From fd65a558cb7eed6003205c1d3bd28b30e3ded0f7 Mon Sep 17 00:00:00 2001
From: Sam Johnson <sam@scj.me>
Date: Tue, 20 Feb 2024 00:58:03 -0600
Subject: [PATCH] Rename keyboard layout to input language

---
 .../{KeyboardLayout.xaml => InputLanguage.xaml}      |  4 ++--
 ...{KeyboardLayout.xaml.cs => InputLanguage.xaml.cs} | 12 ++++++------
 RetroBar/Languages/English.xaml                      |  2 +-
 "RetroBar/Languages/T\303\274rk\303\247e.xaml"       |  2 +-
 RetroBar/Languages/hrvatski.xaml                     |  2 +-
 RetroBar/Languages/srpski.xaml                       |  2 +-
 ...203\321\201\321\201\320\272\320\270\320\271.xaml" |  2 +-
 ...201\321\200\320\277\321\201\320\272\320\270.xaml" |  2 +-
 ...227\320\275\321\201\321\214\320\272\320\260.xaml" |  2 +-
 RetroBar/PropertiesWindow.xaml                       | 10 +++++-----
 RetroBar/Taskbar.xaml                                |  4 ++--
 RetroBar/Themes/System.xaml                          | 10 +++++-----
 RetroBar/Themes/Watercolor.xaml                      |  4 ++--
 RetroBar/Themes/Windows 2000.xaml                    |  4 ++--
 RetroBar/Themes/Windows 95-98.xaml                   |  4 ++--
 RetroBar/Themes/Windows Longhorn Aero.xaml           |  8 ++++----
 RetroBar/Themes/Windows Vista Aero.xaml              |  8 ++++----
 RetroBar/Themes/Windows XP Blue.xaml                 |  4 ++--
 RetroBar/Themes/Windows XP Embedded Style.xaml       |  2 +-
 RetroBar/Themes/Windows XP Olive Green.xaml          |  2 +-
 RetroBar/Themes/Windows XP Royale Noir.xaml          |  2 +-
 RetroBar/Themes/Windows XP Royale.xaml               |  2 +-
 RetroBar/Themes/Windows XP Silver.xaml               |  4 ++--
 RetroBar/Themes/Windows XP Zune Style.xaml           |  4 ++--
 RetroBar/Utilities/Settings.cs                       | 10 +++++-----
 25 files changed, 56 insertions(+), 56 deletions(-)
 rename RetroBar/Controls/{KeyboardLayout.xaml => InputLanguage.xaml} (92%)
 rename RetroBar/Controls/{KeyboardLayout.xaml.cs => InputLanguage.xaml.cs} (89%)

diff --git a/RetroBar/Controls/KeyboardLayout.xaml b/RetroBar/Controls/InputLanguage.xaml
similarity index 92%
rename from RetroBar/Controls/KeyboardLayout.xaml
rename to RetroBar/Controls/InputLanguage.xaml
index 2f5ed580..dc033fab 100644
--- a/RetroBar/Controls/KeyboardLayout.xaml
+++ b/RetroBar/Controls/InputLanguage.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="RetroBar.Controls.KeyboardLayout"
+<UserControl x:Class="RetroBar.Controls.InputLanguage"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:converters="clr-namespace:RetroBar.Converters"
@@ -20,7 +20,7 @@
                          RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=Window}" />
             </DockPanel.Dock>
         </Thumb>
-        <TextBlock Style="{DynamicResource KeyboardLayout}"
+        <TextBlock Style="{DynamicResource InputLanguage}"
                    Text="{Binding Path=LocaleIdentifierProperty, Converter={StaticResource cultureInfoToLocaleNameConverter}, ConverterParameter=TwoLetterIsoLanguageName, Mode=OneWay}">
         </TextBlock>
     </DockPanel>
diff --git a/RetroBar/Controls/KeyboardLayout.xaml.cs b/RetroBar/Controls/InputLanguage.xaml.cs
similarity index 89%
rename from RetroBar/Controls/KeyboardLayout.xaml.cs
rename to RetroBar/Controls/InputLanguage.xaml.cs
index 13258f4f..f9b6097a 100644
--- a/RetroBar/Controls/KeyboardLayout.xaml.cs
+++ b/RetroBar/Controls/InputLanguage.xaml.cs
@@ -8,9 +8,9 @@
 
 namespace RetroBar.Controls
 {
-    public partial class KeyboardLayout : UserControl
+    public partial class InputLanguage : UserControl
     {
-        public static DependencyProperty LocaleIdentifierProperty = DependencyProperty.Register("LocaleIdentifierProperty", typeof(CultureInfo), typeof(KeyboardLayout));
+        public static DependencyProperty LocaleIdentifierProperty = DependencyProperty.Register("LocaleIdentifierProperty", typeof(CultureInfo), typeof(InputLanguage));
 
         public CultureInfo LocaleIdentifier
         {
@@ -22,7 +22,7 @@ public CultureInfo LocaleIdentifier
 
         private bool _isLoaded;
 
-        public KeyboardLayout()
+        public InputLanguage()
         {
             InitializeComponent();
             DataContext = this;
@@ -33,7 +33,7 @@ public KeyboardLayout()
 
         private void Initialize()
         {
-            if (Settings.Instance.ShowKeyboardLayout)
+            if (Settings.Instance.ShowInputLanguage)
             {
                 StartWatch();
             }
@@ -74,9 +74,9 @@ private void StopWatch()
 
         private void Settings_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
-            if (e.PropertyName == "ShowKeyboardLayout")
+            if (e.PropertyName == "ShowInputLanguage")
             {
-                if (Settings.Instance.ShowKeyboardLayout)
+                if (Settings.Instance.ShowInputLanguage)
                 {
                     StartWatch();
                 }
diff --git a/RetroBar/Languages/English.xaml b/RetroBar/Languages/English.xaml
index dc5603c0..4fce77b3 100644
--- a/RetroBar/Languages/English.xaml
+++ b/RetroBar/Languages/English.xaml
@@ -23,7 +23,7 @@
     <s:String x:Key="allow_font_smoothing">_Allow font smoothing</s:String>
     <s:String x:Key="collapse_tray_icons">Collapse _notification area icons</s:String>
     <s:String x:Key="customize">_Customize...</s:String>
-    <s:String x:Key="show_keyboard_layout">Show the keyboard _layout</s:String>
+    <s:String x:Key="show_input_language">Show the input _language</s:String>
     <s:String x:Key="show_clock">Show the cloc_k</s:String>
     <s:String x:Key="show_multi_mon">Show on _multiple displays</s:String>
     <s:String x:Key="show_quick_launch">Show _Quick Launch</s:String>
diff --git "a/RetroBar/Languages/T\303\274rk\303\247e.xaml" "b/RetroBar/Languages/T\303\274rk\303\247e.xaml"
index 57ec0b06..ebc56f3e 100644
--- "a/RetroBar/Languages/T\303\274rk\303\247e.xaml"
+++ "b/RetroBar/Languages/T\303\274rk\303\247e.xaml"
@@ -23,7 +23,7 @@
     <s:String x:Key="allow_font_smoothing">_Yazı tipi yumuşatmaya izin ver</s:String>
     <s:String x:Key="collapse_tray_icons">Bildirim _alanı simgelerini daralt</s:String>
     <s:String x:Key="customize">Ö_zelleştir...</s:String>
-    <s:String x:Key="show_keyboard_layout">_Klavye düzenini göster</s:String>
+    <s:String x:Key="show_input_language">_Klavye düzenini göster</s:String>
     <s:String x:Key="show_clock">_Saati göster</s:String>
     <s:String x:Key="show_multi_mon">Birden çok _ekranda göster</s:String>
     <s:String x:Key="show_quick_launch">_Hızlı Başlat'ı Göster</s:String>
diff --git a/RetroBar/Languages/hrvatski.xaml b/RetroBar/Languages/hrvatski.xaml
index 54c8d552..812a21c5 100644
--- a/RetroBar/Languages/hrvatski.xaml
+++ b/RetroBar/Languages/hrvatski.xaml
@@ -23,7 +23,7 @@
     <s:String x:Key="allow_font_smoothing">_Dopusti izglađivanje fonta</s:String>
     <s:String x:Key="collapse_tray_icons">Sakriji neaktivne ikone</s:String>
     <s:String x:Key="customize">Prilagod_i...</s:String>
-    <s:String x:Key="show_keyboard_layout">Prikaži raspored _tipkovnice</s:String>
+    <s:String x:Key="show_input_language">Prikaži raspored _tipkovnice</s:String>
     <s:String x:Key="show_clock">Prikaži  _sat</s:String>
     <s:String x:Key="show_multi_mon">Prikaži _na više zaslona</s:String>
     <s:String x:Key="show_quick_launch">Prika_ži brzo pokretanje</s:String>
diff --git a/RetroBar/Languages/srpski.xaml b/RetroBar/Languages/srpski.xaml
index 3de846d3..483e9402 100644
--- a/RetroBar/Languages/srpski.xaml
+++ b/RetroBar/Languages/srpski.xaml
@@ -23,7 +23,7 @@
     <s:String x:Key="allow_font_smoothing">Dozvoli izglađivanje _fontova</s:String>
     <s:String x:Key="collapse_tray_icons">Skupi _ikonice u sistemskoj paleti</s:String>
     <s:String x:Key="customize">Prilago_di...</s:String>
-    <s:String x:Key="show_keyboard_layout">Prikaži raspored _tastature</s:String>
+    <s:String x:Key="show_input_language">Prikaži raspored _tastature</s:String>
     <s:String x:Key="show_clock">Prikaži _sat</s:String>
     <s:String x:Key="show_multi_mon">Prikaži na _više ekrana</s:String>
     <s:String x:Key="show_quick_launch">Prikaži _brzo pokretanje</s:String>
diff --git "a/RetroBar/Languages/\321\200\321\203\321\201\321\201\320\272\320\270\320\271.xaml" "b/RetroBar/Languages/\321\200\321\203\321\201\321\201\320\272\320\270\320\271.xaml"
index 68a34674..6a5f81c4 100644
--- "a/RetroBar/Languages/\321\200\321\203\321\201\321\201\320\272\320\270\320\271.xaml"
+++ "b/RetroBar/Languages/\321\200\321\203\321\201\321\201\320\272\320\270\320\271.xaml"
@@ -23,7 +23,7 @@
     <s:String x:Key="allow_font_smoothing">Пр_именять сглаживание шрифтов</s:String>
     <s:String x:Key="collapse_tray_icons">Скр_ывать неиспользуемые значки</s:String>
     <s:String x:Key="customize">_Настроить...</s:String>
-    <s:String x:Key="show_keyboard_layout">Отображать раскладку _клавиатуры</s:String>
+    <s:String x:Key="show_input_language">Отображать раскладку _клавиатуры</s:String>
     <s:String x:Key="show_clock">Отображать _часы</s:String>
     <s:String x:Key="show_multi_mon">Показывать на н_ескольких дисплеях</s:String>
     <s:String x:Key="show_quick_launch">Отображать панель _быстого запуска</s:String>
diff --git "a/RetroBar/Languages/\321\201\321\200\320\277\321\201\320\272\320\270.xaml" "b/RetroBar/Languages/\321\201\321\200\320\277\321\201\320\272\320\270.xaml"
index a4510341..8f4d7a84 100644
--- "a/RetroBar/Languages/\321\201\321\200\320\277\321\201\320\272\320\270.xaml"
+++ "b/RetroBar/Languages/\321\201\321\200\320\277\321\201\320\272\320\270.xaml"
@@ -23,7 +23,7 @@
     <s:String x:Key="allow_font_smoothing">Дозволи изглађивање _фонтова</s:String>
     <s:String x:Key="collapse_tray_icons">Скупи _иконице у системској палети</s:String>
     <s:String x:Key="customize">Прилаго_ди...</s:String>
-    <s:String x:Key="show_keyboard_layout">Прикажи распоред _тастатуре</s:String>
+    <s:String x:Key="show_input_language">Прикажи распоред _тастатуре</s:String>
     <s:String x:Key="show_clock">Прикажи _сат</s:String>
     <s:String x:Key="show_multi_mon">Прикажи на _више екрана</s:String>
     <s:String x:Key="show_quick_launch">Прикажи _брзо покретање</s:String>
diff --git "a/RetroBar/Languages/\321\203\320\272\321\200\320\260\321\227\320\275\321\201\321\214\320\272\320\260.xaml" "b/RetroBar/Languages/\321\203\320\272\321\200\320\260\321\227\320\275\321\201\321\214\320\272\320\260.xaml"
index d9207e9f..eb2bf6cb 100644
--- "a/RetroBar/Languages/\321\203\320\272\321\200\320\260\321\227\320\275\321\201\321\214\320\272\320\260.xaml"
+++ "b/RetroBar/Languages/\321\203\320\272\321\200\320\260\321\227\320\275\321\201\321\214\320\272\320\260.xaml"
@@ -23,7 +23,7 @@
     <s:String x:Key="allow_font_smoothing">Згладжування шрифту</s:String>
     <s:String x:Key="collapse_tray_icons">Згорнути іконки панелі сповіщень</s:String>
     <s:String x:Key="customize">Змінити...</s:String>
-    <s:String x:Key="show_keyboard_layout">Показати розкладку _клавіатури</s:String>
+    <s:String x:Key="show_input_language">Показати розкладку _клавіатури</s:String>
     <s:String x:Key="show_clock">Показати годинник</s:String>
     <s:String x:Key="show_multi_mon">Показати на усіх дисплеях</s:String>
     <s:String x:Key="show_quick_launch">Показати ікони швидкого запуску</s:String>
diff --git a/RetroBar/PropertiesWindow.xaml b/RetroBar/PropertiesWindow.xaml
index 216fad41..947ca436 100644
--- a/RetroBar/PropertiesWindow.xaml
+++ b/RetroBar/PropertiesWindow.xaml
@@ -267,19 +267,19 @@
                                                 <controls:Clock VerticalAlignment="Center" />
                                             </StackPanel>
                                         </GroupBox>
-                                        <controls:KeyboardLayout VerticalAlignment="Stretch" DockPanel.Dock="Right" />
+                                        <controls:InputLanguage VerticalAlignment="Stretch" DockPanel.Dock="Right" />
                                         <StackPanel></StackPanel>
                                     </DockPanel>
                                 </ContentControl>
                             </Border>
-                            <CheckBox x:Name="cbShowKeyboardLayout"
-                                      IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=ShowKeyboardLayout, UpdateSourceTrigger=PropertyChanged}">
-                                <Label Content="{DynamicResource show_keyboard_layout}" />
-                            </CheckBox>
                             <CheckBox x:Name="cbShowClock"
                                       IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=ShowClock, UpdateSourceTrigger=PropertyChanged}">
                                 <Label Content="{DynamicResource show_clock}" />
                             </CheckBox>
+                            <CheckBox x:Name="cbShowInputLanguage"
+                                      IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=ShowInputLanguage, UpdateSourceTrigger=PropertyChanged}">
+                                <Label Content="{DynamicResource show_input_language}" />
+                            </CheckBox>
                             <CheckBox x:Name="cbShowDesktopButton"
                                       IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=ShowDesktopButton, UpdateSourceTrigger=PropertyChanged}">
                                 <Label Content="{DynamicResource add_show_desktop_button}" />
diff --git a/RetroBar/Taskbar.xaml b/RetroBar/Taskbar.xaml
index 0efee621..134f8787 100644
--- a/RetroBar/Taskbar.xaml
+++ b/RetroBar/Taskbar.xaml
@@ -102,7 +102,7 @@
                                     PreviewMouseRightButtonUp="Clock_PreviewMouseRightButtonUp" />
                 </StackPanel>
             </GroupBox>
-            <controls:KeyboardLayout VerticalAlignment="Stretch"
+            <controls:InputLanguage VerticalAlignment="Stretch"
                                      HorizontalAlignment="Stretch">
                 <DockPanel.Dock>
                     <Binding Converter="{StaticResource dockOrientationConverter}"
@@ -110,7 +110,7 @@
                              Path="Orientation"
                              RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=Window}" />
                 </DockPanel.Dock>
-            </controls:KeyboardLayout>
+            </controls:InputLanguage>
             <controls:TaskList VerticalAlignment="Stretch"
                                Host="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"
                                Tasks="{Binding Tasks}"></controls:TaskList>
diff --git a/RetroBar/Themes/System.xaml b/RetroBar/Themes/System.xaml
index 55c4b003..ae8bb17c 100644
--- a/RetroBar/Themes/System.xaml
+++ b/RetroBar/Themes/System.xaml
@@ -21,8 +21,8 @@
     <SolidColorBrush x:Key="ButtonForeground" Color="{x:Static SystemColors.ControlTextColor}" />
     <SolidColorBrush x:Key="ButtonFlashingForeground" Color="{x:Static SystemColors.HighlightTextColor}" />
     <SolidColorBrush x:Key="ClockForeground" Color="{x:Static SystemColors.ControlTextColor}" />
-    <SolidColorBrush x:Key="KeyboardLayoutForeground" Color="{x:Static SystemColors.HighlightTextColor}" />
-    <SolidColorBrush x:Key="KeyboardLayoutBackground" Color="{x:Static SystemColors.HighlightColor}" />
+    <SolidColorBrush x:Key="InputLanguageForeground" Color="{x:Static SystemColors.HighlightTextColor}" />
+    <SolidColorBrush x:Key="InputLanguageBackground" Color="{x:Static SystemColors.HighlightColor}" />
 
     <SolidColorBrush x:Key="ToolTipBackground" Color="{x:Static SystemColors.InfoColor}" />
     <SolidColorBrush x:Key="ToolTipForeground" Color="{x:Static SystemColors.InfoTextColor}" />
@@ -845,12 +845,12 @@
     </ControlTemplate>
 
     <Style TargetType="TextBlock"
-           x:Key="KeyboardLayout"
+           x:Key="InputLanguage"
            BasedOn="{StaticResource GlobalFonts}">
         <Setter Property="Foreground"
-                Value="{DynamicResource KeyboardLayoutForeground}" />
+                Value="{DynamicResource InputLanguageForeground}" />
         <Setter Property="Background" 
-                Value="{DynamicResource KeyboardLayoutBackground}"/>
+                Value="{DynamicResource InputLanguageBackground}"/>
         <Setter Property="MinWidth" 
                 Value="16"/>
         <Setter Property="Height"
diff --git a/RetroBar/Themes/Watercolor.xaml b/RetroBar/Themes/Watercolor.xaml
index 51c041e4..915f8bc2 100644
--- a/RetroBar/Themes/Watercolor.xaml
+++ b/RetroBar/Themes/Watercolor.xaml
@@ -57,8 +57,8 @@
     <SolidColorBrush x:Key="ButtonPressedForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ClockForeground" Color="#000000" />
 
-    <SolidColorBrush x:Key="KeyboardLayoutForeground" Color="#ffffff" />
-    <SolidColorBrush x:Key="KeyboardLayoutBackground" Color="#316ac5" />
+    <SolidColorBrush x:Key="InputLanguageForeground" Color="#ffffff" />
+    <SolidColorBrush x:Key="InputLanguageBackground" Color="#316ac5" />
 
     <SolidColorBrush x:Key="ToolTipBackground" Color="#FFFFE1" />
     <SolidColorBrush x:Key="ToolTipForeground" Color="#000000" />
diff --git a/RetroBar/Themes/Windows 2000.xaml b/RetroBar/Themes/Windows 2000.xaml
index a202392c..587fe73e 100644
--- a/RetroBar/Themes/Windows 2000.xaml	
+++ b/RetroBar/Themes/Windows 2000.xaml	
@@ -15,8 +15,8 @@
     <SolidColorBrush x:Key="ButtonFlashingForeground" Color="#FFFFFF" />
     <SolidColorBrush x:Key="ClockForeground" Color="#000000" />
 
-    <SolidColorBrush x:Key="KeyboardLayoutForeground" Color="#ffffff" />
-    <SolidColorBrush x:Key="KeyboardLayoutBackground" Color="#0A246A" />
+    <SolidColorBrush x:Key="InputLanguageForeground" Color="#ffffff" />
+    <SolidColorBrush x:Key="InputLanguageBackground" Color="#0A246A" />
 
     <SolidColorBrush x:Key="ToolTipBackground" Color="#FFFFE1" />
     <SolidColorBrush x:Key="ToolTipForeground" Color="#000000" />
diff --git a/RetroBar/Themes/Windows 95-98.xaml b/RetroBar/Themes/Windows 95-98.xaml
index 843d419d..9ac169b5 100644
--- a/RetroBar/Themes/Windows 95-98.xaml	
+++ b/RetroBar/Themes/Windows 95-98.xaml	
@@ -15,8 +15,8 @@
     <SolidColorBrush x:Key="ButtonFlashingForeground" Color="#FFFFFF" />
     <SolidColorBrush x:Key="ClockForeground" Color="#000000" />
     
-    <SolidColorBrush x:Key="KeyboardLayoutForeground" Color="#ffffff" />
-    <SolidColorBrush x:Key="KeyboardLayoutBackground" Color="#000080" />
+    <SolidColorBrush x:Key="InputLanguageForeground" Color="#ffffff" />
+    <SolidColorBrush x:Key="InputLanguageBackground" Color="#000080" />
     
     <SolidColorBrush x:Key="ToolTipBackground" Color="#FFFFE1" />
     <SolidColorBrush x:Key="ToolTipForeground" Color="#000000" />
diff --git a/RetroBar/Themes/Windows Longhorn Aero.xaml b/RetroBar/Themes/Windows Longhorn Aero.xaml
index 53886bda..80bc860e 100644
--- a/RetroBar/Themes/Windows Longhorn Aero.xaml	
+++ b/RetroBar/Themes/Windows Longhorn Aero.xaml	
@@ -337,8 +337,8 @@
     <SolidColorBrush x:Key="ButtonPressedForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ButtonFlashingForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ClockForeground" Color="#ffffff" />
-    <SolidColorBrush x:Key="KeyboardLayoutForeground" Color="#ffffff" />
-    <SolidColorBrush x:Key="KeyboardLayoutBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="InputLanguageForeground" Color="#ffffff" />
+    <SolidColorBrush x:Key="InputLanguageBackground" Color="Transparent" />
 
     <SolidColorBrush x:Key="ToolTipBackground" Color="#f4f4f4" />
     <SolidColorBrush x:Key="ToolTipForeground" Color="#00025c" />
@@ -1196,8 +1196,8 @@
     </Style>
 
     <Style TargetType="TextBlock"
-           x:Key="KeyboardLayout"
-           BasedOn="{StaticResource KeyboardLayout}">
+           x:Key="InputLanguage"
+           BasedOn="{StaticResource InputLanguage}">
         <Setter Property="Effect"
                 Value="{StaticResource ForegroundShadow}" />
     </Style>
diff --git a/RetroBar/Themes/Windows Vista Aero.xaml b/RetroBar/Themes/Windows Vista Aero.xaml
index 13e9768c..33368bb8 100644
--- a/RetroBar/Themes/Windows Vista Aero.xaml	
+++ b/RetroBar/Themes/Windows Vista Aero.xaml	
@@ -278,8 +278,8 @@
     <SolidColorBrush x:Key="ButtonPressedForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ButtonFlashingForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ClockForeground" Color="#ffffff" />
-    <SolidColorBrush x:Key="KeyboardLayoutForeground" Color="#ffffff" />
-    <SolidColorBrush x:Key="KeyboardLayoutBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="InputLanguageForeground" Color="#ffffff" />
+    <SolidColorBrush x:Key="InputLanguageBackground" Color="Transparent" />
 
     <LinearGradientBrush x:Key="ShowDesktopButtonBorderHorizontal"
                          StartPoint="0,0"
@@ -1364,8 +1364,8 @@
     </Style>
 
     <Style TargetType="TextBlock"
-           x:Key="KeyboardLayout"
-           BasedOn="{StaticResource KeyboardLayout}">
+           x:Key="InputLanguage"
+           BasedOn="{StaticResource InputLanguage}">
         <Setter Property="Margin"
                 Value="0,-2,0,0" />
     </Style>
diff --git a/RetroBar/Themes/Windows XP Blue.xaml b/RetroBar/Themes/Windows XP Blue.xaml
index a9998a2d..124e69a5 100644
--- a/RetroBar/Themes/Windows XP Blue.xaml	
+++ b/RetroBar/Themes/Windows XP Blue.xaml	
@@ -348,8 +348,8 @@
     <SolidColorBrush x:Key="ButtonPressedForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ButtonFlashingForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ClockForeground" Color="#ffffff" />
-    <SolidColorBrush x:Key="KeyboardLayoutForeground" Color="#ffffff" />
-    <SolidColorBrush x:Key="KeyboardLayoutBackground" Color="#316ac5" />
+    <SolidColorBrush x:Key="InputLanguageForeground" Color="#ffffff" />
+    <SolidColorBrush x:Key="InputLanguageBackground" Color="#316ac5" />
 
     <SolidColorBrush x:Key="ToolTipBackground" Color="#FFFFE1" />
     <SolidColorBrush x:Key="ToolTipForeground" Color="#000000" />
diff --git a/RetroBar/Themes/Windows XP Embedded Style.xaml b/RetroBar/Themes/Windows XP Embedded Style.xaml
index 39ce013b..9b0abde8 100644
--- a/RetroBar/Themes/Windows XP Embedded Style.xaml	
+++ b/RetroBar/Themes/Windows XP Embedded Style.xaml	
@@ -448,7 +448,7 @@
     </LinearGradientBrush>
 
     <SolidColorBrush x:Key="ClockForeground" Color="#ffffff" />
-    <SolidColorBrush x:Key="KeyboardLayoutBackground" Color="#3e9de8" />
+    <SolidColorBrush x:Key="InputLanguageBackground" Color="#3e9de8" />
 
     <BitmapImage x:Key="StartButtonImage"
                  UriSource="../Resources/startxpembeddedbutton.png" />
diff --git a/RetroBar/Themes/Windows XP Olive Green.xaml b/RetroBar/Themes/Windows XP Olive Green.xaml
index f7246453..071be13b 100644
--- a/RetroBar/Themes/Windows XP Olive Green.xaml	
+++ b/RetroBar/Themes/Windows XP Olive Green.xaml	
@@ -388,5 +388,5 @@
     <SolidColorBrush x:Key="ButtonActiveForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ButtonPressedForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ClockForeground" Color="#41400a" />
-    <SolidColorBrush x:Key="KeyboardLayoutBackground" Color="#93a070" />
+    <SolidColorBrush x:Key="InputLanguageBackground" Color="#93a070" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/RetroBar/Themes/Windows XP Royale Noir.xaml b/RetroBar/Themes/Windows XP Royale Noir.xaml
index 95f2097a..22c7a4c6 100644
--- a/RetroBar/Themes/Windows XP Royale Noir.xaml	
+++ b/RetroBar/Themes/Windows XP Royale Noir.xaml	
@@ -402,7 +402,7 @@
                       Opacity="1" />
 
     <SolidColorBrush x:Key="ClockForeground" Color="#ffffff" />
-    <SolidColorBrush x:Key="KeyboardLayoutBackground" Color="#5e80bc" />
+    <SolidColorBrush x:Key="InputLanguageBackground" Color="#5e80bc" />
 
     <BitmapImage x:Key="StartButtonImage"
                  UriSource="../Resources/startnoir.png" />
diff --git a/RetroBar/Themes/Windows XP Royale.xaml b/RetroBar/Themes/Windows XP Royale.xaml
index a5852827..4a11c5d3 100644
--- a/RetroBar/Themes/Windows XP Royale.xaml	
+++ b/RetroBar/Themes/Windows XP Royale.xaml	
@@ -463,7 +463,7 @@
     </LinearGradientBrush>
 
     <SolidColorBrush x:Key="ClockForeground" Color="#000000" />
-    <SolidColorBrush x:Key="KeyboardLayoutBackground" Color="#335ea8" />
+    <SolidColorBrush x:Key="InputLanguageBackground" Color="#335ea8" />
 
     <BitmapImage x:Key="StartButtonImage"
                  UriSource="../Resources/startxproyalebutton.png" />
diff --git a/RetroBar/Themes/Windows XP Silver.xaml b/RetroBar/Themes/Windows XP Silver.xaml
index 7a498e07..f3088287 100644
--- a/RetroBar/Themes/Windows XP Silver.xaml	
+++ b/RetroBar/Themes/Windows XP Silver.xaml	
@@ -790,6 +790,6 @@
     <SolidColorBrush x:Key="ButtonActiveForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ButtonPressedForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ClockForeground" Color="#000000" />
-    <SolidColorBrush x:Key="KeyboardLayoutForeground" Color="#000000" />
-    <SolidColorBrush x:Key="KeyboardLayoutBackground" Color="#b2b4bf" />
+    <SolidColorBrush x:Key="InputLanguageForeground" Color="#000000" />
+    <SolidColorBrush x:Key="InputLanguageBackground" Color="#b2b4bf" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/RetroBar/Themes/Windows XP Zune Style.xaml b/RetroBar/Themes/Windows XP Zune Style.xaml
index c0de8308..cdd8b478 100644
--- a/RetroBar/Themes/Windows XP Zune Style.xaml	
+++ b/RetroBar/Themes/Windows XP Zune Style.xaml	
@@ -450,8 +450,8 @@
     </LinearGradientBrush>
 
     <SolidColorBrush x:Key="ClockForeground" Color="#ffffff" />
-    <SolidColorBrush x:Key="KeyboardLayoutForeground" Color="#000000" />
-    <SolidColorBrush x:Key="KeyboardLayoutBackground" Color="#bebebe" />
+    <SolidColorBrush x:Key="InputLanguageForeground" Color="#000000" />
+    <SolidColorBrush x:Key="InputLanguageBackground" Color="#bebebe" />
 
     <BitmapImage x:Key="StartButtonImage"
                  UriSource="../Resources/startxpzunebutton.png" />
diff --git a/RetroBar/Utilities/Settings.cs b/RetroBar/Utilities/Settings.cs
index 064879d8..8a6c5572 100644
--- a/RetroBar/Utilities/Settings.cs
+++ b/RetroBar/Utilities/Settings.cs
@@ -87,18 +87,18 @@ public string Theme
             }
         }
 
-        private bool _showKeyboardLayout = false;
-        public bool ShowKeyboardLayout
+        private bool _showInputLanguage = false;
+        public bool ShowInputLanguage
         {
             get
             {
-                return _showKeyboardLayout;
+                return _showInputLanguage;
             }
             set
             {
-                if (_showKeyboardLayout != value)
+                if (_showInputLanguage != value)
                 {
-                    _showKeyboardLayout = value;
+                    _showInputLanguage = value;
                     OnPropertyChanged();
                 }
             }