diff --git a/src/ARKServerManager/Styles/Default.xaml b/src/ARKServerManager/Styles/Default.xaml
index 13380fe5..e2b09de0 100644
--- a/src/ARKServerManager/Styles/Default.xaml
+++ b/src/ARKServerManager/Styles/Default.xaml
@@ -3,6 +3,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:Globalization="clr-namespace:WPFSharp.Globalizer;assembly=WPFSharp.Globalizer" 
     xmlns:cc="clr-namespace:ServerManagerTool.Common.Converters;assembly=ServerManager.Common"
+    xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
     Name="Default">
 
     <BitmapImage x:Key="NoAvatar" UriSource="../Art/NoAvatar.png" />
@@ -561,5 +562,156 @@
         <Setter Property="VerticalAlignment" Value="Center"/>
         <Setter Property="TextWrapping" Value="Wrap"/>
     </Style>
-    
+
+    <ContentControl x:Key="SupportZipButtonContent">
+        <StackPanel Orientation="Horizontal" Height="27">
+            <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Zip.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ServerSettings_SupportZipButtonLabel}" VerticalAlignment="Center"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="SyncProfileButtonContent">
+        <StackPanel Orientation="Horizontal" Height="27">
+            <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Copy.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ServerSettings_SyncProfileButtonLabel}" VerticalAlignment="Center"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="ImportButtonContent">
+        <StackPanel Orientation="Horizontal" Height="27">
+            <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/FolderImport.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ServerSettings_ImportButtonLabel}" VerticalAlignment="Center"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="SaveButtonContent">
+        <StackPanel Orientation="Horizontal" Height="27">
+            <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Save.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ServerSettings_SaveButtonLabel}" VerticalAlignment="Center"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="StopButtonContent">
+        <StackPanel Orientation="Horizontal" Height="27">
+            <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Stop.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ServerSettings_StopButtonLabel}" VerticalAlignment="Center"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="StartButtonContent">
+        <StackPanel Orientation="Horizontal" Height="27">
+            <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Start.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ServerSettings_StartButtonLabel}" VerticalAlignment="Center"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="OpenRCONButtonContent">
+        <StackPanel Orientation="Horizontal"  Height="27">
+            <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Command.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ServerSettings_RCONButtonLabel}" VerticalAlignment="Center"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="PlayerListButtonContent">
+        <StackPanel Orientation="Horizontal"  Height="27">
+            <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Players.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ServerSettings_PlayerListButtonLabel}" VerticalAlignment="Center"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="ResetRCONButtonContent">
+        <StackPanel Orientation="Horizontal" Height="20">
+            <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ServerSettings_RCONButtonLabel}" VerticalAlignment="Center" Margin="0,-5,0,-5"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="UpgradeButtonContent">
+        <StackPanel Orientation="Horizontal" Height="27">
+            <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Download.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ServerSettings_UpgradeButtonLabel}" VerticalAlignment="Center"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="InstallButtonContent">
+        <StackPanel Orientation="Horizontal" Height="27">
+            <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Download.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ServerSettings_InstallButtonLabel}" VerticalAlignment="Center"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="CancelInstallButtonContent">
+        <StackPanel Orientation="Horizontal" Height="27">
+            <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Stop.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ServerSettings_CancelUpgradeButtonLabel}" VerticalAlignment="Center"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="LocationButtonContent"  Height="27">
+        <StackPanel Orientation="Horizontal">
+            <Label Content="{DynamicResource ServerSettings_SetLocationButtonLabel}" />
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="ShowCmdButtonContent">
+        <StackPanel Orientation="Horizontal" Height="20">
+            <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Command.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ServerSettings_ShowCommandButtonLabel}" VerticalAlignment="Center" Margin="0,-5,0,-5"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="CreateSymLinkButtonContent">
+        <StackPanel Orientation="Horizontal" Height="20">
+            <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Command.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ServerSettings_CreateSymbolicLinkButtonLabel}" VerticalAlignment="Center" Margin="0,-5,0,-5"/>
+        </StackPanel>
+    </ContentControl>
+
+    <ContentControl x:Key="ShutdownButtonContent">
+        <StackPanel Orientation="Horizontal">
+            <Image Width="16" Height="16" Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Stop.ico,Size=32}" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ShutdownWindow_ShutdownButtonLabel}" VerticalAlignment="Center" Padding="5,0"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="RestartButtonContent">
+        <StackPanel Orientation="Horizontal">
+            <Image Width="16" Height="16" Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Start.ico,Size=32}" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ShutdownWindow_RestartButtonLabel}" VerticalAlignment="Center" Padding="5,0"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="CancelShutdownButtonContent">
+        <StackPanel Orientation="Horizontal">
+            <Image Width="16" Height="16" Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Cancel.ico,Size=32}" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ShutdownWindow_CancelShutdownButtonLabel}" VerticalAlignment="Center" Padding="5,0"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="StopButtonContent2">
+        <StackPanel Orientation="Horizontal">
+            <Image Width="16" Height="16" Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Stop.ico,Size=32}" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ShutdownWindow_StopButtonLabel}" VerticalAlignment="Center" Padding="5,0"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="CancelButtonContent">
+        <StackPanel Orientation="Horizontal">
+            <Label Content="{DynamicResource ShutdownWindow_CloseButtonLabel}" VerticalAlignment="Center" Padding="5,0"/>
+        </StackPanel>
+    </ContentControl>
+
+    <ContentControl x:Key="DataDirectoryButtonContent">
+        <StackPanel Orientation="Horizontal">
+            <Label Content="{DynamicResource GlobalSettings_SetLocationButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="BackupDirectoryButtonContent">
+        <StackPanel Orientation="Horizontal">
+            <Label Content="{DynamicResource GlobalSettings_SetLocationButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="ClearButtonContent">
+        <StackPanel Orientation="Horizontal">
+            <Label Content="{DynamicResource GlobalSettings_ClearButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="SteamAPIKeyButtonContent">
+        <StackPanel Orientation="Horizontal">
+            <Label Content="{DynamicResource GlobalSettings_SteamAPIKeyButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="SteamAPIKeyHelpButtonContent">
+        <StackPanel Orientation="Horizontal">
+            <Label Content="{DynamicResource GlobalSettings_SteamAPIKeyHelpButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="CacheDirectoryButtonContent">
+        <StackPanel Orientation="Horizontal">
+            <Label Content="{DynamicResource GlobalSettings_SetLocationButtonLabel}" VerticalAlignment="Center" Margin="0,-3,0,-3"/>
+        </StackPanel>
+    </ContentControl>
+
 </Globalization:StyleResourceDictionary>
\ No newline at end of file
diff --git a/src/ARKServerManager/Windows/GlobalSettingsControl.xaml b/src/ARKServerManager/Windows/GlobalSettingsControl.xaml
index 96de3306..cd639d3a 100644
--- a/src/ARKServerManager/Windows/GlobalSettingsControl.xaml
+++ b/src/ARKServerManager/Windows/GlobalSettingsControl.xaml
@@ -15,37 +15,6 @@
                 <ResourceDictionary Source="..\Globalization\en-US\en-US.xaml"/>
                 <ResourceDictionary Source="..\Styles\Default.xaml"/>
             </ResourceDictionary.MergedDictionaries>
-
-            <ContentControl x:Key="DataDirectoryButtonContent">
-                <StackPanel Orientation="Horizontal">
-                    <Label Content="{DynamicResource GlobalSettings_SetLocationButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="BackupDirectoryButtonContent">
-                <StackPanel Orientation="Horizontal">
-                    <Label Content="{DynamicResource GlobalSettings_SetLocationButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="ClearButtonContent">
-                <StackPanel Orientation="Horizontal">
-                    <Label Content="{DynamicResource GlobalSettings_ClearButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="SteamAPIKeyButtonContent">
-                <StackPanel Orientation="Horizontal">
-                    <Label Content="{DynamicResource GlobalSettings_SteamAPIKeyButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="SteamAPIKeyHelpButtonContent">
-                <StackPanel Orientation="Horizontal">
-                    <Label Content="{DynamicResource GlobalSettings_SteamAPIKeyHelpButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="CacheDirectoryButtonContent">
-                <StackPanel Orientation="Horizontal">
-                    <Label Content="{DynamicResource GlobalSettings_SetLocationButtonLabel}" VerticalAlignment="Center" Margin="0,-3,0,-3"/>
-                </StackPanel>
-            </ContentControl>
         </ResourceDictionary>
     </UserControl.Resources>
 
diff --git a/src/ARKServerManager/Windows/ProcessorAffinityWindow.xaml b/src/ARKServerManager/Windows/ProcessorAffinityWindow.xaml
index 9ebd8f2d..b22ce845 100644
--- a/src/ARKServerManager/Windows/ProcessorAffinityWindow.xaml
+++ b/src/ARKServerManager/Windows/ProcessorAffinityWindow.xaml
@@ -1,7 +1,6 @@
 <Window x:Class="ServerManagerTool.ProcessorAffinityWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:cc="clr-namespace:ServerManagerTool.Common.Converters;assembly=ServerManager.Common"
         MinWidth="300" MinHeight="200" Width="300" Height="300" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" ResizeMode="CanResize"
         Icon="../Art/favicon.ico" Title="{DynamicResource ProcessorAffinity_Title}">
     <Window.Resources>
diff --git a/src/ARKServerManager/Windows/ServerMonitorWindow.xaml b/src/ARKServerManager/Windows/ServerMonitorWindow.xaml
index 066941be..acacb095 100644
--- a/src/ARKServerManager/Windows/ServerMonitorWindow.xaml
+++ b/src/ARKServerManager/Windows/ServerMonitorWindow.xaml
@@ -3,11 +3,11 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
+        xmlns:tb="http://www.hardcodet.net/taskbar"
         xmlns:clib="clr-namespace:ServerManagerTool.Common.Lib;assembly=ServerManager.Common"
+        xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
         xmlns:enum="clr-namespace:ServerManagerTool.Enums"
         xmlns:vm="clr-namespace:ServerManagerTool.Lib.ViewModel"
-        xmlns:tb="http://www.hardcodet.net/taskbar"
         mc:Ignorable="d"
         MinWidth="600" MinHeight="500" Width="900" Height="500" Left="50" Top="50" ResizeMode="CanResize"
         Loaded="Window_Loaded" SizeChanged="Window_SizeChanged" StateChanged="Window_StateChanged"
diff --git a/src/ARKServerManager/Windows/ServerSettingsControl.xaml b/src/ARKServerManager/Windows/ServerSettingsControl.xaml
index 9326f68c..1ec4b3da 100644
--- a/src/ARKServerManager/Windows/ServerSettingsControl.xaml
+++ b/src/ARKServerManager/Windows/ServerSettingsControl.xaml
@@ -12,8 +12,8 @@
              xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
              xmlns:enum="clr-namespace:ServerManagerTool.Enums"
              xmlns:acenum="clr-namespace:ServerManagerTool.Enums;assembly=ArkServerManager.Common"
-             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:vm="clr-namespace:ServerManagerTool.Lib.ViewModel"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              mc:Ignorable="d"
              d:DesignWidth="900"
              x:Name="SettingsControl">
@@ -42,96 +42,6 @@
             <CollectionViewSource x:Key="EngramsViewSource" Source="{Binding Settings.EngramSettings, ElementName=SettingsControl}" Filter="EngramMod_OnFilter" />
             <CollectionViewSource x:Key="ResourcesViewSource" Source="{Binding Settings.HarvestResourceItemAmountClassMultipliers, ElementName=SettingsControl}" Filter="ResourceMod_OnFilter" />
 
-            <ContentControl x:Key="SupportZipButtonContent">
-                <StackPanel Orientation="Horizontal" Height="27">
-                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Zip.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ServerSettings_SupportZipButtonLabel}" VerticalAlignment="Center"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="SyncProfileButtonContent">
-                <StackPanel Orientation="Horizontal" Height="27">
-                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Copy.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ServerSettings_SyncProfileButtonLabel}" VerticalAlignment="Center"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="ImportButtonContent">
-                <StackPanel Orientation="Horizontal" Height="27">
-                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/FolderImport.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ServerSettings_ImportButtonLabel}" VerticalAlignment="Center"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="SaveButtonContent">
-                <StackPanel Orientation="Horizontal" Height="27">
-                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Save.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ServerSettings_SaveButtonLabel}" VerticalAlignment="Center"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="StopButtonContent">
-                <StackPanel Orientation="Horizontal" Height="27">
-                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Stop.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ServerSettings_StopButtonLabel}" VerticalAlignment="Center"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="StartButtonContent">
-                <StackPanel Orientation="Horizontal" Height="27">
-                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Start.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ServerSettings_StartButtonLabel}" VerticalAlignment="Center"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="OpenRCONButtonContent">
-                <StackPanel Orientation="Horizontal"  Height="27">
-                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Command.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ServerSettings_RCONButtonLabel}" VerticalAlignment="Center"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="PlayerListButtonContent">
-                <StackPanel Orientation="Horizontal"  Height="27">
-                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Players.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ServerSettings_PlayerListButtonLabel}" VerticalAlignment="Center"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="ResetRCONButtonContent">
-                <StackPanel Orientation="Horizontal" Height="20">
-                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ServerSettings_RCONButtonLabel}" VerticalAlignment="Center" Margin="0,-5,0,-5"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="UpgradeButtonContent">
-                <StackPanel Orientation="Horizontal" Height="27">
-                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Download.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ServerSettings_UpgradeButtonLabel}" VerticalAlignment="Center"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="InstallButtonContent">
-                <StackPanel Orientation="Horizontal" Height="27">
-                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Download.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ServerSettings_InstallButtonLabel}" VerticalAlignment="Center"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="CancelInstallButtonContent">
-                <StackPanel Orientation="Horizontal" Height="27">
-                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Stop.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ServerSettings_CancelUpgradeButtonLabel}" VerticalAlignment="Center"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="LocationButtonContent"  Height="27">
-                <StackPanel Orientation="Horizontal">
-                    <Label Content="{DynamicResource ServerSettings_SetLocationButtonLabel}" />
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="ShowCmdButtonContent">
-                <StackPanel Orientation="Horizontal" Height="20">
-                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Command.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ServerSettings_ShowCommandButtonLabel}" VerticalAlignment="Center" Margin="0,-5,0,-5"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="CreateSymLinkButtonContent">
-                <StackPanel Orientation="Horizontal" Height="20">
-                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Command.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ServerSettings_CreateSymbolicLinkButtonLabel}" VerticalAlignment="Center" Margin="0,-5,0,-5"/>
-                </StackPanel>
-            </ContentControl>
-
             <ControlTemplate x:Key="ExpanderTemplateSE" TargetType="{x:Type Expander}">
                 <Border BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3" SnapsToDevicePixels="true" Padding="1" Margin="0,0,0,3" BorderBrush="Black">
                     <DockPanel Background="#FFEAE7E0">
diff --git a/src/ARKServerManager/Windows/ShutdownWindow.xaml b/src/ARKServerManager/Windows/ShutdownWindow.xaml
index 991f8294..8348c0e3 100644
--- a/src/ARKServerManager/Windows/ShutdownWindow.xaml
+++ b/src/ARKServerManager/Windows/ShutdownWindow.xaml
@@ -2,8 +2,6 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:cctl="clr-namespace:ServerManagerTool.Common.Controls;assembly=ServerManager.Common"
-        xmlns:cc="clr-namespace:ServerManagerTool.Common.Converters;assembly=ServerManager.Common"
-        xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
         xmlns:en="clr-namespace:ServerManagerTool.Enums"
         Width="600" ResizeMode="CanMinimize" SizeToContent="Height" WindowStyle="SingleBorderWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="True" 
         Closing="Window_Closing" Closed="Window_Closed"
@@ -14,36 +12,6 @@
                 <ResourceDictionary Source="..\Globalization\en-US\en-US.xaml"/>
                 <ResourceDictionary Source="..\Styles\Default.xaml"/>
             </ResourceDictionary.MergedDictionaries>
-
-            <ContentControl x:Key="ShutdownButtonContent">
-                <StackPanel Orientation="Horizontal">
-                    <Image Width="16" Height="16" Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Stop.ico,Size=32}" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ShutdownWindow_ShutdownButtonLabel}" VerticalAlignment="Center" Padding="5,0"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="RestartButtonContent">
-                <StackPanel Orientation="Horizontal">
-                    <Image Width="16" Height="16" Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Start.ico,Size=32}" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ShutdownWindow_RestartButtonLabel}" VerticalAlignment="Center" Padding="5,0"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="CancelShutdownButtonContent">
-                <StackPanel Orientation="Horizontal">
-                    <Image Width="16" Height="16" Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Cancel.ico,Size=32}" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ShutdownWindow_CancelShutdownButtonLabel}" VerticalAlignment="Center" Padding="5,0"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="StopButtonContent">
-                <StackPanel Orientation="Horizontal">
-                    <Image Width="16" Height="16" Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Stop.ico,Size=32}" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ShutdownWindow_StopButtonLabel}" VerticalAlignment="Center" Padding="5,0"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="CancelButtonContent">
-                <StackPanel Orientation="Horizontal">
-                    <Label Content="{DynamicResource ShutdownWindow_CloseButtonLabel}" VerticalAlignment="Center" Padding="5,0"/>
-                </StackPanel>
-            </ContentControl>
         </ResourceDictionary>
     </Window.Resources>
     <Grid Background="{StaticResource BeigeGradient}">
@@ -207,7 +175,7 @@
                 <Button.Style>
                     <Style BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
                         <Setter Property="IsEnabled" Value="False" />
-                        <Setter Property="Content" Value="{StaticResource StopButtonContent}" />
+                        <Setter Property="Content" Value="{StaticResource StopButtonContent2}" />
                         <Setter Property="ToolTip" Value="{DynamicResource ShutdownWindow_StopButtonTooltip}" />
                         <Style.Triggers>
                             <MultiDataTrigger>
diff --git a/src/ConanServerManager/Styles/Default.xaml b/src/ConanServerManager/Styles/Default.xaml
index a0be2728..59ac044d 100644
--- a/src/ConanServerManager/Styles/Default.xaml
+++ b/src/ConanServerManager/Styles/Default.xaml
@@ -1,16 +1,53 @@
 <Globalization:StyleResourceDictionary 
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:Globalization="clr-namespace:WPFSharp.Globalizer;assembly=WPFSharp.Globalizer" 
+    xmlns:cc="clr-namespace:ServerManagerTool.Common.Converters;assembly=ServerManager.Common" 
+    xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
     Name="Default">
 
-    <!--<FlowDirection x:Key="FlowDirection_Default">LeftToRight</FlowDirection>
-    <FlowDirection x:Key="FlowDirection_Reverse">RightToLeft</FlowDirection>-->
+    <BitmapImage x:Key="NoAvatar" UriSource="../Art/NoAvatar.png" />
 
-    <!--<sys:Double x:Key="CommonFontSize">12</sys:Double>-->
+    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+    <cc:CommaDelimitedStringCountConverter x:Key="CommaDelimitedStringCountConverter"/>
+    <cc:EnumConverter x:Key="EnumConverter"/>
+    <cc:EnumFlagsConverter x:Key="EnumFlagsConverter"/>
+    <cc:FlagsEnumToBooleanConverter x:Key="FlagsEnumToBooleanConverter"/>
+    <cc:HasStringValueConverter x:Key="HasStringValueConverter"/>
+    <cc:InstalledVersionConverter x:Key="InstalledVersionConverter"/>
+    <cc:InvertBooleanConverter x:Key="InvertBooleanConverter"/>
+    <cc:InvertBooleanToVisibilityConverter x:Key="InvertBooleanToVisibilityConverter"/>
+    <cc:IsNullOrWhiteSpaceValueConverter x:Key="IsNullOrWhiteSpaceValueConverter"/>
+    <cc:IsNullValueConverter x:Key="IsNullValueConverter"/>
+    <cc:MinutesToTimeValueConverter x:Key="MinutesToTimeValueConverter"/>
+    <cc:NullValueConverter x:Key="NullValueConverter"/>
+    <cc:ProcessorAffinityConverter x:Key="ProcessorAffinityConverter"/>
+    <cc:SecondsToMinutesConverter x:Key="SecondsToMinutesConverter"/>
+    <cc:SecondsToTimeValueConverter x:Key="SecondsToTimeValueConverter"/>
+    <cc:UnixTimeToDateTimeConverter x:Key="UnixTimeToDateTimeConverter"/>
 
+    <SolidColorBrush x:Key="BeigeBorder" Color="#FFD8CCBC"/>
+    <SolidColorBrush x:Key="BeigeLabel" Color="#FFE6DFD8"/>
+    <SolidColorBrush x:Key="DarkBorder" Color="#FF10274F"/>
+    <SolidColorBrush x:Key="HeaderBrush" Color="#FFF0F0F0"/>
     <SolidColorBrush x:Key="SolidBackground" Color="White" />
+    
+    <SolidColorBrush x:Key="TabItem.Selected.Background" Color="#FFFFFF"/>
+    <SolidColorBrush x:Key="TabItem.Selected.Border" Color="#ACACAC"/>
+    
+    <SolidColorBrush x:Key="Expander.MouseOver.Circle.Stroke" Color="#FF5593FF"/>
+    <SolidColorBrush x:Key="Expander.MouseOver.Circle.Fill" Color="#FFF3F9FF"/>
+    <SolidColorBrush x:Key="Expander.MouseOver.Arrow.Stroke" Color="#FF000000"/>
+    <SolidColorBrush x:Key="Expander.Pressed.Circle.Stroke" Color="#FF3C77DD"/>
+    <SolidColorBrush x:Key="Expander.Pressed.Circle.Fill" Color="#FFD9ECFF"/>
+    <SolidColorBrush x:Key="Expander.Pressed.Arrow.Stroke" Color="#FF000000"/>
+    <SolidColorBrush x:Key="Expander.Disabled.Circle.Stroke" Color="#FFBCBCBC"/>
+    <SolidColorBrush x:Key="Expander.Disabled.Circle.Fill" Color="#FFE6E6E6"/>
+    <SolidColorBrush x:Key="Expander.Disabled.Arrow.Stroke" Color="#FF707070"/>
+    <SolidColorBrush x:Key="Expander.Static.Circle.Fill" Color="#FFFFFFFF"/>
+    <SolidColorBrush x:Key="Expander.Static.Circle.Stroke" Color="#FF333333"/>
+    <SolidColorBrush x:Key="Expander.Static.Arrow.Stroke" Color="#FF333333"/>
+
 
     <!--BeigeGradient-->
     <LinearGradientBrush x:Key="GradientBackground" EndPoint="0.5,1" StartPoint="0.5,0">
@@ -18,11 +55,16 @@
         <GradientStop Color="#FFEAE8E6"/>
     </LinearGradientBrush>
 
+    <LinearGradientBrush x:Key="BeigeGradient" EndPoint="0.5,1" StartPoint="0.5,0">
+        <GradientStop Color="#FFECE1D4" Offset="1"/>
+        <GradientStop Color="#FFEAE8E6"/>
+    </LinearGradientBrush>
 
     <!--Generic control styles-->
     <Style TargetType="{x:Type Label}">
         <Setter Property="Foreground" Value="Black" />
     </Style>
+    
 
     <!--Named styles-->
     <Style x:Key="BorderLabel" TargetType="{x:Type Border}">
@@ -32,6 +74,419 @@
         <Setter Property="BorderBrush" Value="#FFD8CCBC"/>
         <Setter Property="Background" Value="#FFE6DFD8"/>
     </Style>
+    
+    <Style x:Key="GroupBoxStyle" TargetType="GroupBox" BasedOn="{StaticResource {x:Type GroupBox}}">
+        <Setter Property="BorderBrush" Value="{StaticResource BeigeBorder}"/>
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+        <Setter Property="Background" Value="Transparent"/>
+    </Style>
+
+    <Style x:Key="HiddenTextBoxStyle" TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Background" Value="Wheat"/>
+        <Setter Property="IsReadOnly" Value="True"/>
+    </Style>
+
+    <Style x:Key="OnlineListViewItemStyle" TargetType="{x:Type ListViewItem}">
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding IsOnline}" Value="True">
+                <Setter Property="Foreground" Value="Green"/>
+                <Setter Property="FontWeight" Value="Bold"/>
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="ButtonStyle1" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Background" Value="#00ffffff"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Width" Value="22"/>
+        <Setter Property="Height" Value="22"/>
+        <Setter Property="Margin" Value="2"/>
+        <Setter Property="Padding" Value="0"/>
+    </Style>
+    <Style x:Key="ButtonStyle2" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Width" Value="22"/>
+        <Setter Property="Height" Value="22"/>
+        <Setter Property="Margin" Value="2"/>
+        <Setter Property="Padding" Value="0"/>
+    </Style>
+    <Style x:Key="ButtonStyle3" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Background" Value="#00ffffff"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Height" Value="22"/>
+        <Setter Property="Margin" Value="2"/>
+        <Setter Property="Padding" Value="0"/>
+    </Style>
+    <Style x:Key="ButtonStyle5" TargetType="Button" BasedOn="{StaticResource ButtonStyle1}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border CornerRadius="15" Background="{TemplateBinding Background}" BorderThickness="1">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="Red"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="PlayerStatus" TargetType="Border">
+        <Setter Property="BorderBrush" Value="Gray"/>
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding IsOnline}"            Value="True">
+                <Setter Property="BorderBrush" Value="LightGreen"/>
+            </DataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding IsOnline}"      Value="False" />
+                    <Condition Binding="{Binding IsValid}"       Value="False" />
+                </MultiDataTrigger.Conditions>
+                <Setter Property="BorderBrush" Value="Orange"/>
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding IsOnline}"      Value="False" />
+                    <Condition Binding="{Binding IsWhitelisted}" Value="True" />
+                </MultiDataTrigger.Conditions>
+                <Setter Property="BorderBrush" Value="#0066CC"/>
+            </MultiDataTrigger>
+        </Style.Triggers>
+    </Style>
+    <Style x:Key="GuildName" TargetType="Label">
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding GuildName, Converter={StaticResource IsNullOrWhiteSpaceValueConverter}}" Value="True">
+                <Setter Property="Content" Value="No clan"/>
+                <Setter Property="FontStyle" Value="Italic"/>
+                <Setter Property="Foreground" Value="LightGray"/>
+            </DataTrigger>
+            <DataTrigger Binding="{Binding GuildName, Converter={StaticResource IsNullOrWhiteSpaceValueConverter}}" Value="False">
+                <Setter Property="Content" Value="{Binding PlayerData.Guild.GuildName}"/>
+                <Setter Property="FontStyle" Value="Normal"/>
+                <Setter Property="Foreground" Value="Black"/>
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="Online" TargetType="{x:Type Label}">
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding Player.IsOnline}" Value="True">
+                <Setter Property="Foreground" Value="Green"/>
+                <Setter Property="FontWeight" Value="Bold"/>
+            </DataTrigger>
+            <DataTrigger Binding="{Binding Player.IsOnline}" Value="False">
+                <Setter Property="Foreground" Value="Red"/>
+                <Setter Property="FontWeight" Value="Bold"/>
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
+    <Style x:Key="CommunityBanned" TargetType="{x:Type Label}">
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding PlayerData.CommunityBanned}" Value="False">
+                <Setter Property="Foreground" Value="Black"/>
+            </DataTrigger>
+            <DataTrigger Binding="{Binding PlayerData.CommunityBanned}" Value="True">
+                <Setter Property="Foreground" Value="Red"/>
+                <Setter Property="FontWeight" Value="Bold"/>
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
+    <Style x:Key="VACBanned" TargetType="{x:Type Label}">
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding PlayerData.VACBanned}" Value="False">
+                <Setter Property="Foreground" Value="Black"/>
+            </DataTrigger>
+            <DataTrigger Binding="{Binding PlayerData.VACBanned}" Value="True">
+                <Setter Property="Foreground" Value="Red"/>
+                <Setter Property="FontWeight" Value="Bold"/>
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
+    <Style x:Key="Banned" TargetType="{x:Type Label}">
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding Player.IsBanned}" Value="False">
+                <Setter Property="Foreground" Value="Black"/>
+            </DataTrigger>
+            <DataTrigger Binding="{Binding Player.IsBanned}" Value="True">
+                <Setter Property="Foreground" Value="Red"/>
+                <Setter Property="FontWeight" Value="Bold"/>
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
+    <Style x:Key="Whitelisted" TargetType="{x:Type Label}">
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding Player.IsWhitelisted}" Value="True">
+                <Setter Property="Foreground" Value="Blue"/>
+                <Setter Property="FontWeight" Value="Bold"/>
+            </DataTrigger>
+            <DataTrigger Binding="{Binding Player.IsWhitelisted}" Value="False">
+                <Setter Property="Foreground" Value="Black"/>
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="ExpanderRightHeaderStyle" TargetType="{x:Type ToggleButton}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <Border Padding="{TemplateBinding Padding}">
+                        <Grid Background="Transparent" SnapsToDevicePixels="False">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="19"/>
+                                <RowDefinition Height="*"/>
+                            </Grid.RowDefinitions>
+                            <Grid>
+                                <Grid.LayoutTransform>
+                                    <TransformGroup>
+                                        <TransformGroup.Children>
+                                            <TransformCollection>
+                                                <RotateTransform Angle="-90"/>
+                                            </TransformCollection>
+                                        </TransformGroup.Children>
+                                    </TransformGroup>
+                                </Grid.LayoutTransform>
+                                <Ellipse x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
+                                <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" SnapsToDevicePixels="false" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" StrokeThickness="2" VerticalAlignment="Center"/>
+                            </Grid>
+                            <ContentPresenter HorizontalAlignment="Center" Margin="0,4,0,0" Grid.Row="1" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Top"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="true">
+                            <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
+                            <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
+                            <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="true">
+                            <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
+                            <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
+                            <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
+                            <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
+                            <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
+                            <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="ExpanderUpHeaderStyle" TargetType="{x:Type ToggleButton}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <Border Padding="{TemplateBinding Padding}">
+                        <Grid Background="Transparent" SnapsToDevicePixels="False">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="19"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Grid>
+                                <Grid.LayoutTransform>
+                                    <TransformGroup>
+                                        <TransformGroup.Children>
+                                            <TransformCollection>
+                                                <RotateTransform Angle="180"/>
+                                            </TransformCollection>
+                                        </TransformGroup.Children>
+                                    </TransformGroup>
+                                </Grid.LayoutTransform>
+                                <Ellipse x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
+                                <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" SnapsToDevicePixels="false" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" StrokeThickness="2" VerticalAlignment="Center"/>
+                            </Grid>
+                            <ContentPresenter Grid.Column="1" HorizontalAlignment="Left" Margin="4,0,0,0" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Center"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="true">
+                            <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
+                            <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
+                            <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="true">
+                            <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
+                            <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
+                            <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
+                            <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
+                            <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
+                            <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="ExpanderLeftHeaderStyle" TargetType="{x:Type ToggleButton}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <Border Padding="{TemplateBinding Padding}">
+                        <Grid Background="Transparent" SnapsToDevicePixels="False">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="19"/>
+                                <RowDefinition Height="*"/>
+                            </Grid.RowDefinitions>
+                            <Grid>
+                                <Grid.LayoutTransform>
+                                    <TransformGroup>
+                                        <TransformGroup.Children>
+                                            <TransformCollection>
+                                                <RotateTransform Angle="90"/>
+                                            </TransformCollection>
+                                        </TransformGroup.Children>
+                                    </TransformGroup>
+                                </Grid.LayoutTransform>
+                                <Ellipse x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
+                                <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" SnapsToDevicePixels="false" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" StrokeThickness="2" VerticalAlignment="Center"/>
+                            </Grid>
+                            <ContentPresenter HorizontalAlignment="Center" Margin="0,4,0,0" Grid.Row="1" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Top"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="true">
+                            <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
+                            <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
+                            <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="true">
+                            <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
+                            <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
+                            <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
+                            <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
+                            <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
+                            <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="ExpanderHeaderFocusVisual">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Border>
+                        <Rectangle Margin="0" SnapsToDevicePixels="true" Stroke="Black" StrokeThickness="1" StrokeDashArray="1 2"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="ExpanderDownHeaderStyle" TargetType="{x:Type ToggleButton}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <Border Padding="{TemplateBinding Padding}">
+                        <Grid Background="Transparent" SnapsToDevicePixels="False">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="19"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Ellipse x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
+                            <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" SnapsToDevicePixels="false" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" StrokeThickness="2" VerticalAlignment="Center"/>
+                            <ContentPresenter Grid.Column="1" HorizontalAlignment="Left" Margin="4,0,0,0" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Center"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="true">
+                            <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
+                            <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
+                            <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="true">
+                            <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
+                            <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
+                            <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
+                            <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
+                            <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
+                            <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="ExpanderStyle1" TargetType="{x:Type Expander}">
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Stretch"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="1"/>
+    </Style>
+    
+    <Style x:Key="CenteredCheckboxStyle" TargetType="CheckBox">
+        <Setter Property="HorizontalAlignment" Value="Center"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+    </Style>
+    
+    <Style x:Key="CenteredTextBlockStyle" TargetType="TextBlock">
+        <Setter Property="VerticalAlignment" Value="Center"/>
+    </Style>
+
+    <Style x:Key="BorderDarkStyle" TargetType="Border">
+        <Setter Property="BorderBrush" Value="{StaticResource DarkBorder}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="CornerRadius" Value="3"/>
+        <Setter Property="Background" Value="{StaticResource BeigeLabel}"/>
+    </Style>
+    
+    <Style x:Key="BorderLightStyle" TargetType="Border">
+        <Setter Property="BorderBrush" Value="{StaticResource BeigeBorder}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+    </Style>
+    
+    <Style x:Key="BorderFillLightStyle" TargetType="Border">
+        <Setter Property="Background" Value="{StaticResource BeigeLabel}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BeigeBorder}"/>
+    </Style>
+    
+    <Style x:Key="ExpanderHeaderTextStyle" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="13.333"/>
+        <Setter Property="FontWeight" Value="Bold"/>
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="TextWrapping" Value="Wrap"/>
+    </Style>
+
+    <Style x:Key="Version" TargetType="Label">
+        <Setter Property="Content" Value="{Binding Title}"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="Foreground" Value="Black"/>
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding IsCurrent}" Value="True">
+                <Setter Property="FontWeight" Value="Bold"/>
+                <Setter Property="Foreground" Value="#0066CC"/>
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
 
 
     <!--AnnotatedSlider-->
@@ -52,4 +507,169 @@
 
     <SolidColorBrush x:Key="WarningMessage" Color="Red"/>
 
+    <ContentControl x:Key="SupportZipButtonContent">
+        <StackPanel Orientation="Horizontal" Height="27">
+            <Image Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Zip.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ServerSettings_SupportZipButtonLabel}" VerticalAlignment="Center"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="SyncProfileButtonContent">
+        <StackPanel Orientation="Horizontal" Height="27">
+            <Image Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Copy.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ServerSettings_SyncProfileButtonLabel}" VerticalAlignment="Center"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="ImportButtonContent">
+        <StackPanel Orientation="Horizontal" Height="27">
+            <Image Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/FolderImport.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ServerSettings_ImportButtonLabel}" VerticalAlignment="Center"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="SaveButtonContent">
+        <StackPanel Orientation="Horizontal" Height="27">
+            <Image Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Save.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ServerSettings_SaveButtonLabel}" VerticalAlignment="Center"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="StopButtonContent">
+        <StackPanel Orientation="Horizontal" Height="27">
+            <Image Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Stop.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ServerSettings_StopButtonLabel}" VerticalAlignment="Center"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="StartButtonContent">
+        <StackPanel Orientation="Horizontal" Height="27">
+            <Image Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Start.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ServerSettings_StartButtonLabel}" VerticalAlignment="Center"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="OpenRconButtonContent">
+        <StackPanel Orientation="Horizontal"  Height="27">
+            <Image Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Command.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ServerSettings_RconButtonLabel}" VerticalAlignment="Center"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="PlayerListButtonContent">
+        <StackPanel Orientation="Horizontal"  Height="27">
+            <Image Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Players.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ServerSettings_PlayerListButtonLabel}" VerticalAlignment="Center"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="ResetRconButtonContent">
+        <StackPanel Orientation="Horizontal" Height="20">
+            <Image Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Refresh.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ServerSettings_RconButtonLabel}" VerticalAlignment="Center" Margin="0,-5,0,-5"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="UpgradeButtonContent">
+        <StackPanel Orientation="Horizontal" Height="27">
+            <Image Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Download.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ServerSettings_UpgradeButtonLabel}" VerticalAlignment="Center"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="InstallButtonContent">
+        <StackPanel Orientation="Horizontal" Height="27">
+            <Image Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Download.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ServerSettings_InstallButtonLabel}" VerticalAlignment="Center"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="CancelInstallButtonContent">
+        <StackPanel Orientation="Horizontal" Height="27">
+            <Image Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Stop.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ServerSettings_CancelUpgradeButtonLabel}" VerticalAlignment="Center"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="LocationButtonContent"  Height="27">
+        <StackPanel Orientation="Horizontal">
+            <Label Content="{DynamicResource ServerSettings_SetLocationButtonLabel}" />
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="ShowCmdButtonContent">
+        <StackPanel Orientation="Horizontal" Height="20">
+            <Image Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Command.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ServerSettings_ShowCommandButtonLabel}" VerticalAlignment="Center" Margin="0,-5,0,-5"/>
+        </StackPanel>
+    </ContentControl>
+
+    <ContentControl x:Key="ShutdownButtonContent">
+        <StackPanel Orientation="Horizontal">
+            <Image Width="16" Height="16" Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Stop.ico,Size=32}" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ShutdownWindow_ShutdownButtonLabel}" VerticalAlignment="Center" Padding="5,0"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="RestartButtonContent">
+        <StackPanel Orientation="Horizontal">
+            <Image Width="16" Height="16" Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Start.ico,Size=32}" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ShutdownWindow_RestartButtonLabel}" VerticalAlignment="Center" Padding="5,0"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="CancelShutdownButtonContent">
+        <StackPanel Orientation="Horizontal">
+            <Image Width="16" Height="16" Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Cancel.ico,Size=32}" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ShutdownWindow_CancelShutdownButtonLabel}" VerticalAlignment="Center" Padding="5,0"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="StopButtonContent2">
+        <StackPanel Orientation="Horizontal">
+            <Image Width="16" Height="16" Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Stop.ico,Size=32}" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ShutdownWindow_StopButtonLabel}" VerticalAlignment="Center" Padding="5,0"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="CancelButtonContent">
+        <StackPanel Orientation="Horizontal">
+            <Label Content="{DynamicResource ShutdownWindow_CloseButtonLabel}" VerticalAlignment="Center" Padding="5,0"/>
+        </StackPanel>
+    </ContentControl>
+
+    <ContentControl x:Key="SaveManagerPasswordButtonContent">
+        <StackPanel Orientation="Horizontal">
+            <Label Content="{DynamicResource GlobalSettings_SaveManagerPasswordButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="CreateManagerUserButtonContent">
+        <StackPanel Orientation="Horizontal">
+            <Label Content="{DynamicResource GlobalSettings_CreateManagerUserButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="DeleteManagerUserButtonContent">
+        <StackPanel Orientation="Horizontal">
+            <Label Content="{DynamicResource GlobalSettings_DeleteManagerUserButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="DataDirectoryButtonContent">
+        <StackPanel Orientation="Horizontal">
+            <Label Content="{DynamicResource GlobalSettings_SetLocationButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="BackupDirectoryButtonContent">
+        <StackPanel Orientation="Horizontal">
+            <Label Content="{DynamicResource GlobalSettings_SetLocationButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="ClearButtonContent">
+        <StackPanel Orientation="Horizontal">
+            <Label Content="{DynamicResource GlobalSettings_ClearButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="SteamFileButtonContent">
+        <StackPanel Orientation="Horizontal">
+            <Label Content="{DynamicResource GlobalSettings_SetSteamFileButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="SteamAPIKeyButtonContent">
+        <StackPanel Orientation="Horizontal">
+            <Label Content="{DynamicResource GlobalSettings_SteamAPIKeyButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="SteamAPIKeyHelpButtonContent">
+        <StackPanel Orientation="Horizontal">
+            <Label Content="{DynamicResource GlobalSettings_SteamAPIKeyHelpButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
+        </StackPanel>
+    </ContentControl>
+    <ContentControl x:Key="CacheDirectoryButtonContent">
+        <StackPanel Orientation="Horizontal">
+            <Label Content="{DynamicResource GlobalSettings_CacheDirectoryButtonLabel}" VerticalAlignment="Center" Margin="0,-3,0,-3"/>
+        </StackPanel>
+    </ContentControl>
+
 </Globalization:StyleResourceDictionary>
\ No newline at end of file
diff --git a/src/ConanServerManager/Windows/GameDataWindow.xaml b/src/ConanServerManager/Windows/GameDataWindow.xaml
index cbdb970e..1b85df48 100644
--- a/src/ConanServerManager/Windows/GameDataWindow.xaml
+++ b/src/ConanServerManager/Windows/GameDataWindow.xaml
@@ -11,18 +11,6 @@
                 <ResourceDictionary Source="..\Globalization\en-US\en-US.xaml"/>
                 <ResourceDictionary Source="..\Styles\Default.xaml"/>
             </ResourceDictionary.MergedDictionaries>
-
-            <SolidColorBrush x:Key="BeigeBorder" Color="#FFD8CCBC"/>
-            <LinearGradientBrush x:Key="BeigeGradient" EndPoint="0.5,1" StartPoint="0.5,0">
-                <GradientStop Color="#FFECE1D4" Offset="1"/>
-                <GradientStop Color="#FFEAE8E6"/>
-            </LinearGradientBrush>
-
-            <Style x:Key="GroupBoxStyle" TargetType="GroupBox" BasedOn="{StaticResource {x:Type GroupBox}}">
-                <Setter Property="BorderBrush" Value="{StaticResource BeigeBorder}"/>
-                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-                <Setter Property="Background" Value="Transparent"/>
-            </Style>
         </ResourceDictionary>
     </Window.Resources>
     
diff --git a/src/ConanServerManager/Windows/GlobalSettingsControl.xaml b/src/ConanServerManager/Windows/GlobalSettingsControl.xaml
index fa1e7c2c..0d0d2472 100644
--- a/src/ConanServerManager/Windows/GlobalSettingsControl.xaml
+++ b/src/ConanServerManager/Windows/GlobalSettingsControl.xaml
@@ -15,75 +15,6 @@
                 <ResourceDictionary Source="..\Globalization\en-US\en-US.xaml"/>
                 <ResourceDictionary Source="..\Styles\Default.xaml"/>
             </ResourceDictionary.MergedDictionaries>
-
-            <cc:InvertBooleanConverter x:Key="InvertBooleanConverter"/>
-            <cc:MinutesToTimeValueConverter x:Key="MinutesToTimeValueConverter"/>
-
-            <SolidColorBrush x:Key="BeigeBorder" Color="#FFD8CCBC"/>
-            <LinearGradientBrush x:Key="BeigeGradient" EndPoint="0.5,1" StartPoint="0.5,0">
-                <GradientStop Color="#FFECE1D4" Offset="1"/>
-                <GradientStop Color="#FFEAE8E6"/>
-            </LinearGradientBrush>
-
-            <Style x:Key="GroupBoxStyle" TargetType="GroupBox" BasedOn="{StaticResource {x:Type GroupBox}}">
-                <Setter Property="BorderBrush" Value="{StaticResource BeigeBorder}"/>
-            </Style>
-            <Style x:Key="HiddenTextBoxStyle" TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
-                <Setter Property="VerticalContentAlignment" Value="Center"/>
-                <Setter Property="Background" Value="Wheat"/>
-                <Setter Property="IsReadOnly" Value="True"/>
-            </Style>
-
-            <ContentControl x:Key="SaveManagerPasswordButtonContent">
-                <StackPanel Orientation="Horizontal">
-                    <Label Content="{DynamicResource GlobalSettings_SaveManagerPasswordButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="CreateManagerUserButtonContent">
-                <StackPanel Orientation="Horizontal">
-                    <Label Content="{DynamicResource GlobalSettings_CreateManagerUserButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="DeleteManagerUserButtonContent">
-                <StackPanel Orientation="Horizontal">
-                    <Label Content="{DynamicResource GlobalSettings_DeleteManagerUserButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="DataDirectoryButtonContent">
-                <StackPanel Orientation="Horizontal">
-                    <Label Content="{DynamicResource GlobalSettings_SetLocationButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="BackupDirectoryButtonContent">
-                <StackPanel Orientation="Horizontal">
-                    <Label Content="{DynamicResource GlobalSettings_SetLocationButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="ClearButtonContent">
-                <StackPanel Orientation="Horizontal">
-                    <Label Content="{DynamicResource GlobalSettings_ClearButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="SteamFileButtonContent">
-                <StackPanel Orientation="Horizontal">
-                    <Label Content="{DynamicResource GlobalSettings_SetSteamFileButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="SteamAPIKeyButtonContent">
-                <StackPanel Orientation="Horizontal">
-                    <Label Content="{DynamicResource GlobalSettings_SteamAPIKeyButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="SteamAPIKeyHelpButtonContent">
-                <StackPanel Orientation="Horizontal">
-                    <Label Content="{DynamicResource GlobalSettings_SteamAPIKeyHelpButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="CacheDirectoryButtonContent">
-                <StackPanel Orientation="Horizontal">
-                    <Label Content="{DynamicResource GlobalSettings_CacheDirectoryButtonLabel}" VerticalAlignment="Center" Margin="0,-3,0,-3"/>
-                </StackPanel>
-            </ContentControl>
         </ResourceDictionary>
     </UserControl.Resources>
 
diff --git a/src/ConanServerManager/Windows/GuildProfileWindow.xaml b/src/ConanServerManager/Windows/GuildProfileWindow.xaml
index 950b56f5..32485905 100644
--- a/src/ConanServerManager/Windows/GuildProfileWindow.xaml
+++ b/src/ConanServerManager/Windows/GuildProfileWindow.xaml
@@ -1,7 +1,6 @@
 <Window x:Class="ServerManagerTool.GuildProfileWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:cc="clr-namespace:ServerManagerTool.Common.Converters;assembly=ServerManager.Common"
         Width="600" ResizeMode="NoResize" SizeToContent="Height" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" 
         Icon="../Art/favicon.ico" Title="{Binding WindowTitle}">
     <Window.Resources>
@@ -10,26 +9,6 @@
                 <ResourceDictionary Source="..\Globalization\en-US\en-US.xaml"/>
                 <ResourceDictionary Source="..\Styles\Default.xaml"/>
             </ResourceDictionary.MergedDictionaries>
-
-            <cc:UnixTimeToDateTimeConverter x:Key="UnixTimeToDateTimeConverter"/>
-
-            <SolidColorBrush x:Key="BeigeBorder" Color="#FFD8CCBC"/>
-            <LinearGradientBrush x:Key="BeigeGradient" EndPoint="0.5,1" StartPoint="0.5,0">
-                <GradientStop Color="#FFECE1D4" Offset="1"/>
-                <GradientStop Color="#FFEAE8E6"/>
-            </LinearGradientBrush>
-
-            <Style x:Key="GroupBoxStyle" TargetType="GroupBox" BasedOn="{StaticResource {x:Type GroupBox}}">
-                <Setter Property="BorderBrush" Value="{StaticResource BeigeBorder}"/>
-            </Style>
-            <Style x:Key="OnlineListViewItemStyle" TargetType="{x:Type ListViewItem}">
-                <Style.Triggers>
-                    <DataTrigger Binding="{Binding IsOnline}" Value="True">
-                        <Setter Property="Foreground" Value="Green"/>
-                        <Setter Property="FontWeight" Value="Bold"/>
-                    </DataTrigger>
-                </Style.Triggers>
-            </Style>
         </ResourceDictionary>
     </Window.Resources>
     
diff --git a/src/ConanServerManager/Windows/MainWindow.xaml b/src/ConanServerManager/Windows/MainWindow.xaml
index 938dbf85..e83bab9b 100644
--- a/src/ConanServerManager/Windows/MainWindow.xaml
+++ b/src/ConanServerManager/Windows/MainWindow.xaml
@@ -1,15 +1,14 @@
 <Window x:Class="ServerManagerTool.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:eo="http://schemas.essentialobjects.com/wpf/"
-        xmlns:sm="clr-namespace:ServerManagerTool"
-        xmlns:enum="clr-namespace:ServerManagerTool.Enums"
-        xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
-        xmlns:cvr="clr-namespace:ServerManagerTool.Common.ValidationRules;assembly=ServerManager.Common"
-        xmlns:cc="clr-namespace:ServerManagerTool.Common.Converters;assembly=ServerManager.Common"
-        xmlns:clib="clr-namespace:ServerManagerTool.Common.Lib;assembly=ServerManager.Common"
-        xmlns:tsk="clr-namespace:Microsoft.Win32.TaskScheduler;assembly=Microsoft.Win32.TaskScheduler"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:tb="http://www.hardcodet.net/taskbar"
+        xmlns:tsk="clr-namespace:Microsoft.Win32.TaskScheduler;assembly=Microsoft.Win32.TaskScheduler"
+        xmlns:sm="clr-namespace:ServerManagerTool"
+        xmlns:clib="clr-namespace:ServerManagerTool.Common.Lib;assembly=ServerManager.Common"
+        xmlns:cvr="clr-namespace:ServerManagerTool.Common.ValidationRules;assembly=ServerManager.Common"
+        xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
+        xmlns:enum="clr-namespace:ServerManagerTool.Enums"
         MinWidth="900" MinHeight="600" Width="1100" Height="900" Left="50" Top="50" WindowState="Normal"
         Loaded="Window_Loaded" SizeChanged="Window_SizeChanged" StateChanged="Window_StateChanged" LocationChanged="Window_LocationChanged"
         Name="Main" Icon="../Art/favicon.ico" Title="{DynamicResource MainWindow_Title}">
@@ -19,54 +18,6 @@
                 <ResourceDictionary Source="..\Globalization\en-US\en-US.xaml"/>
                 <ResourceDictionary Source="..\Styles\Default.xaml"/>
             </ResourceDictionary.MergedDictionaries>
-
-            <SolidColorBrush x:Key="TabItem.Selected.Background" Color="#FFFFFF"/>
-            <SolidColorBrush x:Key="TabItem.Selected.Border" Color="#ACACAC"/>
-            <LinearGradientBrush x:Key="BeigeGradient" EndPoint="0.5,1" StartPoint="0.5,0">
-                <GradientStop Color="#FFECE1D4" Offset="1"/>
-                <GradientStop Color="#FFEAE8E6"/>
-            </LinearGradientBrush>
-
-            <cc:HasStringValueConverter x:Key="HasStringValueConverter"/>
-
-            <Style x:Key="ButtonStyle1" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
-                <Setter Property="Background" Value="#00ffffff"/>
-                <Setter Property="BorderThickness" Value="0"/>
-                <Setter Property="Width" Value="22"/>
-                <Setter Property="Height" Value="22"/>
-                <Setter Property="Margin" Value="2"/>
-                <Setter Property="Padding" Value="0"/>
-            </Style>
-            <Style x:Key="ButtonStyle2" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
-                <Setter Property="BorderThickness" Value="0"/>
-                <Setter Property="Width" Value="22"/>
-                <Setter Property="Height" Value="22"/>
-                <Setter Property="Margin" Value="2"/>
-                <Setter Property="Padding" Value="0"/>
-            </Style>
-            <Style x:Key="ButtonStyle3" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
-                <Setter Property="Background" Value="#00ffffff"/>
-                <Setter Property="BorderThickness" Value="0"/>
-                <Setter Property="Height" Value="22"/>
-                <Setter Property="Margin" Value="2"/>
-                <Setter Property="Padding" Value="0"/>
-            </Style>
-            <Style x:Key="ButtonStyle5" TargetType="Button" BasedOn="{StaticResource ButtonStyle1}">
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="Button">
-                            <Border CornerRadius="15" Background="{TemplateBinding Background}" BorderThickness="1">
-                                <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                            </Border>
-                            <ControlTemplate.Triggers>
-                                <Trigger Property="IsMouseOver" Value="True">
-                                    <Setter Property="Background" Value="Red"/>
-                                </Trigger>
-                            </ControlTemplate.Triggers>                        
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
         </ResourceDictionary>
     </Window.Resources>
 
diff --git a/src/ConanServerManager/Windows/ModDetailsWindow.xaml b/src/ConanServerManager/Windows/ModDetailsWindow.xaml
index efde95b6..80256ad4 100644
--- a/src/ConanServerManager/Windows/ModDetailsWindow.xaml
+++ b/src/ConanServerManager/Windows/ModDetailsWindow.xaml
@@ -2,7 +2,6 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
-        xmlns:cc="clr-namespace:ServerManagerTool.Common.Converters;assembly=ServerManager.Common"
         MinWidth="600" MinHeight="480" Width="900" Height="480" ResizeMode="CanResize" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" 
         Loaded="Window_Loaded" Closing="Window_Closing"
         Name="ModDetailsUI" Icon="../Art/favicon.ico" Title="{DynamicResource ModDetails_Title}">
@@ -12,14 +11,6 @@
                 <ResourceDictionary Source="..\Globalization\en-US\en-US.xaml"/>
                 <ResourceDictionary Source="..\Styles\Default.xaml"/>
             </ResourceDictionary.MergedDictionaries>
-
-            <cc:IsNullOrWhiteSpaceValueConverter x:Key="IsNullOrWhiteSpaceValueConverter"/>
-            <cc:InvertBooleanConverter x:Key="InvertBooleanConverter"/>
-
-            <LinearGradientBrush x:Key="BeigeGradient" EndPoint="0.5,1" StartPoint="0.5,0">
-                <GradientStop Color="#FFECE1D4" Offset="1"/>
-                <GradientStop Color="#FFEAE8E6"/>
-            </LinearGradientBrush>
         </ResourceDictionary>
     </Window.Resources>
     
diff --git a/src/ConanServerManager/Windows/PlayerListWindow.xaml b/src/ConanServerManager/Windows/PlayerListWindow.xaml
index 35b7b0ea..743e26c4 100644
--- a/src/ConanServerManager/Windows/PlayerListWindow.xaml
+++ b/src/ConanServerManager/Windows/PlayerListWindow.xaml
@@ -1,11 +1,11 @@
 <Window x:Class="ServerManagerTool.PlayerListWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"   
-        xmlns:en="clr-namespace:ServerManagerTool.Enums"
-        xmlns:vm="clr-namespace:ServerManagerTool.Lib.ViewModel"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:cc="clr-namespace:ServerManagerTool.Common.Converters;assembly=ServerManager.Common"
         xmlns:clib="clr-namespace:ServerManagerTool.Common.Lib;assembly=ServerManager.Common"
         xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
+        xmlns:en="clr-namespace:ServerManagerTool.Enums"
+        xmlns:vm="clr-namespace:ServerManagerTool.Lib.ViewModel"
         MinWidth="300" MinHeight="200" Width="300" Height="500" ResizeMode="CanResizeWithGrip" WindowStyle="ToolWindow" 
         SizeChanged="Window_SizeChanged" LocationChanged="Window_LocationChanged"
         Name="PlayerList" Icon="../Art/favicon.ico" Title="{Binding PlayerListParameters.WindowTitle}">
@@ -15,51 +15,6 @@
                 <ResourceDictionary Source="..\Globalization\en-US\en-US.xaml"/>
                 <ResourceDictionary Source="..\Styles\Default.xaml"/>
             </ResourceDictionary.MergedDictionaries>
-
-            <cc:EnumConverter x:Key="EnumConverter"/>
-            <cc:EnumFlagsConverter x:Key="EnumFlagsConverter"/>
-            <cc:IsNullOrWhiteSpaceValueConverter x:Key="IsNullOrWhiteSpaceValueConverter"/>
-            <cc:IsNullValueConverter x:Key="IsNullValueConverter"/>
-            <cc:NullValueConverter x:Key="NullValueConverter"/>
-
-            <SolidColorBrush x:Key="HeaderBrush" Color="#FFF0F0F0"/>
-
-            <Style x:Key="PlayerStatus" TargetType="Border">
-                <Setter Property="BorderBrush" Value="Gray"/>
-                <Style.Triggers>
-                    <DataTrigger Binding="{Binding IsOnline}"            Value="True">
-                        <Setter Property="BorderBrush" Value="LightGreen"/>
-                    </DataTrigger>
-                    <MultiDataTrigger>
-                        <MultiDataTrigger.Conditions>
-                            <Condition Binding="{Binding IsOnline}"      Value="False" />
-                            <Condition Binding="{Binding IsValid}"       Value="False" />
-                        </MultiDataTrigger.Conditions>
-                        <Setter Property="BorderBrush" Value="Orange"/>
-                    </MultiDataTrigger>
-                    <MultiDataTrigger>
-                        <MultiDataTrigger.Conditions>
-                            <Condition Binding="{Binding IsOnline}"      Value="False" />
-                            <Condition Binding="{Binding IsWhitelisted}" Value="True" />
-                        </MultiDataTrigger.Conditions>
-                        <Setter Property="BorderBrush" Value="#0066CC"/>
-                    </MultiDataTrigger>
-                </Style.Triggers>
-            </Style>
-            <Style x:Key="GuildName" TargetType="Label">
-                <Style.Triggers>
-                    <DataTrigger Binding="{Binding GuildName, Converter={StaticResource IsNullOrWhiteSpaceValueConverter}}" Value="True">
-                        <Setter Property="Content" Value="No clan"/>
-                        <Setter Property="FontStyle" Value="Italic"/>
-                        <Setter Property="Foreground" Value="LightGray"/>
-                    </DataTrigger>
-                    <DataTrigger Binding="{Binding GuildName, Converter={StaticResource IsNullOrWhiteSpaceValueConverter}}" Value="False">
-                        <Setter Property="Content" Value="{Binding PlayerData.Guild.GuildName}"/>
-                        <Setter Property="FontStyle" Value="Normal"/>
-                        <Setter Property="Foreground" Value="Black"/>
-                    </DataTrigger>
-                </Style.Triggers>
-            </Style>
         </ResourceDictionary>
     </Window.Resources>
 
diff --git a/src/ConanServerManager/Windows/PlayerProfileWindow.xaml b/src/ConanServerManager/Windows/PlayerProfileWindow.xaml
index 4ed1c7ae..cce112bd 100644
--- a/src/ConanServerManager/Windows/PlayerProfileWindow.xaml
+++ b/src/ConanServerManager/Windows/PlayerProfileWindow.xaml
@@ -1,7 +1,6 @@
 <Window x:Class="ServerManagerTool.PlayerProfileWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:cc="clr-namespace:ServerManagerTool.Common.Converters;assembly=ServerManager.Common"
         Width="500" ResizeMode="NoResize" SizeToContent="Height" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" 
         Icon="../Art/favicon.ico" Title="{Binding WindowTitle}">
     <Window.Resources>
@@ -10,77 +9,6 @@
                 <ResourceDictionary Source="..\Globalization\en-US\en-US.xaml"/>
                 <ResourceDictionary Source="..\Styles\Default.xaml"/>
             </ResourceDictionary.MergedDictionaries>
-            
-            <cc:NullValueConverter x:Key="NullValueConverter"/>
-            <cc:UnixTimeToDateTimeConverter x:Key="UnixTimeToDateTimeConverter"/>
-
-            <BitmapImage x:Key="NoAvatar" UriSource="../Art/NoAvatar.png" />
-            
-            <SolidColorBrush x:Key="BeigeBorder" Color="#FFD8CCBC"/>
-            <LinearGradientBrush x:Key="BeigeGradient" EndPoint="0.5,1" StartPoint="0.5,0">
-                <GradientStop Color="#FFECE1D4" Offset="1"/>
-                <GradientStop Color="#FFEAE8E6"/>
-            </LinearGradientBrush>
-
-            <Style x:Key="GroupBoxStyle" TargetType="GroupBox" BasedOn="{StaticResource {x:Type GroupBox}}">
-                <Setter Property="BorderBrush" Value="{StaticResource BeigeBorder}"/>
-            </Style>
-            <Style x:Key="Online" TargetType="{x:Type Label}">
-                <Style.Triggers>
-                    <DataTrigger Binding="{Binding Player.IsOnline}" Value="True">
-                        <Setter Property="Foreground" Value="Green"/>
-                        <Setter Property="FontWeight" Value="Bold"/>
-                    </DataTrigger>
-                    <DataTrigger Binding="{Binding Player.IsOnline}" Value="False">
-                        <Setter Property="Foreground" Value="Red"/>
-                        <Setter Property="FontWeight" Value="Bold"/>
-                    </DataTrigger>
-                </Style.Triggers>
-            </Style>
-            <Style x:Key="CommunityBanned" TargetType="{x:Type Label}">
-                <Style.Triggers>
-                    <DataTrigger Binding="{Binding PlayerData.CommunityBanned}" Value="False">
-                        <Setter Property="Foreground" Value="Black"/>
-                    </DataTrigger>
-                    <DataTrigger Binding="{Binding PlayerData.CommunityBanned}" Value="True">
-                        <Setter Property="Foreground" Value="Red"/>
-                        <Setter Property="FontWeight" Value="Bold"/>
-                    </DataTrigger>
-                </Style.Triggers>
-            </Style>
-            <Style x:Key="VACBanned" TargetType="{x:Type Label}">
-                <Style.Triggers>
-                    <DataTrigger Binding="{Binding PlayerData.VACBanned}" Value="False">
-                        <Setter Property="Foreground" Value="Black"/>
-                    </DataTrigger>
-                    <DataTrigger Binding="{Binding PlayerData.VACBanned}" Value="True">
-                        <Setter Property="Foreground" Value="Red"/>
-                        <Setter Property="FontWeight" Value="Bold"/>
-                    </DataTrigger>
-                </Style.Triggers>
-            </Style>
-            <Style x:Key="Banned" TargetType="{x:Type Label}">
-                <Style.Triggers>
-                    <DataTrigger Binding="{Binding Player.IsBanned}" Value="False">
-                        <Setter Property="Foreground" Value="Black"/>
-                    </DataTrigger>
-                    <DataTrigger Binding="{Binding Player.IsBanned}" Value="True">
-                        <Setter Property="Foreground" Value="Red"/>
-                        <Setter Property="FontWeight" Value="Bold"/>
-                    </DataTrigger>
-                </Style.Triggers>
-            </Style>
-            <Style x:Key="Whitelisted" TargetType="{x:Type Label}">
-                <Style.Triggers>
-                    <DataTrigger Binding="{Binding Player.IsWhitelisted}" Value="True">
-                        <Setter Property="Foreground" Value="Blue"/>
-                        <Setter Property="FontWeight" Value="Bold"/>
-                    </DataTrigger>
-                    <DataTrigger Binding="{Binding Player.IsWhitelisted}" Value="False">
-                        <Setter Property="Foreground" Value="Black"/>
-                    </DataTrigger>
-                </Style.Triggers>
-            </Style>
         </ResourceDictionary>
     </Window.Resources>
     
diff --git a/src/ConanServerManager/Windows/PluginsWindow.xaml b/src/ConanServerManager/Windows/PluginsWindow.xaml
index 48481d0f..5be9e94b 100644
--- a/src/ConanServerManager/Windows/PluginsWindow.xaml
+++ b/src/ConanServerManager/Windows/PluginsWindow.xaml
@@ -10,18 +10,6 @@
                 <ResourceDictionary Source="..\Globalization\en-US\en-US.xaml"/>
                 <ResourceDictionary Source="..\Styles\Default.xaml"/>
             </ResourceDictionary.MergedDictionaries>
-
-            <SolidColorBrush x:Key="BeigeBorder" Color="#FFD8CCBC"/>
-            <LinearGradientBrush x:Key="BeigeGradient" EndPoint="0.5,1" StartPoint="0.5,0">
-                <GradientStop Color="#FFECE1D4" Offset="1"/>
-                <GradientStop Color="#FFEAE8E6"/>
-            </LinearGradientBrush>
-
-            <Style x:Key="GroupBoxStyle" TargetType="GroupBox" BasedOn="{StaticResource {x:Type GroupBox}}">
-                <Setter Property="BorderBrush" Value="{StaticResource BeigeBorder}"/>
-                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-                <Setter Property="Background" Value="Transparent"/>
-            </Style>
         </ResourceDictionary>
     </Window.Resources>
     
diff --git a/src/ConanServerManager/Windows/ProcessorAffinityWindow.xaml b/src/ConanServerManager/Windows/ProcessorAffinityWindow.xaml
index f676442e..b22ce845 100644
--- a/src/ConanServerManager/Windows/ProcessorAffinityWindow.xaml
+++ b/src/ConanServerManager/Windows/ProcessorAffinityWindow.xaml
@@ -1,11 +1,6 @@
 <Window x:Class="ServerManagerTool.ProcessorAffinityWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
-        xmlns:cc="clr-namespace:ServerManagerTool.Common.Converters;assembly=ServerManager.Common"
-        xmlns:cctl="clr-namespace:ServerManagerTool.Common.Controls;assembly=ServerManager.Common"
-        xmlns:clib="clr-namespace:ServerManagerTool.Common.Lib;assembly=ServerManager.Common"
-        xmlns:cvr="clr-namespace:ServerManagerTool.Common.ValidationRules;assembly=ServerManager.Common"
         MinWidth="300" MinHeight="200" Width="300" Height="300" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" ResizeMode="CanResize"
         Icon="../Art/favicon.ico" Title="{DynamicResource ProcessorAffinity_Title}">
     <Window.Resources>
@@ -14,8 +9,6 @@
                 <ResourceDictionary Source="..\Globalization\en-US\en-US.xaml"/>
                 <ResourceDictionary Source="..\Styles\Default.xaml"/>
             </ResourceDictionary.MergedDictionaries>
-
-            <cc:InvertBooleanConverter x:Key="InvertBooleanConverter"/>
         </ResourceDictionary>
     </Window.Resources>
     
diff --git a/src/ConanServerManager/Windows/ProgressWindow.xaml b/src/ConanServerManager/Windows/ProgressWindow.xaml
index bc231fad..687fdecf 100644
--- a/src/ConanServerManager/Windows/ProgressWindow.xaml
+++ b/src/ConanServerManager/Windows/ProgressWindow.xaml
@@ -10,11 +10,6 @@
                 <ResourceDictionary Source="..\Globalization\en-US\en-US.xaml"/>
                 <ResourceDictionary Source="..\Styles\Default.xaml"/>
             </ResourceDictionary.MergedDictionaries>
-            
-            <LinearGradientBrush x:Key="BeigeGradient" EndPoint="0.5,1" StartPoint="0.5,0">
-                <GradientStop Color="#FFECE1D4" Offset="1"/>
-                <GradientStop Color="#FFEAE8E6"/>
-            </LinearGradientBrush>
         </ResourceDictionary>
     </Window.Resources>
     
diff --git a/src/ConanServerManager/Windows/RconWindow.xaml b/src/ConanServerManager/Windows/RconWindow.xaml
index d7c4a88e..98c0374e 100644
--- a/src/ConanServerManager/Windows/RconWindow.xaml
+++ b/src/ConanServerManager/Windows/RconWindow.xaml
@@ -1,14 +1,14 @@
 <Window x:Class="ServerManagerTool.RconWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"   
-        xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-        xmlns:sys="clr-namespace:System;assembly=mscorlib"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:sm="clr-namespace:ServerManagerTool"
-        xmlns:en="clr-namespace:ServerManagerTool.Enums"
-        xmlns:vm="clr-namespace:ServerManagerTool.Lib.ViewModel"
         xmlns:cc="clr-namespace:ServerManagerTool.Common.Converters;assembly=ServerManager.Common"
         xmlns:clib="clr-namespace:ServerManagerTool.Common.Lib;assembly=ServerManager.Common"
         xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
+        xmlns:en="clr-namespace:ServerManagerTool.Enums"
+        xmlns:vm="clr-namespace:ServerManagerTool.Lib.ViewModel"
+        xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+        xmlns:sys="clr-namespace:System;assembly=mscorlib"
         Width="1024" Height="768" MinWidth="640" MinHeight="480" ResizeMode="CanResizeWithGrip" 
         SizeChanged="RCON_SizeChanged" LocationChanged="RCON_LocationChanged"
         Name="RCON" Icon="../Art/favicon.ico" Title="{Binding RconParameters.WindowTitle}">
@@ -20,54 +20,8 @@
             </ResourceDictionary.MergedDictionaries>
 
             <sm:ScrollToBottomAction x:Key="ScrollToBottomAction" />
-            <cc:EnumConverter x:Key="EnumConverter"/>
-            <cc:EnumFlagsConverter x:Key="EnumFlagsConverter"/>
-            <cc:IsNullOrWhiteSpaceValueConverter x:Key="IsNullOrWhiteSpaceValueConverter"/>
-            <cc:IsNullValueConverter x:Key="IsNullValueConverter"/>
-            <cc:NullValueConverter x:Key="NullValueConverter"/>
             
-            <SolidColorBrush x:Key="HeaderBrush" Color="#FFF0F0F0"/>
-            
-            <Style x:Key="PlayerStatus" TargetType="Border">
-                <Setter Property="BorderBrush" Value="Gray"/>
-                <Style.Triggers>
-                    <DataTrigger Binding="{Binding IsOnline}"            Value="True">
-                        <Setter Property="BorderBrush" Value="LightGreen"/>
-                    </DataTrigger>
-                    <MultiDataTrigger>
-                        <MultiDataTrigger.Conditions>
-                            <Condition Binding="{Binding IsOnline}"      Value="False" />
-                            <Condition Binding="{Binding IsValid}"       Value="False" />
-                        </MultiDataTrigger.Conditions>
-                        <Setter Property="BorderBrush" Value="Orange"/>
-                    </MultiDataTrigger>
-                    <MultiDataTrigger>
-                        <MultiDataTrigger.Conditions>
-                            <Condition Binding="{Binding IsOnline}"      Value="False" />
-                            <Condition Binding="{Binding IsWhitelisted}" Value="True" />
-                        </MultiDataTrigger.Conditions>
-                        <Setter Property="BorderBrush" Value="#0066CC"/>
-                    </MultiDataTrigger>
-                </Style.Triggers>
-            </Style>
-            <Style x:Key="GuildName" TargetType="Label">
-                <Style.Triggers>
-                    <DataTrigger Binding="{Binding GuildName, Converter={StaticResource IsNullOrWhiteSpaceValueConverter}}" Value="True">
-                        <Setter Property="Content" Value="No clan"/>
-                        <Setter Property="FontStyle" Value="Italic"/>
-                        <Setter Property="Foreground" Value="LightGray"/>
-                    </DataTrigger>
-                    <DataTrigger Binding="{Binding GuildName, Converter={StaticResource IsNullOrWhiteSpaceValueConverter}}" Value="False">
-                        <Setter Property="Content" Value="{Binding PlayerData.Guild.GuildName}"/>
-                        <Setter Property="FontStyle" Value="Normal"/>
-                        <Setter Property="Foreground" Value="Black"/>
-                    </DataTrigger>
-                </Style.Triggers>
-            </Style>
-
-            <ObjectDataProvider MethodName="GetValues"
-                ObjectType="{x:Type sys:Enum}"
-                x:Key="InputModes">
+            <ObjectDataProvider MethodName="GetValues" ObjectType="{x:Type sys:Enum}" x:Key="InputModes">
                 <ObjectDataProvider.MethodParameters>
                     <x:Type TypeName="sm:InputMode" />
                 </ObjectDataProvider.MethodParameters>
diff --git a/src/ConanServerManager/Windows/ServerMonitorWindow.xaml b/src/ConanServerManager/Windows/ServerMonitorWindow.xaml
index e5c5ab6d..f9757fda 100644
--- a/src/ConanServerManager/Windows/ServerMonitorWindow.xaml
+++ b/src/ConanServerManager/Windows/ServerMonitorWindow.xaml
@@ -3,12 +3,11 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:cc="clr-namespace:ServerManagerTool.Common.Converters;assembly=ServerManager.Common"
-        xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
+        xmlns:tb="http://www.hardcodet.net/taskbar"
         xmlns:clib="clr-namespace:ServerManagerTool.Common.Lib;assembly=ServerManager.Common"
+        xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
         xmlns:enum="clr-namespace:ServerManagerTool.Enums"
         xmlns:vm="clr-namespace:ServerManagerTool.Lib.ViewModel"
-        xmlns:tb="http://www.hardcodet.net/taskbar"
         mc:Ignorable="d"
         MinWidth="600" MinHeight="500" Width="900" Height="500" Left="50" Top="50" ResizeMode="CanResize"
         Loaded="Window_Loaded" SizeChanged="Window_SizeChanged" StateChanged="Window_StateChanged"
@@ -20,16 +19,7 @@
                 <ResourceDictionary Source="..\Styles\Default.xaml"/>
             </ResourceDictionary.MergedDictionaries>
 
-            <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-            <cc:CommaDelimitedStringCountConverter x:Key="CommaDelimitedStringCountConverter"/>
-            <cc:InstalledVersionConverter x:Key="InstalledVersionConverter"/>
             <vm:MapNameValueConverter x:Key="MapNameValueConverter"/>
-
-            <LinearGradientBrush x:Key="BeigeGradient" EndPoint="0.5,1" StartPoint="0.5,0">
-                <GradientStop Color="#FFECE1D4" Offset="1"/>
-                <GradientStop Color="#FFEAE8E6"/>
-            </LinearGradientBrush>
-
         </ResourceDictionary>
     </Window.Resources>
     
diff --git a/src/ConanServerManager/Windows/ServerSettingsControl.xaml b/src/ConanServerManager/Windows/ServerSettingsControl.xaml
index 44e3b99c..b636e8b1 100644
--- a/src/ConanServerManager/Windows/ServerSettingsControl.xaml
+++ b/src/ConanServerManager/Windows/ServerSettingsControl.xaml
@@ -1,15 +1,15 @@
 <UserControl x:Class="ServerManagerTool.ServerSettingsControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:mts="clr-namespace:Microsoft.Win32.TaskScheduler;assembly=Microsoft.Win32.TaskScheduler"
              xmlns:sm="clr-namespace:ServerManagerTool"
-             xmlns:enum="clr-namespace:ServerManagerTool.Enums"
-             xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
-             xmlns:cc="clr-namespace:ServerManagerTool.Common.Converters;assembly=ServerManager.Common"
              xmlns:cctl="clr-namespace:ServerManagerTool.Common.Controls;assembly=ServerManager.Common"
+             xmlns:cc="clr-namespace:ServerManagerTool.Common.Converters;assembly=ServerManager.Common"
              xmlns:cvr="clr-namespace:ServerManagerTool.Common.ValidationRules;assembly=ServerManager.Common"
+             xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
+             xmlns:enum="clr-namespace:ServerManagerTool.Enums"
              mc:Ignorable="d"
              d:DesignWidth="800"
              x:Name="SettingsControl">
@@ -20,378 +20,6 @@
                 <ResourceDictionary Source="..\Styles\Default.xaml"/>
             </ResourceDictionary.MergedDictionaries>
 
-            <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-            <cc:InvertBooleanConverter x:Key="InvertBooleanConverter"/>
-            <cc:HasStringValueConverter x:Key="HasStringValueConverter"/>
-            <cc:SecondsToTimeValueConverter x:Key="SecondsToTimeValueConverter"/>
-            <cc:InstalledVersionConverter x:Key="InstalledVersionConverter"/>
-            <cc:InvertBooleanToVisibilityConverter x:Key="InvertBooleanToVisibilityConverter"/>
-            <cc:SecondsToMinutesConverter x:Key="SecondsToMinutesConverter"/>
-            <cc:ProcessorAffinityConverter x:Key="ProcessorAffinityConverter"/>
-            <cc:FlagsEnumToBooleanConverter x:Key="FlagsEnumToBooleanConverter"/>
-
-            <SolidColorBrush x:Key="Expander.MouseOver.Circle.Stroke" Color="#FF5593FF"/>
-            <SolidColorBrush x:Key="Expander.MouseOver.Circle.Fill" Color="#FFF3F9FF"/>
-            <SolidColorBrush x:Key="Expander.MouseOver.Arrow.Stroke" Color="#FF000000"/>
-            <SolidColorBrush x:Key="Expander.Pressed.Circle.Stroke" Color="#FF3C77DD"/>
-            <SolidColorBrush x:Key="Expander.Pressed.Circle.Fill" Color="#FFD9ECFF"/>
-            <SolidColorBrush x:Key="Expander.Pressed.Arrow.Stroke" Color="#FF000000"/>
-            <SolidColorBrush x:Key="Expander.Disabled.Circle.Stroke" Color="#FFBCBCBC"/>
-            <SolidColorBrush x:Key="Expander.Disabled.Circle.Fill" Color="#FFE6E6E6"/>
-            <SolidColorBrush x:Key="Expander.Disabled.Arrow.Stroke" Color="#FF707070"/>
-            <SolidColorBrush x:Key="Expander.Static.Circle.Fill" Color="#FFFFFFFF"/>
-            <SolidColorBrush x:Key="Expander.Static.Circle.Stroke" Color="#FF333333"/>
-            <SolidColorBrush x:Key="Expander.Static.Arrow.Stroke" Color="#FF333333"/>
-            <SolidColorBrush x:Key="DarkBorder" Color="#FF10274F"/>
-            <SolidColorBrush x:Key="BeigeLabel" Color="#FFE6DFD8"/>
-            <SolidColorBrush x:Key="BeigeBorder" Color="#FFD8CCBC"/>
-            <LinearGradientBrush x:Key="BeigeGradient" EndPoint="0.5,1" StartPoint="0.5,0">
-                <GradientStop Color="#FFECE1D4" Offset="1"/>
-                <GradientStop Color="#FFEAE8E6"/>
-            </LinearGradientBrush>
-
-            <Style x:Key="ExpanderRightHeaderStyle" TargetType="{x:Type ToggleButton}">
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type ToggleButton}">
-                            <Border Padding="{TemplateBinding Padding}">
-                                <Grid Background="Transparent" SnapsToDevicePixels="False">
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="19"/>
-                                        <RowDefinition Height="*"/>
-                                    </Grid.RowDefinitions>
-                                    <Grid>
-                                        <Grid.LayoutTransform>
-                                            <TransformGroup>
-                                                <TransformGroup.Children>
-                                                    <TransformCollection>
-                                                        <RotateTransform Angle="-90"/>
-                                                    </TransformCollection>
-                                                </TransformGroup.Children>
-                                            </TransformGroup>
-                                        </Grid.LayoutTransform>
-                                        <Ellipse x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
-                                        <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" SnapsToDevicePixels="false" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" StrokeThickness="2" VerticalAlignment="Center"/>
-                                    </Grid>
-                                    <ContentPresenter HorizontalAlignment="Center" Margin="0,4,0,0" Grid.Row="1" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Top"/>
-                                </Grid>
-                            </Border>
-                            <ControlTemplate.Triggers>
-                                <Trigger Property="IsChecked" Value="true">
-                                    <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
-                                </Trigger>
-                                <Trigger Property="IsMouseOver" Value="true">
-                                    <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
-                                    <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
-                                    <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
-                                </Trigger>
-                                <Trigger Property="IsPressed" Value="true">
-                                    <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
-                                    <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
-                                    <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
-                                    <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
-                                </Trigger>
-                                <Trigger Property="IsEnabled" Value="false">
-                                    <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
-                                    <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
-                                    <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
-                                </Trigger>
-                            </ControlTemplate.Triggers>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-            <Style x:Key="ExpanderUpHeaderStyle" TargetType="{x:Type ToggleButton}">
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type ToggleButton}">
-                            <Border Padding="{TemplateBinding Padding}">
-                                <Grid Background="Transparent" SnapsToDevicePixels="False">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="19"/>
-                                        <ColumnDefinition Width="*"/>
-                                    </Grid.ColumnDefinitions>
-                                    <Grid>
-                                        <Grid.LayoutTransform>
-                                            <TransformGroup>
-                                                <TransformGroup.Children>
-                                                    <TransformCollection>
-                                                        <RotateTransform Angle="180"/>
-                                                    </TransformCollection>
-                                                </TransformGroup.Children>
-                                            </TransformGroup>
-                                        </Grid.LayoutTransform>
-                                        <Ellipse x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
-                                        <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" SnapsToDevicePixels="false" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" StrokeThickness="2" VerticalAlignment="Center"/>
-                                    </Grid>
-                                    <ContentPresenter Grid.Column="1" HorizontalAlignment="Left" Margin="4,0,0,0" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Center"/>
-                                </Grid>
-                            </Border>
-                            <ControlTemplate.Triggers>
-                                <Trigger Property="IsChecked" Value="true">
-                                    <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
-                                </Trigger>
-                                <Trigger Property="IsMouseOver" Value="true">
-                                    <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
-                                    <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
-                                    <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
-                                </Trigger>
-                                <Trigger Property="IsPressed" Value="true">
-                                    <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
-                                    <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
-                                    <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
-                                    <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
-                                </Trigger>
-                                <Trigger Property="IsEnabled" Value="false">
-                                    <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
-                                    <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
-                                    <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
-                                </Trigger>
-                            </ControlTemplate.Triggers>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-            <Style x:Key="ExpanderLeftHeaderStyle" TargetType="{x:Type ToggleButton}">
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type ToggleButton}">
-                            <Border Padding="{TemplateBinding Padding}">
-                                <Grid Background="Transparent" SnapsToDevicePixels="False">
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="19"/>
-                                        <RowDefinition Height="*"/>
-                                    </Grid.RowDefinitions>
-                                    <Grid>
-                                        <Grid.LayoutTransform>
-                                            <TransformGroup>
-                                                <TransformGroup.Children>
-                                                    <TransformCollection>
-                                                        <RotateTransform Angle="90"/>
-                                                    </TransformCollection>
-                                                </TransformGroup.Children>
-                                            </TransformGroup>
-                                        </Grid.LayoutTransform>
-                                        <Ellipse x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
-                                        <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" SnapsToDevicePixels="false" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" StrokeThickness="2" VerticalAlignment="Center"/>
-                                    </Grid>
-                                    <ContentPresenter HorizontalAlignment="Center" Margin="0,4,0,0" Grid.Row="1" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Top"/>
-                                </Grid>
-                            </Border>
-                            <ControlTemplate.Triggers>
-                                <Trigger Property="IsChecked" Value="true">
-                                    <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
-                                </Trigger>
-                                <Trigger Property="IsMouseOver" Value="true">
-                                    <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
-                                    <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
-                                    <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
-                                </Trigger>
-                                <Trigger Property="IsPressed" Value="true">
-                                    <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
-                                    <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
-                                    <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
-                                    <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
-                                </Trigger>
-                                <Trigger Property="IsEnabled" Value="false">
-                                    <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
-                                    <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
-                                    <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
-                                </Trigger>
-                            </ControlTemplate.Triggers>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-            <Style x:Key="ExpanderHeaderFocusVisual">
-                <Setter Property="Control.Template">
-                    <Setter.Value>
-                        <ControlTemplate>
-                            <Border>
-                                <Rectangle Margin="0" SnapsToDevicePixels="true" Stroke="Black" StrokeThickness="1" StrokeDashArray="1 2"/>
-                            </Border>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-            <Style x:Key="ExpanderDownHeaderStyle" TargetType="{x:Type ToggleButton}">
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type ToggleButton}">
-                            <Border Padding="{TemplateBinding Padding}">
-                                <Grid Background="Transparent" SnapsToDevicePixels="False">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="19"/>
-                                        <ColumnDefinition Width="*"/>
-                                    </Grid.ColumnDefinitions>
-                                    <Ellipse x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
-                                    <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" SnapsToDevicePixels="false" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" StrokeThickness="2" VerticalAlignment="Center"/>
-                                    <ContentPresenter Grid.Column="1" HorizontalAlignment="Left" Margin="4,0,0,0" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Center"/>
-                                </Grid>
-                            </Border>
-                            <ControlTemplate.Triggers>
-                                <Trigger Property="IsChecked" Value="true">
-                                    <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
-                                </Trigger>
-                                <Trigger Property="IsMouseOver" Value="true">
-                                    <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
-                                    <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
-                                    <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
-                                </Trigger>
-                                <Trigger Property="IsPressed" Value="true">
-                                    <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
-                                    <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
-                                    <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
-                                    <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
-                                </Trigger>
-                                <Trigger Property="IsEnabled" Value="false">
-                                    <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
-                                    <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
-                                    <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
-                                </Trigger>
-                            </ControlTemplate.Triggers>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-            <Style x:Key="ExpanderStyle1" TargetType="{x:Type Expander}">
-                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-                <Setter Property="Background" Value="Transparent"/>
-                <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-                <Setter Property="VerticalContentAlignment" Value="Stretch"/>
-                <Setter Property="BorderBrush" Value="Transparent"/>
-                <Setter Property="BorderThickness" Value="1"/>
-            </Style>
-            <Style x:Key="CenteredCheckboxStyle" TargetType="CheckBox">
-                <Setter Property="HorizontalAlignment" Value="Center"/>
-                <Setter Property="VerticalAlignment" Value="Center"/>
-            </Style>
-            <Style x:Key="CenteredTextBlockStyle" TargetType="TextBlock">
-                <Setter Property="VerticalAlignment" Value="Center"/>
-            </Style>
-            <Style x:Key="GroupBoxStyle" TargetType="GroupBox" BasedOn="{StaticResource {x:Type GroupBox}}">
-                <Setter Property="BorderBrush" Value="{StaticResource BeigeBorder}"/>
-                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-                <Setter Property="Background" Value="Transparent"/>
-            </Style>
-            <Style x:Key="BorderDarkStyle" TargetType="Border">
-                <Setter Property="BorderBrush" Value="{StaticResource DarkBorder}"/>
-                <Setter Property="BorderThickness" Value="1"/>
-                <Setter Property="CornerRadius" Value="3"/>
-                <Setter Property="Background" Value="{StaticResource BeigeLabel}"/>
-            </Style>
-            <Style x:Key="BorderLightStyle" TargetType="Border">
-                <Setter Property="BorderBrush" Value="{StaticResource BeigeBorder}"/>
-                <Setter Property="BorderThickness" Value="1"/>
-            </Style>
-            <Style x:Key="BorderFillLightStyle" TargetType="Border">
-                <Setter Property="Background" Value="{StaticResource BeigeLabel}"/>
-                <Setter Property="BorderBrush" Value="{StaticResource BeigeBorder}"/>
-            </Style>
-            <Style x:Key="ButtonStyle1" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
-                <Setter Property="Background" Value="{StaticResource BeigeLabel}"/>
-                <Setter Property="BorderThickness" Value="1"/>
-                <Setter Property="Width" Value="22"/>
-                <Setter Property="Height" Value="22"/>
-                <Setter Property="Margin" Value="2"/>
-            </Style>
-            <Style x:Key="ExpanderHeaderTextStyle" TargetType="TextBlock">
-                <Setter Property="FontSize" Value="13.333"/>
-                <Setter Property="FontWeight" Value="Bold"/>
-                <Setter Property="HorizontalAlignment" Value="Left"/>
-                <Setter Property="VerticalAlignment" Value="Center"/>
-                <Setter Property="TextWrapping" Value="Wrap"/>
-            </Style>
-            <Style x:Key="HiddenTextBoxStyle" TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
-                <Setter Property="VerticalContentAlignment" Value="Center"/>
-                <Setter Property="Background" Value="Wheat"/>
-                <Setter Property="IsReadOnly" Value="True"/>
-            </Style>
-
-            <ContentControl x:Key="SupportZipButtonContent">
-                <StackPanel Orientation="Horizontal" Height="27">
-                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Zip.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ServerSettings_SupportZipButtonLabel}" VerticalAlignment="Center"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="SyncProfileButtonContent">
-                <StackPanel Orientation="Horizontal" Height="27">
-                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Copy.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ServerSettings_SyncProfileButtonLabel}" VerticalAlignment="Center"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="ImportButtonContent">
-                <StackPanel Orientation="Horizontal" Height="27">
-                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/FolderImport.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ServerSettings_ImportButtonLabel}" VerticalAlignment="Center"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="SaveButtonContent">
-                <StackPanel Orientation="Horizontal" Height="27">
-                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Save.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ServerSettings_SaveButtonLabel}" VerticalAlignment="Center"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="StopButtonContent">
-                <StackPanel Orientation="Horizontal" Height="27">
-                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Stop.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ServerSettings_StopButtonLabel}" VerticalAlignment="Center"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="StartButtonContent">
-                <StackPanel Orientation="Horizontal" Height="27">
-                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Start.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ServerSettings_StartButtonLabel}" VerticalAlignment="Center"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="OpenRconButtonContent">
-                <StackPanel Orientation="Horizontal"  Height="27">
-                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Command.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ServerSettings_RconButtonLabel}" VerticalAlignment="Center"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="PlayerListButtonContent">
-                <StackPanel Orientation="Horizontal"  Height="27">
-                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Players.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ServerSettings_PlayerListButtonLabel}" VerticalAlignment="Center"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="ResetRconButtonContent">
-                <StackPanel Orientation="Horizontal" Height="20">
-                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Refresh.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ServerSettings_RconButtonLabel}" VerticalAlignment="Center" Margin="0,-5,0,-5"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="UpgradeButtonContent">
-                <StackPanel Orientation="Horizontal" Height="27">
-                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Download.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ServerSettings_UpgradeButtonLabel}" VerticalAlignment="Center"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="InstallButtonContent">
-                <StackPanel Orientation="Horizontal" Height="27">
-                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Download.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ServerSettings_InstallButtonLabel}" VerticalAlignment="Center"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="CancelInstallButtonContent">
-                <StackPanel Orientation="Horizontal" Height="27">
-                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Stop.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ServerSettings_CancelUpgradeButtonLabel}" VerticalAlignment="Center"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="LocationButtonContent"  Height="27">
-                <StackPanel Orientation="Horizontal">
-                    <Label Content="{DynamicResource ServerSettings_SetLocationButtonLabel}" />
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="ShowCmdButtonContent">
-                <StackPanel Orientation="Horizontal" Height="20">
-                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Command.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ServerSettings_ShowCommandButtonLabel}" VerticalAlignment="Center" Margin="0,-5,0,-5"/>
-                </StackPanel>
-            </ContentControl>
-
             <ControlTemplate x:Key="ExpanderTemplateSE" TargetType="{x:Type Expander}">
                 <Border BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3" SnapsToDevicePixels="true" Padding="1" Margin="0,0,0,3" BorderBrush="Black">
                     <DockPanel Background="#FFEAE7E0">
diff --git a/src/ConanServerManager/Windows/SettingsWindow.xaml b/src/ConanServerManager/Windows/SettingsWindow.xaml
index 29a26c4f..5bdfcd27 100644
--- a/src/ConanServerManager/Windows/SettingsWindow.xaml
+++ b/src/ConanServerManager/Windows/SettingsWindow.xaml
@@ -14,11 +14,6 @@
                 <ResourceDictionary Source="..\Globalization\en-US\en-US.xaml"/>
                 <ResourceDictionary Source="..\Styles\Default.xaml"/>
             </ResourceDictionary.MergedDictionaries>
-            
-            <LinearGradientBrush x:Key="BeigeGradient" EndPoint="0.5,1" StartPoint="0.5,0">
-                <GradientStop Color="#FFECE1D4" Offset="1"/>
-                <GradientStop Color="#FFEAE8E6"/>
-            </LinearGradientBrush>
         </ResourceDictionary>
     </Window.Resources>
     
diff --git a/src/ConanServerManager/Windows/ShutdownWindow.xaml b/src/ConanServerManager/Windows/ShutdownWindow.xaml
index c2f7b22d..e1c5cb14 100644
--- a/src/ConanServerManager/Windows/ShutdownWindow.xaml
+++ b/src/ConanServerManager/Windows/ShutdownWindow.xaml
@@ -2,8 +2,6 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:cctl="clr-namespace:ServerManagerTool.Common.Controls;assembly=ServerManager.Common"
-        xmlns:cc="clr-namespace:ServerManagerTool.Common.Converters;assembly=ServerManager.Common"
-        xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
         xmlns:enum="clr-namespace:ServerManagerTool.Enums"
         Width="600" ResizeMode="CanMinimize" SizeToContent="Height" WindowStyle="SingleBorderWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="True" 
         Closing="Window_Closing" Closed="Window_Closed" 
@@ -14,49 +12,6 @@
                 <ResourceDictionary Source="..\Globalization\en-US\en-US.xaml"/>
                 <ResourceDictionary Source="..\Styles\Default.xaml"/>
             </ResourceDictionary.MergedDictionaries>
-
-            <cc:InvertBooleanConverter x:Key="InvertBooleanConverter"/>
-
-            <LinearGradientBrush x:Key="BeigeGradient" EndPoint="0.5,1" StartPoint="0.5,0">
-                <GradientStop Color="#FFECE1D4" Offset="1"/>
-                <GradientStop Color="#FFEAE8E6"/>
-            </LinearGradientBrush>
-            <SolidColorBrush x:Key="BeigeLabel" Color="#FFE6DFD8"/>
-            <SolidColorBrush x:Key="BeigeBorder" Color="#FFD8CCBC"/>
-
-            <Style x:Key="GroupBoxStyle" TargetType="GroupBox" BasedOn="{StaticResource {x:Type GroupBox}}">
-                <Setter Property="BorderBrush" Value="{StaticResource BeigeBorder}"/>
-            </Style>
-
-            <ContentControl x:Key="ShutdownButtonContent">
-                <StackPanel Orientation="Horizontal">
-                    <Image Width="16" Height="16" Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Stop.ico,Size=32}" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ShutdownWindow_ShutdownButtonLabel}" VerticalAlignment="Center" Padding="5,0"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="RestartButtonContent">
-                <StackPanel Orientation="Horizontal">
-                    <Image Width="16" Height="16" Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Start.ico,Size=32}" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ShutdownWindow_RestartButtonLabel}" VerticalAlignment="Center" Padding="5,0"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="CancelShutdownButtonContent">
-                <StackPanel Orientation="Horizontal">
-                    <Image Width="16" Height="16" Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Cancel.ico,Size=32}" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ShutdownWindow_CancelShutdownButtonLabel}" VerticalAlignment="Center" Padding="5,0"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="StopButtonContent">
-                <StackPanel Orientation="Horizontal">
-                    <Image Width="16" Height="16" Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Stop.ico,Size=32}" VerticalAlignment="Center"/>
-                    <Label Content="{DynamicResource ShutdownWindow_StopButtonLabel}" VerticalAlignment="Center" Padding="5,0"/>
-                </StackPanel>
-            </ContentControl>
-            <ContentControl x:Key="CancelButtonContent">
-                <StackPanel Orientation="Horizontal">
-                    <Label Content="{DynamicResource ShutdownWindow_CloseButtonLabel}" VerticalAlignment="Center" Padding="5,0"/>
-                </StackPanel>
-            </ContentControl>
         </ResourceDictionary>
     </Window.Resources>
     
@@ -221,7 +176,7 @@
                 <Button.Style>
                     <Style BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
                         <Setter Property="IsEnabled" Value="False" />
-                        <Setter Property="Content" Value="{StaticResource StopButtonContent}" />
+                        <Setter Property="Content" Value="{StaticResource StopButtonContent2}" />
                         <Setter Property="ToolTip" Value="{DynamicResource ShutdownWindow_StopButtonTooltip}" />
                         <Style.Triggers>
                             <MultiDataTrigger>
diff --git a/src/ConanServerManager/Windows/VersionFeedWindow.xaml b/src/ConanServerManager/Windows/VersionFeedWindow.xaml
index f4f2708a..1ac30380 100644
--- a/src/ConanServerManager/Windows/VersionFeedWindow.xaml
+++ b/src/ConanServerManager/Windows/VersionFeedWindow.xaml
@@ -1,9 +1,9 @@
 <Window x:Class="ServerManagerTool.VersionFeedWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
         xmlns:clib="clr-namespace:ServerManagerTool.Common.Lib;assembly=ServerManager.Common"
         xmlns:cmod="clr-namespace:ServerManagerTool.Common.Model;assembly=ServerManager.Common"
+        xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
         MinWidth="400" MinHeight="400" Width="640" Height="480" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" ResizeMode="CanResizeWithGrip"
         Loaded="Window_Loaded"
         Icon="../Art/favicon.ico" Title="{DynamicResource VersionFeedWindow_Title}">
@@ -13,18 +13,6 @@
                 <ResourceDictionary Source="..\Globalization\en-US\en-US.xaml"/>
                 <ResourceDictionary Source="..\Styles\Default.xaml"/>
             </ResourceDictionary.MergedDictionaries>
-
-            <Style x:Key="Version" TargetType="Label">
-                <Setter Property="Content" Value="{Binding Title}"/>
-                <Setter Property="FontWeight" Value="Normal"/>
-                <Setter Property="Foreground" Value="Black"/>
-                <Style.Triggers>
-                    <DataTrigger Binding="{Binding IsCurrent}" Value="True">
-                        <Setter Property="FontWeight" Value="Bold"/>
-                        <Setter Property="Foreground" Value="#0066CC"/>
-                    </DataTrigger>
-                </Style.Triggers>
-            </Style>
         </ResourceDictionary>
     </Window.Resources>
     
diff --git a/src/ConanServerManager/Windows/WorkshopFilesWindow.xaml b/src/ConanServerManager/Windows/WorkshopFilesWindow.xaml
index 8c8d6141..de878895 100644
--- a/src/ConanServerManager/Windows/WorkshopFilesWindow.xaml
+++ b/src/ConanServerManager/Windows/WorkshopFilesWindow.xaml
@@ -11,11 +11,6 @@
                 <ResourceDictionary Source="..\Globalization\en-US\en-US.xaml"/>
                 <ResourceDictionary Source="..\Styles\Default.xaml"/>
             </ResourceDictionary.MergedDictionaries>
-
-            <LinearGradientBrush x:Key="BeigeGradient" EndPoint="0.5,1" StartPoint="0.5,0">
-                <GradientStop Color="#FFECE1D4" Offset="1"/>
-                <GradientStop Color="#FFEAE8E6"/>
-            </LinearGradientBrush>
         </ResourceDictionary>
     </Window.Resources>
     
diff --git a/src/ConanServerManager/Windows/WorldSaveRestoreWindow.xaml b/src/ConanServerManager/Windows/WorldSaveRestoreWindow.xaml
index 980ba86f..4f6f9332 100644
--- a/src/ConanServerManager/Windows/WorldSaveRestoreWindow.xaml
+++ b/src/ConanServerManager/Windows/WorldSaveRestoreWindow.xaml
@@ -11,11 +11,6 @@
                 <ResourceDictionary Source="..\Globalization\en-US\en-US.xaml"/>
                 <ResourceDictionary Source="..\Styles\Default.xaml"/>
             </ResourceDictionary.MergedDictionaries>
-
-            <LinearGradientBrush x:Key="BeigeGradient" EndPoint="0.5,1" StartPoint="0.5,0">
-                <GradientStop Color="#FFECE1D4" Offset="1"/>
-                <GradientStop Color="#FFEAE8E6"/>
-            </LinearGradientBrush>
         </ResourceDictionary>
     </Window.Resources>