From dcc21e7fef4b3efe8e234802cf5c8be86038d1d3 Mon Sep 17 00:00:00 2001
From: Tally <Tally@users.noreply.github.com>
Date: Thu, 4 Mar 2021 14:54:32 -0500
Subject: [PATCH] v1.0.0

---
 Magpie_Desktop/Constants.xaml                 |  24 +--
 .../DerivedStyles/DetailsViewGroupStyle.xaml  |   2 +-
 .../DerivedStyles/GridViewItemStyle.xaml      |  38 +++-
 .../Views/DetailsViewGameOverview.xaml        | 168 +++++++++++-------
 .../Views/GridViewGameOverview.xaml           |  47 +++--
 Magpie_Desktop/theme.yaml                     |   5 +-
 Magpie_Desktop_GBV/Constants.xaml             |   5 +-
 .../DerivedStyles/DetailsViewGroupStyle.xaml  |   2 +-
 .../DerivedStyles/GridViewItemStyle.xaml      |  38 +++-
 .../Views/DetailsViewGameOverview.xaml        | 168 +++++++++++-------
 .../Views/GridViewGameOverview.xaml           | 114 ++++++++----
 Magpie_Desktop_GBV/theme.yaml                 |   5 +-
 12 files changed, 417 insertions(+), 199 deletions(-)

diff --git a/Magpie_Desktop/Constants.xaml b/Magpie_Desktop/Constants.xaml
index 18002fd..a81f919 100644
--- a/Magpie_Desktop/Constants.xaml
+++ b/Magpie_Desktop/Constants.xaml
@@ -43,7 +43,7 @@
     <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="1"/>
+    <SolidColorBrush x:Key="PanelSeparatorBrush" Color="{DynamicResource PanelSeparatorColor}" Opacity="0.7"/>
     <SolidColorBrush x:Key="PopupBackgroundBrush" Color="{DynamicResource PopupBackgroundColor}" />
 
     <SolidColorBrush x:Key="PositiveRatingBrush" Color="#78ffa0" />
@@ -72,7 +72,9 @@
     <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>
@@ -86,19 +88,21 @@
     <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="#20FFFFFF" />
+    <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="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="DetailsPanelBrush" Color="{DynamicResource PopupBackgroundColor}" Opacity="0.7" />
-    <SolidColorBrush x:Key="DetailsViewGroupTextBrush" Color="{DynamicResource GlyphColor}" />
+    <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" />
@@ -110,4 +114,4 @@
     <SolidColorBrush x:Key="ClearFilterBorderBrush" Color="{DynamicResource ClearFilterButtonColor}" Opacity="1" />
     <SolidColorBrush x:Key="CoverOverlayBackgroundBrush" Color="{DynamicResource PanelBackgroundColor}" Opacity=".5" />
 
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/Magpie_Desktop/DerivedStyles/DetailsViewGroupStyle.xaml b/Magpie_Desktop/DerivedStyles/DetailsViewGroupStyle.xaml
index d15e4e0..5bc0a6a 100644
--- a/Magpie_Desktop/DerivedStyles/DetailsViewGroupStyle.xaml
+++ b/Magpie_Desktop/DerivedStyles/DetailsViewGroupStyle.xaml
@@ -11,7 +11,7 @@
                     <ExpanderEx BorderThickness="0" SaveGameGroupId="{Binding Name, Mode=OneWay}"
                                 IsExpanded="True">
                         <ExpanderEx.Header>
-                            <Grid HorizontalAlignment="Stretch" Margin="0">
+                            <Grid HorizontalAlignment="Stretch" Background="Transparent" Margin="0">
                                 <Grid.ContextMenu>
                                     <GameGroupMenu />
                                 </Grid.ContextMenu>
diff --git a/Magpie_Desktop/DerivedStyles/GridViewItemStyle.xaml b/Magpie_Desktop/DerivedStyles/GridViewItemStyle.xaml
index 055da30..cc996c7 100644
--- a/Magpie_Desktop/DerivedStyles/GridViewItemStyle.xaml
+++ b/Magpie_Desktop/DerivedStyles/GridViewItemStyle.xaml
@@ -13,9 +13,35 @@
                           Margin="{Settings ItemSpacingMargin}"
                           x:Name="ItemGrid">
                         <StackPanel Orientation="Vertical">
-                            <Border x:Name="SelectionBorder" Padding="{Settings GridItemMargin}"
-                                    BorderBrush="{DynamicResource GridItemBackgroundBrush}"
-                                    Background="{DynamicResource GridItemBackgroundBrush}">
+                            <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">
@@ -46,12 +72,6 @@
                                         </DrawingBrush.Drawing>
                                     </DrawingBrush>
                                 </Border.OpacityMask>
-                                <Border.Effect>
-                                    <DropShadowEffect ShadowDepth="0"
-                                              Color="Black"
-                                              Opacity=".5"
-                                              BlurRadius="10"/>
-                                </Border.Effect>
                             </Border>
                             <Border MaxHeight="60">
                                 <TextBlock Text="{Binding DisplayName}"
diff --git a/Magpie_Desktop/Views/DetailsViewGameOverview.xaml b/Magpie_Desktop/Views/DetailsViewGameOverview.xaml
index 8ec0ed4..43dd226 100644
--- a/Magpie_Desktop/Views/DetailsViewGameOverview.xaml
+++ b/Magpie_Desktop/Views/DetailsViewGameOverview.xaml
@@ -133,7 +133,7 @@
                                 <RowDefinition Height="*"/>
                             </Grid.RowDefinitions>
                             <FadeImage x:Name="PART_ImageBackground" Tag="{DynamicResource BGModeOn}"
-                                       Grid.Row="0" HorizontalAlignment="Stretch" RenderOptions.BitmapScalingMode="Fant">
+                                       Grid.Row="0" HorizontalAlignment="Center" RenderOptions.BitmapScalingMode="Fant">
                                 <FadeImage.Resources>
                                     <Style TargetType="Image">
                                         <Style.Triggers>
@@ -428,14 +428,10 @@
                             <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" MinWidth="{Binding ElementName=DetailsLeftPanel, Path=ActualWidth}"/>
+                                    <ColumnDefinition Width="Auto"/>
                                     <ColumnDefinition Width="*"/>
-                                    <ColumnDefinition Width="Auto" MinWidth="{Binding ElementName=DetailsRightPanel, Path=ActualWidth}"/>
+                                    <ColumnDefinition Width="Auto"/>
                                 </Grid.ColumnDefinitions>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                </Grid.RowDefinitions>
                                 <Grid.Resources>
                                     <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
                                         <Setter Property="FontSize" Value="{DynamicResource FontSizeLarger}"/>
@@ -453,38 +449,34 @@
                                         </Style.Triggers>
                                     </Style>
                                 </Grid.Resources>
-                                <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="1" Orientation="Horizontal"
-                                                    VerticalAlignment="Center" HorizontalAlignment="Center">
+                                <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 GlyphLabel}">
+                                        <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>
                                     </StackPanel.Resources>
-                                    <StackPanel Orientation="Horizontal" ToolTip="{DynamicResource LOCTimePlayed}">
+                                    <StackPanel ToolTip="{DynamicResource LOCTimePlayed}">
                                         <Label Name="PART_ElemPlayTime" Content="&#x23F3;"/>
                                         <TextBlock Name="PART_TextPlayTime"/>
                                     </StackPanel>
-                                    <StackPanel Orientation="Horizontal" Tag="{DynamicResource Htlb_EnableIntegrationInCustomTheme}">
+                                    <StackPanel Tag="{DynamicResource Htlb_EnableIntegrationInCustomTheme}">
                                         <StackPanel Orientation="Horizontal" Tag="{DynamicResource Htlb_HasData}" ToolTip="{DynamicResource LOCHowLongToBeat}">
-                                            <Label Content="&#x23F1;" FontFamily="{DynamicResource SymbolFont}"/>
+                                            <Label Content="&#x23F1;"/>
                                             <TextBlock Text="{DynamicResource Htlb_TimeToBeatFormat}"/>
                                             <StackPanel.Style>
                                                 <Style>
@@ -508,7 +500,7 @@
                                             </Style>
                                         </StackPanel.Style>
                                     </StackPanel>
-                                    <StackPanel Orientation="Horizontal" ToolTip="{DynamicResource LOCLastPlayed}">
+                                    <StackPanel ToolTip="{DynamicResource LOCLastPlayed}">
                                         <Label Name="PART_ElemLastPlayed" Content="&#xE163;"/>
                                         <TextBlock Name="PART_TextLastActivity"/>
                                     </StackPanel>
@@ -524,62 +516,118 @@
                                                 </Style.Triggers>
                                             </Style>
                                         </StackPanel.Style>
-                                        <Label Content="&#x1F396;"/>
-                                        <TextBlock Text="{DynamicResource Sc_UnlockedString}" Margin="0"/>
-                                        <TextBlock Text=" / " Margin="0"/>
-                                        <TextBlock Text="{DynamicResource Sc_TotalString}"/>
+                                        <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 Orientation="Horizontal" ToolTip="{DynamicResource LOCCompletionStatus}">
+                                    <StackPanel ToolTip="{DynamicResource LOCCompletionStatus}">
                                         <Label Name="PART_ElemCompletionStatus" Content="&#xE10B;"/>
                                         <TextBlock Name="PART_TextCompletionStatus"/>
                                     </StackPanel>
-                                    <Label Content="&#xef25;" FontFamily="{DynamicResource FontIcoFont}" Foreground="{DynamicResource GlyphBrush}" Margin="20,0,20,0"
-                                           Visibility="{Binding Game.Favorite, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+                                </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 Tag="{DynamicResource Htlb_EnableIntegrationInCustomTheme}">
-                                        <Button Name="PART_HltbCustomButton" Content="&#x23F1;" ToolTip="{DynamicResource LOCHowLongToBeat}"
+                                    <StackPanel Orientation="Horizontal">
+                                        <Grid Tag="{DynamicResource Htlb_EnableIntegrationInCustomTheme}">
+                                            <Button Name="PART_HltbCustomButton" Content="&#x23F1;" ToolTip="{DynamicResource LOCHowLongToBeat}"
                                                     FontFamily="{DynamicResource SymbolFont}"/>
-                                        <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>
+                                            <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>
 
-                                    <StackPanel Tag="{DynamicResource Sc_EnableIntegrationInCustomTheme}">
-                                        <Button Name="PART_ScCustomButton" Content="&#x1F396;" ToolTip="SuccessStory"
+                                        <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="Collapsed" />
+                                                <Setter Property="Visibility" Value="Hidden" />
                                                 <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="True">
+                                                    <DataTrigger Binding="{Binding IsMouseOver, RelativeSource={RelativeSource AncestorType=Grid}}"  Value="True">
                                                         <Setter Property="Visibility" Value="Visible" />
                                                     </DataTrigger>
                                                 </Style.Triggers>
                                             </Style>
                                         </StackPanel.Style>
                                     </StackPanel>
-
-                                    <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>
+                                    <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>
 
@@ -759,7 +807,7 @@
                                         </GridEx>
                                     </StackPanel>
 
-                                    <StackPanel Margin="0" DockPanel.Dock="Top">
+                                    <StackPanel Margin="0" DockPanel.Dock="Top" Name="DetailsMiddle">
                                         <StackPanel.Resources>
                                             <Style TargetType="ScrollBar" BasedOn="{StaticResource {x:Type ScrollBar}}">
                                                 <Setter Property="Margin" Value="0"/>
diff --git a/Magpie_Desktop/Views/GridViewGameOverview.xaml b/Magpie_Desktop/Views/GridViewGameOverview.xaml
index 9ba2400..eaded9d 100644
--- a/Magpie_Desktop/Views/GridViewGameOverview.xaml
+++ b/Magpie_Desktop/Views/GridViewGameOverview.xaml
@@ -315,7 +315,7 @@
 
 
                                             <StackPanel Tag="{DynamicResource Sc_EnableIntegrationInCustomTheme}">
-                                                <Button Name="PART_ScCustomButton" Content="&#x1F3C6;"
+                                                <Button Name="PART_ScCustomButton" Content="&#x1F396;" ToolTip="SuccessStory"
                                                     FontFamily="{DynamicResource SymbolFont}" />
                                                 <StackPanel.Style>
                                                     <Style TargetType="StackPanel">
@@ -329,7 +329,7 @@
                                                 </StackPanel.Style>
                                             </StackPanel>
 
-                                            <Button x:Name="PART_ButtonEditGame" Margin="0"
+                                            <Button x:Name="PART_ButtonEditGame" Margin="0" ToolTip="{DynamicResource LOCEditGame}"
                                                 FontFamily="{DynamicResource SymbolFont}" Content="&#xE104;"/>
                                             <StackPanel.Style>
                                                 <Style TargetType="StackPanel">
@@ -391,7 +391,7 @@
                                                         </TextBlock.Style>
                                                     </TextBlock>
                                                 </StackPanel>
-                                                <Separator Margin="0" Background="{DynamicResource HoverBrush}" Grid.Column="2"/>
+                                                <Separator Margin="0,0,5,0" Background="{DynamicResource HoverBrush}" Grid.Column="2"/>
                                             </Grid>
                                             <StackPanel Orientation="Vertical">
                                                 <StackPanel.Resources>
@@ -434,12 +434,12 @@
                                                     <WrapPanel HorizontalAlignment="Center">
                                                         <StackPanel>
                                                             <Label Name="PART_ElemPlayTime" Content="&#x23F3;" ToolTip="{DynamicResource LOCTimePlayed}"/>
-                                                            <TextBlock Name="PART_TextPlayTime" MinWidth="0"/>
+                                                            <TextBlock Name="PART_TextPlayTime" MinWidth="75"/>
                                                         </StackPanel>
                                                         <StackPanel Orientation="Horizontal" Tag="{DynamicResource Htlb_EnableIntegrationInCustomTheme}">
                                                             <StackPanel Orientation="Horizontal" Tag="{DynamicResource Htlb_HasData}" ToolTip="{DynamicResource LOCHowLongToBeat}">
                                                                 <Label Content="&#x23F1;" FontFamily="{DynamicResource SymbolFont}"/>
-                                                                <TextBlock Text="{DynamicResource Htlb_TimeToBeatFormat}" MinWidth="0"/>
+                                                                <TextBlock Text="{DynamicResource Htlb_TimeToBeatFormat}" MinWidth="75"/>
                                                                 <StackPanel.Style>
                                                                     <Style>
                                                                         <Setter Property="Control.Visibility" Value="Collapsed"/>
@@ -464,7 +464,7 @@
                                                         </StackPanel>
                                                         <StackPanel>
                                                             <Label Name="PART_ElemLastPlayed" Content="&#xE163;" ToolTip="{DynamicResource LOCLastPlayed}"/>
-                                                            <TextBlock Name="PART_TextLastActivity" MinWidth="0"/>
+                                                            <TextBlock Name="PART_TextLastActivity" MinWidth="75"/>
                                                         </StackPanel>
                                                         <StackPanel>
                                                             <StackPanel Orientation="Horizontal" Tag="{DynamicResource Sc_HasData}"
@@ -480,18 +480,41 @@
                                                                     </Style>
                                                                 </StackPanel.Style>
                                                                 <Label Content="&#x1F396;"/>
-                                                                <TextBlock Text="{DynamicResource Sc_UnlockedString}" Margin="0,0,0,10" MinWidth="0"/>
-                                                                <TextBlock Text=" / " Margin="0,0,0,10" MinWidth="0"/>
-                                                                <TextBlock Text="{DynamicResource Sc_TotalString}" Margin="0,0,10,10" MinWidth="0"/>
+                                                                <TextBlock Tag="{DynamicResource Sc_PercentageUnlocked}" MinWidth="75" Margin="0,0,10,10">
+                                                                    <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>
                                                                 <Label Name="PART_ElemCompletionStatus" Content="&#xE10B;" ToolTip="{DynamicResource LOCCompletionStatus}"/>
-                                                                <TextBlock Name="PART_TextCompletionStatus" MinWidth="0"/>
+                                                                <TextBlock Name="PART_TextCompletionStatus" MinWidth="75"/>
                                                             </StackPanel>
                                                         </StackPanel>
                                                     </WrapPanel>
-                                                    <Label Content="&#xef25;" Foreground="{DynamicResource GlyphBrush}" Grid.Column="1" FontFamily="{DynamicResource FontIcoFont}"
-                                                           Visibility="{Binding Game.Favorite, Converter={StaticResource BooleanToVisibilityConverter}}" Margin="0,0,20,10"/>
+                                                    <Label Content="&#xef25;" Foreground="{DynamicResource FavoriteColorBrush}" Grid.Column="1" FontFamily="{DynamicResource FontIcoFont}"
+                                                           Visibility="{Binding Game.Favorite, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                                        <Label.Effect>
+                                                            <DropShadowEffect ShadowDepth="0" Color="{DynamicResource FavoriteColor}"
+                                                              Opacity="1" BlurRadius="5"/>
+                                                        </Label.Effect>
+                                                    </Label>
                                                 </Grid>
                                                 <Expander Margin="0,0,0,20" HorizontalAlignment="Stretch">
                                                     <Expander.Header>
diff --git a/Magpie_Desktop/theme.yaml b/Magpie_Desktop/theme.yaml
index 3f95da5..8800226 100644
--- a/Magpie_Desktop/theme.yaml
+++ b/Magpie_Desktop/theme.yaml
@@ -2,9 +2,12 @@ ThemeApiVersion: 1.9.0
 Id: Magpie_Desktop
 Name: Magpie
 Author: Dan Davis
-Version: 0.9.5
+Version: 1.0.0
 Constants:
   - BGModeOn: Off for banners on for backgrounds in details.
+  - GridFavoriteHighlight: Colored border and glow for favorites in grid view.
+  - FavoriteColor: Color of glow favorites' border and star.
+  - FavoriteColorBrush: Color of favorites' border and star.
   - UseAbsoluteExtraMetadataPath: Use absolute path to your Playnite config folder.
   - ExtraMetadataPath: That path; no ending backslash.
   - DetailsViewPanelWidth(640,2560): Width of main details view panel.
diff --git a/Magpie_Desktop_GBV/Constants.xaml b/Magpie_Desktop_GBV/Constants.xaml
index a3f9863..a81f919 100644
--- a/Magpie_Desktop_GBV/Constants.xaml
+++ b/Magpie_Desktop_GBV/Constants.xaml
@@ -72,7 +72,9 @@
     <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>
@@ -86,6 +88,7 @@
     <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" />
 
diff --git a/Magpie_Desktop_GBV/DerivedStyles/DetailsViewGroupStyle.xaml b/Magpie_Desktop_GBV/DerivedStyles/DetailsViewGroupStyle.xaml
index d15e4e0..5bc0a6a 100644
--- a/Magpie_Desktop_GBV/DerivedStyles/DetailsViewGroupStyle.xaml
+++ b/Magpie_Desktop_GBV/DerivedStyles/DetailsViewGroupStyle.xaml
@@ -11,7 +11,7 @@
                     <ExpanderEx BorderThickness="0" SaveGameGroupId="{Binding Name, Mode=OneWay}"
                                 IsExpanded="True">
                         <ExpanderEx.Header>
-                            <Grid HorizontalAlignment="Stretch" Margin="0">
+                            <Grid HorizontalAlignment="Stretch" Background="Transparent" Margin="0">
                                 <Grid.ContextMenu>
                                     <GameGroupMenu />
                                 </Grid.ContextMenu>
diff --git a/Magpie_Desktop_GBV/DerivedStyles/GridViewItemStyle.xaml b/Magpie_Desktop_GBV/DerivedStyles/GridViewItemStyle.xaml
index 055da30..cc996c7 100644
--- a/Magpie_Desktop_GBV/DerivedStyles/GridViewItemStyle.xaml
+++ b/Magpie_Desktop_GBV/DerivedStyles/GridViewItemStyle.xaml
@@ -13,9 +13,35 @@
                           Margin="{Settings ItemSpacingMargin}"
                           x:Name="ItemGrid">
                         <StackPanel Orientation="Vertical">
-                            <Border x:Name="SelectionBorder" Padding="{Settings GridItemMargin}"
-                                    BorderBrush="{DynamicResource GridItemBackgroundBrush}"
-                                    Background="{DynamicResource GridItemBackgroundBrush}">
+                            <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">
@@ -46,12 +72,6 @@
                                         </DrawingBrush.Drawing>
                                     </DrawingBrush>
                                 </Border.OpacityMask>
-                                <Border.Effect>
-                                    <DropShadowEffect ShadowDepth="0"
-                                              Color="Black"
-                                              Opacity=".5"
-                                              BlurRadius="10"/>
-                                </Border.Effect>
                             </Border>
                             <Border MaxHeight="60">
                                 <TextBlock Text="{Binding DisplayName}"
diff --git a/Magpie_Desktop_GBV/Views/DetailsViewGameOverview.xaml b/Magpie_Desktop_GBV/Views/DetailsViewGameOverview.xaml
index 8ec0ed4..43dd226 100644
--- a/Magpie_Desktop_GBV/Views/DetailsViewGameOverview.xaml
+++ b/Magpie_Desktop_GBV/Views/DetailsViewGameOverview.xaml
@@ -133,7 +133,7 @@
                                 <RowDefinition Height="*"/>
                             </Grid.RowDefinitions>
                             <FadeImage x:Name="PART_ImageBackground" Tag="{DynamicResource BGModeOn}"
-                                       Grid.Row="0" HorizontalAlignment="Stretch" RenderOptions.BitmapScalingMode="Fant">
+                                       Grid.Row="0" HorizontalAlignment="Center" RenderOptions.BitmapScalingMode="Fant">
                                 <FadeImage.Resources>
                                     <Style TargetType="Image">
                                         <Style.Triggers>
@@ -428,14 +428,10 @@
                             <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" MinWidth="{Binding ElementName=DetailsLeftPanel, Path=ActualWidth}"/>
+                                    <ColumnDefinition Width="Auto"/>
                                     <ColumnDefinition Width="*"/>
-                                    <ColumnDefinition Width="Auto" MinWidth="{Binding ElementName=DetailsRightPanel, Path=ActualWidth}"/>
+                                    <ColumnDefinition Width="Auto"/>
                                 </Grid.ColumnDefinitions>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                </Grid.RowDefinitions>
                                 <Grid.Resources>
                                     <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
                                         <Setter Property="FontSize" Value="{DynamicResource FontSizeLarger}"/>
@@ -453,38 +449,34 @@
                                         </Style.Triggers>
                                     </Style>
                                 </Grid.Resources>
-                                <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="1" Orientation="Horizontal"
-                                                    VerticalAlignment="Center" HorizontalAlignment="Center">
+                                <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 GlyphLabel}">
+                                        <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>
                                     </StackPanel.Resources>
-                                    <StackPanel Orientation="Horizontal" ToolTip="{DynamicResource LOCTimePlayed}">
+                                    <StackPanel ToolTip="{DynamicResource LOCTimePlayed}">
                                         <Label Name="PART_ElemPlayTime" Content="&#x23F3;"/>
                                         <TextBlock Name="PART_TextPlayTime"/>
                                     </StackPanel>
-                                    <StackPanel Orientation="Horizontal" Tag="{DynamicResource Htlb_EnableIntegrationInCustomTheme}">
+                                    <StackPanel Tag="{DynamicResource Htlb_EnableIntegrationInCustomTheme}">
                                         <StackPanel Orientation="Horizontal" Tag="{DynamicResource Htlb_HasData}" ToolTip="{DynamicResource LOCHowLongToBeat}">
-                                            <Label Content="&#x23F1;" FontFamily="{DynamicResource SymbolFont}"/>
+                                            <Label Content="&#x23F1;"/>
                                             <TextBlock Text="{DynamicResource Htlb_TimeToBeatFormat}"/>
                                             <StackPanel.Style>
                                                 <Style>
@@ -508,7 +500,7 @@
                                             </Style>
                                         </StackPanel.Style>
                                     </StackPanel>
-                                    <StackPanel Orientation="Horizontal" ToolTip="{DynamicResource LOCLastPlayed}">
+                                    <StackPanel ToolTip="{DynamicResource LOCLastPlayed}">
                                         <Label Name="PART_ElemLastPlayed" Content="&#xE163;"/>
                                         <TextBlock Name="PART_TextLastActivity"/>
                                     </StackPanel>
@@ -524,62 +516,118 @@
                                                 </Style.Triggers>
                                             </Style>
                                         </StackPanel.Style>
-                                        <Label Content="&#x1F396;"/>
-                                        <TextBlock Text="{DynamicResource Sc_UnlockedString}" Margin="0"/>
-                                        <TextBlock Text=" / " Margin="0"/>
-                                        <TextBlock Text="{DynamicResource Sc_TotalString}"/>
+                                        <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 Orientation="Horizontal" ToolTip="{DynamicResource LOCCompletionStatus}">
+                                    <StackPanel ToolTip="{DynamicResource LOCCompletionStatus}">
                                         <Label Name="PART_ElemCompletionStatus" Content="&#xE10B;"/>
                                         <TextBlock Name="PART_TextCompletionStatus"/>
                                     </StackPanel>
-                                    <Label Content="&#xef25;" FontFamily="{DynamicResource FontIcoFont}" Foreground="{DynamicResource GlyphBrush}" Margin="20,0,20,0"
-                                           Visibility="{Binding Game.Favorite, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+                                </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 Tag="{DynamicResource Htlb_EnableIntegrationInCustomTheme}">
-                                        <Button Name="PART_HltbCustomButton" Content="&#x23F1;" ToolTip="{DynamicResource LOCHowLongToBeat}"
+                                    <StackPanel Orientation="Horizontal">
+                                        <Grid Tag="{DynamicResource Htlb_EnableIntegrationInCustomTheme}">
+                                            <Button Name="PART_HltbCustomButton" Content="&#x23F1;" ToolTip="{DynamicResource LOCHowLongToBeat}"
                                                     FontFamily="{DynamicResource SymbolFont}"/>
-                                        <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>
+                                            <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>
 
-                                    <StackPanel Tag="{DynamicResource Sc_EnableIntegrationInCustomTheme}">
-                                        <Button Name="PART_ScCustomButton" Content="&#x1F396;" ToolTip="SuccessStory"
+                                        <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="Collapsed" />
+                                                <Setter Property="Visibility" Value="Hidden" />
                                                 <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="True">
+                                                    <DataTrigger Binding="{Binding IsMouseOver, RelativeSource={RelativeSource AncestorType=Grid}}"  Value="True">
                                                         <Setter Property="Visibility" Value="Visible" />
                                                     </DataTrigger>
                                                 </Style.Triggers>
                                             </Style>
                                         </StackPanel.Style>
                                     </StackPanel>
-
-                                    <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>
+                                    <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>
 
@@ -759,7 +807,7 @@
                                         </GridEx>
                                     </StackPanel>
 
-                                    <StackPanel Margin="0" DockPanel.Dock="Top">
+                                    <StackPanel Margin="0" DockPanel.Dock="Top" Name="DetailsMiddle">
                                         <StackPanel.Resources>
                                             <Style TargetType="ScrollBar" BasedOn="{StaticResource {x:Type ScrollBar}}">
                                                 <Setter Property="Margin" Value="0"/>
diff --git a/Magpie_Desktop_GBV/Views/GridViewGameOverview.xaml b/Magpie_Desktop_GBV/Views/GridViewGameOverview.xaml
index fb7191a..7d46626 100644
--- a/Magpie_Desktop_GBV/Views/GridViewGameOverview.xaml
+++ b/Magpie_Desktop_GBV/Views/GridViewGameOverview.xaml
@@ -382,7 +382,7 @@
                                                         <ItemsControl Name="PART_ItemsFeatures"/>
                                                     </GridEx>
                                                 </StackPanel>
-                                                <StackPanel Margin="0" DockPanel.Dock="Top" HorizontalAlignment="Stretch">
+                                                <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"/>
@@ -486,24 +486,16 @@
                                             </Style>
                                         </Grid.Resources>
                                         <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto" MinWidth="{Binding ElementName=DetailsLeftPanel, Path=ActualWidth}"/>
+                                            <ColumnDefinition Width="Auto"/>
                                             <ColumnDefinition Width="*"/>
-                                            <ColumnDefinition Width="Auto" MinWidth="{Binding ElementName=DetailsRightPanel, Path=ActualWidth}"/>
+                                            <ColumnDefinition Width="Auto"/>
                                         </Grid.ColumnDefinitions>
-
-                                        <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="1" Orientation="Horizontal"
-                                                    VerticalAlignment="Center" HorizontalAlignment="Center">
+                                        <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}"/>
@@ -516,13 +508,14 @@
                                                 <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>
                                             </StackPanel.Resources>
-                                            <StackPanel Orientation="Horizontal" ToolTip="{DynamicResource LOCTimePlayed}">
+                                            <StackPanel ToolTip="{DynamicResource LOCTimePlayed}">
                                                 <Label Name="PART_ElemPlayTime" Content="&#x23F3;"/>
                                                 <TextBlock Name="PART_TextPlayTime"/>
                                             </StackPanel>
-                                            <StackPanel Orientation="Horizontal" Tag="{DynamicResource Htlb_EnableIntegrationInCustomTheme}">
+                                            <StackPanel Tag="{DynamicResource Htlb_EnableIntegrationInCustomTheme}">
                                                 <StackPanel Orientation="Horizontal" Tag="{DynamicResource Htlb_HasData}" ToolTip="{DynamicResource LOCHowLongToBeat}">
                                                     <Label Content="&#x23F1;"/>
                                                     <TextBlock Text="{DynamicResource Htlb_TimeToBeatFormat}"/>
@@ -548,7 +541,7 @@
                                                     </Style>
                                                 </StackPanel.Style>
                                             </StackPanel>
-                                            <StackPanel Orientation="Horizontal" ToolTip="{DynamicResource LOCLastPlayed}">
+                                            <StackPanel ToolTip="{DynamicResource LOCLastPlayed}">
                                                 <Label Name="PART_ElemLastPlayed" Content="&#xE163;"/>
                                                 <TextBlock Name="PART_TextLastActivity"/>
                                             </StackPanel>
@@ -564,26 +557,72 @@
                                                         </Style.Triggers>
                                                     </Style>
                                                 </StackPanel.Style>
-                                                <Label Content="&#x1F396;"/>
-                                                <TextBlock Text="{DynamicResource Sc_UnlockedString}" Margin="0"/>
-                                                <TextBlock Text=" / " Margin="0"/>
-                                                <TextBlock Text="{DynamicResource Sc_TotalString}"/>
+                                                <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 Orientation="Horizontal" ToolTip="{DynamicResource LOCCompletionStatus}">
+                                            <StackPanel ToolTip="{DynamicResource LOCCompletionStatus}">
                                                 <Label Name="PART_ElemCompletionStatus" Content="&#xE10B;"/>
                                                 <TextBlock Name="PART_TextCompletionStatus"/>
                                             </StackPanel>
-                                            <Label Content="&#xef25;" FontFamily="{DynamicResource FontIcoFont}" Foreground="{DynamicResource GlyphBrush}" Margin="20,0,20,0"
-                                                   Visibility="{Binding Game.Favorite, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+                                        </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">
-                                                <StackPanel Tag="{DynamicResource Htlb_EnableIntegrationInCustomTheme}">
+                                                <Grid Tag="{DynamicResource Htlb_EnableIntegrationInCustomTheme}">
                                                     <Button Name="PART_HltbCustomButton" Content="&#x23F1;" ToolTip="{DynamicResource LOCHowLongToBeat}"
                                                     FontFamily="{DynamicResource SymbolFont}"/>
-                                                    <StackPanel.Style>
-                                                        <Style TargetType="StackPanel">
+                                                    <Grid.Style>
+                                                        <Style TargetType="Grid">
                                                             <Setter Property="Visibility" Value="Collapsed" />
                                                             <Style.Triggers>
                                                                 <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}"  Value="True">
@@ -591,14 +630,14 @@
                                                                 </DataTrigger>
                                                             </Style.Triggers>
                                                         </Style>
-                                                    </StackPanel.Style>
-                                                </StackPanel>
+                                                    </Grid.Style>
+                                                </Grid>
 
-                                                <StackPanel Tag="{DynamicResource Sc_EnableIntegrationInCustomTheme}">
+                                                <Grid Tag="{DynamicResource Sc_EnableIntegrationInCustomTheme}">
                                                     <Button Name="PART_ScCustomButton" Content="&#x1F396;" ToolTip="SuccessStory"
                                                     FontFamily="{DynamicResource SymbolFont}" />
-                                                    <StackPanel.Style>
-                                                        <Style TargetType="StackPanel">
+                                                    <Grid.Style>
+                                                        <Style TargetType="Grid">
                                                             <Setter Property="Visibility" Value="Collapsed" />
                                                             <Style.Triggers>
                                                                 <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="True">
@@ -606,8 +645,8 @@
                                                                 </DataTrigger>
                                                             </Style.Triggers>
                                                         </Style>
-                                                    </StackPanel.Style>
-                                                </StackPanel>
+                                                    </Grid.Style>
+                                                </Grid>
 
                                                 <Button x:Name="PART_ButtonEditGame" Margin="0" ToolTip="{DynamicResource LOCEditGame}"
                                                 FontFamily="{DynamicResource SymbolFont}" Content="&#xE104;"/>
@@ -623,6 +662,13 @@
                                                     </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;"/>
diff --git a/Magpie_Desktop_GBV/theme.yaml b/Magpie_Desktop_GBV/theme.yaml
index 3fb3a9b..c693432 100644
--- a/Magpie_Desktop_GBV/theme.yaml
+++ b/Magpie_Desktop_GBV/theme.yaml
@@ -2,9 +2,12 @@ ThemeApiVersion: 1.9.0
 Id: Magpie_Desktop_GBV
 Name: Magpie (Grid Banner Variant)
 Author: Dan Davis
-Version: 0.9.5
+Version: 1.0.0
 Constants:
   - BGModeOn: Off for banners on for backgrounds in details.
+  - GridFavoriteHighlight: Colored border and glow for favorites in grid view.
+  - FavoriteColor: Color of glow of favorites' border and star.
+  - FavoriteColorBrush: Color of favorites' border and star.
   - UseAbsoluteExtraMetadataPath: Use absolute path to your Playnite config folder.
   - ExtraMetadataPath: That path; no ending backslash.
   - DetailsViewPanelWidth(640,2560): Width of main details view panel.