diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 06c7e63cb0..406d6411d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -533,7 +533,7 @@ macOS14_Xcode15_arm64:
 
 .Windows_Ninja_Base:
   tags:
-    - windows
+    - saas-windows-medium-amd64
   rules:
     - if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event"
   before_script:
@@ -570,10 +570,10 @@ macOS14_Xcode15_arm64:
     - $env:CCACHE_BASEDIR = Get-Location
     - $env:CCACHE_DIR = "$(Get-Location)\ccache"
     - New-Item -Type Directory -Force -Path $env:CCACHE_DIR
-    - New-Item -Type File -Force -Path MSVC2019_64_Ninja\.cmake\api\v1\query\codemodel-v2
-    - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V -N -b -t -C $multiview -E
+    - New-Item -Type File -Force -Path MSVC2022_64_Ninja\.cmake\api\v1\query\codemodel-v2
+    - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2022 -k -V -N -b -t -C $multiview -E
     - Get-Volume
-    - cd MSVC2019_64_Ninja
+    - cd MSVC2022_64_Ninja
     - .\ActivateMSVC.ps1
     - cmake --build . --config $config
     - ccache --show-stats -v
@@ -583,47 +583,41 @@ macOS14_Xcode15_arm64:
     - Get-ChildItem -Recurse *.ilk | Remove-Item
     - |
       if (Get-ChildItem -Recurse *.pdb) {
-        7z a -tzip "..\..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip"))" '*.pdb' CI-ID.txt
+        7z a -tzip "..\..\$(Make-SafeFileName("OpenMW_MSVC2022_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip"))" '*.pdb' CI-ID.txt
         if (Test-Path env:AWS_ACCESS_KEY_ID) {
-          aws --endpoint-url https://rgw.ctrl-c.liu.se s3 cp "..\..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip"))" s3://openmw-artifacts/${artifactDirectory}
+          aws --endpoint-url https://rgw.ctrl-c.liu.se s3 cp "..\..\$(Make-SafeFileName("OpenMW_MSVC2022_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip"))" s3://openmw-artifacts/${artifactDirectory}
         }
         Push-Location ..
         ..\CI\Store-Symbols.ps1
         if (Test-Path env:AWS_ACCESS_KEY_ID) {
           aws --endpoint-url https://rgw.ctrl-c.liu.se s3 cp --recursive --exclude * --include *.ex_ --include *.dl_ --include *.pd_ .\SymStore s3://openmw-sym
         }
-        7z a -tzip "..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_sym_store.zip"))" '.\SymStore\*' $config\CI-ID.txt
+        7z a -tzip "..\$(Make-SafeFileName("OpenMW_MSVC2022_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_sym_store.zip"))" '.\SymStore\*' $config\CI-ID.txt
         Pop-Location
         Get-ChildItem -Recurse *.pdb | Remove-Item
       }
-    - 7z a -tzip "..\..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}.zip"))" '*'
+    - 7z a -tzip "..\..\$(Make-SafeFileName("OpenMW_MSVC2022_64_${config}_${CI_COMMIT_REF_NAME}.zip"))" '*'
     - |
       if (Test-Path env:AWS_ACCESS_KEY_ID) {
-        aws --endpoint-url https://rgw.ctrl-c.liu.se s3 cp "..\..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}.zip"))" s3://openmw-artifacts/${artifactDirectory}
+        aws --endpoint-url https://rgw.ctrl-c.liu.se s3 cp "..\..\$(Make-SafeFileName("OpenMW_MSVC2022_64_${config}_${CI_COMMIT_REF_NAME}.zip"))" s3://openmw-artifacts/${artifactDirectory}
       }
     - if ($executables) { foreach ($exe in $executables.Split(',')) { & .\$exe } }
   after_script:
     - Get-Volume
     - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
   cache:
-    key: ninja-v8
+    key: ninja-2022-v9
     paths:
     - ccache
     - deps
-    - MSVC2019_64_Ninja/deps/Qt
+    - MSVC2022_64_Ninja/deps/Qt
   artifacts:
     when: always
     paths:
     - "*.zip"
     - "*.log"
-    - MSVC2019_64_Ninja/*.log
-    - MSVC2019_64_Ninja/*/*.log
-    - MSVC2019_64_Ninja/*/*/*.log
-    - MSVC2019_64_Ninja/*/*/*/*.log
-    - MSVC2019_64_Ninja/*/*/*/*/*.log
-    - MSVC2019_64_Ninja/*/*/*/*/*/*.log
-    - MSVC2019_64_Ninja/*/*/*/*/*/*/*.log
-    - MSVC2019_64_Ninja/*/*/*/*/*/*/*/*.log
+    - MSVC2022_64_Ninja/*.log
+    - MSVC2022_64_Ninja/**/*.log
   # When CCache doesn't exist (e.g. first build on a fork), build takes more than 1h, which is the default for forks.
   timeout: 2h
 
@@ -656,7 +650,7 @@ macOS14_Xcode15_arm64:
 
 .Windows_MSBuild_Base:
   tags:
-    - windows
+    - saas-windows-medium-amd64
   rules:
     - if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event"
   before_script:
@@ -688,9 +682,9 @@ macOS14_Xcode15_arm64:
     - $time = (Get-Date -Format "HH:mm:ss")
     - echo ${time}
     - echo "started by ${GITLAB_USER_NAME}"
-    - New-Item -Type File -Force -Path MSVC2019_64\.cmake\api\v1\query\codemodel-v2
-    - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V -b -t -C $multiview -E
-    - cd MSVC2019_64
+    - New-Item -Type File -Force -Path MSVC2022_64\.cmake\api\v1\query\codemodel-v2
+    - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2022 -k -V -b -t -C $multiview -E
+    - cd MSVC2022_64
     - Get-Volume
     - cmake --build . --config $config
     - cd $config
@@ -699,46 +693,40 @@ macOS14_Xcode15_arm64:
     - Get-ChildItem -Recurse *.ilk | Remove-Item
     - |
       if (Get-ChildItem -Recurse *.pdb) {
-        7z a -tzip "..\..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip"))" '*.pdb' CI-ID.txt
+        7z a -tzip "..\..\$(Make-SafeFileName("OpenMW_MSVC2022_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip"))" '*.pdb' CI-ID.txt
         if (Test-Path env:AWS_ACCESS_KEY_ID) {
-          aws --endpoint-url https://rgw.ctrl-c.liu.se s3 cp "..\..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip"))" s3://openmw-artifacts/${artifactDirectory}
+          aws --endpoint-url https://rgw.ctrl-c.liu.se s3 cp "..\..\$(Make-SafeFileName("OpenMW_MSVC2022_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip"))" s3://openmw-artifacts/${artifactDirectory}
         }
         Push-Location ..
         ..\CI\Store-Symbols.ps1
         if (Test-Path env:AWS_ACCESS_KEY_ID) {
           aws --endpoint-url https://rgw.ctrl-c.liu.se s3 cp --recursive --exclude * --include *.ex_ --include *.dl_ --include *.pd_ .\SymStore s3://openmw-sym
         }
-        7z a -tzip "..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_sym_store.zip"))" '.\SymStore\*' $config\CI-ID.txt
+        7z a -tzip "..\$(Make-SafeFileName("OpenMW_MSVC2022_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_sym_store.zip"))" '.\SymStore\*' $config\CI-ID.txt
         Pop-Location
         Get-ChildItem -Recurse *.pdb | Remove-Item
       }
-    - 7z a -tzip "..\..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}.zip"))" '*'
+    - 7z a -tzip "..\..\$(Make-SafeFileName("OpenMW_MSVC2022_64_${config}_${CI_COMMIT_REF_NAME}.zip"))" '*'
     - |
       if (Test-Path env:AWS_ACCESS_KEY_ID) {
-        aws --endpoint-url https://rgw.ctrl-c.liu.se s3 cp "..\..\$(Make-SafeFileName("OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}.zip"))" s3://openmw-artifacts/${artifactDirectory}
+        aws --endpoint-url https://rgw.ctrl-c.liu.se s3 cp "..\..\$(Make-SafeFileName("OpenMW_MSVC2022_64_${config}_${CI_COMMIT_REF_NAME}.zip"))" s3://openmw-artifacts/${artifactDirectory}
       }
     - if ($executables) { foreach ($exe in $executables.Split(',')) { & .\$exe } }
   after_script:
     - Get-Volume
     - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
   cache:
-    key: msbuild-v8
+    key: msbuild-2022-v9
     paths:
     - deps
-    - MSVC2019_64/deps/Qt
+    - MSVC2022_64/deps/Qt
   artifacts:
     when: always
     paths:
     - "*.zip"
     - "*.log"
-    - MSVC2019_64/*.log
-    - MSVC2019_64/*/*.log
-    - MSVC2019_64/*/*/*.log
-    - MSVC2019_64/*/*/*/*.log
-    - MSVC2019_64/*/*/*/*/*.log
-    - MSVC2019_64/*/*/*/*/*/*.log
-    - MSVC2019_64/*/*/*/*/*/*/*.log
-    - MSVC2019_64/*/*/*/*/*/*/*/*.log
+    - MSVC2022_64/*.log
+    - MSVC2022_64/**/*.log
   # When CCache doesn't exist (e.g. first build on a fork), build takes more than 1h, which is the default for forks.
   timeout: 2h
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f2ee0eb63..e935364264 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@
     Bug #6657: Distant terrain tiles become black when using FWIW mod
     Bug #6661: Saved games that have no preview screenshot cause issues or crashes
     Bug #6716: mwscript comparison operator handling is too restrictive
+    Bug #6723: "Turn to movement direction" makes the player rotate wildly with COLLADA
     Bug #6754: Beast to Non-beast transformation mod is not working on OpenMW
     Bug #6758: Main menu background video can be stopped by opening the options menu
     Bug #6807: Ultimate Galleon is not working properly
@@ -169,6 +170,7 @@
     Bug #7899: Editor: Doors can't be unlocked
     Bug #7901: Editor: Teleport-related fields shouldn't be editable if a ref does not teleport
     Bug #7908: Key bindings names in the settings menu are layout-specific
+    Bug #7943: Using "addSoulGem" and "dropSoulGem" commands to creatures works only with "Weapon & Shield" flagged ones
     Feature #2566: Handle NAM9 records for manual cell references
     Feature #3537: Shader-based water ripples
     Feature #5173: Support for NiFogProperty
@@ -218,6 +220,7 @@
     Feature #7652: Sort inactive post processing shaders list properly
     Feature #7698: Implement sAbsorb, sDamage, sDrain, sFortify and sRestore
     Feature #7709: Improve resolution selection in Launcher
+    Feature #7777: Support external Bethesda material files (BGSM/BGEM)
     Feature #7792: Support Timescale Clouds
     Feature #7795: Support MaxNumberRipples INI setting
     Feature #7805: Lua Menu context
diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 3919507bd1..2423f0c54f 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -357,6 +357,16 @@ add_qt_image_dlls() {
 	QT_IMAGEFORMATS[$CONFIG]="${QT_IMAGEFORMATS[$CONFIG]} $@"
 }
 
+declare -A QT_ICONENGINES
+QT_ICONENGINES["Release"]=""
+QT_ICONENGINES["Debug"]=""
+QT_ICONENGINES["RelWithDebInfo"]=""
+add_qt_icon_dlls() {
+	local CONFIG=$1
+	shift
+	QT_ICONENGINES[$CONFIG]="${QT_ICONENGINES[$CONFIG]} $@"
+}
+
 if [ -z $PLATFORM ]; then
 	PLATFORM="$(uname -m)"
 fi
@@ -563,7 +573,7 @@ ICU_VER="70_1"
 LUAJIT_VER="v2.1.0-beta3-452-g7a0cf5fd"
 LZ4_VER="1.9.2"
 OPENAL_VER="1.23.0"
-QT_VER="5.15.2"
+QT_VER="6.6.2"
 
 OSG_ARCHIVE_NAME="OSGoS 3.6.5"
 OSG_ARCHIVE="OSGoS-3.6.5-123-g68c5c573d-msvc${OSG_MSVC_YEAR}-win${BITS}"
@@ -894,7 +904,7 @@ printf "Qt ${QT_VER}... "
 		printf "Exists. "
 	elif [ -z $SKIP_EXTRACT ]; then
 		pushd "$DEPS" > /dev/null
-		AQT_VERSION="v3.1.7"
+		AQT_VERSION="v3.1.12"
 		if ! [ -f "aqt_x64-${AQT_VERSION}.exe" ]; then
 			download "aqt ${AQT_VERSION}"\
 				"https://github.com/miurahr/aqtinstall/releases/download/${AQT_VERSION}/aqt_x64.exe" \
@@ -915,6 +925,9 @@ printf "Qt ${QT_VER}... "
 		echo Done.
 	fi
 
+	QT_MAJOR_VER=$(echo "${QT_VER}" | awk -F '[.]' '{printf "%d", $1}')
+	QT_MINOR_VER=$(echo "${QT_VER}" | awk -F '[.]' '{printf "%d", $2}')
+
 	cd $QT_SDK
 	for CONFIGURATION in ${CONFIGURATIONS[@]}; do
 		if [ $CONFIGURATION == "Debug" ]; then
@@ -922,14 +935,24 @@ printf "Qt ${QT_VER}... "
 		else
 			DLLSUFFIX=""
 		fi
-		if [ "${QT_VER:0:1}" -eq "6" ]; then
-			add_runtime_dlls $CONFIGURATION "$(pwd)/bin/Qt${QT_VER:0:1}"{Core,Gui,Network,OpenGL,OpenGLWidgets,Widgets,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"
+			else
+				add_qt_style_dlls $CONFIGURATION "$(pwd)/plugins/styles/qwindowsvistastyle${DLLSUFFIX}.dll"
+			fi
 		else
-			add_runtime_dlls $CONFIGURATION "$(pwd)/bin/Qt${QT_VER:0:1}"{Core,Gui,Network,OpenGL,Widgets,Svg}${DLLSUFFIX}.dll
+			add_runtime_dlls $CONFIGURATION "$(pwd)/bin/Qt${QT_MAJOR_VER}"{Core,Gui,Network,OpenGL,Widgets,Svg}${DLLSUFFIX}.dll
+			add_qt_style_dlls $CONFIGURATION "$(pwd)/plugins/styles/qwindowsvistastyle${DLLSUFFIX}.dll"
 		fi
+
 		add_qt_platform_dlls $CONFIGURATION "$(pwd)/plugins/platforms/qwindows${DLLSUFFIX}.dll"
-		add_qt_style_dlls $CONFIGURATION "$(pwd)/plugins/styles/qwindowsvistastyle${DLLSUFFIX}.dll"
 		add_qt_image_dlls $CONFIGURATION "$(pwd)/plugins/imageformats/qsvg${DLLSUFFIX}.dll"
+		add_qt_icon_dlls $CONFIGURATION "$(pwd)/plugins/iconengines/qsvgicon${DLLSUFFIX}.dll"
 	done
 	echo Done.
 }
@@ -1123,7 +1146,7 @@ fi
 			echo "    $(basename $DLL)"
 			cp "$DLL" "${DLL_PREFIX}styles"
 		done
-
+		echo
 		echo "- Qt Image Format DLLs..."
 		mkdir -p ${DLL_PREFIX}imageformats
 		for DLL in ${QT_IMAGEFORMATS[$CONFIGURATION]}; do
@@ -1131,6 +1154,13 @@ fi
 			cp "$DLL" "${DLL_PREFIX}imageformats"
 		done
 		echo
+		echo "- Qt Icon Engine DLLs..."
+		mkdir -p ${DLL_PREFIX}iconengines
+		for DLL in ${QT_ICONENGINES[$CONFIGURATION]}; do
+			echo "    $(basename $DLL)"
+			cp "$DLL" "${DLL_PREFIX}iconengines"
+		done
+		echo
 	done
 #fi
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 074c91344b..b478a799eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -825,6 +825,18 @@ if (OPENMW_OSX_DEPLOYMENT AND APPLE)
     get_filename_component(QT_QMACSTYLE_PLUGIN_NAME "${QT_QMACSTYLE_PLUGIN_PATH}" NAME)
     configure_file("${QT_QMACSTYLE_PLUGIN_PATH}" "${APP_BUNDLE_DIR}/Contents/PlugIns/${QT_QMACSTYLE_PLUGIN_GROUP}/${QT_QMACSTYLE_PLUGIN_NAME}" COPYONLY)
 
+    get_property(QT_QSVG_PLUGIN_PATH TARGET Qt${QT_VERSION_MAJOR}::QSvgPlugin PROPERTY LOCATION_RELEASE)
+    get_filename_component(QT_QSVG_PLUGIN_DIR "${QT_QSVG_PLUGIN_PATH}" DIRECTORY)
+    get_filename_component(QT_QSVG_PLUGIN_GROUP "${QT_QSVG_PLUGIN_DIR}" NAME)
+    get_filename_component(QT_QSVG_PLUGIN_NAME "${QT_QSVG_PLUGIN_PATH}" NAME)
+    configure_file("${QT_QSVG_PLUGIN_PATH}" "${APP_BUNDLE_DIR}/Contents/PlugIns/${QT_QSVG_PLUGIN_GROUP}/${QT_QSVG_PLUGIN_NAME}" COPYONLY)
+
+    get_property(QT_QSVG_ICON_PLUGIN_PATH TARGET Qt${QT_VERSION_MAJOR}::QSvgIconPlugin PROPERTY LOCATION_RELEASE)
+    get_filename_component(QT_QSVG_ICON_PLUGIN_DIR "${QT_QSVG_ICON_PLUGIN_PATH}" DIRECTORY)
+    get_filename_component(QT_QSVG_ICON_PLUGIN_GROUP "${QT_QSVG_ICON_PLUGIN_DIR}" NAME)
+    get_filename_component(QT_QSVG_ICON_PLUGIN_NAME "${QT_QSVG_ICON_PLUGIN_PATH}" NAME)
+    configure_file("${QT_QSVG_ICON_PLUGIN_PATH}" "${APP_BUNDLE_DIR}/Contents/PlugIns/${QT_QSVG_ICON_PLUGIN_GROUP}/${QT_QSVG_ICON_PLUGIN_NAME}" COPYONLY)
+
     configure_file("${OpenMW_SOURCE_DIR}/files/mac/qt.conf" "${APP_BUNDLE_DIR}/Contents/Resources/qt.conf" COPYONLY)
 
     if (BUILD_OPENCS)
@@ -832,13 +844,9 @@ if (OPENMW_OSX_DEPLOYMENT AND APPLE)
         set(OPENCS_BUNDLE_NAME "${OPENCS_BUNDLE_NAME_TMP}.app")
         configure_file("${QT_COCOA_PLUGIN_PATH}" "${OPENCS_BUNDLE_NAME}/Contents/PlugIns/${QT_COCOA_PLUGIN_GROUP}/${QT_COCOA_PLUGIN_NAME}" COPYONLY)
         configure_file("${QT_QMACSTYLE_PLUGIN_PATH}" "${OPENCS_BUNDLE_NAME}/Contents/PlugIns/${QT_QMACSTYLE_PLUGIN_GROUP}/${QT_QMACSTYLE_PLUGIN_NAME}" COPYONLY)
-        configure_file("${OpenMW_SOURCE_DIR}/files/mac/qt.conf" "${OPENCS_BUNDLE_NAME}/Contents/Resources/qt.conf" COPYONLY)
-
-        get_property(QT_QSVG_PLUGIN_PATH TARGET Qt${QT_VERSION_MAJOR}::QSvgPlugin PROPERTY LOCATION_RELEASE)
-        get_filename_component(QT_QSVG_PLUGIN_DIR "${QT_QSVG_PLUGIN_PATH}" DIRECTORY)
-        get_filename_component(QT_QSVG_PLUGIN_GROUP "${QT_QSVG_PLUGIN_DIR}" NAME)
-        get_filename_component(QT_QSVG_PLUGIN_NAME "${QT_QSVG_PLUGIN_PATH}" NAME)
         configure_file("${QT_QSVG_PLUGIN_PATH}" "${OPENCS_BUNDLE_NAME}/Contents/PlugIns/${QT_QSVG_PLUGIN_GROUP}/${QT_QSVG_PLUGIN_NAME}" COPYONLY)
+        configure_file("${QT_QSVG_ICON_PLUGIN_PATH}" "${OPENCS_BUNDLE_NAME}/Contents/PlugIns/${QT_QSVG_ICON_PLUGIN_GROUP}/${QT_QSVG_ICON_PLUGIN_NAME}" COPYONLY)
+        configure_file("${OpenMW_SOURCE_DIR}/files/mac/qt.conf" "${OPENCS_BUNDLE_NAME}/Contents/Resources/qt.conf" COPYONLY)
     endif ()
 
     install(DIRECTORY "${APP_BUNDLE_DIR}" USE_SOURCE_PERMISSIONS DESTINATION "." COMPONENT Runtime)
diff --git a/apps/bulletobjecttool/main.cpp b/apps/bulletobjecttool/main.cpp
index b27c8135d6..4dbdb56350 100644
--- a/apps/bulletobjecttool/main.cpp
+++ b/apps/bulletobjecttool/main.cpp
@@ -12,6 +12,7 @@
 #include <components/files/multidircollection.hpp>
 #include <components/misc/strings/conversion.hpp>
 #include <components/platform/platform.hpp>
+#include <components/resource/bgsmfilemanager.hpp>
 #include <components/resource/bulletshape.hpp>
 #include <components/resource/bulletshapemanager.hpp>
 #include <components/resource/foreachbulletobject.hpp>
@@ -173,7 +174,8 @@ namespace
         constexpr double expiryDelay = 0;
         Resource::ImageManager imageManager(&vfs, expiryDelay);
         Resource::NifFileManager nifFileManager(&vfs, &encoder.getStatelessEncoder());
-        Resource::SceneManager sceneManager(&vfs, &imageManager, &nifFileManager, expiryDelay);
+        Resource::BgsmFileManager bgsmFileManager(&vfs, expiryDelay);
+        Resource::SceneManager sceneManager(&vfs, &imageManager, &nifFileManager, &bgsmFileManager, expiryDelay);
         Resource::BulletShapeManager bulletShapeManager(&vfs, &sceneManager, &nifFileManager, expiryDelay);
 
         Resource::forEachBulletObject(
diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt
index bd6a7062fd..91b985948d 100644
--- a/apps/launcher/CMakeLists.txt
+++ b/apps/launcher/CMakeLists.txt
@@ -83,7 +83,7 @@ target_link_libraries(openmw-launcher
     components_qt
 )
 
-target_link_libraries(openmw-launcher Qt::Widgets Qt::Core)
+target_link_libraries(openmw-launcher Qt::Widgets Qt::Core Qt::Svg)
 
 if (BUILD_WITH_CODE_COVERAGE)
     target_compile_options(openmw-launcher PRIVATE --coverage)
diff --git a/apps/navmeshtool/main.cpp b/apps/navmeshtool/main.cpp
index 94ab7ef082..d75a1af5e2 100644
--- a/apps/navmeshtool/main.cpp
+++ b/apps/navmeshtool/main.cpp
@@ -19,6 +19,7 @@
 #include <components/files/conversion.hpp>
 #include <components/files/multidircollection.hpp>
 #include <components/platform/platform.hpp>
+#include <components/resource/bgsmfilemanager.hpp>
 #include <components/resource/bulletshapemanager.hpp>
 #include <components/resource/imagemanager.hpp>
 #include <components/resource/niffilemanager.hpp>
@@ -220,7 +221,8 @@ namespace NavMeshTool
 
             Resource::ImageManager imageManager(&vfs, expiryDelay);
             Resource::NifFileManager nifFileManager(&vfs, &encoder.getStatelessEncoder());
-            Resource::SceneManager sceneManager(&vfs, &imageManager, &nifFileManager, expiryDelay);
+            Resource::BgsmFileManager bgsmFileManager(&vfs, expiryDelay);
+            Resource::SceneManager sceneManager(&vfs, &imageManager, &nifFileManager, &bgsmFileManager, expiryDelay);
             Resource::BulletShapeManager bulletShapeManager(&vfs, &sceneManager, &nifFileManager, expiryDelay);
             DetourNavigator::RecastGlobalAllocator::init();
             DetourNavigator::Settings navigatorSettings = DetourNavigator::makeSettingsFromSettingsManager();
diff --git a/apps/niftest/niftest.cpp b/apps/niftest/niftest.cpp
index b37d85d739..0b8aa8e275 100644
--- a/apps/niftest/niftest.cpp
+++ b/apps/niftest/niftest.cpp
@@ -8,6 +8,7 @@
 #include <utility>
 #include <vector>
 
+#include <components/bgsm/file.hpp>
 #include <components/files/configurationmanager.hpp>
 #include <components/files/constrainedfilestream.hpp>
 #include <components/files/conversion.hpp>
@@ -25,7 +26,7 @@
 namespace bpo = boost::program_options;
 
 /// See if the file has the named extension
-bool hasExtension(const std::filesystem::path& filename, const std::string& extensionToFind)
+bool hasExtension(const std::filesystem::path& filename, std::string_view extensionToFind)
 {
     const auto extension = Files::pathToUnicodeString(filename.extension());
     return Misc::StringUtils::ciEqual(extension, extensionToFind);
@@ -36,6 +37,13 @@ bool isNIF(const std::filesystem::path& filename)
 {
     return hasExtension(filename, ".nif") || hasExtension(filename, ".kf");
 }
+
+/// Check if the file is a material file.
+bool isMaterial(const std::filesystem::path& filename)
+{
+    return hasExtension(filename, ".bgem") || hasExtension(filename, ".bgsm");
+}
+
 /// See if the file has the "bsa" extension.
 bool isBSA(const std::filesystem::path& filename)
 {
@@ -51,16 +59,17 @@ std::unique_ptr<VFS::Archive> makeArchive(const std::filesystem::path& path)
     return nullptr;
 }
 
-void readNIF(
+void readFile(
     const std::filesystem::path& source, const std::filesystem::path& path, const VFS::Manager* vfs, bool quiet)
 {
     const std::string pathStr = Files::pathToUnicodeString(path);
+    const bool isNif = isNIF(path);
     if (!quiet)
     {
-        if (hasExtension(path, ".kf"))
-            std::cout << "Reading KF file '" << pathStr << "'";
+        if (isNif)
+            std::cout << "Reading " << (hasExtension(path, ".nif") ? "NIF" : "KF") << " file '" << pathStr << "'";
         else
-            std::cout << "Reading NIF file '" << pathStr << "'";
+            std::cout << "Reading " << (hasExtension(path, ".bgsm") ? "BGSM" : "BGEM") << " file '" << pathStr << "'";
         if (!source.empty())
             std::cout << " from '" << Files::pathToUnicodeString(isBSA(source) ? source.filename() : source) << "'";
         std::cout << std::endl;
@@ -68,12 +77,22 @@ void readNIF(
     const std::filesystem::path fullPath = !source.empty() ? source / path : path;
     try
     {
-        Nif::NIFFile file(Files::pathToUnicodeString(fullPath));
-        Nif::Reader reader(file, nullptr);
-        if (vfs != nullptr)
-            reader.parse(vfs->get(pathStr));
+        if (isNif)
+        {
+            Nif::NIFFile file(Files::pathToUnicodeString(fullPath));
+            Nif::Reader reader(file, nullptr);
+            if (vfs != nullptr)
+                reader.parse(vfs->get(pathStr));
+            else
+                reader.parse(Files::openConstrainedFileStream(fullPath));
+        }
         else
-            reader.parse(Files::openConstrainedFileStream(fullPath));
+        {
+            if (vfs != nullptr)
+                Bgsm::parse(vfs->get(pathStr));
+            else
+                Bgsm::parse(Files::openConstrainedFileStream(fullPath));
+        }
     }
     catch (std::exception& e)
     {
@@ -95,11 +114,11 @@ void readVFS(std::unique_ptr<VFS::Archive>&& archive, const std::filesystem::pat
     vfs.addArchive(std::move(archive));
     vfs.buildIndex();
 
-    for (const auto& name : vfs.getRecursiveDirectoryIterator(""))
+    for (const auto& name : vfs.getRecursiveDirectoryIterator())
     {
-        if (isNIF(name.value()))
+        if (isNIF(name.value()) || isMaterial(name.value()))
         {
-            readNIF(archivePath, name.value(), &vfs, quiet);
+            readFile(archivePath, name.value(), &vfs, quiet);
         }
     }
 
@@ -129,10 +148,10 @@ void readVFS(std::unique_ptr<VFS::Archive>&& archive, const std::filesystem::pat
 bool parseOptions(int argc, char** argv, Files::PathContainer& files, Files::PathContainer& archives,
     bool& writeDebugLog, bool& quiet)
 {
-    bpo::options_description desc(R"(Ensure that OpenMW can use the provided NIF, KF and BSA/BA2 files
+    bpo::options_description desc(R"(Ensure that OpenMW can use the provided NIF, KF, BGEM/BGSM and BSA/BA2 files
 
 Usages:
-  niftest <nif files, kf files, BSA/BA2 files, or directories>
+  niftest <nif files, kf files, bgem/bgsm files, BSA/BA2 files, or directories>
       Scan the file or directories for NIF errors.
 
 Allowed options)");
@@ -221,9 +240,9 @@ int main(int argc, char** argv)
         const std::string pathStr = Files::pathToUnicodeString(path);
         try
         {
-            if (isNIF(path))
+            if (isNIF(path) || isMaterial(path))
             {
-                readNIF({}, path, vfs.get(), quiet);
+                readFile({}, path, vfs.get(), quiet);
             }
             else if (auto archive = makeArchive(path))
             {
@@ -231,7 +250,7 @@ int main(int argc, char** argv)
             }
             else
             {
-                std::cerr << "Error: '" << pathStr << "' is not a NIF/KF file, BSA/BA2 archive, or directory"
+                std::cerr << "Error: '" << pathStr << "' is not a NIF/KF/BGEM/BGSM file, BSA/BA2 archive, or directory"
                           << std::endl;
             }
         }
diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 3353a4586f..d6af64b33b 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -257,6 +257,7 @@ endif()
 
 if (WIN32)
     target_link_libraries(openmw-cs-lib ${Boost_LOCALE_LIBRARY})
+    target_sources(openmw-cs PRIVATE ${CMAKE_SOURCE_DIR}/files/windows/openmw-cs.exe.manifest)
 endif()
 
 if (WIN32 AND BUILD_OPENCS)
diff --git a/apps/opencs/model/world/columns.cpp b/apps/opencs/model/world/columns.cpp
index bdbb8f697c..d4c35c5cec 100644
--- a/apps/opencs/model/world/columns.cpp
+++ b/apps/opencs/model/world/columns.cpp
@@ -324,7 +324,6 @@ namespace CSMWorld
             { ColumnId_MaxAttack, "Max Attack" },
             { ColumnId_CreatureMisc, "Creature Misc" },
 
-            { ColumnId_Idle1, "Idle 1" },
             { ColumnId_Idle2, "Idle 2" },
             { ColumnId_Idle3, "Idle 3" },
             { ColumnId_Idle4, "Idle 4" },
@@ -332,6 +331,7 @@ namespace CSMWorld
             { ColumnId_Idle6, "Idle 6" },
             { ColumnId_Idle7, "Idle 7" },
             { ColumnId_Idle8, "Idle 8" },
+            { ColumnId_Idle9, "Idle 9" },
 
             { ColumnId_RegionWeather, "Weather" },
             { ColumnId_WeatherName, "Type" },
diff --git a/apps/opencs/model/world/columns.hpp b/apps/opencs/model/world/columns.hpp
index 3c4bff07f6..469c1eee33 100644
--- a/apps/opencs/model/world/columns.hpp
+++ b/apps/opencs/model/world/columns.hpp
@@ -310,14 +310,14 @@ namespace CSMWorld
             ColumnId_MaxAttack = 284,
             ColumnId_CreatureMisc = 285,
 
-            ColumnId_Idle1 = 286,
-            ColumnId_Idle2 = 287,
-            ColumnId_Idle3 = 288,
-            ColumnId_Idle4 = 289,
-            ColumnId_Idle5 = 290,
-            ColumnId_Idle6 = 291,
-            ColumnId_Idle7 = 292,
-            ColumnId_Idle8 = 293,
+            ColumnId_Idle2 = 286,
+            ColumnId_Idle3 = 287,
+            ColumnId_Idle4 = 288,
+            ColumnId_Idle5 = 289,
+            ColumnId_Idle6 = 290,
+            ColumnId_Idle7 = 291,
+            ColumnId_Idle8 = 292,
+            ColumnId_Idle9 = 293,
 
             ColumnId_RegionWeather = 294,
             ColumnId_WeatherName = 295,
diff --git a/apps/opencs/model/world/refidcollection.cpp b/apps/opencs/model/world/refidcollection.cpp
index c3af3d4673..e0d5799726 100644
--- a/apps/opencs/model/world/refidcollection.cpp
+++ b/apps/opencs/model/world/refidcollection.cpp
@@ -210,7 +210,6 @@ CSMWorld::RefIdCollection::RefIdCollection()
     mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_AiDuration, CSMWorld::ColumnBase::Display_Integer));
     mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_AiWanderToD, CSMWorld::ColumnBase::Display_Integer));
 
-    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle1, CSMWorld::ColumnBase::Display_Integer));
     mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle2, CSMWorld::ColumnBase::Display_Integer));
     mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle3, CSMWorld::ColumnBase::Display_Integer));
     mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle4, CSMWorld::ColumnBase::Display_Integer));
@@ -218,6 +217,7 @@ CSMWorld::RefIdCollection::RefIdCollection()
     mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle6, CSMWorld::ColumnBase::Display_Integer));
     mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle7, CSMWorld::ColumnBase::Display_Integer));
     mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle8, CSMWorld::ColumnBase::Display_Integer));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle9, CSMWorld::ColumnBase::Display_Integer));
 
     mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_AiWanderRepeat, CSMWorld::ColumnBase::Display_Boolean));
     mColumns.back().addColumn(
diff --git a/apps/opencs/model/world/resources.cpp b/apps/opencs/model/world/resources.cpp
index 9957af3d66..7082575c64 100644
--- a/apps/opencs/model/world/resources.cpp
+++ b/apps/opencs/model/world/resources.cpp
@@ -28,7 +28,7 @@ void CSMWorld::Resources::recreate(const VFS::Manager* vfs, const char* const* e
 
     size_t baseSize = mBaseDirectory.size();
 
-    for (const auto& filepath : vfs->getRecursiveDirectoryIterator(""))
+    for (const auto& filepath : vfs->getRecursiveDirectoryIterator())
     {
         const std::string_view view = filepath.view();
         if (view.size() < baseSize + 1 || !view.starts_with(mBaseDirectory) || view[baseSize] != '/')
diff --git a/apps/opencs/view/doc/startup.cpp b/apps/opencs/view/doc/startup.cpp
index 27463b0456..e6323bf1a1 100644
--- a/apps/opencs/view/doc/startup.cpp
+++ b/apps/opencs/view/doc/startup.cpp
@@ -10,7 +10,7 @@
 #include <QScreen>
 #include <QVBoxLayout>
 
-QPushButton* CSVDoc::StartupDialogue::addButton(const QString& label, const QIcon& icon)
+QPushButton* CSVDoc::StartupDialogue::addButton(const QString& label, const QString& icon)
 {
     int column = mColumn--;
 
@@ -39,13 +39,13 @@ QWidget* CSVDoc::StartupDialogue::createButtons()
     mLayout = new QGridLayout(widget);
 
     /// \todo add icons
-    QPushButton* loadDocument = addButton("Edit A Content File", QIcon(":startup/edit-content"));
+    QPushButton* loadDocument = addButton("Edit A Content File", ":startup/edit-content");
     connect(loadDocument, &QPushButton::clicked, this, &StartupDialogue::loadDocument);
 
-    QPushButton* createAddon = addButton("Create A New Addon", QIcon(":startup/create-addon"));
+    QPushButton* createAddon = addButton("Create A New Addon", ":startup/create-addon");
     connect(createAddon, &QPushButton::clicked, this, &StartupDialogue::createAddon);
 
-    QPushButton* createGame = addButton("Create A New Game", QIcon(":startup/create-game"));
+    QPushButton* createGame = addButton("Create A New Game", ":startup/create-game");
     connect(createGame, &QPushButton::clicked, this, &StartupDialogue::createGame);
 
     for (int i = 0; i < 3; ++i)
diff --git a/apps/opencs/view/doc/startup.hpp b/apps/opencs/view/doc/startup.hpp
index 061b91b2d1..f2cccfcd38 100644
--- a/apps/opencs/view/doc/startup.hpp
+++ b/apps/opencs/view/doc/startup.hpp
@@ -20,7 +20,7 @@ namespace CSVDoc
         int mColumn;
         QGridLayout* mLayout;
 
-        QPushButton* addButton(const QString& label, const QIcon& icon);
+        QPushButton* addButton(const QString& label, const QString& icon);
 
         QWidget* createButtons();
 
diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index f5cdb1b8fc..88a33108c0 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -1110,7 +1110,16 @@ void CSVDoc::View::updateWidth(bool isGrowLimit, int minSubViewWidth)
 {
     QRect rect;
     if (isGrowLimit)
-        rect = QApplication::screenAt(pos())->geometry();
+    {
+        // Widget position can be negative, we should clamp it.
+        QPoint position = pos();
+        if (position.x() <= 0)
+            position.setX(0);
+        if (position.y() <= 0)
+            position.setY(0);
+
+        rect = QApplication::screenAt(position)->geometry();
+    }
     else
         rect = desktopRect();
 
diff --git a/apps/opencs/view/render/actor.hpp b/apps/opencs/view/render/actor.hpp
index a9cc34b00d..09d896e7e7 100644
--- a/apps/opencs/view/render/actor.hpp
+++ b/apps/opencs/view/render/actor.hpp
@@ -62,7 +62,7 @@ namespace CSVRender
 
         osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
         SceneUtil::Skeleton* mSkeleton;
-        SceneUtil::NodeMapVisitor::NodeMap mNodeMap;
+        SceneUtil::NodeMap mNodeMap;
     };
 }
 
diff --git a/apps/opencs/view/render/instancemovemode.cpp b/apps/opencs/view/render/instancemovemode.cpp
index e4004a1537..bc999eb633 100644
--- a/apps/opencs/view/render/instancemovemode.cpp
+++ b/apps/opencs/view/render/instancemovemode.cpp
@@ -8,7 +8,7 @@
 class QWidget;
 
 CSVRender::InstanceMoveMode::InstanceMoveMode(QWidget* parent)
-    : ModeButton(QIcon(QPixmap(":scenetoolbar/transform-move")),
+    : ModeButton(QIcon(":scenetoolbar/transform-move"),
         "Move selected instances"
         "<ul><li>Use {scene-edit-primary} to move instances around freely</li>"
         "<li>Use {scene-edit-secondary} to move instances around within the grid</li>"
diff --git a/apps/opencs/view/widget/scenetoolmode.cpp b/apps/opencs/view/widget/scenetoolmode.cpp
index f2795d6de9..1fa7cfb690 100644
--- a/apps/opencs/view/widget/scenetoolmode.cpp
+++ b/apps/opencs/view/widget/scenetoolmode.cpp
@@ -94,7 +94,7 @@ void CSVWidget::SceneToolMode::showPanel(const QPoint& position)
 
 void CSVWidget::SceneToolMode::addButton(const std::string& icon, const std::string& id, const QString& tooltip)
 {
-    ModeButton* button = new ModeButton(QIcon(QPixmap(icon.c_str())), tooltip, mPanel);
+    ModeButton* button = new ModeButton(QIcon(icon.c_str()), tooltip, mPanel);
     addButton(button, id);
 }
 
diff --git a/apps/opencs/view/widget/scenetoolshapebrush.cpp b/apps/opencs/view/widget/scenetoolshapebrush.cpp
index 57b78ffc71..0e040c2385 100644
--- a/apps/opencs/view/widget/scenetoolshapebrush.cpp
+++ b/apps/opencs/view/widget/scenetoolshapebrush.cpp
@@ -60,10 +60,10 @@ CSVWidget::ShapeBrushWindow::ShapeBrushWindow(CSMDoc::Document& document, QWidge
     : QFrame(parent, Qt::Popup)
     , mDocument(document)
 {
-    mButtonPoint = new QPushButton(QIcon(QPixmap(":scenetoolbar/brush-point")), "", this);
-    mButtonSquare = new QPushButton(QIcon(QPixmap(":scenetoolbar/brush-square")), "", this);
-    mButtonCircle = new QPushButton(QIcon(QPixmap(":scenetoolbar/brush-circle")), "", this);
-    mButtonCustom = new QPushButton(QIcon(QPixmap(":scenetoolbar/brush-custom")), "", this);
+    mButtonPoint = new QPushButton(QIcon(":scenetoolbar/brush-point"), "", this);
+    mButtonSquare = new QPushButton(QIcon(":scenetoolbar/brush-square"), "", this);
+    mButtonCircle = new QPushButton(QIcon(":scenetoolbar/brush-circle"), "", this);
+    mButtonCustom = new QPushButton(QIcon(":scenetoolbar/brush-custom"), "", this);
 
     mSizeSliders = new ShapeBrushSizeControls("Brush size", this);
 
@@ -201,25 +201,25 @@ void CSVWidget::SceneToolShapeBrush::setButtonIcon(CSVWidget::BrushShape brushSh
     {
         case BrushShape_Point:
 
-            setIcon(QIcon(QPixmap(":scenetoolbar/brush-point")));
+            setIcon(QIcon(":scenetoolbar/brush-point"));
             tooltip += mShapeBrushWindow->toolTipPoint;
             break;
 
         case BrushShape_Square:
 
-            setIcon(QIcon(QPixmap(":scenetoolbar/brush-square")));
+            setIcon(QIcon(":scenetoolbar/brush-square"));
             tooltip += mShapeBrushWindow->toolTipSquare;
             break;
 
         case BrushShape_Circle:
 
-            setIcon(QIcon(QPixmap(":scenetoolbar/brush-circle")));
+            setIcon(QIcon(":scenetoolbar/brush-circle"));
             tooltip += mShapeBrushWindow->toolTipCircle;
             break;
 
         case BrushShape_Custom:
 
-            setIcon(QIcon(QPixmap(":scenetoolbar/brush-custom")));
+            setIcon(QIcon(":scenetoolbar/brush-custom"));
             tooltip += mShapeBrushWindow->toolTipCustom;
             break;
     }
diff --git a/apps/opencs/view/widget/scenetooltexturebrush.cpp b/apps/opencs/view/widget/scenetooltexturebrush.cpp
index 9c3e723009..2e002aaf2e 100644
--- a/apps/opencs/view/widget/scenetooltexturebrush.cpp
+++ b/apps/opencs/view/widget/scenetooltexturebrush.cpp
@@ -90,10 +90,10 @@ CSVWidget::TextureBrushWindow::TextureBrushWindow(CSMDoc::Document& document, QW
         mSelectedBrush = new QLabel(QString::fromStdString(mBrushTextureLabel));
     }
 
-    mButtonPoint = new QPushButton(QIcon(QPixmap(":scenetoolbar/brush-point")), "", this);
-    mButtonSquare = new QPushButton(QIcon(QPixmap(":scenetoolbar/brush-square")), "", this);
-    mButtonCircle = new QPushButton(QIcon(QPixmap(":scenetoolbar/brush-circle")), "", this);
-    mButtonCustom = new QPushButton(QIcon(QPixmap(":scenetoolbar/brush-custom")), "", this);
+    mButtonPoint = new QPushButton(QIcon(":scenetoolbar/brush-point"), "", this);
+    mButtonSquare = new QPushButton(QIcon(":scenetoolbar/brush-square"), "", this);
+    mButtonCircle = new QPushButton(QIcon(":scenetoolbar/brush-circle"), "", this);
+    mButtonCustom = new QPushButton(QIcon(":scenetoolbar/brush-custom"), "", this);
 
     mSizeSliders = new BrushSizeControls("Brush size", this);
 
@@ -282,25 +282,25 @@ void CSVWidget::SceneToolTextureBrush::setButtonIcon(CSVWidget::BrushShape brush
     {
         case BrushShape_Point:
 
-            setIcon(QIcon(QPixmap(":scenetoolbar/brush-point")));
+            setIcon(QIcon(":scenetoolbar/brush-point"));
             tooltip += mTextureBrushWindow->toolTipPoint;
             break;
 
         case BrushShape_Square:
 
-            setIcon(QIcon(QPixmap(":scenetoolbar/brush-square")));
+            setIcon(QIcon(":scenetoolbar/brush-square"));
             tooltip += mTextureBrushWindow->toolTipSquare;
             break;
 
         case BrushShape_Circle:
 
-            setIcon(QIcon(QPixmap(":scenetoolbar/brush-circle")));
+            setIcon(QIcon(":scenetoolbar/brush-circle"));
             tooltip += mTextureBrushWindow->toolTipCircle;
             break;
 
         case BrushShape_Custom:
 
-            setIcon(QIcon(QPixmap(":scenetoolbar/brush-custom")));
+            setIcon(QIcon(":scenetoolbar/brush-custom"));
             tooltip += mTextureBrushWindow->toolTipCustom;
             break;
     }
diff --git a/apps/opencs/view/widget/scenetooltoggle2.cpp b/apps/opencs/view/widget/scenetooltoggle2.cpp
index 8dbd1e804c..44bffa34a6 100644
--- a/apps/opencs/view/widget/scenetooltoggle2.cpp
+++ b/apps/opencs/view/widget/scenetooltoggle2.cpp
@@ -88,7 +88,7 @@ void CSVWidget::SceneToolToggle2::addButton(
     stream << mSingleIcon << id;
 
     PushButton* button = new PushButton(
-        QIcon(QPixmap(stream.str().c_str())), PushButton::Type_Toggle, tooltip.isEmpty() ? name : tooltip, mPanel);
+        QIcon(stream.str().c_str()), PushButton::Type_Toggle, tooltip.isEmpty() ? name : tooltip, mPanel);
 
     button->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
     button->setIconSize(QSize(mIconSize, mIconSize));
diff --git a/apps/opencs/view/world/dragrecordtable.cpp b/apps/opencs/view/world/dragrecordtable.cpp
index 11a0c9a540..a8a3df309c 100644
--- a/apps/opencs/view/world/dragrecordtable.cpp
+++ b/apps/opencs/view/world/dragrecordtable.cpp
@@ -29,7 +29,7 @@ void CSVWorld::DragRecordTable::startDragFromTable(const CSVWorld::DragRecordTab
     mime->setIndexAtDragStart(index);
     QDrag* drag = new QDrag(this);
     drag->setMimeData(mime);
-    drag->setPixmap(QString::fromUtf8(mime->getIcon().c_str()));
+    drag->setPixmap(QIcon(mime->getIcon().c_str()).pixmap(QSize(16, 16)));
     drag->exec(Qt::CopyAction);
 }
 
diff --git a/apps/opencs/view/world/tablesubview.cpp b/apps/opencs/view/world/tablesubview.cpp
index 891d954ad4..b48eaec31d 100644
--- a/apps/opencs/view/world/tablesubview.cpp
+++ b/apps/opencs/view/world/tablesubview.cpp
@@ -78,8 +78,16 @@ CSVWorld::TableSubView::TableSubView(
     widget->setLayout(layout);
 
     setWidget(widget);
+
+    // Widget position can be negative, we should clamp it.
+    QPoint position = pos();
+    if (position.x() <= 0)
+        position.setX(0);
+    if (position.y() <= 0)
+        position.setY(0);
+
     // prefer height of the screen and full width of the table
-    const QRect rect = QApplication::screenAt(pos())->geometry();
+    const QRect rect = QApplication::screenAt(position)->geometry();
     int frameHeight = 40; // set a reasonable default
     QWidget* topLevel = QApplication::topLevelAt(pos());
     if (topLevel)
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 63473fe67d..179dbcdc32 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -64,6 +64,7 @@
 #include "mwscript/interpretercontext.hpp"
 #include "mwscript/scriptmanagerimp.hpp"
 
+#include "mwsound/constants.hpp"
 #include "mwsound/soundmanagerimp.hpp"
 
 #include "mwworld/class.hpp"
@@ -987,9 +988,8 @@ void OMW::Engine::go()
         // start in main menu
         mWindowManager->pushGuiMode(MWGui::GM_MainMenu);
 
-        std::string titlefile = "music/special/morrowind title.mp3";
-        if (mVFS->exists(titlefile))
-            mSoundManager->streamMusic(titlefile, MWSound::MusicType::Special);
+        if (mVFS->exists(MWSound::titleMusic))
+            mSoundManager->streamMusic(MWSound::titleMusic, MWSound::MusicType::Special);
         else
             Log(Debug::Warning) << "Title music not found";
 
diff --git a/apps/openmw/mwbase/soundmanager.hpp b/apps/openmw/mwbase/soundmanager.hpp
index 05b925f87d..ab3f9c5605 100644
--- a/apps/openmw/mwbase/soundmanager.hpp
+++ b/apps/openmw/mwbase/soundmanager.hpp
@@ -117,7 +117,7 @@ namespace MWBase
         virtual void stopMusic() = 0;
         ///< Stops music if it's playing
 
-        virtual void streamMusic(const std::string& filename, MWSound::MusicType type, float fade = 1.f) = 0;
+        virtual void streamMusic(VFS::Path::NormalizedView filename, MWSound::MusicType type, float fade = 1.f) = 0;
         ///< Play a soundifle
         /// \param filename name of a sound file in the data directory.
         /// \param type music type.
@@ -126,7 +126,7 @@ namespace MWBase
         virtual bool isMusicPlaying() = 0;
         ///< Returns true if music is playing
 
-        virtual void playPlaylist(const std::string& playlist) = 0;
+        virtual void playPlaylist(VFS::Path::NormalizedView playlist) = 0;
         ///< Start playing music from the selected folder
         /// \param name of the folder that contains the playlist
         /// Title music playlist is predefined
diff --git a/apps/openmw/mwgui/levelupdialog.cpp b/apps/openmw/mwgui/levelupdialog.cpp
index 4950e3edf4..f1a40a3f16 100644
--- a/apps/openmw/mwgui/levelupdialog.cpp
+++ b/apps/openmw/mwgui/levelupdialog.cpp
@@ -22,6 +22,8 @@
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"
 
+#include "../mwsound/constants.hpp"
+
 #include "class.hpp"
 
 namespace
@@ -216,8 +218,7 @@ namespace MWGui
         center();
 
         // Play LevelUp Music
-        MWBase::Environment::get().getSoundManager()->streamMusic(
-            "Music/Special/MW_Triumph.mp3", MWSound::MusicType::Special);
+        MWBase::Environment::get().getSoundManager()->streamMusic(MWSound::triumphMusic, MWSound::MusicType::Special);
     }
 
     void LevelupDialog::onOkButtonClicked(MyGUI::Widget* sender)
diff --git a/apps/openmw/mwgui/loadingscreen.cpp b/apps/openmw/mwgui/loadingscreen.cpp
index 8ba2bb8312..3a9aba7828 100644
--- a/apps/openmw/mwgui/loadingscreen.cpp
+++ b/apps/openmw/mwgui/loadingscreen.cpp
@@ -67,7 +67,8 @@ namespace MWGui
                 != supported_extensions.end();
         };
 
-        for (const auto& name : mResourceSystem->getVFS()->getRecursiveDirectoryIterator("Splash/"))
+        constexpr VFS::Path::NormalizedView splash("splash/");
+        for (const auto& name : mResourceSystem->getVFS()->getRecursiveDirectoryIterator(splash))
         {
             if (isSupportedExtension(Misc::getFileExtension(name)))
                 mSplashScreens.push_back(name);
diff --git a/apps/openmw/mwgui/mainmenu.cpp b/apps/openmw/mwgui/mainmenu.cpp
index be3700342a..53f791fdac 100644
--- a/apps/openmw/mwgui/mainmenu.cpp
+++ b/apps/openmw/mwgui/mainmenu.cpp
@@ -6,6 +6,7 @@
 
 #include <components/settings/values.hpp>
 #include <components/vfs/manager.hpp>
+#include <components/vfs/pathutil.hpp>
 #include <components/widgets/imagebutton.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -37,7 +38,9 @@ namespace MWGui
         getWidget(mVersionText, "VersionText");
         mVersionText->setCaption(versionDescription);
 
-        mHasAnimatedMenu = mVFS->exists("video/menu_background.bik");
+        constexpr VFS::Path::NormalizedView menuBackgroundVideo("video/menu_background.bik");
+
+        mHasAnimatedMenu = mVFS->exists(menuBackgroundVideo);
 
         updateMenu();
     }
diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 396d0b18a3..075a338592 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -402,7 +402,8 @@ namespace MWGui
 
         std::vector<std::string> availableLanguages;
         const VFS::Manager* vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-        for (const auto& path : vfs->getRecursiveDirectoryIterator("l10n/"))
+        constexpr VFS::Path::NormalizedView l10n("l10n/");
+        for (const auto& path : vfs->getRecursiveDirectoryIterator(l10n))
         {
             if (Misc::getFileExtension(path) == "yaml")
             {
diff --git a/apps/openmw/mwgui/windowbase.cpp b/apps/openmw/mwgui/windowbase.cpp
index eff5c98588..f5d90590f8 100644
--- a/apps/openmw/mwgui/windowbase.cpp
+++ b/apps/openmw/mwgui/windowbase.cpp
@@ -7,7 +7,6 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#include <components/settings/values.hpp>
 #include <components/widgets/imagebutton.hpp>
 
 #include "draganddrop.hpp"
@@ -80,12 +79,12 @@ void WindowBase::center()
 
 void WindowBase::clampWindowCoordinates(MyGUI::Window* window)
 {
-    auto minSize = window->getMinSize();
-    minSize.height = static_cast<int>(minSize.height * Settings::gui().mScalingFactor);
-    minSize.width = static_cast<int>(minSize.width * Settings::gui().mScalingFactor);
+    MyGUI::IntSize viewSize = MyGUI::RenderManager::getInstance().getViewSize();
+    if (window->getLayer())
+        viewSize = window->getLayer()->getSize();
 
     // Window's minimum size is larger than the screen size, can not clamp coordinates
-    MyGUI::IntSize viewSize = MyGUI::RenderManager::getInstance().getViewSize();
+    auto minSize = window->getMinSize();
     if (minSize.width > viewSize.width || minSize.height > viewSize.height)
         return;
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 61a8b3361c..3212e8f02b 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -356,7 +356,8 @@ namespace MWGui
         mWindows.push_back(std::move(console));
         trackWindow(mConsole, makeConsoleWindowSettingValues());
 
-        bool questList = mResourceSystem->getVFS()->exists("textures/tx_menubook_options_over.dds");
+        constexpr VFS::Path::NormalizedView menubookOptionsOverTexture("textures/tx_menubook_options_over.dds");
+        const bool questList = mResourceSystem->getVFS()->exists(menubookOptionsOverTexture);
         auto journal = JournalWindow::create(JournalViewModel::create(), questList, mEncoding);
         mGuiModeStates[GM_Journal] = GuiModeState(journal.get());
         mWindows.push_back(std::move(journal));
diff --git a/apps/openmw/mwlua/soundbindings.cpp b/apps/openmw/mwlua/soundbindings.cpp
index 57d1e606c1..a5ec69b4fc 100644
--- a/apps/openmw/mwlua/soundbindings.cpp
+++ b/apps/openmw/mwlua/soundbindings.cpp
@@ -141,7 +141,7 @@ namespace MWLua
         api["streamMusic"] = [](std::string_view fileName, const sol::optional<sol::table>& options) {
             auto args = getStreamMusicArgs(options);
             MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
-            sndMgr->streamMusic(std::string(fileName), MWSound::MusicType::Scripted, args.mFade);
+            sndMgr->streamMusic(VFS::Path::Normalized(fileName), MWSound::MusicType::Scripted, args.mFade);
         };
 
         api["say"]
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index addf62df34..32f81c398e 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -39,6 +39,8 @@
 
 #include "../mwrender/vismask.hpp"
 
+#include "../mwsound/constants.hpp"
+
 #include "actor.hpp"
 #include "actorutil.hpp"
 #include "aicombataction.hpp"
@@ -1798,7 +1800,7 @@ namespace MWMechanics
                     MWBase::Environment::get().getStateManager()->askLoadRecent();
                     // Play Death Music if it was the player dying
                     MWBase::Environment::get().getSoundManager()->streamMusic(
-                        "Music/Special/MW_Death.mp3", MWSound::MusicType::Special);
+                        MWSound::deathMusic, MWSound::MusicType::Special);
                 }
                 else
                 {
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 47fba46c75..048476c6ef 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -29,6 +29,8 @@
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 
+#include "../mwsound/constants.hpp"
+
 #include "actor.hpp"
 #include "actors.hpp"
 #include "actorutil.hpp"
@@ -1678,12 +1680,12 @@ namespace MWMechanics
         if (mMusicType != MWSound::MusicType::Explore && !hasHostiles
             && !(player.getClass().getCreatureStats(player).isDead() && musicPlaying))
         {
-            MWBase::Environment::get().getSoundManager()->playPlaylist(std::string("Explore"));
+            MWBase::Environment::get().getSoundManager()->playPlaylist(MWSound::explorePlaylist);
             mMusicType = MWSound::MusicType::Explore;
         }
         else if (mMusicType != MWSound::MusicType::Battle && hasHostiles)
         {
-            MWBase::Environment::get().getSoundManager()->playPlaylist(std::string("Battle"));
+            MWBase::Environment::get().getSoundManager()->playPlaylist(MWSound::battlePlaylist);
             mMusicType = MWSound::MusicType::Battle;
         }
     }
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 0baf68ed5d..31b5d36c79 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -530,6 +530,7 @@ namespace MWRender
         , mHasMagicEffects(false)
         , mAlpha(1.f)
         , mPlayScriptedOnly(false)
+        , mRequiresBoneMap(false)
     {
         for (size_t i = 0; i < sNumBlendMasks; i++)
             mAnimationTimePtr[i] = std::make_shared<AnimationTime>();
@@ -964,8 +965,17 @@ namespace MWRender
     {
         if (!mNodeMapCreated && mObjectRoot)
         {
-            SceneUtil::NodeMapVisitor visitor(mNodeMap);
-            mObjectRoot->accept(visitor);
+            // If the base of this animation is an osgAnimation, we should map the bones not matrix transforms
+            if (mRequiresBoneMap)
+            {
+                SceneUtil::NodeMapVisitorBoneOnly visitor(mNodeMap);
+                mObjectRoot->accept(visitor);
+            }
+            else
+            {
+                SceneUtil::NodeMapVisitor visitor(mNodeMap);
+                mObjectRoot->accept(visitor);
+            }
             mNodeMapCreated = true;
         }
         return mNodeMap;
@@ -1479,6 +1489,10 @@ namespace MWRender
             mInsert->addChild(mObjectRoot);
         }
 
+        // osgAnimation formats with skeletons should have their nodemap be bone instances
+        // FIXME: better way to detect osgAnimation here instead of relying on extension?
+        mRequiresBoneMap = mSkeleton != nullptr && !Misc::StringUtils::ciEndsWith(model, ".nif");
+
         if (previousStateset)
             mObjectRoot->setStateSet(previousStateset);
 
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 22b7167a9c..4cff658011 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -246,6 +246,7 @@ namespace MWRender
         osg::ref_ptr<SceneUtil::LightListCallback> mLightListCallback;
 
         bool mPlayScriptedOnly;
+        bool mRequiresBoneMap;
 
         const NodeMap& getNodeMap() const;
 
diff --git a/apps/openmw/mwrender/rotatecontroller.cpp b/apps/openmw/mwrender/rotatecontroller.cpp
index d7f8bb902c..61a2a2628a 100644
--- a/apps/openmw/mwrender/rotatecontroller.cpp
+++ b/apps/openmw/mwrender/rotatecontroller.cpp
@@ -1,6 +1,7 @@
 #include "rotatecontroller.hpp"
 
 #include <osg/MatrixTransform>
+#include <osgAnimation/Bone>
 
 namespace MWRender
 {
@@ -43,6 +44,17 @@ namespace MWRender
 
         node->setMatrix(matrix);
 
+        // If we are linked to a bone we must call setMatrixInSkeletonSpace
+        osgAnimation::Bone* b = dynamic_cast<osgAnimation::Bone*>(node);
+        if (b)
+        {
+            osgAnimation::Bone* parent = b->getBoneParent();
+            if (parent)
+                matrix *= parent->getMatrixInSkeletonSpace();
+
+            b->setMatrixInSkeletonSpace(matrix);
+        }
+
         traverse(node, nv);
     }
 
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index a28ca0b7b7..cbc560d5ac 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -715,8 +715,6 @@ namespace MWRender
 
         osg::ref_ptr<osg::Texture2D> normalMap(
             new osg::Texture2D(mResourceSystem->getImageManager()->getImage("textures/omw/water_nm.png")));
-        if (normalMap->getImage())
-            normalMap->getImage()->flipVertical();
         normalMap->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
         normalMap->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
         normalMap->setMaxAnisotropy(16);
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index 481a0e2ec1..cfdeb8c658 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -631,7 +631,7 @@ namespace MWScript
                 ESM::RefId gem = ESM::RefId::stringRefId(runtime.getStringLiteral(runtime[0].mInteger));
                 runtime.pop();
 
-                if (!ptr.getClass().hasInventoryStore(ptr))
+                if (!ptr.getClass().isActor())
                     return;
 
                 const MWWorld::ESMStore& store = *MWBase::Environment::get().getESMStore();
@@ -664,10 +664,10 @@ namespace MWScript
                 for (unsigned int i = 0; i < arg0; ++i)
                     runtime.pop();
 
-                if (!ptr.getClass().hasInventoryStore(ptr))
+                if (!ptr.getClass().isActor())
                     return;
 
-                MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr);
+                MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
                 for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
                 {
                     if (it->getCellRef().getSoul() == soul)
@@ -780,10 +780,10 @@ namespace MWScript
                 ESM::RefId soul = ESM::RefId::stringRefId(runtime.getStringLiteral(runtime[0].mInteger));
                 runtime.pop();
 
-                if (!ptr.getClass().hasInventoryStore(ptr))
+                if (!ptr.getClass().isActor())
                     return;
 
-                MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr);
+                MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
 
                 for (MWWorld::ContainerStoreIterator iter(store.begin()); iter != store.end(); ++iter)
                 {
diff --git a/apps/openmw/mwscript/soundextensions.cpp b/apps/openmw/mwscript/soundextensions.cpp
index ee39860584..79bdf20160 100644
--- a/apps/openmw/mwscript/soundextensions.cpp
+++ b/apps/openmw/mwscript/soundextensions.cpp
@@ -63,7 +63,7 @@ namespace MWScript
         public:
             void execute(Interpreter::Runtime& runtime) override
             {
-                std::string music{ runtime.getStringLiteral(runtime[0].mInteger) };
+                const VFS::Path::Normalized music(runtime.getStringLiteral(runtime[0].mInteger));
                 runtime.pop();
 
                 MWBase::Environment::get().getSoundManager()->streamMusic(
diff --git a/apps/openmw/mwsound/constants.hpp b/apps/openmw/mwsound/constants.hpp
new file mode 100644
index 0000000000..217dd1935e
--- /dev/null
+++ b/apps/openmw/mwsound/constants.hpp
@@ -0,0 +1,15 @@
+#ifndef OPENMW_APPS_OPENMW_MWSOUND_CONSTANTS_H
+#define OPENMW_APPS_OPENMW_MWSOUND_CONSTANTS_H
+
+#include <components/vfs/pathutil.hpp>
+
+namespace MWSound
+{
+    constexpr VFS::Path::NormalizedView battlePlaylist("battle");
+    constexpr VFS::Path::NormalizedView explorePlaylist("explore");
+    constexpr VFS::Path::NormalizedView titleMusic("music/special/morrowind title.mp3");
+    constexpr VFS::Path::NormalizedView triumphMusic("music/special/mw_triumph.mp3");
+    constexpr VFS::Path::NormalizedView deathMusic("music/special/mw_death.mp3");
+}
+
+#endif
diff --git a/apps/openmw/mwsound/ffmpeg_decoder.cpp b/apps/openmw/mwsound/ffmpeg_decoder.cpp
index 9e7a2be3a8..e9a5a1eb94 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.cpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.cpp
@@ -208,7 +208,7 @@ namespace MWSound
         return dec;
     }
 
-    void FFmpeg_Decoder::open(const std::string& fname)
+    void FFmpeg_Decoder::open(VFS::Path::NormalizedView fname)
     {
         close();
         mDataStream = mResourceMgr->get(fname);
@@ -224,7 +224,7 @@ namespace MWSound
         formatCtx->pb = ioCtx.get();
 
         // avformat_open_input frees user supplied AVFormatContext on failure
-        if (avformat_open_input(&formatCtx, fname.c_str(), nullptr, nullptr) != 0)
+        if (avformat_open_input(&formatCtx, fname.value().data(), nullptr, nullptr) != 0)
             throw std::runtime_error("Failed to open input");
 
         AVFormatContextPtr formatCtxPtr(std::exchange(formatCtx, nullptr));
diff --git a/apps/openmw/mwsound/ffmpeg_decoder.hpp b/apps/openmw/mwsound/ffmpeg_decoder.hpp
index ed3297403e..264ff8fab7 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.hpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.hpp
@@ -93,7 +93,7 @@ namespace MWSound
         bool getAVAudioData();
         size_t readAVAudioData(void* data, size_t length);
 
-        void open(const std::string& fname) override;
+        void open(VFS::Path::NormalizedView fname) override;
         void close() override;
 
         std::string getName() override;
diff --git a/apps/openmw/mwsound/movieaudiofactory.cpp b/apps/openmw/mwsound/movieaudiofactory.cpp
index 1bb5275c45..68ea221321 100644
--- a/apps/openmw/mwsound/movieaudiofactory.cpp
+++ b/apps/openmw/mwsound/movieaudiofactory.cpp
@@ -24,8 +24,10 @@ namespace MWSound
     private:
         MWSound::MovieAudioDecoder* mDecoder;
 
-        void open(const std::string& fname) override;
-        void close() override;
+        void open(VFS::Path::NormalizedView fname) override { throw std::runtime_error("Method not implemented"); }
+
+        void close() override {}
+
         std::string getName() override;
         void getInfo(int* samplerate, ChannelConfig* chans, SampleType* type) override;
         size_t read(char* buffer, size_t bytes) override;
@@ -92,12 +94,6 @@ namespace MWSound
         std::shared_ptr<MWSoundDecoderBridge> mDecoderBridge;
     };
 
-    void MWSoundDecoderBridge::open(const std::string& fname)
-    {
-        throw std::runtime_error("Method not implemented");
-    }
-    void MWSoundDecoderBridge::close() {}
-
     std::string MWSoundDecoderBridge::getName()
     {
         return mDecoder->getStreamName();
diff --git a/apps/openmw/mwsound/sound_decoder.hpp b/apps/openmw/mwsound/sound_decoder.hpp
index f6dcdb7032..17f9d28909 100644
--- a/apps/openmw/mwsound/sound_decoder.hpp
+++ b/apps/openmw/mwsound/sound_decoder.hpp
@@ -1,6 +1,8 @@
 #ifndef GAME_SOUND_SOUND_DECODER_H
 #define GAME_SOUND_SOUND_DECODER_H
 
+#include <components/vfs/pathutil.hpp>
+
 #include <string>
 #include <vector>
 
@@ -36,7 +38,7 @@ namespace MWSound
     {
         const VFS::Manager* mResourceMgr;
 
-        virtual void open(const std::string& fname) = 0;
+        virtual void open(VFS::Path::NormalizedView fname) = 0;
         virtual void close() = 0;
 
         virtual std::string getName() = 0;
diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index 56224b4dcb..bcaec8ddfd 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -26,14 +26,14 @@
 
 #include "../mwmechanics/actorutil.hpp"
 
+#include "constants.hpp"
+#include "ffmpeg_decoder.hpp"
+#include "openal_output.hpp"
 #include "sound.hpp"
 #include "sound_buffer.hpp"
 #include "sound_decoder.hpp"
 #include "sound_output.hpp"
 
-#include "ffmpeg_decoder.hpp"
-#include "openal_output.hpp"
-
 namespace MWSound
 {
     namespace
@@ -252,13 +252,13 @@ namespace MWSound
         }
     }
 
-    void SoundManager::streamMusicFull(const std::string& filename)
+    void SoundManager::streamMusicFull(VFS::Path::NormalizedView filename)
     {
         if (!mOutput->isInitialized())
             return;
 
         stopMusic();
-        if (filename.empty())
+        if (filename.value().empty())
             return;
 
         Log(Debug::Info) << "Playing \"" << filename << "\"";
@@ -269,7 +269,7 @@ namespace MWSound
         {
             decoder->open(filename);
         }
-        catch (std::exception& e)
+        catch (const std::exception& e)
         {
             Log(Debug::Error) << "Failed to load audio from \"" << filename << "\": " << e.what();
             return;
@@ -285,7 +285,7 @@ namespace MWSound
         mOutput->streamSound(std::move(decoder), mMusic.get());
     }
 
-    void SoundManager::advanceMusic(const std::string& filename, float fadeOut)
+    void SoundManager::advanceMusic(VFS::Path::NormalizedView filename, float fadeOut)
     {
         if (!isMusicPlaying())
         {
@@ -300,13 +300,16 @@ namespace MWSound
 
     void SoundManager::startRandomTitle()
     {
-        const std::vector<std::string>& filelist = mMusicFiles[mCurrentPlaylist];
-        if (filelist.empty())
+        const auto playlist = mMusicFiles.find(mCurrentPlaylist);
+
+        if (playlist == mMusicFiles.end() || playlist->second.empty())
         {
-            advanceMusic(std::string());
+            advanceMusic(VFS::Path::NormalizedView());
             return;
         }
 
+        const std::vector<VFS::Path::Normalized>& filelist = playlist->second;
+
         auto& tracklist = mMusicToPlay[mCurrentPlaylist];
 
         // Do a Fisher-Yates shuffle
@@ -335,7 +338,7 @@ namespace MWSound
         return mMusic && mOutput->isStreamPlaying(mMusic.get());
     }
 
-    void SoundManager::streamMusic(const std::string& filename, MusicType type, float fade)
+    void SoundManager::streamMusic(VFS::Path::NormalizedView filename, MusicType type, float fade)
     {
         const auto mechanicsManager = MWBase::Environment::get().getMechanicsManager();
 
@@ -344,35 +347,36 @@ namespace MWSound
             && type != MusicType::Special)
             return;
 
-        std::string normalizedName = VFS::Path::normalizeFilename(filename);
-
         mechanicsManager->setMusicType(type);
-        advanceMusic(normalizedName, fade);
+        advanceMusic(filename, fade);
         if (type == MWSound::MusicType::Battle)
-            mCurrentPlaylist = "Battle";
+            mCurrentPlaylist = battlePlaylist;
         else if (type == MWSound::MusicType::Explore)
-            mCurrentPlaylist = "Explore";
+            mCurrentPlaylist = explorePlaylist;
     }
 
-    void SoundManager::playPlaylist(const std::string& playlist)
+    void SoundManager::playPlaylist(VFS::Path::NormalizedView playlist)
     {
         if (mCurrentPlaylist == playlist)
             return;
 
-        if (mMusicFiles.find(playlist) == mMusicFiles.end())
+        auto it = mMusicFiles.find(playlist);
+
+        if (it == mMusicFiles.end())
         {
-            std::vector<std::string> filelist;
-            auto playlistPath = Misc::ResourceHelpers::correctMusicPath(playlist) + '/';
-            for (const auto& name : mVFS->getRecursiveDirectoryIterator(playlistPath))
+            std::vector<VFS::Path::Normalized> filelist;
+            const VFS::Path::Normalized playlistPath
+                = Misc::ResourceHelpers::correctMusicPath(playlist) / VFS::Path::NormalizedView();
+            for (const auto& name : mVFS->getRecursiveDirectoryIterator(VFS::Path::NormalizedView(playlistPath)))
                 filelist.push_back(name);
 
-            mMusicFiles[playlist] = std::move(filelist);
+            it = mMusicFiles.emplace_hint(it, playlist, std::move(filelist));
         }
 
         // No Battle music? Use Explore playlist
-        if (playlist == "Battle" && mMusicFiles[playlist].empty())
+        if (playlist == battlePlaylist && it->second.empty())
         {
-            playPlaylist("Explore");
+            playPlaylist(explorePlaylist);
             return;
         }
 
@@ -1019,7 +1023,7 @@ namespace MWSound
         mTimePassed = 0.0f;
 
         // Make sure music is still playing
-        if (!isMusicPlaying() && !mCurrentPlaylist.empty())
+        if (!isMusicPlaying() && !mCurrentPlaylist.value().empty())
             startRandomTitle();
 
         Environment env = Env_Normal;
@@ -1137,10 +1141,10 @@ namespace MWSound
         if (!mMusic || !mMusic->updateFade(duration) || !mOutput->isStreamPlaying(mMusic.get()))
         {
             stopMusic();
-            if (!mNextMusic.empty())
+            if (!mNextMusic.value().empty())
             {
                 streamMusicFull(mNextMusic);
-                mNextMusic.clear();
+                mNextMusic = VFS::Path::Normalized();
             }
         }
         else
@@ -1160,9 +1164,8 @@ namespace MWSound
 
         if (isMainMenu && !isMusicPlaying())
         {
-            std::string titlefile = "music/special/morrowind title.mp3";
-            if (mVFS->exists(titlefile))
-                streamMusic(titlefile, MWSound::MusicType::Special);
+            if (mVFS->exists(MWSound::titleMusic))
+                streamMusic(MWSound::titleMusic, MWSound::MusicType::Special);
         }
 
         updateSounds(duration);
diff --git a/apps/openmw/mwsound/soundmanagerimp.hpp b/apps/openmw/mwsound/soundmanagerimp.hpp
index 75b1193118..1ba80f1d73 100644
--- a/apps/openmw/mwsound/soundmanagerimp.hpp
+++ b/apps/openmw/mwsound/soundmanagerimp.hpp
@@ -9,6 +9,7 @@
 
 #include <components/fallback/fallback.hpp>
 #include <components/misc/objectpool.hpp>
+#include <components/misc/strings/algorithm.hpp>
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/soundmanager.hpp"
@@ -52,9 +53,10 @@ namespace MWSound
         std::unique_ptr<Sound_Output> mOutput;
 
         // Caches available music tracks by <playlist name, (sound files) >
-        std::unordered_map<std::string, std::vector<std::string>> mMusicFiles;
+        std::unordered_map<VFS::Path::Normalized, std::vector<VFS::Path::Normalized>, VFS::Path::Hash, std::equal_to<>>
+            mMusicFiles;
         std::unordered_map<std::string, std::vector<int>> mMusicToPlay; // A list with music files not yet played
-        std::string mLastPlayedMusic; // The music file that was last played
+        VFS::Path::Normalized mLastPlayedMusic; // The music file that was last played
 
         WaterSoundUpdater mWaterSoundUpdater;
 
@@ -90,7 +92,7 @@ namespace MWSound
         TrackList mActiveTracks;
 
         StreamPtr mMusic;
-        std::string mCurrentPlaylist;
+        VFS::Path::Normalized mCurrentPlaylist;
 
         bool mListenerUnderwater;
         osg::Vec3f mListenerPos;
@@ -102,7 +104,7 @@ namespace MWSound
         Sound* mUnderwaterSound;
         Sound* mNearWaterSound;
 
-        std::string mNextMusic;
+        VFS::Path::Normalized mNextMusic;
         bool mPlaybackPaused;
 
         RegionSoundSelector mRegionSoundSelector;
@@ -123,8 +125,8 @@ namespace MWSound
 
         StreamPtr playVoice(DecoderPtr decoder, const osg::Vec3f& pos, bool playlocal);
 
-        void streamMusicFull(const std::string& filename);
-        void advanceMusic(const std::string& filename, float fadeOut = 1.f);
+        void streamMusicFull(VFS::Path::NormalizedView filename);
+        void advanceMusic(VFS::Path::NormalizedView filename, float fadeOut = 1.f);
         void startRandomTitle();
 
         void cull3DSound(SoundBase* sound);
@@ -174,7 +176,7 @@ namespace MWSound
         void stopMusic() override;
         ///< Stops music if it's playing
 
-        void streamMusic(const std::string& filename, MWSound::MusicType type, float fade = 1.f) override;
+        void streamMusic(VFS::Path::NormalizedView filename, MWSound::MusicType type, float fade = 1.f) override;
         ///< Play a soundifle
         /// \param filename name of a sound file in the data directory.
         /// \param type music type.
@@ -183,7 +185,7 @@ namespace MWSound
         bool isMusicPlaying() override;
         ///< Returns true if music is playing
 
-        void playPlaylist(const std::string& playlist) override;
+        void playPlaylist(VFS::Path::NormalizedView playlist) override;
         ///< Start playing music from the selected folder
         /// \param name of the folder that contains the playlist
         /// Title music playlist is predefined
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 64a258cff8..beb519b9e6 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -190,7 +190,8 @@ namespace
         {
             const DetourNavigator::AgentBounds agentBounds = world.getPathfindingAgentBounds(ptr);
             if (!navigator.addAgent(agentBounds))
-                Log(Debug::Warning) << "Agent bounds are not supported by navigator: " << agentBounds;
+                Log(Debug::Warning) << "Agent bounds are not supported by navigator for " << ptr.toString() << ": "
+                                    << agentBounds;
         }
     }
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 74335a1534..c72a9993d6 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -90,6 +90,8 @@
 #include "../mwphysics/object.hpp"
 #include "../mwphysics/physicssystem.hpp"
 
+#include "../mwsound/constants.hpp"
+
 #include "actionteleport.hpp"
 #include "cellstore.hpp"
 #include "containerstore.hpp"
@@ -394,7 +396,7 @@ namespace MWWorld
             {
                 // Make sure that we do not continue to play a Title music after a new game video.
                 MWBase::Environment::get().getSoundManager()->stopMusic();
-                MWBase::Environment::get().getSoundManager()->playPlaylist(std::string("Explore"));
+                MWBase::Environment::get().getSoundManager()->playPlaylist(MWSound::explorePlaylist);
                 MWBase::Environment::get().getWindowManager()->playVideo(video, true);
             }
         }
diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index b91940cd77..db6ecb816a 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -100,6 +100,8 @@ file(GLOB UNITTEST_SRC_FILES
     resource/testobjectcache.cpp
 
     vfs/testpathutil.cpp
+
+    sceneutil/osgacontroller.cpp
 )
 
 source_group(apps\\openmw_test_suite FILES openmw_test_suite.cpp ${UNITTEST_SRC_FILES})
diff --git a/apps/openmw_test_suite/misc/test_resourcehelpers.cpp b/apps/openmw_test_suite/misc/test_resourcehelpers.cpp
index 5290630394..48edb72578 100644
--- a/apps/openmw_test_suite/misc/test_resourcehelpers.cpp
+++ b/apps/openmw_test_suite/misc/test_resourcehelpers.cpp
@@ -8,19 +8,22 @@ namespace
     TEST(CorrectSoundPath, wav_files_not_overridden_with_mp3_in_vfs_are_not_corrected)
     {
         std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({ { "sound/bar.wav", nullptr } });
-        EXPECT_EQ(correctSoundPath("sound/bar.wav", *mVFS), "sound/bar.wav");
+        constexpr VFS::Path::NormalizedView path("sound/bar.wav");
+        EXPECT_EQ(correctSoundPath(path, *mVFS), "sound/bar.wav");
     }
 
     TEST(CorrectSoundPath, wav_files_overridden_with_mp3_in_vfs_are_corrected)
     {
         std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({ { "sound/foo.mp3", nullptr } });
-        EXPECT_EQ(correctSoundPath("sound/foo.wav", *mVFS), "sound/foo.mp3");
+        constexpr VFS::Path::NormalizedView path("sound/foo.wav");
+        EXPECT_EQ(correctSoundPath(path, *mVFS), "sound/foo.mp3");
     }
 
     TEST(CorrectSoundPath, corrected_path_does_not_check_existence_in_vfs)
     {
         std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({});
-        EXPECT_EQ(correctSoundPath("sound/foo.wav", *mVFS), "sound/foo.mp3");
+        constexpr VFS::Path::NormalizedView path("sound/foo.wav");
+        EXPECT_EQ(correctSoundPath(path, *mVFS), "sound/foo.mp3");
     }
 
     namespace
diff --git a/apps/openmw_test_suite/nifosg/testnifloader.cpp b/apps/openmw_test_suite/nifosg/testnifloader.cpp
index f05d651301..fa023fff0d 100644
--- a/apps/openmw_test_suite/nifosg/testnifloader.cpp
+++ b/apps/openmw_test_suite/nifosg/testnifloader.cpp
@@ -3,6 +3,7 @@
 #include <components/nif/node.hpp>
 #include <components/nif/property.hpp>
 #include <components/nifosg/nifloader.hpp>
+#include <components/resource/bgsmfilemanager.hpp>
 #include <components/resource/imagemanager.hpp>
 #include <components/sceneutil/serialize.hpp>
 #include <components/vfs/manager.hpp>
@@ -29,6 +30,7 @@ namespace
     {
         VFS::Manager mVfs;
         Resource::ImageManager mImageManager{ &mVfs, 0 };
+        Resource::BgsmFileManager mMaterialManager{ &mVfs, 0 };
         const osgDB::ReaderWriter* mReaderWriter = osgDB::Registry::instance()->getReaderWriterForExtension("osgt");
         osg::ref_ptr<osgDB::Options> mOptions = new osgDB::Options;
 
@@ -70,7 +72,7 @@ namespace
         init(node);
         Nif::NIFFile file("test.nif");
         file.mRoots.push_back(&node);
-        auto result = Loader::load(file, &mImageManager);
+        auto result = Loader::load(file, &mImageManager, &mMaterialManager);
         EXPECT_EQ(serialize(*result), R"(
 osg::Group {
   UniqueID 1
@@ -259,7 +261,7 @@ osg::Group {
         node.mProperties.push_back(Nif::RecordPtrT<Nif::NiProperty>(&property));
         Nif::NIFFile file("test.nif");
         file.mRoots.push_back(&node);
-        auto result = Loader::load(file, &mImageManager);
+        auto result = Loader::load(file, &mImageManager, &mMaterialManager);
         EXPECT_EQ(serialize(*result), formatOsgNodeForBSShaderProperty(GetParam().mExpectedShaderPrefix));
     }
 
@@ -289,7 +291,7 @@ osg::Group {
         node.mProperties.push_back(Nif::RecordPtrT<Nif::NiProperty>(&property));
         Nif::NIFFile file("test.nif");
         file.mRoots.push_back(&node);
-        auto result = Loader::load(file, &mImageManager);
+        auto result = Loader::load(file, &mImageManager, &mMaterialManager);
         EXPECT_EQ(serialize(*result), formatOsgNodeForBSLightingShaderProperty(GetParam().mExpectedShaderPrefix));
     }
 
diff --git a/apps/openmw_test_suite/sceneutil/osgacontroller.cpp b/apps/openmw_test_suite/sceneutil/osgacontroller.cpp
new file mode 100644
index 0000000000..309de4a878
--- /dev/null
+++ b/apps/openmw_test_suite/sceneutil/osgacontroller.cpp
@@ -0,0 +1,131 @@
+#include <components/sceneutil/osgacontroller.hpp>
+
+#include <gtest/gtest.h>
+#include <osgAnimation/Channel>
+
+#include <filesystem>
+#include <fstream>
+
+namespace
+{
+    using namespace SceneUtil;
+
+    static const std::string ROOT_BONE_NAME = "bip01";
+
+    // Creates a merged anim track with a single root channel with two start/end matrix transforms
+    osg::ref_ptr<Resource::Animation> createMergedAnimationTrack(std::string name, osg::Matrixf startTransform,
+        osg::Matrixf endTransform, float startTime = 0.0f, float endTime = 1.0f)
+    {
+        osg::ref_ptr<Resource::Animation> mergedAnimationTrack = new Resource::Animation;
+        mergedAnimationTrack->setName(name);
+
+        osgAnimation::MatrixKeyframeContainer* cbCntr = new osgAnimation::MatrixKeyframeContainer;
+        cbCntr->push_back(osgAnimation::MatrixKeyframe(startTime, startTransform));
+        cbCntr->push_back(osgAnimation::MatrixKeyframe(endTime, endTransform));
+
+        osg::ref_ptr<osgAnimation::MatrixLinearChannel> rootChannel = new osgAnimation::MatrixLinearChannel;
+        rootChannel->setName("transform");
+        rootChannel->setTargetName(ROOT_BONE_NAME);
+        rootChannel->getOrCreateSampler()->setKeyframeContainer(cbCntr);
+        mergedAnimationTrack->addChannel(rootChannel);
+        return mergedAnimationTrack;
+    }
+
+    TEST(OsgAnimationControllerTest, getTranslationShouldReturnSampledChannelTranslationForBip01)
+    {
+        std::vector<EmulatedAnimation> emulatedAnimations;
+        emulatedAnimations.push_back({ 0.0f, 1.0f, "test1" }); // should sample this
+        emulatedAnimations.push_back({ 1.1f, 2.0f, "test2" }); // should ignore this
+
+        OsgAnimationController controller;
+        controller.setEmulatedAnimations(emulatedAnimations);
+
+        osg::Matrixf startTransform = osg::Matrixf::identity();
+        osg::Matrixf endTransform = osg::Matrixf::identity();
+        osg::Matrixf endTransform2 = osg::Matrixf::identity();
+        endTransform.setTrans(1.0f, 1.0f, 1.0f);
+        controller.addMergedAnimationTrack(createMergedAnimationTrack("test1", startTransform, endTransform));
+        endTransform2.setTrans(2.0f, 2.0f, 2.0f);
+        controller.addMergedAnimationTrack(
+            createMergedAnimationTrack("test2", endTransform, endTransform2, 0.1f, 0.9f));
+
+        // should be halfway between 0,0,0 and 1,1,1
+        osg::Vec3f translation = controller.getTranslation(0.5f);
+        EXPECT_EQ(translation, osg::Vec3f(0.5f, 0.5f, 0.5f));
+    }
+
+    TEST(OsgAnimationControllerTest, getTranslationShouldReturnZeroVectorIfNotFound)
+    {
+        std::vector<EmulatedAnimation> emulatedAnimations;
+        emulatedAnimations.push_back({ 0.0f, 1.0f, "test1" });
+
+        OsgAnimationController controller;
+        controller.setEmulatedAnimations(emulatedAnimations);
+
+        osg::Matrixf startTransform = osg::Matrixf::identity();
+        osg::Matrixf endTransform = osg::Matrixf::identity();
+        endTransform.setTrans(1.0f, 1.0f, 1.0f);
+        controller.addMergedAnimationTrack(createMergedAnimationTrack("test1", startTransform, endTransform));
+
+        // Has no emulated animation at time so will return 0,0,0
+        osg::Vec3f translation = controller.getTranslation(100.0f);
+        EXPECT_EQ(translation, osg::Vec3f(0.0f, 0.0f, 0.0f));
+    }
+
+    TEST(OsgAnimationControllerTest, getTranslationShouldReturnZeroVectorIfNoMergedTracks)
+    {
+        std::vector<EmulatedAnimation> emulatedAnimations;
+        emulatedAnimations.push_back({ 0.0f, 1.0f, "test1" });
+
+        OsgAnimationController controller;
+        controller.setEmulatedAnimations(emulatedAnimations);
+
+        // Has no merged tracks so will return 0,0,0
+        osg::Vec3f translation = controller.getTranslation(0.5);
+        EXPECT_EQ(translation, osg::Vec3f(0.0f, 0.0f, 0.0f));
+    }
+
+    TEST(OsgAnimationControllerTest, getTransformShouldReturnIdentityIfNotFound)
+    {
+        std::vector<EmulatedAnimation> emulatedAnimations;
+        emulatedAnimations.push_back({ 0.0f, 1.0f, "test1" });
+
+        OsgAnimationController controller;
+        controller.setEmulatedAnimations(emulatedAnimations);
+
+        osg::Matrixf startTransform = osg::Matrixf::identity();
+        osg::Matrixf endTransform = osg::Matrixf::identity();
+        endTransform.setTrans(1.0f, 1.0f, 1.0f);
+        controller.addMergedAnimationTrack(createMergedAnimationTrack("test1", startTransform, endTransform));
+
+        // Has no emulated animation at time so will return identity
+        EXPECT_EQ(controller.getTransformForNode(100.0f, ROOT_BONE_NAME), osg::Matrixf::identity());
+
+        // Has no bone animation at time so will return identity
+        EXPECT_EQ(controller.getTransformForNode(0.5f, "wrongbone"), osg::Matrixf::identity());
+    }
+
+    TEST(OsgAnimationControllerTest, getTransformShouldReturnSampledAnimMatrixAtTime)
+    {
+        std::vector<EmulatedAnimation> emulatedAnimations;
+        emulatedAnimations.push_back({ 0.0f, 1.0f, "test1" }); // should sample this
+        emulatedAnimations.push_back({ 1.1f, 2.0f, "test2" }); // should ignore this
+
+        OsgAnimationController controller;
+        controller.setEmulatedAnimations(emulatedAnimations);
+
+        osg::Matrixf startTransform = osg::Matrixf::identity();
+        osg::Matrixf endTransform = osg::Matrixf::identity();
+        endTransform.setTrans(1.0f, 1.0f, 1.0f);
+        controller.addMergedAnimationTrack(createMergedAnimationTrack("test1", startTransform, endTransform));
+        osg::Matrixf endTransform2 = osg::Matrixf::identity();
+        endTransform2.setTrans(2.0f, 2.0f, 2.0f);
+        controller.addMergedAnimationTrack(
+            createMergedAnimationTrack("test2", endTransform, endTransform2, 0.1f, 0.9f));
+
+        EXPECT_EQ(controller.getTransformForNode(0.0f, ROOT_BONE_NAME), startTransform); // start of test1
+        EXPECT_EQ(controller.getTransformForNode(1.0f, ROOT_BONE_NAME), endTransform); // end of test1
+        EXPECT_EQ(controller.getTransformForNode(1.1f, ROOT_BONE_NAME), endTransform); // start of test2
+        EXPECT_EQ(controller.getTransformForNode(2.0f, ROOT_BONE_NAME), endTransform2); // end of test2
+    }
+}
diff --git a/apps/openmw_test_suite/vfs/testpathutil.cpp b/apps/openmw_test_suite/vfs/testpathutil.cpp
index 6eb84f97d5..3819f9905a 100644
--- a/apps/openmw_test_suite/vfs/testpathutil.cpp
+++ b/apps/openmw_test_suite/vfs/testpathutil.cpp
@@ -39,7 +39,7 @@ namespace VFS::Path
 
         TEST(NormalizedTest, shouldSupportConstructorFromNormalizedView)
         {
-            const NormalizedView view = "foo/bar/baz";
+            const NormalizedView view("foo/bar/baz");
             const Normalized value(view);
             EXPECT_EQ(value.view(), "foo/bar/baz");
         }
diff --git a/apps/wizard/CMakeLists.txt b/apps/wizard/CMakeLists.txt
index 3a17210cd3..444290f3a6 100644
--- a/apps/wizard/CMakeLists.txt
+++ b/apps/wizard/CMakeLists.txt
@@ -85,7 +85,7 @@ target_link_libraries(openmw-wizard
     components_qt
 )
 
-target_link_libraries(openmw-wizard Qt::Widgets Qt::Core)
+target_link_libraries(openmw-wizard Qt::Widgets Qt::Core Qt::Svg)
 
 if (OPENMW_USE_UNSHIELD)
     target_link_libraries(openmw-wizard ${LIBUNSHIELD_LIBRARIES})
diff --git a/apps/wizard/installationtargetpage.cpp b/apps/wizard/installationtargetpage.cpp
index dc94d2d002..1da28b1237 100644
--- a/apps/wizard/installationtargetpage.cpp
+++ b/apps/wizard/installationtargetpage.cpp
@@ -19,6 +19,8 @@ Wizard::InstallationTargetPage::InstallationTargetPage(QWidget* parent, const Fi
 
     setupUi(this);
 
+    folderIconLabel->setPixmap(QIcon(":folder").pixmap(QSize(48, 48)));
+
     registerField(QLatin1String("installation.path*"), targetLineEdit);
 }
 
diff --git a/apps/wizard/languageselectionpage.cpp b/apps/wizard/languageselectionpage.cpp
index 7dcf642dd6..7d4c2184ee 100644
--- a/apps/wizard/languageselectionpage.cpp
+++ b/apps/wizard/languageselectionpage.cpp
@@ -9,6 +9,8 @@ Wizard::LanguageSelectionPage::LanguageSelectionPage(QWidget* parent)
 
     setupUi(this);
 
+    flagIconLabel->setPixmap(QIcon(":preferences-desktop-locale").pixmap(QSize(48, 48)));
+
     registerField(QLatin1String("installation.language"), languageComboBox, "currentData", "currentDataChanged");
 }
 
diff --git a/apps/wizard/methodselectionpage.cpp b/apps/wizard/methodselectionpage.cpp
index b3a1c73635..2ff7db5487 100644
--- a/apps/wizard/methodselectionpage.cpp
+++ b/apps/wizard/methodselectionpage.cpp
@@ -11,6 +11,10 @@ Wizard::MethodSelectionPage::MethodSelectionPage(QWidget* parent)
 
     setupUi(this);
 
+    installerIconLabel->setPixmap(QIcon(":system-installer").pixmap(QSize(48, 48)));
+    folderIconLabel->setPixmap(QIcon(":folder").pixmap(QSize(48, 48)));
+    buyIconLabel->setPixmap(QIcon(":dollar").pixmap(QSize(48, 48)));
+
 #ifndef OPENMW_USE_UNSHIELD
     retailDiscRadioButton->setEnabled(false);
     existingLocationRadioButton->setChecked(true);
diff --git a/apps/wizard/ui/installationtargetpage.ui b/apps/wizard/ui/installationtargetpage.ui
index c87214d8d9..4b1f4238d4 100644
--- a/apps/wizard/ui/installationtargetpage.ui
+++ b/apps/wizard/ui/installationtargetpage.ui
@@ -30,9 +30,6 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
        <property name="textFormat">
         <enum>Qt::RichText</enum>
        </property>
diff --git a/apps/wizard/ui/languageselectionpage.ui b/apps/wizard/ui/languageselectionpage.ui
index fccd2aa424..3cff2c5b44 100644
--- a/apps/wizard/ui/languageselectionpage.ui
+++ b/apps/wizard/ui/languageselectionpage.ui
@@ -30,9 +30,6 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/preferences-desktop-locale.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
        <property name="textFormat">
         <enum>Qt::RichText</enum>
        </property>
diff --git a/apps/wizard/ui/methodselectionpage.ui b/apps/wizard/ui/methodselectionpage.ui
index c2dd260527..28755ad438 100644
--- a/apps/wizard/ui/methodselectionpage.ui
+++ b/apps/wizard/ui/methodselectionpage.ui
@@ -59,9 +59,6 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/system-installer.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
        <property name="textFormat">
         <enum>Qt::RichText</enum>
        </property>
@@ -124,9 +121,6 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
        <property name="textFormat">
         <enum>Qt::RichText</enum>
        </property>
@@ -191,9 +185,6 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/dollar.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
       </widget>
      </item>
      <item>
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 68411be2fc..1235072de5 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -107,6 +107,10 @@ add_component_dir (settings
     windowmode
     )
 
+add_component_dir (bgsm
+    stream file
+    )
+
 add_component_dir (bsa
     bsa_file compressedbsafile ba2gnrlfile ba2dx10file ba2file memorystream
     )
@@ -125,7 +129,7 @@ add_component_dir (vfs
 
 add_component_dir (resource
     scenemanager keyframemanager imagemanager bulletshapemanager bulletshape niffilemanager objectcache multiobjectcache resourcesystem
-    resourcemanager stats animation foreachbulletobject errormarker cachestats
+    resourcemanager stats animation foreachbulletobject errormarker cachestats bgsmfilemanager
     )
 
 add_component_dir (shader
@@ -511,7 +515,7 @@ set (ESM_UI ${CMAKE_CURRENT_SOURCE_DIR}/contentselector/contentselector.ui
 if (USE_QT)
     add_component_qt_dir (contentselector
         model/modelitem model/esmfile
-        model/naturalsort model/contentmodel
+        model/contentmodel
         model/loadordererror
         view/combobox view/contentselector
         )
diff --git a/components/bgsm/file.cpp b/components/bgsm/file.cpp
new file mode 100644
index 0000000000..2aaacaf25c
--- /dev/null
+++ b/components/bgsm/file.cpp
@@ -0,0 +1,236 @@
+#include "file.hpp"
+
+#include <array>
+#include <stdexcept>
+
+#include "stream.hpp"
+
+namespace Bgsm
+{
+    MaterialFilePtr parse(Files::IStreamPtr&& inputStream)
+    {
+        std::shared_ptr<Bgsm::MaterialFile> file;
+        BGSMStream stream(std::move(inputStream));
+
+        std::array<char, 4> signature;
+        stream.readArray(signature);
+        std::string shaderType(signature.data(), 4);
+        if (shaderType == "BGEM")
+        {
+            file = std::make_shared<BGEMFile>();
+            file->mShaderType = Bgsm::ShaderType::Effect;
+        }
+        else if (shaderType == "BGSM")
+        {
+            file = std::make_shared<BGSMFile>();
+            file->mShaderType = Bgsm::ShaderType::Lighting;
+        }
+        else
+            throw std::runtime_error("Invalid material file");
+
+        file->read(stream);
+        return file;
+    }
+
+    void MaterialFile::read(BGSMStream& stream)
+    {
+        stream.read(mVersion);
+        stream.read(mClamp);
+        stream.read(mUVOffset);
+        stream.read(mUVScale);
+        stream.read(mTransparency);
+        stream.read(mAlphaBlend);
+        stream.read(mSourceBlendMode);
+        stream.read(mDestinationBlendMode);
+        stream.read(mAlphaTestThreshold);
+        stream.read(mAlphaTest);
+        stream.read(mDepthWrite);
+        stream.read(mDepthTest);
+        stream.read(mSSR);
+        stream.read(mWetnessControlSSR);
+        stream.read(mDecal);
+        stream.read(mTwoSided);
+        stream.read(mDecalNoFade);
+        stream.read(mNonOccluder);
+        stream.read(mRefraction);
+        stream.read(mRefractionFalloff);
+        stream.read(mRefractionPower);
+        if (mVersion < 10)
+        {
+            stream.read(mEnvMapEnabled);
+            stream.read(mEnvMapMaskScale);
+        }
+        else
+        {
+            stream.read(mDepthBias);
+        }
+        stream.read(mGrayscaleToPaletteColor);
+        if (mVersion >= 6)
+            stream.read(mMaskWrites);
+    }
+
+    void BGSMFile::read(BGSMStream& stream)
+    {
+        MaterialFile::read(stream);
+
+        stream.read(mDiffuseMap);
+        stream.read(mNormalMap);
+        stream.read(mSmoothSpecMap);
+        stream.read(mGrayscaleMap);
+        if (mVersion >= 3)
+        {
+            stream.read(mGlowMap);
+            stream.read(mWrinkleMap);
+            stream.read(mSpecularMap);
+            stream.read(mLightingMap);
+            stream.read(mFlowMap);
+            if (mVersion >= 17)
+                stream.read(mDistanceFieldAlphaMap);
+        }
+        else
+        {
+            stream.read(mEnvMap);
+            stream.read(mGlowMap);
+            stream.read(mInnerLayerMap);
+            stream.read(mWrinkleMap);
+            stream.read(mDisplacementMap);
+        }
+        stream.read(mEnableEditorAlphaThreshold);
+        if (mVersion >= 8)
+        {
+            stream.read(mTranslucency);
+            stream.read(mTranslucencyThickObject);
+            stream.read(mTranslucencyMixAlbedoWithSubsurfaceColor);
+            stream.read(mTranslucencySubsurfaceColor);
+            stream.read(mTranslucencyTransmissiveScale);
+            stream.read(mTranslucencyTurbulence);
+        }
+        else
+        {
+            stream.read(mRimLighting);
+            stream.read(mRimPower);
+            stream.read(mBackLightPower);
+            stream.read(mSubsurfaceLighting);
+            stream.read(mSubsurfaceLightingRolloff);
+        }
+        stream.read(mSpecularEnabled);
+        stream.read(mSpecularColor);
+        stream.read(mSpecularMult);
+        stream.read(mSmoothness);
+        stream.read(mFresnelPower);
+        stream.read(mWetnessControlSpecScale);
+        stream.read(mWetnessControlSpecPowerScale);
+        stream.read(mWetnessControlSpecMinvar);
+        if (mVersion < 10)
+            stream.read(mWetnessControlEnvMapScale);
+        stream.read(mWetnessControlFresnelPower);
+        stream.read(mWetnessControlMetalness);
+        if (mVersion >= 3)
+        {
+            stream.read(mPBR);
+            if (mVersion >= 9)
+            {
+                stream.read(mCustomPorosity);
+                stream.read(mPorosityValue);
+            }
+        }
+        stream.read(mRootMaterialPath);
+        stream.read(mAnisoLighting);
+        stream.read(mEmitEnabled);
+        if (mEmitEnabled)
+            stream.read(mEmittanceColor);
+        stream.read(mEmittanceMult);
+        stream.read(mModelSpaceNormals);
+        stream.read(mExternalEmittance);
+        if (mVersion >= 12)
+        {
+            stream.read(mLumEmittance);
+            if (mVersion >= 13)
+            {
+                stream.read(mUseAdaptiveEmissive);
+                stream.read(mAdaptiveEmissiveExposureParams);
+            }
+        }
+        else if (mVersion < 8)
+        {
+            stream.read(mBackLighting);
+        }
+        stream.read(mReceiveShadows);
+        stream.read(mHideSecret);
+        stream.read(mCastShadows);
+        stream.read(mDissolveFade);
+        stream.read(mAssumeShadowmask);
+        stream.read(mGlowMapEnabled);
+        if (mVersion < 7)
+        {
+            stream.read(mEnvMapWindow);
+            stream.read(mEnvMapEye);
+        }
+        stream.read(mHair);
+        stream.read(mHairTintColor);
+        stream.read(mTree);
+        stream.read(mFacegen);
+        stream.read(mSkinTint);
+        stream.read(mTessellate);
+        if (mVersion < 3)
+        {
+            stream.read(mDisplacementMapParams);
+            stream.read(mTessellationParams);
+        }
+        stream.read(mGrayscaleToPaletteScale);
+        if (mVersion >= 1)
+        {
+            stream.read(mSkewSpecularAlpha);
+            stream.read(mTerrain);
+            if (mTerrain)
+            {
+                if (mVersion == 3)
+                    stream.skip(4); // Unknown
+
+                stream.read(mTerrainParams);
+            }
+        }
+    }
+
+    void BGEMFile::read(BGSMStream& stream)
+    {
+        MaterialFile::read(stream);
+
+        stream.read(mBaseMap);
+        stream.read(mGrayscaleMap);
+        stream.read(mEnvMap);
+        stream.read(mNormalMap);
+        stream.read(mEnvMapMask);
+        if (mVersion >= 11)
+        {
+            stream.read(mSpecularMap);
+            stream.read(mLightingMap);
+            stream.read(mGlowMap);
+        }
+        if (mVersion >= 10)
+        {
+            stream.read(mEnvMapEnabled);
+            stream.read(mEnvMapMaskScale);
+        }
+        stream.read(mBlood);
+        stream.read(mEffectLighting);
+        stream.read(mFalloff);
+        stream.read(mFalloffColor);
+        stream.read(mGrayscaleToPaletteAlpha);
+        stream.read(mSoft);
+        stream.read(mBaseColor);
+        stream.read(mBaseColorScale);
+        stream.read(mFalloffParams);
+        stream.read(mLightingInfluence);
+        stream.read(mEnvmapMinLOD);
+        stream.read(mSoftDepth);
+        if (mVersion >= 11)
+            stream.read(mEmittanceColor);
+        if (mVersion >= 15)
+            stream.read(mAdaptiveEmissiveExposureParams);
+        if (mVersion >= 16)
+            stream.read(mGlowMapEnabled);
+        if (mVersion >= 20)
+            stream.read(mEffectPbrSpecular);
+    }
+}
diff --git a/components/bgsm/file.hpp b/components/bgsm/file.hpp
new file mode 100644
index 0000000000..b409752d74
--- /dev/null
+++ b/components/bgsm/file.hpp
@@ -0,0 +1,167 @@
+#ifndef OPENMW_COMPONENTS_BGSM_FILE_HPP
+#define OPENMW_COMPONENTS_BGSM_FILE_HPP
+
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <string_view>
+
+#include <osg/Vec2f>
+#include <osg/Vec3f>
+#include <osg/Vec4f>
+
+#include <components/files/istreamptr.hpp>
+
+namespace Bgsm
+{
+    class BGSMStream;
+
+    enum class ShaderType
+    {
+        Lighting,
+        Effect,
+    };
+
+    struct MaterialFile
+    {
+        ShaderType mShaderType;
+        std::uint32_t mVersion;
+        std::uint32_t mClamp;
+        osg::Vec2f mUVOffset, mUVScale;
+        float mTransparency;
+        bool mAlphaBlend;
+        std::uint32_t mSourceBlendMode;
+        std::uint32_t mDestinationBlendMode;
+        std::uint8_t mAlphaTestThreshold;
+        bool mAlphaTest;
+        bool mDepthWrite, mDepthTest;
+        bool mSSR;
+        bool mWetnessControlSSR;
+        bool mDecal;
+        bool mTwoSided;
+        bool mDecalNoFade;
+        bool mNonOccluder;
+        bool mRefraction;
+        bool mRefractionFalloff;
+        float mRefractionPower;
+        bool mEnvMapEnabled;
+        float mEnvMapMaskScale;
+        bool mDepthBias;
+        bool mGrayscaleToPaletteColor;
+        std::uint8_t mMaskWrites;
+
+        MaterialFile() = default;
+        virtual void read(BGSMStream& stream);
+        virtual ~MaterialFile() = default;
+    };
+
+    struct BGSMFile : MaterialFile
+    {
+        std::string mDiffuseMap;
+        std::string mNormalMap;
+        std::string mSmoothSpecMap;
+        std::string mGrayscaleMap;
+        std::string mGlowMap;
+        std::string mWrinkleMap;
+        std::string mSpecularMap;
+        std::string mLightingMap;
+        std::string mFlowMap;
+        std::string mDistanceFieldAlphaMap;
+        std::string mEnvMap;
+        std::string mInnerLayerMap;
+        std::string mDisplacementMap;
+        bool mEnableEditorAlphaThreshold;
+        bool mTranslucency;
+        bool mTranslucencyThickObject;
+        bool mTranslucencyMixAlbedoWithSubsurfaceColor;
+        osg::Vec3f mTranslucencySubsurfaceColor;
+        float mTranslucencyTransmissiveScale;
+        float mTranslucencyTurbulence;
+        bool mRimLighting;
+        float mRimPower;
+        float mBackLightPower;
+        bool mSubsurfaceLighting;
+        float mSubsurfaceLightingRolloff;
+        bool mSpecularEnabled;
+        osg::Vec3f mSpecularColor;
+        float mSpecularMult;
+        float mSmoothness;
+        float mFresnelPower;
+        float mWetnessControlSpecScale;
+        float mWetnessControlSpecPowerScale;
+        float mWetnessControlSpecMinvar;
+        float mWetnessControlEnvMapScale;
+        float mWetnessControlFresnelPower;
+        float mWetnessControlMetalness;
+        bool mPBR;
+        bool mCustomPorosity;
+        float mPorosityValue;
+        std::string mRootMaterialPath;
+        bool mAnisoLighting;
+        bool mEmitEnabled;
+        osg::Vec3f mEmittanceColor;
+        float mEmittanceMult;
+        bool mModelSpaceNormals;
+        bool mExternalEmittance;
+        float mLumEmittance;
+        bool mUseAdaptiveEmissive;
+        osg::Vec3f mAdaptiveEmissiveExposureParams;
+        bool mBackLighting;
+        bool mReceiveShadows;
+        bool mHideSecret;
+        bool mCastShadows;
+        bool mDissolveFade;
+        bool mAssumeShadowmask;
+        bool mGlowMapEnabled;
+        bool mEnvMapWindow;
+        bool mEnvMapEye;
+        bool mHair;
+        osg::Vec3f mHairTintColor;
+        bool mTree;
+        bool mFacegen;
+        bool mSkinTint;
+        bool mTessellate;
+        osg::Vec2f mDisplacementMapParams;
+        osg::Vec3f mTessellationParams;
+        float mGrayscaleToPaletteScale;
+        bool mSkewSpecularAlpha;
+        bool mTerrain;
+        osg::Vec3f mTerrainParams;
+
+        void read(BGSMStream& stream) override;
+    };
+
+    struct BGEMFile : MaterialFile
+    {
+        std::string mBaseMap;
+        std::string mGrayscaleMap;
+        std::string mEnvMap;
+        std::string mNormalMap;
+        std::string mEnvMapMask;
+        std::string mSpecularMap;
+        std::string mLightingMap;
+        std::string mGlowMap;
+        bool mBlood;
+        bool mEffectLighting;
+        bool mFalloff;
+        bool mFalloffColor;
+        bool mGrayscaleToPaletteAlpha;
+        bool mSoft;
+        osg::Vec3f mBaseColor;
+        float mBaseColorScale;
+        osg::Vec4f mFalloffParams;
+        float mLightingInfluence;
+        std::uint8_t mEnvmapMinLOD;
+        float mSoftDepth;
+        osg::Vec3f mEmittanceColor;
+        osg::Vec3f mAdaptiveEmissiveExposureParams;
+        bool mGlowMapEnabled;
+        bool mEffectPbrSpecular;
+
+        void read(BGSMStream& stream) override;
+    };
+
+    using MaterialFilePtr = std::shared_ptr<const Bgsm::MaterialFile>;
+    MaterialFilePtr parse(Files::IStreamPtr&& stream);
+}
+#endif
diff --git a/components/bgsm/stream.cpp b/components/bgsm/stream.cpp
new file mode 100644
index 0000000000..c4fa9c1d8c
--- /dev/null
+++ b/components/bgsm/stream.cpp
@@ -0,0 +1,39 @@
+#include "stream.hpp"
+
+namespace Bgsm
+{
+    template <>
+    void BGSMStream::read<osg::Vec2f>(osg::Vec2f& vec)
+    {
+        readBufferOfType(mStream, vec._v);
+    }
+
+    template <>
+    void BGSMStream::read<osg::Vec3f>(osg::Vec3f& vec)
+    {
+        readBufferOfType(mStream, vec._v);
+    }
+
+    template <>
+    void BGSMStream::read<osg::Vec4f>(osg::Vec4f& vec)
+    {
+        readBufferOfType(mStream, vec._v);
+    }
+
+    template <>
+    void BGSMStream::read<std::string>(std::string& str)
+    {
+        std::uint32_t length;
+        read(length);
+        // Prevent potential memory allocation freezes; strings this long are not expected in BGSM
+        if (length > 1024)
+            throw std::runtime_error("Requested string length is too large: " + std::to_string(length));
+        str = std::string(length, '\0');
+        mStream->read(str.data(), length);
+        if (mStream->bad())
+            throw std::runtime_error("Failed to read sized string of " + std::to_string(length) + " chars");
+        std::size_t end = str.find('\0');
+        if (end != std::string::npos)
+            str.erase(end);
+    }
+}
diff --git a/components/bgsm/stream.hpp b/components/bgsm/stream.hpp
new file mode 100644
index 0000000000..a355523367
--- /dev/null
+++ b/components/bgsm/stream.hpp
@@ -0,0 +1,77 @@
+#ifndef OPENMW_COMPONENTS_BGSM_STREAM_HPP
+#define OPENMW_COMPONENTS_BGSM_STREAM_HPP
+
+#include <array>
+#include <cassert>
+#include <cstdint>
+#include <istream>
+#include <stdexcept>
+#include <string>
+#include <type_traits>
+
+#include <components/files/istreamptr.hpp>
+#include <components/misc/endianness.hpp>
+
+#include <osg/Vec2f>
+#include <osg/Vec3f>
+#include <osg/Vec4f>
+
+namespace Bgsm
+{
+    template <std::size_t numInstances, typename T>
+    inline void readBufferOfType(Files::IStreamPtr& pIStream, T* dest)
+    {
+        static_assert(std::is_arithmetic_v<T>, "Buffer element type is not arithmetic");
+        pIStream->read(reinterpret_cast<char*>(dest), numInstances * sizeof(T));
+        if (pIStream->bad())
+            throw std::runtime_error("Failed to read typed (" + std::string(typeid(T).name()) + ") buffer of "
+                + std::to_string(numInstances) + " instances");
+        if constexpr (Misc::IS_BIG_ENDIAN)
+            for (std::size_t i = 0; i < numInstances; i++)
+                Misc::swapEndiannessInplace(dest[i]);
+    }
+
+    template <std::size_t numInstances, typename T>
+    inline void readBufferOfType(Files::IStreamPtr& pIStream, T (&dest)[numInstances])
+    {
+        readBufferOfType<numInstances>(pIStream, static_cast<T*>(dest));
+    }
+
+    class BGSMStream
+    {
+        Files::IStreamPtr mStream;
+
+    public:
+        explicit BGSMStream(Files::IStreamPtr&& stream)
+            : mStream(std::move(stream))
+        {
+        }
+
+        void skip(size_t size) { mStream->ignore(size); }
+
+        /// Read into a single instance of type
+        template <class T>
+        void read(T& data)
+        {
+            readBufferOfType<1>(mStream, &data);
+        }
+
+        /// Read multiple instances of type into an array
+        template <class T, size_t size>
+        void readArray(std::array<T, size>& arr)
+        {
+            readBufferOfType<size>(mStream, arr.data());
+        }
+    };
+
+    template <>
+    void BGSMStream::read<osg::Vec2f>(osg::Vec2f& vec);
+    template <>
+    void BGSMStream::read<osg::Vec3f>(osg::Vec3f& vec);
+    template <>
+    void BGSMStream::read<osg::Vec4f>(osg::Vec4f& vec);
+    template <>
+    void BGSMStream::read<std::string>(std::string& str);
+}
+
+#endif
diff --git a/components/contentselector/model/naturalsort.cpp b/components/contentselector/model/naturalsort.cpp
deleted file mode 100644
index b090137d97..0000000000
--- a/components/contentselector/model/naturalsort.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * This file contains code found in the QtGui module of the Qt Toolkit.
- * See Qt's qfilesystemmodel source files for more information
- */
-
-#include "naturalsort.hpp"
-
-static inline QChar getNextChar(const QString& s, int location)
-{
-    return (location < s.length()) ? s.at(location) : QChar();
-}
-
-/*!
- *   Natural number sort, skips spaces.
- *
- *   Examples:
- *   1, 2, 10, 55, 100
- *   01.jpg, 2.jpg, 10.jpg
- *
- *   Note on the algorithm:
- *   Only as many characters as necessary are looked at and at most they all
- *   are looked at once.
- *
- *   Slower then QString::compare() (of course)
- */
-int naturalCompare(const QString& s1, const QString& s2, Qt::CaseSensitivity cs)
-{
-    for (int l1 = 0, l2 = 0; l1 <= s1.count() && l2 <= s2.count(); ++l1, ++l2)
-    {
-        // skip spaces, tabs and 0's
-        QChar c1 = getNextChar(s1, l1);
-        while (c1.isSpace())
-            c1 = getNextChar(s1, ++l1);
-        QChar c2 = getNextChar(s2, l2);
-        while (c2.isSpace())
-            c2 = getNextChar(s2, ++l2);
-
-        if (c1.isDigit() && c2.isDigit())
-        {
-            while (c1.digitValue() == 0)
-                c1 = getNextChar(s1, ++l1);
-            while (c2.digitValue() == 0)
-                c2 = getNextChar(s2, ++l2);
-
-            int lookAheadLocation1 = l1;
-            int lookAheadLocation2 = l2;
-            int currentReturnValue = 0;
-            // find the last digit, setting currentReturnValue as we go if it isn't equal
-            for (QChar lookAhead1 = c1, lookAhead2 = c2;
-                 (lookAheadLocation1 <= s1.length() && lookAheadLocation2 <= s2.length());
-                 lookAhead1 = getNextChar(s1, ++lookAheadLocation1), lookAhead2 = getNextChar(s2, ++lookAheadLocation2))
-            {
-                bool is1ADigit = !lookAhead1.isNull() && lookAhead1.isDigit();
-                bool is2ADigit = !lookAhead2.isNull() && lookAhead2.isDigit();
-                if (!is1ADigit && !is2ADigit)
-                    break;
-                if (!is1ADigit)
-                    return -1;
-                if (!is2ADigit)
-                    return 1;
-                if (currentReturnValue == 0)
-                {
-                    if (lookAhead1 < lookAhead2)
-                    {
-                        currentReturnValue = -1;
-                    }
-                    else if (lookAhead1 > lookAhead2)
-                    {
-                        currentReturnValue = 1;
-                    }
-                }
-            }
-            if (currentReturnValue != 0)
-                return currentReturnValue;
-        }
-
-        if (cs == Qt::CaseInsensitive)
-        {
-            if (!c1.isLower())
-                c1 = c1.toLower();
-            if (!c2.isLower())
-                c2 = c2.toLower();
-        }
-        int r = QString::localeAwareCompare(c1, c2);
-        if (r < 0)
-            return -1;
-        if (r > 0)
-            return 1;
-    }
-    // The two strings are the same (02 == 2) so fall back to the normal sort
-    return QString::compare(s1, s2, cs);
-}
-
-bool naturalSortLessThanCS(const QString& left, const QString& right)
-{
-    return (naturalCompare(left, right, Qt::CaseSensitive) < 0);
-}
-
-bool naturalSortLessThanCI(const QString& left, const QString& right)
-{
-    return (naturalCompare(left, right, Qt::CaseInsensitive) < 0);
-}
-
-bool naturalSortGreaterThanCS(const QString& left, const QString& right)
-{
-    return (naturalCompare(left, right, Qt::CaseSensitive) > 0);
-}
-
-bool naturalSortGreaterThanCI(const QString& left, const QString& right)
-{
-    return (naturalCompare(left, right, Qt::CaseInsensitive) > 0);
-}
diff --git a/components/contentselector/model/naturalsort.hpp b/components/contentselector/model/naturalsort.hpp
deleted file mode 100644
index 6973c55c2e..0000000000
--- a/components/contentselector/model/naturalsort.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef NATURALSORT_H
-#define NATURALSORT_H
-
-#include <QString>
-
-bool naturalSortLessThanCS(const QString& left, const QString& right);
-bool naturalSortLessThanCI(const QString& left, const QString& right);
-bool naturalSortGreaterThanCS(const QString& left, const QString& right);
-bool naturalSortGreaterThanCI(const QString& left, const QString& right);
-
-#endif
diff --git a/components/contentselector/view/contentselector.cpp b/components/contentselector/view/contentselector.cpp
index a3fd224390..ab12f45fd7 100644
--- a/components/contentselector/view/contentselector.cpp
+++ b/components/contentselector/view/contentselector.cpp
@@ -31,7 +31,7 @@ ContentSelectorView::ContentSelector::~ContentSelector() = default;
 
 void ContentSelectorView::ContentSelector::buildContentModel(bool showOMWScripts)
 {
-    QIcon warningIcon(ui->addonView->style()->standardIcon(QStyle::SP_MessageBoxWarning).pixmap(QSize(16, 15)));
+    QIcon warningIcon(ui->addonView->style()->standardIcon(QStyle::SP_MessageBoxWarning));
     mContentModel = new ContentSelectorModel::ContentModel(this, warningIcon, showOMWScripts);
 }
 
diff --git a/components/misc/resourcehelpers.cpp b/components/misc/resourcehelpers.cpp
index 1d5b57bfd9..5ed0bcc972 100644
--- a/components/misc/resourcehelpers.cpp
+++ b/components/misc/resourcehelpers.cpp
@@ -173,6 +173,11 @@ std::string Misc::ResourceHelpers::correctActorModelPath(const std::string& resP
     return mdlname;
 }
 
+std::string Misc::ResourceHelpers::correctMaterialPath(std::string_view resPath, const VFS::Manager* vfs)
+{
+    return correctResourcePath({ { "materials" } }, resPath, vfs);
+}
+
 std::string Misc::ResourceHelpers::correctMeshPath(std::string_view resPath)
 {
     std::string res = "meshes\\";
@@ -186,9 +191,10 @@ VFS::Path::Normalized Misc::ResourceHelpers::correctSoundPath(VFS::Path::Normali
     return prefix / resPath;
 }
 
-std::string Misc::ResourceHelpers::correctMusicPath(const std::string& resPath)
+VFS::Path::Normalized Misc::ResourceHelpers::correctMusicPath(VFS::Path::NormalizedView resPath)
 {
-    return "music\\" + resPath;
+    static constexpr VFS::Path::NormalizedView prefix("music");
+    return prefix / resPath;
 }
 
 std::string_view Misc::ResourceHelpers::meshPathForESM3(std::string_view resPath)
diff --git a/components/misc/resourcehelpers.hpp b/components/misc/resourcehelpers.hpp
index cda99d928d..069d921fa9 100644
--- a/components/misc/resourcehelpers.hpp
+++ b/components/misc/resourcehelpers.hpp
@@ -34,15 +34,16 @@ namespace Misc
         /// Use "xfoo.nif" instead of "foo.nif" if "xfoo.kf" is available
         /// Note that if "xfoo.nif" is actually unavailable, we can't fall back to "foo.nif". :(
         std::string correctActorModelPath(const std::string& resPath, const VFS::Manager* vfs);
+        std::string correctMaterialPath(std::string_view resPath, const VFS::Manager* vfs);
 
         // Adds "meshes\\".
         std::string correctMeshPath(std::string_view resPath);
 
-        // Adds "sound\\".
+        // Prepends "sound/".
         VFS::Path::Normalized correctSoundPath(VFS::Path::NormalizedView resPath);
 
-        // Adds "music\\".
-        std::string correctMusicPath(const std::string& resPath);
+        // Prepends "music/".
+        VFS::Path::Normalized correctMusicPath(VFS::Path::NormalizedView resPath);
 
         // Removes "meshes\\".
         std::string_view meshPathForESM3(std::string_view resPath);
diff --git a/components/misc/strings/algorithm.hpp b/components/misc/strings/algorithm.hpp
index 28bc696cd3..18f72104bd 100644
--- a/components/misc/strings/algorithm.hpp
+++ b/components/misc/strings/algorithm.hpp
@@ -15,6 +15,13 @@ namespace Misc::StringUtils
         bool operator()(char x, char y) const { return toLower(x) < toLower(y); }
     };
 
+    inline std::string underscoresToSpaces(const std::string_view oldName)
+    {
+        std::string newName(oldName);
+        std::replace(newName.begin(), newName.end(), '_', ' ');
+        return newName;
+    }
+
     inline bool ciLess(std::string_view x, std::string_view y)
     {
         return std::lexicographical_compare(x.begin(), x.end(), y.begin(), y.end(), CiCharLess());
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 8d46b0f751..05a8378c11 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -21,6 +21,7 @@
 #include <components/misc/strings/algorithm.hpp>
 #include <components/misc/strings/lower.hpp>
 #include <components/nif/parent.hpp>
+#include <components/resource/bgsmfilemanager.hpp>
 #include <components/resource/imagemanager.hpp>
 
 // particle
@@ -42,6 +43,7 @@
 #include <osg/TexEnvCombine>
 #include <osg/Texture2D>
 
+#include <components/bgsm/file.hpp>
 #include <components/nif/effect.hpp>
 #include <components/nif/exception.hpp>
 #include <components/nif/extra.hpp>
@@ -247,6 +249,8 @@ namespace NifOsg
         }
         std::filesystem::path mFilename;
         unsigned int mVersion, mUserVersion, mBethVersion;
+        Resource::BgsmFileManager* mMaterialManager{ nullptr };
+        Resource::ImageManager* mImageManager{ nullptr };
 
         size_t mFirstRootTextureIndex{ ~0u };
         bool mFoundFirstRootTexturingProperty = false;
@@ -339,7 +343,6 @@ namespace NifOsg
         struct HandleNodeArgs
         {
             unsigned int mNifVersion;
-            Resource::ImageManager* mImageManager;
             SceneUtil::TextKeyMap* mTextKeys;
             std::vector<unsigned int> mBoundTextures = {};
             int mAnimFlags = 0;
@@ -349,7 +352,7 @@ namespace NifOsg
             osg::Node* mRootNode = nullptr;
         };
 
-        osg::ref_ptr<osg::Node> load(Nif::FileView nif, Resource::ImageManager* imageManager)
+        osg::ref_ptr<osg::Node> load(Nif::FileView nif)
         {
             const size_t numRoots = nif.numRoots();
             std::vector<const Nif::NiAVObject*> roots;
@@ -371,10 +374,8 @@ namespace NifOsg
             created->setDataVariance(osg::Object::STATIC);
             for (const Nif::NiAVObject* root : roots)
             {
-                auto node = handleNode(root, nullptr, nullptr,
-                    { .mNifVersion = nif.getVersion(),
-                        .mImageManager = imageManager,
-                        .mTextKeys = &textkeys->mTextKeys });
+                auto node = handleNode(
+                    root, nullptr, nullptr, { .mNifVersion = nif.getVersion(), .mTextKeys = &textkeys->mTextKeys });
                 created->addChild(node);
             }
             if (mHasNightDayLabel)
@@ -405,8 +406,7 @@ namespace NifOsg
         }
 
         void applyNodeProperties(const Nif::NiAVObject* nifNode, osg::Node* applyTo,
-            SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* imageManager,
-            std::vector<unsigned int>& boundTextures, int animflags)
+            SceneUtil::CompositeStateSetUpdater* composite, std::vector<unsigned int>& boundTextures, int animflags)
         {
             bool hasStencilProperty = false;
 
@@ -444,8 +444,7 @@ namespace NifOsg
                         if (property.getPtr()->recIndex == mFirstRootTextureIndex)
                             applyTo->setUserValue("overrideFx", 1);
                     }
-                    handleProperty(property.getPtr(), applyTo, composite, imageManager, boundTextures, animflags,
-                        hasStencilProperty);
+                    handleProperty(property.getPtr(), applyTo, composite, boundTextures, animflags, hasStencilProperty);
                 }
             }
 
@@ -457,8 +456,7 @@ namespace NifOsg
                 shaderprop = static_cast<const Nif::BSTriShape*>(nifNode)->mShaderProperty;
 
             if (!shaderprop.empty())
-                handleProperty(shaderprop.getPtr(), applyTo, composite, imageManager, boundTextures, animflags,
-                    hasStencilProperty);
+                handleProperty(shaderprop.getPtr(), applyTo, composite, boundTextures, animflags, hasStencilProperty);
         }
 
         static void setupController(const Nif::NiTimeController* ctrl, SceneUtil::Controller* toSetup, int animflags)
@@ -522,32 +520,21 @@ namespace NifOsg
             sequenceNode->setMode(osg::Sequence::START);
         }
 
-        osg::ref_ptr<osg::Image> handleSourceTexture(
-            const Nif::NiSourceTexture* st, Resource::ImageManager* imageManager)
+        osg::ref_ptr<osg::Image> handleSourceTexture(const Nif::NiSourceTexture* st) const
         {
-            if (!st)
-                return nullptr;
+            if (st)
+            {
+                if (st->mExternal)
+                    return getTextureImage(st->mFile);
 
-            osg::ref_ptr<osg::Image> image;
-            if (st->mExternal)
-            {
-                std::string filename = Misc::ResourceHelpers::correctTexturePath(st->mFile, imageManager->getVFS());
-                image = imageManager->getImage(filename);
+                if (!st->mData.empty())
+                    return handleInternalTexture(st->mData.getPtr());
             }
-            else if (!st->mData.empty())
-            {
-                image = handleInternalTexture(st->mData.getPtr());
-            }
-            return image;
+
+            return nullptr;
         }
 
-        void handleTextureWrapping(osg::Texture2D* texture, bool wrapS, bool wrapT)
-        {
-            texture->setWrap(osg::Texture::WRAP_S, wrapS ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
-            texture->setWrap(osg::Texture::WRAP_T, wrapT ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
-        }
-
-        bool handleEffect(const Nif::NiAVObject* nifNode, osg::StateSet* stateset, Resource::ImageManager* imageManager)
+        bool handleEffect(const Nif::NiAVObject* nifNode, osg::StateSet* stateset)
         {
             if (nifNode->recType != Nif::RC_NiTextureEffect)
             {
@@ -590,16 +577,12 @@ namespace NifOsg
                     return false;
             }
 
-            osg::ref_ptr<osg::Image> image(handleSourceTexture(textureEffect->mTexture.getPtr(), imageManager));
-            osg::ref_ptr<osg::Texture2D> texture2d(new osg::Texture2D(image));
-            if (image)
-                texture2d->setTextureSize(image->s(), image->t());
-            texture2d->setName("envMap");
-            handleTextureWrapping(texture2d, textureEffect->wrapS(), textureEffect->wrapT());
-
-            int texUnit = 3; // FIXME
-
-            stateset->setTextureAttributeAndModes(texUnit, texture2d, osg::StateAttribute::ON);
+            const unsigned int uvSet = 0;
+            const unsigned int texUnit = 3; // FIXME
+            std::vector<unsigned int> boundTextures;
+            boundTextures.resize(3); // Dummy vector for attachNiSourceTexture
+            attachNiSourceTexture("envMap", textureEffect->mTexture.getPtr(), textureEffect->wrapS(),
+                textureEffect->wrapT(), uvSet, stateset, boundTextures);
             stateset->setTextureAttributeAndModes(texUnit, texGen, osg::StateAttribute::ON);
             stateset->setTextureAttributeAndModes(texUnit, createEmissiveTexEnv(), osg::StateAttribute::ON);
 
@@ -761,7 +744,7 @@ namespace NifOsg
 
             osg::ref_ptr<SceneUtil::CompositeStateSetUpdater> composite = new SceneUtil::CompositeStateSetUpdater;
 
-            applyNodeProperties(nifNode, node, composite, args.mImageManager, args.mBoundTextures, args.mAnimFlags);
+            applyNodeProperties(nifNode, node, composite, args.mBoundTextures, args.mAnimFlags);
 
             const bool isNiGeometry = isTypeNiGeometry(nifNode->recType);
             const bool isBSGeometry = isTypeBSGeometry(nifNode->recType);
@@ -769,7 +752,7 @@ namespace NifOsg
 
             if (isGeometry && !args.mSkipMeshes)
             {
-                bool skip;
+                bool skip = false;
                 if (args.mNifVersion <= Nif::NIFFile::NIFVersion::VER_MW)
                 {
                     skip = (args.mHasMarkers && Misc::StringUtils::ciStartsWith(nifNode->mName, "tri editormarker"))
@@ -777,7 +760,11 @@ namespace NifOsg
                         || Misc::StringUtils::ciStartsWith(nifNode->mName, "tri shadow");
                 }
                 else
-                    skip = args.mHasMarkers && Misc::StringUtils::ciStartsWith(nifNode->mName, "EditorMarker");
+                {
+                    if (args.mHasMarkers)
+                        skip = Misc::StringUtils::ciStartsWith(nifNode->mName, "EditorMarker")
+                            || Misc::StringUtils::ciStartsWith(nifNode->mName, "VisibilityEditorMarker");
+                }
                 if (!skip)
                 {
                     if (isNiGeometry)
@@ -859,7 +846,7 @@ namespace NifOsg
                     if (!effect.empty())
                     {
                         osg::ref_ptr<osg::StateSet> effectStateSet = new osg::StateSet;
-                        if (handleEffect(effect.getPtr(), effectStateSet, args.mImageManager))
+                        if (handleEffect(effect.getPtr(), effectStateSet))
                             for (unsigned int i = 0; i < currentNode->getNumChildren(); ++i)
                                 currentNode->getChild(i)->getOrCreateStateSet()->merge(*effectStateSet);
                     }
@@ -1025,9 +1012,56 @@ namespace NifOsg
             }
         }
 
+        osg::ref_ptr<osg::Image> getTextureImage(std::string_view path) const
+        {
+            if (!mImageManager)
+                return nullptr;
+
+            std::string filename = Misc::ResourceHelpers::correctTexturePath(path, mImageManager->getVFS());
+            return mImageManager->getImage(filename);
+        }
+
+        osg::ref_ptr<osg::Texture2D> attachTexture(const std::string& name, osg::ref_ptr<osg::Image> image, bool wrapS,
+            bool wrapT, unsigned int uvSet, osg::StateSet* stateset, std::vector<unsigned int>& boundTextures) const
+        {
+            osg::ref_ptr<osg::Texture2D> texture2d = new osg::Texture2D(image);
+            if (image)
+                texture2d->setTextureSize(image->s(), image->t());
+            texture2d->setWrap(osg::Texture::WRAP_S, wrapS ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
+            texture2d->setWrap(osg::Texture::WRAP_T, wrapT ? osg::Texture::REPEAT : osg::Texture::CLAMP_TO_EDGE);
+            unsigned int texUnit = boundTextures.size();
+            if (stateset)
+                stateset->setTextureAttributeAndModes(texUnit, texture2d, osg::StateAttribute::ON);
+            texture2d->setName(name);
+            boundTextures.emplace_back(uvSet);
+            return texture2d;
+        }
+
+        osg::ref_ptr<osg::Texture2D> attachExternalTexture(const std::string& name, const std::string& path, bool wrapS,
+            bool wrapT, unsigned int uvSet, osg::StateSet* stateset, std::vector<unsigned int>& boundTextures) const
+        {
+            return attachTexture(name, getTextureImage(path), wrapS, wrapT, uvSet, stateset, boundTextures);
+        }
+
+        osg::ref_ptr<osg::Texture2D> attachNiSourceTexture(const std::string& name, const Nif::NiSourceTexture* st,
+            bool wrapS, bool wrapT, unsigned int uvSet, osg::StateSet* stateset,
+            std::vector<unsigned int>& boundTextures) const
+        {
+            return attachTexture(name, handleSourceTexture(st), wrapS, wrapT, uvSet, stateset, boundTextures);
+        }
+
+        static void clearBoundTextures(osg::StateSet* stateset, std::vector<unsigned int>& boundTextures)
+        {
+            if (!boundTextures.empty())
+            {
+                for (unsigned int i = 0; i < boundTextures.size(); ++i)
+                    stateset->setTextureMode(i, GL_TEXTURE_2D, osg::StateAttribute::OFF);
+                boundTextures.clear();
+            }
+        }
+
         void handleTextureControllers(const Nif::NiProperty* texProperty,
-            SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* imageManager,
-            osg::StateSet* stateset, int animflags)
+            SceneUtil::CompositeStateSetUpdater* composite, osg::StateSet* stateset, int animflags)
         {
             for (Nif::NiTimeControllerPtr ctrl = texProperty->mController; !ctrl.empty(); ctrl = ctrl->mNext)
             {
@@ -1056,17 +1090,16 @@ namespace NifOsg
                         wrapT = inherit->getWrap(osg::Texture2D::WRAP_T);
                     }
 
+                    const unsigned int uvSet = 0;
+                    std::vector<unsigned int> boundTextures; // Dummy list for attachTexture
                     for (const auto& source : flipctrl->mSources)
                     {
                         if (source.empty())
                             continue;
 
-                        osg::ref_ptr<osg::Image> image(handleSourceTexture(source.getPtr(), imageManager));
-                        osg::ref_ptr<osg::Texture2D> texture(new osg::Texture2D(image));
-                        if (image)
-                            texture->setTextureSize(image->s(), image->t());
-                        texture->setWrap(osg::Texture::WRAP_S, wrapS);
-                        texture->setWrap(osg::Texture::WRAP_T, wrapT);
+                        // NB: not changing the stateset
+                        osg::ref_ptr<osg::Texture2D> texture
+                            = attachNiSourceTexture({}, source.getPtr(), wrapS, wrapT, uvSet, nullptr, boundTextures);
                         textures.push_back(texture);
                     }
                     osg::ref_ptr<FlipController> callback(new FlipController(flipctrl, textures));
@@ -1811,7 +1844,7 @@ namespace NifOsg
             }
         }
 
-        osg::ref_ptr<osg::Image> handleInternalTexture(const Nif::NiPixelData* pixelData)
+        osg::ref_ptr<osg::Image> handleInternalTexture(const Nif::NiPixelData* pixelData) const
         {
             if (pixelData->mMipmaps.empty())
                 return nullptr;
@@ -1946,7 +1979,7 @@ namespace NifOsg
             return image;
         }
 
-        osg::ref_ptr<osg::TexEnvCombine> createEmissiveTexEnv()
+        static osg::ref_ptr<osg::TexEnvCombine> createEmissiveTexEnv()
         {
             osg::ref_ptr<osg::TexEnvCombine> texEnv(new osg::TexEnvCombine);
             // Sum the previous colour and the emissive colour.
@@ -1977,33 +2010,42 @@ namespace NifOsg
 
         void handleTextureProperty(const Nif::NiTexturingProperty* texprop, const std::string& nodeName,
             osg::StateSet* stateset, SceneUtil::CompositeStateSetUpdater* composite,
-            Resource::ImageManager* imageManager, std::vector<unsigned int>& boundTextures, int animflags)
+            std::vector<unsigned int>& boundTextures, int animflags)
         {
-            if (!boundTextures.empty())
-            {
-                // overriding a parent NiTexturingProperty, so remove what was previously bound
-                for (unsigned int i = 0; i < boundTextures.size(); ++i)
-                    stateset->setTextureMode(i, GL_TEXTURE_2D, osg::StateAttribute::OFF);
-                boundTextures.clear();
-            }
+            // overriding a parent NiTexturingProperty, so remove what was previously bound
+            clearBoundTextures(stateset, boundTextures);
 
             // If this loop is changed such that the base texture isn't guaranteed to end up in texture unit 0, the
             // shadow casting shader will need to be updated accordingly.
             for (size_t i = 0; i < texprop->mTextures.size(); ++i)
             {
-                if (texprop->mTextures[i].mEnabled
-                    || (i == Nif::NiTexturingProperty::BaseTexture && !texprop->mController.empty()))
+                const Nif::NiTexturingProperty::Texture& tex = texprop->mTextures[i];
+                if (tex.mEnabled || (i == Nif::NiTexturingProperty::BaseTexture && !texprop->mController.empty()))
                 {
+                    std::string textureName;
                     switch (i)
                     {
                         // These are handled later on
                         case Nif::NiTexturingProperty::BaseTexture:
+                            textureName = "diffuseMap";
+                            break;
                         case Nif::NiTexturingProperty::GlowTexture:
+                            textureName = "glowMap";
+                            break;
                         case Nif::NiTexturingProperty::DarkTexture:
+                            textureName = "darkMap";
+                            break;
                         case Nif::NiTexturingProperty::BumpTexture:
+                            textureName = "bumpMap";
+                            break;
                         case Nif::NiTexturingProperty::DetailTexture:
+                            textureName = "detailMap";
+                            break;
                         case Nif::NiTexturingProperty::DecalTexture:
+                            textureName = "decalMap";
+                            break;
                         case Nif::NiTexturingProperty::GlossTexture:
+                            textureName = "glossMap";
                             break;
                         default:
                         {
@@ -2013,12 +2055,9 @@ namespace NifOsg
                         }
                     }
 
-                    unsigned int uvSet = 0;
-                    // create a new texture, will later attempt to share using the SharedStateManager
-                    osg::ref_ptr<osg::Texture2D> texture2d;
-                    if (texprop->mTextures[i].mEnabled)
+                    const unsigned int texUnit = boundTextures.size();
+                    if (tex.mEnabled)
                     {
-                        const Nif::NiTexturingProperty::Texture& tex = texprop->mTextures[i];
                         if (tex.mSourceTexture.empty() && texprop->mController.empty())
                         {
                             if (i == 0)
@@ -2028,32 +2067,18 @@ namespace NifOsg
                         }
 
                         if (!tex.mSourceTexture.empty())
-                        {
-                            const Nif::NiSourceTexture* st = tex.mSourceTexture.getPtr();
-                            osg::ref_ptr<osg::Image> image = handleSourceTexture(st, imageManager);
-                            texture2d = new osg::Texture2D(image);
-                            if (image)
-                                texture2d->setTextureSize(image->s(), image->t());
-                        }
+                            attachNiSourceTexture(textureName, tex.mSourceTexture.getPtr(), tex.wrapS(), tex.wrapT(),
+                                tex.mUVSet, stateset, boundTextures);
                         else
-                            texture2d = new osg::Texture2D;
-
-                        handleTextureWrapping(texture2d, tex.wrapS(), tex.wrapT());
-
-                        uvSet = tex.mUVSet;
+                            attachTexture(
+                                textureName, nullptr, tex.wrapS(), tex.wrapT(), tex.mUVSet, stateset, boundTextures);
                     }
                     else
                     {
                         // Texture only comes from NiFlipController, so tex is ignored, set defaults
-                        texture2d = new osg::Texture2D;
-                        handleTextureWrapping(texture2d, true, true);
-                        uvSet = 0;
+                        attachTexture(textureName, nullptr, true, true, 0, stateset, boundTextures);
                     }
 
-                    unsigned int texUnit = boundTextures.size();
-
-                    stateset->setTextureAttributeAndModes(texUnit, texture2d, osg::StateAttribute::ON);
-
                     if (i == Nif::NiTexturingProperty::GlowTexture)
                     {
                         stateset->setTextureAttributeAndModes(texUnit, createEmissiveTexEnv(), osg::StateAttribute::ON);
@@ -2121,51 +2146,165 @@ namespace NifOsg
                         texEnv->setOperand0_Alpha(osg::TexEnvCombine::SRC_ALPHA);
                         stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
                     }
-
-                    switch (i)
-                    {
-                        case Nif::NiTexturingProperty::BaseTexture:
-                            texture2d->setName("diffuseMap");
-                            break;
-                        case Nif::NiTexturingProperty::BumpTexture:
-                            texture2d->setName("bumpMap");
-                            break;
-                        case Nif::NiTexturingProperty::GlowTexture:
-                            texture2d->setName("emissiveMap");
-                            break;
-                        case Nif::NiTexturingProperty::DarkTexture:
-                            texture2d->setName("darkMap");
-                            break;
-                        case Nif::NiTexturingProperty::DetailTexture:
-                            texture2d->setName("detailMap");
-                            break;
-                        case Nif::NiTexturingProperty::DecalTexture:
-                            texture2d->setName("decalMap");
-                            break;
-                        case Nif::NiTexturingProperty::GlossTexture:
-                            texture2d->setName("glossMap");
-                            break;
-                        default:
-                            break;
-                    }
-
-                    boundTextures.push_back(uvSet);
                 }
             }
-            handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
+            handleTextureControllers(texprop, composite, stateset, animflags);
         }
 
-        void handleTextureSet(const Nif::BSShaderTextureSet* textureSet, unsigned int clamp,
-            const std::string& nodeName, osg::StateSet* stateset, Resource::ImageManager* imageManager,
-            std::vector<unsigned int>& boundTextures)
+        static Bgsm::MaterialFilePtr getShaderMaterial(
+            std::string_view path, Resource::BgsmFileManager* materialManager)
         {
-            if (!boundTextures.empty())
+            if (!materialManager)
+                return nullptr;
+
+            if (!Misc::StringUtils::ciEndsWith(path, ".bgem") && !Misc::StringUtils::ciEndsWith(path, ".bgsm"))
+                return nullptr;
+
+            std::string normalizedPath = Misc::ResourceHelpers::correctMaterialPath(path, materialManager->getVFS());
+            try
             {
-                for (unsigned int i = 0; i < boundTextures.size(); ++i)
-                    stateset->setTextureMode(i, GL_TEXTURE_2D, osg::StateAttribute::OFF);
-                boundTextures.clear();
+                return materialManager->get(VFS::Path::Normalized(normalizedPath));
+            }
+            catch (std::exception& e)
+            {
+                Log(Debug::Error) << "Failed to load shader material: " << e.what();
+                return nullptr;
+            }
+        }
+
+        void handleShaderMaterialNodeProperties(
+            Bgsm::MaterialFilePtr material, osg::StateSet* stateset, std::vector<unsigned int>& boundTextures)
+        {
+            const unsigned int uvSet = 0;
+            const bool wrapS = (material->mClamp >> 1) & 0x1;
+            const bool wrapT = material->mClamp & 0x1;
+            if (material->mShaderType == Bgsm::ShaderType::Lighting)
+            {
+                const Bgsm::BGSMFile* bgsm = static_cast<const Bgsm::BGSMFile*>(material.get());
+
+                if (!bgsm->mDiffuseMap.empty())
+                    attachExternalTexture(
+                        "diffuseMap", bgsm->mDiffuseMap, wrapS, wrapT, uvSet, stateset, boundTextures);
+
+                if (!bgsm->mNormalMap.empty())
+                    attachExternalTexture("normalMap", bgsm->mNormalMap, wrapS, wrapT, uvSet, stateset, boundTextures);
+
+                if (bgsm->mGlowMapEnabled && !bgsm->mGlowMap.empty())
+                    attachExternalTexture("emissiveMap", bgsm->mGlowMap, wrapS, wrapT, uvSet, stateset, boundTextures);
+
+                if (bgsm->mTree)
+                    stateset->addUniform(new osg::Uniform("useTreeAnim", true));
+            }
+            else if (material->mShaderType == Bgsm::ShaderType::Effect)
+            {
+                const Bgsm::BGEMFile* bgem = static_cast<const Bgsm::BGEMFile*>(material.get());
+
+                if (!bgem->mBaseMap.empty())
+                    attachExternalTexture("diffuseMap", bgem->mBaseMap, wrapS, wrapT, uvSet, stateset, boundTextures);
+
+                bool useFalloff = bgem->mFalloff;
+                stateset->addUniform(new osg::Uniform("useFalloff", useFalloff));
+                if (useFalloff)
+                    stateset->addUniform(new osg::Uniform("falloffParams", bgem->mFalloffParams));
             }
 
+            if (material->mTwoSided)
+                stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
+            handleDepthFlags(stateset, material->mDepthTest, material->mDepthWrite);
+        }
+
+        void handleDecal(bool enabled, bool hasSortAlpha, osg::Node& node)
+        {
+            if (!enabled)
+                return;
+            osg::ref_ptr<osg::StateSet> stateset = node.getOrCreateStateSet();
+            osg::ref_ptr<osg::PolygonOffset> polygonOffset(new osg::PolygonOffset);
+            polygonOffset->setUnits(SceneUtil::AutoDepth::isReversed() ? 1.f : -1.f);
+            polygonOffset->setFactor(SceneUtil::AutoDepth::isReversed() ? 0.65f : -0.65f);
+            polygonOffset = shareAttribute(polygonOffset);
+            stateset->setAttributeAndModes(polygonOffset, osg::StateAttribute::ON);
+            if (!mPushedSorter && !hasSortAlpha)
+                stateset->setRenderBinDetails(1, "SORT_BACK_TO_FRONT");
+        }
+
+        void handleAlphaTesting(
+            bool enabled, osg::AlphaFunc::ComparisonFunction function, int threshold, osg::Node& node)
+        {
+            if (enabled)
+            {
+                osg::ref_ptr<osg::AlphaFunc> alphaFunc(new osg::AlphaFunc(function, threshold / 255.f));
+                alphaFunc = shareAttribute(alphaFunc);
+                node.getOrCreateStateSet()->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
+            }
+            else if (osg::StateSet* stateset = node.getStateSet())
+            {
+                stateset->removeAttribute(osg::StateAttribute::ALPHAFUNC);
+                stateset->removeMode(GL_ALPHA_TEST);
+            }
+        }
+
+        void handleAlphaBlending(
+            bool enabled, int sourceMode, int destMode, bool sort, bool& hasSortAlpha, osg::Node& node)
+        {
+            if (enabled)
+            {
+                osg::ref_ptr<osg::StateSet> stateset = node.getOrCreateStateSet();
+                osg::ref_ptr<osg::BlendFunc> blendFunc(
+                    new osg::BlendFunc(getBlendMode(sourceMode), getBlendMode(destMode)));
+                // on AMD hardware, alpha still seems to be stored with an RGBA framebuffer with OpenGL.
+                // This might be mandated by the OpenGL 2.1 specification section 2.14.9, or might be a bug.
+                // Either way, D3D8.1 doesn't do that, so adapt the destination factor.
+                if (blendFunc->getDestination() == GL_DST_ALPHA)
+                    blendFunc->setDestination(GL_ONE);
+                blendFunc = shareAttribute(blendFunc);
+                stateset->setAttributeAndModes(blendFunc, osg::StateAttribute::ON);
+
+                if (sort)
+                {
+                    hasSortAlpha = true;
+                    if (!mPushedSorter)
+                        stateset->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
+                }
+                else if (!mPushedSorter)
+                {
+                    stateset->setRenderBinToInherit();
+                }
+            }
+            else if (osg::ref_ptr<osg::StateSet> stateset = node.getStateSet())
+            {
+                stateset->removeAttribute(osg::StateAttribute::BLENDFUNC);
+                stateset->removeMode(GL_BLEND);
+                if (!mPushedSorter)
+                    stateset->setRenderBinToInherit();
+            }
+        }
+
+        void handleShaderMaterialDrawableProperties(
+            Bgsm::MaterialFilePtr shaderMat, osg::ref_ptr<osg::Material> mat, osg::Node& node, bool& hasSortAlpha)
+        {
+            mat->setAlpha(osg::Material::FRONT_AND_BACK, shaderMat->mTransparency);
+            handleAlphaTesting(shaderMat->mAlphaTest, osg::AlphaFunc::GREATER, shaderMat->mAlphaTestThreshold, node);
+            handleAlphaBlending(shaderMat->mAlphaBlend, shaderMat->mSourceBlendMode, shaderMat->mDestinationBlendMode,
+                true, hasSortAlpha, node);
+            handleDecal(shaderMat->mDecal, hasSortAlpha, node);
+            if (shaderMat->mShaderType == Bgsm::ShaderType::Lighting)
+            {
+                auto bgsm = static_cast<const Bgsm::BGSMFile*>(shaderMat.get());
+                mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(bgsm->mEmittanceColor, 1.f));
+                mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(bgsm->mSpecularColor, 1.f));
+            }
+            else if (shaderMat->mShaderType == Bgsm::ShaderType::Effect)
+            {
+                auto bgem = static_cast<const Bgsm::BGEMFile*>(shaderMat.get());
+                mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(bgem->mEmittanceColor, 1.f));
+                if (bgem->mSoft)
+                    SceneUtil::setupSoftEffect(node, bgem->mSoftDepth, true, bgem->mSoftDepth);
+            }
+        }
+
+        void handleTextureSet(const Nif::BSShaderTextureSet* textureSet, bool wrapS, bool wrapT,
+            const std::string& nodeName, osg::StateSet* stateset, std::vector<unsigned int>& boundTextures)
+        {
             const unsigned int uvSet = 0;
 
             for (size_t i = 0; i < textureSet->mTextures.size(); ++i)
@@ -2175,8 +2314,16 @@ namespace NifOsg
                 switch (static_cast<Nif::BSShaderTextureSet::TextureType>(i))
                 {
                     case Nif::BSShaderTextureSet::TextureType::Base:
+                        attachExternalTexture(
+                            "diffuseMap", textureSet->mTextures[i], wrapS, wrapT, uvSet, stateset, boundTextures);
+                        break;
                     case Nif::BSShaderTextureSet::TextureType::Normal:
+                        attachExternalTexture(
+                            "normalMap", textureSet->mTextures[i], wrapS, wrapT, uvSet, stateset, boundTextures);
+                        break;
                     case Nif::BSShaderTextureSet::TextureType::Glow:
+                        attachExternalTexture(
+                            "emissiveMap", textureSet->mTextures[i], wrapS, wrapT, uvSet, stateset, boundTextures);
                         break;
                     default:
                     {
@@ -2185,31 +2332,6 @@ namespace NifOsg
                         continue;
                     }
                 }
-                std::string filename
-                    = Misc::ResourceHelpers::correctTexturePath(textureSet->mTextures[i], imageManager->getVFS());
-                osg::ref_ptr<osg::Image> image = imageManager->getImage(filename);
-                osg::ref_ptr<osg::Texture2D> texture2d = new osg::Texture2D(image);
-                if (image)
-                    texture2d->setTextureSize(image->s(), image->t());
-                handleTextureWrapping(texture2d, (clamp >> 1) & 0x1, clamp & 0x1);
-                unsigned int texUnit = boundTextures.size();
-                stateset->setTextureAttributeAndModes(texUnit, texture2d, osg::StateAttribute::ON);
-                // BSShaderTextureSet presence means there's no need for FFP support for the affected node
-                switch (static_cast<Nif::BSShaderTextureSet::TextureType>(i))
-                {
-                    case Nif::BSShaderTextureSet::TextureType::Base:
-                        texture2d->setName("diffuseMap");
-                        break;
-                    case Nif::BSShaderTextureSet::TextureType::Normal:
-                        texture2d->setName("normalMap");
-                        break;
-                    case Nif::BSShaderTextureSet::TextureType::Glow:
-                        texture2d->setName("emissiveMap");
-                        break;
-                    default:
-                        break;
-                }
-                boundTextures.emplace_back(uvSet);
             }
         }
 
@@ -2269,8 +2391,8 @@ namespace NifOsg
         }
 
         void handleProperty(const Nif::NiProperty* property, osg::Node* node,
-            SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* imageManager,
-            std::vector<unsigned int>& boundTextures, int animflags, bool hasStencilProperty)
+            SceneUtil::CompositeStateSetUpdater* composite, std::vector<unsigned int>& boundTextures, int animflags,
+            bool hasStencilProperty)
         {
             switch (property->recType)
             {
@@ -2352,8 +2474,7 @@ namespace NifOsg
                 {
                     const Nif::NiTexturingProperty* texprop = static_cast<const Nif::NiTexturingProperty*>(property);
                     osg::StateSet* stateset = node->getOrCreateStateSet();
-                    handleTextureProperty(
-                        texprop, node->getName(), stateset, composite, imageManager, boundTextures, animflags);
+                    handleTextureProperty(texprop, node->getName(), stateset, composite, boundTextures, animflags);
                     node->setUserValue("applyMode", static_cast<int>(texprop->mApplyMode));
                     break;
                 }
@@ -2364,13 +2485,13 @@ namespace NifOsg
                     node->setUserValue("shaderPrefix", std::string(getBSShaderPrefix(texprop->mType)));
                     node->setUserValue("shaderRequired", shaderRequired);
                     osg::StateSet* stateset = node->getOrCreateStateSet();
+                    clearBoundTextures(stateset, boundTextures);
+                    const bool wrapS = (texprop->mClamp >> 1) & 0x1;
+                    const bool wrapT = texprop->mClamp & 0x1;
                     if (!texprop->mTextureSet.empty())
-                    {
-                        auto textureSet = texprop->mTextureSet.getPtr();
                         handleTextureSet(
-                            textureSet, texprop->mClamp, node->getName(), stateset, imageManager, boundTextures);
-                    }
-                    handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
+                            texprop->mTextureSet.getPtr(), wrapS, wrapT, node->getName(), stateset, boundTextures);
+                    handleTextureControllers(texprop, composite, stateset, animflags);
                     if (texprop->refraction())
                         SceneUtil::setupDistortion(*node, texprop->mRefraction.mStrength);
                     break;
@@ -2383,34 +2504,20 @@ namespace NifOsg
                     node->setUserValue("shaderPrefix", std::string(getBSShaderPrefix(texprop->mType)));
                     node->setUserValue("shaderRequired", shaderRequired);
                     osg::StateSet* stateset = node->getOrCreateStateSet();
+                    clearBoundTextures(stateset, boundTextures);
                     if (!texprop->mFilename.empty())
                     {
-                        if (!boundTextures.empty())
-                        {
-                            for (unsigned int i = 0; i < boundTextures.size(); ++i)
-                                stateset->setTextureMode(i, GL_TEXTURE_2D, osg::StateAttribute::OFF);
-                            boundTextures.clear();
-                        }
-                        std::string filename
-                            = Misc::ResourceHelpers::correctTexturePath(texprop->mFilename, imageManager->getVFS());
-                        osg::ref_ptr<osg::Image> image = imageManager->getImage(filename);
-                        osg::ref_ptr<osg::Texture2D> texture2d = new osg::Texture2D(image);
-                        texture2d->setName("diffuseMap");
-                        if (image)
-                            texture2d->setTextureSize(image->s(), image->t());
-                        handleTextureWrapping(texture2d, texprop->wrapS(), texprop->wrapT());
-                        const unsigned int texUnit = 0;
                         const unsigned int uvSet = 0;
-                        stateset->setTextureAttributeAndModes(texUnit, texture2d, osg::StateAttribute::ON);
-                        boundTextures.push_back(uvSet);
-                        if (mBethVersion >= 27)
-                        {
-                            useFalloff = true;
-                            stateset->addUniform(new osg::Uniform("falloffParams", texprop->mFalloffParams));
-                        }
+                        attachExternalTexture("diffuseMap", texprop->mFilename, texprop->wrapS(), texprop->wrapT(),
+                            uvSet, stateset, boundTextures);
+                    }
+                    if (mBethVersion >= 27)
+                    {
+                        useFalloff = true;
+                        stateset->addUniform(new osg::Uniform("falloffParams", texprop->mFalloffParams));
                     }
                     stateset->addUniform(new osg::Uniform("useFalloff", useFalloff));
-                    handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
+                    handleTextureControllers(texprop, composite, stateset, animflags);
                     handleDepthFlags(stateset, texprop->depthTest(), texprop->depthWrite());
                     break;
                 }
@@ -2421,10 +2528,18 @@ namespace NifOsg
                     node->setUserValue("shaderPrefix", std::string(getBSLightingShaderPrefix(texprop->mType)));
                     node->setUserValue("shaderRequired", shaderRequired);
                     osg::StateSet* stateset = node->getOrCreateStateSet();
+                    clearBoundTextures(stateset, boundTextures);
+                    if (Bgsm::MaterialFilePtr material = getShaderMaterial(texprop->mName, mMaterialManager))
+                    {
+                        handleShaderMaterialNodeProperties(material, stateset, boundTextures);
+                        break;
+                    }
+                    const bool wrapS = (texprop->mClamp >> 1) & 0x1;
+                    const bool wrapT = texprop->mClamp & 0x1;
                     if (!texprop->mTextureSet.empty())
-                        handleTextureSet(texprop->mTextureSet.getPtr(), texprop->mClamp, node->getName(), stateset,
-                            imageManager, boundTextures);
-                    handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
+                        handleTextureSet(
+                            texprop->mTextureSet.getPtr(), wrapS, wrapT, node->getName(), stateset, boundTextures);
+                    handleTextureControllers(texprop, composite, stateset, animflags);
                     if (texprop->doubleSided())
                         stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
                     if (texprop->treeAnim())
@@ -2442,27 +2557,20 @@ namespace NifOsg
                     node->setUserValue("shaderPrefix", std::string("bs/nolighting"));
                     node->setUserValue("shaderRequired", shaderRequired);
                     osg::StateSet* stateset = node->getOrCreateStateSet();
+                    clearBoundTextures(stateset, boundTextures);
+                    if (Bgsm::MaterialFilePtr material = getShaderMaterial(texprop->mName, mMaterialManager))
+                    {
+                        handleShaderMaterialNodeProperties(material, stateset, boundTextures);
+                        break;
+                    }
                     if (!texprop->mSourceTexture.empty())
                     {
-                        if (!boundTextures.empty())
-                        {
-                            for (unsigned int i = 0; i < boundTextures.size(); ++i)
-                                stateset->setTextureMode(i, GL_TEXTURE_2D, osg::StateAttribute::OFF);
-                            boundTextures.clear();
-                        }
-                        std::string filename = Misc::ResourceHelpers::correctTexturePath(
-                            texprop->mSourceTexture, imageManager->getVFS());
-                        osg::ref_ptr<osg::Image> image = imageManager->getImage(filename);
-                        osg::ref_ptr<osg::Texture2D> texture2d = new osg::Texture2D(image);
-                        texture2d->setName("diffuseMap");
-                        if (image)
-                            texture2d->setTextureSize(image->s(), image->t());
-                        handleTextureWrapping(texture2d, (texprop->mClamp >> 1) & 0x1, texprop->mClamp & 0x1);
-                        const unsigned int texUnit = 0;
                         const unsigned int uvSet = 0;
-                        stateset->setTextureAttributeAndModes(texUnit, texture2d, osg::StateAttribute::ON);
-                        boundTextures.push_back(uvSet);
-
+                        const bool wrapS = (texprop->mClamp >> 1) & 0x1;
+                        const bool wrapT = texprop->mClamp & 0x1;
+                        unsigned int texUnit = boundTextures.size();
+                        attachExternalTexture(
+                            "diffuseMap", texprop->mSourceTexture, wrapS, wrapT, uvSet, stateset, boundTextures);
                         {
                             osg::ref_ptr<osg::TexMat> texMat(new osg::TexMat);
                             // This handles 20.2.0.7 UV settings like 4.0.0.2 UV settings (see NifOsg::UVController)
@@ -2484,7 +2592,7 @@ namespace NifOsg
                     stateset->addUniform(new osg::Uniform("useFalloff", useFalloff));
                     if (useFalloff)
                         stateset->addUniform(new osg::Uniform("falloffParams", texprop->mFalloffParams));
-                    handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
+                    handleTextureControllers(texprop, composite, stateset, animflags);
                     if (texprop->doubleSided())
                         stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
                     handleDepthFlags(stateset, texprop->depthTest(), texprop->depthWrite());
@@ -2566,12 +2674,9 @@ namespace NifOsg
 
             bool hasMatCtrl = false;
             bool hasSortAlpha = false;
-            osg::StateSet* blendFuncStateSet = nullptr;
 
-            auto setBin_Transparent = [](osg::StateSet* ss) { ss->setRenderingHint(osg::StateSet::TRANSPARENT_BIN); };
             auto setBin_BackToFront = [](osg::StateSet* ss) { ss->setRenderBinDetails(0, "SORT_BACK_TO_FRONT"); };
             auto setBin_Traversal = [](osg::StateSet* ss) { ss->setRenderBinDetails(2, "TraversalOrderBin"); };
-            auto setBin_Inherit = [](osg::StateSet* ss) { ss->setRenderBinToInherit(); };
 
             auto lightmode = Nif::NiVertexColorProperty::LightMode::LightMode_EmiAmbDif;
             float emissiveMult = 1.f;
@@ -2657,52 +2762,10 @@ namespace NifOsg
                     case Nif::RC_NiAlphaProperty:
                     {
                         const Nif::NiAlphaProperty* alphaprop = static_cast<const Nif::NiAlphaProperty*>(property);
-                        if (alphaprop->useAlphaBlending())
-                        {
-                            osg::ref_ptr<osg::BlendFunc> blendFunc(
-                                new osg::BlendFunc(getBlendMode(alphaprop->sourceBlendMode()),
-                                    getBlendMode(alphaprop->destinationBlendMode())));
-                            // on AMD hardware, alpha still seems to be stored with an RGBA framebuffer with OpenGL.
-                            // This might be mandated by the OpenGL 2.1 specification section 2.14.9, or might be a bug.
-                            // Either way, D3D8.1 doesn't do that, so adapt the destination factor.
-                            if (blendFunc->getDestination() == GL_DST_ALPHA)
-                                blendFunc->setDestination(GL_ONE);
-                            blendFunc = shareAttribute(blendFunc);
-                            node->getOrCreateStateSet()->setAttributeAndModes(blendFunc, osg::StateAttribute::ON);
-
-                            if (!alphaprop->noSorter())
-                            {
-                                hasSortAlpha = true;
-                                if (!mPushedSorter)
-                                    setBin_Transparent(node->getStateSet());
-                            }
-                            else
-                            {
-                                if (!mPushedSorter)
-                                    setBin_Inherit(node->getStateSet());
-                            }
-                        }
-                        else if (osg::StateSet* stateset = node->getStateSet())
-                        {
-                            stateset->removeAttribute(osg::StateAttribute::BLENDFUNC);
-                            stateset->removeMode(GL_BLEND);
-                            blendFuncStateSet = stateset;
-                            if (!mPushedSorter)
-                                blendFuncStateSet->setRenderBinToInherit();
-                        }
-
-                        if (alphaprop->useAlphaTesting())
-                        {
-                            osg::ref_ptr<osg::AlphaFunc> alphaFunc(new osg::AlphaFunc(
-                                getTestMode(alphaprop->alphaTestMode()), alphaprop->mThreshold / 255.f));
-                            alphaFunc = shareAttribute(alphaFunc);
-                            node->getOrCreateStateSet()->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
-                        }
-                        else if (osg::StateSet* stateset = node->getStateSet())
-                        {
-                            stateset->removeAttribute(osg::StateAttribute::ALPHAFUNC);
-                            stateset->removeMode(GL_ALPHA_TEST);
-                        }
+                        handleAlphaBlending(alphaprop->useAlphaBlending(), alphaprop->sourceBlendMode(),
+                            alphaprop->destinationBlendMode(), !alphaprop->noSorter(), hasSortAlpha, *node);
+                        handleAlphaTesting(alphaprop->useAlphaTesting(), getTestMode(alphaprop->alphaTestMode()),
+                            alphaprop->mThreshold, *node);
                         break;
                     }
                     case Nif::RC_BSShaderPPLightingProperty:
@@ -2714,6 +2777,18 @@ namespace NifOsg
                     case Nif::RC_BSLightingShaderProperty:
                     {
                         auto shaderprop = static_cast<const Nif::BSLightingShaderProperty*>(property);
+                        if (Bgsm::MaterialFilePtr shaderMat = getShaderMaterial(shaderprop->mName, mMaterialManager))
+                        {
+                            handleShaderMaterialDrawableProperties(shaderMat, mat, *node, hasSortAlpha);
+                            if (shaderMat->mShaderType == Bgsm::ShaderType::Lighting)
+                            {
+                                auto bgsm = static_cast<const Bgsm::BGSMFile*>(shaderMat.get());
+                                specEnabled = false; // bgsm->mSpecularEnabled; TODO: PBR specular lighting
+                                specStrength = 1.f; // bgsm->mSpecularMult;
+                                emissiveMult = bgsm->mEmittanceMult;
+                            }
+                            break;
+                        }
                         mat->setAlpha(osg::Material::FRONT_AND_BACK, shaderprop->mAlpha);
                         mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(shaderprop->mEmissive, 1.f));
                         mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(shaderprop->mSpecular, 1.f));
@@ -2722,31 +2797,18 @@ namespace NifOsg
                         emissiveMult = shaderprop->mEmissiveMult;
                         specStrength = shaderprop->mSpecStrength;
                         specEnabled = shaderprop->specular();
-                        if (shaderprop->decal())
-                        {
-                            osg::StateSet* stateset = node->getOrCreateStateSet();
-                            if (!mPushedSorter && !hasSortAlpha)
-                                stateset->setRenderBinDetails(1, "SORT_BACK_TO_FRONT");
-                            osg::ref_ptr<osg::PolygonOffset> polygonOffset(new osg::PolygonOffset);
-                            polygonOffset->setUnits(SceneUtil::AutoDepth::isReversed() ? 1.f : -1.f);
-                            polygonOffset->setFactor(SceneUtil::AutoDepth::isReversed() ? 0.65f : -0.65f);
-                            stateset->setAttributeAndModes(polygonOffset, osg::StateAttribute::ON);
-                        }
+                        handleDecal(shaderprop->decal(), hasSortAlpha, *node);
                         break;
                     }
                     case Nif::RC_BSEffectShaderProperty:
                     {
                         auto shaderprop = static_cast<const Nif::BSEffectShaderProperty*>(property);
-                        if (shaderprop->decal())
+                        if (Bgsm::MaterialFilePtr shaderMat = getShaderMaterial(shaderprop->mName, mMaterialManager))
                         {
-                            osg::StateSet* stateset = node->getOrCreateStateSet();
-                            if (!mPushedSorter && !hasSortAlpha)
-                                stateset->setRenderBinDetails(1, "SORT_BACK_TO_FRONT");
-                            osg::ref_ptr<osg::PolygonOffset> polygonOffset(new osg::PolygonOffset);
-                            polygonOffset->setUnits(SceneUtil::AutoDepth::isReversed() ? 1.f : -1.f);
-                            polygonOffset->setFactor(SceneUtil::AutoDepth::isReversed() ? 0.65f : -0.65f);
-                            stateset->setAttributeAndModes(polygonOffset, osg::StateAttribute::ON);
+                            handleShaderMaterialDrawableProperties(shaderMat, mat, *node, hasSortAlpha);
+                            break;
                         }
+                        handleDecal(shaderprop->decal(), hasSortAlpha, *node);
                         if (shaderprop->softEffect())
                             SceneUtil::setupSoftEffect(
                                 *node, shaderprop->mFalloffDepth, true, shaderprop->mFalloffDepth);
@@ -2860,10 +2922,13 @@ namespace NifOsg
         }
     };
 
-    osg::ref_ptr<osg::Node> Loader::load(Nif::FileView file, Resource::ImageManager* imageManager)
+    osg::ref_ptr<osg::Node> Loader::load(
+        Nif::FileView file, Resource::ImageManager* imageManager, Resource::BgsmFileManager* materialManager)
     {
         LoaderImpl impl(file.getFilename(), file.getVersion(), file.getUserVersion(), file.getBethVersion());
-        return impl.load(file, imageManager);
+        impl.mMaterialManager = materialManager;
+        impl.mImageManager = imageManager;
+        return impl.load(file);
     }
 
     void Loader::loadKf(Nif::FileView kf, SceneUtil::KeyframeHolder& target)
diff --git a/components/nifosg/nifloader.hpp b/components/nifosg/nifloader.hpp
index 21e0ae097c..14f16088cc 100644
--- a/components/nifosg/nifloader.hpp
+++ b/components/nifosg/nifloader.hpp
@@ -18,6 +18,7 @@ namespace osg
 namespace Resource
 {
     class ImageManager;
+    class BgsmFileManager;
 }
 
 namespace NifOsg
@@ -30,7 +31,8 @@ namespace NifOsg
     public:
         /// Create a scene graph for the given NIF. Auto-detects when skinning is used and wraps the graph in a Skeleton
         /// if so.
-        static osg::ref_ptr<osg::Node> load(Nif::FileView file, Resource::ImageManager* imageManager);
+        static osg::ref_ptr<osg::Node> load(
+            Nif::FileView file, Resource::ImageManager* imageManager, Resource::BgsmFileManager* materialManager);
 
         /// Load keyframe controllers from the given kf file.
         static void loadKf(Nif::FileView kf, SceneUtil::KeyframeHolder& target);
diff --git a/components/resource/bgsmfilemanager.cpp b/components/resource/bgsmfilemanager.cpp
new file mode 100644
index 0000000000..7d93608603
--- /dev/null
+++ b/components/resource/bgsmfilemanager.cpp
@@ -0,0 +1,55 @@
+#include "bgsmfilemanager.hpp"
+
+#include <osg/Object>
+
+#include <components/vfs/manager.hpp>
+
+#include "objectcache.hpp"
+
+namespace Resource
+{
+
+    class BgsmFileHolder : public osg::Object
+    {
+    public:
+        BgsmFileHolder(const Bgsm::MaterialFilePtr& file)
+            : mBgsmFile(file)
+        {
+        }
+        BgsmFileHolder(const BgsmFileHolder& copy, const osg::CopyOp& copyop)
+            : mBgsmFile(copy.mBgsmFile)
+        {
+        }
+
+        BgsmFileHolder() = default;
+
+        META_Object(Resource, BgsmFileHolder)
+
+        Bgsm::MaterialFilePtr mBgsmFile;
+    };
+
+    BgsmFileManager::BgsmFileManager(const VFS::Manager* vfs, double expiryDelay)
+        : ResourceManager(vfs, expiryDelay)
+    {
+    }
+
+    Bgsm::MaterialFilePtr BgsmFileManager::get(VFS::Path::NormalizedView name)
+    {
+        osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(name);
+        if (obj)
+            return static_cast<BgsmFileHolder*>(obj.get())->mBgsmFile;
+        else
+        {
+            Bgsm::MaterialFilePtr file = Bgsm::parse(mVFS->get(name));
+            obj = new BgsmFileHolder(file);
+            mCache->addEntryToObjectCache(name.value(), obj);
+            return file;
+        }
+    }
+
+    void BgsmFileManager::reportStats(unsigned int frameNumber, osg::Stats* stats) const
+    {
+        Resource::reportStats("BSShader Material", frameNumber, mCache->getStats(), *stats);
+    }
+
+}
diff --git a/components/resource/bgsmfilemanager.hpp b/components/resource/bgsmfilemanager.hpp
new file mode 100644
index 0000000000..3c77c2c665
--- /dev/null
+++ b/components/resource/bgsmfilemanager.hpp
@@ -0,0 +1,27 @@
+#ifndef OPENMW_COMPONENTS_RESOURCE_BGSMFILEMANAGER_H
+#define OPENMW_COMPONENTS_RESOURCE_BGSMFILEMANAGER_H
+
+#include <components/bgsm/file.hpp>
+
+#include "resourcemanager.hpp"
+
+namespace Resource
+{
+
+    /// @brief Handles caching of material files.
+    /// @note May be used from any thread.
+    class BgsmFileManager : public ResourceManager
+    {
+    public:
+        BgsmFileManager(const VFS::Manager* vfs, double expiryDelay);
+        ~BgsmFileManager() = default;
+
+        /// Retrieve a material file from the cache or load it from the VFS if not cached yet.
+        Bgsm::MaterialFilePtr get(VFS::Path::NormalizedView name);
+
+        void reportStats(unsigned int frameNumber, osg::Stats* stats) const override;
+    };
+
+}
+
+#endif
diff --git a/components/resource/keyframemanager.cpp b/components/resource/keyframemanager.cpp
index 0cbbe40d60..84e7a7e311 100644
--- a/components/resource/keyframemanager.cpp
+++ b/components/resource/keyframemanager.cpp
@@ -37,11 +37,11 @@ namespace Resource
 
     bool RetrieveAnimationsVisitor::belongsToLeftUpperExtremity(const std::string& name)
     {
-        static const std::array boneNames = { "bip01_l_clavicle", "left_clavicle", "bip01_l_upperarm", "left_upper_arm",
-            "bip01_l_forearm", "bip01_l_hand", "left_hand", "left_wrist", "shield_bone", "bip01_l_pinky1",
-            "bip01_l_pinky2", "bip01_l_pinky3", "bip01_l_ring1", "bip01_l_ring2", "bip01_l_ring3", "bip01_l_middle1",
-            "bip01_l_middle2", "bip01_l_middle3", "bip01_l_pointer1", "bip01_l_pointer2", "bip01_l_pointer3",
-            "bip01_l_thumb1", "bip01_l_thumb2", "bip01_l_thumb3", "left_forearm" };
+        static const std::array boneNames = { "bip01 l clavicle", "left clavicle", "bip01 l upperarm", "left upper arm",
+            "bip01 l forearm", "bip01 l hand", "left hand", "left wrist", "shield bone", "bip01 l pinky1",
+            "bip01 l pinky2", "bip01 l pinky3", "bip01 l ring1", "bip01 l ring2", "bip01 l ring3", "bip01 l middle1",
+            "bip01 l middle2", "bip01 l middle3", "bip01 l pointer1", "bip01 l pointer2", "bip01 l pointer3",
+            "bip01 l thumb1", "bip01 l thumb2", "bip01 l thumb3", "left forearm" };
 
         if (std::find(boneNames.begin(), boneNames.end(), name) != boneNames.end())
             return true;
@@ -51,11 +51,11 @@ namespace Resource
 
     bool RetrieveAnimationsVisitor::belongsToRightUpperExtremity(const std::string& name)
     {
-        static const std::array boneNames = { "bip01_r_clavicle", "right_clavicle", "bip01_r_upperarm",
-            "right_upper_arm", "bip01_r_forearm", "bip01_r_hand", "right_hand", "right_wrist", "bip01_r_thumb1",
-            "bip01_r_thumb2", "bip01_r_thumb3", "weapon_bone", "bip01_r_pinky1", "bip01_r_pinky2", "bip01_r_pinky3",
-            "bip01_r_ring1", "bip01_r_ring2", "bip01_r_ring3", "bip01_r_middle1", "bip01_r_middle2", "bip01_r_middle3",
-            "bip01_r_pointer1", "bip01_r_pointer2", "bip01_r_pointer3", "right_forearm" };
+        static const std::array boneNames = { "bip01 r clavicle", "right clavicle", "bip01 r upperarm",
+            "right upper arm", "bip01 r forearm", "bip01 r hand", "right hand", "right wrist", "bip01 r thumb1",
+            "bip01 r thumb2", "bip01 r thumb3", "weapon bone", "bip01 r pinky1", "bip01 r pinky2", "bip01 r pinky3",
+            "bip01 r ring1", "bip01 r ring2", "bip01 r ring3", "bip01 r middle1", "bip01 r middle2", "bip01 r middle3",
+            "bip01 r pointer1", "bip01 r pointer2", "bip01 r pointer3", "right forearm" };
 
         if (std::find(boneNames.begin(), boneNames.end(), name) != boneNames.end())
             return true;
@@ -66,7 +66,7 @@ namespace Resource
     bool RetrieveAnimationsVisitor::belongsToTorso(const std::string& name)
     {
         static const std::array boneNames
-            = { "bip01_spine1", "bip01_spine2", "bip01_neck", "bip01_head", "head", "neck", "chest", "groin" };
+            = { "bip01 spine1", "bip01 spine2", "bip01 neck", "bip01 head", "head", "neck", "chest", "groin" };
 
         if (std::find(boneNames.begin(), boneNames.end(), name) != boneNames.end())
             return true;
@@ -99,6 +99,9 @@ namespace Resource
                 const osgAnimation::ChannelList& channels = animation->getChannels();
                 for (const auto& channel : channels)
                 {
+                    // Replace channel target name to match the renamed bones/transforms
+                    channel->setTargetName(Misc::StringUtils::underscoresToSpaces(channel->getTargetName()));
+
                     if (name == "Bip01 R Clavicle")
                     {
                         if (!belongsToRightUpperExtremity(channel->getTargetName()))
diff --git a/components/resource/resourcesystem.cpp b/components/resource/resourcesystem.cpp
index 65a83a60ab..f012627efb 100644
--- a/components/resource/resourcesystem.cpp
+++ b/components/resource/resourcesystem.cpp
@@ -2,6 +2,7 @@
 
 #include <algorithm>
 
+#include "bgsmfilemanager.hpp"
 #include "imagemanager.hpp"
 #include "keyframemanager.hpp"
 #include "niffilemanager.hpp"
@@ -15,11 +16,14 @@ namespace Resource
         : mVFS(vfs)
     {
         mNifFileManager = std::make_unique<NifFileManager>(vfs, encoder);
+        mBgsmFileManager = std::make_unique<BgsmFileManager>(vfs, expiryDelay);
         mImageManager = std::make_unique<ImageManager>(vfs, expiryDelay);
-        mSceneManager = std::make_unique<SceneManager>(vfs, mImageManager.get(), mNifFileManager.get(), expiryDelay);
+        mSceneManager = std::make_unique<SceneManager>(
+            vfs, mImageManager.get(), mNifFileManager.get(), mBgsmFileManager.get(), expiryDelay);
         mKeyframeManager = std::make_unique<KeyframeManager>(vfs, mSceneManager.get(), expiryDelay, encoder);
 
         addResourceManager(mNifFileManager.get());
+        addResourceManager(mBgsmFileManager.get());
         addResourceManager(mKeyframeManager.get());
         // note, scene references images so add images afterwards for correct implementation of updateCache()
         addResourceManager(mSceneManager.get());
@@ -43,6 +47,11 @@ namespace Resource
         return mImageManager.get();
     }
 
+    BgsmFileManager* ResourceSystem::getBgsmFileManager()
+    {
+        return mBgsmFileManager.get();
+    }
+
     NifFileManager* ResourceSystem::getNifFileManager()
     {
         return mNifFileManager.get();
diff --git a/components/resource/resourcesystem.hpp b/components/resource/resourcesystem.hpp
index f7f09b9277..5609176a89 100644
--- a/components/resource/resourcesystem.hpp
+++ b/components/resource/resourcesystem.hpp
@@ -25,6 +25,7 @@ namespace Resource
 
     class SceneManager;
     class ImageManager;
+    class BgsmFileManager;
     class NifFileManager;
     class KeyframeManager;
     class BaseResourceManager;
@@ -41,6 +42,7 @@ namespace Resource
 
         SceneManager* getSceneManager();
         ImageManager* getImageManager();
+        BgsmFileManager* getBgsmFileManager();
         NifFileManager* getNifFileManager();
         KeyframeManager* getKeyframeManager();
 
@@ -74,6 +76,7 @@ namespace Resource
     private:
         std::unique_ptr<SceneManager> mSceneManager;
         std::unique_ptr<ImageManager> mImageManager;
+        std::unique_ptr<BgsmFileManager> mBgsmFileManager;
         std::unique_ptr<NifFileManager> mNifFileManager;
         std::unique_ptr<KeyframeManager> mKeyframeManager;
 
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index e4d0b4363d..fbc6acb3cf 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -9,7 +9,10 @@
 #include <osg/Node>
 #include <osg/UserDataContainer>
 
+#include <osgAnimation/Bone>
 #include <osgAnimation/RigGeometry>
+#include <osgAnimation/Skeleton>
+#include <osgAnimation/UpdateBone>
 
 #include <osgParticle/ParticleSystem>
 
@@ -52,6 +55,7 @@
 #include <components/files/hash.hpp>
 #include <components/files/memorystream.hpp>
 
+#include "bgsmfilemanager.hpp"
 #include "errormarker.hpp"
 #include "imagemanager.hpp"
 #include "niffilemanager.hpp"
@@ -268,6 +272,11 @@ namespace Resource
 
         void apply(osg::Node& node) override
         {
+            // If an osgAnimation bone/transform, ensure underscores in name are replaced with spaces
+            // this is for compatibility reasons
+            if (dynamic_cast<osgAnimation::Bone*>(&node))
+                node.setName(Misc::StringUtils::underscoresToSpaces(node.getName()));
+
             if (osg::StateSet* stateset = node.getStateSet())
             {
                 if (stateset->getRenderingHint() == osg::StateSet::TRANSPARENT_BIN)
@@ -353,8 +362,55 @@ namespace Resource
         std::vector<osg::ref_ptr<SceneUtil::RigGeometryHolder>> mRigGeometryHolders;
     };
 
+    void updateVertexInfluenceMap(osgAnimation::RigGeometry& rig)
+    {
+        osgAnimation::VertexInfluenceMap* vertexInfluenceMap = rig.getInfluenceMap();
+        if (!vertexInfluenceMap)
+            return;
+
+        std::vector<std::string> renameList;
+        for (const auto& [boneName, unused] : *vertexInfluenceMap)
+        {
+            if (boneName.find('_') != std::string::npos)
+                renameList.push_back(boneName);
+        }
+
+        for (const std::string& oldName : renameList)
+        {
+            const std::string newName = Misc::StringUtils::underscoresToSpaces(oldName);
+            if (vertexInfluenceMap->find(newName) == vertexInfluenceMap->end())
+                (*vertexInfluenceMap)[newName] = std::move((*vertexInfluenceMap)[oldName]);
+            vertexInfluenceMap->erase(oldName);
+        }
+    }
+
+    class RenameAnimCallbacksVisitor : public osg::NodeVisitor
+    {
+    public:
+        RenameAnimCallbacksVisitor()
+            : osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN)
+        {
+        }
+
+        void apply(osg::MatrixTransform& node) override
+        {
+            // osgAnimation update callback name must match bone name/channel targets
+            osg::Callback* cb = node.getUpdateCallback();
+            while (cb)
+            {
+                auto animCb = dynamic_cast<osgAnimation::AnimationUpdateCallback<osg::NodeCallback>*>(cb);
+                if (animCb)
+                    animCb->setName(Misc::StringUtils::underscoresToSpaces(animCb->getName()));
+
+                cb = cb->getNestedCallback();
+            }
+
+            traverse(node);
+        }
+    };
+
     SceneManager::SceneManager(const VFS::Manager* vfs, Resource::ImageManager* imageManager,
-        Resource::NifFileManager* nifFileManager, double expiryDelay)
+        Resource::NifFileManager* nifFileManager, Resource::BgsmFileManager* bgsmFileManager, double expiryDelay)
         : ResourceManager(vfs, expiryDelay)
         , mShaderManager(new Shader::ShaderManager)
         , mForceShaders(false)
@@ -369,6 +425,7 @@ namespace Resource
         , mSharedStateManager(new SharedStateManager)
         , mImageManager(imageManager)
         , mNifFileManager(nifFileManager)
+        , mBgsmFileManager(bgsmFileManager)
         , mMinFilter(osg::Texture::LINEAR_MIPMAP_LINEAR)
         , mMagFilter(osg::Texture::LINEAR)
         , mMaxAnisotropy(1)
@@ -556,6 +613,7 @@ namespace Resource
             VFS::Path::NormalizedView normalizedFilename, std::istream& model, Resource::ImageManager* imageManager)
         {
             const std::string_view ext = Misc::getFileExtension(normalizedFilename.value());
+            const bool isColladaFile = ext == "dae";
             osgDB::ReaderWriter* reader = osgDB::Registry::instance()->getReaderWriterForExtension(std::string(ext));
             if (!reader)
             {
@@ -571,7 +629,7 @@ namespace Resource
             // findFileCallback would be necessary. but findFileCallback does not support virtual files, so we can't
             // implement it.
             options->setReadFileCallback(new ImageReadCallback(imageManager));
-            if (ext == "dae")
+            if (isColladaFile)
                 options->setOptionString("daeUseSequencedTextureUnits");
 
             const std::array<std::uint64_t, 2> fileHash = Files::getHash(normalizedFilename.value(), model);
@@ -599,9 +657,13 @@ namespace Resource
             node->accept(rigFinder);
             for (osg::Node* foundRigNode : rigFinder.mFoundNodes)
             {
-                if (foundRigNode->libraryName() == std::string("osgAnimation"))
+                if (foundRigNode->libraryName() == std::string_view("osgAnimation"))
                 {
                     osgAnimation::RigGeometry* foundRigGeometry = static_cast<osgAnimation::RigGeometry*>(foundRigNode);
+
+                    if (isColladaFile)
+                        Resource::updateVertexInfluenceMap(*foundRigGeometry);
+
                     osg::ref_ptr<SceneUtil::RigGeometryHolder> newRig
                         = new SceneUtil::RigGeometryHolder(*foundRigGeometry, osg::CopyOp::DEEP_COPY_ALL);
 
@@ -616,13 +678,18 @@ namespace Resource
                 }
             }
 
-            if (ext == "dae")
+            if (isColladaFile)
             {
                 Resource::ColladaDescriptionVisitor colladaDescriptionVisitor;
                 node->accept(colladaDescriptionVisitor);
 
                 if (colladaDescriptionVisitor.mSkeleton)
                 {
+                    // Collada bones may have underscores in place of spaces due to a collada limitation
+                    // we should rename the bones and update callbacks here at load time
+                    Resource::RenameAnimCallbacksVisitor renameBoneVisitor;
+                    node->accept(renameBoneVisitor);
+
                     if (osg::Group* group = dynamic_cast<osg::Group*>(node))
                     {
                         group->removeChildren(0, group->getNumChildren());
@@ -730,11 +797,12 @@ namespace Resource
     }
 
     osg::ref_ptr<osg::Node> load(VFS::Path::NormalizedView normalizedFilename, const VFS::Manager* vfs,
-        Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager)
+        Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager,
+        Resource::BgsmFileManager* materialMgr)
     {
         const std::string_view ext = Misc::getFileExtension(normalizedFilename.value());
         if (ext == "nif")
-            return NifOsg::Loader::load(*nifFileManager->get(normalizedFilename), imageManager);
+            return NifOsg::Loader::load(*nifFileManager->get(normalizedFilename), imageManager, materialMgr);
         else if (ext == "spt")
         {
             Log(Debug::Warning) << "Ignoring SpeedTree data file " << normalizedFilename;
@@ -856,7 +924,7 @@ namespace Resource
             {
                 path.changeExtension(meshType);
                 if (mVFS->exists(path))
-                    return load(path, mVFS, mImageManager, mNifFileManager);
+                    return load(path, mVFS, mImageManager, mNifFileManager, mBgsmFileManager);
             }
         }
         catch (const std::exception& e)
@@ -865,7 +933,8 @@ namespace Resource
                                 << ", using embedded marker_error instead";
         }
         Files::IMemStream file(ErrorMarker::sValue.data(), ErrorMarker::sValue.size());
-        return loadNonNif("error_marker.osgt", file, mImageManager);
+        constexpr VFS::Path::NormalizedView errorMarker("error_marker.osgt");
+        return loadNonNif(errorMarker, file, mImageManager);
     }
 
     osg::ref_ptr<osg::Node> SceneManager::cloneErrorMarker()
@@ -888,7 +957,7 @@ namespace Resource
             osg::ref_ptr<osg::Node> loaded;
             try
             {
-                loaded = load(normalized, mVFS, mImageManager, mNifFileManager);
+                loaded = load(normalized, mVFS, mImageManager, mNifFileManager, mBgsmFileManager);
 
                 SceneUtil::ProcessExtraDataVisitor extraDataVisitor(this);
                 loaded->accept(extraDataVisitor);
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index 3ad8a24892..31ad51694c 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -32,6 +32,7 @@ namespace Resource
 {
     class ImageManager;
     class NifFileManager;
+    class BgsmFileManager;
     class SharedStateManager;
 }
 
@@ -90,7 +91,7 @@ namespace Resource
     {
     public:
         explicit SceneManager(const VFS::Manager* vfs, Resource::ImageManager* imageManager,
-            Resource::NifFileManager* nifFileManager, double expiryDelay);
+            Resource::NifFileManager* nifFileManager, Resource::BgsmFileManager* bgsmFileManager, double expiryDelay);
         ~SceneManager();
 
         Shader::ShaderManager& getShaderManager();
@@ -259,6 +260,7 @@ namespace Resource
 
         Resource::ImageManager* mImageManager;
         Resource::NifFileManager* mNifFileManager;
+        Resource::BgsmFileManager* mBgsmFileManager;
 
         osg::Texture::FilterMode mMinFilter;
         osg::Texture::FilterMode mMagFilter;
diff --git a/components/resource/stats.cpp b/components/resource/stats.cpp
index 9bb90635d1..6730ddb303 100644
--- a/components/resource/stats.cpp
+++ b/components/resource/stats.cpp
@@ -87,6 +87,7 @@ namespace Resource
                 "Image",
                 "Nif",
                 "Keyframe",
+                "BSShader Material",
                 "Groundcover Chunk",
                 "Object Chunk",
                 "Terrain Chunk",
diff --git a/components/sceneutil/extradata.cpp b/components/sceneutil/extradata.cpp
index bd82e9abba..5e91830bba 100644
--- a/components/sceneutil/extradata.cpp
+++ b/components/sceneutil/extradata.cpp
@@ -9,6 +9,7 @@
 #include <yaml-cpp/yaml.h>
 
 #include <components/misc/osguservalues.hpp>
+#include <components/misc/strings/algorithm.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/depth.hpp>
 #include <components/shader/shadermanager.hpp>
diff --git a/components/sceneutil/osgacontroller.cpp b/components/sceneutil/osgacontroller.cpp
index 06b693a6ca..d3268fef36 100644
--- a/components/sceneutil/osgacontroller.cpp
+++ b/components/sceneutil/osgacontroller.cpp
@@ -1,5 +1,6 @@
 #include <components/sceneutil/osgacontroller.hpp>
 
+#include <osg/MatrixTransform>
 #include <osg/Node>
 #include <osg/NodeVisitor>
 #include <osg/ref_ptr>
@@ -9,6 +10,7 @@
 #include <osgAnimation/Sampler>
 #include <osgAnimation/UpdateMatrixTransform>
 
+#include <components/misc/strings/algorithm.hpp>
 #include <components/misc/strings/lower.hpp>
 #include <components/resource/animation.hpp>
 #include <components/sceneutil/controller.hpp>
@@ -24,6 +26,10 @@ namespace SceneUtil
 
     void LinkVisitor::link(osgAnimation::UpdateMatrixTransform* umt)
     {
+        // If osgAnimation had underscores, we should update the umt name also
+        // otherwise the animation channel and updates wont be applied
+        umt->setName(Misc::StringUtils::underscoresToSpaces(umt->getName()));
+
         const osgAnimation::ChannelList& channels = mAnimation->getChannels();
         for (const auto& channel : channels)
         {
@@ -85,9 +91,8 @@ namespace SceneUtil
         }
     }
 
-    osg::Vec3f OsgAnimationController::getTranslation(float time) const
+    osg::Matrixf OsgAnimationController::getTransformForNode(float time, const std::string_view name) const
     {
-        osg::Vec3f translationValue;
         std::string animationName;
         float newTime = time;
 
@@ -98,10 +103,11 @@ namespace SceneUtil
             {
                 newTime = time - emulatedAnimation.mStartTime;
                 animationName = emulatedAnimation.mName;
+                break;
             }
         }
 
-        // Find the root transform track in animation
+        // Find the bone's transform track in animation
         for (const auto& mergedAnimationTrack : mMergedAnimationTracks)
         {
             if (mergedAnimationTrack->getName() != animationName)
@@ -111,7 +117,7 @@ namespace SceneUtil
 
             for (const auto& channel : channels)
             {
-                if (channel->getTargetName() != "bip01" || channel->getName() != "transform")
+                if (!Misc::StringUtils::ciEqual(name, channel->getTargetName()) || channel->getName() != "transform")
                     continue;
 
                 if (osgAnimation::MatrixLinearSampler* templateSampler
@@ -119,13 +125,17 @@ namespace SceneUtil
                 {
                     osg::Matrixf matrix;
                     templateSampler->getValueAt(newTime, matrix);
-                    translationValue = matrix.getTrans();
-                    return osg::Vec3f(translationValue[0], translationValue[1], translationValue[2]);
+                    return matrix;
                 }
             }
         }
 
-        return osg::Vec3f();
+        return osg::Matrixf::identity();
+    }
+
+    osg::Vec3f OsgAnimationController::getTranslation(float time) const
+    {
+        return getTransformForNode(time, "bip01").getTrans();
     }
 
     void OsgAnimationController::update(float time, const std::string& animationName)
@@ -162,6 +172,12 @@ namespace SceneUtil
                     update(time - emulatedAnimation.mStartTime, emulatedAnimation.mName);
                 }
             }
+
+            // Reset the transform of this node to whats in the animation
+            // we force this here because downstream some code relies on the bone having a non-modified transform
+            // as this is how the NIF controller behaves. RotationController is a good example of this.
+            // Without this here, it causes osgAnimation skeletons to spin wildly
+            static_cast<osg::MatrixTransform*>(node)->setMatrix(getTransformForNode(time, node->getName()));
         }
 
         traverse(node, nv);
diff --git a/components/sceneutil/osgacontroller.hpp b/components/sceneutil/osgacontroller.hpp
index 8739d68b99..bb9a621760 100644
--- a/components/sceneutil/osgacontroller.hpp
+++ b/components/sceneutil/osgacontroller.hpp
@@ -59,6 +59,9 @@ namespace SceneUtil
         /// @brief Handles the location of the instance
         osg::Vec3f getTranslation(float time) const override;
 
+        /// @brief Handles finding bone position in the animation
+        osg::Matrixf getTransformForNode(float time, const std::string_view name) const;
+
         /// @brief Calls animation track update()
         void update(float time, const std::string& animationName);
 
diff --git a/components/sceneutil/visitor.cpp b/components/sceneutil/visitor.cpp
index ffcf12b167..8d1bf46322 100644
--- a/components/sceneutil/visitor.cpp
+++ b/components/sceneutil/visitor.cpp
@@ -5,6 +5,8 @@
 
 #include <osgParticle/ParticleSystem>
 
+#include <osgAnimation/Bone>
+
 #include <components/debug/debuglog.hpp>
 #include <components/misc/strings/algorithm.hpp>
 
@@ -13,7 +15,6 @@
 
 namespace SceneUtil
 {
-
     bool FindByNameVisitor::checkGroup(osg::Group& group)
     {
         if (Misc::StringUtils::ciEqual(group.getName(), mNameToFind))
@@ -22,35 +23,13 @@ namespace SceneUtil
             return true;
         }
 
-        // FIXME: can the nodes/bones be renamed at loading stage rather than each time?
-        // Convert underscores to whitespaces as a workaround for Collada (OpenMW's animation system uses
-        // whitespace-separated names)
-        std::string nodeName = group.getName();
-        std::replace(nodeName.begin(), nodeName.end(), '_', ' ');
-        if (Misc::StringUtils::ciEqual(nodeName, mNameToFind))
-        {
-            mFoundNode = &group;
-            return true;
-        }
         return false;
     }
 
     void FindByClassVisitor::apply(osg::Node& node)
     {
         if (Misc::StringUtils::ciEqual(node.className(), mNameToFind))
-        {
             mFoundNodes.push_back(&node);
-        }
-        else
-        {
-            // FIXME: can the nodes/bones be renamed at loading stage rather than each time?
-            // Convert underscores to whitespaces as a workaround for Collada (OpenMW's animation system uses
-            // whitespace-separated names)
-            std::string nodeName = node.className();
-            std::replace(nodeName.begin(), nodeName.end(), '_', ' ');
-            if (Misc::StringUtils::ciEqual(nodeName, mNameToFind))
-                mFoundNodes.push_back(&node);
-        }
 
         traverse(node);
     }
@@ -69,23 +48,19 @@ namespace SceneUtil
 
     void FindByNameVisitor::apply(osg::Geometry&) {}
 
+    void NodeMapVisitorBoneOnly::apply(osg::MatrixTransform& trans)
+    {
+        // Choose first found bone in file
+        if (dynamic_cast<osgAnimation::Bone*>(&trans) != nullptr)
+            mMap.emplace(trans.getName(), &trans);
+
+        traverse(trans);
+    }
+
     void NodeMapVisitor::apply(osg::MatrixTransform& trans)
     {
         // Choose first found node in file
-
-        if (trans.libraryName() == std::string_view("osgAnimation"))
-        {
-            std::string nodeName = trans.getName();
-
-            // FIXME: can the nodes/bones be renamed at loading stage rather than each time?
-            // Convert underscores to whitespaces as a workaround for Collada (OpenMW's animation system uses
-            // whitespace-separated names)
-            std::replace(nodeName.begin(), nodeName.end(), '_', ' ');
-            mMap.emplace(nodeName, &trans);
-        }
-        else
-            mMap.emplace(trans.getName(), &trans);
-
+        mMap.emplace(trans.getName(), &trans);
         traverse(trans);
     }
 
diff --git a/components/sceneutil/visitor.hpp b/components/sceneutil/visitor.hpp
index 3e3df4d4b3..a9a943423c 100644
--- a/components/sceneutil/visitor.hpp
+++ b/components/sceneutil/visitor.hpp
@@ -50,14 +50,14 @@ namespace SceneUtil
         std::vector<osg::Node*> mFoundNodes;
     };
 
+    typedef std::unordered_map<std::string, osg::ref_ptr<osg::MatrixTransform>, Misc::StringUtils::CiHash,
+        Misc::StringUtils::CiEqual>
+        NodeMap;
+
     /// Maps names to nodes
     class NodeMapVisitor : public osg::NodeVisitor
     {
     public:
-        typedef std::unordered_map<std::string, osg::ref_ptr<osg::MatrixTransform>, Misc::StringUtils::CiHash,
-            Misc::StringUtils::CiEqual>
-            NodeMap;
-
         NodeMapVisitor(NodeMap& map)
             : osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN)
             , mMap(map)
@@ -70,6 +70,22 @@ namespace SceneUtil
         NodeMap& mMap;
     };
 
+    /// Maps names to bone nodes
+    class NodeMapVisitorBoneOnly : public osg::NodeVisitor
+    {
+    public:
+        NodeMapVisitorBoneOnly(NodeMap& map)
+            : osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN)
+            , mMap(map)
+        {
+        }
+
+        void apply(osg::MatrixTransform& trans) override;
+
+    private:
+        NodeMap& mMap;
+    };
+
     /// @brief Base class for visitors that remove nodes from a scene graph.
     /// Subclasses need to fill the mToRemove vector.
     /// To use, node->accept(removeVisitor); removeVisitor.remove();
diff --git a/components/vfs/manager.cpp b/components/vfs/manager.cpp
index 936dd64679..2d22a7a034 100644
--- a/components/vfs/manager.cpp
+++ b/components/vfs/manager.cpp
@@ -99,4 +99,21 @@ namespace VFS
         ++normalized.back();
         return { it, mIndex.lower_bound(normalized) };
     }
+
+    RecursiveDirectoryRange Manager::getRecursiveDirectoryIterator(VFS::Path::NormalizedView path) const
+    {
+        if (path.value().empty())
+            return { mIndex.begin(), mIndex.end() };
+        const auto it = mIndex.lower_bound(path);
+        if (it == mIndex.end() || !it->first.view().starts_with(path.value()))
+            return { it, it };
+        std::string copy(path.value());
+        ++copy.back();
+        return { it, mIndex.lower_bound(copy) };
+    }
+
+    RecursiveDirectoryRange Manager::getRecursiveDirectoryIterator() const
+    {
+        return { mIndex.begin(), mIndex.end() };
+    }
 }
diff --git a/components/vfs/manager.hpp b/components/vfs/manager.hpp
index 59211602de..d64be1d1d1 100644
--- a/components/vfs/manager.hpp
+++ b/components/vfs/manager.hpp
@@ -65,6 +65,10 @@ namespace VFS
         /// @note May be called from any thread once the index has been built.
         RecursiveDirectoryRange getRecursiveDirectoryIterator(std::string_view path) const;
 
+        RecursiveDirectoryRange getRecursiveDirectoryIterator(VFS::Path::NormalizedView path) const;
+
+        RecursiveDirectoryRange getRecursiveDirectoryIterator() const;
+
         /// Retrieve the absolute path to the file
         /// @note Throws an exception if the file can not be found.
         /// @note May be called from any thread once the index has been built.
diff --git a/components/vfs/pathutil.hpp b/components/vfs/pathutil.hpp
index 07e73acfa9..50f16d1804 100644
--- a/components/vfs/pathutil.hpp
+++ b/components/vfs/pathutil.hpp
@@ -79,7 +79,7 @@ namespace VFS::Path
     public:
         constexpr NormalizedView() noexcept = default;
 
-        constexpr NormalizedView(const char* value)
+        constexpr explicit NormalizedView(const char* value)
             : mValue(value)
         {
             if (!isNormalized(mValue))
@@ -179,6 +179,12 @@ namespace VFS::Path
             return true;
         }
 
+        Normalized& operator=(NormalizedView value)
+        {
+            mValue = value.value();
+            return *this;
+        }
+
         Normalized& operator/=(NormalizedView value)
         {
             mValue.reserve(mValue.size() + value.value().size() + 1);
@@ -258,6 +264,22 @@ namespace VFS::Path
         result /= rhs;
         return result;
     }
+
+    struct Hash
+    {
+        using is_transparent = void;
+
+        [[nodiscard]] std::size_t operator()(std::string_view sv) const { return std::hash<std::string_view>{}(sv); }
+
+        [[nodiscard]] std::size_t operator()(const std::string& s) const { return std::hash<std::string>{}(s); }
+
+        [[nodiscard]] std::size_t operator()(const Normalized& s) const { return std::hash<std::string>{}(s.value()); }
+
+        [[nodiscard]] std::size_t operator()(NormalizedView s) const
+        {
+            return std::hash<std::string_view>{}(s.value());
+        }
+    };
 }
 
 #endif
diff --git a/files/lang/components_sv.ts b/files/lang/components_sv.ts
new file mode 100644
index 0000000000..8682a569bd
--- /dev/null
+++ b/files/lang/components_sv.ts
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="sv_SE">
+<context>
+    <name>ContentSelector</name>
+    <message>
+        <source>Select language used by ESM/ESP content files to allow OpenMW to detect their encoding. </source>
+        <translation>Välj språk som används av ESM/ESP-innehållsfiler så att OpenMW kan hitta deras kodning. </translation>
+    </message>
+</context>
+<context>
+    <name>ContentSelectorModel::ContentModel</name>
+    <message>
+        <source>Unable to find dependent file: %1</source>
+        <translation>Kunde inte hitta beroende fil: %1</translation>
+    </message>
+    <message>
+        <source>Dependent file needs to be active: %1</source>
+        <translation>Beroende fil måste vara aktiv: %1</translation>
+    </message>
+    <message>
+        <source>This file needs to load after %1</source>
+        <translation>Denna fil måste laddas efter %1</translation>
+    </message>
+</context>
+<context>
+    <name>ContentSelectorModel::EsmFile</name>
+    <message>
+        <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;br/&gt;&lt;b&gt;Format version:&lt;/b&gt; %2&lt;br/&gt;&lt;b&gt;Modified:&lt;/b&gt; %3&lt;br/&gt;&lt;b&gt;Path:&lt;/b&gt;&lt;br/&gt;%4&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Description:&lt;/b&gt;&lt;br/&gt;%5&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Dependencies: &lt;/b&gt;%6&lt;br/&gt;</source>
+        <translation>&lt;b&gt;Skapare:&lt;/b&gt; %1&lt;br/&gt;&lt;b&gt;Formatversion:&lt;/b&gt; %2&lt;br/&gt;&lt;b&gt;Ändrad:&lt;/b&gt; %3&lt;br/&gt;&lt;b&gt;Sökväg:&lt;/b&gt;&lt;br/&gt;%4&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Beskrivning:&lt;/b&gt;&lt;br/&gt;%5&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Beroenden: &lt;/b&gt;%6&lt;br/&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br/&gt;&lt;b&gt;This content file cannot be disabled because it is part of OpenMW.&lt;/b&gt;&lt;br/&gt;</source>
+        <translation>&lt;br/&gt;&lt;b&gt;Denna innehållsfil kan inte inaktiveras då den är en del av OpenMW.&lt;/b&gt;&lt;br/&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br/&gt;&lt;b&gt;This content file cannot be disabled because it is enabled in a config file other than the user one.&lt;/b&gt;&lt;br/&gt;</source>
+        <translation>&lt;br/&gt;&lt;b&gt;Denna innehållsfil kan inte inaktiveras då den är en aktiverad i en annan konfigurationsfil än användarens.&lt;/b&gt;&lt;br/&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>ContentSelectorView::ContentSelector</name>
+    <message>
+        <source>&amp;Check Selected</source>
+        <translation>&amp;Bocka i markerade</translation>
+    </message>
+    <message>
+        <source>&amp;Uncheck Selected</source>
+        <translation>&amp;Bocka ur markerade</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Path(s) to Clipboard</source>
+        <translation>&amp;Kopiera sökväg(ar) till klippbordet</translation>
+    </message>
+    <message>
+        <source>&lt;No game file&gt;</source>
+        <translation>&lt;Ingen spelfil&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>Process::ProcessInvoker</name>
+    <message>
+        <source>Error starting executable</source>
+        <translation>Kunde inte starta körbara filen</translation>
+    </message>
+    <message>
+        <source>Error running executable</source>
+        <translation>Fel när körbara filen skulle köras</translation>
+    </message>
+    <message>
+        <source>
+Arguments:
+</source>
+        <translation>
+Argument:
+</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not find %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;The application is not found.&lt;/p&gt;&lt;p&gt;Please make sure OpenMW is installed correctly and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Kunde inte hitta %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Applikationen hittas inte.&lt;/p&gt;&lt;p&gt;Se till att OpenMW är korrekt installerat och försök igen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not start %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;The application is not executable.&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Kunde inte starta %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Applikationen är inte körbar.&lt;/p&gt;&lt;p&gt;Se till att du har rätt behörigheter och försök igen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not start %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;An error occurred while starting %1.&lt;/p&gt;&lt;p&gt;Press &quot;Show Details...&quot; for more information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Kunde inte starta %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Ett fel uppstod när %1 skulle startas.&lt;/p&gt;&lt;p&gt;Tryck på &quot;Visa detaljer...&quot; för mer information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Executable %1 returned an error&lt;/b&gt;&lt;/p&gt;&lt;p&gt;An error occurred while running %1.&lt;/p&gt;&lt;p&gt;Press &quot;Show Details...&quot; for more information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Körbara filen %1 gav ett felmeddelande&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Ett fel uppstod när %1 kördes.&lt;/p&gt;&lt;p&gt;Tryck på &quot;Visa detaljer...&quot; för mer information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+</context>
+</TS>
diff --git a/files/lang/launcher_sv.ts b/files/lang/launcher_sv.ts
new file mode 100644
index 0000000000..4cd75487b2
--- /dev/null
+++ b/files/lang/launcher_sv.ts
@@ -0,0 +1,1494 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="sv_SE">
+<context>
+    <name>DataFilesPage</name>
+    <message>
+        <source>Content Files</source>
+        <translation>Innehållsfiler</translation>
+    </message>
+    <message>
+        <source>Data Directories</source>
+        <translation>Datakataloger</translation>
+    </message>
+    <message>
+        <source>Scan directories for likely data directories and append them at the end of the list.</source>
+        <translation>Skanna kataloger för troliga datakataloger och lägg till dem i slutet på listan.</translation>
+    </message>
+    <message>
+        <source>Append</source>
+        <translation>Lägg till</translation>
+    </message>
+    <message>
+        <source>Scan directories for likely data directories and insert them above the selected position</source>
+        <translation>Skanna kataloger för troliga datakataloger och lägg till dem ovanför den markerade positionen</translation>
+    </message>
+    <message>
+        <source>Insert Above</source>
+        <translation>Lägg till ovanför</translation>
+    </message>
+    <message>
+        <source>Move selected directory one position up</source>
+        <translation>Flytta markerad katalog en position upp</translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation>Flytta upp</translation>
+    </message>
+    <message>
+        <source>Move selected directory one position down</source>
+        <translation>Flytta markerad katalog en position ner</translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation>Flytta ner</translation>
+    </message>
+    <message>
+        <source>Remove selected directory</source>
+        <translation>Ta bort markerad katalog</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Ta bort</translation>
+    </message>
+    <message>
+        <source>Archive Files</source>
+        <translation>Arkivfiler</translation>
+    </message>
+    <message>
+        <source>Move selected archive one position up</source>
+        <translation>Flytta markerat arkiv en position upp</translation>
+    </message>
+    <message>
+        <source>Move selected archive one position down</source>
+        <translation>Flytta markerat arkiv en position ner</translation>
+    </message>
+    <message>
+        <source>Navigation Mesh Cache</source>
+        <translation>Cache för navigeringsmesh</translation>
+    </message>
+    <message>
+        <source>Generate navigation mesh cache for all content. Will be used by the engine to make cell loading faster.</source>
+        <translation>Generera navigeringsmesh för allt innehåll. Kommer användas av motorn för att ladda celler snabbare.</translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation>Uppdatera</translation>
+    </message>
+    <message>
+        <source>Cancel navigation mesh generation. Already processed data will be saved.</source>
+        <translation>Avbryt generering av navigationsmesh. Redan processad data kommer sparas.</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Avbryt</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation> MiB</translation>
+    </message>
+    <message>
+        <source>Content List</source>
+        <translation>Innehållslista</translation>
+    </message>
+    <message>
+        <source>Select a content list</source>
+        <translation>Välj en innehållslista</translation>
+    </message>
+    <message>
+        <source>New Content List</source>
+        <translation>Ny innehållslista</translation>
+    </message>
+    <message>
+        <source>&amp;New Content List</source>
+        <translation>&amp;Ny innehållslista</translation>
+    </message>
+    <message>
+        <source>Clone Content List</source>
+        <translation>Klona innehållslista</translation>
+    </message>
+    <message>
+        <source>Delete Content List</source>
+        <translation>Radera innehållslista</translation>
+    </message>
+    <message>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
+    </message>
+    <message>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <source>Check Selection</source>
+        <translation>Kryssa markering</translation>
+    </message>
+    <message>
+        <source>Uncheck Selection</source>
+        <translation>Avkryssa markering</translation>
+    </message>
+    <message>
+        <source>Refresh Data Files</source>
+        <translation>Uppdatera datafiler</translation>
+    </message>
+    <message>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: content files that are not part of current Content List are &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Notera: innehållsfiler som inte är del av aktuell innehållslista är &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;markerade&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: directories that are not part of current Content List are &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Notera: kataloger som inte är del av aktuell innehållslista är &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;markerade&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: archives that are not part of current Content List are &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;highlighted&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Notera: arkiv som inte är del av aktuell innehållslista är &lt;span style=&quot; font-style:italic;font-weight: bold&quot;&gt;markerade&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Remove Unused Tiles</source>
+        <translation>Ta bort oanvända celler</translation>
+    </message>
+    <message>
+        <source>Max Size</source>
+        <translation>Maximal storlek</translation>
+    </message>
+</context>
+<context>
+    <name>GraphicsPage</name>
+    <message>
+        <source>0</source>
+        <translation>0</translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation>2</translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation>4</translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation>8</translation>
+    </message>
+    <message>
+        <source>16</source>
+        <translation>16</translation>
+    </message>
+    <message>
+        <source>Custom:</source>
+        <translation>Egen:</translation>
+    </message>
+    <message>
+        <source>Standard:</source>
+        <translation>Standard:</translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation>Helskärm</translation>
+    </message>
+    <message>
+        <source>Windowed Fullscreen</source>
+        <translation>Helskärm i fönsterläge</translation>
+    </message>
+    <message>
+        <source>Windowed</source>
+        <translation>Fönster</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Inaktiverad</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Aktiverad</translation>
+    </message>
+    <message>
+        <source>Adaptive</source>
+        <translation>Adaptiv</translation>
+    </message>
+    <message>
+        <source> FPS</source>
+        <translation> FPS</translation>
+    </message>
+    <message>
+        <source> × </source>
+        <translation> × </translation>
+    </message>
+    <message>
+        <source>Screen</source>
+        <translation>Skärm</translation>
+    </message>
+    <message>
+        <source>Resolution</source>
+        <translation>Upplösning</translation>
+    </message>
+    <message>
+        <source>Window Mode</source>
+        <translation>Fönsterläge</translation>
+    </message>
+    <message>
+        <source>Framerate Limit</source>
+        <translation>Gränsvärde bilduppdateringsfrekvens</translation>
+    </message>
+    <message>
+        <source>Window Border</source>
+        <translation>Fönster, ram</translation>
+    </message>
+    <message>
+        <source>Anti-Aliasing</source>
+        <translation>Kantutjämning</translation>
+    </message>
+    <message>
+        <source>Vertical Synchronization</source>
+        <translation>Vertikal synkronisering</translation>
+    </message>
+</context>
+<context>
+    <name>ImportPage</name>
+    <message>
+        <source>Form</source>
+        <translatorcomment>Can be translated in different ways depending on context. Will return to later.</translatorcomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morrowind Installation Wizard</source>
+        <translation>Installationsguide för Morrowind</translation>
+    </message>
+    <message>
+        <source>Run &amp;Installation Wizard</source>
+        <translation>Kör &amp;Installationsguide</translation>
+    </message>
+    <message>
+        <source>Morrowind Settings Importer</source>
+        <translation>Inställningsimporterare för Morrowind</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <translation>Bläddra...</translation>
+    </message>
+    <message>
+        <source>Fonts shipped with the original engine are blurry with UI scaling and support only a small amount of characters,
+so OpenMW provides another set of fonts to avoid these issues. These fonts use TrueType technology and are quite similar
+to default Morrowind fonts. Check this box if you still prefer original fonts over OpenMW ones or if you use custom bitmap fonts.</source>
+        <translation>Fonter som kommer med ordinarie spelmotor är suddiga med gränssnittsuppskalning och stödjer bara ett litet antal tecken,
+så OpenMW tillhandahåller andra fonter för att undvika dessa problem. Dessa fonter använder TrueType-teknologi och är ganska lika
+de ordinarie fonterna i Morrowind. Bocka denna ruta om du ändå föredrar ordinarie fonter istället för OpenMWs, alternativt om du använder egna bitmapfonter.</translation>
+    </message>
+    <message>
+        <source>Run &amp;Settings Importer</source>
+        <translation>Kör &amp;Inställningsimporterare</translation>
+    </message>
+    <message>
+        <source>File to Import Settings From:</source>
+        <translation>Fil att importera inställningar från:</translation>
+    </message>
+    <message>
+        <source>Import Bitmap Fonts</source>
+        <translation>Importera bitmapfonter</translation>
+    </message>
+    <message>
+        <source>Import Add-on and Plugin Selection</source>
+        <translation>Importera tillägg- och pluginmarkeringar</translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::DataFilesPage</name>
+    <message>
+        <source>English</source>
+        <translation>Engelska</translation>
+    </message>
+    <message>
+        <source>French</source>
+        <translation>Franska</translation>
+    </message>
+    <message>
+        <source>German</source>
+        <translation>Tyska</translation>
+    </message>
+    <message>
+        <source>Italian</source>
+        <translation>Italienska</translation>
+    </message>
+    <message>
+        <source>Polish</source>
+        <translation>Polska</translation>
+    </message>
+    <message>
+        <source>Russian</source>
+        <translation>Ryska</translation>
+    </message>
+    <message>
+        <source>Spanish</source>
+        <translation>Spanska</translation>
+    </message>
+    <message>
+        <source>New Content List</source>
+        <translation>Ny innehållslista</translation>
+    </message>
+    <message>
+        <source>Content List name:</source>
+        <translation>Namn på innehållslista:</translation>
+    </message>
+    <message>
+        <source>Clone Content List</source>
+        <translation>Klona innehållslista</translation>
+    </message>
+    <message>
+        <source>Select Directory</source>
+        <translation>Välj katalog</translation>
+    </message>
+    <message>
+        <source>Delete Content List</source>
+        <translation>Radera innehållslista</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete &lt;b&gt;%1&lt;/b&gt;?</source>
+        <translation>Är du säker på att du vill radera &lt;b&gt;%1&lt;/b&gt;?</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Radera</translation>
+    </message>
+    <message>
+        <source>Contains content file(s)</source>
+        <translation>Innehåller innehållsfil(er)</translation>
+    </message>
+    <message>
+        <source>Will be added to the current profile</source>
+        <translation>Kommer läggas till nuvarande profil</translation>
+    </message>
+    <message>
+        <source>&amp;Check Selected</source>
+        <translation>&amp;Kryssa markerade</translation>
+    </message>
+    <message>
+        <source>&amp;Uncheck Selected</source>
+        <translation>&amp;Avkryssa markerade</translation>
+    </message>
+    <message>
+        <source>Resolved as %1</source>
+        <translation>Löst som %1</translation>
+    </message>
+    <message>
+        <source>This is the data-local directory and cannot be disabled</source>
+        <translation>Det här är den data-lokala katalogen och kan inte inaktiveras</translation>
+    </message>
+    <message>
+        <source>This directory is part of OpenMW and cannot be disabled</source>
+        <translation>Denna katalog är en del av OpenMW och kan inte inaktiveras</translation>
+    </message>
+    <message>
+        <source>This directory is enabled in an openmw.cfg other than the user one</source>
+        <translation>Denna katalog är aktiverad i en annan openmw.cfg än användarens</translation>
+    </message>
+    <message>
+        <source>This archive is enabled in an openmw.cfg other than the user one</source>
+        <translation>Detta arkiv är aktiverat i en annan openmw.cfg än användarens</translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::GraphicsPage</name>
+    <message>
+        <source>Error receiving number of screens</source>
+        <translation>Det gick inte att ta emot antalet skärmar</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;SDL_GetNumVideoDisplays failed:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;SDL_GetNumVideoDisplays misslyckades:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Screen </source>
+        <translation>Skärm </translation>
+    </message>
+    <message>
+        <source>Error receiving resolutions</source>
+        <translation>Det gick inte att ta emot upplösningar</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;SDL_GetNumDisplayModes failed:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;SDL_GetNumDisplayModes misslyckades:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;SDL_GetDisplayMode failed:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;SDL_GetDisplayMode misslyckades:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::ImportPage</name>
+    <message>
+        <source>Error writing OpenMW configuration file</source>
+        <translation>Det gick inte att skriva en OpenMW-konfigurationsfil</translation>
+    </message>
+    <message>
+        <source>Morrowind configuration file (*.ini)</source>
+        <translation>Morrowind konfigurationsfil (*.ini)</translation>
+    </message>
+    <message>
+        <source>Importer finished</source>
+        <translation>Importeraren klar</translation>
+    </message>
+    <message>
+        <source>Failed to import settings from INI file.</source>
+        <translation>Misslyckades att importera inställningar från INI-fil.</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not open or create %1 for writing &lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Kunde inte öppna eller skapa %1 för att skriva &lt;/b&gt;&lt;/p&gt;&lt;p&gt;Kontrollera att du har rätt behörigheter och försök igen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::MainDialog</name>
+    <message>
+        <source>Close</source>
+        <translation>Stäng</translation>
+    </message>
+    <message>
+        <source> Launch OpenMW </source>
+        <translation> Starta OpenMW </translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation>Hjälp</translation>
+    </message>
+    <message>
+        <source>Error opening OpenMW configuration file</source>
+        <translation>Fel när OpenMW-konfigurationsfil skulle öppnas</translation>
+    </message>
+    <message>
+        <source>First run</source>
+        <translation>Första körning</translation>
+    </message>
+    <message>
+        <source>Run &amp;Installation Wizard</source>
+        <translation>Kör &amp;Installationsguide</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation>Hoppa över</translation>
+    </message>
+    <message>
+        <source>OpenMW %1 release</source>
+        <translation>OpenMW version %1</translation>
+    </message>
+    <message>
+        <source>OpenMW development (%1)</source>
+        <translation>OpenMW utvecklarversion (%1)</translation>
+    </message>
+    <message>
+        <source>Compiled on %1 %2</source>
+        <translation>Kompilerad den %1 %2</translation>
+    </message>
+    <message>
+        <source>Error detecting Morrowind installation</source>
+        <translation>Kunde inte hitta Morrowindinstallation</translation>
+    </message>
+    <message>
+        <source>Run &amp;Installation Wizard...</source>
+        <translation>Kör &amp;Installationsguide...</translation>
+    </message>
+    <message>
+        <source>Error reading OpenMW configuration files</source>
+        <translation>Fel när OpenMW-konfigurationsfil skulle läsas</translation>
+    </message>
+    <message>
+        <source>Error writing OpenMW configuration file</source>
+        <translation>Fel när OpenMW-konfigurationsfil skulle skrivas&gt;</translation>
+    </message>
+    <message>
+        <source>Error writing user settings file</source>
+        <translation>Fel när användarinställningsfil skulle skrivas</translation>
+    </message>
+    <message>
+        <source>Error writing Launcher configuration file</source>
+        <translation>Fel när Startarens-konfigurationsfil skulle skrivas</translation>
+    </message>
+    <message>
+        <source>No game file selected</source>
+        <translation>Ingen spelfil vald</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Welcome to OpenMW!&lt;/b&gt;&lt;/p&gt;&lt;p&gt;It is recommended to run the Installation Wizard.&lt;/p&gt;&lt;p&gt;The Wizard will let you select an existing Morrowind installation, or install Morrowind for OpenMW to use.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Välkommen till OpenMW!&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Det är rekommenderat att du kör Installationsguiden.&lt;/p&gt;&lt;p&gt;Installationsguiden låter dig välja en befintlig Morrowindinstallation eller installera Morrowind för OpenMW.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not open %0 for reading:&lt;/b&gt;&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;Please make sure you have the right permissions and try again.&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Kunde inte öppna %0 för läsning:&lt;/b&gt;&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;Se till att du har rätt behörigheter och försök igen.&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not open %0 for reading&lt;/b&gt;&lt;br&gt;&lt;br&gt;Please make sure you have the right permissions and try again.&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Kunde inte öppna %0 för läsning&lt;/b&gt;&lt;br&gt;&lt;br&gt;Se till att du har rätt behörigheter och försök igen.&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not find the Data Files location&lt;/b&gt;&lt;br&gt;&lt;br&gt;The directory containing the data files was not found.</source>
+        <translation>&lt;br&gt;&lt;b&gt;Kunde inte hitta Data Files-platsen&lt;/b&gt;&lt;br&gt;&lt;br&gt;Katalogen som innehåller datafilerna hittades inte.</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;The problem may be due to an incomplete installation of OpenMW.&lt;br&gt;Reinstalling OpenMW may resolve the problem.&lt;br&gt;</source>
+        <translation>&lt;br&gt;Problemet kan bero på en ofullständig installation av OpenMW.&lt;br&gt;Ominstallation av OpenMW kan lösa problemet.&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not open or create %0 for writing&lt;/b&gt;&lt;br&gt;&lt;br&gt;Please make sure you have the right permissions and try again.&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Kunde inte öppna eller skapa %0 för att skriva&lt;/b&gt;&lt;br&gt;&lt;br&gt;Se till att du har rätt behörigheter och försök igen.&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;You do not have a game file selected.&lt;/b&gt;&lt;br&gt;&lt;br&gt;OpenMW will not start without a game file selected.&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Du har ingen spelfil markerad.&lt;/b&gt;&lt;br&gt;&lt;br&gt;OpenMW kan inte starta utan en spelfil markerad.&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Error creating OpenMW configuration directory: code %0</source>
+        <translation>Kunde inte skapa konfigurationskatalog för OpenMW: kod %0</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not create directory %0&lt;/b&gt;&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Kunde inte skapa katalog %0&lt;/b&gt;&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>Launcher::SettingsPage</name>
+    <message>
+        <source>Text file (*.txt)</source>
+        <translation>Textfil (*.txt)</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>OpenMW Launcher</source>
+        <translation>OpenMW Startare</translation>
+    </message>
+    <message>
+        <source>OpenMW version</source>
+        <translation>OpenMW version</translation>
+    </message>
+    <message>
+        <source>toolBar</source>
+        <translation>toolBar</translation>
+    </message>
+    <message>
+        <source>Data Files</source>
+        <translation>Datafiler</translation>
+    </message>
+    <message>
+        <source>Allows to setup data files and directories</source>
+        <translation>Låter dig ställa in datafiler och kataloger</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Inställningar</translation>
+    </message>
+    <message>
+        <source>Allows to tweak engine settings</source>
+        <translation>Låter dig justera spelmotorinställningar</translation>
+    </message>
+    <message>
+        <source>Import</source>
+        <translation>Importera</translation>
+    </message>
+    <message>
+        <source>Allows to import data from original engine</source>
+        <translation>Låter dig importera data från originalmotorn</translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation>Bild</translation>
+    </message>
+    <message>
+        <source>Allows to change display settings</source>
+        <translation>Låter dig ändra bildinställningar</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Select configuration file</source>
+        <translation>Välj konfigurationsfil</translation>
+    </message>
+    <message>
+        <source>Select script file</source>
+        <translation>Välj skriptfil</translation>
+    </message>
+</context>
+<context>
+    <name>SelectSubdirs</name>
+    <message>
+        <source>Select directories you wish to add</source>
+        <translation>Välj kataloger du vill lägga till</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsPage</name>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make disposition change of merchants caused by trading permanent.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Gör dispositionsändring av handlare orsakad av handel permanent.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make player followers and escorters start combat with enemies who have started combat with them or the player. Otherwise they wait for the enemies or the player to do an attack first.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Gör att följare och eskorter till spelaren själva påbörjar strid med fiender som påbörjat strid med dem eller spelaren. Annars kommer de vänta tills fienden eller spelaren har attackerat dem först.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make Damage Fatigue magic effect uncapped like Drain Fatigue effect.&lt;/p&gt;&lt;p&gt;This means that unlike Morrowind you will be able to knock down actors using this effect.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Gör att &quot;Damage Fatigue&quot;-magieffekten blir obegränsad såsom &quot;Drain Fatigue&quot;-effekten.&lt;/p&gt;&lt;p&gt;Det innebär att du, till skillnad från i Morrowind, kommer kunna slå ner figurer till marken med denna effekt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Uncapped Damage Fatigue</source>
+        <translation>Obegränsad &quot;Damage Fatigue&quot;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Stops combat with NPCs affected by Calm spells every frame -- like in Morrowind without the MCP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Avbryter strid med icke-spelbara figurer påverkade av &quot;Calm&quot;-besvjärjelser varje bildruta – såsom i Morrowind utan MCP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make the value of filled soul gems dependent only on soul magnitude.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Gör värderingen av fyllda &quot;Soulgems&quot; endast baserad på själens magnitud.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes player swim a bit upward from the line of sight. Applies only in third person mode. Intended to make simpler swimming without diving.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Får spelaren att simma något uppåt från siktlinjen. Endast applicerat på tredjepersonsperspektivet. Avsett att göra simning enklare.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make stealing items from NPCs that were knocked down possible during combat.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Gör det möjligt att stjäla föremål från icke-spelbara figurer som är avsvimmade.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a name=&quot;docs-internal-guid-f375b85a-7fff-02ff-a5af-c5cff63923c0&quot;/&gt;When enabled, a navigation mesh is built in the background for world geometry to be used for pathfinding. When disabled only the path grid is used to build paths. Single-core CPU systems may have a big performance impact on existing interior location and moving across the exterior world. May slightly affect performance on multi-core CPU systems. Multi-core CPU systems may have different latency for nav mesh update depending on other settings and system performance. Moving across external world, entering/exiting location produce nav mesh update. NPC and creatures may not be able to find path before nav mesh is built around them. Try to disable this if you want to have old fashioned AI which doesn&apos;t know where to go when you stand behind that stone and cast a firebolt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a name=&quot;docs-internal-guid-f375b85a-7fff-02ff-a5af-c5cff63923c0&quot;/&gt;Om aktiv kommer en en navigeringsmesh av världsgeometrin byggas i bakgrunden som används för pathfinding. Om inaktiv kommer endast pathgrid användas för att bygga vägar. Enkelkärnade processorer kan få kraftigt försämrad prestanda. Kan påverka prestandan på flerkärniga processorer något. Flerkärniga processorer kan ha olika fördröjning för att uppdatera navigeringsmesh. Förflyttning mellan externa världar och att gå in eller ut ur en plats producerar en uppdatering av navigeringsmesh. Icke-spelbara figurer kan inte hitta vägar innan navigeringsmesh har skapats runt om dem. Testa att inaktivera denna funktion om du vill ha en mer gammaldags AI som inte vet var den ska gå när du står bakom den där stenen och skjuter ett eldklot.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled NPCs apply evasion maneuver to avoid collisions with others.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om aktiverat kommer icke-spelbara figurer göra undanmanövrar för att undvika kollisioner med andra.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Don&apos;t use race weight in NPC movement speed calculations.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ta inte med varelsers vikt i beräkningen av hastighet.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, the player is allowed to loot actors (e.g. summoned creatures) during death animation, if they are not in combat. In this case we have to increment death counter and run disposed actor&apos;s script instantly.&lt;/p&gt;&lt;p&gt;If this setting is false, player has to wait until end of death animation in all cases. Makes using of summoned creatures exploit (looting summoned Dremoras and Golden Saints for expensive weapons) a lot harder. Conflicts with mannequin mods, which use SkipAnim to prevent end of death animation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om denna inställning är aktiv tillåts spelaren plundra figurer (exempelvis tillkallade varelser) under deras dödsanimation, om de inte är i strid.&lt;/p&gt;&lt;p&gt;Om inställningen är inaktiv måste spelaren vänta tills dödsanimationen är slut. Detta gör det mycket svårare att exploatera tillkallade varelser (exempelvis plundra Draemoror eller Golden Saints för att få dyrbara vapen). Inställningen är i konflikt med skyltdocks-moddar som använder SkipAnim för att förhindra avslutning av dödsanimationer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes unarmed creature attacks able to reduce armor condition, just as attacks from NPCs and armed creatures.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Gör att obeväpnade varelseattacker kan reducera rustningars skick, precis som attacker från icke-spelbara figurer och beväpnade varelser.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Off</source>
+        <translation>Av</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;How many threads will be spawned to compute physics update in the background. A value of 0 means that the update will be performed in the main thread.&lt;/p&gt;&lt;p&gt;A value greater than 1 requires the Bullet library be compiled with multithreading support.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Antalet exekveringstrådar som kommer användas för att beräkna fysikuppdateringar i bakgrunden.&lt;/p&gt;&lt;p&gt;Ett värde högre än 1 kräver att Bullet-biblioteket är kompilerat med multithreading-stöd.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Cylinder</source>
+        <translation>Cylinder</translation>
+    </message>
+    <message>
+        <source>Visuals</source>
+        <translation>Visuellt</translation>
+    </message>
+    <message>
+        <source>Animations</source>
+        <translation>Animationer</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use casting animations for magic items, just as for spells.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Använd animationer för magiska föremål, precis som för besvärjelser.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes NPCs and player movement more smooth. Recommended to use with &quot;turn to movement direction&quot; enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Gör spelarens och icke-spelbara figurers rörelser mjukare. Rekommenderas att användas tillsammans med &quot;vänd mot rörelseriktningen&quot; aktiverad.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Load per-group KF-files and skeleton files from Animations folder&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ladda per-grupp KF-filer och skelettfiler från Animations-katalogen&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Affects side and diagonal movement. Enabling this setting makes movement more realistic.&lt;/p&gt;&lt;p&gt;If disabled then the whole character&apos;s body is pointed to the direction of view. Diagonal movement has no special animation and causes sliding.&lt;/p&gt;&lt;p&gt;If enabled then the character turns lower body to the direction of movement. Upper body is turned partially. Head is always pointed to the direction of view. In combat mode it works only for diagonal movement. In non-combat mode it changes straight right and straight left movement as well. Also turns the whole body up or down when swimming according to the movement direction.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Påverkar sido- och diagonalförflyttningar. Förflyttningar blir mer realistiska om aktiv.&lt;/p&gt;&lt;p&gt;Om aktiv kommer spelarrollfiguren vända underkroppen i rikting mot förflyttningen. Överkroppen vänds delvis. Huvudet pekar alltid dit kameran ser. I stidsläge fungerar det bara för diagonal förflyttning. Utanför strid ändrar inställningen förflyttningar rakt höger och vänster också. Inställningen vänder också hela kroppen upp eller ner vid simning enligt förflyttningsriktningen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render holstered weapons (with quivers and scabbards), requires modded assets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Rendera hölstrade vapen (med koger och vapenslidor), kräver moddat innehåll.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render holstered shield, requires modded assets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Rendera hölstrade sköldar, kräver moddat innehåll.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;In third person, the camera will sway along with the movement animations of the player. Enabling this option disables this swaying by having the player character move independently of its animation. This was the default behavior of OpenMW 0.48 and earlier.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;I tredjepersonsperspektiv kommer kameran svänga efter spelarens förflyttningsanimationer. Detta var det förvalda beteendet i OpenMW 0.48.0 och tidigare.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Shaders</source>
+        <translation>Shader</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this option is enabled, normal maps are automatically recognized and used if they are named appropriately
+                  (see &apos;normal map pattern&apos;, e.g. for a base texture foo.dds, the normal map texture would have to be named foo_n.dds).
+                  If this option is disabled, normal maps are only used if they are explicitly listed within the mesh file (.nif or .osg file). Affects objects.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om funktionen är aktiv kommer normalkartor (normal maps) att hittas och användas automatiskt om de har korrekt namn
+                  (se &apos;normal map pattern&apos;, t.ex. för en bastextur foo.dds ska normalkartan heta foo_n.dds).
+                  Om funktionen är inaktiverad kommer normalkartor bara användas om texturerna är explicit listade i 3D-modell-filen (.nif eller .osg fil). Påverkar objekt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;See &apos;auto use object normal maps&apos;. Affects terrain.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Se &apos;autoanvänd normalkartor (normal maps) på objekt&apos;. Påverkar terräng.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this option is enabled, specular maps are automatically recognized and used if they are named appropriately
+                  (see &apos;specular map pattern&apos;, e.g. for a base texture foo.dds,
+                  the specular map texture would have to be named foo_spec.dds).
+                  If this option is disabled, normal maps are only used if they are explicitly listed within the mesh file
+                  (.osg file, not supported in .nif files). Affects objects.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om den här funktionen är aktiverad kommer spekularitetskartor (specular maps) att hittas och användas 
+                  (see &apos;specular map pattern&apos;, t.ex. för en bastextur foo.dds,
+                  ska spekularitetskartan heta foo_spec.dds).
+                  Om funktionen är inaktiverad kommer normalkartor bara användas om texturerna är explicit listade i 3D-modell-filen 
+                  (.nif eller .osg fil). Påverkar objekt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If a file with pattern &apos;terrain specular map pattern&apos; exists, use that file as a &apos;diffuse specular&apos; map. The texture must contain the layer colour in the RGB channel (as usual), and a specular multiplier in the alpha channel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om en fil med mönstret &apos;terrain specular map pattern&apos; finns, använd den filen som en &apos;diffuse specular&apos;-karta. Texturen måste innehålla färglagren i RGB-kanalerna (som vanligt) och spekularitet i alfakanalen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Normally environment map reflections aren&apos;t affected by lighting, which makes environment-mapped (and thus bump-mapped objects) glow in the dark.
+                  Morrowind Code Patch includes an option to remedy that by doing environment-mapping before applying lighting, this is the equivalent of that option.
+                  Affected objects will use shaders.
+                  &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Normalt sett påverkas omgivningskartors reflektioner inte av ljus, vilket gör att omgivningskartor (och således så kallade bump mappade objekt) glöder i mörkret.
+                  Morrowind Code Patch inkluderar en inställning att kringå detta genom att lägga omgivningskartor före ljussättningen. Det här är motsvarigheten till den inställningen.
+                  Påverkade objekt kommer använda shaders.
+                  &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Allows MSAA to work with alpha-tested meshes, producing better-looking edges without pixelation. Can negatively impact performance.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Gör att MSAA fungerar med alfa-testade modeller, vilket ger snyggare kanter utan synliga pixlar. Kan påverka prestandan negativt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enables soft particles for particle effects. This technique softens the intersection between individual particles and other opaque geometry by blending between them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Aktiverar mjuka partiklar på partikeleffekter. Denna teknik mjukar upp övergången mellan individuella partiklar och annan ogenomskinlig geometri genom att smälta samman dem.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Simulate coverage-preserving mipmaps to prevent alpha-tested meshes shrinking as they get further away. Will cause meshes whose textures have coverage-preserving mipmaps to grow, though, so refer to mod installation instructions for how to set this.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Simulerar mip maps med coverage-preserving för att förhindra att alfa-testade modeller krymper när de kommer längre bort. Kommer göra att dessa modeller växer istället; se instruktioner i modinstallationen för hur detta ska ställas in.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;EXPERIMENTAL: Stop rain and snow from falling through overhangs and roofs.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;EXPERIMENTELLT: Förhindra att regn och snö faller genom tak och överhäng.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Fog</source>
+        <translation>Dimma</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;By default, the fog becomes thicker proportionally to your distance from the clipping plane set at the clipping distance, which causes distortion at the edges of the screen.
+                    This setting makes the fog use the actual eye point distance (or so called Euclidean distance) to calculate the fog, which makes the fog look less artificial, especially if you have a wide FOV.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Som standard blir dimman tätare proportionellt med ditt avstånd till avklippningsdistansen, vilket ger distortion vid skärmens kanter.
+                    Denna inställning gör att dimman använder det faktiska ögonpunktsavståndet (så kallat euklidiskt avstånd) för att beräkna dimman, vilket får dimman att se mindre artificiell ut, särskilt vid hög FoV.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use exponential fog formula. By default, linear fog is used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Använd exponentiell formel för dimma. Som standard används linjär dimma.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Reduce visibility of clipping plane by blending objects with the sky.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Reducera synligheten av avklippsplanet genom att smälta samman objekt med himmelen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The fraction of the maximum distance at which blending with the sky starts.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Fraktionen av det maximala avståndet där utsmetning mellan himmel och horisont påbörjas.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Terrain</source>
+        <translation>Terräng</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Controls how large an object must be to be visible in the scene. The object’s size is divided by its distance to the camera and the result of the division is compared with this value. The smaller this value is, the more objects you will see in the scene.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bestämmer hur stort ett objekt måste vara för att vara synligt på skärmen. Objektets storlek divideras med sitt avstånd till kameran. Resultatet av denna division jämförs med detta värde. Ju mindre värdet är, desto fler objekt kommer du se i scenen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If true, use paging and LOD algorithms to display the entire terrain. If false, only display terrain of the loaded cells.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om aktiverat används paging och LOD-algoritmer för att rita upp all terräng. Om inaktiverat visas endast terrängen i den laddade cellen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use object paging for active cells grid.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Använd objekt-paging för aktiva cellers rutnät.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, supporting models will make use of day night switch nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om den här inställningen är aktiv kommer modeller med stöd för det att använda dag- och natt-bytesnoder.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Post Processing</source>
+        <translation>Efterbehandling</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, post processing will be enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om denna inställning är på kommer efterbehandling (post processing) att vara aktiverat.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Re-render transparent objects with forced alpha clipping.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Återrendera transparenta objekt med forcerad alpha clipping.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Controls how much eye adaptation can change from frame to frame. Smaller values makes for slower transitions.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bestämmer hur mycket ögonanpassningen kan förändras från bildruta till bildruta. Lägre värden ger långsammare övergångar.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation>Ljud</translation>
+    </message>
+    <message>
+        <source>Select your preferred audio device.</source>
+        <translation>Välj din föredragna ljudenhet.</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation>Förvalt</translation>
+    </message>
+    <message>
+        <source>This setting controls HRTF, which simulates 3D sound on stereo systems.</source>
+        <translation>Denna inställning kontrollerar HRTF, vilket simulerar 3D-ljud på stereosystem.</translation>
+    </message>
+    <message>
+        <source>HRTF</source>
+        <translation>HRTF</translation>
+    </message>
+    <message>
+        <source>Automatic</source>
+        <translation>Automatisk</translation>
+    </message>
+    <message>
+        <source>On</source>
+        <translation>På</translation>
+    </message>
+    <message>
+        <source>Select your preferred HRTF profile.</source>
+        <translation>Välj din föredragna HRTF-profil.</translation>
+    </message>
+    <message>
+        <source>Interface</source>
+        <translation>Gränssnitt</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting scales GUI windows. A value of 1.0 results in the normal scale.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Denna inställning skalar grafiska fönster i gränssnittet. Ett värde på 1.0 ger den normala skalan.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Show the remaining duration of magic effects and lights if this setting is true. The remaining duration is displayed in the tooltip by hovering over the magical effect. &lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Visar den återstående tiden för magiska effekter och ljus om denna inställning är på. Den återstående tiden visas som en inforuta när muspekaren befinner sig över den magiska effekten. &lt;/p&gt;&lt;p&gt;Förvalt är av.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, dialogue topics will have a different color if the topic is specific to the NPC you&apos;re talking to or the topic was previously seen. Color can be changed in settings.cfg.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om denna inställning är på kommer dialogämnen ha en annan färg om ämnet är specifikt till den icke-spelbara figur du pratar med eller om ämnet redan har setts. Färger kan ändras i settings.cfg.&lt;/p&gt;&lt;p&gt;Förvalt är av.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Size of characters in game texts.</source>
+        <translation>Storlek på tecken i speltext.</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable zooming on local and global maps.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Aktivera zoomning på lokala och globala kartor.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, containers supporting graphic herbalism will do so instead of opening the menu.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om denna inställning är på kommer behållare som stödjer grafisk örtplockning (graphic herbalism) använda den funktionen istället för att öppna menyn.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, damage bonus of arrows and bolts will be shown on item tooltip.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om denna inställning är på kommer skadebonus från pilar visas på föremålens inforuta.&lt;/p&gt;&lt;p&gt;Förvalt är av.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, melee weapons reach and speed will be shown on item tooltip.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om denna inställning är på kommer närstridsvapens räckvidd och hastighet att visas på föremåls inforuta.&lt;/p&gt;&lt;p&gt;Förvalt är av.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Stretch menus, load screens, etc. to the window aspect ratio.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Sträck ut menyer, laddskärmar o.s.v. till fönstrets aspektratio.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Whether or not the chance of success will be displayed in the enchanting menu.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Huruvida chansen att lyckas kommer visas i förtrollningsmenyn.&lt;/p&gt;&lt;p&gt;Förvalt är av.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prevents merchants from equipping items that are sold to them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Förhindrar att handlare tar på sig föremål som säljs till dem.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Trainers now only choose which skills to train using their base skill points, allowing mercantile improving effects to be used without making mercantile an offered skill.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tränare väljer nu endast de färdigheter som kan tränas genom att använda deras basfärdighetsvärde, vilket tillåter förbättring av merkantil utan att göra merkantil till en erbjuden färdighet.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Miscellaneous</source>
+        <translation>Diverse</translation>
+    </message>
+    <message>
+        <source>Saves</source>
+        <translation>Sparfiler</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting determines whether the amount of the time the player has spent playing will be displayed for each saved game in the Load menu.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Denna inställning avgör huruvida mängden tid spelaren har spenderat i spelet kommer visas för varje sparat spel i Ladda spel-menyn.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>JPG</source>
+        <translation>JPG</translation>
+    </message>
+    <message>
+        <source>PNG</source>
+        <translation>PNG</translation>
+    </message>
+    <message>
+        <source>TGA</source>
+        <translation>TGA</translation>
+    </message>
+    <message>
+        <source>Testing</source>
+        <translation>Testning</translation>
+    </message>
+    <message>
+        <source>These settings are intended for testing mods and will cause issues if used for normal gameplay.</source>
+        <translation>Dessa inställningar är avsedda för att testa moddar och kommer orsaka problem vid normalt spelande.</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;OpenMW will capture control of the cursor if this setting is true.&lt;/p&gt;&lt;p&gt;In “look mode”, OpenMW will center the cursor regardless of the value of this setting (since the cursor/crosshair is always centered in the OpenMW window). However, in GUI mode, this setting determines the behavior when the cursor is moved outside the OpenMW window. If true, the cursor movement stops at the edge of the window preventing access to other applications. If false, the cursor is allowed to move freely on the desktop.&lt;/p&gt;&lt;p&gt;This setting does not apply to the screen where escape has been pressed, where the cursor is never captured. Regardless of this setting “Alt-Tab” or some other operating system dependent key sequence can be used to allow the operating system to regain control of the mouse cursor. This setting interacts with the minimize on focus loss setting by affecting what counts as a focus loss. Specifically on a two-screen configuration it may be more convenient to access the second screen with setting disabled.&lt;/p&gt;&lt;p&gt;Note for developers: it’s desirable to have this setting disabled when running the game in a debugger, to prevent the mouse cursor from becoming unusable when the game pauses on a breakpoint.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;OpenMW kommer ta kontroll av muspekaren om denna inställning är aktiverad.&lt;/p&gt;&lt;p&gt;I ”tittläge” kommer OpenMW centrera muspekaren oavsett värdet på denna inställning (eftersom muspekaren/hårkorset alltid är centrerat i OpenMW-fönstret). I gränssnittsläge däremot kommer denna inställning bedöma beteendet när muspekaren flyttas utanför OpenMW-fönstret. Om på kommer muspekarrörelsen stanna vid kanten av fönstret, vilket förhindrar tillgång till  andra applikationer. Om av tillåts muspekaren att röras fritt över skrivbordet.&lt;/p&gt;&lt;p&gt;Denna inställning appliceras inte på skärmen där Escape har blivit tryckt, då muspekaren aldrig tas över. Oavsett denna inställning kan ”Alt-Tab” eller annan operativsystemberoende knappsekvens användas för att ge operativsystemet åter tillgång till muspekaren. Denna inställning interagerar med minimera vid fokusförlust-inställningen genom att påverka vad som räknas som en fokusförlust. Specifikt på en tvåskärmskonfiguration kan det vara mer smidigt att få tillgång till den andra skärmen med inställningen inaktiverad.&lt;/p&gt;&lt;p&gt;Notis för utvecklare: det är önskvärt att ha denna inställning inaktiverad när OpenMW körs i debug-läge för att förhindra att musen blir oanvändbar när spelet pausar vid en brytpunkt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Browse…</source>
+        <translation>Bläddra…</translation>
+    </message>
+    <message>
+        <source>Collision is used for both physics simulation and navigation mesh generation for pathfinding. Cylinder gives the best consistency between available navigation paths and ability to move by them. Changing this value affects navigation mesh generation therefore navigation mesh disk cache generated for one value will not be useful with another.</source>
+        <translation>Kollision används för både fysiksimulering och navigationsmeshgenerering för pathfinding. Cylinder ger bäst förenlighet mellan tillgängliga navigeringsvägar och möjlighet att förflytta förbi dem. Ändring av detta värde påverkar navigeringsmeshgenereringen – därför kommer inte navigeringsmesh disk cache för ett värde vara användbart för ett annat.</translation>
+    </message>
+    <message>
+        <source>Gameplay</source>
+        <translation>Spelmekanik</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled, a magical ammunition is required to bypass normal weapon resistance or weakness. If disabled, a magical ranged weapon or a magical ammunition is required.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om aktiverad kommer magisk ammunition krävas för att förbigå normal vapenmotståndskraft eller -svaghet. Om inaktiverad krävs ett magiskt avståndsvapen eller en magisk ammunition.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make enchanted weapons without Magical flag bypass normal weapons resistance, like in Morrowind.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Få förtrollade vapen utan Magisk-flagga att förbigå normal vapenmotståndskraft, såsom i Morrowind.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source> cells</source>
+        <translation> celler</translation>
+    </message>
+    <message>
+        <source>Shadows</source>
+        <translation>Skuggor</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Type of &quot;compute scene bounds&quot; computation method to be used. Bounds (default) for good balance between performance and shadow quality, primitives for better looking shadows or none for no computation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Typ av &quot;compute scene bounds&quot; beräkningsmetod att använda. Bounds (förvalt) för en bra balans mellan prestanda och skuggkvalitet, primitives för snyggare skuggor eller none för ingen beräkning alls.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;64 game units is 1 real life yard or about 0.9 m&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;64 spelenheter är 1 yard eller ungefär 0,9 meter i verkligheten&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source> unit(s)</source>
+        <translation> enhet(er)</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows for NPCs and creatures besides the player character. May have a minor performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Aktiverar skuggor för icke-spelbara figurer och varelser bortsett från spelarrollfiguren. Kan ha en liten negativ prestandapåverkan.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>512</source>
+        <translation>512</translation>
+    </message>
+    <message>
+        <source>1024</source>
+        <translation>1024</translation>
+    </message>
+    <message>
+        <source>2048</source>
+        <translation>2048</translation>
+    </message>
+    <message>
+        <source>4096</source>
+        <translation>4096</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The fraction of the limit above at which shadows begin to gradually fade away.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Den fraktion av gränsen ovan vid vilken skuggor gradvis börjar blekna bort.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows exclusively for the player character. May have a very minor performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Aktivera skuggor exklusivt för spelarrollfiguren. Kan ha en mycket liten negativ prestandapåverkan.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The resolution of each individual shadow map. Increasing it significantly improves shadow quality but may have a minor performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Upplösningen för varje individuell skuggkarta. Ökning av den ökar skuggkvalitén signifikant, men kan ha en lättare negativ prestandapåverkan.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The distance from the camera at which shadows completely disappear.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Avståndet från kameran vid vilken skuggor helt försvinner.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows for primarily inanimate objects. May have a significant performance impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Aktivera skuggor för huvudsakligen icke-rörliga objekt. Kan ha en signifikant negativ prestandapåverkan.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Due to limitations with Morrowind&apos;s data, only actors can cast shadows indoors, which some might feel is distracting.&lt;/p&gt;&lt;p&gt;Has no effect if actor/player shadows are not enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;På grund av begränsningar med Morrowinds data kan endast figurer ge ifrån sig skuggor inomhus, vilket vissa kan tycka vara distraherande.&lt;/p&gt;&lt;p&gt;Har ingen effekt om figur/spelarskuggor inte är aktiverat.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable shadows for the terrain including distant terrain. May have a significant performance and shadow quality impact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Aktivera skuggor för terräng, inklusive avlägsen terräng. Kan ha en signifikant negativ påverkan på prestanda och skuggkvalité.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Lighting</source>
+        <translation>Ljussättning</translation>
+    </message>
+    <message>
+        <source>Tooltip</source>
+        <translation>Inforuta</translation>
+    </message>
+    <message>
+        <source>Crosshair</source>
+        <translation>Hårkors</translation>
+    </message>
+    <message>
+        <source>Screenshots</source>
+        <translation>Skärmdumpar</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Give actors an ability to swim over the water surface when they follow other actor independently from their ability to swim. Has effect only when nav mesh building is enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ge figurer en möjlighet att simma över vattenytan när de följer andra figurer, oberoende av deras förmåga att simma. Har endast effekt när navigeringsmesh är aktiverat.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Effects of reflected Absorb spells are not mirrored - like in Morrowind.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Effekter av reflekterade &quot;Absorb&quot;-besvärjelser speglas inte – såsom i Morrowind.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum distance at which lights will appear (measured in units).&lt;/p&gt;&lt;p&gt;Set this to 0 to use an unlimited distance.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximala avståndet där ljuskällor syns (mätt i enheter).&lt;/p&gt;&lt;p&gt;Värdet 0 ger oändligt avstånd.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of lights per object.&lt;/p&gt;&lt;p&gt;A low number near default will cause light popping similar to what you would see with legacy lighting.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximalt antal ljuskällor per objekt.&lt;/p&gt;&lt;p&gt;Ett lågt tal nära det förvalda kommer orsaka att ljuskällor poppar upp som vid ljussättningsmetoden Gammaldags.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Fraction of maximum distance at which lights will start to fade.&lt;/p&gt;&lt;p&gt;Set this to a low value for slower transitions or a high value for quicker transitions.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Fraktion av det maximala avståndet från vilket ljuskällor börjar blekna.&lt;/p&gt;&lt;p&gt;Välj ett lågt värde för långsammare övergång eller högre värde för snabbare övergång.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the internal handling of light sources.&lt;/p&gt;
+&lt;p&gt; &quot;Legacy&quot; always uses 8 lights per object and provides a lighting closest to an original game.&lt;/p&gt;
+&lt;p&gt;&quot;Shaders (compatibility)&quot; removes the 8 light limit. This mode also enables lighting on groundcover and a configurable light fade. It is recommended to use this with older hardware and a light limit closer to 8.&lt;/p&gt;
+&lt;p&gt; &quot;Shaders&quot; carries all of the benefits that &quot;Shaders (compatibility)&quot; does, but uses a modern approach that allows for a higher max lights count with little to no performance penalties on modern hardware.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Välj intern hantering av ljuskällor.&lt;/p&gt;
+&lt;p&gt; &quot;Gammaldags&quot; använder alltid max 8 ljuskällor per objekt och ger ljussättning likt ett gammaldags spel.&lt;/p&gt;
+&lt;p&gt;&quot;Shader (kompatibilitet)&quot; tar bort begränsningen med max 8 ljuskällor per objekt. Detta läge aktiverar också ljus på marktäckning och ett konfigurerbart ljusbleknande. Rekommenderas för äldre hårdvara tillsammans med en ljusbegränsning nära 8.&lt;/p&gt;
+&lt;p&gt; &quot;Shader&quot; har alla fördelar som &quot;Shader (kompatibilitet)&quot; har, men med ett modernt förhållningssätt som möjliggör fler maximalt antal ljuskällor med liten eller ingen prestandaförlust på modern hårdvara.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Legacy</source>
+        <translation>Gammaldags</translation>
+    </message>
+    <message>
+        <source>Shaders (compatibility)</source>
+        <translation>Shader (kompatibilitet)</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Multipler for bounding sphere of lights.&lt;/p&gt;&lt;p&gt;Higher numbers allows for smooth falloff but require an increase in number of max lights.&lt;/p&gt;&lt;p&gt;Does not effect the illumination or strength of lights.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Multiplikator för ljusens gränssfär.&lt;/p&gt;&lt;p&gt;Högre värden ger mjukare minskning av gränssfären, men kräver högre värde i Max antal ljuskällor.&lt;/p&gt;&lt;p&gt;Påverkar inte ljusstyrkan.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Minimum ambient interior brightness.&lt;/p&gt;&lt;p&gt;Increase this if you feel interiors are too dark.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Minsta omgivande ljusstyrka i interiörer.&lt;/p&gt;&lt;p&gt;Öka värdet om du anser att interiörer är för mörka.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>In third-person view, use the camera as the sound listener instead of the player character.</source>
+        <translation>Använd kameran som ljudlyssnare istället för spelarrollfiguren i tredjepersonsperspektivet.</translation>
+    </message>
+    <message>
+        <source>Permanent Barter Disposition Changes</source>
+        <translation>Permanenta handelsförändringar</translation>
+    </message>
+    <message>
+        <source>Classic Calm Spells Behavior</source>
+        <translation>Klassiskt beteende för &quot;Calm&quot;-besvärjelser</translation>
+    </message>
+    <message>
+        <source>NPCs Avoid Collisions</source>
+        <translation>Icke-spelbara figurer undviker kollisioner</translation>
+    </message>
+    <message>
+        <source>Soulgem Values Rebalance</source>
+        <translation>Ombalansering av &quot;Soulgems&quot; värdering</translation>
+    </message>
+    <message>
+        <source>Day Night Switch Nodes</source>
+        <translation>Dag/natt-bytesnoder</translation>
+    </message>
+    <message>
+        <source>Followers Defend Immediately</source>
+        <translation>Följare försvarar omedelbart</translation>
+    </message>
+    <message>
+        <source>Only Magical Ammo Bypass Resistance</source>
+        <translation>Bara magisk ammunition förbigår motstånd</translation>
+    </message>
+    <message>
+        <source>Graphic Herbalism</source>
+        <translation>Grafisk örtplockning</translation>
+    </message>
+    <message>
+        <source>Swim Upward Correction</source>
+        <translation>Simma uppåt korrigering</translation>
+    </message>
+    <message>
+        <source>Enchanted Weapons Are Magical</source>
+        <translation>Förtrollade vapen är magiska</translation>
+    </message>
+    <message>
+        <source>Merchant Equipping Fix</source>
+        <translation>Handlare klär inte på sig</translation>
+    </message>
+    <message>
+        <source>Can Loot During Death Animation</source>
+        <translation>Kan plundra under dödsanimation</translation>
+    </message>
+    <message>
+        <source>Classic Reflected Absorb Spells Behavior</source>
+        <translation>Klassiskt beteende för reflekterade &quot;Absorb&quot;-besvärjelser</translation>
+    </message>
+    <message>
+        <source>Unarmed Creature Attacks Damage Armor</source>
+        <translation>Obeväpnad attack från varelser skadar rustning</translation>
+    </message>
+    <message>
+        <source>Affect Werewolves</source>
+        <translation>Påverka varulvar</translation>
+    </message>
+    <message>
+        <source>Do Not Affect Werewolves</source>
+        <translation>Påverka inte varulvar</translation>
+    </message>
+    <message>
+        <source>Background Physics Threads</source>
+        <translation>Fysiktrådar i bakgrunden</translation>
+    </message>
+    <message>
+        <source>Actor Collision Shape Type</source>
+        <translation>Figurers kollisionsformtyp</translation>
+    </message>
+    <message>
+        <source>Axis-Aligned Bounding Box</source>
+        <translation>Axeljusterad begränsningslåda</translation>
+    </message>
+    <message>
+        <source>Rotating Box</source>
+        <translation>Roterande låda</translation>
+    </message>
+    <message>
+        <source>Smooth Movement</source>
+        <translation>Mjuka rörelser</translation>
+    </message>
+    <message>
+        <source>Use Additional Animation Sources</source>
+        <translation>Använd extra animationskällor</translation>
+    </message>
+    <message>
+        <source>Weapon Sheathing</source>
+        <translation>Vapenhölstring</translation>
+    </message>
+    <message>
+        <source>Shield Sheathing</source>
+        <translation>Sköldhölstring</translation>
+    </message>
+    <message>
+        <source>Player Movement Ignores Animation</source>
+        <translation>Spelarförflyttningar ignorerar animation</translation>
+    </message>
+    <message>
+        <source>Use Magic Item Animation</source>
+        <translation>Animationer för magiska föremål</translation>
+    </message>
+    <message>
+        <source>Auto Use Object Normal Maps</source>
+        <translation>Använd automatiskt normalkartor på objekt</translation>
+    </message>
+    <message>
+        <source>Soft Particles</source>
+        <translation>Mjuka partiklar</translation>
+    </message>
+    <message>
+        <source>Auto Use Object Specular Maps</source>
+        <translation>Använd automatiskt spekularitetskartor på objekt</translation>
+    </message>
+    <message>
+        <source>Auto Use Terrain Normal Maps</source>
+        <translation>Använd automatiskt normalkartor på terräng</translation>
+    </message>
+    <message>
+        <source>Auto Use Terrain Specular Maps</source>
+        <translation>Använd automatiskt spekularitetskartor på terräng</translation>
+    </message>
+    <message>
+        <source>Use Anti-Aliased Alpha Testing</source>
+        <translation>Använd kantutjämnad alfa-testning</translation>
+    </message>
+    <message>
+        <source>Bump/Reflect Map Local Lighting</source>
+        <translation>Bump/Reflektionskartor lokalt ljus</translation>
+    </message>
+    <message>
+        <source>Weather Particle Occlusion</source>
+        <translation>Regn/snö blockeras av tak</translation>
+    </message>
+    <message>
+        <source>Exponential Fog</source>
+        <translation>Exponentiell dimma</translation>
+    </message>
+    <message>
+        <source>Radial Fog</source>
+        <translation>Radiell dimma</translation>
+    </message>
+    <message>
+        <source>Sky Blending Start</source>
+        <translation>Smeta ut horisont/himmel, start</translation>
+    </message>
+    <message>
+        <source>Sky Blending</source>
+        <translation>Smeta ut horisont/himmel</translation>
+    </message>
+    <message>
+        <source>Object Paging Min Size</source>
+        <translatorcomment>Object paging needs a better translation</translatorcomment>
+        <translation>Minsta storlek för objektpaging</translation>
+    </message>
+    <message>
+        <source>Viewing Distance</source>
+        <translation>Siktavstånd</translation>
+    </message>
+    <message>
+        <source>Distant Land</source>
+        <translation>Avlägsen terräng</translation>
+    </message>
+    <message>
+        <source>Active Grid Object Paging</source>
+        <translatorcomment>Object paging needs a better translation</translatorcomment>
+        <translation>Objektpaging i aktivt rutnät</translation>
+    </message>
+    <message>
+        <source>Transparent Postpass</source>
+        <translatorcomment>Will return to later</translatorcomment>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Auto Exposure Speed</source>
+        <translation>Autoexponeringshastighet</translation>
+    </message>
+    <message>
+        <source>Enable Post Processing</source>
+        <translation>Aktivera efterbehandling (post processing)</translation>
+    </message>
+    <message>
+        <source>Shadow Planes Computation Method</source>
+        <translation>Skuggplaner beräkningsmetod</translation>
+    </message>
+    <message>
+        <source>Enable Actor Shadows</source>
+        <translation>Aktivera rollfigurskuggor</translation>
+    </message>
+    <message>
+        <source>Fade Start Multiplier</source>
+        <translation>Blekningsstartmultiplikator</translation>
+    </message>
+    <message>
+        <source>Enable Player Shadows</source>
+        <translation>Aktivera spelarskuggor</translation>
+    </message>
+    <message>
+        <source>Shadow Map Resolution</source>
+        <translation>Skuggkartsupplösning</translation>
+    </message>
+    <message>
+        <source>Shadow Distance Limit:</source>
+        <translation>Skuggavståndsgräns:</translation>
+    </message>
+    <message>
+        <source>Enable Object Shadows</source>
+        <translation>Aktivera objektskuggor</translation>
+    </message>
+    <message>
+        <source>Enable Indoor Shadows</source>
+        <translation>Aktivera interiöra skuggor</translation>
+    </message>
+    <message>
+        <source>Enable Terrain Shadows</source>
+        <translation>Aktivera terrängskuggor</translation>
+    </message>
+    <message>
+        <source>Maximum Light Distance</source>
+        <translation>Maximalt ljusavstånd</translation>
+    </message>
+    <message>
+        <source>Max Lights</source>
+        <translation>Max antal ljuskällor</translation>
+    </message>
+    <message>
+        <source>Lighting Method</source>
+        <translation>Ljussättningsmetod</translation>
+    </message>
+    <message>
+        <source>Bounding Sphere Multiplier</source>
+        <translation>Gränssfärsmultiplikator</translation>
+    </message>
+    <message>
+        <source>Minimum Interior Brightness</source>
+        <translation>Minsta ljusstyrka i interiörer</translation>
+    </message>
+    <message>
+        <source>Audio Device</source>
+        <translation>Ljudenhet</translation>
+    </message>
+    <message>
+        <source>HRTF Profile</source>
+        <translation>HRTF-profil</translation>
+    </message>
+    <message>
+        <source>Tooltip and Crosshair</source>
+        <translation>Inforuta och hårkors</translation>
+    </message>
+    <message>
+        <source>GUI Scaling Factor</source>
+        <translation>Skalningsfaktor för gränssnitt</translation>
+    </message>
+    <message>
+        <source>Show Effect Duration</source>
+        <translation>Visa effektvaraktighet</translation>
+    </message>
+    <message>
+        <source>Change Dialogue Topic Color</source>
+        <translation>Ändra färg på dialogämnen</translation>
+    </message>
+    <message>
+        <source>Font Size</source>
+        <translation>Fontstorlek</translation>
+    </message>
+    <message>
+        <source>Show Projectile Damage</source>
+        <translation>Visa projektilskada</translation>
+    </message>
+    <message>
+        <source>Show Melee Info</source>
+        <translation>Visa närstridsinfo</translation>
+    </message>
+    <message>
+        <source>Stretch Menu Background</source>
+        <translation>Sträck ut menybakgrund</translation>
+    </message>
+    <message>
+        <source>Show Owned Objects</source>
+        <translation>Visa ägda objekt</translation>
+    </message>
+    <message>
+        <source>Show Enchant Chance</source>
+        <translation>Visa chans för &quot;Enchant&quot;</translation>
+    </message>
+    <message>
+        <source>Maximum Quicksaves</source>
+        <translation>Max snabbsparfiler</translation>
+    </message>
+    <message>
+        <source>Screenshot Format</source>
+        <translation>Skärmdumpformat</translation>
+    </message>
+    <message>
+        <source>Grab Cursor</source>
+        <translation>Ta över muspekaren</translation>
+    </message>
+    <message>
+        <source>Default Cell</source>
+        <translation>Förinställd cell</translation>
+    </message>
+    <message>
+        <source>Bounds</source>
+        <translation>Bounds</translation>
+    </message>
+    <message>
+        <source>Primitives</source>
+        <translation>Primitives</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>None</translation>
+    </message>
+    <message>
+        <source>Always Allow Actors to Follow over Water</source>
+        <translation>Tillåt alltid figurer att följa över vatten</translation>
+    </message>
+    <message>
+        <source>Racial Variation in Speed Fix</source>
+        <translation>Fix för varelsers hastighetsvariation</translation>
+    </message>
+    <message>
+        <source>Use Navigation Mesh for Pathfinding</source>
+        <translation>Använd navigeringsmesh för pathfinding</translation>
+    </message>
+    <message>
+        <source>Trainers Choose Offered Skills by Base Value</source>
+        <translation>Tränare väljer erbjudna färdigheter efter grundvärde</translation>
+    </message>
+    <message>
+        <source>Steal from Knocked out Actors in Combat</source>
+        <translation>Stjäl från avsvimmade rollfigurer i strid</translation>
+    </message>
+    <message>
+        <source>Factor Strength into Hand-to-Hand Combat</source>
+        <translation>Räkna in styrka i obeväpnad strid</translation>
+    </message>
+    <message>
+        <source>Turn to Movement Direction</source>
+        <translation>Vänd mot rörelseriktningen</translation>
+    </message>
+    <message>
+        <source>Adjust Coverage for Alpha Test</source>
+        <translation>Justera täckning för alfa-testning</translation>
+    </message>
+    <message>
+        <source>Use the Camera as the Sound Listener</source>
+        <translation>Använd kameran som ljudlyssnaren</translation>
+    </message>
+    <message>
+        <source>Can Zoom on Maps</source>
+        <translation>Kan zooma på kartor</translation>
+    </message>
+    <message>
+        <source>Add &quot;Time Played&quot; to Saves</source>
+        <translation>Lägg till spelad tid i sparfiler</translation>
+    </message>
+    <message>
+        <source>Notify on Saved Screenshot</source>
+        <translation>Ge notis vid sparad skärmdump</translation>
+    </message>
+    <message>
+        <source>Skip Menu and Generate Default Character</source>
+        <translation>Hoppa över meny och generera förinställd rollfigur</translation>
+    </message>
+    <message>
+        <source>Start Default Character at</source>
+        <translation>Starta förinställd rollfigur vid</translation>
+    </message>
+    <message>
+        <source>Run Script After Startup:</source>
+        <translation>Kör skript efter uppstart:</translation>
+    </message>
+</context>
+</TS>
diff --git a/files/lang/wizard_de.ts b/files/lang/wizard_de.ts
index 33c7a5fb53..c3ef55b04a 100644
--- a/files/lang/wizard_de.ts
+++ b/files/lang/wizard_de.ts
@@ -128,10 +128,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Where should Morrowind be installed?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Morrowind will be installed to the following location. </source>
         <translation type="unfinished"></translation>
@@ -170,10 +166,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>What is the language of the Morrowind installation?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/preferences-desktop-locale.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Select the language of the Morrowind installation.</source>
         <translation type="unfinished"></translation>
@@ -197,10 +189,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Retail CD/DVD</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/system-installer.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Install from a retail disc to a new location.</source>
         <translation type="unfinished"></translation>
@@ -209,10 +197,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Existing Installation</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Select an existing installation.</source>
         <translation type="unfinished"></translation>
@@ -221,10 +205,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Don&apos;t have a copy?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/dollar.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Buy the game</source>
         <translation type="unfinished"></translation>
diff --git a/files/lang/wizard_fr.ts b/files/lang/wizard_fr.ts
index 6c655885d2..010883d0c4 100644
--- a/files/lang/wizard_fr.ts
+++ b/files/lang/wizard_fr.ts
@@ -128,10 +128,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Where should Morrowind be installed?</source>
         <translation>À quel emplacement Morrowind doit-il être installé ?</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>Morrowind will be installed to the following location. </source>
         <translation>Morrowind sera installé à l&apos;emplacement suivant :</translation>
@@ -170,10 +166,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>What is the language of the Morrowind installation?</source>
         <translation>Dans quelle langue est cette installation de Morrowind ?</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/preferences-desktop-locale.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/preferences-desktop-locale.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>Select the language of the Morrowind installation.</source>
         <translation>Sélectionnez la langue de cette installation de Morrowind.</translation>
@@ -197,10 +189,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Retail CD/DVD</source>
         <translation>Copie CD/DVD physique</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/system-installer.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/system-installer.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>Install from a retail disc to a new location.</source>
         <translation>Installer depuis un CD/DVD et choisir la destination sur l&apos;ordinateur.</translation>
@@ -209,10 +197,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Existing Installation</source>
         <translation>Installation existante</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>Select an existing installation.</source>
         <translation>Sélectionnez une installation existante.</translation>
@@ -221,10 +205,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Don&apos;t have a copy?</source>
         <translation>Vous n&apos;avez pas de copie du jeu ?</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/dollar.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/dollar.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>Buy the game</source>
         <translation>Achetez le jeu.</translation>
diff --git a/files/lang/wizard_ru.ts b/files/lang/wizard_ru.ts
index 5784b11eac..ba9815f634 100644
--- a/files/lang/wizard_ru.ts
+++ b/files/lang/wizard_ru.ts
@@ -130,10 +130,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Where should Morrowind be installed?</source>
         <translation>Куда нужно установить Morrowind?</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>Morrowind will be installed to the following location. </source>
         <translation>Morrowind будет установлен в следующее место. </translation>
@@ -172,10 +168,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>What is the language of the Morrowind installation?</source>
         <translation>Какой язык использует ваша копия Morrowind?</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/preferences-desktop-locale.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&gt;&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/preferences-desktop-locale.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>Select the language of the Morrowind installation.</source>
         <translation>Выберите язык, используемый вашей копией Morrowind.</translation>
@@ -199,10 +191,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Retail CD/DVD</source>
         <translation>CD/DVD-диск</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/system-installer.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/system-installer.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>Install from a retail disc to a new location.</source>
         <translation>Установить игру с диска.</translation>
@@ -211,10 +199,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Existing Installation</source>
         <translation>Установленная копия игры</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/folder.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>Select an existing installation.</source>
         <translation>Выбрать установленную копию игры.</translation>
@@ -223,10 +207,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Don&apos;t have a copy?</source>
         <translation>Нет копии игры?</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/dollar.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/icons/tango/48x48/dollar.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>Buy the game</source>
         <translation>Купить игру</translation>
diff --git a/files/lang/wizard_sv.ts b/files/lang/wizard_sv.ts
new file mode 100644
index 0000000000..099a95d128
--- /dev/null
+++ b/files/lang/wizard_sv.ts
@@ -0,0 +1,658 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="sv_SE">
+<context>
+    <name>ComponentSelectionPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>Select Components</source>
+        <translation>Välj komponenter</translation>
+    </message>
+    <message>
+        <source>Which components should be installed?</source>
+        <translation>Vilka komponenter ska installeras?</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select which official Morrowind expansions should be installed. For best results, it is recommended to have both expansions installed.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:bold;&quot;&gt;Note:&lt;/span&gt; It is possible to install expansions later by re-running this Wizard.&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Välj vilka officiella Morrowindexpansioner som ska installeras. För bäst resultat rekommenderas att båda expansionerna installeras.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:bold;&quot;&gt;Note:&lt;/span&gt; Det är möjligt att installera expansioner senare genom att köra denna guide igen.&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Selected components:</source>
+        <translation>Valda komponenter:</translation>
+    </message>
+</context>
+<context>
+    <name>ConclusionPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>Completing the OpenMW Wizard</source>
+        <translation>Färdigställer OpenMWs installationsguide</translation>
+    </message>
+    <message>
+        <source>Placeholder</source>
+        <translation>Placeholder</translation>
+    </message>
+</context>
+<context>
+    <name>ExistingInstallationPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>Select Existing Installation</source>
+        <translation>Välj befintlig installation</translation>
+    </message>
+    <message>
+        <source>Select an existing installation for OpenMW to use or modify.</source>
+        <translation>Välj en befintlig installation som OpenMW kan använda eller modifiera.</translation>
+    </message>
+    <message>
+        <source>Detected installations:</source>
+        <translation>Hittade installationer:</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <translation>Bläddra...</translation>
+    </message>
+</context>
+<context>
+    <name>ImportPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>Import Settings</source>
+        <translation>Importera inställningar</translation>
+    </message>
+    <message>
+        <source>Import settings from the Morrowind installation.</source>
+        <translation>Importera inställningar från Morrowindinstallationen.</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;OpenMW needs to import settings from the Morrowind configuration file in order to function properly.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:bold;&quot;&gt;Note:&lt;/span&gt; It is possible to import settings later by re-running this Wizard.&lt;/p&gt;&lt;p/&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;OpenMW behöver importera inställningar från Morrowinds konfigurationsfil för att fungera korrekt.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:bold;&quot;&gt;Notera:&lt;/span&gt; Det är möjligt att importera inställningarna senare genom att köra denna guide igen.&lt;/p&gt;&lt;p/&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Import Settings From Morrowind.ini</source>
+        <translation>Importera inställningar från Morrowind.ini</translation>
+    </message>
+    <message>
+        <source>Import Add-on and Plugin Selection</source>
+        <translation>Importera tillägg- och pluginmarkering</translation>
+    </message>
+    <message>
+        <source>Import Bitmap Fonts Setup From Morrowind.ini</source>
+        <translation>Importera bitmapfonter från Morrowind.ini</translation>
+    </message>
+    <message>
+        <source>Fonts shipped with the original engine are blurry with UI scaling and support only a small amount of characters,
+so OpenMW provides another set of fonts to avoid these issues. These fonts use TrueType technology and are quite similar
+to default Morrowind fonts. Check this box if you still prefer original fonts over OpenMW ones or if you use custom bitmap fonts.</source>
+        <translation>Fonter som kommer med ordinarie spelmotor är suddiga med gränssnittsuppskalning och stödjer bara ett litet antal tecken,
+så OpenMW tillhandahåller därför andra fonter för att undvika dessa problem. Dessa fonter använder TrueType-teknologi och är ganska lika
+de ordinarie fonterna i Morrowind. Bocka i denna ruta om du ändå föredrar ordinarie fonter istället för OpenMWs, alternativt om du använder egna bitmapfonter.</translation>
+    </message>
+</context>
+<context>
+    <name>InstallationPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>Installing</source>
+        <translation>Installerar</translation>
+    </message>
+    <message>
+        <source>Please wait while Morrowind is installed on your computer.</source>
+        <translation>Vänta medan Morrowind installeras på din dator.</translation>
+    </message>
+</context>
+<context>
+    <name>InstallationTargetPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>Select Installation Destination</source>
+        <translation>Välj installationsplats</translation>
+    </message>
+    <message>
+        <source>Where should Morrowind be installed?</source>
+        <translation>Var ska Morrowind installeras?</translation>
+    </message>
+    <message>
+        <source>Morrowind will be installed to the following location. </source>
+        <translation>Morrowind kommer installeras på följande plats. </translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <translation>Bläddra...</translation>
+    </message>
+</context>
+<context>
+    <name>IntroPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>Welcome to the OpenMW Wizard</source>
+        <translation>Välkommen till OpenMWs installationsguide</translation>
+    </message>
+    <message>
+        <source>This Wizard will help you install Morrowind and its add-ons for OpenMW to use.</source>
+        <translation>Denna guide hjälper dig att installera Morrowind och expansionerna för OpenMW.</translation>
+    </message>
+</context>
+<context>
+    <name>LanguageSelectionPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>Select Morrowind Language</source>
+        <translation>Välj Morrowinds språk</translation>
+    </message>
+    <message>
+        <source>What is the language of the Morrowind installation?</source>
+        <translation>Vad är språket på Morrowindinstallationen?</translation>
+    </message>
+    <message>
+        <source>Select the language of the Morrowind installation.</source>
+        <translation>Välj språket på Morrowindinstallationen.</translation>
+    </message>
+</context>
+<context>
+    <name>MethodSelectionPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>Select Installation Method</source>
+        <translation>Välj installationsmetod</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select how you would like to install &lt;i&gt;The Elder Scrolls III: Morrowind&lt;/i&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Välj hur du vill installera &lt;i&gt;The Elder Scrolls III: Morrowind&lt;/i&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Retail CD/DVD</source>
+        <translation>Köpt CD/DVD</translation>
+    </message>
+    <message>
+        <source>Install from a retail disc to a new location.</source>
+        <translation>Installera från en köpt skiva till en ny plats.</translation>
+    </message>
+    <message>
+        <source>Existing Installation</source>
+        <translation>Befintlig installation</translation>
+    </message>
+    <message>
+        <source>Select an existing installation.</source>
+        <translation>Välj en befintlig installation.</translation>
+    </message>
+    <message>
+        <source>Don&apos;t have a copy?</source>
+        <translation>Äger du inte spelet?</translation>
+    </message>
+    <message>
+        <source>Buy the game</source>
+        <translation>Köp spelet</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Could not find Morrowind.ini&lt;/b&gt;&lt;br&gt;&lt;br&gt;The Wizard needs to update settings in this file.&lt;br&gt;&lt;br&gt;Press &quot;Browse...&quot; to specify the location manually.&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Kunde inte hitta Morrowind.ini&lt;/b&gt;&lt;br&gt;&lt;br&gt;Guiden behöver uppdatera inställningarna i denna fil.&lt;br&gt;&lt;br&gt;Tryck på &quot;Bläddra...&quot; för att specificera filens plats manuellt.&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>B&amp;rowse...</source>
+        <translation>B&amp;läddra...</translation>
+    </message>
+    <message>
+        <source>Select configuration file</source>
+        <translation>Välj konfigurationsfil</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Morrowind.bsa&lt;/b&gt; is missing!&lt;br&gt;Make sure your Morrowind installation is complete.</source>
+        <translation>&lt;b&gt;Morrowind.bsa&lt;/b&gt; saknas!&lt;br&gt;Se till att din Morrowindinstallation är komplett.</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;There may be a more recent version of Morrowind available.&lt;/b&gt;&lt;br&gt;&lt;br&gt;Do you wish to continue anyway?&lt;br&gt;</source>
+        <translation>&lt;br&gt;&lt;b&gt;Det kan finnas nyare version av Morrowind tillgänglig.&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vill du fortsätta ändå?&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Most recent Morrowind not detected</source>
+        <translation>Senaste versionen av Morrowind hittades inte</translation>
+    </message>
+    <message>
+        <source>Select a valid %1 installation media.&lt;br&gt;&lt;b&gt;Hint&lt;/b&gt;: make sure that it contains at least one &lt;b&gt;.cab&lt;/b&gt; file.</source>
+        <translation>Välj ett giltigt %1 installationsmedium.&lt;br&gt;&lt;b&gt;Tips&lt;/b&gt;: säkerställ att det finns åtminstone en &lt;b&gt;.cab&lt;/b&gt;-fil.</translation>
+    </message>
+    <message>
+        <source>There may be a more recent version of Morrowind available.&lt;br&gt;&lt;br&gt;Do you wish to continue anyway?</source>
+        <translation>Det kan finnas en mer uppdaterad version av Morrowind tillgänglig.&lt;br&gt;&lt;br&gt;Vill du fortsätta ändå?</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::ComponentSelectionPage</name>
+    <message>
+        <source>&amp;Install</source>
+        <translation>&amp;Installera</translation>
+    </message>
+    <message>
+        <source>&amp;Skip</source>
+        <translation>&amp;Hoppa över</translation>
+    </message>
+    <message>
+        <source>Morrowind		(installed)</source>
+        <translation>Morrowind		(installerat)</translation>
+    </message>
+    <message>
+        <source>Morrowind</source>
+        <translation>Morrowind</translation>
+    </message>
+    <message>
+        <source>Tribunal		(installed)</source>
+        <translation>Tribunal		(installerat)</translation>
+    </message>
+    <message>
+        <source>Tribunal</source>
+        <translation>Tribunal</translation>
+    </message>
+    <message>
+        <source>Bloodmoon		(installed)</source>
+        <translation>Bloodmoon		(installerat)</translation>
+    </message>
+    <message>
+        <source>Bloodmoon</source>
+        <translation>Bloodmoon</translation>
+    </message>
+    <message>
+        <source>About to install Tribunal after Bloodmoon</source>
+        <translation>På väg att installera Tribunal efter Bloodmoon</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;You are about to install Tribunal&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Bloodmoon is already installed on your computer.&lt;/p&gt;&lt;p&gt;However, it is recommended that you install Tribunal before Bloodmoon.&lt;/p&gt;&lt;p&gt;Would you like to re-install Bloodmoon?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Du håller på att installera Tribunal&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Bloodmoon finns redan installerat på din dator.&lt;/p&gt;&lt;p&gt;Det är dock rekommenderat att du installerar Tribunal före Bloodmoon.&lt;/p&gt;&lt;p&gt;Vill du ominstallera Bloodmoon?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Re-install &amp;Bloodmoon</source>
+        <translation>Ominstallera &amp;Bloodmoon</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::ConclusionPage</name>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The OpenMW Wizard successfully installed Morrowind on your computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;OpenMWs Installationsguide har installerat Morrowind på din dator.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The OpenMW Wizard successfully modified your existing Morrowind installation.&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;OpenMWs installationsguide har justerat din befintliga Morrowindinstallation.&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The OpenMW Wizard failed to install Morrowind on your computer.&lt;/p&gt;&lt;p&gt;Please report any bugs you might have encountered to our &lt;a href=&quot;https://gitlab.com/OpenMW/openmw/issues&quot;&gt;bug tracker&lt;/a&gt;.&lt;br/&gt;Make sure to include the installation log.&lt;/p&gt;&lt;br/&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;OpenMWs installationsguide misslyckades med att installera Morrowind på din dator.&lt;/p&gt;&lt;p&gt;Vänligen rapportera eventuella buggar på vår &lt;a href=&quot;https://gitlab.com/OpenMW/openmw/issues&quot;&gt;bug tracker&lt;/a&gt;.&lt;br/&gt;Se till att du inkluderar installationsloggen.&lt;/p&gt;&lt;br/&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::ExistingInstallationPage</name>
+    <message>
+        <source>No existing installations detected</source>
+        <translation>Inga befintliga installationer hittades</translation>
+    </message>
+    <message>
+        <source>Error detecting Morrowind configuration</source>
+        <translation>Kunde inte hitta Morrowind-konfigurationsfil</translation>
+    </message>
+    <message>
+        <source>Morrowind configuration file (*.ini)</source>
+        <translation>Morrowind konfigurationsfil (*.ini)</translation>
+    </message>
+    <message>
+        <source>Select Morrowind.esm (located in Data Files)</source>
+        <translation>Markera Morrowind.esm (hittas i Data Files)</translation>
+    </message>
+    <message>
+        <source>Morrowind master file (Morrowind.esm)</source>
+        <translation>Morrowind masterfil (Morrowind.esm)</translation>
+    </message>
+    <message>
+        <source>Error detecting Morrowind files</source>
+        <translation>Kunde inte hitta Morrowindfiler</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::InstallationPage</name>
+    <message>
+        <source>&lt;p&gt;Attempting to install component %1.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Försöker installera komponent %1.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Attempting to install component %1.</source>
+        <translation>Försöker installera komponent %1.</translation>
+    </message>
+    <message>
+        <source>%1 Installation</source>
+        <translation>%1 Installation</translation>
+    </message>
+    <message>
+        <source>Select %1 installation media</source>
+        <translation>Välj %1 installationsmedia</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;br/&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;Error: The installation was aborted by the user&lt;/b&gt;&lt;/span&gt;&lt;/p&gt;</source>
+        <translation>&lt;p&gt;&lt;br/&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;Fel: Installationen avbröts av användaren&lt;/b&gt;&lt;/span&gt;&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Detected old version of component Morrowind.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Hittade gammal version av Morrowind.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Detected old version of component Morrowind.</source>
+        <translation>Hittade gammal version av komponenten Morrowind.</translation>
+    </message>
+    <message>
+        <source>Morrowind Installation</source>
+        <translation>Installation av Morrowind</translation>
+    </message>
+    <message>
+        <source>Installation finished</source>
+        <translation>Installationen klar</translation>
+    </message>
+    <message>
+        <source>Installation completed successfully!</source>
+        <translation>Installationen slutfördes!</translation>
+    </message>
+    <message>
+        <source>Installation failed!</source>
+        <translation>Installationen misslyckades!</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;br/&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;Error: %1&lt;/b&gt;&lt;/p&gt;</source>
+        <translation>&lt;p&gt;&lt;br/&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;Fel: %1&lt;/b&gt;&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/p&gt;</source>
+        <translation>&lt;p&gt;&lt;span style=&quot;color:red;&quot;&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;The Wizard has encountered an error&lt;/b&gt;&lt;/p&gt;&lt;p&gt;The error reported was:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;Press &amp;quot;Show Details...&amp;quot; for more information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Guiden har stött på ett fel&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Felet som rapporterades var:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;Tryck på &amp;quot;Visa detaljer...&amp;quot; för mer information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>An error occurred</source>
+        <translation>Ett fel uppstod</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::InstallationTargetPage</name>
+    <message>
+        <source>Error creating destination</source>
+        <translation>Fel när målkatalogen skulle skapas</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not create the destination directory&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again, or specify a different location.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Kunde inte skapa målkatalogen&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Se till att du har rätt behörigheter och försök igen, eller specificera en annan katalog.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not write to the destination directory&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again, or specify a different location.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Kunde inte skriva till målkatalogen&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Se till att du har rätt behörigheter och försök igen, eller specificera en annan katalog.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;The destination directory is not empty&lt;/b&gt;&lt;/p&gt;&lt;p&gt;An existing Morrowind installation is present in the specified location.&lt;/p&gt;&lt;p&gt;Please specify a different location, or go back and select the location as an existing installation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Målkatalogen är inte tom&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Det finns en befintlig Morrowindinstallation i den specificerade katalogen.&lt;/p&gt;&lt;p&gt;Välj en annan katalog eller gå tillbaka och välj katalogen som en befintlig installation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Insufficient permissions</source>
+        <translation>Otillräckliga behörigheter</translation>
+    </message>
+    <message>
+        <source>Destination not empty</source>
+        <translation>Platsen är inte tom</translation>
+    </message>
+    <message>
+        <source>Select where to install Morrowind</source>
+        <translation>Välj där Morrowind ska installeras</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::LanguageSelectionPage</name>
+    <message>
+        <source>English</source>
+        <translation>Engelska</translation>
+    </message>
+    <message>
+        <source>French</source>
+        <translation>Franska</translation>
+    </message>
+    <message>
+        <source>German</source>
+        <translation>Tyska</translation>
+    </message>
+    <message>
+        <source>Italian</source>
+        <translation>Italienska</translation>
+    </message>
+    <message>
+        <source>Polish</source>
+        <translation>Polska</translation>
+    </message>
+    <message>
+        <source>Russian</source>
+        <translation>Ryska</translation>
+    </message>
+    <message>
+        <source>Spanish</source>
+        <translation>Spanska</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::MainWizard</name>
+    <message>
+        <source>OpenMW Wizard</source>
+        <translation>OpenMW installationsguide</translation>
+    </message>
+    <message>
+        <source>Error opening Wizard log file</source>
+        <translation>Kunde inte öppna guidens loggfil</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not open %1 for writing&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Kunde inte öppna %1 för att skriva&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Se till att du har rätt behörigheter och försök igen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not open %1 for reading&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Kunde inte öppna %1 för läsning&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Se till att du har rätt behörigheter och försök igen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Error opening OpenMW configuration file</source>
+        <translation>Fel när OpenMW-konfigurationsfil skulle öppnas</translation>
+    </message>
+    <message>
+        <source>Quit Wizard</source>
+        <translation>Avsluta guiden</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to exit the Wizard?</source>
+        <translation>Är du säker på att du vill avsluta guiden?</translation>
+    </message>
+    <message>
+        <source>Error creating OpenMW configuration directory</source>
+        <translation>Fel vid skapande av OpenMW-konfigurationskatalog</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not create %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Kunde inte skapa %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Se till att du har rätt behörigheter och försök igen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Error writing OpenMW configuration file</source>
+        <translation>Kunde inte skriva OpenMW-konfigurationsfil</translation>
+    </message>
+</context>
+<context>
+    <name>Wizard::UnshieldWorker</name>
+    <message>
+        <source>Failed to open Morrowind configuration file!</source>
+        <translation>Kunde inte öppna en Morrowind-konfigurationsfil!</translation>
+    </message>
+    <message>
+        <source>Opening %1 failed: %2.</source>
+        <translation>Öppnar %1 misslyckad: %2.</translation>
+    </message>
+    <message>
+        <source>Failed to write Morrowind configuration file!</source>
+        <translation>Kunde inte skriva en Morrowind-konfigurationsfil!</translation>
+    </message>
+    <message>
+        <source>Writing to %1 failed: %2.</source>
+        <translation>Skriver till %1 misslyckad: %2.</translation>
+    </message>
+    <message>
+        <source>Installing: %1</source>
+        <translation>Installerar: %1</translation>
+    </message>
+    <message>
+        <source>Installing: %1 directory</source>
+        <translation>Installerar: %1 katalog</translation>
+    </message>
+    <message>
+        <source>Installation finished!</source>
+        <translation>Installationen slutförd!</translation>
+    </message>
+    <message>
+        <source>Component parameter is invalid!</source>
+        <translation>Komponentparametern är ogiltig!</translation>
+    </message>
+    <message>
+        <source>An invalid component parameter was supplied.</source>
+        <translation>En ogiltig komponentparameter angavs.</translation>
+    </message>
+    <message>
+        <source>Failed to find a valid archive containing %1.bsa! Retrying.</source>
+        <translation>Misslyckades att hitta ett giltigt arkiv som innehåller %1.bsa! Försöker igen.</translation>
+    </message>
+    <message>
+        <source>Installing %1</source>
+        <translation>Installerar %1</translation>
+    </message>
+    <message>
+        <source>Installation media path not set!</source>
+        <translation>Sökväg till installationsmedia inte inställd!</translation>
+    </message>
+    <message>
+        <source>The source path for %1 was not set.</source>
+        <translation>Källsökvägen för %1 ställdes inte in.</translation>
+    </message>
+    <message>
+        <source>Cannot create temporary directory!</source>
+        <translation>Kan inte skapa temporär katalog!</translation>
+    </message>
+    <message>
+        <source>Failed to create %1.</source>
+        <translation>Kunde inte skapa %1.</translation>
+    </message>
+    <message>
+        <source>Cannot move into temporary directory!</source>
+        <translation>Kan inte flytta till temporär katalog!</translation>
+    </message>
+    <message>
+        <source>Failed to move into %1.</source>
+        <translation>Misslyckades att flytta till %1.</translation>
+    </message>
+    <message>
+        <source>Moving installation files</source>
+        <translation>Flyttar installationsfiler</translation>
+    </message>
+    <message>
+        <source>Could not install directory!</source>
+        <translation>Kunde inte installera katalog!</translation>
+    </message>
+    <message>
+        <source>Installing %1 to %2 failed.</source>
+        <translation>Installation %1 till %2 misslyckades.</translation>
+    </message>
+    <message>
+        <source>Could not install translation file!</source>
+        <translation>Kunde inte installera översättningsfil!</translation>
+    </message>
+    <message>
+        <source>Failed to install *%1 files.</source>
+        <translation>Kunde inte installera *%1 filer.</translation>
+    </message>
+    <message>
+        <source>Could not install Morrowind data file!</source>
+        <translation>Kunde inte installera Morrowind-datafil!</translation>
+    </message>
+    <message>
+        <source>Failed to install %1.</source>
+        <translation>Misslyckades att installera %1.</translation>
+    </message>
+    <message>
+        <source>Could not install Morrowind configuration file!</source>
+        <translation>Kunde inte installera Morrowind-konfigurationsfil!</translation>
+    </message>
+    <message>
+        <source>Installing: Sound directory</source>
+        <translation>Installerar: Ljudkatalog</translation>
+    </message>
+    <message>
+        <source>Could not find Tribunal data file!</source>
+        <translation>Tribunal-datafil hittades inte!</translation>
+    </message>
+    <message>
+        <source>Failed to find %1.</source>
+        <translation>Misslyckades att hitta %1.</translation>
+    </message>
+    <message>
+        <source>Could not find Tribunal patch file!</source>
+        <translation>Tribunal-patchfil hittades inte!</translation>
+    </message>
+    <message>
+        <source>Could not find Bloodmoon data file!</source>
+        <translation>Bloodmoon-datafil hittades inte!</translation>
+    </message>
+    <message>
+        <source>Updating Morrowind configuration file</source>
+        <translation>Uppdaterar Morrowind-konfigurationsfil</translation>
+    </message>
+    <message>
+        <source>%1 installation finished!</source>
+        <translation>%1 installation klar!</translation>
+    </message>
+    <message>
+        <source>Extracting: %1</source>
+        <translation>Extraherar: %1</translation>
+    </message>
+    <message>
+        <source>Failed to open InstallShield Cabinet File.</source>
+        <translation>Misslyckades att öppna en InstallShield Cabinet-fil.</translation>
+    </message>
+    <message>
+        <source>Opening %1 failed.</source>
+        <translation>Misslyckades att öppna %1.</translation>
+    </message>
+    <message>
+        <source>Failed to extract %1.</source>
+        <translation>Misslyckades att extrahera %1.</translation>
+    </message>
+    <message>
+        <source>Complete path: %1</source>
+        <translation>Färdigställ sökväg: %1</translation>
+    </message>
+</context>
+</TS>
diff --git a/files/opencs/configure.svg b/files/opencs/configure.svg
new file mode 100644
index 0000000000..91a5efca5c
--- /dev/null
+++ b/files/opencs/configure.svg
@@ -0,0 +1,501 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
+
+<svg
+   version="1.0"
+   id="Livello_1"
+   width="128"
+   height="128.00018"
+   viewBox="0 0 119.999 120.061"
+   overflow="visible"
+   enable-background="new 0 0 119.999 120.061"
+   xml:space="preserve"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:ns="http://ns.adobe.com/SaveForWeb/1.0/"><defs
+     id="defs127"><linearGradient
+       id="linearGradient3291"><stop
+         style="stop-color:black;stop-opacity:1"
+         offset="0"
+         id="stop3293" /><stop
+         style="stop-color:black;stop-opacity:0"
+         offset="1"
+         id="stop3295" /></linearGradient><radialGradient
+       xlink:href="#linearGradient3291"
+       id="radialGradient3336"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.197802,0,92.82166)"
+       cx="63.912209"
+       cy="115.70919"
+       fx="33.953373"
+       fy="115.70919"
+       r="63.912209" /><linearGradient
+       xlink:href="#XMLID_11_"
+       id="linearGradient9291"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1250507,0.1245433,0.1244801,1.1244802,-2.8257128,-11.708873)"
+       x1="41.188999"
+       y1="80.101601"
+       x2="27.6451"
+       y2="66.557701" /><linearGradient
+       id="linearGradient6141"><stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop6143" /><stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop6145" /></linearGradient><linearGradient
+       gradientTransform="translate(-3.0255781e-2,3.056501e-4)"
+       id="linearGradient5166"
+       gradientUnits="userSpaceOnUse"
+       x1="77.542931"
+       y1="41.868668"
+       x2="88.108376"
+       y2="31.303225"><stop
+         offset="0"
+         style="stop-color:#323232;stop-opacity:1;"
+         id="stop5168" /><stop
+         offset="0.75739998"
+         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop5170" /></linearGradient><linearGradient
+       y2="31.303225"
+       x2="88.108376"
+       y1="41.868668"
+       x1="77.542931"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_16_"
+       gradientTransform="translate(-3.0255781e-2,3.056501e-4)"><stop
+         id="stop92"
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0" /><stop
+         id="stop106"
+         style="stop-color:#ffffff;stop-opacity:0.01898734;"
+         offset="0.75739998" /></linearGradient><linearGradient
+       xlink:href="#XMLID_18_"
+       id="linearGradient3295"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7074656,-0.7074656,0.7071068,0.7071068,-18.749172,36.539651)"
+       x1="-6.165"
+       y1="112.5049"
+       x2="11.0181"
+       y2="112.5049" /><linearGradient
+       xlink:href="#XMLID_17_"
+       id="linearGradient3298"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0002442,-2.5378062e-4,-2.5378062e-4,1.0002442,8.6347844,-24.632129)"
+       x1="38.757801"
+       y1="7.4277"
+       x2="63.923302"
+       y2="7.4277" /><linearGradient
+       xlink:href="#XMLID_16_"
+       id="linearGradient3301"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7074656,-0.7074656,0.7071068,0.7071068,-24.896055,39.032512)"
+       x1="76.281174"
+       y1="43.060352"
+       x2="86.611"
+       y2="31.303225" /><linearGradient
+       xlink:href="#XMLID_15_"
+       id="linearGradient3304"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7074656,-0.7074656,0.7071068,0.7071068,-24.895791,39.125846)"
+       x1="76.919403"
+       y1="43.1436"
+       x2="100.6411"
+       y2="19.4214" /><linearGradient
+       xlink:href="#XMLID_14_"
+       id="linearGradient3307"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7074656,-0.7074656,0.7071068,0.7071068,-18.749172,36.539651)"
+       x1="67.880402"
+       y1="6.4331002"
+       x2="105.3924"
+       y2="43.945599" /><linearGradient
+       xlink:href="#XMLID_13_"
+       id="linearGradient3310"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.7074656,0.7074656,-0.7071068,-0.7071068,101.2385,185.78751)"
+       x1="-0.47799999"
+       y1="105.0586"
+       x2="6.3157001"
+       y2="111.8523" /><linearGradient
+       xlink:href="#XMLID_12_"
+       id="linearGradient3313"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.7074656,0.7074656,-0.7071068,-0.7071068,107.38512,183.20132)"
+       x1="1.3501"
+       y1="103.2324"
+       x2="8.1437998"
+       y2="110.0261" /><linearGradient
+       id="XMLID_10_"
+       gradientUnits="userSpaceOnUse"
+       x1="61.9692"
+       y1="88.430702"
+       x2="40.815899"
+       y2="88.430702"
+       gradientTransform="matrix(0.7074589,0.7071,-0.7074589,0.7071,68.76314,-21.373694)"><stop
+         offset="0.0533"
+         style="stop-color:#555555"
+         id="stop10" /><stop
+         offset="0.21113414"
+         style="stop-color:#BBBBBB"
+         id="stop12" /><stop
+         offset="0.36265489"
+         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop14" /><stop
+         offset="0.60322773"
+         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop16" /><stop
+         offset="0.84976584"
+         style="stop-color:#e9e9e9;stop-opacity:1;"
+         id="stop18" /><stop
+         offset="1"
+         style="stop-color:#555555"
+         id="stop20" /></linearGradient><linearGradient
+       xlink:href="#XMLID_10_"
+       id="linearGradient10168"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5628683,-3.9649986e-4,-3.9652886e-4,1.562754,-20.23462,-103.35726)"
+       x1="61.9692"
+       y1="88.430702"
+       x2="40.815899"
+       y2="88.430702" /><linearGradient
+       xlink:href="#XMLID_10_"
+       id="linearGradient10170"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0663866,2.7056218e-4,-2.7056218e-4,-1.0663866,9.2387294,154.26114)"
+       x1="61.9692"
+       y1="88.430702"
+       x2="40.815899"
+       y2="88.430702" /><linearGradient
+       xlink:href="#XMLID_17_"
+       id="linearGradient10203"
+       x1="56.03125"
+       y1="121.5"
+       x2="72.031251"
+       y2="121.5"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       xlink:href="#XMLID_17_"
+       id="linearGradient10205"
+       x1="56.03125"
+       y1="110.5"
+       x2="72.031251"
+       y2="110.5"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       xlink:href="#XMLID_10_"
+       id="linearGradient10219"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0663866,2.7056218e-4,-2.7056218e-4,-1.0663866,9.2387294,154.26114)"
+       x1="61.9692"
+       y1="88.430702"
+       x2="40.815899"
+       y2="88.430702" /><linearGradient
+       xlink:href="#XMLID_17_"
+       id="linearGradient10221"
+       gradientUnits="userSpaceOnUse"
+       x1="56.03125"
+       y1="110.5"
+       x2="72.031251"
+       y2="110.5" /><linearGradient
+       xlink:href="#XMLID_14_"
+       id="linearGradient10223"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7074656,-0.7074656,0.7071068,0.7071068,-18.749172,36.539651)"
+       x1="67.880402"
+       y1="6.4331002"
+       x2="105.3924"
+       y2="43.945599" /><linearGradient
+       xlink:href="#XMLID_15_"
+       id="linearGradient10225"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7074656,-0.7074656,0.7071068,0.7071068,-24.895791,39.125846)"
+       x1="76.919403"
+       y1="43.1436"
+       x2="100.6411"
+       y2="19.4214" /><linearGradient
+       xlink:href="#XMLID_16_"
+       id="linearGradient10227"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7074656,-0.7074656,0.7071068,0.7071068,-24.895791,39.125846)"
+       x1="76.281174"
+       y1="43.060352"
+       x2="86.611"
+       y2="31.303225" /><linearGradient
+       xlink:href="#XMLID_17_"
+       id="linearGradient10229"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0002442,-2.5378062e-4,-2.5378062e-4,1.0002442,8.6347844,-24.632129)"
+       x1="38.757801"
+       y1="7.4277"
+       x2="63.923302"
+       y2="7.4277" /><linearGradient
+       xlink:href="#XMLID_17_"
+       id="linearGradient10231"
+       gradientUnits="userSpaceOnUse"
+       x1="56.03125"
+       y1="121.5"
+       x2="72.031251"
+       y2="121.5" /><linearGradient
+       xlink:href="#XMLID_18_"
+       id="linearGradient10233"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7074656,-0.7074656,0.7071068,0.7071068,-18.749172,36.539651)"
+       x1="-6.165"
+       y1="112.5049"
+       x2="11.0181"
+       y2="112.5049" /><linearGradient
+       xlink:href="#XMLID_18_"
+       id="linearGradient10236"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0005075,0,0,1.0000001,6.1427973,2.5178157)"
+       x1="-6.165"
+       y1="112.5049"
+       x2="11.0181"
+       y2="112.5049" /><linearGradient
+       xlink:href="#XMLID_17_"
+       id="linearGradient10239"
+       gradientUnits="userSpaceOnUse"
+       x1="56.03125"
+       y1="121.5"
+       x2="72.031251"
+       y2="121.5"
+       gradientTransform="matrix(0.6632486,0.6632486,-0.6632486,0.6632486,45.21604,-10.083813)" /><linearGradient
+       xlink:href="#XMLID_17_"
+       id="linearGradient10242"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7074589,0.7071,-0.7074589,0.7071,68.761161,-21.373784)"
+       x1="38.757801"
+       y1="7.4277"
+       x2="63.923302"
+       y2="7.4277" /><linearGradient
+       xlink:href="#XMLID_16_"
+       id="linearGradient10245"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0005075,0,0,1.0000001,-3.223487e-2,2.1565487e-4)"
+       x1="76.281174"
+       y1="43.060352"
+       x2="86.611"
+       y2="31.303225" /><linearGradient
+       xlink:href="#XMLID_15_"
+       id="linearGradient10248"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0005075,0,0,1.0000001,-3.223487e-2,2.1565487e-4)"
+       x1="76.919403"
+       y1="43.1436"
+       x2="100.6411"
+       y2="19.4214" /><linearGradient
+       xlink:href="#XMLID_14_"
+       id="linearGradient10251"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0005075,0,0,1.0000001,6.1427973,2.5178157)"
+       x1="67.880402"
+       y1="6.4331002"
+       x2="105.3924"
+       y2="43.945599" /><linearGradient
+       xlink:href="#XMLID_17_"
+       id="linearGradient10254"
+       gradientUnits="userSpaceOnUse"
+       x1="56.03125"
+       y1="110.5"
+       x2="72.031251"
+       y2="110.5"
+       gradientTransform="matrix(0.6632486,0.6632486,-0.6632486,0.6632486,45.21604,-10.083813)" /><linearGradient
+       xlink:href="#XMLID_10_"
+       id="linearGradient10257"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7071,0.7074589,0.7071,-0.7074589,-50.969871,98.357246)"
+       x1="61.9692"
+       y1="88.430702"
+       x2="40.815899"
+       y2="88.430702" /><linearGradient
+       xlink:href="#XMLID_17_"
+       id="linearGradient10260"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7074589,0.7071,-0.7074589,0.7071,68.761161,-21.373784)"
+       x1="51.339096"
+       y1="30.159527"
+       x2="51.326984"
+       y2="-17.582758" /><linearGradient
+       xlink:href="#linearGradient6141"
+       id="linearGradient6147"
+       x1="7.2493796"
+       y1="120.2508"
+       x2="57.625931"
+       y2="69.874252"
+       gradientUnits="userSpaceOnUse" /></defs><metadata
+     id="metadata3"><ns:sfw><ns:slices /><ns:sliceSourceBounds
+         y="3.97"
+         x="4"
+         height="120.061"
+         width="119.999"
+         bottomLeftOrigin="true" /></ns:sfw><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><linearGradient
+     id="XMLID_11_"
+     gradientUnits="userSpaceOnUse"
+     x1="41.188999"
+     y1="80.101601"
+     x2="27.6451"
+     y2="66.557701"
+     gradientTransform="translate(8.7075442,3.5814057)"><stop
+       offset="0.40830001"
+       style="stop-color:#f0f0f0;stop-opacity:1;"
+       id="stop25" /><stop
+       offset="0.50628459"
+       style="stop-color:#C3C3C3"
+       id="stop27" /><stop
+       offset="0.56008232"
+       style="stop-color:#8b8b8b;stop-opacity:1;"
+       id="stop29" /><stop
+       id="stop12212"
+       style="stop-color:#393939;stop-opacity:1;"
+       offset="0.67944592" /></linearGradient><linearGradient
+     id="XMLID_12_"
+     gradientUnits="userSpaceOnUse"
+     x1="1.3501"
+     y1="103.2324"
+     x2="8.1437998"
+     y2="110.0261"
+     gradientTransform="matrix(-1,0,0,-1,18.150444,221.94371)"><stop
+       offset="0"
+       style="stop-color:#EEEEEE"
+       id="stop36" /><stop
+       offset="1"
+       style="stop-color:#BBBBBB"
+       id="stop38" /></linearGradient><linearGradient
+     id="XMLID_13_"
+     gradientUnits="userSpaceOnUse"
+     x1="-0.47799999"
+     y1="105.0586"
+     x2="6.3157001"
+     y2="111.8523"
+     gradientTransform="matrix(-1,0,0,-1,11.978544,219.42611)"><stop
+       offset="0"
+       style="stop-color:#BBBBBB"
+       id="stop43" /><stop
+       offset="1"
+       style="stop-color:#555555"
+       id="stop45" /></linearGradient><linearGradient
+     id="XMLID_14_"
+     gradientUnits="userSpaceOnUse"
+     x1="67.880402"
+     y1="6.4331002"
+     x2="105.3924"
+     y2="43.945599"
+     gradientTransform="translate(6.1416442,2.5179057)"><stop
+       offset="0.0947"
+       style="stop-color:#666666;stop-opacity:1;"
+       id="stop50" /><stop
+       id="stop3330"
+       style="stop-color:#b7b7b7;stop-opacity:1;"
+       offset="0.40963161" /><stop
+       offset="0.50530702"
+       style="stop-color:#ffffff;stop-opacity:1;"
+       id="stop56" /><stop
+       id="stop3328"
+       style="stop-color:#a3a3a3;stop-opacity:1;"
+       offset="0.63043118" /><stop
+       offset="0.93489999"
+       style="stop-color:#646464;stop-opacity:1;"
+       id="stop62" /></linearGradient><linearGradient
+     id="XMLID_15_"
+     gradientUnits="userSpaceOnUse"
+     x1="76.919403"
+     y1="43.1436"
+     x2="100.6411"
+     y2="19.4214"
+     gradientTransform="translate(-3.0255781e-2,3.056501e-4)"><stop
+       offset="0"
+       style="stop-color:#aeaeae;stop-opacity:1;"
+       id="stop67" /><stop
+       offset="0.0602"
+       style="stop-color:#b2b2b2;stop-opacity:1;"
+       id="stop69" /><stop
+       offset="0.18103883"
+       style="stop-color:#d9d9d9;stop-opacity:1;"
+       id="stop71" /><stop
+       offset="0.3195"
+       style="stop-color:#ffffff;stop-opacity:1;"
+       id="stop73" /><stop
+       offset="0.43529999"
+       style="stop-color:#f4f4f4;stop-opacity:1;"
+       id="stop75" /><stop
+       offset="0.6028"
+       style="stop-color:#D4D4D4"
+       id="stop77" /><stop
+       offset="0.7633"
+       style="stop-color:#BBBBBB"
+       id="stop79" /><stop
+       offset="0.80790001"
+       style="stop-color:#b9bcc1;stop-opacity:1;"
+       id="stop81" /><stop
+       offset="0.92970002"
+       style="stop-color:#bdc0c3;stop-opacity:1;"
+       id="stop83" /><stop
+       offset="1"
+       style="stop-color:#b5b9bb;stop-opacity:1;"
+       id="stop85" /></linearGradient><linearGradient
+     id="XMLID_17_"
+     gradientUnits="userSpaceOnUse"
+     x1="38.757801"
+     y1="7.4277"
+     x2="63.923302"
+     y2="7.4277"
+     gradientTransform="matrix(0.7071,0.7071,-0.7071,0.7071,68.728244,-21.373694)"><stop
+       offset="0"
+       style="stop-color:#3a3a3a;stop-opacity:1;"
+       id="stop111" /><stop
+       offset="0.60194176"
+       style="stop-color:#ffffff;stop-opacity:1;"
+       id="stop113" /><stop
+       offset="1"
+       style="stop-color:#888888"
+       id="stop115" /></linearGradient><linearGradient
+     id="XMLID_18_"
+     gradientUnits="userSpaceOnUse"
+     x1="-6.165"
+     y1="112.5049"
+     x2="11.0181"
+     y2="112.5049"
+     gradientTransform="translate(6.1416442,2.5179057)"><stop
+       offset="0"
+       style="stop-color:#BBBBBB"
+       id="stop120" /><stop
+       offset="1"
+       style="stop-color:#000000"
+       id="stop122" /></linearGradient><path
+     style="fill:url(#linearGradient10257)"
+     d="M 76.409451,31.804481 C 75.443086,30.924606 74.357677,30.748097 72.740857,32.364097 L 2.6023174,103.87059 C 2.5703077,103.90258 2.569153,103.93922 2.5401379,103.97422 C -0.95363288,107.73022 -0.88972357,113.60492 2.7681296,117.25992 C 6.4259848,120.91592 12.29792,120.98291 16.053828,117.48791 C 16.088848,117.45991 16.126446,117.45673 16.157461,117.42573 L 87.72613,47.307917 C 90.960771,44.076918 86.953486,42.972159 84.679332,40.696158 L 79.373343,35.390169 C 78.234266,34.251669 77.375816,32.684356 76.409451,31.804481 z M 16.053828,104.01567 C 18.984982,106.94689 18.986335,111.69819 16.053828,114.62765 C 13.124457,117.55553 8.3745634,117.55731 5.4418505,114.62765 C 2.5091357,111.69799 2.5109065,106.94669 5.4418505,104.01567 C 8.3727812,101.08623 13.121121,101.086 16.053828,104.01567 z "
+     id="path10166" /><path
+     style="fill:url(#linearGradient10254)"
+     d="M 17.380325,102.68918 C 14.447618,99.759506 9.6992784,99.759734 6.7683477,102.68918 C 6.5428061,102.91472 6.3373933,103.14849 6.1465522,103.39388 C 9.0905761,101.11028 13.348454,101.3131 16.053828,104.01567 C 18.759425,106.72134 18.965866,110.98021 16.675624,113.92295 C 16.920967,113.73233 17.15491,113.52645 17.380325,113.30115 C 20.312833,110.3717 20.31148,105.6204 17.380325,102.68918 z "
+     id="path10186" /><path
+     d="M 118.731,16.620217 L 103.19512,32.150217 C 99.80841,35.534217 93.549236,33.235217 90.160517,29.850217 C 86.776801,26.465216 84.475632,20.211217 87.86035,16.825217 L 103.40023,1.2962158 C 92.523716,-2.8617843 79.067889,3.9452161 74.82974,8.1812158 C 63.636062,19.367217 62.837657,34.722217 74.065352,45.942217 C 85.286043,57.160217 100.64883,56.490217 111.84151,45.303218 C 116.07966,41.066217 122.89111,27.489217 118.731,16.620217 z "
+     id="path64"
+     style="fill:url(#linearGradient10251)" /><path
+     d="M 77.659175,11.009216 C 72.74068,15.925216 70.031306,21.867217 70.031306,27.741217 L 70.030305,27.742217 C 70.031306,33.311217 72.404509,38.626217 76.894787,43.113217 C 81.422083,47.639217 86.7778,50.031218 92.381644,50.031217 L 92.381644,50.031217 C 98.22961,50.031218 104.1346,47.348218 109.01107,42.474217 C 111.8225,39.664217 115.5714,32.245217 115.93458,25.071217 C 111.35626,29.647217 106.02356,34.977217 106.02356,34.977217 C 100.96199,40.037217 92.379643,37.724217 87.331082,32.680217 C 84.259524,29.607217 82.198478,25.228217 82.198477,21.129217 C 82.199478,18.494217 83.050911,15.977216 85.028913,13.997217 C 85.029914,13.996217 90.524701,8.5042158 94.982962,4.049216 C 87.471153,4.3972165 80.050388,8.6212158 77.659175,11.009216 z "
+     id="path87"
+     style="fill:url(#linearGradient10248);fill-opacity:1.0" /><path
+     d="M 85.387095,16.818216 C 81.792271,20.411216 84.661727,27.477217 88.592721,31.406217 C 92.527718,35.337217 99.594302,38.205217 103.19012,34.613217 C 103.19012,34.613217 118.96412,17.234216 118.73,16.620217 L 103.19412,32.150217 C 99.80741,35.534218 93.548235,33.235217 90.159515,29.850217 C 86.775799,26.465216 84.474633,20.211217 87.85935,16.825217 L 103.39923,1.2962158 L 85.387095,16.818216 z "
+     id="path117"
+     style="fill:url(#linearGradient10260)" /><path
+     style="fill:url(#linearGradient10239)"
+     d="M 4.820055,104.72037 C 4.5726725,104.91226 4.3425471,105.11509 4.1153533,105.34217 C 1.1844093,108.27319 1.1826385,113.02448 4.1153533,115.95415 C 7.0480662,118.88381 11.79796,118.88203 14.727331,115.95415 C 14.952993,115.72872 15.158195,115.49477 15.349126,115.24945 C 12.406133,117.53606 8.148893,117.33187 5.4418505,114.62765 C 2.734806,111.92343 2.5308464,107.66392 4.820055,104.72037 z "
+     id="path10190" /><path
+     d="M 2.7691837,116.26123 C 1.0242958,114.51723 0.10383016,112.26923 -0.011225313,109.98622 C -0.15229878,112.60123 0.76716563,115.26323 2.7691816,117.26123 C 6.4270358,120.91723 12.302016,120.99023 16.057925,117.49522 C 16.092943,117.46722 16.134962,117.44623 16.165977,117.41523 L 17.166488,116.41622 C 13.410582,119.90922 6.427038,119.91723 2.7691837,116.26123 z "
+     id="path124"
+     style="fill:url(#linearGradient10236)" /><path
+     style="fill:url(#linearGradient6147);fill-opacity:1.0;fill-rule:nonzero;opacity:0.5"
+     d="M 43.21875 69.5625 L 2.8125 110.75 C 2.7783735 110.78411 2.7809338 110.80644 2.75 110.84375 C -0.97480066 114.84812 -0.93098327 121.10331 2.96875 125 C 6.8684854 128.89776 13.151978 128.97611 17.15625 125.25 C 17.193586 125.22015 17.216934 125.22055 17.25 125.1875 L 57.3125 85.9375 C 53.66929 79.550692 48.861858 73.979783 43.21875 69.5625 z M 11.5 108.5625 C 13.547005 108.56247 15.592932 109.34455 17.15625 110.90625 C 20.281231 114.0313 20.282673 119.09558 17.15625 122.21875 C 14.033171 125.34024 8.9703922 125.34214 5.84375 122.21875 C 2.7171056 119.09537 2.7189937 114.03109 5.84375 110.90625 C 7.406121 109.34467 9.4529953 108.56253 11.5 108.5625 z "
+     id="path2236"
+     transform="matrix(0.9379752,0,0,0.9379752,-3.0914126e-2,0)" /><path
+     d="M 15.537923,96.062539 C 14.713663,96.978699 14.388162,98.22441 14.530816,99.52305 C 14.682682,100.89492 15.361817,102.33182 16.533505,103.50003 C 18.808146,105.77775 22.084895,106.19602 23.991153,104.45332 C 24.002148,104.47231 67.492075,61.01118 77.726913,50.782827 C 77.294045,50.416137 69.737251,42.875414 69.288707,42.347047 C 66.356033,45.277862 15.537923,96.062539 15.537923,96.062539 z "
+     id="path33"
+     style="fill:url(#linearGradient9291);opacity:0.5" /><path
+     style="fill:url(#linearGradient3301)"
+     id="path108"
+     d="M 94.304331,48.937972 C 88.699488,48.937972 83.344772,46.545972 78.817475,42.019972 C 74.327198,37.532972 71.953994,32.217972 71.952993,26.648972 L 71.953994,26.647972 C 71.953994,20.773972 74.663368,14.831973 79.581863,9.9159745 C 80.407282,9.0909731 81.84201,8.0489732 83.661933,7.0219732 C 80.923544,8.3389732 78.759446,9.8199731 77.661889,10.915974 C 72.743394,15.831973 70.034021,21.773972 70.034021,27.647972 L 70.033021,27.648972 C 70.034021,33.217972 72.407224,38.532972 76.897502,43.019972 C 81.424798,47.545972 86.780515,49.937972 92.384357,49.937972 C 96.062223,49.937972 99.7631,48.874972 103.21585,46.874972 C 100.32739,48.224972 97.308855,48.937972 94.304331,48.937972 z " /></svg>
diff --git a/files/opencs/scalable/editor-icons.svg b/files/opencs/editor-icons.svg
similarity index 100%
rename from files/opencs/scalable/editor-icons.svg
rename to files/opencs/editor-icons.svg
diff --git a/files/opencs/menu-reload.svg b/files/opencs/menu-reload.svg
index aef27dd104..32cefa7548 100644
--- a/files/opencs/menu-reload.svg
+++ b/files/opencs/menu-reload.svg
@@ -89,23 +89,82 @@
        x2="76.100182"
        y2="249"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="Main-61">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop2082-1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2098"
+       x1="52.082603"
+       y1="61.780205"
+       x2="53.181248"
+       y2="61.780205"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.7795278,0,0,3.7795278,-189.44141,-219.41797)" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2096"
+       x1="50.281166"
+       y1="62.838539"
+       x2="52.926998"
+       y2="62.838539"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2098-8"
+       x1="52.082603"
+       y1="61.780205"
+       x2="53.181248"
+       y2="61.780205"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2096-5"
+       x1="50.286324"
+       y1="62.972603"
+       x2="52.024643"
+       y2="62.967445"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.27492098,-0.52917219)" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2098-4"
+       x1="52.082603"
+       y1="61.780205"
+       x2="53.181248"
+       y2="61.780205"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.3228271,-0.79375592)" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2092"
+       x1="45.243748"
+       y1="62.838539"
+       x2="47.88958"
+       y2="62.838539"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.26458362)" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2094"
+       x1="44.989498"
+       y1="61.780205"
+       x2="46.088139"
+       y2="61.780205"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.79373763)" />
   </defs>
   <g
      id="menu-reload"
-     transform="matrix(3.7795278,0,0,3.7795278,-67.999997,-247.99997)"
+     transform="matrix(3.7795278,0,0,3.7795278,-187.99999,-227.99997)"
      style="display:inline">
-    <rect
-       style="opacity:0;fill:#a51d2d;stroke-width:0.264583px;paint-order:fill markers stroke;stop-color:#000000"
-       id="rect1553"
-       width="4.2333331"
-       height="4.2333331"
-       x="17.991665"
-       y="65.616653"
-       rx="1.9824198e-15" />
     <path
-       id="circle2129"
-       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2146);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
-       d="m 69.046875,241.90039 a 7.0999998,7.0999998 0 0 0 -3.628906,0.9707 l 3.210937,3.21094 0.800782,-0.80273 -1.892579,-1.89258 A 5.7999999,5.7999999 0 0 1 69,243.19922 5.7999999,5.7999999 0 0 1 74.800781,249 a 5.7999999,5.7999999 0 0 1 -0.697265,2.75586 l 1.144531,0.61719 a 7.0999998,7.0999998 0 0 0 -1.316406,-8.48047 7.0999998,7.0999998 0 0 0 -4.884766,-1.99219 z m -6.294922,3.72656 a 7.0999998,7.0999998 0 0 0 1.316406,8.48047 7.0999998,7.0999998 0 0 0 4.884766,1.99219 7.0999998,7.0999998 0 0 0 3.628906,-0.9707 l -3.210937,-3.21094 -0.800782,0.80273 1.892579,1.89258 A 5.7999999,5.7999999 0 0 1 69,254.80078 5.7999999,5.7999999 0 0 1 63.199219,249 a 5.7999999,5.7999999 0 0 1 0.697265,-2.75586 z"
-       transform="matrix(0.26458333,0,0,0.26458333,1.8520833,1.8520833)" />
+       d="m 52.8211,61.122306 -2.004035,-0.0036 0.217103,-0.201119 c 0.158097,-0.150209 -0.07905,-0.375524 -0.237144,-0.225315 l -0.50101,0.476016 c -0.06587,0.06207 -0.06587,0.163247 0,0.225315 l 0.50101,0.476016 c 0.06533,0.06258 0.171817,0.06258 0.237144,0 0.06587,-0.06207 0.06585,-0.163246 -1.8e-5,-0.225315 L 50.817065,61.383321 H 52.8211 c 0.143894,-0.0027 0.357404,0.162378 0.360144,0.299094 v 0.391921 c 0,0.211563 0.264583,0.211563 0.264583,0 v -0.391921 c -0.0028,-0.311974 -0.296373,-0.566316 -0.624727,-0.563677 z m 0.07432,1.891352 c -0.158096,-0.149435 -0.394425,0.07511 -0.237143,0.225315 l 0.2171,0.261015 h -2.004033 c -0.143895,0.0027 -0.333193,-0.162379 -0.335933,-0.299097 v -0.39192 c -5.38e-4,-0.21105 -0.264046,-0.21105 -0.264584,0 v 0.39192 c 0.0028,0.311975 0.272162,0.56632 0.600517,0.56368 h 2.004035 l -0.217101,0.20112 c -0.06587,0.06207 -0.06587,0.163245 0,0.225314 0.06533,0.06258 0.171816,0.06258 0.237144,0 l 0.501007,-0.476016 c 0.06587,-0.06207 0.06587,-0.163245 0,-0.225314 z"
+       id="path1"
+       style="display:inline;overflow:hidden;fill:#4d4d4d;fill-opacity:1;stroke-width:0.00381524" />
   </g>
 </svg>
diff --git a/files/opencs/object.svg b/files/opencs/object.svg
index 717269b9d6..8f9261fd18 100644
--- a/files/opencs/object.svg
+++ b/files/opencs/object.svg
@@ -108,11 +108,11 @@
      style="display:inline"
      transform="matrix(3.7795278,0,0,3.77117,-148,-187.58427)">
     <ellipse
-       style="fill:none;stroke:#4d4d4d;stroke-width:0.324753;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:none;stroke:#4d4d4d;stroke-width:0.264876;stroke-dasharray:none;stroke-opacity:1"
        id="path1"
        cx="41.274998"
-       cy="51.863022"
-       rx="1.6897067"
-       ry="1.6938115" />
+       cy="51.863018"
+       rx="1.7196451"
+       ry="1.7237496" />
   </g>
 </svg>
diff --git a/files/opencs/raster/startup/big/configure.png b/files/opencs/raster/startup/big/configure.png
deleted file mode 100644
index f0be888a15..0000000000
Binary files a/files/opencs/raster/startup/big/configure.png and /dev/null differ
diff --git a/files/opencs/raster/startup/small/configure.png b/files/opencs/raster/startup/small/configure.png
deleted file mode 100644
index e91b7f7731..0000000000
Binary files a/files/opencs/raster/startup/small/configure.png and /dev/null differ
diff --git a/files/opencs/raster/startup/small/create-addon.png b/files/opencs/raster/startup/small/create-addon.png
deleted file mode 100644
index 64fd138be5..0000000000
Binary files a/files/opencs/raster/startup/small/create-addon.png and /dev/null differ
diff --git a/files/opencs/raster/startup/small/edit-content.png b/files/opencs/raster/startup/small/edit-content.png
deleted file mode 100644
index 6297f1169c..0000000000
Binary files a/files/opencs/raster/startup/small/edit-content.png and /dev/null differ
diff --git a/files/opencs/raster/startup/small/new-game.png b/files/opencs/raster/startup/small/new-game.png
deleted file mode 100644
index 0d7d14c558..0000000000
Binary files a/files/opencs/raster/startup/small/new-game.png and /dev/null differ
diff --git a/files/opencs/record-edit.svg b/files/opencs/record-edit.svg
index 2db10e9c78..5e7a058782 100644
--- a/files/opencs/record-edit.svg
+++ b/files/opencs/record-edit.svg
@@ -116,7 +116,7 @@
        gradientTransform="matrix(0.2267857,0,0,0.24804718,6.7279833,5.1097051)" />
   </defs>
   <g
-     id="script"
+     id="record-edit"
      transform="matrix(3.7795278,0,0,3.7795232,-128.00003,-187.99976)"
      style="display:inline">
     <path
diff --git a/files/opencs/record-touch.svg b/files/opencs/record-touch.svg
index 4d53a591b5..39e54c3ff1 100644
--- a/files/opencs/record-touch.svg
+++ b/files/opencs/record-touch.svg
@@ -117,27 +117,36 @@
        xlink:href="#Main-3"
        id="linearGradient2163"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(19.999965,19.999991)"
+       gradientTransform="matrix(0.2267857,0,0,0.24804749,6.7279756,5.1096472)"
        x1="122"
        y1="189"
        x2="136"
        y2="189" />
+    <linearGradient
+       xlink:href="#Main-6"
+       id="linearGradient2178"
+       x1="122"
+       y1="189"
+       x2="136"
+       y2="189"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.85714286,0,0,0.93750007,-102.57143,-168.68751)" />
   </defs>
   <g
-     id="error-log"
+     id="record-touch"
      transform="matrix(3.7795278,0,0,3.7795176,-128.00003,-187.99948)"
      style="display:inline">
     <path
-       id="path2008"
-       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient2163);fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000;stop-opacity:1"
-       d="m 142,201 v 16 h 11.40625 v -1 H 143 v -14 h 12 v 9.18499 h 1 V 201 Z"
-       transform="matrix(0.26458333,0,0,0.26458333,-3.4395741,-3.439581)" />
+       id="rect2091"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#linearGradient2178);fill-opacity:1;stroke:none;stroke-width:0.89642px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000"
+       d="M 2,1 V 16.000002 H 13.999997 V 1 Z M 2.8571402,1.9374994 H 13.142856 V 15.062503 H 2.8571402 Z"
+       transform="matrix(0.26458331,0,0,0.26458402,33.866672,49.74166)" />
     <ellipse
-       style="fill:#fdb433;fill-opacity:1;stroke:#000000;stroke-width:0"
+       style="display:inline;fill:#fdb433;fill-opacity:1;stroke:#000000;stroke-width:0"
        id="path1"
-       cx="37.184597"
-       cy="53.039677"
-       rx="0.9260416"
-       ry="0.92604411" />
+       cx="37.306255"
+       cy="51.329163"
+       rx="0.79374993"
+       ry="0.79375207" />
   </g>
 </svg>
diff --git a/files/opencs/resources.qrc b/files/opencs/resources.qrc
index 786040623c..3b5a17c730 100644
--- a/files/opencs/resources.qrc
+++ b/files/opencs/resources.qrc
@@ -102,7 +102,7 @@
         <file alias="create-addon">raster/startup/big/create-addon.png</file>
         <file alias="create-game">raster/startup/big/new-game.png</file>
         <file alias="edit-content">raster/startup/big/edit-content.png</file>
-        <file alias="configure">raster/startup/small/configure.png</file>
+        <file alias="configure">configure.svg</file>
     </qresource>
     <qresource prefix="/scenetoolbar">
         <file alias="night">lighting-moon.svg</file>
diff --git a/files/opencs/run-log.svg b/files/opencs/run-log.svg
index 404f74a6d4..96e0d037b7 100644
--- a/files/opencs/run-log.svg
+++ b/files/opencs/run-log.svg
@@ -67,14 +67,13 @@
        gradientTransform="matrix(0.26458338,0,0,0.26459185,23.018732,7.1420691)" />
   </defs>
   <g
-     id="debug-profile"
+     id="run-log"
      transform="matrix(3.7795278,0,0,3.7794065,-207.99997,-207.99282)"
      style="display:inline">
     <path
-       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.183633px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000"
        id="path6526"
-       d="m 53.055828,51.961969 -2.084719,1.199138 a 0.11547005,0.11547005 30.092328 0 1 -0.173044,-0.100279 l 0.0039,-2.404989 a 0.11547005,0.11547005 150.09233 0 1 0.173366,-0.09972 l 2.080844,1.205851 a 0.11547005,0.11547005 90.092328 0 1 -3.23e-4,0.2 z"
-       transform="matrix(0.97119563,0,0,1.0037896,6.7567971,5.0948873)" />
+       d="m 57.904031,57.222619 -1.429163,0.842578 a 0.07915963,0.08113535 0 0 1 -0.118629,-0.07046 l 0.0027,-1.689872 a 0.07915963,0.08113535 0 0 1 0.11885,-0.07007 l 1.426507,0.847294 a 0.07915963,0.08113535 0 0 1 -2.21e-4,0.140531 z" />
     <path
        id="rect2091"
        style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#linearGradient2178);fill-opacity:1;stroke:none;stroke-width:0.264587px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;stop-color:#000000"
diff --git a/files/opencs/scalable/startup/configure.svgz b/files/opencs/scalable/startup/configure.svgz
deleted file mode 100644
index 1275ec53fa..0000000000
Binary files a/files/opencs/scalable/startup/configure.svgz and /dev/null differ
diff --git a/files/opencs/sound.svg b/files/opencs/sound.svg
index f482c9cd70..ead929c862 100644
--- a/files/opencs/sound.svg
+++ b/files/opencs/sound.svg
@@ -120,7 +120,8 @@
        x1="17.991667"
        y1="30.691668"
        x2="21.960417"
-       y2="30.691668" />
+       y2="30.691668"
+       gradientTransform="matrix(1.5999994,0,0,1,-10.794989,8.2675378e-8)" />
     <linearGradient
        xlink:href="#Main-3"
        id="linearGradient2264"
@@ -129,7 +130,7 @@
        x2="11.641667"
        y2="30.691668"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.7795264,0,0,3.7795263,-27.999988,-107.99997)" />
+       gradientTransform="matrix(1.5,0,0,1.6,6.0324979,-18.415001)" />
   </defs>
   <g
      id="sound"
@@ -145,8 +146,8 @@
        rx="1.9824198e-15" />
     <path
        id="path3127"
-       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient3131);fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
-       d="m 18.520833,28.575001 v 4.233334 h 0.264583 v -4.233334 z m 0.529166,0.529167 v 3.175 h 0.264584 v -3.175 z m 1.058334,0.264583 v 2.645834 h 0.264583 v -2.645834 z m -2.116667,0.529167 v 1.5875 h 0.264583 v -1.5875 z m 1.5875,0 v 1.5875 h 0.264583 v -1.5875 z m 1.058333,0.264583 v 1.058334 h 0.264584 v -1.058334 z m 0.529167,0.264584 v 0.529166 h 0.264583 v -0.529166 z m 0.529167,0 v 0.529166 h 0.264583 v -0.529166 z" />
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient3131);fill-opacity:1;stroke:none;stroke-width:0.334674px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 18.838333,28.575001 v 4.233334 h 0.423332 v -4.233334 z m 0.846662,0.846667 v 2.540001 h 0.423336 v -2.540001 z m 1.693335,0 v 2.540001 h 0.423334 v -2.540001 z m -3.386665,0.423334 v 1.693333 h 0.423333 v -1.693333 z m 2.539997,0 v 1.693333 h 0.423335 v -1.693333 z m 1.693334,0 v 1.693333 h 0.423336 v -1.693333 z" />
     <rect
        style="display:inline;opacity:0;fill:#a51d2d;stroke-width:0.999998px;paint-order:fill markers stroke;stop-color:#000000"
        id="rect1435"
@@ -158,8 +159,7 @@
        transform="matrix(0.42333331,0,0,0.42333347,16.721665,27.305001)" />
     <path
        id="rect1042"
-       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#linearGradient2264);fill-opacity:1;stroke:none;stroke-width:0.999998px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
-       d="M 5e-6,0 V 15.999997 H 16 V 0 Z M 1.000003,1.0000022 H 14.999998 V 14.999995 H 1.000003 Z"
-       transform="matrix(0.42333331,0,0,0.42333347,16.721665,27.305001)" />
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:url(#linearGradient2264);fill-opacity:1;stroke:none;stroke-width:0.40989px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 17.144998,27.305001 v 6.773334 h 6.35 v -6.773334 z m 0.396874,0.423334 h 5.55625 v 5.926666 h -5.55625 z" />
   </g>
 </svg>
diff --git a/files/shaders/compatibility/bs/default.frag b/files/shaders/compatibility/bs/default.frag
index d2c8de0b22..3c665752d1 100644
--- a/files/shaders/compatibility/bs/default.frag
+++ b/files/shaders/compatibility/bs/default.frag
@@ -77,10 +77,11 @@ void main()
     vec3 specularColor = getSpecularColor().xyz;
 #if @normalMap
     vec4 normalTex = texture2D(normalMap, normalMapUV);
+    vec3 normal = normalTex.xyz * 2.0 - 1.0;
 #if @reconstructNormalZ
-    normalTex.z = sqrt(1.0 - dot(normalTex.xy, normalTex.xy));
+    normal.z = sqrt(1.0 - dot(normal.xy, normal.xy));
 #endif
-    vec3 viewNormal = normalToView(normalTex.xyz * 2.0 - 1.0);
+    vec3 viewNormal = normalToView(normal);
     specularColor *= normalTex.a;
 #else
     vec3 viewNormal = normalize(gl_NormalMatrix * passNormal);
diff --git a/files/shaders/compatibility/groundcover.frag b/files/shaders/compatibility/groundcover.frag
index aab37d465d..96a79c8793 100644
--- a/files/shaders/compatibility/groundcover.frag
+++ b/files/shaders/compatibility/groundcover.frag
@@ -60,10 +60,11 @@ void main()
 
 #if @normalMap
     vec4 normalTex = texture2D(normalMap, normalMapUV);
+    vec3 normal = normalTex.xyz * 2.0 - 1.0;
 #if @reconstructNormalZ
-    normalTex.z = sqrt(1.0 - dot(normalTex.xy, normalTex.xy));
+    normal.z = sqrt(1.0 - dot(normal.xy, normal.xy));
 #endif
-    vec3 viewNormal = normalToView(normalTex.xyz * 2.0 - 1.0);
+    vec3 viewNormal = normalToView(normal);
 #else
     vec3 viewNormal = normalToView(normalize(passNormal));
 #endif
diff --git a/files/shaders/compatibility/objects.frag b/files/shaders/compatibility/objects.frag
index eb5b79a0c2..7f163580cc 100644
--- a/files/shaders/compatibility/objects.frag
+++ b/files/shaders/compatibility/objects.frag
@@ -168,10 +168,11 @@ vec2 screenCoords = gl_FragCoord.xy / screenRes;
 
 #if @normalMap
     vec4 normalTex = texture2D(normalMap, normalMapUV + offset);
+    vec3 normal = normalTex.xyz * 2.0 - 1.0;
 #if @reconstructNormalZ
-    normalTex.z = sqrt(1.0 - dot(normalTex.xy, normalTex.xy));
+    normal.z = sqrt(1.0 - dot(normal.xy, normal.xy));
 #endif
-    vec3 viewNormal = normalToView(normalTex.xyz * 2.0 - 1.0);
+    vec3 viewNormal = normalToView(normal);
 #else
     vec3 viewNormal = normalize(gl_NormalMatrix * passNormal);
 #endif
diff --git a/files/shaders/compatibility/terrain.frag b/files/shaders/compatibility/terrain.frag
index f45f1f024e..9d89217f35 100644
--- a/files/shaders/compatibility/terrain.frag
+++ b/files/shaders/compatibility/terrain.frag
@@ -64,10 +64,11 @@ void main()
 
 #if @normalMap
     vec4 normalTex = texture2D(normalMap, adjustedUV);
+    vec3 normal = normalTex.xyz * 2.0 - 1.0;
 #if @reconstructNormalZ
-    normalTex.z = sqrt(1.0 - dot(normalTex.xy, normalTex.xy));
+    normal.z = sqrt(1.0 - dot(normal.xy, normal.xy));
 #endif
-    vec3 viewNormal = normalToView(normalTex.xyz * 2.0 - 1.0);
+    vec3 viewNormal = normalToView(normal);
 #else
     vec3 viewNormal = normalize(gl_NormalMatrix * passNormal);
 #endif
diff --git a/files/shaders/compatibility/water.frag b/files/shaders/compatibility/water.frag
index d1324e01bd..749dcf27cd 100644
--- a/files/shaders/compatibility/water.frag
+++ b/files/shaders/compatibility/water.frag
@@ -94,7 +94,6 @@ uniform vec2 screenRes;
 void main(void)
 {
     vec2 UV = worldPos.xy / (8192.0*5.0) * 3.0;
-    UV.y *= -1.0;
 
     float shadow = unshadowedLightRatio(linearDepth);
 
diff --git a/files/windows/openmw-cs.exe.manifest b/files/windows/openmw-cs.exe.manifest
new file mode 100644
index 0000000000..3107f64706
--- /dev/null
+++ b/files/windows/openmw-cs.exe.manifest
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+  <asmv3:application>
+    <asmv3:windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+</assembly>
\ No newline at end of file
diff --git a/files/wizard/icons/dollar.svg b/files/wizard/icons/dollar.svg
new file mode 100644
index 0000000000..60c5a4b23c
--- /dev/null
+++ b/files/wizard/icons/dollar.svg
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+
+<svg
+   height="48"
+   width="48"
+   version="1.1"
+   id="Capa_1"
+   viewBox="0 0 30.72 30.72"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs11" />
+<g
+   id="g11"
+   transform="matrix(0.06,0,0,0.06222222,0,-0.56888864)">
+	<g
+   id="g1">
+		<path
+   style="fill:#74d24f"
+   d="M 496,112 H 16 c -8.82,0 -16,7.18 -16,16 v 256 c 0,8.82 7.18,16 16,16 h 480 c 8.82,0 16,-7.18 16,-16 V 128 c 0,-8.82 -7.18,-16 -16,-16 z"
+   id="path1" />
+	</g>
+	<g
+   id="g2">
+		<path
+   style="fill:#ffefbc"
+   d="m 472,192 c -22.055,0 -40,-17.945 -40,-40 0,-4.422 -3.578,-8 -8,-8 H 88 c -4.422,0 -8,3.578 -8,8 0,22.055 -17.945,40 -40,40 -4.422,0 -8,3.578 -8,8 v 112 c 0,4.422 3.578,8 8,8 22.055,0 40,17.945 40,40 0,4.422 3.578,8 8,8 h 336 c 4.422,0 8,-3.578 8,-8 0,-22.055 17.945,-40 40,-40 4.422,0 8,-3.578 8,-8 V 200 c 0,-4.422 -3.578,-8 -8,-8 z"
+   id="path2" />
+	</g>
+	<g
+   id="g3">
+		<path
+   style="fill:#869b55"
+   d="m 128,256 c 0,48.221 26.691,90.175 66.081,112 H 317.92 C 357.309,346.175 384,304.221 384,256 384,207.779 357.309,165.825 317.919,144 H 194.08 C 154.691,165.825 128,207.779 128,256 Z"
+   id="path3" />
+	</g>
+	<g
+   id="g4">
+		<path
+   style="fill:#ffefbc"
+   d="m 256,244 c -16.023,0 -28,-8.445 -28,-16 0,-7.555 11.977,-16 28,-16 16.023,0 28,8.445 28,16 0,6.625 5.375,12 12,12 6.625,0 12,-5.375 12,-12 0,-19.236 -16.824,-34.862 -40,-38.932 V 184 c 0,-6.625 -5.375,-12 -12,-12 -6.625,0 -12,5.375 -12,12 v 5.068 c -23.176,4.07 -40,19.695 -40,38.932 0,22.43 22.844,40 52,40 16.023,0 28,8.445 28,16 0,7.555 -11.977,16 -28,16 -16.023,0 -28,-8.445 -28,-16 0,-6.625 -5.375,-12 -12,-12 -6.625,0 -12,5.375 -12,12 0,19.236 16.824,34.862 40,38.932 V 328 c 0,6.625 5.375,12 12,12 6.625,0 12,-5.375 12,-12 v -5.068 c 23.176,-4.07 40,-19.695 40,-38.932 0,-22.43 -22.844,-40 -52,-40 z"
+   id="path4" />
+	</g>
+	<g
+   id="g5">
+		<circle
+   style="fill:#74d24f"
+   cx="80"
+   cy="256"
+   r="24"
+   id="circle4" />
+	</g>
+	<g
+   id="g6">
+		<circle
+   style="fill:#74d24f"
+   cx="432"
+   cy="256"
+   r="24"
+   id="circle5" />
+	</g>
+	<g
+   id="g7">
+		<circle
+   style="fill:#869b55"
+   cx="40"
+   cy="152"
+   r="16"
+   id="circle6" />
+	</g>
+	<g
+   id="g8">
+		<circle
+   style="fill:#869b55"
+   cx="472"
+   cy="152"
+   r="16"
+   id="circle7" />
+	</g>
+	<g
+   id="g9">
+		<circle
+   style="fill:#869b55"
+   cx="40"
+   cy="360"
+   r="16"
+   id="circle8" />
+	</g>
+	<g
+   id="g10">
+		<circle
+   style="fill:#869b55"
+   cx="472"
+   cy="360"
+   r="16"
+   id="circle9" />
+	</g>
+</g>
+</svg>
diff --git a/files/wizard/icons/folder.svg b/files/wizard/icons/folder.svg
new file mode 100644
index 0000000000..a976bad226
--- /dev/null
+++ b/files/wizard/icons/folder.svg
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="48"
+   height="48"
+   id="svg97"
+   version="1.1"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5050" />
+      <stop
+         id="stop5056"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5052" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9766">
+      <stop
+         style="stop-color:#6194cb;stop-opacity:1;"
+         offset="0"
+         id="stop9768" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="1"
+         id="stop9770" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3096">
+      <stop
+         id="stop3098"
+         offset="0"
+         style="stop-color:#424242;stop-opacity:1;" />
+      <stop
+         id="stop3100"
+         offset="1.0000000"
+         style="stop-color:#777777;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1789">
+      <stop
+         style="stop-color:#202020;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop1790" />
+      <stop
+         style="stop-color:#b9b9b9;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop1791" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3983">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.87628865;"
+         offset="0.0000000"
+         id="stop3984" />
+      <stop
+         style="stop-color:#fffffe;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop3985" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient5048"
+       id="linearGradient6715"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <radialGradient
+       xlink:href="#linearGradient5060"
+       id="radialGradient6717"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       id="linearGradient5060">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop5062" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5064" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient5060"
+       id="radialGradient6719"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <radialGradient
+       xlink:href="#linearGradient1789"
+       id="radialGradient238"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.055022,-0.02734504,0.177703,1.190929,-3.572177,-7.125301)"
+       cx="20.706017"
+       cy="37.517986"
+       fx="20.706017"
+       fy="37.517986"
+       r="30.905205" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="6.1802502"
+       x2="15.514889"
+       y1="31.36775"
+       x1="18.112709"
+       id="linearGradient3104"
+       xlink:href="#linearGradient3096" />
+    <linearGradient
+       xlink:href="#linearGradient3983"
+       id="linearGradient491"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.516844,0,0,0.708978,-0.879573,-1.318166)"
+       x1="6.2297964"
+       y1="13.773066"
+       x2="9.8980894"
+       y2="66.834053" />
+    <linearGradient
+       xlink:href="#linearGradient9766"
+       id="linearGradient9772"
+       x1="22.175976"
+       y1="36.987999"
+       x2="22.065331"
+       y2="32.050499"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="46.689312"
+       x2="12.853771"
+       y1="32.567184"
+       x1="13.035696"
+       gradientTransform="matrix(1.317489,0,0,0.816256,-0.879573,-1.318166)"
+       id="linearGradient322"
+       xlink:href="#linearGradient319" />
+    <linearGradient
+       id="linearGradient319">
+      <stop
+         id="stop320"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop321"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:date>2009-01-13, 2020-12-18</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner, Daniel S. Fowler</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:source>https://tekeye.uk/free_resources/tango_desktop_project/index</dc:source>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>folder</rdf:li>
+            <rdf:li>directory</rdf:li>
+            <rdf:li>icon</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Public Domain</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>https://tekeye.uk/</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:identifier>https://tekeye.uk/free_resources/tango_desktop_project/images/folder.svg</dc:identifier>
+        <dc:coverage>computing</dc:coverage>
+        <dc:description>A representation of a folder for file storage.</dc:description>
+        <dc:language>en-GB</dc:language>
+        <dc:relation>https://tekeye.uk/free_resources/tango_desktop_project/images/folder-remote.svg</dc:relation>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     transform="matrix(0.18110236,0,0,0.18029774,0.81889764,0.85315151)">
+    <g
+       id="g95"
+       transform="matrix(5.5294093,0,0,5.5293987,-0.61953982,-5.1472721)">
+      <g
+         style="display:inline"
+         transform="matrix(0.02262383,0,0,0.02086758,43.38343,36.36962)"
+         id="g6707">
+        <rect
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402062;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           id="rect6709"
+           width="1339.6335"
+           height="478.35718"
+           x="-1559.2523"
+           y="-150.69685" />
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402062;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z"
+           id="path6711" />
+        <path
+           id="path6713"
+           d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402062;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      </g>
+      <path
+         d="m 4.5217805,38.687417 c 0.021796,0.416304 0.4599049,0.832609 0.8762095,0.832609 h 31.327021 c 0.416302,0 0.810812,-0.416305 0.789016,-0.832609 L 36.577584,11.460682 c -0.0218,-0.416303 -0.459897,-0.832616 -0.876201,-0.832616 H 22.43051 c -0.485057,0 -1.234473,-0.315589 -1.401644,-1.1066322 L 20.417475,6.6283628 C 20.262006,5.8926895 19.535261,5.5904766 19.118957,5.5904766 H 4.3400975 c -0.4163128,0 -0.8108208,0.4163041 -0.7890249,0.8326083 z"
+         id="path216"
+         style="fill:url(#radialGradient238);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3104);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path9788"
+         d="M 5.2265927,22.5625 H 35.492173"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <path
+         id="path9784"
+         d="M 5.0421736,18.5625 H 35.489104"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="M 4.9806965,12.5625 H 35.488057"
+         id="path9778" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="M 5.3861577,32.5625 H 35.494881"
+         id="path9798" />
+      <path
+         id="path9800"
+         d="M 5.5091398,34.5625 H 35.496893"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="M 5.0421736,16.5625 H 35.489104"
+         id="path9782" />
+      <path
+         id="path9780"
+         d="M 5.0114345,14.5625 H 35.48858"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <path
+         id="path9776"
+         d="M 4.9220969,10.5625 H 20.202912"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="M 4.8737534,8.5624999 H 19.657487"
+         id="path9774" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="M 5.3246666,28.5625 H 35.493876"
+         id="path9794" />
+      <path
+         id="path9792"
+         d="M 5.2880638,26.5625 H 35.493184"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="M 5.2265927,24.5625 H 35.492173"
+         id="path9790" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="M 5.1958537,20.5625 H 35.491649"
+         id="path9786" />
+      <path
+         id="path9796"
+         d="M 5.3246666,30.5625 H 35.493876"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.113636;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="M 5.5091398,36.5625 H 35.496893"
+         id="path9802" />
+      <path
+         style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.451429;fill:url(#linearGradient491);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.2138;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="m 6.068343,38.864023 c 0.016343,0.312228 -0.1809113,0.520379 -0.4985848,0.416303 v 0 C 5.2520766,39.176251 5.033027,38.968099 5.0166756,38.65587 L 4.068956,6.5913839 C 4.0526131,6.2791558 4.2341418,6.0906134 4.5463699,6.0906134 L 18.96842,6.0429196 c 0.312228,0 0.931943,0.3004727 1.132936,1.3221818 l 0.573489,2.8155346 C 20.247791,9.715379 20.255652,9.7010175 20.037287,9.0239299 L 19.631192,7.7647478 C 19.412142,7.0371009 18.932991,6.9328477 18.620763,6.9328477 H 5.7329889 c -0.3122276,0 -0.5094814,0.2081522 -0.4931306,0.5203887 L 6.1778636,38.968099 Z"
+         id="path219" />
+      <g
+         style="fill:#ffffff;fill-opacity:0.757062;fill-rule:nonzero;stroke:none;stroke-width:0.999465;stroke-miterlimit:4"
+         id="g220"
+         transform="matrix(1.040764,0,0.05449252,1.040764,-8.670199,2.670594)">
+        <path
+           style="fill:#ffffff;fill-opacity:0.508475"
+           d="m 42.417183,8.5151772 c 0.0051,-0.097113 -0.128161,-0.2469882 -0.235117,-0.2470056 l -13.031401,-0.00212 c 0,0 0.911714,0.5879545 2.201812,0.5962436 l 11.053497,0.07102 c 0.01109,-0.2117278 0.0027,-0.2560322 0.01121,-0.4181395 z"
+           id="path221" />
+      </g>
+      <path
+         style="color:#000000;display:block;visibility:visible;fill:url(#linearGradient9772);fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="m 39.783532,39.51062 c 1.143894,-0.04406 1.963076,-1.096299 2.047035,-2.321005 0.791787,-11.548687 1.65936,-21.231949 1.65936,-21.231949 0.07215,-0.247484 -0.167911,-0.494967 -0.48014,-0.494967 H 8.6386304 c 0,0 -1.8503191,21.866892 -1.8503191,21.866892 -0.1145551,0.982066 -0.4660075,1.804718 -1.5498358,2.183713 z"
+         id="path233" />
+      <path
+         id="path304"
+         d="m 9.6202444,16.463921 32.7910986,0.06481 -1.574046,20.001979 c -0.08432,1.071511 -0.450678,1.428215 -1.872656,1.428215 -1.871502,0 -28.677968,-0.03241 -31.394742,-0.03241 0.2335983,-0.320811 0.3337557,-0.988623 0.3350963,-1.004612 z"
+         style="opacity:0.465909;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient322);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="path323"
+         d="M 9.6202481,16.223182 8.4536014,31.866453 c 0,0 8.2961546,-4.148078 18.6663476,-4.148078 10.370193,0 15.55529,-11.495193 15.55529,-11.495193 z"
+         style="fill:#ffffff;fill-opacity:0.0892857;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/files/wizard/icons/preferences-desktop-locale.svg b/files/wizard/icons/preferences-desktop-locale.svg
new file mode 100644
index 0000000000..51098cfa13
--- /dev/null
+++ b/files/wizard/icons/preferences-desktop-locale.svg
@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="48"
+   height="48"
+   id="svg11300"
+   version="1.1"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <title
+     id="title148">Locale Preferences Icon</title>
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient2913">
+      <stop
+         style="stop-color:white;stop-opacity:0.43877551;"
+         offset="0"
+         id="stop2915" />
+      <stop
+         id="stop2921"
+         offset="0.5"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop2917" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2877">
+      <stop
+         style="stop-color:#75507b;stop-opacity:1;"
+         offset="0"
+         id="stop2879" />
+      <stop
+         id="stop2885"
+         offset="0.25709054"
+         style="stop-color:#a984af;stop-opacity:1;" />
+      <stop
+         style="stop-color:#513755;stop-opacity:1;"
+         offset="0.5655992"
+         id="stop2887" />
+      <stop
+         style="stop-color:#875c8e;stop-opacity:1;"
+         offset="1"
+         id="stop2881" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2865">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2867" />
+      <stop
+         id="stop2873"
+         offset="0.25568181"
+         style="stop-color:#9ced4b;stop-opacity:1;" />
+      <stop
+         style="stop-color:#64b813;stop-opacity:1;"
+         offset="0.59400827"
+         id="stop2875" />
+      <stop
+         style="stop-color:#8eea34;stop-opacity:1;"
+         offset="1"
+         id="stop2869" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient5060"
+       id="radialGradient6719"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       id="linearGradient5060">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop5062" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5064" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient5060"
+       id="radialGradient6717"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5050" />
+      <stop
+         id="stop5056"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5052" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient5048"
+       id="linearGradient6715"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <linearGradient
+       xlink:href="#linearGradient5048"
+       id="linearGradient6761"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <radialGradient
+       xlink:href="#linearGradient5060"
+       id="radialGradient6763"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <radialGradient
+       xlink:href="#linearGradient5060"
+       id="radialGradient6765"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       xlink:href="#linearGradient2865"
+       id="linearGradient2871"
+       x1="10.029842"
+       y1="28.695923"
+       x2="46.026699"
+       y2="28.695923"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0154047,0,0,0.97776882,-0.164004,0.32227608)" />
+    <linearGradient
+       xlink:href="#linearGradient2877"
+       id="linearGradient2883"
+       x1="3.1234348"
+       y1="17.789515"
+       x2="39.120289"
+       y2="17.789515"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0154047,0,0,0.97776881,-0.05761325,0.0798138)" />
+    <linearGradient
+       xlink:href="#linearGradient2913"
+       id="linearGradient2919"
+       x1="10.964451"
+       y1="28.712873"
+       x2="36.336609"
+       y2="27.445059"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#linearGradient2913"
+       id="linearGradient3205"
+       gradientUnits="userSpaceOnUse"
+       x1="4.1213179"
+       y1="24.253414"
+       x2="33.066338"
+       y2="25.661276" />
+  </defs>
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner, Daniel S. Fowler</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>https://tekeye.uk/free_resources/tango_desktop_project/index</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:title>Locale Preferences Icon</dc:title>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>locale</rdf:li>
+            <rdf:li>settings</rdf:li>
+            <rdf:li>preferences</rdf:li>
+            <rdf:li>location</rdf:li>
+            <rdf:li>flag</rdf:li>
+            <rdf:li>computer</rdf:li>
+            <rdf:li>icon</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:date> 2021-01-02</dc:date>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Public Domain</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>https://tekeye.uk/</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:identifier>https://tekeye.uk/free_resources/tango_desktop_project/images/svg/apps/preferences-desktop-locale.svg</dc:identifier>
+        <dc:relation>https://tekeye.uk/free_resources/tango_desktop_project/images/svg/apps/preferences-desktop-screensaver.svg</dc:relation>
+        <dc:language>en-GB</dc:language>
+        <dc:coverage>computing</dc:coverage>
+        <dc:description>An icon for locale settings.</dc:description>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     transform="matrix(0.17322834,0,0,0.18209601,1.8267717,0.63275188)">
+    <g
+       id="g146"
+       transform="matrix(5.3725693,0,0,5.3725694,-6.3889238,-4.0101781)">
+      <g
+         id="g6753"
+         transform="matrix(0.01971468,0,0,0.03343226,38.92492,24.71253)">
+        <rect
+           y="-150.69685"
+           x="-1559.2523"
+           height="478.35718"
+           width="1339.6335"
+           id="rect6755"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402062;fill:url(#linearGradient6761);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+        <path
+           id="path6757"
+           d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402062;fill:url(#radialGradient6763);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402062;fill:url(#radialGradient6765);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z"
+           id="path6759" />
+      </g>
+      <g
+         transform="matrix(0.01971468,0,0,0.03343226,46.17276,35.14236)"
+         id="g6707">
+        <rect
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402062;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           id="rect6709"
+           width="1339.6335"
+           height="478.35718"
+           x="-1559.2523"
+           y="-150.69685" />
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402062;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z"
+           id="path6711" />
+        <path
+           id="path6713"
+           d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402062;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      </g>
+      <path
+         style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#linearGradient2883);fill-opacity:1;fill-rule:evenodd;stroke:#5c3566;stroke-width:0.996406;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="m 3.6216391,6.1344628 c 9.3237929,-6.39532928 26.0362549,1.9013142 35.5359699,0 V 30.6787 c -9.147873,2.938395 -24.980731,-6.222482 -35.5359699,0 z"
+         id="rect15576" />
+      <path
+         id="path16462"
+         d="m 4.6213179,6.8032613 c 7.9771481,-5.728237 23.8335951,1.944544 33.0355491,0.5 l -0.125,23.2897917 c -6.814844,2.192704 -22.737708,-5.704436 -32.8480491,-1.125 z"
+         style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.629213;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3205);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <path
+         id="path16504"
+         d="m 10.528047,17.040871 c 9.323793,-6.395329 26.036255,1.901314 35.53597,0 v 24.544238 c -9.147873,2.938394 -24.980731,-6.222483 -35.53597,0 z"
+         style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#linearGradient2871);fill-opacity:1;fill-rule:evenodd;stroke:#4e9a06;stroke-width:0.996406;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <path
+         style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.629213;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2919);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="m 11.464451,17.654135 c 7.977148,-5.728237 23.833595,1.944544 33.035549,0.5 l -0.125,23.37818 c -6.814844,2.192704 -22.737708,-5.704436 -32.848049,-1.125 z"
+         id="path16506" />
+    </g>
+  </g>
+</svg>
diff --git a/files/wizard/icons/system-installer.svg b/files/wizard/icons/system-installer.svg
new file mode 100644
index 0000000000..7d95eea080
--- /dev/null
+++ b/files/wizard/icons/system-installer.svg
@@ -0,0 +1,456 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="48"
+   height="48"
+   id="svg14603"
+   version="1.1"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <title
+     id="title103">System Installer Icon</title>
+  <defs
+     id="defs3">
+    <radialGradient
+       xlink:href="#linearGradient5060"
+       id="radialGradient5031"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       id="linearGradient5060">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop5062" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5064" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient5060"
+       id="radialGradient5029"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5050" />
+      <stop
+         id="stop5056"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5052" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient5048"
+       id="linearGradient5027"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <linearGradient
+       id="linearGradient7844">
+      <stop
+         id="stop7846"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop7848"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7834">
+      <stop
+         id="stop7836"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop7838"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7670">
+      <stop
+         id="stop7672"
+         offset="0"
+         style="stop-color:#dfdfdf;stop-opacity:1;" />
+      <stop
+         id="stop7674"
+         offset="1.0000000"
+         style="stop-color:#c0c0c0;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(1.008511,0,0,1,-47.59576,-0.285714)"
+       gradientUnits="userSpaceOnUse"
+       y2="40.857143"
+       x2="72.85714"
+       y1="9.7142859"
+       x1="64.571426"
+       id="linearGradient7676"
+       xlink:href="#linearGradient7670" />
+    <linearGradient
+       gradientTransform="translate(-2)"
+       gradientUnits="userSpaceOnUse"
+       y2="0.50379461"
+       x2="19.323767"
+       y1="11.312428"
+       x1="19.362535"
+       id="linearGradient7840"
+       xlink:href="#linearGradient7834" />
+    <linearGradient
+       id="aigrd1"
+       gradientUnits="userSpaceOnUse"
+       x1="14.9966"
+       y1="11.1885"
+       x2="32.511002"
+       y2="34.307499">
+      <stop
+         offset="0"
+         style="stop-color:#EBEBEB"
+         id="stop3034" />
+      <stop
+         offset="0.5"
+         style="stop-color:#FFFFFF"
+         id="stop3036" />
+      <stop
+         offset="1"
+         style="stop-color:#EBEBEB"
+         id="stop3038" />
+    </linearGradient>
+    <linearGradient
+       id="aigrd2"
+       gradientUnits="userSpaceOnUse"
+       x1="12.2744"
+       y1="32.4165"
+       x2="35.391201"
+       y2="14.2033">
+      <stop
+         offset="0"
+         style="stop-color:#FBFBFB"
+         id="stop3043" />
+      <stop
+         offset="0.5"
+         style="stop-color:#B6B6B6"
+         id="stop3045" />
+      <stop
+         offset="1"
+         style="stop-color:#E4E4E4"
+         id="stop3047" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4236">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.32673267;"
+         offset="0.0000000"
+         id="stop4238" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.60396039;"
+         offset="1.0000000"
+         id="stop4240" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6028">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop6030" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop6032" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6036">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop6038" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop6040" />
+    </linearGradient>
+    <linearGradient
+       y2="14.2033"
+       x2="35.391201"
+       y1="32.4165"
+       x1="12.2744"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3394">
+      <stop
+         id="stop3396"
+         style="stop-color:#fff307;stop-opacity:1.0000000;"
+         offset="0.0000000" />
+      <stop
+         id="stop3398"
+         style="stop-color:#166eff;stop-opacity:1.0000000;"
+         offset="0.50000000" />
+      <stop
+         id="stop3400"
+         style="stop-color:#ffffff;stop-opacity:0.0000000;"
+         offset="1.0000000" />
+    </linearGradient>
+    <radialGradient
+       r="22.728432"
+       fy="37.595428"
+       fx="24.546707"
+       cy="37.595428"
+       cx="24.546707"
+       gradientTransform="matrix(1,0,0,0.333333,0,25.06362)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10566"
+       xlink:href="#linearGradient7844" />
+    <linearGradient
+       y2="34.307499"
+       x2="32.511002"
+       y1="11.1885"
+       x1="14.9966"
+       gradientTransform="matrix(0.683145,0,0,0.683145,18.55581,18.12886)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient10568"
+       xlink:href="#aigrd1" />
+    <linearGradient
+       y2="14.2033"
+       x2="35.391201"
+       y1="32.4165"
+       x1="12.2744"
+       gradientTransform="matrix(0.705308,0,0,0.705308,18.02392,17.61692)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient10570"
+       xlink:href="#aigrd2" />
+    <linearGradient
+       y2="28"
+       x2="29"
+       y1="14.625"
+       x1="21.125"
+       gradientTransform="matrix(0.717302,0,0,0.717302,17.73603,18.06909)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient10572"
+       xlink:href="#linearGradient4236" />
+    <linearGradient
+       y2="28"
+       x2="29"
+       y1="14.625"
+       x1="21.125"
+       gradientTransform="matrix(0.717302,0,0,0.717302,17.73603,18.06909)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient10574"
+       xlink:href="#linearGradient4236" />
+    <linearGradient
+       y2="54.698483"
+       x2="48.798885"
+       y1="3.6100161"
+       x1="10.50172"
+       gradientTransform="matrix(0.573842,0,0,0.573842,20.97995,19.56347)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient10576"
+       xlink:href="#linearGradient6036" />
+    <linearGradient
+       y2="18.366575"
+       x2="17.742729"
+       y1="31.494707"
+       x1="28.702885"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient10578"
+       xlink:href="#linearGradient6028" />
+    <radialGradient
+       r="21.333334"
+       fy="27.569166"
+       fx="37.751469"
+       cy="27.569166"
+       cx="37.751469"
+       gradientTransform="matrix(0.441746,0.498655,-0.407098,0.360624,32.00755,10.21308)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10580"
+       xlink:href="#linearGradient3394" />
+  </defs>
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>System Installer Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner, Daniel S. Fowler</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>https://tekeye.uk/free_resources/tango_desktop_project/index</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:date> 2021-01-02</dc:date>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Public Domain</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>https://tekeye.uk/</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:identifier>https://tekeye.uk/free_resources/tango_desktop_project/images/svg/apps/system-installer.svg</dc:identifier>
+        <dc:relation>https://tekeye.uk/free_resources/tango_desktop_project/images/svg/apps/preferences-desktop-screensaver.svg</dc:relation>
+        <dc:language>en-GB</dc:language>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>install</rdf:li>
+            <rdf:li>setup</rdf:li>
+            <rdf:li>packages</rdf:li>
+            <rdf:li>manager</rdf:li>
+            <rdf:li>settings</rdf:li>
+            <rdf:li>preferences</rdf:li>
+            <rdf:li>cd</rdf:li>
+            <rdf:li>dvd</rdf:li>
+            <rdf:li>computer</rdf:li>
+            <rdf:li>icon</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:coverage>computing</dc:coverage>
+        <dc:description>An icon for system setup and installation.</dc:description>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     transform="matrix(0.1653543,0,0,0.16681119,2.8346457,3.4986993)">
+    <g
+       id="g101"
+       transform="matrix(5.9766957,0,0,5.9767047,-14.855812,-21.310431)">
+      <path
+         id="path7822"
+         d="M 7.0663522,9.8326324 11.142857,5.5714286 h 23.571429 l 4.320377,4.3622191 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#6b6c69;fill-opacity:1;fill-rule:evenodd;stroke:#606060;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <g
+         id="g5022"
+         transform="matrix(0.0201828,0,0,0.02086758,41.09416,37.29644)">
+        <rect
+           y="-150.69685"
+           x="-1559.2523"
+           height="478.35718"
+           width="1339.6335"
+           id="rect4173"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402062;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+        <path
+           id="path5058"
+           d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402062;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402062;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z"
+           id="path5018" />
+      </g>
+      <rect
+         ry="1.4285715"
+         rx="1.4285721"
+         y="9.4285717"
+         x="6.5756874"
+         height="31.142857"
+         width="32.848644"
+         id="rect6910"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient7676);fill-opacity:1;fill-rule:evenodd;stroke:#606060;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <path
+         id="rect7826"
+         d="m 38.857143,22.756128 v 16.428573 c 0,0.474857 -0.363132,0.857143 -0.814198,0.857143 H 15.874474 l 0.04939,-17.285716 c 0,0 22.93328,0 22.933279,0 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#a40000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <path
+         id="path7824"
+         d="m 15.379549,11.285714 v 28"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#606060;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f0f0f0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="M 38.857143,22.613273 V 11.470414 c 0,-0.474857 -0.363132,-0.857143 -0.814198,-0.857143 H 15.874474 l 0.04939,12.000002 c 0,0 22.93328,0 22.933279,0 z"
+         id="path10582" />
+      <path
+         id="rect7829"
+         d="m 11.512932,6.5274685 c 0,0 22.772115,0 22.772115,0 0,0 4.256999,4.2569985 4.256999,4.2569985 v 28.431057 c 0,0.287766 -0.231668,0.519434 -0.519434,0.519434 H 7.9773979 c -0.2877664,0 -0.519434,-0.231668 -0.519434,-0.519434 V 10.784467 c 0,0 4.0549681,-4.2569985 4.0549681,-4.2569985 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.625668;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient7840);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <g
+         transform="translate(-0.999997,-0.285714)"
+         id="g10554">
+        <ellipse
+           transform="matrix(0.55024,0,0,0.55024,19.89726,20.62321)"
+           id="path10170"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.625668;fill:url(#radialGradient10566);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:11;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           cx="24.546707"
+           cy="37.595428"
+           rx="22.728432"
+           ry="7.5761442" />
+        <g
+           id="g10156"
+           transform="translate(-1.642857,-2.642857)">
+          <path
+             style="fill:url(#linearGradient10568);fill-rule:nonzero;stroke:none;stroke-miterlimit:4"
+             d="m 34.951289,21.954475 c -6.626509,0 -11.955042,5.328533 -11.955042,11.955042 0,6.626509 5.328533,11.955042 11.955042,11.955042 6.62651,0 11.955043,-5.328533 11.955043,-11.955042 0,-6.626509 -5.328533,-11.955042 -11.955043,-11.955042 z m 0,14.824252 c -1.571234,0 -2.86921,-1.297976 -2.86921,-2.86921 0,-1.571234 1.297976,-2.86921 2.86921,-2.86921 1.571234,0 2.86921,1.297976 2.86921,2.86921 0,1.571234 -1.297976,2.86921 -2.86921,2.86921 z"
+             id="path3040" />
+          <path
+             style="fill:url(#linearGradient10570);fill-rule:nonzero;stroke:#808080;stroke-miterlimit:4;stroke-opacity:1"
+             d="m 34.951305,21.566644 c -6.841486,0 -12.342888,5.501401 -12.342888,12.342888 0,6.841486 5.501402,12.342887 12.342888,12.342887 6.841487,0 12.342888,-5.501401 12.342888,-12.342887 0,-6.841487 -5.501401,-12.342888 -12.342888,-12.342888 z m 0,15.30518 c -1.622208,0 -2.962293,-1.340084 -2.962293,-2.962292 0,-1.622208 1.340085,-2.962293 2.962293,-2.962293 1.622208,0 2.962293,1.340085 2.962293,2.962293 0,1.622208 -1.340085,2.962292 -2.962293,2.962292 z"
+             id="path3049" />
+          <path
+             style="opacity:0.11;fill-rule:nonzero;stroke:none;stroke-miterlimit:4"
+             d="m 34.951289,28.111323 c -3.237952,0 -5.798194,2.635543 -5.798194,5.798194 0,3.237954 2.635543,5.798195 5.798194,5.798195 3.237953,0 5.798195,-2.635543 5.798195,-5.798195 0,-3.237953 -2.635544,-5.798194 -5.798195,-5.798194 z m 0,8.960846 c -1.731928,0 -3.162651,-1.430723 -3.162651,-3.162652 0,-1.731928 1.430723,-3.162651 3.162651,-3.162651 1.731928,0 3.162651,1.430723 3.162651,3.162651 0,1.731929 -1.430723,3.162652 -3.162651,3.162652 z"
+             id="path3051" />
+          <path
+             id="path3916"
+             d="m 38.150519,22.816711 -2.063876,8.030725 c 0.645402,0.171876 1.161538,0.571243 1.512147,1.123894 l 7.111176,-4.332097 c -1.454832,-2.369804 -3.789773,-4.113338 -6.559447,-4.822522 z"
+             style="fill:url(#linearGradient10572);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-miterlimit:4;stroke-opacity:1" />
+          <path
+             style="fill:url(#linearGradient10574);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-miterlimit:4;stroke-opacity:1"
+             d="m 30.911911,44.678269 2.717288,-7.833804 c -0.629082,-0.224368 -1.110628,-0.664826 -1.414602,-1.244438 l -7.44334,3.73264 c 1.255025,2.481415 3.438679,4.411057 6.140654,5.345602 z"
+             id="path4214" />
+          <path
+             id="path5264"
+             d="m 34.951287,22.548803 c -6.29708,0 -11.360712,5.063632 -11.360712,11.360712 0,6.297081 5.063632,11.360712 11.360712,11.360712 6.297081,0 11.360712,-5.063631 11.360712,-11.360712 0,-6.29708 -5.063631,-11.360712 -11.360712,-11.360712 z"
+             style="opacity:0.546448;fill:none;fill-rule:nonzero;stroke:url(#linearGradient10576);stroke-miterlimit:4;stroke-opacity:1" />
+          <circle
+             transform="matrix(0.573842,0,0,0.573842,21.03068,19.61419)"
+             id="path6026"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.672131;fill:none;fill-opacity:0.316384;fill-rule:nonzero;stroke:url(#linearGradient10578);stroke-width:1.62159;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+             cx="24.306795"
+             cy="24.930641"
+             r="6.0987959" />
+          <path
+             id="path3390"
+             d="m 34.951289,23.065643 c -6.010605,0 -10.843874,4.833269 -10.843874,10.843874 0,6.010605 4.833269,10.843874 10.843874,10.843874 6.010606,0 10.843875,-4.833269 10.843875,-10.843874 0,-6.010605 -4.833269,-10.843874 -10.843875,-10.843874 z m 0,13.446404 c -1.425195,0 -2.60253,-1.177335 -2.60253,-2.60253 0,-1.425195 1.177335,-2.60253 2.60253,-2.60253 1.425195,0 2.60253,1.177335 2.60253,2.60253 0,1.425195 -1.177335,2.60253 -2.60253,2.60253 z"
+             style="opacity:0.114286;fill:url(#radialGradient10580);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-miterlimit:4;stroke-opacity:1" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/files/wizard/icons/tango/48x48/dollar.png b/files/wizard/icons/tango/48x48/dollar.png
deleted file mode 100644
index a14ba2505d..0000000000
Binary files a/files/wizard/icons/tango/48x48/dollar.png and /dev/null differ
diff --git a/files/wizard/icons/tango/48x48/folder.png b/files/wizard/icons/tango/48x48/folder.png
deleted file mode 100644
index e93d7cf8f8..0000000000
Binary files a/files/wizard/icons/tango/48x48/folder.png and /dev/null differ
diff --git a/files/wizard/icons/tango/48x48/preferences-desktop-locale.png b/files/wizard/icons/tango/48x48/preferences-desktop-locale.png
deleted file mode 100644
index f56497bd23..0000000000
Binary files a/files/wizard/icons/tango/48x48/preferences-desktop-locale.png and /dev/null differ
diff --git a/files/wizard/icons/tango/48x48/system-installer.png b/files/wizard/icons/tango/48x48/system-installer.png
deleted file mode 100644
index dbd08f7e2f..0000000000
Binary files a/files/wizard/icons/tango/48x48/system-installer.png and /dev/null differ
diff --git a/files/wizard/icons/tango/index.theme b/files/wizard/icons/tango/index.theme
deleted file mode 100644
index 3ffebebc9a..0000000000
--- a/files/wizard/icons/tango/index.theme
+++ /dev/null
@@ -1,8 +0,0 @@
-[Icon Theme]
-Name=Tango
-Comment=Tango Theme
-Inherits=default
-Directories=48x48
-
-[48x48]
-Size=48
\ No newline at end of file
diff --git a/files/wizard/wizard.qrc b/files/wizard/wizard.qrc
index 7dbb8fe080..6f7bf69eb0 100644
--- a/files/wizard/wizard.qrc
+++ b/files/wizard/wizard.qrc
@@ -1,10 +1,9 @@
 <RCC>
-  <qresource prefix="icons/tango">
-    <file alias="48x48/preferences-desktop-locale.png">icons/tango/48x48/preferences-desktop-locale.png</file>
-    <file alias="index.theme">icons/tango/index.theme</file>
-    <file alias="48x48/folder.png">icons/tango/48x48/folder.png</file>
-    <file alias="48x48/system-installer.png">icons/tango/48x48/system-installer.png</file>
-    <file alias="48x48/dollar.png">icons/tango/48x48/dollar.png</file>
+  <qresource prefix="">
+    <file alias="preferences-desktop-locale">icons/preferences-desktop-locale.svg</file>
+    <file alias="folder">icons/folder.svg</file>
+    <file alias="system-installer">icons/system-installer.svg</file>
+    <file alias="dollar">icons/dollar.svg</file>
   </qresource>
   <qresource prefix="images">
     <file alias="intropage-background.png">images/intropage-background.png</file>    
diff --git a/scripts/osg_stats.py b/scripts/osg_stats.py
index 20fae2cac8..81739c1b57 100755
--- a/scripts/osg_stats.py
+++ b/scripts/osg_stats.py
@@ -159,13 +159,7 @@ def collect_per_frame(sources, keys, begin_frame, end_frame, frame_number_name):
                     if key in frame:
                         result[name][key][index] = frame[key]
         for key in keys:
-            prev = 0.0
             values = result[name][key][:max_index + 1]
-            for i in range(len(values)):
-                if values[i] is not None:
-                    prev = values[i]
-                else:
-                    values[i] = prev
             result[name][key] = numpy.array(values)
     return result, begin_frame, end_frame
 
@@ -187,7 +181,7 @@ def draw_timeseries(sources, keys, add_sum, begin_frame, end_frame):
             y = frames[key]
             ax.plot(x[:len(y)], y, label=f'{key}:{name}')
         if add_sum:
-            y = numpy.sum(list(frames[k] for k in keys), axis=0)
+            y = sum_arrays_with_none([frames[k] for k in keys])
             ax.plot(x[:len(y)], y, label=f'sum:{name}', linestyle='--')
     ax.grid(True)
     ax.legend()
@@ -199,10 +193,10 @@ def draw_cumulative_timeseries(sources, keys, add_sum, begin_frame, end_frame):
     x = numpy.array(range(begin_frame, end_frame))
     for name, frames in sources.items():
         for key in keys:
-            y = numpy.cumsum(frames[key])
+            y = cumsum_with_none(frames[key])
             ax.plot(x[:len(y)], y, label=f'{key}:{name}')
         if add_sum:
-            y = numpy.cumsum(numpy.sum(list(frames[k] for k in keys), axis=0))
+            y = sum_arrays_with_none([cumsum_with_none(frames[k]) for k in keys])
             ax.plot(x[:len(y)], y, label=f'sum:{name}', linestyle='--')
     ax.grid(True)
     ax.legend()
@@ -214,10 +208,10 @@ def draw_timeseries_delta(sources, keys, add_sum, begin_frame, end_frame):
     x = numpy.array(range(begin_frame + 1, end_frame))
     for name, frames in sources.items():
         for key in keys:
-            y = numpy.diff(frames[key])
-            ax.plot(x[:len(y)], numpy.diff(frames[key]), label=f'{key}:{name}')
+            y = diff_with_none(frames[key])
+            ax.plot(x[:len(y)], y, label=f'{key}:{name}')
         if add_sum:
-            y = numpy.diff(numpy.sum(list(frames[k] for k in keys), axis=0))
+            y = sum_arrays_with_none([diff_with_none(frames[k]) for k in keys])
             ax.plot(x[:len(y)], y, label=f'sum:{name}', linestyle='--')
     ax.grid(True)
     ax.legend()
@@ -367,13 +361,13 @@ def make_stats(source, key, values, precision):
         source=source,
         key=key,
         number=len(values),
-        min=fixed_float(min(values), precision),
-        max=fixed_float(max(values), precision),
-        sum=fixed_float(sum(values), precision),
-        mean=fixed_float(statistics.mean(values), precision),
-        median=fixed_float(statistics.median(values), precision),
-        stdev=fixed_float(statistics.stdev(float(v) for v in values), precision),
-        q95=fixed_float(numpy.quantile(values, 0.95), precision),
+        min=fixed_float(min(values), precision) if values else '-',
+        max=fixed_float(max(values), precision) if values else '-',
+        sum=fixed_float(sum(values), precision) if values else '-',
+        mean=fixed_float(statistics.mean(values), precision) if values else '-',
+        median=fixed_float(statistics.median(values), precision) if values else '-',
+        stdev=fixed_float(statistics.stdev(float(v) for v in values), precision) if values else '-',
+        q95=fixed_float(numpy.quantile(values, 0.95), precision) if values else '-',
     )
 
 
@@ -384,5 +378,49 @@ def to_number(value):
         return float(value)
 
 
+def cumsum_with_none(values):
+    cumsum = None
+    result = list()
+    for v in values:
+        if v is None:
+            result.append(None)
+        elif cumsum is None:
+            cumsum = v
+            result.append(cumsum)
+        else:
+            cumsum += v
+            result.append(cumsum)
+    return numpy.array(result)
+
+
+def diff_with_none(values):
+    if len(values) < 2:
+        return numpy.array([])
+    prev = values[0]
+    result = list()
+    for v in values[1:]:
+        if prev is None:
+            result.append(v)
+            prev = v
+        elif v is None:
+            result.append(v)
+        else:
+            result.append(v - prev)
+            prev = v
+    return numpy.array(result)
+
+
+def sum_arrays_with_none(arrays):
+    size = max(len(v) for v in arrays)
+    result = list()
+    for i in range(size):
+        not_none_values = [v[i] for v in arrays if v[i] is not None]
+        if not_none_values:
+            result.append(sum(not_none_values))
+        else:
+            result.append(None)
+    return numpy.array(result)
+
+
 if __name__ == '__main__':
     main()