diff --git a/apps/openmw/mwgui/debugwindow.cpp b/apps/openmw/mwgui/debugwindow.cpp
index fe2fed02bb..2a9ae25664 100644
--- a/apps/openmw/mwgui/debugwindow.cpp
+++ b/apps/openmw/mwgui/debugwindow.cpp
@@ -104,20 +104,20 @@ namespace MWGui
         // - Shader editor
 
         MyGUI::TabItem* itemLV = mTabControl->addItem("Log Viewer");
-        itemLV->setCaptionWithReplacing(" #{DebugMenu:LogViewer} ");
+        itemLV->setCaptionWithReplacing(" #{OMWEngine:LogViewer} ");
         mLogView
             = itemLV->createWidgetReal<MyGUI::EditBox>("LogEdit", MyGUI::FloatCoord(0, 0, 1, 1), MyGUI::Align::Stretch);
         mLogView->setEditReadOnly(true);
 
         MyGUI::TabItem* itemLuaProfiler = mTabControl->addItem("Lua Profiler");
-        itemLuaProfiler->setCaptionWithReplacing(" #{DebugMenu:LuaProfiler} ");
+        itemLuaProfiler->setCaptionWithReplacing(" #{OMWEngine:LuaProfiler} ");
         mLuaProfiler = itemLuaProfiler->createWidgetReal<MyGUI::EditBox>(
             "LogEdit", MyGUI::FloatCoord(0, 0, 1, 1), MyGUI::Align::Stretch);
         mLuaProfiler->setEditReadOnly(true);
 
 #ifndef BT_NO_PROFILE
         MyGUI::TabItem* item = mTabControl->addItem("Physics Profiler");
-        item->setCaptionWithReplacing(" #{DebugMenu:PhysicsProfiler} ");
+        item->setCaptionWithReplacing(" #{OMWEngine:PhysicsProfiler} ");
         mBulletProfilerEdit
             = item->createWidgetReal<MyGUI::EditBox>("LogEdit", MyGUI::FloatCoord(0, 0, 1, 1), MyGUI::Align::Stretch);
 #else
diff --git a/apps/openmw/mwgui/postprocessorhud.cpp b/apps/openmw/mwgui/postprocessorhud.cpp
index 5f58cb3032..9e05c180ca 100644
--- a/apps/openmw/mwgui/postprocessorhud.cpp
+++ b/apps/openmw/mwgui/postprocessorhud.cpp
@@ -329,26 +329,22 @@ namespace MWGui
             case fx::Technique::Status::Uncompiled:
             {
                 if (technique->getDynamic())
-                    ss << "#{fontcolourhtml=header}#{PostProcessing:ShaderLocked}:      #{fontcolourhtml=normal} "
-                          "#{PostProcessing:ShaderLockedDescription}"
+                    ss << "#{fontcolourhtml=header}#{OMWShaders:ShaderLocked}:      #{fontcolourhtml=normal} "
+                          "#{OMWShaders:ShaderLockedDescription}"
                        << endl
                        << endl;
-                ss << "#{fontcolourhtml=header}#{PostProcessing:Author}:      #{fontcolourhtml=normal} " << author
+                ss << "#{fontcolourhtml=header}#{OMWShaders:Author}:      #{fontcolourhtml=normal} " << author << endl
+                   << endl
+                   << "#{fontcolourhtml=header}#{OMWShaders:Version}:     #{fontcolourhtml=normal} " << version << endl
+                   << endl
+                   << "#{fontcolourhtml=header}#{OMWShaders:Description}: #{fontcolourhtml=normal} " << description
                    << endl
                    << endl
-                   << "#{fontcolourhtml=header}#{PostProcessing:Version}:     #{fontcolourhtml=normal} " << version
-                   << endl
-                   << endl
-                   << "#{fontcolourhtml=header}#{PostProcessing:Description}: #{fontcolourhtml=normal} " << description
-                   << endl
-                   << endl
-                   << "#{fontcolourhtml=header}#{PostProcessing:InInteriors}: #{fontcolourhtml=normal} "
-                   << flag_interior
-                   << "#{fontcolourhtml=header}   #{PostProcessing:InExteriors}: #{fontcolourhtml=normal} "
-                   << flag_exterior
-                   << "#{fontcolourhtml=header}   #{PostProcessing:Underwater}: #{fontcolourhtml=normal} "
+                   << "#{fontcolourhtml=header}#{OMWShaders:InInteriors}: #{fontcolourhtml=normal} " << flag_interior
+                   << "#{fontcolourhtml=header}   #{OMWShaders:InExteriors}: #{fontcolourhtml=normal} " << flag_exterior
+                   << "#{fontcolourhtml=header}   #{OMWShaders:Underwater}: #{fontcolourhtml=normal} "
                    << flag_underwater
-                   << "#{fontcolourhtml=header}   #{PostProcessing:Abovewater}: #{fontcolourhtml=normal} "
+                   << "#{fontcolourhtml=header}   #{OMWShaders:Abovewater}: #{fontcolourhtml=normal} "
                    << flag_abovewater;
                 break;
             }
@@ -370,7 +366,7 @@ namespace MWGui
             {
                 MyGUI::Button* resetButton
                     = mConfigArea->createWidget<MyGUI::Button>("MW_Button", { 0, 0, 0, 24 }, MyGUI::Align::Default);
-                resetButton->setCaptionWithReplacing("#{PostProcessing:ResetShader}");
+                resetButton->setCaptionWithReplacing("#{OMWShaders:ResetShader}");
                 resetButton->setTextAlign(MyGUI::Align::Center);
                 resetButton->eventMouseWheel += MyGUI::newDelegate(this, &PostProcessorHud::notifyMouseWheel);
                 resetButton->eventMouseButtonClick
diff --git a/apps/openmw/mwgui/savegamedialog.cpp b/apps/openmw/mwgui/savegamedialog.cpp
index 462fab75e0..ae5b8d53f2 100644
--- a/apps/openmw/mwgui/savegamedialog.cpp
+++ b/apps/openmw/mwgui/savegamedialog.cpp
@@ -216,7 +216,7 @@ namespace MWGui
 
         mCharacterSelection->setIndexSelected(selectedIndex);
         if (selectedIndex == MyGUI::ITEM_NONE)
-            mCharacterSelection->setCaptionWithReplacing("#{SavegameMenu:SelectCharacter}");
+            mCharacterSelection->setCaptionWithReplacing("#{OMWEngine:SelectCharacter}");
 
         fillSaveList();
     }
@@ -430,7 +430,7 @@ namespace MWGui
         if (Settings::Manager::getBool("timeplayed", "Saves"))
         {
             text << "\n"
-                 << "#{SavegameMenu:TimePlayed}: " << formatTimeplayed(mCurrentSlot->mProfile.mTimePlayed);
+                 << "#{OMWEngine:TimePlayed}: " << formatTimeplayed(mCurrentSlot->mProfile.mTimePlayed);
         }
 
         mInfoText->setCaptionWithReplacing(text.str());
diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index c06eb7ef7e..d7031fffef 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -45,14 +45,14 @@ namespace
     std::string textureMipmappingToStr(const std::string& val)
     {
         if (val == "linear")
-            return "#{SettingsMenu:TextureFilteringTrilinear}";
+            return "#{OMWEngine:TextureFilteringTrilinear}";
         if (val == "nearest")
-            return "#{SettingsMenu:TextureFilteringBilinear}";
+            return "#{OMWEngine:TextureFilteringBilinear}";
         if (val == "none")
-            return "#{SettingsMenu:TextureFilteringDisabled}";
+            return "#{OMWEngine:TextureFilteringDisabled}";
 
         Log(Debug::Warning) << "Warning: Invalid texture mipmap option: " << val;
-        return "#{SettingsMenu:TextureFilteringOther}";
+        return "#{OMWEngine:TextureFilteringOther}";
     }
 
     std::string lightingMethodToStr(SceneUtil::LightingMethod method)
@@ -61,14 +61,14 @@ namespace
         switch (method)
         {
             case SceneUtil::LightingMethod::FFP:
-                result = "#{SettingsMenu:LightingMethodLegacy}";
+                result = "#{OMWEngine:LightingMethodLegacy}";
                 break;
             case SceneUtil::LightingMethod::PerObjectUniform:
-                result = "#{SettingsMenu:LightingMethodShadersCompatibility}";
+                result = "#{OMWEngine:LightingMethodShadersCompatibility}";
                 break;
             case SceneUtil::LightingMethod::SingleUBO:
             default:
-                result = "#{SettingsMenu:LightingMethodShaders}";
+                result = "#{OMWEngine:LightingMethodShaders}";
                 break;
         }
 
@@ -533,7 +533,7 @@ namespace MWGui
         _sender->setCaptionWithReplacing(_sender->getItemNameAt(_sender->getIndexSelected()));
 
         MWBase::Environment::get().getWindowManager()->interactiveMessageBox(
-            "#{SettingsMenu:ChangeRequiresRestart}", { "#{sOK}" }, true);
+            "#{OMWEngine:ChangeRequiresRestart}", { "#{sOK}" }, true);
 
         Settings::Manager::setString("lighting method", "Shaders", *_sender->getItemDataAt<std::string>(pos));
         apply();
@@ -547,7 +547,7 @@ namespace MWGui
         _sender->setCaptionWithReplacing(_sender->getItemNameAt(_sender->getIndexSelected()));
 
         MWBase::Environment::get().getWindowManager()->interactiveMessageBox(
-            "#{SettingsMenu:ChangeRequiresRestart}", { "#{sOK}" }, true);
+            "#{OMWEngine:ChangeRequiresRestart}", { "#{sOK}" }, true);
 
         std::vector<std::string> currentLocales = Settings::Manager::getStringArray("preferred locales", "General");
         if (currentLocales.size() <= langPriority)
@@ -601,7 +601,7 @@ namespace MWGui
     {
         std::vector<std::string> buttons = { "#{sYes}", "#{sNo}" };
         MWBase::Environment::get().getWindowManager()->interactiveMessageBox(
-            "#{SettingsMenu:LightingResetToDefaults}", buttons, true);
+            "#{OMWEngine:LightingResetToDefaults}", buttons, true);
         int selectedButton = MWBase::Environment::get().getWindowManager()->readPressedButton();
         if (selectedButton == 1 || selectedButton == -1)
             return;
diff --git a/apps/openmw/mwinput/bindingsmanager.cpp b/apps/openmw/mwinput/bindingsmanager.cpp
index a010b4e745..9eac57e830 100644
--- a/apps/openmw/mwinput/bindingsmanager.cpp
+++ b/apps/openmw/mwinput/bindingsmanager.cpp
@@ -441,13 +441,13 @@ namespace MWInput
         switch (action)
         {
             case A_Screenshot:
-                return "#{SettingsMenu:Screenshot}";
+                return "#{OMWEngine:Screenshot}";
             case A_ZoomIn:
-                return "#{SettingsMenu:CameraZoomIn}";
+                return "#{OMWEngine:CameraZoomIn}";
             case A_ZoomOut:
-                return "#{SettingsMenu:CameraZoomOut}";
+                return "#{OMWEngine:CameraZoomOut}";
             case A_ToggleHUD:
-                return "#{SettingsMenu:ToggleHUD}";
+                return "#{OMWEngine:ToggleHUD}";
             case A_Use:
                 return "#{sUse}";
             case A_Activate:
@@ -519,7 +519,7 @@ namespace MWInput
             case A_QuickLoad:
                 return "#{sQuickLoadCmd}";
             case A_TogglePostProcessorHUD:
-                return "#{SettingsMenu:TogglePostProcessorHUD}";
+                return "#{OMWEngine:TogglePostProcessorHUD}";
             default:
                 return {}; // not configurable
         }
diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index 7df9d5d59b..ce6df7f1a4 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -276,7 +276,7 @@ namespace DetourNavigator
         const Loading::ScopedLoad load(listener);
         if (listener != nullptr)
         {
-            listener->setLabel("#{Navigation:BuildingNavigationMesh}");
+            listener->setLabel("#{OMWEngine:BuildingNavigationMesh}");
             listener->setProgressRange(maxProgress);
         }
         while (!mDone.wait_for(lock, std::chrono::milliseconds(20), isDone))
diff --git a/docs/source/reference/lua-scripting/api.rst b/docs/source/reference/lua-scripting/api.rst
index e59b926d0f..061f2ce5c7 100644
--- a/docs/source/reference/lua-scripting/api.rst
+++ b/docs/source/reference/lua-scripting/api.rst
@@ -59,7 +59,8 @@ Sources can be found in ``resources/vfs/openmw_aux``. In theory mods can overrid
 
 .. include:: tables/aux_packages.rst
 
-**Interfaces of built-in scripts**
+Interfaces of built-in scripts
+------------------------------
 
 .. list-table::
   :widths: 20 20 60
diff --git a/docs/source/reference/lua-scripting/overview.rst b/docs/source/reference/lua-scripting/overview.rst
index 47008428ab..f09b56a47c 100644
--- a/docs/source/reference/lua-scripting/overview.rst
+++ b/docs/source/reference/lua-scripting/overview.rst
@@ -85,7 +85,7 @@ Let's write a simple example of a `Player script`:
 
 .. code-block:: Lua
 
-    -- Save to my_lua_mod/example/player.lua
+    -- Save to my_lua_mod/scripts/example/player.lua
 
     local ui = require('openmw.ui')
 
@@ -107,7 +107,7 @@ The options are:
 1. Create text file "my_lua_mod.omwscripts" with the following line:
 ::
 
-    PLAYER: example/player.lua
+    PLAYER: scripts/example/player.lua
 
 2. (not implemented yet) Add the script in OpenMW CS on "Lua scripts" view and save as "my_lua_mod.omwaddon".
 
@@ -122,6 +122,19 @@ Enable it in ``openmw.cfg`` the same way as any other mod:
 Now every time the player presses "X" on a keyboard, a message is shown.
 
 
+Lua scripts naming policy
+=========================
+
+Technically scripts can be placed anywhere in the virtual file system, but we recommend to follow the naming policy and choose one of:
+
+- ``scripts/<ModName>/<ScriptName>.lua``: general case.
+- ``scripts/<AuthorName>/<ModName>/<ScriptName>.lua``: if "ModName" is short and can potentially collide with other mods.
+- ``scripts/<ModName>.lua``: if it is a simple mod that consists from a single script, the script can placed to ``scripts/`` without subdirs.
+
+``scripts/omw/`` is reserved for built-in scripts, don't use it in mods. Overriding built-in scripts is not recommended, prefer to adjust their behaviour via :ref:`Interfaces of built-in scripts` instead.
+
+See also naming policy of :ref:`Localisation Files`.
+
 Format of ``.omwscripts``
 =========================
 
@@ -129,20 +142,20 @@ Format of ``.omwscripts``
 
     # Lines starting with '#' are comments
 
-    GLOBAL: my_mod/some_global_script.lua
+    GLOBAL: scripts/my_mod/some_global_script.lua
 
     # Script that will be automatically attached to the player
-    PLAYER: my_mod/player.lua
+    PLAYER: scripts/my_mod/player.lua
 
     # Local script that will be automatically attached to every NPC and every creature in the game
-    NPC, CREATURE: my_mod/some_other_script.lua
+    NPC, CREATURE: scripts/my_mod/some_other_script.lua
 
     # Local script that can be attached to any object by a global script
-    CUSTOM: my_mod/something.lua
+    CUSTOM: scripts/my_mod/something.lua
 
     # Local script that will be automatically attached to any Container AND can be
     # attached to any other object by a global script.
-    CONTAINER, CUSTOM: my_mod/container.lua
+    CONTAINER, CUSTOM: scripts/my_mod/container.lua
 
 Each script is described by one line:
 ``<flags>: <path to .lua file in virtual file system>``.
diff --git a/docs/source/reference/modding/localisation.rst b/docs/source/reference/modding/localisation.rst
index bc66053d58..457d2a6c27 100644
--- a/docs/source/reference/modding/localisation.rst
+++ b/docs/source/reference/modding/localisation.rst
@@ -31,11 +31,26 @@ E.g. if you include ``en_US.yaml`` and ``en_GB.yaml`` localisation files, you sh
 Note that because of the fallbacks only messages which differ between variants need to be included in the country-specific localisation files.
 
 Localisation Files
---------------------------
+------------------
 
 Localisation files (containing the message names and translations) should be stored in the
 VFS as files of the form ``l10n/<ContextName>/<Locale>.yaml``.
 
+**Naming policy**
+
+"ContextName" should be in line with :ref:`Lua scripts naming policy`:
+
+- L10n files for ``scripts/<ModName>/<ScriptName>.lua`` should be placed to ``l10n/<ModName>/<Locale>.yaml``.
+- L10n files for ``scripts/<AuthorName>/<ModName>/<ScriptName>.lua`` should be placed to ``l10n/<AuthorName><ModName>/<Locale>.yaml``.
+
+In most cases one mod should have only one l10n context. Don't create a new context for each single message. Really big mods with hundreds and thousands of messages can have several l10n contexts. In this case all context names should start with the name of the mod. I.e. ``<ContextName> = <ModName><Subcontext>`` (or ``<AuthorName><ModName><Subcontext>``).
+
+L10n contexts with prefix "OMW" are reserved for the OpenMW itself (in particular for built-in scripts ``scripts/omw/``) and shouldn't be used in mods.
+
+Built-in l10n contexts "Interface" and "Calendar" don't have the "OMW" prefix because these messages are more generic and can be reused in mods.
+
+**Format**
+
 Messages contents have the form of ICU MessageFormat strings.
 See `the Formatting Messages chapter of the ICU Guide <https://unicode-org.github.io/icu/userguide/format_parse/messages/>`_
 for a guide to MessageFormat, and see
diff --git a/files/data/CMakeLists.txt b/files/data/CMakeLists.txt
index d3e052b3fc..d95e2297dc 100644
--- a/files/data/CMakeLists.txt
+++ b/files/data/CMakeLists.txt
@@ -20,31 +20,21 @@ set(BUILTIN_DATA_FILES
     fonts/MysticCards.omwfont
     fonts/MysticCardsFontLicense.txt
 
-    l10n/BuiltInShaders/de.yaml
-    l10n/BuiltInShaders/en.yaml
-    l10n/BuiltInShaders/ru.yaml
-    l10n/BuiltInShaders/sv.yaml
-    l10n/BuiltInShaders/fr.yaml
+    # Month names and date formatting
     l10n/Calendar/de.yaml
     l10n/Calendar/en.yaml
     l10n/Calendar/ru.yaml
     l10n/Calendar/sv.yaml
     l10n/Calendar/fr.yaml
-    l10n/DebugMenu/de.yaml
-    l10n/DebugMenu/en.yaml
-    l10n/DebugMenu/ru.yaml
-    l10n/DebugMenu/sv.yaml
-    l10n/DebugMenu/fr.yaml
+
+    # Generic UI messages that can be reused by mods
     l10n/Interface/de.yaml
     l10n/Interface/en.yaml
     l10n/Interface/ru.yaml
     l10n/Interface/sv.yaml
     l10n/Interface/fr.yaml
-    l10n/Navigation/de.yaml
-    l10n/Navigation/en.yaml
-    l10n/Navigation/ru.yaml
-    l10n/Navigation/sv.yaml
-    l10n/Navigation/fr.yaml
+
+    # L10n for scripts/omw
     l10n/OMWCamera/de.yaml
     l10n/OMWCamera/en.yaml
     l10n/OMWCamera/ru.yaml
@@ -53,21 +43,20 @@ set(BUILTIN_DATA_FILES
     l10n/OMWControls/en.yaml
     l10n/OMWControls/ru.yaml
     l10n/OMWControls/sv.yaml
-    l10n/PostProcessing/de.yaml
-    l10n/PostProcessing/en.yaml
-    l10n/PostProcessing/ru.yaml
-    l10n/PostProcessing/sv.yaml
-    l10n/PostProcessing/fr.yaml
-    l10n/SavegameMenu/de.yaml
-    l10n/SavegameMenu/en.yaml
-    l10n/SavegameMenu/ru.yaml
-    l10n/SavegameMenu/sv.yaml
-    l10n/SavegameMenu/fr.yaml
-    l10n/SettingsMenu/de.yaml
-    l10n/SettingsMenu/en.yaml
-    l10n/SettingsMenu/ru.yaml
-    l10n/SettingsMenu/sv.yaml
-    l10n/SettingsMenu/fr.yaml
+
+    # L10n for OpenMW menus and non-game-specific messages
+    l10n/OMWEngine/de.yaml
+    l10n/OMWEngine/en.yaml
+    l10n/OMWEngine/ru.yaml
+    l10n/OMWEngine/sv.yaml
+    l10n/OMWEngine/fr.yaml
+    
+    # L10n for post-processing HUD and built-in shaders
+    l10n/OMWShaders/de.yaml
+    l10n/OMWShaders/en.yaml
+    l10n/OMWShaders/ru.yaml
+    l10n/OMWShaders/sv.yaml
+    l10n/OMWShaders/fr.yaml
 
     openmw_aux/util.lua
     openmw_aux/time.lua
diff --git a/files/data/l10n/BuiltInShaders/de.yaml b/files/data/l10n/BuiltInShaders/de.yaml
deleted file mode 100644
index 5886356782..0000000000
--- a/files/data/l10n/BuiltInShaders/de.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-DisplayDepthName: "Visualisiert den Tiefenpuffer."
-DisplayDepthFactorDescription: "Bestimmt die Korrelation zwischen dem Pixeltiefenwert und seiner Ausgabefarbe. Hohe Werte führen zu einem helleren Bild."
-DisplayDepthFactorName: "Farbfaktor"
-ContrastLevelDescription: "Kontraststufe"
-ContrastLevelName: "Kontrast"
-GammaLevelDescription: "Gamma-Level"
-GammaLevelName: "Gamma"
\ No newline at end of file
diff --git a/files/data/l10n/DebugMenu/de.yaml b/files/data/l10n/DebugMenu/de.yaml
deleted file mode 100644
index 2ff4abd89f..0000000000
--- a/files/data/l10n/DebugMenu/de.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-DebugWindow: "Debug"
-LogViewer: "Protokollansicht"
-LuaProfiler: "Lua-Profiler"
-PhysicsProfiler: "Physik-Profiler"
diff --git a/files/data/l10n/DebugMenu/en.yaml b/files/data/l10n/DebugMenu/en.yaml
deleted file mode 100644
index 6f76d147c6..0000000000
--- a/files/data/l10n/DebugMenu/en.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-DebugWindow: "Debug"
-LogViewer: "Log Viewer"
-LuaProfiler: "Lua Profiler"
-PhysicsProfiler: "Physics Profiler"
diff --git a/files/data/l10n/DebugMenu/fr.yaml b/files/data/l10n/DebugMenu/fr.yaml
deleted file mode 100644
index 8b6716e5c6..0000000000
--- a/files/data/l10n/DebugMenu/fr.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-DebugWindow: "Fenêtre de débogage"
-LogViewer: "Journal"
-PhysicsProfiler: "Profileur des performances de la physique"
diff --git a/files/data/l10n/DebugMenu/ru.yaml b/files/data/l10n/DebugMenu/ru.yaml
deleted file mode 100644
index 0cd7131705..0000000000
--- a/files/data/l10n/DebugMenu/ru.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-DebugWindow: "Меню отладки"
-LogViewer: "Журнал логов"
-LuaProfiler: "Профилировщик Луа"
-PhysicsProfiler: "Профилировщик физики"
diff --git a/files/data/l10n/DebugMenu/sv.yaml b/files/data/l10n/DebugMenu/sv.yaml
deleted file mode 100644
index 07807782de..0000000000
--- a/files/data/l10n/DebugMenu/sv.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-DebugWindow: "Felsökning"
-LogViewer: "Loggvisare"
-PhysicsProfiler: "Fysikprofilerare"
diff --git a/files/data/l10n/Navigation/de.yaml b/files/data/l10n/Navigation/de.yaml
deleted file mode 100644
index c63a9aeb25..0000000000
--- a/files/data/l10n/Navigation/de.yaml
+++ /dev/null
@@ -1 +0,0 @@
-BuildingNavigationMesh: "Baue Navigationsgitter"
diff --git a/files/data/l10n/Navigation/en.yaml b/files/data/l10n/Navigation/en.yaml
deleted file mode 100644
index 06fb8c26ba..0000000000
--- a/files/data/l10n/Navigation/en.yaml
+++ /dev/null
@@ -1 +0,0 @@
-BuildingNavigationMesh: "Building navigation mesh"
diff --git a/files/data/l10n/Navigation/fr.yaml b/files/data/l10n/Navigation/fr.yaml
deleted file mode 100644
index e7a6f9aecc..0000000000
--- a/files/data/l10n/Navigation/fr.yaml
+++ /dev/null
@@ -1 +0,0 @@
-BuildingNavigationMesh: "Construction du mesh de navigation"
diff --git a/files/data/l10n/Navigation/ru.yaml b/files/data/l10n/Navigation/ru.yaml
deleted file mode 100644
index 509c178dea..0000000000
--- a/files/data/l10n/Navigation/ru.yaml
+++ /dev/null
@@ -1 +0,0 @@
-BuildingNavigationMesh: "Построение навигационной сетки"
diff --git a/files/data/l10n/Navigation/sv.yaml b/files/data/l10n/Navigation/sv.yaml
deleted file mode 100644
index d7c4780f94..0000000000
--- a/files/data/l10n/Navigation/sv.yaml
+++ /dev/null
@@ -1 +0,0 @@
-BuildingNavigationMesh: "Bygger navigeringsmesh"
diff --git a/files/data/l10n/SettingsMenu/de.yaml b/files/data/l10n/OMWEngine/de.yaml
similarity index 92%
rename from files/data/l10n/SettingsMenu/de.yaml
rename to files/data/l10n/OMWEngine/de.yaml
index 80c02597e2..6b9018b5a6 100644
--- a/files/data/l10n/SettingsMenu/de.yaml
+++ b/files/data/l10n/OMWEngine/de.yaml
@@ -1,3 +1,24 @@
+# Debug window
+
+DebugWindow: "Debug"
+LogViewer: "Protokollansicht"
+LuaProfiler: "Lua-Profiler"
+PhysicsProfiler: "Physik-Profiler"
+
+
+# Messages
+
+BuildingNavigationMesh: "Baue Navigationsgitter"
+
+
+# Save game menu
+
+SelectCharacter: "Charakterauswahl..."
+TimePlayed: "Spielzeit"
+
+
+# Settings menu
+
 ActorsProcessingRange: "Akteur-Verarbeitungsreichweite"
 Anisotropy: "Anisotropie"
 CameraSensitivity: "Kameraempfindlichkeit"
diff --git a/files/data/l10n/SettingsMenu/en.yaml b/files/data/l10n/OMWEngine/en.yaml
similarity index 92%
rename from files/data/l10n/SettingsMenu/en.yaml
rename to files/data/l10n/OMWEngine/en.yaml
index 9cd4cd83bf..49725aba2a 100644
--- a/files/data/l10n/SettingsMenu/en.yaml
+++ b/files/data/l10n/OMWEngine/en.yaml
@@ -1,3 +1,24 @@
+# Debug window
+
+DebugWindow: "Debug"
+LogViewer: "Log Viewer"
+LuaProfiler: "Lua Profiler"
+PhysicsProfiler: "Physics Profiler"
+
+
+# Messages
+
+BuildingNavigationMesh: "Building navigation mesh"
+
+
+# Save game menu
+
+SelectCharacter: "Select Character..."
+TimePlayed: "Time played"
+
+
+# Settings menu
+
 ActorsProcessingRange: "Actors Processing Range"
 Anisotropy: "Anisotropy"
 CameraSensitivity: "Camera Sensitivity"
diff --git a/files/data/l10n/SettingsMenu/fr.yaml b/files/data/l10n/OMWEngine/fr.yaml
similarity index 93%
rename from files/data/l10n/SettingsMenu/fr.yaml
rename to files/data/l10n/OMWEngine/fr.yaml
index 29b1a4ec71..b2f4197a64 100644
--- a/files/data/l10n/SettingsMenu/fr.yaml
+++ b/files/data/l10n/OMWEngine/fr.yaml
@@ -1,3 +1,23 @@
+# Debug window
+
+DebugWindow: "Fenêtre de débogage"
+LogViewer: "Journal"
+PhysicsProfiler: "Profileur des performances de la physique"
+
+
+# Messages
+
+BuildingNavigationMesh: "Construction du mesh de navigation"
+
+
+# Save game menu
+
+SelectCharacter: "Sélection du personnage..."
+TimePlayed: "Temps de jeu"
+
+
+# Settings menu
+
 ActorsProcessingRange: "Distance de traitement pour les personnages"
 Anisotropy: "Anisotropie"
 CameraSensitivity: "Sensibilité de la caméra"
diff --git a/files/data/l10n/SettingsMenu/ru.yaml b/files/data/l10n/OMWEngine/ru.yaml
similarity index 93%
rename from files/data/l10n/SettingsMenu/ru.yaml
rename to files/data/l10n/OMWEngine/ru.yaml
index fc9760c3d6..35beec7f32 100644
--- a/files/data/l10n/SettingsMenu/ru.yaml
+++ b/files/data/l10n/OMWEngine/ru.yaml
@@ -1,3 +1,24 @@
+# Debug window
+
+DebugWindow: "Меню отладки"
+LogViewer: "Журнал логов"
+LuaProfiler: "Профилировщик Луа"
+PhysicsProfiler: "Профилировщик физики"
+
+
+# Messages
+
+BuildingNavigationMesh: "Построение навигационной сетки"
+
+
+# Save game menu
+
+SelectCharacter: "Выберите персонажа..."
+TimePlayed: "Время в игре"
+
+
+# Settings menu
+
 ActorsProcessingRange: "Дальность обработки персонажей"
 Anisotropy: "Анизотропная фильтрация"
 CameraSensitivity: "Чувствительность камеры"
diff --git a/files/data/l10n/SettingsMenu/sv.yaml b/files/data/l10n/OMWEngine/sv.yaml
similarity index 93%
rename from files/data/l10n/SettingsMenu/sv.yaml
rename to files/data/l10n/OMWEngine/sv.yaml
index 865582b76f..704d1f719b 100644
--- a/files/data/l10n/SettingsMenu/sv.yaml
+++ b/files/data/l10n/OMWEngine/sv.yaml
@@ -1,3 +1,23 @@
+# Debug window
+
+DebugWindow: "Felsökning"
+LogViewer: "Loggvisare"
+PhysicsProfiler: "Fysikprofilerare"
+
+
+# Messages
+
+BuildingNavigationMesh: "Bygger navigeringsmesh"
+
+
+# Save game menu
+
+SelectCharacter: "Välj spelfigur..."
+TimePlayed: "Speltid"
+
+
+# Settings menu
+
 ActorsProcessingRange: "Processavstånd för figurer"
 Anisotropy: "Anisotropi"
 CameraSensitivity: "Kamerakänslighet"
diff --git a/files/data/l10n/PostProcessing/de.yaml b/files/data/l10n/OMWShaders/de.yaml
similarity index 62%
rename from files/data/l10n/PostProcessing/de.yaml
rename to files/data/l10n/OMWShaders/de.yaml
index fb0846555b..7d17199dd9 100644
--- a/files/data/l10n/PostProcessing/de.yaml
+++ b/files/data/l10n/OMWShaders/de.yaml
@@ -1,3 +1,5 @@
+# Post-processing HUD
+
 Abovewater: "Überwasser"
 ActiveShaders: "Aktive Shader"
 Author: "Autor"
@@ -19,3 +21,14 @@ ShaderLockedDescription: "Kann nicht umgeschaltet oder verschoben werden, gesteu
 ShaderResetUniform: "r"
 Underwater: "Unterwasser"
 Version: "Version"
+
+
+# Built-in post-processing shaders
+
+DisplayDepthName: "Visualisiert den Tiefenpuffer."
+DisplayDepthFactorDescription: "Bestimmt die Korrelation zwischen dem Pixeltiefenwert und seiner Ausgabefarbe. Hohe Werte führen zu einem helleren Bild."
+DisplayDepthFactorName: "Farbfaktor"
+ContrastLevelDescription: "Kontraststufe"
+ContrastLevelName: "Kontrast"
+GammaLevelDescription: "Gamma-Level"
+GammaLevelName: "Gamma"
diff --git a/files/data/l10n/BuiltInShaders/en.yaml b/files/data/l10n/OMWShaders/en.yaml
similarity index 63%
rename from files/data/l10n/BuiltInShaders/en.yaml
rename to files/data/l10n/OMWShaders/en.yaml
index 00354a45ff..8221be933f 100644
--- a/files/data/l10n/BuiltInShaders/en.yaml
+++ b/files/data/l10n/OMWShaders/en.yaml
@@ -1,3 +1,30 @@
+# Post-processing HUD
+
+Abovewater: "Abovewater"
+ActiveShaders: "Active Shaders"
+Author: "Author"
+Description: "Description"
+InactiveShaders: "Inactive Shaders"
+InExteriors: "Exteriors"
+InInteriors: "Interiors"
+KeyboardControls: |
+    Keyboard controls:
+
+    Shift+Right-Arrow > Activate shader
+    Shift+Left-Arrow > Deactive shader
+    Shift+Up-Arrow > Move shader up
+    Shift+Down-Arrow > Move shader down
+PostProcessHUD: "Postprocess HUD"
+ResetShader: "Reset shader to default state"
+ShaderLocked: "Locked"
+ShaderLockedDescription: "Cannot be toggled or moved, controlled by external Lua script"
+ShaderResetUniform: "r"
+Underwater: "Underwater"
+Version: "Version"
+
+
+# Built-in post-processing shaders
+
 AdjustmentsDescription: "Colour adjustments."
 BloomDescription: "Bloom shader performing its calculations in (approximately) linear light."
 DebugDescription: "Debug shader."
diff --git a/files/data/l10n/BuiltInShaders/fr.yaml b/files/data/l10n/OMWShaders/fr.yaml
similarity index 64%
rename from files/data/l10n/BuiltInShaders/fr.yaml
rename to files/data/l10n/OMWShaders/fr.yaml
index 8e43bd848a..3b4e47370e 100644
--- a/files/data/l10n/BuiltInShaders/fr.yaml
+++ b/files/data/l10n/OMWShaders/fr.yaml
@@ -1,3 +1,30 @@
+# Post-processing HUD
+
+Abovewater: "Hors de l'eau"
+ActiveShaders: "Shaders actifs"
+Author: "Auteur(e)"
+Description: "Description"
+InactiveShaders: "Shaders inactifs"
+InExteriors: "À l'extérieur"
+InInteriors: "En intérieur"
+KeyboardControls: |
+    Raccourcis clavier:
+
+    Majuscule+Flèche droite > Active le shader
+    Majuscule+Flèche gauche > Désactive le shader
+    Majuscule+Flèche haut > Monte le shader dans la liste
+    Majuscule+Flèche bas > Descend le shader dans la liste
+MainPassDescription: "Transmet les données de la scène aux shaders de post-traitement. Ne peut être déplacé ou supprimé."
+PostProcessHUD: "HUD de post-traitement"
+ResetShader: "Restaure le shader dans sa configuration par défaut"
+ShaderLocked: "Verrouillé"
+ShaderResetUniform: "r"
+Underwater: "Sous l'eau"
+Version: "Version"
+
+
+# Built-in post-processing shaders
+
 AdjustmentsDescription: "Ajustements de l'image (couleurs, luminosité, contrastes...)."
 BloomDescription: "Flou lumineux, calculé (approximativement) de façon linéaire suivant l'intensité de la lumière."
 DebugDescription: "Shader de débogage."
diff --git a/files/data/l10n/BuiltInShaders/ru.yaml b/files/data/l10n/OMWShaders/ru.yaml
similarity index 62%
rename from files/data/l10n/BuiltInShaders/ru.yaml
rename to files/data/l10n/OMWShaders/ru.yaml
index b61c61c29b..b886f72b54 100644
--- a/files/data/l10n/BuiltInShaders/ru.yaml
+++ b/files/data/l10n/OMWShaders/ru.yaml
@@ -1,3 +1,30 @@
+# Post-processing HUD
+
+Abovewater: "Над водой"
+ActiveShaders: "Включенные шейдеры"
+Author: "Автор"
+Description: "Описание"
+InactiveShaders: "Выключенные шейдеры"
+InExteriors: "Вне помещений"
+InInteriors: "В помещениях"
+KeyboardControls: |
+    Управление с помощью клавиатуры:
+
+    Shift+Right-Arrow > Включить шейдер
+    Shift+Left-Arrow > Выключить шейдер
+    Shift+Up-Arrow > Передвинуть шейдер выше
+    Shift+Down-Arrow > Передвинуть шейдер ниже
+PostProcessHUD: "Настройки постобработки"
+ResetShader: "Обнулить настройки этого шейдера"
+ShaderLocked: "Заблокирован"
+ShaderLockedDescription: "Не может быть выключен или передвинут, управляется внешним Lua-скриптом"
+ShaderResetUniform: "x"
+Underwater: "Под водой"
+Version: "Версия"
+
+
+# Built-in post-processing shaders
+
 AdjustmentsDescription: "Коррекция цвета."
 DebugDescription: "Отладочный шейдер."
 DebugHeaderDepth: "Буфер глубины"
diff --git a/files/data/l10n/BuiltInShaders/sv.yaml b/files/data/l10n/OMWShaders/sv.yaml
similarity index 59%
rename from files/data/l10n/BuiltInShaders/sv.yaml
rename to files/data/l10n/OMWShaders/sv.yaml
index fe9bfc8350..c1f1a5a333 100644
--- a/files/data/l10n/BuiltInShaders/sv.yaml
+++ b/files/data/l10n/OMWShaders/sv.yaml
@@ -1,3 +1,30 @@
+# Post-processing HUD
+
+Abovewater: "Ovan vatten"
+ActiveShaders: "Aktiva shaders"
+Author: "Skapare" # Author = Författare, but författare sounds very book-author-ish. Skapare, meaning "creator", sounds better in Swedish in this case. Ok?
+Description: "Beskrivning"
+ActiveShaders: "Inaktiva shaders"
+InExteriors: "Exteriörer"
+InInteriors: "Interiörer"
+KeyboardControls: |
+    Tangentbordskontroller:
+
+    Shift+Högerpil > Aktivera shader
+    Shift+Vänsterpil > Avaktivera shader
+    Shift+Pil upp > Flytta shader upp
+    Shift+Pil ner > Flytta shader ner
+PostProcessHUD: "Postprocess HUD"
+ResetShader: "Återställ shader to ursprungligt läge"
+ShaderLocked: "Låst"
+ShaderLockedDescription: "Kan ej aktiveras/inaktiveras eller flyttas. Kontrolleras av externt Lua-skript"
+ShaderResetUniform: "r"
+Underwater: "Under vatten"
+Version: "Version"
+
+
+# Built-in post-processing shaders
+
 AdjustmentsDescription: "Färgjusteringar."
 BloomDescription: "Bloomshader som utför sina beräkningar i (ungefärligt) linjärt ljus."
 DebugDescription: "Felsökningsshader."
@@ -10,7 +37,7 @@ DisplayNormalsName: "Visualisera normalvektorer" # på engelska står det "pass
 ContrastLevelDescription: "Kontrastnivå"
 ContrastLevelName: "Kontrast"
 GammaLevelDescription: "Gammanivå"
-# GammaLevelName: "Gamma" samma som engelska
+GammaLevelName: "Gamma" # samma som engelska
 StrengthLevelName: "Styrka"
 StrengthLevelDescription: "Effektens styrka."
 RadiusLevelName: "Radie"
diff --git a/files/data/l10n/PostProcessing/en.yaml b/files/data/l10n/PostProcessing/en.yaml
deleted file mode 100644
index 5416cd723f..0000000000
--- a/files/data/l10n/PostProcessing/en.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-Abovewater: "Abovewater"
-ActiveShaders: "Active Shaders"
-Author: "Author"
-Description: "Description"
-InactiveShaders: "Inactive Shaders"
-InExteriors: "Exteriors"
-InInteriors: "Interiors"
-KeyboardControls: |
-    Keyboard controls:
-
-    Shift+Right-Arrow > Activate shader
-    Shift+Left-Arrow > Deactive shader
-    Shift+Up-Arrow > Move shader up
-    Shift+Down-Arrow > Move shader down
-PostProcessHUD: "Postprocess HUD"
-ResetShader: "Reset shader to default state"
-ShaderLocked: "Locked"
-ShaderLockedDescription: "Cannot be toggled or moved, controlled by external Lua script"
-ShaderResetUniform: "r"
-Underwater: "Underwater"
-Version: "Version"
diff --git a/files/data/l10n/PostProcessing/fr.yaml b/files/data/l10n/PostProcessing/fr.yaml
deleted file mode 100644
index c5500ac09d..0000000000
--- a/files/data/l10n/PostProcessing/fr.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-Abovewater: "Hors de l'eau"
-ActiveShaders: "Shaders actifs"
-Author: "Auteur(e)"
-Description: "Description"
-InactiveShaders: "Shaders inactifs"
-InExteriors: "À l'extérieur"
-InInteriors: "En intérieur"
-KeyboardControls: |
-    Raccourcis clavier:
-
-    Majuscule+Flèche droite > Active le shader
-    Majuscule+Flèche gauche > Désactive le shader
-    Majuscule+Flèche haut > Monte le shader dans la liste
-    Majuscule+Flèche bas > Descend le shader dans la liste
-MainPassDescription: "Transmet les données de la scène aux shaders de post-traitement. Ne peut être déplacé ou supprimé."
-PostProcessHUD: "HUD de post-traitement"
-ResetShader: "Restaure le shader dans sa configuration par défaut"
-ShaderLocked: "Verrouillé"
-ShaderResetUniform: "r"
-Underwater: "Sous l'eau"
-Version: "Version"
diff --git a/files/data/l10n/PostProcessing/ru.yaml b/files/data/l10n/PostProcessing/ru.yaml
deleted file mode 100644
index d0a137bb9a..0000000000
--- a/files/data/l10n/PostProcessing/ru.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-Abovewater: "Над водой"
-ActiveShaders: "Включенные шейдеры"
-Author: "Автор"
-Description: "Описание"
-InactiveShaders: "Выключенные шейдеры"
-InExteriors: "Вне помещений"
-InInteriors: "В помещениях"
-KeyboardControls: |
-    Управление с помощью клавиатуры:
-
-    Shift+Right-Arrow > Включить шейдер
-    Shift+Left-Arrow > Выключить шейдер
-    Shift+Up-Arrow > Передвинуть шейдер выше
-    Shift+Down-Arrow > Передвинуть шейдер ниже
-PostProcessHUD: "Настройки постобработки"
-ResetShader: "Обнулить настройки этого шейдера"
-ShaderLocked: "Заблокирован"
-ShaderLockedDescription: "Не может быть выключен или передвинут, управляется внешним Lua-скриптом"
-ShaderResetUniform: "x"
-Underwater: "Под водой"
-Version: "Версия"
diff --git a/files/data/l10n/PostProcessing/sv.yaml b/files/data/l10n/PostProcessing/sv.yaml
deleted file mode 100644
index 5c2e11a011..0000000000
--- a/files/data/l10n/PostProcessing/sv.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-Abovewater: "Ovan vatten"
-ActiveShaders: "Aktiva shaders"
-Author: "Skapare" # Author = Författare, but författare sounds very book-author-ish. Skapare, meaning "creator", sounds better in Swedish in this case. Ok?
-Description: "Beskrivning"
-ActiveShaders: "Inaktiva shaders"
-InExteriors: "Exteriörer"
-InInteriors: "Interiörer"
-KeyboardControls: |
-    Tangentbordskontroller:
-
-    Shift+Högerpil > Aktivera shader
-    Shift+Vänsterpil > Avaktivera shader
-    Shift+Pil upp > Flytta shader upp
-    Shift+Pil ner > Flytta shader ner
-PostProcessHUD: "Postprocess HUD"
-ResetShader: "Återställ shader to ursprungligt läge"
-ShaderLocked: "Låst"
-ShaderLockedDescription: "Kan ej aktiveras/inaktiveras eller flyttas. Kontrolleras av externt Lua-skript"
-ShaderResetUniform: "r"
-Underwater: "Under vatten"
-Version: "Version"
-
diff --git a/files/data/l10n/SavegameMenu/de.yaml b/files/data/l10n/SavegameMenu/de.yaml
deleted file mode 100644
index 225b6c3a07..0000000000
--- a/files/data/l10n/SavegameMenu/de.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-SelectCharacter: "Charakterauswahl..."
-TimePlayed: "Spielzeit"
diff --git a/files/data/l10n/SavegameMenu/en.yaml b/files/data/l10n/SavegameMenu/en.yaml
deleted file mode 100644
index b7e3c60a5f..0000000000
--- a/files/data/l10n/SavegameMenu/en.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-SelectCharacter: "Select Character..."
-TimePlayed: "Time played"
diff --git a/files/data/l10n/SavegameMenu/fr.yaml b/files/data/l10n/SavegameMenu/fr.yaml
deleted file mode 100644
index 15bc37b4a7..0000000000
--- a/files/data/l10n/SavegameMenu/fr.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-SelectCharacter: "Sélection du personnage..."
-TimePlayed: "Temps de jeu"
diff --git a/files/data/l10n/SavegameMenu/ru.yaml b/files/data/l10n/SavegameMenu/ru.yaml
deleted file mode 100644
index 8b87500bd3..0000000000
--- a/files/data/l10n/SavegameMenu/ru.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-SelectCharacter: "Выберите персонажа..."
-TimePlayed: "Время в игре"
diff --git a/files/data/l10n/SavegameMenu/sv.yaml b/files/data/l10n/SavegameMenu/sv.yaml
deleted file mode 100644
index ef23465f6c..0000000000
--- a/files/data/l10n/SavegameMenu/sv.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-SelectCharacter: "Välj spelfigur..."
-TimePlayed: "Speltid"
diff --git a/files/data/mygui/openmw_debug_window.layout b/files/data/mygui/openmw_debug_window.layout
index a2635c3c46..7019c5292d 100644
--- a/files/data/mygui/openmw_debug_window.layout
+++ b/files/data/mygui/openmw_debug_window.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
   <Widget type="Window" skin="MW_Window" position="0 0 400 400" layer="Debug" name="_Main" align="Stretch">
-    <Property key="Caption" value="#{DebugMenu:DebugWindow}"/>
+    <Property key="Caption" value="#{OMWEngine:DebugWindow}"/>
     <Property key="Visible" value="false"/>
 
     <Widget type="Widget" skin="DialogBG" position_real="0 0 1 1" name="Background" align="Stretch">
diff --git a/files/data/mygui/openmw_postprocessor_hud.layout b/files/data/mygui/openmw_postprocessor_hud.layout
index 0c2868435a..4ed8ecdb36 100644
--- a/files/data/mygui/openmw_postprocessor_hud.layout
+++ b/files/data/mygui/openmw_postprocessor_hud.layout
@@ -2,7 +2,7 @@
 <MyGUI type="Layout">
   <Widget type="Window" skin="MW_Window" position="0 0 500 500" layer="Debug" name="_Main" align="Stretch">
     <Property key="Visible" value="false"/>
-    <Property key="Caption" value="#{PostProcessing:PostProcessHUD}"/>
+    <Property key="Caption" value="#{OMWShaders:PostProcessHUD}"/>
     <Property key="MinSize" value="600 600"/>
 
     <Widget type="TabControl" skin="TabControl_NoBorder" position="8 8 468 450" align="Stretch" name="TabControl">
@@ -12,7 +12,7 @@
             <Property key="Caption" value="[?]"/>
             <UserString key="ToolTipType" value="Layout"/>
             <UserString key="ToolTipLayout" value="TextToolTip"/>
-            <UserString key="Caption_Text" value="#{PostProcessing:KeyboardControls}"/>
+            <UserString key="Caption_Text" value="#{OMWShaders:KeyboardControls}"/>
             <Property key="Depth" value="-10"/>
         </Widget>
 
@@ -34,7 +34,7 @@
 
                         <Widget type="VBox" position_real="0 0 1 1" align="Stretch">
                             <Widget type="AutoSizedTextBox" skin="NormalText" position="0 0 50 50" align="Top Right">
-                                <Property key="Caption" value="#{PostProcessing:InactiveShaders}"/>
+                                <Property key="Caption" value="#{OMWShaders:InactiveShaders}"/>
                             </Widget>
 
                             <Widget type="EditBox" skin="MW_TextBoxEditWithBorder" position="0 0 0 28" name="Filter">
@@ -80,7 +80,7 @@
 
                         <Widget type="VBox" position_real="0 0 1 1" align="Stretch">
                             <Widget type="AutoSizedTextBox" skin="NormalText" position="0 0 50 50" align="Top Right">
-                                <Property key="Caption" value="#{PostProcessing:ActiveShaders}"/>
+                                <Property key="Caption" value="#{OMWShaders:ActiveShaders}"/>
                             </Widget>
 
                             <Widget type="ListWrapper" skin="MW_List" name="ActiveList">
diff --git a/files/data/mygui/openmw_postprocessor_hud.skin.xml b/files/data/mygui/openmw_postprocessor_hud.skin.xml
index b25b7f1372..35ab652f2c 100644
--- a/files/data/mygui/openmw_postprocessor_hud.skin.xml
+++ b/files/data/mygui/openmw_postprocessor_hud.skin.xml
@@ -59,7 +59,7 @@
                 <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 22 22" name="Reset">
                     <UserString key="HStretch" value="false"/>
                     <UserString key="VStretch" value="false"/>
-                    <Property key="Caption" value="#{PostProcessing:ShaderResetUniform}"/>
+                    <Property key="Caption" value="#{OMWShaders:ShaderResetUniform}"/>
                 </Widget>
                 <Widget type="Widget" skin="BlackBG" position="0 0 225 22" name="Client">
                     <UserString key="HStretch" value="false"/>
diff --git a/files/data/mygui/openmw_savegame_dialog.layout b/files/data/mygui/openmw_savegame_dialog.layout
index d2d8df295f..a1cdba89ab 100644
--- a/files/data/mygui/openmw_savegame_dialog.layout
+++ b/files/data/mygui/openmw_savegame_dialog.layout
@@ -6,7 +6,7 @@
         <Property key="Spacing" value="8"/>
 
         <Widget type="ComboBox" skin="MW_ComboBox" position="0 0 0 24" name="SelectCharacter">
-            <Property key="Caption" value="#{SavegameMenu:SelectCharacter}"/>
+            <Property key="Caption" value="#{OMWEngine:SelectCharacter}"/>
             <UserString key="HStretch" value="true"/>
         </Widget>
 
diff --git a/files/data/mygui/openmw_settings_window.layout b/files/data/mygui/openmw_settings_window.layout
index 0569751191..59e9d44ecc 100644
--- a/files/data/mygui/openmw_settings_window.layout
+++ b/files/data/mygui/openmw_settings_window.layout
@@ -75,7 +75,7 @@
                 </Widget>
                 <Widget type="Widget" position="4 184 400 54" align="Left Top HStretch">
                     <Widget type="TextBox" skin="NormalText" position="0 0 400 16" align="Left Top" name="ActorProcessingText">
-                        <Property key="Caption" value="#{SettingsMenu:ActorsProcessingRange}"/>
+                        <Property key="Caption" value="#{OMWEngine:ActorsProcessingRange}"/>
                     </Widget>
                     <Widget type="ScrollBar" skin="MW_HScroll" position="0 20 352 14" align="Left Top HStretch">
                         <Property key="Range" value="3584"/>
@@ -87,7 +87,7 @@
                         <UserString key="SettingMin" value="3584"/>
                         <UserString key="SettingMax" value="7168"/>
                         <UserString key="SettingLabelWidget" value="ActorProcessingText"/>
-                        <UserString key="SettingLabelCaption" value="#{SettingsMenu:ActorsProcessingRange} (%s)"/>
+                        <UserString key="SettingLabelCaption" value="#{OMWEngine:ActorsProcessingRange} (%s)"/>
                     </Widget>
                     <Widget type="TextBox" skin="SandText" position="0 38 352 16" align="Left Top">
                         <Property key="Caption" value="#{sLow}"/>
@@ -204,10 +204,10 @@
                     <Property key="Padding" value="0"/>
                     <Property key="Spacing" value="4"/>
                     <Widget type="AutoSizedButton" skin="MW_Button" name="KeyboardButton">
-                        <Property key="Caption" value="#{SettingsMenu:MouseAndKeyboard}"/>
+                        <Property key="Caption" value="#{OMWEngine:MouseAndKeyboard}"/>
                     </Widget>
                     <Widget type="AutoSizedButton" skin="MW_Button" name="ControllerButton">
-                        <Property key="Caption" value="#{SettingsMenu:Controller}"/>
+                        <Property key="Caption" value="#{OMWEngine:Controller}"/>
                     </Widget>
                 </Widget>
 
@@ -226,7 +226,7 @@
                         <UserString key="SettingType" value="CheckButton"/>
                     </Widget>
                     <Widget type="AutoSizedTextBox" skin="SandText">
-                        <Property key="Caption" value="#{SettingsMenu:InvertXAxis} "/>
+                        <Property key="Caption" value="#{OMWEngine:InvertXAxis} "/>
                     </Widget>
                     <Widget type="AutoSizedButton" skin="MW_Button">
                         <UserString key="SettingCategory" value="Input"/>
@@ -238,7 +238,7 @@
                     </Widget>
                 </Widget>
                 <Widget type="TextBox" skin="NormalText" position="4 258 352 18" align="Left Bottom">
-                    <Property key="Caption" value="#{SettingsMenu:CameraSensitivity}"/>
+                    <Property key="Caption" value="#{OMWEngine:CameraSensitivity}"/>
                 </Widget>
                 <Widget type="ScrollBar" skin="MW_HScroll" position="4 282 352 18" align="HStretch Bottom">
                     <Property key="Range" value="10000"/>
@@ -277,13 +277,13 @@
                         <Property key="Caption" value=" #{sVideo} "/>
                         <Widget type="ListBox" skin="MW_List" position="0 4 185 225" align="Left Top" name="ResolutionList"/>
                         <Widget type="TextBox" skin="NormalText" position="197 4 185 18" align="Left Top">
-                            <Property key="Caption" value="#{SettingsMenu:WindowMode}"/>
+                            <Property key="Caption" value="#{OMWEngine:WindowMode}"/>
                         </Widget>
                         <Widget type="HBox" position="197 28 400 24">
                             <Widget type="ComboBox" skin="MW_ComboBox" position="0 0 200 24" align="Left Top" name="WindowModeList">
-                                <Property key="AddItem" value="#{SettingsMenu:WindowModeFullscreen}"/>
-                                <Property key="AddItem" value="#{SettingsMenu:WindowModeWindowedFullscreen}"/>
-                                <Property key="AddItem" value="#{SettingsMenu:WindowModeWindowed}"/>
+                                <Property key="AddItem" value="#{OMWEngine:WindowModeFullscreen}"/>
+                                <Property key="AddItem" value="#{OMWEngine:WindowModeWindowedFullscreen}"/>
+                                <Property key="AddItem" value="#{OMWEngine:WindowModeWindowed}"/>
                             </Widget>
                         </Widget>
                         <Widget type="HBox" position="197 58 400 28">
@@ -293,7 +293,7 @@
                                 <UserString key="SettingType" value="CheckButton"/>
                             </Widget>
                             <Widget type="AutoSizedTextBox" skin="SandText" position="28 4 48 16" align="Left Top">
-                                <Property key="Caption" value="#{SettingsMenu:VSync}"/>
+                                <Property key="Caption" value="#{OMWEngine:VSync}"/>
                             </Widget>
                         </Widget>
                         <Widget type="HBox" position="197 88 300 28">
@@ -303,7 +303,7 @@
                                 <UserString key="SettingType" value="CheckButton"/>
                             </Widget>
                             <Widget type="AutoSizedTextBox" skin="SandText" position="28 4 48 16" align="Left Top">
-                                <Property key="Caption" value="#{SettingsMenu:WindowBorder}"/>
+                                <Property key="Caption" value="#{OMWEngine:WindowBorder}"/>
                             </Widget>
                         </Widget>
                         <Widget type="HBox" position="197 118 300 28">
@@ -313,15 +313,15 @@
                                 <UserString key="SettingType" value="CheckButton"/>
                             </Widget>
                             <Widget type="AutoSizedTextBox" skin="SandText" position="28 4 48 16" align="Left Top">
-                                <Property key="Caption" value="#{SettingsMenu:PostProcessing}"/>
+                                <Property key="Caption" value="#{OMWEngine:PostProcessing}"/>
                                 <UserString key="ToolTipType" value="Layout"/>
                                 <UserString key="ToolTipLayout" value="TextToolTip"/>
-                                <UserString key="Caption_Text" value="#{SettingsMenu:PostProcessingTooltip}"/>
+                                <UserString key="Caption_Text" value="#{OMWEngine:PostProcessingTooltip}"/>
                             </Widget>
                         </Widget>
 
                         <Widget type="AutoSizedTextBox" skin="SandText" position="197 154 300 32" align="Left Top">
-                            <Property key="Caption" value="#{SettingsMenu:FrameRateHint}"/>
+                            <Property key="Caption" value="#{OMWEngine:FrameRateHint}"/>
                         </Widget>
                         <Widget type="AutoSizedTextBox" skin="SandText" position="197 196 300 32" align="Left Top" name="WindowModeHint">
                             <Property key="Caption" value="#{SettingsMenu:WindowModeHint}"/>
@@ -339,7 +339,7 @@
                             <UserString key="SettingMin" value="30"/>
                             <UserString key="SettingMax" value="110"/>
                             <UserString key="SettingLabelWidget" value="FovText"/>
-                            <UserString key="SettingLabelCaption" value="#{SettingsMenu:FieldOfView} (%s)"/>
+                            <UserString key="SettingLabelCaption" value="#{OMWEngine:FieldOfView} (%s)"/>
                         </Widget>
                         <Widget type="TextBox" skin="SandText" position="0 286 352 18" align="Left Top">
                             <Property key="Caption" value="#{sLow}"/>
@@ -375,17 +375,17 @@
                         <Property key="Caption" value=" #{sDetail_Level} "/>
 
                         <Widget type="AutoSizedTextBox" skin="NormalText" align="Left Top">
-                            <Property key="Caption" value="#{SettingsMenu:TextureFiltering}"/>
+                            <Property key="Caption" value="#{OMWEngine:TextureFiltering}"/>
                             <UserString key="VStretch" value="false"/>
                             <UserString key="HStretch" value="false"/>
                         </Widget>
                         <Widget type="ComboBox" align="Left Top" skin="MW_ComboBox" position="0 28 200 24" name="TextureFilteringButton">
-                            <Property key="AddItem" value="#{SettingsMenu:TextureFilteringBilinear}"/>
-                            <Property key="AddItem" value="#{SettingsMenu:TextureFilteringTrilinear}"/>
+                            <Property key="AddItem" value="#{OMWEngine:TextureFilteringBilinear}"/>
+                            <Property key="AddItem" value="#{OMWEngine:TextureFilteringTrilinear}"/>
                         </Widget>
 
                         <Widget type="AutoSizedTextBox" skin="NormalText" position="0 58 200 18" name="AnisotropyLabel">
-                            <Property key="Caption" value="#{SettingsMenu:Anisotropy}"/>
+                            <Property key="Caption" value="#{OMWEngine:Anisotropy}"/>
                         </Widget>
                         <Widget type="ScrollBar" skin="MW_HScroll" position="0 80 352 18" align="HStretch Top">
                             <Property key="Range" value="17"/>
@@ -394,7 +394,7 @@
                             <UserString key="SettingCategory" value="General"/>
                             <UserString key="SettingName" value="anisotropy"/>
                             <UserString key="SettingLabelWidget" value="AnisotropyLabel"/>
-                            <UserString key="SettingLabelCaption" value="#{SettingsMenu:Anisotropy} (%s)"/>
+                            <UserString key="SettingLabelCaption" value="#{OMWEngine:Anisotropy} (%s)"/>
                         </Widget>
 
                         <Widget type="AutoSizedTextBox" skin="NormalText" position="0 104 0 18" align="Left Top" name="RenderDistanceLabel">
@@ -435,7 +435,7 @@
 
                     </Widget>
                     <Widget type="TabItem">
-                        <Property key="Caption" value=" #{SettingsMenu:Water} "/>
+                        <Property key="Caption" value=" #{OMWEngine:Water} "/>
 
                         <Widget type="VBox" position_real="0 0 1 1" align="Stretch">
 
@@ -449,7 +449,7 @@
                                     <UserString key="SettingType" value="CheckButton"/>
                                 </Widget>
                                 <Widget type="AutoSizedTextBox" skin="SandText">
-                                    <Property key="Caption" value="#{SettingsMenu:WaterShader}"/>
+                                    <Property key="Caption" value="#{OMWEngine:WaterShader}"/>
                                 </Widget>
                             </Widget>
 
@@ -463,14 +463,14 @@
                                     <UserString key="SettingType" value="CheckButton"/>
                                 </Widget>
                                 <Widget type="AutoSizedTextBox" skin="SandText">
-                                    <Property key="Caption" value="#{SettingsMenu:Refraction}"/>
+                                    <Property key="Caption" value="#{OMWEngine:Refraction}"/>
                                 </Widget>
                             </Widget>
 
                             <Widget type="Widget" position="0 0 0 18" align="Top Left HStretch">
                                 <UserString key="HStretch" value="true"/>
                                 <Widget type="AutoSizedTextBox" skin="NormalText">
-                                    <Property key="Caption" value="#{SettingsMenu:WaterShaderTextureQuality}"/>
+                                    <Property key="Caption" value="#{OMWEngine:WaterShaderTextureQuality}"/>
                                 </Widget>
                                 <Widget type="Spacer" />
                             </Widget>
@@ -489,7 +489,7 @@
                             <Widget type="Widget" position="0 0 0 18" align="Top Left HStretch">
                                 <UserString key="HStretch" value="true"/>
                                 <Widget type="AutoSizedTextBox" skin="NormalText">
-                                    <Property key="Caption" value="#{SettingsMenu:ReflectionShaderDetail}"/>
+                                    <Property key="Caption" value="#{OMWEngine:ReflectionShaderDetail}"/>
                                 </Widget>
                                 <Widget type="Spacer" />
                             </Widget>
@@ -498,12 +498,12 @@
                                 <UserString key="VStretch" value="false"/>
 
                                 <Widget type="ComboBox" skin="MW_ComboBox" position="0 0 200 24" align="Left Top" name="WaterReflectionDetail">
-                                    <Property key="AddItem" value="#{SettingsMenu:ReflectionShaderDetailSky}"/>
-                                    <Property key="AddItem" value="#{SettingsMenu:ReflectionShaderDetailTerrain}"/>
-                                    <Property key="AddItem" value="#{SettingsMenu:ReflectionShaderDetailWorld}"/>
-                                    <Property key="AddItem" value="#{SettingsMenu:ReflectionShaderDetailObjects}"/>
-                                    <Property key="AddItem" value="#{SettingsMenu:ReflectionShaderDetailActors}"/>
-                                    <Property key="AddItem" value="#{SettingsMenu:ReflectionShaderDetailGroundcover}"/>
+                                    <Property key="AddItem" value="#{OMWEngine:ReflectionShaderDetailSky}"/>
+                                    <Property key="AddItem" value="#{OMWEngine:ReflectionShaderDetailTerrain}"/>
+                                    <Property key="AddItem" value="#{OMWEngine:ReflectionShaderDetailWorld}"/>
+                                    <Property key="AddItem" value="#{OMWEngine:ReflectionShaderDetailObjects}"/>
+                                    <Property key="AddItem" value="#{OMWEngine:ReflectionShaderDetailActors}"/>
+                                    <Property key="AddItem" value="#{OMWEngine:ReflectionShaderDetailGroundcover}"/>
                                 </Widget>
                                 <Widget type="Spacer" />
                             </Widget>
@@ -511,7 +511,7 @@
                             <Widget type="Widget" position="0 0 0 18" align="Top Left HStretch">
                                 <UserString key="HStretch" value="true"/>
                                 <Widget type="AutoSizedTextBox" skin="NormalText">
-                                    <Property key="Caption" value="#{SettingsMenu:RainRippleDetail}"/>
+                                    <Property key="Caption" value="#{OMWEngine:RainRippleDetail}"/>
                                 </Widget>
                                 <Widget type="Spacer" />
                             </Widget>
@@ -521,9 +521,9 @@
                                 <UserString key="VStretch" value="false"/>
 
                                 <Widget type="ComboBox" skin="MW_ComboBox" position="0 0 200 24" align="Left Top" name="WaterRainRippleDetail">
-                                    <Property key="AddItem" value="#{SettingsMenu:RainRippleDetailSimple}"/>
-                                    <Property key="AddItem" value="#{SettingsMenu:RainRippleDetailSparse}"/>
-                                    <Property key="AddItem" value="#{SettingsMenu:RainRippleDetailDense}"/>
+                                    <Property key="AddItem" value="#{OMWEngine:RainRippleDetailSimple}"/>
+                                    <Property key="AddItem" value="#{OMWEngine:RainRippleDetailSparse}"/>
+                                    <Property key="AddItem" value="#{OMWEngine:RainRippleDetailDense}"/>
                                 </Widget>
                                 <Widget type="Spacer" />
                             </Widget>
@@ -532,10 +532,10 @@
 
                     </Widget>
                     <Widget type="TabItem">
-                        <Property key="Caption" value=" #{SettingsMenu:Lights} "/>
+                        <Property key="Caption" value=" #{OMWEngine:Lights} "/>
                         <!-- Lighting Method -->
                         <Widget type="TextBox" skin="NormalText" position="0 4 250 18" align="Left Top">
-                            <Property key="Caption" value="#{SettingsMenu:LightingMethod}"/>
+                            <Property key="Caption" value="#{OMWEngine:LightingMethod}"/>
                         </Widget>
                         <Widget type="ComboBox" skin="MW_ComboBox" position="0 28 250 24" align="Left Top" name="LightingMethodButton">
                             <Property key="AddItem" value="legacy"/>
@@ -546,7 +546,7 @@
                         <Widget type="TextBox" skin="NormalText" position="258 4 350 18" align="Left Top" name="MaxLightsText">
                             <UserString key="ToolTipType" value="Layout"/>
                             <UserString key="ToolTipLayout" value="TextToolTip"/>
-                            <UserString key="Caption_Text" value="#{SettingsMenu:MaxLightsTooltip}"/>
+                            <UserString key="Caption_Text" value="#{OMWEngine:MaxLightsTooltip}"/>
                         </Widget>
                         <Widget type="ScrollBar" position="0 0 0 0">
                             <UserString key="SettingType" value="Slider"/>
@@ -554,7 +554,7 @@
                             <UserString key="SettingName" value="max lights"/>
                             <UserString key="SettingValueType" value="Integer"/>
                             <UserString key="SettingLabelWidget" value="MaxLightsText"/>
-                            <UserString key="SettingLabelCaption" value="#{SettingsMenu:MaxLights} (%s)"/>
+                            <UserString key="SettingLabelCaption" value="#{OMWEngine:MaxLights} (%s)"/>
                         </Widget>
                         <Widget type="ComboBox" skin="MW_ComboBox" position="258 28 250 24" align="Left Top" name="MaxLights">
                             <Property key="AddItem" value="8"/>
@@ -567,7 +567,7 @@
                         <Widget type="TextBox" skin="NormalText" position="0 78 500 18" align="Left Top" name="MaxLightDistanceText">
                             <UserString key="ToolTipType" value="Layout"/>
                             <UserString key="ToolTipLayout" value="TextToolTip"/>
-                            <UserString key="Caption_Text" value="#{SettingsMenu:LightsMaximumDistanceTooltip}"/>
+                            <UserString key="Caption_Text" value="#{OMWEngine:LightsMaximumDistanceTooltip}"/>
                         </Widget>
                         <Widget type="ScrollBar" skin="MW_HScroll" position="0 104 352 18" align="HStretch Top">
                             <Property key="Range" value="8192"/>
@@ -579,13 +579,13 @@
                             <UserString key="SettingName" value="maximum light distance"/>
                             <UserString key="SettingValueType" value="Integer"/>
                             <UserString key="SettingLabelWidget" value="MaxLightDistanceText"/>
-                            <UserString key="SettingLabelCaption" value="#{SettingsMenu:LightsMaximumDistance} (%s)"/>
+                            <UserString key="SettingLabelCaption" value="#{OMWEngine:LightsMaximumDistance} (%s)"/>
                         </Widget>
                         <!-- Light Fade Multiplier -->
                         <Widget type="TextBox" skin="NormalText" position="0 128 500 18" align="Left Top" name="LightFadeMultiplierText">
                             <UserString key="ToolTipType" value="Layout"/>
                             <UserString key="ToolTipLayout" value="TextToolTip"/>
-                            <UserString key="Caption_Text" value="#{SettingsMenu:LightsFadeStartMultiplierTooltip}"/>
+                            <UserString key="Caption_Text" value="#{OMWEngine:LightsFadeStartMultiplierTooltip}"/>
                         </Widget>
                         <Widget type="ScrollBar" skin="MW_HScroll" position="0 152 352 18" align="HStretch Top">
                             <Property key="Range" value="10000"/>
@@ -597,13 +597,13 @@
                             <UserString key="SettingMin" value="0.0"/>
                             <UserString key="SettingMax" value="1.0"/>
                             <UserString key="SettingLabelWidget" value="LightFadeMultiplierText"/>
-                            <UserString key="SettingLabelCaption" value="#{SettingsMenu:LightsFadeStartMultiplier} (%s)"/>
+                            <UserString key="SettingLabelCaption" value="#{OMWEngine:LightsFadeStartMultiplier} (%s)"/>
                         </Widget>
                         <!-- Bounding Sphere Multiplier -->
                         <Widget type="TextBox" skin="NormalText" position="0 176 500 18" align="Left Top" name="BoundingSphereMultText">
                             <UserString key="ToolTipType" value="Layout"/>
                             <UserString key="ToolTipLayout" value="TextToolTip"/>
-                            <UserString key="Caption_Text" value="#{SettingsMenu:LightsBoundingSphereMultiplierTooltip}"/>
+                            <UserString key="Caption_Text" value="#{OMWEngine:LightsBoundingSphereMultiplierTooltip}"/>
                         </Widget>
                         <Widget type="ScrollBar" skin="MW_HScroll" position="0 200 352 18" align="HStretch Top">
                             <Property key="Range" value="500000"/>
@@ -615,13 +615,13 @@
                             <UserString key="SettingName" value="light bounds multiplier"/>
                             <UserString key="SettingValueType" value="Float"/>
                             <UserString key="SettingLabelWidget" value="BoundingSphereMultText"/>
-                            <UserString key="SettingLabelCaption" value="#{SettingsMenu:LightsBoundingSphereMultiplier} (%s)"/>
+                            <UserString key="SettingLabelCaption" value="#{OMWEngine:LightsBoundingSphereMultiplier} (%s)"/>
                         </Widget>
                         <!-- Minimum Ambient Brightness -->
                         <Widget type="TextBox" skin="NormalText" position="0 224 500 18" align="Left Top" name="MinimumBrightnessText">
                             <UserString key="ToolTipType" value="Layout"/>
                             <UserString key="ToolTipLayout" value="TextToolTip"/>
-                            <UserString key="Caption_Text" value="#{SettingsMenu:LightsMinimumInteriorBrightnessTooltip}"/>
+                            <UserString key="Caption_Text" value="#{OMWEngine:LightsMinimumInteriorBrightnessTooltip}"/>
                         </Widget>
                         <Widget type="ScrollBar" skin="MW_HScroll" position="0 248 352 18" align="HStretch Top">
                             <Property key="Range" value="10000"/>
@@ -631,7 +631,7 @@
                             <UserString key="SettingName" value="minimum interior brightness"/>
                             <UserString key="SettingValueType" value="Float"/>
                             <UserString key="SettingLabelWidget" value="MinimumBrightnessText"/>
-                            <UserString key="SettingLabelCaption" value="#{SettingsMenu:LightsMinimumInteriorBrightness} (%s)"/>
+                            <UserString key="SettingLabelCaption" value="#{OMWEngine:LightsMinimumInteriorBrightness} (%s)"/>
                         </Widget>
                         <Widget type="AutoSizedButton" skin="MW_Button" position="0 290 0 0" align="Top Left" name="LightsResetButton">
                             <Property key="Caption" value="#{sControlsMenu1}"/>
@@ -640,10 +640,10 @@
                 </Widget>
             </Widget>
             <Widget type="TabItem">
-                <Property key="Caption" value=" #{SettingsMenu:Scripts} "/>
+                <Property key="Caption" value=" #{OMWEngine:Scripts} "/>
 
                 <Widget name="ScriptDisabled" type="EditBox" skin="SandText" position_real="0 0 1 1" align="HStretch Top">
-                    <Property key="Caption" value="#{SettingsMenu:ScriptsDisabled}"/>
+                    <Property key="Caption" value="#{OMWEngine:ScriptsDisabled}"/>
                     <Property key="TextAlign" value="Center"/>
                     <Property key="MultiLine" value="true"/>
                     <Property key="WordWrap" value="true"/>
@@ -681,24 +681,24 @@
 
             </Widget>
             <Widget type="TabItem">
-                <Property key="Caption" value=" #{SettingsMenu:Language} "/>
+                <Property key="Caption" value=" #{OMWEngine:Language} "/>
                 <Widget type="AutoSizedTextBox" skin="SandText" position="4 4 300 32" align="Left Top">
-                    <Property key="Caption" value="#{SettingsMenu:LanguageNote}"/>
+                    <Property key="Caption" value="#{OMWEngine:LanguageNote}"/>
                 </Widget>
                 <!-- Primary Language -->
                 <Widget type="TextBox" skin="NormalText" position="4 28 250 18" align="Left Top">
-                    <Property key="Caption" value="#{SettingsMenu:PrimaryLanguage}"/>
+                    <Property key="Caption" value="#{OMWEngine:PrimaryLanguage}"/>
                     <UserString key="ToolTipType" value="Layout"/>
                     <UserString key="ToolTipLayout" value="TextToolTip"/>
-                    <UserString key="Caption_Text" value="#{SettingsMenu:PrimaryLanguageTooltip}"/>
+                    <UserString key="Caption_Text" value="#{OMWEngine:PrimaryLanguageTooltip}"/>
                 </Widget>
                 <Widget type="ComboBox" skin="MW_ComboBox" position="4 52 250 24" align="Left Top" name="PrimaryLanguage" />
                 <!-- Secondary Language -->
                 <Widget type="TextBox" skin="NormalText" position="262 28 250 18" align="Left Top">
-                    <Property key="Caption" value="#{SettingsMenu:SecondaryLanguage}"/>
+                    <Property key="Caption" value="#{OMWEngine:SecondaryLanguage}"/>
                     <UserString key="ToolTipType" value="Layout"/>
                     <UserString key="ToolTipLayout" value="TextToolTip"/>
-                    <UserString key="Caption_Text" value="#{SettingsMenu:SecondaryLanguageTooltip}"/>
+                    <UserString key="Caption_Text" value="#{OMWEngine:SecondaryLanguageTooltip}"/>
                 </Widget>
                 <Widget type="ComboBox" skin="MW_ComboBox" position="262 52 250 24" align="Left Top" name="SecondaryLanguage" />
             </Widget>
diff --git a/files/data/shaders/adjustments.omwfx b/files/data/shaders/adjustments.omwfx
index dff182d422..4a9d8ab73b 100644
--- a/files/data/shaders/adjustments.omwfx
+++ b/files/data/shaders/adjustments.omwfx
@@ -3,8 +3,8 @@ uniform_float uGamma {
     step = 0.01;
     min = 0.0;
     max = 5.0;
-    display_name = "#{BuiltInShaders:GammaLevelName}";
-    description = "#{BuiltInShaders:GammaLevelDescription}";
+    display_name = "#{OMWShaders:GammaLevelName}";
+    description = "#{OMWShaders:GammaLevelDescription}";
 }
 
 uniform_float uContrast {
@@ -12,8 +12,8 @@ uniform_float uContrast {
     step = 0.01;
     min = 0.0;
     max = 5.0;
-    display_name = "#{BuiltInShaders:ContrastLevelName}";
-    description = "#{BuiltInShaders:ContrastLevelDescription}";
+    display_name = "#{OMWShaders:ContrastLevelName}";
+    description = "#{OMWShaders:ContrastLevelDescription}";
 }
 
 fragment main {
@@ -31,7 +31,7 @@ fragment main {
 }
 
 technique {
-    description = "#{BuiltInShaders:AdjustmentsDescription}";
+    description = "#{OMWShaders:AdjustmentsDescription}";
     version = "1.0";
     author = "OpenMW";
     passes = main;
diff --git a/files/data/shaders/bloomlinear.omwfx b/files/data/shaders/bloomlinear.omwfx
index a0b78e4026..3de7139f39 100644
--- a/files/data/shaders/bloomlinear.omwfx
+++ b/files/data/shaders/bloomlinear.omwfx
@@ -3,48 +3,48 @@ uniform_float uGamma {
     min = 0.1;
     max = 4.0;
     step = 0.01;
-    display_name = "#{BuiltInShaders:GammaLevelName}";
-    description = "#{BuiltInShaders:GammaLevelDescription}";
+    display_name = "#{OMWShaders:GammaLevelName}";
+    description = "#{OMWShaders:GammaLevelDescription}";
 }
 uniform_float uThreshold {
     default = 0.35;
     min = 0.0;
     max = 1.0;
     step = 0.01;
-    display_name = "#{BuiltInShaders:BloomThresholdLevelName}";
-    description = "#{BuiltInShaders:BloomThresholdLevelDescription}";
+    display_name = "#{OMWShaders:BloomThresholdLevelName}";
+    description = "#{OMWShaders:BloomThresholdLevelDescription}";
 }
 uniform_float uClamp {
     default = 1.0;
     min = 0.0;
     max = 1.0;
     step = 0.01;
-    display_name = "#{BuiltInShaders:BloomClampLevelName}";
-    description = "#{BuiltInShaders:BloomClampLevelDescription}";
+    display_name = "#{OMWShaders:BloomClampLevelName}";
+    description = "#{OMWShaders:BloomClampLevelDescription}";
 }
 uniform_float uSkyFactor {
     default = 0.5;
     min = 0.0;
     max = 2.0;
     step = 0.01;
-    display_name = "#{BuiltInShaders:SkyFactorLevelName}";
-    description = "#{BuiltInShaders:SkyFactorLevelDescription}";
+    display_name = "#{OMWShaders:SkyFactorLevelName}";
+    description = "#{OMWShaders:SkyFactorLevelDescription}";
 }
 uniform_float uRadius {
     default = 0.5;
     min = 0.0;
     max = 1.0;
     step = 0.01;
-    display_name = "#{BuiltInShaders:RadiusLevelName}";
-    description = "#{BuiltInShaders:RadiusLevelDescription}";
+    display_name = "#{OMWShaders:RadiusLevelName}";
+    description = "#{OMWShaders:RadiusLevelDescription}";
 }
 uniform_float uStrength {
     default = 0.25;
     min = 0.0;
     max = 1.0;
     step = 0.01;
-    display_name = "#{BuiltInShaders:StrengthLevelName}";
-    description = "#{BuiltInShaders:StrengthLevelDescription}";
+    display_name = "#{OMWShaders:StrengthLevelName}";
+    description = "#{OMWShaders:StrengthLevelDescription}";
 }
 
 shared {
@@ -215,7 +215,7 @@ fragment final(rt1=RT_Vertical) {
 
 technique {
     passes = nomipmap, horizontal, vertical, final;
-    description = "#{BuiltInShaders:BloomDescription}";
+    description = "#{OMWShaders:BloomDescription}";
     author = "OpenMW";
     version = "1.0";
 }
diff --git a/files/data/shaders/debug.omwfx b/files/data/shaders/debug.omwfx
index addcbf6c38..4bfeea2499 100644
--- a/files/data/shaders/debug.omwfx
+++ b/files/data/shaders/debug.omwfx
@@ -1,7 +1,7 @@
 uniform_bool uDisplayDepth {
-    header = "#{BuiltInShaders:DebugHeaderDepth}";
+    header = "#{OMWShaders:DebugHeaderDepth}";
     default = true;
-    display_name = "#{BuiltInShaders:DisplayDepthName}";
+    display_name = "#{OMWShaders:DisplayDepthName}";
 }
 
 uniform_float uDepthFactor {
@@ -9,14 +9,14 @@ uniform_float uDepthFactor {
     min = 0.01;
     max = 20.0;
     default = 1.0;
-    display_name = "#{BuiltInShaders:DisplayDepthFactorName}";
-    description = "#{BuiltInShaders:DisplayDepthFactorDescription}";
+    display_name = "#{OMWShaders:DisplayDepthFactorName}";
+    description = "#{OMWShaders:DisplayDepthFactorDescription}";
 }
 
 uniform_bool uDisplayNormals {
-    header = "#{BuiltInShaders:DebugHeaderNormals}";
+    header = "#{OMWShaders:DebugHeaderNormals}";
     default = true;
-    display_name = "#{BuiltInShaders:DisplayNormalsName}";
+    display_name = "#{OMWShaders:DisplayNormalsName}";
 }
 
 fragment main {
@@ -38,7 +38,7 @@ fragment main {
 
 technique {
     passes = main;
-    description = "#{BuiltInShaders:DebugDescription}";
+    description = "#{OMWShaders:DebugDescription}";
     author = "OpenMW";
     version = "1.0";
     pass_normals = true;