2025-08-16 12:14:12 +00:00
1019 changed files with 15899 additions and 58756 deletions
--- a/.clang-tidy
+++ b/.clang-tidy
@ -1,7 +1,6 @@
 Checks: >
  -*,
  portability-*,
-  -portability-template-virtual-member-function,
  clang-analyzer-*,
  -clang-analyzer-optin.*,
  -clang-analyzer-cplusplus.NewDeleteLeaks,
@ -14,9 +13,3 @@ HeaderFilterRegex: '(apps|components)/'
 CheckOptions:
 - key: readability-identifier-naming.ConceptCase
  value: CamelCase
- key: readability-identifier-naming.NamespaceCase
-  value: CamelCase
- key: readability-identifier-naming.NamespaceIgnoredRegexp
-  value: 'bpo|osg(DB|FX|Particle|Shadow|Viewer|Util)?'
- key: readability-identifier-naming.LocalVariableCase
-  value: camelBack
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@ -104,6 +104,7 @@ jobs:
      fail-fast: true
      matrix:
        image:
+        - "2019"
        - "2022"

    uses: ./.github/workflows/windows.yml
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@ -4,13 +4,9 @@ on:
  workflow_call:
    inputs:
      image:
-        description: Window Server image
+        description: MSVC image (2019/2022)
        required: true
        type: string
-      msvc:
-        description: MSVC version (2019/2022)
-        default: "2022"
-        type: string
      vcpkg-deps-tag:
        description: Git tag of our deps
        required: true
@ -49,7 +45,7 @@ jobs:
    - name: Download prebuilt vcpkg packages
      working-directory: ${{ github.workspace }}/deps
      run: |
-        $MANIFEST = "vcpkg-x64-${{ inputs.msvc }}-${{ inputs.vcpkg-deps-tag }}.txt"
+        $MANIFEST = "vcpkg-x64-${{ inputs.image }}-${{ inputs.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]
@ -65,7 +61,7 @@ jobs:

    - name: Extract archived prebuilt vcpkg packages
      working-directory: ${{ github.workspace }}/deps
-      run: 7z x -y -ovcpkg-x64-${{ inputs.msvc }}-${{ inputs.vcpkg-deps-tag }} $env:archive
+      run: 7z x -y -ovcpkg-x64-${{ inputs.image }}-${{ inputs.vcpkg-deps-tag }} $env:archive

    - name: Cache Qt
      id: qt-cache
@ -98,12 +94,12 @@ jobs:
        -B ${{ github.workspace }}/build
        -G Ninja
        -D CMAKE_BUILD_TYPE=${{ inputs.build-type }}
-        -D CMAKE_TOOLCHAIN_FILE='${{ github.workspace }}/deps/vcpkg-x64-${{ inputs.msvc }}-${{ inputs.vcpkg-deps-tag }}/scripts/buildsystems/vcpkg.cmake'
+        -D CMAKE_TOOLCHAIN_FILE='${{ github.workspace }}/deps/vcpkg-x64-${{ inputs.image }}-${{ inputs.vcpkg-deps-tag }}/scripts/buildsystems/vcpkg.cmake'
        -D CMAKE_PREFIX_PATH='${{ github.workspace }}/deps/Qt/6.6.3/msvc2019_64'
        ${{ inputs.package && '-D CMAKE_CXX_FLAGS_RELEASE="/O2 /Ob2 /DNDEBUG /Zi"' || '' }}
        ${{ inputs.package && '-D "CMAKE_EXE_LINKER_FLAGS_RELEASE=/DEBUG /INCREMENTAL:NO"' || '' }}
-        -D LuaJit_INCLUDE_DIR='${{ github.workspace }}/deps/vcpkg-x64-${{ inputs.msvc }}-${{ inputs.vcpkg-deps-tag }}/installed/x64-windows/include/luajit'
-        -D LuaJit_LIBRARY='${{ github.workspace }}/deps/vcpkg-x64-${{ inputs.msvc }}-${{ inputs.vcpkg-deps-tag }}/installed/x64-windows/lib/lua51.lib'
+        -D LuaJit_INCLUDE_DIR='${{ github.workspace }}/deps/vcpkg-x64-${{ inputs.image }}-${{ inputs.vcpkg-deps-tag }}/installed/x64-windows/include/luajit'
+        -D LuaJit_LIBRARY='${{ github.workspace }}/deps/vcpkg-x64-${{ inputs.image }}-${{ inputs.vcpkg-deps-tag }}/installed/x64-windows/lib/lua51.lib'
        -D BUILD_BENCHMARKS=${{ ! inputs.package }}
        -D BUILD_COMPONENTS_TESTS=${{ ! inputs.package }}
        -D BUILD_OPENMW_TESTS=${{ ! inputs.package }}
@ -118,9 +114,9 @@ jobs:

    - name: Copy missing DLLs
      run: |
-        cp ${{ github.workspace }}/deps/vcpkg-x64-${{ inputs.msvc }}-${{ inputs.vcpkg-deps-tag }}/installed/x64-windows/bin/Release/MyGUIEngine.dll ${{ github.workspace }}/build
-        cp -Filter *.dll -Recurse ${{ github.workspace }}/deps/vcpkg-x64-${{ inputs.msvc }}-${{ inputs.vcpkg-deps-tag }}/installed/x64-windows/bin/osgPlugins-3.6.5 ${{ github.workspace }}/build
-        cp ${{ github.workspace }}/deps/vcpkg-x64-${{ inputs.msvc }}-${{ inputs.vcpkg-deps-tag }}/installed/x64-windows/bin/*.dll ${{ github.workspace }}/build
+        cp ${{ github.workspace }}/deps/vcpkg-x64-${{ inputs.image }}-${{ inputs.vcpkg-deps-tag }}/installed/x64-windows/bin/Release/MyGUIEngine.dll ${{ github.workspace }}/build
+        cp -Filter *.dll -Recurse ${{ github.workspace }}/deps/vcpkg-x64-${{ inputs.image }}-${{ inputs.vcpkg-deps-tag }}/installed/x64-windows/bin/osgPlugins-3.6.5 ${{ github.workspace }}/build
+        cp ${{ github.workspace }}/deps/vcpkg-x64-${{ inputs.image }}-${{ inputs.vcpkg-deps-tag }}/installed/x64-windows/bin/*.dll ${{ github.workspace }}/build

    - name: Copy Qt DLLs
      working-directory: ${{ github.workspace }}/deps/Qt/6.6.3/msvc2019_64
@ -176,7 +172,7 @@ jobs:
      env:
        GH_TOKEN: ${{ github.token }}
      run: |
-        job_url=$(gh run --repo ${{ github.repository }} view ${{ github.run_id }} --json jobs --jq '.jobs[] | select(.name == "windows-${{ inputs.msvc }}") | .url')
+        job_url=$(gh run --repo ${{ github.repository }} view ${{ github.run_id }} --json jobs --jq '.jobs[] | select(.name == "windows-${{ inputs.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
        cp install/CI-ID.txt SymStore/CI-ID.txt
@ -184,19 +180,19 @@ jobs:
    - name: Store OpenMW archived pdb files
      uses: actions/upload-artifact@v4
      with:
-        name: openmw-windows-${{ inputs.msvc }}-pdb-${{ github.sha }}
+        name: openmw-windows-${{ inputs.image }}-pdb-${{ github.sha }}
        path: ${{ github.workspace }}/pdb/*

    - name: Store OpenMW build artifacts
      uses: actions/upload-artifact@v4
      with:
-        name: openmw-windows-${{ inputs.msvc }}-${{ github.sha }}
+        name: openmw-windows-${{ inputs.image }}-${{ github.sha }}
        path: ${{ github.workspace }}/install/*

    - name: Store symbol server artifacts
      uses: actions/upload-artifact@v4
      with:
-        name: openmw-windows-${{ inputs.msvc }}-sym-store-${{ github.sha }}
+        name: openmw-windows-${{ inputs.image }}-sym-store-${{ github.sha }}
        path: ${{ github.workspace }}/SymStore/*

    - name: Upload to symbol server
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -9,8 +9,6 @@ stages:
  - test

 workflow:
-  auto_cancel:
-    on_new_commit: interruptible
  rules:
    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
@ -29,14 +27,14 @@ variables:
 .Ubuntu_Image:
  tags:
    - saas-linux-medium-amd64
-  image: ubuntu:24.04
+  image: ubuntu:22.04
  rules:
    - if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event"

 Ubuntu_GCC_preprocess:
  extends: .Ubuntu_Image
  cache:
-    key: Ubuntu_GCC_preprocess.ubuntu_24.04.v1
+    key: Ubuntu_GCC_preprocess.ubuntu_22.04.v1
    paths:
      - apt-cache/
      - .cache/pip/
@ -45,12 +43,9 @@ Ubuntu_GCC_preprocess:
    PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
  before_script:
    - CI/install_debian_deps.sh openmw-deps openmw-deps-dynamic gcc_preprocess
-    - pip3 install --user --break-system-packages click termtables
+    - pip3 install --user click termtables
  script:
    - CI/ubuntu_gcc_preprocess.sh
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    - if: $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_ID != "7107382"

 .Ubuntu:
  extends: .Ubuntu_Image
@ -82,9 +77,9 @@ Ubuntu_GCC_preprocess:
    - 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 -svv
+    - ccache -s
    - df -h
-    - if [[ "${BUILD_WITH_CODE_COVERAGE}" ]]; then ~/.local/bin/gcovr --xml-pretty --exclude-unreachable-branches --gcov-ignore-parse-errors=negative_hits.warn_once_per_file --print-summary --root "${CI_PROJECT_DIR}" -j $(nproc) -o ../coverage.xml; fi
+    - 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 '^components-tests.xml$' -e '^openmw-tests.xml$' -e '^openmw-cs-tests.xml$' | xargs -I '{}' rm -rf './{}'
    - cd ..
    - df -h
@ -99,20 +94,19 @@ Ubuntu_GCC_preprocess:
 Coverity:
  tags:
    - saas-linux-medium-amd64
-  image: ubuntu:24.04
+  image: ubuntu:22.04
  stage: build
-  interruptible: false
  rules:
    - if: $CI_PIPELINE_SOURCE == "schedule"
  cache:
-    key: Coverity.ubuntu_24.04.v1
+    key: Coverity.ubuntu_22.04.v1
    paths:
    - apt-cache/
    - ccache/
  variables:
    CCACHE_SIZE: 2G
-    CC: clang
-    CXX: clang++
+    CC: clang-12
+    CXX: clang++-12
    CMAKE_BUILD_TYPE: Debug
    CMAKE_CXX_FLAGS_DEBUG: -O0
  before_script:
@ -128,40 +122,23 @@ Coverity:
    - ccache -z -M "${CCACHE_SIZE}"
    - CI/before_script.linux.sh
    - cov-analysis-linux64-*/bin/cov-configure --template --comptype prefix --compiler ccache
+    # Remove the specific targets and build everything once we can do it under 3h
    - cov-analysis-linux64-*/bin/cov-build --dir cov-int cmake --build build -- -j $(nproc)
-    - ccache -svv
+    - ccache -s
+  after_script:
    - tar cfz cov-int.tar.gz cov-int
-    - echo "OPENMW_JOB_ID=$CI_JOB_ID" >> build.env
-  artifacts:
-    expire_in: 1 day
-    paths:
-      - /builds/OpenMW/openmw/cov-int/build-log.txt
-      - /builds/OpenMW/openmw/cov-int.tar.gz
-    reports:
-      dotenv: build.env
-
-Coverity_Upload:
-  image: ubuntu:24.04
-  stage: build
-  interruptible: false
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-  before_script:
-    - CI/install_debian_deps.sh coverity_upload
-  script:
-    - echo "$CI_API_V4_URL/projects/$CI_PROJECT_ID/jobs/$OPENMW_JOB_ID/artifacts/cov-int.tar.gz"
    - curl https://scan.coverity.com/builds?project=$COVERITY_SCAN_PROJECT_NAME
      --form token=$COVERITY_SCAN_TOKEN --form email=$GITLAB_USER_EMAIL
-      --form version="$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA"
+      --form file=@cov-int.tar.gz --form version="$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA"
      --form description="CI_COMMIT_SHORT_SHA / $CI_COMMIT_TITLE / $CI_COMMIT_REF_NAME:$CI_PIPELINE_ID"
-      --form url="$CI_API_V4_URL/projects/$CI_PROJECT_ID/jobs/$OPENMW_JOB_ID/artifacts/cov-int.tar.gz"
-  needs:
-    - Coverity
+  artifacts:
+    paths:
+      - /builds/OpenMW/openmw/cov-int/build-log.txt

 Ubuntu_GCC:
  extends: .Ubuntu
  cache:
-    key: Ubuntu_GCC.ubuntu_24.04.v1
+    key: Ubuntu_GCC.ubuntu_22.04.v1
  before_script:
    - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic
  variables:
@ -174,7 +151,7 @@ Ubuntu_GCC:
 Ubuntu_GCC_asan:
  extends: Ubuntu_GCC
  cache:
-    key: Ubuntu_GCC_asan.ubuntu_24.04.v1
+    key: Ubuntu_GCC_asan.ubuntu_22.04.v1
  variables:
    CMAKE_BUILD_TYPE: Debug
    CMAKE_CXX_FLAGS_DEBUG: -g -O1 -fno-omit-frame-pointer -fsanitize=address -fsanitize=pointer-subtract -fsanitize=leak
@ -187,7 +164,7 @@ Clang_Format:
  extends: .Ubuntu_Image
  stage: checks
  cache:
-    key: Ubuntu_Clang_Format.ubuntu_24.04.v1
+    key: Ubuntu_Clang_Format.ubuntu_22.04.v1
    paths:
      - apt-cache/
  variables:
@ -203,11 +180,11 @@ Lupdate:
  extends: .Ubuntu_Image
  stage: checks
  cache:
-    key: Ubuntu_lupdate.ubuntu_24.04.v1
+    key: Ubuntu_lupdate.ubuntu_22.04.v1
    paths:
      - apt-cache/
  variables:
-    LUPDATE: /usr/lib/qt6/bin/lupdate
+    LUPDATE: lupdate
  before_script:
    - CI/install_debian_deps.sh openmw-qt-translations
  script:
@ -229,7 +206,7 @@ Teal:
 Ubuntu_GCC_Debug:
  extends: .Ubuntu
  cache:
-    key: Ubuntu_GCC_Debug.ubuntu_24.04.v2
+    key: Ubuntu_GCC_Debug.ubuntu_22.04.v2
  before_script:
    - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic
  variables:
@ -245,7 +222,7 @@ Ubuntu_GCC_Debug:
 Ubuntu_GCC_tests:
  extends: Ubuntu_GCC
  cache:
-    key: Ubuntu_GCC_tests.ubuntu_24.04.v1
+    key: Ubuntu_GCC_tests.ubuntu_22.04.v1
  variables:
    CCACHE_SIZE: 1G
    BUILD_TESTS_ONLY: 1
@ -259,7 +236,7 @@ Ubuntu_GCC_tests:
 .Ubuntu_GCC_tests_Debug:
  extends: Ubuntu_GCC
  cache:
-    key: Ubuntu_GCC_tests_Debug.ubuntu_24.04.v1
+    key: Ubuntu_GCC_tests_Debug.ubuntu_22.04.v1
  variables:
    CCACHE_SIZE: 1G
    BUILD_TESTS_ONLY: 1
@ -275,7 +252,7 @@ Ubuntu_GCC_tests:
 Ubuntu_GCC_tests_asan:
  extends: Ubuntu_GCC
  cache:
-    key: Ubuntu_GCC_tests_asan.ubuntu_24.04.v1
+    key: Ubuntu_GCC_tests_asan.ubuntu_22.04.v1
  variables:
    CCACHE_SIZE: 1G
    BUILD_TESTS_ONLY: 1
@ -291,14 +268,11 @@ Ubuntu_GCC_tests_asan:
    when: always
    reports:
      junit: build/*-tests.xml
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    - if: $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_ID != "7107382"

 Ubuntu_GCC_tests_ubsan:
  extends: Ubuntu_GCC
  cache:
-    key: Ubuntu_GCC_tests_ubsan.ubuntu_24.04.v1
+    key: Ubuntu_GCC_tests_ubsan.ubuntu_22.04.v1
  variables:
    CCACHE_SIZE: 1G
    BUILD_TESTS_ONLY: 1
@ -311,14 +285,11 @@ Ubuntu_GCC_tests_ubsan:
    when: always
    reports:
      junit: build/*-tests.xml
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    - if: $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_ID != "7107382"

 .Ubuntu_GCC_tests_tsan:
  extends: Ubuntu_GCC
  cache:
-    key: Ubuntu_GCC_tests_tsan.ubuntu_24.04.v1
+    key: Ubuntu_GCC_tests_tsan.ubuntu_22.04.v1
  variables:
    CCACHE_SIZE: 1G
    BUILD_TESTS_ONLY: 1
@ -336,15 +307,11 @@ Ubuntu_GCC_tests_ubsan:
 Ubuntu_GCC_tests_coverage:
  extends: .Ubuntu_GCC_tests_Debug
  cache:
-    key: Ubuntu_GCC_tests_coverage.ubuntu_24.04.v1
-    paths:
-      - .cache/pip
+    key: Ubuntu_GCC_tests_coverage.ubuntu_22.04.v1
  variables:
    BUILD_WITH_CODE_COVERAGE: 1
-    PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
  before_script:
    - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic openmw-coverage
-    - pipx install gcovr
  coverage: /^\s*lines:\s*\d+.\d+\%/
  artifacts:
    paths: []
@ -355,9 +322,6 @@ Ubuntu_GCC_tests_coverage:
        coverage_format: cobertura
        path: coverage.xml
      junit: build/*-tests.xml
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    - if: $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_ID != "7107382"

 .Ubuntu_Static_Deps:
  extends: Ubuntu_Clang
@ -369,7 +333,7 @@ Ubuntu_GCC_tests_coverage:
        - "CI/**/*"
        - ".gitlab-ci.yml"
  cache:
-    key: Ubuntu_Static_Deps.ubuntu_24.04.v1
+    key: Ubuntu_Static_Deps.ubuntu_22.04.v1
    paths:
      - apt-cache/
      - ccache/
@ -386,7 +350,7 @@ Ubuntu_GCC_tests_coverage:
 .Ubuntu_Static_Deps_tests:
  extends: .Ubuntu_Static_Deps
  cache:
-    key: Ubuntu_Static_Deps_tests.ubuntu_24.04.v1
+    key: Ubuntu_Static_Deps_tests.ubuntu_22.04.v1
  variables:
    CCACHE_SIZE: 1G
    BUILD_TESTS_ONLY: 1
@ -405,7 +369,7 @@ Ubuntu_Clang:
  before_script:
    - CI/install_debian_deps.sh clang openmw-deps openmw-deps-dynamic
  cache:
-    key: Ubuntu_Clang.ubuntu_24.04.v2
+    key: Ubuntu_Clang.ubuntu_22.04.v2
  variables:
    CC: clang
    CXX: clang++
@ -418,7 +382,7 @@ Ubuntu_Clang:
  before_script:
    - CI/install_debian_deps.sh clang clang-tidy openmw-deps openmw-deps-dynamic
  cache:
-    key: Ubuntu_Clang_Tidy.ubuntu_24.04.v1
+    key: Ubuntu_Clang_Tidy.ubuntu_22.04.v1
  variables:
    CMAKE_BUILD_TYPE: Debug
    CMAKE_CXX_FLAGS_DEBUG: -O0
@ -429,19 +393,15 @@ Ubuntu_Clang:
    - mkdir -pv "${CCACHE_DIR}"
    - ccache -z -M "${CCACHE_SIZE}"
    - CI/before_script.linux.sh
-    - cp extern/.clang-tidy build/.clang-tidy
    - cd build
    - find . -name *.o -exec touch {} \;
    - cmake --build . -- -j $(nproc) ${BUILD_TARGETS}
-    - ccache -svv
+    - ccache -s
  artifacts:
    paths:
      - build/
    expire_in: 12h
  timeout: 3h
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    - if: $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_ID != "7107382"

 Ubuntu_Clang_Tidy_components:
  extends: .Ubuntu_Clang_Tidy_Base
@ -454,7 +414,7 @@ Ubuntu_Clang_Tidy_openmw:
  needs:
    - Ubuntu_Clang_Tidy_components
  variables:
-    BUILD_TARGETS: openmw openmw-tests
+    BUILD_TARGETS: openmw
  timeout: 3h

 Ubuntu_Clang_Tidy_openmw-cs:
@ -470,13 +430,13 @@ Ubuntu_Clang_Tidy_other:
  needs:
    - Ubuntu_Clang_Tidy_components
  variables:
-    BUILD_TARGETS: components-tests bsatool esmtool openmw-launcher openmw-iniimporter openmw-essimporter openmw-wizard niftest 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:
  extends: Ubuntu_Clang
  cache:
-    key: Ubuntu_Clang_tests.ubuntu_24.04.v1
+    key: Ubuntu_Clang_tests.ubuntu_22.04.v1
  variables:
    CCACHE_SIZE: 1G
    BUILD_TESTS_ONLY: 1
@ -490,7 +450,7 @@ Ubuntu_Clang_Tidy_other:
 Ubuntu_Clang_tests_Debug:
  extends: Ubuntu_Clang
  cache:
-    key: Ubuntu_Clang_tests_Debug.ubuntu_24.04.v1
+    key: Ubuntu_Clang_tests_Debug.ubuntu_22.04.v1
  variables:
    CCACHE_SIZE: 1G
    BUILD_TESTS_ONLY: 1
@ -507,14 +467,14 @@ Ubuntu_Clang_tests_Debug:
  stage: test
  variables:
    PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
-    EXAMPLE_SUITE_REVISION: 3e01d10e073474a886a9efe3658088db14869627
+    EXAMPLE_SUITE_REVISION: f51b832e033429a7cdc520e0e48d7dfdb9141caa
  cache:
    paths:
      - .cache/pip
      - apt-cache/
  before_script:
    - CI/install_debian_deps.sh $OPENMW_DEPS
-    - pip3 install --user --break-system-packages numpy matplotlib termtables click
+    - pip3 install --user numpy matplotlib termtables click
  script:
    - CI/run_integration_tests.sh
  after_script:
@ -525,7 +485,7 @@ Ubuntu_Clang_integration_tests:
  needs:
    - Ubuntu_Clang
  cache:
-    key: Ubuntu_Clang_integration_tests.ubuntu_24.04.v2
+    key: Ubuntu_Clang_integration_tests.ubuntu_22.04.v2
  variables:
    OPENMW_DEPS: openmw-integration-tests

@ -534,22 +494,15 @@ Ubuntu_GCC_integration_tests_asan:
  needs:
    - Ubuntu_GCC_asan
  cache:
-    key: Ubuntu_GCC_integration_tests_asan.ubuntu_24.04.v1
+    key: Ubuntu_GCC_integration_tests_asan.ubuntu_22.04.v1
  variables:
-    OPENMW_DEPS: openmw-integration-tests libasan
+    OPENMW_DEPS: openmw-integration-tests libasan6
    ASAN_OPTIONS: halt_on_error=1:strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:detect_leaks=0

 .MacOS:
  stage: build
  rules:
-    - if: $CI_PROJECT_ID != "7107382"
-      when: never
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-      when: manual
-    - if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule"
-  image: macos-15-xcode-16
-  tags:
-    - saas-macos-medium-m1
+    - if: $CI_PROJECT_ID == "7107382"
  cache:
    paths:
    - ccache/
@ -582,28 +535,28 @@ Ubuntu_GCC_integration_tests_asan:
    paths:
      - build/OpenMW-*.dmg

-macOS15_Xcode16_amd64:
+macOS14_Xcode15_amd64:
  extends: .MacOS
+  image: macos-14-xcode-15
+  tags:
+    - saas-macos-medium-m1
  cache:
-    key: macOS15_Xcode16_amd64.v1
+    key: macOS14_Xcode15_amd64.v2
  variables:
    CCACHE_SIZE: 3G
    DMG_IDENTIFIER: amd64
    MACOS_AMD64: true
-    HOMEBREW_NO_AUTO_UPDATE: 1
-    HOMEBREW_NO_EMOJI: true
-    HOMEBREW_NO_INSTALL_CLEANUP: true

-macOS15_Xcode16_arm64:
+macOS14_Xcode15_arm64:
  extends: .MacOS
+  image: macos-14-xcode-15
+  tags:
+    - saas-macos-medium-m1
  cache:
-    key: macOS15_Xcode16_arm64.v1
+    key: macOS14_Xcode15_arm64.v1
  variables:
    DMG_IDENTIFIER: arm64
    CCACHE_SIZE: 3G
-    HOMEBREW_NO_AUTO_UPDATE: 1
-    HOMEBREW_NO_EMOJI: true
-    HOMEBREW_NO_INSTALL_CLEANUP: true

 .Compress_And_Upload_Symbols_Base:
  extends: .Ubuntu_Image
@ -728,7 +681,7 @@ macOS15_Xcode16_arm64:
    - Get-Volume
    - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
  cache:
-    key: ninja-2022-v13
+    key: ninja-2022-v12
    paths:
    - ccache
    - deps
@ -886,7 +839,7 @@ macOS15_Xcode16_arm64:
    - Get-Volume
    - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
  cache:
-    key: msbuild-2022-v13
+    key: msbuild-2022-v12
    paths:
    - deps
    - MSVC2022_64/deps/Qt
@ -987,7 +940,7 @@ Windows_MSBuild_CacheInit:
    - cd build
    - cmake --build . -- -j $(nproc)
    # - cmake --install .  # no one uses builds anyway, disable until 'no space left' is resolved
-    - ccache -svv
+    - ccache -s
    - df -h
    - ls | grep -v -e '^extern$' -e '^install$' | xargs -I '{}' rm -rf './{}'
    - cd ..
@ -1015,7 +968,7 @@ Windows_MSBuild_CacheInit:
    paths:
      - .cache/pip
  before_script:
-    - pip3 install --user --break-system-packages requests click discord_webhook
+    - pip3 install --user requests click discord_webhook
  script:
    - scripts/find_missing_merge_requests.py --project_id=$CI_PROJECT_ID --ignored_mrs_path=$CI_PROJECT_DIR/.resubmitted_merge_requests.txt

--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@ -10,4 +10,4 @@ python:
 build:
  os: ubuntu-22.04
  tools:
-    python: "3.9"
+    python: "3.8"
--- a/AUTHORS.md
+++ b/AUTHORS.md
@ -10,8 +10,7 @@ If you feel your name is missing from this list, please add it to `AUTHORS.md`.
 Programmers
 -----------

-    Alexey Dobrokhotov (Capo) - Project leader 2025-present
-    Bret Curtis (psi29a) - Project leader 2019-2025
+    Bret Curtis (psi29a) - Project leader 2019-present
    Marc Zinnschlag (Zini) - Project leader 2010-2018
    Nicolay Korslund - Project leader 2008-2010
    scrawl - Top contributor
@ -50,10 +49,10 @@ Programmers
    Berulacks
    Bo Svensson
    Britt Mathis (galdor557)
+    Capostrophic
    Carl Maxwell
    cc9cii
    Cédric Mocquillon
-    Charles Horn
    Chris Boyce (slothlife)
    Chris Robinson (KittyCat)
    Chris Vigil
@ -197,7 +196,7 @@ Programmers
    Qlonever
    Radu-Marius Popovici (rpopovici)
    Rafael Moura (dhustkoder)
-    Randy Davin (Kuyondo)
+    Randy Davin (Kindi)
    rdimesio
    rexelion
    riothamus
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,97 +1,3 @@
-0.50.0
------
-
-    Bug #2967: Inventory windows don't update when changing items by script
-    Bug #4437: Transformations for NiSkinInstance are ignored
-    Bug #4885: Disable in dialogue result script causes a crash
-    Bug #5331: Pathfinding works incorrectly when actor is moved from one interior cell to another
-    Bug #6029: Hostile NPCs are perfectly aware of a player character with a 75% Chameleon effect
-    Bug #6039: Next Spell keybind fails while selected enchanted item has multiple copies
-    Bug #6573: Editor: Selection behaves incorrectly on high-DPI displays
-    Bug #6792: Birth sign info box has no line breaks
-    Bug #7371: Equipping item from inventory does not play a Down sound when equipping fails
-    Bug #7622: Player's marksman weapons don't work on close actors underwater
-    Bug #7649: The sound and vfx of resisted enchanted items' magic still play
-    Bug #7693: I.ItemUsage should return an item to the selected stack if equipping/consumption is denied
-    Bug #7740: Magic items in the HUD aren't composited correctly
-    Bug #7799: Picking up ingredients while object paging active grid is on may cause a hiccup
-    Bug #7871: Kwama Queen doesn't start combat with player
-    Bug #7979: Paralyzed NPCs battlecry
-    Bug #8012: Startcombat and Stopcombat do not affect music in the menu mode
-    Bug #8245: The console command ShowVars does not list global mwscripts
-    Bug #8265: Topics are linked incorrectly
-    Bug #8303: On target spells cast by non-actors should fire underwater
-    Bug #8309: RemoveSpell should instantly remove the spell's effects
-    Bug #8318: Missing global variables are not handled gracefully in dialogue conditions
-    Bug #8333: Quest status subrecords should not actually cause parsing to skip remaining data
-    Bug #8340: Multi-effect enchantments are too expensive
-    Bug #8341: Repeat shader visitor passes discard parallax
-    Bug #8349: Travel to non-existent cell causes persistent black screen
-    Bug #8359: Some quick keys menu related issues
-    Bug #8371: Silence affects powers
-    Bug #8375: Moon phase cycle doesn't match Morrowind
-    Bug #8383: Casting bound helm or boots on beast races doesn't cleanup properly
-    Bug #8385: Russian encoding broken with locale parameters and calendar
-    Bug #8399: Jail skill increases don't count as progress towards the next level
-    Bug #8404: Prevent merchant equipping breaks on lights
-    Bug #8408: OpenMW doesn't report all the potential resting hindrances
-    Bug #8414: Waterwalking works when collision is disabled
-    Bug #8431: Behaviour of removed items from a container is buggy
-    Bug #8432: Changing to and from an interior cell doesn't update collision
-    Bug #8433: Wandering NPCs are not capable of avoiding easy obstacles
-    Bug #8436: Spell selection in a pinned spellbook window doesn't update
-    Bug #8437: Pinned inventory window's pin button doesn't look pressed
-    Bug #8446: Travel prices are strangely inconsistent
-    Bug #8447: Werewolf swimming animation breaks in third person perspective
-    Bug #8459: Changing magic effect base cost doesn't change spell price
-    Bug #8466: Showmap "" reveals nameless cells
-    Bug #8485: Witchwither disease and probably other common diseases don't work correctly
-    Bug #8490: Normals on Water disappear when Water Shader is Enabled but Refraction is Disabled
-    Bug #8500: OpenMW Alarm behaviour doesn't match morrowind.exe
-    Bug #8519: Multiple bounty is sometimes assigned to player when detected during a pickpocketing action
-    Bug #8540: Magic resistance is applied to effects without a magnitude
-    Bug #8557: Charm's disposition changes capped on 100, uncapped below 0
-    Bug #8582: addScript-attached local scripts start out inactive
-    Bug #8584: Spacing of service menu list entries is inconsistent
-    Bug #8585: Dialogue topic list doesn't have enough padding
-    Bug #8587: Minor INI importer problems
-    Bug #8593: Render targets do not generate mipmaps
-    Bug #8598: Post processing shaders don't interact with the vfs correctly
-    Bug #8599: Non-ASCII paths in BSA files don't work
-    Bug #8606: Floating point imprecision can mess with container capacity
-    Bug #8609: The crosshair is too large
-    Bug #8610: Terrain normal maps using NormalGL format instead of NormalDX
-    Bug #8612: Using aiactivate on an ingredient when graphical herbalism is enabled triggers non-stop pickup sounds
-    Bug #8614: Lua garbage collection fails to remove unused data
-    Bug #8615: Rest/wait time progress speed is different from vanilla
-    Bug #8620: Create/CloneCommand can reuse refNums, causing severe issues in-game
-    Bug #8650: Some plants turn invisible when being called types.Container.inventory(cont):isResolved()
-    Feature #2522: Support quick item transfer
-    Feature #3740: Gamepad GUI Mode
-    Feature #3769: Allow GetSpellEffects on enchantments
-    Feature #6000: Oblivion terrain rendering
-    Feature #6976: [Lua] Weather API
-    Feature #7813: Add audio doppler for 3d sounds
-    Feature #7966: Add Lua read access to TES3 player's journal records
-    Feature #8077: Save settings changes when clicking "ok"/closing the window
-    Feature #8112: Expose landscape record data to Lua
-    Feature #8113: Support extended selection in autodetected subdirectory dialog
-    Feature #8139: Editor: Redesign the selection markers
-    Feature #8285: Expose list of active shaders in postprocessing API
-    Feature #8290: Show player gold in Spellmaking
-    Feature #8313: Show the character name in the savegame details
-    Feature #8320: Add access mwscript source text to lua api
-    Feature #8334: Lua: AddTopic equivalent
-    Feature #8355: Lua: Window visibility checking in interfaces.UI
-    Feature #8509: FillJournal script instruction
-    Feature #8579: Bulk (un)indentation in mwscript editor
-    Feature #8580: Sort characters in the save loading menu
-    Feature #8597: Lua: Add more built-in event handlers
-    Feature #8629: Expose path grid data to Lua
-    Feature #8642: Partially dehardcode on-hit mechanics
-    Feature #8654: Allow lua world.createRecord to create NPC records
-    Task #8578: Drop support for Qt5
-
 0.49.0
 ------

@ -331,7 +237,6 @@
    Bug #8503: Camera does not handle NaN gracefully
    Bug #8541: Lua: util.color:asHex produces wrong output for some colors
    Bug #8567: Token replacement does not work via CLI and relative paths passed via the command line are not relative to the CWD
-    Bug #8576: Crash on exit when unresolving containers with scripted items
    Feature #1415: Infinite fall failsafe
    Feature #2566: Handle NAM9 records for manual cell references
    Feature #3501: OpenMW-CS: Instance Editing - Shortcuts for axial locking
--- a/CI/before_install.macos.sh
+++ b/CI/before_install.macos.sh
@ -1,5 +1,9 @@
 #!/bin/sh -ex

+export HOMEBREW_NO_EMOJI=1
+export HOMEBREW_NO_INSTALL_CLEANUP=1
+export HOMEBREW_AUTOREMOVE=1
+
 if [[ "${MACOS_AMD64}" ]]; then
    ./CI/macos/before_install.amd64.sh
 else
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@ -377,8 +377,6 @@ case $VS_VERSION in
 		MSVC_DISPLAY_YEAR="2022"

 		QT_MSVC_YEAR="2019"
-
-		VCPKG_TRIPLET="x64-windows"
 		;;

 	16|16.0|2019 )
@ -388,8 +386,6 @@ case $VS_VERSION in
 		MSVC_DISPLAY_YEAR="2019"

 		QT_MSVC_YEAR="2019"
-
-		VCPKG_TRIPLET="x64-windows-2019"
 		;;

 	15|15.0|2017 )
@ -550,7 +546,7 @@ fi
 QT_VER='6.6.3'
 AQT_VERSION='v3.1.15'

-VCPKG_TAG="2025-07-23"
+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"
@ -637,16 +633,16 @@ printf "vcpkg packages ${VCPKG_TAG:?}... "
 	fi

 	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/${VCPKG_TRIPLET}/include/luajit"
-	add_cmake_opts -DLuaJit_LIBRARY="$(real_pwd)/${VCPKG_PATH:?}/installed/${VCPKG_TRIPLET}/lib/lua51.lib"
+	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"

 	for CONFIGURATION in ${CONFIGURATIONS[@]}; do
 		if [[ ${CONFIGURATION:?} == "Debug" ]]; then
-			VCPKG_DLL_BIN="$(pwd)/${VCPKG_PATH:?}/installed/${VCPKG_TRIPLET}/debug/bin"
+			VCPKG_DLL_BIN="$(pwd)/${VCPKG_PATH:?}/installed/x64-windows/debug/bin"

 			add_runtime_dlls ${CONFIGURATION:?} "${VCPKG_DLL_BIN:?}/Debug/MyGUIEngine_d.dll"
 		else
-			VCPKG_DLL_BIN="$(pwd)/${VCPKG_PATH:?}/installed/${VCPKG_TRIPLET}/bin"
+			VCPKG_DLL_BIN="$(pwd)/${VCPKG_PATH:?}/installed/x64-windows/bin"

 			add_runtime_dlls ${CONFIGURATION:?} "${VCPKG_DLL_BIN:?}/Release/MyGUIEngine.dll"
 		fi
@ -708,12 +704,17 @@ printf "Qt ${QT_VER}... "
 			DLLSUFFIX=""
 		fi

-		add_runtime_dlls $CONFIGURATION "$(pwd)/bin/Qt${QT_MAJOR_VER}"{Core,Gui,Network,OpenGL,OpenGLWidgets,Widgets,Svg}${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"
+			# 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_MAJOR_VER}"{Core,Gui,Network,OpenGL,Widgets,Svg}${DLLSUFFIX}.dll
 			add_qt_style_dlls $CONFIGURATION "$(pwd)/plugins/styles/qwindowsvistastyle${DLLSUFFIX}.dll"
 		fi

--- a/CI/check_file_names.sh
+++ b/CI/check_file_names.sh
@ -1,6 +1,7 @@
 #!/bin/bash -ex

 git ls-files -- ':(exclude)extern/' '*.cpp' '*.hpp' '*.h' |
-    grep -vP '/[a-z0-9]+\.(cpp|hpp|h)$' &&
+    grep -vP '/[a-z0-9]+\.(cpp|hpp|h)$' |
+    grep -vFf CI/file_name_exceptions.txt &&
    ( echo 'File names do not follow the naming convention, see https://wiki.openmw.org/index.php?title=Naming_Conventions#Files'; exit -1 )
 exit 0
--- a/CI/file_name_exceptions.txt
+++ b/CI/file_name_exceptions.txt
@ -0,0 +1,48 @@
+apps/openmw/android_main.cpp
+apps/openmw/mwsound/efx-presets.h
+apps/openmw/mwsound/ffmpeg_decoder.cpp
+apps/openmw/mwsound/ffmpeg_decoder.hpp
+apps/openmw/mwsound/openal_output.cpp
+apps/openmw/mwsound/openal_output.hpp
+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/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
+components/crashcatcher/windows_crashcatcher.hpp
+components/crashcatcher/windows_crashmonitor.cpp
+components/crashcatcher/windows_crashmonitor.hpp
+components/crashcatcher/windows_crashshm.hpp
+components/fx/lexer_types.hpp
+components/fx/parse_constants.hpp
+components/platform/file.posix.cpp
+components/platform/file.stdio.cpp
+components/platform/file.win32.cpp
+components/sdlutil/gl4es_init.cpp
+components/sdlutil/gl4es_init.h
+components/to_utf8/gen_iconv.cpp
+components/to_utf8/tables_gen.hpp
+components/to_utf8/to_utf8.cpp
+components/to_utf8/to_utf8.hpp
--- a/CI/github.env
+++ b/CI/github.env
@ -1 +1 @@
-VCPKG_DEPS_TAG=2025-07-23
+VCPKG_DEPS_TAG=2024-11-10
--- a/CI/install_debian_deps.sh
+++ b/CI/install_debian_deps.sh
@ -11,8 +11,7 @@ print_help() {
 declare -rA GROUPED_DEPS=(
  [gcc]="binutils gcc build-essential cmake ccache curl unzip git pkg-config mold"
  [clang]="binutils clang make cmake ccache curl unzip git pkg-config mold"
-  [coverity]="binutils clang make cmake ccache curl unzip git pkg-config file"
-  [coverity_upload]="curl"
+  [coverity]="binutils clang-12 make cmake ccache curl unzip git pkg-config"
  [gcc_preprocess]="
    binutils
    build-essential
@ -34,10 +33,10 @@ declare -rA GROUPED_DEPS=(
    libboost-system-dev libboost-iostreams-dev

    libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev
-    libsdl2-dev libqt6opengl6-dev qt6-tools-dev qt6-tools-dev-tools libopenal-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 libqt6svg6 libqt6svg6-dev
+    libyaml-cpp-dev libqt5svg5 libqt5svg5-dev
  "

  # These dependencies can alternatively be built and linked statically.
@ -58,22 +57,22 @@ declare -rA GROUPED_DEPS=(
    libsdl2-dev libboost-system-dev libboost-filesystem-dev libgl-dev
  "

-  [openmw-coverage]="pipx"
+  [openmw-coverage]="gcovr"

  [openmw-integration-tests]="
    ca-certificates
    gdb
    git
    git-lfs
-    libavcodec60
-    libavformat60
-    libavutil58
-    libboost-iostreams1.83.0
-    libboost-program-options1.83.0
-    libboost-system1.83.0
+    libavcodec58
+    libavformat58
+    libavutil56
+    libboost-iostreams1.74.0
+    libboost-program-options1.74.0
+    libboost-system1.74.0
    libbullet3.24
    libcollada-dom2.5-dp0
-    libicu74
+    libicu70
    libjpeg8
    libluajit-5.1-2
    liblz4-1
@ -81,19 +80,19 @@ declare -rA GROUPED_DEPS=(
    libopenal1
    libopenscenegraph161
    libpng16-16
-    libqt6opengl6
+    libqt5opengl5
    librecast1
    libsdl2-2.0-0
    libsqlite3-0
-    libswresample4
-    libswscale7
+    libswresample3
+    libswscale5
    libtinyxml2.6.2v5
    libyaml-cpp0.8
    python3-pip
    xvfb
  "

-  [libasan]="libasan8"
+  [libasan6]="libasan6"

  [android]="binutils build-essential cmake ccache curl unzip git pkg-config"

@ -103,8 +102,8 @@ declare -rA GROUPED_DEPS=(
  "

  [openmw-qt-translations]="
-    qt6-tools-dev
-    qt6-tools-dev-tools
+    qttools5-dev
+    qttools5-dev-tools
    git-core
  "
 )
--- a/CI/macos/before_install.arm64.sh
+++ b/CI/macos/before_install.arm64.sh
@ -3,7 +3,14 @@
 brew tap --repair
 brew update --quiet

-brew install curl xquartz gd fontconfig freetype harfbuzz brotli s3cmd ccache cmake qt@6 openal-soft icu4c yaml-cpp sqlite
+brew install curl xquartz gd fontconfig freetype harfbuzz brotli s3cmd
+
+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@6
+
+# Install deps
+brew install openal-soft icu4c yaml-cpp sqlite

 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
--- a/CI/macos/ccache_save.sh
+++ b/CI/macos/ccache_save.sh
@ -1,7 +1,7 @@
 #!/bin/sh -ex

 if [[ "${MACOS_AMD64}" ]]; then
-    arch -x86_64 ccache -svv
+    arch -x86_64 ccache -s
 else
-    ccache -svv
+    ccache -s
 fi
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -80,10 +80,10 @@ endif()
 message(STATUS "Configuring OpenMW...")

 set(OPENMW_VERSION_MAJOR 0)
-set(OPENMW_VERSION_MINOR 50)
+set(OPENMW_VERSION_MINOR 49)
 set(OPENMW_VERSION_RELEASE 0)
-set(OPENMW_LUA_API_REVISION 92)
-set(OPENMW_POSTPROCESSING_API_REVISION 3)
+set(OPENMW_LUA_API_REVISION 76)
+set(OPENMW_POSTPROCESSING_API_REVISION 2)

 set(OPENMW_VERSION_COMMITHASH "")
 set(OPENMW_VERSION_TAGHASH "")
@ -249,8 +249,12 @@ endif()
 find_package(LZ4 REQUIRED)

 if (USE_QT)
-    find_package(QT REQUIRED COMPONENTS Core NAMES Qt6)
-    find_package(Qt6 COMPONENTS Core Widgets Network OpenGL OpenGLWidgets LinguistTools Svg REQUIRED)
+    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 LinguistTools Svg REQUIRED)
+    else()
+        find_package(Qt6 COMPONENTS Core Widgets Network OpenGL OpenGLWidgets LinguistTools Svg REQUIRED)
+    endif()
    message(STATUS "Using Qt${QT_VERSION}")
 endif()

@ -462,7 +466,7 @@ find_package(Boost 1.70.0 CONFIG REQUIRED COMPONENTS ${BOOST_COMPONENTS} OPTIONA
 if(OPENMW_USE_SYSTEM_MYGUI)
    find_package(MyGUI 3.4.3 REQUIRED)
 endif()
-find_package(SDL2 2.0.20 REQUIRED)
+find_package(SDL2 2.0.10 REQUIRED)
 find_package(OpenAL REQUIRED)
 find_package(ZLIB REQUIRED)

@ -586,10 +590,30 @@ if(OPENMW_LTO_BUILD)
    endif()
 endif()

-if (APPLE)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++")
-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}")
+
+    if (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
+        # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105438
+        set(OPENMW_CXX_FLAGS "-Wno-array-bounds ${OPENMW_CXX_FLAGS}")
+    endif()
+
+    if (APPLE)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++")
+    endif()
+
+    if (CMAKE_CXX_COMPILER_ID STREQUAL Clang AND NOT APPLE)
+        if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3.6 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 3.6)
+            set(OPENMW_CXX_FLAGS "${OPENMW_CXX_FLAGS} -Wno-potentially-evaluated-expression")
+        endif ()
+    endif()
+
+    if (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
+        set(OPENMW_CXX_FLAGS "${OPENMW_CXX_FLAGS} -Wno-unused-but-set-parameter -Wduplicated-branches -Wduplicated-cond -Wlogical-op")
+    endif()
+endif (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)

 # Extern

@ -600,42 +624,8 @@ if (BUILD_OPENCS OR BUILD_OPENCS_TESTS)
    add_subdirectory (extern/osgQt)
 endif()

-if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
-    add_compile_options("/W4")
-
-    set(WARNINGS_DISABLE
-        4100 # Unreferenced formal parameter (-Wunused-parameter)
-        4127 # Conditional expression is constant
-        4996 # Function was declared deprecated
-        5054 # Deprecated operations between enumerations of different types caused by Qt headers
-        )
-
-    foreach(d ${WARNINGS_DISABLE})
-        add_compile_options("/wd${d}")
-    endforeach(d)
-
-    if(OPENMW_MSVC_WERROR)
-        add_compile_options("/WX")
-    endif()
-else ()
-    add_compile_options("-Wall" "-Wextra" "-Wundef" "-Wextra-semi" "-Wno-unused-parameter" "-pedantic" "-Wno-long-long" "-Wnon-virtual-dtor" "-Wunused")
-
-    if (CMAKE_CXX_COMPILER_ID STREQUAL Clang AND NOT APPLE)
-        if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3.6 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 3.6)
-            add_compile_options("-Wno-potentially-evaluated-expression")
-        endif ()
-    endif()
-
-    if (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
-        add_compile_options("-Wno-unused-but-set-parameter" "-Wduplicated-branches" "-Wduplicated-cond" "-Wlogical-op")
-        # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105438
-        add_compile_options("-Wno-array-bounds")
-    endif()
-endif ()
-
 if (OPENMW_CXX_FLAGS)
-    separate_arguments(OPENMW_CXX_FLAGS NATIVE_COMMAND "${OPENMW_CXX_FLAGS}")
-    add_compile_options(${OPENMW_CXX_FLAGS})
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPENMW_CXX_FLAGS}")
 endif()

 # Components
@ -725,9 +715,87 @@ if (WIN32)
            set_target_properties(openmw PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:WINDOWS")
        endif()

+        # Play a bit with the warning levels
+
+        set(WARNINGS "/W4")
+
+        set(WARNINGS_DISABLE
+            4100 # Unreferenced formal parameter (-Wunused-parameter)
+            4127 # Conditional expression is constant
+            4996 # Function was declared deprecated
+            5054 # Deprecated operations between enumerations of different types caused by Qt headers
+            )
+
+        foreach(d ${WARNINGS_DISABLE})
+            list(APPEND WARNINGS "/wd${d}")
+        endforeach(d)
+
+        if(OPENMW_MSVC_WERROR)
+            list(APPEND WARNINGS "/WX")
+        endif()
+
+        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)
+            target_compile_options(bsatool PRIVATE ${WARNINGS})
+        endif()
+
+        if (BUILD_ESMTOOL)
+            target_compile_options(esmtool PRIVATE ${WARNINGS})
+        endif()
+
+        if (BUILD_ESSIMPORTER)
+            target_compile_options(openmw-essimporter PRIVATE ${WARNINGS})
+        endif()
+
+        if (BUILD_LAUNCHER)
+            target_compile_options(openmw-launcher PRIVATE ${WARNINGS})
+        endif()
+
+        if (BUILD_MWINIIMPORTER)
+            target_compile_options(openmw-iniimporter PRIVATE ${WARNINGS})
+        endif()
+
+        if (BUILD_OPENCS)
+            target_compile_options(openmw-cs PRIVATE ${WARNINGS})
+        endif()
+
+        if (BUILD_OPENMW)
+            target_compile_options(openmw PRIVATE ${WARNINGS})
+        endif()
+
+        if (BUILD_WIZARD)
+            target_compile_options(openmw-wizard PRIVATE ${WARNINGS})
+        endif()
+
+        if (BUILD_COMPONENTS_TESTS)
+            target_compile_options(components-tests PRIVATE ${WARNINGS})
+        endif()
+
+        if (BUILD_BENCHMARKS)
+            target_compile_options(openmw_detournavigator_navmeshtilescache_benchmark PRIVATE ${WARNINGS})
+        endif()
+
+        if (BUILD_NAVMESHTOOL)
+            target_compile_options(openmw-navmeshtool PRIVATE ${WARNINGS})
+        endif()
+
+        if (BUILD_BULLETOBJECTTOOL)
+            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)

    # TODO: At some point release builds should not use the console but rather write to a log file
--- a/README.md
+++ b/README.md
@ -5,7 +5,7 @@ OpenMW is an open-source open-world RPG game engine that supports playing Morrow

 OpenMW also comes with OpenMW-CS, a replacement for Bethesda's Construction Set.

-* Version: 0.50.0
+* Version: 0.49.0
 * License: GPLv3 (see [LICENSE](https://gitlab.com/OpenMW/openmw/-/raw/master/LICENSE) for more information)
 * Website: https://www.openmw.org
 * IRC: #openmw on irc.libera.chat
--- a/apps/bsatool/bsatool.cpp
+++ b/apps/bsatool/bsatool.cpp
@ -75,8 +75,8 @@ Allowed options)");
    bpo::variables_map variables;
    try
    {
-        bpo::parsed_options validOpts = bpo::command_line_parser(argc, argv).options(all).positional(p).run();
-        bpo::store(validOpts, variables);
+        bpo::parsed_options valid_opts = bpo::command_line_parser(argc, argv).options(all).positional(p).run();
+        bpo::store(valid_opts, variables);
    }
    catch (std::exception& e)
    {
--- a/apps/bulletobjecttool/main.cpp
+++ b/apps/bulletobjecttool/main.cpp
@ -20,7 +20,7 @@
 #include <components/resource/niffilemanager.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/settings/settings.hpp>
-#include <components/toutf8/toutf8.hpp>
+#include <components/to_utf8/to_utf8.hpp>
 #include <components/version/version.hpp>
 #include <components/vfs/manager.hpp>
 #include <components/vfs/registerarchives.hpp>
@ -155,7 +155,7 @@ namespace

        VFS::Manager vfs;

-        VFS::registerArchives(&vfs, fileCollections, archives, true, &encoder.getStatelessEncoder());
+        VFS::registerArchives(&vfs, fileCollections, archives, true);

        Settings::Manager::load(config);

--- a/apps/components_tests/CMakeLists.txt
+++ b/apps/components_tests/CMakeLists.txt
@ -4,28 +4,29 @@ include_directories(SYSTEM ${GMOCK_INCLUDE_DIRS})
 file(GLOB UNITTEST_SRC_FILES
    main.cpp

-    esm/testfixedstring.cpp
-    esm/testrefid.cpp
+    esm/test_fixed_string.cpp
    esm/variant.cpp
+    esm/testrefid.cpp

-    lua/testasync.cpp
-    lua/testconfiguration.cpp
-    lua/testinputactions.cpp
-    lua/testl10n.cpp
-    lua/testlua.cpp
-    lua/testscriptscontainer.cpp
-    lua/testserialization.cpp
-    lua/teststorage.cpp
-    lua/testuicontent.cpp
-    lua/testutilpackage.cpp
-    lua/testyaml.cpp
+    lua/test_lua.cpp
+    lua/test_scriptscontainer.cpp
+    lua/test_utilpackage.cpp
+    lua/test_serialization.cpp
+    lua/test_configuration.cpp
+    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/compression.cpp
    misc/progressreporter.cpp
-    misc/testendianness.cpp
+    misc/test_endianness.cpp
+    misc/test_resourcehelpers.cpp
+    misc/test_stringops.cpp
    misc/testmathutil.cpp
-    misc/testresourcehelpers.cpp
-    misc/teststringops.cpp

    nifloader/testbulletnifloader.cpp

@ -63,8 +64,8 @@ file(GLOB UNITTEST_SRC_FILES
    esmloader/esmdata.cpp
    esmloader/record.cpp

-    files/conversiontests.cpp
    files/hash.cpp
+    files/conversion_tests.cpp

    toutf8/toutf8.cpp

--- a/apps/components_tests/detournavigator/navigator.cpp
+++ b/apps/components_tests/detournavigator/navigator.cpp
@ -139,7 +139,7 @@ namespace

    TEST_F(DetourNavigatorNavigatorTest, find_path_for_empty_should_return_empty)
    {
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
            Status::NavMeshNotFound);
        EXPECT_EQ(mPath, std::deque<osg::Vec3f>());
    }
@ -147,7 +147,7 @@ namespace
    TEST_F(DetourNavigatorNavigatorTest, find_path_for_existing_agent_with_no_navmesh_should_throw_exception)
    {
        ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
            Status::StartPolygonNotFound);
    }

@ -156,7 +156,7 @@ namespace
        ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
        ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
        mNavigator->removeAgent(mAgentBounds);
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
            Status::StartPolygonNotFound);
    }

@ -172,7 +172,7 @@ namespace
        updateGuard.reset();
        mNavigator->wait(WaitConditionType::requiredTilesPresent, &mListener);

-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
            Status::Success);

        EXPECT_THAT(mPath,
@ -194,7 +194,7 @@ namespace
        updateGuard.reset();
        mNavigator->wait(WaitConditionType::requiredTilesPresent, &mListener);

-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mStart, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
+        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;
@ -218,7 +218,7 @@ namespace
        mNavigator->update(mPlayerPosition, nullptr);
        mNavigator->wait(WaitConditionType::allJobsDone, &mListener);

-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
            Status::Success);

        EXPECT_THAT(mPath,
@ -237,7 +237,7 @@ namespace

        mPath.clear();
        mOut = std::back_inserter(mPath);
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
            Status::Success);

        EXPECT_THAT(mPath,
@ -265,7 +265,7 @@ namespace
        mNavigator->update(mPlayerPosition, nullptr);
        mNavigator->wait(WaitConditionType::allJobsDone, &mListener);

-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
            Status::Success);

        EXPECT_THAT(mPath,
@ -285,7 +285,7 @@ namespace

        mPath.clear();
        mOut = std::back_inserter(mPath);
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
            Status::Success);

        EXPECT_THAT(mPath,
@ -318,7 +318,7 @@ namespace
        mNavigator->update(mPlayerPosition, nullptr);
        mNavigator->wait(WaitConditionType::allJobsDone, &mListener);

-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
            Status::Success);

        EXPECT_THAT(mPath,
@ -386,7 +386,7 @@ namespace
        mNavigator->update(mPlayerPosition, nullptr);
        mNavigator->wait(WaitConditionType::allJobsDone, &mListener);

-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
            Status::Success);

        EXPECT_THAT(mPath,
@ -421,7 +421,7 @@ namespace
        mEnd.x() = 256;
        mEnd.z() = 300;

-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_swim, mAreaCosts, mEndTolerance, {}, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_swim, mAreaCosts, mEndTolerance, mOut),
            Status::Success);

        EXPECT_THAT(mPath,
@ -453,8 +453,8 @@ namespace
        mStart.x() = 256;
        mEnd.x() = 256;

-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mEndTolerance,
-                      {}, mOut),
+        EXPECT_EQ(
+            findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mEndTolerance, mOut),
            Status::Success);

        EXPECT_THAT(mPath,
@ -487,8 +487,8 @@ namespace
        mStart.x() = 256;
        mEnd.x() = 256;

-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mEndTolerance,
-                      {}, mOut),
+        EXPECT_EQ(
+            findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mEndTolerance, mOut),
            Status::Success);

        EXPECT_THAT(mPath,
@ -520,7 +520,7 @@ namespace
        mStart.x() = 256;
        mEnd.x() = 256;

-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
            Status::Success);

        EXPECT_THAT(mPath,
@ -549,7 +549,7 @@ namespace
        mNavigator->update(mPlayerPosition, nullptr);
        mNavigator->wait(WaitConditionType::allJobsDone, &mListener);

-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
            Status::Success);

        EXPECT_THAT(mPath,
@ -577,7 +577,7 @@ namespace
        mNavigator->update(mPlayerPosition, nullptr);
        mNavigator->wait(WaitConditionType::allJobsDone, &mListener);

-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
            Status::Success);

        EXPECT_THAT(mPath,
@ -658,7 +658,7 @@ namespace
        mNavigator->update(mPlayerPosition, nullptr);
        mNavigator->wait(WaitConditionType::allJobsDone, &mListener);

-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
            Status::Success);

        EXPECT_THAT(mPath,
@ -781,7 +781,7 @@ namespace
        mNavigator->update(mPlayerPosition, nullptr);
        mNavigator->wait(WaitConditionType::requiredTilesPresent, &mListener);

-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
            Status::Success);

        EXPECT_THAT(mPath,
@ -806,7 +806,7 @@ namespace
        mNavigator->update(mPlayerPosition, nullptr);
        mNavigator->wait(WaitConditionType::allJobsDone, &mListener);

-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
            Status::PartialPath);

        EXPECT_THAT(mPath,
@ -834,7 +834,7 @@ namespace

        const float endTolerance = 1000.0f;

-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, endTolerance, {}, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, endTolerance, mOut),
            Status::Success);

        EXPECT_THAT(mPath,
@ -979,146 +979,6 @@ namespace
        EXPECT_EQ(usedNavMeshTiles, 854);
    }

-    TEST_F(DetourNavigatorNavigatorTest, find_path_should_return_path_around_steep_mountains)
-    {
-        const std::array<float, 5 * 5> heightfieldData{ {
-            0, 0, 0, 0, 0, // row 0
-            0, 0, 0, 0, 0, // row 1
-            0, 0, 1000, 0, 0, // row 2
-            0, 0, 1000, 0, 0, // row 3
-            0, 0, 0, 0, 0, // row 4
-        } };
-        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
-        const int cellSize = heightfieldTileSize * static_cast<int>(surface.mSize - 1);
-
-        ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
-        mNavigator->addHeightfield(mCellPosition, cellSize, surface, nullptr);
-        mNavigator->update(mPlayerPosition, nullptr);
-        mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
-
-        const osg::Vec3f start(56, 56, 12);
-        const osg::Vec3f end(464, 464, 12);
-
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, start, end, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
-            Status::Success);
-
-        EXPECT_THAT(mPath,
-            ElementsAre( //
-                Vec3fEq(56.66664886474609375, 56.66664886474609375, 11.33333301544189453125),
-                Vec3fEq(396.666656494140625, 79.33331298828125, 11.33333301544189453125),
-                Vec3fEq(430.666656494140625, 113.33331298828125, 11.33333301544189453125),
-                Vec3fEq(463.999969482421875, 463.999969482421875, 11.33333301544189453125)))
-            << mPath;
-    }
-
-    TEST_F(DetourNavigatorNavigatorTest, find_path_should_return_path_around_steep_cliffs)
-    {
-        const std::array<float, 5 * 5> heightfieldData{ {
-            0, 0, 0, 0, 0, // row 0
-            0, 0, 0, 0, 0, // row 1
-            0, 0, -1000, 0, 0, // row 2
-            0, 0, -1000, 0, 0, // row 3
-            0, 0, 0, 0, 0, // row 4
-        } };
-        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
-        const int cellSize = heightfieldTileSize * static_cast<int>(surface.mSize - 1);
-
-        ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
-        mNavigator->addHeightfield(mCellPosition, cellSize, surface, nullptr);
-        mNavigator->update(mPlayerPosition, nullptr);
-        mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
-
-        const osg::Vec3f start(56, 56, 12);
-        const osg::Vec3f end(464, 464, 12);
-
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, start, end, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
-            Status::Success);
-
-        EXPECT_THAT(mPath,
-            ElementsAre( //
-                Vec3fEq(56.66664886474609375, 56.66664886474609375, 8.66659259796142578125),
-                Vec3fEq(385.33331298828125, 79.33331298828125, 8.66659259796142578125),
-                Vec3fEq(430.666656494140625, 124.66664886474609375, 8.66659259796142578125),
-                Vec3fEq(463.999969482421875, 463.999969482421875, 8.66659259796142578125)))
-            << mPath;
-    }
-
-    TEST_F(DetourNavigatorNavigatorTest, find_path_should_return_path_with_checkpoints)
-    {
-        const std::array<float, 5 * 5> heightfieldData{ {
-            0, 0, 0, 0, 0, // row 0
-            0, 0, 0, 0, 0, // row 1
-            0, 0, 1000, 0, 0, // row 2
-            0, 0, 1000, 0, 0, // row 3
-            0, 0, 0, 0, 0, // row 4
-        } };
-        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
-        const int cellSize = heightfieldTileSize * static_cast<int>(surface.mSize - 1);
-
-        ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
-        mNavigator->addHeightfield(mCellPosition, cellSize, surface, nullptr);
-        mNavigator->update(mPlayerPosition, nullptr);
-        mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
-
-        const std::vector<osg::Vec3f> checkpoints = {
-            osg::Vec3f(400, 70, 12),
-        };
-
-        const osg::Vec3f start(56, 56, 12);
-        const osg::Vec3f end(464, 464, 12);
-
-        EXPECT_EQ(
-            findPath(*mNavigator, mAgentBounds, start, end, Flag_walk, mAreaCosts, mEndTolerance, checkpoints, mOut),
-            Status::Success);
-
-        EXPECT_THAT(mPath,
-            ElementsAre( //
-                Vec3fEq(56.66664886474609375, 56.66664886474609375, 11.33333301544189453125),
-                Vec3fEq(400, 70, 11.33333301544189453125),
-                Vec3fEq(430.666656494140625, 113.33331298828125, 11.33333301544189453125),
-                Vec3fEq(463.999969482421875, 463.999969482421875, 11.33333301544189453125)))
-            << mPath;
-    }
-
-    TEST_F(DetourNavigatorNavigatorTest, find_path_should_skip_unreachable_checkpoints)
-    {
-        const std::array<float, 5 * 5> heightfieldData{ {
-            0, 0, 0, 0, 0, // row 0
-            0, 0, 0, 0, 0, // row 1
-            0, 0, 1000, 0, 0, // row 2
-            0, 0, 1000, 0, 0, // row 3
-            0, 0, 0, 0, 0, // row 4
-        } };
-        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
-        const int cellSize = heightfieldTileSize * static_cast<int>(surface.mSize - 1);
-
-        ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
-        mNavigator->addHeightfield(mCellPosition, cellSize, surface, nullptr);
-        mNavigator->update(mPlayerPosition, nullptr);
-        mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
-
-        const std::vector<osg::Vec3f> checkpoints = {
-            osg::Vec3f(400, 70, 10000),
-            osg::Vec3f(256, 256, 1000),
-            osg::Vec3f(-1000, -1000, 0),
-        };
-
-        const osg::Vec3f start(56, 56, 12);
-        const osg::Vec3f end(464, 464, 12);
-
-        EXPECT_EQ(
-            findPath(*mNavigator, mAgentBounds, start, end, Flag_walk, mAreaCosts, mEndTolerance, checkpoints, mOut),
-            Status::Success);
-
-        EXPECT_THAT(mPath,
-            ElementsAre( //
-                Vec3fEq(56.66664886474609375, 56.66664886474609375, 11.33333301544189453125),
-                Vec3fEq(396.666656494140625, 79.33331298828125, 11.33333301544189453125),
-                Vec3fEq(430.666656494140625, 113.33331298828125, 11.33333301544189453125),
-                Vec3fEq(463.999969482421875, 463.999969482421875, 11.33333301544189453125)))
-            << mPath;
-    }
-
    struct DetourNavigatorNavigatorNotSupportedAgentBoundsTest : TestWithParam<AgentBounds>
    {
    };
--- a/apps/components_tests/esm/test_fixed_string.cpp
+++ b/apps/components_tests/esm/test_fixed_string.cpp
--- a/apps/components_tests/esm3/testsaveload.cpp
+++ b/apps/components_tests/esm3/testsaveload.cpp
@ -723,7 +723,7 @@ namespace ESM
        TEST_P(Esm3SaveLoadRecordTest, landShouldNotChange)
        {
            LandRecordData data;
-            std::iota(data.mHeights.begin(), data.mHeights.end(), 1.0f);
+            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());
--- a/apps/components_tests/esmloader/load.cpp
+++ b/apps/components_tests/esmloader/load.cpp
@ -10,7 +10,7 @@
 #include <components/esmloader/load.hpp>
 #include <components/files/collections.hpp>
 #include <components/files/multidircollection.hpp>
-#include <components/toutf8/toutf8.hpp>
+#include <components/to_utf8/to_utf8.hpp>

 #include <gtest/gtest.h>

--- a/apps/components_tests/files/conversion_tests.cpp
+++ b/apps/components_tests/files/conversion_tests.cpp
--- a/apps/components_tests/fx/lexer.cpp
+++ b/apps/components_tests/fx/lexer.cpp
@ -5,7 +5,7 @@
 namespace
 {
    using namespace testing;
-    using namespace Fx::Lexer;
+    using namespace fx::Lexer;

    struct LexerTest : Test
    {
--- a/apps/components_tests/fx/technique.cpp
+++ b/apps/components_tests/fx/technique.cpp
@ -91,7 +91,7 @@ namespace
 )" };

    using namespace testing;
-    using namespace Fx;
+    using namespace fx;

    struct TechniqueTest : Test
    {
@ -113,8 +113,7 @@ namespace

        void compile(const std::string& name)
        {
-            mTechnique = std::make_unique<Technique>(
-                *mVFS.get(), mImageManager, Technique::makeFileName(name), name, 1, 1, true, true);
+            mTechnique = std::make_unique<Technique>(*mVFS.get(), mImageManager, name, 1, 1, true, true);
            mTechnique->compile();
        }
    };
--- a/apps/components_tests/lua/test_async.cpp
+++ b/apps/components_tests/lua/test_async.cpp
--- a/apps/components_tests/lua/test_configuration.cpp
+++ b/apps/components_tests/lua/test_configuration.cpp
--- a/apps/components_tests/lua/test_inputactions.cpp
+++ b/apps/components_tests/lua/test_inputactions.cpp
--- a/apps/components_tests/lua/test_l10n.cpp
+++ b/apps/components_tests/lua/test_l10n.cpp
@ -24,8 +24,6 @@ namespace
    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");
-    constexpr VFS::Path::NormalizedView test4RuPath("l10n/test4/ru.yaml");
-    constexpr VFS::Path::NormalizedView test4EnPath("l10n/test4/en.yaml");

    VFSTestFile invalidScript("not a script");
    VFSTestFile incorrectScript(
@ -71,16 +69,6 @@ currency: "You have {money, number, currency}"
    VFSTestFile test2En(R"X(
 good_morning: "Morning!"
 you_have_arrows: "Arrows count: {count}"
-)X");
-
-    VFSTestFile test4Ru(R"X(
-skill_increase: "Ваш навык {навык} увеличился до {value}"
-acrobatics: "Акробатика"
-)X");
-
-    VFSTestFile test4En(R"X(
-stat_increase: "Your {stat} has increased to {value}"
-speed: "Speed"
 )X");

    struct LuaL10nTest : Test
@ -92,8 +80,6 @@ speed: "Speed"
            { test2EnPath, &test2En },
            { test3EnPath, &test1En },
            { test3DePath, &test1De },
-            { test4RuPath, &test4Ru },
-            { test4EnPath, &test4En },
        });

        LuaUtil::ScriptsConfiguration mCfg;
@ -105,7 +91,7 @@ speed: "Speed"
        lua.protectedCall([&](LuaUtil::LuaView& view) {
            sol::state_view& l = view.sol();
            internal::CaptureStdout();
-            L10n::Manager l10nManager(mVFS.get());
+            l10n::Manager l10nManager(mVFS.get());
            l10nManager.setPreferredLocales({ "de", "en" });
            EXPECT_THAT(internal::GetCapturedStdout(), "Preferred locales: gmst de en\n");

@ -183,18 +169,6 @@ speed: "Speed"
            l.safe_script("t3 = l10n('Test3', 'de')");
            l10nManager.setPreferredLocales({ "en" });
            EXPECT_EQ(get<std::string>(l, "t3('Hello {name}!', {name='World'})"), "Hallo World!");
-
-            // Test that formatting arguments use a correct encoding
-            l.safe_script("t4 = l10n('Test4', 'ru')");
-            l10nManager.setPreferredLocales({ "ru", "en" });
-            EXPECT_EQ(get<std::string>(l, "t4('skill_increase', {навык='Акробатика', value=100})"),
-                "Ваш навык Акробатика увеличился до 100");
-            EXPECT_EQ(get<std::string>(l, "t4('skill_increase', {навык=t4('acrobatics'), value=100})"),
-                "Ваш навык Акробатика увеличился до 100");
-            EXPECT_EQ(get<std::string>(l, "t4('stat_increase', {stat='Speed', value=100})"),
-                "Your Speed has increased to 100");
-            EXPECT_EQ(get<std::string>(l, "t4('stat_increase', {stat=t4('speed'), value=100})"),
-                "Your Speed has increased to 100");
        });
    }
 }
--- a/apps/components_tests/lua/test_lua.cpp
+++ b/apps/components_tests/lua/test_lua.cpp
--- a/apps/components_tests/lua/test_scriptscontainer.cpp
+++ b/apps/components_tests/lua/test_scriptscontainer.cpp
@ -285,17 +285,17 @@ CUSTOM: customdata.lua
        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));
+        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();
-            scripts.receiveEvent("SomeEvent", x1);
+            scripts.receiveEvent("SomeEvent", X1);
            EXPECT_EQ(internal::GetCapturedStdout(), "");
        }
        {
            testing::internal::CaptureStdout();
-            scripts.receiveEvent("Event1", x1);
+            scripts.receiveEvent("Event1", X1);
            EXPECT_EQ(internal::GetCapturedStdout(),
                "Test[test2.lua]:\t event1 1.5\n"
                "Test[stopevent.lua]:\t event1 1.5\n"
@ -303,21 +303,21 @@ CUSTOM: customdata.lua
        }
        {
            testing::internal::CaptureStdout();
-            scripts.receiveEvent("Event2", x1);
+            scripts.receiveEvent("Event2", X1);
            EXPECT_EQ(internal::GetCapturedStdout(),
                "Test[test2.lua]:\t event2 1.5\n"
                "Test[test1.lua]:\t event2 1.5\n");
        }
        {
            testing::internal::CaptureStdout();
-            scripts.receiveEvent("Event1", x0);
+            scripts.receiveEvent("Event1", X0);
            EXPECT_EQ(internal::GetCapturedStdout(),
                "Test[test2.lua]:\t event1 0.5\n"
                "Test[stopevent.lua]:\t event1 0.5\n");
        }
        {
            testing::internal::CaptureStdout();
-            scripts.receiveEvent("Event2", x0);
+            scripts.receiveEvent("Event2", X0);
            EXPECT_EQ(internal::GetCapturedStdout(),
                "Test[test2.lua]:\t event2 0.5\n"
                "Test[test1.lua]:\t event2 0.5\n");
@ -333,12 +333,12 @@ CUSTOM: customdata.lua
        EXPECT_TRUE(scripts.addCustomScript(getId(test2Path)));

        sol::state_view sol = mLua.unsafeState();
-        std::string x = LuaUtil::serialize(sol.create_table_with("x", 0.5));
+        std::string X = LuaUtil::serialize(sol.create_table_with("x", 0.5));

        {
            testing::internal::CaptureStdout();
            scripts.update(1.5f);
-            scripts.receiveEvent("Event1", x);
+            scripts.receiveEvent("Event1", X);
            EXPECT_EQ(internal::GetCapturedStdout(),
                "Test[test1.lua]:\t update 1.5\n"
                "Test[test2.lua]:\t update 1.5\n"
@ -352,7 +352,7 @@ CUSTOM: customdata.lua
            scripts.removeScript(stopEventScriptId);
            EXPECT_FALSE(scripts.hasScript(stopEventScriptId));
            scripts.update(1.5f);
-            scripts.receiveEvent("Event1", x);
+            scripts.receiveEvent("Event1", X);
            EXPECT_EQ(internal::GetCapturedStdout(),
                "Test[test1.lua]:\t update 1.5\n"
                "Test[test2.lua]:\t update 1.5\n"
@ -363,7 +363,7 @@ CUSTOM: customdata.lua
            testing::internal::CaptureStdout();
            scripts.removeScript(getId(test1Path));
            scripts.update(1.5f);
-            scripts.receiveEvent("Event1", x);
+            scripts.receiveEvent("Event1", X);
            EXPECT_EQ(internal::GetCapturedStdout(),
                "Test[test2.lua]:\t update 1.5\n"
                "Test[test2.lua]:\t event1 0.5\n");
@ -638,9 +638,8 @@ CUSTOM: customdata.lua
            sol::object deserialized = LuaUtil::deserialize(lua.sol(), data2.mScripts[0].mData, &serializer1);
            EXPECT_TRUE(deserialized.is<sol::table>());
            sol::table table = deserialized;
-            if (!table.empty())
+            for (const auto& [key, value] : table)
            {
-                const auto [key, value] = *table.cbegin();
                EXPECT_TRUE(key.is<ESM::RefNum>());
                EXPECT_TRUE(value.is<ESM::RefNum>());
                EXPECT_EQ(key.as<ESM::RefNum>(), (ESM::RefNum{ 42, 34 }));
--- a/apps/components_tests/lua/test_serialization.cpp
+++ b/apps/components_tests/lua/test_serialization.cpp
@ -171,10 +171,10 @@ namespace

        std::string serialized = LuaUtil::serialize(table);
        EXPECT_EQ(serialized.size(), 139);
-        sol::table resTable = LuaUtil::deserialize(lua, serialized);
-        sol::table resReadonlyTable = LuaUtil::deserialize(lua, serialized, nullptr, true);
+        sol::table res_table = LuaUtil::deserialize(lua, serialized);
+        sol::table res_readonly_table = LuaUtil::deserialize(lua, serialized, nullptr, true);

-        for (auto t : { resTable, resReadonlyTable })
+        for (auto t : { res_table, res_readonly_table })
        {
            EXPECT_EQ(t.get<int>("aa"), 1);
            EXPECT_EQ(t.get<bool>("ab"), true);
@ -185,8 +185,8 @@ namespace
            EXPECT_EQ(t.get<osg::Vec2f>(2), osg::Vec2f(2, 1));
        }

-        lua["t"] = resTable;
-        lua["ro_t"] = resReadonlyTable;
+        lua["t"] = res_table;
+        lua["ro_t"] = res_readonly_table;
        EXPECT_NO_THROW(lua.safe_script("t.x = 5"));
        EXPECT_NO_THROW(lua.safe_script("t.nested.x = 5"));
        EXPECT_ERROR(lua.safe_script("ro_t.x = 5"), "userdata value");
--- a/apps/components_tests/lua/test_storage.cpp
+++ b/apps/components_tests/lua/test_storage.cpp
--- a/apps/components_tests/lua/test_ui_content.cpp
+++ b/apps/components_tests/lua/test_ui_content.cpp
--- a/apps/components_tests/lua/test_utilpackage.cpp
+++ b/apps/components_tests/lua/test_utilpackage.cpp
@ -9,33 +9,22 @@ namespace
 {
    using namespace testing;

-    struct LuaUtilPackageTest : Test
-    {
-        LuaUtil::LuaState mLuaState{ nullptr, nullptr };
-
-        LuaUtilPackageTest()
-        {
-            mLuaState.addInternalLibSearchPath(
-                std::filesystem::path{ OPENMW_PROJECT_SOURCE_DIR } / "components" / "lua");
-            sol::state_view sol = mLuaState.unsafeState();
-            sol["util"] = LuaUtil::initUtilPackage(sol);
-        }
-    };
-
    template <typename T>
-    T get(sol::state_view& lua, const std::string& luaCode)
+    T get(sol::state& lua, const std::string& luaCode)
    {
        return lua.safe_script("return " + luaCode).get<T>();
    }

-    std::string getAsString(sol::state_view& lua, std::string luaCode)
+    std::string getAsString(sol::state& lua, std::string luaCode)
    {
        return LuaUtil::toString(lua.safe_script("return " + luaCode));
    }

-    TEST_F(LuaUtilPackageTest, Vector2)
+    TEST(LuaUtilPackageTest, Vector2)
    {
-        sol::state_view lua = mLuaState.unsafeState();
+        sol::state lua;
+        lua.open_libraries(sol::lib::base, sol::lib::math, sol::lib::string);
+        lua["util"] = LuaUtil::initUtilPackage(lua);
        lua.safe_script("v = util.vector2(3, 4)");
        EXPECT_FLOAT_EQ(get<float>(lua, "v.x"), 3);
        EXPECT_FLOAT_EQ(get<float>(lua, "v.y"), 4);
@ -66,9 +55,11 @@ namespace
        EXPECT_TRUE(get<bool>(lua, "swizzle['01'] == util.vector2(0, 1) and swizzle['0y'] == util.vector2(0, 2)"));
    }

-    TEST_F(LuaUtilPackageTest, Vector3)
+    TEST(LuaUtilPackageTest, Vector3)
    {
-        sol::state_view lua = mLuaState.unsafeState();
+        sol::state lua;
+        lua.open_libraries(sol::lib::base, sol::lib::math, sol::lib::string);
+        lua["util"] = LuaUtil::initUtilPackage(lua);
        lua.safe_script("v = util.vector3(5, 12, 13)");
        EXPECT_FLOAT_EQ(get<float>(lua, "v.x"), 5);
        EXPECT_FLOAT_EQ(get<float>(lua, "v.y"), 12);
@ -103,9 +94,11 @@ namespace
            get<bool>(lua, "swizzle['001'] == util.vector3(0, 0, 1) and swizzle['0yx'] == util.vector3(0, 2, 1)"));
    }

-    TEST_F(LuaUtilPackageTest, Vector4)
+    TEST(LuaUtilPackageTest, Vector4)
    {
-        sol::state_view lua = mLuaState.unsafeState();
+        sol::state lua;
+        lua.open_libraries(sol::lib::base, sol::lib::math, sol::lib::string);
+        lua["util"] = LuaUtil::initUtilPackage(lua);
        lua.safe_script("v = util.vector4(5, 12, 13, 15)");
        EXPECT_FLOAT_EQ(get<float>(lua, "v.x"), 5);
        EXPECT_FLOAT_EQ(get<float>(lua, "v.y"), 12);
@ -143,9 +136,11 @@ namespace
            lua, "swizzle['0001'] == util.vector4(0, 0, 0, 1) and swizzle['0yx1'] == util.vector4(0, 2, 1, 1)"));
    }

-    TEST_F(LuaUtilPackageTest, Color)
+    TEST(LuaUtilPackageTest, Color)
    {
-        sol::state_view lua = mLuaState.unsafeState();
+        sol::state lua;
+        lua.open_libraries(sol::lib::base, sol::lib::math, sol::lib::string);
+        lua["util"] = LuaUtil::initUtilPackage(lua);
        lua.safe_script("brown = util.color.rgba(0.75, 0.25, 0, 1)");
        EXPECT_EQ(get<std::string>(lua, "tostring(brown)"), "(0.75, 0.25, 0, 1)");
        lua.safe_script("blue = util.color.rgb(0, 1, 0, 1)");
@ -160,9 +155,11 @@ namespace
        EXPECT_TRUE(get<bool>(lua, "red:asRgb() == util.vector3(1, 0, 0)"));
    }

-    TEST_F(LuaUtilPackageTest, Transform)
+    TEST(LuaUtilPackageTest, Transform)
    {
-        sol::state_view lua = mLuaState.unsafeState();
+        sol::state lua;
+        lua.open_libraries(sol::lib::base, sol::lib::math, sol::lib::string);
+        lua["util"] = LuaUtil::initUtilPackage(lua);
        lua["T"] = lua["util"]["transform"];
        lua["v"] = lua["util"]["vector3"];
        EXPECT_ERROR(lua.safe_script("T.identity = nil"), "attempt to index");
@ -194,9 +191,11 @@ namespace
        EXPECT_LT(get<float>(lua, "(rz_move_rx:inverse() * v(0, 1, 2) - v(1, 2, 3)):length()"), 1e-6);
    }

-    TEST_F(LuaUtilPackageTest, UtilityFunctions)
+    TEST(LuaUtilPackageTest, UtilityFunctions)
    {
-        sol::state_view lua = mLuaState.unsafeState();
+        sol::state lua;
+        lua.open_libraries(sol::lib::base, sol::lib::math, sol::lib::string);
+        lua["util"] = LuaUtil::initUtilPackage(lua);
        lua.safe_script("v = util.vector2(1, 0):rotate(math.rad(120))");
        EXPECT_FLOAT_EQ(get<float>(lua, "v.x"), -0.5f);
        EXPECT_FLOAT_EQ(get<float>(lua, "v.y"), 0.86602539f);
@ -204,10 +203,6 @@ namespace
        EXPECT_FLOAT_EQ(get<float>(lua, "util.clamp(0.1, 0, 1.5)"), 0.1f);
        EXPECT_FLOAT_EQ(get<float>(lua, "util.clamp(-0.1, 0, 1.5)"), 0);
        EXPECT_FLOAT_EQ(get<float>(lua, "util.clamp(2.1, 0, 1.5)"), 1.5f);
-        EXPECT_FLOAT_EQ(get<float>(lua, "util.round(2.1)"), 2.0f);
-        EXPECT_FLOAT_EQ(get<float>(lua, "util.round(-2.1)"), -2.0f);
-        EXPECT_FLOAT_EQ(get<float>(lua, "util.remap(5, 0, 10, 0, 100)"), 50.0f);
-        EXPECT_FLOAT_EQ(get<float>(lua, "util.remap(-5, 0, 10, 0, 100)"), -50.0f);
        lua.safe_script("t = util.makeReadOnly({x = 1})");
        EXPECT_FLOAT_EQ(get<float>(lua, "t.x"), 1);
        EXPECT_ERROR(lua.safe_script("t.y = 2"), "userdata value");
--- a/apps/components_tests/lua/test_yaml.cpp
+++ b/apps/components_tests/lua/test_yaml.cpp
--- a/apps/components_tests/misc/test_endianness.cpp
+++ b/apps/components_tests/misc/test_endianness.cpp
--- a/apps/components_tests/misc/test_resourcehelpers.cpp
+++ b/apps/components_tests/misc/test_resourcehelpers.cpp
@ -26,15 +26,6 @@ namespace
        std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({});
        constexpr VFS::Path::NormalizedView path("sound/foo.wav");
        EXPECT_EQ(correctSoundPath(path, *mVFS), "sound/foo.mp3");
-
-        auto correctESM4SoundPath = [](auto path, auto* vfs) {
-            return Misc::ResourceHelpers::correctResourcePath({ { "sound" } }, path, vfs, ".mp3");
-        };
-
-        EXPECT_EQ(correctESM4SoundPath("foo.WAV", mVFS.get()), "sound\\foo.mp3");
-        EXPECT_EQ(correctESM4SoundPath("SOUND/foo.WAV", mVFS.get()), "sound\\foo.mp3");
-        EXPECT_EQ(correctESM4SoundPath("DATA\\SOUND\\foo.WAV", mVFS.get()), "sound\\foo.mp3");
-        EXPECT_EQ(correctESM4SoundPath("\\Data/Sound\\foo.WAV", mVFS.get()), "sound\\foo.mp3");
    }

    namespace
--- a/apps/components_tests/misc/test_stringops.cpp
+++ b/apps/components_tests/misc/test_stringops.cpp
--- a/apps/components_tests/toutf8/toutf8.cpp
+++ b/apps/components_tests/toutf8/toutf8.cpp
@ -1,5 +1,5 @@
 #include <components/misc/strings/conversion.hpp>
-#include <components/toutf8/toutf8.hpp>
+#include <components/to_utf8/to_utf8.hpp>

 #include <gtest/gtest.h>

--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@ -101,9 +101,9 @@ Allowed options)");

        try
        {
-            bpo::parsed_options validOpts = bpo::command_line_parser(argc, argv).options(all).positional(p).run();
+            bpo::parsed_options valid_opts = bpo::command_line_parser(argc, argv).options(all).positional(p).run();

-            bpo::store(validOpts, variables);
+            bpo::store(valid_opts, variables);
        }
        catch (std::exception& e)
        {
@ -215,6 +215,8 @@ int main(int argc, char** argv)
        std::cerr << "ERROR: " << e.what() << std::endl;
        return 1;
    }
+
+    return 0;
 }

 namespace
--- a/apps/esmtool/labels.cpp
+++ b/apps/esmtool/labels.cpp
@ -1,7 +1,5 @@
 #include "labels.hpp"

-#include <format>
-
 #include <components/esm3/dialoguecondition.hpp>
 #include <components/esm3/loadalch.hpp>
 #include <components/esm3/loadbody.hpp>
@ -18,6 +16,8 @@
 #include <components/esm3/loadspel.hpp>
 #include <components/esm3/loadweap.hpp>

+#include <components/misc/strings/format.hpp>
+
 std::string_view bodyPartLabel(int idx)
 {
    if (idx >= 0 && idx <= 26)
@ -675,7 +675,7 @@ std::string bodyPartFlags(int flags)
    int unused = (0xFFFFFFFF ^ (ESM::BodyPart::BPF_Female | ESM::BodyPart::BPF_NotPlayable));
    if (flags & unused)
        properties += "Invalid ";
-    properties += std::format("(0x{:08X})", flags);
+    properties += Misc::StringUtils::format("(0x%08X)", flags);
    return properties;
 }

@ -699,7 +699,7 @@ std::string cellFlags(int flags)
        ^ (ESM::Cell::HasWater | ESM::Cell::Interior | ESM::Cell::NoSleep | ESM::Cell::QuasiEx | 0x00000040));
    if (flags & unused)
        properties += "Invalid ";
-    properties += std::format("(0x{:08X})", flags);
+    properties += Misc::StringUtils::format("(0x%08X)", flags);
    return properties;
 }

@ -717,7 +717,7 @@ std::string containerFlags(int flags)
    int unused = (0xFFFFFFFF ^ (ESM::Container::Unknown | ESM::Container::Organic | ESM::Container::Respawn));
    if (flags & unused)
        properties += "Invalid ";
-    properties += std::format("(0x{:08X})", flags);
+    properties += Misc::StringUtils::format("(0x%08X)", flags);
    return properties;
 }

@ -747,7 +747,7 @@ std::string creatureFlags(int flags)
            | ESM::Creature::Bipedal | ESM::Creature::Respawn | ESM::Creature::Weapon | ESM::Creature::Essential));
    if (flags & unused)
        properties += "Invalid ";
-    properties += std::format("(0x{:02X})", flags);
+    properties += Misc::StringUtils::format("(0x%02X)", flags);
    return properties;
 }

@ -760,7 +760,7 @@ std::string enchantmentFlags(int flags)
        properties += "Autocalc ";
    if (flags & (0xFFFFFFFF ^ ESM::Enchantment::Autocalc))
        properties += "Invalid ";
-    properties += std::format("(0x{:08X})", flags);
+    properties += Misc::StringUtils::format("(0x%08X)", flags);
    return properties;
 }

@ -778,7 +778,7 @@ std::string landFlags(std::uint32_t flags)
    int unused = 0xFFFFFFFF ^ (ESM::Land::Flag_HeightsNormals | ESM::Land::Flag_Colors | ESM::Land::Flag_Textures);
    if (flags & unused)
        properties += "Invalid ";
-    properties += std::format("(0x{:08X})", flags);
+    properties += Misc::StringUtils::format("(0x%08X)", flags);
    return properties;
 }

@ -794,7 +794,7 @@ std::string itemListFlags(int flags)
    int unused = (0xFFFFFFFF ^ (ESM::ItemLevList::AllLevels | ESM::ItemLevList::Each));
    if (flags & unused)
        properties += "Invalid ";
-    properties += std::format("(0x{:08X})", flags);
+    properties += Misc::StringUtils::format("(0x%08X)", flags);
    return properties;
 }

@ -808,7 +808,7 @@ std::string creatureListFlags(int flags)
    int unused = (0xFFFFFFFF ^ ESM::CreatureLevList::AllLevels);
    if (flags & unused)
        properties += "Invalid ";
-    properties += std::format("(0x{:08X})", flags);
+    properties += Misc::StringUtils::format("(0x%08X)", flags);
    return properties;
 }

@ -840,7 +840,7 @@ std::string lightFlags(int flags)
            | ESM::Light::Pulse | ESM::Light::PulseSlow | ESM::Light::Negative | ESM::Light::OffDefault));
    if (flags & unused)
        properties += "Invalid ";
-    properties += std::format("(0x{:08X})", flags);
+    properties += Misc::StringUtils::format("(0x%08X)", flags);
    return properties;
 }

@ -888,7 +888,7 @@ std::string magicEffectFlags(int flags)

    if (flags & 0xFFFC0000)
        properties += "Invalid ";
-    properties += std::format("(0x{:08X})", flags);
+    properties += Misc::StringUtils::format("(0x%08X)", flags);
    return properties;
 }

@ -913,7 +913,7 @@ std::string npcFlags(int flags)
        = (0xFF ^ (ESM::NPC::Base | ESM::NPC::Autocalc | ESM::NPC::Female | ESM::NPC::Respawn | ESM::NPC::Essential));
    if (flags & unused)
        properties += "Invalid ";
-    properties += std::format("(0x{:02X})", flags);
+    properties += Misc::StringUtils::format("(0x%02X)", flags);
    return properties;
 }

@ -930,7 +930,7 @@ std::string raceFlags(int flags)
    int unused = (0xFFFFFFFF ^ (ESM::Race::Playable | ESM::Race::Beast));
    if (flags & unused)
        properties += "Invalid ";
-    properties += std::format("(0x{:08X})", flags);
+    properties += Misc::StringUtils::format("(0x%08X)", flags);
    return properties;
 }

@ -948,7 +948,7 @@ std::string spellFlags(int flags)
    int unused = (0xFFFFFFFF ^ (ESM::Spell::F_Autocalc | ESM::Spell::F_PCStart | ESM::Spell::F_Always));
    if (flags & unused)
        properties += "Invalid ";
-    properties += std::format("(0x{:08X})", flags);
+    properties += Misc::StringUtils::format("(0x%08X)", flags);
    return properties;
 }

@ -967,7 +967,7 @@ std::string weaponFlags(int flags)
    int unused = (0xFFFFFFFF ^ (ESM::Weapon::Magical | ESM::Weapon::Silver));
    if (flags & unused)
        properties += "Invalid ";
-    properties += std::format("(0x{:08X})", flags);
+    properties += Misc::StringUtils::format("(0x%08X)", flags);
    return properties;
 }

@ -987,7 +987,7 @@ std::string recordFlags(uint32_t flags)
    int unused = ~(ESM::FLAG_Deleted | ESM::FLAG_Persistent | ESM::FLAG_Ignored | ESM::FLAG_Blocked);
    if (flags & unused)
        properties += "Invalid ";
-    properties += std::format("(0x{:08X})", flags);
+    properties += Misc::StringUtils::format("(0x%08X)", flags);
    return properties;
 }

@ -1000,6 +1000,6 @@ std::string potionFlags(int flags)
        properties += "Autocalc ";
    if (flags & (0xFFFFFFFF ^ ESM::Enchantment::Autocalc))
        properties += "Invalid ";
-    properties += std::format("(0x{:08X})", flags);
+    properties += Misc::StringUtils::format("(0x%08X)", flags);
    return properties;
 }
--- a/apps/esmtool/record.cpp
+++ b/apps/esmtool/record.cpp
@ -1,7 +1,6 @@
 #include "record.hpp"
 #include "labels.hpp"

-#include <format>
 #include <iostream>
 #include <numeric>
 #include <sstream>
@ -9,13 +8,15 @@
 #include <components/esm3/cellstate.hpp>
 #include <components/esm3/esmreader.hpp>
 #include <components/misc/strings/conversion.hpp>
+#include <components/misc/strings/format.hpp>

 namespace
 {

    void printAIPackage(const ESM::AIPackage& p)
    {
-        std::cout << std::format("  AI Type: {} (0x{:08X})\n", aiTypeLabel(p.mType), std::uint32_t(p.mType));
+        std::cout << "  AI Type: " << aiTypeLabel(p.mType) << " (" << Misc::StringUtils::format("0x%08X", p.mType)
+                  << ")" << std::endl;
        if (p.mType == ESM::AI_Wander)
        {
            std::cout << "    Distance: " << p.mWander.mDistance << std::endl;
@ -50,7 +51,7 @@ namespace
        }
        else
        {
-            std::cout << std::format("    BadPackage: 0x{:08X}\n", std::uint32_t(p.mType));
+            std::cout << "    BadPackage: " << Misc::StringUtils::format("0x%08X", p.mType) << std::endl;
        }

        if (!p.mCellName.empty())
@ -59,81 +60,81 @@ namespace

    std::string ruleString(const ESM::DialogueCondition& ss)
    {
-        std::string_view typeStr = "INVALID";
-        std::string_view funcStr;
+        std::string_view type_str = "INVALID";
+        std::string_view func_str;

        switch (ss.mFunction)
        {
            case ESM::DialogueCondition::Function_Global:
-                typeStr = "Global";
-                funcStr = ss.mVariable;
+                type_str = "Global";
+                func_str = ss.mVariable;
                break;
            case ESM::DialogueCondition::Function_Local:
-                typeStr = "Local";
-                funcStr = ss.mVariable;
+                type_str = "Local";
+                func_str = ss.mVariable;
                break;
            case ESM::DialogueCondition::Function_Journal:
-                typeStr = "Journal";
-                funcStr = ss.mVariable;
+                type_str = "Journal";
+                func_str = ss.mVariable;
                break;
            case ESM::DialogueCondition::Function_Item:
-                typeStr = "Item count";
-                funcStr = ss.mVariable;
+                type_str = "Item count";
+                func_str = ss.mVariable;
                break;
            case ESM::DialogueCondition::Function_Dead:
-                typeStr = "Dead";
-                funcStr = ss.mVariable;
+                type_str = "Dead";
+                func_str = ss.mVariable;
                break;
            case ESM::DialogueCondition::Function_NotId:
-                typeStr = "Not ID";
-                funcStr = ss.mVariable;
+                type_str = "Not ID";
+                func_str = ss.mVariable;
                break;
            case ESM::DialogueCondition::Function_NotFaction:
-                typeStr = "Not Faction";
-                funcStr = ss.mVariable;
+                type_str = "Not Faction";
+                func_str = ss.mVariable;
                break;
            case ESM::DialogueCondition::Function_NotClass:
-                typeStr = "Not Class";
-                funcStr = ss.mVariable;
+                type_str = "Not Class";
+                func_str = ss.mVariable;
                break;
            case ESM::DialogueCondition::Function_NotRace:
-                typeStr = "Not Race";
-                funcStr = ss.mVariable;
+                type_str = "Not Race";
+                func_str = ss.mVariable;
                break;
            case ESM::DialogueCondition::Function_NotCell:
-                typeStr = "Not Cell";
-                funcStr = ss.mVariable;
+                type_str = "Not Cell";
+                func_str = ss.mVariable;
                break;
            case ESM::DialogueCondition::Function_NotLocal:
-                typeStr = "Not Local";
-                funcStr = ss.mVariable;
+                type_str = "Not Local";
+                func_str = ss.mVariable;
                break;
            default:
-                typeStr = "Function";
-                funcStr = ruleFunction(ss.mFunction);
+                type_str = "Function";
+                func_str = ruleFunction(ss.mFunction);
                break;
        }

-        std::string_view operStr = "??";
+        std::string_view oper_str = "??";
        switch (ss.mComparison)
        {
            case ESM::DialogueCondition::Comp_Eq:
-                operStr = "==";
+                oper_str = "==";
                break;
            case ESM::DialogueCondition::Comp_Ne:
-                operStr = "!=";
+                oper_str = "!=";
                break;
            case ESM::DialogueCondition::Comp_Gt:
-                operStr = "> ";
+                oper_str = "> ";
                break;
            case ESM::DialogueCondition::Comp_Ge:
-                operStr = ">=";
+                oper_str = ">=";
                break;
            case ESM::DialogueCondition::Comp_Ls:
-                operStr = "< ";
+                oper_str = "< ";
                break;
            case ESM::DialogueCondition::Comp_Le:
-                operStr = "<=";
+                oper_str = "<=";
                break;
            default:
                break;
@ -142,7 +143,8 @@ namespace
        std::ostringstream stream;
        std::visit([&](auto value) { stream << value; }, ss.mValue);

-        std::string result = std::format("{:<12} {:<32} {:2} {}", typeStr, funcStr, operStr, stream.str());
+        std::string result
+            = Misc::StringUtils::format("%-12s %-32s %2s %s", type_str, func_str, oper_str, stream.str());
        return result;
    }

@ -174,10 +176,12 @@ namespace
    {
        for (const ESM::Transport::Dest& dest : transport)
        {
-            std::cout << std::format("  Destination Position: ({:12.3f},{:12.3f},{:12.3f})\n", dest.mPos.pos[0],
-                dest.mPos.pos[1], dest.mPos.pos[2]);
-            std::cout << std::format("  Destination Rotation: ({:9.6f},{:9.6f},{:9.6f})\n", dest.mPos.rot[0],
-                dest.mPos.rot[1], dest.mPos.rot[2]);
+            std::cout << "  Destination Position: " << Misc::StringUtils::format("%12.3f", dest.mPos.pos[0]) << ","
+                      << Misc::StringUtils::format("%12.3f", dest.mPos.pos[1]) << ","
+                      << Misc::StringUtils::format("%12.3f", dest.mPos.pos[2]) << ")" << std::endl;
+            std::cout << "  Destination Rotation: " << Misc::StringUtils::format("%9.6f", dest.mPos.rot[0]) << ","
+                      << Misc::StringUtils::format("%9.6f", dest.mPos.rot[1]) << ","
+                      << Misc::StringUtils::format("%9.6f", dest.mPos.rot[2]) << ")" << std::endl;
            if (!dest.mCellName.empty())
                std::cout << "  Destination Cell: " << dest.mCellName << std::endl;
        }
@ -579,7 +583,7 @@ namespace EsmTool
            std::cout << "  Water Level: " << mData.mWater << std::endl;
        }
        else
-            std::cout << std::format("  Map Color: 0x{:08X}\n", mData.mMapColor);
+            std::cout << "  Map Color: " << Misc::StringUtils::format("0x%08X", mData.mMapColor) << std::endl;
        std::cout << "  RefId counter: " << mData.mRefNumCounter << std::endl;
        std::cout << "  Deleted: " << mIsDeleted << std::endl;
    }
@ -590,7 +594,7 @@ namespace EsmTool
        std::cout << "  Name: " << mData.mName << std::endl;
        std::cout << "  Description: " << mData.mDescription << std::endl;
        std::cout << "  Playable: " << mData.mData.mIsPlayable << std::endl;
-        std::cout << std::format("  AI Services: 0x{:08X}\n", mData.mData.mServices);
+        std::cout << "  AI Services: " << Misc::StringUtils::format("0x%08X", mData.mData.mServices) << std::endl;
        for (size_t i = 0; i < mData.mData.mAttribute.size(); ++i)
            std::cout << "  Attribute" << (i + 1) << ": " << attributeLabel(mData.mData.mAttribute[i]) << " ("
                      << mData.mData.mAttribute[i] << ")" << std::endl;
@ -638,7 +642,8 @@ namespace EsmTool
        std::cout << "  Flags: " << containerFlags(mData.mFlags) << std::endl;
        std::cout << "  Weight: " << mData.mWeight << std::endl;
        for (const ESM::ContItem& item : mData.mInventory.mList)
-            std::cout << std::format("  Inventory: Count: {:4d} Item: ", item.mCount) << item.mItem << std::endl;
+            std::cout << "  Inventory: Count: " << Misc::StringUtils::format("%4d", item.mCount)
+                      << " Item: " << item.mItem << std::endl;
        std::cout << "  Deleted: " << mIsDeleted << std::endl;
    }

@ -675,7 +680,8 @@ namespace EsmTool
        std::cout << "  Gold: " << mData.mData.mGold << std::endl;

        for (const ESM::ContItem& item : mData.mInventory.mList)
-            std::cout << std::format("  Inventory: Count: {:4d} Item: ", item.mCount) << item.mItem << std::endl;
+            std::cout << "  Inventory: Count: " << Misc::StringUtils::format("%4d", item.mCount)
+                      << " Item: " << item.mItem << std::endl;

        for (const auto& spell : mData.mSpells.mList)
            std::cout << "  Spell: " << spell << std::endl;
@ -687,7 +693,7 @@ 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 << std::format("    AI Services:0x{:08X}\n", mData.mAiData.mServices);
+        std::cout << "    AI Services:" << Misc::StringUtils::format("0x%08X", mData.mAiData.mServices) << std::endl;

        for (const ESM::AIPackage& package : mData.mAiPackage.mList)
            printAIPackage(package);
@ -1062,7 +1068,8 @@ namespace EsmTool
        }

        for (const ESM::ContItem& item : mData.mInventory.mList)
-            std::cout << std::format("  Inventory: Count: {:4d} Item: ", item.mCount) << item.mItem << std::endl;
+            std::cout << "  Inventory: Count: " << Misc::StringUtils::format("%4d", item.mCount)
+                      << " Item: " << item.mItem << std::endl;

        for (const auto& spell : mData.mSpells.mList)
            std::cout << "  Spell: " << spell << std::endl;
@ -1074,7 +1081,7 @@ 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 << std::format("    AI Services:0x{:08X}\n", mData.mAiData.mServices);
+        std::cout << "    AI Services:" << Misc::StringUtils::format("0x%08X", mData.mAiData.mServices) << std::endl;

        for (const ESM::AIPackage& package : mData.mAiPackage.mList)
            printAIPackage(package);
@ -1185,8 +1192,8 @@ namespace EsmTool
            std::cout << "  Variable: " << variable << std::endl;

        std::cout << "  ByteCode: ";
-        for (unsigned char byte : mData.mScriptData)
-            std::cout << std::format("{:02X}", byte);
+        for (const unsigned char& byte : mData.mScriptData)
+            std::cout << Misc::StringUtils::format("%02X", (int)(byte));
        std::cout << std::endl;

        if (mPrintPlain)
--- a/apps/esmtool/tes4.cpp
+++ b/apps/esmtool/tes4.cpp
@ -15,7 +15,7 @@
 #include <components/esm4/readerutils.hpp>
 #include <components/esm4/records.hpp>
 #include <components/esm4/typetraits.hpp>
-#include <components/toutf8/toutf8.hpp>
+#include <components/to_utf8/to_utf8.hpp>

 namespace EsmTool
 {
--- a/apps/essimporter/convertacdt.cpp
+++ b/apps/essimporter/convertacdt.cpp
@ -90,7 +90,7 @@ namespace ESSImport
            scriptedAnim.mAbsolute = true;
            // Neither loop count nor queueing seems to be supported by the ess format.
            scriptedAnim.mLoopCount = std::numeric_limits<size_t>::max();
-            state.mScriptedAnims.push_back(std::move(scriptedAnim));
+            state.mScriptedAnims.push_back(scriptedAnim);
        }
        else
            // TODO: Handle 0xFF index, which seems to be used for finished animations.
--- a/apps/essimporter/converter.cpp
+++ b/apps/essimporter/converter.cpp
@ -303,7 +303,7 @@ namespace ESSImport
            marker.mWorldY = notepos[1];
            marker.mNote = std::move(note);
            marker.mCell = cell.mId;
-            mMarkers.push_back(std::move(marker));
+            mMarkers.push_back(marker);
        }

        newcell.mRefs = std::move(cellrefs);
--- a/apps/essimporter/converter.hpp
+++ b/apps/essimporter/converter.hpp
@ -181,14 +181,14 @@ namespace ESSImport
    public:
        void read(ESM::ESMReader& esm) override
        {
-            ESM::Class classRecord;
+            ESM::Class class_;
            bool isDeleted = false;

-            classRecord.load(esm, isDeleted);
-            if (classRecord.mId == "NEWCLASSID_CHARGEN")
-                mContext->mCustomPlayerClassName = classRecord.mName;
+            class_.load(esm, isDeleted);
+            if (class_.mId == "NEWCLASSID_CHARGEN")
+                mContext->mCustomPlayerClassName = class_.mName;

-            mRecords[classRecord.mId] = classRecord;
+            mRecords[class_.mId] = class_;
        }
    };

@ -249,7 +249,7 @@ namespace ESSImport
            {
                ESM::InventoryState& invState = mContext->mPlayer.mObject.mInventory;

-                for (uint32_t i = 0; i < static_cast<uint32_t>(invState.mItems.size()); ++i)
+                for (size_t i = 0; i < invState.mItems.size(); ++i)
                {
                    // FIXME: in case of conflict (multiple items with this refID) use the already equipped one?
                    if (invState.mItems[i].mRef.mRefID == refr.mActorData.mSelectedEnchantItem)
@ -584,7 +584,7 @@ namespace ESSImport
            script.load(esm);
            ESM::GlobalScript out;
            convertSCPT(script, out);
-            mScripts.push_back(std::move(out));
+            mScripts.push_back(out);
        }
        void write(ESM::ESMWriter& esm) override
        {
--- a/apps/essimporter/importer.cpp
+++ b/apps/essimporter/importer.cpp
@ -25,7 +25,7 @@

 #include <components/misc/constants.hpp>

-#include <components/toutf8/toutf8.hpp>
+#include <components/to_utf8/to_utf8.hpp>

 #include "importercontext.hpp"

@ -136,9 +136,9 @@ namespace ESSImport
                sub.mName = esm.retSubName().toString();
                sub.mData.resize(esm.getSubSize());
                esm.getExact(sub.mData.data(), sub.mData.size());
-                rec.mSubrecords.push_back(std::move(sub));
+                rec.mSubrecords.push_back(sub);
            }
-            file.mRecords.push_back(std::move(rec));
+            file.mRecords.push_back(rec);
        }
    }

--- a/apps/essimporter/importinventory.cpp
+++ b/apps/essimporter/importinventory.cpp
@ -49,7 +49,7 @@ namespace ESSImport
            }

            if (!separateStacks)
-                mItems.push_back(std::move(item));
+                mItems.push_back(item);
        }

        // equipped items
--- a/apps/essimporter/importsplm.cpp
+++ b/apps/essimporter/importsplm.cpp
@ -38,7 +38,7 @@ namespace ESSImport
            unsigned char xnam; // sentinel
            esm.getHNT(xnam, "XNAM");

-            mActiveSpells.push_back(std::move(spell));
+            mActiveSpells.push_back(spell);
        }
    }

--- a/apps/essimporter/main.cpp
+++ b/apps/essimporter/main.cpp
@ -15,7 +15,7 @@ int main(int argc, char** argv)
    {
        bpo::options_description desc(R"(Syntax: openmw-essimporter <options> infile.ess outfile.omwsave
 Allowed options)");
-        bpo::positional_options_description positionalDesc;
+        bpo::positional_options_description p_desc;
        auto addOption = desc.add_options();
        addOption("help,h", "produce help message");
        addOption("mwsave,m", bpo::value<Files::MaybeQuotedPath>(), "morrowind .ess save file");
@ -23,13 +23,12 @@ Allowed options)");
        addOption("compare,c", "compare two .ess files");
        addOption("encoding", boost::program_options::value<std::string>()->default_value("win1252"),
            "encoding of the save file");
-        positionalDesc.add("mwsave", 1).add("output", 1);
+        p_desc.add("mwsave", 1).add("output", 1);
        Files::ConfigurationManager::addCommonOptions(desc);

        bpo::variables_map variables;

-        bpo::parsed_options parsed
-            = bpo::command_line_parser(argc, argv).options(desc).positional(positionalDesc).run();
+        bpo::parsed_options parsed = bpo::command_line_parser(argc, argv).options(desc).positional(p_desc).run();
        bpo::store(parsed, variables);

        if (variables.count("help") || !variables.count("mwsave") || !variables.count("output"))
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@ -39,6 +39,8 @@
 #include "utils/profilescombobox.hpp"
 #include "utils/textinputdialog.hpp"

+#include "ui_directorypicker.h"
+
 const char* Launcher::DataFilesPage::mDefaultContentListName = "Default";

 namespace
@ -153,7 +155,6 @@ namespace Launcher
 Launcher::DataFilesPage::DataFilesPage(const Files::ConfigurationManager& cfg, Config::GameSettings& gameSettings,
    Config::LauncherSettings& launcherSettings, MainDialog* parent)
    : QWidget(parent)
-    , mDirectoryPickerDialog(new QDialog(this))
    , mMainDialog(parent)
    , mCfgMgr(cfg)
    , mGameSettings(gameSettings)
@ -162,7 +163,6 @@ Launcher::DataFilesPage::DataFilesPage(const Files::ConfigurationManager& cfg, C
    , mReloadCellsThread(&DataFilesPage::reloadCells, this)
 {
    ui.setupUi(this);
-    mDirectoryPicker.setupUi(mDirectoryPickerDialog);
    setObjectName("DataFilesPage");
    mSelector = new ContentSelectorView::ContentSelector(ui.contentSelectorWidget, /*showOMWScripts=*/true);
    const QString encoding = mGameSettings.value("encoding", { "win1252" }).value;
@ -266,7 +266,6 @@ void Launcher::DataFilesPage::buildView()

    buildArchiveContextMenu();
    buildDataFilesContextMenu();
-    buildDirectoryPickerContextMenu();
 }

 void Launcher::DataFilesPage::slotCopySelectedItemsPaths()
@ -299,10 +298,8 @@ void Launcher::DataFilesPage::buildArchiveContextMenu()
        &DataFilesPage::slotShowArchiveContextMenu);

    mArchiveContextMenu = new QMenu(ui.archiveListWidget);
-    mArchiveContextMenu->addAction(tr("&Check Selected"), this,
-        [this]() { setCheckStateForMultiSelectedItems(ui.archiveListWidget, Qt::Checked); });
-    mArchiveContextMenu->addAction(tr("&Uncheck Selected"), this,
-        [this]() { setCheckStateForMultiSelectedItems(ui.archiveListWidget, Qt::Unchecked); });
+    mArchiveContextMenu->addAction(tr("&Check Selected"), this, SLOT(slotCheckMultiSelectedItems()));
+    mArchiveContextMenu->addAction(tr("&Uncheck Selected"), this, SLOT(slotUncheckMultiSelectedItems()));
 }

 void Launcher::DataFilesPage::buildDataFilesContextMenu()
@ -317,18 +314,6 @@ void Launcher::DataFilesPage::buildDataFilesContextMenu()
        tr("&Open Path in File Explorer"), this, &Launcher::DataFilesPage::slotOpenSelectedItemsPaths);
 }

-void Launcher::DataFilesPage::buildDirectoryPickerContextMenu()
-{
-    connect(mDirectoryPicker.dirListWidget, &QListWidget::customContextMenuRequested, this,
-        &DataFilesPage::slotShowDirectoryPickerContextMenu);
-
-    mDirectoryPickerMenu = new QMenu(mDirectoryPicker.dirListWidget);
-    mDirectoryPickerMenu->addAction(tr("&Check Selected"), this,
-        [this]() { setCheckStateForMultiSelectedItems(mDirectoryPicker.dirListWidget, Qt::Checked); });
-    mDirectoryPickerMenu->addAction(tr("&Uncheck Selected"), this,
-        [this]() { setCheckStateForMultiSelectedItems(mDirectoryPicker.dirListWidget, Qt::Unchecked); });
-}
-
 bool Launcher::DataFilesPage::loadSettings()
 {
    ui.navMeshMaxSizeSpinBox->setValue(getMaxNavMeshDbFileSizeMiB());
@ -836,22 +821,28 @@ void Launcher::DataFilesPage::addSubdirectories(bool append)
        return;
    }

-    mDirectoryPicker.dirListWidget->clear();
+    QDialog dialog;
+    Ui::SelectSubdirs select;
+
+    select.setupUi(&dialog);

    for (const auto& dir : subdirs)
    {
        if (!ui.directoryListWidget->findItems(dir, Qt::MatchFixedString).isEmpty())
            continue;
-        QListWidgetItem* newDir = new QListWidgetItem(dir, mDirectoryPicker.dirListWidget);
-        newDir->setCheckState(Qt::Unchecked);
+        const auto lastRow = select.dirListWidget->count();
+        select.dirListWidget->addItem(dir);
+        select.dirListWidget->item(lastRow)->setCheckState(Qt::Unchecked);
    }

-    if (mDirectoryPickerDialog->exec() == QDialog::Rejected)
+    dialog.show();
+
+    if (dialog.exec() == QDialog::Rejected)
        return;

-    for (int i = 0; i < mDirectoryPicker.dirListWidget->count(); ++i)
+    for (int i = 0; i < select.dirListWidget->count(); ++i)
    {
-        const auto* dir = mDirectoryPicker.dirListWidget->item(i);
+        const auto* dir = select.dirListWidget->item(i);
        if (dir->checkState() == Qt::Checked)
        {
            ui.directoryListWidget->insertItem(selectedRow, dir->text());
@ -902,35 +893,38 @@ void Launcher::DataFilesPage::removeDirectory()
    refreshDataFilesView();
 }

-void Launcher::DataFilesPage::showContextMenu(QMenu* menu, QListWidget* list, const QPoint& pos)
-{
-    QPoint globalPos = list->viewport()->mapToGlobal(pos);
-    menu->exec(globalPos);
-}
-
 void Launcher::DataFilesPage::slotShowArchiveContextMenu(const QPoint& pos)
 {
-    showContextMenu(mArchiveContextMenu, ui.archiveListWidget, pos);
+    QPoint globalPos = ui.archiveListWidget->viewport()->mapToGlobal(pos);
+    mArchiveContextMenu->exec(globalPos);
 }

 void Launcher::DataFilesPage::slotShowDataFilesContextMenu(const QPoint& pos)
 {
-    showContextMenu(mDataFilesContextMenu, ui.directoryListWidget, pos);
+    QPoint globalPos = ui.directoryListWidget->viewport()->mapToGlobal(pos);
+    mDataFilesContextMenu->exec(globalPos);
 }

-void Launcher::DataFilesPage::slotShowDirectoryPickerContextMenu(const QPoint& pos)
+void Launcher::DataFilesPage::setCheckStateForMultiSelectedItems(bool checked)
 {
-    showContextMenu(mDirectoryPickerMenu, mDirectoryPicker.dirListWidget, pos);
-}
+    Qt::CheckState checkState = checked ? Qt::Checked : Qt::Unchecked;

-void Launcher::DataFilesPage::setCheckStateForMultiSelectedItems(QListWidget* list, Qt::CheckState checkState)
-{
-    for (QListWidgetItem* selectedItem : list->selectedItems())
+    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);
--- a/apps/launcher/datafilespage.hpp
+++ b/apps/launcher/datafilespage.hpp
@ -2,7 +2,6 @@
 #define DATAFILESPAGE_H

 #include "ui_datafilespage.h"
-#include "ui_directorypicker.h"

 #include <components/process/processinvoker.hpp>

@ -47,11 +46,8 @@ namespace Launcher

        ContentSelectorView::ContentSelector* mSelector;
        Ui::DataFilesPage ui;
-        QDialog* mDirectoryPickerDialog;
-        Ui::SelectSubdirs mDirectoryPicker;
        QMenu* mArchiveContextMenu;
        QMenu* mDataFilesContextMenu;
-        QMenu* mDirectoryPickerMenu;

    public:
        explicit DataFilesPage(const Files::ConfigurationManager& cfg, Config::GameSettings& gameSettings,
@ -91,7 +87,8 @@ namespace Launcher

        void slotShowArchiveContextMenu(const QPoint& pos);
        void slotShowDataFilesContextMenu(const QPoint& pos);
-        void slotShowDirectoryPickerContextMenu(const QPoint& pos);
+        void slotCheckMultiSelectedItems();
+        void slotUncheckMultiSelectedItems();

        void on_newProfileAction_triggered();
        void on_cloneProfileAction_triggered();
@ -148,9 +145,7 @@ namespace Launcher
        void buildView();
        void buildArchiveContextMenu();
        void buildDataFilesContextMenu();
-        void buildDirectoryPickerContextMenu();
-        void showContextMenu(QMenu* menu, QListWidget* list, const QPoint& pos);
-        void setCheckStateForMultiSelectedItems(QListWidget* list, Qt::CheckState checkState);
+        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);
--- a/apps/launcher/graphicspage.cpp
+++ b/apps/launcher/graphicspage.cpp
@ -242,36 +242,11 @@ void Launcher::GraphicsPage::handleWindowModeChange(Settings::WindowMode mode)
 {
    if (mode == Settings::WindowMode::Fullscreen || mode == Settings::WindowMode::WindowedFullscreen)
    {
-        QString customSizeMessage = tr("Custom window size is available only in Windowed mode.");
-        QString windowBorderMessage = tr("Window border is available only in Windowed mode.");
-
        standardRadioButton->toggle();
        customRadioButton->setEnabled(false);
        customWidthSpinBox->setEnabled(false);
        customHeightSpinBox->setEnabled(false);
        windowBorderCheckBox->setEnabled(false);
-        windowBorderCheckBox->setToolTip(windowBorderMessage);
-        customWidthSpinBox->setToolTip(customSizeMessage);
-        customHeightSpinBox->setToolTip(customSizeMessage);
-        customRadioButton->setToolTip(customSizeMessage);
-    }
-
-    if (mode == Settings::WindowMode::Fullscreen)
-    {
-        resolutionComboBox->setEnabled(true);
-        resolutionComboBox->setToolTip("");
-        standardRadioButton->setToolTip("");
-    }
-    else if (mode == Settings::WindowMode::WindowedFullscreen)
-    {
-        QString fullScreenMessage = tr("Windowed Fullscreen mode always uses the native display resolution.");
-
-        resolutionComboBox->setEnabled(false);
-        resolutionComboBox->setToolTip(fullScreenMessage);
-        standardRadioButton->setToolTip(fullScreenMessage);
-
-        // Assume that a first item is a native screen resolution
-        resolutionComboBox->setCurrentIndex(0);
    }
    else
    {
@ -279,13 +254,6 @@ void Launcher::GraphicsPage::handleWindowModeChange(Settings::WindowMode mode)
        customWidthSpinBox->setEnabled(true);
        customHeightSpinBox->setEnabled(true);
        windowBorderCheckBox->setEnabled(true);
-        resolutionComboBox->setEnabled(true);
-        resolutionComboBox->setToolTip("");
-        standardRadioButton->setToolTip("");
-        windowBorderCheckBox->setToolTip("");
-        customWidthSpinBox->setToolTip("");
-        customHeightSpinBox->setToolTip("");
-        customRadioButton->setToolTip("");
    }
 }

--- a/apps/launcher/importpage.cpp
+++ b/apps/launcher/importpage.cpp
@ -88,7 +88,11 @@ void Launcher::ImportPage::on_importerButton_clicked()
    // Create the file if it doesn't already exist, else the importer will fail
    auto path = mCfgMgr.getUserConfigPath();
    path /= "openmw.cfg";
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
    QFile file(path);
+#else
+    QFile file(Files::pathToQString(path));
+#endif

    if (!file.exists())
    {
--- a/apps/launcher/main.cpp
+++ b/apps/launcher/main.cpp
@ -42,7 +42,7 @@ int runLauncher(int argc, char* argv[])
            resourcesPath = Files::pathToQString(variables["resources"].as<Files::MaybeQuotedPath>().u8string());
        }

-        L10n::installQtTranslations(app, "launcher", resourcesPath);
+        l10n::installQtTranslations(app, "launcher", resourcesPath);

        Launcher::MainDialog mainWin(configurationManager);

--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@ -497,7 +497,11 @@ bool Launcher::MainDialog::writeSettings()
    }

    // Game settings
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
    QFile file(userPath / Files::openmwCfgFile);
+#else
+    QFile file(Files::getUserConfigPathQString(mCfgMgr));
+#endif

    if (!file.open(QIODevice::ReadWrite | QIODevice::Text))
    {
--- a/apps/launcher/settingspage.cpp
+++ b/apps/launcher/settingspage.cpp
@ -163,6 +163,8 @@ bool Launcher::SettingsPage::loadSettings()
        loadSettingInt(Settings::physics().mAsyncNumThreads, *physicsThreadsSpinBox);
        loadSettingBool(
            Settings::game().mAllowActorsToFollowOverWaterSurface, *allowNPCToFollowOverWaterSurfaceCheckBox);
+        loadSettingBool(
+            Settings::game().mUnarmedCreatureAttacksDamageArmor, *unarmedCreatureAttacksDamageArmorCheckBox);
        loadSettingInt(Settings::game().mActorCollisionShapeType, *actorCollisonShapeTypeComboBox);
    }

@ -291,7 +293,6 @@ bool Launcher::SettingsPage::loadSettings()
            }
        }
        loadSettingBool(Settings::sound().mCameraListener, *cameraListenerCheckBox);
-        dopplerSpinBox->setValue(Settings::sound().mDopplerFactor);
    }

    // Interface Changes
@ -303,9 +304,6 @@ bool Launcher::SettingsPage::loadSettings()
        loadSettingBool(Settings::gui().mColorTopicEnable, *changeDialogTopicsCheckBox);
        showOwnedComboBox->setCurrentIndex(Settings::game().mShowOwned);
        loadSettingBool(Settings::gui().mStretchMenuBackground, *stretchBackgroundCheckBox);
-        connect(controllerMenusCheckBox, &QCheckBox::toggled, this, &SettingsPage::slotControllerMenusToggled);
-        loadSettingBool(Settings::gui().mControllerMenus, *controllerMenusCheckBox);
-        loadSettingBool(Settings::gui().mControllerTooltips, *controllerMenuTooltipsCheckBox);
        loadSettingBool(Settings::map().mAllowZooming, *useZoomOnMapCheckBox);
        loadSettingBool(Settings::game().mGraphicHerbalism, *graphicHerbalismCheckBox);
        scalingSpinBox->setValue(Settings::gui().mScalingFactor);
@ -375,6 +373,8 @@ void Launcher::SettingsPage::saveSettings()
        saveSettingInt(*physicsThreadsSpinBox, Settings::physics().mAsyncNumThreads);
        saveSettingBool(
            *allowNPCToFollowOverWaterSurfaceCheckBox, Settings::game().mAllowActorsToFollowOverWaterSurface);
+        saveSettingBool(
+            *unarmedCreatureAttacksDamageArmorCheckBox, Settings::game().mUnarmedCreatureAttacksDamageArmor);
        saveSettingInt(*actorCollisonShapeTypeComboBox, Settings::game().mActorCollisionShapeType);
    }

@ -486,8 +486,6 @@ void Launcher::SettingsPage::saveSettings()

        const bool cCameraListener = cameraListenerCheckBox->checkState() != Qt::Unchecked;
        Settings::sound().mCameraListener.set(cCameraListener);
-
-        Settings::sound().mDopplerFactor.set(dopplerSpinBox->value());
    }

    // Interface Changes
@ -499,8 +497,6 @@ void Launcher::SettingsPage::saveSettings()
        saveSettingBool(*changeDialogTopicsCheckBox, Settings::gui().mColorTopicEnable);
        saveSettingInt(*showOwnedComboBox, Settings::game().mShowOwned);
        saveSettingBool(*stretchBackgroundCheckBox, Settings::gui().mStretchMenuBackground);
-        saveSettingBool(*controllerMenusCheckBox, Settings::gui().mControllerMenus);
-        saveSettingBool(*controllerMenuTooltipsCheckBox, Settings::gui().mControllerTooltips);
        saveSettingBool(*useZoomOnMapCheckBox, Settings::map().mAllowZooming);
        saveSettingBool(*graphicHerbalismCheckBox, Settings::game().mGraphicHerbalism);
        Settings::gui().mScalingFactor.set(scalingSpinBox->value());
@ -559,11 +555,6 @@ void Launcher::SettingsPage::slotAnimSourcesToggled(bool checked)
    }
 }

-void Launcher::SettingsPage::slotControllerMenusToggled(bool checked)
-{
-    controllerMenuTooltipsCheckBox->setEnabled(checked);
-}
-
 void Launcher::SettingsPage::slotPostProcessToggled(bool checked)
 {
    postprocessTransparentPostpassCheckBox->setEnabled(checked);
--- a/apps/launcher/settingspage.hpp
+++ b/apps/launcher/settingspage.hpp
@ -34,7 +34,6 @@ namespace Launcher
        void slotSkyBlendingToggled(bool checked);
        void slotShadowDistLimitToggled(bool checked);
        void slotDistantLandToggled(bool checked);
-        void slotControllerMenusToggled(bool checked);

    private:
        Config::GameSettings& mGameSettings;
--- a/apps/launcher/ui/directorypicker.ui
+++ b/apps/launcher/ui/directorypicker.ui
@ -25,14 +25,7 @@
    </widget>
   </item>
   <item row="0" column="0">
-    <widget class="QListWidget" name="dirListWidget">
-     <property name="selectionMode">
-      <enum>QAbstractItemView::ExtendedSelection</enum>
-     </property>
-     <property name="contextMenuPolicy">
-      <enum>Qt::CustomContextMenu</enum>
-     </property>
-    </widget>
+    <widget class="QListWidget" name="dirListWidget"/>
   </item>
  </layout>
 </widget>
--- a/apps/launcher/ui/settingspage.ui
+++ b/apps/launcher/ui/settingspage.ui
@ -53,7 +53,7 @@
           </property>
          </widget>
         </item>
-         <item row="9" column="1">
+         <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>
@ -63,7 +63,7 @@
           </property>
          </widget>
         </item>
-         <item row="8" column="1">
+         <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>
@ -73,7 +73,7 @@
           </property>
          </widget>
         </item>
-         <item row="11" column="1">
+         <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>
@ -123,7 +123,7 @@
           </property>
          </widget>
         </item>
-         <item row="5" column="1">
+         <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>
@ -133,7 +133,7 @@
           </property>
          </widget>
         </item>
-         <item row="12" column="1">
+         <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>
@ -143,7 +143,7 @@
           </property>
          </widget>
         </item>
-         <item row="10" column="1">
+         <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>
@ -153,7 +153,7 @@
           </property>
          </widget>
         </item>
-         <item row="7" column="1">
+         <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>
@ -183,7 +183,7 @@
           </property>
          </widget>
         </item>
-         <item row="6" column="1">
+         <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>
@ -203,7 +203,7 @@
           </property>
          </widget>
         </item>
-         <item row="4" column="1">
+         <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>
@ -213,6 +213,16 @@
           </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>
@ -420,14 +430,14 @@
                </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>
+                 <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>
@ -1089,20 +1099,68 @@
      <attribute name="title">
       <string>Audio</string>
      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_3">
+      <layout class="QVBoxLayout">
       <item>
-        <layout class="QGridLayout" name="audioLayout">
-         <item row="1" column="1">
-          <widget class="QComboBox" name="enableHRTFComboBox">
+        <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="Preferred" vsizetype="Fixed">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="minimumSize">
            <size>
-             <width>0</width>
+             <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>
@ -1126,74 +1184,11 @@
           </item>
          </widget>
         </item>
-         <item row="1" column="0">
-          <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 row="4" column="0">
-          <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 row="3" column="0">
-          <widget class="QLabel" name="dopplerLabel">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Controls the strength of the Doppler effect. Zero means it is completely disabled.&lt;/p&gt;&lt;p&gt;The Doppler effect increases or decreases the pitch of sounds relative to the velocity of the sound source and the listener.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Doppler Factor</string>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="1">
-          <widget class="QDoubleSpinBox" name="dopplerSpinBox">
-           <property name="maximum">
-            <double>1.000000000000000</double>
-           </property>
-           <property name="singleStep">
-            <double>0.010000000000000</double>
-           </property>
-           <property name="value">
-            <double>0.250000000000000</double>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="1">
-          <widget class="QComboBox" name="hrtfProfileSelectorComboBox">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="currentIndex">
-            <number>0</number>
-           </property>
-           <item>
-            <property name="text">
-             <string>Default</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-         <item row="2" column="0">
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout">
+         <item>
          <widget class="QLabel" name="hrtfProfileSelectorLabel">
           <property name="toolTip">
            <string>Select your preferred HRTF profile.</string>
@ -1203,27 +1198,17 @@
           </property>
          </widget>
         </item>
-         <item row="0" column="0">
-          <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 row="0" column="1">
-          <widget class="QComboBox" name="audioDeviceSelectorComboBox">
+         <item>
+          <widget class="QComboBox" name="hrtfProfileSelectorComboBox">
           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="minimumSize">
            <size>
-             <width>0</width>
+             <width>283</width>
             <height>0</height>
            </size>
           </property>
@ -1239,6 +1224,16 @@
         </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">
@ -1246,8 +1241,8 @@
         </property>
         <property name="sizeHint" stdset="0">
          <size>
-           <width>20</width>
-           <height>40</height>
+           <width>0</width>
+           <height>0</height>
          </size>
         </property>
        </spacer>
@ -1403,29 +1398,6 @@
           </property>
          </widget>
         </item>
-         <item row="7" column="1">
-          <widget class="QCheckBox" name="controllerMenusCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make it easier to use game menus with a controller.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Enable Controller Menus</string>
-           </property>
-          </widget>
-         </item>
-         <item row="8" column="1">
-          <widget class="QCheckBox" name="controllerMenuTooltipsCheckBox">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When using controller menus, make tooltips visible by default.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Show Controller Tooltips By Default</string>
-           </property>
-          </widget>
-         </item>
         <item row="0" column="0">
          <widget class="QLabel" name="showOwnedLabel">
           <property name="text">
--- a/apps/launcher/utils/openalutil.cpp
+++ b/apps/launcher/utils/openalutil.cpp
@ -43,10 +43,10 @@ std::vector<std::string> Launcher::enumerateOpenALDevicesHrtf()
            LPALCGETSTRINGISOFT alcGetStringiSOFT = nullptr;
            void* funcPtr = alcGetProcAddress(device, "alcGetStringiSOFT");
            memcpy(&alcGetStringiSOFT, &funcPtr, sizeof(funcPtr));
-            ALCint numHrtf;
-            alcGetIntegerv(device, ALC_NUM_HRTF_SPECIFIERS_SOFT, 1, &numHrtf);
-            ret.reserve(numHrtf);
-            for (ALCint i = 0; i < numHrtf; ++i)
+            ALCint num_hrtf;
+            alcGetIntegerv(device, ALC_NUM_HRTF_SPECIFIERS_SOFT, 1, &num_hrtf);
+            ret.reserve(num_hrtf);
+            for (ALCint i = 0; i < num_hrtf; ++i)
            {
                const ALCchar* entry = alcGetStringiSOFT(device, ALC_HRTF_SPECIFIER_SOFT, i);
                if (strcmp(entry, "") == 0)
--- a/apps/mwiniimporter/importer.cpp
+++ b/apps/mwiniimporter/importer.cpp
@ -9,22 +9,7 @@
 #include <fstream>
 #include <iostream>

-namespace
-{
-    // from configfileparser.cpp
-    std::string trim_ws(const std::string& s)
-    {
-        std::string::size_type n, n2;
-        n = s.find_first_not_of(" \t\r\n");
-        if (n == std::string::npos)
-            return std::string();
-        else
-        {
-            n2 = s.find_last_not_of(" \t\r\n");
-            return s.substr(n, n2 - n + 1);
-        }
-    }
-}
+namespace sfs = std::filesystem;

 MwIniImporter::MwIniImporter()
    : mVerbose(false)
@ -326,10 +311,10 @@ MwIniImporter::multistrmap MwIniImporter::loadIniFile(const std::filesystem::pat
            continue;
        }

-        const std::string::size_type commentPos = utf8.find(';');
-        if (commentPos != std::string::npos)
+        int comment_pos = static_cast<int>(utf8.find(';'));
+        if (comment_pos > 0)
        {
-            utf8 = utf8.substr(0, commentPos);
+            utf8 = utf8.substr(0, comment_pos);
        }

        int pos = static_cast<int>(utf8.find('='));
@ -351,7 +336,7 @@ MwIniImporter::multistrmap MwIniImporter::loadIniFile(const std::filesystem::pat
        if (it == map.end())
            it = map.emplace_hint(it, std::move(key), std::vector<std::string>());

-        it->second.emplace_back(value);
+        it->second.push_back(std::string(value));
    }

    return map;
@ -367,10 +352,12 @@ MwIniImporter::multistrmap MwIniImporter::loadCfgFile(const std::filesystem::pat
    std::string line;
    while (std::getline(file, line))
    {
-        // ignore comments - keep in sync with configfileparser.cpp
-        if (line.find('#') == line.find_first_not_of(" \t\r\n"))
+
+        // we cant say comment by only looking at first char anymore
+        int comment_pos = static_cast<int>(line.find('#'));
+        if (comment_pos > 0)
        {
-            continue;
+            line = line.substr(0, comment_pos);
        }

        if (line.empty())
@ -386,14 +373,12 @@ MwIniImporter::multistrmap MwIniImporter::loadCfgFile(const std::filesystem::pat

        std::string key(line.substr(0, pos));
        std::string value(line.substr(pos + 1));
-        key = trim_ws(key);
-        value = trim_ws(value);

        if (map.find(key) == map.end())
        {
            map.insert(std::make_pair(key, std::vector<std::string>()));
        }
-        map[key].push_back(std::move(value));
+        map[key].push_back(value);
    }

    return map;
--- a/apps/mwiniimporter/importer.hpp
+++ b/apps/mwiniimporter/importer.hpp
@ -8,7 +8,7 @@
 #include <string>
 #include <vector>

-#include <components/toutf8/toutf8.hpp>
+#include <components/to_utf8/to_utf8.hpp>

 class MwIniImporter
 {
--- a/apps/mwiniimporter/main.cpp
+++ b/apps/mwiniimporter/main.cpp
@ -10,6 +10,7 @@
 #include <components/files/conversion.hpp>

 namespace bpo = boost::program_options;
+namespace sfs = std::filesystem;

 #ifndef _WIN32
 int main(int argc, char* argv[])
@ -62,7 +63,7 @@ int wmain(int argc, wchar_t* wargv[])
    try
    {
        bpo::options_description desc("Syntax: openmw-iniimporter <options> inifile configfile\nAllowed options");
-        bpo::positional_options_description positionalDesc;
+        bpo::positional_options_description p_desc;
        auto addOption = desc.add_options();
        addOption("help,h", "produce help message");
        addOption("verbose,v", "verbose output");
@ -79,12 +80,11 @@ int wmain(int argc, wchar_t* wargv[])
            "\n\twin1251 - Cyrillic alphabet such as Russian, Bulgarian, Serbian Cyrillic and other languages\n"
            "\n\twin1252 - Western European (Latin) alphabet, used by default");
        ;
-        positionalDesc.add("ini", 1).add("cfg", 1);
+        p_desc.add("ini", 1).add("cfg", 1);

        bpo::variables_map vm;

-        bpo::parsed_options parsed
-            = bpo::command_line_parser(argc, argv).options(desc).positional(positionalDesc).run();
+        bpo::parsed_options parsed = bpo::command_line_parser(argc, argv).options(desc).positional(p_desc).run();
        bpo::store(parsed, vm);

        if (vm.count("help") || !vm.count("ini") || !vm.count("cfg"))
@ -126,20 +126,12 @@ int wmain(int argc, wchar_t* wargv[])
        MwIniImporter importer;
        importer.setVerbose(vm.count("verbose") != 0);

-        MwIniImporter::multistrmap cfg = importer.loadCfgFile(cfgFile);
-
        // Font encoding settings
-        std::string encoding;
-        if (vm["encoding"].defaulted() && cfg.contains("encoding") && !cfg["encoding"].empty())
-            encoding = cfg["encoding"].back();
-        else
-        {
-            encoding = vm["encoding"].as<std::string>();
-            cfg["encoding"] = { encoding };
-        }
+        std::string encoding(vm["encoding"].as<std::string>());
        importer.setInputEncoding(ToUTF8::calculateEncoding(encoding));

        MwIniImporter::multistrmap ini = importer.loadIniFile(iniFile);
+        MwIniImporter::multistrmap cfg = importer.loadCfgFile(cfgFile);

        if (!vm.count("fonts"))
        {
--- a/apps/navmeshtool/main.cpp
+++ b/apps/navmeshtool/main.cpp
@ -25,7 +25,7 @@
 #include <components/resource/niffilemanager.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/settings/values.hpp>
-#include <components/toutf8/toutf8.hpp>
+#include <components/to_utf8/to_utf8.hpp>
 #include <components/version/version.hpp>
 #include <components/vfs/manager.hpp>
 #include <components/vfs/registerarchives.hpp>
@ -189,7 +189,7 @@ namespace NavMeshTool

            VFS::Manager vfs;

-            VFS::registerArchives(&vfs, fileCollections, archives, true, &encoder.getStatelessEncoder());
+            VFS::registerArchives(&vfs, fileCollections, archives, true);

            Settings::Manager::load(config);

--- a/apps/navmeshtool/worldspacedata.cpp
+++ b/apps/navmeshtool/worldspacedata.cpp
@ -201,8 +201,8 @@ namespace NavMeshTool
        {
            if (!land.has_value() || osg::Vec2i(land->mX, land->mY) != cellPosition
                || (land->mDataTypes & ESM::Land::DATA_VHGT) == 0)
-                return { HeightfieldPlane{ static_cast<float>(ESM::Land::DEFAULT_HEIGHT) },
-                    static_cast<float>(ESM::Land::DEFAULT_HEIGHT), static_cast<float>(ESM::Land::DEFAULT_HEIGHT) };
+                return { HeightfieldPlane{ ESM::Land::DEFAULT_HEIGHT }, ESM::Land::DEFAULT_HEIGHT,
+                    ESM::Land::DEFAULT_HEIGHT };

            ESM::Land::LandData& landData = *landDatas.emplace_back(std::make_unique<ESM::Land::LandData>());
            land->loadData(ESM::Land::DATA_VHGT, landData);
--- a/apps/niftest/niftest.cpp
+++ b/apps/niftest/niftest.cpp
@ -113,7 +113,7 @@ bool isBSA(const std::filesystem::path& path)
 std::unique_ptr<VFS::Archive> makeArchive(const std::filesystem::path& path)
 {
    if (isBSA(path))
-        return VFS::makeBsaArchive(path, nullptr);
+        return VFS::makeBsaArchive(path);
    if (std::filesystem::is_directory(path))
        return std::make_unique<VFS::FileSystemArchive>(path);
    return nullptr;
@ -198,7 +198,7 @@ void readVFS(std::unique_ptr<VFS::Archive>&& archive, const std::filesystem::pat
            {
                try
                {
-                    readVFS(VFS::makeBsaArchive(file.second, nullptr), file.second, quiet);
+                    readVFS(VFS::makeBsaArchive(file.second), file.second, quiet);
                }
                catch (const std::exception& e)
                {
@ -235,8 +235,8 @@ Allowed options)");
    bpo::variables_map variables;
    try
    {
-        bpo::parsed_options validOpts = bpo::command_line_parser(argc, argv).options(desc).positional(p).run();
-        bpo::store(validOpts, variables);
+        bpo::parsed_options valid_opts = bpo::command_line_parser(argc, argv).options(desc).positional(p).run();
+        bpo::store(valid_opts, variables);
        bpo::notify(variables);
        if (variables.count("help"))
        {
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@ -88,7 +88,7 @@ opencs_units (view/render
    scenewidget worldspacewidget pagedworldspacewidget unpagedworldspacewidget
    previewwidget editmode instancemode instanceselectionmode instancemovemode
    orbitcameramode pathgridmode selectionmode pathgridselectionmode cameracontroller
-    cellwater terraintexturemode actor terrainselection terrainshapemode brushdraw commands objectmarker
+    cellwater terraintexturemode actor terrainselection terrainshapemode brushdraw commands
    )

 opencs_units (view/render
@ -240,7 +240,11 @@ target_link_libraries(openmw-cs-lib
    components_qt
 )

-target_link_libraries(openmw-cs-lib Qt::Widgets Qt::Core Qt::Network Qt::OpenGL Qt::OpenGLWidgets Qt::Svg)
+if (QT_VERSION_MAJOR VERSION_EQUAL 6)
+    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 Qt::Svg)
+endif()

 if (WIN32)
    target_sources(openmw-cs PRIVATE ${CMAKE_SOURCE_DIR}/files/windows/openmw-cs.exe.manifest)
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@ -34,7 +34,7 @@
 #include <components/misc/rng.hpp>
 #include <components/nifosg/nifloader.hpp>
 #include <components/settings/settings.hpp>
-#include <components/toutf8/toutf8.hpp>
+#include <components/to_utf8/to_utf8.hpp>

 #include "view/doc/viewmanager.hpp"

@ -166,7 +166,7 @@ std::pair<Files::PathContainer, std::vector<std::string>> CS::Editor::readConfig
    if (!local.empty())
    {
        std::filesystem::create_directories(local);
-        dataLocal.push_back(std::move(local));
+        dataLocal.push_back(local);
    }
    mCfgMgr.filterOutNonExistingPaths(dataDirs);
    mCfgMgr.filterOutNonExistingPaths(dataLocal);
--- a/apps/opencs/model/doc/document.hpp
+++ b/apps/opencs/model/doc/document.hpp
@ -12,7 +12,7 @@
 #include <apps/opencs/model/world/universalid.hpp>

 #include <components/files/multidircollection.hpp>
-#include <components/toutf8/toutf8.hpp>
+#include <components/to_utf8/to_utf8.hpp>

 #include "../world/data.hpp"
 #include "../world/idcompletionmanager.hpp"
--- a/apps/opencs/model/doc/documentmanager.hpp
+++ b/apps/opencs/model/doc/documentmanager.hpp
@ -9,7 +9,7 @@
 #include <vector>

 #include <components/files/multidircollection.hpp>
-#include <components/toutf8/toutf8.hpp>
+#include <components/to_utf8/to_utf8.hpp>

 #include "loader.hpp"

--- a/apps/opencs/model/doc/saving.hpp
+++ b/apps/opencs/model/doc/saving.hpp
@ -3,7 +3,7 @@

 #include <QObject>

-#include <components/toutf8/toutf8.hpp>
+#include <components/to_utf8/to_utf8.hpp>

 #include "operation.hpp"
 #include "savingstate.hpp"
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@ -291,7 +291,8 @@ int CSMDoc::WriteCellCollectionStage::setup()
    return mDocument.getData().getCells().getSize();
 }

-void CSMDoc::WriteCellCollectionStage::writeReferences(const std::deque<int>& references, bool interior)
+void CSMDoc::WriteCellCollectionStage::writeReferences(
+    const std::deque<int>& references, bool interior, unsigned int& newRefNum)
 {
    ESM::ESMWriter& writer = mState.getWriter();

@ -303,8 +304,6 @@ void CSMDoc::WriteCellCollectionStage::writeReferences(const std::deque<int>& re
        {
            CSMWorld::CellRef refRecord = ref.get();

-            const bool isLocal = refRecord.mRefNum.mContentFile == -1;
-
            // -1 is the current file, saved indices are 1-based
            refRecord.mRefNum.mContentFile++;

@ -317,7 +316,12 @@ void CSMDoc::WriteCellCollectionStage::writeReferences(const std::deque<int>& re
            }

            ESM::RefId streamId = ESM::RefId::stringRefId(stream.str());
-            if (!isLocal && (refRecord.mOriginalCell.empty() ? refRecord.mCell : refRecord.mOriginalCell) != streamId
+            if (refRecord.mNew || refRecord.mRefNum.mIndex == 0
+                || (!interior && ref.mState == CSMWorld::RecordBase::State_ModifiedOnly && refRecord.mCell != streamId))
+            {
+                refRecord.mRefNum.mIndex = newRefNum++;
+            }
+            else if ((refRecord.mOriginalCell.empty() ? refRecord.mCell : refRecord.mOriginalCell) != streamId
                && !interior)
            {
                // An empty mOriginalCell is meant to indicate that it is the same as
@ -358,6 +362,9 @@ void CSMDoc::WriteCellCollectionStage::perform(int stage, Messages& messages)
        CSMWorld::Cell cellRecord = cell.get();
        const bool interior = !cellRecord.mId.startsWith("#");

+        // count new references and adjust RefNumCount accordingsly
+        unsigned int newRefNum = cellRecord.mRefNumCounter;
+
        if (references != nullptr)
        {
            for (std::deque<int>::const_iterator iter(references->begin()); iter != references->end(); ++iter)
@ -383,6 +390,9 @@ void CSMDoc::WriteCellCollectionStage::perform(int stage, Messages& messages)
                        ESM::RefId::stringRefId(CSMWorld::CellCoordinates(refRecord.getCellIndex()).getId(""))
                            != refRecord.mCell))
                    ++cellRecord.mRefNumCounter;
+
+                if (refRecord.mRefNum.mIndex >= newRefNum)
+                    newRefNum = refRecord.mRefNum.mIndex + 1;
            }
        }

@ -405,9 +415,9 @@ void CSMDoc::WriteCellCollectionStage::perform(int stage, Messages& messages)
        // write references
        if (references != nullptr)
        {
-            writeReferences(persistentRefs, interior);
+            writeReferences(persistentRefs, interior, newRefNum);
            cellRecord.saveTempMarker(writer, static_cast<int>(references->size()) - persistentRefs.size());
-            writeReferences(tempRefs, interior);
+            writeReferences(tempRefs, interior, newRefNum);
        }

        writer.endRecord(cellRecord.sRecordId);
--- a/apps/opencs/model/doc/savingstages.hpp
+++ b/apps/opencs/model/doc/savingstages.hpp
@ -167,7 +167,7 @@ namespace CSMDoc
        Document& mDocument;
        SavingState& mState;

-        void writeReferences(const std::deque<int>& references, bool interior);
+        void writeReferences(const std::deque<int>& references, bool interior, unsigned int& newRefNum);

    public:
        WriteCellCollectionStage(Document& document, SavingState& state);
--- a/apps/opencs/model/doc/savingstate.hpp
+++ b/apps/opencs/model/doc/savingstate.hpp
@ -9,7 +9,7 @@

 #include <components/esm3/esmwriter.hpp>
 #include <components/misc/algorithm.hpp>
-#include <components/toutf8/toutf8.hpp>
+#include <components/to_utf8/to_utf8.hpp>

 namespace CSMDoc
 {
--- a/apps/opencs/model/filter/parser.cpp
+++ b/apps/opencs/model/filter/parser.cpp
@ -365,7 +365,7 @@ std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseNAry(const Token& keywo
        if (mError)
            return std::shared_ptr<Node>();

-        nodes.push_back(std::move(node));
+        nodes.push_back(node);

        token = getNextToken();

--- a/apps/opencs/model/filter/textnode.cpp
+++ b/apps/opencs/model/filter/textnode.cpp
@ -34,11 +34,11 @@ bool CSMFilter::TextNode::test(const CSMWorld::IdTableBase& table, int row, cons

    QString string;

-    if (data.typeId() == QMetaType::QString)
+    if (data.type() == QVariant::String)
    {
        string = data.toString();
    }
-    else if ((data.typeId() == QMetaType::Int || data.typeId() == QMetaType::UInt)
+    else if ((data.type() == QVariant::Int || data.type() == QVariant::UInt)
        && CSMWorld::Columns::hasEnums(static_cast<CSMWorld::Columns::ColumnId>(mColumnId)))
    {
        int value = data.toInt();
@ -49,7 +49,7 @@ bool CSMFilter::TextNode::test(const CSMWorld::IdTableBase& table, int row, cons
        if (value >= 0 && value < static_cast<int>(enums.size()))
            string = QString::fromUtf8(enums[value].second.c_str());
    }
-    else if (data.typeId() == QMetaType::Bool)
+    else if (data.type() == QVariant::Bool)
    {
        string = data.toBool() ? "true" : "false";
    }
--- a/apps/opencs/model/filter/valuenode.cpp
+++ b/apps/opencs/model/filter/valuenode.cpp
@ -29,8 +29,8 @@ bool CSMFilter::ValueNode::test(const CSMWorld::IdTableBase& table, int row, con

    QVariant data = table.data(index);

-    if (data.typeId() != QMetaType::Double && data.typeId() != QMetaType::Bool && data.typeId() != QMetaType::Int
-        && data.typeId() != QMetaType::UInt && data.typeId() != QMetaType::Float)
+    if (data.type() != QVariant::Double && data.type() != QVariant::Bool && data.type() != QVariant::Int
+        && data.type() != QVariant::UInt && data.type() != static_cast<QVariant::Type>(QMetaType::Float))
        return false;

    double value = data.toDouble();
--- a/apps/opencs/model/prefs/modifiersetting.cpp
+++ b/apps/opencs/model/prefs/modifiersetting.cpp
@ -95,9 +95,9 @@ namespace CSMPrefs
    bool ModifierSetting::handleEvent(QObject* target, int mod, int value)
    {
        // For potential future exceptions
-        const int blacklist[] = { 0 };
+        const int Blacklist[] = { 0 };

-        const size_t blacklistSize = std::size(blacklist);
+        const size_t BlacklistSize = sizeof(Blacklist) / sizeof(int);

        if (!mEditorActive)
        {
@ -114,9 +114,9 @@ namespace CSMPrefs
        }

        // Handle blacklist
-        for (size_t i = 0; i < blacklistSize; ++i)
+        for (size_t i = 0; i < BlacklistSize; ++i)
        {
-            if (value == blacklist[i])
+            if (value == Blacklist[i])
                return true;
        }

--- a/apps/opencs/model/prefs/shortcuteventhandler.cpp
+++ b/apps/opencs/model/prefs/shortcuteventhandler.cpp
@ -62,31 +62,39 @@ namespace CSMPrefs
        {
            QWidget* widget = static_cast<QWidget*>(watched);
            QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
+            unsigned int mod = (unsigned int)keyEvent->modifiers();
+            unsigned int key = (unsigned int)keyEvent->key();

            if (!keyEvent->isAutoRepeat())
-                return activate(widget, keyEvent->keyCombination());
+                return activate(widget, mod, key);
        }
        else if (event->type() == QEvent::KeyRelease)
        {
            QWidget* widget = static_cast<QWidget*>(watched);
            QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
+            unsigned int mod = (unsigned int)keyEvent->modifiers();
+            unsigned int key = (unsigned int)keyEvent->key();

            if (!keyEvent->isAutoRepeat())
-                return deactivate(widget, keyEvent->keyCombination());
+                return deactivate(widget, mod, key);
        }
        else if (event->type() == QEvent::MouseButtonPress)
        {
            QWidget* widget = static_cast<QWidget*>(watched);
            QMouseEvent* mouseEvent = static_cast<QMouseEvent*>(event);
+            unsigned int mod = (unsigned int)mouseEvent->modifiers();
+            unsigned int button = (unsigned int)mouseEvent->button();

-            return activate(widget, QKeyCombination(mouseEvent->modifiers(), Qt::Key(mouseEvent->button())));
+            return activate(widget, mod, button);
        }
        else if (event->type() == QEvent::MouseButtonRelease)
        {
            QWidget* widget = static_cast<QWidget*>(watched);
            QMouseEvent* mouseEvent = static_cast<QMouseEvent*>(event);
+            unsigned int mod = (unsigned int)mouseEvent->modifiers();
+            unsigned int button = (unsigned int)mouseEvent->button();

-            return deactivate(widget, QKeyCombination(mouseEvent->modifiers(), Qt::Key(mouseEvent->button())));
+            return deactivate(widget, mod, button);
        }
        else if (event->type() == QEvent::FocusOut)
        {
@ -141,7 +149,7 @@ namespace CSMPrefs
        }
    }

-    bool ShortcutEventHandler::activate(QWidget* widget, QKeyCombination keyCombination)
+    bool ShortcutEventHandler::activate(QWidget* widget, unsigned int mod, unsigned int button)
    {
        std::vector<std::pair<MatchResult, Shortcut*>> potentials;
        bool used = false;
@ -159,7 +167,7 @@ namespace CSMPrefs
                if (!shortcut->isEnabled())
                    continue;

-                if (checkModifier(keyCombination, shortcut, true))
+                if (checkModifier(mod, button, shortcut, true))
                    used = true;

                if (shortcut->getActivationStatus() != Shortcut::AS_Inactive)
@ -167,8 +175,7 @@ namespace CSMPrefs

                int pos = shortcut->getPosition();
                int lastPos = shortcut->getLastPosition();
-                MatchResult result = match(keyCombination.keyboardModifiers(), keyCombination.key(),
-                    shortcut->getSequence()[pos].toCombined());
+                MatchResult result = match(mod, button, shortcut->getSequence()[pos]);

                if (result == Matches_WithMod || result == Matches_NoMod)
                {
@ -213,8 +220,10 @@ namespace CSMPrefs
        return used;
    }

-    bool ShortcutEventHandler::deactivate(QWidget* widget, QKeyCombination keyCombination)
+    bool ShortcutEventHandler::deactivate(QWidget* widget, unsigned int mod, unsigned int button)
    {
+        const int KeyMask = 0x01FFFFFF;
+
        bool used = false;

        while (widget)
@ -226,11 +235,11 @@ namespace CSMPrefs
            {
                Shortcut* shortcut = *it;

-                if (checkModifier(keyCombination, shortcut, false))
+                if (checkModifier(mod, button, shortcut, false))
                    used = true;

                int pos = shortcut->getPosition();
-                MatchResult result = match(0, keyCombination.key(), shortcut->getSequence()[pos].key());
+                MatchResult result = match(0, button, shortcut->getSequence()[pos] & KeyMask);

                if (result != Matches_Not)
                {
@ -259,13 +268,13 @@ namespace CSMPrefs
        return used;
    }

-    bool ShortcutEventHandler::checkModifier(QKeyCombination keyCombination, Shortcut* shortcut, bool activate)
+    bool ShortcutEventHandler::checkModifier(unsigned int mod, unsigned int button, Shortcut* shortcut, bool activate)
    {
        if (!shortcut->isEnabled() || !shortcut->getModifier() || shortcut->getSecondaryMode() == Shortcut::SM_Ignore
            || shortcut->getModifierStatus() == activate)
            return false;

-        MatchResult result = match(keyCombination.keyboardModifiers(), keyCombination.key(), shortcut->getModifier());
+        MatchResult result = match(mod, button, shortcut->getModifier());
        bool used = false;

        if (result != Matches_Not)
--- a/apps/opencs/model/prefs/shortcuteventhandler.hpp
+++ b/apps/opencs/model/prefs/shortcuteventhandler.hpp
@ -42,11 +42,11 @@ namespace CSMPrefs

        void updateParent(QWidget* widget);

-        bool activate(QWidget* widget, QKeyCombination keyCombination);
+        bool activate(QWidget* widget, unsigned int mod, unsigned int button);

-        bool deactivate(QWidget* widget, QKeyCombination keyCombination);
+        bool deactivate(QWidget* widget, unsigned int mod, unsigned int button);

-        bool checkModifier(QKeyCombination keyCombination, Shortcut* shortcut, bool activate);
+        bool checkModifier(unsigned int mod, unsigned int button, Shortcut* shortcut, bool activate);

        MatchResult match(unsigned int mod, unsigned int button, unsigned int value);

--- a/apps/opencs/model/prefs/shortcutmanager.cpp
+++ b/apps/opencs/model/prefs/shortcutmanager.cpp
@ -78,7 +78,7 @@ namespace CSMPrefs
        }
    }

-    bool ShortcutManager::getModifier(std::string_view name, int& modifier) const
+    bool ShortcutManager::getModifier(const std::string& name, int& modifier) const
    {
        ModifierMap::const_iterator item = mModifiers.find(name);
        if (item != mModifiers.end())
@ -115,12 +115,15 @@ namespace CSMPrefs

    std::string ShortcutManager::convertToString(const QKeySequence& sequence) const
    {
+        const int MouseKeyMask = 0x01FFFFFF;
+        const int ModMask = 0x7E000000;
+
        std::string result;

-        for (int i = 0; i < sequence.count(); ++i)
+        for (int i = 0; i < (int)sequence.count(); ++i)
        {
-            int mods = sequence[i].keyboardModifiers();
-            int key = sequence[i].key();
+            int mods = sequence[i] & ModMask;
+            int key = sequence[i] & MouseKeyMask;

            if (key)
            {
@ -172,27 +175,27 @@ namespace CSMPrefs
        return concat;
    }

-    void ShortcutManager::convertFromString(std::string_view data, QKeySequence& sequence) const
+    void ShortcutManager::convertFromString(const std::string& data, QKeySequence& sequence) const
    {
-        const int maxKeys = 4; // A limitation of QKeySequence
+        const int MaxKeys = 4; // A limitation of QKeySequence

        size_t end = data.find(';');
        size_t size = std::min(end, data.size());

-        std::string_view value = data.substr(0, size);
+        std::string value = data.substr(0, size);
        size_t start = 0;

        int keyPos = 0;
        int mods = 0;

-        int keys[maxKeys] = {};
+        int keys[MaxKeys] = {};

        while (start < value.size())
        {
            end = data.find('+', start);
            end = std::min(end, value.size());

-            std::string_view name = value.substr(start, end - start);
+            std::string name = value.substr(start, end - start);

            if (name == "Ctrl")
            {
@ -228,7 +231,7 @@ namespace CSMPrefs
                    mods = 0;
                    keyPos += 1;

-                    if (keyPos >= maxKeys)
+                    if (keyPos >= MaxKeys)
                        break;
                }
            }
@ -239,12 +242,12 @@ namespace CSMPrefs
        sequence = QKeySequence(keys[0], keys[1], keys[2], keys[3]);
    }

-    void ShortcutManager::convertFromString(std::string_view data, int& modifier) const
+    void ShortcutManager::convertFromString(const std::string& data, int& modifier) const
    {
        size_t start = data.find(';') + 1;
        start = std::min(start, data.size());

-        std::string_view name = data.substr(start);
+        std::string name = data.substr(start);
        KeyMap::const_iterator searchResult = mKeys.find(name);
        if (searchResult != mKeys.end())
        {
@ -256,7 +259,7 @@ namespace CSMPrefs
        }
    }

-    void ShortcutManager::convertFromString(std::string_view data, QKeySequence& sequence, int& modifier) const
+    void ShortcutManager::convertFromString(const std::string& data, QKeySequence& sequence, int& modifier) const
    {
        convertFromString(data, sequence);
        convertFromString(data, modifier);
@ -286,14 +289,14 @@ namespace CSMPrefs

    QString ShortcutManager::processToolTip(const QString& toolTip) const
    {
-        const QChar sequenceStart = '{';
-        const QChar sequenceEnd = '}';
+        const QChar SequenceStart = '{';
+        const QChar SequenceEnd = '}';

        QStringList substrings;

        int prevIndex = 0;
-        int startIndex = toolTip.indexOf(sequenceStart);
-        int endIndex = (startIndex != -1) ? toolTip.indexOf(sequenceEnd, startIndex) : -1;
+        int startIndex = toolTip.indexOf(SequenceStart);
+        int endIndex = (startIndex != -1) ? toolTip.indexOf(SequenceEnd, startIndex) : -1;

        // Process every valid shortcut escape sequence
        while (startIndex != -1 && endIndex != -1)
@ -328,8 +331,8 @@ namespace CSMPrefs
                prevIndex = endIndex + 1; // '}' character
            }

-            startIndex = toolTip.indexOf(sequenceStart, endIndex);
-            endIndex = (startIndex != -1) ? toolTip.indexOf(sequenceEnd, startIndex) : -1;
+            startIndex = toolTip.indexOf(SequenceStart, endIndex);
+            endIndex = (startIndex != -1) ? toolTip.indexOf(SequenceEnd, startIndex) : -1;
        }

        if (prevIndex < toolTip.size())
--- a/apps/opencs/model/prefs/shortcutmanager.hpp
+++ b/apps/opencs/model/prefs/shortcutmanager.hpp
@ -31,7 +31,7 @@ namespace CSMPrefs
        bool getSequence(std::string_view name, QKeySequence& sequence) const;
        void setSequence(std::string_view name, const QKeySequence& sequence);

-        bool getModifier(std::string_view name, int& modifier) const;
+        bool getModifier(const std::string& name, int& modifier) const;
        void setModifier(std::string_view name, int modifier);

        std::string convertToString(const QKeySequence& sequence) const;
@ -39,10 +39,10 @@ namespace CSMPrefs

        std::string convertToString(const QKeySequence& sequence, int modifier) const;

-        void convertFromString(std::string_view data, QKeySequence& sequence) const;
-        void convertFromString(std::string_view data, int& modifier) const;
+        void convertFromString(const std::string& data, QKeySequence& sequence) const;
+        void convertFromString(const std::string& data, int& modifier) const;

-        void convertFromString(std::string_view data, QKeySequence& sequence, int& modifier) const;
+        void convertFromString(const std::string& data, QKeySequence& sequence, int& modifier) const;

        /// Replaces "{sequence-name}" or "{modifier-name}" with the appropriate text
        QString processToolTip(const QString& toolTip) const;
@ -53,7 +53,7 @@ namespace CSMPrefs
        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, std::less<>> KeyMap;
+        typedef std::map<std::string, int> KeyMap;

        ShortcutMap mShortcuts;
        SequenceMap mSequences;
--- a/apps/opencs/model/prefs/shortcutsetting.cpp
+++ b/apps/opencs/model/prefs/shortcutsetting.cpp
@ -118,9 +118,9 @@ namespace CSMPrefs
    bool ShortcutSetting::handleEvent(QObject* target, int mod, int value, bool active)
    {
        // Modifiers are handled differently
-        const int blacklist[] = { Qt::Key_Shift, Qt::Key_Control, Qt::Key_Meta, Qt::Key_Alt, Qt::Key_AltGr };
+        const int Blacklist[] = { Qt::Key_Shift, Qt::Key_Control, Qt::Key_Meta, Qt::Key_Alt, Qt::Key_AltGr };

-        const size_t blacklistSize = std::size(blacklist);
+        const size_t BlacklistSize = sizeof(Blacklist) / sizeof(int);

        if (!mEditorActive)
        {
@ -137,9 +137,9 @@ namespace CSMPrefs
        }

        // Handle blacklist
-        for (size_t i = 0; i < blacklistSize; ++i)
+        for (size_t i = 0; i < BlacklistSize; ++i)
        {
-            if (value == blacklist[i])
+            if (value == Blacklist[i])
                return true;
        }

--- a/apps/opencs/model/prefs/state.cpp
+++ b/apps/opencs/model/prefs/state.cpp
@ -59,6 +59,13 @@ void CSMPrefs::State::declare()
        .setTooltip("Minimum width of subviews.")
        .setRange(50, 10000);
    declareEnum(mValues->mWindows.mMainwindowScrollbar, "Main Window Horizontal Scrollbar Mode");
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    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"
+            "is limited to the current screen.");
+#endif

    declareCategory("Records");
    declareEnum(mValues->mRecords.mStatusFormat, "Modification Status Display Format");
@ -173,10 +180,7 @@ void CSMPrefs::State::declare()
    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(mValues->mRendering.mObjectMarkerScale, "Object Marker Scale Factor")
-        .setPrecision(2)
-        .setRange(.01f, 100.f)
-        .setTooltip("Multiplier for the size of object selection markers.");
+    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")
@ -372,7 +376,6 @@ void CSMPrefs::State::declare()
    declareShortcut(mValues->mKeyBindings.mSceneScaleSubmode, "Scale Object Submode");
    declareShortcut(mValues->mKeyBindings.mSceneRotateSubmode, "Rotate Object Submode");
    declareShortcut(mValues->mKeyBindings.mSceneCameraCycle, "Cycle Camera Mode");
-    declareShortcut(mValues->mKeyBindings.mSceneToggleMarker, "Toggle Selection Marker");

    declareSubcategory("1st/Free Camera");
    declareShortcut(mValues->mKeyBindings.mFreeForward, "Forward");
@ -495,7 +498,7 @@ CSMPrefs::ShortcutSetting& CSMPrefs::State::declareShortcut(
    // Setup with actual data
    QKeySequence sequence;

-    getShortcutManager().convertFromString(value.get(), sequence);
+    getShortcutManager().convertFromString(value, sequence);
    getShortcutManager().setSequence(value.mName, sequence);

    CSMPrefs::ShortcutSetting* setting
--- a/apps/opencs/model/prefs/values.hpp
+++ b/apps/opencs/model/prefs/values.hpp
@ -258,7 +258,7 @@ namespace CSMPrefs
        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> mObjectMarkerScale{ mIndex, sName, "object-marker-scale", 5.0 };
+        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" };
@ -491,7 +491,7 @@ namespace CSMPrefs
        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> mSceneToggleMarker{ mIndex, sName, "scene-toggle-marker", "F4" };
+        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" };
@ -507,10 +507,8 @@ namespace CSMPrefs
        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",
-            "Ctrl+Slash" };
-        Settings::SettingValue<std::string> mScriptEditorUncomment{ mIndex, sName, "script-editor-uncomment",
-            "Ctrl+Shift+Question" };
+        Settings::SettingValue<std::string> mScriptEditorComment{ mIndex, sName, "script-editor-comment", "" };
+        Settings::SettingValue<std::string> mScriptEditorUncomment{ mIndex, sName, "script-editor-uncomment", "" };
    };

    struct ModelsCategory : Settings::WithIndex
--- a/apps/opencs/model/tools/classcheck.cpp
+++ b/apps/opencs/model/tools/classcheck.cpp
@ -37,23 +37,23 @@ void CSMTools::ClassCheckStage::perform(int stage, CSMDoc::Messages& messages)
    if ((mIgnoreBaseRecords && record.mState == CSMWorld::RecordBase::State_BaseOnly) || record.isDeleted())
        return;

-    const ESM::Class& classRecord = record.get();
+    const ESM::Class& class_ = record.get();

-    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Class, classRecord.mId);
+    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Class, class_.mId);

    // A class should have a name
-    if (classRecord.mName.empty())
+    if (class_.mName.empty())
        messages.add(id, "Name is missing", "", CSMDoc::Message::Severity_Error);

    // A playable class should have a description
-    if (classRecord.mData.mIsPlayable != 0 && classRecord.mDescription.empty())
+    if (class_.mData.mIsPlayable != 0 && class_.mDescription.empty())
        messages.add(id, "Description of a playable class is missing", "", CSMDoc::Message::Severity_Warning);

    // test for invalid attributes
    std::map<int, int> attributeCount;
-    for (size_t i = 0; i < classRecord.mData.mAttribute.size(); ++i)
+    for (size_t i = 0; i < class_.mData.mAttribute.size(); ++i)
    {
-        int attribute = classRecord.mData.mAttribute[i];
+        int attribute = class_.mData.mAttribute[i];
        if (attribute == -1)
            messages.add(id, "Attribute #" + std::to_string(i) + " is not set", {}, CSMDoc::Message::Severity_Error);
        else
@ -73,7 +73,7 @@ void CSMTools::ClassCheckStage::perform(int stage, CSMDoc::Messages& messages)
    // test for non-unique skill
    std::map<int, int> skills; // ID, number of occurrences

-    for (const auto& s : classRecord.mData.mSkills)
+    for (const auto& s : class_.mData.mSkills)
        for (int skill : s)
            ++skills[skill];

--- a/apps/opencs/model/tools/mergeoperation.hpp
+++ b/apps/opencs/model/tools/mergeoperation.hpp
@ -3,7 +3,7 @@

 #include <memory>

-#include <components/toutf8/toutf8.hpp>
+#include <components/to_utf8/to_utf8.hpp>

 #include "../doc/operation.hpp"

--- a/apps/opencs/model/tools/mergestages.hpp
+++ b/apps/opencs/model/tools/mergestages.hpp
@ -9,7 +9,7 @@
 #include <apps/opencs/model/world/idcollection.hpp>
 #include <apps/opencs/model/world/record.hpp>

-#include <components/toutf8/toutf8.hpp>
+#include <components/to_utf8/to_utf8.hpp>

 #include "../doc/stage.hpp"

--- a/apps/opencs/model/tools/referenceablecheck.cpp
+++ b/apps/opencs/model/tools/referenceablecheck.cpp
@ -581,12 +581,12 @@ void CSMTools::ReferenceableCheckStage::creaturesLevListCheck(
    if ((mIgnoreBaseRecords && baseRecord.mState == CSMWorld::RecordBase::State_BaseOnly) || baseRecord.isDeleted())
        return;

-    const ESM::CreatureLevList& creatureLevList
+    const ESM::CreatureLevList& CreatureLevList
        = (dynamic_cast<const CSMWorld::Record<ESM::CreatureLevList>&>(baseRecord)).get();
-    // CreatureLevList but Type_CreatureLevelledList :/
-    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_CreatureLevelledList, creatureLevList.mId);
+    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_CreatureLevelledList,
+        CreatureLevList.mId); // CreatureLevList but Type_CreatureLevelledList :/

-    listCheck<ESM::CreatureLevList>(creatureLevList, messages, id.toString());
+    listCheck<ESM::CreatureLevList>(CreatureLevList, messages, id.toString());
 }

 void CSMTools::ReferenceableCheckStage::itemLevelledListCheck(
@ -598,10 +598,10 @@ void CSMTools::ReferenceableCheckStage::itemLevelledListCheck(
    if ((mIgnoreBaseRecords && baseRecord.mState == CSMWorld::RecordBase::State_BaseOnly) || baseRecord.isDeleted())
        return;

-    const ESM::ItemLevList& itemLevList = (dynamic_cast<const CSMWorld::Record<ESM::ItemLevList>&>(baseRecord)).get();
-    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_ItemLevelledList, itemLevList.mId);
+    const ESM::ItemLevList& ItemLevList = (dynamic_cast<const CSMWorld::Record<ESM::ItemLevList>&>(baseRecord)).get();
+    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_ItemLevelledList, ItemLevList.mId);

-    listCheck<ESM::ItemLevList>(itemLevList, messages, id.toString());
+    listCheck<ESM::ItemLevList>(ItemLevList, messages, id.toString());
 }

 void CSMTools::ReferenceableCheckStage::lightCheck(
--- a/apps/opencs/model/tools/tools.hpp
+++ b/apps/opencs/model/tools/tools.hpp
@ -6,7 +6,7 @@

 #include <apps/opencs/model/world/universalid.hpp>

-#include <components/toutf8/toutf8.hpp>
+#include <components/to_utf8/to_utf8.hpp>

 #include <QObject>

--- a/apps/opencs/model/world/actoradapter.cpp
+++ b/apps/opencs/model/world/actoradapter.cpp
@ -474,8 +474,8 @@ namespace CSMWorld
            return;
        }

-        const int typeColumn = mReferenceables.findColumnIndex(Columns::ColumnId_RecordType);
-        int type = mReferenceables.getData(index, typeColumn).toInt();
+        const int TypeColumn = mReferenceables.findColumnIndex(Columns::ColumnId_RecordType);
+        int type = mReferenceables.getData(index, TypeColumn).toInt();
        if (type == UniversalId::Type_Creature)
        {
            // Valid creature record
@ -606,8 +606,8 @@ namespace CSMWorld
            }
        };

-        const int typeColumn = mReferenceables.findColumnIndex(Columns::ColumnId_RecordType);
-        int type = mReferenceables.getData(index, typeColumn).toInt();
+        int TypeColumn = mReferenceables.findColumnIndex(Columns::ColumnId_RecordType);
+        int type = mReferenceables.getData(index, TypeColumn).toInt();
        if (type == UniversalId::Type_Armor)
        {
            auto& armor = dynamic_cast<const Record<ESM::Armor>&>(record).get();
--- a/apps/opencs/model/world/collection.hpp
+++ b/apps/opencs/model/world/collection.hpp
@ -273,6 +273,15 @@ namespace CSMWorld
        copy->mState = RecordBase::State_ModifiedOnly;
        setRecordId(destination, copy->get());

+        if constexpr (std::is_same_v<ESXRecordT, CSMWorld::CellRef>)
+        {
+            if (type == UniversalId::Type_Reference)
+            {
+                CSMWorld::CellRef* ptr = (CSMWorld::CellRef*)&copy->mModified;
+                ptr->mRefNum.mIndex = 0;
+            }
+        }
+
        if constexpr (std::is_same_v<ESXRecordT, ESM::Dialogue>)
        {
            copy->mModified.mStringId = copy->mModified.mId.getRefIdString();
--- a/apps/opencs/model/world/columnimp.cpp
+++ b/apps/opencs/model/world/columnimp.cpp
@ -86,14 +86,14 @@ namespace CSMWorld

    QVariant LandNormalsColumn::get(const Record<Land>& record) const
    {
-        const int size = Land::LAND_NUM_VERTS * 3;
+        const int Size = Land::LAND_NUM_VERTS * 3;
        const Land& land = record.get();

-        DataType values(size, 0);
+        DataType values(Size, 0);

        if (land.isDataLoaded(Land::DATA_VNML))
        {
-            for (int i = 0; i < size; ++i)
+            for (int i = 0; i < Size; ++i)
                values[i] = land.getLandData()->mNormals[i];
        }

@ -133,14 +133,14 @@ namespace CSMWorld

    QVariant LandHeightsColumn::get(const Record<Land>& record) const
    {
-        const int size = Land::LAND_NUM_VERTS;
+        const int Size = Land::LAND_NUM_VERTS;
        const Land& land = record.get();

-        DataType values(size, 0);
+        DataType values(Size, 0);

        if (land.isDataLoaded(Land::DATA_VHGT))
        {
-            for (int i = 0; i < size; ++i)
+            for (int i = 0; i < Size; ++i)
                values[i] = land.getLandData()->mHeights[i];
        }

@ -182,14 +182,14 @@ namespace CSMWorld

    QVariant LandColoursColumn::get(const Record<Land>& record) const
    {
-        const int size = Land::LAND_NUM_VERTS * 3;
+        const int Size = Land::LAND_NUM_VERTS * 3;
        const Land& land = record.get();

-        DataType values(size, 0);
+        DataType values(Size, 0);

        if (land.isDataLoaded(Land::DATA_VCLR))
        {
-            for (int i = 0; i < size; ++i)
+            for (int i = 0; i < Size; ++i)
                values[i] = land.getLandData()->mColours[i];
        }

@ -231,14 +231,14 @@ namespace CSMWorld

    QVariant LandTexturesColumn::get(const Record<Land>& record) const
    {
-        const int size = Land::LAND_NUM_TEXTURES;
+        const int Size = Land::LAND_NUM_TEXTURES;
        const Land& land = record.get();

-        DataType values(size, 0);
+        DataType values(Size, 0);

        if (land.isDataLoaded(Land::DATA_VTEX))
        {
-            for (int i = 0; i < size; ++i)
+            for (int i = 0; i < Size; ++i)
                values[i] = land.getLandData()->mTextures[i];
        }

--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@ -143,7 +143,7 @@ CSMWorld::Data::Data(ToUTF8::FromType encoding, const Files::PathContainer& data
    , mArchives(archives)
    , mVFS(std::make_unique<VFS::Manager>())
 {
-    VFS::registerArchives(mVFS.get(), Files::Collections(mDataPaths), mArchives, true, &mEncoder.getStatelessEncoder());
+    VFS::registerArchives(mVFS.get(), Files::Collections(mDataPaths), mArchives, true);

    mResourcesManager.setVFS(mVFS.get());

@ -1465,7 +1465,7 @@ std::vector<ESM::RefId> CSMWorld::Data::getIds(bool listDeleted) const
 void CSMWorld::Data::assetsChanged()
 {
    mVFS.get()->reset();
-    VFS::registerArchives(mVFS.get(), Files::Collections(mDataPaths), mArchives, true, &mEncoder.getStatelessEncoder());
+    VFS::registerArchives(mVFS.get(), Files::Collections(mDataPaths), mArchives, true);

    const UniversalId assetTableIds[] = { UniversalId::Type_Meshes, UniversalId::Type_Icons, UniversalId::Type_Musics,
        UniversalId::Type_SoundsRes, UniversalId::Type_Textures, UniversalId::Type_Videos };
--- a/apps/opencs/model/world/data.hpp
+++ b/apps/opencs/model/world/data.hpp
@ -38,7 +38,7 @@
 #include <components/esm3/selectiongroup.hpp>
 #include <components/files/multidircollection.hpp>
 #include <components/misc/algorithm.hpp>
-#include <components/toutf8/toutf8.hpp>
+#include <components/to_utf8/to_utf8.hpp>

 #include "cell.hpp"
 #include "idcollection.hpp"
--- a/apps/opencs/model/world/idcollection.cpp
+++ b/apps/opencs/model/world/idcollection.cpp
@ -59,13 +59,14 @@ namespace CSMWorld

    const Record<ESM::LandTexture>* IdCollection<ESM::LandTexture>::searchRecord(std::uint16_t index, int plugin) const
    {
-        const auto it = mIndices.find({ plugin, index });
-        if (it == mIndices.end())
-            return nullptr;
-        const int recordIndex = searchId(it->second);
-        if (recordIndex == -1)
-            return nullptr;
-        return &getRecord(recordIndex);
+        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
--- a/Show more
+++ b/Show more