diff --git a/FoliCon/App.xaml b/FoliCon/App.xaml
index ca94c51b..bb669a11 100644
--- a/FoliCon/App.xaml
+++ b/FoliCon/App.xaml
@@ -9,6 +9,8 @@
+
+
diff --git a/FoliCon/Modules/UI/BindingProxy.cs b/FoliCon/Modules/UI/BindingProxy.cs
new file mode 100644
index 00000000..480631da
--- /dev/null
+++ b/FoliCon/Modules/UI/BindingProxy.cs
@@ -0,0 +1,21 @@
+using System.Windows;
+
+namespace FoliCon.Modules.UI
+{
+ public class BindingProxy : Freezable
+ {
+ protected override Freezable CreateInstanceCore()
+ {
+ return new BindingProxy();
+ }
+
+ public object Data
+ {
+ get { return (object)GetValue(DataProperty); }
+ set { SetValue(DataProperty, value); }
+ }
+
+ public static readonly DependencyProperty DataProperty =
+ DependencyProperty.Register("Data", typeof(object), typeof(BindingProxy), new UIPropertyMetadata(null));
+ }
+}
\ No newline at end of file
diff --git a/FoliCon/Resources/Themes/DarkPurpleTheme.xaml b/FoliCon/Resources/Themes/DarkPurpleTheme.xaml
new file mode 100644
index 00000000..20c6e839
--- /dev/null
+++ b/FoliCon/Resources/Themes/DarkPurpleTheme.xaml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/FoliCon/Views/MainWindow.xaml b/FoliCon/Views/MainWindow.xaml
index d52cef0c..35ae7625 100644
--- a/FoliCon/Views/MainWindow.xaml
+++ b/FoliCon/Views/MainWindow.xaml
@@ -1,4 +1,4 @@
-
+ d:DataContext="{d:DesignInstance viewModels:MainWindowViewModel}" Closed="MainWindow_OnClosed"
+ NonClientAreaVisible="True" WindowStyle="SingleBorderWindow"
+ Background="{DynamicResource RegionBrush}">
+
+
+
+
+
+
+
+
+
+
+
+
@@ -53,293 +102,287 @@
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/FoliCon/Views/MainWindow.xaml.cs b/FoliCon/Views/MainWindow.xaml.cs
index 52bde57c..b5ff375e 100644
--- a/FoliCon/Views/MainWindow.xaml.cs
+++ b/FoliCon/Views/MainWindow.xaml.cs
@@ -13,13 +13,13 @@ public MainWindow()
private void CmbLanguage_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
{
-
- if (CmbLanguage.SelectedItem is null)
+ var comboBox = sender as System.Windows.Controls.ComboBox;
+ if (comboBox?.SelectedItem is null)
{
return;
}
- var selectedLanguage = (Languages)CmbLanguage.SelectedValue;
+ var selectedLanguage = (Languages)comboBox.SelectedValue;
var cultureInfo = CultureUtils.GetCultureInfoByLanguage(selectedLanguage);
LangProvider.Culture = cultureInfo;
Thread.CurrentThread.CurrentCulture = cultureInfo;