diff --git a/src/ARKServerManager/Styles/Default.xaml b/src/ARKServerManager/Styles/Default.xaml
index a0be2728..235fcc0e 100644
--- a/src/ARKServerManager/Styles/Default.xaml
+++ b/src/ARKServerManager/Styles/Default.xaml
@@ -1,23 +1,50 @@
 <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"
     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:FloatToPercentageConverter x:Key="FloatToPercentageConverter"/>
+    <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:SecondsToHoursConverter x:Key="SecondsToHoursConverter"/>
+    <cc:SecondsToMinutesConverter x:Key="SecondsToMinutesConverter"/>
+    <cc:SecondsToTimeValueConverter x:Key="SecondsToTimeValueConverter"/>
 
+    <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="WarningMessage" Color="Red"/>
+    <SolidColorBrush x:Key="TabItem.Selected.Background" Color="#FFFFFF"/>
+    <SolidColorBrush x:Key="TabItem.Selected.Border" Color="#ACACAC"/>
 
-    <!--BeigeGradient-->
     <LinearGradientBrush x:Key="GradientBackground" EndPoint="0.5,1" StartPoint="0.5,0">
         <GradientStop Color="#FFECE1D4" Offset="1"/>
         <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}">
@@ -33,6 +60,237 @@
         <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="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"/>
+    </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="#00ffffff"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <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="ServerStatus" TargetType="{x:Type Label}">
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding ServerRCON.Status}" Value="Connected">
+                <Setter Property="Foreground" Value="Green"/>
+                <Setter Property="FontWeight" Value="Bold"/>
+            </DataTrigger>
+            <DataTrigger Binding="{Binding ServerRCON.Status}" Value="Disconnected">
+                <Setter Property="Foreground" Value="Red"/>
+                <Setter Property="FontWeight" Value="Bold"/>
+            </DataTrigger>
+        </Style.Triggers>
+    </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="PlayerName" TargetType="Label">
+        <Setter Property="Content" Value="{Binding PlayerName}"/>
+        <Setter Property="ToolTip" Value="{Binding PlayerId}"/>
+        <Setter Property="Background" Value="AliceBlue"/>
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding IsAdmin}" Value="True">
+                <Setter Property="FontWeight" Value="Bold"/>
+                <Setter Property="Foreground" Value="#0066CC"/>
+            </DataTrigger>
+            <DataTrigger Binding="{Binding IsAdmin}" Value="False">
+                <Setter Property="FontStyle" Value="Normal"/>
+                <Setter Property="Foreground" Value="Black"/>
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
+    
+    <Style x:Key="TribeName" TargetType="Label">
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding TribeName, Converter={StaticResource IsNullOrWhiteSpaceValueConverter}}" Value="True">
+                <Setter Property="Content" Value="No tribe"/>
+                <Setter Property="FontStyle" Value="Italic"/>
+                <Setter Property="Foreground" Value="LightGray"/>
+            </DataTrigger>
+            <DataTrigger Binding="{Binding TribeName, Converter={StaticResource IsNullOrWhiteSpaceValueConverter}}" Value="False">
+                <Setter Property="Content" Value="{Binding PlayerData.Tribe.Name}"/>
+                <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="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="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-->
     <SolidColorBrush x:Key="SliderThumb.Static.Foreground" Color="#FFE5E5E5"/>
@@ -50,6 +308,252 @@
     <SolidColorBrush x:Key="SliderThumb.Tick.Bottom" Color="#FFD8CCBC"/>
     <SolidColorBrush x:Key="SliderThumb.Track.Background" Color="#FFBFA786"/>
 
-    <SolidColorBrush x:Key="WarningMessage" Color="Red"/>
+    <!--Expander-->
+    <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"/>
 
+    <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.Triggers>
+            <DataTrigger Binding="{Binding ElementName=EnableSOTFCheckbox, Path=IsChecked}" Value="True">
+                <Setter Property="Foreground" Value="DarkRed"/>
+            </DataTrigger>
+            <DataTrigger Binding="{Binding ElementName=EnablePGMCheckbox, Path=IsChecked}" Value="True">
+                <Setter Property="Foreground" Value="#4E008B"/>
+            </DataTrigger>
+        </Style.Triggers>
+    </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>
+    
 </Globalization:StyleResourceDictionary>
\ No newline at end of file
diff --git a/src/ARKServerManager/Windows/AutoUpdateWindow.xaml b/src/ARKServerManager/Windows/AutoUpdateWindow.xaml
index 518d601f..0df8f2ca 100644
--- a/src/ARKServerManager/Windows/AutoUpdateWindow.xaml
+++ b/src/ARKServerManager/Windows/AutoUpdateWindow.xaml
@@ -1,10 +1,6 @@
 <Window x:Class="ServerManagerTool.AutoUpdateWindow"
         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:clib="clr-namespace:ServerManagerTool.Common.Lib;assembly=ServerManager.Common"
-        xmlns:cvr="clr-namespace:ServerManagerTool.Common.ValidationRules;assembly=ServerManager.Common"
         Width="380" WindowStyle="ToolWindow" WindowStartupLocation="CenterScreen" ResizeMode="NoResize" SizeToContent="Height" 
         Loaded="Window_Loaded" Closing="Window_Closing"
         Icon="../Art/favicon.ico" Title="{DynamicResource AutoUpdater_Title}">
diff --git a/src/ARKServerManager/Windows/CommandLineWindow.xaml b/src/ARKServerManager/Windows/CommandLineWindow.xaml
index f9832619..725807c4 100644
--- a/src/ARKServerManager/Windows/CommandLineWindow.xaml
+++ b/src/ARKServerManager/Windows/CommandLineWindow.xaml
@@ -1,10 +1,6 @@
 <Window x:Class="ServerManagerTool.CommandLineWindow"
         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:clib="clr-namespace:ServerManagerTool.Common.Lib;assembly=ServerManager.Common"
-        xmlns:cvr="clr-namespace:ServerManagerTool.Common.ValidationRules;assembly=ServerManager.Common"
         MinWidth="500" MinHeight="200" Width="500" Height="200" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" ResizeMode="CanResize"
         Icon="../Art/favicon.ico" Title="{DynamicResource CommandLine_Title}">
     <Window.Resources>
diff --git a/src/ARKServerManager/Windows/CustomConfigDataWindow.xaml b/src/ARKServerManager/Windows/CustomConfigDataWindow.xaml
index 5432ce03..0c148ba1 100644
--- a/src/ARKServerManager/Windows/CustomConfigDataWindow.xaml
+++ b/src/ARKServerManager/Windows/CustomConfigDataWindow.xaml
@@ -1,10 +1,6 @@
 <Window x:Class="ServerManagerTool.CustomConfigDataWindow"
         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:clib="clr-namespace:ServerManagerTool.Common.Lib;assembly=ServerManager.Common"
-        xmlns:cvr="clr-namespace:ServerManagerTool.Common.ValidationRules;assembly=ServerManager.Common"
         MinWidth="400" MinHeight="400" Width="600" Height="400" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" ResizeMode="CanResize"
         Icon="../Art/favicon.ico" Title="{DynamicResource CustomConfigData_Title}">
     <Window.Resources>
diff --git a/src/ARKServerManager/Windows/GameDataWindow.xaml b/src/ARKServerManager/Windows/GameDataWindow.xaml
index 6a532212..807ca961 100644
--- a/src/ARKServerManager/Windows/GameDataWindow.xaml
+++ b/src/ARKServerManager/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/ARKServerManager/Windows/GlobalSettingsControl.xaml b/src/ARKServerManager/Windows/GlobalSettingsControl.xaml
index a6c44298..b88b7807 100644
--- a/src/ARKServerManager/Windows/GlobalSettingsControl.xaml
+++ b/src/ARKServerManager/Windows/GlobalSettingsControl.xaml
@@ -15,17 +15,6 @@
                 <ResourceDictionary Source="..\Styles\Default.xaml"/>
             </ResourceDictionary.MergedDictionaries>
 
-            <SolidColorBrush x:Key="BeigeBorder" Color="#FFD8CCBC"/>
-
-            <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="DataDirectoryButtonContent">
                 <StackPanel Orientation="Horizontal">
                     <Label Content="{DynamicResource GlobalSettings_SetLocationButtonLabel}" VerticalAlignment="Center" Margin="0,-2,0,-2"/>
@@ -56,9 +45,6 @@
                     <Label Content="{DynamicResource GlobalSettings_SetLocationButtonLabel}" VerticalAlignment="Center" Margin="0,-3,0,-3"/>
                 </StackPanel>
             </ContentControl>
-
-            <cc:InvertBooleanConverter x:Key="InvertBooleanConverter"/>
-            <cc:MinutesToTimeValueConverter x:Key="MinutesToTimeValueConverter"/>
         </ResourceDictionary>
     </UserControl.Resources>
     
diff --git a/src/ARKServerManager/Windows/MainWindow.xaml b/src/ARKServerManager/Windows/MainWindow.xaml
index f686aa7d..f787948e 100644
--- a/src/ARKServerManager/Windows/MainWindow.xaml
+++ b/src/ARKServerManager/Windows/MainWindow.xaml
@@ -2,14 +2,13 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:eo="http://schemas.essentialobjects.com/wpf/"
         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:local="clr-namespace:ServerManagerTool"
-        xmlns:cc="clr-namespace:ServerManagerTool.Common.Converters;assembly=ServerManager.Common"
+        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:clib="clr-namespace:ServerManagerTool.Common.Lib;assembly=ServerManager.Common"
         xmlns:enum="clr-namespace:ServerManagerTool.Enums"
-        xmlns:tb="http://www.hardcodet.net/taskbar"
         MinWidth="900" MinHeight="600" Width="1100" Height="900" Left="50" Top="50"
         Loaded="Window_Loaded" SizeChanged="Window_SizeChanged" StateChanged="Window_StateChanged"
         Name="Main" Icon="../Art/favicon.ico" Title="{DynamicResource MainWindow_Title}">
@@ -19,53 +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/ARKServerManager/Windows/ModDetailsWindow.xaml b/src/ARKServerManager/Windows/ModDetailsWindow.xaml
index ca9a9f0b..ba109a84 100644
--- a/src/ARKServerManager/Windows/ModDetailsWindow.xaml
+++ b/src/ARKServerManager/Windows/ModDetailsWindow.xaml
@@ -1,7 +1,6 @@
 <Window x:Class="ServerManagerTool.ModDetailsWindow"
         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"
         xmlns:com="clr-namespace:ServerManagerTool.Common;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"
@@ -12,14 +11,6 @@
                 <ResourceDictionary Source="..\Globalization\en-US\en-US.xaml"/>
                 <ResourceDictionary Source="..\Styles\Default.xaml"/>
             </ResourceDictionary.MergedDictionaries>
-
-            <cc:InvertBooleanConverter x:Key="InvertBooleanConverter"/>
-            <cc:IsNullOrWhiteSpaceValueConverter x:Key="IsNullOrWhiteSpaceValueConverter"/>
-
-            <LinearGradientBrush x:Key="BeigeGradient" EndPoint="0.5,1" StartPoint="0.5,0">
-                <GradientStop Color="#FFECE1D4" Offset="1"/>
-                <GradientStop Color="#FFEAE8E6"/>
-            </LinearGradientBrush>
         </ResourceDictionary>
     </Window.Resources>
     <Grid Background="{StaticResource BeigeGradient}" MouseLeftButtonUp="OnMouseLeftButtonUp" MouseMove="OnMouseMove">
diff --git a/src/ARKServerManager/Windows/OpenRCONWindow.xaml b/src/ARKServerManager/Windows/OpenRCONWindow.xaml
index 0306ff55..c8773e22 100644
--- a/src/ARKServerManager/Windows/OpenRCONWindow.xaml
+++ b/src/ARKServerManager/Windows/OpenRCONWindow.xaml
@@ -12,11 +12,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>
     <Grid Background="{StaticResource BeigeGradient}">
diff --git a/src/ARKServerManager/Windows/PlayerListWindow.xaml b/src/ARKServerManager/Windows/PlayerListWindow.xaml
index 3b3ed2d0..9d21cb5b 100644
--- a/src/ARKServerManager/Windows/PlayerListWindow.xaml
+++ b/src/ARKServerManager/Windows/PlayerListWindow.xaml
@@ -15,66 +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="PlayerName" TargetType="Label">
-                <Setter Property="Content" Value="{Binding PlayerName}"/>
-                <Setter Property="ToolTip" Value="{Binding PlayerId}"/>
-                <Setter Property="Background" Value="AliceBlue"/>
-                <Style.Triggers>
-                    <DataTrigger Binding="{Binding IsAdmin}" Value="True">
-                        <Setter Property="FontWeight" Value="Bold"/>
-                        <Setter Property="Foreground" Value="#0066CC"/>
-                    </DataTrigger>
-                    <DataTrigger Binding="{Binding IsAdmin}" Value="False">
-                        <Setter Property="FontStyle" Value="Normal"/>
-                        <Setter Property="Foreground" Value="Black"/>
-                    </DataTrigger>
-                </Style.Triggers>
-            </Style>
-            <Style x:Key="TribeName" TargetType="Label">
-                <Style.Triggers>
-                    <DataTrigger Binding="{Binding TribeName, Converter={StaticResource IsNullOrWhiteSpaceValueConverter}}" Value="True">
-                        <Setter Property="Content" Value="No tribe"/>
-                        <Setter Property="FontStyle" Value="Italic"/>
-                        <Setter Property="Foreground" Value="LightGray"/>
-                    </DataTrigger>
-                    <DataTrigger Binding="{Binding TribeName, Converter={StaticResource IsNullOrWhiteSpaceValueConverter}}" Value="False">
-                        <Setter Property="Content" Value="{Binding PlayerData.Tribe.Name}"/>
-                        <Setter Property="FontStyle" Value="Normal"/>
-                        <Setter Property="Foreground" Value="Black"/>
-                    </DataTrigger>
-                </Style.Triggers>
-            </Style>
         </ResourceDictionary>
     </Window.Resources>
 
diff --git a/src/ARKServerManager/Windows/PlayerProfileWindow.xaml b/src/ARKServerManager/Windows/PlayerProfileWindow.xaml
index 5ac759e2..97234942 100644
--- a/src/ARKServerManager/Windows/PlayerProfileWindow.xaml
+++ b/src/ARKServerManager/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>
-            
-            <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>
-            
-            <cc:NullValueConverter x:Key="NullValueConverter"/>
-            
-            <BitmapImage x:Key="NoAvatar" UriSource="../Art/NoAvatar.png" />
-            
-            <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>
     <Grid Background="{StaticResource BeigeGradient}">
diff --git a/src/ARKServerManager/Windows/PluginsWindow.xaml b/src/ARKServerManager/Windows/PluginsWindow.xaml
index 985699d4..600b59f8 100644
--- a/src/ARKServerManager/Windows/PluginsWindow.xaml
+++ b/src/ARKServerManager/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/ARKServerManager/Windows/ProcessorAffinityWindow.xaml b/src/ARKServerManager/Windows/ProcessorAffinityWindow.xaml
index c6cb6ea4..9ebd8f2d 100644
--- a/src/ARKServerManager/Windows/ProcessorAffinityWindow.xaml
+++ b/src/ARKServerManager/Windows/ProcessorAffinityWindow.xaml
@@ -10,8 +10,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/ARKServerManager/Windows/ProgressWindow.xaml b/src/ARKServerManager/Windows/ProgressWindow.xaml
index 783905cd..9eebadf2 100644
--- a/src/ARKServerManager/Windows/ProgressWindow.xaml
+++ b/src/ARKServerManager/Windows/ProgressWindow.xaml
@@ -10,10 +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>
     <Grid Background="{StaticResource BeigeGradient}">
diff --git a/src/ARKServerManager/Windows/RCONWindow.xaml b/src/ARKServerManager/Windows/RCONWindow.xaml
index e73ade52..ab8cd5ed 100644
--- a/src/ARKServerManager/Windows/RCONWindow.xaml
+++ b/src/ARKServerManager/Windows/RCONWindow.xaml
@@ -20,81 +20,8 @@
             </ResourceDictionary.MergedDictionaries>
             
             <local:ScrollToBottomAction x:Key="ScrollToBottomAction" />
-            <cc:NullValueConverter x:Key="NullValueConverter"/>
-            <cc:IsNullValueConverter x:Key="IsNullValueConverter"/>
-            <cc:IsNullOrWhiteSpaceValueConverter x:Key="IsNullOrWhiteSpaceValueConverter"/>
-            <cc:EnumConverter x:Key="EnumConverter"/>
-            <cc:EnumFlagsConverter x:Key="EnumFlagsConverter"/>
-            
-            <SolidColorBrush x:Key="HeaderBrush" Color="#FFF0F0F0"/>
-            
-            <Style x:Key="ServerStatus" TargetType="{x:Type Label}">
-                <Style.Triggers>
-                    <DataTrigger Binding="{Binding ServerRCON.Status}" Value="Connected">
-                        <Setter Property="Foreground" Value="Green"/>
-                        <Setter Property="FontWeight" Value="Bold"/>
-                    </DataTrigger>
-                    <DataTrigger Binding="{Binding ServerRCON.Status}" Value="Disconnected">
-                        <Setter Property="Foreground" Value="Red"/>
-                        <Setter Property="FontWeight" Value="Bold"/>
-                    </DataTrigger>
-                </Style.Triggers>
-            </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="PlayerName" TargetType="Label">
-                <Setter Property="Content" Value="{Binding PlayerName}"/>
-                <Setter Property="ToolTip" Value="{Binding PlayerId}"/>
-                <Setter Property="Background" Value="AliceBlue"/>
-                <Style.Triggers>
-                    <DataTrigger Binding="{Binding IsAdmin}" Value="True">
-                        <Setter Property="FontWeight" Value="Bold"/>
-                        <Setter Property="Foreground" Value="#0066CC"/>
-                    </DataTrigger>
-                    <DataTrigger Binding="{Binding IsAdmin}" Value="False">
-                        <Setter Property="FontStyle" Value="Normal"/>
-                        <Setter Property="Foreground" Value="Black"/>
-                    </DataTrigger>
-                </Style.Triggers>
-            </Style>
-            <Style x:Key="Tribename" TargetType="Label">
-                <Style.Triggers>
-                    <DataTrigger Binding="{Binding TribeName, Converter={StaticResource IsNullOrWhiteSpaceValueConverter}}" Value="True">
-                        <Setter Property="Content" Value="No tribe"/>
-                        <Setter Property="FontStyle" Value="Italic"/>
-                        <Setter Property="Foreground" Value="LightGray"/>
-                    </DataTrigger>
-                    <DataTrigger Binding="{Binding TribeName, Converter={StaticResource IsNullOrWhiteSpaceValueConverter}}" Value="False">
-                        <Setter Property="Content" Value="{Binding PlayerData.Tribe.Name}"/>
-                        <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="local:InputMode" />
                 </ObjectDataProvider.MethodParameters>
diff --git a/src/ARKServerManager/Windows/ServerMonitorWindow.xaml b/src/ARKServerManager/Windows/ServerMonitorWindow.xaml
index e89e04f5..f6479d6e 100644
--- a/src/ARKServerManager/Windows/ServerMonitorWindow.xaml
+++ b/src/ARKServerManager/Windows/ServerMonitorWindow.xaml
@@ -19,17 +19,6 @@
                 <ResourceDictionary Source="..\Globalization\en-US\en-US.xaml"/>
                 <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/ARKServerManager/Windows/ServerSettingsControl.xaml b/src/ARKServerManager/Windows/ServerSettingsControl.xaml
index ea21be43..78a54924 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:vm="clr-namespace:ServerManagerTool.Lib.ViewModel"
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:vm="clr-namespace:ServerManagerTool.Lib.ViewModel"
              mc:Ignorable="d"
              d:DesignWidth="900"
              x:Name="SettingsControl">
@@ -24,23 +24,13 @@
                 <ResourceDictionary Source="..\Styles\Default.xaml"/>
             </ResourceDictionary.MergedDictionaries>
 
-            <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-            <cc:SecondsToTimeValueConverter x:Key="SecondsToTimeValueConverter"/>
-            <cc:InstalledVersionConverter x:Key="InstalledVersionConverter"/>
-            <cc:InvertBooleanConverter x:Key="InvertBooleanConverter"/>
-            <cc:InvertBooleanToVisibilityConverter x:Key="InvertBooleanToVisibilityConverter"/>
-            <cc:HasStringValueConverter x:Key="HasStringValueConverter"/>
-            <cc:SecondsToMinutesConverter x:Key="SecondsToMinutesConverter"/>
-            <cc:SecondsToHoursConverter x:Key="SecondsToHoursConverter"/>
-            <cc:ProcessorAffinityConverter x:Key="ProcessorAffinityConverter"/>
-            <cc:FlagsEnumToBooleanConverter x:Key="FlagsEnumToBooleanConverter"/>
-            <cc:FloatToPercentageConverter x:Key="FloatToPercentageConverter"/>
-            <vm:OfficialDifficultyValueConverter x:Key="OfficialDifficultyValueConverter" />
             <vm:DinoLevelIndexToDisplayLevelConverter x:Key="DinoLevelIndexToDisplayLevelConverter" />
-            <vm:PlayerLevelIndexToDisplayLevelConverter x:Key="PlayerLevelIndexToDisplayLevelConverter" />
-            <vm:ResourceNameValueConverter x:Key="ResourceNameValueConverter" />
             <vm:ExtinctionEventDateConverter x:Key="ExtinctionEventDateConverter"/>
             <vm:ExtinctionEventTimeIntervalConverter x:Key="ExtinctionEventTimeIntervalConverter"/>
+            <vm:MapNameValueConverter x:Key="MapNameValueConverter"/>
+            <vm:OfficialDifficultyValueConverter x:Key="OfficialDifficultyValueConverter" />
+            <vm:PlayerLevelIndexToDisplayLevelConverter x:Key="PlayerLevelIndexToDisplayLevelConverter" />
+            <vm:ResourceNameValueConverter x:Key="ResourceNameValueConverter" />
             <vm:TributeExpirationConverter x:Key="TributeExpirationConverter"/>
 
             <ObjectDataProvider x:Key="NPCSpawnContainerTypes" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
@@ -53,291 +43,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" />
 
-            <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.Triggers>
-                    <DataTrigger Binding="{Binding ElementName=EnableSOTFCheckbox, Path=IsChecked}" Value="True">
-                        <Setter Property="Foreground" Value="DarkRed"/>
-                    </DataTrigger>
-                    <DataTrigger Binding="{Binding ElementName=EnablePGMCheckbox, Path=IsChecked}" Value="True">
-                        <Setter Property="Foreground" Value="#4E008B"/>
-                    </DataTrigger>
-                </Style.Triggers>
-            </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"/>
-            </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,0,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Zip.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
diff --git a/src/ARKServerManager/Windows/SettingsWindow.xaml b/src/ARKServerManager/Windows/SettingsWindow.xaml
index 5f4b0520..19e1b951 100644
--- a/src/ARKServerManager/Windows/SettingsWindow.xaml
+++ b/src/ARKServerManager/Windows/SettingsWindow.xaml
@@ -13,10 +13,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>
     <Grid>
diff --git a/src/ARKServerManager/Windows/ShutdownWindow.xaml b/src/ARKServerManager/Windows/ShutdownWindow.xaml
index 56f20237..991f8294 100644
--- a/src/ARKServerManager/Windows/ShutdownWindow.xaml
+++ b/src/ARKServerManager/Windows/ShutdownWindow.xaml
@@ -14,19 +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>
-            <SolidColorBrush x:Key="BeigeLabel" Color="#FFE6DFD8"/>
-            <SolidColorBrush x:Key="BeigeBorder" Color="#FFD8CCBC"/>
-
-            <cc:InvertBooleanConverter x:Key="InvertBooleanConverter"/>
-
-            <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">
diff --git a/src/ARKServerManager/Windows/SupplyCrateOverridesWindow.xaml b/src/ARKServerManager/Windows/SupplyCrateOverridesWindow.xaml
index fa12da5c..7e46d4f7 100644
--- a/src/ARKServerManager/Windows/SupplyCrateOverridesWindow.xaml
+++ b/src/ARKServerManager/Windows/SupplyCrateOverridesWindow.xaml
@@ -1,8 +1,6 @@
 <Window x:Class="ServerManagerTool.SupplyCrateOverridesWindow"
         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"
-        xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
         Loaded="Window_Loaded" Closing="Window_Closing"
         MinWidth="600" MinHeight="480" Width="900" Height="480" ResizeMode="CanResize" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" 
         Name="SupplyCrateUI" Icon="../Art/favicon.ico" Title="SupplyCrateOverridesWindow" >
@@ -12,14 +10,6 @@
                 <ResourceDictionary Source="..\Globalization\en-US\en-US.xaml"/>
                 <ResourceDictionary Source="..\Styles\Default.xaml"/>
             </ResourceDictionary.MergedDictionaries>
-
-            <cc:InvertBooleanConverter x:Key="InvertBooleanConverter"/>
-            <cc:IsNullOrWhiteSpaceValueConverter x:Key="IsNullOrWhiteSpaceValueConverter"/>
-
-            <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/ARKServerManager/Windows/TribeProfileWindow.xaml b/src/ARKServerManager/Windows/TribeProfileWindow.xaml
index 74297be0..710fb162 100644
--- a/src/ARKServerManager/Windows/TribeProfileWindow.xaml
+++ b/src/ARKServerManager/Windows/TribeProfileWindow.xaml
@@ -9,24 +9,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>
-            <SolidColorBrush x:Key="BeigeBorder" Color="#FFD8CCBC"/>
-
-            <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>
     <Grid Background="{StaticResource BeigeGradient}">
diff --git a/src/ARKServerManager/Windows/VersionFeedWindow.xaml b/src/ARKServerManager/Windows/VersionFeedWindow.xaml
index 64303492..af9fed0f 100644
--- a/src/ARKServerManager/Windows/VersionFeedWindow.xaml
+++ b/src/ARKServerManager/Windows/VersionFeedWindow.xaml
@@ -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/ARKServerManager/Windows/WorkshopFilesWindow.xaml b/src/ARKServerManager/Windows/WorkshopFilesWindow.xaml
index 87fb8dda..81f8b512 100644
--- a/src/ARKServerManager/Windows/WorkshopFilesWindow.xaml
+++ b/src/ARKServerManager/Windows/WorkshopFilesWindow.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>
     <Grid Background="{StaticResource BeigeGradient}">
diff --git a/src/ARKServerManager/Windows/WorldSaveRestoreWindow.xaml b/src/ARKServerManager/Windows/WorldSaveRestoreWindow.xaml
index 37409409..fe28e951 100644
--- a/src/ARKServerManager/Windows/WorldSaveRestoreWindow.xaml
+++ b/src/ARKServerManager/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>
     <Grid Background="{StaticResource BeigeGradient}">