diff --git a/ArenaHelper.csproj b/ArenaHelper.csproj
index ab0a419..db9f5ef 100644
--- a/ArenaHelper.csproj
+++ b/ArenaHelper.csproj
@@ -84,6 +84,9 @@
     <Compile Include="Controls\DebugTextBlock.xaml.cs">
       <DependentUpon>DebugTextBlock.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Controls\DeckRating.xaml.cs">
+      <DependentUpon>DeckRating.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Controls\Hero.xaml.cs">
       <DependentUpon>Hero.xaml</DependentUpon>
     </Compile>
@@ -124,6 +127,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Controls\DeckRating.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Controls\Hero.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/ArenaWindow.xaml b/ArenaWindow.xaml
index e7ba240..fca478b 100644
--- a/ArenaWindow.xaml
+++ b/ArenaWindow.xaml
@@ -4,12 +4,16 @@
                       xmlns:controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
                       xmlns:local="clr-namespace:ArenaHelper"
                       xmlns:localcontrols="clr-namespace:ArenaHelper.Controls"
-                      Title="Arena Helper" Height="255" MinHeight="255" MaxHeight="255" Width="400" MinWidth="400" MaxWidth="400"
-                      Background="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" Topmost="True" LocationChanged="MetroWindow_LocationChanged" ShowMaxRestoreButton="False">
+                      Title="Arena Helper" Height="255" MinHeight="255" MaxHeight="255" Width="480" MinWidth="480" MaxWidth="480"
+                      Background="{DynamicResource WindowBackground}" Topmost="True" LocationChanged="MetroWindow_LocationChanged" ShowMaxRestoreButton="False">
     <controls:MetroWindow.Resources>
         <Style TargetType="{x:Type Hyperlink}" BasedOn="{StaticResource {x:Type Hyperlink}}" x:Key="HyperlinkAboutStyle">
             <Setter Property="Foreground" Value="#0088ff" />
         </Style>
+        <SolidColorBrush x:Key="WindowBackground" Color="#696969" />
+        <SolidColorBrush x:Key="SeparatorBackground" Color="#a0a0a0" />
+        <SolidColorBrush x:Key="PortraitBackground" Color="#a0a0a0" />
+        <SolidColorBrush x:Key="TextColor" Color="#ffffff" />
     </controls:MetroWindow.Resources>
     <controls:MetroWindow.RightWindowCommands>
         <controls:WindowCommands>
@@ -39,7 +43,7 @@
     <controls:MetroWindow.Flyouts>
         <controls:FlyoutsControl Margin="{Binding TitleBarMargin, RelativeSource={RelativeSource AncestorType=local:ArenaWindow}}">
             <!-- Options -->
-            <controls:Flyout x:Name="FlyoutOptions" Header="Options" Position="Left" Width="400">
+            <controls:Flyout x:Name="FlyoutOptions" Header="Options" Position="Left" Width="480">
                 <StackPanel>
                     <CheckBox x:Name="CheckBoxOverlay" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="8,0,0,0" Checked="CheckBoxOverlay_Checked" Unchecked="CheckBoxOverlay_Unchecked" Content="Show values in overlay" />
                     <CheckBox x:Name="CheckBoxManual" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="8,8,0,0" Checked="CheckBoxManual_Checked" Unchecked="CheckBoxManual_Unchecked">
@@ -51,17 +55,17 @@
             </controls:Flyout>
 
             <!-- About -->
-            <controls:Flyout x:Name="FlyoutAbout" Header="About" CloseButtonVisibility="Collapsed" Position="Left" Width="400">
+            <controls:Flyout x:Name="FlyoutAbout" Header="About" CloseButtonVisibility="Collapsed" Position="Left" Width="480">
                 <StackPanel Margin="5">
                     <TextBlock Margin="10,5,10,15" FontWeight="SemiBold" FontSize="13" TextWrapping="Wrap">
                         <Run Text="Arena Helper " /><Run Text="{Binding StringVersion, Mode=OneWay}" /><Run Text=" was made by " /><Hyperlink NavigateUri="{Binding StringWebsite}" RequestNavigate="Hyperlink_RequestNavigate" Style="{StaticResource HyperlinkAboutStyle}">Rembound</Hyperlink>
                         <Run Text="with support from the community at GitHub." />
                         <Run Text="Thanks go out to Grinning Goat for providing " /><Hyperlink NavigateUri="{Binding StringTierList}" RequestNavigate="Hyperlink_RequestNavigate" Style="{StaticResource HyperlinkAboutStyle}">Hearthstone Arena Tier List</Hyperlink><Run Text="!" />
                         <LineBreak /><LineBreak />
-                        <Hyperlink NavigateUri="{Binding StringDonate}" RequestNavigate="Hyperlink_RequestNavigate" Style="{StaticResource HyperlinkAboutStyle}">Donate</Hyperlink><Run Text=" to help support development. Thank you!" />
+                        <Run Text="Thanks for your support! Any " /><Hyperlink NavigateUri="{Binding StringDonate}" RequestNavigate="Hyperlink_RequestNavigate" Style="{StaticResource HyperlinkAboutStyle}">donation</Hyperlink><Run Text=" is greatly appreciated." />
                     </TextBlock>
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                        <Button Name="AboutDonate" Content="donate" Width="60" Margin="0,0,0,0" Height="30" Style="{DynamicResource AccentedSquareButtonStyle}" Click="AboutDonate_Click"/>
+                        <Button Name="AboutDonate" Content="donate" Width="60" Margin="0,0,0,0" Height="30" Style="{DynamicResource SquareButtonStyle}" Click="AboutDonate_Click"/>
                         <Button Name="AboutVisitWebsite" Content="rembound.com" Margin="10,0,0,0" Width="100" Height="30" Style="{DynamicResource SquareButtonStyle}" Click="AboutVisitWebsite_Click"/>
                         <Button Name="AboutVisitGitHub" Content="github" Width="60" Margin="10,0,0,0" Height="30" Style="{DynamicResource SquareButtonStyle}" Click="AboutVisitGitHub_Click"/>
                         <Button Name="AboutButtonClose" Content="close" Width="60" Margin="10,0,0,0" Height="30" Style="{DynamicResource SquareButtonStyle}" Click="AboutButtonClose_Click"/>
@@ -70,7 +74,7 @@
             </controls:Flyout>
 
             <!-- Update -->
-            <controls:Flyout x:Name="FlyoutUpdate" Header="Update available!" CloseButtonVisibility="Collapsed" Position="Left" Width="400">
+            <controls:Flyout x:Name="FlyoutUpdate" Header="Update available!" CloseButtonVisibility="Collapsed" Position="Left" Width="480">
                 <StackPanel Margin="5">
                     <TextBlock x:Name="UpdateText" Margin="10,5,10,15" FontWeight="SemiBold" FontSize="13" TextWrapping="Wrap">
                         <Run Text="Press &quot;download&quot; to automatically download and install the new update. This will restart Hearthstone Deck Tracker." />
@@ -84,16 +88,16 @@
             </controls:Flyout>
 
             <!-- Data Update -->
-            <controls:Flyout x:Name="FlyoutDataUpdate" Header="Data update applied!" CloseButtonVisibility="Collapsed" Position="Left" Width="400">
+            <controls:Flyout x:Name="FlyoutDataUpdate" Header="Data update applied!" CloseButtonVisibility="Collapsed" Position="Left" Width="480">
                 <StackPanel Margin="5">
                     <TextBlock Margin="10,5,10,15" FontWeight="SemiBold" FontSize="13" TextWrapping="Wrap">
                         <Run Text="The tier list and card data was updated to the latest version." />
                         <Run Text="More info about the tier list can be found at: " /><Hyperlink NavigateUri="{Binding StringTierList}" RequestNavigate="Hyperlink_RequestNavigate" Style="{StaticResource HyperlinkAboutStyle}">Hearthstone Arena Tier List</Hyperlink>
                         <LineBreak /><LineBreak />
-                        <Hyperlink NavigateUri="{Binding StringDonate}" RequestNavigate="Hyperlink_RequestNavigate" Style="{StaticResource HyperlinkAboutStyle}">Donate</Hyperlink><Run Text=" to help support development. Thank you!" />
+                        <Run Text="Thanks for your support! Any " /><Hyperlink NavigateUri="{Binding StringDonate}" RequestNavigate="Hyperlink_RequestNavigate" Style="{StaticResource HyperlinkAboutStyle}">donation</Hyperlink><Run Text=" is greatly appreciated." />
                     </TextBlock>
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                        <Button Name="DataUpdateDonate" Content="donate" Width="60" Margin="0,0,0,0" Height="30" Style="{DynamicResource AccentedSquareButtonStyle}" Click="AboutDonate_Click"/>
+                        <Button Name="DataUpdateDonate" Content="donate" Width="60" Margin="0,0,0,0" Height="30" Style="{DynamicResource SquareButtonStyle}" Click="AboutDonate_Click"/>
                         <Button Name="DataUpdateWebsite" Content="rembound.com" Margin="10,0,0,0" Width="100" Height="30" Style="{DynamicResource SquareButtonStyle}" Click="AboutVisitWebsite_Click"/>
                         <Button Name="DataUpdateGitHub" Content="github" Width="60" Margin="10,0,0,0" Height="30" Style="{DynamicResource SquareButtonStyle}" Click="AboutVisitGitHub_Click"/>
                         <Button Name="DataUpdateClose" Content="close" Width="60" Margin="10,0,0,0" Height="30" Style="{DynamicResource SquareButtonStyle}" Click="DataUpdateClose_Click"/>
@@ -108,6 +112,8 @@
             <RowDefinition Height="auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
+
+        <!-- Top Panel -->
         <StackPanel Grid.Row="0">
             <Grid>
                 <Grid.ColumnDefinitions>
@@ -115,12 +121,12 @@
                     <ColumnDefinition Width="auto" />
                 </Grid.ColumnDefinitions>
                 <WrapPanel Grid.Column="0">
-                    <Border Height="40" Width="40" Background="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" Margin="4" MouseUp="ConfigureHero_MouseUp" >
+                    <Border Height="40" Width="40" Background="{DynamicResource PortraitBackground}" Margin="4" MouseUp="ConfigureHero_MouseUp" >
                         <Grid>
                             <Image x:Name="PickedHeroImage" Width="32" Height="32" />
                         </Grid>
                     </Border>
-                    <Label x:Name="DeckName" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}" Content="Deckname" FontSize="14" Margin="0" />
+                    <Label x:Name="DeckName" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="{DynamicResource TextColor}" Content="Deckname" FontSize="14" Margin="0" />
                 </WrapPanel>
 
                 <WrapPanel Grid.Column="1" VerticalAlignment="Center">
@@ -128,7 +134,7 @@
                     <Button x:Name="Button2" Width="70" Content="Save Deck" Margin="0 0 8 0" Click="ButtonSave_Click" />
                 </WrapPanel>
             </Grid>
-            <Separator/>
+            <Separator Background="{DynamicResource SeparatorBackground}" />
         </StackPanel>
         
         <!-- DetectingPanel -->
@@ -140,14 +146,14 @@
                 <RowDefinition Height="auto" />
             </Grid.RowDefinitions>
 
-            <local:OutlinedTextBlock Grid.Row="0" x:Name="DetectingHeader" HorizontalAlignment="Center" FontFamily="/ArenaHelper;component/resources/#Belwe Bd BT" FontSize="20" Text="Title" Margin="0,4,0,0" />
-            <TextBlock Grid.Row="1" x:Name="DetectingText" TextWrapping="Wrap" TextAlignment="Center" Foreground="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}" Margin="0,12,0,0">text</TextBlock>
-            <TextBlock Grid.Row="2" x:Name="DetectingText2" TextWrapping="Wrap" TextAlignment="Center" Foreground="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}" Margin="0,20,0,0">text</TextBlock>
+            <local:OutlinedTextBlock Grid.Row="0" x:Name="DetectingHeader" HorizontalAlignment="Center" FontFamily="/ArenaHelper;component/resources/#Belwe Bd BT" FontSize="20" Text="Title" Margin="0,8,0,0" />
+            <TextBlock Grid.Row="1" x:Name="DetectingText" TextWrapping="Wrap" TextAlignment="Center" Foreground="{DynamicResource TextColor}" Margin="0,12,0,0">text</TextBlock>
+            <TextBlock Grid.Row="2" x:Name="DetectingText2" TextWrapping="Wrap" TextAlignment="Center" Foreground="{DynamicResource TextColor}" Margin="0,20,0,0">text</TextBlock>
         </Grid>
 
         <!-- HeroPanel -->
         <StackPanel x:Name="HeroPanel" Grid.Row="1" Width="200" Visibility="Hidden">
-            <local:OutlinedTextBlock HorizontalAlignment="Center" FontFamily="/ArenaHelper;component/resources/#Belwe Bd BT" FontSize="20" Text="Detected Heroes" Margin="0,4,0,0" />
+            <local:OutlinedTextBlock HorizontalAlignment="Center" FontFamily="/ArenaHelper;component/resources/#Belwe Bd BT" FontSize="20" Text="Detected Heroes" Margin="0,8,0,0" />
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="*" />
@@ -161,9 +167,10 @@
                 <localcontrols:Hero Grid.Row="0" Grid.Column="1" Margin="0,16,0,0" x:Name="Hero1" />
                 <localcontrols:Hero Grid.Row="0" Grid.Column="2" Margin="0,16,0,0" x:Name="Hero2" />
             </Grid>
-            <TextBlock x:Name="DetectedHeroesWarning" TextWrapping="Wrap" TextAlignment="Center" Foreground="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}" Margin="0,20,0,0">text</TextBlock>
+            <TextBlock x:Name="DetectedHeroesWarning" TextWrapping="Wrap" TextAlignment="Center" Foreground="{DynamicResource TextColor}" Margin="0,20,0,0">text</TextBlock>
         </StackPanel>
 
+        <!-- ConfigureHeroPanel -->
         <StackPanel x:Name="ConfigureHeroPanel" Grid.Row="1" Width="300" Visibility="Hidden">
             <local:OutlinedTextBlock HorizontalAlignment="Center" FontFamily="/ArenaHelper;component/resources/#Belwe Bd BT" FontSize="20" Text="Select Hero" Margin="0,4,0,0" />
             <Grid>
@@ -194,23 +201,40 @@
         </StackPanel>
 
         <!-- CardPanel -->
-        <Grid x:Name="CardPanel" Grid.Row="1" HorizontalAlignment="Center" Visibility="Hidden">
+        <Grid x:Name="CardPanel" Grid.Row="1" HorizontalAlignment="Left" Visibility="Hidden">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="auto" />
                 <ColumnDefinition Width="auto" />
+                <ColumnDefinition Width="auto" />
             </Grid.ColumnDefinitions>
-            <StackPanel Grid.Column="0">
-                <local:OutlinedTextBlock x:Name="Header" HorizontalAlignment="Center" FontFamily="/ArenaHelper;component/resources/#Belwe Bd BT" FontSize="20" Text="header" Margin="0,4,0,0" />
-                <localcontrols:Card x:Name="CardControl0" DataContext="{Binding Card0}" HorizontalAlignment="Center" Margin="0,12,0,0" MouseUp="CardControl0_MouseUp" />
+            <localcontrols:DeckRating x:Name="DeckRatingControl0" Grid.Column="0" Margin="16,0,0,0" />
+            <StackPanel Grid.Column="1" Margin="24,0,0,0">
+                <local:OutlinedTextBlock x:Name="Header" HorizontalAlignment="Center" FontFamily="/ArenaHelper;component/resources/#Belwe Bd BT" FontSize="20" Text="header" Margin="0,8,0,0" />
+                <localcontrols:Card x:Name="CardControl0" DataContext="{Binding Card0}" HorizontalAlignment="Center" Margin="0,15,0,0" MouseUp="CardControl0_MouseUp" />
                 <localcontrols:Card x:Name="CardControl1" DataContext="{Binding Card1}" HorizontalAlignment="Center" Margin="0,4,0,0" MouseUp="CardControl1_MouseUp" />
                 <localcontrols:Card x:Name="CardControl2" DataContext="{Binding Card2}" HorizontalAlignment="Center" Margin="0,4,0,0" MouseUp="CardControl2_MouseUp" />
             </StackPanel>
-            <StackPanel Grid.Column="1" Visibility="Visible" HorizontalAlignment="Center" Margin="32,0,0,0">
-                <local:OutlinedTextBlock HorizontalAlignment="Center" FontFamily="/ArenaHelper;component/resources/#Belwe Bd BT" FontSize="20" Text="Value" Margin="0,4,0,0" />
-                <Label x:Name="Value0" Height="35" VerticalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center"  Foreground="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}" Content="80" FontSize="14" Margin="0,12,0,0" />
-                <Label x:Name="Value1" Height="35" VerticalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}" Content="80" FontSize="14" Margin="0,4,0,0" />
-                <Label x:Name="Value2" Height="35" VerticalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}" Content="80" FontSize="14" Margin="0,4,0,0" />
+            <StackPanel Grid.Column="2" Visibility="Visible" HorizontalAlignment="Center" Margin="24,0,0,0">
+                <local:OutlinedTextBlock HorizontalAlignment="Center" FontFamily="/ArenaHelper;component/resources/#Belwe Bd BT" FontSize="20" Text="Value" Margin="0,8,0,0" />
+                <Label x:Name="Value0" Height="34" VerticalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center"  Foreground="{DynamicResource TextColor}" Content="80" FontSize="14" Margin="0,14,0,0" />
+                <Label x:Name="Value1" Height="34" VerticalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="{DynamicResource TextColor}" Content="80" FontSize="14" Margin="0,4,0,0" />
+                <Label x:Name="Value2" Height="34" VerticalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="{DynamicResource TextColor}" Content="80" FontSize="14" Margin="0,4,0,0" />
             </StackPanel>
         </Grid>
+
+        <!-- DonePanel -->
+        <Grid x:Name="DonePanel" Grid.Row="1" HorizontalAlignment="Left" Visibility="Hidden">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="auto" />
+                <ColumnDefinition Width="auto" />
+            </Grid.ColumnDefinitions>
+            <localcontrols:DeckRating x:Name="DeckRatingControl1" Grid.Column="0" Margin="16,0,0,0" />
+            <Grid Grid.Column="1" HorizontalAlignment="Center" Margin="72,0,16,0">
+                <StackPanel Grid.Column="1" >
+                    <local:OutlinedTextBlock HorizontalAlignment="Center" FontFamily="/ArenaHelper;component/resources/#Belwe Bd BT" FontSize="20" Text="Done" Margin="0,8,0,0" />
+                    <TextBlock TextWrapping="Wrap" Width="200" TextAlignment="Center" Foreground="{DynamicResource TextColor}" Margin="0,12,0,0">All cards are picked. You can start a new arena run or save the deck.</TextBlock>
+                </StackPanel>
+            </Grid>
+        </Grid>
     </Grid>
 </controls:MetroWindow>
\ No newline at end of file
diff --git a/ArenaWindow.xaml.cs b/ArenaWindow.xaml.cs
index 9be69d6..e12df0a 100644
--- a/ArenaWindow.xaml.cs
+++ b/ArenaWindow.xaml.cs
@@ -14,6 +14,7 @@
 using MahApps.Metro.Controls.Dialogs;
 using System.Windows.Navigation;
 using System.Diagnostics;
+using MahApps.Metro;
 
 #endregion
 
diff --git a/Controls/DeckRating.xaml b/Controls/DeckRating.xaml
new file mode 100644
index 0000000..3d1d26a
--- /dev/null
+++ b/Controls/DeckRating.xaml
@@ -0,0 +1,20 @@
+<UserControl x:Class="ArenaHelper.Controls.DeckRating"
+             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:local="clr-namespace:ArenaHelper"
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <local:OutlinedTextBlock Grid.Row="0"  HorizontalAlignment="Center" FontFamily="/ArenaHelper;component/resources/#Belwe Bd BT" FontSize="20" Text="Deck Average" Margin="0,8,0,0" />
+        <Grid  Grid.Row="1" VerticalAlignment="Top" Margin="0,15,0,0">
+            <Ellipse Width="110" Height="110" Fill="#494949" Stroke="#2f2f2f" StrokeThickness="3"></Ellipse>
+            <TextBlock x:Name="DeckRatingText" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="#f7f7f7" FontFamily="/ArenaHelper;component/resources/#Belwe Bd BT" FontSize="32" Text="65.3"/>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/Controls/DeckRating.xaml.cs b/Controls/DeckRating.xaml.cs
new file mode 100644
index 0000000..ceebba5
--- /dev/null
+++ b/Controls/DeckRating.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace ArenaHelper.Controls
+{
+    /// <summary>
+    /// Interaction logic for DeckRating.xaml
+    /// </summary>
+    public partial class DeckRating : UserControl
+    {
+        public DeckRating()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Controls/Hero.xaml b/Controls/Hero.xaml
index d077b2b..9d47d40 100644
--- a/Controls/Hero.xaml
+++ b/Controls/Hero.xaml
@@ -6,8 +6,11 @@
              xmlns:local="clr-namespace:ArenaHelper"
              mc:Ignorable="d" 
              d:DesignHeight="200" d:DesignWidth="200">
+    <UserControl.Resources>
+        <SolidColorBrush x:Key="PortraitBackground" Color="#a0a0a0" />
+    </UserControl.Resources>
     <StackPanel VerticalAlignment="Center">
-        <Border x:Name="HeroBorder" Height="40" Width="40"  Grid.Row="0" Grid.Column="0" Background="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" Margin="0,0,0,0" MouseUp="Hero_MouseUp">
+        <Border x:Name="HeroBorder" Height="40" Width="40"  Grid.Row="0" Grid.Column="0" Background="{StaticResource PortraitBackground}" Margin="0,0,0,0" MouseUp="Hero_MouseUp">
             <Image x:Name="HeroImage" Width="32" Height="32"  Margin="0,0,0,0" />
         </Border>
         <local:OutlinedTextBlock x:Name="HeroName" VerticalAlignment="Bottom" HorizontalAlignment="Center" Text="Paladin" FontFamily="/ArenaHelper;component/resources/#Belwe Bd BT" TextAlignment="Left" FontSize="13" Margin="0,4,0,0" />
diff --git a/Plugin.cs b/Plugin.cs
index 8d794a4..2fd2c73 100644
--- a/Plugin.cs
+++ b/Plugin.cs
@@ -117,6 +117,7 @@ public class ArenaData
             public List<string> detectedheroes;
             public string pickedhero;
             public List<Tuple<string, string, string>> detectedcards;
+            public List<Tuple<double, double, double>> cardrating;
             public List<string> pickedcards;
 
             public ArenaData()
@@ -126,6 +127,7 @@ public ArenaData()
                 detectedheroes = new List<string>();
                 pickedhero = "";
                 detectedcards = new List<Tuple<string, string, string>>();
+                cardrating = new List<Tuple<double, double, double>>();
                 pickedcards = new List<string>();
             }
         }
@@ -135,6 +137,7 @@ public enum PluginState { Idle, SearchHeroes, SearchBigHero, DetectedHeroes, Sea
         private List<Detection.DetectedInfo> detectedcards = new List<Detection.DetectedInfo>();
         private List<Detection.DetectedInfo> detectedheroes = new List<Detection.DetectedInfo>();
         private List<Detection.DetectedInfo> detectedbighero = new List<Detection.DetectedInfo>();
+        private List<double> currentcardvalues = new List<double>();
         private static PluginState state;
         private List<int> mouseindex = new List<int>();
         private ArenaData arenadata = new ArenaData();
@@ -251,7 +254,7 @@ public string Author
 
         public Version Version
         {
-            get { return new Version("0.8.4"); }
+            get { return new Version("0.8.5"); }
         }
 
         public MenuItem MenuItem
@@ -775,6 +778,8 @@ private void LoadArenaData(string filename)
                         // Set the data
                         arenadata = loadedarenadata;
                         validarenadata = true;
+
+                        Log.Info("Arena Helper: Card Rating: " + arenadata.cardrating.Count);
                     }
                     else
                     {
@@ -883,6 +888,7 @@ private void NewArena()
             arenadata.detectedheroes.Clear();
             arenadata.pickedhero = "";
             arenadata.detectedcards.Clear();
+            arenadata.cardrating.Clear();
             arenadata.pickedcards.Clear();
 
             // Invalidate arena
@@ -1248,6 +1254,7 @@ private void SetState(PluginState newstate)
                 arenawindow.ConfigureHeroPanel.Visibility = System.Windows.Visibility.Visible;
                 arenawindow.HeroPanel.Visibility = System.Windows.Visibility.Hidden;
                 arenawindow.CardPanel.Visibility = System.Windows.Visibility.Hidden;
+                arenawindow.DonePanel.Visibility = System.Windows.Visibility.Hidden;
             } else if (!stablearena && state != PluginState.Done)
             {
                 ShowOverlay(false);
@@ -1257,6 +1264,7 @@ private void SetState(PluginState newstate)
                 arenawindow.ConfigureHeroPanel.Visibility = System.Windows.Visibility.Hidden;
                 arenawindow.HeroPanel.Visibility = System.Windows.Visibility.Hidden;
                 arenawindow.CardPanel.Visibility = System.Windows.Visibility.Hidden;
+                arenawindow.DonePanel.Visibility = System.Windows.Visibility.Hidden;
             }
             else if (newstate == PluginState.SearchHeroes)
             {
@@ -1269,6 +1277,7 @@ private void SetState(PluginState newstate)
                 arenawindow.ConfigureHeroPanel.Visibility = System.Windows.Visibility.Hidden;
                 arenawindow.HeroPanel.Visibility = System.Windows.Visibility.Hidden;
                 arenawindow.CardPanel.Visibility = System.Windows.Visibility.Hidden;
+                arenawindow.DonePanel.Visibility = System.Windows.Visibility.Hidden;
             }
             else if (newstate == PluginState.SearchBigHero)
             {
@@ -1278,6 +1287,7 @@ private void SetState(PluginState newstate)
                 arenawindow.ConfigureHeroPanel.Visibility = System.Windows.Visibility.Hidden;
                 arenawindow.HeroPanel.Visibility = System.Windows.Visibility.Visible;
                 arenawindow.CardPanel.Visibility = System.Windows.Visibility.Hidden;
+                arenawindow.DonePanel.Visibility = System.Windows.Visibility.Hidden;
             }
             else if (newstate == PluginState.DetectedHeroes)
             {
@@ -1287,6 +1297,7 @@ private void SetState(PluginState newstate)
                 arenawindow.ConfigureHeroPanel.Visibility = System.Windows.Visibility.Hidden;
                 arenawindow.HeroPanel.Visibility = System.Windows.Visibility.Visible;
                 arenawindow.CardPanel.Visibility = System.Windows.Visibility.Hidden;
+                arenawindow.DonePanel.Visibility = System.Windows.Visibility.Hidden;
             }
             else if (newstate == PluginState.SearchCards)
             {
@@ -1300,6 +1311,7 @@ private void SetState(PluginState newstate)
                 arenawindow.ConfigureHeroPanel.Visibility = System.Windows.Visibility.Hidden;
                 arenawindow.HeroPanel.Visibility = System.Windows.Visibility.Hidden;
                 arenawindow.CardPanel.Visibility = System.Windows.Visibility.Hidden;
+                arenawindow.DonePanel.Visibility = System.Windows.Visibility.Hidden;
             }
             else if (newstate == PluginState.SearchCardValues)
             {
@@ -1312,6 +1324,7 @@ private void SetState(PluginState newstate)
                 arenawindow.ConfigureHeroPanel.Visibility = System.Windows.Visibility.Hidden;
                 arenawindow.HeroPanel.Visibility = System.Windows.Visibility.Hidden;
                 arenawindow.CardPanel.Visibility = System.Windows.Visibility.Hidden;
+                arenawindow.DonePanel.Visibility = System.Windows.Visibility.Hidden;
             }
             else if (newstate == PluginState.DetectedCards)
             {
@@ -1320,15 +1333,18 @@ private void SetState(PluginState newstate)
                 arenawindow.ConfigureHeroPanel.Visibility = System.Windows.Visibility.Hidden;
                 arenawindow.HeroPanel.Visibility = System.Windows.Visibility.Hidden;
                 arenawindow.CardPanel.Visibility = System.Windows.Visibility.Visible;
+                arenawindow.DonePanel.Visibility = System.Windows.Visibility.Hidden;
             }
             else if (newstate == PluginState.Done)
             {
+                arenawindow.DeckRatingControl1.DeckRatingText.Text = GetDeckRating().ToString("0.##", System.Globalization.CultureInfo.InvariantCulture);
+
                 ShowOverlay(false);
-                SetDetectingText("Done", DoneMessage, "");
-                arenawindow.DetectingPanel.Visibility = System.Windows.Visibility.Visible;
+                arenawindow.DetectingPanel.Visibility = System.Windows.Visibility.Hidden;
                 arenawindow.ConfigureHeroPanel.Visibility = System.Windows.Visibility.Hidden;
                 arenawindow.HeroPanel.Visibility = System.Windows.Visibility.Hidden;
                 arenawindow.CardPanel.Visibility = System.Windows.Visibility.Hidden;
+                arenawindow.DonePanel.Visibility = System.Windows.Visibility.Visible;
             }
         }
 
@@ -1838,11 +1854,11 @@ private async Task SearchCardValues()
 
             // Get the actual numerical value
             double maxvalue = 0;
-            List<double> cardvalues = new List<double>();
+            currentcardvalues.Clear();
             for (int i = 0; i < 3; i++)
             {
                 double dval = GetNumericalValue(values[i]);
-                cardvalues.Add(dval);
+                currentcardvalues.Add(dval);
 
                 if (i == 0 || dval > maxvalue)
                 {
@@ -1856,7 +1872,7 @@ private async Task SearchCardValues()
                 SetValueText(i, values[i]);
                 
                 // Highlight the card with the highest value, if no cards are missing
-                if (!missing && cardvalues[i] == maxvalue)
+                if (!missing && currentcardvalues[i] == maxvalue)
                 {
                     valueoverlays[i].GradientStop1.Color = System.Windows.Media.Color.FromArgb(0xFF, 0xf5, 0xdb, 0x4c);
                     valueoverlays[i].GradientStop2.Color = System.Windows.Media.Color.FromArgb(0xFF, 0x8b, 0x68, 0x11);
@@ -2055,7 +2071,22 @@ private void PickCard(int pickindex)
                 Log.Info("AH: Missed a pick");
             }
 
+            // Add picked card
             arenadata.pickedcards.Add(cardid);
+
+            // Add card rating
+            double cardval0 = 0;
+            double cardval1 = 0;
+            double cardval2 = 0;
+            if (currentcardvalues.Count == 3)
+            {
+                cardval0 = currentcardvalues[0];
+                cardval1 = currentcardvalues[1];
+                cardval2 = currentcardvalues[2];
+            }
+            arenadata.cardrating.Add(new Tuple<double, double, double>(cardval0, cardval1, cardval2));
+
+            // Save
             SaveArenaData();
 
             plugins.CardPicked(arenadata, pickindex, pickedcard);
@@ -2141,6 +2172,47 @@ private void UpdateTitle()
         {
             arenawindow.Header.Text = "Picking card " + (arenadata.pickedcards.Count + 1) + "/" + MaxCardCount;
             arenawindow.DeckName.Content = arenadata.deckname;
+            arenawindow.DeckRatingControl0.DeckRatingText.Text = GetDeckRating().ToString("0.##", System.Globalization.CultureInfo.InvariantCulture);
+        }
+
+        private double GetDeckRating()
+        {
+            int pcount = arenadata.pickedcards.Count;
+            int dcount = arenadata.detectedcards.Count;
+            int ccount = arenadata.cardrating.Count;
+
+            // Check if valid counts
+            if (!(pcount > 0 && pcount <= dcount && pcount == ccount))
+            {
+                return 0;
+            }
+
+            // Calculate total rating
+            double totalrating = 0;
+            for (int i = 0; i < pcount; i++)
+            {
+                string curcard = arenadata.pickedcards[i];
+                double curcardval = 0;
+                if (curcard == arenadata.detectedcards[i].Item1)
+                {
+                    curcardval = arenadata.cardrating[i].Item1;
+                }
+                else if (curcard == arenadata.detectedcards[i].Item2)
+                {
+                    curcardval = arenadata.cardrating[i].Item2;
+                }
+                else if (curcard == arenadata.detectedcards[i].Item3)
+                {
+                    curcardval = arenadata.cardrating[i].Item3;
+                }
+
+                totalrating += curcardval;
+            }
+
+
+            // Return average
+            double deckrating = totalrating / (double)pcount;
+            return deckrating;
         }
 
         private void SetDetectingText(string title, string text, string text2)