diff --git a/src/Ryujinx/Common/Locale/LocaleManager.cs b/src/Ryujinx/Common/LocaleManager.cs
similarity index 100%
rename from src/Ryujinx/Common/Locale/LocaleManager.cs
rename to src/Ryujinx/Common/LocaleManager.cs
diff --git a/src/Ryujinx/Common/Icon/IconExtension.cs b/src/Ryujinx/Common/MarkupExtensions/IconExtension.cs
similarity index 96%
rename from src/Ryujinx/Common/Icon/IconExtension.cs
rename to src/Ryujinx/Common/MarkupExtensions/IconExtension.cs
index 41bdf5b02..15b1ad112 100644
--- a/src/Ryujinx/Common/Icon/IconExtension.cs
+++ b/src/Ryujinx/Common/MarkupExtensions/IconExtension.cs
@@ -4,7 +4,7 @@ using Avalonia.Markup.Xaml.MarkupExtensions;
 using Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings;
 using System;
 
-namespace Ryujinx.Ava.Common.Icon
+namespace Ryujinx.Ava.Common.Markup
 {
     internal class IconExtension(string iconString) : MarkupExtension
     {
diff --git a/src/Ryujinx/Common/Locale/LocaleExtension.cs b/src/Ryujinx/Common/MarkupExtensions/LocaleExtension.cs
similarity index 92%
rename from src/Ryujinx/Common/Locale/LocaleExtension.cs
rename to src/Ryujinx/Common/MarkupExtensions/LocaleExtension.cs
index 54441c4cc..60d435e30 100644
--- a/src/Ryujinx/Common/Locale/LocaleExtension.cs
+++ b/src/Ryujinx/Common/MarkupExtensions/LocaleExtension.cs
@@ -2,9 +2,10 @@ using Avalonia.Data.Core;
 using Avalonia.Markup.Xaml;
 using Avalonia.Markup.Xaml.MarkupExtensions;
 using Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings;
+using Ryujinx.Ava.Common.Locale;
 using System;
 
-namespace Ryujinx.Ava.Common.Locale
+namespace Ryujinx.Ava.Common.Markup
 {
     internal class LocaleExtension(LocaleKeys key) : MarkupExtension
     {
diff --git a/src/Ryujinx/UI/Applet/ControllerAppletDialog.axaml b/src/Ryujinx/UI/Applet/ControllerAppletDialog.axaml
index e24a1bb1d..038698f9f 100644
--- a/src/Ryujinx/UI/Applet/ControllerAppletDialog.axaml
+++ b/src/Ryujinx/UI/Applet/ControllerAppletDialog.axaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:applet="using:Ryujinx.Ava.UI.Applet"
     mc:Ignorable="d"
     Width="400"
@@ -25,11 +25,11 @@
                 Spacing="10"
                 Margin="10">
                 <TextBlock
-                    Text="{locale:Locale ControllerAppletDescription}" />
+                    Text="{ext:Locale ControllerAppletDescription}" />
                 <TextBlock
                     IsVisible="{Binding IsDocked}"
                     FontWeight="Bold"
-                    Text="{locale:Locale ControllerAppletDocked}" />
+                    Text="{ext:Locale ControllerAppletDocked}" />
             </StackPanel>
         </Border>
         <Border
@@ -48,7 +48,7 @@
                     VerticalAlignment="Center"
                     TextAlignment="Center"
                     FontWeight="Bold"
-                    Text="{locale:Locale ControllerAppletControllers}" />
+                    Text="{ext:Locale ControllerAppletControllers}" />
                 <StackPanel
                     Spacing="10"
                     HorizontalAlignment="Center"
@@ -96,7 +96,7 @@
                     VerticalAlignment="Center"
                     TextAlignment="Center"
                     FontWeight="Bold"
-                    Text="{locale:Locale ControllerAppletPlayers}" />
+                    Text="{ext:Locale ControllerAppletPlayers}" />
                 <Border Height="50">
                     <TextBlock
                         HorizontalAlignment="Center"
@@ -121,13 +121,13 @@
                     Name="SaveButton"
                     MinWidth="90"
                     Command="{Binding OpenSettingsWindow}">
-                    <TextBlock Text="{locale:Locale DialogOpenSettingsWindowLabel}" />
+                    <TextBlock Text="{ext:Locale DialogOpenSettingsWindowLabel}" />
                 </Button>
                 <Button
                     Name="CancelButton"
                     MinWidth="90"
                     Command="{Binding Close}">
-                    <TextBlock Text="{locale:Locale SettingsButtonClose}" />
+                    <TextBlock Text="{ext:Locale SettingsButtonClose}" />
                 </Button>
             </StackPanel>
         </Panel>
diff --git a/src/Ryujinx/UI/Applet/ErrorAppletWindow.axaml b/src/Ryujinx/UI/Applet/ErrorAppletWindow.axaml
index 709d833b8..c7aa56fb8 100644
--- a/src/Ryujinx/UI/Applet/ErrorAppletWindow.axaml
+++ b/src/Ryujinx/UI/Applet/ErrorAppletWindow.axaml
@@ -3,9 +3,9 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    Title="{locale:Locale ErrorWindowTitle}"
+    Title="{ext:Locale ErrorWindowTitle}"
     xmlns:views="using:Ryujinx.Ava.UI.Applet"
     Width="450"
     Height="340"
diff --git a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml
index 4a6c99d1d..926af7686 100644
--- a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml
@@ -2,109 +2,108 @@
     x:Class="Ryujinx.Ava.UI.Controls.ApplicationContextMenu"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
-    xmlns:icon="clr-namespace:Ryujinx.Ava.Common.Icon"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     x:DataType="viewModels:MainWindowViewModel">
     <MenuItem
         Click="RunApplication_Click"
-        Header="{locale:Locale GameListContextMenuRunApplication}"
-        Icon="{icon:Icon fa-solid fa-play}"/>
+        Header="{ext:Locale GameListContextMenuRunApplication}"
+        Icon="{ext:Icon fa-solid fa-play}"/>
     <MenuItem
         Click="ToggleFavorite_Click"
-        Header="{locale:Locale GameListContextMenuToggleFavorite}"
-        Icon="{icon:Icon fa-solid fa-star}"
-        ToolTip.Tip="{locale:Locale GameListContextMenuToggleFavoriteToolTip}" />
+        Header="{ext:Locale GameListContextMenuToggleFavorite}"
+        Icon="{ext:Icon fa-solid fa-star}"
+        ToolTip.Tip="{ext:Locale GameListContextMenuToggleFavoriteToolTip}" />
     <MenuItem
         Click="CreateApplicationShortcut_Click"
-        Header="{locale:Locale GameListContextMenuCreateShortcut}"
+        Header="{ext:Locale GameListContextMenuCreateShortcut}"
         IsEnabled="{Binding CreateShortcutEnabled}"
-        Icon="{icon:Icon fa-solid fa-bookmark}"
-        ToolTip.Tip="{OnPlatform Default={locale:Locale GameListContextMenuCreateShortcutToolTip}, macOS={locale:Locale GameListContextMenuCreateShortcutToolTipMacOS}}" />
+        Icon="{ext:Icon fa-solid fa-bookmark}"
+        ToolTip.Tip="{OnPlatform Default={ext:Locale GameListContextMenuCreateShortcutToolTip}, macOS={ext:Locale GameListContextMenuCreateShortcutToolTipMacOS}}" />
     <Separator />
     <MenuItem
         Click="OpenUserSaveDirectory_Click"
-        Header="{locale:Locale GameListContextMenuOpenUserSaveDirectory}"
-        Icon="{icon:Icon mdi-folder-account}"
+        Header="{ext:Locale GameListContextMenuOpenUserSaveDirectory}"
+        Icon="{ext:Icon mdi-folder-account}"
         IsEnabled="{Binding OpenUserSaveDirectoryEnabled}"
-        ToolTip.Tip="{locale:Locale GameListContextMenuOpenUserSaveDirectoryToolTip}" />
+        ToolTip.Tip="{ext:Locale GameListContextMenuOpenUserSaveDirectoryToolTip}" />
     <MenuItem
         Click="OpenDeviceSaveDirectory_Click"
-        Header="{locale:Locale GameListContextMenuOpenDeviceSaveDirectory}"
+        Header="{ext:Locale GameListContextMenuOpenDeviceSaveDirectory}"
         IsEnabled="{Binding OpenDeviceSaveDirectoryEnabled}"
-        ToolTip.Tip="{locale:Locale GameListContextMenuOpenDeviceSaveDirectoryToolTip}" />
+        ToolTip.Tip="{ext:Locale GameListContextMenuOpenDeviceSaveDirectoryToolTip}" />
     <MenuItem
         Click="OpenBcatSaveDirectory_Click"
-        Header="{locale:Locale GameListContextMenuOpenBcatSaveDirectory}"
+        Header="{ext:Locale GameListContextMenuOpenBcatSaveDirectory}"
         IsEnabled="{Binding OpenBcatSaveDirectoryEnabled}"
-        ToolTip.Tip="{locale:Locale GameListContextMenuOpenBcatSaveDirectoryToolTip}" />
+        ToolTip.Tip="{ext:Locale GameListContextMenuOpenBcatSaveDirectoryToolTip}" />
     <Separator />
     <MenuItem
         Click="OpenTitleUpdateManager_Click"
-        Header="{locale:Locale GameListContextMenuManageTitleUpdates}"
-        Icon="{icon:Icon fa-solid fa-code-compare}"
-        ToolTip.Tip="{locale:Locale GameListContextMenuManageTitleUpdatesToolTip}" />
+        Header="{ext:Locale GameListContextMenuManageTitleUpdates}"
+        Icon="{ext:Icon fa-solid fa-code-compare}"
+        ToolTip.Tip="{ext:Locale GameListContextMenuManageTitleUpdatesToolTip}" />
     <MenuItem
         Click="OpenDownloadableContentManager_Click"
-        Header="{locale:Locale GameListContextMenuManageDlc}"
-        Icon="{icon:Icon fa-solid fa-download}"
-        ToolTip.Tip="{locale:Locale GameListContextMenuManageDlcToolTip}" />
+        Header="{ext:Locale GameListContextMenuManageDlc}"
+        Icon="{ext:Icon fa-solid fa-download}"
+        ToolTip.Tip="{ext:Locale GameListContextMenuManageDlcToolTip}" />
     <MenuItem
         Click="OpenCheatManager_Click"
-        Header="{locale:Locale GameListContextMenuManageCheat}"
-        Icon="{icon:Icon fa-solid fa-code}"
-        ToolTip.Tip="{locale:Locale GameListContextMenuManageCheatToolTip}" />
+        Header="{ext:Locale GameListContextMenuManageCheat}"
+        Icon="{ext:Icon fa-solid fa-code}"
+        ToolTip.Tip="{ext:Locale GameListContextMenuManageCheatToolTip}" />
     <MenuItem
         Click="OpenModManager_Click"
-        Header="{locale:Locale GameListContextMenuManageMod}"
-        Icon="{icon:Icon mdi-view-module}"
-        ToolTip.Tip="{locale:Locale GameListContextMenuManageModToolTip}" />
+        Header="{ext:Locale GameListContextMenuManageMod}"
+        Icon="{ext:Icon mdi-view-module}"
+        ToolTip.Tip="{ext:Locale GameListContextMenuManageModToolTip}" />
     <Separator />
     <MenuItem
         Click="OpenModsDirectory_Click"
-        Header="{locale:Locale GameListContextMenuOpenModsDirectory}"
-        Icon="{icon:Icon mdi-folder-file}"
-        ToolTip.Tip="{locale:Locale GameListContextMenuOpenModsDirectoryToolTip}" />
+        Header="{ext:Locale GameListContextMenuOpenModsDirectory}"
+        Icon="{ext:Icon mdi-folder-file}"
+        ToolTip.Tip="{ext:Locale GameListContextMenuOpenModsDirectoryToolTip}" />
     <MenuItem
         Click="OpenSdModsDirectory_Click"
-        Header="{locale:Locale GameListContextMenuOpenSdModsDirectory}"
-        Icon="{icon:Icon mdi-folder-file}"
-        ToolTip.Tip="{locale:Locale GameListContextMenuOpenSdModsDirectoryToolTip}" />
+        Header="{ext:Locale GameListContextMenuOpenSdModsDirectory}"
+        Icon="{ext:Icon mdi-folder-file}"
+        ToolTip.Tip="{ext:Locale GameListContextMenuOpenSdModsDirectoryToolTip}" />
     <Separator />
-    <MenuItem Header="{locale:Locale GameListContextMenuCacheManagement}" Icon="{icon:Icon mdi-cached}">
+    <MenuItem Header="{ext:Locale GameListContextMenuCacheManagement}" Icon="{ext:Icon mdi-cached}">
         <MenuItem
             Click="PurgePtcCache_Click"
-            Header="{locale:Locale GameListContextMenuCacheManagementPurgePptc}"
-            Icon="{icon:Icon mdi-refresh}"
-            ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementPurgePptcToolTip}" />
+            Header="{ext:Locale GameListContextMenuCacheManagementPurgePptc}"
+            Icon="{ext:Icon mdi-refresh}"
+            ToolTip.Tip="{ext:Locale GameListContextMenuCacheManagementPurgePptcToolTip}" />
         <MenuItem
             Click="PurgeShaderCache_Click"
-            Header="{locale:Locale GameListContextMenuCacheManagementPurgeShaderCache}"
-            Icon="{icon:Icon mdi-delete-alert}"
-            ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementPurgeShaderCacheToolTip}" />
+            Header="{ext:Locale GameListContextMenuCacheManagementPurgeShaderCache}"
+            Icon="{ext:Icon mdi-delete-alert}"
+            ToolTip.Tip="{ext:Locale GameListContextMenuCacheManagementPurgeShaderCacheToolTip}" />
         <MenuItem
             Click="OpenPtcDirectory_Click"
-            Header="{locale:Locale GameListContextMenuCacheManagementOpenPptcDirectory}"
-            Icon="{icon:Icon mdi-folder-arrow-up-down}"
-            ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementOpenPptcDirectoryToolTip}" />
+            Header="{ext:Locale GameListContextMenuCacheManagementOpenPptcDirectory}"
+            Icon="{ext:Icon mdi-folder-arrow-up-down}"
+            ToolTip.Tip="{ext:Locale GameListContextMenuCacheManagementOpenPptcDirectoryToolTip}" />
         <MenuItem
             Click="OpenShaderCacheDirectory_Click"
-            Header="{locale:Locale GameListContextMenuCacheManagementOpenShaderCacheDirectory}"
-            Icon="{icon:Icon mdi-folder-arrow-up-down}"
-            ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementOpenShaderCacheDirectoryToolTip}" />
+            Header="{ext:Locale GameListContextMenuCacheManagementOpenShaderCacheDirectory}"
+            Icon="{ext:Icon mdi-folder-arrow-up-down}"
+            ToolTip.Tip="{ext:Locale GameListContextMenuCacheManagementOpenShaderCacheDirectoryToolTip}" />
     </MenuItem>
-    <MenuItem Header="{locale:Locale GameListContextMenuExtractData}">
+    <MenuItem Header="{ext:Locale GameListContextMenuExtractData}">
         <MenuItem
             Click="ExtractApplicationExeFs_Click"
-            Header="{locale:Locale GameListContextMenuExtractDataExeFS}"
-            ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataExeFSToolTip}" />
+            Header="{ext:Locale GameListContextMenuExtractDataExeFS}"
+            ToolTip.Tip="{ext:Locale GameListContextMenuExtractDataExeFSToolTip}" />
         <MenuItem
             Click="ExtractApplicationRomFs_Click"
-            Header="{locale:Locale GameListContextMenuExtractDataRomFS}"
-            ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataRomFSToolTip}" />
+            Header="{ext:Locale GameListContextMenuExtractDataRomFS}"
+            ToolTip.Tip="{ext:Locale GameListContextMenuExtractDataRomFSToolTip}" />
         <MenuItem
             Click="ExtractApplicationLogo_Click"
-            Header="{locale:Locale GameListContextMenuExtractDataLogo}"
-            ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataLogoToolTip}" />
+            Header="{ext:Locale GameListContextMenuExtractDataLogo}"
+            ToolTip.Tip="{ext:Locale GameListContextMenuExtractDataLogoToolTip}" />
     </MenuItem>
 </MenuFlyout>
diff --git a/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml b/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml
index 08bdf90f4..7daf23eb6 100644
--- a/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml
@@ -1,7 +1,7 @@
 <UserControl
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
@@ -73,7 +73,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsTriggerZL}"
+                                Text="{ext:Locale ControllerSettingsTriggerZL}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="ButtonZl">
                                 <TextBlock
@@ -89,7 +89,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsTriggerL}"
+                                Text="{ext:Locale ControllerSettingsTriggerL}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="ButtonL">
                                 <TextBlock
@@ -105,7 +105,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsButtonMinus}"
+                                Text="{ext:Locale ControllerSettingsButtonMinus}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="ButtonMinus">
                                 <TextBlock
@@ -128,7 +128,7 @@
                         <TextBlock
                             Margin="0,0,0,10"
                             HorizontalAlignment="Center"
-                            Text="{locale:Locale ControllerSettingsLStick}" />
+                            Text="{ext:Locale ControllerSettingsLStick}" />
                         <!-- Left Joystick Controller -->
                         <StackPanel Orientation="Vertical">
                             <!-- Left Joystick Button -->
@@ -139,7 +139,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickButton}"
+                                    Text="{ext:Locale ControllerSettingsStickButton}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="LeftStickButton">
                                     <TextBlock
@@ -156,7 +156,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickStick}"
+                                    Text="{ext:Locale ControllerSettingsStickStick}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="LeftJoystick" Tag="stick">
                                     <TextBlock
@@ -168,13 +168,13 @@
                                 Margin="0,8,0,8"
                                 Height="1" />
                             <CheckBox IsChecked="{Binding Config.LeftInvertStickX}">
-                                <TextBlock Text="{locale:Locale ControllerSettingsStickInvertXAxis}" />
+                                <TextBlock Text="{ext:Locale ControllerSettingsStickInvertXAxis}" />
                             </CheckBox>
                             <CheckBox IsChecked="{Binding Config.LeftInvertStickY}">
-                                <TextBlock Text="{locale:Locale ControllerSettingsStickInvertYAxis}" />
+                                <TextBlock Text="{ext:Locale ControllerSettingsStickInvertYAxis}" />
                             </CheckBox>
                             <CheckBox IsChecked="{Binding Config.LeftRotate90}">
-                                <TextBlock Text="{locale:Locale ControllerSettingsRotate90}" />
+                                <TextBlock Text="{ext:Locale ControllerSettingsRotate90}" />
                             </CheckBox>
                             <Separator
                                 Margin="0,8,0,8"
@@ -182,7 +182,7 @@
                             <StackPanel Orientation="Vertical">
                                 <TextBlock
                                     HorizontalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickDeadzone}" />
+                                    Text="{ext:Locale ControllerSettingsStickDeadzone}" />
                                 <StackPanel
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
@@ -202,7 +202,7 @@
                                 </StackPanel>
                                 <TextBlock
                                     HorizontalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickRange}" />
+                                    Text="{ext:Locale ControllerSettingsStickRange}" />
                                 <StackPanel
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
@@ -238,7 +238,7 @@
                         <TextBlock
                             Margin="0,0,0,10"
                             HorizontalAlignment="Center"
-                            Text="{locale:Locale ControllerSettingsDPad}" />
+                            Text="{ext:Locale ControllerSettingsDPad}" />
                         <StackPanel Orientation="Vertical">
                             <!-- Left DPad Up -->
                             <StackPanel
@@ -249,7 +249,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsDPadUp}"
+                                    Text="{ext:Locale ControllerSettingsDPadUp}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="DpadUp">
                                     <TextBlock
@@ -266,7 +266,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsDPadDown}"
+                                    Text="{ext:Locale ControllerSettingsDPadDown}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="DpadDown">
                                     <TextBlock
@@ -283,7 +283,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsDPadLeft}"
+                                    Text="{ext:Locale ControllerSettingsDPadLeft}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="DpadLeft">
                                     <TextBlock
@@ -300,7 +300,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsDPadRight}"
+                                    Text="{ext:Locale ControllerSettingsDPadRight}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="DpadRight">
                                     <TextBlock
@@ -334,7 +334,7 @@
                         Orientation="Vertical">
                         <TextBlock
                             HorizontalAlignment="Center"
-                            Text="{locale:Locale ControllerSettingsTriggerThreshold}" />
+                            Text="{ext:Locale ControllerSettingsTriggerThreshold}" />
                         <StackPanel
                             HorizontalAlignment="Center"
                             Orientation="Horizontal">
@@ -363,7 +363,7 @@
                                     Width="20"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsLeftSR}"
+                                    Text="{ext:Locale ControllerSettingsLeftSR}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="LeftButtonSr">
                                     <TextBlock
@@ -381,7 +381,7 @@
                                     Width="20"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsLeftSL}"
+                                    Text="{ext:Locale ControllerSettingsLeftSL}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="LeftButtonSl">
                                     <TextBlock
@@ -399,7 +399,7 @@
                                     Width="20"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsRightSR}"
+                                    Text="{ext:Locale ControllerSettingsRightSR}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="RightButtonSr">
                                     <TextBlock
@@ -417,7 +417,7 @@
                                     Width="20"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsRightSL}"
+                                    Text="{ext:Locale ControllerSettingsRightSL}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="RightButtonSl">
                                     <TextBlock
@@ -450,13 +450,13 @@
                                 MinWidth="0"
                                 Grid.Column="0"
                                 IsChecked="{Binding Config.EnableMotion, Mode=TwoWay}">
-                                <TextBlock Text="{locale:Locale ControllerSettingsMotion}" />
+                                <TextBlock Text="{ext:Locale ControllerSettingsMotion}" />
                             </CheckBox>
                             <Button
                                 Margin="10"
                                 Grid.Column="1"
                                 Command="{Binding ShowMotionConfig}">
-                                <TextBlock Text="{locale:Locale ControllerSettingsConfigureGeneral}" />
+                                <TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" />
                             </Button>
                         </Grid>
                     </Border>
@@ -476,13 +476,13 @@
                                 MinWidth="0"
                                 Grid.Column="0"
                                 IsChecked="{Binding Config.EnableRumble, Mode=TwoWay}">
-                                <TextBlock Text="{locale:Locale ControllerSettingsRumble}" />
+                                <TextBlock Text="{ext:Locale ControllerSettingsRumble}" />
                             </CheckBox>
                             <Button
                                 Margin="10"
                                 Grid.Column="1"
                                 Command="{Binding ShowRumbleConfig}">
-                                <TextBlock Text="{locale:Locale ControllerSettingsConfigureGeneral}" />
+                                <TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" />
                             </Button>
                         </Grid>
                     </Border>
@@ -519,7 +519,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsTriggerZR}"
+                                Text="{ext:Locale ControllerSettingsTriggerZR}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="ButtonZr">
                                 <TextBlock
@@ -537,7 +537,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsTriggerR}"
+                                Text="{ext:Locale ControllerSettingsTriggerR}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="ButtonR">
                                 <TextBlock
@@ -555,7 +555,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsButtonPlus}"
+                                Text="{ext:Locale ControllerSettingsButtonPlus}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="ButtonPlus">
                                 <TextBlock
@@ -578,7 +578,7 @@
                         <TextBlock
                             Margin="0,0,0,10"
                             HorizontalAlignment="Center"
-                            Text="{locale:Locale ControllerSettingsButtons}" />
+                            Text="{ext:Locale ControllerSettingsButtons}" />
                         <StackPanel
                             Orientation="Vertical">
                             <!-- Right Buttons A -->
@@ -590,7 +590,7 @@
                                     Margin="0,0,10,0"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsButtonA}"
+                                    Text="{ext:Locale ControllerSettingsButtonA}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="ButtonA">
                                     <TextBlock
@@ -607,7 +607,7 @@
                                     Margin="0,0,10,0"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsButtonB}"
+                                    Text="{ext:Locale ControllerSettingsButtonB}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="ButtonB">
                                     <TextBlock
@@ -624,7 +624,7 @@
                                     Margin="0,0,10,0"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsButtonX}"
+                                    Text="{ext:Locale ControllerSettingsButtonX}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="ButtonX">
                                     <TextBlock
@@ -641,7 +641,7 @@
                                     Margin="0,0,10,0"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsButtonY}"
+                                    Text="{ext:Locale ControllerSettingsButtonY}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="ButtonY">
                                     <TextBlock
@@ -664,7 +664,7 @@
                         <TextBlock
                             Margin="0,0,0,10"
                             HorizontalAlignment="Center"
-                            Text="{locale:Locale ControllerSettingsRStick}" />
+                            Text="{ext:Locale ControllerSettingsRStick}" />
                         <!-- Right Joystick Controller -->
                         <StackPanel Orientation="Vertical">
                             <!-- Right Joystick Button -->
@@ -675,7 +675,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickButton}"
+                                    Text="{ext:Locale ControllerSettingsStickButton}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="RightStickButton">
                                     <TextBlock
@@ -693,7 +693,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickStick}"
+                                    Text="{ext:Locale ControllerSettingsStickStick}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="RightJoystick" Tag="stick">
                                     <TextBlock
@@ -703,19 +703,19 @@
                             </StackPanel>
                             <Separator Margin="0,8,0,8" Height="1" />
                             <CheckBox IsChecked="{Binding Config.RightInvertStickX}">
-                                <TextBlock Text="{locale:Locale ControllerSettingsStickInvertXAxis}" />
+                                <TextBlock Text="{ext:Locale ControllerSettingsStickInvertXAxis}" />
                             </CheckBox>
                             <CheckBox IsChecked="{Binding Config.RightInvertStickY}">
-                                <TextBlock Text="{locale:Locale ControllerSettingsStickInvertYAxis}" />
+                                <TextBlock Text="{ext:Locale ControllerSettingsStickInvertYAxis}" />
                             </CheckBox>
                             <CheckBox IsChecked="{Binding Config.RightRotate90}">
-                                <TextBlock Text="{locale:Locale ControllerSettingsRotate90}" />
+                                <TextBlock Text="{ext:Locale ControllerSettingsRotate90}" />
                             </CheckBox>
                             <Separator Margin="0,8,0,8" Height="1" />
                             <StackPanel Orientation="Vertical">
                                 <TextBlock
                                     HorizontalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickDeadzone}" />
+                                    Text="{ext:Locale ControllerSettingsStickDeadzone}" />
                                 <StackPanel
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
@@ -737,7 +737,7 @@
                                 </StackPanel>
                                 <TextBlock
                                     HorizontalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickRange}" />
+                                    Text="{ext:Locale ControllerSettingsStickRange}" />
                                 <StackPanel
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
diff --git a/src/Ryujinx/UI/Views/Input/InputView.axaml b/src/Ryujinx/UI/Views/Input/InputView.axaml
index b4940941c..851c9c626 100644
--- a/src/Ryujinx/UI/Views/Input/InputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/InputView.axaml
@@ -2,7 +2,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:models="clr-namespace:Ryujinx.Ava.UI.Models"
@@ -56,7 +56,7 @@
                         Width="90"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Text="{locale:Locale ControllerSettingsPlayer}" />
+                        Text="{ext:Locale ControllerSettingsPlayer}" />
                     <ComboBox
                         Grid.Column="1"
                         Name="PlayerIndexBox"
@@ -90,7 +90,7 @@
                         Width="90"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Text="{locale:Locale ControllerSettingsProfile}" />
+                        Text="{ext:Locale ControllerSettingsProfile}" />
                     <ui:FAComboBox
                         Grid.Column="1"
                         IsEditable="True"
@@ -105,7 +105,7 @@
                         MinWidth="0"
                         Margin="5,0,0,0"
                         VerticalAlignment="Center"
-                        ToolTip.Tip="{locale:Locale ControllerSettingsLoadProfileToolTip}"
+                        ToolTip.Tip="{ext:Locale ControllerSettingsLoadProfileToolTip}"
                         Command="{Binding LoadProfile}">
                         <ui:SymbolIcon
                             Symbol="Upload"
@@ -117,7 +117,7 @@
                             MinWidth="0"
                             Margin="5,0,0,0"
                             VerticalAlignment="Center"
-                            ToolTip.Tip="{locale:Locale ControllerSettingsSaveProfileToolTip}"
+                            ToolTip.Tip="{ext:Locale ControllerSettingsSaveProfileToolTip}"
                             Command="{Binding SaveProfile}">
                         <ui:SymbolIcon
                             Symbol="Save"
@@ -129,7 +129,7 @@
                             MinWidth="0"
                             Margin="5,0,0,0"
                             VerticalAlignment="Center"
-                            ToolTip.Tip="{locale:Locale ControllerSettingsRemoveProfileToolTip}"
+                            ToolTip.Tip="{ext:Locale ControllerSettingsRemoveProfileToolTip}"
                             Command="{Binding RemoveProfile}">
                         <ui:SymbolIcon
                             Symbol="Delete"
@@ -161,7 +161,7 @@
                         Width="90"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Text="{locale:Locale ControllerSettingsInputDevice}" />
+                        Text="{ext:Locale ControllerSettingsInputDevice}" />
                     <ComboBox
                         Grid.Column="1"
                         Name="DeviceBox"
@@ -196,7 +196,7 @@
                         Width="90"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Text="{locale:Locale ControllerSettingsControllerType}" />
+                        Text="{ext:Locale ControllerSettingsControllerType}" />
                     <ComboBox
                         Grid.Column="1"
                         HorizontalAlignment="Stretch"
diff --git a/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml b/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml
index e4566f463..ecb9053f7 100644
--- a/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml
@@ -1,7 +1,7 @@
 <UserControl
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels.Input"
@@ -72,7 +72,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsTriggerZL}"
+                                Text="{ext:Locale ControllerSettingsTriggerZL}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="ButtonZl">
                                 <TextBlock
@@ -88,7 +88,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsTriggerL}"
+                                Text="{ext:Locale ControllerSettingsTriggerL}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="ButtonL">
                                 <TextBlock
@@ -104,7 +104,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsButtonMinus}"
+                                Text="{ext:Locale ControllerSettingsButtonMinus}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="ButtonMinus">
                                 <TextBlock
@@ -127,7 +127,7 @@
                         <TextBlock
                             Margin="0,0,0,10"
                             HorizontalAlignment="Center"
-                            Text="{locale:Locale ControllerSettingsLStick}" />
+                            Text="{ext:Locale ControllerSettingsLStick}" />
                         <!-- Left Joystick Keyboard -->
                         <StackPanel Orientation="Vertical">
                             <!-- Left Joystick Button -->
@@ -139,7 +139,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickButton}"
+                                    Text="{ext:Locale ControllerSettingsStickButton}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="LeftStickButton">
                                     <TextBlock
@@ -156,7 +156,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickUp}"
+                                    Text="{ext:Locale ControllerSettingsStickUp}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="LeftStickUp">
                                     <TextBlock
@@ -173,7 +173,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickDown}"
+                                    Text="{ext:Locale ControllerSettingsStickDown}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="LeftStickDown">
                                     <TextBlock
@@ -190,7 +190,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickLeft}"
+                                    Text="{ext:Locale ControllerSettingsStickLeft}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="LeftStickLeft">
                                     <TextBlock
@@ -207,7 +207,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickRight}"
+                                    Text="{ext:Locale ControllerSettingsStickRight}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="LeftStickRight">
                                     <TextBlock
@@ -232,7 +232,7 @@
                         <TextBlock
                             Margin="0,0,0,10"
                             HorizontalAlignment="Center"
-                            Text="{locale:Locale ControllerSettingsDPad}" />
+                            Text="{ext:Locale ControllerSettingsDPad}" />
                         <StackPanel Orientation="Vertical">
                             <!-- Left DPad Up -->
                             <StackPanel
@@ -243,7 +243,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsDPadUp}"
+                                    Text="{ext:Locale ControllerSettingsDPadUp}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="DpadUp">
                                     <TextBlock
@@ -260,7 +260,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsDPadDown}"
+                                    Text="{ext:Locale ControllerSettingsDPadDown}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="DpadDown">
                                     <TextBlock
@@ -277,7 +277,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsDPadLeft}"
+                                    Text="{ext:Locale ControllerSettingsDPadLeft}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="DpadLeft">
                                     <TextBlock
@@ -294,7 +294,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsDPadRight}"
+                                    Text="{ext:Locale ControllerSettingsDPadRight}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="DpadRight">
                                     <TextBlock
@@ -337,7 +337,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsLeftSR}"
+                                Text="{ext:Locale ControllerSettingsLeftSR}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="LeftButtonSr">
                                 <TextBlock
@@ -355,7 +355,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsLeftSL}"
+                                Text="{ext:Locale ControllerSettingsLeftSL}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="LeftButtonSl">
                                 <TextBlock
@@ -373,7 +373,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsRightSR}"
+                                Text="{ext:Locale ControllerSettingsRightSR}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="RightButtonSr">
                                 <TextBlock
@@ -391,7 +391,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsRightSL}"
+                                Text="{ext:Locale ControllerSettingsRightSL}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="RightButtonSl">
                                 <TextBlock
@@ -433,7 +433,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsTriggerZR}"
+                                Text="{ext:Locale ControllerSettingsTriggerZR}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="ButtonZr">
                                 <TextBlock
@@ -451,7 +451,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsTriggerR}"
+                                Text="{ext:Locale ControllerSettingsTriggerR}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="ButtonR">
                                 <TextBlock
@@ -469,7 +469,7 @@
                                 Width="20"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsButtonPlus}"
+                                Text="{ext:Locale ControllerSettingsButtonPlus}"
                                 TextAlignment="Center" />
                             <ToggleButton Name="ButtonPlus">
                                 <TextBlock
@@ -492,7 +492,7 @@
                         <TextBlock
                             Margin="0,0,0,10"
                             HorizontalAlignment="Center"
-                            Text="{locale:Locale ControllerSettingsButtons}" />
+                            Text="{ext:Locale ControllerSettingsButtons}" />
                         <StackPanel
                             Orientation="Vertical">
                             <!-- Right Buttons A -->
@@ -504,7 +504,7 @@
                                     Margin="0,0,10,0"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsButtonA}"
+                                    Text="{ext:Locale ControllerSettingsButtonA}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="ButtonA">
                                     <TextBlock
@@ -521,7 +521,7 @@
                                     Margin="0,0,10,0"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsButtonB}"
+                                    Text="{ext:Locale ControllerSettingsButtonB}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="ButtonB">
                                     <TextBlock
@@ -538,7 +538,7 @@
                                     Margin="0,0,10,0"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsButtonX}"
+                                    Text="{ext:Locale ControllerSettingsButtonX}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="ButtonX">
                                     <TextBlock
@@ -555,7 +555,7 @@
                                     Margin="0,0,10,0"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsButtonY}"
+                                    Text="{ext:Locale ControllerSettingsButtonY}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="ButtonY">
                                     <TextBlock
@@ -578,7 +578,7 @@
                         <TextBlock
                             Margin="0,0,0,10"
                             HorizontalAlignment="Center"
-                            Text="{locale:Locale ControllerSettingsRStick}" />
+                            Text="{ext:Locale ControllerSettingsRStick}" />
                         <!-- Right Joystick Keyboard -->
                         <StackPanel Orientation="Vertical">
                             <!-- Right Joystick Button -->
@@ -590,7 +590,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickButton}"
+                                    Text="{ext:Locale ControllerSettingsStickButton}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="RightStickButton">
                                     <TextBlock
@@ -607,7 +607,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickUp}"
+                                    Text="{ext:Locale ControllerSettingsStickUp}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="RightStickUp">
                                     <TextBlock
@@ -624,7 +624,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickDown}"
+                                    Text="{ext:Locale ControllerSettingsStickDown}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="RightStickDown">
                                     <TextBlock
@@ -641,7 +641,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickLeft}"
+                                    Text="{ext:Locale ControllerSettingsStickLeft}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="RightStickLeft">
                                     <TextBlock
@@ -658,7 +658,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{locale:Locale ControllerSettingsStickRight}"
+                                    Text="{ext:Locale ControllerSettingsStickRight}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="RightStickRight">
                                     <TextBlock
@@ -672,4 +672,4 @@
             </StackPanel>
         </Grid>
     </StackPanel>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/src/Ryujinx/UI/Views/Input/MotionInputView.axaml b/src/Ryujinx/UI/Views/Input/MotionInputView.axaml
index 0d018e297..9096a06d1 100644
--- a/src/Ryujinx/UI/Views/Input/MotionInputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/MotionInputView.axaml
@@ -5,7 +5,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
     xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels.Input"
     mc:Ignorable="d"
     x:Class="Ryujinx.Ava.UI.Views.Input.MotionInputView"
@@ -23,7 +23,7 @@
                 <TextBlock
                     Margin="0"
                     HorizontalAlignment="Center"
-                    Text="{locale:Locale ControllerSettingsMotionGyroSensitivity}" />
+                    Text="{ext:Locale ControllerSettingsMotionGyroSensitivity}" />
                 <controls:SliderScroll
                     Margin="0,-5,0,-5"
                     Width="150"
@@ -45,7 +45,7 @@
                 <TextBlock
                     Margin="0"
                     HorizontalAlignment="Center"
-                    Text="{locale:Locale ControllerSettingsMotionGyroDeadzone}" />
+                    Text="{ext:Locale ControllerSettingsMotionGyroDeadzone}" />
                 <controls:SliderScroll
                     Margin="0,-5,0,-5"
                     Width="150"
@@ -70,7 +70,7 @@
                 <TextBlock
                     Margin="0,3,0,0"
                     VerticalAlignment="Center"
-                    Text="{locale:Locale ControllerSettingsMotionUseCemuhookCompatibleMotion}" />
+                    Text="{ext:Locale ControllerSettingsMotionUseCemuhookCompatibleMotion}" />
             </CheckBox>
         </StackPanel>
         <Border
@@ -98,7 +98,7 @@
                             Margin="5"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            Text="{locale:Locale ControllerSettingsMotionServerHost}" />
+                            Text="{ext:Locale ControllerSettingsMotionServerHost}" />
                         <TextBox
                             Height="30"
                             MinWidth="100"
@@ -130,7 +130,7 @@
                             <TextBlock
                                 Margin="0,10,0,0"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsMotionControllerSlot}" />
+                                Text="{ext:Locale ControllerSettingsMotionControllerSlot}" />
                             <ui:NumberBox
                                 Grid.Row="0"
                                 Grid.Column="1"
@@ -145,7 +145,7 @@
                                 Grid.Row="1"
                                 Grid.Column="0"
                                 VerticalAlignment="Center"
-                                Text="{locale:Locale ControllerSettingsMotionRightJoyConSlot}" />
+                                Text="{ext:Locale ControllerSettingsMotionRightJoyConSlot}" />
                             <ui:NumberBox
                                 Grid.Row="1"
                                 Grid.Column="1"
@@ -162,7 +162,7 @@
                         IsChecked="{Binding MirrorInput, Mode=TwoWay}">
                         <TextBlock
                             HorizontalAlignment="Center"
-                            Text="{locale:Locale ControllerSettingsMotionMirrorInput}" />
+                            Text="{ext:Locale ControllerSettingsMotionMirrorInput}" />
                     </CheckBox>
                 </StackPanel>
             </Grid>
diff --git a/src/Ryujinx/UI/Views/Input/RumbleInputView.axaml b/src/Ryujinx/UI/Views/Input/RumbleInputView.axaml
index 1beb1f06e..5f6cde5b5 100644
--- a/src/Ryujinx/UI/Views/Input/RumbleInputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/RumbleInputView.axaml
@@ -4,7 +4,7 @@
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels.Input"
     mc:Ignorable="d"
     x:Class="Ryujinx.Ava.UI.Views.Input.RumbleInputView"
@@ -21,7 +21,7 @@
                     Width="100"
                     TextWrapping="WrapWithOverflow"
                     HorizontalAlignment="Center"
-                    Text="{locale:Locale ControllerSettingsRumbleStrongMultiplier}" />
+                    Text="{ext:Locale ControllerSettingsRumbleStrongMultiplier}" />
                 <controls:SliderScroll
                     Margin="0,-5,0,-5"
                     Width="200"
@@ -41,7 +41,7 @@
                     Width="100"
                     TextWrapping="WrapWithOverflow"
                     HorizontalAlignment="Center"
-                    Text="{locale:Locale ControllerSettingsRumbleWeakMultiplier}" />
+                    Text="{ext:Locale ControllerSettingsRumbleWeakMultiplier}" />
                 <controls:SliderScroll
                     Margin="0,-5,0,-5"
                     Width="200"
diff --git a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
index 6ee055d25..fe8b64eb6 100644
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
@@ -3,8 +3,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
-    xmlns:icon="clr-namespace:Ryujinx.Ava.Common.Icon"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     mc:Ignorable="d"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     x:DataType="viewModels:MainWindowViewModel"
@@ -31,60 +30,60 @@
                     <DockPanel Margin="0" HorizontalAlignment="Stretch" />
                 </ItemsPanelTemplate>
             </Menu.ItemsPanel>
-            <MenuItem VerticalAlignment="Center" Header="{locale:Locale MenuBarFile}">
+            <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarFile}">
                 <MenuItem
                     Command="{Binding OpenFile}"
-                    Header="{locale:Locale MenuBarFileOpenFromFile}"
-                    Icon="{icon:Icon fa-solid fa-file}"
+                    Header="{ext:Locale MenuBarFileOpenFromFile}"
+                    Icon="{ext:Icon fa-solid fa-file}"
                     IsEnabled="{Binding EnableNonGameRunningControls}"
-                    ToolTip.Tip="{locale:Locale LoadApplicationFileTooltip}" />
+                    ToolTip.Tip="{ext:Locale LoadApplicationFileTooltip}" />
                 <MenuItem
                     Command="{Binding OpenFolder}"
-                    Header="{locale:Locale MenuBarFileOpenUnpacked}"
-                    Icon="{icon:Icon fa-solid fa-folder}"
+                    Header="{ext:Locale MenuBarFileOpenUnpacked}"
+                    Icon="{ext:Icon fa-solid fa-folder}"
                     IsEnabled="{Binding EnableNonGameRunningControls}"
-                    ToolTip.Tip="{locale:Locale LoadApplicationFolderTooltip}" />
+                    ToolTip.Tip="{ext:Locale LoadApplicationFolderTooltip}" />
                 <MenuItem
                     Command="{Binding LoadDlcFromFolder}"
-                    Header="{locale:Locale MenuBarFileLoadDlcFromFolder}"
-                    Icon="{icon:Icon fa-solid fa-download}"
+                    Header="{ext:Locale MenuBarFileLoadDlcFromFolder}"
+                    Icon="{ext:Icon fa-solid fa-download}"
                     IsEnabled="{Binding EnableNonGameRunningControls}"
-                    ToolTip.Tip="{locale:Locale LoadDlcFromFolderTooltip}" />
+                    ToolTip.Tip="{ext:Locale LoadDlcFromFolderTooltip}" />
                 <MenuItem
                     Command="{Binding LoadTitleUpdatesFromFolder}"
-                    Header="{locale:Locale MenuBarFileLoadTitleUpdatesFromFolder}"
-                    Icon="{icon:Icon fa-solid fa-code-compare}"
+                    Header="{ext:Locale MenuBarFileLoadTitleUpdatesFromFolder}"
+                    Icon="{ext:Icon fa-solid fa-code-compare}"
                     IsEnabled="{Binding EnableNonGameRunningControls}"
-                    ToolTip.Tip="{locale:Locale LoadTitleUpdatesFromFolderTooltip}" />
-                <MenuItem Header="{locale:Locale MenuBarFileOpenApplet}" IsEnabled="{Binding IsAppletMenuActive}" Icon="{icon:Icon mdi-launch}">
+                    ToolTip.Tip="{ext:Locale LoadTitleUpdatesFromFolderTooltip}" />
+                <MenuItem Header="{ext:Locale MenuBarFileOpenApplet}" IsEnabled="{Binding IsAppletMenuActive}" Icon="{ext:Icon mdi-launch}">
                     <MenuItem
                         Click="OpenMiiApplet"
                         Header="Mii Edit Applet"
-                        Icon="{icon:Icon fa-solid fa-person}"
-                        ToolTip.Tip="{locale:Locale MenuBarFileOpenAppletOpenMiiAppletToolTip}" />
+                        Icon="{ext:Icon fa-solid fa-person}"
+                        ToolTip.Tip="{ext:Locale MenuBarFileOpenAppletOpenMiiAppletToolTip}" />
                 </MenuItem>
                 <Separator />
                 <MenuItem
                     Command="{Binding OpenRyujinxFolder}"
-                    Header="{locale:Locale MenuBarFileOpenEmuFolder}"
-                    ToolTip.Tip="{locale:Locale OpenRyujinxFolderTooltip}" />
+                    Header="{ext:Locale MenuBarFileOpenEmuFolder}"
+                    ToolTip.Tip="{ext:Locale OpenRyujinxFolderTooltip}" />
                 <MenuItem
                     Command="{Binding OpenLogsFolder}"
-                    Header="{locale:Locale MenuBarFileOpenLogsFolder}"
-                    ToolTip.Tip="{locale:Locale OpenRyujinxLogsTooltip}" />
+                    Header="{ext:Locale MenuBarFileOpenLogsFolder}"
+                    ToolTip.Tip="{ext:Locale OpenRyujinxLogsTooltip}" />
                 <Separator />
                 <MenuItem
                     Click="CloseWindow"
-                    Header="{locale:Locale MenuBarFileExit}"
-                    Icon="{icon:Icon fa-solid fa-xmark}"
-                    ToolTip.Tip="{locale:Locale ExitTooltip}" />
+                    Header="{ext:Locale MenuBarFileExit}"
+                    Icon="{ext:Icon fa-solid fa-xmark}"
+                    ToolTip.Tip="{ext:Locale ExitTooltip}" />
             </MenuItem>
-            <MenuItem VerticalAlignment="Center" Header="{locale:Locale MenuBarOptions}">
+            <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarOptions}">
                 <MenuItem
                     Command="{Binding ToggleFullscreen}"
-                    Header="{locale:Locale MenuBarOptionsToggleFullscreen}"
+                    Header="{ext:Locale MenuBarOptionsToggleFullscreen}"
                     Padding="0"
-                    Icon="{icon:Icon fa-solid fa-expand}"
+                    Icon="{ext:Icon fa-solid fa-expand}"
                     InputGesture="F11">
                     <MenuItem.Styles>
                         <Style Selector="Viewbox#PART_IconPresenter">
@@ -101,7 +100,7 @@
                 <MenuItem
                     Padding="0"
                     Command="{Binding ToggleStartGamesInFullscreen}"
-                    Header="{locale:Locale MenuBarOptionsStartGamesInFullscreen}">
+                    Header="{ext:Locale MenuBarOptionsStartGamesInFullscreen}">
                     <MenuItem.Icon>
                         <CheckBox
                             MinWidth="{DynamicResource CheckBoxSize}"
@@ -125,7 +124,7 @@
                     Padding="0"
                     IsVisible="{Binding ShowConsoleVisible}"
                     Command="{Binding ToggleShowConsole}"
-                    Header="{locale:Locale MenuBarOptionsShowConsole}">
+                    Header="{ext:Locale MenuBarOptionsShowConsole}">
                     <MenuItem.Icon>
                         <CheckBox
                             MinWidth="{DynamicResource CheckBoxSize}"
@@ -149,8 +148,8 @@
                 <MenuItem
                     Name="ChangeLanguageMenuItem" 
                     Padding="0"
-                    Header="{locale:Locale MenuBarOptionsChangeLanguage}"
-                    Icon="{icon:Icon fa-solid fa-language}">
+                    Header="{ext:Locale MenuBarOptionsChangeLanguage}"
+                    Icon="{ext:Icon fa-solid fa-language}">
                     <MenuItem.Styles>
                         <Style Selector="Viewbox#PART_IconPresenter">
                             <Setter Property="MaxHeight" Value="36" />
@@ -166,14 +165,14 @@
                 <MenuItem 
                     Name="ToggleFileTypesMenuItem" 
                     Padding="-10,0,0,0"
-                    Header="{locale:Locale MenuBarShowFileTypes}" />
+                    Header="{ext:Locale MenuBarShowFileTypes}" />
                 <Separator />
                 <MenuItem
                     Click="OpenSettings"
                     Padding="0"
-                    Header="{locale:Locale MenuBarOptionsSettings}"
-                    Icon="{icon:Icon fa-solid fa-gear}"
-                    ToolTip.Tip="{locale:Locale OpenSettingsTooltip}">
+                    Header="{ext:Locale MenuBarOptionsSettings}"
+                    Icon="{ext:Icon fa-solid fa-gear}"
+                    ToolTip.Tip="{ext:Locale OpenSettingsTooltip}">
                     <MenuItem.Styles>
                         <Style Selector="Viewbox#PART_IconPresenter">
                             <Setter Property="MaxHeight" Value="36" />
@@ -189,10 +188,10 @@
                 <MenuItem
                     Command="{Binding ManageProfiles}"
                     Padding="0"
-                    Header="{locale:Locale MenuBarOptionsManageUserProfiles}"
-                    Icon="{icon:Icon mdi-account}"
+                    Header="{ext:Locale MenuBarOptionsManageUserProfiles}"
+                    Icon="{ext:Icon mdi-account}"
                     IsEnabled="{Binding EnableNonGameRunningControls}"
-                    ToolTip.Tip="{locale:Locale OpenProfileManagerTooltip}">
+                    ToolTip.Tip="{ext:Locale OpenProfileManagerTooltip}">
                     <MenuItem.Styles>
                         <Style Selector="Viewbox#PART_IconPresenter">
                             <Setter Property="MaxHeight" Value="36" />
@@ -209,87 +208,87 @@
             <MenuItem
                 Name="ActionsMenuItem"
                 VerticalAlignment="Center"
-                Header="{locale:Locale MenuBarActions}"
+                Header="{ext:Locale MenuBarActions}"
                 IsEnabled="{Binding IsGameRunning}">
                 <MenuItem
                     Click="PauseEmulation_Click"
-                    Header="{locale:Locale MenuBarOptionsPauseEmulation}"
-                    Icon="{icon:Icon fa-solid fa-pause}"
+                    Header="{ext:Locale MenuBarOptionsPauseEmulation}"
+                    Icon="{ext:Icon fa-solid fa-pause}"
                     InputGesture="{Binding PauseKey}"
                     IsEnabled="{Binding !IsPaused}"
                     IsVisible="{Binding !IsPaused}" />
                 <MenuItem
                     Click="ResumeEmulation_Click"
-                    Header="{locale:Locale MenuBarOptionsResumeEmulation}"
-                    Icon="{icon:Icon fa-solid fa-play}"
+                    Header="{ext:Locale MenuBarOptionsResumeEmulation}"
+                    Icon="{ext:Icon fa-solid fa-play}"
                     InputGesture="{Binding PauseKey}"
                     IsEnabled="{Binding IsPaused}"
                     IsVisible="{Binding IsPaused}" />
                 <MenuItem
                     Click="StopEmulation_Click"
-                    Header="{locale:Locale MenuBarOptionsStopEmulation}"
-                    Icon="{icon:Icon fa-solid fa-stop}"
+                    Header="{ext:Locale MenuBarOptionsStopEmulation}"
+                    Icon="{ext:Icon fa-solid fa-stop}"
                     InputGesture="Escape"
                     IsEnabled="{Binding IsGameRunning}"
-                    ToolTip.Tip="{locale:Locale StopEmulationTooltip}" />
-                <MenuItem Command="{Binding SimulateWakeUpMessage}" Header="{locale:Locale MenuBarOptionsSimulateWakeUpMessage}" />
+                    ToolTip.Tip="{ext:Locale StopEmulationTooltip}" />
+                <MenuItem Command="{Binding SimulateWakeUpMessage}" Header="{ext:Locale MenuBarOptionsSimulateWakeUpMessage}" />
                 <Separator />
                 <MenuItem
                     Name="ScanAmiiboMenuItem"
                     AttachedToVisualTree="ScanAmiiboMenuItem_AttachedToVisualTree"
                     Click="OpenAmiiboWindow"
-                    Header="{locale:Locale MenuBarActionsScanAmiibo}"
-                    Icon="{icon:Icon mdi-cube-scan}"
+                    Header="{ext:Locale MenuBarActionsScanAmiibo}"
+                    Icon="{ext:Icon mdi-cube-scan}"
                     InputGesture="Ctrl + A"
                     IsEnabled="{Binding IsAmiiboRequested}" />
                 <MenuItem
                     Command="{Binding TakeScreenshot}"
-                    Header="{locale:Locale MenuBarFileToolsTakeScreenshot}"
-                    Icon="{icon:Icon mdi-monitor-screenshot}"
+                    Header="{ext:Locale MenuBarFileToolsTakeScreenshot}"
+                    Icon="{ext:Icon mdi-monitor-screenshot}"
                     InputGesture="{Binding ScreenshotKey}"
                     IsEnabled="{Binding IsGameRunning}" />
                 <MenuItem
                     Command="{Binding HideUi}"
-                    Header="{locale:Locale MenuBarFileToolsHideUi}"
-                    Icon="{icon:Icon mdi-eye-off}"
+                    Header="{ext:Locale MenuBarFileToolsHideUi}"
+                    Icon="{ext:Icon mdi-eye-off}"
                     InputGesture="{Binding ShowUiKey}"
                     IsEnabled="{Binding IsGameRunning}" />
                 <MenuItem
                     Click="OpenCheatManagerForCurrentApp"
-                    Header="{locale:Locale GameListContextMenuManageCheat}"
-                    Icon="{icon:Icon fa-solid fa-code}"
+                    Header="{ext:Locale GameListContextMenuManageCheat}"
+                    Icon="{ext:Icon fa-solid fa-code}"
                     IsEnabled="{Binding IsGameRunning}" />
             </MenuItem>
-            <MenuItem VerticalAlignment="Center" Header="{locale:Locale MenuBarTools}">
-                <MenuItem Header="{locale:Locale MenuBarToolsInstallFirmware}" Icon="{icon:Icon fa-solid fa-download}" IsEnabled="{Binding EnableNonGameRunningControls}">
-                    <MenuItem Command="{Binding InstallFirmwareFromFile}" Header="{locale:Locale MenuBarFileToolsInstallFirmwareFromFile}" Icon="{icon:Icon mdi-file-cog}" />
-                    <MenuItem Command="{Binding InstallFirmwareFromFolder}" Header="{locale:Locale MenuBarFileToolsInstallFirmwareFromDirectory}" Icon="{icon:Icon mdi-folder-cog}" />
+            <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarTools}">
+                <MenuItem Header="{ext:Locale MenuBarToolsInstallFirmware}" Icon="{ext:Icon fa-solid fa-download}" IsEnabled="{Binding EnableNonGameRunningControls}">
+                    <MenuItem Command="{Binding InstallFirmwareFromFile}" Header="{ext:Locale MenuBarFileToolsInstallFirmwareFromFile}" Icon="{ext:Icon mdi-file-cog}" />
+                    <MenuItem Command="{Binding InstallFirmwareFromFolder}" Header="{ext:Locale MenuBarFileToolsInstallFirmwareFromDirectory}" Icon="{ext:Icon mdi-folder-cog}" />
                 </MenuItem>
-                <MenuItem Header="{locale:Locale MenuBarToolsManageFileTypes}" IsVisible="{Binding ManageFileTypesVisible}">
-                    <MenuItem Header="{locale:Locale MenuBarToolsInstallFileTypes}" Click="InstallFileTypes_Click"/>
-                    <MenuItem Header="{locale:Locale MenuBarToolsUninstallFileTypes}" Click="UninstallFileTypes_Click"/>
+                <MenuItem Header="{ext:Locale MenuBarToolsManageFileTypes}" IsVisible="{Binding ManageFileTypesVisible}">
+                    <MenuItem Header="{ext:Locale MenuBarToolsInstallFileTypes}" Click="InstallFileTypes_Click"/>
+                    <MenuItem Header="{ext:Locale MenuBarToolsUninstallFileTypes}" Click="UninstallFileTypes_Click"/>
                 </MenuItem>
             </MenuItem>
-            <MenuItem VerticalAlignment="Center" Header="{locale:Locale MenuBarView}">
-                <MenuItem VerticalAlignment="Center" Header="{locale:Locale MenuBarViewWindow}">
-                    <MenuItem Header="{locale:Locale MenuBarViewWindow720}" Tag="720 1280" Click="ChangeWindowSize_Click" />
-                    <MenuItem Header="{locale:Locale MenuBarViewWindow1080}" Tag="1080 1920" Click="ChangeWindowSize_Click" />
+            <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarView}">
+                <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarViewWindow}">
+                    <MenuItem Header="{ext:Locale MenuBarViewWindow720}" Tag="720 1280" Click="ChangeWindowSize_Click" />
+                    <MenuItem Header="{ext:Locale MenuBarViewWindow1080}" Tag="1080 1920" Click="ChangeWindowSize_Click" />
                 </MenuItem>
             </MenuItem>
-            <MenuItem VerticalAlignment="Center" Header="{locale:Locale MenuBarHelp}">
+            <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarHelp}">
                 <MenuItem
                     Name="UpdateMenuItem"
                     IsEnabled="{Binding CanUpdate}"
                     Click="CheckForUpdates"
-                    Header="{locale:Locale MenuBarHelpCheckForUpdates}"
-                    Icon="{icon:Icon mdi-update}"
-                    ToolTip.Tip="{locale:Locale CheckUpdatesTooltip}" />
+                    Header="{ext:Locale MenuBarHelpCheckForUpdates}"
+                    Icon="{ext:Icon mdi-update}"
+                    ToolTip.Tip="{ext:Locale CheckUpdatesTooltip}" />
                 <Separator />
                 <MenuItem
                     Click="OpenAboutWindow"
-                    Header="{locale:Locale MenuBarHelpAbout}"
-                    Icon="{icon:Icon fa-solid fa-circle-info}"
-                    ToolTip.Tip="{locale:Locale OpenAboutTooltip}" />
+                    Header="{ext:Locale MenuBarHelpAbout}"
+                    Icon="{ext:Icon fa-solid fa-circle-info}"
+                    ToolTip.Tip="{ext:Locale OpenAboutTooltip}" />
             </MenuItem>
         </Menu>
     </DockPanel>
diff --git a/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml b/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml
index 77b9f7b6e..ef38611a8 100644
--- a/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml
+++ b/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml
@@ -4,7 +4,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     xmlns:config="clr-namespace:Ryujinx.Common.Configuration;assembly=Ryujinx.Common"
@@ -49,7 +49,7 @@
                     Margin="0,0,5,0"
                     VerticalAlignment="Center"
                     IsVisible="{Binding EnableNonGameRunningControls}"
-                    Text="{locale:Locale StatusBarGamesLoaded}" />
+                    Text="{ext:Locale StatusBarGamesLoaded}" />
                 <ProgressBar
                     Name="LoadProgressBar"
                     Grid.Column="2"
@@ -115,7 +115,7 @@
                 IsVisible="{Binding !ShowLoadProgress}"
                 Content="{Binding AspectRatioStatusText}"
                 Click="AspectRatioStatus_OnClick"
-                ToolTip.Tip="{locale:Locale AspectRatioTooltip}">
+                ToolTip.Tip="{ext:Locale AspectRatioTooltip}">
                 <SplitButton.Styles>
                     <Style Selector="Border#SeparatorBorder">
                         <Setter Property="Opacity" Value="0" />
@@ -124,27 +124,27 @@
                 <SplitButton.Flyout>
                     <MenuFlyout Placement="Bottom" ShowMode="TransientWithDismissOnPointerMoveAway">
                         <MenuItem
-                            Header="{locale:Locale SettingsTabGraphicsAspectRatio4x3}"
+                            Header="{ext:Locale SettingsTabGraphicsAspectRatio4x3}"
                             Command="{Binding SetAspectRatio}"
                             CommandParameter="{x:Static config:AspectRatio.Fixed4x3}"/>
                         <MenuItem
-                            Header="{locale:Locale SettingsTabGraphicsAspectRatio16x9}"
+                            Header="{ext:Locale SettingsTabGraphicsAspectRatio16x9}"
                             Command="{Binding SetAspectRatio}"
                             CommandParameter="{x:Static config:AspectRatio.Fixed16x9}"/>
                         <MenuItem
-                            Header="{locale:Locale SettingsTabGraphicsAspectRatio16x10}"
+                            Header="{ext:Locale SettingsTabGraphicsAspectRatio16x10}"
                             Command="{Binding SetAspectRatio}"
                             CommandParameter="{x:Static config:AspectRatio.Fixed16x10}"/>
                         <MenuItem
-                            Header="{locale:Locale SettingsTabGraphicsAspectRatio21x9}"
+                            Header="{ext:Locale SettingsTabGraphicsAspectRatio21x9}"
                             Command="{Binding SetAspectRatio}"
                             CommandParameter="{x:Static config:AspectRatio.Fixed21x9}"/>
                         <MenuItem
-                            Header="{locale:Locale SettingsTabGraphicsAspectRatio32x9}"
+                            Header="{ext:Locale SettingsTabGraphicsAspectRatio32x9}"
                             Command="{Binding SetAspectRatio}"
                             CommandParameter="{x:Static config:AspectRatio.Fixed32x9}"/>
                         <MenuItem
-                            Header="{locale:Locale SettingsTabGraphicsAspectRatioStretch}"
+                            Header="{ext:Locale SettingsTabGraphicsAspectRatioStretch}"
                             Command="{Binding SetAspectRatio}"
                             CommandParameter="{x:Static config:AspectRatio.Stretched}"/>
                     </MenuFlyout>
@@ -195,7 +195,7 @@
                                 Minimum="0"
                                 SmallChange="0.01"
                                 TickFrequency="0.05"
-                                ToolTip.Tip="{locale:Locale AudioVolumeTooltip}"
+                                ToolTip.Tip="{ext:Locale AudioVolumeTooltip}"
                                 Value="{Binding Volume}" />
                         </Grid>
                     </Flyout>
@@ -286,7 +286,7 @@
                 Margin="0"
                 HorizontalAlignment="Right"
                 VerticalAlignment="Center"
-                Text="{locale:Locale StatusBarSystemVersion}" />
+                Text="{ext:Locale StatusBarSystemVersion}" />
         </StackPanel>
     </Grid>
 </UserControl>
diff --git a/src/Ryujinx/UI/Views/Main/MainViewControls.axaml b/src/Ryujinx/UI/Views/Main/MainViewControls.axaml
index 485d6de01..1c6895db1 100644
--- a/src/Ryujinx/UI/Views/Main/MainViewControls.axaml
+++ b/src/Ryujinx/UI/Views/Main/MainViewControls.axaml
@@ -6,7 +6,7 @@
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
     xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
     x:Class="Ryujinx.Ava.UI.Views.Main.MainViewControls"
@@ -49,8 +49,8 @@
         <TextBlock
             Margin="10,0"
             VerticalAlignment="Center"
-            Text="{locale:Locale IconSize}"
-            ToolTip.Tip="{locale:Locale IconSizeTooltip}" />
+            Text="{ext:Locale IconSize}"
+            ToolTip.Tip="{ext:Locale IconSizeTooltip}" />
         <controls:SliderScroll
             Width="150"
             Height="35"
@@ -61,14 +61,14 @@
             Maximum="4"
             Minimum="1"
             TickFrequency="1"
-            ToolTip.Tip="{locale:Locale IconSizeTooltip}"
+            ToolTip.Tip="{ext:Locale IconSizeTooltip}"
             Value="{Binding GridSizeScale}" />
         <CheckBox
             Margin="0"
             VerticalAlignment="Center"
             IsChecked="{Binding ShowNames, Mode=TwoWay}"
             IsVisible="{Binding IsGrid}">
-            <TextBlock Margin="5,3,0,0" Text="{locale:Locale CommonShowNames}" />
+            <TextBlock Margin="5,3,0,0" Text="{ext:Locale CommonShowNames}" />
         </CheckBox>
         <TextBox
             Name="SearchBox"
@@ -79,7 +79,7 @@
             DockPanel.Dock="Right"
             KeyUp="SearchBox_OnKeyUp"
             Text="{Binding SearchText}"
-            Watermark="{locale:Locale MenuSearch}" />
+            Watermark="{ext:Locale MenuSearch}" />
         <DropDownButton
             Width="150"
             HorizontalAlignment="Right"
@@ -95,49 +95,49 @@
                         <StackPanel>
                             <RadioButton
                                 Checked="Sort_Checked"
-                                Content="{locale:Locale CommonFavorite}"
+                                Content="{ext:Locale CommonFavorite}"
                                 GroupName="Sort"
                                 IsChecked="{Binding IsSortedByFavorite, Mode=OneTime}"
                                 Tag="Favorite" />
                             <RadioButton
                                 Checked="Sort_Checked"
-                                Content="{locale:Locale GameListHeaderApplication}"
+                                Content="{ext:Locale GameListHeaderApplication}"
                                 GroupName="Sort"
                                 IsChecked="{Binding IsSortedByTitle, Mode=OneTime}"
                                 Tag="Title" />
                             <RadioButton
                                 Checked="Sort_Checked"
-                                Content="{locale:Locale GameListHeaderDeveloper}"
+                                Content="{ext:Locale GameListHeaderDeveloper}"
                                 GroupName="Sort"
                                 IsChecked="{Binding IsSortedByDeveloper, Mode=OneTime}"
                                 Tag="Developer" />
                             <RadioButton
                                 Checked="Sort_Checked"
-                                Content="{locale:Locale GameListHeaderTimePlayed}"
+                                Content="{ext:Locale GameListHeaderTimePlayed}"
                                 GroupName="Sort"
                                 IsChecked="{Binding IsSortedByTimePlayed, Mode=OneTime}"
                                 Tag="TotalTimePlayed" />
                             <RadioButton
                                 Checked="Sort_Checked"
-                                Content="{locale:Locale GameListHeaderLastPlayed}"
+                                Content="{ext:Locale GameListHeaderLastPlayed}"
                                 GroupName="Sort"
                                 IsChecked="{Binding IsSortedByLastPlayed, Mode=OneTime}"
                                 Tag="LastPlayed" />
                             <RadioButton
                                 Checked="Sort_Checked"
-                                Content="{locale:Locale GameListHeaderFileExtension}"
+                                Content="{ext:Locale GameListHeaderFileExtension}"
                                 GroupName="Sort"
                                 IsChecked="{Binding IsSortedByType, Mode=OneTime}"
                                 Tag="FileType" />
                             <RadioButton
                                 Checked="Sort_Checked"
-                                Content="{locale:Locale GameListHeaderFileSize}"
+                                Content="{ext:Locale GameListHeaderFileSize}"
                                 GroupName="Sort"
                                 IsChecked="{Binding IsSortedBySize, Mode=OneTime}"
                                 Tag="FileSize" />
                             <RadioButton
                                 Checked="Sort_Checked"
-                                Content="{locale:Locale GameListHeaderPath}"
+                                Content="{ext:Locale GameListHeaderPath}"
                                 GroupName="Sort"
                                 IsChecked="{Binding IsSortedByPath, Mode=OneTime}"
                                 Tag="Path" />
@@ -153,13 +153,13 @@
                         </Border>
                         <RadioButton
                             Checked="Order_Checked"
-                            Content="{locale:Locale OrderAscending}"
+                            Content="{ext:Locale OrderAscending}"
                             GroupName="Order"
                             IsChecked="{Binding IsAscending, Mode=OneTime}"
                             Tag="Ascending" />
                         <RadioButton
                             Checked="Order_Checked"
-                            Content="{locale:Locale OrderDescending}"
+                            Content="{ext:Locale OrderDescending}"
                             GroupName="Order"
                             IsChecked="{Binding !IsAscending, Mode=OneTime}"
                             Tag="Descending" />
@@ -172,6 +172,6 @@
             HorizontalAlignment="Right"
             VerticalAlignment="Center"
             DockPanel.Dock="Right"
-            Text="{locale:Locale CommonSort}" />
+            Text="{ext:Locale CommonSort}" />
     </DockPanel>
 </UserControl>
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml
index 657e07ee7..2f9ae65a0 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml
@@ -6,7 +6,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
     xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     mc:Ignorable="d"
     x:DataType="viewModels:SettingsViewModel">
@@ -25,36 +25,36 @@
                 HorizontalAlignment="Stretch"
                 Orientation="Vertical"
                 Spacing="10">
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabAudio}" />
+                <TextBlock Classes="h1" Text="{ext:Locale SettingsTabAudio}" />
                 <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
                     <TextBlock VerticalAlignment="Center"
-                               Text="{locale:Locale SettingsTabSystemAudioBackend}"
-                               ToolTip.Tip="{locale:Locale AudioBackendTooltip}"
+                               Text="{ext:Locale SettingsTabSystemAudioBackend}"
+                               ToolTip.Tip="{ext:Locale AudioBackendTooltip}"
                                Width="250" />
                     <ComboBox SelectedIndex="{Binding AudioBackend}"
                               Width="350"
                               HorizontalContentAlignment="Left">
                         <ComboBoxItem>
-                            <TextBlock Text="{locale:Locale SettingsTabSystemAudioBackendDummy}" />
+                            <TextBlock Text="{ext:Locale SettingsTabSystemAudioBackendDummy}" />
                         </ComboBoxItem>
                         <ComboBoxItem IsEnabled="{Binding IsOpenAlEnabled}">
-                            <TextBlock Text="{locale:Locale SettingsTabSystemAudioBackendOpenAL}" />
+                            <TextBlock Text="{ext:Locale SettingsTabSystemAudioBackendOpenAL}" />
                         </ComboBoxItem>
                         <ComboBoxItem IsEnabled="{Binding IsSoundIoEnabled}">
-                            <TextBlock Text="{locale:Locale SettingsTabSystemAudioBackendSoundIO}" />
+                            <TextBlock Text="{ext:Locale SettingsTabSystemAudioBackendSoundIO}" />
                         </ComboBoxItem>
                         <ComboBoxItem IsEnabled="{Binding IsSDL2Enabled}">
-                            <TextBlock Text="{locale:Locale SettingsTabSystemAudioBackendSDL2}" />
+                            <TextBlock Text="{ext:Locale SettingsTabSystemAudioBackendSDL2}" />
                         </ComboBoxItem>
                     </ComboBox>
                 </StackPanel>
                 <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
                     <TextBlock VerticalAlignment="Center"
-                               Text="{locale:Locale SettingsTabSystemAudioVolume}"
-                               ToolTip.Tip="{locale:Locale AudioVolumeTooltip}"
+                               Text="{ext:Locale SettingsTabSystemAudioVolume}"
+                               ToolTip.Tip="{ext:Locale AudioVolumeTooltip}"
                                Width="250" />
                     <ui:NumberBox Value="{Binding Volume}"
-                            ToolTip.Tip="{locale:Locale AudioVolumeTooltip}"
+                            ToolTip.Tip="{ext:Locale AudioVolumeTooltip}"
                             Width="350"
                             SmallChange="1"
                             LargeChange="10"
@@ -66,7 +66,7 @@
                 <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
                     <controls:SliderScroll Value="{Binding Volume}"
                             Margin="250,0,0,0"
-                            ToolTip.Tip="{locale:Locale AudioVolumeTooltip}"
+                            ToolTip.Tip="{ext:Locale AudioVolumeTooltip}"
                             Minimum="0"
                             Maximum="100"
                             SmallChange="1"
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml
index 48a50c9cf..c7f03a45d 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     mc:Ignorable="d"
     x:DataType="viewModels:SettingsViewModel">
@@ -23,56 +23,56 @@
                 HorizontalAlignment="Stretch"
                 Orientation="Vertical"
                 Spacing="10">
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabCpuCache}" />
+                <TextBlock Classes="h1" Text="{ext:Locale SettingsTabCpuCache}" />
                 <StackPanel
                     Margin="10,0,0,0"
                     HorizontalAlignment="Stretch"
                     Orientation="Vertical">
                     <CheckBox IsChecked="{Binding EnablePptc}">
-                        <TextBlock Text="{locale:Locale SettingsTabSystemEnablePptc}"
-                                   ToolTip.Tip="{locale:Locale PptcToggleTooltip}" />
+                        <TextBlock Text="{ext:Locale SettingsTabSystemEnablePptc}"
+                                   ToolTip.Tip="{ext:Locale PptcToggleTooltip}" />
                     </CheckBox>
                     <CheckBox IsChecked="{Binding EnableLowPowerPptc}">
-                        <TextBlock Text="{locale:Locale SettingsTabSystemEnableLowPowerPptc}"
-                                   ToolTip.Tip="{locale:Locale LowPowerPptcToggleTooltip}" />
+                        <TextBlock Text="{ext:Locale SettingsTabSystemEnableLowPowerPptc}"
+                                   ToolTip.Tip="{ext:Locale LowPowerPptcToggleTooltip}" />
                     </CheckBox>
                 </StackPanel>
                 <Separator Height="1" />
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabCpuMemory}" />
+                <TextBlock Classes="h1" Text="{ext:Locale SettingsTabCpuMemory}" />
                 <StackPanel
                     Margin="10,0,0,0"
                     HorizontalAlignment="Stretch"
                     Orientation="Vertical">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock VerticalAlignment="Center"
-                                   Text="{locale:Locale SettingsTabSystemMemoryManagerMode}"
-                                   ToolTip.Tip="{locale:Locale MemoryManagerTooltip}"
+                                   Text="{ext:Locale SettingsTabSystemMemoryManagerMode}"
+                                   ToolTip.Tip="{ext:Locale MemoryManagerTooltip}"
                                    Width="250" />
                         <ComboBox SelectedIndex="{Binding MemoryMode}"
-                                  ToolTip.Tip="{locale:Locale MemoryManagerTooltip}"
+                                  ToolTip.Tip="{ext:Locale MemoryManagerTooltip}"
                                   HorizontalContentAlignment="Left"
                                   Width="350">
                             <ComboBoxItem
-                                ToolTip.Tip="{locale:Locale MemoryManagerSoftwareTooltip}">
+                                ToolTip.Tip="{ext:Locale MemoryManagerSoftwareTooltip}">
                                 <TextBlock
-                                    Text="{locale:Locale SettingsTabSystemMemoryManagerModeSoftware}" />
+                                    Text="{ext:Locale SettingsTabSystemMemoryManagerModeSoftware}" />
                             </ComboBoxItem>
                             <ComboBoxItem
-                                ToolTip.Tip="{locale:Locale MemoryManagerHostTooltip}">
-                                <TextBlock Text="{locale:Locale SettingsTabSystemMemoryManagerModeHost}" />
+                                ToolTip.Tip="{ext:Locale MemoryManagerHostTooltip}">
+                                <TextBlock Text="{ext:Locale SettingsTabSystemMemoryManagerModeHost}" />
                             </ComboBoxItem>
                             <ComboBoxItem
-                                ToolTip.Tip="{locale:Locale MemoryManagerUnsafeTooltip}">
+                                ToolTip.Tip="{ext:Locale MemoryManagerUnsafeTooltip}">
                                 <TextBlock
-                                    Text="{locale:Locale SettingsTabSystemMemoryManagerModeHostUnchecked}" />
+                                    Text="{ext:Locale SettingsTabSystemMemoryManagerModeHostUnchecked}" />
                             </ComboBoxItem>
                         </ComboBox>
                     </StackPanel>
                     <CheckBox IsChecked="{Binding UseHypervisor}"
                               IsVisible="{Binding IsHypervisorAvailable}"
-                              ToolTip.Tip="{locale:Locale UseHypervisorTooltip}">
-                        <TextBlock Text="{locale:Locale SettingsTabSystemUseHypervisor}"
-                                   ToolTip.Tip="{locale:Locale UseHypervisorTooltip}" />
+                              ToolTip.Tip="{ext:Locale UseHypervisorTooltip}">
+                        <TextBlock Text="{ext:Locale SettingsTabSystemUseHypervisor}"
+                                   ToolTip.Tip="{ext:Locale UseHypervisorTooltip}" />
                     </CheckBox>
                 </StackPanel>
             </StackPanel>
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml
index 0a12575ad..219efcef8 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml
@@ -6,7 +6,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
     xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     Design.Width="1000"
     mc:Ignorable="d"
@@ -26,16 +26,16 @@
                 HorizontalAlignment="Stretch"
                 Orientation="Vertical"
                 Spacing="10">
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabGraphicsAPI}" />
+                <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGraphicsAPI}" />
                 <StackPanel Margin="10,0,0,0" Orientation="Vertical" Spacing="10">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock VerticalAlignment="Center"
-                                ToolTip.Tip="{locale:Locale SettingsTabGraphicsBackendTooltip}"
-                                Text="{locale:Locale SettingsTabGraphicsBackend}"
+                                ToolTip.Tip="{ext:Locale SettingsTabGraphicsBackendTooltip}"
+                                Text="{ext:Locale SettingsTabGraphicsBackend}"
                                 Width="250" />
                         <ComboBox Width="350"
                                 HorizontalContentAlignment="Left"
-                                ToolTip.Tip="{locale:Locale SettingsTabGraphicsBackendTooltip}"
+                                ToolTip.Tip="{ext:Locale SettingsTabGraphicsBackendTooltip}"
                                 SelectedIndex="{Binding GraphicsBackendIndex}">
                             <ComboBoxItem IsVisible="{Binding IsVulkanAvailable}">
                                 <TextBlock Text="Vulkan" />
@@ -47,66 +47,66 @@
                     </StackPanel>
                     <StackPanel Orientation="Horizontal" IsVisible="{Binding IsVulkanSelected}">
                         <TextBlock VerticalAlignment="Center"
-                                ToolTip.Tip="{locale:Locale SettingsTabGraphicsPreferredGpuTooltip}"
-                                Text="{locale:Locale SettingsTabGraphicsPreferredGpu}"
+                                ToolTip.Tip="{ext:Locale SettingsTabGraphicsPreferredGpuTooltip}"
+                                Text="{ext:Locale SettingsTabGraphicsPreferredGpu}"
                                 Width="250" />
                         <ComboBox Width="350"
                                 HorizontalContentAlignment="Left"
-                                ToolTip.Tip="{locale:Locale SettingsTabGraphicsPreferredGpuTooltip}"
+                                ToolTip.Tip="{ext:Locale SettingsTabGraphicsPreferredGpuTooltip}"
                                 SelectedIndex="{Binding PreferredGpuIndex}"
                                 ItemsSource="{Binding AvailableGpus}"/>
                     </StackPanel>
                 </StackPanel>
                 <Separator Height="1" />
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabGraphicsFeatures}" />
+                <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGraphicsFeatures}" />
                 <StackPanel Margin="10,0,0,0" Orientation="Vertical" Spacing="10">
                     <StackPanel Orientation="Vertical">
                         <CheckBox IsChecked="{Binding EnableShaderCache}"
-                            ToolTip.Tip="{locale:Locale ShaderCacheToggleTooltip}">
-                            <TextBlock Text="{locale:Locale SettingsTabGraphicsEnableShaderCache}" />
+                            ToolTip.Tip="{ext:Locale ShaderCacheToggleTooltip}">
+                            <TextBlock Text="{ext:Locale SettingsTabGraphicsEnableShaderCache}" />
                         </CheckBox>
                         <CheckBox IsChecked="{Binding EnableTextureRecompression}"
-                            ToolTip.Tip="{locale:Locale SettingsEnableTextureRecompressionTooltip}">
-                            <TextBlock Text="{locale:Locale SettingsEnableTextureRecompression}" />
+                            ToolTip.Tip="{ext:Locale SettingsEnableTextureRecompressionTooltip}">
+                            <TextBlock Text="{ext:Locale SettingsEnableTextureRecompression}" />
                         </CheckBox>
                         <CheckBox IsChecked="{Binding EnableMacroHLE}"
-                            ToolTip.Tip="{locale:Locale SettingsEnableMacroHLETooltip}">
-                            <TextBlock Text="{locale:Locale SettingsEnableMacroHLE}" />
+                            ToolTip.Tip="{ext:Locale SettingsEnableMacroHLETooltip}">
+                            <TextBlock Text="{ext:Locale SettingsEnableMacroHLE}" />
                         </CheckBox>
                         <CheckBox IsChecked="{Binding EnableColorSpacePassthrough}"
                                   IsVisible="{Binding ColorSpacePassthroughAvailable}"
-                            ToolTip.Tip="{locale:Locale SettingsEnableColorSpacePassthroughTooltip}">
-                            <TextBlock Text="{locale:Locale SettingsEnableColorSpacePassthrough}" />
+                            ToolTip.Tip="{ext:Locale SettingsEnableColorSpacePassthroughTooltip}">
+                            <TextBlock Text="{ext:Locale SettingsEnableColorSpacePassthrough}" />
                         </CheckBox>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
                         <TextBlock VerticalAlignment="Center"
-                                   ToolTip.Tip="{locale:Locale ResolutionScaleTooltip}"
-                                   Text="{locale:Locale SettingsTabGraphicsResolutionScale}"
+                                   ToolTip.Tip="{ext:Locale ResolutionScaleTooltip}"
+                                   Text="{ext:Locale SettingsTabGraphicsResolutionScale}"
                                    Width="250" />
                         <ComboBox SelectedIndex="{Binding ResolutionScale}"
                                   Width="350"
                                   HorizontalContentAlignment="Left"
-                                  ToolTip.Tip="{locale:Locale ResolutionScaleTooltip}">
+                                  ToolTip.Tip="{ext:Locale ResolutionScaleTooltip}">
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScaleNative}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGraphicsResolutionScaleNative}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScale2x}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGraphicsResolutionScale2x}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScale3x}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGraphicsResolutionScale3x}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScale4x}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGraphicsResolutionScale4x}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScaleCustom}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGraphicsResolutionScaleCustom}" />
                             </ComboBoxItem>
                         </ComboBox>
                         <ui:NumberBox
                             Margin="10,0,0,0"
-                            ToolTip.Tip="{locale:Locale ResolutionScaleEntryTooltip}"
+                            ToolTip.Tip="{ext:Locale ResolutionScaleEntryTooltip}"
                             MinWidth="150"
                             SmallChange="0.1"
                             LargeChange="1"
@@ -123,30 +123,30 @@
                         Spacing="10">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock VerticalAlignment="Center"
-                                       ToolTip.Tip="{locale:Locale GraphicsAATooltip}"
-                                       Text="{locale:Locale GraphicsAALabel}"
+                                       ToolTip.Tip="{ext:Locale GraphicsAATooltip}"
+                                       Text="{ext:Locale GraphicsAALabel}"
                                        Width="250" />
                             <ComboBox Width="350"
                                       HorizontalContentAlignment="Left"
-                                      ToolTip.Tip="{locale:Locale GraphicsAATooltip}"
+                                      ToolTip.Tip="{ext:Locale GraphicsAATooltip}"
                                       SelectedIndex="{Binding AntiAliasingEffect}">
                                 <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
+                                    <TextBlock Text="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
                                     <TextBlock Text="FXAA" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SmaaLow}" />
+                                    <TextBlock Text="{ext:Locale SmaaLow}" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SmaaMedium}" />
+                                    <TextBlock Text="{ext:Locale SmaaMedium}" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SmaaHigh}" />
+                                    <TextBlock Text="{ext:Locale SmaaHigh}" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SmaaUltra}" />
+                                    <TextBlock Text="{ext:Locale SmaaUltra}" />
                                 </ComboBoxItem>
                             </ComboBox>
                         </StackPanel>
@@ -157,28 +157,28 @@
                         Spacing="10">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock VerticalAlignment="Center"
-                                       ToolTip.Tip="{locale:Locale GraphicsScalingFilterTooltip}"
-                                       Text="{locale:Locale GraphicsScalingFilterLabel}"
+                                       ToolTip.Tip="{ext:Locale GraphicsScalingFilterTooltip}"
+                                       Text="{ext:Locale GraphicsScalingFilterLabel}"
                                        Width="250" />
                             <ComboBox Width="350"
                                       HorizontalContentAlignment="Left"
-                                      ToolTip.Tip="{locale:Locale GraphicsScalingFilterTooltip}"
+                                      ToolTip.Tip="{ext:Locale GraphicsScalingFilterTooltip}"
                                       SelectedIndex="{Binding ScalingFilter}">
                                 <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale GraphicsScalingFilterBilinear}" />
+                                    <TextBlock Text="{ext:Locale GraphicsScalingFilterBilinear}" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale GraphicsScalingFilterNearest}" />
+                                    <TextBlock Text="{ext:Locale GraphicsScalingFilterNearest}" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale GraphicsScalingFilterFsr}" />
+                                    <TextBlock Text="{ext:Locale GraphicsScalingFilterFsr}" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale GraphicsScalingFilterArea}" />
+                                    <TextBlock Text="{ext:Locale GraphicsScalingFilterArea}" />
                                 </ComboBoxItem>
                             </ComboBox>
                             <controls:SliderScroll Value="{Binding ScalingFilterLevel}"
-                                    ToolTip.Tip="{locale:Locale GraphicsScalingFilterLevelTooltip}"
+                                    ToolTip.Tip="{ext:Locale GraphicsScalingFilterLevelTooltip}"
                                     MinWidth="150"
                                     Margin="10,-3,0,0"
                                     Height="32"
@@ -199,58 +199,58 @@
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
                         <TextBlock VerticalAlignment="Center"
-                                   ToolTip.Tip="{locale:Locale AnisotropyTooltip}"
-                                   Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering}"
+                                   ToolTip.Tip="{ext:Locale AnisotropyTooltip}"
+                                   Text="{ext:Locale SettingsTabGraphicsAnisotropicFiltering}"
                                    Width="250" />
                         <ComboBox SelectedIndex="{Binding MaxAnisotropy}"
                                   Width="350"
                                   HorizontalContentAlignment="Left"
-                                  ToolTip.Tip="{locale:Locale AnisotropyTooltip}">
+                                  ToolTip.Tip="{ext:Locale AnisotropyTooltip}">
                             <ComboBoxItem>
                                 <TextBlock
-                                    Text="{locale:Locale SettingsTabGraphicsAnisotropicFilteringAuto}" />
+                                    Text="{ext:Locale SettingsTabGraphicsAnisotropicFilteringAuto}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering2x}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAnisotropicFiltering2x}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering4x}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAnisotropicFiltering4x}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering8x}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAnisotropicFiltering8x}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
                                 <TextBlock
-                                    Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering16x}" />
+                                    Text="{ext:Locale SettingsTabGraphicsAnisotropicFiltering16x}" />
                             </ComboBoxItem>
                         </ComboBox>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
                         <TextBlock VerticalAlignment="Center"
-                                   ToolTip.Tip="{locale:Locale AspectRatioTooltip}"
-                                   Text="{locale:Locale SettingsTabGraphicsAspectRatio}"
+                                   ToolTip.Tip="{ext:Locale AspectRatioTooltip}"
+                                   Text="{ext:Locale SettingsTabGraphicsAspectRatio}"
                                    Width="250" />
                         <ComboBox SelectedIndex="{Binding AspectRatio}"
                                   Width="350"
                                   HorizontalContentAlignment="Left"
-                                  ToolTip.Tip="{locale:Locale AspectRatioTooltip}">
+                                  ToolTip.Tip="{ext:Locale AspectRatioTooltip}">
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio4x3}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatio4x3}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio16x9}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatio16x9}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio16x10}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatio16x10}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio21x9}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatio21x9}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio32x9}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatio32x9}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatioStretch}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatioStretch}" />
                             </ComboBoxItem>
                         </ComboBox>
                     </StackPanel>
@@ -262,27 +262,27 @@
                     Spacing="10">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock VerticalAlignment="Center"
-                                   ToolTip.Tip="{locale:Locale GraphicsBackendThreadingTooltip}"
-                                   Text="{locale:Locale SettingsTabGraphicsBackendMultithreading}"
+                                   ToolTip.Tip="{ext:Locale GraphicsBackendThreadingTooltip}"
+                                   Text="{ext:Locale SettingsTabGraphicsBackendMultithreading}"
                                    Width="250" />
                         <ComboBox Width="350"
                                   HorizontalContentAlignment="Left"
-                                  ToolTip.Tip="{locale:Locale GalThreadingTooltip}"
+                                  ToolTip.Tip="{ext:Locale GalThreadingTooltip}"
                                   SelectedIndex="{Binding GraphicsBackendMultithreadingIndex}">
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale CommonAuto}" />
+                                <TextBlock Text="{ext:Locale CommonAuto}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale CommonOff}" />
+                                <TextBlock Text="{ext:Locale CommonOff}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale CommonOn}" />
+                                <TextBlock Text="{ext:Locale CommonOn}" />
                             </ComboBoxItem>
                         </ComboBox>
                     </StackPanel>
                 </StackPanel>
                 <Separator Height="1" />
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabGraphicsDeveloperOptions}" />
+                <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGraphicsDeveloperOptions}" />
                 <StackPanel
                     Margin="10,0,0,0"
                     HorizontalAlignment="Stretch"
@@ -290,12 +290,12 @@
                     Spacing="10">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock VerticalAlignment="Center"
-                                   ToolTip.Tip="{locale:Locale ShaderDumpPathTooltip}"
-                                   Text="{locale:Locale SettingsTabGraphicsShaderDumpPath}"
+                                   ToolTip.Tip="{ext:Locale ShaderDumpPathTooltip}"
+                                   Text="{ext:Locale SettingsTabGraphicsShaderDumpPath}"
                                    Width="250" />
                         <TextBox Text="{Binding ShaderDumpPath}"
                                  Width="350"
-                                 ToolTip.Tip="{locale:Locale ShaderDumpPathTooltip}" />
+                                 ToolTip.Tip="{ext:Locale ShaderDumpPathTooltip}" />
                     </StackPanel>
                 </StackPanel>
             </StackPanel>
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml
index bffcada05..06f6728da 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
     mc:Ignorable="d"
@@ -48,57 +48,57 @@
                 Spacing="10">
                 <TextBlock
                     Classes="h1"
-                    Text="{locale:Locale SettingsTabHotkeysHotkeys}" />
+                    Text="{ext:Locale SettingsTabHotkeysHotkeys}" />
                 <StackPanel>
-                    <TextBlock Text="{locale:Locale SettingsTabHotkeysToggleVsyncHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysToggleVsyncHotkey}" />
                     <ToggleButton Name="ToggleVsync">
                         <TextBlock Text="{Binding KeyboardHotkey.ToggleVsync, Converter={StaticResource Key}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{locale:Locale SettingsTabHotkeysScreenshotHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysScreenshotHotkey}" />
                     <ToggleButton Name="Screenshot">
                         <TextBlock Text="{Binding KeyboardHotkey.Screenshot, Converter={StaticResource Key}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{locale:Locale SettingsTabHotkeysShowUiHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysShowUiHotkey}" />
                     <ToggleButton Name="ShowUI">
                         <TextBlock Text="{Binding KeyboardHotkey.ShowUI, Converter={StaticResource Key}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{locale:Locale SettingsTabHotkeysPauseHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysPauseHotkey}" />
                     <ToggleButton Name="Pause">
                         <TextBlock Text="{Binding KeyboardHotkey.Pause, Converter={StaticResource Key}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{locale:Locale SettingsTabHotkeysToggleMuteHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysToggleMuteHotkey}" />
                     <ToggleButton Name="ToggleMute">
                         <TextBlock Text="{Binding KeyboardHotkey.ToggleMute, Converter={StaticResource Key}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{locale:Locale SettingsTabHotkeysResScaleUpHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysResScaleUpHotkey}" />
                     <ToggleButton Name="ResScaleUp">
                         <TextBlock Text="{Binding KeyboardHotkey.ResScaleUp, Converter={StaticResource Key}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{locale:Locale SettingsTabHotkeysResScaleDownHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysResScaleDownHotkey}" />
                     <ToggleButton Name="ResScaleDown">
                         <TextBlock Text="{Binding KeyboardHotkey.ResScaleDown, Converter={StaticResource Key}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{locale:Locale SettingsTabHotkeysVolumeUpHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysVolumeUpHotkey}" />
                     <ToggleButton Name="VolumeUp">
                         <TextBlock Text="{Binding KeyboardHotkey.VolumeUp, Converter={StaticResource Key}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{locale:Locale SettingsTabHotkeysVolumeDownHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysVolumeDownHotkey}" />
                     <ToggleButton Name="VolumeDown">
                         <TextBlock Text="{Binding KeyboardHotkey.VolumeDown, Converter={StaticResource Key}}" />
                     </ToggleButton>
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml
index 55c2ed6e3..b0edc51a5 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:views="clr-namespace:Ryujinx.Ava.UI.Views.Input"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     mc:Ignorable="d"
@@ -40,23 +40,23 @@
                             Orientation="Horizontal"
                             Spacing="10">
                             <CheckBox
-                                ToolTip.Tip="{locale:Locale DockModeToggleTooltip}"
+                                ToolTip.Tip="{ext:Locale DockModeToggleTooltip}"
                                 MinWidth="0"
                                 IsChecked="{Binding EnableDockedMode}">
                                 <TextBlock
-                                    Text="{locale:Locale SettingsTabInputEnableDockedMode}" />
+                                    Text="{ext:Locale SettingsTabInputEnableDockedMode}" />
                             </CheckBox>
                             <CheckBox
-                                ToolTip.Tip="{locale:Locale DirectKeyboardTooltip}"
+                                ToolTip.Tip="{ext:Locale DirectKeyboardTooltip}"
                                 IsChecked="{Binding EnableKeyboard}">
                                 <TextBlock
-                                    Text="{locale:Locale SettingsTabInputDirectKeyboardAccess}" />
+                                    Text="{ext:Locale SettingsTabInputDirectKeyboardAccess}" />
                             </CheckBox>
                             <CheckBox
-                                ToolTip.Tip="{locale:Locale DirectMouseTooltip}"
+                                ToolTip.Tip="{ext:Locale DirectMouseTooltip}"
                                 IsChecked="{Binding EnableMouse}">
                                 <TextBlock
-                                    Text="{locale:Locale SettingsTabInputDirectMouseAccess}" />
+                                    Text="{ext:Locale SettingsTabInputDirectMouseAccess}" />
                             </CheckBox>
                         </StackPanel>
                     </StackPanel>
@@ -64,4 +64,4 @@
             </Panel>
         </Border>
     </ScrollViewer>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml
index 5d22b891c..7ab49c0ae 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml
@@ -5,7 +5,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     mc:Ignorable="d"
     x:DataType="viewModels:SettingsViewModel">
@@ -24,37 +24,37 @@
                 HorizontalAlignment="Stretch"
                 Orientation="Vertical"
                 Spacing="10">
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabLoggingLogging}" />
+                <TextBlock Classes="h1" Text="{ext:Locale SettingsTabLoggingLogging}" />
                 <StackPanel Margin="10,0,0,0" Orientation="Vertical">
                     <CheckBox IsChecked="{Binding EnableFileLog}"
-                              ToolTip.Tip="{locale:Locale FileLogTooltip}">
-                        <TextBlock Text="{locale:Locale SettingsTabLoggingEnableLoggingToFile}" />
+                              ToolTip.Tip="{ext:Locale FileLogTooltip}">
+                        <TextBlock Text="{ext:Locale SettingsTabLoggingEnableLoggingToFile}" />
                     </CheckBox>
                     <CheckBox IsChecked="{Binding EnableStub}"
-                              ToolTip.Tip="{locale:Locale StubLogTooltip}">
-                        <TextBlock Text="{locale:Locale SettingsTabLoggingEnableStubLogs}" />
+                              ToolTip.Tip="{ext:Locale StubLogTooltip}">
+                        <TextBlock Text="{ext:Locale SettingsTabLoggingEnableStubLogs}" />
                     </CheckBox>
                     <CheckBox IsChecked="{Binding EnableInfo}"
-                              ToolTip.Tip="{locale:Locale InfoLogTooltip}">
-                        <TextBlock Text="{locale:Locale SettingsTabLoggingEnableInfoLogs}" />
+                              ToolTip.Tip="{ext:Locale InfoLogTooltip}">
+                        <TextBlock Text="{ext:Locale SettingsTabLoggingEnableInfoLogs}" />
                     </CheckBox>
                     <CheckBox IsChecked="{Binding EnableWarn}"
-                              ToolTip.Tip="{locale:Locale WarnLogTooltip}">
-                        <TextBlock Text="{locale:Locale SettingsTabLoggingEnableWarningLogs}" />
+                              ToolTip.Tip="{ext:Locale WarnLogTooltip}">
+                        <TextBlock Text="{ext:Locale SettingsTabLoggingEnableWarningLogs}" />
                     </CheckBox>
                     <CheckBox IsChecked="{Binding EnableError}"
-                              ToolTip.Tip="{locale:Locale ErrorLogTooltip}">
-                        <TextBlock Text="{locale:Locale SettingsTabLoggingEnableErrorLogs}" />
+                              ToolTip.Tip="{ext:Locale ErrorLogTooltip}">
+                        <TextBlock Text="{ext:Locale SettingsTabLoggingEnableErrorLogs}" />
                     </CheckBox>
                     <CheckBox IsChecked="{Binding EnableGuest}"
-                              ToolTip.Tip="{locale:Locale GuestLogTooltip}">
-                        <TextBlock Text="{locale:Locale SettingsTabLoggingEnableGuestLogs}" />
+                              ToolTip.Tip="{ext:Locale GuestLogTooltip}">
+                        <TextBlock Text="{ext:Locale SettingsTabLoggingEnableGuestLogs}" />
                     </CheckBox>
                 </StackPanel>
                 <Separator Height="1" />
                 <StackPanel Orientation="Vertical" Spacing="5">
-                    <TextBlock Classes="h1" Text="{locale:Locale SettingsTabLoggingDeveloperOptions}" />
-                    <TextBlock Foreground="{DynamicResource SecondaryTextColor}" Text="{locale:Locale SettingsTabLoggingDeveloperOptionsNote}" />
+                    <TextBlock Classes="h1" Text="{ext:Locale SettingsTabLoggingDeveloperOptions}" />
+                    <TextBlock Foreground="{DynamicResource SecondaryTextColor}" Text="{ext:Locale SettingsTabLoggingDeveloperOptionsNote}" />
                 </StackPanel>
                 <StackPanel
                     Margin="10,0,0,0"
@@ -63,21 +63,21 @@
                     Spacing="10">
                     <StackPanel Orientation="Vertical">
                         <CheckBox IsChecked="{Binding EnableTrace}"
-                                  ToolTip.Tip="{locale:Locale TraceLogTooltip}">
-                            <TextBlock Text="{locale:Locale SettingsTabLoggingEnableTraceLogs}" />
+                                  ToolTip.Tip="{ext:Locale TraceLogTooltip}">
+                            <TextBlock Text="{ext:Locale SettingsTabLoggingEnableTraceLogs}" />
                         </CheckBox>
                         <CheckBox IsChecked="{Binding EnableFsAccessLog}"
-                                ToolTip.Tip="{locale:Locale FileAccessLogTooltip}">
-                        <TextBlock Text="{locale:Locale SettingsTabLoggingEnableFsAccessLogs}" />
+                                ToolTip.Tip="{ext:Locale FileAccessLogTooltip}">
+                        <TextBlock Text="{ext:Locale SettingsTabLoggingEnableFsAccessLogs}" />
                         </CheckBox>
                         <CheckBox IsChecked="{Binding EnableDebug}"
-                                  ToolTip.Tip="{locale:Locale DebugLogTooltip}">
-                            <TextBlock Text="{locale:Locale SettingsTabLoggingEnableDebugLogs}" />
+                                  ToolTip.Tip="{ext:Locale DebugLogTooltip}">
+                            <TextBlock Text="{ext:Locale SettingsTabLoggingEnableDebugLogs}" />
                         </CheckBox>
                         <StackPanel Margin="0,10,0,0" Orientation="Horizontal" VerticalAlignment="Stretch">
                             <TextBlock VerticalAlignment="Center"
-                                    ToolTip.Tip="{locale:Locale FSAccessLogModeTooltip}"
-                                    Text="{locale:Locale SettingsTabLoggingFsGlobalAccessLogMode}"
+                                    ToolTip.Tip="{ext:Locale FSAccessLogModeTooltip}"
+                                    Text="{ext:Locale SettingsTabLoggingFsGlobalAccessLogMode}"
                                     Width="285" />
                             <ui:NumberBox
                                 Maximum="3"
@@ -90,25 +90,25 @@
                         </StackPanel>
                         <StackPanel Margin="0,10,0,0" Orientation="Horizontal">
                             <TextBlock VerticalAlignment="Center"
-                                    Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevel}"
-                                    ToolTip.Tip="{locale:Locale OpenGlLogLevel}"
+                                    Text="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevel}"
+                                    ToolTip.Tip="{ext:Locale OpenGlLogLevel}"
                                     Width="285" />
                             <ComboBox SelectedIndex="{Binding OpenglDebugLevel}"
                                     Width="150"
                                     HorizontalContentAlignment="Left"
-                                    ToolTip.Tip="{locale:Locale OpenGlLogLevel}">
+                                    ToolTip.Tip="{ext:Locale OpenGlLogLevel}">
                                 <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
+                                    <TextBlock Text="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelError}" />
+                                    <TextBlock Text="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelError}" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
                                     <TextBlock
-                                        Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelPerformance}" />
+                                        Text="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelPerformance}" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelAll}" />
+                                    <TextBlock Text="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelAll}" />
                                 </ComboBoxItem>
                             </ComboBox>
                         </StackPanel>
@@ -117,4 +117,4 @@
             </StackPanel>
         </Border>
     </ScrollViewer>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml
index 67fac192d..c7736bf8d 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     mc:Ignorable="d"
     x:DataType="viewModels:SettingsViewModel">
@@ -23,37 +23,37 @@
                 HorizontalAlignment="Stretch"
                 Orientation="Vertical"
                 Spacing="10">
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabNetworkMultiplayer}" />
+                <TextBlock Classes="h1" Text="{ext:Locale SettingsTabNetworkMultiplayer}" />
                 <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
                     <TextBlock VerticalAlignment="Center"
-                        Text="{locale:Locale MultiplayerMode}"
-                        ToolTip.Tip="{locale:Locale MultiplayerModeTooltip}"
+                        Text="{ext:Locale MultiplayerMode}"
+                        ToolTip.Tip="{ext:Locale MultiplayerModeTooltip}"
                         Width="200" />
                     <ComboBox SelectedIndex="{Binding MultiplayerModeIndex}"
-                        ToolTip.Tip="{locale:Locale MultiplayerModeTooltip}"
+                        ToolTip.Tip="{ext:Locale MultiplayerModeTooltip}"
                         HorizontalContentAlignment="Left"
                         Width="250">
                         <ComboBoxItem>
-                            <TextBlock Text="{locale:Locale MultiplayerModeDisabled}" />
+                            <TextBlock Text="{ext:Locale MultiplayerModeDisabled}" />
                         </ComboBoxItem>
                         <ComboBoxItem>
-                            <TextBlock Text="{locale:Locale MultiplayerModeLdnMitm}" />
+                            <TextBlock Text="{ext:Locale MultiplayerModeLdnMitm}" />
                         </ComboBoxItem>
                     </ComboBox>
                 </StackPanel>
                 <Separator Height="1" />
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabNetworkConnection}" />
+                <TextBlock Classes="h1" Text="{ext:Locale SettingsTabNetworkConnection}" />
                 <CheckBox Margin="10,0,0,0" IsChecked="{Binding EnableInternetAccess}">
-                    <TextBlock Text="{locale:Locale SettingsTabSystemEnableInternetAccess}"
-                        ToolTip.Tip="{locale:Locale EnableInternetAccessTooltip}" />
+                    <TextBlock Text="{ext:Locale SettingsTabSystemEnableInternetAccess}"
+                        ToolTip.Tip="{ext:Locale EnableInternetAccessTooltip}" />
                 </CheckBox>
                 <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
                     <TextBlock VerticalAlignment="Center"
-                        Text="{locale:Locale SettingsTabNetworkInterface}"
-                        ToolTip.Tip="{locale:Locale NetworkInterfaceTooltip}"
+                        Text="{ext:Locale SettingsTabNetworkInterface}"
+                        ToolTip.Tip="{ext:Locale NetworkInterfaceTooltip}"
                         Width="200" />
                     <ComboBox SelectedIndex="{Binding NetworkInterfaceIndex}"
-                        ToolTip.Tip="{locale:Locale NetworkInterfaceTooltip}"
+                        ToolTip.Tip="{ext:Locale NetworkInterfaceTooltip}"
                         HorizontalContentAlignment="Left"
                         ItemsSource="{Binding NetworkInterfaceList}"
                         Width="250" />
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
index 92485a569..4fe57b425 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
     mc:Ignorable="d"
@@ -29,7 +29,7 @@
                 Spacing="10">
                 <TextBlock
                     Classes="h1"
-                    Text="{locale:Locale SettingsTabSystemCore}" />
+                    Text="{ext:Locale SettingsTabSystemCore}" />
                 <StackPanel
                     Margin="10,0,0,0"
                     Orientation="Vertical">
@@ -38,33 +38,33 @@
                         Orientation="Horizontal">
                         <TextBlock
                             VerticalAlignment="Center"
-                            Text="{locale:Locale SettingsTabSystemSystemRegion}"
+                            Text="{ext:Locale SettingsTabSystemSystemRegion}"
                             Width="250" />
                         <ComboBox
                             SelectedIndex="{Binding Region}"
-                            ToolTip.Tip="{locale:Locale RegionTooltip}"
+                            ToolTip.Tip="{ext:Locale RegionTooltip}"
                             HorizontalContentAlignment="Left"
                             Width="350">
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionJapan}" />
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionJapan}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionUSA}" />
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionUSA}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionEurope}" />
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionEurope}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionAustralia}" />
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionAustralia}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionChina}" />
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionChina}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionKorea}" />
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionKorea}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionTaiwan}" />
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionTaiwan}" />
                             </ComboBoxItem>
                         </ComboBox>
                     </StackPanel>
@@ -73,67 +73,67 @@
                         Orientation="Horizontal">
                         <TextBlock
                             VerticalAlignment="Center"
-                            Text="{locale:Locale SettingsTabSystemSystemLanguage}"
-                            ToolTip.Tip="{locale:Locale LanguageTooltip}"
+                            Text="{ext:Locale SettingsTabSystemSystemLanguage}"
+                            ToolTip.Tip="{ext:Locale LanguageTooltip}"
                             Width="250" />
                         <ComboBox
                             SelectedIndex="{Binding Language}"
-                            ToolTip.Tip="{locale:Locale LanguageTooltip}"
+                            ToolTip.Tip="{ext:Locale LanguageTooltip}"
                             HorizontalContentAlignment="Left"
                             Width="350">
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageJapanese}" />
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageJapanese}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageAmericanEnglish}" />
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageAmericanEnglish}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageFrench}" />
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageFrench}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageGerman}" />
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageGerman}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageItalian}" />
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageItalian}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageSpanish}" />
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageSpanish}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageChinese}" />
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageChinese}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageKorean}" />
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageKorean}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageDutch}" />
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageDutch}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguagePortuguese}" />
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguagePortuguese}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageRussian}" />
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageRussian}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageTaiwanese}" />
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageTaiwanese}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageBritishEnglish}" />
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageBritishEnglish}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageCanadianFrench}" />
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageCanadianFrench}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageLatinAmericanSpanish}" />
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageLatinAmericanSpanish}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageSimplifiedChinese}" />
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageSimplifiedChinese}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageTraditionalChinese}" />
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageTraditionalChinese}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
                             </ComboBoxItem>
                         </ComboBox>
                     </StackPanel>
@@ -142,8 +142,8 @@
                         Orientation="Horizontal">
                         <TextBlock
                             VerticalAlignment="Center"
-                            Text="{locale:Locale SettingsTabSystemSystemTimeZone}"
-                            ToolTip.Tip="{locale:Locale TimezoneTooltip}"
+                            Text="{ext:Locale SettingsTabSystemSystemTimeZone}"
+                            ToolTip.Tip="{ext:Locale TimezoneTooltip}"
                             Width="250" />
                         <AutoCompleteBox
                             Name="TimeZoneBox"
@@ -154,7 +154,7 @@
                             SelectionChanged="TimeZoneBox_OnSelectionChanged"
                             Text="{Binding Path=TimeZone, Mode=OneWay}"
                             TextChanged="TimeZoneBox_OnTextChanged"
-                            ToolTip.Tip="{locale:Locale TimezoneTooltip}" 
+                            ToolTip.Tip="{ext:Locale TimezoneTooltip}" 
                             ValueMemberBinding="{Binding Mode=OneWay, Converter={StaticResource TimeZone}}" />
                     </StackPanel>
                     <StackPanel
@@ -162,13 +162,13 @@
                         Orientation="Horizontal">
                         <TextBlock
                             VerticalAlignment="Center"
-                            Text="{locale:Locale SettingsTabSystemSystemTime}"
-                            ToolTip.Tip="{locale:Locale TimeTooltip}"
+                            Text="{ext:Locale SettingsTabSystemSystemTime}"
+                            ToolTip.Tip="{ext:Locale TimeTooltip}"
                             Width="250"/>
                         <DatePicker
                             VerticalAlignment="Center" 
                             SelectedDate="{Binding CurrentDate}"
-                            ToolTip.Tip="{locale:Locale TimeTooltip}"
+                            ToolTip.Tip="{ext:Locale TimeTooltip}"
                             Width="350" />
                     </StackPanel>
                     <StackPanel
@@ -179,17 +179,17 @@
                             ClockIdentifier="24HourClock"
                             SelectedTime="{Binding CurrentTime}"
                             Width="350"
-                            ToolTip.Tip="{locale:Locale TimeTooltip}" />
+                            ToolTip.Tip="{ext:Locale TimeTooltip}" />
                     </StackPanel>
                     <CheckBox IsChecked="{Binding EnableVsync}">
                         <TextBlock
-                            Text="{locale:Locale SettingsTabSystemEnableVsync}"
-                            ToolTip.Tip="{locale:Locale VSyncToggleTooltip}" />
+                            Text="{ext:Locale SettingsTabSystemEnableVsync}"
+                            ToolTip.Tip="{ext:Locale VSyncToggleTooltip}" />
                     </CheckBox>
                     <CheckBox IsChecked="{Binding EnableFsIntegrityChecks}">
                         <TextBlock
-                            Text="{locale:Locale SettingsTabSystemEnableFsIntegrityChecks}"
-                            ToolTip.Tip="{locale:Locale FsIntegrityToggleTooltip}" />
+                            Text="{ext:Locale SettingsTabSystemEnableFsIntegrityChecks}"
+                            ToolTip.Tip="{ext:Locale FsIntegrityToggleTooltip}" />
                     </CheckBox>
                 </StackPanel>
                 <Separator Height="1" />
@@ -198,35 +198,35 @@
                     Spacing="5">
                     <TextBlock
                         Classes="h1"
-                        Text="{locale:Locale SettingsTabSystemHacks}" />
+                        Text="{ext:Locale SettingsTabSystemHacks}" />
                     <TextBlock
                         Foreground="{DynamicResource SecondaryTextColor}"
                         TextDecorations="Underline"
-                        Text="{locale:Locale SettingsTabSystemHacksNote}" />
+                        Text="{ext:Locale SettingsTabSystemHacksNote}" />
                 </StackPanel>
                 <StackPanel
                     Margin="10,0,0,0"
                     Orientation="Horizontal">
                     <TextBlock
                         VerticalAlignment="Center"
-                        Text="{locale:Locale SettingsTabSystemDramSize}"
+                        Text="{ext:Locale SettingsTabSystemDramSize}"
                         Width="250" />
                     <ComboBox
                         SelectedIndex="{Binding DramSize}"
-                        ToolTip.Tip="{locale:Locale DRamTooltip}"
+                        ToolTip.Tip="{ext:Locale DRamTooltip}"
                         HorizontalContentAlignment="Left"
                         Width="350">
                         <ComboBoxItem>
-                            <TextBlock Text="{locale:Locale SettingsTabSystemDramSize4GiB}" />
+                            <TextBlock Text="{ext:Locale SettingsTabSystemDramSize4GiB}" />
                         </ComboBoxItem>
                         <ComboBoxItem>
-                            <TextBlock Text="{locale:Locale SettingsTabSystemDramSize6GiB}" />
+                            <TextBlock Text="{ext:Locale SettingsTabSystemDramSize6GiB}" />
                         </ComboBoxItem>
                         <ComboBoxItem>
-                            <TextBlock Text="{locale:Locale SettingsTabSystemDramSize8GiB}" />
+                            <TextBlock Text="{ext:Locale SettingsTabSystemDramSize8GiB}" />
                         </ComboBoxItem>
                         <ComboBoxItem>
-                            <TextBlock Text="{locale:Locale SettingsTabSystemDramSize12GiB}" />
+                            <TextBlock Text="{ext:Locale SettingsTabSystemDramSize12GiB}" />
                         </ComboBoxItem>
                     </ComboBox>
                 </StackPanel>
@@ -236,13 +236,13 @@
                     Orientation="Vertical">
                     <CheckBox
                         IsChecked="{Binding IgnoreMissingServices}"
-                        ToolTip.Tip="{locale:Locale IgnoreMissingServicesTooltip}">
-                        <TextBlock Text="{locale:Locale SettingsTabSystemIgnoreMissingServices}" />
+                        ToolTip.Tip="{ext:Locale IgnoreMissingServicesTooltip}">
+                        <TextBlock Text="{ext:Locale SettingsTabSystemIgnoreMissingServices}" />
                     </CheckBox>
                     <CheckBox 
                         IsChecked="{Binding IgnoreApplet}"
-                        ToolTip.Tip="{locale:Locale IgnoreAppletTooltip}">
-                        <TextBlock Text="{locale:Locale SettingsTabSystemIgnoreApplet}" />
+                        ToolTip.Tip="{ext:Locale IgnoreAppletTooltip}">
+                        <TextBlock Text="{ext:Locale SettingsTabSystemIgnoreApplet}" />
                     </CheckBox>
                 </StackPanel>
             </StackPanel>
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
index b2dd4e2d6..3f23a75fd 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     mc:Ignorable="d"
     x:DataType="viewModels:SettingsViewModel">
@@ -23,65 +23,65 @@
                 HorizontalAlignment="Stretch"
                 Orientation="Vertical"
                 Spacing="10">
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabGeneralGeneral}" />
+                <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGeneral}" />
                 <StackPanel Margin="10,0,0,0" Orientation="Vertical">
                     <CheckBox IsChecked="{Binding EnableDiscordIntegration}">
                         <TextBlock VerticalAlignment="Center"
-                                   ToolTip.Tip="{locale:Locale ToggleDiscordTooltip}"
-                                   Text="{locale:Locale SettingsTabGeneralEnableDiscordRichPresence}" />
+                                   ToolTip.Tip="{ext:Locale ToggleDiscordTooltip}"
+                                   Text="{ext:Locale SettingsTabGeneralEnableDiscordRichPresence}" />
                     </CheckBox>
                     <CheckBox IsChecked="{Binding CheckUpdatesOnStart}">
-                        <TextBlock Text="{locale:Locale SettingsTabGeneralCheckUpdatesOnLaunch}" />
+                        <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunch}" />
                     </CheckBox>
                     <CheckBox IsChecked="{Binding ShowConfirmExit}">
-                        <TextBlock Text="{locale:Locale SettingsTabGeneralShowConfirmExitDialog}" />
+                        <TextBlock Text="{ext:Locale SettingsTabGeneralShowConfirmExitDialog}" />
                     </CheckBox>
                     <CheckBox IsChecked="{Binding RememberWindowState}">
-                        <TextBlock Text="{locale:Locale SettingsTabGeneralRememberWindowState}" />
+                        <TextBlock Text="{ext:Locale SettingsTabGeneralRememberWindowState}" />
                     </CheckBox>
                     <CheckBox IsChecked="{Binding ShowTitleBar}" Name="ShowTitleBarBox">
-                        <TextBlock Text="{locale:Locale SettingsTabGeneralShowTitleBar}" />
+                        <TextBlock Text="{ext:Locale SettingsTabGeneralShowTitleBar}" />
                     </CheckBox>
                     <StackPanel Margin="0, 15, 0, 0" Orientation="Horizontal">
                         <TextBlock VerticalAlignment="Center"
-                                   Text="{locale:Locale SettingsTabGeneralHideCursor}"
+                                   Text="{ext:Locale SettingsTabGeneralHideCursor}"
                                    Width="150" />
                         <ComboBox SelectedIndex="{Binding HideCursor}"
                                   HorizontalContentAlignment="Left"
                                   MinWidth="100">
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGeneralHideCursorNever}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorNever}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGeneralHideCursorOnIdle}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorOnIdle}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGeneralHideCursorAlways}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorAlways}" />
                             </ComboBoxItem>
                         </ComboBox>
                     </StackPanel>
                     <StackPanel Margin="0, 15, 0, 10" Orientation="Horizontal">
                         <TextBlock
                             VerticalAlignment="Center"
-                            Text="{locale:Locale SettingsTabGeneralTheme}"
+                            Text="{ext:Locale SettingsTabGeneralTheme}"
                             Width="150" />
                         <ComboBox SelectedIndex="{Binding BaseStyleIndex}"
                                   HorizontalContentAlignment="Left"
                                   MinWidth="100">
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGeneralThemeAuto}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralThemeAuto}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGeneralThemeLight}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralThemeLight}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGeneralThemeDark}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralThemeDark}" />
                             </ComboBoxItem>
                         </ComboBox>
                     </StackPanel>
                 </StackPanel>
                 <Separator Height="1" />
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabGeneralGameDirectories}" />
+                <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGameDirectories}" />
                 <StackPanel
                     Margin="10,0,0,0"
                     HorizontalAlignment="Stretch"
@@ -107,34 +107,34 @@
                         <TextBox
                             Name="GameDirPathBox"
                             Margin="0"
-                            ToolTip.Tip="{locale:Locale AddGameDirBoxTooltip}"
+                            ToolTip.Tip="{ext:Locale AddGameDirBoxTooltip}"
                             VerticalAlignment="Stretch" />
                         <Button
                             Name="AddGameDirButton"
                             Grid.Column="1"
                             MinWidth="90"
                             Margin="10,0,0,0"
-                            ToolTip.Tip="{locale:Locale AddGameDirTooltip}"
+                            ToolTip.Tip="{ext:Locale AddGameDirTooltip}"
                             Click="AddGameDirButton_OnClick">
                             <TextBlock HorizontalAlignment="Center"
-                                       Text="{locale:Locale SettingsTabGeneralAdd}" />
+                                       Text="{ext:Locale SettingsTabGeneralAdd}" />
                         </Button>
                         <Button
                             Name="RemoveGameDirButton"
                             Grid.Column="2"
                             MinWidth="90"
                             Margin="10,0,0,0"
-                            ToolTip.Tip="{locale:Locale RemoveGameDirTooltip}"
+                            ToolTip.Tip="{ext:Locale RemoveGameDirTooltip}"
                             Click="RemoveGameDirButton_OnClick">
                             <TextBlock HorizontalAlignment="Center"
-                                       Text="{locale:Locale SettingsTabGeneralRemove}" />
+                                       Text="{ext:Locale SettingsTabGeneralRemove}" />
                         </Button>
                     </Grid>
                 </StackPanel>
                 <Separator Height="1" />
                <StackPanel Orientation="Vertical" Spacing="5">
-                    <TextBlock Classes="h1" Text="{locale:Locale SettingsTabGeneralAutoloadDirectories}" />
-                    <TextBlock Foreground="{DynamicResource SecondaryTextColor}" Text="{locale:Locale SettingsTabGeneralAutoloadNote}" />
+                    <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralAutoloadDirectories}" />
+                    <TextBlock Foreground="{DynamicResource SecondaryTextColor}" Text="{ext:Locale SettingsTabGeneralAutoloadNote}" />
                 </StackPanel>
                 <StackPanel
                     Margin="10,0,0,0"
@@ -161,27 +161,27 @@
                         <TextBox
                             Name="AutoloadDirPathBox"
                             Margin="0"
-                            ToolTip.Tip="{locale:Locale AddAutoloadDirBoxTooltip}"
+                            ToolTip.Tip="{ext:Locale AddAutoloadDirBoxTooltip}"
                             VerticalAlignment="Stretch" />
                         <Button
                             Name="AddAutoloadDirButton"
                             Grid.Column="1"
                             MinWidth="90"
                             Margin="10,0,0,0"
-                            ToolTip.Tip="{locale:Locale AddAutoloadDirTooltip}"
+                            ToolTip.Tip="{ext:Locale AddAutoloadDirTooltip}"
                             Click="AddAutoloadDirButton_OnClick">
                             <TextBlock HorizontalAlignment="Center"
-                                       Text="{locale:Locale SettingsTabGeneralAdd}" />
+                                       Text="{ext:Locale SettingsTabGeneralAdd}" />
                         </Button>
                         <Button
                             Name="RemoveAutoloadDirButton"
                             Grid.Column="2"
                             MinWidth="90"
                             Margin="10,0,0,0"
-                            ToolTip.Tip="{locale:Locale RemoveAutoloadDirTooltip}"
+                            ToolTip.Tip="{ext:Locale RemoveAutoloadDirTooltip}"
                             Click="RemoveAutoloadDirButton_OnClick">
                             <TextBlock HorizontalAlignment="Center"
-                                       Text="{locale:Locale SettingsTabGeneralRemove}" />
+                                       Text="{ext:Locale SettingsTabGeneralRemove}" />
                         </Button>
                     </Grid>
                 </StackPanel>
diff --git a/src/Ryujinx/UI/Views/User/UserEditorView.axaml b/src/Ryujinx/UI/Views/User/UserEditorView.axaml
index ab83c2cdd..7a4af4823 100644
--- a/src/Ryujinx/UI/Views/User/UserEditorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserEditorView.axaml
@@ -2,7 +2,7 @@
     x:Class="Ryujinx.Ava.UI.Views.User.UserEditorView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -32,15 +32,15 @@
             HorizontalAlignment="Stretch"
             Orientation="Vertical"
             Spacing="10">
-            <TextBlock Text="{locale:Locale UserProfilesName}" />
+            <TextBlock Text="{ext:Locale UserProfilesName}" />
             <TextBox
                 Name="NameBox"
                 Width="300"
                 HorizontalAlignment="Stretch"
                 MaxLength="{Binding MaxProfileNameLength}"
-                Watermark="{locale:Locale ProfileNameSelectionWatermark}"
+                Watermark="{ext:Locale ProfileNameSelectionWatermark}"
                 Text="{Binding Name}" />
-            <TextBlock Name="IdText" Text="{locale:Locale UserProfilesUserId}" />
+            <TextBlock Name="IdText" Text="{ext:Locale UserProfilesUserId}" />
             <TextBox
                 Name="IdLabel"
                 Width="300"
@@ -104,19 +104,19 @@
             <Button
                 Name="DeleteButton"
                 Click="DeleteButton_Click"
-                Content="{locale:Locale UserProfilesDelete}" />
+                Content="{ext:Locale UserProfilesDelete}" />
             <Button
                 Name="ChangePictureButton"
                 Click="ChangePictureButton_Click"
-                Content="{locale:Locale UserProfilesChangeProfileImage}" />
+                Content="{ext:Locale UserProfilesChangeProfileImage}" />
             <Button
                 Name="AddPictureButton"
                 Click="ChangePictureButton_Click"
-                Content="{locale:Locale UserProfilesSetProfileImage}" />
+                Content="{ext:Locale UserProfilesSetProfileImage}" />
             <Button
                 Name="SaveButton"
                 Click="SaveButton_Click"
-                Content="{locale:Locale Save}" />
+                Content="{ext:Locale Save}" />
         </StackPanel>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml b/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
index 21dfc9099..d6a78bf9b 100644
--- a/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
@@ -9,7 +9,7 @@
     d:DesignWidth="578"
     d:DesignHeight="350"
     x:Class="Ryujinx.Ava.UI.Views.User.UserFirmwareAvatarSelectorView"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
     x:DataType="viewModels:UserFirmwareAvatarSelectorViewModel"
@@ -104,10 +104,10 @@
                 </ui:ColorPickerButton.Styles>
             </ui:ColorPickerButton>
             <Button
-                Content="{locale:Locale AvatarChoose}"
+                Content="{ext:Locale AvatarChoose}"
                 Height="35"
                 Name="ChooseButton"
                 Click="ChooseButton_OnClick" />
         </StackPanel>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/src/Ryujinx/UI/Views/User/UserProfileImageSelectorView.axaml b/src/Ryujinx/UI/Views/User/UserProfileImageSelectorView.axaml
index b1786430e..26e27176b 100644
--- a/src/Ryujinx/UI/Views/User/UserProfileImageSelectorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserProfileImageSelectorView.axaml
@@ -4,7 +4,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModles="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     Focusable="True"
     mc:Ignorable="d"
@@ -28,7 +28,7 @@
             TextWrapping="Wrap"
             HorizontalAlignment="Left"
             TextAlignment="Start"
-            Text="{locale:Locale ProfileImageSelectionNote}" />
+            Text="{ext:Locale ProfileImageSelectionNote}" />
         <StackPanel
             Grid.Row="2"
             Spacing="10"
@@ -49,13 +49,13 @@
             <Button
                 Name="Import"
                 Click="Import_OnClick">
-                <TextBlock Text="{locale:Locale ProfileImageSelectionImportImage}" />
+                <TextBlock Text="{ext:Locale ProfileImageSelectionImportImage}" />
             </Button>
             <Button
                 Name="SelectFirmwareImage"
                 IsEnabled="{Binding FirmwareFound}"
                 Click="SelectFirmwareImage_OnClick">
-                <TextBlock Text="{locale:Locale ProfileImageSelectionSelectAvatar}" />
+                <TextBlock Text="{ext:Locale ProfileImageSelectionSelectAvatar}" />
             </Button>
         </StackPanel>
     </Grid>
diff --git a/src/Ryujinx/UI/Views/User/UserRecovererView.axaml b/src/Ryujinx/UI/Views/User/UserRecovererView.axaml
index 3fdb4ab92..f49444642 100644
--- a/src/Ryujinx/UI/Views/User/UserRecovererView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserRecovererView.axaml
@@ -8,7 +8,7 @@
     d:DesignHeight="450"
     Width="500"
     Height="400"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     x:Class="Ryujinx.Ava.UI.Views.User.UserRecovererView"
@@ -55,7 +55,7 @@
                                             HorizontalAlignment="Right"
                                             Click="Recover"
                                             CommandParameter="{Binding}"
-                                            Content="{locale:Locale Recover}"/>
+                                            Content="{ext:Locale Recover}"/>
                                 </Grid>
                             </Border>
                         </DataTemplate>
@@ -64,7 +64,7 @@
                 <TextBlock
                     IsVisible="{Binding IsEmpty}"
                     TextAlignment="Center"
-                    Text="{locale:Locale UserProfilesRecoverEmptyList}"/>
+                    Text="{ext:Locale UserProfilesRecoverEmptyList}"/>
             </Panel>
         </Border>
         <StackPanel
diff --git a/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml b/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
index 8bc5125a7..e43c39dfa 100644
--- a/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
@@ -4,7 +4,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
     xmlns:models="clr-namespace:Ryujinx.Ava.UI.Models"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
@@ -40,19 +40,19 @@
                 Orientation="Horizontal"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center">
-                <Label Content="{locale:Locale CommonSort}" VerticalAlignment="Center" />
+                <Label Content="{ext:Locale CommonSort}" VerticalAlignment="Center" />
                 <ComboBox SelectedIndex="{Binding SortIndex}" Width="100">
                     <ComboBoxItem>
                         <Label
                             VerticalAlignment="Center"
                             HorizontalContentAlignment="Left"
-                            Content="{locale:Locale Name}" />
+                            Content="{ext:Locale Name}" />
                     </ComboBoxItem>
                     <ComboBoxItem>
                         <Label
                             VerticalAlignment="Center"
                             HorizontalContentAlignment="Left"
-                            Content="{locale:Locale Size}" />
+                            Content="{ext:Locale Size}" />
                     </ComboBoxItem>
                     <ComboBox.Styles>
                         <Style Selector="ContentControl#ContentPresenter">
@@ -65,13 +65,13 @@
                         <Label
                             VerticalAlignment="Center"
                             HorizontalContentAlignment="Left"
-                            Content="{locale:Locale OrderAscending}" />
+                            Content="{ext:Locale OrderAscending}" />
                     </ComboBoxItem>
                     <ComboBoxItem>
                         <Label
                             VerticalAlignment="Center"
                             HorizontalContentAlignment="Left"
-                            Content="{locale:Locale OrderDescending}" />
+                            Content="{ext:Locale OrderDescending}" />
                     </ComboBoxItem>
                     <ComboBox.Styles>
                         <Style Selector="ContentControl#ContentPresenter">
@@ -88,7 +88,7 @@
                     <ColumnDefinition Width="Auto"/>
                     <ColumnDefinition/>
                 </Grid.ColumnDefinitions>
-                <Label Content="{locale:Locale Search}" VerticalAlignment="Center" />
+                <Label Content="{ext:Locale Search}" VerticalAlignment="Center" />
                 <TextBox
                     Margin="5,0,0,0"
                     Grid.Column="1"
@@ -210,4 +210,4 @@
             </Button>
         </StackPanel>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/src/Ryujinx/UI/Views/User/UserSelectorView.axaml b/src/Ryujinx/UI/Views/User/UserSelectorView.axaml
index 3a9de3039..fd6513ae7 100644
--- a/src/Ryujinx/UI/Views/User/UserSelectorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserSelectorView.axaml
@@ -2,7 +2,7 @@
     x:Class="Ryujinx.Ava.UI.Views.User.UserSelectorViews"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
@@ -144,10 +144,10 @@
             Spacing="10">
             <Button
                 Click="ManageSaves"
-                Content="{locale:Locale UserProfilesManageSaves}" />
+                Content="{ext:Locale UserProfilesManageSaves}" />
             <Button
                 Click="RecoverLostAccounts"
-                Content="{locale:Locale UserProfilesRecoverLostAccounts}" />
+                Content="{ext:Locale UserProfilesRecoverLostAccounts}" />
         </StackPanel>
         <StackPanel
             Grid.Row="1"
@@ -156,7 +156,7 @@
             Orientation="Horizontal">
             <Button
                 Click="Close"
-                Content="{locale:Locale UserProfilesClose}" />
+                Content="{ext:Locale UserProfilesClose}" />
         </StackPanel>
     </Grid>
 </UserControl>
diff --git a/src/Ryujinx/UI/Windows/AboutWindow.axaml b/src/Ryujinx/UI/Windows/AboutWindow.axaml
index 746504317..6d4a7b7e3 100644
--- a/src/Ryujinx/UI/Windows/AboutWindow.axaml
+++ b/src/Ryujinx/UI/Windows/AboutWindow.axaml
@@ -3,9 +3,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:viewModel="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     Width="550"
     Height="260"
@@ -85,7 +84,7 @@
                     HorizontalAlignment="Center"
                     FontSize="10"
                     LineHeight="12"
-                    Text="{locale:Locale AboutDisclaimerMessage}"
+                    Text="{ext:Locale AboutDisclaimerMessage}"
                     TextAlignment="Center"
                     TextWrapping="Wrap" />
                 <TextBlock
@@ -95,7 +94,7 @@
                     FontSize="10"
                     LineHeight="12"
                     PointerPressed="AmiiboLabel_OnPointerPressed"
-                    Text="{locale:Locale AboutAmiiboDisclaimerMessage}"
+                    Text="{ext:Locale AboutAmiiboDisclaimerMessage}"
                     TextAlignment="Center"
                     TextWrapping="Wrap" />
                 <StackPanel
@@ -111,7 +110,7 @@
                         Background="Transparent"
                         Click="Button_OnClick"
                         CornerRadius="15"
-                        ToolTip.Tip="{locale:Locale AboutGithubUrlTooltipMessage}">
+                        ToolTip.Tip="{ext:Locale AboutGithubUrlTooltipMessage}">
                         <Image Source="{Binding GithubLogo}" />
                     </Button>
                     <Button
@@ -124,7 +123,7 @@
                         Click="Button_OnClick"
                         CornerRadius="15"
                         Tag="https://discord.gg/dHPrkBkkyA"
-                        ToolTip.Tip="{locale:Locale AboutDiscordUrlTooltipMessage}">
+                        ToolTip.Tip="{ext:Locale AboutDiscordUrlTooltipMessage}">
                         <Image Source="{Binding DiscordLogo}" />
                     </Button>
                 </StackPanel>
@@ -148,10 +147,10 @@
                 <TextBlock
                     FontSize="15"
                     FontWeight="Bold"
-                    Text="{locale:Locale AboutRyujinxAboutTitle}" />
+                    Text="{ext:Locale AboutRyujinxAboutTitle}" />
                 <TextBlock
                     FontSize="10"
-                    Text="{locale:Locale AboutRyujinxAboutContent}"
+                    Text="{ext:Locale AboutRyujinxAboutContent}"
                     TextWrapping="Wrap" />
             </StackPanel>
             <StackPanel
@@ -161,7 +160,7 @@
                 <TextBlock
                     FontSize="15"
                     FontWeight="Bold"
-                    Text="{locale:Locale AboutRyujinxMaintainersTitle}" />
+                    Text="{ext:Locale AboutRyujinxMaintainersTitle}" />
                 <TextBlock
                     FontSize="10"
                     Text="{Binding Developers}"
@@ -174,9 +173,9 @@
                     Tag="https://github.com/GreemDev/Ryujinx/graphs/contributors?type=a">
                     <TextBlock
                         FontSize="10"
-                        Text="{locale:Locale AboutRyujinxContributorsButtonHeader}"
+                        Text="{ext:Locale AboutRyujinxContributorsButtonHeader}"
                         TextAlignment="End"
-                        ToolTip.Tip="{locale:Locale AboutRyujinxMaintainersContentTooltipMessage}" />
+                        ToolTip.Tip="{ext:Locale AboutRyujinxMaintainersContentTooltipMessage}" />
                 </Button>
             </StackPanel>
         </Grid>
diff --git a/src/Ryujinx/UI/Windows/AmiiboWindow.axaml b/src/Ryujinx/UI/Windows/AmiiboWindow.axaml
index 180eb4a88..ce410923d 100644
--- a/src/Ryujinx/UI/Windows/AmiiboWindow.axaml
+++ b/src/Ryujinx/UI/Windows/AmiiboWindow.axaml
@@ -5,7 +5,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:window="clr-namespace:Ryujinx.Ava.UI.Windows"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     mc:Ignorable="d"
     d:DesignWidth="400"
     d:DesignHeight="350"
@@ -25,11 +25,11 @@
     <Grid RowDefinitions="Auto,Auto,*,Auto" Margin="15" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" >
         <Grid ColumnDefinitions="*,*" Grid.Row="1" HorizontalAlignment="Stretch" >
             <StackPanel Spacing="10" Orientation="Horizontal" HorizontalAlignment="Left">
-                <TextBlock VerticalAlignment="Center" Text="{locale:Locale AmiiboSeriesLabel}" />
+                <TextBlock VerticalAlignment="Center" Text="{ext:Locale AmiiboSeriesLabel}" />
                 <ComboBox SelectedIndex="{Binding SeriesSelectedIndex}" ItemsSource="{Binding AmiiboSeries}" MinWidth="100" />
             </StackPanel>
             <StackPanel Spacing="10" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
-                <TextBlock VerticalAlignment="Center" Text="{locale:Locale AmiiboCharacterLabel}" />
+                <TextBlock VerticalAlignment="Center" Text="{ext:Locale AmiiboCharacterLabel}" />
                 <ComboBox SelectedIndex="{Binding AmiiboSelectedIndex}" MinWidth="100" ItemsSource="{Binding AmiiboList}" />
             </StackPanel>
         </Grid>
@@ -44,24 +44,24 @@
         <Grid Grid.Row="3" ColumnDefinitions="Auto,Auto,*,Auto,Auto">
             <CheckBox Margin="10" Grid.Column="0" VerticalContentAlignment="Center" 
                       IsChecked="{Binding ShowAllAmiibo}"
-                      Content="{locale:Locale AmiiboOptionsShowAllLabel}" />
+                      Content="{ext:Locale AmiiboOptionsShowAllLabel}" />
             <CheckBox HotKey="H" 
                       Margin="10" VerticalContentAlignment="Center" Grid.Column="1" 
                       IsChecked="{Binding UseRandomUuid}"
-                      Content="{locale:Locale AmiiboOptionsUsRandomTagLabel}" />
+                      Content="{ext:Locale AmiiboOptionsUsRandomTagLabel}" />
             <Button Grid.Column="3" 
                     IsEnabled="{Binding EnableScanning}" 
                     Width="80"
                     Name="ScanButton"
                     HotKey="Return"
-                    Content="{locale:Locale AmiiboScanButtonLabel}"
+                    Content="{ext:Locale AmiiboScanButtonLabel}"
                     Click="ScanButton_Click" />
             <Button Grid.Column="4" 
                     Margin="10,0" 
                     Width="80"
                     Name="CancelButton"
                     HotKey="Escape"
-                    Content="{locale:Locale InputDialogCancel}"
+                    Content="{ext:Locale InputDialogCancel}"
                     Click="CancelButton_Click" />
         </Grid>
     </Grid>
diff --git a/src/Ryujinx/UI/Windows/CheatWindow.axaml b/src/Ryujinx/UI/Windows/CheatWindow.axaml
index 5809ae2bd..c6d485c9b 100644
--- a/src/Ryujinx/UI/Windows/CheatWindow.axaml
+++ b/src/Ryujinx/UI/Windows/CheatWindow.axaml
@@ -3,9 +3,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:model="clr-namespace:Ryujinx.Ava.UI.Models"
     xmlns:window="clr-namespace:Ryujinx.Ava.UI.Windows"
     Width="500"
     Height="500"
@@ -41,7 +40,7 @@
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
             LineHeight="30"
-            Text="{locale:Locale BuildId}"
+            Text="{ext:Locale BuildId}"
             TextAlignment="Center"
             TextWrapping="Wrap" />
         <TextBox
@@ -101,7 +100,7 @@
                     HotKey="Ctrl+S"
                     Command="{Binding Save}"
                     IsVisible="{Binding !NoCheatsFound}">
-                    <TextBlock Text="{locale:Locale SettingsButtonSave}" />
+                    <TextBlock Text="{ext:Locale SettingsButtonSave}" />
                 </Button>
                 <Button
                     Name="CancelButton"
@@ -109,7 +108,7 @@
                     Margin="5"
                     HotKey="Escape"
                     Command="{Binding Close}">
-                    <TextBlock Text="{locale:Locale InputDialogCancel}" />
+                    <TextBlock Text="{ext:Locale InputDialogCancel}" />
                 </Button>
             </DockPanel>
         </DockPanel>
diff --git a/src/Ryujinx/UI/Windows/DownloadableContentManagerWindow.axaml b/src/Ryujinx/UI/Windows/DownloadableContentManagerWindow.axaml
index 5d3aab5e2..df70f02eb 100644
--- a/src/Ryujinx/UI/Windows/DownloadableContentManagerWindow.axaml
+++ b/src/Ryujinx/UI/Windows/DownloadableContentManagerWindow.axaml
@@ -3,7 +3,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     xmlns:models="clr-namespace:Ryujinx.UI.Common.Models;assembly=Ryujinx.UI.Common"
@@ -33,7 +33,7 @@
             <TextBlock
                 FontStyle="Italic"
                 VerticalAlignment="Bottom"
-                Text="{locale:Locale DlcWindowBundledContentNotice}" />
+                Text="{ext:Locale DlcWindowBundledContentNotice}" />
         </StackPanel>
         <Panel
             Margin="0 0 0 10"
@@ -51,14 +51,14 @@
                         MinWidth="90"
                         Margin="5"
                         Command="{Binding EnableAll}">
-                        <TextBlock Text="{locale:Locale DlcManagerEnableAllButton}" />
+                        <TextBlock Text="{ext:Locale DlcManagerEnableAllButton}" />
                     </Button>
                     <Button
                         Name="DisableAllButton"
                         MinWidth="90"
                         Margin="5"
                         Command="{Binding DisableAll}">
-                        <TextBlock Text="{locale:Locale DlcManagerDisableAllButton}" />
+                        <TextBlock Text="{ext:Locale DlcManagerDisableAllButton}" />
                     </Button>
                 </StackPanel>
                 <TextBox
@@ -66,7 +66,7 @@
                     MinHeight="29"
                     MaxHeight="29"
                     HorizontalAlignment="Stretch"
-                    Watermark="{locale:Locale Search}"
+                    Watermark="{ext:Locale Search}"
                     Text="{Binding Search}" />
             </Grid>
         </Panel>
@@ -167,14 +167,14 @@
                     MinWidth="90"
                     Margin="5"
                     Command="{Binding Add}">
-                    <TextBlock Text="{locale:Locale SettingsTabGeneralAdd}" />
+                    <TextBlock Text="{ext:Locale SettingsTabGeneralAdd}" />
                 </Button>
                 <Button
                     Name="RemoveAllButton"
                     MinWidth="90"
                     Margin="5"
                     Command="{Binding RemoveAll}">
-                    <TextBlock Text="{locale:Locale DlcManagerRemoveAllButton}" />
+                    <TextBlock Text="{ext:Locale DlcManagerRemoveAllButton}" />
                 </Button>
             </StackPanel>
             <StackPanel
@@ -186,14 +186,14 @@
                     MinWidth="90"
                     Margin="5"
                     Click="SaveAndClose">
-                    <TextBlock Text="{locale:Locale SettingsButtonSave}" />
+                    <TextBlock Text="{ext:Locale SettingsButtonSave}" />
                 </Button>
                 <Button
                     Name="CancelButton"
                     MinWidth="90"
                     Margin="5"
                     Click="Close">
-                    <TextBlock Text="{locale:Locale InputDialogCancel}" />
+                    <TextBlock Text="{ext:Locale InputDialogCancel}" />
                 </Button>
             </StackPanel>
         </Panel>
diff --git a/src/Ryujinx/UI/Windows/ModManagerWindow.axaml b/src/Ryujinx/UI/Windows/ModManagerWindow.axaml
index f19be9472..3a1c4e6dd 100644
--- a/src/Ryujinx/UI/Windows/ModManagerWindow.axaml
+++ b/src/Ryujinx/UI/Windows/ModManagerWindow.axaml
@@ -2,7 +2,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     xmlns:models="clr-namespace:Ryujinx.Ava.UI.Models"
@@ -31,14 +31,14 @@
                         MinWidth="90"
                         Margin="5"
                         Command="{Binding EnableAll}">
-                        <TextBlock Text="{locale:Locale DlcManagerEnableAllButton}" />
+                        <TextBlock Text="{ext:Locale DlcManagerEnableAllButton}" />
                     </Button>
                     <Button
                         Name="DisableAllButton"
                         MinWidth="90"
                         Margin="5"
                         Command="{Binding DisableAll}">
-                        <TextBlock Text="{locale:Locale DlcManagerDisableAllButton}" />
+                        <TextBlock Text="{ext:Locale DlcManagerDisableAllButton}" />
                     </Button>
                 </StackPanel>
                 <TextBox
@@ -46,7 +46,7 @@
                     MinHeight="27"
                     MaxHeight="27"
                     HorizontalAlignment="Stretch"
-                    Watermark="{locale:Locale Search}"
+                    Watermark="{ext:Locale Search}"
                     Text="{Binding Search}" />
             </Grid>
         </Panel>
@@ -135,14 +135,14 @@
                     MinWidth="90"
                     Margin="5"
                     Command="{Binding Add}">
-                    <TextBlock Text="{locale:Locale SettingsTabGeneralAdd}" />
+                    <TextBlock Text="{ext:Locale SettingsTabGeneralAdd}" />
                 </Button>
                 <Button
                     Name="RemoveAllButton"
                     MinWidth="90"
                     Margin="5"
                     Click="DeleteAll">
-                    <TextBlock Text="{locale:Locale ModManagerDeleteAllButton}" />
+                    <TextBlock Text="{ext:Locale ModManagerDeleteAllButton}" />
                 </Button>
             </StackPanel>
             <StackPanel
@@ -154,14 +154,14 @@
                     MinWidth="90"
                     Margin="5"
                     Click="SaveAndClose">
-                    <TextBlock Text="{locale:Locale SettingsButtonSave}" />
+                    <TextBlock Text="{ext:Locale SettingsButtonSave}" />
                 </Button>
                 <Button
                     Name="CancelButton"
                     MinWidth="90"
                     Margin="5"
                     Click="Close">
-                    <TextBlock Text="{locale:Locale InputDialogCancel}" />
+                    <TextBlock Text="{ext:Locale InputDialogCancel}" />
                 </Button>
             </StackPanel>
         </Panel>
diff --git a/src/Ryujinx/UI/Windows/SettingsWindow.axaml b/src/Ryujinx/UI/Windows/SettingsWindow.axaml
index c813b1122..f9d10fe4f 100644
--- a/src/Ryujinx/UI/Windows/SettingsWindow.axaml
+++ b/src/Ryujinx/UI/Windows/SettingsWindow.axaml
@@ -3,7 +3,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:window="clr-namespace:Ryujinx.Ava.UI.Windows"
@@ -51,23 +51,23 @@
             <ui:NavigationView.MenuItems>
                 <ui:NavigationViewItem
                     IsSelected="True"
-                    Content="{locale:Locale SettingsTabGeneral}"
+                    Content="{ext:Locale SettingsTabGeneral}"
                     Tag="UiPage"
                     IconSource="New" />
                 <ui:NavigationViewItem
-                    Content="{locale:Locale SettingsTabInput}"
+                    Content="{ext:Locale SettingsTabInput}"
                     Tag="InputPage"
                     IconSource="Games" />
                 <ui:NavigationViewItem
-                    Content="{locale:Locale SettingsTabHotkeys}"
+                    Content="{ext:Locale SettingsTabHotkeys}"
                     Tag="HotkeysPage"
                     IconSource="Keyboard" />
                 <ui:NavigationViewItem
-                    Content="{locale:Locale SettingsTabSystem}"
+                    Content="{ext:Locale SettingsTabSystem}"
                     Tag="SystemPage"
                     IconSource="Settings" />
                 <ui:NavigationViewItem
-                    Content="{locale:Locale SettingsTabCpu}"
+                    Content="{ext:Locale SettingsTabCpu}"
                     Tag="CpuPage">
                     <ui:NavigationViewItem.IconSource>
                         <ui:FontIconSource
@@ -76,19 +76,19 @@
                     </ui:NavigationViewItem.IconSource>
                 </ui:NavigationViewItem>
                 <ui:NavigationViewItem
-                    Content="{locale:Locale SettingsTabGraphics}"
+                    Content="{ext:Locale SettingsTabGraphics}"
                     Tag="GraphicsPage"
                     IconSource="Image" />
                 <ui:NavigationViewItem
-                    Content="{locale:Locale SettingsTabAudio}"
+                    Content="{ext:Locale SettingsTabAudio}"
                     IconSource="Audio"
                     Tag="AudioPage" />
                 <ui:NavigationViewItem
-                    Content="{locale:Locale SettingsTabNetwork}"
+                    Content="{ext:Locale SettingsTabNetwork}"
                     Tag="NetworkPage"
                     IconSource="Globe" />
                 <ui:NavigationViewItem
-                    Content="{locale:Locale SettingsTabLogging}"
+                    Content="{ext:Locale SettingsTabLogging}"
                     Tag="LoggingPage"
                     IconSource="Document" />
             </ui:NavigationView.MenuItems>
@@ -111,14 +111,14 @@
             <Button
                 HotKey="Enter"
                 Classes="accent"
-                Content="{locale:Locale SettingsButtonOk}"
+                Content="{ext:Locale SettingsButtonOk}"
                 Command="{Binding OkButton}" />
             <Button
                 HotKey="Escape"
-                Content="{locale:Locale SettingsButtonCancel}"
+                Content="{ext:Locale SettingsButtonCancel}"
                 Command="{Binding CancelButton}" />
             <Button
-                Content="{locale:Locale SettingsButtonApply}"
+                Content="{ext:Locale SettingsButtonApply}"
                 Command="{Binding ApplyButton}" />
         </ReversibleStackPanel>
     </Grid>
diff --git a/src/Ryujinx/UI/Windows/TitleUpdateWindow.axaml b/src/Ryujinx/UI/Windows/TitleUpdateWindow.axaml
index c62b3b583..6e22cfed7 100644
--- a/src/Ryujinx/UI/Windows/TitleUpdateWindow.axaml
+++ b/src/Ryujinx/UI/Windows/TitleUpdateWindow.axaml
@@ -3,7 +3,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     xmlns:models="clr-namespace:Ryujinx.UI.Common.Models;assembly=Ryujinx.UI.Common"
@@ -33,7 +33,7 @@
             <TextBlock
                 FontStyle="Italic"
                 VerticalAlignment="Bottom"
-                Text="{locale:Locale UpdateWindowBundledContentNotice}" />
+                Text="{ext:Locale UpdateWindowBundledContentNotice}" />
         </StackPanel>
         <Border
             Grid.Row="1"
@@ -103,7 +103,7 @@
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Center"
                                 TextWrapping="Wrap"
-                                Text="{locale:Locale NoUpdate}" />
+                                Text="{ext:Locale NoUpdate}" />
                         </Panel>
                     </DataTemplate>
                 </ListBox.DataTemplates>
@@ -125,13 +125,13 @@
                     Name="AddButton"
                     MinWidth="90"
                     Command="{Binding Add}">
-                    <TextBlock Text="{locale:Locale SettingsTabGeneralAdd}" />
+                    <TextBlock Text="{ext:Locale SettingsTabGeneralAdd}" />
                 </Button>
                 <Button
                     Name="RemoveAllButton"
                     MinWidth="90"
                     Click="RemoveAll">
-                    <TextBlock Text="{locale:Locale DlcManagerRemoveAllButton}" />
+                    <TextBlock Text="{ext:Locale DlcManagerRemoveAllButton}" />
                 </Button>
             </StackPanel>
             <StackPanel
@@ -142,13 +142,13 @@
                     Name="SaveButton"
                     MinWidth="90"
                     Click="Save">
-                    <TextBlock Text="{locale:Locale SettingsButtonSave}" />
+                    <TextBlock Text="{ext:Locale SettingsButtonSave}" />
                 </Button>
                 <Button
                     Name="CancelButton"
                     MinWidth="90"
                     Click="Close">
-                    <TextBlock Text="{locale:Locale InputDialogCancel}" />
+                    <TextBlock Text="{ext:Locale InputDialogCancel}" />
                 </Button>
             </StackPanel>
         </Panel>