diff --git a/Magpie_Desktop_GBV_1_1_0/Constants.xaml b/Magpie_Desktop_GBV_1_1_0/Constants.xaml
deleted file mode 100644
index bb885f7..0000000
--- a/Magpie_Desktop_GBV_1_1_0/Constants.xaml
+++ /dev/null
@@ -1,122 +0,0 @@
-<ResourceDictionary 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">
-
-    <sys:Double x:Key="FontSizeSmall">12</sys:Double>
-    <sys:Double x:Key="FontSize">14</sys:Double>
-    <sys:Double x:Key="FontSizeLarge">15</sys:Double>
-    <sys:Double x:Key="FontSizeLarger">20</sys:Double>
-    <sys:Double x:Key="FontSizeLargest">29</sys:Double>
-    <FontFamily x:Key="FontFamily">Trebuchet MS</FontFamily>
-    <FontFamily x:Key="MonospaceFontFamily">Consolas</FontFamily>
-    <Thickness x:Key="PopupBorderThickness">1</Thickness>
-    <Thickness x:Key="ControlBorderThickness">1</Thickness>
-    <sys:Double x:Key="EllipseBorderThickness">1</sys:Double>
-    <CornerRadius x:Key="ControlCornerRadius">0</CornerRadius>
-    <Thickness x:Key="SidebarItemPadding">8</Thickness>
-
-    <Color x:Key="BlackColor">#FF000000</Color>
-    <Color x:Key="WhiteColor">#FFFFFFFF</Color>
-    <Color x:Key="TextColor">#f2f2f2</Color>
-    <Color x:Key="TextColorDarker">#cacaca</Color>
-    <Color x:Key="TextColorDark">#FF000000</Color>
-    <Color x:Key="MainColor">#2b2b2b</Color>
-    <Color x:Key="MainColorDark">#202020</Color>
-    <Color x:Key="HoverColor">#4d4d4d</Color>
-    <Color x:Key="GlyphColor">#62C3DF</Color>
-    <Color x:Key="HighlightGlyphColor">#FFFF0000</Color>
-    <Color x:Key="PopupBackgroundColor">#121212</Color>
-    <Color x:Key="PopupBorderColor">#2B2B2B</Color>
-    <Color x:Key="BackgroundToneColor">#202020</Color>
-    <Color x:Key="GridItemBackgroundColor">#6c6c6c</Color>
-    <Color x:Key="PanelSeparatorColor">#282828</Color>
-    <Color x:Key="WindowPanelSeparatorColor">#3355CDFF</Color>
-
-    <SolidColorBrush x:Key="ControlBackgroundBrush" Color="{DynamicResource MainColorDark}" Opacity="0.7" />
-    <SolidColorBrush x:Key="TextBrush" Color="{DynamicResource TextColor}" />
-    <SolidColorBrush x:Key="TextBrushDarker" Color="{DynamicResource TextColorDarker}" />
-    <SolidColorBrush x:Key="TextBrushDark" Color="{DynamicResource TextColorDark}" />
-    <SolidColorBrush x:Key="NormalBrush" Color="{DynamicResource MainColor}" />
-    <SolidColorBrush x:Key="NormalBrushDark" Color="{DynamicResource MainColorDark}" />
-    <SolidColorBrush x:Key="NormalBorderBrush" Color="{DynamicResource ButtonBackgroundColor}" />
-    <SolidColorBrush x:Key="HoverBrush" Color="{DynamicResource HoverColor}"/>
-    <SolidColorBrush x:Key="GlyphBrush" Color="{DynamicResource GlyphColor}" />
-    <SolidColorBrush x:Key="HighlightGlyphBrush" Color="{DynamicResource HighlightGlyphColor}" />
-    <SolidColorBrush x:Key="PopupBorderBrush" Color="{DynamicResource PopupBorderColor}" />
-    <SolidColorBrush x:Key="TooltipBackgroundBrush" Color="{DynamicResource BackgroundToneColor}" />
-    <SolidColorBrush x:Key="ButtonBackgroundBrush" Color="{DynamicResource ButtonBackgroundColor}"/>
-    <SolidColorBrush x:Key="GridItemBackgroundBrush" Color="{DynamicResource GridItemBackgroundColor}" Opacity="0.7 "/>
-    <SolidColorBrush x:Key="PanelSeparatorBrush" Color="{DynamicResource PanelSeparatorColor}" Opacity="0.7"/>
-    <SolidColorBrush x:Key="WindowPanelSeparatorBrush" Color="{DynamicResource WindowPanelSeparatorColor}" />
-    <SolidColorBrush x:Key="PopupBackgroundBrush" Color="{DynamicResource PopupBackgroundColor}" />
-    <SolidColorBrush x:Key="CheckBoxCheckMarkBkBrush" Color="{DynamicResource MainColorDark}" />
-
-    <SolidColorBrush x:Key="PositiveRatingBrush" Color="#78ffa0" />
-    <SolidColorBrush x:Key="NegativeRatingBrush" Color="#ff6b6b" />
-    <SolidColorBrush x:Key="MixedRatingBrush" Color="#fffca1" />
-
-    <SolidColorBrush x:Key="WarningBrush" Color="#ff6b6b" />
-
-    <SolidColorBrush x:Key="ExpanderBackgroundBrush" Color="Transparent" />
-
-    <!-- Spacer for alignment
-    with default theme -->
-    
-    <SolidColorBrush x:Key="WindowBackgroundBrush" Color="{DynamicResource PopupBackgroundColor}"/>
-
-    <!-- Some ideas for custom glyph colors:
-    For grey try: #A6A6A6,
-    for gold try #FFD768,
-    for salmon try #FF7A68,
-    for red try #E34141,
-    for blue try #62C3DF -->
-    
-    <!-- Magpie-Specific Variables-->
-
-    <sys:Boolean x:Key="UseAbsoluteExtraMetadataPath">false</sys:Boolean>
-    <sys:String x:Key="ExtraMetadataPath">..\..\..\..</sys:String>
-    <sys:String x:Key="AboutGameText">About the Game</sys:String>
-    <sys:Boolean x:Key="BGModeOn">false</sys:Boolean>
-    <sys:Boolean x:Key="GridFavoriteHighlight">true</sys:Boolean>
-
-    <SolidColorBrush x:Key="FavoriteColorBrush" Color="{DynamicResource FavoriteColor}"/>
-    <sys:Double x:Key="ControlCornerRadiusDouble">0</sys:Double>
-    <sys:Double x:Key="GroupSeparatorOpacity">1</sys:Double>
-    <FontFamily x:Key="SymbolFont">seguisym.ttf#Segoe UI Symbol</FontFamily>
-    <Visibility x:Key="TitleTextVisibility">Visible</Visibility>
-    <sys:Double x:Key="DetailsViewPanelWidth">1280</sys:Double>
-    
-    <!-- Magpie-Specific Colors -->
-    <Color x:Key="ButtonBackgroundColor">#2b2b2b</Color>
-    <Color x:Key="PlayButtonColor">#4BC937</Color>
-    <Color x:Key="ContextButtonColor">#385DA2</Color>
-    <Color x:Key="ContextButtonHighlightColor">#5C63BB</Color>
-    <Color x:Key="ClearFilterButtonColor">#e34141</Color>
-    <Color x:Key="PopupBackgroundTransparent">#00121212</Color>
-    <Color x:Key="FavoriteColor">Goldenrod</Color>
-
-    <SolidColorBrush x:Key="CoverHighlightBrush" Color="#10FFFFFF" />
-
-    <Color x:Key="NormalBorderColor">#282828</Color>
-    <SolidColorBrush x:Key="TitlebarBrush" Color="{DynamicResource PopupBackgroundColor}" Opacity="0.7"/>
-    <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="{DynamicResource MainColorDark}"/>
-    <SolidColorBrush x:Key="DetailsButtonBrush" Color="{DynamicResource HoverColor}" Opacity=".7"/>
-    <SolidColorBrush x:Key="ButtonBorderBrush" Color="{DynamicResource ButtonBackgroundColor}" Opacity="1"/>
-    <SolidColorBrush x:Key="HoverBorderBrush" Color="{DynamicResource HoverColor}" Opacity="1"/>
-    <SolidColorBrush x:Key="ButtonFocusBorderBrush" Color="{DynamicResource HoverColor}" Opacity="1"/>
-    <SolidColorBrush x:Key="PanelBackgroundBrush" Color="{DynamicResource PopupBackgroundColor}" Opacity="0.7"/>
-    <SolidColorBrush x:Key="GridDetailsDrawerBrush" Color="{DynamicResource PopupBackgroundColor}" Opacity="0.9"/>
-    <SolidColorBrush x:Key="DetailsPanelBrush" Color="{DynamicResource PopupBackgroundColor}" Opacity="0.7"/>
-    <SolidColorBrush x:Key="DetailsViewGroupTextBrush" Color="{DynamicResource GlyphColor}"/>
-
-    <SolidColorBrush x:Key="PlayButtonBrush" Color="{DynamicResource HoverColor}" Opacity="0.7" />
-    <SolidColorBrush x:Key="PlayBorderBrush" Color="{DynamicResource HoverColor}" Opacity="1" />
-    <SolidColorBrush x:Key="PlayButtonHighlightBrush" Color="{DynamicResource PlayButtonColor}" Opacity="0.7" />
-    <SolidColorBrush x:Key="PlayBorderHighlightBrush" Color="{DynamicResource PlayButtonColor}" Opacity="1" />
-    <SolidColorBrush x:Key="ContextButtonBrush" Color="{DynamicResource ContextButtonColor}" Opacity="0.7" />
-    <SolidColorBrush x:Key="ContextBorderBrush" Color="{DynamicResource ContextButtonColor}" Opacity="1" />
-    <SolidColorBrush x:Key="ClearFilterButtonBrush" Color="{DynamicResource ClearFilterButtonColor}" Opacity="0.7" />
-    <SolidColorBrush x:Key="ClearFilterBorderBrush" Color="{DynamicResource ClearFilterButtonColor}" Opacity="1" />
-    <SolidColorBrush x:Key="CoverOverlayBackgroundBrush" Color="{DynamicResource PanelBackgroundColor}" Opacity=".5" />
-
-</ResourceDictionary>
diff --git a/Magpie_Desktop_GBV_1_1_0/CustomControls/SliderEx.xaml b/Magpie_Desktop_GBV_1_1_0/CustomControls/SliderEx.xaml
deleted file mode 100644
index 9f38486..0000000
--- a/Magpie_Desktop_GBV_1_1_0/CustomControls/SliderEx.xaml
+++ /dev/null
@@ -1,80 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <Style x:Key="SliderExTrackButton" TargetType="{x:Type RepeatButton}">
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="true" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type RepeatButton}">
-                    <Border Background="Transparent" />
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type SliderEx}" BasedOn="{StaticResource {x:Type Slider}}">
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource TextBrush}" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Slider}">
-                    <Grid x:Name="GridRoot">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" MinHeight="{TemplateBinding MinHeight}" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <TickBar x:Name="TopTick" Visibility="Collapsed" Height="4" Placement="Top"
-                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"  Fill="{DynamicResource GlyphBrush}" />
-                        <Border x:Name="Border" Grid.Row="1" Margin="0" Height="6" CornerRadius="{DynamicResource ControlCornerRadius}"
-                                Background="{TemplateBinding Background}" BorderBrush="{DynamicResource NormalBorderBrush}"
-                                BorderThickness="{DynamicResource ControlBorderThickness}" />
-                        <Track Grid.Row="1" x:Name="PART_Track">
-                            <Track.Thumb>
-                                <Thumb Width="25" />
-                            </Track.Thumb>
-                            <Track.DecreaseRepeatButton>
-                                <RepeatButton Style="{StaticResource SliderExTrackButton}"
-                                              Command="Slider.DecreaseLarge" />
-                            </Track.DecreaseRepeatButton>
-                            <Track.IncreaseRepeatButton>
-                                <RepeatButton Style="{StaticResource SliderExTrackButton}"
-                                              Command="Slider.IncreaseLarge" />
-                            </Track.IncreaseRepeatButton>
-                        </Track>
-                        <TickBar x:Name="BottomTick" Visibility="Collapsed" Grid.Row="2" Height="4" Placement="Bottom"
-                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Fill="{TemplateBinding Foreground}" />
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsFocused" Value="True">
-                            <Setter TargetName="PART_Track" Property="FocusManager.FocusedElement" Value="{Binding ElementName=PART_Track}" />
-                        </Trigger>
-                        <Trigger Property="TickPlacement" Value="TopLeft">
-                            <Setter Property="Visibility" Value="Visible" TargetName="TopTick" />
-                        </Trigger>
-                        <Trigger Property="TickPlacement" Value="BottomRight">
-                            <Setter Property="Visibility" Value="Visible" TargetName="BottomTick" />
-                        </Trigger>
-                        <Trigger Property="TickPlacement" Value="Both">
-                            <Setter Property="Visibility" Value="Visible" TargetName="TopTick" />
-                            <Setter Property="Visibility" Value="Visible" TargetName="BottomTick" />
-                        </Trigger>
-                        <Trigger Property="Orientation" Value="Vertical">
-                            <Setter Property="LayoutTransform" TargetName="GridRoot">
-                                <Setter.Value>
-                                    <RotateTransform Angle="-90" />
-                                </Setter.Value>
-                            </Setter>
-                            <Setter TargetName="PART_Track" Property="Orientation" Value="Horizontal" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Magpie_Desktop_GBV_1_1_0/CustomControls/WindowBase.xaml b/Magpie_Desktop_GBV_1_1_0/CustomControls/WindowBase.xaml
deleted file mode 100644
index 5a9bf47..0000000
--- a/Magpie_Desktop_GBV_1_1_0/CustomControls/WindowBase.xaml
+++ /dev/null
@@ -1,18 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <Style TargetType="WindowBase">
-        <Setter Property="Background" Value="{DynamicResource WindowBackgroundBrush}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type WindowBase}">
-                    <Border Background="{TemplateBinding Background}">
-                        <AdornerDecorator>
-                            <ContentPresenter />
-                        </AdornerDecorator>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Magpie_Desktop_GBV_1_1_0/DefaultControls/Button.xaml b/Magpie_Desktop_GBV_1_1_0/DefaultControls/Button.xaml
deleted file mode 100644
index dcba5d9..0000000
--- a/Magpie_Desktop_GBV_1_1_0/DefaultControls/Button.xaml
+++ /dev/null
@@ -1,43 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                    xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                    mc:Ignorable="d">
-
-    <Style TargetType="{x:Type Button}" BasedOn="{StaticResource BaseStyle}">
-        <Setter Property="Background" Value="{DynamicResource ButtonBackgroundBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource GlyphBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{DynamicResource ControlBorderThickness}" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="Padding" Value="10,5,10,5" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Button}">
-                    <Border x:Name="Border" Cursor="Hand" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}"
-                            CornerRadius="{DynamicResource ControlCornerRadius}" Style="{DynamicResource HighlightBorder}" BorderBrush="{TemplateBinding BorderBrush}">
-                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" />
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsFocused" Value="True">
-                            <Setter Property="BorderBrush" Value="{DynamicResource HoverBorderBrush}"/>
-                            <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
-                <Setter Property="Background" Value="{DynamicResource HoverBrush}"/>
-                <Setter Property="BorderBrush" Value="{DynamicResource HoverBorderBrush}"/>
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Magpie_Desktop_GBV_1_1_0/DefaultControls/CheckBox.xaml b/Magpie_Desktop_GBV_1_1_0/DefaultControls/CheckBox.xaml
deleted file mode 100644
index cf2eab0..0000000
--- a/Magpie_Desktop_GBV_1_1_0/DefaultControls/CheckBox.xaml
+++ /dev/null
@@ -1,60 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                    xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                    mc:Ignorable="d">
-
-    <Style TargetType="{x:Type CheckBox}" BasedOn="{StaticResource BaseStyle}">
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{DynamicResource ControlBorderThickness}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type CheckBox}">
-                    <Border Background="Transparent"
-                            Padding="{TemplateBinding Padding}">
-                        <StackPanel Orientation="Horizontal">
-                            <Border x:Name="BulletBorder" CornerRadius="{DynamicResource ControlCornerRadius}"
-                                    BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}"
-                                    Style="{DynamicResource HighlightBorder}" >
-                                <Grid Width="18" Height="18" Background="Transparent">
-                                    <Viewbox x:Name="CheckIcon" Visibility="Collapsed">
-                                        <TextBlock Text="b" FontFamily="Marlett" Foreground="{DynamicResource GlyphBrush}"
-                                                    HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                    </Viewbox>
-                                    <Viewbox x:Name="IndeterminateIcon" Visibility="Collapsed" Margin="2">
-                                        <TextBlock Text="g" FontFamily="Marlett" Foreground="{DynamicResource GlyphBrush}"
-                                                    HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                    </Viewbox>
-                                </Grid>
-                            </Border>                            
-                            <ContentPresenter RecognizesAccessKey="True" Margin="5,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Left" />
-                        </StackPanel>
-                    </Border>                    
-                    <ControlTemplate.Triggers>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="IsChecked" Value="{x:Null}" />
-                                <Condition Property="IsThreeState" Value="True" />
-                            </MultiTrigger.Conditions>
-                            <Setter Property="Visibility" Value="Visible" TargetName="IndeterminateIcon"/>
-                        </MultiTrigger>
-                        <Trigger Property="IsChecked" Value="True">
-                            <Setter Property="Visibility" Value="Visible" TargetName="CheckIcon" />
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="BorderBrush" Value="{DynamicResource GlyphBrush}" TargetName="BulletBorder" />
-                        </Trigger>
-                        <Trigger Property="IsFocused" Value="True">
-                            <Setter Property="BorderBrush" Value="{DynamicResource GlyphBrush}" TargetName="BulletBorder" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>                  
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Magpie_Desktop_GBV_1_1_0/DefaultControls/ComboBox.xaml b/Magpie_Desktop_GBV_1_1_0/DefaultControls/ComboBox.xaml
deleted file mode 100644
index b1035cc..0000000
--- a/Magpie_Desktop_GBV_1_1_0/DefaultControls/ComboBox.xaml
+++ /dev/null
@@ -1,108 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                    xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                    mc:Ignorable="d">
-
-    <Style TargetType="{x:Type ComboBox}" BasedOn="{StaticResource BaseStyle}">
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource NormalBrush}"/>
-        <Setter Property="BorderThickness" Value="{DynamicResource ControlBorderThickness}" />        
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ComboBox}">
-                    <Border x:Name="Border" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{DynamicResource ControlCornerRadius}"
-                            Style="{DynamicResource HighlightBorder}" Background="{TemplateBinding Background}">
-                        <Grid>
-                            <ToggleButton x:Name="ToggleButton" Focusable="False" ClickMode="Press" Margin="0,0,2,0"
-                                          IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}">
-                                <ToggleButton.Template>
-                                    <ControlTemplate TargetType="{x:Type ToggleButton}">
-                                        <DockPanel LastChildFill="False" Background="Transparent">
-                                            <Viewbox DockPanel.Dock="Right" Width="20" >
-                                                <TextBlock Text="6" FontFamily="Marlett" Foreground="{DynamicResource GlyphBrush}"
-                                                           VerticalAlignment="Center"/>
-                                            </Viewbox>
-                                        </DockPanel>
-                                    </ControlTemplate>
-                                </ToggleButton.Template>
-                            </ToggleButton>
-                            <ContentPresenter x:Name="ContentSite" HorizontalAlignment="Left" VerticalAlignment="Center"
-                                              Margin="5,0,25,0" IsHitTestVisible="False" Content="{TemplateBinding SelectionBoxItem}"
-                                              ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
-                                              ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" />
-                            <TextBox x:Name="PART_EditableTextBox" Visibility="Hidden" VerticalAlignment="Center"
-                                     HorizontalAlignment="Stretch" Margin="0,0,25,0" Focusable="True"
-                                     BorderThickness="0" Background="{TemplateBinding Background}"
-                                     IsReadOnly="{TemplateBinding IsReadOnly}" Foreground="{DynamicResource TextBrush}">
-                            </TextBox>
-                            <Popup x:Name="Popup" IsOpen="{TemplateBinding IsDropDownOpen}"
-                                   Placement="Bottom" Focusable="False" AllowsTransparency="True">
-                                <Grid MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{TemplateBinding ActualWidth}"
-                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                                    <Border BorderBrush="{DynamicResource PopupBorderBrush}"
-                                            BorderThickness="{DynamicResource PopupBorderThickness}"
-                                            Background="{DynamicResource PopupBackgroundBrush}">
-                                        <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
-                                            <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Contained" />
-                                        </ScrollViewer>
-                                    </Border>
-                                </Grid>
-                            </Popup>
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsFocused" Value="True">
-                            <Setter Property="BorderBrush" Value="{DynamicResource GlyphBrush}" TargetName="Border" />
-                        </Trigger>
-                        <Trigger Property="IsEditable" Value="True">
-                            <Setter Property="IsTabStop" Value="False" />
-                            <Setter Property="Visibility" Value="Visible" TargetName="PART_EditableTextBox" />
-                            <Setter Property="Visibility" Value="Hidden" TargetName="ContentSite" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type ComboBoxItem}">
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
-        <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="Padding" Value="5" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ComboBoxItem}">
-                    <Grid>
-                        <Rectangle x:Name="HoverRectangle" IsHitTestVisible="False" Visibility="Collapsed" Fill="{DynamicResource HoverBrush}" />
-                        <Rectangle x:Name="SelectedRectangle" IsHitTestVisible="False" Visibility="Collapsed" Fill="{DynamicResource GlyphBrush}" Opacity=".5"/>
-                        <Border Background="Transparent" Padding="{TemplateBinding Padding}">
-                            <ContentPresenter VerticalAlignment="Center" />
-                        </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsHighlighted" Value="True">
-                            <Setter Property="Visibility" Value="Visible" TargetName="HoverRectangle" />
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Visibility" Value="Visible" TargetName="HoverRectangle" />
-                        </Trigger>
-                        <Trigger Property="IsSelected" Value="True">
-                            <Setter Property="Visibility" Value="Visible" TargetName="SelectedRectangle" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <Trigger Property="Selector.IsSelected" Value="True">
-                <Setter Property="Foreground" Value="{DynamicResource TextBrushDark}" />
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Magpie_Desktop_GBV_1_1_0/DefaultControls/DatePicker.xaml b/Magpie_Desktop_GBV_1_1_0/DefaultControls/DatePicker.xaml
deleted file mode 100644
index 41a8698..0000000
--- a/Magpie_Desktop_GBV_1_1_0/DefaultControls/DatePicker.xaml
+++ /dev/null
@@ -1,246 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                    xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                    mc:Ignorable="d">
-
-    <Style x:Key="CalendarItemStyle" TargetType="{x:Type CalendarItem}">
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="Background" Value="{DynamicResource PopupBackgroundBrush}" />
-        <Setter Property="BorderThickness" Value="{DynamicResource PopupBorderThickness}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource PopupBorderBrush}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="CalendarItem">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            BorderBrush="{TemplateBinding BorderBrush}">
-                        <DockPanel Name="PART_Root" LastChildFill="True" >
-                            <Button x:Name="PART_PreviousButton" DockPanel.Dock="Left"
-                                    FontWeight="Bold" FontFamily="Marlett" Padding="4,2,4,2"
-                                    Content="3" Focusable="False" BorderThickness="0"
-                                    Background="Transparent"/>
-                            <Button x:Name="PART_NextButton" DockPanel.Dock="Right"
-                                    FontWeight="Bold" FontFamily="Marlett" Padding="4,2,4,2"
-                                    Content="4" BorderThickness="0"
-                                    Focusable="False"
-                                    Background="Transparent"/>
-                            <Button x:Name="PART_HeaderButton" DockPanel.Dock="Top"
-                                    Padding="2" Height="30" Focusable="False"
-                                    BorderThickness="0" Background="Transparent"/>
-                            <Grid>
-                                <Grid x:Name="PART_MonthView" Visibility="Visible">
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="Auto"/>
-                                        <RowDefinition Height="Auto"/>
-                                        <RowDefinition Height="Auto"/>
-                                        <RowDefinition Height="Auto"/>
-                                        <RowDefinition Height="Auto"/>
-                                        <RowDefinition Height="Auto"/>
-                                        <RowDefinition Height="Auto"/>
-                                    </Grid.RowDefinitions>
-
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                    </Grid.ColumnDefinitions>
-                                </Grid>
-                                <Grid x:Name="PART_YearView"  Visibility="Hidden">
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="*"/>
-                                        <RowDefinition Height="*"/>
-                                        <RowDefinition Height="*"/>
-                                    </Grid.RowDefinitions>
-
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*"/>
-                                        <ColumnDefinition Width="*"/>
-                                        <ColumnDefinition Width="*"/>
-                                        <ColumnDefinition Width="*"/>
-                                    </Grid.ColumnDefinitions>
-                                </Grid>
-                            </Grid>
-                        </DockPanel>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type Calendar}}, Path=DisplayMode}" Value="Year">
-                            <Setter TargetName="PART_MonthView" Property="Visibility" Value="Hidden" />
-                            <Setter TargetName="PART_YearView" Property="Visibility" Value="Visible" />
-                        </DataTrigger>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type Calendar}}, Path=DisplayMode}" Value="Decade">
-                            <Setter TargetName="PART_MonthView" Property="Visibility" Value="Hidden" />
-                            <Setter TargetName="PART_YearView" Property="Visibility" Value="Visible" />
-                        </DataTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="CalendarButtonStyle" TargetType="{x:Type CalendarButton}">
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="FontFamily" Value="{DynamicResource FontFamily}"/>
-        <Setter Property="FontSize" Value="{DynamicResource FontSize}" />
-        <Setter Property="Width" Value="40" />
-        <Setter Property="Height" Value="40" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type CalendarButton}">
-                    <Border Background="Transparent">
-                        <ContentPresenter Content="{TemplateBinding ContentControl.Content}"
-                                          ContentTemplate="{TemplateBinding ContentControl.ContentTemplate}"
-                                          ContentStringFormat="{TemplateBinding ContentControl.ContentStringFormat}"
-                        HorizontalAlignment="{TemplateBinding Control.HorizontalContentAlignment}"
-                        VerticalAlignment="{TemplateBinding Control.VerticalContentAlignment}"
-                        TextElement.Foreground="{TemplateBinding Foreground}" />
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsInactive" Value="True">
-                            <Setter Property="Opacity" Value="0.5" />
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Foreground" Value="{DynamicResource GlyphBrush}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="CalendarDayButtonStyle" TargetType="{x:Type CalendarDayButton}">
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="FontFamily" Value="{DynamicResource FontFamily}"/>
-        <Setter Property="FontSize" Value="{DynamicResource FontSize}" />
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Width" Value="40" />
-        <Setter Property="Height" Value="40" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type CalendarDayButton}">
-                    <Border Background="Transparent">
-                        <ContentPresenter
-                        Content="{TemplateBinding ContentControl.Content}"
-                        ContentTemplate="{TemplateBinding ContentControl.ContentTemplate}"
-                        ContentStringFormat="{TemplateBinding ContentControl.ContentStringFormat}"
-                        HorizontalAlignment="{TemplateBinding Control.HorizontalContentAlignment}"
-                        VerticalAlignment="{TemplateBinding Control.VerticalContentAlignment}"
-                        TextElement.Foreground="{TemplateBinding Foreground}">
-                        </ContentPresenter>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsToday" Value="True">
-                            <Setter Property="Foreground" Value="{DynamicResource GlyphBrush}" />
-                        </Trigger>
-                        <Trigger Property="IsInactive" Value="True">
-                            <Setter Property="Foreground" Value="{DynamicResource TextBrushDarker}" />
-                        </Trigger>
-                        <Trigger Property="IsSelected" Value="True">
-                            <Setter Property="Foreground" Value="{DynamicResource GlyphBrush}" />
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Foreground" Value="{DynamicResource GlyphBrush}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="CalendarStyle" TargetType="{x:Type Calendar}">
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="CalendarDayButtonStyle" Value="{DynamicResource CalendarDayButtonStyle}"/>
-        <Setter Property="CalendarButtonStyle" Value="{DynamicResource CalendarButtonStyle}"/>
-        <Setter Property="Background" Value="{DynamicResource PopupBackgroundBrush}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Calendar">
-                    <Grid Name="PART_Root">
-                        <CalendarItem Name="PART_CalendarItem"
-                                      Style="{DynamicResource CalendarItemStyle}"
-                                      VerticalAlignment="Center" />
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type DatePicker}">
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="TextBlock.FontFamily" Value="{DynamicResource FontFamily}" />
-        <Setter Property="TextBlock.FontSize" Value="{DynamicResource FontSize}" />
-        <Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBrush}" />
-        <Setter Property="TextBlock.Background" Value="{DynamicResource ControlBackgroundBrush}" />
-        <Setter Property="CalendarStyle" Value="{StaticResource CalendarStyle}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{DynamicResource ControlBorderThickness}" />
-        <Setter Property="Padding" Value="3" />
-        <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="DatePicker">
-                    <Border x:Name="Border" BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{DynamicResource ControlCornerRadius}"
-                            Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}">
-                        <DockPanel>
-                            <Popup x:Name="PART_Popup" StaysOpen="False"
-                                   AllowsTransparency="True" Placement="Bottom"
-                                   PlacementTarget="{Binding ElementName=PART_TextBox}" />
-                            <ToggleButton x:Name="PART_Button" DockPanel.Dock="Right" Content="🗓"
-                                          BorderThickness="0" Padding="5,0,5,0"
-                                          IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"/>
-                            <DatePickerTextBox x:Name="PART_TextBox" DockPanel.Dock="Left"
-                                               Background="Transparent" BorderThickness="0"/>
-                        </DockPanel>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger SourceName="PART_TextBox"  Property="IsFocused" Value="True">
-                            <Setter Property="BorderBrush" Value="{DynamicResource GlyphBrush}" TargetName="Border" />
-                        </Trigger>
-                        <Trigger SourceName="PART_Button"  Property="IsFocused" Value="True">
-                            <Setter Property="BorderBrush" Value="{DynamicResource GlyphBrush}" TargetName="Border" />
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="BorderBrush" Value="{DynamicResource GlyphBrush}" TargetName="Border" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type DatePickerTextBox}" BasedOn="{StaticResource BaseStyle}">
-        <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="AllowDrop" Value="True" />
-        <Setter Property="CaretBrush" Value="{DynamicResource TextBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
-        <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}"/>
-        <Setter Property="BorderThickness" Value="{DynamicResource ControlBorderThickness}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type DatePickerTextBox}">
-                    <Border x:Name="Border" BorderThickness="{TemplateBinding BorderThickness}"
-                            Background="{TemplateBinding Background}" CornerRadius="{DynamicResource ControlCornerRadius}"
-                            Style="{DynamicResource HighlightBorder}">
-                        <Grid>
-                            <ScrollViewer x:Name="PART_ContentHost"
-                                          VerticalScrollBarVisibility="{TemplateBinding VerticalScrollBarVisibility}"
-                                          HorizontalScrollBarVisibility="{TemplateBinding HorizontalScrollBarVisibility}"/>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Magpie_Desktop_GBV_1_1_0/DefaultControls/RadioButton.xaml b/Magpie_Desktop_GBV_1_1_0/DefaultControls/RadioButton.xaml
deleted file mode 100644
index 167f6b3..0000000
--- a/Magpie_Desktop_GBV_1_1_0/DefaultControls/RadioButton.xaml
+++ /dev/null
@@ -1,51 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                    xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                    mc:Ignorable="d">
-
-    <Style TargetType="{x:Type RadioButton}" BasedOn="{StaticResource BaseStyle}">
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{DynamicResource ControlBorderThickness}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type RadioButton}">
-                    <BulletDecorator>
-                        <BulletDecorator.Bullet>
-                            <Border Background="Transparent">
-                                <Grid Width="18" Height="18">
-                                    <Ellipse x:Name="BulletBorder" Width="18" Height="18" Fill="{TemplateBinding Background}"
-                                            Stroke="{DynamicResource NormalBorderBrush}"
-                                            StrokeThickness="{DynamicResource EllipseBorderThickness}" />
-                                    <Viewbox x:Name="CheckIcon" Visibility="Collapsed" >
-                                        <TextBlock Text="h" FontFamily="Marlett" Foreground="{DynamicResource GlyphBrush}"
-                                                    HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                    </Viewbox>
-                                </Grid>
-                            </Border>
-                        </BulletDecorator.Bullet>
-                        <Border Padding="{TemplateBinding Padding}" Background="Transparent">
-                            <ContentPresenter RecognizesAccessKey="True" Margin="5,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Left"/>
-                        </Border>
-                    </BulletDecorator>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsChecked" Value="True">
-                            <Setter Property="Visibility" Value="Visible" TargetName="CheckIcon" />
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Stroke" Value="{DynamicResource GlyphBrush}" TargetName="BulletBorder" />
-                        </Trigger>
-                        <Trigger Property="IsFocused" Value="True">
-                            <Setter Property="Stroke" Value="{DynamicResource GlyphBrush}" TargetName="BulletBorder" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Magpie_Desktop_GBV_1_1_0/DefaultControls/TabControl.xaml b/Magpie_Desktop_GBV_1_1_0/DefaultControls/TabControl.xaml
deleted file mode 100644
index e9a108f..0000000
--- a/Magpie_Desktop_GBV_1_1_0/DefaultControls/TabControl.xaml
+++ /dev/null
@@ -1,177 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                    xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                    mc:Ignorable="d">
-
-    <Style TargetType="{x:Type TabControl}" BasedOn="{StaticResource BaseStyle}">
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type TabControl}">
-                    <Grid KeyboardNavigation.TabNavigation="Local">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition x:Name="ColumnDefinition0" />
-                            <ColumnDefinition x:Name="ColumnDefinition1" Width="0" />
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" x:Name="RowDefinition0" />
-                            <RowDefinition Height="*" x:Name="RowDefinition1" />
-                        </Grid.RowDefinitions>
-                        <Border x:Name="HeaderBorder" Background="{DynamicResource PopupBackgroundBrush}"
-                                BorderThickness="0,0,0,1" BorderBrush="{DynamicResource PopupBorderBrush}" Margin="2,0,2,0">
-                            <TabPanel x:Name="HeaderPanel" IsItemsHost="True" Panel.ZIndex="1" Width="Auto" Height="Auto"
-                                      KeyboardNavigation.TabIndex="1" RenderTransformOrigin="0.5,0.5">
-                                <TabPanel.LayoutTransform>
-                                    <TransformGroup>
-                                        <ScaleTransform ScaleX="1" ScaleY="1" />
-                                        <SkewTransform AngleX="0" AngleY="0" />
-                                        <RotateTransform Angle="0" />
-                                        <TranslateTransform X="0" Y="0" />
-                                    </TransformGroup>
-                                </TabPanel.LayoutTransform>
-                                <TabPanel.RenderTransform>
-                                    <TransformGroup>
-                                        <ScaleTransform ScaleX="1" ScaleY="1" />
-                                        <SkewTransform AngleX="0" AngleY="0" />
-                                        <RotateTransform />
-                                        <TranslateTransform X="0" Y="0" />
-                                    </TransformGroup>
-                                </TabPanel.RenderTransform>
-                            </TabPanel>
-                        </Border>
-                        <Border x:Name="ContentPanel" Grid.Column="0" Grid.Row="1" BorderBrush="{DynamicResource PopupBorderBrush}" BorderThickness="1,0,1,1" Margin="2,0,2,2"
-                                KeyboardNavigation.DirectionalNavigation="Contained" KeyboardNavigation.TabIndex="2" Padding="5"
-                                KeyboardNavigation.TabNavigation="Local" Background="{DynamicResource NormalBrushDark}" >
-                            <ContentPresenter x:Name="PART_SelectedContentHost" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                              ContentSource="SelectedContent" />
-                        </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="TabStripPlacement" Value="Bottom">
-                            <Setter Property="Grid.Row" TargetName="ContentPanel" Value="0" />
-                            <Setter Property="Height" TargetName="RowDefinition0" Value="*" />
-                            <Setter Property="Height" TargetName="RowDefinition1" Value="Auto" />
-                            <Setter Property="Grid.Row" TargetName="HeaderBorder" Value="1"/>
-                            <Setter Property="BorderThickness" TargetName="HeaderBorder" Value="0,1,0,0"/>
-                            <Setter Property="CornerRadius" TargetName="ContentPanel" Value="0"/>
-                            <Setter Property="CornerRadius" TargetName="HeaderBorder" Value="0"/>
-                        </Trigger>
-                        <Trigger Property="TabStripPlacement" Value="Left">
-                            <Setter Property="Grid.Row" TargetName="HeaderPanel" Value="0" />
-                            <Setter Property="Grid.Row" TargetName="ContentPanel" Value="0" />
-                            <Setter Property="Grid.Column" TargetName="ContentPanel" Value="1" />
-                            <Setter Property="Width" TargetName="ColumnDefinition0" Value="Auto" />
-                            <Setter Property="Width" TargetName="ColumnDefinition1" Value="*" />
-                            <Setter Property="Height" TargetName="RowDefinition0" Value="*" />
-                            <Setter Property="Height" TargetName="RowDefinition1" Value="0" />
-                            <Setter Property="Grid.Column" TargetName="HeaderBorder" Value="0"/>
-                            <Setter Property="BorderThickness" TargetName="HeaderBorder" Value="0,0,1,0"/>
-                            <Setter Property="Margin" TargetName="HeaderBorder" Value="0,0,0,0"/>
-                            <Setter Property="Margin" TargetName="ContentPanel" Value="0,0,0,0"/>
-                            <Setter Property="CornerRadius" TargetName="HeaderBorder" Value="0"/>
-                            <Setter Property="CornerRadius" TargetName="ContentPanel" Value="0"/>
-                        </Trigger>
-                        <Trigger Property="TabStripPlacement" Value="Right">
-                            <Setter Property="Grid.Row" TargetName="HeaderPanel" Value="0" />
-                            <Setter Property="Grid.Row" TargetName="ContentPanel" Value="0" />
-                            <Setter Property="Grid.Column" TargetName="ContentPanel" Value="0" />
-                            <Setter Property="Width" TargetName="ColumnDefinition0" Value="*" />
-                            <Setter Property="Width" TargetName="ColumnDefinition1" Value="Auto" />
-                            <Setter Property="Height" TargetName="RowDefinition0" Value="*" />
-                            <Setter Property="Height" TargetName="RowDefinition1" Value="0" />
-                            <Setter Property="Grid.Column" TargetName="HeaderBorder" Value="1"/>
-                            <Setter Property="BorderThickness" TargetName="HeaderBorder" Value="1,0,0,0"/>
-                            <Setter Property="CornerRadius" TargetName="ContentPanel" Value="0"/>
-                            <Setter Property="CornerRadius" TargetName="HeaderBorder" Value="0"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type TabItem}" BasedOn="{StaticResource BaseStyle}">
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type TabItem}">
-                    <Grid x:Name="TabGrid">
-                        <Border x:Name="SelectedBorder" Visibility="Collapsed" Margin="0,0,0,-5"
-                                SnapsToDevicePixels="True" CornerRadius="{DynamicResource ControlCornerRadius}" Background="{DynamicResource NormalBrushDark}"
-                                BorderThickness="1,1,1,0" BorderBrush="{DynamicResource PopupBorderBrush}">
-                            <Border BorderThickness="0,2,0,0" BorderBrush="{DynamicResource GlyphBrush}" Margin="-1,-1,-1,0" CornerRadius="{DynamicResource ControlCornerRadius}"/>
-                        </Border>
-                        <TextBlock x:Name="TextContent" Padding="5" Style="{DynamicResource BaseTextBlockStyle}"
-                                   Foreground="{TemplateBinding Foreground}">
-                            <ContentPresenter x:Name="ContentSite" RecognizesAccessKey="True" ContentSource="Header"
-                                              HorizontalAlignment="Center" Margin="5" VerticalAlignment="Center" />
-                        </TextBlock>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="TabStripPlacement" Value="Left">
-                            <Setter Property="LayoutTransform" TargetName="TextContent">
-                                <Setter.Value>
-                                    <TransformGroup>
-                                        <RotateTransform Angle="90" />
-                                    </TransformGroup>
-                                </Setter.Value>
-                            </Setter>
-                            <Setter Property="LayoutTransform" TargetName="TabGrid">
-                                <Setter.Value>
-                                    <TransformGroup>
-                                        <RotateTransform Angle="270"/>
-                                    </TransformGroup>
-                                </Setter.Value>
-                            </Setter>
-                        </Trigger>
-                        <Trigger Property="TabStripPlacement" Value="Right">
-                            <Setter Property="LayoutTransform" TargetName="TabGrid">
-                                <Setter.Value>
-                                    <TransformGroup>
-                                        <RotateTransform Angle="0" />
-                                    </TransformGroup>
-                                </Setter.Value>
-                            </Setter>
-                        </Trigger>
-                        <Trigger Property="TabStripPlacement" Value="Bottom">
-                            <Setter Property="LayoutTransform" TargetName="TextContent">
-                                <Setter.Value>
-                                    <TransformGroup>
-                                        <RotateTransform Angle="180" />
-                                    </TransformGroup>
-                                </Setter.Value>
-                            </Setter>
-                            <Setter Property="LayoutTransform" TargetName="TabGrid">
-                                <Setter.Value>
-                                    <TransformGroup>
-                                        <RotateTransform Angle="180"/>
-                                    </TransformGroup>
-                                </Setter.Value>
-                            </Setter>
-                        </Trigger>
-                        <Trigger Property="IsSelected" Value="True">
-                            <Setter Property="Foreground" Value="{DynamicResource TextBrush}" TargetName="TextContent"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Foreground" Value="{DynamicResource TextBrush}" TargetName="TextContent"/>
-                            <Setter Property="Opacity" Value="1" TargetName="TextContent"/>
-                        </Trigger>
-                        <Trigger Property="IsFocused" Value="True">
-                            <Setter Property="Visibility" Value="Visible" TargetName="SelectedBorder" />
-                            <Setter Property="BorderThickness" Value="1,1,1,0" TargetName="SelectedBorder" />
-                            <Setter Property="Opacity" Value="1" TargetName="TextContent"/>
-                        </Trigger>
-                        <Trigger Property="IsSelected" Value="True">
-                            <Setter Property="Visibility" Value="Visible" TargetName="SelectedBorder" />
-                            <Setter Property="Opacity" Value="1" TargetName="TextContent"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Magpie_Desktop_GBV_1_1_0/DefaultControls/Thumb.xaml b/Magpie_Desktop_GBV_1_1_0/DefaultControls/Thumb.xaml
deleted file mode 100644
index 53e4063..0000000
--- a/Magpie_Desktop_GBV_1_1_0/DefaultControls/Thumb.xaml
+++ /dev/null
@@ -1,35 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                    xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                    mc:Ignorable="d">
-
-    <Style TargetType="{x:Type Thumb}">
-        <Setter Property="Width" Value="Auto" />
-        <Setter Property="Height" Value="Auto" />
-        <Setter Property="Background" Value="{DynamicResource TextBrushDarker}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Grid>
-                        <Rectangle x:Name="HoverRectangle" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
-                                   Width="Auto" Height="Auto" RadiusX="{DynamicResource ControlCornerRadiusDouble}" RadiusY="{DynamicResource ControlCornerRadiusDouble}"
-                                   Stroke="{x:Null}" Margin="4.5,1,4.5,1" MinHeight="10"
-                                   Fill="{TemplateBinding Background}" />
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsFocused" Value="True" />
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Fill" Value="{DynamicResource TextBrush}" TargetName="HoverRectangle" />
-                        </Trigger>
-                        <DataTrigger Binding="{Binding IsFocused, RelativeSource={RelativeSource AncestorType=Track}}" Value="True">
-                            <Setter Property="Fill" Value="{DynamicResource TextBrush}" TargetName="HoverRectangle" />
-                        </DataTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Magpie_Desktop_GBV_1_1_0/DerivedStyles/BottomButton.xaml b/Magpie_Desktop_GBV_1_1_0/DerivedStyles/BottomButton.xaml
deleted file mode 100644
index 93f507a..0000000
--- a/Magpie_Desktop_GBV_1_1_0/DerivedStyles/BottomButton.xaml
+++ /dev/null
@@ -1,37 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <Style x:Key="BottomButton" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
-        <Setter Property="Margin" Value="5" />
-        <Setter Property="Padding" Value="15,8,15,8" />
-        <Setter Property="MinWidth" Value="70" />
-        <Setter Property="Background" Value="{DynamicResource ButtonEmphaticBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource GlyphBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ButtonEmphaticBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{DynamicResource ControlBorderThickness}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Button}">
-                    <Border x:Name="Border" Cursor="Hand" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}"
-                            CornerRadius="{DynamicResource ControlCornerRadius}" Style="{DynamicResource HighlightBorder}" BorderBrush="{TemplateBinding BorderBrush}">
-                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" />
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsFocused" Value="True">
-                            <Setter Property="BorderBrush" Value="{DynamicResource GlyphBrush}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
-                <Setter Property="Background" Value="{DynamicResource HoverBrush}"/>
-                <Setter Property="BorderBrush" Value="{DynamicResource HoverBorderBrush}"/>
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Magpie_Desktop_GBV_1_1_0/DerivedStyles/DetailsViewGroupStyle.xaml b/Magpie_Desktop_GBV_1_1_0/DerivedStyles/DetailsViewGroupStyle.xaml
deleted file mode 100644
index 5bc0a6a..0000000
--- a/Magpie_Desktop_GBV_1_1_0/DerivedStyles/DetailsViewGroupStyle.xaml
+++ /dev/null
@@ -1,57 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <Style x:Key="DetailsViewGroupStyle" TargetType="{x:Type GroupItem}">
-        <Setter Property="Foreground" Value="{DynamicResource DetailsViewGroupTextBrush}" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="FontSize" Value="{DynamicResource FontSizeLarge}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type GroupItem}">
-                    <ExpanderEx BorderThickness="0" SaveGameGroupId="{Binding Name, Mode=OneWay}"
-                                IsExpanded="True">
-                        <ExpanderEx.Header>
-                            <Grid HorizontalAlignment="Stretch" Background="Transparent" Margin="0">
-                                <Grid.ContextMenu>
-                                    <GameGroupMenu />
-                                </Grid.ContextMenu>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="*" />
-                                </Grid.ColumnDefinitions>
-                                <TextBlock Grid.Column="0"
-                                    Foreground="{TemplateBinding Foreground}"
-                                    VerticalAlignment="Center" HorizontalAlignment="Left"
-                                    TextAlignment="Center" Margin="0,0,5,0" FontSize="{TemplateBinding FontSize}"
-                                    Typography.Capitals="SmallCaps" TextBlock.FontWeight="SemiBold">
-                                    <TextBlock.Style>
-                                        <Style TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
-                                            <Setter Property="Text" Value="{Binding Name, Converter={StaticResource ObjectToStringConverter}}" />
-                                            <Style.Triggers>
-                                                <DataTrigger Binding="{Binding Name, Converter={StaticResource ObjectToStringConverter}}" Value="{x:Null}">
-                                                    <Setter Property="Text" Value="{DynamicResource LOCNone}" />
-                                                </DataTrigger>
-                                                <DataTrigger Binding="{Binding Name, Converter={StaticResource ObjectToStringConverter}}" Value="">
-                                                    <Setter Property="Text" Value="{DynamicResource LOCNone}" />
-                                                </DataTrigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </TextBlock.Style>
-                                </TextBlock>
-                                <TextBlock Grid.Column="1" Text="{Binding Items.Count, Mode=OneWay, StringFormat=({0})}"
-                                           Foreground="{DynamicResource DetailsViewGroupTextBrush}"
-                                           VerticalAlignment="Center" HorizontalAlignment="Left"
-                                           Style="{DynamicResource BaseTextBlockStyle}"
-                                           DockPanel.Dock="Left" TextAlignment="Center"
-                                           Visibility="{Settings ShowGroupCount}" Margin="0,0,5,0"/>
-                                <Separator Grid.Column="2" Background="{DynamicResource HoverBrush}" VerticalAlignment="Center"/>
-                            </Grid>
-                        </ExpanderEx.Header>
-                        <ItemsPresenter />
-                    </ExpanderEx>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Magpie_Desktop_GBV_1_1_0/DerivedStyles/GridViewGroupStyle.xaml b/Magpie_Desktop_GBV_1_1_0/DerivedStyles/GridViewGroupStyle.xaml
deleted file mode 100644
index eb74464..0000000
--- a/Magpie_Desktop_GBV_1_1_0/DerivedStyles/GridViewGroupStyle.xaml
+++ /dev/null
@@ -1,57 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <Style x:Key="GridViewGroupStyle" TargetType="{x:Type GroupItem}">
-        <Setter Property="Foreground" Value="{DynamicResource DetailsViewGroupTextBrush}" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="FontSize" Value="{DynamicResource FontSizeLarge}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type GroupItem}">
-                    <ExpanderEx BorderThickness="0" SaveGameGroupId="{Binding Name, Mode=OneWay}"
-                                IsExpanded="True" Background="Transparent" Padding="10">
-                        <ExpanderEx.Header>
-                            <Grid HorizontalAlignment="Stretch" Background="Transparent" Margin="0">
-                                <Grid.ContextMenu>
-                                    <GameGroupMenu />
-                                </Grid.ContextMenu>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="*" />
-                                </Grid.ColumnDefinitions>
-                                <TextBlock Grid.Column="0"
-                                    Foreground="{TemplateBinding Foreground}"
-                                    VerticalAlignment="Center" HorizontalAlignment="Left"
-                                    TextAlignment="Center" Margin="0,0,5,0" FontSize="{TemplateBinding FontSize}"
-                                    Typography.Capitals="SmallCaps" TextBlock.FontWeight="SemiBold">
-                                    <TextBlock.Style>
-                                        <Style TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
-                                            <Setter Property="Text" Value="{Binding Name, Converter={StaticResource ObjectToStringConverter}}" />
-                                            <Style.Triggers>
-                                                <DataTrigger Binding="{Binding Name, Converter={StaticResource ObjectToStringConverter}}" Value="{x:Null}">
-                                                    <Setter Property="Text" Value="{DynamicResource LOCNone}" />
-                                                </DataTrigger>
-                                                <DataTrigger Binding="{Binding Name, Converter={StaticResource ObjectToStringConverter}}" Value="">
-                                                    <Setter Property="Text" Value="{DynamicResource LOCNone}" />
-                                                </DataTrigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </TextBlock.Style>
-                                </TextBlock>
-                                <TextBlock Grid.Column="1" Text="{Binding Items.Count, Mode=OneWay, StringFormat=({0})}"
-                                           Foreground="{DynamicResource DetailsViewGroupTextBrush}"
-                                           VerticalAlignment="Center" HorizontalAlignment="Left"
-                                           Style="{DynamicResource BaseTextBlockStyle}"
-                                           DockPanel.Dock="Left" TextAlignment="Center"
-                                           Visibility="{Settings ShowGroupCount}" Margin="0,0,5,0"/>
-                                <Separator Grid.Column="2" Background="{DynamicResource HoverBrush}" VerticalAlignment="Center"/>
-                            </Grid>
-                        </ExpanderEx.Header>
-                        <ItemsPresenter />
-                    </ExpanderEx>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Magpie_Desktop_GBV_1_1_0/DerivedStyles/GridViewItemStyle.xaml b/Magpie_Desktop_GBV_1_1_0/DerivedStyles/GridViewItemStyle.xaml
deleted file mode 100644
index cc996c7..0000000
--- a/Magpie_Desktop_GBV_1_1_0/DerivedStyles/GridViewItemStyle.xaml
+++ /dev/null
@@ -1,107 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <Style x:Key="GridViewItemStyle" TargetType="{x:Type ListBoxItem}">
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="UseLayoutRounding" Value="True" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                    <Grid Background="Transparent"
-                          Margin="{Settings ItemSpacingMargin}"
-                          x:Name="ItemGrid">
-                        <StackPanel Orientation="Vertical">
-                            <Border x:Name="SelectionBorder" Padding="{Settings GridItemMargin}" Tag="{DynamicResource GridFavoriteHighlight}">
-                                <Border.Style>
-                                    <Style TargetType="Border">
-                                        <Setter Property="BorderBrush" Value="{DynamicResource GridItemBackgroundBrush}"/>
-                                        <Setter Property="Background" Value="{DynamicResource GridItemBackgroundBrush}"/>
-                                        <Setter Property="Effect">
-                                            <Setter.Value>
-                                                <DropShadowEffect ShadowDepth="0" Color="Black"
-                                                                  Opacity=".5" BlurRadius="10"/>
-                                            </Setter.Value>
-                                        </Setter>
-                                        <Style.Triggers>
-                                            <MultiDataTrigger>
-                                                <MultiDataTrigger.Conditions>
-                                                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true"/>
-                                                    <Condition Binding="{Binding Favorite}" Value="true"/>
-                                                </MultiDataTrigger.Conditions>
-                                                <Setter Property="BorderBrush" Value="{DynamicResource FavoriteColorBrush}"/>
-                                                <Setter Property="Background" Value="{DynamicResource FavoriteColorBrush}"/>
-                                                <Setter Property="Effect">
-                                                    <Setter.Value>
-                                                        <DropShadowEffect ShadowDepth="0" Color="{DynamicResource FavoriteColor}"
-                                                                  Opacity=".75" BlurRadius="10"/>
-                                                    </Setter.Value>
-                                                </Setter>
-                                            </MultiDataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </Border.Style>
-                                <ContentPresenter>
-                                    <ContentPresenter.OpacityMask>
-                                        <DrawingBrush x:Name="CoverMask" RenderOptions.CachingHint="Cache">
-                                            <DrawingBrush.Drawing>
-                                                <GeometryDrawing Brush="White">
-                                                    <GeometryDrawing.Geometry>
-                                                        <RectangleGeometry 
-                                                         Rect="0,0,2,3"
-                                                         RadiusX="0.05"
-                                                         RadiusY="0.05" />
-                                                    </GeometryDrawing.Geometry>
-                                                </GeometryDrawing>
-                                            </DrawingBrush.Drawing>
-                                        </DrawingBrush>
-                                    </ContentPresenter.OpacityMask>
-                                </ContentPresenter>
-                                <Border.OpacityMask>
-                                    <DrawingBrush RenderOptions.CachingHint="Cache">
-                                        <DrawingBrush.Drawing>
-                                            <GeometryDrawing Brush="White">
-                                                <GeometryDrawing.Geometry>
-                                                    <RectangleGeometry 
-                                                         Rect="0,0,2,3"
-                                                         RadiusX="0.05"
-                                                         RadiusY="0.05" />
-                                                </GeometryDrawing.Geometry>
-                                            </GeometryDrawing>
-                                        </DrawingBrush.Drawing>
-                                    </DrawingBrush>
-                                </Border.OpacityMask>
-                            </Border>
-                            <Border MaxHeight="60">
-                                <TextBlock Text="{Binding DisplayName}"
-                                   Style="{DynamicResource BaseTextBlockStyle}"                                                                   
-                                   TextAlignment="Center" TextWrapping="Wrap"
-                                   TextTrimming="WordEllipsis"
-                                   VerticalAlignment="Center"
-                                   Padding="2,5,2,5" FontSize="{DynamicResource FontSizeLarge}"
-                                   Width="{Settings GridItemWidth}" 
-                                   Typography.Capitals="SmallCaps"
-                                   Visibility="{Settings ShowNamesUnderCovers}"/>
-                            </Border>
-                        </StackPanel>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Settings ShowGridItemBackground}" Value="False">
-                            <Setter Property="Background" Value="Transparent" TargetName="SelectionBorder" />
-                            <Setter Property="BorderBrush" Value="Transparent" TargetName="SelectionBorder" />
-                        </DataTrigger>
-                        <Trigger Property="IsSelected" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource TextBrushDarker}" TargetName="SelectionBorder" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource TextBrushDarker}" TargetName="SelectionBorder"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="BorderBrush" Value="{DynamicResource GlyphBrush}" TargetName="SelectionBorder"/>
-                            <Setter Property="Background" Value="{DynamicResource GlyphBrush}" TargetName="SelectionBorder" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Magpie_Desktop_GBV_1_1_0/DerivedStyles/GridViewItemTemplate.xaml b/Magpie_Desktop_GBV_1_1_0/DerivedStyles/GridViewItemTemplate.xaml
deleted file mode 100644
index ff335e9..0000000
--- a/Magpie_Desktop_GBV_1_1_0/DerivedStyles/GridViewItemTemplate.xaml
+++ /dev/null
@@ -1,77 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-                    mc:Ignorable="d">
-
-    <Style x:Key="GridViewItemTemplate" TargetType="{x:Type GameListItem}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type GameListItem}">
-                    <Border>
-                        <StackPanel Name="PART_PanelHost"
-                                    d:DataContext="{x:Static DesignMainViewModel.DesignSelectedGameIntance}">
-                            <Grid Width="{Settings GridItemWidth}"
-                                    Height="{Settings GridItemHeight}">
-                                <Image Name="PART_ImageCover" RenderOptions.BitmapScalingMode="Fant"
-                                       StretchDirection="Both" HorizontalAlignment="Center" VerticalAlignment="Center"
-                                       Stretch="{Settings CoverArtStretch}"/>
-                                <Border Background="#99000000" x:Name="TextGameName"
-                                        Visibility="Collapsed">
-                                    <TextBlock Text="{Binding DisplayName}"
-                                           TextWrapping="Wrap" Margin="5"
-                                           Style="{StaticResource BaseTextBlockStyle}"
-                                           TextTrimming="CharacterEllipsis" TextAlignment="Center"
-                                           HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                </Border>
-                                <Border Background="{DynamicResource CoverHighlightBrush}"
-                                        x:Name="BorderMouseOver" Visibility="Collapsed"/>
-                                <Border Background="#AA000000" x:Name="BorderUninstalled" Visibility="Collapsed"/>
-                                <Border Name="GameControls"  Visibility="Collapsed" VerticalAlignment="Bottom"
-                                        HorizontalAlignment="Center" Margin="5" CornerRadius="5">
-                                    <Border.Background>
-                                        <SolidColorBrush Color="{DynamicResource PopupBackgroundColor}" Opacity="0.7"/>
-                                    </Border.Background>
-                                    <Viewbox MaxHeight="50" MinHeight="20">
-                                        <StackPanel Orientation="Horizontal" Cursor="Hand" Margin="0,0,0,1">
-                                                <Button Name="PART_ButtonPlay" Style="{DynamicResource GlyphButton}"
-                                                    Margin="4,0,4,0" Content="&#x25B6;"
-                                                    FontFamily="{DynamicResource SymbolFont}" />
-                                                <Button Name="PART_ButtonInfo" Style="{DynamicResource GlyphButton}"
-                                                    Margin="4,0,4,0" Content="&#x1F6C8;"
-                                                    FontFamily="{DynamicResource SymbolFont}"/>
-                                        </StackPanel>
-                                    </Viewbox>
-                                </Border>
-                            </Grid>
-                        </StackPanel>
-
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding IsInstalled}" Value="False">
-                            <Setter Property="Content" Value="&#xE118;" TargetName="PART_ButtonPlay" />
-                        </DataTrigger>
-                        <MultiDataTrigger>
-                            <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding IsInstalled}" Value="False" />
-                                <Condition Binding="{Settings DarkenUninstalledGamesGrid}" Value="True" />
-                            </MultiDataTrigger.Conditions>
-                            <Setter Property="Visibility" Value="Visible" TargetName="BorderUninstalled" />
-                        </MultiDataTrigger>
-                        <MultiDataTrigger>
-                            <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding CoverImage}" Value="{x:Null}" />
-                                <Condition Binding="{Settings ShowNameEmptyCover}" Value="True" />
-                            </MultiDataTrigger.Conditions>
-                            <Setter Property="Visibility" Value="Visible" TargetName="TextGameName"/>
-                        </MultiDataTrigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Visibility" Value="Visible" TargetName="BorderMouseOver"/>
-                            <Setter Property="Visibility" Value="Visible" TargetName="GameControls"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Magpie_Desktop_GBV_1_1_0/DerivedStyles/MainWindowStyle.xaml b/Magpie_Desktop_GBV_1_1_0/DerivedStyles/MainWindowStyle.xaml
deleted file mode 100644
index e7a49c0..0000000
--- a/Magpie_Desktop_GBV_1_1_0/DerivedStyles/MainWindowStyle.xaml
+++ /dev/null
@@ -1,61 +0,0 @@
-<ResourceDictionary 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">
-
-    <Style x:Key="MainWindowStyle" TargetType="WindowBase">
-        <Setter Property="Background" Value="{DynamicResource WindowBackgroundBrush}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="TextOptions.TextFormattingMode" Value="Ideal" />
-        <Setter Property="TextOptions.TextRenderingMode" Value="Auto" />
-        <Setter Property="UseLayoutRounding" Value="True"/>
-        <Setter Property="WindowChrome.WindowChrome">
-            <Setter.Value>
-                <WindowChrome CaptionHeight="25" CornerRadius="0" ResizeBorderThickness="4"
-                              NonClientFrameEdges ="None" UseAeroCaptionButtons="False" GlassFrameThickness="0"/>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type WindowBase}">
-                    <ControlTemplate.Resources>
-                        <sys:Boolean x:Key="True">True</sys:Boolean>
-                    </ControlTemplate.Resources>
-                    <AdornerDecorator>
-                        <Border x:Name="WindowBorder" BorderBrush="{DynamicResource PopupBorderBrush}" CornerRadius="0"
-                                BorderThickness="1"
-                                Background="{TemplateBinding Background}">
-                            <Grid>
-                                <ContentPresenter Margin="0,0,0,0"/>
-                                <DockPanel DockPanel.Dock="Top" LastChildFill="False">
-                                    <DockPanel DockPanel.Dock="Top" LastChildFill="False">
-                                        <TextBlock Text="{TemplateBinding Title}" DockPanel.Dock="Left" Margin="10,3,0,0" VerticalAlignment="Center"
-                                                   Opacity="0.75" Style="{DynamicResource BaseTextBlockStyle}" x:Name="PART_TextTitle" />
-                                        <StackPanel DockPanel.Dock="Right" Orientation="Horizontal" Margin="0,3,5,0">
-                                            <Button Style="{DynamicResource WindowBarButton}" Content="0" x:Name="PART_ButtonMinimize"/>
-                                            <Button Style="{DynamicResource WindowBarButton}" Content="1" x:Name="PART_ButtonMaximize" />
-                                            <Button Style="{DynamicResource WindowBarButton}" Content="r" x:Name="PART_ButtonClose"/>
-                                        </StackPanel>
-                                    </DockPanel>
-                                </DockPanel>
-                                <Border BorderBrush="{DynamicResource PopupBorderBrush}"
-                                        BorderThickness="{TemplateBinding BorderThickness}"
-                                        CornerRadius="0" Margin="-1"
-                                        IsHitTestVisible="False" Visibility="Visible"/>
-                            </Grid>
-                        </Border>
-                    </AdornerDecorator>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="WindowState" Value="Maximized">
-                            <Setter Property="Content" Value="2" TargetName="PART_ButtonMaximize"/>
-                            <Setter Property="Padding" Value="8" TargetName="WindowBorder"/>
-                        </Trigger>
-                        <DataTrigger Binding="{Binding HasChildWindow, Mode=OneWay, RelativeSource={RelativeSource Self}, TargetNullValue=False}" Value="True">
-                            <Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}" TargetName="WindowBorder"/>
-                            <Setter Property="Opacity" Value="0.4" />
-                        </DataTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Magpie_Desktop_GBV_1_1_0/DerivedStyles/PlayButton.xaml b/Magpie_Desktop_GBV_1_1_0/DerivedStyles/PlayButton.xaml
deleted file mode 100644
index 3198698..0000000
--- a/Magpie_Desktop_GBV_1_1_0/DerivedStyles/PlayButton.xaml
+++ /dev/null
@@ -1,39 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <Style x:Key="PlayButton" TargetType="{x:Type Button}" BasedOn="{StaticResource BaseStyle}">
-        <Setter Property="Background" Value="{DynamicResource PlayButtonBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource PlayBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{DynamicResource ControlBorderThickness}" />
-        <Setter Property="Padding" Value="10,5,10,5" />
-        <Setter Property="VerticalAlignment" Value="Stretch"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Button}">
-                    <Grid x:Name="Grid">
-                        <Border x:Name="DefaultBorder" Cursor="Hand" BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"  Background="{TemplateBinding Background}"
-                                Opacity="1" CornerRadius="{DynamicResource ControlCornerRadius}"/>
-                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True"
-                                          Content="&#xE102;" TextBlock.FontFamily="{DynamicResource SymbolFont}" />
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsEnabled" Value="True" />
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Background" Value="{DynamicResource DisabledBackgroundBrush}" TargetName="DefaultBorder" />
-                            <Setter Property="Opacity" TargetName="Grid" Value="0.5" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <Trigger Property="IsMouseOver" Value="true">
-                <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
-                <Setter Property="Background" Value="{DynamicResource PlayButtonHighlightBrush}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource PlayBorderHighlightBrush}" />
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Magpie_Desktop_GBV_1_1_0/DerivedStyles/Simplebutton.xaml b/Magpie_Desktop_GBV_1_1_0/DerivedStyles/Simplebutton.xaml
deleted file mode 100644
index 2591150..0000000
--- a/Magpie_Desktop_GBV_1_1_0/DerivedStyles/Simplebutton.xaml
+++ /dev/null
@@ -1,30 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Style x:Key="SimpleButton" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
-        <Setter Property="FontSize" Value="{DynamicResource FontSize}" />
-        <Setter Property="Margin" Value="0,3,0,3" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Button">
-                    <TextBlock FontSize="{TemplateBinding FontSize}"
-                               Foreground="{TemplateBinding Foreground}"
-                               Text="{TemplateBinding Content}"
-                               TextWrapping="Wrap"/>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Foreground" Value="{DynamicResource GlyphBrush}" />
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Foreground" Value="{DynamicResource TextBrushDarker}" />
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-    <Style x:Key="GlyphButton" TargetType="Button" BasedOn="{StaticResource SimpleButton}">
-        <Setter Property="TextOptions.TextRenderingMode" Value="Aliased"/>
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Magpie_Desktop_GBV_1_1_0/DerivedStyles/StandardWindowStyle.xaml b/Magpie_Desktop_GBV_1_1_0/DerivedStyles/StandardWindowStyle.xaml
deleted file mode 100644
index ec3803b..0000000
--- a/Magpie_Desktop_GBV_1_1_0/DerivedStyles/StandardWindowStyle.xaml
+++ /dev/null
@@ -1,61 +0,0 @@
-<ResourceDictionary 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">
-
-    <Style x:Key="WindowDesignStyle" TargetType="WindowBase">
-        <Setter Property="TextOptions.TextFormattingMode" Value="Ideal" />
-        <Setter Property="TextOptions.TextRenderingMode" Value="Auto" />
-    </Style>
-
-    <Style x:Key="StandardWindowStyle" TargetType="WindowBase">
-        <Setter Property="Background" Value="{DynamicResource WindowBackgroundBrush}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="TextOptions.TextFormattingMode" Value="Ideal" />
-        <Setter Property="TextOptions.TextRenderingMode" Value="Auto" />
-        <Setter Property="WindowChrome.WindowChrome">
-            <Setter.Value>
-                <WindowChrome CaptionHeight="25" CornerRadius="0" ResizeBorderThickness="4"
-                              NonClientFrameEdges ="None" UseAeroCaptionButtons="False" GlassFrameThickness="0"/>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type WindowBase}">
-                    <ControlTemplate.Resources>
-                        <sys:Boolean x:Key="True">True</sys:Boolean>
-                    </ControlTemplate.Resources>
-                    <AdornerDecorator>
-                        <Border x:Name="WindowBorder" BorderBrush="{DynamicResource PopupBorderBrush}" CornerRadius="0"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Background="{TemplateBinding Background}">
-                            <Grid>
-                                <ContentPresenter Margin="0,25,0,0"/>
-                                <DockPanel DockPanel.Dock="Top" LastChildFill="False">
-                                    <DockPanel DockPanel.Dock="Top" LastChildFill="False">
-                                        <TextBlock Text="{TemplateBinding Title}" DockPanel.Dock="Left" Margin="10,3,0,0" VerticalAlignment="Center"
-                                                   Opacity="0.75" Style="{DynamicResource BaseTextBlockStyle}" x:Name="PART_TextTitle" />
-                                        <StackPanel DockPanel.Dock="Right" Orientation="Horizontal" Margin="0,3,5,0">
-                                            <Button Style="{DynamicResource WindowBarButton}" Content="0" x:Name="PART_ButtonMinimize"/>
-                                            <Button Style="{DynamicResource WindowBarButton}" Content="1" x:Name="PART_ButtonMaximize" />
-                                            <Button Style="{DynamicResource WindowBarButton}" Content="r" x:Name="PART_ButtonClose"/>
-                                        </StackPanel>
-                                    </DockPanel>
-                                </DockPanel>
-                            </Grid>
-                        </Border>
-                    </AdornerDecorator>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="WindowState" Value="Maximized">
-                            <Setter Property="Content" Value="2" TargetName="PART_ButtonMaximize"/>
-                            <Setter Property="Padding" Value="8" TargetName="WindowBorder"/>
-                        </Trigger>
-                        <DataTrigger Binding="{Binding HasChildWindow, Mode=OneWay, RelativeSource={RelativeSource Self}, TargetNullValue=False}" Value="True">
-                            <Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}" TargetName="WindowBorder"/>
-                            <Setter Property="Opacity" Value="0.4" />
-                        </DataTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Magpie_Desktop_GBV_1_1_0/Views/DetailsViewGameOverview.xaml b/Magpie_Desktop_GBV_1_1_0/Views/DetailsViewGameOverview.xaml
deleted file mode 100644
index 55d0ddf..0000000
--- a/Magpie_Desktop_GBV_1_1_0/Views/DetailsViewGameOverview.xaml
+++ /dev/null
@@ -1,954 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-                    mc:Ignorable="d">
-
-    <Style x:Key="GlyphLabel" TargetType="Label" BasedOn="{StaticResource {x:Type Label}}">
-        <Setter Property="FontFamily" Value="{DynamicResource SymbolFont}"/>
-        <Setter Property="TextOptions.TextRenderingMode" Value="Aliased"/>
-    </Style>
-
-    <Style x:Key="ContextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource BaseStyle}">
-        <Setter Property="Background" Value="{DynamicResource PlayButtonBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
-        <Setter Property="FontWeight" Value="SemiBold"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource PlayBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{DynamicResource ControlBorderThickness}" />
-        <Setter Property="Padding" Value="10,5,10,5" />
-        <Setter Property="VerticalAlignment" Value="Stretch"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Button}">
-                    <Grid x:Name="Grid">
-                        <Border x:Name="DefaultBorder" Cursor="Hand" BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"  Background="{TemplateBinding Background}"
-                                Opacity="1" CornerRadius="{DynamicResource ControlCornerRadius}"/>
-                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" />
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsEnabled" Value="True" />
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Background" Value="{DynamicResource DisabledBackgroundBrush}" TargetName="DefaultBorder" />
-                            <Setter Property="Opacity" TargetName="Grid" Value="0.5" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <Trigger Property="IsMouseOver" Value="true">
-                <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
-                <Setter Property="Background" Value="{DynamicResource ContextButtonBrush}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ContextBorderBrush}" />
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
-    <Style x:Key="ExtraMetadataLogoPath" TargetType="TextBlock">
-        <Setter Property="Text">
-            <Setter.Value>
-                <MultiBinding StringFormat="{}{0}{1}{2}{3}">
-                    <Binding RelativeSource="{RelativeSource Self}" Path="Tag" />
-                    <Binding Source="\ExtraMetadata\games\"/>
-                    <Binding Path="Game.Id"/>
-                    <Binding Source="\logo.png" />
-                </MultiBinding>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="ExtraMetadataLogoLeftPath" TargetType="TextBlock">
-        <Setter Property="Text">
-            <Setter.Value>
-                <MultiBinding StringFormat="{}{0}{1}{2}{3}">
-                    <Binding RelativeSource="{RelativeSource Self}" Path="Tag" />
-                    <Binding Source="\ExtraMetadata\games\"/>
-                    <Binding Path="Game.Id"/>
-                    <Binding Source="\logo-l.png" />
-                </MultiBinding>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="ExtraMetadataLogoRightPath" TargetType="TextBlock">
-        <Setter Property="Text">
-            <Setter.Value>
-                <MultiBinding StringFormat="{}{0}{1}{2}{3}">
-                    <Binding RelativeSource="{RelativeSource Self}" Path="Tag" />
-                    <Binding Source="\ExtraMetadata\games\"/>
-                    <Binding Path="Game.Id"/>
-                    <Binding Source="\logo-r.png" />
-                </MultiBinding>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="ExtraMetadataHeaderPath" TargetType="TextBlock">
-        <Setter Property="Text">
-            <Setter.Value>
-                <MultiBinding StringFormat="{}{0}{1}{2}{3}">
-                    <Binding RelativeSource="{RelativeSource Self}" Path="Tag" />
-                    <Binding Source="\ExtraMetadata\games\"/>
-                    <Binding Path="Game.Id"/>
-                    <Binding Source="\header.jpg" />
-                </MultiBinding>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type DetailsViewGameOverview}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type DetailsViewGameOverview}">
-                    <Grid d:DesignWidth="1520" d:DesignHeight="1080"
-                        d:DataContext="{x:Static DesignMainViewModel.DesignSelectedGameDetailsIntance}"
-                          HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="0">
-
-                        <TextBlock Name="LogoPath" Style="{DynamicResource ExtraMetadataLogoPath}"
-                                   Visibility="Collapsed" Tag="{DynamicResource ExtraMetadataPath}"/>
-                        <TextBlock Name="LogoLeftPath" Style="{DynamicResource ExtraMetadataLogoLeftPath}"
-                                   Visibility="Collapsed" Tag="{DynamicResource ExtraMetadataPath}"/>
-                        <TextBlock Name="LogoRightPath" Style="{DynamicResource ExtraMetadataLogoRightPath}"
-                                   Visibility="Collapsed" Tag="{DynamicResource ExtraMetadataPath}"/>
-                        <TextBlock Name="HeaderPath" Style="{DynamicResource ExtraMetadataHeaderPath}" 
-                                   Visibility="Collapsed"  Tag="{DynamicResource ExtraMetadataPath}"/>
-
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Tag="{Settings CalculatedGameDetailsIndentation}">
-                                    <RowDefinition.Style>
-                                        <Style TargetType="RowDefinition">
-                                            <Setter Property="MaxHeight" Value="{Binding RelativeSource={RelativeSource Self}, Path=Tag}"/>
-                                            <Setter Property="MinHeight" Value="{Binding RelativeSource={RelativeSource Self}, Path=Tag}"/>
-                                            <Style.Triggers>
-                                                <DataTrigger Binding="{Settings IndentGameDetails}" Value="false">
-                                                    <Setter Property="MaxHeight" Value="0"/>
-                                                </DataTrigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </RowDefinition.Style>
-                                </RowDefinition>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="*"/>
-                            </Grid.RowDefinitions>
-                            <FadeImage x:Name="PART_ImageBackground" Tag="{DynamicResource BGModeOn}"
-                                       Grid.Row="0" HorizontalAlignment="Center" RenderOptions.BitmapScalingMode="Fant">
-                                <FadeImage.Resources>
-                                    <Style TargetType="Image">
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Settings IndentGameDetails}" Value="false">
-                                                <Setter Property="Visibility" Value="Collapsed"/>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </FadeImage.Resources>
-                                <FadeImage.Style>
-                                    <Style TargetType="FadeImage">
-                                        <Setter Property="Grid.RowSpan" Value="2"/>
-                                        <Setter Property="Stretch" Value="UniformToFill"/>
-                                        <Setter Property="VerticalAlignment" Value="Stretch"/>
-                                        <Setter Property="OpacityMask">
-                                            <Setter.Value>
-                                                <LinearGradientBrush StartPoint="0,0.9" EndPoint="0,1">
-                                                    <GradientStop Offset="0" Color="{DynamicResource PopupBackgroundColor}"/>
-                                                    <GradientStop Offset="1" Color="{DynamicResource PopupBackgroundTransparent}" />
-                                                </LinearGradientBrush>
-                                            </Setter.Value>
-                                        </Setter>
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true">
-                                                <Setter Property="Grid.RowSpan" Value="3"/>
-                                                <Setter Property="Stretch" Value="Uniform"/>
-                                                <Setter Property="VerticalAlignment" Value="Top"/>
-                                                <Setter Property="ImageOpacityMask">
-                                                    <Setter.Value>
-                                                        <RadialGradientBrush GradientOrigin="0.5,0" Center="0.5,0" RadiusX="2" RadiusY="0.9">
-                                                            <RadialGradientBrush.GradientStops>
-                                                                <GradientStop Color="Black" Offset="0.3" />
-                                                                <GradientStop Color="Transparent" Offset="1" />
-                                                            </RadialGradientBrush.GradientStops>
-                                                        </RadialGradientBrush>
-                                                    </Setter.Value>
-                                                </Setter>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </FadeImage.Style>
-                            </FadeImage>
-
-                            <Grid Grid.Column="1"  Grid.Row="0" Margin="0" Name="TitleGrid"
-                                  Width="{Binding ElementName=DetailsPanel, Path=ActualWidth}"
-                                  VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-                                <Grid.Style>
-                                    <Style TargetType="Grid">
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Settings IndentGameDetails}" Value="false">
-                                                <Setter Property="Visibility" Value="Collapsed"/>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </Grid.Style>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="1*" />
-                                    <ColumnDefinition Width="1*" />
-                                    <ColumnDefinition Width="1*" />
-                                    <ColumnDefinition Width="1*" />
-                                </Grid.ColumnDefinitions>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="1*" />
-                                    <RowDefinition Height="4*" />
-                                    <RowDefinition Height="1*" />
-                                </Grid.RowDefinitions>
-                                <FadeImage HorizontalAlignment="Center" VerticalAlignment="Center" Name="FadeLogoImage" AnimationEnabled="{Settings BackgroundImageAnimation}"
-                                                           RenderOptions.BitmapScalingMode="Fant" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2" Stretch="Uniform"
-                                                           Tag="{DynamicResource UseAbsoluteExtraMetadataPath}">
-                                    <FadeImage.Style>
-                                        <Style TargetType="FadeImage">
-                                            <Style.Triggers>
-                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true">
-                                                    <Setter Property="Source" Value="{Binding ElementName=LogoPath, Path=Text}"/>
-                                                </DataTrigger>
-                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="false">
-                                                    <Setter Property="Source" Value="{x:Null}"/>
-                                                </DataTrigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </FadeImage.Style>
-                                </FadeImage>
-                                <FadeImage HorizontalAlignment="Left" VerticalAlignment="Center" Name="FadeLogoImageLeft" AnimationEnabled="{Settings BackgroundImageAnimation}"
-                                                           RenderOptions.BitmapScalingMode="Fant" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" Stretch="Uniform"
-                                                           Margin="50,0,-50,0" Tag="{DynamicResource UseAbsoluteExtraMetadataPath}">
-                                    <FadeImage.Style>
-                                        <Style TargetType="FadeImage">
-                                            <Style.Triggers>
-                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true">
-                                                    <Setter Property="Source" Value="{Binding ElementName=LogoLeftPath, Path=Text}"/>
-                                                </DataTrigger>
-                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="false">
-                                                    <Setter Property="Source" Value="{x:Null}"/>
-                                                </DataTrigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </FadeImage.Style>
-                                </FadeImage>
-                                <FadeImage HorizontalAlignment="Right" VerticalAlignment="Center" Name="FadeLogoImageRight" AnimationEnabled="{Settings BackgroundImageAnimation}"
-                                                           RenderOptions.BitmapScalingMode="Fant" Grid.Column="2" Grid.Row="1" Grid.ColumnSpan="2" Stretch="Uniform"
-                                                           Margin="-50,0,50,0" Tag="{DynamicResource UseAbsoluteExtraMetadataPath}">
-                                    <FadeImage.Style>
-                                        <Style TargetType="FadeImage">
-                                            <Style.Triggers>
-                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true">
-                                                    <Setter Property="Source" Value="{Binding ElementName=LogoRightPath, Path=Text}"/>
-                                                </DataTrigger>
-                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="false">
-                                                    <Setter Property="Source" Value="{x:Null}"/>
-                                                </DataTrigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </FadeImage.Style>
-                                </FadeImage>
-                                <Image HorizontalAlignment="Center" VerticalAlignment="Center" Name="LogoImage"
-                                                           RenderOptions.BitmapScalingMode="Fant" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2"
-                                                           Tag="{DynamicResource UseAbsoluteExtraMetadataPath}">
-                                    <Image.Style>
-                                        <Style TargetType="Image">
-                                            <Style.Triggers>
-                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="false">
-                                                    <Setter Property="Source" Value="{Binding ElementName=LogoPath, Path=Text}"/>
-                                                </DataTrigger>
-                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true">
-                                                    <Setter Property="Source" Value="{x:Null}"/>
-                                                </DataTrigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </Image.Style>
-                                </Image>
-                                <Image HorizontalAlignment="Left" VerticalAlignment="Center" Name="LogoImageLeft"
-                                                           RenderOptions.BitmapScalingMode="Fant" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2"
-                                                           Margin="50,0,-50,0" Tag="{DynamicResource UseAbsoluteExtraMetadataPath}">
-                                    <Image.Style>
-                                        <Style TargetType="Image">
-                                            <Style.Triggers>
-                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="false">
-                                                    <Setter Property="Source" Value="{Binding ElementName=LogoLeftPath, Path=Text}"/>
-                                                </DataTrigger>
-                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true">
-                                                    <Setter Property="Source" Value="{x:Null}"/>
-                                                </DataTrigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </Image.Style>
-                                </Image>
-                                <Image HorizontalAlignment="Right" VerticalAlignment="Center" Name="LogoImageRight"
-                                                           RenderOptions.BitmapScalingMode="Fant" Grid.Column="2" Grid.Row="1" Grid.ColumnSpan="2"
-                                                           Margin="-50,0,50,0" Tag="{DynamicResource UseAbsoluteExtraMetadataPath}">
-                                    <Image.Style>
-                                        <Style TargetType="Image">
-                                            <Style.Triggers>
-                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="false">
-                                                    <Setter Property="Source" Value="{Binding ElementName=LogoRightPath, Path=Text}"/>
-                                                </DataTrigger>
-                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true">
-                                                    <Setter Property="Source" Value="{x:Null}"/>
-                                                </DataTrigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </Image.Style>
-                                </Image>
-                                <TextBlock Text="{Binding Game.DisplayName}" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2"
-                                               FontSize="{DynamicResource FontSizeLargest}" Tag="{DynamicResource UseAbsoluteExtraMetadataPath}"
-                                               TextWrapping="Wrap" VerticalAlignment="Center" Foreground="{DynamicResource TextBrush}"
-                                               TextOptions.TextRenderingMode="Aliased" TextOptions.TextFormattingMode="Ideal"
-                                               TextAlignment="Center" Typography.Capitals="SmallCaps">
-                                    <TextBlock.Effect>
-                                        <DropShadowEffect ShadowDepth="0" Color="{DynamicResource PopupBackgroundColor}"
-                                                              Opacity="1" BlurRadius="5"/>
-                                    </TextBlock.Effect>
-                                    <TextBlock.Style>
-                                        <Style TargetType="TextBlock">
-                                            <Setter Property="Visibility" Value="Collapsed"/>
-                                            <Style.Triggers>
-                                                <MultiDataTrigger>
-                                                    <MultiDataTrigger.Conditions>
-                                                        <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="True"/>
-                                                        <Condition Binding="{Binding ElementName=FadeLogoImage, Path=ActualHeight}" Value="0" />
-                                                        <Condition Binding="{Binding ElementName=FadeLogoImageLeft, Path=ActualHeight}" Value="0" />
-                                                        <Condition Binding="{Binding ElementName=FadeLogoImageRight, Path=ActualHeight}" Value="0" />
-                                                    </MultiDataTrigger.Conditions>
-                                                    <Setter Property="Visibility" Value="{DynamicResource TitleTextVisibility}"/>
-                                                </MultiDataTrigger>
-                                                <MultiDataTrigger>
-                                                    <MultiDataTrigger.Conditions>
-                                                        <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="False"/>
-                                                        <Condition Binding="{Binding ElementName=LogoImage, Path=Source}" Value="{x:Null}" />
-                                                        <Condition Binding="{Binding ElementName=LogoImageLeft, Path=Source}" Value="{x:Null}" />
-                                                        <Condition Binding="{Binding ElementName=LogoImageRight, Path=Source}" Value="{x:Null}" />
-                                                    </MultiDataTrigger.Conditions>
-                                                    <Setter Property="Visibility" Value="{DynamicResource TitleTextVisibility}"/>
-                                                </MultiDataTrigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </TextBlock.Style>
-                                </TextBlock>
-                            </Grid>
-
-                            <Grid Grid.Row="1" Grid.RowSpan="2" Tag="{DynamicResource BGModeOn}">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto"/>
-                                    <RowDefinition Height="*"/>
-                                </Grid.RowDefinitions>
-                                <Grid.Style>
-                                    <Style TargetType="Grid">
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true">
-                                                <Setter Property="HorizontalAlignment" Value="Center"/>
-                                                <Setter Property="Width" Value="{DynamicResource DetailsViewPanelWidth}"/>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </Grid.Style>
-                                <Border Grid.Row="0" VerticalAlignment="Top" Tag="{DynamicResource BGModeOn}"
-                                    Height="{Binding ElementName=ControlButtons, Path=ActualHeight}" HorizontalAlignment="Stretch"
-                                    BorderBrush="{DynamicResource PanelSeparatorBrush}" Background="{DynamicResource PanelBackgroundBrush}">
-                                    <Border.Style>
-                                        <Style TargetType="Border">
-                                            <Setter Property="BorderThickness" Value="0,1,0,1"/>
-                                            <Setter Property="Margin" Value="0"/>
-                                            <Setter Property="Grid.Column" Value="0"/>
-                                            <Setter Property="Grid.ColumnSpan" Value="3"/>
-                                            <Style.Triggers>
-                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true">
-                                                    <Setter Property="BorderThickness" Value="1"/>
-                                                    <Setter Property="Margin" Value="-1,0,-1,0"/>
-                                                    <Setter Property="Grid.Column" Value="1"/>
-                                                    <Setter Property="Grid.ColumnSpan" Value="1"/>
-                                                </DataTrigger>
-                                                <DataTrigger Binding="{Settings ShowPanelSeparators}" Value="False">
-                                                    <Setter Property="BorderThickness" Value="0"/>
-                                                </DataTrigger>
-                                                <MultiDataTrigger>
-                                                    <MultiDataTrigger.Conditions>
-                                                        <Condition Binding="{Settings ShowPanelSeparators}" Value="false"/>
-                                                        <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true"/>
-                                                    </MultiDataTrigger.Conditions>
-                                                    <Setter Property="Margin" Value="0"/>
-                                                </MultiDataTrigger>
-                                                <MultiDataTrigger>
-                                                    <MultiDataTrigger.Conditions>
-                                                        <Condition Binding="{Settings IndentGameDetails}" Value="false"/>
-                                                        <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="false"/>
-                                                    </MultiDataTrigger.Conditions>
-                                                    <Setter Property="BorderThickness" Value="0,0,0,1"/>
-                                                </MultiDataTrigger>
-                                                <MultiDataTrigger>
-                                                    <MultiDataTrigger.Conditions>
-                                                        <Condition Binding="{Settings IndentGameDetails}" Value="false"/>
-                                                        <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true"/>
-                                                    </MultiDataTrigger.Conditions>
-                                                    <Setter Property="BorderThickness" Value="1,0,1,1"/>
-                                                </MultiDataTrigger>
-                                                <MultiDataTrigger>
-                                                    <MultiDataTrigger.Conditions>
-                                                        <Condition Binding="{Settings ShowPanelSeparators}" Value="False"/>
-                                                        <Condition Binding="{Settings IndentGameDetails}" Value="false"/>
-                                                    </MultiDataTrigger.Conditions>
-                                                    <Setter Property="BorderThickness" Value="0"/>
-                                                </MultiDataTrigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </Border.Style>
-                                </Border>
-
-                                <Border Grid.Row="1" Tag="{DynamicResource BGModeOn}"
-                                VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
-                                BorderBrush="{DynamicResource PanelSeparatorBrush}"
-                                Background="{DynamicResource PanelBackgroundBrush}">
-                                    <Border.Style>
-                                        <Style TargetType="Border">
-                                            <Setter Property="BorderThickness" Value="1,0,1,0"/>
-                                            <Setter Property="Margin" Value="-1,0,-1,0"/>
-                                            <Setter Property="Grid.Column" Value="0"/>
-                                            <Setter Property="Grid.ColumnSpan" Value="3"/>
-                                            <Style.Triggers>
-                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true">
-                                                    <Setter Property="Grid.Column" Value="1"/>
-                                                    <Setter Property="Grid.ColumnSpan" Value="1"/>
-                                                </DataTrigger>
-                                                <DataTrigger Binding="{Settings ShowPanelSeparators}" Value="false">
-                                                    <Setter Property="BorderThickness" Value="0"/>
-                                                    <Setter Property="Margin" Value="0"/>
-                                                </DataTrigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </Border.Style>
-                                </Border>
-                            </Grid>
-
-                            <Grid Name="ControlsBar" Grid.Column="1" Grid.Row="1" MaxWidth="{Binding ElementName=DetailsPanel, Path=ActualWidth}"
-                                  HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Background="Transparent">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="*"/>
-                                    <ColumnDefinition Width="Auto"/>
-                                </Grid.ColumnDefinitions>
-                                <Grid.Resources>
-                                    <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
-                                        <Setter Property="FontSize" Value="{DynamicResource FontSizeLarger}"/>
-                                        <Setter Property="TextOptions.TextRenderingMode" Value="Aliased"/>
-                                        <Setter Property="Margin" Value="1,0,0,0" />
-                                        <Setter Property="MinWidth" Value="40" />
-                                        <Setter Property="MinHeight" Value="40" />
-                                        <Setter Property="Background" Value="Transparent" />
-                                        <Setter Property="BorderBrush" Value="Transparent" />
-                                        <Setter Property="Foreground" Value="{DynamicResource GlyphBrush}" />
-                                        <Style.Triggers>
-                                            <Trigger Property="IsMouseOver" Value="True">
-                                                <Setter Property="Background" Value="{DynamicResource DetailsButtonBrush}" />
-                                            </Trigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </Grid.Resources>
-                                <StackPanel Grid.Column="1" Orientation="Horizontal" Grid.ColumnSpan="1"
-                                           MaxWidth="{Binding ElementName=DetailsMiddle, Path=ActualWidth}" VerticalAlignment="Center" HorizontalAlignment="Center">
-                                    <StackPanel.Resources>
-                                        <Style TargetType="StackPanel">
-                                            <Setter Property="HorizontalAlignment" Value="Center" />
-                                            <Setter Property="Orientation" Value="Horizontal"/>
-                                        </Style>
-                                        <Style TargetType="Label" BasedOn="{StaticResource {x:Type Label}}">
-                                            <Setter Property="Foreground" Value="{DynamicResource TextBrushDarker}"/>
-                                            <Setter Property="FontSize" Value="{DynamicResource FontSizeLarger}"/>
-                                            <Setter Property="FontFamily" Value="{DynamicResource SymbolFont}"/>
-                                            <Setter Property="VerticalAlignment" Value="Center"/>
-                                            <Setter Property="Margin" Value="20,0,5,0" />
-                                            <Setter Property="TextOptions.TextRenderingMode" Value="Aliased"/>
-                                        </Style>
-                                        <Style TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
-                                            <Setter Property="VerticalAlignment" Value="Center"/>
-                                            <Setter Property="Margin" Value="0,0,20,0"/>
-                                            <Setter Property="MinWidth" Value="75"/>
-                                        </Style>
-                                        <Style TargetType="Button" BasedOn="{StaticResource SimpleButton}" >
-                                            <Setter Property="VerticalAlignment" Value="Center"/>
-                                            <Setter Property="Margin" Value="0,0,20,0"/>
-                                            <Setter Property="MinWidth" Value="75"/>
-                                        </Style>
-                                    </StackPanel.Resources>
-                                    <StackPanel ToolTip="{DynamicResource LOCTimePlayed}">
-                                        <Label Name="PART_ElemPlayTime" Content="&#x23F3;"/>
-                                        <TextBlock Name="PART_TextPlayTime"/>
-                                    </StackPanel>
-                                    <StackPanel Tag="{DynamicResource Htlb_EnableIntegrationInCustomTheme}">
-                                        <StackPanel Orientation="Horizontal" Tag="{DynamicResource Htlb_HasData}" ToolTip="{DynamicResource LOCHowLongToBeat}">
-                                            <Label Content="&#x23F1;"/>
-                                            <TextBlock Text="{DynamicResource Htlb_TimeToBeatFormat}"/>
-                                            <StackPanel.Style>
-                                                <Style>
-                                                    <Setter Property="Control.Visibility" Value="Collapsed"/>
-                                                    <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true">
-                                                            <Setter Property="Control.Visibility" Value="Visible"/>
-                                                        </DataTrigger>
-                                                    </Style.Triggers>
-                                                </Style>
-                                            </StackPanel.Style>
-                                        </StackPanel>
-                                        <StackPanel.Style>
-                                            <Style>
-                                                <Setter Property="Control.Visibility" Value="Collapsed"/>
-                                                <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true">
-                                                        <Setter Property="Control.Visibility" Value="Visible"/>
-                                                    </DataTrigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </StackPanel.Style>
-                                    </StackPanel>
-                                    <StackPanel ToolTip="{DynamicResource LOCLastPlayed}">
-                                        <Label Name="PART_ElemLastPlayed" Content="&#xE163;"/>
-                                        <TextBlock Name="PART_TextLastActivity"/>
-                                    </StackPanel>
-                                    <StackPanel Orientation="Horizontal" Tag="{DynamicResource Sc_HasData}"
-                                                ToolTip="{DynamicResource LOCCommonLinksAchievements}">
-                                        <StackPanel.Style>
-                                            <Style>
-                                                <Setter Property="Control.Visibility" Value="Collapsed"/>
-                                                <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true">
-                                                        <Setter Property="Control.Visibility" Value="Visible"/>
-                                                    </DataTrigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </StackPanel.Style>
-                                        <Label Content="&#x1F396;" Tag="{DynamicResource Sc_PercentageUnlocked}">
-                                            <Label.Style>
-                                                <Style TargetType="Label" BasedOn="{StaticResource {x:Type Label}}">
-                                                    <Setter Property="Foreground" Value="{DynamicResource TextBrushDarker}"/>
-                                                    <Setter Property="FontSize" Value="{DynamicResource FontSizeLarger}"/>
-                                                    <Setter Property="FontFamily" Value="{DynamicResource SymbolFont}"/>
-                                                    <Setter Property="VerticalAlignment" Value="Center"/>
-                                                    <Setter Property="Margin" Value="20,0,5,0" />
-                                                    <Setter Property="TextOptions.TextRenderingMode" Value="Aliased"/>
-                                                    <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="100">
-                                                            <Setter Property="Foreground" Value="Gold"/>
-                                                            <Setter Property="Effect">
-                                                                <Setter.Value>
-                                                                    <DropShadowEffect ShadowDepth="0" Color="Gold"
-                                                                                  Opacity=".5" BlurRadius="10"/>
-                                                                </Setter.Value>
-                                                            </Setter>
-                                                        </DataTrigger>
-                                                    </Style.Triggers>
-                                                </Style>
-                                            </Label.Style>
-                                        </Label>
-                                        <TextBlock Tag="{DynamicResource Sc_PercentageUnlocked}">
-                                            <Run Text="{DynamicResource Sc_UnlockedString}"/>
-                                            <Run Text=" / "/>
-                                            <Run Text="{DynamicResource Sc_TotalString}"/>
-                                            <TextBlock.Style>
-                                                <Style TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
-                                                    <Setter Property="VerticalAlignment" Value="Center"/>
-                                                    <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="100">
-                                                            <Setter Property="Foreground" Value="Gold"/>
-                                                            <Setter Property="Effect">
-                                                                <Setter.Value>
-                                                                    <DropShadowEffect ShadowDepth="0" Color="Gold"
-                                                                                  Opacity=".5" BlurRadius="5"/>
-                                                                </Setter.Value>
-                                                            </Setter>
-                                                        </DataTrigger>
-                                                    </Style.Triggers>
-                                                </Style>
-                                            </TextBlock.Style>
-                                        </TextBlock>
-                                    </StackPanel>
-                                    <StackPanel ToolTip="{DynamicResource LOCCompletionStatus}">
-                                        <Label Name="PART_ElemCompletionStatus" Content="&#xE10B;"/>
-                                        <Button Name="PART_ButtonCompletionStatus"/>
-                                    </StackPanel>
-                                </StackPanel>
-
-                                <StackPanel x:Name="ControlButtons" Grid.Column="0" Margin="20,0,0,0" Orientation="Horizontal">
-                                    <Button Name="PART_ButtonPlayAction" Width="{Binding ElementName=PART_ImageCover, Path=ActualWidth}"
-                                            MinWidth="80" FontSize="{DynamicResource FontSizeLarger}" Style="{DynamicResource PlayButton}" />
-                                    <Button Name="PART_ButtonContextAction" Width="{Binding ElementName=PART_ImageCover, Path=ActualWidth}"
-                                            MinWidth="80" Style="{DynamicResource ContextButton}" FontSize="{DynamicResource FontSizeLarger}"/>
-                                    <Button Name="PART_ButtonMoreActions"
-                                                Content="&#xE10C;" FontFamily="{DynamicResource SymbolFont}"/>
-                                </StackPanel>
-
-                                <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,20,0">
-                                    <StackPanel Orientation="Horizontal">
-                                        <Grid Tag="{DynamicResource Htlb_EnableIntegrationInCustomTheme}">
-                                            <Button Name="PART_HltbCustomButton" Content="&#x23F1;" ToolTip="{DynamicResource LOCHowLongToBeat}"
-                                                    FontFamily="{DynamicResource SymbolFont}"/>
-                                            <Grid.Style>
-                                                <Style TargetType="Grid">
-                                                    <Setter Property="Visibility" Value="Collapsed" />
-                                                    <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}"  Value="True">
-                                                            <Setter Property="Visibility" Value="Visible" />
-                                                        </DataTrigger>
-                                                    </Style.Triggers>
-                                                </Style>
-                                            </Grid.Style>
-                                        </Grid>
-
-                                        <Grid Tag="{DynamicResource Sc_EnableIntegrationInCustomTheme}">
-                                            <Button Name="PART_ScCustomButton" Content="&#x1F396;" ToolTip="SuccessStory"
-                                                    FontFamily="{DynamicResource SymbolFont}" />
-                                            <Grid.Style>
-                                                <Style TargetType="Grid">
-                                                    <Setter Property="Visibility" Value="Collapsed" />
-                                                    <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="True">
-                                                            <Setter Property="Visibility" Value="Visible" />
-                                                        </DataTrigger>
-                                                    </Style.Triggers>
-                                                </Style>
-                                            </Grid.Style>
-                                        </Grid>
-
-                                        <Button x:Name="PART_ButtonEditGame" Margin="0" ToolTip="{DynamicResource LOCEditGame}"
-                                                FontFamily="{DynamicResource SymbolFont}" Content="&#xE104;"/>
-                                        <StackPanel.Style>
-                                            <Style TargetType="StackPanel">
-                                                <Setter Property="Visibility" Value="Hidden" />
-                                                <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding IsMouseOver, RelativeSource={RelativeSource AncestorType=Grid}}"  Value="True">
-                                                        <Setter Property="Visibility" Value="Visible" />
-                                                    </DataTrigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </StackPanel.Style>
-                                    </StackPanel>
-                                    <Label Content="&#xef25;" FontFamily="{DynamicResource FontIcoFont}" Foreground="{DynamicResource FavoriteColorBrush}" Margin="20,0,20,0"
-                                           Visibility="{Binding Game.Favorite, Converter={StaticResource BooleanToVisibilityConverter}}" FontSize="{DynamicResource FontSizeLarger}">
-                                        <Label.Effect>
-                                            <DropShadowEffect ShadowDepth="0" Color="{DynamicResource FavoriteColor}"
-                                                              Opacity="1" BlurRadius="5"/>
-                                        </Label.Effect>
-                                    </Label>
-                                </StackPanel>
-                            </Grid>
-
-                            <ScrollViewer Name="DetailsPanel" Grid.Column="1" Grid.Row="2"
-                                          MaxWidth="{DynamicResource DetailsViewPanelWidth}"
-                                          HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-                                <ScrollViewer.Resources>
-                                    <Style TargetType="ScrollBar" BasedOn="{StaticResource {x:Type ScrollBar}}">
-                                        <Setter Property="Margin" Value="0,20,0,0"/>
-                                    </Style>
-                                </ScrollViewer.Resources>
-                                <ScrollViewer.OpacityMask>
-                                    <LinearGradientBrush StartPoint="0,0" EndPoint="0,20" MappingMode="Absolute">
-                                        <LinearGradientBrush.GradientStops>
-                                            <GradientStop Offset="0" Color="Transparent"/>
-                                            <GradientStop Offset="1" Color="White"/>
-                                        </LinearGradientBrush.GradientStops>
-                                    </LinearGradientBrush>
-                                </ScrollViewer.OpacityMask>
-                                <DockPanel Margin="20" HorizontalAlignment="Stretch">
-                                    <StackPanel Name="DetailsRightPanel" Orientation="Vertical"
-                                                    DockPanel.Dock="Right" Margin="20,20,00,0">
-
-                                        <GridEx HorizontalAlignment="Left" Margin="0"
-                                                ColumnCount="2" RowCount="12" AutoLayoutColumns="2">
-                                            <GridEx.Resources>
-                                                <Style TargetType="ItemsControl">
-                                                    <Setter Property="VerticalAlignment" Value="Center" />
-                                                    <Setter Property="Margin" Value="10,0,0,10" />
-                                                </Style>
-                                                <Style TargetType="Label" BasedOn="{StaticResource {x:Type Label}}">
-                                                    <Setter Property="HorizontalAlignment" Value="Center"/>
-                                                    <Setter Property="HorizontalContentAlignment" Value="Center"/>
-                                                    <Setter Property="VerticalAlignment" Value="Center"/>
-                                                    <Setter Property="Margin" Value="0,0,10,10" />
-                                                    <Setter Property="Foreground" Value="{DynamicResource TextBrushDarker}"/>
-                                                    <Setter Property="FontSize" Value="{DynamicResource FontSizeLarger}" />
-                                                    <Setter Property="FontFamily" Value="{DynamicResource SymbolFont}"/>
-                                                </Style>
-                                                <Style TargetType="Border">
-                                                    <Setter Property="BorderBrush" Value="{DynamicResource HoverBorderBrush}"/>
-                                                    <Setter Property="BorderThickness" Value="0,0,1,0"/>
-                                                    <Setter Property="Margin" Value="-1,5,0,5"/>
-                                                </Style>
-                                                <Style TargetType="Button" BasedOn="{StaticResource PropertyItemButton}" >
-                                                    <Setter Property="Margin" Value="10,0,0,10" />
-                                                    <Setter Property="VerticalAlignment" Value="Center"/>
-                                                </Style>
-                                                <Style TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}" >
-                                                    <Setter Property="Margin" Value="10,0,0,10" />
-                                                    <Setter Property="VerticalAlignment" Value="Center"/>
-                                                </Style>
-                                            </GridEx.Resources>
-
-                                            <Label Name="PART_ElemPlatform" Content="&#xEA32;" FontFamily="{DynamicResource FontIcoFont}"
-                                                   ToolTip="{DynamicResource LOCPlatformTitle}"/>
-                                            <ItemsControl Name="PART_ItemsPlatforms" />
-
-                                            <Label Name="PART_ElemReleaseDate" Content="&#x1F382;" ToolTip="{DynamicResource LOCGameReleaseDateTitle}"/>
-                                            <Button Name="PART_ButtonReleaseDate"/>
-
-                                            <Label Name="PART_ElemSeries" Content="&#xE158;" ToolTip="{DynamicResource LOCSeriesLabel}"/>
-                                            <ItemsControl Name="PART_ItemsSeries" />
-
-                                            <Label Name="PART_ElemDevelopers" Content="&#xE144;" ToolTip="{DynamicResource LOCDeveloperLabel}"/>
-                                            <ItemsControl Name="PART_ItemsDevelopers" />
-
-                                            <Label Name="PART_ElemPublishers" Content="&#x1F454;" ToolTip="{DynamicResource LOCPublisherLabel}"/>
-                                            <ItemsControl Name="PART_ItemsPublishers" />
-
-                                            <Label Name="PART_ElemAgeRating" Content="&#x26D4;" ToolTip="{DynamicResource LOCAgeRatingLabel}"/>
-                                            <ItemsControl Name="PART_ItemsAgeRatings" />
-
-                                            <Label Name="PART_ElemRegion" Content="&#xE128;" ToolTip="{DynamicResource LOCRegionLabel}"/>
-                                            <ItemsControl Name="PART_ItemsRegions" />
-
-                                            <Label Name="PART_ElemCommunityScore" Content="&#xE125;" ToolTip="{DynamicResource LOCCommunityScore}"/>
-                                            <TextBlock Name="PART_TextCommunityScore" VerticalAlignment="Center"
-                                                        Style="{DynamicResource TextBlockGameScore}" Margin="10,0,0,10"/>
-
-                                            <Label Name="PART_ElemCriticScore" Content="&#xE136;" ToolTip="{DynamicResource LOCCriticScore}"/>
-                                            <TextBlock Name="PART_TextCriticScore" VerticalAlignment="Center"
-                                                        Style="{DynamicResource TextBlockGameScore}" Margin="10,0,0,10"/>
-
-                                            <Border>
-                                                <Label Name="PART_ElemGenres" Content="&#x1F3AD;" ToolTip="{DynamicResource LOCGenreLabel}"/>
-                                            </Border>
-                                            <ItemsControl Name="PART_ItemsGenres"/>
-
-                                            <Border>
-                                                <Label Name="PART_ElemTags" Content="&#xE1CB;" ToolTip="{DynamicResource LOCTagsLabel}"/>
-                                            </Border>
-                                            <ItemsControl Name="PART_ItemsTags"/>
-
-                                            <Border>
-                                                <Label Name="PART_ElemFeatures" Content="&#xE133;" ToolTip="{DynamicResource LOCFeaturesLabel}"/>
-                                            </Border>
-                                            <ItemsControl Name="PART_ItemsFeatures"/>
-                                        </GridEx>
-                                    </StackPanel>
-
-                                    <StackPanel Name="DetailsLeftPanel" DockPanel.Dock="Left" Margin="0,20,20,0" MinWidth="{Binding ElementName=PART_ImageCover, Path=ActualWidth}">
-                                        <Border>
-                                            <Image Name="PART_ImageCover" VerticalAlignment="Center" HorizontalAlignment="Left"
-                                               Height="{Settings GameDetailsCoverHeight}" RenderOptions.BitmapScalingMode="Fant"
-                                               StretchDirection="Both" Stretch="Uniform" Margin="0,0,0,10">
-                                                <Image.OpacityMask>
-                                                    <DrawingBrush>
-                                                        <DrawingBrush.Drawing>
-                                                            <GeometryDrawing Brush="White">
-                                                                <GeometryDrawing.Geometry>
-                                                                    <RectangleGeometry RadiusX="0.05" RadiusY="0.05">
-                                                                        <RectangleGeometry.Rect>
-                                                                            <Rect X="0" Y="0" Width="2" Height="3"/>
-                                                                        </RectangleGeometry.Rect>
-                                                                    </RectangleGeometry>
-                                                                </GeometryDrawing.Geometry>
-                                                            </GeometryDrawing>
-                                                        </DrawingBrush.Drawing>
-                                                    </DrawingBrush>
-                                                </Image.OpacityMask>
-                                            </Image>
-                                            <Border.Effect>
-                                                <DropShadowEffect ShadowDepth="0" Color="Black"
-                                                                  Opacity=".5" BlurRadius="10"/>
-                                            </Border.Effect>
-                                        </Border>
-                                        <GridEx ColumnCount="2" RowCount="6" AutoLayoutColumns="2" HorizontalAlignment="Center">
-                                            <Grid.Resources>
-                                                <Style TargetType="Label" BasedOn="{StaticResource {x:Type Label}}">
-                                                    <Setter Property="HorizontalAlignment" Value="Center" />
-                                                    <Setter Property="VerticalAlignment" Value="Center"/>
-                                                    <Setter Property="Margin" Value="0,0,10,10" />
-                                                    <Setter Property="Foreground" Value="{DynamicResource TextBrushDarker}"/>
-                                                    <Setter Property="FontSize" Value="{DynamicResource FontSizeLarger}" />
-                                                    <Setter Property="FontFamily" Value="{DynamicResource SymbolFont}"/>
-                                                </Style>
-                                                <Style TargetType="Border">
-                                                    <Setter Property="BorderBrush" Value="{DynamicResource HoverBorderBrush}"/>
-                                                    <Setter Property="BorderThickness" Value="0,0,1,0"/>
-                                                    <Setter Property="Margin" Value="-1,5,0,5"/>
-                                                </Style>
-                                                <Style TargetType="ItemsControl">
-                                                    <Setter Property="VerticalAlignment" Value="Center" />
-                                                    <Setter Property="Margin" Value="10,0,0,10"/>
-                                                </Style>
-                                                <Style TargetType="Button" BasedOn="{StaticResource PropertyItemButton}" >
-                                                    <Setter Property="VerticalAlignment" Value="Center"/>
-                                                    <Setter Property="Margin" Value="10,0,0,10"/>
-                                                </Style>
-                                                <Style TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}" >
-                                                    <Setter Property="VerticalAlignment" Value="Center"/>
-                                                </Style>
-                                            </Grid.Resources>
-                                            <Label Name="PART_ElemLibrary" Content="&#xEF65;" FontFamily="{DynamicResource FontIcoFont}"
-                                                   ToolTip="{DynamicResource LOCGameProviderTitle}"/>
-                                            <Button Name="PART_ButtonLibrary"/>
-
-                                            <Label Name="PART_ElemSource" Content="&#xE14D;" ToolTip="{DynamicResource LOCSourceLabel}"/>
-                                            <Button Name="PART_ButtonSource"/>
-
-                                            <Label Name="PART_ElemVersion" Content="&#xE15E;" ToolTip="{DynamicResource LOCVersionLabel}"/>
-                                            <Button Name="PART_ButtonVersion"/>
-
-                                            <Label Name="PART_ElemUserScore" Content="&#xE13D;" ToolTip="{DynamicResource LOCUserScore}"/>
-                                            <TextBlock Name="PART_TextUserScore" Style="{DynamicResource TextBlockGameScore}"
-                                                       VerticalAlignment="Center" Margin="10,0,0,10"/>
-
-                                            <Label Name="PART_ElemCategories" Content="&#xE188;" ToolTip="{DynamicResource LOCGameCategoriesTitle}"/>
-                                            <ItemsControl Name="PART_ItemsCategories"/>
-
-                                            <Border>
-                                                <Label Name="PART_ElemLinks" Content="&#xEF71;" FontFamily="{DynamicResource FontIcoFont}"
-                                                       ToolTip="{DynamicResource LOCLinksLabel}"/>
-                                            </Border>
-                                            <ItemsControl Name="PART_ItemsLinks"/>
-                                        </GridEx>
-                                    </StackPanel>
-
-                                    <StackPanel Margin="0" DockPanel.Dock="Top" Name="DetailsMiddle">
-                                        <StackPanel.Resources>
-                                            <Style TargetType="ScrollBar" BasedOn="{StaticResource {x:Type ScrollBar}}">
-                                                <Setter Property="Margin" Value="0"/>
-                                            </Style>
-                                        </StackPanel.Resources>
-                                        <StackPanel Margin="0" >
-                                            <StackPanel Margin="0" Tag="{DynamicResource Sc_EnableIntegrationInCustomTheme}">
-                                                <StackPanel.Style>
-                                                    <Style TargetType="StackPanel">
-                                                        <Setter Property="Visibility" Value="Collapsed" />
-                                                        <Style.Triggers>
-                                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="True">
-                                                                <Setter Property="Visibility" Value="Visible" />
-                                                            </DataTrigger>
-                                                        </Style.Triggers>
-                                                    </Style>
-                                                </StackPanel.Style>
-                                                <StackPanel Margin="0,0,0,20" Tag="{DynamicResource Sc_HasData}">
-                                                    <StackPanel.Style>
-                                                        <Style>
-                                                            <Setter Property="Control.Visibility" Value="Visible" />
-                                                            <Style.Triggers>
-                                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="{x:Null}">
-                                                                    <Setter Property="Control.Visibility" Value="Collapsed" />
-                                                                </DataTrigger>
-                                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="False">
-                                                                    <Setter Property="Control.Visibility" Value="Collapsed" />
-                                                                </DataTrigger>
-                                                            </Style.Triggers>
-                                                        </Style>
-                                                    </StackPanel.Style>
-                                                    <StackPanel.Resources>
-                                                        <Style TargetType="StackPanel">
-                                                            <Setter Property="MaxWidth" Value="720"/>
-                                                        </Style>
-                                                    </StackPanel.Resources>
-                                                    <Grid HorizontalAlignment="Stretch" Margin="0,0,0,20" >
-                                                        <Grid.ColumnDefinitions>
-                                                            <ColumnDefinition Width="*"/>
-                                                            <ColumnDefinition Width="Auto"/>
-                                                            <ColumnDefinition Width="*"/>
-                                                        </Grid.ColumnDefinitions>
-                                                        <Separator Margin="0" Background="{DynamicResource HoverBrush}" Grid.Column="0"/>
-                                                        <TextBlock Text="{DynamicResource LOCCommonLinksAchievements}" Margin="10,0,10,0"
-                                                                       Grid.Column="1" Foreground="{DynamicResource TextBrush}"
-                                                                       FontSize="{DynamicResource FontSizeLarger}" FontFamily="{DynamicResource FontFamily}"
-                                                                       Typography.Capitals="SmallCaps" FontWeight="SemiBold" />
-                                                        <Separator Margin="0" Background="{DynamicResource HoverBrush}" Grid.Column="2"/>
-                                                    </Grid>
-                                                    <StackPanel Name="PART_Achievements_Graphics"/>
-
-                                                    <StackPanel Name="PART_Achievements_ProgressBar"/>
-
-                                                    <StackPanel Name="PART_Achievements_ListComptact"/>
-
-                                                    <StackPanel Name="PART_Achievements_ListCompactUnlocked"/>
-
-                                                    <StackPanel Name="PART_Achievements_ListCompactLocked"/>
-
-                                                    <StackPanel Orientation="Horizontal">
-                                                        <StackPanel Name="PART_Achievements_List"/>
-
-                                                        <StackPanel Name="PART_ScUserStats"/>
-                                                    </StackPanel>
-                                                </StackPanel>
-                                            </StackPanel>
-                                            <StackPanel Name="PART_ElemDescription" Margin="0,0,0,20">
-                                                <Grid HorizontalAlignment="Stretch" Margin="0,0,0,20" >
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="*"/>
-                                                        <ColumnDefinition Width="Auto"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Separator Margin="0" Background="{DynamicResource HoverBrush}" Grid.Column="0"/>
-                                                    <StackPanel Grid.Column="1" Orientation="Horizontal" Margin="0">
-                                                        <Image Name="PART_ImageIcon" Height="32" Width="32" SnapsToDevicePixels="True"
-                                                               Margin="10,0,0,0" HorizontalAlignment="Center" VerticalAlignment="Center"
-                                                               StretchDirection="DownOnly" RenderOptions.BitmapScalingMode="Fant"/>
-                                                        <TextBlock Foreground="{DynamicResource TextBrush}" Tag="{DynamicResource LOCGameDescriptionTitle}"
-                                                                   FontSize="{DynamicResource FontSizeLarger}" FontFamily="{DynamicResource FontFamily}"
-                                                                   Typography.Capitals="SmallCaps" Visibility="Visible" FontWeight="SemiBold"
-                                                                   VerticalAlignment="Center" Margin="10,0,10,0">
-                                                            <TextBlock.Style>
-                                                                <Style TargetType="TextBlock">
-                                                                    <Setter Property="Text" Value="{DynamicResource LOCGameDescriptionTitle}"/>
-                                                                    <Style.Triggers>
-                                                                        <Trigger Property="Tag" Value="Description">
-                                                                            <Setter Property="Text" Value="About the Game"/>
-                                                                        </Trigger>
-                                                                    </Style.Triggers>
-                                                                </Style>
-                                                            </TextBlock.Style>
-                                                        </TextBlock>
-                                                    </StackPanel>
-                                                    <Separator Margin="0" Background="{DynamicResource HoverBrush}" Grid.Column="2"/>
-                                                </Grid>
-                                                <HtmlTextView Margin="20,0,20,0" x:Name="PART_HtmlDescription"
-                                                              HtmlFontSize="{DynamicResource FontSize}"
-                                                              HtmlFontFamily="{DynamicResource FontFamily}"
-                                                              HtmlForeground="{DynamicResource TextColor}"
-                                                              LinkForeground="{DynamicResource GlyphColor}"                                      
-                                                              ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                                                              ScrollViewer.VerticalScrollBarVisibility="Disabled" />
-                                            </StackPanel>
-                                            <StackPanel Name="PART_ElemNotes" Margin="0,0,0,20">
-                                                <Grid HorizontalAlignment="Stretch" Margin="0,0,0,20" >
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="*"/>
-                                                        <ColumnDefinition Width="Auto"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Separator Margin="0" Background="{DynamicResource HoverBrush}" Grid.Column="0"/>
-                                                    <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1"
-                                                       Text="{DynamicResource LOCNotesLabel}" Margin="10,0,10,0" Foreground="{DynamicResource TextBrush}"
-                                                       FontSize="{DynamicResource FontSizeLarger}" FontFamily="{DynamicResource FontFamily}"
-                                                       Typography.Capitals="SmallCaps" Visibility="Visible" FontWeight="SemiBold" />
-                                                    <Separator Margin="0" Background="{DynamicResource HoverBrush}" Grid.Column="2"/>
-                                                </Grid>
-                                                <TextBox Name="PART_TextNotes" IsReadOnly="True"
-                                                     BorderThickness="0" Background="Transparent"
-                                                     AcceptsReturn="True" TextWrapping="Wrap"
-                                                     Margin="-1,5,-1,5" Padding="0"/>
-                                            </StackPanel>
-                                        </StackPanel>
-                                    </StackPanel>
-                                </DockPanel>
-                            </ScrollViewer>
-                        </Grid>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <Trigger Property="DataContext" Value="{x:Null}">
-                <Setter Property="Visibility" Value="Collapsed" />
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Magpie_Desktop_GBV_1_1_0/Views/ExplorerPanel.xaml b/Magpie_Desktop_GBV_1_1_0/Views/ExplorerPanel.xaml
deleted file mode 100644
index b48fec3..0000000
--- a/Magpie_Desktop_GBV_1_1_0/Views/ExplorerPanel.xaml
+++ /dev/null
@@ -1,41 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-                    mc:Ignorable="d">
-
-    <Style TargetType="{x:Type ExplorerPanel}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ExplorerPanel}">
-                    <Border BorderBrush="{DynamicResource PanelSeparatorBrush}"
-                            d:DesignWidth="200"
-                            d:DesignHeight="400">
-                        <Border.Style>
-                            <Style TargetType="Border">
-                                <Setter Property="BorderThickness" Value="1,0,0,0" />
-                                <Style.Triggers>
-                                    <DataTrigger Binding="{Settings ExplorerPanelPosition}" Value="Left">
-                                        <Setter Property="BorderThickness" Value="0,0,1,0" />
-                                    </DataTrigger>
-                                    <DataTrigger Binding="{Settings ShowPanelSeparators}" Value="False">
-                                        <Setter Property="BorderThickness" Value="0" />
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </Border.Style>
-                        <DockPanel Background="{DynamicResource PanelBackgroundBrush}">
-                            <ComboBox Name="PART_SelectFields"
-                                  DockPanel.Dock="Top" Margin="5,8,5,8" />
-                            <ListBox Name="PART_SelectItems"
-                                 DockPanel.Dock="Top" Margin="5,0,5,8"                                      
-                                 BorderThickness="0"
-                                 ScrollViewer.HorizontalScrollBarVisibility="Disabled">
-                            </ListBox>
-                        </DockPanel>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Magpie_Desktop_GBV_1_1_0/Views/GridViewGameOverview.xaml b/Magpie_Desktop_GBV_1_1_0/Views/GridViewGameOverview.xaml
deleted file mode 100644
index 26847ab..0000000
--- a/Magpie_Desktop_GBV_1_1_0/Views/GridViewGameOverview.xaml
+++ /dev/null
@@ -1,690 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-                    mc:Ignorable="d">
-
-    <Style TargetType="{x:Type GridViewGameOverview}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type GridViewGameOverview}">
-                    <Border Background="Transparent" Padding="0" BorderBrush="{DynamicResource PanelSeparatorBrush}"
-                            d:DataContext="{x:Static DesignMainViewModel.DesignSelectedGameDetailsIntance}"
-                            d:DesignWidth="1920" d:DesignHeight="640">
-                        <Border.Style>
-                            <Style TargetType="Border">
-                                <Setter Property="BorderThickness" Value="0,0,0,0" />
-                                <Style.Triggers>
-                                    <DataTrigger Binding="{Settings GridViewDetailsPosition}" Value="Left">
-                                        <Setter Property="BorderThickness" Value="0,0,0,0" />
-                                    </DataTrigger>
-                                    <DataTrigger Binding="{Settings ShowPanelSeparators}" Value="False">
-                                        <Setter Property="BorderThickness" Value="0" />
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </Border.Style>
-
-                        <Grid>
-                            <TextBlock Text="{DynamicResource LOCErrorNoGameSelected}" 
-                                   Margin="0,20,0,0" DockPanel.Dock="Top"
-                                   HorizontalAlignment="Center" VerticalAlignment="Center">
-                                <TextBlock.Style>
-                                    <Style TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
-                                        <Setter Property="Visibility" Value="Collapsed" />
-                                        <Style.Triggers>
-                                            <Trigger Property="DataContext" Value="{x:Null}">
-                                                <Setter Property="Visibility" Value="Visible" />
-                                            </Trigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </TextBlock.Style>
-                            </TextBlock>
-
-                            <TextBlock Name="LogoPath" Style="{DynamicResource ExtraMetadataLogoPath}"
-                                   Visibility="Collapsed" Tag="{DynamicResource ExtraMetadataPath}"/>
-                            <TextBlock Name="LogoLeftPath" Style="{DynamicResource ExtraMetadataLogoLeftPath}"
-                                   Visibility="Collapsed" Tag="{DynamicResource ExtraMetadataPath}"/>
-                            <TextBlock Name="LogoRightPath" Style="{DynamicResource ExtraMetadataLogoRightPath}"
-                                   Visibility="Collapsed" Tag="{DynamicResource ExtraMetadataPath}"/>
-                            <TextBlock Name="HeaderPath" Style="{DynamicResource ExtraMetadataHeaderPath}" 
-                                   Visibility="Collapsed"  Tag="{DynamicResource ExtraMetadataPath}"/>
-
-                            <Grid Margin="0">
-                                <Grid.Style>
-                                    <Style TargetType="Grid">
-                                        <Style.Triggers>
-                                            <Trigger Property="DataContext" Value="{x:Null}">
-                                                <Setter Property="Visibility" Value="Collapsed" />
-                                            </Trigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </Grid.Style>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="*"/>
-                                    <RowDefinition Height="Auto"/>
-                                </Grid.RowDefinitions>
-                                <FadeImage x:Name="PART_ImageBackground" Stretch="UniformToFill" Grid.Row="0" Grid.RowSpan="2"
-                                           VerticalAlignment="Top" HorizontalAlignment="Center" RenderOptions.BitmapScalingMode="Fant">
-                                    <FadeImage.OpacityMask>
-                                        <LinearGradientBrush StartPoint="0,1" EndPoint="0,0.9">
-                                            <GradientStop Offset="0" Color="{DynamicResource PopupBackgroundTransparent}"/>
-                                            <GradientStop Offset="1" Color="{DynamicResource PopupBackgroundColor}"/>
-                                        </LinearGradientBrush>
-                                    </FadeImage.OpacityMask>
-                                </FadeImage>
-
-                                <TextBlock Text="{DynamicResource LOCErrorNoGameSelected}" 
-                                   Margin="0,20,0,0" Grid.Row="0"
-                                   HorizontalAlignment="Center" VerticalAlignment="Center">
-                                    <TextBlock.Style>
-                                        <Style TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
-                                            <Setter Property="Visibility" Value="Collapsed" />
-                                            <Style.Triggers>
-                                                <Trigger Property="DataContext" Value="{x:Null}">
-                                                    <Setter Property="Visibility" Value="Visible" />
-                                                </Trigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </TextBlock.Style>
-                                </TextBlock>
-
-                                <ScrollViewer HorizontalAlignment="Stretch" Grid.Row="0" Grid.RowSpan="2"
-                                              HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden">
-                                    <ScrollViewer.OpacityMask>
-                                        <LinearGradientBrush StartPoint="0,1" EndPoint="0,0.9">
-                                            <GradientStop Offset="0" Color="{DynamicResource PopupBackgroundTransparent}"/>
-                                            <GradientStop Offset="1" Color="{DynamicResource PopupBackgroundColor}"/>
-                                        </LinearGradientBrush>
-                                    </ScrollViewer.OpacityMask>
-                                    <StackPanel Orientation="Vertical">
-                                        <StackPanel.Resources>
-                                            <Style TargetType="ScrollBar" BasedOn="{StaticResource {x:Type ScrollBar}}">
-                                                <Setter Property="Margin" Value="0"/>
-                                            </Style>
-                                        </StackPanel.Resources>
-
-                                        <Grid Height="{Settings GrdiDetailsWitdh}" MaxWidth="{Binding ElementName=DetailsPanel, Path=ActualWidth}">
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="1*" />
-                                                <ColumnDefinition Width="1*" />
-                                                <ColumnDefinition Width="1*" />
-                                                <ColumnDefinition Width="1*" />
-                                            </Grid.ColumnDefinitions>
-                                            <Grid.RowDefinitions>
-                                                <RowDefinition Height="1*" />
-                                                <RowDefinition Height="4*" />
-                                                <RowDefinition Height="1*" />
-                                                <RowDefinition Height="{Binding ElementName=ControlsPanel, Path=ActualHeight}" />
-                                            </Grid.RowDefinitions>
-                                            <FadeImage HorizontalAlignment="Center" VerticalAlignment="Center" Name="FadeLogoImage" AnimationEnabled="{Settings BackgroundImageAnimation}"
-                                                           RenderOptions.BitmapScalingMode="Fant" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2" Stretch="Uniform"
-                                                           Tag="{DynamicResource UseAbsoluteExtraMetadataPath}">
-                                                <FadeImage.Style>
-                                                    <Style TargetType="FadeImage">
-                                                        <Setter Property="Source" Value="{Binding ElementName=LogoPath, Path=Text}"/>
-                                                        <Style.Triggers>
-                                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="false">
-                                                                <Setter Property="Source" Value="{x:Null}"/>
-                                                            </DataTrigger>
-                                                        </Style.Triggers>
-                                                    </Style>
-                                                </FadeImage.Style>
-                                            </FadeImage>
-                                            <FadeImage HorizontalAlignment="Left" VerticalAlignment="Center" Name="FadeLogoImageLeft" AnimationEnabled="{Settings BackgroundImageAnimation}"
-                                                           RenderOptions.BitmapScalingMode="Fant" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" Stretch="Uniform"
-                                                           Margin="50,0,-50,0" Tag="{DynamicResource UseAbsoluteExtraMetadataPath}">
-                                                <FadeImage.Style>
-                                                    <Style TargetType="FadeImage">
-                                                        <Setter Property="Source" Value="{Binding ElementName=LogoLeftPath, Path=Text}"/>
-                                                        <Style.Triggers>
-                                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="false">
-                                                                <Setter Property="Source" Value="{x:Null}"/>
-                                                            </DataTrigger>
-                                                        </Style.Triggers>
-                                                    </Style>
-                                                </FadeImage.Style>
-                                            </FadeImage>
-                                            <FadeImage HorizontalAlignment="Right" VerticalAlignment="Center" Name="FadeLogoImageRight" AnimationEnabled="{Settings BackgroundImageAnimation}"
-                                                           RenderOptions.BitmapScalingMode="Fant" Grid.Column="2" Grid.Row="1" Grid.ColumnSpan="2" Stretch="Uniform"
-                                                           Margin="-50,0,50,0" Tag="{DynamicResource UseAbsoluteExtraMetadataPath}">
-                                                <FadeImage.Style>
-                                                    <Style TargetType="FadeImage">
-                                                        <Setter Property="Source" Value="{Binding ElementName=LogoRightPath, Path=Text}"/>
-                                                        <Style.Triggers>
-                                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="false">
-                                                                <Setter Property="Source" Value="{x:Null}"/>
-                                                            </DataTrigger>
-                                                        </Style.Triggers>
-                                                    </Style>
-                                                </FadeImage.Style>
-                                            </FadeImage>
-                                            <Image HorizontalAlignment="Center" VerticalAlignment="Center" Name="LogoImage"
-                                                           RenderOptions.BitmapScalingMode="Fant" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2"
-                                                           Tag="{DynamicResource UseAbsoluteExtraMetadataPath}">
-                                                <Image.Style>
-                                                    <Style TargetType="Image">
-                                                        <Setter Property="Source" Value="{Binding ElementName=LogoPath, Path=Text}"/>
-                                                        <Style.Triggers>
-                                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="True">
-                                                                <Setter Property="Source" Value="{x:Null}"/>
-                                                            </DataTrigger>
-                                                        </Style.Triggers>
-                                                    </Style>
-                                                </Image.Style>
-                                            </Image>
-                                            <Image HorizontalAlignment="Left" VerticalAlignment="Center" Name="LogoImageLeft"
-                                                           RenderOptions.BitmapScalingMode="Fant" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2"
-                                                           Margin="50,0,-50,0" Tag="{DynamicResource UseAbsoluteExtraMetadataPath}">
-                                                <Image.Style>
-                                                    <Style TargetType="Image">
-                                                        <Setter Property="Source" Value="{Binding ElementName=LogoLeftPath, Path=Text}"/>
-                                                        <Style.Triggers>
-                                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="True">
-                                                                <Setter Property="Source" Value="{x:Null}"/>
-                                                            </DataTrigger>
-                                                        </Style.Triggers>
-                                                    </Style>
-                                                </Image.Style>
-                                            </Image>
-                                            <Image HorizontalAlignment="Right" VerticalAlignment="Center" Name="LogoImageRight"
-                                                           RenderOptions.BitmapScalingMode="Fant" Grid.Column="2" Grid.Row="1" Grid.ColumnSpan="2"
-                                                           Margin="-50,0,50,0" Tag="{DynamicResource UseAbsoluteExtraMetadataPath}">
-                                                <Image.Style>
-                                                    <Style TargetType="Image">
-                                                        <Setter Property="Source" Value="{Binding ElementName=LogoRightPath, Path=Text}"/>
-                                                        <Style.Triggers>
-                                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="True">
-                                                                <Setter Property="Source" Value="{x:Null}"/>
-                                                            </DataTrigger>
-                                                        </Style.Triggers>
-                                                    </Style>
-                                                </Image.Style>
-                                            </Image>
-                                            <TextBlock Text="{Binding Game.DisplayName}" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2" FontSize="{DynamicResource FontSizeLargest}"
-                                                           TextWrapping="Wrap" VerticalAlignment="Center" Foreground="{DynamicResource TextBrush}"
-                                                           TextOptions.TextRenderingMode="Aliased" TextOptions.TextFormattingMode="Ideal"
-                                                           TextAlignment="Center" Typography.Capitals="SmallCaps" Tag="{DynamicResource UseAbsoluteExtraMetadataPath}">
-                                                <TextBlock.Effect>
-                                                    <DropShadowEffect ShadowDepth="0"
-                                                                                  Color="{DynamicResource PopupBackgroundColor}"
-                                                                                  Opacity="1" BlurRadius="5"/>
-                                                </TextBlock.Effect>
-                                                <TextBlock.Style>
-                                                    <Style TargetType="TextBlock">
-                                                        <Setter Property="Visibility" Value="Collapsed"/>
-                                                        <Style.Triggers>
-                                                            <MultiDataTrigger>
-                                                                <MultiDataTrigger.Conditions>
-                                                                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="True"/>
-                                                                    <Condition Binding="{Binding ElementName=FadeLogoImage, Path=ActualHeight}" Value="0" />
-                                                                    <Condition Binding="{Binding ElementName=FadeLogoImageLeft, Path=ActualHeight}" Value="0" />
-                                                                    <Condition Binding="{Binding ElementName=FadeLogoImageRight, Path=ActualHeight}" Value="0" />
-                                                                </MultiDataTrigger.Conditions>
-                                                                <Setter Property="Visibility" Value="{DynamicResource TitleTextVisibility}"/>
-                                                            </MultiDataTrigger>
-                                                            <MultiDataTrigger>
-                                                                <MultiDataTrigger.Conditions>
-                                                                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="False"/>
-                                                                    <Condition Binding="{Binding ElementName=LogoImage, Path=Source}" Value="{x:Null}" />
-                                                                    <Condition Binding="{Binding ElementName=LogoImageLeft, Path=Source}" Value="{x:Null}" />
-                                                                    <Condition Binding="{Binding ElementName=LogoImageRight, Path=Source}" Value="{x:Null}" />
-                                                                </MultiDataTrigger.Conditions>
-                                                                <Setter Property="Visibility" Value="{DynamicResource TitleTextVisibility}"/>
-                                                            </MultiDataTrigger>
-                                                        </Style.Triggers>
-                                                    </Style>
-                                                </TextBlock.Style>
-                                            </TextBlock>
-                                            <StackPanel Orientation="Horizontal" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="2"
-                                                        HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="Collapsed">
-                                                <Label Content="&#x0035;" FontFamily="Marlett"/>
-                                                <TextBlock Text="{DynamicResource LOCGameDetails}" Foreground="{DynamicResource TextBrush}"/>
-                                            </StackPanel>
-                                        </Grid>
-
-                                        <Border BorderBrush="{DynamicResource PanelSeparatorBrush}" HorizontalAlignment="Stretch" Margin="0"
-                                                    BorderThickness="0,1,0,0" Background="{DynamicResource GridDetailsDrawerBrush}"
-                                                    CornerRadius="{DynamicResource ControlCornerRadius}">
-
-                                            <DockPanel Name="DetailsPanel" Margin="20,20,20,60" HorizontalAlignment="Stretch"
-                                                       MaxWidth="{DynamicResource DetailsViewPanelWidth}">
-                                                <StackPanel Name="DetailsLeftPanel" Orientation="Vertical"
-                                                    DockPanel.Dock="Left" Margin="0,20,20,0">
-                                                    <GridEx ColumnCount="2" RowCount="6" AutoLayoutColumns="2" HorizontalAlignment="Center">
-                                                        <Grid.Resources>
-                                                            <Style TargetType="Label" BasedOn="{StaticResource {x:Type Label}}">
-                                                                <Setter Property="HorizontalAlignment" Value="Center" />
-                                                                <Setter Property="VerticalAlignment" Value="Center"/>
-                                                                <Setter Property="Margin" Value="0,0,10,10" />
-                                                                <Setter Property="Foreground" Value="{DynamicResource TextBrushDarker}"/>
-                                                                <Setter Property="FontSize" Value="{DynamicResource FontSizeLarger}" />
-                                                                <Setter Property="FontFamily" Value="{DynamicResource SymbolFont}"/>
-                                                            </Style>
-                                                            <Style TargetType="Border">
-                                                                <Setter Property="BorderBrush" Value="{DynamicResource HoverBorderBrush}"/>
-                                                                <Setter Property="BorderThickness" Value="0,0,1,0"/>
-                                                                <Setter Property="Margin" Value="-1,5,0,5"/>
-                                                            </Style>
-                                                            <Style TargetType="ItemsControl">
-                                                                <Setter Property="VerticalAlignment" Value="Center" />
-                                                                <Setter Property="Margin" Value="10,0,0,10"/>
-                                                            </Style>
-                                                            <Style TargetType="Button" BasedOn="{StaticResource PropertyItemButton}" >
-                                                                <Setter Property="VerticalAlignment" Value="Center"/>
-                                                                <Setter Property="Margin" Value="10,0,0,10"/>
-                                                            </Style>
-                                                            <Style TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}" >
-                                                                <Setter Property="VerticalAlignment" Value="Center"/>
-                                                            </Style>
-                                                        </Grid.Resources>
-                                                        <Label Name="PART_ElemLibrary" Content="&#xEF65;" FontFamily="{DynamicResource FontIcoFont}"
-                                                   ToolTip="{DynamicResource LOCGameProviderTitle}"/>
-                                                        <Button Name="PART_ButtonLibrary"/>
-
-                                                        <Label Name="PART_ElemSource" Content="&#xE14D;" ToolTip="{DynamicResource LOCSourceLabel}"/>
-                                                        <Button Name="PART_ButtonSource"/>
-
-                                                        <Label Name="PART_ElemVersion" Content="&#xE15E;" ToolTip="{DynamicResource LOCVersionLabel}"/>
-                                                        <Button Name="PART_ButtonVersion"/>
-
-                                                        <Label Name="PART_ElemUserScore" Content="&#xE13D;" ToolTip="{DynamicResource LOCUserScore}"/>
-                                                        <TextBlock Name="PART_TextUserScore" Style="{DynamicResource TextBlockGameScore}"
-                                                       VerticalAlignment="Center" Margin="10,0,0,10"/>
-
-                                                        <Border>
-                                                            <Label Name="PART_ElemCategories" Content="&#xE188;" ToolTip="{DynamicResource LOCGameCategoriesTitle}"/>
-                                                        </Border>
-                                                        <ItemsControl Name="PART_ItemsCategories"/>
-
-                                                        <Border>
-                                                            <Label Name="PART_ElemLinks" Content="&#xEF71;" FontFamily="{DynamicResource FontIcoFont}"
-                                                       ToolTip="{DynamicResource LOCLinksLabel}"/>
-                                                        </Border>
-                                                        <ItemsControl Name="PART_ItemsLinks"/>
-                                                    </GridEx>
-                                                </StackPanel>
-                                                <StackPanel Name="DetailsRightPanel" DockPanel.Dock="Right" Margin="20,20,0,0" MinWidth="{Binding ElementName=PART_ImageCover, Path=ActualWidth}">
-                                                    <GridEx HorizontalAlignment="Left" Margin="0"
-                                                ColumnCount="2" RowCount="12" AutoLayoutColumns="2">
-                                                        <GridEx.Resources>
-                                                            <Style TargetType="ItemsControl">
-                                                                <Setter Property="VerticalAlignment" Value="Center" />
-                                                                <Setter Property="Margin" Value="10,0,0,10" />
-                                                            </Style>
-                                                            <Style TargetType="Label" BasedOn="{StaticResource {x:Type Label}}">
-                                                                <Setter Property="HorizontalAlignment" Value="Center"/>
-                                                                <Setter Property="HorizontalContentAlignment" Value="Center"/>
-                                                                <Setter Property="VerticalAlignment" Value="Center"/>
-                                                                <Setter Property="Margin" Value="0,0,10,10" />
-                                                                <Setter Property="Foreground" Value="{DynamicResource TextBrushDarker}"/>
-                                                                <Setter Property="FontSize" Value="{DynamicResource FontSizeLarger}" />
-                                                                <Setter Property="FontFamily" Value="{DynamicResource SymbolFont}"/>
-                                                            </Style>
-                                                            <Style TargetType="Border">
-                                                                <Setter Property="BorderBrush" Value="{DynamicResource HoverBorderBrush}"/>
-                                                                <Setter Property="BorderThickness" Value="0,0,1,0"/>
-                                                                <Setter Property="Margin" Value="-1,5,0,5"/>
-                                                            </Style>
-                                                            <Style TargetType="Button" BasedOn="{StaticResource PropertyItemButton}" >
-                                                                <Setter Property="Margin" Value="10,0,0,10" />
-                                                                <Setter Property="VerticalAlignment" Value="Center"/>
-                                                            </Style>
-                                                            <Style TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}" >
-                                                                <Setter Property="Margin" Value="10,0,0,10" />
-                                                                <Setter Property="VerticalAlignment" Value="Center"/>
-                                                            </Style>
-                                                        </GridEx.Resources>
-
-                                                        <Label Name="PART_ElemPlatform" Content="&#xEA32;" FontFamily="{DynamicResource FontIcoFont}"
-                                                   ToolTip="{DynamicResource LOCPlatformTitle}"/>
-                                                        <ItemsControl Name="PART_ItemsPlatforms" />
-
-                                                        <Label Name="PART_ElemReleaseDate" Content="&#x1F382;" ToolTip="{DynamicResource LOCGameReleaseDateTitle}"/>
-                                                        <Button Name="PART_ButtonReleaseDate"/>
-
-                                                        <Label Name="PART_ElemSeries" Content="&#xE158;" ToolTip="{DynamicResource LOCSeriesLabel}"/>
-                                                        <ItemsControl Name="PART_ItemsSeries" />
-
-                                                        <Label Name="PART_ElemDevelopers" Content="&#xE144;" ToolTip="{DynamicResource LOCDeveloperLabel}"/>
-                                                        <ItemsControl Name="PART_ItemsDevelopers" />
-
-                                                        <Label Name="PART_ElemPublishers" Content="&#x1F454;" ToolTip="{DynamicResource LOCPublisherLabel}"/>
-                                                        <ItemsControl Name="PART_ItemsPublishers" />
-
-                                                        <Label Name="PART_ElemAgeRating" Content="&#x26D4;" ToolTip="{DynamicResource LOCAgeRatingLabel}"/>
-                                                        <ItemsControl Name="PART_ItemsAgeRatings" />
-
-                                                        <Label Name="PART_ElemRegion" Content="&#xE128;" ToolTip="{DynamicResource LOCRegionLabel}"/>
-                                                        <ItemsControl Name="PART_ItemsRegions" />
-
-                                                        <Label Name="PART_ElemCommunityScore" Content="&#xE125;" ToolTip="{DynamicResource LOCCommunityScore}"/>
-                                                        <TextBlock Name="PART_TextCommunityScore" VerticalAlignment="Center"
-                                                        Style="{DynamicResource TextBlockGameScore}" Margin="10,0,0,10"/>
-
-                                                        <Label Name="PART_ElemCriticScore" Content="&#xE136;" ToolTip="{DynamicResource LOCCriticScore}"/>
-                                                        <TextBlock Name="PART_TextCriticScore" VerticalAlignment="Center"
-                                                        Style="{DynamicResource TextBlockGameScore}" Margin="10,0,0,10"/>
-
-                                                        <Border>
-                                                            <Label Name="PART_ElemGenres" Content="&#x1F3AD;" ToolTip="{DynamicResource LOCGenreLabel}"/>
-                                                        </Border>
-                                                        <ItemsControl Name="PART_ItemsGenres"/>
-
-                                                        <Border>
-                                                            <Label Name="PART_ElemTags" Content="&#xE1CB;" ToolTip="{DynamicResource LOCTagsLabel}"/>
-                                                        </Border>
-                                                        <ItemsControl Name="PART_ItemsTags"/>
-
-                                                        <Border>
-                                                            <Label Name="PART_ElemFeatures" Content="&#xE133;" ToolTip="{DynamicResource LOCFeaturesLabel}"/>
-                                                        </Border>
-                                                        <ItemsControl Name="PART_ItemsFeatures"/>
-                                                    </GridEx>
-                                                </StackPanel>
-                                                <StackPanel Margin="0" DockPanel.Dock="Top" HorizontalAlignment="Stretch" Name="DetailsMiddle">
-                                                    <StackPanel.Resources>
-                                                        <Style TargetType="ScrollBar" BasedOn="{StaticResource {x:Type ScrollBar}}">
-                                                            <Setter Property="Margin" Value="0"/>
-                                                        </Style>
-                                                    </StackPanel.Resources>
-                                                    <StackPanel Margin="0,0,0,0" >
-                                                        <StackPanel Name="PART_ElemNotes" Margin="0,0,0,20">
-                                                            <Grid HorizontalAlignment="Stretch" Margin="0,0,0,20" >
-                                                                <Grid.ColumnDefinitions>
-                                                                    <ColumnDefinition Width="*"/>
-                                                                    <ColumnDefinition Width="Auto"/>
-                                                                    <ColumnDefinition Width="*"/>
-                                                                </Grid.ColumnDefinitions>
-                                                                <Separator Margin="0" Background="{DynamicResource HoverBrush}" Grid.Column="0"/>
-                                                                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1"
-                                                       Text="{DynamicResource LOCNotesLabel}" Margin="10,0,10,0" Foreground="{DynamicResource TextBrush}"
-                                                       FontSize="{DynamicResource FontSizeLarger}" FontFamily="{DynamicResource FontFamily}"
-                                                       Typography.Capitals="SmallCaps" Visibility="Visible" FontWeight="SemiBold" />
-                                                                <Separator Margin="0" Background="{DynamicResource HoverBrush}" Grid.Column="2"/>
-                                                            </Grid>
-                                                            <TextBox Name="PART_TextNotes" IsReadOnly="True"
-                                                     BorderThickness="0" Background="Transparent"
-                                                     AcceptsReturn="True" TextWrapping="Wrap"
-                                                     Margin="-1,5,-1,5" Padding="0"/>
-                                                        </StackPanel>
-                                                        <StackPanel Name="PART_ElemDescription" Margin="0,0,0,20">
-                                                            <Grid HorizontalAlignment="Stretch" Margin="0,0,0,20" >
-                                                                <Grid.ColumnDefinitions>
-                                                                    <ColumnDefinition Width="*"/>
-                                                                    <ColumnDefinition Width="Auto"/>
-                                                                    <ColumnDefinition Width="*"/>
-                                                                </Grid.ColumnDefinitions>
-                                                                <Separator Margin="0" Background="{DynamicResource HoverBrush}" Grid.Column="0"/>
-                                                                <StackPanel Grid.Column="1" Orientation="Horizontal" Margin="0">
-                                                                    <Image Visibility="Collapsed" Name="PART_ImageIcon" Height="32" Width="32" SnapsToDevicePixels="True"
-                                                               Margin="10,0,0,0" HorizontalAlignment="Center" VerticalAlignment="Center"
-                                                               StretchDirection="DownOnly" RenderOptions.BitmapScalingMode="Fant"/>
-                                                                    <TextBlock Foreground="{DynamicResource TextBrush}" Tag="{DynamicResource LOCGameDescriptionTitle}"
-                                                                   FontSize="{DynamicResource FontSizeLarger}" FontFamily="{DynamicResource FontFamily}"
-                                                                   Typography.Capitals="SmallCaps" Visibility="Visible" FontWeight="SemiBold"
-                                                                   VerticalAlignment="Center" Margin="10,0,10,0">
-                                                                        <TextBlock.Style>
-                                                                            <Style TargetType="TextBlock">
-                                                                                <Setter Property="Text" Value="{DynamicResource LOCGameDescriptionTitle}"/>
-                                                                                <Style.Triggers>
-                                                                                    <Trigger Property="Tag" Value="Description">
-                                                                                        <Setter Property="Text" Value="About the Game"/>
-                                                                                    </Trigger>
-                                                                                </Style.Triggers>
-                                                                            </Style>
-                                                                        </TextBlock.Style>
-                                                                    </TextBlock>
-                                                                </StackPanel>
-                                                                <Separator Margin="0" Background="{DynamicResource HoverBrush}" Grid.Column="2"/>
-                                                            </Grid>
-                                                            <HtmlTextView Margin="20,0,20,0" x:Name="PART_HtmlDescription"
-                                                              HtmlFontSize="{DynamicResource FontSize}"
-                                                              HtmlFontFamily="{DynamicResource FontFamily}"
-                                                              HtmlForeground="{DynamicResource TextColor}"
-                                                              LinkForeground="{DynamicResource GlyphColor}"                                      
-                                                              ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                                                              ScrollViewer.VerticalScrollBarVisibility="Disabled" />
-                                                        </StackPanel>
-                                                    </StackPanel>
-                                                </StackPanel>
-                                            </DockPanel>
-                                        </Border>
-                                    </StackPanel>
-                                </ScrollViewer>
-
-                                <Border Name="ControlsPanel" BorderBrush="{DynamicResource NormalBorderBrush}"
-                                        Grid.Row="1" Background="{DynamicResource PanelBackgroundBrush}" >
-                                    <Border.Style>
-                                        <Style TargetType="Border">
-                                            <Setter Property="BorderThickness" Value="0,1,0,1"/>
-                                            <Style.Triggers>
-                                                <DataTrigger Binding="{Settings ShowPanelSeparators}" Value="False">
-                                                    <Setter Property="BorderThickness" Value="0" />
-                                                </DataTrigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </Border.Style>
-
-                                    <Grid VerticalAlignment="Bottom" Background="Transparent" HorizontalAlignment="Stretch" Margin="5,0,5,0"
-                                          MaxWidth="{Binding ElementName=DetailsPanel, Path=ActualWidth}">
-                                        <Grid.Resources>
-                                            <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
-                                                <Setter Property="FontSize" Value="{DynamicResource FontSizeLarger}"/>
-                                                <Setter Property="TextOptions.TextRenderingMode" Value="Aliased"/>
-                                                <Setter Property="Margin" Value="1,0,0,0"/>
-                                                <Setter Property="MinWidth" Value="40"/>
-                                                <Setter Property="Background" Value="Transparent"/>
-                                                <Setter Property="BorderBrush" Value="Transparent"/>
-                                                <Setter Property="Foreground" Value="{DynamicResource GlyphBrush}"/>
-                                                <Setter Property="VerticalAlignment" Value="Stretch"/>
-                                                <Style.Triggers>
-                                                    <Trigger Property="IsMouseOver" Value="True">
-                                                        <Setter Property="Background" Value="{DynamicResource DetailsButtonBrush}" />
-                                                    </Trigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </Grid.Resources>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto"/>
-                                            <ColumnDefinition Width="*"/>
-                                            <ColumnDefinition Width="Auto"/>
-                                        </Grid.ColumnDefinitions>
-                                        <StackPanel Grid.Column="1" Orientation="Horizontal" Grid.ColumnSpan="1"
-                                           VerticalAlignment="Center" HorizontalAlignment="Center">
-                                            <StackPanel.Resources>
-                                                <Style TargetType="StackPanel">
-                                                    <Setter Property="HorizontalAlignment" Value="Center" />
-                                                    <Setter Property="Orientation" Value="Horizontal"/>
-                                                </Style>
-                                                <Style TargetType="Label" BasedOn="{StaticResource {x:Type Label}}">
-                                                    <Setter Property="Foreground" Value="{DynamicResource TextBrushDarker}"/>
-                                                    <Setter Property="FontSize" Value="{DynamicResource FontSizeLarger}"/>
-                                                    <Setter Property="FontFamily" Value="{DynamicResource SymbolFont}"/>
-                                                    <Setter Property="VerticalAlignment" Value="Center"/>
-                                                    <Setter Property="Margin" Value="20,0,5,0" />
-                                                    <Setter Property="TextOptions.TextRenderingMode" Value="Aliased"/>
-                                                </Style>
-                                                <Style TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
-                                                    <Setter Property="VerticalAlignment" Value="Center"/>
-                                                    <Setter Property="Margin" Value="0,0,20,0"/>
-                                                    <Setter Property="MinWidth" Value="75"/>
-                                                </Style>
-                                                <Style TargetType="Button" BasedOn="{StaticResource SimpleButton}" >
-                                                    <Setter Property="VerticalAlignment" Value="Center"/>
-                                                    <Setter Property="Margin" Value="0,0,20,0"/>
-                                                    <Setter Property="MinWidth" Value="75"/>
-                                                </Style>
-                                            </StackPanel.Resources>
-                                            <StackPanel ToolTip="{DynamicResource LOCTimePlayed}">
-                                                <Label Name="PART_ElemPlayTime" Content="&#x23F3;"/>
-                                                <TextBlock Name="PART_TextPlayTime"/>
-                                            </StackPanel>
-                                            <StackPanel Tag="{DynamicResource Htlb_EnableIntegrationInCustomTheme}">
-                                                <StackPanel Orientation="Horizontal" Tag="{DynamicResource Htlb_HasData}" ToolTip="{DynamicResource LOCHowLongToBeat}">
-                                                    <Label Content="&#x23F1;"/>
-                                                    <TextBlock Text="{DynamicResource Htlb_TimeToBeatFormat}"/>
-                                                    <StackPanel.Style>
-                                                        <Style>
-                                                            <Setter Property="Control.Visibility" Value="Collapsed"/>
-                                                            <Style.Triggers>
-                                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true">
-                                                                    <Setter Property="Control.Visibility" Value="Visible"/>
-                                                                </DataTrigger>
-                                                            </Style.Triggers>
-                                                        </Style>
-                                                    </StackPanel.Style>
-                                                </StackPanel>
-                                                <StackPanel.Style>
-                                                    <Style>
-                                                        <Setter Property="Control.Visibility" Value="Collapsed"/>
-                                                        <Style.Triggers>
-                                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true">
-                                                                <Setter Property="Control.Visibility" Value="Visible"/>
-                                                            </DataTrigger>
-                                                        </Style.Triggers>
-                                                    </Style>
-                                                </StackPanel.Style>
-                                            </StackPanel>
-                                            <StackPanel ToolTip="{DynamicResource LOCLastPlayed}">
-                                                <Label Name="PART_ElemLastPlayed" Content="&#xE163;"/>
-                                                <TextBlock Name="PART_TextLastActivity"/>
-                                            </StackPanel>
-                                            <StackPanel Orientation="Horizontal" Tag="{DynamicResource Sc_HasData}"
-                                                ToolTip="{DynamicResource LOCCommonLinksAchievements}">
-                                                <StackPanel.Style>
-                                                    <Style>
-                                                        <Setter Property="Control.Visibility" Value="Collapsed"/>
-                                                        <Style.Triggers>
-                                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true">
-                                                                <Setter Property="Control.Visibility" Value="Visible"/>
-                                                            </DataTrigger>
-                                                        </Style.Triggers>
-                                                    </Style>
-                                                </StackPanel.Style>
-                                                <Label Content="&#x1F396;" Tag="{DynamicResource Sc_PercentageUnlocked}">
-                                                    <Label.Style>
-                                                        <Style TargetType="Label" BasedOn="{StaticResource {x:Type Label}}">
-                                                            <Setter Property="Foreground" Value="{DynamicResource TextBrushDarker}"/>
-                                                            <Setter Property="FontSize" Value="{DynamicResource FontSizeLarger}"/>
-                                                            <Setter Property="FontFamily" Value="{DynamicResource SymbolFont}"/>
-                                                            <Setter Property="VerticalAlignment" Value="Center"/>
-                                                            <Setter Property="Margin" Value="20,0,5,0" />
-                                                            <Setter Property="TextOptions.TextRenderingMode" Value="Aliased"/>
-                                                            <Style.Triggers>
-                                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="100">
-                                                                    <Setter Property="Foreground" Value="Gold"/>
-                                                                    <Setter Property="Effect">
-                                                                        <Setter.Value>
-                                                                            <DropShadowEffect ShadowDepth="0" Color="Gold"
-                                                                                  Opacity=".5" BlurRadius="10"/>
-                                                                        </Setter.Value>
-                                                                    </Setter>
-                                                                </DataTrigger>
-                                                            </Style.Triggers>
-                                                        </Style>
-                                                    </Label.Style>
-                                                </Label>
-                                                <TextBlock Tag="{DynamicResource Sc_PercentageUnlocked}">
-                                            <Run Text="{DynamicResource Sc_UnlockedString}"/>
-                                            <Run Text=" / "/>
-                                            <Run Text="{DynamicResource Sc_TotalString}"/>
-                                                    <TextBlock.Style>
-                                                        <Style TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
-                                                            <Setter Property="VerticalAlignment" Value="Center"/>
-                                                            <Style.Triggers>
-                                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="100">
-                                                                    <Setter Property="Foreground" Value="Gold"/>
-                                                                    <Setter Property="Effect">
-                                                                        <Setter.Value>
-                                                                            <DropShadowEffect ShadowDepth="0" Color="Gold"
-                                                                                  Opacity=".5" BlurRadius="5"/>
-                                                                        </Setter.Value>
-                                                                    </Setter>
-                                                                </DataTrigger>
-                                                            </Style.Triggers>
-                                                        </Style>
-                                                    </TextBlock.Style>
-                                                </TextBlock>
-                                            </StackPanel>
-                                            <StackPanel ToolTip="{DynamicResource LOCCompletionStatus}">
-                                                <Label Name="PART_ElemCompletionStatus" Content="&#xE10B;"/>
-                                                <Button Name="PART_ButtonCompletionStatus"/>
-                                            </StackPanel>
-                                        </StackPanel>
-
-                                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                            <Button Name="PART_ButtonPlayAction" FontSize="{DynamicResource FontSizeLarger}"
-                                                    Style="{DynamicResource PlayButton}" MinWidth="150"/>
-                                            <Button Name="PART_ButtonContextAction" FontSize="{DynamicResource FontSizeLarger}"
-                                                        Style="{DynamicResource ContextButton}" MinWidth="150"/>
-                                            <Button Name="PART_ButtonMoreActions" Content="&#xE10C;" FontFamily="{DynamicResource SymbolFont}"/>
-                                        </StackPanel>
-
-                                        <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right">
-                                            <StackPanel Orientation="Horizontal">
-                                                <Grid Tag="{DynamicResource Htlb_EnableIntegrationInCustomTheme}">
-                                                    <Button Name="PART_HltbCustomButton" Content="&#x23F1;" ToolTip="{DynamicResource LOCHowLongToBeat}"
-                                                    FontFamily="{DynamicResource SymbolFont}"/>
-                                                    <Grid.Style>
-                                                        <Style TargetType="Grid">
-                                                            <Setter Property="Visibility" Value="Collapsed" />
-                                                            <Style.Triggers>
-                                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}"  Value="True">
-                                                                    <Setter Property="Visibility" Value="Visible" />
-                                                                </DataTrigger>
-                                                            </Style.Triggers>
-                                                        </Style>
-                                                    </Grid.Style>
-                                                </Grid>
-
-                                                <Grid Tag="{DynamicResource Sc_EnableIntegrationInCustomTheme}">
-                                                    <Button Name="PART_ScCustomButton" Content="&#x1F396;" ToolTip="SuccessStory"
-                                                    FontFamily="{DynamicResource SymbolFont}" />
-                                                    <Grid.Style>
-                                                        <Style TargetType="Grid">
-                                                            <Setter Property="Visibility" Value="Collapsed" />
-                                                            <Style.Triggers>
-                                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="True">
-                                                                    <Setter Property="Visibility" Value="Visible" />
-                                                                </DataTrigger>
-                                                            </Style.Triggers>
-                                                        </Style>
-                                                    </Grid.Style>
-                                                </Grid>
-
-                                                <Button x:Name="PART_ButtonEditGame" Margin="0" ToolTip="{DynamicResource LOCEditGame}"
-                                                FontFamily="{DynamicResource SymbolFont}" Content="&#xE104;"/>
-
-                                                <StackPanel.Style>
-                                                    <Style TargetType="StackPanel">
-                                                        <Setter Property="Visibility" Value="Hidden" />
-                                                        <Style.Triggers>
-                                                            <DataTrigger Binding="{Binding IsMouseOver, RelativeSource={RelativeSource AncestorType=Grid}}"  Value="True">
-                                                                <Setter Property="Visibility" Value="Visible" />
-                                                            </DataTrigger>
-                                                        </Style.Triggers>
-                                                    </Style>
-                                                </StackPanel.Style>
-                                            </StackPanel>
-                                            <Label Content="&#xef25;" FontFamily="{DynamicResource FontIcoFont}" Foreground="{DynamicResource FavoriteColorBrush}" Margin="20,0,20,0"
-                                                   Visibility="{Binding Game.Favorite, Converter={StaticResource BooleanToVisibilityConverter}}" FontSize="{DynamicResource FontSizeLarger}">
-                                                <Label.Effect>
-                                                    <DropShadowEffect ShadowDepth="0" Color="{DynamicResource FavoriteColor}"
-                                                                      Opacity="1" BlurRadius="5"/>
-                                                </Label.Effect>
-                                            </Label>
-                                            <Button Name="CloseButton" Command="{MainViewModel CloseGameSideBarCommand}"
-                                                Grid.Column="1" HorizontalAlignment="Right" Foreground="{DynamicResource TextBrush}"
-                                                FontFamily="Marlett" FontSize="{DynamicResource FontSizeLarge}" Content="&#x0072;"/>
-                                        </StackPanel>
-                                    </Grid>
-                                </Border>
-                            </Grid>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Magpie_Desktop_GBV_1_1_0/Views/LibraryDetailsView.xaml b/Magpie_Desktop_GBV_1_1_0/Views/LibraryDetailsView.xaml
deleted file mode 100644
index f8da7f5..0000000
--- a/Magpie_Desktop_GBV_1_1_0/Views/LibraryDetailsView.xaml
+++ /dev/null
@@ -1,86 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-                    mc:Ignorable="d">
-
-    <Style TargetType="{x:Type LibraryDetailsView}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type LibraryDetailsView}">
-                    <DockPanel d:DesignWidth="1280" d:DesignHeight="960"
-                               d:DataContext="{x:Static DesignMainViewModel.DesignIntance}">
-                        <Grid DockPanel.Dock="{Settings DetailsListPosition}"
-                              Width="{Settings DetailsListWitdh}">
-                            <Border Background="{DynamicResource PanelBackgroundBrush}">
-                                <ExtendedListBox x:Name="PART_ListGames" Padding="0,20,0,0"
-                                         SelectionMode="Extended" 
-                                         Width="{Settings DetailsListWitdh}"
-                                         BorderBrush="{DynamicResource PanelSeparatorBrush}"
-                                         DockPanel.Dock="{Settings DetailsListPosition}"
-                                         ItemContainerStyle="{DynamicResource DetailsViewItemStyle}"
-                                         ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                                         ScrollViewer.PanningMode="VerticalOnly"
-                                         VirtualizingPanel.CacheLengthUnit="Item"
-                                         VirtualizingPanel.CacheLength="5"
-                                         VirtualizingPanel.IsVirtualizingWhenGrouping="True"
-                                         VirtualizingPanel.VirtualizationMode="Recycling"
-                                         Background="Transparent">
-                                    <ExtendedListBox.Style>
-                                        <Style TargetType="ExtendedListBox" BasedOn="{StaticResource {x:Type ExtendedListBox}}">
-                                            <Setter Property="BorderThickness" Value="0,0,1,0" />
-                                            <Style.Triggers>
-                                                <DataTrigger Binding="{Settings DetailsListPosition}" Value="Right">
-                                                    <Setter Property="BorderThickness" Value="1,0,0,0" />
-                                                </DataTrigger>
-                                                <DataTrigger Binding="{Settings ShowPanelSeparators}" Value="False">
-                                                    <Setter Property="BorderThickness" Value="0" />
-                                                </DataTrigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </ExtendedListBox.Style>
-                                    <ExtendedListBox.GroupStyle>
-                                        <GroupStyle ContainerStyle="{StaticResource DetailsViewGroupStyle}"/>
-                                    </ExtendedListBox.GroupStyle>
-                                    <ExtendedListBox.ItemTemplate>
-                                        <DataTemplate>
-                                            <GameListItem Style="{StaticResource DetailsViewItemTemplate}" />
-                                        </DataTemplate>
-                                    </ExtendedListBox.ItemTemplate>
-                                    <ExtendedListBox.Resources>
-                                        <Style TargetType="ScrollBar" BasedOn="{StaticResource {x:Type ScrollBar}}">
-                                            <Setter Property="Margin" Value="0,20,0,20"/>
-                                        </Style>
-                                    </ExtendedListBox.Resources>
-                                    <ExtendedListBox.OpacityMask>
-                                        <LinearGradientBrush StartPoint="0,0" EndPoint="0,20" MappingMode="Absolute">
-                                            <LinearGradientBrush.GradientStops>
-                                                <GradientStop Offset="0" Color="Transparent"/>
-                                                <GradientStop Offset="1" Color="White"/>
-                                            </LinearGradientBrush.GradientStops>
-                                        </LinearGradientBrush>
-                                    </ExtendedListBox.OpacityMask>
-                                </ExtendedListBox>
-                            </Border>
-                            <TextBlock FontSize="{StaticResource FontSizeLarge}" Margin="0,15,0,0"
-                                       Text="{DynamicResource LOCNoItemsFound}" TextWrapping="Wrap"                                       
-                                       TextAlignment="Center" HorizontalAlignment="Center">
-                                <TextBlock.Style>
-                                    <Style TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
-                                        <Setter Property="Visibility" Value="Collapsed" />
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding Items.Count, ElementName=PART_ListGames, Mode=OneWay}" Value="0">
-                                                <Setter Property="Visibility" Value="Visible" />
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </TextBlock.Style>
-                            </TextBlock>
-                        </Grid>
-                        <DetailsViewGameOverview x:Name="PART_ControlGameView" DockPanel.Dock="Left" />
-                    </DockPanel>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Magpie_Desktop_GBV_1_1_0/Views/LibraryGridView.xaml b/Magpie_Desktop_GBV_1_1_0/Views/LibraryGridView.xaml
deleted file mode 100644
index f47bb3a..0000000
--- a/Magpie_Desktop_GBV_1_1_0/Views/LibraryGridView.xaml
+++ /dev/null
@@ -1,93 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                    mc:Ignorable="d">
-
-    <Style TargetType="{x:Type LibraryGridView}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type LibraryGridView}">
-                    <DockPanel Background="{TemplateBinding Background}"
-                               d:DesignWidth="1280" d:DesignHeight="960"
-                               d:DataContext="{x:Static DesignMainViewModel.DesignIntance}">
-                        <GridViewGameOverview x:Name="PART_ControlGameView"
-                                              Height="{Settings GrdiDetailsWitdh}"
-                                              DockPanel.Dock="Top" />
-                        <Grid DockPanel.Dock="Bottom">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition/>
-                            </Grid.ColumnDefinitions>
-                            <ExtendedListBox x:Name="PART_ListGames" Padding="5,25,5,5"
-                                             ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                                             ScrollViewer.PanningMode="VerticalOnly"
-                                             ItemContainerStyle="{DynamicResource GridViewItemStyle}"
-                                             SelectionMode="Extended"
-                                             DockPanel.Dock="Left" Background="Transparent"
-                                             BorderThickness="0" Grid.Column="1">
-                                <ExtendedListBox.ItemTemplate>
-                                    <DataTemplate>
-                                        <GameListItem Style="{StaticResource GridViewItemTemplate}" />
-                                    </DataTemplate>
-                                </ExtendedListBox.ItemTemplate>
-                                <ExtendedListBox.GroupStyle>
-                                    <GroupStyle ContainerStyle="{StaticResource GridViewGroupStyle}"/>
-                                </ExtendedListBox.GroupStyle>
-                                <ExtendedListBox.Resources>
-                                    <Style TargetType="ScrollBar" BasedOn="{StaticResource {x:Type ScrollBar}}">
-                                        <Setter Property="Margin" Value="0,20,0,20"/>
-                                    </Style>
-                                </ExtendedListBox.Resources>
-                                <ExtendedListBox.OpacityMask>
-                                    <LinearGradientBrush StartPoint="0,0" EndPoint="0,20" MappingMode="Absolute">
-                                        <LinearGradientBrush.GradientStops>
-                                            <GradientStop Offset="0" Color="Transparent"/>
-                                            <GradientStop Offset="1" Color="White"/>
-                                        </LinearGradientBrush.GradientStops>
-                                    </LinearGradientBrush>
-                                </ExtendedListBox.OpacityMask>
-                            </ExtendedListBox>
-                            <TextBlock FontSize="{StaticResource FontSizeLarge}" Margin="0,40,0,0"
-                                       Text="{DynamicResource LOCNoItemsFound}" TextWrapping="Wrap"                                      
-                                       TextAlignment="Center" HorizontalAlignment="Center" Grid.Column="1">
-                                <TextBlock.Style>
-                                    <Style TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
-                                        <Setter Property="Visibility" Value="Collapsed" />
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding Items.Count, ElementName=PART_ListGames, Mode=OneWay}" Value="0">
-                                                <Setter Property="Visibility" Value="Visible" />
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </TextBlock.Style>
-                            </TextBlock>
-                            <StackPanel Margin="0" Orientation="Horizontal" Grid.Column="0" HorizontalAlignment="Left">
-                                <Label FontFamily="{DynamicResource SymbolFont}" Content="&#xE1D8;"
-                                       Foreground="{DynamicResource TextBrushDarker}" Margin="10,5,10,5"
-                                       TextOptions.TextRenderingMode="Aliased"/>
-                                <SliderWithPopup x:Name="PART_SliderZoom" />
-                                <Label FontFamily="{DynamicResource SymbolFont}" Content="&#xE1D9;"
-                                       Foreground="{DynamicResource TextBrushDarker}" Margin="10,5,10,5"
-                                       TextOptions.TextRenderingMode="Aliased"/>
-                                <StackPanel.Effect>
-                                    <DropShadowEffect ShadowDepth="0"
-                                                         Color="Black"
-                                                         Opacity="1"
-                                                         BlurRadius="2"/>
-                                </StackPanel.Effect>
-                                <StackPanel.LayoutTransform>
-                                    <RotateTransform Angle="270"/>
-                                </StackPanel.LayoutTransform>
-                            </StackPanel>
-                        </Grid>
-                    </DockPanel>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Magpie_Desktop_GBV_1_1_0/Views/MainWindow.xaml b/Magpie_Desktop_GBV_1_1_0/Views/MainWindow.xaml
deleted file mode 100644
index b6df4b1..0000000
--- a/Magpie_Desktop_GBV_1_1_0/Views/MainWindow.xaml
+++ /dev/null
@@ -1,59 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-                    mc:Ignorable="d">
-
-    <Style TargetType="{x:Type MainWindow}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type MainWindow}">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            d:DesignWidth="1280" d:DesignHeight="960">
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition />
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition />
-                            </Grid.ColumnDefinitions>
-                            <Grid.Resources>
-                                <Storyboard x:Key="VisibilityOn">
-                                    <ThicknessAnimationUsingKeyFrames Storyboard.TargetProperty="Margin"
-                                                 Storyboard.TargetName="PART_Notifications">
-                                        <SplineThicknessKeyFrame KeyTime="00:00:00" Value="-260,0,0,0" />
-                                        <SplineThicknessKeyFrame KeyTime="0:0:0.10" Value="0,0,0,0" />
-                                    </ThicknessAnimationUsingKeyFrames>
-                                </Storyboard>
-                                <Storyboard x:Key="VisibilityOff">
-                                    <ThicknessAnimationUsingKeyFrames Storyboard.TargetProperty="Margin"
-                                                 Storyboard.TargetName="PART_Notifications">
-                                        <SplineThicknessKeyFrame KeyTime="00:00:00" Value="0,0,0,0" />
-                                        <SplineThicknessKeyFrame KeyTime="0:0:0.10" Value="-260,0,0,0" />
-                                    </ThicknessAnimationUsingKeyFrames>
-                                </Storyboard>
-                            </Grid.Resources>
-
-                            <DockPanel>
-                                <Sidebar x:Name="PART_Sidebar" Panel.ZIndex="999"
-                                         DockPanel.Dock="{Settings SidebarPosition}" />
-                                <ContentControl Name="PART_ContentView"
-                                                DockPanel.Dock="Top" />
-                            </DockPanel>
-                            <NotificationPanel x:Name="PART_Notifications"  
-                                               WindowChrome.IsHitTestVisibleInChrome="True"
-                                               Width="260"
-                                               Grid.Row="0" Grid.Column="0" Grid.RowSpan="2"
-                                               HorizontalAlignment="Left" VerticalAlignment="Stretch"
-                                               AnimatedVisibility.Visibility="{Settings NotificationPanelVisible}"
-                                               AnimatedVisibility.Visible="{StaticResource VisibilityOn}"
-                                               AnimatedVisibility.Collapsed="{StaticResource VisibilityOff}"/>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Magpie_Desktop_GBV_1_1_0/Views/Sidebar.xaml b/Magpie_Desktop_GBV_1_1_0/Views/Sidebar.xaml
deleted file mode 100644
index 4cec252..0000000
--- a/Magpie_Desktop_GBV_1_1_0/Views/Sidebar.xaml
+++ /dev/null
@@ -1,55 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-                    mc:Ignorable="d">
-
-    <Style TargetType="{x:Type Sidebar}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Sidebar}">
-                    <Border BorderThickness="0,0,1,0" BorderBrush="{DynamicResource PanelSeparatorBrush}"
-                            x:Name="BorderContentHolder" Background="{DynamicResource TitlebarBrush}">
-                        <DockPanel x:Name="DockContentHolder">
-                            <Border x:Name="PART_ElemMainMenu" Background="Transparent"
-                                    Width="44" Height="44" Margin="0,0,0,5"
-                                    DockPanel.Dock="Top" Cursor="Hand"
-                                    WindowChrome.IsHitTestVisibleInChrome="True">
-                                    <Button Content="&#x2630;" Style="{DynamicResource GlyphButton}"
-                                           HorizontalAlignment="Center" FontSize="30" Margin="0,0,0,4"/>
-                            </Border>
-
-                            <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Hidden"
-                                          DockPanel.Dock="Top" CanContentScroll="True"
-                                          x:Name="ScrollSidebarItems">
-                                <StackPanel x:Name="PART_PanelSideBarItems" Orientation="Vertical" />
-                            </ScrollViewer> 
-                        </DockPanel>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Settings SidebarPosition}" Value="Right">
-                            <Setter Property="Padding" Value="0,25,0,0" />
-                            <Setter Property="Margin" Value="0,0,0,5" TargetName="PART_ElemMainMenu" />
-                            <Setter Property="BorderThickness" Value="1,0,0,0" TargetName="BorderContentHolder" />
-                        </DataTrigger>
-                        <DataTrigger Binding="{Settings SidebarPosition}" Value="Top">
-                            <Setter Property="Margin" Value="0,0,5,0" TargetName="PART_ElemMainMenu" />
-                            <Setter Property="BorderThickness" Value="0,0,0,1" TargetName="BorderContentHolder" />
-                            <Setter Property="DockPanel.Dock" Value="Left" TargetName="PART_ElemMainMenu" />
-                            <Setter Property="DockPanel.Dock" Value="Left" TargetName="ScrollSidebarItems" />
-                            <Setter Property="Margin" Value="0,0,100,0" TargetName="ScrollSidebarItems" />
-                            <Setter Property="Orientation" Value="Horizontal" TargetName="PART_PanelSideBarItems" />
-                        </DataTrigger>
-                        <DataTrigger Binding="{Settings SidebarPosition}" Value="Bottom">
-                            <Setter Property="Margin" Value="0,0,5,0" TargetName="PART_ElemMainMenu" />
-                            <Setter Property="BorderThickness" Value="0,1,0,0" TargetName="BorderContentHolder" />
-                            <Setter Property="DockPanel.Dock" Value="Left" TargetName="PART_ElemMainMenu" />
-                            <Setter Property="DockPanel.Dock" Value="Left" TargetName="ScrollSidebarItems" />
-                            <Setter Property="Orientation" Value="Horizontal" TargetName="PART_PanelSideBarItems" />
-                        </DataTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Magpie_Desktop_GBV_1_1_0/Views/TopPanel.xaml b/Magpie_Desktop_GBV_1_1_0/Views/TopPanel.xaml
deleted file mode 100644
index 6e26523..0000000
--- a/Magpie_Desktop_GBV_1_1_0/Views/TopPanel.xaml
+++ /dev/null
@@ -1,224 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                    mc:Ignorable="d">
-
-    <DataTemplate x:Key="TopPanelGeneralViewSettingsTemplate">
-        <TextBlock Text="&#xefe2;" FontFamily="{DynamicResource FontIcoFont}" FontSize="18"                   
-                   VerticalAlignment="Center" HorizontalAlignment="Center"/>
-    </DataTemplate>
-
-    <DataTemplate x:Key="TopPanelFilterPresetsSelectionTemplate">
-        <TextBlock Text="&#xeec0;" FontFamily="{DynamicResource FontIcoFont}" FontSize="20"
-                   VerticalAlignment="Center" HorizontalAlignment="Center"/>
-    </DataTemplate>
-
-    <DataTemplate x:Key="TopPanelGroupSettingsTemplate">
-        <TextBlock Text="&#xee03;" FontFamily="{DynamicResource FontIcoFont}" FontSize="20"
-                   VerticalAlignment="Center" HorizontalAlignment="Center"/>
-    </DataTemplate>
-
-    <DataTemplate x:Key="TopPanelSortSettingsTemplate">
-        <TextBlock Text="&#xefee;" FontFamily="{DynamicResource FontIcoFont}" FontSize="20"
-                   VerticalAlignment="Center" HorizontalAlignment="Center"/>
-    </DataTemplate>
-
-    <DataTemplate x:Key="TopPanelSwitchDetailsViewTemplate">
-        <TextBlock Text="&#xE145;" FontFamily="Segoe UI Symbol" FontSize="20"
-                   VerticalAlignment="Center" HorizontalAlignment="Center"/>
-    </DataTemplate>
-
-    <DataTemplate x:Key="TopPanelSwitchGridViewTemplate">
-        <TextBlock Text="&#xE138;" FontFamily="Segoe UI Symbol" FontSize="20"
-                   VerticalAlignment="Center" HorizontalAlignment="Center"/>
-    </DataTemplate>
-
-    <DataTemplate x:Key="TopPanelSwitchListViewTemplate">
-        <TextBlock Text="&#xE14C;" FontFamily="Segoe UI Symbol" FontSize="20"
-                   VerticalAlignment="Center" HorizontalAlignment="Center"/>
-    </DataTemplate>
-    
-    <DataTemplate x:Key="TopPanelUpdateButtonTemplate">
-        <TextBlock Foreground="{DynamicResource WarningBrush}"
-                   VerticalAlignment="Center" HorizontalAlignment="Center"
-                   Text="&#xef08;" FontSize="24" FontFamily="{DynamicResource FontIcoFont}"/>
-    </DataTemplate>
-
-    <DataTemplate x:Key="TopPanelExplorerSwitchTemplate">
-        <TextBlock Text="&#xeeed;" FontFamily="{DynamicResource FontIcoFont}" FontSize="20"
-                   VerticalAlignment="Center" HorizontalAlignment="Center"/>
-    </DataTemplate>
-
-    <DataTemplate x:Key="TopPanelSelectRandomGameButtonTemplate">
-        <TextBlock Text="&#xef03;" FontFamily="{DynamicResource FontIcoFont}" FontSize="20"
-                   VerticalAlignment="Center" HorizontalAlignment="Center"/>
-    </DataTemplate>
-
-    <Style x:Key="TopPanelMenu" TargetType="{x:Type ContextMenu}">
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="Background" Value="{DynamicResource PopupBackgroundBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource PopupBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{DynamicResource PopupBorderThickness}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ContextMenu}">
-                    <Border BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            Background="{TemplateBinding Background}"
-                            Grid.IsSharedSizeScope="True">
-                        <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-                            <ItemsPresenter KeyboardNavigation.DirectionalNavigation="Cycle"/>
-                        </ScrollViewer>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="TopPanelFilterToggle" TargetType="CheckBox">
-        <Setter Property="MinWidth" Value="35" />
-        <Setter Property="WindowChrome.IsHitTestVisibleInChrome" Value="True" />
-        <Setter Property="Background" Value="#990a0e1e" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="Margin" Value="10,6,0,6" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate>
-                    <Border Background="{TemplateBinding Background}" BorderThickness="0"
-                            CornerRadius="3">
-                        <StackPanel Orientation="Horizontal" Margin="6,0,6,0">
-                            <TextBlock Text="&#xef29;"
-                                       FontFamily="{DynamicResource FontIcoFont}" FontSize="20"
-                                       VerticalAlignment="Center" HorizontalAlignment="Center"
-                                       Foreground="{TemplateBinding Foreground}"/>
-                            <TextBlock Text="{DynamicResource LOCFilterActiveLabel}"
-                                       Style="{DynamicResource BaseTextBlockStyle}"
-                                       Margin="3,0,0,0" VerticalAlignment="Center"
-                                       Name="TextFilter" />
-                        </StackPanel>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="Tag" Value="{StaticResource True}">
-                            <Setter Property="Visibility" Value="Visible" TargetName="TextFilter" />
-                            <Setter Property="Background" Value="{DynamicResource NormalBrush}" />
-                        </Trigger>
-                        <Trigger Property="Tag" Value="{StaticResource False}">
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="TextFilter" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Foreground" Value="{DynamicResource GlyphBrush}" />
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
-    <Style x:Key="TopPanelNotificationsToggle" TargetType="ToggleButton">
-        <Setter Property="Margin" Value="10,6,0,6" />
-        <Setter Property="MinWidth" Value="35" />
-        <Setter Property="WindowChrome.IsHitTestVisibleInChrome" Value="True" />
-        <Setter Property="Foreground" Value="{DynamicResource GlyphBrush}" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate>
-                    <Border Background="Transparent">
-                        <Grid>
-                            <TextBlock Text="&#xeea3;" FontFamily="{DynamicResource FontIcoFont}" FontSize="24"
-                                       Foreground="{TemplateBinding Foreground}"
-                                       HorizontalAlignment="Center"/>
-                            <Border CornerRadius="3" Width="15" Height="15"
-                                    Margin="20,0,0,0" Background="OrangeRed"
-                                    HorizontalAlignment="Right" VerticalAlignment="Bottom">
-                                <TextBlock Text="{Api Notifications.Count}" FontSize="12"
-                                           Foreground="{DynamicResource TextBrush}"
-                                           HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                            </Border>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <DataTrigger Binding="{Api Notifications.Count}" Value="0">
-                <Setter Property="Visibility" Value="Collapsed"/>
-            </DataTrigger>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
-    <Style TargetType="{x:Type TopPanel}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type TopPanel}">
-                    <Border Height="50" BorderBrush="{DynamicResource PanelSeparatorBrush}"
-                            Background="{DynamicResource PanelBackgroundBrush}"
-                            d:DesignWidth="1280"
-                            d:DataContext="{x:Static DesignMainViewModel.DesignIntance}">
-                        <Border.Style>
-                            <Style TargetType="Border">
-                                <Setter Property="BorderThickness" Value="0,0,0,1" />
-                                <Style.Triggers>
-                                    <DataTrigger Binding="{Settings ShowPanelSeparators}" Value="False">
-                                        <Setter Property="BorderThickness" Value="0" />
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </Border.Style>
-                        <DockPanel Margin="0,3,110,3">
-                            <Border x:Name="PART_ElemMainMenu" Background="Transparent"
-                                    DockPanel.Dock="Left" Margin="5,0,0,0" Cursor="Hand"
-                                    WindowChrome.IsHitTestVisibleInChrome="True">
-                                <Button Content="&#x2630;" Style="{DynamicResource GlyphButton}"
-                                           HorizontalAlignment="Center" FontSize="30" Margin="0,0,0,4"/>
-                            </Border>
-
-                            <SearchBox x:Name="PART_TextMainSearch"
-                                        Margin="5,6,0,6" DockPanel.Dock="Left"
-                                        WindowChrome.IsHitTestVisibleInChrome="True"
-                                        Width="300" />
-                            
-                            <StackPanel x:Name="PART_PanelMainItems" Orientation="Horizontal"
-                                        VerticalAlignment="Stretch" Margin="0,6,0,6"/>
-
-                            <CheckBox x:Name="PART_ToggleFilter" ToolTip="{DynamicResource LOCFilters}"
-                                      Style="{DynamicResource TopPanelFilterToggle}"
-                                      DockPanel.Dock="Left" />
-
-                            <CheckBox x:Name="PART_ToggleNotifications"
-                                      Style="{DynamicResource TopPanelNotificationsToggle}"
-                                      DockPanel.Dock="Left" />
-
-                            <StackPanel x:Name="PART_PanelMainPluginItems" Orientation="Horizontal"
-                                        VerticalAlignment="Stretch" Margin="15,6,15,6"
-                                        DockPanel.Dock="{Settings PluginTopPanelAlignment}"/>
-
-                            <StackPanel Orientation="Horizontal" DockPanel.Dock="Left"
-                                        HorizontalAlignment="Center" Margin="0,5,0,5">
-                                <Grid MaxWidth="600" MinWidth="300">
-                                    <ProgressBar Name="PART_ProgressGlobal" />
-                                    <TextBlock Name="PART_TextProgressText"
-                                               VerticalAlignment="Center" HorizontalAlignment="Center"
-                                               Style="{DynamicResource BaseTextBlockStyle}" Margin="5,0,5,0" />
-                                </Grid>
-
-                                <Button Name="PART_ButtonProgressCancel"
-                                        Content="{DynamicResource LOCCancelLabel}"
-                                        WindowChrome.IsHitTestVisibleInChrome="True"
-                                        Margin="5,0,0,0" />
-                            </StackPanel>                    
-                        </DockPanel>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Magpie_Desktop_GBV_1_1_0/seguisym.ttf b/Magpie_Desktop_GBV_1_1_0/seguisym.ttf
deleted file mode 100644
index d987ce5..0000000
Binary files a/Magpie_Desktop_GBV_1_1_0/seguisym.ttf and /dev/null differ
diff --git a/Magpie_Desktop_GBV_1_1_0/theme.yaml b/Magpie_Desktop_GBV_1_1_0/theme.yaml
deleted file mode 100644
index 813d522..0000000
--- a/Magpie_Desktop_GBV_1_1_0/theme.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-ThemeApiVersion: 2.1.0
-Id: Magpie_Desktop_GBV
-Name: Magpie (Grid Banner Variant)
-Author: Dan Davis
-Version: 1.1.0