From 36e59877ff5ac66a6f07ca7f9de2687d20998b94 Mon Sep 17 00:00:00 2001
From: Josef Nemec <nemecjosef@gmail.com>
Date: Fri, 21 Apr 2017 09:26:23 +0200
Subject: [PATCH 1/3] Renamed build output files.

---
 .gitignore      | 4 ++--
 build/build.ps1 | 2 +-
 build/setup.nsi | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8ea2767e7..fad411266 100644
--- a/.gitignore
+++ b/.gitignore
@@ -261,8 +261,8 @@ paket-files/
 .vscode/
 
 build/nuget.exe
-build/playnite.exe
-build/playnite.zip
+build/PlayniteInstaller.exe
+build/PlaynitePortable.zip
 build/TestPackage/*
 build/PlayniteServices/*
 
diff --git a/build/build.ps1 b/build/build.ps1
index 47477830b..fb3f19ad6 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -99,7 +99,7 @@ if ($Portable -and $appCompileSuccess)
 {
     Write-Host "Building portable package..." -ForegroundColor Green
 
-    $packageName = "playnite.zip"
+    $packageName = "PlaynitePortable.zip"
 
     if (Test-path $packageName)
     {
diff --git a/build/setup.nsi b/build/setup.nsi
index c394ac1df..c2d4b2a3e 100644
--- a/build/setup.nsi
+++ b/build/setup.nsi
@@ -6,7 +6,7 @@
 
 Var /GLOBAL ProgressOnly
 Var /GLOBAL Portable
-OutFile "playnite.exe"
+OutFile "PlayniteInstaller.exe"
 Unicode true
 SetCompressor /SOLID lzma
 

From 4284b92b07cba9560c4a87fe2603823bc7a52122 Mon Sep 17 00:00:00 2001
From: Josef Nemec <nemecjosef@gmail.com>
Date: Thu, 27 Apr 2017 16:11:10 +0200
Subject: [PATCH 2/3] Some progress in making new tests and UI testability
 improvements.

---
 source/Playnite/Database/GameDatabase.cs      |   4 +
 .../PlayniteUI/Controls/FilterSelector.xaml   |  12 +-
 .../Controls/FilterSelectorItem.xaml          |  11 +-
 .../Controls/FilterSelectorItem.xaml.cs       |  87 ++++++-
 source/PlayniteUI/Controls/GameDetails.xaml   |  12 +-
 source/PlayniteUI/Controls/GamePopupMenu.xaml |  94 ++++---
 .../PlayniteUI/Controls/GamePopupMenu.xaml.cs |  18 +-
 .../Controls/GamePopupMenuMulti.xaml          |  27 +-
 .../Controls/GamePopupMenuMulti.xaml.cs       |  10 +-
 source/PlayniteUI/Controls/GameTaskView.xaml  |  10 +-
 .../PlayniteUI/Controls/GamesImagesView.xaml  |  35 +--
 source/PlayniteUI/Controls/GamesListView.xaml |   6 +-
 .../PlayniteUI/Controls/ProgressControl.xaml  |   2 +-
 .../Controls/ProgressControl.xaml.cs          |   4 +-
 source/PlayniteUI/Controls/SearchBox.xaml     |   4 +-
 .../Converters/LiteDBImageToImageConverter.cs |  11 +-
 source/PlayniteUI/Images/close.png            | Bin 0 -> 334 bytes
 source/PlayniteUI/PlayniteUI.csproj           |   5 +
 source/PlayniteUI/Theme.xaml                  | 246 ++----------------
 source/PlayniteUI/Windows/AboutWindow.xaml    |  18 +-
 .../Windows/CategoryConfigWindow.xaml         |   3 +-
 .../Windows/CrashHandlerWindow.xaml           |   6 +-
 .../Windows/FirstTimeStartupWindow.xaml       |  48 ++--
 source/PlayniteUI/Windows/GameEditWindow.xaml |  68 ++---
 .../PlayniteUI/Windows/GameEditWindow.xaml.cs |  36 +--
 .../Windows/InstalledGamesWindow.xaml         |   8 +-
 source/PlayniteUI/Windows/MainWindow.xaml     | 146 +++++------
 source/PlayniteUI/Windows/MainWindow.xaml.cs  |  94 ++++---
 .../Windows/MetadataLookupWindow.xaml         |   7 +-
 .../Windows/NotificationsWindow.xaml          |   3 +-
 source/PlayniteUI/Windows/SettingsWindow.xaml |  27 +-
 .../PlayniteUI/Windows/SettingsWindow.xaml.cs |   8 +-
 tests/Mapping/AboutWindow.ps1                 |  21 ++
 tests/Mapping/CategoryConfigWindow.ps1        |  21 ++
 tests/Mapping/CrashHandlerWindow.ps1          |  17 ++
 tests/Mapping/FirstTimeWizardWindow.ps1       |  51 ++++
 tests/Mapping/GameEditWindow.ps1              | 119 +++++++++
 tests/Mapping/InstalledGamesWindow.ps1        |  21 ++
 tests/Mapping/MainWindow.ps1                  |  65 +++++
 tests/Mapping/MetadataLookupWindow.ps1        |  23 ++
 tests/Mapping/NotificationsWindow.ps1         |  13 +
 tests/Mapping/OpenFileWindow.ps1              |  17 ++
 tests/Mapping/SettingsWindow.ps1              |  47 ++++
 tests/Mapping/SetupUninstallWindow.ps1        |  20 ++
 tests/Mapping/SetupWindow.ps1                 |  23 ++
 tests/RunTests.ps1                            |   4 +-
 tests/TestFiles/TestCover.jpg                 | Bin 0 -> 38337 bytes
 tests/TestFiles/TestIcon.png                  | Bin 0 -> 32097 bytes
 tests/UI/FirstTimeWizard.Tests.ps1            |  73 ++++++
 tests/UI/GameEditWindow.Tests.ps1             | 192 ++++++++++++++
 50 files changed, 1193 insertions(+), 604 deletions(-)
 create mode 100644 source/PlayniteUI/Images/close.png
 create mode 100644 tests/Mapping/AboutWindow.ps1
 create mode 100644 tests/Mapping/CategoryConfigWindow.ps1
 create mode 100644 tests/Mapping/CrashHandlerWindow.ps1
 create mode 100644 tests/Mapping/FirstTimeWizardWindow.ps1
 create mode 100644 tests/Mapping/GameEditWindow.ps1
 create mode 100644 tests/Mapping/InstalledGamesWindow.ps1
 create mode 100644 tests/Mapping/MainWindow.ps1
 create mode 100644 tests/Mapping/MetadataLookupWindow.ps1
 create mode 100644 tests/Mapping/NotificationsWindow.ps1
 create mode 100644 tests/Mapping/OpenFileWindow.ps1
 create mode 100644 tests/Mapping/SettingsWindow.ps1
 create mode 100644 tests/Mapping/SetupUninstallWindow.ps1
 create mode 100644 tests/Mapping/SetupWindow.ps1
 create mode 100644 tests/TestFiles/TestCover.jpg
 create mode 100644 tests/TestFiles/TestIcon.png
 create mode 100644 tests/UI/FirstTimeWizard.Tests.ps1
 create mode 100644 tests/UI/GameEditWindow.Tests.ps1

diff --git a/source/Playnite/Database/GameDatabase.cs b/source/Playnite/Database/GameDatabase.cs
index a060fa68d..2ba57735c 100644
--- a/source/Playnite/Database/GameDatabase.cs
+++ b/source/Playnite/Database/GameDatabase.cs
@@ -262,6 +262,10 @@ public MemoryStream GetFileStream(string id)
             CheckDbState();
 
             var file = Database.FileStorage.FindById(id);
+            if (file == null)
+            {
+                return null;
+            }
 
             lock (fileLock)
             {
diff --git a/source/PlayniteUI/Controls/FilterSelector.xaml b/source/PlayniteUI/Controls/FilterSelector.xaml
index a91e60ac3..b5caf9b62 100644
--- a/source/PlayniteUI/Controls/FilterSelector.xaml
+++ b/source/PlayniteUI/Controls/FilterSelector.xaml
@@ -9,23 +9,23 @@
              mc:Ignorable="d">
     <Grid>
         <StackPanel>
-            <local:FilterSelectorItem Text="Installed" CountText="{Binding Path=Stats.Installed, Mode=OneWay}"
+            <local:FilterSelectorItem x:Name="FilterInstalled" Text="Installed" CountText="{Binding Path=Stats.Installed, Mode=OneWay}"
                                       IsChecked="{Binding Settings.Installed}" Padding="5,5,5,3" />
-            <local:FilterSelectorItem Text="Hidden" CountText="{Binding Path=Stats.Hidden, Mode=OneWay}"
+            <local:FilterSelectorItem x:Name="FilterHidden" Text="Hidden" CountText="{Binding Path=Stats.Hidden, Mode=OneWay}"
                                       IsChecked="{Binding Settings.Hidden}" Padding="5,0,5,3" />
             <Separator/>
             <TextBlock Text="Providers" FontSize="16" Foreground="LightGray" FontStyle="Italic" Margin="5" Padding="5,0,5,3"/>
             <StackPanel>
-                <local:FilterSelectorItem IsChecked="{Binding Path=Settings.Providers[(playniteModels:Provider)Steam]}"
+                <local:FilterSelectorItem x:Name="FilterSteam" IsChecked="{Binding Path=Settings.Providers[(playniteModels:Provider)Steam]}"
                                           CountText="{Binding Path=Stats.Steam, Mode=OneWay}"
                                           Padding="5,0,5,3" Text="Steam"/>
-                <local:FilterSelectorItem IsChecked="{Binding Path=Settings.Providers[(playniteModels:Provider)GOG]}"
+                <local:FilterSelectorItem x:Name="FilterGOG" IsChecked="{Binding Path=Settings.Providers[(playniteModels:Provider)GOG]}"
                                           CountText="{Binding Path=Stats.GOG, Mode=OneWay}"
                                           Padding="5,0,5,3" Text="GOG"/>
-                <local:FilterSelectorItem IsChecked="{Binding Path=Settings.Providers[(playniteModels:Provider)Origin]}"
+                <local:FilterSelectorItem x:Name="FilterOrigin" IsChecked="{Binding Path=Settings.Providers[(playniteModels:Provider)Origin]}"
                                           CountText="{Binding Path=Stats.Origin, Mode=OneWay}"
                                           Padding="5,0,5,3" Text="Origin"/>
-                <local:FilterSelectorItem IsChecked="{Binding Path=Settings.Providers[(playniteModels:Provider)Custom]}"
+                <local:FilterSelectorItem x:Name="FilterCustom" IsChecked="{Binding Path=Settings.Providers[(playniteModels:Provider)Custom]}"
                                           CountText="{Binding Path=Stats.Custom, Mode=OneWay}"
                                           Padding="5,0,5,3" Text="Custom" />
             </StackPanel>
diff --git a/source/PlayniteUI/Controls/FilterSelectorItem.xaml b/source/PlayniteUI/Controls/FilterSelectorItem.xaml
index dc5cfb7cf..b2d1f1e94 100644
--- a/source/PlayniteUI/Controls/FilterSelectorItem.xaml
+++ b/source/PlayniteUI/Controls/FilterSelectorItem.xaml
@@ -5,18 +5,17 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:PlayniteUI.Controls"
              mc:Ignorable="d" 
-             d:DesignWidth="300"
-             Name="MainControl">
+             d:DesignWidth="300">
 
     <UserControl.Resources>
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
     </UserControl.Resources>
 
-    <Border CornerRadius="2" MouseUp="mainControl_MouseUp" Cursor="Hand" Name="BorderMain">
+    <Border CornerRadius="2" MouseUp="MainControl_MouseUp" Cursor="Hand" Name="BorderMain">
         <Border.Style>
             <Style TargetType="Border">
                 <Style.Triggers>
-                    <DataTrigger Binding="{Binding IsChecked, ElementName=MainControl}" Value="True">
+                    <DataTrigger Binding="{Binding IsChecked, RelativeSource={RelativeSource AncestorType=UserControl}}" Value="True">
                         <Setter Property="Background" Value="{StaticResource NormalBrush}" />
                     </DataTrigger>
                     <DataTrigger Binding="{Binding IsMouseOver, ElementName=BorderMain}" Value="True">
@@ -27,9 +26,9 @@
         </Border.Style>
 
         <DockPanel LastChildFill="True" Margin="5">
-            <TextBlock Text="{Binding Text, ElementName=MainControl}" DockPanel.Dock="Left" FontSize="16" VerticalAlignment="Center"/>
+            <TextBlock Text="{Binding Text, RelativeSource={RelativeSource AncestorType=UserControl}}" DockPanel.Dock="Left" FontSize="16" VerticalAlignment="Center"/>
             <TextBlock Text="(" DockPanel.Dock="Left" FontSize="16" VerticalAlignment="Center" Padding="5,0,0,0"/>
-            <TextBlock Text="{Binding CountText, ElementName=MainControl}" DockPanel.Dock="Left" FontSize="16" VerticalAlignment="Center" />
+            <TextBlock Text="{Binding CountText, RelativeSource={RelativeSource AncestorType=UserControl}}" DockPanel.Dock="Left" FontSize="16" VerticalAlignment="Center" />
             <TextBlock Text=")" DockPanel.Dock="Left" FontSize="16" VerticalAlignment="Center" />
         </DockPanel>
     </Border>
diff --git a/source/PlayniteUI/Controls/FilterSelectorItem.xaml.cs b/source/PlayniteUI/Controls/FilterSelectorItem.xaml.cs
index 667c5a3f4..017dc5156 100644
--- a/source/PlayniteUI/Controls/FilterSelectorItem.xaml.cs
+++ b/source/PlayniteUI/Controls/FilterSelectorItem.xaml.cs
@@ -14,9 +14,89 @@
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using Playnite;
+using System.Windows.Automation.Peers;
+using System.Windows.Automation.Provider;
 
 namespace PlayniteUI.Controls
 {
+    public class FilterSelectorItemAutomationPeer : FrameworkElementAutomationPeer, IValueProvider, IToggleProvider
+    {
+        private FilterSelectorItem OwnerControl
+        {
+            get
+            {
+                return (FilterSelectorItem)Owner;
+            }
+        }
+
+        public string Value
+        {
+            get
+            {
+                return OwnerControl.CountText;
+            }
+        }
+
+        public bool IsReadOnly
+        {
+            get
+            {
+                return true;
+            }
+        }
+
+        public System.Windows.Automation.ToggleState ToggleState
+        {
+            get
+            {
+                if (OwnerControl.IsChecked)
+                {
+                    return System.Windows.Automation.ToggleState.On;
+                }
+                else
+                {
+                    return System.Windows.Automation.ToggleState.Off;
+                }
+            }
+        }
+
+        public FilterSelectorItemAutomationPeer(FilterSelectorItem owner) : base(owner) { }
+
+        protected override string GetClassNameCore()
+        {
+            return "FilterSelectorItem";
+        }
+        protected override AutomationControlType GetAutomationControlTypeCore()
+        {
+            return AutomationControlType.Custom;
+        }
+
+        public override object GetPattern(PatternInterface patternInterface)
+        {
+            if (patternInterface == PatternInterface.Value)
+            {
+                return this;
+            }
+
+            if (patternInterface == PatternInterface.Toggle)
+            {
+                return this;
+            }
+
+            return base.GetPattern(patternInterface);
+        }
+
+        public void SetValue(string value)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Toggle()
+        {
+            OwnerControl.IsChecked = !OwnerControl.IsChecked;
+        }
+    }
+
     /// <summary>
     /// Interaction logic for FilterSelectorItem.xaml
     /// </summary>
@@ -84,9 +164,14 @@ public FilterSelectorItem()
             InitializeComponent();
         }
         
-        private void mainControl_MouseUp(object sender, MouseButtonEventArgs e)
+        private void MainControl_MouseUp(object sender, MouseButtonEventArgs e)
         {
             IsChecked = !IsChecked;
         }
+
+        protected override AutomationPeer OnCreateAutomationPeer()
+        {
+            return new FilterSelectorItemAutomationPeer(this);
+        }
     }
 }
diff --git a/source/PlayniteUI/Controls/GameDetails.xaml b/source/PlayniteUI/Controls/GameDetails.xaml
index 580e12718..a1dcb1218 100644
--- a/source/PlayniteUI/Controls/GameDetails.xaml
+++ b/source/PlayniteUI/Controls/GameDetails.xaml
@@ -32,7 +32,7 @@
                         ImageSource="{Binding BackgroundImage, IsAsync=True, Mode=OneTime, Converter={StaticResource ImageUrlToImageSourceConverter}}" />
         </Grid.Background>
 
-        <DockPanel Name="gameDetails" Margin="0,10,0,0">
+        <DockPanel Margin="0,10,0,0">
             <playniteControls:GamePopupMenu x:Name="PopupMore" StaysOpen="False" Placement="Relative" VerticalOffset="{Binding ActualHeight, ElementName=ButtonMore}"/>
 
             <DockPanel DockPanel.Dock="Top">
@@ -60,7 +60,7 @@
                             <Button Style="{StaticResource PlayButton}" Name="ButtonPlay" Width="100" HorizontalAlignment="Left" Click="ButtonPlay_Click"
                                     Visibility="{Binding IsInstalled, Converter={StaticResource BooleanToVisibilityConverter}}" Content="Play" />
                             <UserControl Visibility="{Binding Provider, Converter={StaticResource EnumCompVisibilityConverterInverted}, ConverterParameter={x:Static models:Provider.Custom}}">
-                                <Button Width="100" Click="ButtonInstall_Click" Content="Install"
+                                <Button Width="100" Click="ButtonInstall_Click" Content="Install" Name="ButtonInstall"
                                     Visibility="{Binding IsInstalled, Converter={StaticResource InvertableBooleanToVisibilityConverter}, ConverterParameter=Inverted}" />
                             </UserControl>
                         </StackPanel>
@@ -71,21 +71,21 @@
                     <StackPanel  Orientation="Horizontal">
                         <TextBlock Margin="0,5,5,5" Background="#66000000" Padding="5" Width="75" TextAlignment="Center"
                                    Visibility="{Binding CommunityHubUrl, Converter={StaticResource StringNullOrEmptyToVisibilityConverter}}">                        
-                            <Hyperlink Style="{DynamicResource DetailsHyperlink}" NavigateUri="{Binding CommunityHubUrl, TargetNullValue={x:Null}}"
+                            <Hyperlink Name="HyperlinkForum" Style="{DynamicResource DetailsHyperlink}" NavigateUri="{Binding CommunityHubUrl, TargetNullValue={x:Null}}"
                                        TextDecorations="{x:Null}" RequestNavigate="Link_RequestNavigate">
                                 Forum
                             </Hyperlink>
                         </TextBlock>
                         <TextBlock Margin="5" Background="#66000000" Padding="5" Width="75" TextAlignment="Center"
                                    Visibility="{Binding StoreUrl, Converter={StaticResource StringNullOrEmptyToVisibilityConverter}}">  
-                            <Hyperlink Style="{DynamicResource DetailsHyperlink}" NavigateUri="{Binding StoreUrl, TargetNullValue={x:Null}}"
+                            <Hyperlink Name="HyperlinkStore" Style="{DynamicResource DetailsHyperlink}" NavigateUri="{Binding StoreUrl, TargetNullValue={x:Null}}"
                                        TextDecorations="{x:Null}" RequestNavigate="Link_RequestNavigate">
                                 Store
                             </Hyperlink>
                         </TextBlock>
                         <TextBlock Margin="5,5,0,5" Background="#66000000" Padding="5" Width="75" TextAlignment="Center"
                                    Visibility="{Binding WikiUrl, Converter={StaticResource StringNullOrEmptyToVisibilityConverter}}">
-                            <Hyperlink Style="{DynamicResource DetailsHyperlink}" NavigateUri="{Binding WikiUrl, TargetNullValue={x:Null}}"
+                            <Hyperlink Name="HyperlinkWiki" Style="{DynamicResource DetailsHyperlink}" NavigateUri="{Binding WikiUrl, TargetNullValue={x:Null}}"
                                        TextDecorations="{x:Null}" RequestNavigate="Link_RequestNavigate">
                                 Wiki
                             </Hyperlink>
@@ -93,7 +93,7 @@
                     </StackPanel>
                 </WrapPanel>
             </DockPanel>            
-            <html:HtmlPanel Name="htmlPanel" Background="Transparent" Text="{Binding DescriptionView, Mode=OneWay}" Margin="10,20,0,0"/>
+            <html:HtmlPanel Background="Transparent" Text="{Binding DescriptionView, Mode=OneWay}" Margin="10,20,0,0"/>
         </DockPanel>
     </Grid>    
 </UserControl>
diff --git a/source/PlayniteUI/Controls/GamePopupMenu.xaml b/source/PlayniteUI/Controls/GamePopupMenu.xaml
index 276fc5932..dc2313cba 100644
--- a/source/PlayniteUI/Controls/GamePopupMenu.xaml
+++ b/source/PlayniteUI/Controls/GamePopupMenu.xaml
@@ -1,14 +1,14 @@
 <Popup x:Class="PlayniteUI.Controls.GamePopupMenu"
-        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:PlayniteUI.Controls"
-        xmlns:playniteUI="clr-namespace:PlayniteUI"
-        xmlns:models="clr-namespace:Playnite.Models;assembly=Playnite"
-        mc:Ignorable="d" 
-        d:DesignHeight="300" d:DesignWidth="300"
-        StaysOpen="False" Placement="MousePoint">
+       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:PlayniteUI.Controls"
+       xmlns:playniteUI="clr-namespace:PlayniteUI"
+       xmlns:models="clr-namespace:Playnite.Models;assembly=Playnite"
+       mc:Ignorable="d" 
+       d:DesignHeight="300" d:DesignWidth="300"
+       StaysOpen="False" Placement="MousePoint">
 
     <Popup.Resources>
         <playniteUI:EnumConverter x:Key="EnumConverter" />
@@ -27,42 +27,40 @@
         </playniteUI:ValueConverterGroup>
     </Popup.Resources>
 
-    <Border Style="{StaticResource PopUpBorder}">
-        <StackPanel Background="{StaticResource NormalBrushDark}">
-            <UserControl Visibility="{Binding IsSetupInProgress, Converter={StaticResource InvertableBooleanToVisibilityConverter}, ConverterParameter=Inverted}">
-                <StackPanel Visibility="{Binding RelativeSource={RelativeSource AncestorType=Popup}, Path=ShowPlayInstallButton, Converter={StaticResource BooleanToVisibilityConverter}}">
-                    <TextBlock Text="Play" MouseUp="ListPopupPlay_MouseUp" FontWeight="Bold" Style="{StaticResource TextBlockPopupItem}"
-                               Visibility="{Binding IsInstalled, Converter={StaticResource BooleanToVisibilityConverter}}"/>
-                    <UserControl Visibility="{Binding Provider, Converter={StaticResource EnumCompVisibilityConverterInverted}, ConverterParameter={x:Static models:Provider.Custom}}">
-                        <TextBlock Text="Install" MouseUp="ListPopupInstall_MouseUp" FontWeight="Bold" Style="{StaticResource TextBlockPopupItem}"
-                                   Visibility="{Binding IsInstalled, Converter={StaticResource InvertableBooleanToVisibilityConverter}, ConverterParameter=Inverted}"/>
-                    </UserControl>
-                    <Separator Name="SeparatorPlayInstall"/>
-                </StackPanel>
-            </UserControl>
-            <ItemsControl ItemsSource="{Binding OtherTasks}">
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate>
-                        <TextBlock Text="{Binding Name}" MouseUp="ListPopupTask_MouseUp" Style="{StaticResource TextBlockPopupItem}"/>
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-            </ItemsControl>
-            <Separator Name="SeparatorTasks"/>
-            
-            <TextBlock Text="Open Game Location" MouseUp="ListPopupOpenLocation_MouseUp" Style="{StaticResource TextBlockPopupItem}"
-                        Visibility="{Binding IsInstalled, Converter={StaticResource BooleanToVisibilityConverter}}"/>
-            <TextBlock Text="Hide" MouseUp="ListPopupHide_MouseUp" Style="{StaticResource TextBlockPopupItem}"
-                       Visibility="{Binding Hidden, Converter={StaticResource InvertableBooleanToVisibilityConverter}, ConverterParameter=Inverted}"/>
-            <TextBlock Text="Show in Library" MouseUp="ListPopupHide_MouseUp" Style="{StaticResource TextBlockPopupItem}"
-                       Visibility="{Binding Hidden, Converter={StaticResource BooleanToVisibilityConverter}}" />
-            <TextBlock Text="Edit . . ." MouseUp="ListPopupEdit_MouseUp" Style="{StaticResource TextBlockPopupItem}"/>
-            <TextBlock Text="Set Category . . ." MouseUp="ListPopupCategory_MouseUp" Style="{StaticResource TextBlockPopupItem}"/>
-            <TextBlock Text="Remove" MouseUp="ListPopupDelete_MouseUp" Style="{StaticResource TextBlockPopupItem}"
-                       Visibility="{Binding Provider, Converter={StaticResource EnumCompVisibilityConverter}, ConverterParameter={x:Static models:Provider.Custom}}"/>
-            <UserControl Visibility="{Binding IsInstalled, Converter={StaticResource BooleanToVisibilityConverter}}">
-                <TextBlock Text="Uninstall" MouseUp="ListPopupUninstall_MouseUp" Style="{StaticResource TextBlockPopupItem}"
-                           Visibility="{Binding Provider, Converter={StaticResource EnumCompVisibilityConverterInverted}, ConverterParameter={x:Static models:Provider.Custom}}"/>
-            </UserControl>
-        </StackPanel>
-    </Border>
+    <ItemsControl Background="{StaticResource NormalBrushDark}" BorderBrush="{StaticResource NormalBorderBrush}" BorderThickness="2">
+        <UserControl Visibility="{Binding IsSetupInProgress, Converter={StaticResource InvertableBooleanToVisibilityConverter}, ConverterParameter=Inverted}">
+            <StackPanel Visibility="{Binding RelativeSource={RelativeSource AncestorType=Popup}, Path=ShowPlayInstallButton, Converter={StaticResource BooleanToVisibilityConverter}}">
+                <MenuItem Header="Play" Click="Play_Click" FontWeight="Bold"
+                            Visibility="{Binding IsInstalled, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+                <UserControl Visibility="{Binding Provider, Converter={StaticResource EnumCompVisibilityConverterInverted}, ConverterParameter={x:Static models:Provider.Custom}}">
+                    <MenuItem Header="Install" Click="Install_Click" FontWeight="Bold"
+                                Visibility="{Binding IsInstalled, Converter={StaticResource InvertableBooleanToVisibilityConverter}, ConverterParameter=Inverted}"/>
+                </UserControl>
+                <Separator Name="SeparatorPlayInstall"/>
+            </StackPanel>
+        </UserControl>
+        <ItemsControl ItemsSource="{Binding OtherTasks}">
+            <ItemsControl.ItemTemplate>
+                <DataTemplate>
+                    <MenuItem Header="{Binding Name}" Click="Task_Click" />
+                </DataTemplate>
+            </ItemsControl.ItemTemplate>
+        </ItemsControl>
+        <Separator Name="SeparatorTasks"/>
+
+        <MenuItem Header="Open Game Location" Click="OpenLocation_Click"
+                  Visibility="{Binding IsInstalled, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+        <MenuItem Header="Hide" Click="Hide_Click"
+                  Visibility="{Binding Hidden, Converter={StaticResource InvertableBooleanToVisibilityConverter}, ConverterParameter=Inverted}"/>
+        <MenuItem Header="Show in Library"
+                  Visibility="{Binding Hidden, Converter={StaticResource BooleanToVisibilityConverter}}" />
+        <MenuItem Header="Edit..."  Click="Edit_Click" />
+        <MenuItem Header="Set Category..." Click="Category_Click" />
+        <MenuItem Header="Remove" Click="Delete_Click"
+                  Visibility="{Binding Provider, Converter={StaticResource EnumCompVisibilityConverter}, ConverterParameter={x:Static models:Provider.Custom}}"/>
+        <UserControl Visibility="{Binding IsInstalled, Converter={StaticResource BooleanToVisibilityConverter}}">
+            <MenuItem Header="Uninstall" Click="Uninstall_Click"
+                      Visibility="{Binding Provider, Converter={StaticResource EnumCompVisibilityConverterInverted}, ConverterParameter={x:Static models:Provider.Custom}}"/>
+        </UserControl>
+    </ItemsControl>
 </Popup>
diff --git a/source/PlayniteUI/Controls/GamePopupMenu.xaml.cs b/source/PlayniteUI/Controls/GamePopupMenu.xaml.cs
index accd41527..f6843283d 100644
--- a/source/PlayniteUI/Controls/GamePopupMenu.xaml.cs
+++ b/source/PlayniteUI/Controls/GamePopupMenu.xaml.cs
@@ -76,7 +76,7 @@ private void GamePopupMenu_DataContextChanged(object sender, DependencyPropertyC
             }
         }
 
-        private void ListPopupTask_MouseUp(object sender, MouseButtonEventArgs e)
+        private void Task_Click(object sender, RoutedEventArgs e)
         {
             var gameTask = (GameTask)(sender as FrameworkElement).DataContext;
             try
@@ -93,40 +93,40 @@ private void ListPopupTask_MouseUp(object sender, MouseButtonEventArgs e)
             }
         }
 
-        private void ListPopupPlay_MouseUp(object sender, MouseButtonEventArgs e)
+        private void Play_Click(object sender, RoutedEventArgs e)
         {
             var game = (IGame)(sender as FrameworkElement).DataContext;
             GamesEditor.Instance.PlayGame(game);
             IsOpen = false;
         }
 
-        private void ListPopupInstall_MouseUp(object sender, MouseButtonEventArgs e)
+        private void Install_Click(object sender, RoutedEventArgs e)
         {
             var game = (IGame)(sender as FrameworkElement).DataContext;
             GamesEditor.Instance.InstallGame(game);
             IsOpen = false;
         }
 
-        private void ListPopupUninstall_MouseUp(object sender, MouseButtonEventArgs e)
+        private void Uninstall_Click(object sender, RoutedEventArgs e)
         {
             var game = (IGame)(sender as FrameworkElement).DataContext;
             GamesEditor.Instance.UnInstallGame(game);
             IsOpen = false;
         }
 
-        private void ListPopupEdit_MouseUp(object sender, MouseButtonEventArgs e)
+        private void Edit_Click(object sender, RoutedEventArgs e)
         {
             GamesEditor.Instance.EditGame((IGame)DataContext);
             IsOpen = false;
         }
 
-        private void ListPopupCategory_MouseUp(object sender, MouseButtonEventArgs e)
+        private void Category_Click(object sender, RoutedEventArgs e)
         {
             GamesEditor.Instance.SetGameCategories((IGame)DataContext);
             IsOpen = false;
         }
 
-        private void ListPopupDelete_MouseUp(object sender, MouseButtonEventArgs e)
+        private void Delete_Click(object sender, RoutedEventArgs e)
         {
             if (MessageBox.Show(
                 "Are you sure you want to remove this game?",
@@ -150,7 +150,7 @@ private void ListPopupDelete_MouseUp(object sender, MouseButtonEventArgs e)
             IsOpen = false;
         }
 
-        private void ListPopupOpenLocation_MouseUp(object sender, MouseButtonEventArgs e)
+        private void OpenLocation_Click(object sender, RoutedEventArgs e)
         {
             var game = (IGame)(sender as FrameworkElement).DataContext;
             try
@@ -167,7 +167,7 @@ private void ListPopupOpenLocation_MouseUp(object sender, MouseButtonEventArgs e
             }
         }
 
-        private void ListPopupHide_MouseUp(object sender, MouseButtonEventArgs e)
+        private void Hide_Click(object sender, RoutedEventArgs e)
         {
             var game = (IGame)(sender as FrameworkElement).DataContext;
             game.Hidden = !game.Hidden;
diff --git a/source/PlayniteUI/Controls/GamePopupMenuMulti.xaml b/source/PlayniteUI/Controls/GamePopupMenuMulti.xaml
index 1da558d59..11755d7c4 100644
--- a/source/PlayniteUI/Controls/GamePopupMenuMulti.xaml
+++ b/source/PlayniteUI/Controls/GamePopupMenuMulti.xaml
@@ -12,21 +12,14 @@
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
     </Popup.Resources>
 
-    <Border Style="{StaticResource PopUpBorder}">
-        <StackPanel Background="{StaticResource NormalBrushDark}">
-            <TextBlock Text="Hide" Style="{StaticResource TextBlockPopupItem}"
-                       MouseLeftButtonUp="Hide_MouseLeftButtonUp"
-                       Visibility="{Binding ShowHideButton, RelativeSource={RelativeSource AncestorType=Popup}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
-            <TextBlock Text="Show in Library" Style="{StaticResource TextBlockPopupItem}"
-                       MouseLeftButtonUp="UnHide_MouseLeftButtonUp"
-                       Visibility="{Binding ShowUnHideButton, RelativeSource={RelativeSource AncestorType=Popup}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
-            <TextBlock Text="Edit" Style="{StaticResource TextBlockPopupItem}"
-                       MouseLeftButtonUp="Edit_MouseLeftButtonUp"/>
-            <TextBlock Text="Set Category . . ." Style="{StaticResource TextBlockPopupItem}"
-                       MouseLeftButtonUp="Categories_MouseLeftButtonUp" />
-            <TextBlock Text="Remove" Style="{StaticResource TextBlockPopupItem}"
-                       MouseLeftButtonUp="Remove_MouseLeftButtonUp"
-                       Visibility="{Binding ShowRemoveButton, RelativeSource={RelativeSource AncestorType=Popup}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
-        </StackPanel>
-    </Border>
+    <ItemsControl Background="{StaticResource NormalBrushDark}" BorderBrush="{StaticResource NormalBorderBrush}" BorderThickness="2">
+        <MenuItem Header="Hide" Click="Hide_Click"
+                  Visibility="{Binding ShowHideButton, RelativeSource={RelativeSource AncestorType=Popup}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+        <MenuItem Header="Show in Library" Click="UnHide_Click"
+                  Visibility="{Binding ShowUnHideButton, RelativeSource={RelativeSource AncestorType=Popup}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+        <MenuItem Header="Edit" Click="Edit_Click"/>
+        <MenuItem Header="Set Category..." Click="Categories_Click"/>
+        <MenuItem Header="Remove" Click="Remove_Click"
+                  Visibility="{Binding ShowRemoveButton, RelativeSource={RelativeSource AncestorType=Popup}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+    </ItemsControl>
 </Popup>
diff --git a/source/PlayniteUI/Controls/GamePopupMenuMulti.xaml.cs b/source/PlayniteUI/Controls/GamePopupMenuMulti.xaml.cs
index bfd697c0b..1f6f3571e 100644
--- a/source/PlayniteUI/Controls/GamePopupMenuMulti.xaml.cs
+++ b/source/PlayniteUI/Controls/GamePopupMenuMulti.xaml.cs
@@ -95,7 +95,7 @@ public void OnPropertyChanged(string name)
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
         }
 
-        private void Hide_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        private void Hide_Click(object sender, RoutedEventArgs e)
         {
             foreach (var game in (List<IGame>)DataContext)
             {
@@ -106,7 +106,7 @@ private void Hide_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
             IsOpen = false;
         }
 
-        private void UnHide_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        private void UnHide_Click(object sender, RoutedEventArgs e)
         {
             foreach (var game in (List<IGame>)DataContext)
             {
@@ -117,21 +117,21 @@ private void UnHide_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
             IsOpen = false;
         }
 
-        private void Edit_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        private void Edit_Click(object sender, RoutedEventArgs e)
         {
             var games = (List<IGame>)DataContext;
             GamesEditor.Instance.EditGames(games);
             IsOpen = false;
         }
 
-        private void Categories_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        private void Categories_Click(object sender, RoutedEventArgs e)
         {
             var games = (List<IGame>)DataContext;
             GamesEditor.Instance.SetGamesCategories(games);
             IsOpen = false;
         }
 
-        private void Remove_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        private void Remove_Click(object sender, RoutedEventArgs e)
         {
             var games = (List<IGame>)DataContext;
             if (MessageBox.Show(
diff --git a/source/PlayniteUI/Controls/GameTaskView.xaml b/source/PlayniteUI/Controls/GameTaskView.xaml
index 882f3c46b..b3254bebe 100644
--- a/source/PlayniteUI/Controls/GameTaskView.xaml
+++ b/source/PlayniteUI/Controls/GameTaskView.xaml
@@ -24,10 +24,10 @@
         </Grid.RowDefinitions>
 
         <TextBlock Text="Name" Grid.Column="0" Grid.Row="0" Margin="0,1,0,1"/>
-        <TextBox Grid.Column="1" Grid.Row="0" Text="{Binding Name}" Margin="0,1,0,1"/>
+        <TextBox Name="TextName" Grid.Column="1" Grid.Row="0" Text="{Binding Name}" Margin="0,1,0,1"/>
 
         <TextBlock Text="Type" Grid.Column="0" Grid.Row="1"  Margin="0,1,0,1"/>
-        <ComboBox Grid.Column="1" Grid.Row="1" SelectedIndex="{Binding Type, Converter={StaticResource BidirectionalEnumAndNumberConverter}}" Margin="0,1,0,1"
+        <ComboBox Name="ComboType" Grid.Column="1" Grid.Row="1" SelectedIndex="{Binding Type, Converter={StaticResource BidirectionalEnumAndNumberConverter}}" Margin="0,1,0,1"
                   SelectionChanged="ComboType_SelectionChanged">
             <ComboBoxItem Content="File" />
             <ComboBoxItem Content="URL" />
@@ -35,14 +35,14 @@
 
         <TextBlock Text="Path" Grid.Column="0" Grid.Row="2"  Margin="0,1,0,1"/>
         <DockPanel Grid.Column="1" Grid.Row="2" LastChildFill="True" Margin="0,1,0,1">
-            <Button Content=". . ." Padding="5,0,5,0" DockPanel.Dock="Right" Click="ButtonBrowsePath_Click"/>
+            <Button Name="ButtonBrowse" Content=". . ." Padding="5,0,5,0" DockPanel.Dock="Right" Click="ButtonBrowsePath_Click"/>
             <TextBox Name="TextPath" Text="{Binding Path, UpdateSourceTrigger=PropertyChanged}" DockPanel.Dock="Right"/>
         </DockPanel>
 
         <TextBlock Text="Arguments" Grid.Column="0" Grid.Row="3" Margin="0,1,0,1" />
-        <TextBox Grid.Column="1" Grid.Row="3" Text="{Binding Arguments}" Margin="0,1,0,1"/>
+        <TextBox Name="TextArguments" Grid.Column="1" Grid.Row="3" Text="{Binding Arguments}" Margin="0,1,0,1"/>
 
         <TextBlock Text="WorkingDir" Grid.Column="0" Grid.Row="4" Margin="0,1,0,1"/>
-        <TextBox Grid.Column="1" Grid.Row="4" Text="{Binding WorkingDir}" Margin="0,1,0,1"/>
+        <TextBox Name="TextWorkDir" Grid.Column="1" Grid.Row="4" Text="{Binding WorkingDir}" Margin="0,1,0,1"/>
     </Grid>
 </UserControl>
diff --git a/source/PlayniteUI/Controls/GamesImagesView.xaml b/source/PlayniteUI/Controls/GamesImagesView.xaml
index ab346c689..658933906 100644
--- a/source/PlayniteUI/Controls/GamesImagesView.xaml
+++ b/source/PlayniteUI/Controls/GamesImagesView.xaml
@@ -102,9 +102,10 @@
                                     </Border.Style>
                                     
                                     <Image RenderOptions.BitmapScalingMode="Fant" Width="{Binding Path=Value, ElementName=SliderZoom}"
-                                           Name="imageImageViewImage" StretchDirection="Both"
-                                           MouseLeftButtonUp="ImageGrid_MouseLeftButtonUp">
-                                        
+                                           Name="ImageViewImage" StretchDirection="Both"
+                                           MouseLeftButtonUp="ImageGrid_MouseLeftButtonUp"
+                                           AutomationProperties.HelpText="{Binding Image}"
+                                           AutomationProperties.Name="{Binding Name}">                                        
                                         <Image.Source>
                                             <PriorityBinding>
                                                 <Binding Path="Image" IsAsync="True" Mode="OneWay" Converter="{StaticResource LiteDBImageToImageConverter}" ConverterParameter="Image"/>
@@ -122,31 +123,9 @@
                 
                 <Grid DockPanel.Dock="Right" Grid.Column="2">
                     <playniteUI:GameDetails x:Name="GameDetails"/>
-                    <Grid Width="20" Height="20" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10" Cursor="Hand"
-                      Background="Transparent" MouseLeftButtonUp="CloseDetailBorder_MouseLeftButtonDown">
-                        <Ellipse Fill="{DynamicResource NormalBrush}" Stroke="{DynamicResource NormalBrush}" Width="20" Height="20"/>
-                        <Path x:Name="ButtonPath" Width="10" Height="10"
-                              Stroke="{DynamicResource TextBrush}"
-                              StrokeThickness="1.5"
-                              StrokeStartLineCap="Square"
-                              StrokeEndLineCap="Square"
-                              Stretch="Uniform"
-                              VerticalAlignment="Center"
-                              HorizontalAlignment="Center">
-                            <Path.Data>
-                                <PathGeometry>
-                                    <PathGeometry.Figures>
-                                        <PathFigure StartPoint="0,0">
-                                            <LineSegment Point="25,25"/>
-                                        </PathFigure>
-                                        <PathFigure StartPoint="0,25">
-                                            <LineSegment Point="25,0"/>
-                                        </PathFigure>
-                                    </PathGeometry.Figures>
-                                </PathGeometry>
-                            </Path.Data>
-                        </Path>
-                    </Grid>
+                    <Image Name="ImageCloseDetails" Source="/Images/close.png" Width="28" Margin="10" Cursor="Hand"
+                           VerticalAlignment="Top" HorizontalAlignment="Right"
+                           MouseLeftButtonUp="CloseDetailBorder_MouseLeftButtonDown"/>
                 </Grid>
             </Grid>
         </DockPanel>
diff --git a/source/PlayniteUI/Controls/GamesListView.xaml b/source/PlayniteUI/Controls/GamesListView.xaml
index dbb49d5b6..c9715c275 100644
--- a/source/PlayniteUI/Controls/GamesListView.xaml
+++ b/source/PlayniteUI/Controls/GamesListView.xaml
@@ -20,8 +20,10 @@
 
     <Grid>
         <DockPanel>
-            <playniteControls:GamePopupMenuMulti x:Name="PopupGameMulti" />
-            <playniteControls:GamePopupMenu x:Name="PopupGame" StaysOpen="False" Placement="MousePoint"/>
+            <playniteControls:GamePopupMenuMulti x:Name="PopupGameMulti"
+                                                 AutomationProperties.AutomationId="MenuGame"/>
+            <playniteControls:GamePopupMenu x:Name="PopupGame" StaysOpen="False" Placement="MousePoint"
+                                            AutomationProperties.AutomationId="MenuGameMulti"/>
 
             <ListBox Name="ListGames" SelectionMode="Extended"
                      SelectionChanged="GamesListList_SelectionChanged"
diff --git a/source/PlayniteUI/Controls/ProgressControl.xaml b/source/PlayniteUI/Controls/ProgressControl.xaml
index df29cca51..13be5d571 100644
--- a/source/PlayniteUI/Controls/ProgressControl.xaml
+++ b/source/PlayniteUI/Controls/ProgressControl.xaml
@@ -8,7 +8,7 @@
              d:DesignHeight="35" d:DesignWidth="300">
     <Grid>
         <ProgressBar Name="ProgressBarBar" />
-        <TextBlock Name="TextDescription" Margin="10,0,0,0"
+        <TextBlock Name="TextProgressDescription" Margin="10,0,0,0"
                    VerticalAlignment="Center" HorizontalAlignment="Center" />
     </Grid>
 </UserControl>
diff --git a/source/PlayniteUI/Controls/ProgressControl.xaml.cs b/source/PlayniteUI/Controls/ProgressControl.xaml.cs
index ee0c2f110..6b45e52c0 100644
--- a/source/PlayniteUI/Controls/ProgressControl.xaml.cs
+++ b/source/PlayniteUI/Controls/ProgressControl.xaml.cs
@@ -24,12 +24,12 @@ public string Text
         {
             get
             {
-                return TextDescription.Dispatcher.Invoke(() => TextDescription.Text);
+                return TextProgressDescription.Dispatcher.Invoke(() => TextProgressDescription.Text);
             }
 
             set
             {
-                TextDescription.Dispatcher.Invoke(() => TextDescription.Text = value);
+                TextProgressDescription.Dispatcher.Invoke(() => TextProgressDescription.Text = value);
             }
         }
 
diff --git a/source/PlayniteUI/Controls/SearchBox.xaml b/source/PlayniteUI/Controls/SearchBox.xaml
index 7c574d22a..945818445 100644
--- a/source/PlayniteUI/Controls/SearchBox.xaml
+++ b/source/PlayniteUI/Controls/SearchBox.xaml
@@ -9,8 +9,8 @@
              d:DesignHeight="60" d:DesignWidth="300">
 
     <DockPanel Background="{StaticResource ControlBackgroundBrush}">
-        <Image Source="/Images/searchicon.png" DockPanel.Dock="Left" RenderOptions.BitmapScalingMode="HighQuality"/>        
-        <Image Source="/Images/clear.png" Name="ImageClear" DockPanel.Dock="Right" RenderOptions.BitmapScalingMode="HighQuality"
+        <Image Source="/Images/searchicon.png" DockPanel.Dock="Left" RenderOptions.BitmapScalingMode="Fant"/>        
+        <Image Source="/Images/clear.png" Name="ImageClear" DockPanel.Dock="Right" RenderOptions.BitmapScalingMode="Fant"
                MouseUp="clearImage_MouseUp" Margin="0,0,4,0" Visibility="Hidden"/>
         <TextBox Name="TextFilter" BorderThickness="0" VerticalContentAlignment="Center" FontSize="14"                 
                  Text="{Binding Text, RelativeSource={RelativeSource AncestorType=UserControl}, UpdateSourceTrigger=PropertyChanged}"
diff --git a/source/PlayniteUI/Converters/LiteDBImageToImageConverter.cs b/source/PlayniteUI/Converters/LiteDBImageToImageConverter.cs
index 8847a56fe..a1f5a1325 100644
--- a/source/PlayniteUI/Converters/LiteDBImageToImageConverter.cs
+++ b/source/PlayniteUI/Converters/LiteDBImageToImageConverter.cs
@@ -7,11 +7,14 @@
 using System.Windows.Data;
 using System.Windows.Media.Imaging;
 using Playnite.Database;
+using NLog;
 
 namespace PlayniteUI
 {
     public class LiteDBImageToImageConverter : IValueConverter
     {
+        private static Logger logger = LogManager.GetCurrentClassLogger();
+
         public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
             var imageId = (string)value;
@@ -19,9 +22,15 @@ public object Convert(object value, Type targetType, object parameter, System.Gl
             {
                 return DependencyProperty.UnsetValue;
             }
-
+            
             using (var imageData = GameDatabase.Instance.GetFileStream(imageId))
             {
+                if (imageData == null)
+                {
+                    logger.Warn("Image not found in database: " + imageId);
+                    return DependencyProperty.UnsetValue;
+                }
+
                 var bitmap = new BitmapImage();
                 bitmap.BeginInit();
                 bitmap.StreamSource = imageData;
diff --git a/source/PlayniteUI/Images/close.png b/source/PlayniteUI/Images/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..807881e1c95cc23f950e32442f5cd903def161d2
GIT binary patch
literal 334
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezr3(Fp7G*IEGZjy}jwk)#M;@>|@~z
zy?G0Fd7Io-XyOyRqO~H_t$gLV2irdKY@1V&VB@GFY=7y8+zziN|C3F&E)r;x{1jpQ
zLa~8?$t~4E=6E7UgNg6rd21Q`7rs*QyrkVw{LVfcC|RNWyXf5V?wzskMGvG{nSDOG
zraL)-(KUrNaDhl;e>ejRh~Q}K3uh2$>;V#r&0XOP5{w<}ci34J6PG$3*JfyNIP#dW
z@}J4Shp!nv&3tp&yx~~Bx%K1PF#Zofp5~#X#~(SkJFgeVnQ0tydi1qvDsR_@6F-s`
zaB%mvE9)5S<7MKvc+>Cu=(fU>8$Z$)Uah)$RQ5OXH2tqE0tfE5&MA&*WOHWtzw-ZE
d0S5*~eQTv}b=SWxmji|qgQu&X%Q~loCIGR@h;IM@

literal 0
HcmV?d00001

diff --git a/source/PlayniteUI/PlayniteUI.csproj b/source/PlayniteUI/PlayniteUI.csproj
index 091ddf333..5a1a8419e 100644
--- a/source/PlayniteUI/PlayniteUI.csproj
+++ b/source/PlayniteUI/PlayniteUI.csproj
@@ -133,6 +133,8 @@
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
+    <Reference Include="UIAutomationProvider" />
+    <Reference Include="UIAutomationTypes" />
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -420,6 +422,9 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\close.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
diff --git a/source/PlayniteUI/Theme.xaml b/source/PlayniteUI/Theme.xaml
index 3273d777c..398e62207 100644
--- a/source/PlayniteUI/Theme.xaml
+++ b/source/PlayniteUI/Theme.xaml
@@ -13,6 +13,7 @@
   mc:Ignorable="d"
   xmlns:d="http://schemas.microsoft.com/expression/blend/2008">
 
+    
     <!-- Main Colors -->
 
     <Color x:Key="MainColor">#FF595959</Color>
@@ -98,7 +99,6 @@
     <SolidColorBrush x:Key="DefaultedBorderBrush" Color="{StaticResource DefaultColor}" />
     <SolidColorBrush x:Key="SolidBorderBrush" Color="#888" />
 
-
     <Style x:Key="NuclearButtonFocusVisual">
         <Setter Property="Control.Template">
             <Setter.Value>
@@ -1888,13 +1888,15 @@
     <Style TargetType="ContextMenu">
         <Setter Property="Background" Value="{DynamicResource NormalBrushDark}" />
         <Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}" />
+        <Setter Property="BorderThickness" Value="2" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ContextMenu}">
                     <Grid>
-                        <Border Margin="1" x:Name="Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
-                        <StackPanel Background="{DynamicResource NormalBrushDark}" IsItemsHost="True" ClipToBounds="True"/>
+                        <Border Margin="1" x:Name="Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                            <StackPanel Background="{DynamicResource NormalBrushDark}" IsItemsHost="True" ClipToBounds="True"/>
+                        </Border>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsEnabled" Value="False">
@@ -1906,11 +1908,9 @@
             </Setter.Value>
         </Setter>
     </Style>
-    
+
     <Style TargetType="MenuItem">
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Background" Value="{DynamicResource NormalBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+        <Setter Property="Foreground" Value="{StaticResource TextBrush}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type MenuItem}">
@@ -1932,7 +1932,6 @@
                             </DoubleAnimationUsingKeyFrames>
                         </Storyboard>
                     </ControlTemplate.Resources>
-                    <Border x:Name="Border" BorderThickness="{TemplateBinding BorderThickness}">
                         <Grid>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition MinWidth="17" Width="Auto" SharedSizeGroup="MenuItemIconColumnGroup" />
@@ -1946,8 +1945,8 @@
                             <Grid Visibility="Hidden" Margin="8,0,6,0" x:Name="GlyphPanel" VerticalAlignment="Center">
                                 <Path x:Name="GlyphPanelpath" VerticalAlignment="Center" Fill="{TemplateBinding Foreground}" Data="M0,2 L0,4.8 L2.5,7.4 L7.1,2.8 L7.1,0 L2.5,4.6 z" FlowDirection="LeftToRight" />
                             </Grid>
-                            <TextBlock VerticalAlignment="Center" Grid.Column="1" Padding="5">
-                                <ContentPresenter x:Name="HeaderHost" RecognizesAccessKey="True" ContentSource="Header"/>
+                            <TextBlock VerticalAlignment="Center" Grid.Column="1" Padding="5" x:Name="HeaderHost" Foreground="{TemplateBinding Foreground}" >
+                                <ContentPresenter RecognizesAccessKey="True" ContentSource="Header"/>
                             </TextBlock>
                             <Grid Grid.Column="3" Margin="4,0,6,0" x:Name="ArrowPanel" VerticalAlignment="Center">
                                 <Path x:Name="ArrowPanelPath" VerticalAlignment="Center" Fill="{TemplateBinding Foreground}" Data="M0,0 L0,8 L4,4 z" />
@@ -1963,7 +1962,6 @@
                                 </Grid>
                             </Popup>
                         </Grid>
-                    </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="Role" Value="TopLevelHeader">
                             <Setter Property="Margin" Value="0,1,0,1" />
@@ -2011,162 +2009,13 @@
                             </Trigger.EnterActions>
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                            <Setter Property="Foreground" Value="Gray" TargetName="HeaderHost"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
-
-    <!--<Style TargetType="Separator">
-        <Setter Property="Background" Value="Red"/>
-    </Style>-->
-
-    <!--<Style TargetType="{x:Type Menu}">
-        <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Menu}">
-                    <Grid>
-                        <Border Margin="1" x:Name="Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
-                        <StackPanel Background="Red" IsItemsHost="True" ClipToBounds="True" Orientation="Horizontal" />
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Background" Value="{DynamicResource DisabledBackgroundBrush}" TargetName="Border" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource DisabledBorderBrush}" TargetName="Border" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <DropShadowBitmapEffect x:Key="PopupDropShadow" ShadowDepth="1.5" Softness="0.15" />
-    <Style TargetType="{x:Type MenuItem}">
-        <Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
-        <Setter Property="VerticalContentAlignment" Value="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type MenuItem}">
-                    <ControlTemplate.Resources>
-                        <Storyboard x:Key="HighlightedOn">
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-                            </DoubleAnimationUsingKeyFrames>
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverShineBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                        <Storyboard x:Key="HightlightedOff">
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverShineBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                    </ControlTemplate.Resources>
-                    <Border x:Name="Border" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="0,0,0,0" Margin="3,2,3,2">
-                        <Grid Margin="0,0,0,0">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition MinWidth="17" Width="Auto" SharedSizeGroup="MenuItemIconColumnGroup" />
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIGTColumnGroup" />
-                                <ColumnDefinition Width="14" />
-                            </Grid.ColumnDefinitions>
-                            <Border Grid.Column="0" Grid.ColumnSpan="4" Background="{DynamicResource HoverBrush}" Opacity="0" x:Name="HoverBorder" />
-                            <Border Grid.ColumnSpan="4" Background="{DynamicResource HoverShineBrush}" Opacity="0" x:Name="HoverShineBorder" />
-                            <ContentPresenter Margin="4,0,6,0" x:Name="Icon" VerticalAlignment="Center" ContentSource="Icon" />
-                            <Grid Visibility="Hidden" Margin="4,0,6,0" x:Name="GlyphPanel" VerticalAlignment="Center">
-                                <Path x:Name="GlyphPanelpath" VerticalAlignment="Center" Fill="{TemplateBinding Foreground}" Data="M0,2 L0,4.8 L2.5,7.4 L7.1,2.8 L7.1,0 L2.5,4.6 z" FlowDirection="LeftToRight" />
-                            </Grid>
-                            <ContentPresenter Grid.Column="1" x:Name="HeaderHost" RecognizesAccessKey="True" ContentSource="Header" Margin="2,1,2,1" />
-                            <Grid Grid.Column="3" Margin="4,0,6,0" x:Name="ArrowPanel" VerticalAlignment="Center">
-                                <Path x:Name="ArrowPanelPath" VerticalAlignment="Center" Fill="{TemplateBinding Foreground}" Data="M0,0 L0,8 L4,4 z" />
-                            </Grid>
-                            <Popup IsOpen="{Binding Path=IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}" Placement="Right" x:Name="SubMenuPopup" Focusable="false" AllowsTransparency="true" PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimationKey}}">
-                                <Grid x:Name="SubMenu">
-                                    <Border x:Name="SubMenuBorder" Background="{DynamicResource LightBrush}" BorderThickness="1" Opacity="0.8">
-                                        <Border.BorderBrush>
-                                            <SolidColorBrush Color="{DynamicResource WhiteColor}" />
-                                        </Border.BorderBrush>
-                                    </Border>
-                                    <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
-                                </Grid>
-                            </Popup>
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="Role" Value="TopLevelHeader">
-                            <Setter Property="Margin" Value="0,1,0,1" />
-                            <Setter Property="Padding" Value="6,3,6,3" />
-                            <Setter Property="Grid.IsSharedSizeScope" Value="true" />
-                            <Setter Property="Placement" Value="Bottom" TargetName="SubMenuPopup" />
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="ArrowPanel" />
-                        </Trigger>
-                        <Trigger Property="Role" Value="TopLevelItem">
-                            <Setter Property="Margin" Value="0,1,0,1" />
-                            <Setter Property="Padding" Value="6,3,6,3" />
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="ArrowPanel" />
-                        </Trigger>
-                        <Trigger Property="Role" Value="SubmenuHeader">
-                            <Setter Property="DockPanel.Dock" Value="Top" />
-                            <Setter Property="Padding" Value="0,2,0,2" />
-                            <Setter Property="Grid.IsSharedSizeScope" Value="true" />
-                        </Trigger>
-                        <Trigger Property="Role" Value="SubmenuItem">
-                            <Setter Property="DockPanel.Dock" Value="Top" />
-                            <Setter Property="Padding" Value="0,2,0,2" />
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="ArrowPanel" />
-                        </Trigger>
-                        <Trigger Property="IsSuspendingPopupAnimation" Value="true">
-                            <Setter Property="PopupAnimation" Value="None" TargetName="SubMenuPopup" />
-                        </Trigger>
-                        <Trigger Property="Icon" Value="{x:Null}">
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="Icon" />
-                        </Trigger>
-                        <Trigger Property="IsChecked" Value="true">
-                            <Setter Property="Visibility" Value="Visible" TargetName="GlyphPanel" />
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="Icon" />
-                        </Trigger>
-                        <Trigger Property="AllowsTransparency" SourceName="SubMenuPopup" Value="true">
-                            <Setter Property="Margin" Value="0,0,3,3" TargetName="SubMenu" />
-                            <Setter Property="SnapsToDevicePixels" Value="true" TargetName="SubMenu" />
-                            <Setter Property="BitmapEffect" Value="{DynamicResource PopupDropShadow}" TargetName="SubMenuBorder" />
-                        </Trigger>
-                        <Trigger Property="IsHighlighted" Value="true">
-                            <Trigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource HightlightedOff}" x:Name="HightlightedOff_BeginStoryboard"/>
-                            </Trigger.ExitActions>
-                            <Trigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource HighlightedOn}"/>
-                            </Trigger.EnterActions>
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>-->
-    <!--<Style TargetType="{x:Type Separator}">
-        <Setter Property="Height" Value="1" />
-        <Setter Property="Margin" Value="0,2,0,2" />
-        <Setter Property="Focusable" Value="false" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Separator}">
-                    <Border BorderBrush="{DynamicResource SolidBorderBrush}" BorderThickness="1" />
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>-->
     <Style TargetType="{x:Type TabControl}">
         <Setter Property="Template">
             <Setter.Value>
@@ -3478,69 +3327,7 @@
             </Setter.Value>
         </Setter>
         <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
-    </Style>
-
-    <Style x:Key="PopUpBorder" TargetType="Border">
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="BorderBrush" Value="Gray" />        
-    </Style>
-    
-    <Style x:Key="TextBlockPopupItem" TargetType="TextBlock">
-        <Setter Property="FontSize" Value="14"/>
-        <Setter Property="Foreground" Value="{StaticResource TextBrush}" />
-        <Setter Property="Padding" Value="5" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Style.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Foreground" Value="White" />
-                <Setter Property="Background" Value="Gray" />
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="False" >
-                <Setter Property="Foreground" Value="Gray" />                
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
-    <Style x:Key="BorderBlockPopupItem" TargetType="Border">
-        <Setter Property="Padding" Value="5" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Style.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="Gray" />
-            </Trigger>
-            <Trigger Property="IsMouseOver" Value="false">
-                <Setter Property="Background" Value="Transparent" />
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
-    <Style x:Key="PopupRadioItem" TargetType="{x:Type RadioButton}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type RadioButton}">
-                    <Border Style="{StaticResource BorderBlockPopupItem}">
-                        <BulletDecorator>
-                            <BulletDecorator.Bullet>
-                                <Polygon Name="TickMark"
-                                    Points="4,9 8,15 15,3 8,11 4,9"
-                                    Stroke="{StaticResource TextBrush}"
-                                    StrokeThickness="1" Visibility="Hidden" Fill="{StaticResource TextBrush}">
-                                </Polygon>
-                            </BulletDecorator.Bullet>
-                            <TextBlock Padding="3" VerticalAlignment="Center" FontSize="14">
-                                <ContentPresenter/>
-                            </TextBlock>
-                        </BulletDecorator>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsChecked" Value="true">
-                            <Setter TargetName="TickMark" Property="Visibility" Value="Visible"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+    </Style>   
 
     <Style TargetType="Hyperlink">
         <Setter Property="Foreground" Value="LightGray" />
@@ -3560,10 +3347,6 @@
             </Trigger>
         </Style.Triggers>
     </Style>
-
-    <Style TargetType="TextBlock">
-        <Setter Property="Foreground" Value="{StaticResource TextBrush}" />
-    </Style>
     
     <Style TargetType="DatePicker">
         <Setter Property="Foreground" Value="Black" />
@@ -3612,7 +3395,7 @@
         </Setter>
     </Style>
 
-    <Style TargetType="ToolTip">
+    <Style TargetType="ToolTip">        
         <Setter Property="Background" Value="{StaticResource NormalBrush}" />
     </Style>
 
@@ -3623,6 +3406,11 @@
     <Style TargetType="GridSplitter">
         <Setter Property="Background" Value="{StaticResource NormalBrushDark}" />
     </Style>
+
+    <Style x:Key="ContextSeparator" TargetType="Separator">
+        <Setter Property="Margin" Value="-50,2,0,2" />
+        <Setter Property="Background" Value="DarkGray" />
+    </Style>
 </ResourceDictionary>
 
 
diff --git a/source/PlayniteUI/Windows/AboutWindow.xaml b/source/PlayniteUI/Windows/AboutWindow.xaml
index 056eeace8..9709fdc82 100644
--- a/source/PlayniteUI/Windows/AboutWindow.xaml
+++ b/source/PlayniteUI/Windows/AboutWindow.xaml
@@ -5,24 +5,26 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:PlayniteUI"
         mc:Ignorable="d"
-        Name="MainWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
-        Title="About Playnite" ResizeMode="NoResize" Height="315" Width="400">
+        WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
+        Title="About Playnite" ResizeMode="NoResize" Height="315" Width="400"
+        AutomationProperties.AutomationId="WindowAbout">
     <Grid Background="{StaticResource NormalBrush}">
         <DockPanel Margin="10">
             <StackPanel Orientation="Horizontal" DockPanel.Dock="Top">
                 <Image Source="/Images/applogo.png" Width="64" Height="64" RenderOptions.BitmapScalingMode="Fant"/>             
 
                 <StackPanel Margin="15,0,0,0">
-                    <TextBlock Text="{Binding Path=VersionInfo, ElementName=MainWindow}" Foreground="{StaticResource TextBrush}" FontSize="20"/>
+                    <TextBlock Name="TextVersionInfo" Text="{Binding VersionInfo, RelativeSource={RelativeSource AncestorType=Window}}"
+                               Foreground="{StaticResource TextBrush}" FontSize="20"/>
                     <TextBlock Text="by Josef Nemec" Foreground="LightGray"/>
                     <TextBlock>
-                        <Hyperlink FontSize="12" Style="{DynamicResource DetailsHyperlink}" NavigateUri="http://www.playnite.link" TextDecorations="{x:Null}"
+                        <Hyperlink Name="HyperlinkHomepage" FontSize="12" NavigateUri="http://www.playnite.link"
                                    RequestNavigate="Hyperlink_RequestNavigate">
                             Homepage at www.playnite.link
                         </Hyperlink>
                     </TextBlock>
                     <TextBlock>
-                        <Hyperlink FontSize="12" Style="{DynamicResource DetailsHyperlink}" NavigateUri="https://github.com/JosefNemec/Playnite/" TextDecorations="{x:Null}"
+                        <Hyperlink Name="HyperlinkSource" FontSize="12" NavigateUri="https://github.com/JosefNemec/Playnite/"
                                    RequestNavigate="Hyperlink_RequestNavigate">
                             Source Code at GitHub
                         </Hyperlink>
@@ -31,12 +33,12 @@
             </StackPanel>
             
             <DockPanel Margin="0,10,0,0" LastChildFill="False" DockPanel.Dock="Bottom">
-                <Button Content="Create diag. package" Padding="5" Click="DiagButton_Click"/>
-                <Button Content="Close" Padding="10,5,10,5"  DockPanel.Dock="Right" Click="CloseButton_Click" IsCancel="True"/>
+                <Button Name="ButtonCreatePackage" Content="Create diag. package" Padding="5" Click="DiagButton_Click"/>
+                <Button Name="ButtonClose" Content="Close" Padding="10,5,10,5"  DockPanel.Dock="Right" Click="CloseButton_Click" IsCancel="True"/>
             </DockPanel>
 
             <ScrollViewer Margin="0,5,0,0" DockPanel.Dock="Top">
-            <TextBox AcceptsReturn="True" IsReadOnly="True"  TextWrapping="Wrap" Text="MIT License&#x0a;&#x0a;Copyright (c) 2017 Josef Nemec&#x0a;&#x0a;Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &quot;Software&quot;), to deal
+            <TextBox AcceptsReturn="True" IsReadOnly="True" TextWrapping="Wrap" Text="MIT License&#x0a;&#x0a;Copyright (c) 2017 Josef Nemec&#x0a;&#x0a;Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &quot;Software&quot;), to deal
 in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:&#x0a;&#x0a;The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.&#x0a;&#x0a;THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
diff --git a/source/PlayniteUI/Windows/CategoryConfigWindow.xaml b/source/PlayniteUI/Windows/CategoryConfigWindow.xaml
index ad68fe679..0e990e99e 100644
--- a/source/PlayniteUI/Windows/CategoryConfigWindow.xaml
+++ b/source/PlayniteUI/Windows/CategoryConfigWindow.xaml
@@ -7,7 +7,8 @@
         mc:Ignorable="d"
         Title="Assign category for the game" Height="320" Width="340"
         Background="{StaticResource NormalBrush}"
-        WindowStartupLocation="CenterScreen" ShowInTaskbar="False">
+        WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
+        AutomationProperties.AutomationId="WindowCategories">
     <Grid>
         <DockPanel>
             <DockPanel Margin="10" LastChildFill="False" Height="25" DockPanel.Dock="Bottom">
diff --git a/source/PlayniteUI/Windows/CrashHandlerWindow.xaml b/source/PlayniteUI/Windows/CrashHandlerWindow.xaml
index 8b3b46600..e57687c3c 100644
--- a/source/PlayniteUI/Windows/CrashHandlerWindow.xaml
+++ b/source/PlayniteUI/Windows/CrashHandlerWindow.xaml
@@ -6,10 +6,10 @@
         xmlns:local="clr-namespace:PlayniteUI.Windows"
         mc:Ignorable="d"
         Title="Oh no, something bad happened..." Height="400" Width="600"
-        WindowStartupLocation="CenterScreen">
+        WindowStartupLocation="CenterScreen"
+        AutomationProperties.AutomationId="WindowCrash">
     <Grid Background="{DynamicResource NormalBrush}">
-        <DockPanel>
-            
+        <DockPanel>            
             <DockPanel Margin="10" LastChildFill="False" Height="25" DockPanel.Dock="Bottom">
                 <Button Name="ButtonClose" Click="ButtonClose_Click" Content="Close Playnite" Padding="15,0,15,0" DockPanel.Dock="Right" Margin="10,0,0,0"/>
                 <Button Name="ButtonSaveDiag" Click="ButtonSaveDiag_Click" Content="Create diag. package" Padding="15,0,15,0" DockPanel.Dock="Right"/>
diff --git a/source/PlayniteUI/Windows/FirstTimeStartupWindow.xaml b/source/PlayniteUI/Windows/FirstTimeStartupWindow.xaml
index 8dc2dd995..77e2c7395 100644
--- a/source/PlayniteUI/Windows/FirstTimeStartupWindow.xaml
+++ b/source/PlayniteUI/Windows/FirstTimeStartupWindow.xaml
@@ -8,7 +8,8 @@
         mc:Ignorable="d"
         Title="First Time Configuration" WindowStartupLocation="CenterOwner"
         Background="{StaticResource NormalBrush}"
-        Height="330" Width="500" Name="WindowMain">
+        Height="330" Width="500" Name="WindowMain"
+        AutomationProperties.AutomationId="WindowWizard">
 
     <Window.Resources>
         <playniteUI:NegateConverter x:Key="NegateConverter" />
@@ -37,17 +38,17 @@
                 <DockPanel Margin="20" LastChildFill="False">
                     <TextBlock Text="Database Location" VerticalAlignment="Center" FontSize="16" DockPanel.Dock="Top"/>
                     <TextBlock Text="Choose location for library database file. Location can be also changed later via Settings menu." DockPanel.Dock="Top" Margin="5,20,5,0" TextWrapping="Wrap"/>
-                    <RadioButton Content="Default program data location for all users" GroupName="database"
+                    <RadioButton Name="RadioDbDefault" Content="Default program data location for all users" GroupName="database"
                                  IsChecked="{Binding Path=DatabaseLocation, Converter={StaticResource EnumBooleanConverter}, ConverterParameter=ProgramData, ElementName=WindowMain}"
                                  DockPanel.Dock="Top" Margin="5,10,5,5"/>
-                    <RadioButton Content="Custom location" GroupName="database" Name="RadioCustomLocation"
+                    <RadioButton Name="RadioDbCustom" Content="Custom location" GroupName="database"
                                  IsChecked="{Binding Path=DatabaseLocation, Converter={StaticResource EnumBooleanConverter}, ConverterParameter=Custom, ElementName=WindowMain}"
                                  DockPanel.Dock="Top" Margin="5"/>
-                    <DockPanel DockPanel.Dock="Top" Margin="15,5,5,5" IsEnabled="{Binding IsChecked, ElementName=RadioCustomLocation}">
+                    <DockPanel DockPanel.Dock="Top" Margin="15,5,5,5" IsEnabled="{Binding IsChecked, ElementName=RadioDbCustom}">
                         <Button Content=". . ." DockPanel.Dock="Right" Padding="5,0,5,0" Name="ButtonBrowserDbFile"
                                 Click="ButtonBrowserDbFile_Click" />
                         <TextBox AcceptsReturn="False" Margin="10,0,5,0" DockPanel.Dock="Left"
-                                 Text="{Binding DatabasePath, ElementName=WindowMain}"/>
+                                 Name="TextDbFile" Text="{Binding DatabasePath, ElementName=WindowMain}"/>
                     </DockPanel>
                 </DockPanel>
             </TabItem>
@@ -57,11 +58,11 @@
                     <TextBlock Text="Automatically import games from following services:" DockPanel.Dock="Top" Margin="5,20,5,0"/>
                     <TextBlock Text="(newly added games will be automatically imported during application start)" DockPanel.Dock="Top" Margin="5,0,5,5"/>
                     <CheckBox Content="Steam" IsChecked="{Binding SteamEnabled, ElementName=WindowMain}"
-                              DockPanel.Dock="Top" Margin="5" />
+                              DockPanel.Dock="Top" Margin="5" Name="CheckEnableSteam" />
                     <CheckBox Content="GOG" IsChecked="{Binding GOGEnabled, ElementName=WindowMain}"
-                              DockPanel.Dock="Top" Margin="5"/>
+                              DockPanel.Dock="Top" Margin="5" Name="CheckEnableGOG"/>
                     <CheckBox Content="Origin" IsChecked="{Binding OriginEnabled, ElementName=WindowMain}"
-                              DockPanel.Dock="Top" Margin="5"/>
+                              DockPanel.Dock="Top" Margin="5" Name="CheckEnableOrigin"/>
                 </DockPanel>
             </TabItem>
             <TabItem Header="Steam" Visibility="Collapsed">
@@ -70,10 +71,10 @@
                         <Image Source="/Images/steamicon.png" Width="32" RenderOptions.BitmapScalingMode="Fant"/>
                         <TextBlock Text="Steam Integration" VerticalAlignment="Center" FontSize="16" Margin="10,0,0,0"/>
                     </StackPanel>
-                    <RadioButton Content="Only import installed games" GroupName="steam"
+                    <RadioButton Name="RadioInstalledSteam" Content="Only import installed games" GroupName="steam"
                                  IsChecked="{Binding SteamImportLibrary, ElementName=WindowMain, Converter={StaticResource NegateConverter}}"
                                  DockPanel.Dock="Top" Margin="5"/>
-                    <RadioButton Content="Import complete library" GroupName="steam" Name="RadioSteamImportLib"
+                    <RadioButton Name="RadioLibrarySteam" Content="Import complete library" GroupName="steam"
                                  IsChecked="{Binding SteamImportLibrary, ElementName=WindowMain}"
                                  DockPanel.Dock="Top" Margin="5"/>
                     <DockPanel DockPanel.Dock="Top" Margin="30,5,5,5">
@@ -83,8 +84,9 @@
                                 What's my account name?
                             </Hyperlink>
                         </TextBlock>
-                        <TextBox AcceptsReturn="False" Margin="10,0,10,0" IsEnabled="{Binding IsChecked, ElementName=RadioSteamImportLib}"
-                                 Text="{Binding SteamAccountName, ElementName=WindowMain}"/>
+                        <TextBox Name="TextSteamAccount" AcceptsReturn="False" Margin="10,0,10,0" 
+                                 Text="{Binding SteamAccountName, ElementName=WindowMain}"
+                                 IsEnabled="{Binding IsChecked, ElementName=RadioLibrarySteam}"/>
                     </DockPanel>
                 </DockPanel>
             </TabItem>
@@ -94,15 +96,14 @@
                         <Image Source="/Images/gogicon.png" Width="32" RenderOptions.BitmapScalingMode="Fant"/>
                         <TextBlock Text="GOG Integration" VerticalAlignment="Center" FontSize="16" Margin="10,0,0,0"/>
                     </StackPanel>
-                    <RadioButton Content="Only import installed games" GroupName="gog"
+                    <RadioButton Name="RadioInstalledGOG" Content="Only import installed games" GroupName="gog"
                                  IsChecked="{Binding GogImportLibrary, ElementName=WindowMain, Converter={StaticResource NegateConverter}}"
                                  DockPanel.Dock="Top" Margin="5"/>
-                    <RadioButton Content="Import complete library (requires authentication)"
-                                 GroupName="gog" Name="RadioGogImportLib"
-                                 IsChecked="{Binding GogImportLibrary, ElementName=WindowMain}"
-                                 DockPanel.Dock="Top" Margin="5"/>
+                    <RadioButton Name="RadioLibraryGOG" Content="Import complete library (requires authentication)"
+                                 GroupName="gog" DockPanel.Dock="Top" Margin="5"
+                                 IsChecked="{Binding GogImportLibrary, ElementName=WindowMain}" />
                     <Button Content="Authenticate" DockPanel.Dock="Top" Margin="5" HorizontalAlignment="Left" Padding="5"
-                            Name="ButtonGogAuthenticate" IsEnabled="{Binding IsChecked, ElementName=RadioGogImportLib}"
+                            Name="ButtonGogAuthenticate" IsEnabled="{Binding IsChecked, ElementName=RadioLibraryGOG}"
                             Click="ButtonGogAuthenticate_Click"/>
                 </DockPanel>
             </TabItem>
@@ -112,15 +113,14 @@
                         <Image Source="/Images/originicon.png" Width="32" RenderOptions.BitmapScalingMode="Fant"/>
                         <TextBlock Text="Origin Integration" VerticalAlignment="Center" FontSize="16" Margin="10,0,0,0"/>
                     </StackPanel>
-                    <RadioButton Content="Only import installed games" GroupName="origin"
+                    <RadioButton Name="RadioInstalledOrigin" Content="Only import installed games" GroupName="origin"
                                  IsChecked="{Binding OriginImportLibrary, ElementName=WindowMain, Converter={StaticResource NegateConverter}}"
                                  DockPanel.Dock="Top" Margin="5"/>
-                    <RadioButton Content="Import complete library (requires authentication)"
-                                 GroupName="origin" Name="RadioOriginImportLib"
-                                 IsChecked="{Binding OriginImportLibrary, ElementName=WindowMain}"
-                                 DockPanel.Dock="Top" Margin="5"/>
+                    <RadioButton Name="RadioLibraryOrigin" Content="Import complete library (requires authentication)"
+                                 GroupName="origin" DockPanel.Dock="Top" Margin="5"
+                                 IsChecked="{Binding OriginImportLibrary, ElementName=WindowMain}" />
                     <Button Content="Authenticate" DockPanel.Dock="Top" Margin="5" HorizontalAlignment="Left" Padding="5"
-                            Name="ButtonOriginAuthenticate" IsEnabled="{Binding IsChecked, ElementName=RadioOriginImportLib}"
+                            Name="ButtonOriginAuthenticate" IsEnabled="{Binding IsChecked, ElementName=RadioLibraryOrigin}"
                             Click="ButtonOriginAuthenticate_Click"/>
                 </DockPanel>
             </TabItem>
diff --git a/source/PlayniteUI/Windows/GameEditWindow.xaml b/source/PlayniteUI/Windows/GameEditWindow.xaml
index 750b3188a..3179b29ae 100644
--- a/source/PlayniteUI/Windows/GameEditWindow.xaml
+++ b/source/PlayniteUI/Windows/GameEditWindow.xaml
@@ -13,7 +13,8 @@
         Name="mainWindow" ResizeMode="CanResizeWithGrip"
         LocationChanged="MainWindow_LocationChanged"
         Loaded="MainWindow_Loaded"
-        SizeChanged="MainWindow_SizeChanged">
+        SizeChanged="MainWindow_SizeChanged"
+        AutomationProperties.AutomationId="WindowGameEdit">
 
     <Window.Resources>
         <local:ListToStringConverter x:Key="ListToStringConverter" />
@@ -29,7 +30,7 @@
             <RowDefinition Height="30"/>
         </Grid.RowDefinitions>
 
-        <TabControl DockPanel.Dock="Top" Grid.Column="0" Grid.Row="0">
+        <TabControl Name="TabControlMain" DockPanel.Dock="Top" Grid.Column="0" Grid.Row="0">
             <TabItem Header="General" >
                 <Grid Margin="5,3,0,0">
                     <Grid.ColumnDefinitions>
@@ -65,7 +66,7 @@
                                  Visibility="{Binding Source={x:Static playnite:Constants.IsDebugBuild}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
 
                         <TextBlock  Grid.Column="0" Grid.Row="1" Text="Name" Margin="0,1,0,0"/>
-                        <CheckBox   Grid.Column="1" Grid.Row="1" Name="checkName" VerticalAlignment="Center"
+                        <CheckBox   Grid.Column="1" Grid.Row="1" Name="CheckName" VerticalAlignment="Center"
                                     Visibility="{Binding CheckBoxesVisible, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
                                     IsChecked="{Binding IsNameBindingDirty, ElementName=mainWindow, Mode=OneWay}"/>
                         <TextBox    Grid.Column="2" Grid.Row="1" Name="TextName" Margin="0,1,0,0"
@@ -73,7 +74,7 @@
                                     TextChanged="TextBox_TextChanged" Tag="IsNameBindingDirty"/>
 
                         <TextBlock  Grid.Column="0" Grid.Row="2" Text="Genre(s)"  Margin="0,1,0,0"/>
-                        <CheckBox   Grid.Column="1" Grid.Row="2" Name="checkGenres" VerticalAlignment="Center"
+                        <CheckBox   Grid.Column="1" Grid.Row="2" Name="CheckGenres" VerticalAlignment="Center"
                                     Visibility="{Binding CheckBoxesVisible, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
                                     IsChecked="{Binding IsGenreBindingDirty, ElementName=mainWindow, Mode=OneWay}"/>
                         <TextBox    Grid.Column="2" Grid.Row="2" Name="TextGenres" Margin="0,1,0,0"
@@ -81,7 +82,7 @@
                                     TextChanged="TextBox_TextChanged" Tag="IsGenreBindingDirty"/>
 
                         <TextBlock  Grid.Column="0" Grid.Row="3" Text="Release date" Margin="0,1,0,0"/>
-                        <CheckBox   Grid.Column="1" Grid.Row="3" Name="checkReleaseDate" VerticalAlignment="Center"
+                        <CheckBox   Grid.Column="1" Grid.Row="3" Name="CheckReleaseDate" VerticalAlignment="Center"
                                     Visibility="{Binding CheckBoxesVisible, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
                                     IsChecked="{Binding IsReleaseDateBindingDirty, ElementName=mainWindow, Mode=OneWay}"/>
                         <Grid       Grid.Column="2" Grid.Row="3" Margin="0,1,0,0">
@@ -93,7 +94,7 @@
                         </Grid>
 
                         <TextBlock  Grid.Column="0" Grid.Row="4" Text="Developer(s)" Margin="0,1,0,0" />
-                        <CheckBox   Grid.Column="1" Grid.Row="4" Name="checkDeveloper" VerticalAlignment="Center"
+                        <CheckBox   Grid.Column="1" Grid.Row="4" Name="CheckDeveloper" VerticalAlignment="Center"
                                     Visibility="{Binding CheckBoxesVisible, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
                                     IsChecked="{Binding IsDeveloperBindingDirty, ElementName=mainWindow, Mode=OneWay}"/>
                         <TextBox    Grid.Column="2" Grid.Row="4" Name="TextDeveloper" Margin="0,1,0,0"
@@ -101,7 +102,7 @@
                                     TextChanged="TextBox_TextChanged" Tag="IsDeveloperBindingDirty"/>
 
                         <TextBlock  Grid.Column="0" Grid.Row="5" Text="Publisher(s)" Margin="0,1,0,0" />
-                        <CheckBox   Grid.Column="1" Grid.Row="5" Name="checkPublisher" VerticalAlignment="Center"
+                        <CheckBox   Grid.Column="1" Grid.Row="5" Name="CheckPublisher" VerticalAlignment="Center"
                                     Visibility="{Binding CheckBoxesVisible, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
                                     IsChecked="{Binding IsPublisherBindingDirty, ElementName=mainWindow, Mode=OneWay}"/>
                         <TextBox    Grid.Column="2" Grid.Row="5" Name="TextPublisher" Margin="0,1,0,0"
@@ -109,7 +110,7 @@
                                     TextChanged="TextBox_TextChanged" Tag="IsPublisherBindingDirty"/>
 
                         <TextBlock  Grid.Column="0" Grid.Row="6" Text="Categories" Margin="0,1,0,0" />
-                        <CheckBox   Grid.Column="1" Grid.Row="6" Name="checkCategories" VerticalAlignment="Center"
+                        <CheckBox   Grid.Column="1" Grid.Row="6" Name="CheckCategories" VerticalAlignment="Center"
                                     Visibility="{Binding CheckBoxesVisible, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
                                     IsChecked="{Binding IsCategoriesBindingDirty, ElementName=mainWindow, Mode=OneWay}"/>
                         <DockPanel Grid.Column="2" Grid.Row="6" Margin="0,1,0,0">
@@ -119,7 +120,7 @@
                         </DockPanel>
 
                         <TextBlock  Grid.Column="0" Grid.Row="7" Text="Store URL" Margin="0,1,0,0" />
-                        <CheckBox   Grid.Column="1" Grid.Row="7" Name="checkStore" VerticalAlignment="Center"
+                        <CheckBox   Grid.Column="1" Grid.Row="7" Name="CheckStore" VerticalAlignment="Center"
                                     Visibility="{Binding CheckBoxesVisible, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
                                     IsChecked="{Binding IsStoreBindingDirty, ElementName=mainWindow, Mode=OneWay}"/>
                         <TextBox    Grid.Column="2" Grid.Row="7" Name="TextStore" Margin="0,1,0,0"
@@ -127,7 +128,7 @@
                                     TextChanged="TextBox_TextChanged" Tag="IsStoreBindingDirty"/>
 
                         <TextBlock  Grid.Column="0" Grid.Row="8" Text="Wiki URL" Margin="0,1,0,0" />
-                        <CheckBox   Grid.Column="1" Grid.Row="8" Name="checkWiki" VerticalAlignment="Center"
+                        <CheckBox   Grid.Column="1" Grid.Row="8" Name="CheckWiki" VerticalAlignment="Center"
                                     Visibility="{Binding CheckBoxesVisible, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
                                     IsChecked="{Binding IsWikiBindingDirty, ElementName=mainWindow, Mode=OneWay}"/>
                         <TextBox    Grid.Column="2" Grid.Row="8" Name="TextWiki" Margin="0,1,0,0"
@@ -135,7 +136,7 @@
                                     TextChanged="TextBox_TextChanged" Tag="IsWikiBindingDirty"/>
 
                         <TextBlock  Grid.Column="0" Grid.Row="9" Text="Forums URL" Margin="0,1,0,0" />
-                        <CheckBox   Grid.Column="1" Grid.Row="9" Name="checkForums" VerticalAlignment="Center"
+                        <CheckBox   Grid.Column="1" Grid.Row="9" Name="CheckForums" VerticalAlignment="Center"
                                     Visibility="{Binding CheckBoxesVisible, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
                                     IsChecked="{Binding IsForumsBindingDirty, ElementName=mainWindow, Mode=OneWay}"/>                        
                         <TextBox    Grid.Column="2" Grid.Row="9" Name="TextForums" Margin="0,1,0,0"
@@ -143,7 +144,7 @@
                                     TextChanged="TextBox_TextChanged" Tag="IsForumsBindingDirty"/>
 
                         <TextBlock  Grid.Column="0" Grid.Row="10" Text="Description" Margin="0,1,0,0" />
-                        <CheckBox   Grid.Column="1" Grid.Row="10" Name="checkDescription" Margin="0,2,0,0"
+                        <CheckBox   Grid.Column="1" Grid.Row="10" Name="CheckDescription" Margin="0,2,0,0"
                                     Visibility="{Binding CheckBoxesVisible, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
                                     IsChecked="{Binding IsDescriptionBindingDirty, ElementName=mainWindow, Mode=OneWay}"/>
                         <ScrollViewer Grid.Column="2" Grid.Row="10" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" Margin="0,1,0,0">
@@ -160,11 +161,11 @@
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition/>
                         </Grid.ColumnDefinitions>
-                        <GroupBox Grid.Column="0" Grid.Row="0" Header="Icon" Name="groupIcon">
+                        <GroupBox Grid.Column="0" Grid.Row="0" Header="Icon">
                             <GroupBox.HeaderTemplate>
                                 <DataTemplate>
                                     <StackPanel Orientation="Horizontal">
-                                        <CheckBox Name="checkIcon" VerticalAlignment="Center" Loaded="CheckIcon_Loaded"
+                                        <CheckBox Name="CheckIcon" VerticalAlignment="Center" Loaded="CheckIcon_Loaded"
                                                   Visibility="{Binding CheckBoxesVisible, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
                                                   IsChecked="{Binding IsIconBindingDirty, ElementName=mainWindow, Mode=OneWay}"/>
                                     <TextBlock Text="{Binding}" />
@@ -173,21 +174,21 @@
                             </GroupBox.HeaderTemplate>
                             <DockPanel LastChildFill="True">
                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,5,0,5" DockPanel.Dock="Top">
-                                    <Button Content="Select Icon" Width="80" Height="25" Click="ButtonSelectIcon_Click" />
-                                    <Button Content=" Use exe's icon " Height="25" Click="ButtonExecIcon_Click"
-                                        Margin="5,0,0,0"/>
+                                    <Button Name="ButtonSelectIcon" Content="Select Icon" Width="80" Height="25" Click="ButtonSelectIcon_Click" />
+                                    <Button Name="ButtonUseExeIcon" Content=" Use exe's icon " Height="25" Click="ButtonExecIcon_Click" Margin="5,0,0,0"/>
                                 </StackPanel>
                                 <Image Source="{Binding Icon, UpdateSourceTrigger=Explicit, Mode=TwoWay, Converter={StaticResource LiteDBImageToImageConverter}}"
                                        Stretch="Uniform" StretchDirection="DownOnly" RenderOptions.BitmapScalingMode="Fant" Name="ImageIcon"
-                                       DockPanel.Dock="Top" Tag="IsIconBindingDirty"/>
+                                       DockPanel.Dock="Top" Tag="IsIconBindingDirty"
+                                       AutomationProperties.HelpText="{Binding Icon}"/>
 
                             </DockPanel>
                         </GroupBox>
-                        <GroupBox Grid.Column="0" Grid.Row="1" Header="Cover Image" Margin="0,2,0,0" Name="groupImage">
+                        <GroupBox Grid.Column="0" Grid.Row="1" Header="Cover Image" Margin="0,2,0,0">
                             <GroupBox.HeaderTemplate>
                                 <DataTemplate>
                                     <StackPanel Orientation="Horizontal">
-                                        <CheckBox Name="checkImage" VerticalAlignment="Center" Loaded="CheckImage_Loaded"
+                                        <CheckBox Name="CheckImage" VerticalAlignment="Center" Loaded="CheckImage_Loaded"
                                                   Visibility="{Binding CheckBoxesVisible, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
                                                   IsChecked="{Binding IsImageBindingDirty, ElementName=mainWindow, Mode=OneWay}"/>
                                         <TextBlock Text="{Binding}" />
@@ -196,12 +197,13 @@
                             </GroupBox.HeaderTemplate>
                             <DockPanel LastChildFill="True">
                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,5,0,5" DockPanel.Dock="Top">
-                                    <Button Width="80" Height="25" Content="Select Image" Click="ButtonSelectImage_Click"
+                                    <Button Name="ButtonSelectImage" Width="80" Height="25" Content="Select Image" Click="ButtonSelectImage_Click"
                                             Margin="0,0,5,0"/>
                                 </StackPanel>
                                 <Image Source="{Binding Image, UpdateSourceTrigger=Explicit, Mode=TwoWay, Converter={StaticResource LiteDBImageToImageConverter}}"
                                        Stretch="Uniform" StretchDirection="DownOnly" RenderOptions.BitmapScalingMode="Fant" Name="ImageImage"
-                                       DockPanel.Dock="Top" Tag="IsImageBindingDirty"/>
+                                       DockPanel.Dock="Top" Tag="IsImageBindingDirty"
+                                       AutomationProperties.HelpText="{Binding Image}"/>
                             </DockPanel>
                         </GroupBox>
                     </Grid>
@@ -213,32 +215,32 @@
                     <StackPanel>
                         <GroupBox Header="Play Action" Padding="2" Margin="2,5,2,0">
                             <StackPanel>
-                                <Button Content="Add Play Action" Width="120" Height="25" Click="ButtonAddPlayAction_Click" HorizontalAlignment="Left"
+                                <Button Name="ButtonAddPlay" Content="Add Play Action" Width="120" Height="25" Click="ButtonAddPlayAction_Click" HorizontalAlignment="Left"
                                         Visibility="{Binding ShowAddPlayAction, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
                                         Margin="0,5,0,5"/>
-                                <Button Content="Remove Play Action" Width="120" Height="25" Click="ButtonRemovePlayAction_Click" HorizontalAlignment="Left"
+                                <Button Name="ButtonRemovePlay" Content="Remove Play Action" Width="120" Height="25" Click="ButtonRemovePlayAction_Click" HorizontalAlignment="Left"
                                         Visibility="{Binding ShowRemovePlayAction, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
                                         Margin="0,5,0,5"/>
-                                <local:GameTaskView x:Name="playTask" DataContext="{Binding TempPlayTask, ElementName=mainWindow}"
+                                <local:GameTaskView x:Name="TaskPlay" DataContext="{Binding TempPlayTask, ElementName=mainWindow}"
                                         Visibility="{Binding ShowPlayActionEdit, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"/>
                             </StackPanel>
                         </GroupBox>
                         <GroupBox Header="Other Actions" Padding="2" Margin="2,5,2,0">
                             <StackPanel>
-                                <ItemsControl Name="controlOtherTasks">
+                                <ItemsControl Name="OtherTasksItems">
                                     <ItemsControl.ItemTemplate>
                                         <DataTemplate>
                                             <Border BorderThickness="2" BorderBrush="{StaticResource NormalBrush}" CornerRadius="2" Padding="3" Margin="0,5,0,0">
                                                 <StackPanel>
-                                                    <local:GameTaskView />
+                                                    <local:GameTaskView x:Name="TaskCustom"/>
                                                     <Button Content="Delete Action" Width="120" Height="25" Click="ButtonDeleteAction_Click" HorizontalAlignment="Right" Margin="0,3,5,3"/>
                                                 </StackPanel>
                                             </Border>
                                         </DataTemplate>
                                     </ItemsControl.ItemTemplate>
                                 </ItemsControl>
-                                <Button Content="Add Action" Width="80" Height="25" Click="ButtonAddAction_Click" HorizontalAlignment="Left"
-                                    Margin="0,5,0,5"/>
+                                <Button Name="ButtonAddAction" Content="Add Action" Width="80" Height="25" Click="ButtonAddAction_Click" HorizontalAlignment="Left"
+                                        Margin="0,5,0,5"/>
                             </StackPanel>
                         </GroupBox>
                     </StackPanel>
@@ -247,11 +249,11 @@
         </TabControl>
 
         <DockPanel Margin="0,5,0,0" LastChildFill="False" Grid.Column="0" Grid.Row="1">
-            <Button Content=" Download data from Web... " DockPanel.Dock="Left" Padding="7,0,7,0"
-                    Click="ButtonDownload_Click" Name="ButtonDownload"/>
-            <Button Content="Cancel" Width="60" DockPanel.Dock="Right" Margin="10,0,10,0" IsCancel="True"
+            <Button Name="ButtonDownload" Content=" Download data from Web... " DockPanel.Dock="Left" Padding="7,0,7,0"
+                    Click="ButtonDownload_Click"/>
+            <Button Name="ButtonCancel" Content="Cancel" Width="60" DockPanel.Dock="Right" Margin="10,0,10,0" IsCancel="True"
                     Click="ButtonCancel_Click"/>
-            <Button Content="OK" Width="60" DockPanel.Dock="Right"
+            <Button Name="ButtonOK" Content="OK" Width="60" DockPanel.Dock="Right"
                     Click="ButtonOK_Click"/>
         </DockPanel>
     </Grid>
diff --git a/source/PlayniteUI/Windows/GameEditWindow.xaml.cs b/source/PlayniteUI/Windows/GameEditWindow.xaml.cs
index b99955377..b5000c156 100644
--- a/source/PlayniteUI/Windows/GameEditWindow.xaml.cs
+++ b/source/PlayniteUI/Windows/GameEditWindow.xaml.cs
@@ -254,8 +254,8 @@ public bool IsImageBindingDirty
 
         #endregion Dirty flags
 
-        private CheckBox checkIcon;
-        private CheckBox checkImage;
+        private CheckBox CheckIcon;
+        private CheckBox CheckImage;
 
         public event PropertyChangedEventHandler PropertyChanged;
 
@@ -320,7 +320,7 @@ private void DataChanged(object data)
                 if (Game.OtherTasks != null)
                 {
                     TempOtherTasks = Playnite.CloneObject.CloneJson<ObservableCollection<GameTask>>(Game.OtherTasks);
-                    controlOtherTasks.ItemsSource = TempOtherTasks;
+                    OtherTasksItems.ItemsSource = TempOtherTasks;
                 }
 
                 PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("ShowAddPlayAction"));
@@ -412,7 +412,7 @@ private void ButtonOK_Click(object sender, RoutedEventArgs e)
                 return;
             }
 
-            if (IsNameBindingDirty && checkName.IsChecked == true)
+            if (IsNameBindingDirty && CheckName.IsChecked == true)
             {
                 BindingOperations.GetBindingExpression(TextName, TextBox.TextProperty).UpdateSource();
                 if (Games != null)
@@ -424,7 +424,7 @@ private void ButtonOK_Click(object sender, RoutedEventArgs e)
                 }
             }
             
-            if (IsGenreBindingDirty && checkGenres.IsChecked == true)
+            if (IsGenreBindingDirty && CheckGenres.IsChecked == true)
             {
                 BindingOperations.GetBindingExpression(TextGenres, TextBox.TextProperty).UpdateSource();
                 if (Games != null)
@@ -436,7 +436,7 @@ private void ButtonOK_Click(object sender, RoutedEventArgs e)
                 }
             }
             
-            if (IsReleaseDateBindingDirty && checkReleaseDate.IsChecked == true)
+            if (IsReleaseDateBindingDirty && CheckReleaseDate.IsChecked == true)
             {
                 BindingOperations.GetBindingExpression(TextReleaseDate, TextBox.TextProperty).UpdateSource();
                 if (Games != null)
@@ -448,7 +448,7 @@ private void ButtonOK_Click(object sender, RoutedEventArgs e)
                 }
             }
             
-            if (IsDeveloperBindingDirty && checkDeveloper.IsChecked == true)
+            if (IsDeveloperBindingDirty && CheckDeveloper.IsChecked == true)
             {
                 BindingOperations.GetBindingExpression(TextDeveloper, TextBox.TextProperty).UpdateSource();
                 if (Games != null)
@@ -460,7 +460,7 @@ private void ButtonOK_Click(object sender, RoutedEventArgs e)
                 }
             }
 
-            if (IsPublisherBindingDirty && checkPublisher.IsChecked == true)
+            if (IsPublisherBindingDirty && CheckPublisher.IsChecked == true)
             {
                 BindingOperations.GetBindingExpression(TextPublisher, TextBox.TextProperty).UpdateSource();
                 if (Games != null)
@@ -472,7 +472,7 @@ private void ButtonOK_Click(object sender, RoutedEventArgs e)
                 }
             }
             
-            if (IsCategoriesBindingDirty && checkCategories.IsChecked == true)
+            if (IsCategoriesBindingDirty && CheckCategories.IsChecked == true)
             {
                 BindingOperations.GetBindingExpression(TextCategories, TextBox.TextProperty).UpdateSource();
                 if (Games != null)
@@ -484,7 +484,7 @@ private void ButtonOK_Click(object sender, RoutedEventArgs e)
                 }
             }
 
-            if (IsStoreBindingDirty && checkStore.IsChecked == true)
+            if (IsStoreBindingDirty && CheckStore.IsChecked == true)
             {
                 BindingOperations.GetBindingExpression(TextStore, TextBox.TextProperty).UpdateSource();
                 if (Games != null)
@@ -496,7 +496,7 @@ private void ButtonOK_Click(object sender, RoutedEventArgs e)
                 }
             }
 
-            if (IsWikiBindingDirty && checkWiki.IsChecked == true)
+            if (IsWikiBindingDirty && CheckWiki.IsChecked == true)
             {
                 BindingOperations.GetBindingExpression(TextWiki, TextBox.TextProperty).UpdateSource();
                 if (Games != null)
@@ -508,7 +508,7 @@ private void ButtonOK_Click(object sender, RoutedEventArgs e)
                 }
             }
 
-            if (IsForumsBindingDirty && checkForums.IsChecked == true)
+            if (IsForumsBindingDirty && CheckForums.IsChecked == true)
             {
                 BindingOperations.GetBindingExpression(TextForums, TextBox.TextProperty).UpdateSource();
                 if (Games != null)
@@ -520,7 +520,7 @@ private void ButtonOK_Click(object sender, RoutedEventArgs e)
                 }
             }
 
-            if (IsDescriptionBindingDirty && checkDescription.IsChecked == true)
+            if (IsDescriptionBindingDirty && CheckDescription.IsChecked == true)
             {
                 BindingOperations.GetBindingExpression(TextDescription, TextBox.TextProperty).UpdateSource();
                 if (Games != null)
@@ -532,7 +532,7 @@ private void ButtonOK_Click(object sender, RoutedEventArgs e)
                 }
             }
 
-            if (IsIconBindingDirty && checkIcon.IsChecked == true)
+            if (IsIconBindingDirty && CheckIcon.IsChecked == true)
             {
                 var iconPath = HttpUtility.UrlDecode(((BitmapImage)ImageIcon.Source).UriSource.AbsolutePath);
                 var fileName = Guid.NewGuid().ToString() + Path.GetExtension(iconPath);
@@ -567,7 +567,7 @@ private void ButtonOK_Click(object sender, RoutedEventArgs e)
                 }
             }
 
-            if (IsImageBindingDirty && checkImage.IsChecked == true)
+            if (IsImageBindingDirty && CheckImage.IsChecked == true)
             {
                 var imagePath = HttpUtility.UrlDecode(((BitmapImage)ImageImage.Source).UriSource.AbsolutePath);
                 var fileName = Guid.NewGuid().ToString() + Path.GetExtension(imagePath);
@@ -713,7 +713,7 @@ private void ButtonAddAction_Click(object sender, RoutedEventArgs e)
             if (TempOtherTasks == null)
             {
                 TempOtherTasks = new ObservableCollection<GameTask>();
-                controlOtherTasks.ItemsSource = TempOtherTasks;
+                OtherTasksItems.ItemsSource = TempOtherTasks;
             }
 
             TempOtherTasks.Add(new GameTask()
@@ -766,12 +766,12 @@ private void Image_SourceUpdated(object sender, DataTransferEventArgs e)
 
         private void CheckIcon_Loaded(object sender, RoutedEventArgs e)
         {
-            checkIcon = sender as CheckBox;
+            CheckIcon = sender as CheckBox;
         }
 
         private void CheckImage_Loaded(object sender, RoutedEventArgs e)
         {
-            checkImage = sender as CheckBox;
+            CheckImage = sender as CheckBox;
         }
 
         private void MainWindow_LocationChanged(object sender, EventArgs e)
diff --git a/source/PlayniteUI/Windows/InstalledGamesWindow.xaml b/source/PlayniteUI/Windows/InstalledGamesWindow.xaml
index ed1fdacd3..0c6e02f53 100644
--- a/source/PlayniteUI/Windows/InstalledGamesWindow.xaml
+++ b/source/PlayniteUI/Windows/InstalledGamesWindow.xaml
@@ -9,7 +9,7 @@
         Background="{StaticResource NormalBrush}" WindowStartupLocation="CenterOwner"
         Title="Select games to import" Height="400" Width="700" ResizeMode="CanResizeWithGrip"
         Loaded="Window_Loaded"
-        >
+        AutomationProperties.AutomationId="WindowInstalledGames">
     <Window.Resources>
         <playniteUI:IconToImageSourceConverter x:Key="IconToImageSourceConverter" />
     </Window.Resources>
@@ -57,11 +57,11 @@
                    Name="TextDownloading"/>
         
         <DockPanel Margin="0,5,0,0" LastChildFill="False" Grid.Column="0" Grid.Row="1">
-            <Button Content="Browse..." Padding="10,0,10,0" DockPanel.Dock="Left"
+            <Button Name="ButtonBrowse" Content="Browse..." Padding="10,0,10,0" DockPanel.Dock="Left"
                     Click="buttonBrowse_Click"/>
-            <Button Content="Cancel" Padding="10,0,10,0" Margin="10,0,10,0" DockPanel.Dock="Right" IsCancel="True"
+            <Button Name="ButtonCancel" Content="Cancel" Padding="10,0,10,0" Margin="10,0,10,0" DockPanel.Dock="Right" IsCancel="True"
                     Click="buttonCancel_Click"/>
-            <Button Content="Add games" Padding="10,0,10,0" DockPanel.Dock="Right"
+            <Button Name="ButtonOK" Content="Add games" Padding="10,0,10,0" DockPanel.Dock="Right"
                     Click="buttonOK_Click"/>
         </DockPanel>
     </Grid>
diff --git a/source/PlayniteUI/Windows/MainWindow.xaml b/source/PlayniteUI/Windows/MainWindow.xaml
index d066cd6ec..7007fd30a 100644
--- a/source/PlayniteUI/Windows/MainWindow.xaml
+++ b/source/PlayniteUI/Windows/MainWindow.xaml
@@ -16,7 +16,9 @@
         Width="1200" Height="900"  WindowStartupLocation="CenterScreen" Icon="/Images/applogo.ico"
         Background="{StaticResource ControlBackgroundBrush}"
         Loaded="Window_Loaded" Closed="Window_Closed"
-        LocationChanged="Window_LocationChanged" SizeChanged="Window_SizeChanged">
+        LocationChanged="Window_LocationChanged" SizeChanged="Window_SizeChanged"
+        Name="WindowMain"
+        AutomationProperties.AutomationId="WindowMain">
 
     <Window.Resources>
         <local:EnumConverter x:Key="EnumConverter" />
@@ -39,106 +41,102 @@
 
     <DockPanel>
         <DockPanel LastChildFill="True" DockPanel.Dock="Top" Background="#222222">
-            <DockPanel MouseUp="ImageLogo_MouseDown" Name="StackMenu" Cursor="Hand" Margin="10,0,5,0"
-                       Opacity="{Binding IsMouseOver, Converter={StaticResource OpacityBoolConverter}, ConverterParameter={StaticResource True}, ElementName=StackMenu}">
+            <DockPanel MouseUp="ImageLogo_MouseDown" Cursor="Hand" Margin="10,0,5,0"
+                       Opacity="{Binding IsMouseOver, Converter={StaticResource OpacityBoolConverter}, ConverterParameter={StaticResource True}, RelativeSource={RelativeSource AncestorType=DockPanel}}">
                 <Border DockPanel.Dock="Left" Background="Transparent">
                     <Image Source="/Images/applogo.png" Height="40" Name="ImageLogo" RenderOptions.BitmapScalingMode="Fant" Margin="5"/>
                 </Border>
                 <Border DockPanel.Dock="Left" Background="Transparent">
                     <Image Source="/Images/dropdown.png" Width="8" Height="32"/>
                 </Border>
+                <DockPanel.ContextMenu>
+                    <ContextMenu StaysOpen="False" Name="MenuMainMenu" Placement="Bottom">                        
+                        <MenuItem Header="Add Game..." Click="AddNewGame_Click" IsEnabled="{Binding GameAdditionAllowed}"/>
+                        <MenuItem Header="Add Installed Game(s)..." Click="AddInstalledGames_Click" IsEnabled="{Binding GameAdditionAllowed}" />
+                        <Separator Style="{StaticResource ContextSeparator}"/>
+                        <MenuItem Header="Reload Games List" Click="ReloadGames_Click" IsEnabled="{Binding GameAdditionAllowed}" />
+                        <MenuItem Header="Settings..." Click="Settings_Click" />
+                        <MenuItem Header="About Playnite..." Click="About_Click" />
+                        <MenuItem Header="Request Feature or Report Issue..." Click="Issue_Click" />
+                        <Separator Style="{StaticResource ContextSeparator}"/>
+                        <MenuItem Header="Exit Playnite" Click="Exitappp_Click" />
+                    </ContextMenu>
+                </DockPanel.ContextMenu>
             </DockPanel>
-            <Popup StaysOpen="False" Name="PopupMenu" Placement="Relative"
-                   VerticalOffset="{Binding ActualHeight, ElementName=ImageLogo}">
-                <Border Style="{StaticResource PopUpBorder}">
-                    <StackPanel Background="{StaticResource NormalBrushDark}">
-                        <TextBlock Style="{StaticResource TextBlockPopupItem}" Text="Add Game . . ." MouseUp="AddNewGamePopup_MouseUp" Name="TextAddGame"/>
-                        <TextBlock Style="{StaticResource TextBlockPopupItem}" Text="Add Installed Game(s) . . ." MouseUp="AddInstalledGames_MouseUp" Name="TextAddInstalledGame"/>
-                        <Separator />
-                        <TextBlock Style="{StaticResource TextBlockPopupItem}" Text="Reload Games List" MouseUp="ReloadGamesPopup_MouseUp" Name="TextReloadGames"/>
-                        <TextBlock Style="{StaticResource TextBlockPopupItem}" Text="Settings . . ." MouseUp="SettingsPopup_MouseUp"/>
-                        <TextBlock Style="{StaticResource TextBlockPopupItem}" Text="About Playnite . . ." MouseUp="AboutPopup_Click"/>
-                        <TextBlock Style="{StaticResource TextBlockPopupItem}" Text="Request Feature or Report Issue . . ." MouseUp="IssuePopup_MouseUp"/>
-                        <Separator />
-                        <TextBlock Style="{StaticResource TextBlockPopupItem}" Text="Exit Playnite" MouseUp="ExitappPopUp_mouseUp"/>
-                    </StackPanel>
-                </Border>
-            </Popup>
 
             <controls:SearchBox BorderBrush="DarkGray" Margin="5,8,5,8" DockPanel.Dock="Left" Padding="0"
-                x:Name="textFilter" Height="24" Width="235"
+                x:Name="SearchBoxFilter" Height="24" Width="235"
                 Text="{Binding FilterText, RelativeSource={RelativeSource AncestorType=Window},
                 Mode=OneWayToSource, Delay=500}" />
 
             <Border BorderBrush="DarkGray" Background="Transparent" BorderThickness="1,1,1,1" Width="30" Height="24"
                     Cursor="Hand" MouseUp="ViewConfigElement_MouseUp">
-                <TextBlock Text=". . ." HorizontalAlignment="Center" FontWeight="Bold"/>
+                <TextBlock Name="TextGroup" Text=". . ." HorizontalAlignment="Center" FontWeight="Bold"/>
+                <Border.ContextMenu>
+                    <ContextMenu StaysOpen="False" Name="MenuViewSettings" Placement="Bottom">
+                        <MenuItem Header="Sort by Name" IsCheckable="True"
+                                  IsChecked="{Binding Path=SortingOrder, Converter={StaticResource EnumConverter}, ConverterParameter={x:Static shared:SortOrder.Name}}"/>
+                        <MenuItem Header="Sort by Last Activity" IsCheckable="True"
+                                  IsChecked="{Binding Path=SortingOrder, Converter={StaticResource EnumConverter}, ConverterParameter={x:Static shared:SortOrder.Activity}}"/>
+                        <Separator Style="{StaticResource ContextSeparator}" />
+                        <MenuItem Header="Don't group" IsCheckable="True"
+                                  IsChecked="{Binding Path=GroupingOrder, Converter={StaticResource EnumConverter}, ConverterParameter={x:Static shared:GroupOrder.None}}"/>
+                        <MenuItem Header="Group by Store" IsCheckable="True"
+                                  IsChecked="{Binding Path=GroupingOrder, Converter={StaticResource EnumConverter}, ConverterParameter={x:Static shared:GroupOrder.Store}}"/>
+                        <MenuItem Header="Group by Category" IsCheckable="True"
+                                  IsChecked="{Binding Path=GroupingOrder, Converter={StaticResource EnumConverter}, ConverterParameter={x:Static shared:GroupOrder.Category}}"/>
+                    </ContextMenu>
+                </Border.ContextMenu>
             </Border>
 
-            <Popup StaysOpen="False" Name="PopupViewSettings" Placement="Relative" VerticalOffset="24">
-                <Border Style="{StaticResource PopUpBorder}">
-                    <StackPanel Background="{StaticResource NormalBrushDark}">
-                        <RadioButton GroupName="order" Content="Sort by Name" Click="HidePopUp_Click"
-                                     Style="{StaticResource PopupRadioItem}"
-                                     IsChecked="{Binding Path=SortingOrder, Converter={StaticResource EnumConverter}, ConverterParameter={x:Static shared:SortOrder.Name}}"/>
-                        <RadioButton GroupName="order" Content="Sort by Last Activity" Click="HidePopUp_Click"       
-                                     Style="{StaticResource PopupRadioItem}"
-                                     IsChecked="{Binding Path=SortingOrder, Converter={StaticResource EnumConverter}, ConverterParameter={x:Static shared:SortOrder.Activity}}"/>
-                        <Separator />
-                        <RadioButton GroupName="group" Content="Don't group" Click="HidePopUp_Click"
-                                     Style="{StaticResource PopupRadioItem}"
-                                     IsChecked="{Binding Path=GroupingOrder, Converter={StaticResource EnumConverter}, ConverterParameter={x:Static shared:GroupOrder.None}}"/>
-                        <RadioButton GroupName="group" Content="Group by Store" Click="HidePopUp_Click"
-                                     Style="{StaticResource PopupRadioItem}"
-                                     IsChecked="{Binding Path=GroupingOrder, Converter={StaticResource EnumConverter}, ConverterParameter={x:Static shared:GroupOrder.Store}}"/>
-                        <RadioButton GroupName="group" Content="Group by Category" Click="HidePopUp_Click"
-                                     Style="{StaticResource PopupRadioItem}"
-                                     IsChecked="{Binding Path=GroupingOrder, Converter={StaticResource EnumConverter}, ConverterParameter={x:Static shared:GroupOrder.Category}}"/>
-                    </StackPanel>
-                </Border>
-            </Popup>
-
             <Border BorderBrush="DarkGray" Background="Transparent" BorderThickness="1,1,1,1"  Height="24"
                     Cursor="Hand" MouseUp="ViewModeElement_MouseUp" Margin="5,0,0,0">
-                <TextBlock Text="VIEW" HorizontalAlignment="Center" FontWeight="Bold" VerticalAlignment="Center" Padding="5"/>
+                <TextBlock Name="TextView" Text="VIEW" HorizontalAlignment="Center" FontWeight="Bold" VerticalAlignment="Center" Padding="5"/>
+                <Border.ContextMenu>
+                    <ContextMenu StaysOpen="False" Name="MenuViewMode" Placement="Bottom">
+                        <MenuItem Header="List" IsCheckable="True"
+                                  IsChecked="{Binding Path=GamesViewType, Converter={StaticResource EnumConverter}, ConverterParameter={x:Static shared:ViewType.List}}"/>
+                        <MenuItem Header="Images" IsCheckable="True"
+                                  IsChecked="{Binding Path=GamesViewType, Converter={StaticResource EnumConverter}, ConverterParameter={x:Static shared:ViewType.Images}}"/>
+                        <MenuItem Header="Details" IsCheckable="True"
+                                  IsChecked="{Binding Path=GamesViewType, Converter={StaticResource EnumConverter}, ConverterParameter={x:Static shared:ViewType.Grid}}"/>                        
+                    </ContextMenu>
+                </Border.ContextMenu>
             </Border>
 
-            <Popup StaysOpen="False" Name="PopupViewMode" Placement="Relative" VerticalOffset="24">
-                <Border Style="{StaticResource PopUpBorder}">
-                    <StackPanel Background="{StaticResource NormalBrushDark}">
-                        <RadioButton GroupName="view" Content="List" Click="HidePopUp_Click"
-                                     Style="{StaticResource PopupRadioItem}"
-                                     IsChecked="{Binding Path=GamesViewType, Converter={StaticResource EnumConverter}, ConverterParameter={x:Static shared:ViewType.List}}"/>
-                        <RadioButton GroupName="view" Content="Images" Click="HidePopUp_Click"
-                                     Style="{StaticResource PopupRadioItem}"
-                                     IsChecked="{Binding Path=GamesViewType, Converter={StaticResource EnumConverter}, ConverterParameter={x:Static shared:ViewType.Images}}"/>
-                        <RadioButton GroupName="view" Content="Details" Click="HidePopUp_Click"
-                                     Style="{StaticResource PopupRadioItem}"
-                                     IsChecked="{Binding Path=GamesViewType, Converter={StaticResource EnumConverter}, ConverterParameter={x:Static shared:ViewType.Grid}}"/>
-                    </StackPanel>
-                </Border>
-            </Popup>
-            
-            <StackPanel Name="FilterIndicator" Orientation="Horizontal" Cursor="Hand" MouseUp="FilterSwitch_MouseUp" DockPanel.Dock="Right" Margin="30,0,30,0">
-                <Grid>
-                    <TextBlock Text="FILTER" VerticalAlignment="Center" FontWeight="Bold" FontSize="16"
-                               Visibility="{Binding Active, Converter={StaticResource InvertableBooleanToVisibilityConverter}, ConverterParameter=Inverted}"/>
-                    <TextBlock Text="FILTER" VerticalAlignment="Center" FontWeight="Bold" FontSize="16" Foreground="#FF6600"
-                               Visibility="{Binding Active, Converter={StaticResource BooleanToVisibilityConverter}}"/>
-                </Grid>
-                <Border Padding="5,0,5,0" Background="Transparent">
-                    <Image Source="/Images/dropdown.png" Width="8" Height="32" DockPanel.Dock="Left"/>
-                </Border>
-            </StackPanel>
+            <CheckBox Name="CheckFilterView" DockPanel.Dock="Right" Margin="30,0,30,0" IsChecked="True">
+                <CheckBox.Style>
+                    <Style TargetType="CheckBox">
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate>
+                                <StackPanel Orientation="Horizontal" Cursor="Hand" >
+                                    <TextBlock Text="FILTER" VerticalAlignment="Center" FontWeight="Bold" FontSize="16"/>
+                                    <Border Padding="5,0,5,0" Background="Transparent">
+                                        <Image Source="/Images/dropdown.png" Width="8" Height="32" DockPanel.Dock="Left"/>
+                                    </Border>
+                                </StackPanel>
+                            </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding Active}" Value="True">
+                                <Setter Property="Foreground" Value="#FF6600" />
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>                        
+                </CheckBox.Style>
+            </CheckBox>
 
             <local:ProgressControl x:Name="ProgressControl" DockPanel.Dock="Left" Margin="40,0,40,0" Height="25"/>
         </DockPanel>
         
         <DockPanel>
             <Border BorderThickness="1,0,0,0" BorderBrush="{StaticResource NormalBrush}" DockPanel.Dock="Right" >
-                <controls:FilterSelector x:Name="FilterSelector" Width="140"/>
+                <controls:FilterSelector x:Name="FilterSelector" Width="140"
+                                         Visibility="{Binding IsChecked, ElementName=CheckFilterView, Converter={StaticResource BooleanToVisibilityConverter}}"/>
             </Border>
-            <TabControl Name="viewTabControl" BorderThickness="0" Padding="0" DockPanel.Dock="Left">
+            <TabControl Name="TabControlView" BorderThickness="0" Padding="0" DockPanel.Dock="Left">
                 <TabItem Header="List" Visibility="Collapsed">
                     <controls:GamesListView x:Name="ListGamesView"/>
                 </TabItem>
diff --git a/source/PlayniteUI/Windows/MainWindow.xaml.cs b/source/PlayniteUI/Windows/MainWindow.xaml.cs
index 519a7a54a..4cebceb55 100644
--- a/source/PlayniteUI/Windows/MainWindow.xaml.cs
+++ b/source/PlayniteUI/Windows/MainWindow.xaml.cs
@@ -33,7 +33,7 @@ namespace PlayniteUI
     /// <summary>
     /// Interaction logic for MainWindow.xaml
     /// </summary>
-    public partial class MainWindow : Window
+    public partial class MainWindow : Window, INotifyPropertyChanged
     {
         public Settings Config;
         private static Logger logger = LogManager.GetCurrentClassLogger();
@@ -42,11 +42,27 @@ public partial class MainWindow : Window
         private GamesStats gamesStats = new GamesStats();
         public NotificationsWindow NotificationsWin = new NotificationsWindow();
 
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        private bool gameAdditionAllowed = true;
+        public bool GameAdditionAllowed
+        {
+            get
+            {
+                return gameAdditionAllowed;
+            }
+            set
+            {
+                gameAdditionAllowed = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("GameAdditionAllowed"));
+            }
+        }
+
         public string FilterText
         {
             get
             {
-                return textFilter.Text;
+                return SearchBoxFilter.Text;
             }
 
             set
@@ -92,11 +108,12 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
 
             Config.PropertyChanged += Config_PropertyChanged;
             Config.FilterSettings.PropertyChanged += FilterSettings_PropertyChanged;
-            
-            PopupViewSettings.DataContext = Config;
-            PopupViewMode.DataContext = Config;
+
+            MenuMainMenu.DataContext = this;
+            MenuViewSettings.DataContext = Config;
+            MenuViewMode.DataContext = Config;
             FilterSelector.DataContext = new Controls.FilterSelectorConfig(gamesStats, Config.FilterSettings);
-            FilterIndicator.DataContext = Config.FilterSettings;
+            CheckFilterView.DataContext = Config.FilterSettings;
             GridGamesView.HeaderMenu.DataContext = Config;
             
             if (!Config.FirstTimeWizardComplete)
@@ -215,7 +232,7 @@ private async void LoadGames()
                 await GamesLoaderHandler.ProgressTask;
             }
 
-            TextReloadGames.IsEnabled = false;
+            GameAdditionAllowed = false;
 
             try
             {
@@ -232,9 +249,7 @@ private async void LoadGames()
                 }
                 catch (Exception exc)
                 {
-                    TextAddGame.IsEnabled = false;
-                    TextAddInstalledGame.IsEnabled = false;
-                    TextReloadGames.IsEnabled = false;
+                    GameAdditionAllowed = false;
                     MessageBox.Show("Failed to open library database: " + exc.Message, "Database Error", MessageBoxButton.OK, MessageBoxImage.Error);
                     return;
                 }
@@ -427,7 +442,7 @@ private async void LoadGames()
             }
             finally
             {
-                TextReloadGames.IsEnabled = true;
+                GameAdditionAllowed = true;
             }
         }
 
@@ -481,13 +496,13 @@ private bool GamesFilter(object item)
 
             // ------------------ Name filter
             bool textResult;
-            if (string.IsNullOrEmpty(textFilter.Text))
+            if (string.IsNullOrEmpty(SearchBoxFilter.Text))
             {
                 textResult = true;
             }
             else
             {
-                textResult = (game.Name.IndexOf(textFilter.Text, StringComparison.OrdinalIgnoreCase) >= 0);
+                textResult = (game.Name.IndexOf(SearchBoxFilter.Text, StringComparison.OrdinalIgnoreCase) >= 0);
             }
 
             return installedResult && hiddenResult && textResult && providersFilter;
@@ -502,7 +517,7 @@ private void Config_PropertyChanged(object sender, PropertyChangedEventArgs e)
 
             if (e != null && e.PropertyName == "GamesViewType")
             {
-                viewTabControl.SelectedIndex = (int)Config.GamesViewType;
+                TabControlView.SelectedIndex = (int)Config.GamesViewType;
                 return;
             }
 
@@ -552,7 +567,7 @@ private void Config_PropertyChanged(object sender, PropertyChangedEventArgs e)
                     MainCollectionView.LiveFilteringProperties.Add("Provider");
                     MainCollectionView.Filter = GamesFilter;
 
-                    viewTabControl.SelectedIndex = (int)Config.GamesViewType;
+                    TabControlView.SelectedIndex = (int)Config.GamesViewType;
                 }
                 else
                 {
@@ -619,20 +634,20 @@ private void FilterSettings_PropertyChanged(object sender, PropertyChangedEventA
 
         private void ImageLogo_MouseDown(object sender, MouseButtonEventArgs e)
         {
-            PopupMenu.PlacementTarget = (UIElement)sender;
-            PopupMenu.IsOpen = true;
+            MenuMainMenu.PlacementTarget = (UIElement)sender;
+            MenuMainMenu.IsOpen = true;
         }
 
         private void ViewConfigElement_MouseUp(object sender, MouseButtonEventArgs e)
         {
-            PopupViewSettings.PlacementTarget = (UIElement)sender;
-            PopupViewSettings.IsOpen = true;
+            MenuViewSettings.PlacementTarget = (UIElement)sender;
+            MenuViewSettings.IsOpen = true;
         }
 
         private void ViewModeElement_MouseUp(object sender, MouseButtonEventArgs e)
         {
-            PopupViewMode.PlacementTarget = (UIElement)sender;
-            PopupViewMode.IsOpen = true;
+            MenuViewMode.PlacementTarget = (UIElement)sender;
+            MenuViewMode.IsOpen = true;
         }
 
         private void ListViewSelection_MouseUp(object sender, MouseButtonEventArgs e)
@@ -650,13 +665,13 @@ private void GridViewSelection_MouseUp(object sender, MouseButtonEventArgs e)
             Config.GamesViewType = ViewType.Grid;
         }
 
-        private void ReloadGamesPopup_MouseUp(object sender, MouseButtonEventArgs e)
+        private void ReloadGames_Click(object sender, RoutedEventArgs e)
         {
             LoadGames();
-            PopupMenu.IsOpen = false;
+            MenuMainMenu.IsOpen = false;
         }
 
-        private void AddNewGamePopup_MouseUp(object sender, MouseButtonEventArgs e)
+        private void AddNewGame_Click(object sender, RoutedEventArgs e)
         {
             var newGame = new Game()
             {
@@ -665,7 +680,7 @@ private void AddNewGamePopup_MouseUp(object sender, MouseButtonEventArgs e)
             };
 
             GameDatabase.Instance.AddGame(newGame);
-            PopupMenu.IsOpen = false;
+            MenuMainMenu.IsOpen = false;
 
             if (GamesEditor.Instance.EditGame(newGame) == true)
             {
@@ -689,7 +704,7 @@ private void AddNewGamePopup_MouseUp(object sender, MouseButtonEventArgs e)
             }
         }
 
-        private void AddInstalledGames_MouseUp(object sender, MouseButtonEventArgs e)
+        private void AddInstalledGames_Click(object sender, RoutedEventArgs e)
         {
             var window = new InstalledGamesWindow()
             {
@@ -704,7 +719,7 @@ private void AddInstalledGames_MouseUp(object sender, MouseButtonEventArgs e)
             }
         }
 
-        private void SettingsPopup_MouseUp(object sender, MouseButtonEventArgs e)
+        private void Settings_Click(object sender, RoutedEventArgs e)
         {
             var configWindow = new SettingsWindow()
             {
@@ -720,17 +735,12 @@ private void SettingsPopup_MouseUp(object sender, MouseButtonEventArgs e)
             }
         }
 
-        private void ExitappPopUp_mouseUp(object sender, MouseButtonEventArgs e)
+        private void Exitappp_Click(object sender, RoutedEventArgs e)
         {
             Application.Current.Shutdown();
         }
 
-        private void HidePopUp_Click(object sender, RoutedEventArgs e)
-        {
-            ((((sender as Control).Parent as StackPanel).Parent as Border).Parent as Popup).IsOpen = false;
-        }
-
-        private void AboutPopup_Click(object sender, RoutedEventArgs e)
+        private void About_Click(object sender, RoutedEventArgs e)
         {
             var aboutWindow = new AboutWindow()
             {
@@ -740,10 +750,10 @@ private void AboutPopup_Click(object sender, RoutedEventArgs e)
             aboutWindow.ShowDialog();
         }
 
-        private void IssuePopup_MouseUp(object sender, MouseButtonEventArgs e)
+        private void Issue_Click(object sender, RoutedEventArgs e)
         {
             System.Diagnostics.Process.Start(@"https://github.com/JosefNemec/Playnite/issues/new");
-            PopupMenu.IsOpen = false;
+            MenuMainMenu.IsOpen = false;
         }
 
         private void Window_LocationChanged(object sender, EventArgs e)
@@ -761,17 +771,5 @@ private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
                 positionManager.SaveSize(Config);
             }
         }
-
-        private void FilterSwitch_MouseUp(object sender, MouseButtonEventArgs e)
-        {
-            if (FilterSelector.Visibility == Visibility.Visible)
-            {
-                FilterSelector.Visibility = Visibility.Collapsed;
-            }
-            else
-            {
-                FilterSelector.Visibility = Visibility.Visible;
-            }
-        }
     }
 }
diff --git a/source/PlayniteUI/Windows/MetadataLookupWindow.xaml b/source/PlayniteUI/Windows/MetadataLookupWindow.xaml
index f01f4c1ac..921371b9d 100644
--- a/source/PlayniteUI/Windows/MetadataLookupWindow.xaml
+++ b/source/PlayniteUI/Windows/MetadataLookupWindow.xaml
@@ -6,7 +6,8 @@
         xmlns:local="clr-namespace:PlayniteUI.Windows"
         mc:Ignorable="d"
         Title="Metadata search" Height="600" Width="800"
-        Background="{StaticResource NormalBrush}" Loaded="Window_Loaded" ResizeMode="CanResizeWithGrip">
+        Background="{StaticResource NormalBrush}" Loaded="Window_Loaded" ResizeMode="CanResizeWithGrip"
+        AutomationProperties.AutomationId="WindowMetaSearch">
     
     <Window.CommandBindings>
         <CommandBinding Command="Search" Executed="Search_Executed" />
@@ -17,9 +18,9 @@
             <RowDefinition Height="*"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="35"/>
-        </Grid.RowDefinitions>     
+        </Grid.RowDefinitions>
 
-        <ListBox Grid.Row="0" Grid.Column="0"  Name="ListSearch" HorizontalAlignment="Stretch" BorderThickness="0" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
+        <ListBox Name="ListSearch" Grid.Row="0" Grid.Column="0" HorizontalAlignment="Stretch" BorderThickness="0" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
                  SelectionChanged="ListSearch_SelectionChanged" MouseDoubleClick="ListSearch_MouseDoubleClick">
             <ListBox.ItemTemplate>
                 <DataTemplate>
diff --git a/source/PlayniteUI/Windows/NotificationsWindow.xaml b/source/PlayniteUI/Windows/NotificationsWindow.xaml
index 12cadddca..98479a595 100644
--- a/source/PlayniteUI/Windows/NotificationsWindow.xaml
+++ b/source/PlayniteUI/Windows/NotificationsWindow.xaml
@@ -7,7 +7,8 @@
         mc:Ignorable="d"
         Background="{StaticResource NormalBrush}"
         Closing="Window_Closing"
-        Title="Playnite Notifications" Height="300" Width="500" WindowStartupLocation="CenterScreen">
+        Title="Playnite Notifications" Height="300" Width="500" WindowStartupLocation="CenterScreen"
+        AutomationProperties.AutomationId="WindowNotifications">
 
     <Window.Resources>
         <local:NotificationIconConverter x:Key="NotificationIconConverter" />
diff --git a/source/PlayniteUI/Windows/SettingsWindow.xaml b/source/PlayniteUI/Windows/SettingsWindow.xaml
index be560c76e..143dcd318 100644
--- a/source/PlayniteUI/Windows/SettingsWindow.xaml
+++ b/source/PlayniteUI/Windows/SettingsWindow.xaml
@@ -6,7 +6,8 @@
         xmlns:local="clr-namespace:PlayniteUI"
         mc:Ignorable="d"
         WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
-        Title="Configuration" ResizeMode="CanResizeWithGrip" Width="500" Height="330">
+        Title="Configuration" ResizeMode="CanResizeWithGrip" Width="500" Height="330"
+        AutomationProperties.AutomationId="WindowSettings">
 
     <Window.Resources>
         <local:NegateConverter x:Key="NegateConverter" />
@@ -15,15 +16,15 @@
     <Grid Background="{StaticResource NormalBrush}">
         <DockPanel Margin="10">
             <DockPanel Margin="0,10,0,0" LastChildFill="False" Height="25" DockPanel.Dock="Bottom">
-                <Button Name="buttonCancel" Click="ButtonCancel_Click" Content="Cancel" Width="60" DockPanel.Dock="Right" Margin="10,0,0,0"/>
-                <Button Name="buttonOK" Click="ButtonOK_Click" Content="OK" Width="60" DockPanel.Dock="Right"/>
+                <Button Name="ButtonCancel" Click="ButtonCancel_Click" Content="Cancel" Width="60" DockPanel.Dock="Right" Margin="10,0,0,0"/>
+                <Button Name="ButtonOK" Click="ButtonOK_Click" Content="OK" Width="60" DockPanel.Dock="Right"/>
             </DockPanel>
             <TabControl DockPanel.Dock="Bottom">
                 <TabItem Header="General" >
                     <DockPanel Margin="5" LastChildFill="False">
                         <TextBlock Text="Database location:" DockPanel.Dock="Top" Margin="5"/>
                         <DockPanel DockPanel.Dock="Top" Margin="5">
-                            <Button Content=". . ." DockPanel.Dock="Right" Padding="5,0,5,0" Name="ButtonBrowserDbFile"
+                            <Button Name="ButtonBrowserDbFile" Content=". . ." DockPanel.Dock="Right" Padding="5,0,5,0"
                                     Click="ButtonBrowserDbFile_Click"/>                        
                             <TextBox Name="TextDatabase" Text="{Binding DatabasePath, UpdateSourceTrigger=Explicit}"
                                      DockPanel.Dock="Left" Margin="0,0,5,0"/>
@@ -36,11 +37,11 @@
                                   Name="CheckSteamEnabled" Content="Import Steam Games" HorizontalAlignment="Left"  VerticalAlignment="Center"
                                   DockPanel.Dock="Top" Margin="5"/>
 
-                        <RadioButton Content="Only import installed games"
+                        <RadioButton Name="RadioInstalledSteam" Content="Only import installed games"
                                      IsChecked="{Binding SteamSettings.LibraryDownloadEnabled, UpdateSourceTrigger=Explicit, Converter={StaticResource NegateConverter}}"
                                      IsEnabled="{Binding IsChecked, ElementName=CheckSteamEnabled}"
                                      DockPanel.Dock="Top" Margin="20,5,5,5"/>
-                        <RadioButton Name="RadioSteamImportLib" Content="Import complete library"
+                        <RadioButton Name="RadioLibrarySteam" Content="Import complete library"
                                      IsChecked="{Binding SteamSettings.LibraryDownloadEnabled, UpdateSourceTrigger=Explicit}"
                                      IsEnabled="{Binding IsChecked, ElementName=CheckSteamEnabled}"
                                      DockPanel.Dock="Top" Margin="20,5,5,5"/>
@@ -53,7 +54,7 @@
                                 </Hyperlink>
                             </TextBlock>
                             <TextBox Text="{Binding SteamSettings.AccountName, UpdateSourceTrigger=Explicit}"
-                                     Name="TextSteamAccountName" DockPanel.Dock="Left" Margin="10,0,10,0" IsEnabled="{Binding IsChecked, ElementName=RadioSteamImportLib}"/>
+                                     Name="TextSteamAccountName" DockPanel.Dock="Left" Margin="10,0,10,0" IsEnabled="{Binding IsChecked, ElementName=RadioLibrarySteam}"/>
                         </DockPanel>
                     </DockPanel>
                 </TabItem>
@@ -63,18 +64,18 @@
                                   Name="CheckGogEnabled" Content="Import GOG Games" HorizontalAlignment="Left"  VerticalAlignment="Center"
                                   DockPanel.Dock="Top" Margin="5"/>
 
-                        <RadioButton Content="Only import installed games"
+                        <RadioButton Name="RadioInstalledGOG" Content="Only import installed games"
                                      IsChecked="{Binding GOGSettings.LibraryDownloadEnabled, UpdateSourceTrigger=Explicit, Converter={StaticResource NegateConverter}}"
                                      IsEnabled="{Binding IsChecked, ElementName=CheckGogEnabled}"
                                      DockPanel.Dock="Top" Margin="20,5,5,5"/>
-                        <RadioButton Name="RadioGogImportLib" Content="Import complete library"
+                        <RadioButton Name="RadioLibraryGOG" Content="Import complete library"
                                      IsChecked="{Binding GOGSettings.LibraryDownloadEnabled, UpdateSourceTrigger=Explicit}"
                                      IsEnabled="{Binding IsChecked, ElementName=CheckGogEnabled}"
                                      DockPanel.Dock="Top" Margin="20,5,5,5"/>
                         <DockPanel DockPanel.Dock="Top" Margin="20,5,5,5" IsEnabled="{Binding IsChecked, ElementName=CheckGogEnabled}"
                                    LastChildFill="False">
                             <Button Content="Authenticate" DockPanel.Dock="Left" Padding="5"
-                                    IsEnabled="{Binding IsChecked, ElementName=RadioGogImportLib}"
+                                    IsEnabled="{Binding IsChecked, ElementName=RadioLibraryGOG}"
                                     Name="ButtonGogAuth" Click="ButtonGogAuth_Click"/>
                         </DockPanel>
                         <CheckBox IsChecked="{Binding GOGSettings.UseRealIcon, UpdateSourceTrigger=Explicit}" Visibility="Collapsed"
@@ -91,18 +92,18 @@
                                   Name="CheckOriginEnabled" Content="Import Origin Games" HorizontalAlignment="Left"  VerticalAlignment="Center"
                                   DockPanel.Dock="Top" Margin="5"/>
 
-                        <RadioButton Content="Only import installed games"
+                        <RadioButton Name="RadioInstalledOrigin" Content="Only import installed games"
                                      IsChecked="{Binding OriginSettings.LibraryDownloadEnabled, UpdateSourceTrigger=Explicit, Converter={StaticResource NegateConverter}}"
                                      IsEnabled="{Binding IsChecked, ElementName=CheckOriginEnabled}"
                                      DockPanel.Dock="Top" Margin="20,5,5,5"/>
-                        <RadioButton Name="RadioOriginImportLib" Content="Import complete library"
+                        <RadioButton Name="RadioLibraryOrigin" Content="Import complete library"
                                      IsChecked="{Binding OriginSettings.LibraryDownloadEnabled, UpdateSourceTrigger=Explicit}"
                                      IsEnabled="{Binding IsChecked, ElementName=CheckOriginEnabled}"
                                      DockPanel.Dock="Top" Margin="20,5,5,5"/>
                         <DockPanel DockPanel.Dock="Top" Margin="20,5,5,5" IsEnabled="{Binding IsChecked, ElementName=CheckOriginEnabled}"
                                    LastChildFill="False">
                             <Button Content="Authenticate" DockPanel.Dock="Left" Padding="5"
-                                    IsEnabled="{Binding IsChecked, ElementName=RadioOriginImportLib}"
+                                    IsEnabled="{Binding IsChecked, ElementName=RadioLibraryOrigin}"
                                     Name="ButtonOriginAuth" Click="ButtonOriginAuth_Click"/>
                         </DockPanel>
                     </DockPanel>
diff --git a/source/PlayniteUI/Windows/SettingsWindow.xaml.cs b/source/PlayniteUI/Windows/SettingsWindow.xaml.cs
index 1184626b5..fc2f3786e 100644
--- a/source/PlayniteUI/Windows/SettingsWindow.xaml.cs
+++ b/source/PlayniteUI/Windows/SettingsWindow.xaml.cs
@@ -51,7 +51,7 @@ private void ButtonCancel_Click(object sender, RoutedEventArgs e)
 
         private void ButtonOK_Click(object sender, RoutedEventArgs e)
         {
-            if (RadioSteamImportLib.IsChecked == true && string.IsNullOrEmpty(TextSteamAccountName.Text))
+            if (RadioLibrarySteam.IsChecked == true && string.IsNullOrEmpty(TextSteamAccountName.Text))
             {
                 MessageBox.Show("Steam account name cannot be empty.", "Wrong settings data", MessageBoxButton.OK, MessageBoxImage.Error);
                 return;
@@ -77,7 +77,7 @@ private void ButtonOK_Click(object sender, RoutedEventArgs e)
                 steamEnabled.UpdateSource();
             }
 
-            var steamDownloadLib = RadioSteamImportLib.GetBindingExpression(RadioButton.IsCheckedProperty);
+            var steamDownloadLib = RadioLibrarySteam.GetBindingExpression(RadioButton.IsCheckedProperty);
             if (steamDownloadLib.IsDirty)
             {
                 providerIntegrationChanged = true;
@@ -110,7 +110,7 @@ private void ButtonOK_Click(object sender, RoutedEventArgs e)
                 gogIcons.UpdateSource();
             }
 
-            var gogDownloadLib = RadioGogImportLib.GetBindingExpression(RadioButton.IsCheckedProperty);
+            var gogDownloadLib = RadioLibraryGOG.GetBindingExpression(RadioButton.IsCheckedProperty);
             if (gogDownloadLib.IsDirty)
             {
                 providerIntegrationChanged = true;
@@ -124,7 +124,7 @@ private void ButtonOK_Click(object sender, RoutedEventArgs e)
                 originEnabled.UpdateSource();
             }
 
-            var originDownloadLib = RadioOriginImportLib.GetBindingExpression(RadioButton.IsCheckedProperty);
+            var originDownloadLib = RadioLibraryOrigin.GetBindingExpression(RadioButton.IsCheckedProperty);
             if (originDownloadLib.IsDirty)
             {
                 providerIntegrationChanged = true;
diff --git a/tests/Mapping/AboutWindow.ps1 b/tests/Mapping/AboutWindow.ps1
new file mode 100644
index 000000000..462f14195
--- /dev/null
+++ b/tests/Mapping/AboutWindow.ps1
@@ -0,0 +1,21 @@
+using module c:\devel\PowerShell\PSNativeAutomation\source\PSNativeAutomation\bin\Debug\PSNativeAutomation.psd1
+
+class AboutWindow : Window
+{
+    [UIObject]$ButtonCreatePackage
+    [UIObject]$ButtonClose
+    [UIObject]$HyperlinkSource
+    [UIObject]$HyperlinkHomepage
+    [UIObject]$TextVersionInfo
+
+    AboutWindow() : base({Get-UIWindow -ProcessName "PlayniteUI" | Get-UIWindow -AutomationId "WindowAbout"}, "WindowAbout")
+    {
+        $this.ButtonCreatePackage = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonCreatePackage" -First}), "ButtonCreatePackage")
+        $this.ButtonClose         = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonClose" -First}), "ButtonClose")
+        $this.HyperlinkSource     = [UIObject]::New($this.GetChildReference({Get-UIControl -AutomationId "HyperlinkSource" -First}), "HyperlinkSource")
+        $this.HyperlinkHomepage   = [UIObject]::New($this.GetChildReference({Get-UIControl -AutomationId "HyperlinkHomepage" -First}), "HyperlinkHomepage")
+        $this.TextVersionInfo     = [UIObject]::New($this.GetChildReference({Get-UITextBlock -AutomationId "TextVersionInfo" -First}), "TextVersionInfo")
+    }
+}
+
+return [AboutWindow]::New()
\ No newline at end of file
diff --git a/tests/Mapping/CategoryConfigWindow.ps1 b/tests/Mapping/CategoryConfigWindow.ps1
new file mode 100644
index 000000000..f8707a0e5
--- /dev/null
+++ b/tests/Mapping/CategoryConfigWindow.ps1
@@ -0,0 +1,21 @@
+using module c:\devel\PowerShell\PSNativeAutomation\source\PSNativeAutomation\bin\Debug\PSNativeAutomation.psd1
+
+class CategoryConfigWindow : Window
+{
+    [UIObject]$ButtonAddCat
+    [UIObject]$ButtonCancel
+    [UIObject]$ButtonOK
+    [ListBox]$ListCategories
+    [UIObject]$TextNewCat
+
+    CategoryConfigWindow() : base({Get-UIWindow -ProcessName "PlayniteUI" | Get-UIWindow -AutomationId "WindowCategories"}, "CategoryConfigWindow")
+    {
+        $this.ButtonAddCat     = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonAddCat" -First}), "ButtonAddCat")
+        $this.ButtonCancel     = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonCancel" -First}), "ButtonCancel")
+        $this.ButtonOK         = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonOK" -First}), "ButtonOK")
+        $this.ListCategories   = [ListBox]::New($this.GetChildReference({Get-UIListBox -AutomationId "ListCategories" -First}), "ListCategories")
+        $this.TextNewCat       = [UIObject]::New($this.GetChildReference({Get-UITextBox -AutomationId "TextNewCat" -First}), "TextNewCat")
+    }
+}
+
+return [CategoryConfigWindow]::New()
\ No newline at end of file
diff --git a/tests/Mapping/CrashHandlerWindow.ps1 b/tests/Mapping/CrashHandlerWindow.ps1
new file mode 100644
index 000000000..c7c31c714
--- /dev/null
+++ b/tests/Mapping/CrashHandlerWindow.ps1
@@ -0,0 +1,17 @@
+using module c:\devel\PowerShell\PSNativeAutomation\source\PSNativeAutomation\bin\Debug\PSNativeAutomation.psd1
+
+class CrashHandlerWindow : Window
+{
+    [UIObject]$ButtonSaveDiag
+    [UIObject]$ButtonClose
+    [UIObject]$TextDetails
+    
+    CrashHandlerWindow() : base({Get-UIWindow -ProcessName "PlayniteUI" | Get-UIWindow -AutomationId "WindowCrash"}, "CrashHandlerWindow")
+    {
+        $this.ButtonSaveDiag = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonSaveDiag" -First}), "ButtonSaveDiag")
+        $this.ButtonClose    = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonClose" -First}), "ButtonClose")
+        $this.TextDetails    = [UIObject]::New($this.GetChildReference({Get-UITextBox -AutomationId "TextDetails" -First}), "TextDetails")
+    }
+}
+
+return [CrashHandlerWindow]::New()
\ No newline at end of file
diff --git a/tests/Mapping/FirstTimeWizardWindow.ps1 b/tests/Mapping/FirstTimeWizardWindow.ps1
new file mode 100644
index 000000000..ce07e882c
--- /dev/null
+++ b/tests/Mapping/FirstTimeWizardWindow.ps1
@@ -0,0 +1,51 @@
+using module c:\devel\PowerShell\PSNativeAutomation\source\PSNativeAutomation\bin\Debug\PSNativeAutomation.psd1
+
+class FirstTimeWizardWindow : Window
+{
+    [UIObject]$ButtonNext
+    [UIObject]$ButtonBack
+    [UIObject]$ButtonFinish
+    [UIObject]$ButtonBrowseDbFile
+    [UIObject]$ButtonGogAuthenticate
+    [UIObject]$ButtonOriginAuthenticate
+    [UIObject]$ButtonImportGames
+    [UIObject]$CheckEnableGOG
+    [UIObject]$CheckEnableOrigin
+    [UIObject]$CheckEnableSteam
+    [UIObject]$RadioDbCustom
+    [UIObject]$RadioDbDefault
+    [UIObject]$RadioInstalledGOG
+    [UIObject]$RadioInstalledOrigin
+    [UIObject]$RadioInstalledSteam
+    [UIObject]$RadioLibraryGOG
+    [UIObject]$RadioLibraryOrigin
+    [UIObject]$RadioLibrarySteam
+    [UIObject]$TextDbFile
+    [UIObject]$TextSteamAccount
+
+    FirstTimeWizardWindow() : base({Get-UIWindow -ProcessName "PlayniteUI" | Get-UIWindow -AutomationId "WindowWizard"}, "FirstTimeWizardWindow")
+    {
+        $this.ButtonNext                = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonNext"}), "ButtonNext");
+        $this.ButtonBack                = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonBack"}), "ButtonBack");
+        $this.ButtonFinish              = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonFinish"}), "ButtonFinish");
+        $this.ButtonBrowseDbFile        = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonBrowserDbFile"}), "ButtonBrowserDbFile");
+        $this.ButtonGogAuthenticate     = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonGogAuthenticate"}), "ButtonGogAuthenticate");
+        $this.ButtonOriginAuthenticate  = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonOriginAuthenticate"}), "ButtonOriginAuthenticate");
+        $this.ButtonImportGames         = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonImportGames"}), "ButtonImportGames");
+        $this.CheckEnableGOG            = [UIObject]::New($this.GetChildReference({Get-UICheckBox -AutomationId "CheckEnableGOG"}), "CheckEnableGOG");
+        $this.CheckEnableOrigin         = [UIObject]::New($this.GetChildReference({Get-UICheckBox -AutomationId "CheckEnableOrigin"}), "CheckEnableOrigin");
+        $this.CheckEnableSteam          = [UIObject]::New($this.GetChildReference({Get-UICheckBox -AutomationId "CheckEnableSteam"}), "CheckEnableSteam");
+        $this.RadioDbCustom             = [UIObject]::New($this.GetChildReference({Get-UIRadioButton -AutomationId "RadioDbCustom"}), "RadioDbCustom");
+        $this.RadioDbDefault            = [UIObject]::New($this.GetChildReference({Get-UIRadioButton -AutomationId "RadioDbDefault"}), "RadioDbDefault");
+        $this.RadioInstalledGOG         = [UIObject]::New($this.GetChildReference({Get-UIRadioButton -AutomationId "RadioInstalledGOG"}), "RadioInstalledGOG");
+        $this.RadioInstalledOrigin      = [UIObject]::New($this.GetChildReference({Get-UIRadioButton -AutomationId "RadioInstalledOrigin"}), "RadioInstalledOrigin");
+        $this.RadioInstalledSteam       = [UIObject]::New($this.GetChildReference({Get-UIRadioButton -AutomationId "RadioInstalledSteam"}), "RadioInstalledSteam");
+        $this.RadioLibraryGOG           = [UIObject]::New($this.GetChildReference({Get-UIRadioButton -AutomationId "RadioLibraryGOG"}), "RadioLibraryGOG");
+        $this.RadioLibraryOrigin        = [UIObject]::New($this.GetChildReference({Get-UIRadioButton -AutomationId "RadioLibraryOrigin"}), "RadioLibraryOrigin");
+        $this.RadioLibrarySteam         = [UIObject]::New($this.GetChildReference({Get-UIRadioButton -AutomationId "RadioLibrarySteam"}), "RadioLibrarySteam");
+        $this.TextDbFile                = [UIObject]::New($this.GetChildReference({Get-UITextBox -AutomationId "TextDbFile"}), "TextDbFile");
+        $this.TextSteamAccount          = [UIObject]::New($this.GetChildReference({Get-UITextBox -AutomationId "TextSteamAccount"}), "TextSteamAccount");
+    }
+}
+
+return [FirstTimeWizardWindow]::New()
\ No newline at end of file
diff --git a/tests/Mapping/GameEditWindow.ps1 b/tests/Mapping/GameEditWindow.ps1
new file mode 100644
index 000000000..3335015ab
--- /dev/null
+++ b/tests/Mapping/GameEditWindow.ps1
@@ -0,0 +1,119 @@
+using module c:\devel\PowerShell\PSNativeAutomation\source\PSNativeAutomation\bin\Debug\PSNativeAutomation.psd1
+
+class GameTaskControl : UIObject
+{
+    [UIObject]$ButtonBrowse
+    [UIObject]$ComboType
+    [UIObject]$TextArguments
+    [UIObject]$TextWorkDir
+    [UIObject]$TextName
+    [UIObject]$TextPath
+
+    GameTaskControl([scriptblock]$ScriptReference, [string]$Name) : base($ScriptReference, $Name)
+    {
+        $this.ButtonBrowse  = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonBrowse" -First}), "ButtonBrowse")
+        $this.ComboType     = [UIObject]::New($this.GetChildReference({Get-UIComboBox -AutomationId "ComboType" -First}), "ComboType")
+        $this.TextArguments = [UIObject]::New($this.GetChildReference({Get-UITextBox -AutomationId "TextArguments" -First}), "TextArguments")
+        $this.TextWorkDir   = [UIObject]::New($this.GetChildReference({Get-UITextBox -AutomationId "TextWorkDir" -First}), "TextWorkDir")
+        $this.TextName      = [UIObject]::New($this.GetChildReference({Get-UITextBox -AutomationId "TextName" -First}), "TextName")
+        $this.TextPath      = [UIObject]::New($this.GetChildReference({Get-UITextBox -AutomationId "TextPath" -First}), "TextPath")
+    }
+
+    GameTaskControl([object]$ObjectReference) : base($ObjectReference)
+    {
+        $this.ButtonBrowse  = [UIObject]::New(($ObjectReference | Get-UIButton -AutomationId "ButtonBrowse" -First))
+        $this.ComboType     = [UIObject]::New(($ObjectReference | Get-UIComboBox -AutomationId "ComboType" -First))
+        $this.TextArguments = [UIObject]::New(($ObjectReference | Get-UITextBox -AutomationId "TextArguments" -First))
+        $this.TextWorkDir   = [UIObject]::New(($ObjectReference | Get-UITextBox -AutomationId "TextWorkDir" -First))
+        $this.TextName      = [UIObject]::New(($ObjectReference | Get-UITextBox -AutomationId "TextName" -First))
+        $this.TextPath      = [UIObject]::New(($ObjectReference | Get-UITextBox -AutomationId "TextPath" -First))
+    }
+}
+
+class GameEditWindow : Window
+{
+    [UIObject]$ButtonSelectImage
+    [UIObject]$ButtonAddPlay
+    [UIObject]$ButtonUseExeIcon
+    [UIObject]$ButtonPickCat
+    [UIObject]$ButtonSelectIcon
+    [UIObject]$ButtonDownload
+    [UIObject]$ButtonCancel
+    [UIObject]$ButtonOK
+    [UIObject]$ButtonRemovePlay
+    [UIObject]$ButtonAddAction
+    [UIObject]$CheckForums
+    [UIObject]$CheckWiki
+    [UIObject]$CheckImage
+    [UIObject]$CheckIcon
+    [UIObject]$CheckDescription
+    [UIObject]$CheckStore
+    [UIObject]$CheckCategories
+    [UIObject]$CheckGenres
+    [UIObject]$CheckReleaseDate
+    [UIObject]$CheckPublisher
+    [UIObject]$CheckName
+    [UIObject]$CheckDeveloper
+    [UIObject]$ImageImage
+    [UIObject]$ImageIcon
+    [UIObject]$OtherTasksItems
+    [GameTaskControl]$TaskPlay
+    [UIObject]$TaskCustom
+    [TabControl]$TabControlMain
+    [UIObject]$TabActions
+    [UIObject]$TextGenres
+    [UIObject]$TextName
+    [UIObject]$TextWiki
+    [UIObject]$TextForums
+    [UIObject]$TextStore
+    [UIObject]$TextCategories
+    [UIObject]$TextDeveloper
+    [UIObject]$TextReleaseDate
+    [UIObject]$TextPublisher
+    [UIObject]$TextDescription
+    
+    GameEditWindow() : base({Get-UIWindow -ProcessName "PlayniteUI" -AutomationId "WindowMain" | Get-UIWindow -AutomationId "WindowGameEdit"}, "GameEditWindow")
+    {
+        $this.ButtonSelectImage = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonSelectImage" -First}), "ButtonSelectImage")
+        $this.ButtonAddPlay     = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonAddPlay" -First}), "ButtonAddPlay")
+        $this.ButtonUseExeIcon  = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonUseExeIcon" -First}), "ButtonUseExeIcon")
+        $this.ButtonPickCat     = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonPickCat" -First}), "ButtonPickCat")
+        $this.ButtonSelectIcon  = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonSelectIcon" -First}), "ButtonSelectIcon")
+        $this.ButtonDownload    = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonDownload" -First}), "ButtonDownload")
+        $this.ButtonCancel      = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonCancel" -First}), "ButtonCancel")
+        $this.ButtonOK          = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonOK" -First}), "ButtonOK")
+        $this.ButtonRemovePlay  = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonRemovePlay" -First}), "ButtonRemovePlay")
+        $this.ButtonAddAction   = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonAddAction" -First}), "ButtonAddAction")
+        $this.CheckForums       = [UIObject]::New($this.GetChildReference({Get-UICheckBox -AutomationId "CheckForums" -First}), "CheckForums")
+        $this.CheckWiki         = [UIObject]::New($this.GetChildReference({Get-UICheckBox -AutomationId "CheckWiki" -First}), "CheckWiki")
+        $this.CheckImage        = [UIObject]::New($this.GetChildReference({Get-UICheckBox -AutomationId "CheckImage" -First}), "CheckImage")
+        $this.CheckIcon         = [UIObject]::New($this.GetChildReference({Get-UICheckBox -AutomationId "CheckIcon" -First}), "CheckIcon")
+        $this.CheckDescription  = [UIObject]::New($this.GetChildReference({Get-UICheckBox -AutomationId "CheckDescription" -First}), "CheckDescription")
+        $this.CheckStore        = [UIObject]::New($this.GetChildReference({Get-UICheckBox -AutomationId "CheckStore" -First}), "CheckStore")
+        $this.CheckCategories   = [UIObject]::New($this.GetChildReference({Get-UICheckBox -AutomationId "CheckCategories" -First}), "CheckCategories")
+        $this.CheckGenres       = [UIObject]::New($this.GetChildReference({Get-UICheckBox -AutomationId "CheckGenres" -First}), "CheckGenres")
+        $this.CheckReleaseDate  = [UIObject]::New($this.GetChildReference({Get-UICheckBox -AutomationId "CheckReleaseDate" -First}), "CheckReleaseDate")
+        $this.CheckPublisher    = [UIObject]::New($this.GetChildReference({Get-UICheckBox -AutomationId "CheckPublisher" -First}), "CheckPublisher")
+        $this.CheckName         = [UIObject]::New($this.GetChildReference({Get-UICheckBox -AutomationId "CheckName" -First}), "CheckName")
+        $this.CheckDeveloper    = [UIObject]::New($this.GetChildReference({Get-UICheckBox -AutomationId "CheckDeveloper" -First}), "CheckDeveloper")
+        $this.ImageImage        = [UIObject]::New($this.GetChildReference({Get-UIImage -AutomationId "ImageImage" -First}), "ImageImage")
+        $this.ImageIcon         = [UIObject]::New($this.GetChildReference({Get-UIImage -AutomationId "ImageIcon" -First}), "ImageIcon")
+        $this.OtherTasksItems   = [UIObject]::New($this.GetChildReference({Get-UIControl -AutomationId "OtherTasksItems" -First}), "OtherTasksItems")
+        $this.TaskPlay          = [GameTaskControl]::New($this.GetChildReference({Get-UIControl -AutomationId "TaskPlay" -First}), "TaskPlay")
+        $this.TaskCustom        = [UIObject]::New($this.GetChildReference({Get-UIControl -AutomationId "TaskCustom" -First}), "TaskCustom")
+        $this.TabControlMain    = [TabControl]::New($this.GetChildReference({Get-UITabControl -AutomationId "TabControlMain" -First}), "TabControlMain")
+        $this.TabActions        = [UIObject]::New($this.GetChildReference({Get-UIControl -AutomationId "TabActions" -First}), "TabActions")
+        $this.TextGenres        = [UIObject]::New($this.GetChildReference({Get-UITextBox -AutomationId "TextGenres" -First}), "TextGenres")
+        $this.TextName          = [UIObject]::New($this.GetChildReference({Get-UITextBox -AutomationId "TextName" -First}), "TextName")
+        $this.TextWiki          = [UIObject]::New($this.GetChildReference({Get-UITextBox -AutomationId "TextWiki" -First}), "TextWiki")
+        $this.TextForums        = [UIObject]::New($this.GetChildReference({Get-UITextBox -AutomationId "TextForums" -First}), "TextForums")
+        $this.TextStore         = [UIObject]::New($this.GetChildReference({Get-UITextBox -AutomationId "TextStore" -First}), "TextStore")
+        $this.TextCategories    = [UIObject]::New($this.GetChildReference({Get-UITextBox -AutomationId "TextCategories" -First}), "TextCategories")
+        $this.TextDeveloper     = [UIObject]::New($this.GetChildReference({Get-UITextBox -AutomationId "TextDeveloper" -First}), "TextDeveloper")
+        $this.TextReleaseDate   = [UIObject]::New($this.GetChildReference({Get-UITextBox -AutomationId "TextReleaseDate" -First}), "TextReleaseDate")
+        $this.TextPublisher     = [UIObject]::New($this.GetChildReference({Get-UITextBox -AutomationId "TextPublisher" -First}), "TextPublisher")
+        $this.TextDescription   = [UIObject]::New($this.GetChildReference({Get-UITextBox -AutomationId "TextDescription" -First}), "TextDescription")
+    }
+}
+
+return [GameEditWindow]::New()
\ No newline at end of file
diff --git a/tests/Mapping/InstalledGamesWindow.ps1 b/tests/Mapping/InstalledGamesWindow.ps1
new file mode 100644
index 000000000..17f33360d
--- /dev/null
+++ b/tests/Mapping/InstalledGamesWindow.ps1
@@ -0,0 +1,21 @@
+using module c:\devel\PowerShell\PSNativeAutomation\source\PSNativeAutomation\bin\Debug\PSNativeAutomation.psd1
+
+class InstalledGamesWindow : Window
+{
+    [UIObject]$ButtonCancel
+    [UIObject]$ButtonBrowse
+    [UIObject]$ButtonOK
+    [ListView]$ListPrograms
+    [UIObject]$TextDownloading
+    
+    InstalledGamesWindow() : base({Get-UIWindow -ProcessName "PlayniteUI" | Get-UIWindow -AutomationId "WindowInstalledGames"}, "InstalledGamesWindow")
+    {
+        $this.ButtonCancel         = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonCancel" -First}), "ButtonCancel")
+        $this.ButtonBrowse         = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonBrowse" -First}), "ButtonBrowse")
+        $this.ButtonOK             = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonOK" -First}), "ButtonOK")
+        $this.ListPrograms         = [ListView]::New($this.GetChildReference({Get-UIListView -AutomationId "ListPrograms" -First}), "ListPrograms")
+        $this.TextDownloading      = [UIObject]::New($this.GetChildReference({Get-UITextBlock -AutomationId "TextDownloading" -First}), "TextDownloading")
+    }
+}
+
+return [InstalledGamesWindow]::New()
\ No newline at end of file
diff --git a/tests/Mapping/MainWindow.ps1 b/tests/Mapping/MainWindow.ps1
new file mode 100644
index 000000000..0b79b2e4d
--- /dev/null
+++ b/tests/Mapping/MainWindow.ps1
@@ -0,0 +1,65 @@
+using module c:\devel\PowerShell\PSNativeAutomation\source\PSNativeAutomation\bin\Debug\PSNativeAutomation.psd1
+
+class MainWindow : Window
+{
+    [ListBox]$ListBoxGames
+    [ListView]$ListViewGames
+    [Menu]$PopupMenu
+    [UIObject]$TextFilter
+
+    [UIObject]$ButtonInstall
+    [UIObject]$ButtonMore
+    [UIObject]$ButtonSetupProgress
+    [UIObject]$ButtonPlay
+    [UIObject]$HyperlinkStore
+    [UIObject]$HyperlinkForum
+    [UIObject]$HyperlinkWiki
+
+    [Menu]$MenuMainMenu
+    [Menu]$MenuViewSettings
+    [Menu]$MenuViewMode
+    [UIObject]$FilterSelector
+    [UIObject]$GridGamesView
+    [UIObject]$ImagesGamesView
+    [UIObject]$ListGamesView
+    [UIObject]$SearchBoxFilter
+    [UIObject]$CheckFilterView
+    [UIObject]$ImageLogo
+    [UIObject]$ProgressControl
+    [UIObject]$TabControlView
+    [UIObject]$TextView
+    [UIObject]$TextGroup
+
+    MainWindow() : base({Get-UIWindow -ProcessName "PlayniteUI" -AutomationId "WindowMain"}, "MainWindow")
+    {
+        $this.ListBoxGames      = [ListBox]::New($this.GetChildReference({Get-UIListBox -AutomationId "ListGames" -First}), "ListBoxGames");
+        $this.ListViewGames     = [ListView]::New($this.GetChildReference({Get-UIListView -AutomationId "GridGames" -First}), "ListViewGames");
+        $this.PopupMenu         = [Menu]::New($this.GetChildReference({Get-UIControl -Class "Popup" -First}), "PopupMenu");
+        $this.TextFilter        = [UIObject]::New($this.GetChildReference({Get-UITextBox -AutomationId "TextFilter" -First}), "TextFilter");
+
+        $this.ButtonInstall       = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonInstall" -First}), "ButtonInstall")
+        $this.ButtonMore          = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonMore" -First}), "ButtonMore")
+        $this.ButtonSetupProgress = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonSetupProgress" -First}), "ButtonSetupProgress")
+        $this.ButtonPlay          = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonPlay" -First}), "ButtonPlay")
+        $this.HyperlinkStore      = [UIObject]::New($this.GetChildReference({Get-UIControl -AutomationId "HyperlinkStore" -First}), "HyperlinkStore")
+        $this.HyperlinkForum      = [UIObject]::New($this.GetChildReference({Get-UIControl -AutomationId "HyperlinkForum" -First}), "HyperlinkForum")
+        $this.HyperlinkWiki       = [UIObject]::New($this.GetChildReference({Get-UIControl -AutomationId "HyperlinkWiki" -First}), "HyperlinkWiki")
+
+        $this.MenuMainMenu     = [Menu]::New($this.GetChildReference({Get-UIContextMenu -AutomationId "MenuMainMenu" -First}), "MenuMainMenu")
+        $this.MenuViewSettings = [Menu]::New($this.GetChildReference({Get-UIContextMenu -AutomationId "MenuViewSettings" -First}), "MenuViewSettings")
+        $this.MenuViewMode     = [Menu]::New($this.GetChildReference({Get-UIContextMenu -AutomationId "MenuViewMode" -First}), "MenuViewMode")
+        $this.FilterSelector   = [UIObject]::New($this.GetChildReference({Get-UIControl -AutomationId "FilterSelector" -First}), "FilterSelector")
+        $this.GridGamesView    = [UIObject]::New($this.GetChildReference({Get-UIControl -AutomationId "GridGamesView" -First}), "GridGamesView")
+        $this.ImagesGamesView  = [UIObject]::New($this.GetChildReference({Get-UIControl -AutomationId "ImagesGamesView" -First}), "ImagesGamesView")
+        $this.ListGamesView    = [UIObject]::New($this.GetChildReference({Get-UIControl -AutomationId "ListGamesView" -First}), "ListGamesView")
+        $this.SearchBoxFilter  = [UIObject]::New($this.GetChildReference({Get-UIControl -AutomationId "SearchBoxFilter" -First}), "SearchBoxFilter")
+        $this.CheckFilterView  = [UIObject]::New($this.GetChildReference({Get-UICheckBox -AutomationId "CheckFilterView" -First}), "CheckFilterView")
+        $this.ImageLogo        = [UIObject]::New($this.GetChildReference({Get-UIImage -AutomationId "ImageLogo" -First}), "ImageLogo")
+        $this.ProgressControl  = [UIObject]::New($this.GetChildReference({Get-UIControl -AutomationId "ProgressControl" -First}), "ProgressControl")
+        $this.TabControlView   = [UIObject]::New($this.GetChildReference({Get-UIControl -AutomationId "TabControlView" -First}), "TabControlView")
+        $this.TextView         = [UIObject]::New($this.GetChildReference({Get-UITextBlock -AutomationId "TextView" -First}), "TextView")
+        $this.TextGroup        = [UIObject]::New($this.GetChildReference({Get-UITextBlock -AutomationId "TextGroup" -First}), "TextGroup")
+    }
+}
+
+return [MainWindow]::New()
\ No newline at end of file
diff --git a/tests/Mapping/MetadataLookupWindow.ps1 b/tests/Mapping/MetadataLookupWindow.ps1
new file mode 100644
index 000000000..a53415fb0
--- /dev/null
+++ b/tests/Mapping/MetadataLookupWindow.ps1
@@ -0,0 +1,23 @@
+using module c:\devel\PowerShell\PSNativeAutomation\source\PSNativeAutomation\bin\Debug\PSNativeAutomation.psd1
+
+class MetadataLookupWindow : Window
+{
+    [UIObject]$ButtonOK
+    [UIObject]$ButtonCancel
+    [UIObject]$ButtonSearch
+    [ListBox]$ListSearch
+    [UIObject]$TextDownloading
+    [UIObject]$TextSearch
+
+    MetadataLookupWindow() : base({Get-UIWindow -ProcessName "PlayniteUI" | Get-UIWindow -AutomationId "WindowMetaSearch"}, "MetadataLookupWindow")
+    {
+        $this.ButtonOK         = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonOK" -First}), "ButtonOK")
+        $this.ButtonCancel     = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonCancel" -First}), "ButtonCancel")
+        $this.ButtonSearch     = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonSearch" -First}), "ButtonSearch")
+        $this.ListSearch       = [ListBox]::New($this.GetChildReference({Get-UIListBox -AutomationId "ListSearch" -First}), "ListSearch")
+        $this.TextDownloading  = [UIObject]::New($this.GetChildReference({Get-UITextBlock -AutomationId "TextDownloading" -First}), "TextDownloading")
+        $this.TextSearch       = [UIObject]::New($this.GetChildReference({Get-UITextBox -AutomationId "TextSearch" -First}), "TextSearch")
+    }
+}
+
+return [MetadataLookupWindow]::New()
\ No newline at end of file
diff --git a/tests/Mapping/NotificationsWindow.ps1 b/tests/Mapping/NotificationsWindow.ps1
new file mode 100644
index 000000000..2e9bb19fe
--- /dev/null
+++ b/tests/Mapping/NotificationsWindow.ps1
@@ -0,0 +1,13 @@
+using module c:\devel\PowerShell\PSNativeAutomation\source\PSNativeAutomation\bin\Debug\PSNativeAutomation.psd1
+
+class NotificationsWindow : Window
+{
+    [ListBox]$ListNotifications
+
+    NotificationsWindow() : base({Get-UIWindow -ProcessName "PlayniteUI" | Get-UIWindow -AutomationId "WindowNotifications"}, "NotificationsWindow")
+    {
+        $this.ListNotifications   = [ListBox]::New($this.GetChildReference({Get-UIListBox -AutomationId "ListNotifications" -First}), "ListNotifications")
+    }
+}
+
+return [NotificationsWindow]::New()
\ No newline at end of file
diff --git a/tests/Mapping/OpenFileWindow.ps1 b/tests/Mapping/OpenFileWindow.ps1
new file mode 100644
index 000000000..3b80a6fec
--- /dev/null
+++ b/tests/Mapping/OpenFileWindow.ps1
@@ -0,0 +1,17 @@
+using module c:\devel\PowerShell\PSNativeAutomation\source\PSNativeAutomation\bin\Debug\PSNativeAutomation.psd1
+
+class OpenFileWindow : Window
+{
+    [UIObject]$ButtonOpen
+    [UIObject]$ButtonCancel
+    [UIObject]$EditFileName
+
+    OpenFileWindow() : base({Get-UIWindow -ProcessName "PlayniteUI" | Get-UIWindow -Name "Open"}, "OpenFileWindow")
+    {
+        $this.ButtonOpen   = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "1" -First}), "ButtonOpen")
+        $this.ButtonCancel = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "2" -First}), "ButtonCancel")
+        $this.EditFileName = [UIObject]::New($this.GetChildReference({Get-UIEdit -AutomationId "1148" -First}), "EditFileName")
+    }
+}
+
+return [OpenFileWindow]::New()
\ No newline at end of file
diff --git a/tests/Mapping/SettingsWindow.ps1 b/tests/Mapping/SettingsWindow.ps1
new file mode 100644
index 000000000..653b171d7
--- /dev/null
+++ b/tests/Mapping/SettingsWindow.ps1
@@ -0,0 +1,47 @@
+using module c:\devel\PowerShell\PSNativeAutomation\source\PSNativeAutomation\bin\Debug\PSNativeAutomation.psd1
+
+class SettingsWindow : Window
+{
+    [UIObject]$ButtonBrowserDbFile
+    [UIObject]$ButtonGogAuth
+    [UIObject]$ButtonOK
+    [UIObject]$ButtonOriginAuth
+    [UIObject]$ButtonCancel
+    [UIObject]$CheckGogEnabled
+    [UIObject]$CheckGogIcons
+    [UIObject]$CheckOriginEnabled
+    [UIObject]$CheckGogRunGalaxy
+    [UIObject]$CheckSteamEnabled
+    [UIObject]$RadioLibraryOrigin
+    [UIObject]$RadioInstalledOrigin
+    [UIObject]$RadioLibrarySteam
+    [UIObject]$RadioInstalledSteam
+    [UIObject]$RadioInstalledGOG
+    [UIObject]$RadioLibraryGOG
+    [UIObject]$TextSteamAccountName
+    [UIObject]$TextDatabase
+
+    SettingsWindow() : base({Get-UIWindow -ProcessName "PlayniteUI" | Get-UIWindow -AutomationId "WindowSettings"}, "SettingsWindow")
+    {
+        $this.ButtonBrowserDbFile  = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonBrowserDbFile" -First}), "ButtonBrowserDbFile")
+        $this.ButtonGogAuth        = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonGogAuth" -First}), "ButtonGogAuth")
+        $this.ButtonOK             = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonOK" -First}), "ButtonOK")
+        $this.ButtonOriginAuth     = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonOriginAuth" -First}), "ButtonOriginAuth")
+        $this.ButtonCancel         = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "ButtonCancel" -First}), "ButtonCancel")
+        $this.CheckGogEnabled      = [UIObject]::New($this.GetChildReference({Get-UICheckBox -AutomationId "CheckGogEnabled" -First}), "CheckGogEnabled")
+        $this.CheckGogIcons        = [UIObject]::New($this.GetChildReference({Get-UICheckBox -AutomationId "CheckGogIcons" -First}), "CheckGogIcons")
+        $this.CheckOriginEnabled   = [UIObject]::New($this.GetChildReference({Get-UICheckBox -AutomationId "CheckOriginEnabled" -First}), "CheckOriginEnabled")
+        $this.CheckGogRunGalaxy    = [UIObject]::New($this.GetChildReference({Get-UICheckBox -AutomationId "CheckGogRunGalaxy" -First}), "CheckGogRunGalaxy")
+        $this.CheckSteamEnabled    = [UIObject]::New($this.GetChildReference({Get-UICheckBox -AutomationId "CheckSteamEnabled" -First}), "CheckSteamEnabled")
+        $this.RadioLibraryOrigin   = [UIObject]::New($this.GetChildReference({Get-UIRadioButton -AutomationId "RadioLibraryOrigin" -First}), "RadioLibraryOrigin")
+        $this.RadioInstalledOrigin = [UIObject]::New($this.GetChildReference({Get-UIRadioButton -AutomationId "RadioInstalledOrigin" -First}), "RadioInstalledOrigin")
+        $this.RadioLibrarySteam    = [UIObject]::New($this.GetChildReference({Get-UIRadioButton -AutomationId "RadioLibrarySteam" -First}), "RadioLibrarySteam")
+        $this.RadioInstalledSteam  = [UIObject]::New($this.GetChildReference({Get-UIRadioButton -AutomationId "RadioInstalledSteam" -First}), "RadioInstalledSteam")
+        $this.RadioInstalledGOG    = [UIObject]::New($this.GetChildReference({Get-UIRadioButton -AutomationId "RadioInstalledGOG" -First}), "RadioInstalledGOG")
+        $this.RadioLibraryGOG      = [UIObject]::New($this.GetChildReference({Get-UIRadioButton -AutomationId "RadioLibraryGOG" -First}), "RadioLibraryGOG")
+        $this.TextSteamAccountName = [UIObject]::New($this.GetChildReference({Get-UITextBox -AutomationId "TextSteamAccountName" -First}), "TextSteamAccountName")
+        $this.TextDatabase         = [UIObject]::New($this.GetChildReference({Get-UITextBox -AutomationId "TextDatabase" -First}), "TextDatabase")
+    }
+}
+
+return [SettingsWindow]::New()
\ No newline at end of file
diff --git a/tests/Mapping/SetupUninstallWindow.ps1 b/tests/Mapping/SetupUninstallWindow.ps1
new file mode 100644
index 000000000..285d3f337
--- /dev/null
+++ b/tests/Mapping/SetupUninstallWindow.ps1
@@ -0,0 +1,20 @@
+
+using module c:\devel\PowerShell\PSNativeAutomation\source\PSNativeAutomation\bin\Debug\PSNativeAutomation.psd1
+
+class SetupUninstallWindow : Window
+{
+    [UIObject]$ButtonYes
+    [UIObject]$ButtonNo
+    [UIObject]$ButtonClose
+    [UIObject]$TextStatus
+
+    SetupUninstallWindow() : base({Get-UIWindow -ProcessName "Un_A"}, "SetupUninstallWindow")
+    {
+        $this.ButtonYes = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "6" -First}), "ButtonYes")
+        $this.ButtonNo  = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "7" -First}), "ButtonNo")
+        $this.ButtonClose  = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "1" -First}), "ButtonClose")
+        $this.TextStatus  = [UIObject]::New($this.GetChildReference({Get-UIControl -AutomationId "1006" -First}), "TextStatus")
+    }
+}
+
+return [SetupUninstallWindow]::New()
\ No newline at end of file
diff --git a/tests/Mapping/SetupWindow.ps1 b/tests/Mapping/SetupWindow.ps1
new file mode 100644
index 000000000..6f35ba6b8
--- /dev/null
+++ b/tests/Mapping/SetupWindow.ps1
@@ -0,0 +1,23 @@
+
+using module c:\devel\PowerShell\PSNativeAutomation\source\PSNativeAutomation\bin\Debug\PSNativeAutomation.psd1
+
+class SetupWindow : Window
+{
+    [UIObject]$ButtonInstall
+    [UIObject]$ButtonCancel
+    [UIObject]$ButtonBrowse
+    [UIObject]$TextPath
+    [UIObject]$CheckRunAfterInstall
+    [Window]$WindowUninstallAsk
+
+    SetupWindow() : base({Get-UIWindow -Name "Playnite * Setup *"}, "SetupWindow")
+    {
+        $this.ButtonInstall         = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "1" -First}), "ButtonInstall")
+        $this.ButtonCancel          = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "2" -First}), "ButtonCancel")
+        $this.ButtonBrowse          = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "1001" -First}), "ButtonBrowse")
+        $this.TextPath              = [UIObject]::New($this.GetChildReference({Get-UIEdit -AutomationId "1019" -First}), "TextPath")
+        $this.CheckRunAfterInstall  = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "1203" -First}), "CheckRunAfterInstall")
+    }
+}
+
+return [SetupWindow]::New()
\ No newline at end of file
diff --git a/tests/RunTests.ps1 b/tests/RunTests.ps1
index ac5846fb5..814f76b0f 100644
--- a/tests/RunTests.ps1
+++ b/tests/RunTests.ps1
@@ -1,8 +1,8 @@
 $ErrorActionPreference = "Stop"
 
 Import-Module "Pester"
-Import-Module "PSNativeAutomation"
+Import-Module "c:\devel\PowerShell\PSNativeAutomation\source\PSNativeAutomation\bin\Debug\PSNativeAutomation.psd1"
 Invoke-Expression ".\TestExtensions.ps1"
 
-Invoke-Pester
+Invoke-Pester -TestName $args[0]
 
diff --git a/tests/TestFiles/TestCover.jpg b/tests/TestFiles/TestCover.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..dfde37773bc6069bbc99ce49a9382573d550184b
GIT binary patch
literal 38337
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
F{TpKe>ox!Y

literal 0
HcmV?d00001

diff --git a/tests/TestFiles/TestIcon.png b/tests/TestFiles/TestIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..496b576b6fb91fef8d607d948980c87073b595a1
GIT binary patch
literal 32097
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
NE2$*$Q_Ljv{{b|{*BSr-

literal 0
HcmV?d00001

diff --git a/tests/UI/FirstTimeWizard.Tests.ps1 b/tests/UI/FirstTimeWizard.Tests.ps1
new file mode 100644
index 000000000..f2300b7a2
--- /dev/null
+++ b/tests/UI/FirstTimeWizard.Tests.ps1
@@ -0,0 +1,73 @@
+Describe "Run through - installed only" {
+    BeforeAll {
+        $global:WizardWindow = & (Join-Path $PSScriptRoot "..\Mapping\FirstTimeWizardWindow.ps1")
+        $global:InstalledGamesWindow = & (Join-Path $PSScriptRoot "..\Mapping\InstalledGamesWindow.ps1")
+    }
+
+    It "Wizard is opened" {
+        $WizardWindow.WaitForObject(10000)
+    }
+
+    It "Database location is presented" {
+        $WizardWindow.ButtonNext.Invoke()
+        $WizardWindow.RadioDbDefault.GetSelectionState() | Should Be $true
+        $WizardWindow.RadioDbCustom.GetSelectionState() | Should Be $false
+        $WizardWindow.TextDbFile.GetEnabledState() | Should Be $false
+        $WizardWindow.ButtonBrowseDbFile.GetEnabledState() | Should Be $false       
+        $WizardWindow.RadioDbCustom.Select()
+        $WizardWindow.RadioDbDefault.GetSelectionState() | Should Be $false
+        $WizardWindow.RadioDbCustom.GetSelectionState() | Should Be $true
+        $WizardWindow.TextDbFile.GetEnabledState() | Should Be $true
+        $WizardWindow.ButtonBrowseDbFile.GetEnabledState() | Should Be $true
+        $WizardWindow.RadioDbDefault.Select()
+    }
+
+    It "All integrations are presented and enabled" {
+        $WizardWindow.ButtonNext.Invoke()
+        $WizardWindow.CheckEnableGOG.GetToggleState() | Should Be "On"
+        $WizardWindow.CheckEnableOrigin.GetToggleState() | Should Be "On"
+        $WizardWindow.CheckEnableSteam.GetToggleState() | Should Be "On"
+    }
+
+    It "Steam import page" {
+        $WizardWindow.ButtonNext.Invoke()
+        $WizardWindow.RadioInstalledSteam.GetSelectionState() | Should Be $true
+        $WizardWindow.TextSteamAccount.GetEnabledState() | Should Be $false
+        $WizardWindow.RadioLibrarySteam.Select()
+        $WizardWindow.TextSteamAccount.GetEnabledState() | Should Be $true
+        $WizardWindow.RadioInstalledSteam.Select()
+    }
+
+    It "GOG import page" {
+        $WizardWindow.ButtonNext.Invoke()
+        $WizardWindow.RadioInstalledGOG.GetSelectionState() | Should Be $true
+        $WizardWindow.ButtonGogAuthenticate.GetEnabledState() | Should Be $false
+        $WizardWindow.RadioLibraryGOG.Select()
+        $WizardWindow.ButtonGogAuthenticate.GetEnabledState() | Should Be $true
+        $WizardWindow.RadioInstalledGOG.Select()
+    }
+
+    It "Origin import page" {
+        $WizardWindow.ButtonNext.Invoke()
+        $WizardWindow.RadioInstalledOrigin.GetSelectionState() | Should Be $true
+        $WizardWindow.ButtonOriginAuthenticate.GetEnabledState() | Should Be $false
+        $WizardWindow.RadioLibraryOrigin.Select()
+        $WizardWindow.ButtonOriginAuthenticate.GetEnabledState() | Should Be $true        
+        $WizardWindow.RadioInstalledOrigin.Select()
+    }
+
+    It "Custom import page" {
+        $WizardWindow.ButtonNext.Invoke()
+        $WizardWindow.ButtonImportGames.GetEnabledState() | Should Be $true
+        $WizardWindow.ButtonImportGames.Invoke()        
+        $InstalledGamesWindow.WaitForObject(5000)
+        $InstalledGamesWindow.Close()
+    }
+
+    It "Finish page" {
+        $WizardWindow.ButtonNext.Invoke()
+        $WizardWindow.ButtonFinish.Invoke()
+        Start-Sleep -Seconds 2
+        $WizardWindow.Exists() | Should Be $false
+    }
+}
\ No newline at end of file
diff --git a/tests/UI/GameEditWindow.Tests.ps1 b/tests/UI/GameEditWindow.Tests.ps1
new file mode 100644
index 000000000..3d10b27d8
--- /dev/null
+++ b/tests/UI/GameEditWindow.Tests.ps1
@@ -0,0 +1,192 @@
+Describe "Edit Window - Basic Test" {
+    BeforeAll {
+        $windowMain = & (Join-Path $PSScriptRoot "..\Mapping\MainWindow.ps1")
+        $windowGameEdit = & (Join-Path $PSScriptRoot "..\Mapping\GameEditWindow.ps1")
+        $windowOpenFile = & (Join-Path $PSScriptRoot "..\Mapping\OpenFileWindow.ps1")     
+
+        $editData = @{
+            "Name" = "AA New Name";
+            "Genres" = "Genre1, Genre2";
+            "ReleaseDate" = [datetime]::Now.ToShortDateString();
+            "Developers" = "Developer1";
+            "Publishers" = "Publisher";
+            "Categories" = "Cat1, Cat2, Cat3";
+            "StoreURL" = "New store url";
+            "WikiURL" = "New wiki url";
+            "ForumsURL" = "New forum url";
+            "Description" = "New description";
+            "Icon" = Join-Path $PSScriptRoot "..\TestFiles\TestIcon.png";
+            "Image" = Join-Path $PSScriptRoot "..\TestFiles\TestCover.jpg";
+        }
+    }
+
+    It "Edit window can be opened" {
+        $windowMain.ListBoxGames.GetItems()[(Get-Random -Minimum 0 -Maximum 5)].ClickRight()
+        $windowMain.PopupMenu.InvokeItem("Edit...")
+        $windowGameEdit.WaitForObject(5000)
+        $windowGameEdit.Close()
+    }
+
+    It "Cancel button doesn't save changes" {
+        $itemIndex = Get-Random -Minimum 0 -Maximum 5
+        $windowMain.ListBoxGames.GetItems()[$itemIndex].ClickRight()
+        $windowMain.PopupMenu.InvokeItem("Edit...")
+        $windowGameEdit.WaitForObject(5000)
+
+        # basic fileds
+        $windowGameEdit.TextName.SetValue($editData.Name)
+        $windowGameEdit.TextGenres.SetValue($editData.Genres)
+        $windowGameEdit.TextReleaseDate.SetValue($editData.ReleaseDate)
+        $windowGameEdit.TextDeveloper.SetValue($editData.Developers)
+        $windowGameEdit.TextPublisher.SetValue($editData.Publishers)
+        $windowGameEdit.TextCategories.SetValue($editData.Categories)
+        $windowGameEdit.TextStore.SetValue($editData.StoreURL)
+        $windowGameEdit.TextWiki.SetValue($editData.WikiURL)
+        $windowGameEdit.TextForums.SetValue($editData.ForumsURL)
+        $windowGameEdit.TextDescription.SetValue($editData.Description)
+        # images
+        $windowGameEdit.ButtonSelectIcon.Invoke()
+        $windowOpenFile.EditFileName.SetValue($editData.Icon)
+        $windowOpenFile.ButtonOpen.Invoke()
+        $windowGameEdit.ButtonSelectImage.Invoke()
+        $windowOpenFile.EditFileName.SetValue($editData.Image)
+        $windowOpenFile.ButtonOpen.Invoke()
+        # tasks
+        $windowGameEdit.TabControlMain.SelectItem("Actions")
+        $windowGameEdit.TaskPlay.TextName.SetValue("TestName")
+        $windowGameEdit.TaskPlay.TextPath.SetValue("TestPath")
+
+        $windowGameEdit.ButtonCancel.Invoke()        
+        $windowMain.ListBoxGames.GetItems()[$itemIndex].ClickRight()
+        $windowMain.PopupMenu.InvokeItem("Edit...")
+
+        $windowGameEdit.TextName.GetValue() | Should Not Be $editData.Name
+        $windowGameEdit.TextGenres.GetValue() | Should Not Be $editData.Genres
+        $windowGameEdit.TextReleaseDate.GetValue() | Should Not Be $editData.ReleaseDate
+        $windowGameEdit.TextDeveloper.GetValue() | Should Not Be $editData.Developers
+        $windowGameEdit.TextPublisher.GetValue() | Should Not Be $editData.Publishers
+        $windowGameEdit.TextCategories.GetValue() | Should Not Be $editData.Categories
+        $windowGameEdit.TextStore.GetValue() | Should Not Be $editData.StoreURL
+        $windowGameEdit.TextWiki.GetValue() | Should Not Be $editData.WikiURL
+        $windowGameEdit.TextForums.GetValue() | Should Not Be $editData.ForumsURL
+        $windowGameEdit.TextDescription.GetValue() | Should Not Be $editData.Description
+        $windowGameEdit.ImageIcon.GetObject().Current.HelpText | Should Not BeLike "images/custom*"
+        $windowGameEdit.ImageImage.GetObject().Current.HelpText | Should Not BeLike "images/custom*"
+        $windowGameEdit.TabControlMain.SelectItem("Actions")
+        $windowGameEdit.TaskPlay.TextName.GetValue() | Should Not Be "TestName"
+        $windowGameEdit.TaskPlay.TextPath.GetValue() | Should Not Be "TestPath"
+
+        $windowGameEdit.Close()
+    }
+
+    It "OK button saves changes" {
+        $itemIndex = Get-Random -Minimum 0 -Maximum 5
+        $windowMain.ListBoxGames.GetItems()[$itemIndex].Select()
+        $windowMain.ButtonMore.Invoke()
+        $windowMain.PopupMenu.InvokeItem("Edit...")
+        $windowGameEdit.WaitForObject(5000)
+
+        # basic fields
+        $windowGameEdit.TextName.SetValue($editData.Name)
+        $windowGameEdit.TextGenres.SetValue($editData.Genres)
+        $windowGameEdit.TextReleaseDate.SetValue($editData.ReleaseDate)
+        $windowGameEdit.TextDeveloper.SetValue($editData.Developers)
+        $windowGameEdit.TextPublisher.SetValue($editData.Publishers)
+        $windowGameEdit.TextCategories.SetValue($editData.Categories)
+        $windowGameEdit.TextStore.SetValue($editData.StoreURL)
+        $windowGameEdit.TextWiki.SetValue($editData.WikiURL)
+        $windowGameEdit.TextForums.SetValue($editData.ForumsURL)
+        $windowGameEdit.TextDescription.SetValue($editData.Description)
+        # images
+        $windowGameEdit.ButtonSelectIcon.Invoke()
+        $windowOpenFile.EditFileName.SetValue($editData.Icon)
+        $windowOpenFile.ButtonOpen.Invoke()
+        $windowGameEdit.ButtonSelectImage.Invoke()
+        $windowOpenFile.EditFileName.SetValue($editData.Image)
+        $windowOpenFile.ButtonOpen.Invoke()
+        # tasks
+        $windowGameEdit.TabControlMain.SelectItem("Actions")
+        $windowGameEdit.TaskPlay.TextName.SetValue("TestName")
+        $windowGameEdit.TaskPlay.TextPath.SetValue("TestPath")
+
+        $windowGameEdit.ButtonOK.Invoke()        
+        $windowMain.ListBoxGames.GetItems()[0].Select()
+        $windowMain.ButtonMore.Invoke()
+        $windowMain.PopupMenu.InvokeItem("Edit...")
+
+        $windowGameEdit.TextName.GetValue() | Should Be $editData.Name
+        $windowGameEdit.TextGenres.GetValue() | Should Be $editData.Genres
+        $windowGameEdit.TextReleaseDate.GetValue() | Should Be $editData.ReleaseDate
+        $windowGameEdit.TextDeveloper.GetValue() | Should Be $editData.Developers
+        $windowGameEdit.TextPublisher.GetValue() | Should Be $editData.Publishers
+        $windowGameEdit.TextCategories.GetValue() | Should Be $editData.Categories
+        $windowGameEdit.TextStore.GetValue() | Should Be $editData.StoreURL
+        $windowGameEdit.TextWiki.GetValue() | Should Be $editData.WikiURL
+        $windowGameEdit.TextForums.GetValue() | Should Be $editData.ForumsURL
+        $windowGameEdit.TextDescription.GetValue() | Should Be $editData.Description
+        $windowGameEdit.ImageIcon.GetObject().Current.HelpText | Should BeLike "images/custom*"
+        $windowGameEdit.ImageImage.GetObject().Current.HelpText | Should BeLike "images/custom*"
+        $windowGameEdit.TabControlMain.SelectItem("Actions")
+        $windowGameEdit.TaskPlay.TextName.GetValue() | Should Be "TestName"
+        $windowGameEdit.TaskPlay.TextPath.GetValue() | Should Be "TestPath"
+
+        $windowGameEdit.Close()
+    }
+}
+
+Describe "Edit Window - Bulk editing" {
+
+}
+
+Describe "Edit Window - Categories" {
+    BeforeAll {
+        $windowMain = & (Join-Path $PSScriptRoot "..\Mapping\MainWindow.ps1")
+        $windowGameEdit = & (Join-Path $PSScriptRoot "..\Mapping\GameEditWindow.ps1")
+        $windowCategoryConfig = & (Join-Path $PSScriptRoot "..\Mapping\CategoryConfigWindow.ps1")        
+    }
+
+    It "Cancel doesn't change category" { 
+        $itemIndex = Get-Random -Minimum 0 -Maximum 5
+        $windowMain.ListBoxGames.GetItems()[$itemIndex].ClickRight()
+        $windowMain.PopupMenu.InvokeItem("Edit...")
+        $windowGameEdit.WaitForObject(5000)
+        
+        $currentCat = $windowGameEdit.TextCategories.GetValue()
+        $windowGameEdit.ButtonPickCat.Invoke()
+        $windowCategoryConfig.WaitForObject(2000)
+        $windowCategoryConfig.TextNewCat.SetValue("NewCat1")
+        $windowCategoryConfig.ButtonAddCat.Invoke()
+        $windowCategoryConfig.ButtonCancel.Invoke()
+        $windowGameEdit.TextCategories.GetValue() | Should Be $currentCat
+
+        $windowGameEdit.Close()
+    }
+
+    It "OK changes category" {
+        $itemIndex = Get-Random -Minimum 0 -Maximum 5
+        $windowMain.ListBoxGames.GetItems()[$itemIndex].ClickRight()
+        $windowMain.PopupMenu.InvokeItem("Edit...")
+        $windowGameEdit.WaitForObject(5000)
+        
+        $windowGameEdit.ButtonPickCat.Invoke()
+        $windowCategoryConfig.WaitForObject(2000)
+        $windowCategoryConfig.TextNewCat.SetValue("NewCat1")
+        $windowCategoryConfig.ButtonAddCat.Invoke()
+        $windowCategoryConfig.ButtonOK.Invoke()
+        $windowGameEdit.TextCategories.GetValue() | Should Be "NewCat1"
+
+        $windowGameEdit.Close()
+    }
+}
+
+Describe "Edit Window - Icon from EXE" {
+
+}
+
+Describe "Edit Window - Metadata Download" {
+
+}
+
+Describe "Edit Window - Tasks" {
+
+}
\ No newline at end of file

From 859350b69b35b8922543d213211efac41063cf3a Mon Sep 17 00:00:00 2001
From: Josef Nemec <nemecjosef@gmail.com>
Date: Sun, 7 May 2017 15:00:42 +0200
Subject: [PATCH 3/3] UI polish, usability improvements and new theme.

---
 source/PlayniteUI/App.xaml.cs                 |    1 +
 .../PlayniteUI/Controls/FilterSelector.xaml   |   25 +-
 .../Controls/FilterSelectorItem.xaml          |   15 +-
 source/PlayniteUI/Controls/GameDetails.xaml   |   28 +-
 .../PlayniteUI/Controls/GameDetails.xaml.cs   |   20 +-
 source/PlayniteUI/Controls/GamePopupMenu.xaml |    6 +-
 .../Controls/GamePopupMenuMulti.xaml          |    2 +-
 source/PlayniteUI/Controls/GameTaskView.xaml  |   32 +-
 source/PlayniteUI/Controls/GamesGridView.xaml |   33 +-
 .../PlayniteUI/Controls/GamesGridView.xaml.cs |    2 +-
 .../PlayniteUI/Controls/GamesImagesView.xaml  |   24 +-
 source/PlayniteUI/Controls/GamesListView.xaml |   36 +-
 .../PlayniteUI/Controls/GamesListView.xaml.cs |    2 +-
 .../PlayniteUI/Controls/ProgressControl.xaml  |    2 +-
 source/PlayniteUI/Controls/SearchBox.xaml     |   21 +-
 source/PlayniteUI/Controls/SearchBox.xaml.cs  |    2 +-
 .../Converters/ListToStringConverter.cs       |    5 -
 source/PlayniteUI/Theme.xaml                  | 1364 ++++++-----------
 source/PlayniteUI/Windows/AboutWindow.xaml    |   69 +-
 .../Windows/CategoryConfigWindow.xaml         |   50 +-
 .../Windows/CrashHandlerWindow.xaml           |   45 +-
 .../Windows/CrashHandlerWindow.xaml.cs        |    5 +-
 .../Windows/FirstTimeStartupWindow.xaml       |   46 +-
 source/PlayniteUI/Windows/GameEditWindow.xaml |  167 +-
 .../Windows/InstalledGamesWindow.xaml         |   42 +-
 .../Windows/InstalledGamesWindow.xaml.cs      |    6 +-
 source/PlayniteUI/Windows/MainWindow.xaml     |   80 +-
 source/PlayniteUI/Windows/MainWindow.xaml.cs  |   18 +-
 .../Windows/MetadataLookupWindow.xaml         |   45 +-
 .../Windows/NotificationsWindow.xaml          |    4 +-
 source/PlayniteUI/Windows/SettingsWindow.xaml |   42 +-
 tests/Mapping/AboutWindow.ps1                 |    2 +-
 tests/Mapping/CategoryConfigWindow.ps1        |    2 +-
 tests/Mapping/CrashHandlerWindow.ps1          |    2 +-
 tests/Mapping/FirstTimeWizardWindow.ps1       |    2 +-
 tests/Mapping/GameEditWindow.ps1              |    2 +-
 tests/Mapping/InstalledGamesWindow.ps1        |    2 +-
 tests/Mapping/MainWindow.ps1                  |    2 +-
 tests/Mapping/MetadataLookupWindow.ps1        |    2 +-
 tests/Mapping/NotificationsWindow.ps1         |    2 +-
 tests/Mapping/OpenFileWindow.ps1              |    2 +-
 tests/Mapping/SettingsWindow.ps1              |    2 +-
 tests/Mapping/SetupUninstallWindow.ps1        |    3 +-
 tests/Mapping/SetupWindow.ps1                 |    3 +-
 tests/Mapping/SystemDialog.ps1                |   15 +
 tests/RunTests.ps1                            |    2 +-
 tests/UI/CustomGames.Tests.ps1                |   56 +
 tests/UI/GameEditWindow.Tests.ps1             |   35 +-
 tests/UI/InstalledGamesImport.Tests.ps1       |   66 +
 49 files changed, 1101 insertions(+), 1340 deletions(-)
 create mode 100644 tests/Mapping/SystemDialog.ps1
 create mode 100644 tests/UI/CustomGames.Tests.ps1
 create mode 100644 tests/UI/InstalledGamesImport.Tests.ps1

diff --git a/source/PlayniteUI/App.xaml.cs b/source/PlayniteUI/App.xaml.cs
index a5711c6fa..98c4561c2 100644
--- a/source/PlayniteUI/App.xaml.cs
+++ b/source/PlayniteUI/App.xaml.cs
@@ -46,6 +46,7 @@ private void Application_Startup(object sender, StartupEventArgs e)
         {
             Settings.ConfigureLogger();
             Settings.ConfigureCef();
+            Settings.LoadSettings();
 
 #if !DEBUG
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
diff --git a/source/PlayniteUI/Controls/FilterSelector.xaml b/source/PlayniteUI/Controls/FilterSelector.xaml
index b5caf9b62..e60a20026 100644
--- a/source/PlayniteUI/Controls/FilterSelector.xaml
+++ b/source/PlayniteUI/Controls/FilterSelector.xaml
@@ -10,24 +10,23 @@
     <Grid>
         <StackPanel>
             <local:FilterSelectorItem x:Name="FilterInstalled" Text="Installed" CountText="{Binding Path=Stats.Installed, Mode=OneWay}"
-                                      IsChecked="{Binding Settings.Installed}" Padding="5,5,5,3" />
+                                      IsChecked="{Binding Settings.Installed}" Padding="5,5,5,3" Margin="0,5,0,0" />
             <local:FilterSelectorItem x:Name="FilterHidden" Text="Hidden" CountText="{Binding Path=Stats.Hidden, Mode=OneWay}"
-                                      IsChecked="{Binding Settings.Hidden}" Padding="5,0,5,3" />
-            <Separator/>
-            <TextBlock Text="Providers" FontSize="16" Foreground="LightGray" FontStyle="Italic" Margin="5" Padding="5,0,5,3"/>
-            <StackPanel>
-                <local:FilterSelectorItem x:Name="FilterSteam" IsChecked="{Binding Path=Settings.Providers[(playniteModels:Provider)Steam]}"
+                                      IsChecked="{Binding Settings.Hidden}" Padding="5,0,5,3" Margin="0,5,0,5"/>
+            <Border BorderThickness="0,1,0,0" BorderBrush="{StaticResource NormalBorderBrush}"/>            
+            <StackPanel Margin="0,3,0,0">
+                <local:FilterSelectorItem Text="Steam" x:Name="FilterSteam" IsChecked="{Binding Path=Settings.Providers[(playniteModels:Provider)Steam]}"
                                           CountText="{Binding Path=Stats.Steam, Mode=OneWay}"
-                                          Padding="5,0,5,3" Text="Steam"/>
-                <local:FilterSelectorItem x:Name="FilterGOG" IsChecked="{Binding Path=Settings.Providers[(playniteModels:Provider)GOG]}"
+                                          Padding="5,0,5,3" Margin="0,5,0,5"/>
+                <local:FilterSelectorItem Text="GOG" x:Name="FilterGOG" IsChecked="{Binding Path=Settings.Providers[(playniteModels:Provider)GOG]}"
                                           CountText="{Binding Path=Stats.GOG, Mode=OneWay}"
-                                          Padding="5,0,5,3" Text="GOG"/>
-                <local:FilterSelectorItem x:Name="FilterOrigin" IsChecked="{Binding Path=Settings.Providers[(playniteModels:Provider)Origin]}"
+                                          Padding="5,0,5,3" Margin="0,0,0,5" />
+                <local:FilterSelectorItem Text="Origin" x:Name="FilterOrigin" IsChecked="{Binding Path=Settings.Providers[(playniteModels:Provider)Origin]}"
                                           CountText="{Binding Path=Stats.Origin, Mode=OneWay}"
-                                          Padding="5,0,5,3" Text="Origin"/>
-                <local:FilterSelectorItem x:Name="FilterCustom" IsChecked="{Binding Path=Settings.Providers[(playniteModels:Provider)Custom]}"
+                                          Padding="5,0,5,3" Margin="0,0,0,5" />
+                <local:FilterSelectorItem Text="Custom" x:Name="FilterCustom" IsChecked="{Binding Path=Settings.Providers[(playniteModels:Provider)Custom]}"
                                           CountText="{Binding Path=Stats.Custom, Mode=OneWay}"
-                                          Padding="5,0,5,3" Text="Custom" />
+                                          Padding="5,0,5,3" Margin="0,0,0,5" />
             </StackPanel>
         </StackPanel>
     </Grid>
diff --git a/source/PlayniteUI/Controls/FilterSelectorItem.xaml b/source/PlayniteUI/Controls/FilterSelectorItem.xaml
index b2d1f1e94..17e501095 100644
--- a/source/PlayniteUI/Controls/FilterSelectorItem.xaml
+++ b/source/PlayniteUI/Controls/FilterSelectorItem.xaml
@@ -11,25 +11,26 @@
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
     </UserControl.Resources>
 
-    <Border CornerRadius="2" MouseUp="MainControl_MouseUp" Cursor="Hand" Name="BorderMain">
+    <Border CornerRadius="3" MouseUp="MainControl_MouseUp" Cursor="Hand" Name="BorderMain"
+            BorderThickness="2" BorderBrush="{StaticResource NormalBorderBrush}">
         <Border.Style>
             <Style TargetType="Border">
                 <Style.Triggers>
                     <DataTrigger Binding="{Binding IsChecked, RelativeSource={RelativeSource AncestorType=UserControl}}" Value="True">
-                        <Setter Property="Background" Value="{StaticResource NormalBrush}" />
+                        <Setter Property="Background" Value="{StaticResource PopupBorderBrush}" />
                     </DataTrigger>
                     <DataTrigger Binding="{Binding IsMouseOver, ElementName=BorderMain}" Value="True">
-                        <Setter Property="Background" Value="{StaticResource NormalBrush}" />
+                        <Setter Property="Background" Value="{StaticResource IndicatorBrush}" />
                     </DataTrigger>
                 </Style.Triggers>
             </Style>
         </Border.Style>
 
         <DockPanel LastChildFill="True" Margin="5">
-            <TextBlock Text="{Binding Text, RelativeSource={RelativeSource AncestorType=UserControl}}" DockPanel.Dock="Left" FontSize="16" VerticalAlignment="Center"/>
-            <TextBlock Text="(" DockPanel.Dock="Left" FontSize="16" VerticalAlignment="Center" Padding="5,0,0,0"/>
-            <TextBlock Text="{Binding CountText, RelativeSource={RelativeSource AncestorType=UserControl}}" DockPanel.Dock="Left" FontSize="16" VerticalAlignment="Center" />
-            <TextBlock Text=")" DockPanel.Dock="Left" FontSize="16" VerticalAlignment="Center" />
+            <Label Content="{Binding Text, RelativeSource={RelativeSource AncestorType=UserControl}}" DockPanel.Dock="Left" FontSize="16" VerticalAlignment="Center"/>
+            <Label Content=" (" DockPanel.Dock="Left" FontSize="16" VerticalAlignment="Center" Padding="5,0,0,0"/>
+            <Label Content="{Binding CountText, RelativeSource={RelativeSource AncestorType=UserControl}}" DockPanel.Dock="Left" VerticalAlignment="Center" />
+            <Label Content=")" DockPanel.Dock="Left" FontSize="16" VerticalAlignment="Center" HorizontalContentAlignment="Stretch" />
         </DockPanel>
     </Border>
 </UserControl>
diff --git a/source/PlayniteUI/Controls/GameDetails.xaml b/source/PlayniteUI/Controls/GameDetails.xaml
index a1dcb1218..df58129da 100644
--- a/source/PlayniteUI/Controls/GameDetails.xaml
+++ b/source/PlayniteUI/Controls/GameDetails.xaml
@@ -8,7 +8,7 @@
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:models="clr-namespace:Playnite.Models;assembly=Playnite"
              xmlns:playniteControls="clr-namespace:PlayniteUI.Controls"
-             mc:Ignorable="d" 
+             mc:Ignorable="d"
              d:DesignHeight="600" d:DesignWidth="600" DataContextChanged="UserControl_DataContextChanged">
 
     <UserControl.Resources>
@@ -25,7 +25,7 @@
             <BooleanToVisibilityConverter/>
         </local:ValueConverterGroup>
     </UserControl.Resources>
-    
+
     <Grid Visibility="{Binding ShowContent, RelativeSource={RelativeSource AncestorType=UserControl}, Converter={StaticResource BooleanToVisibilityConverter}, Mode=OneWay}">
         <Grid.Background>
             <ImageBrush Stretch="Uniform" AlignmentX="Center" AlignmentY="Top" RenderOptions.BitmapScalingMode="Fant"
@@ -45,7 +45,7 @@
                     </Image.Source>
                 </Image>
                 <TextBlock Text="{Binding Name, Mode=OneWay}" FontSize="20" Margin="10,10,0,10" TextWrapping="Wrap" DockPanel.Dock="Left"
-                           HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="White">
+                           HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="{StaticResource TextBrush}">
                     <TextBlock.Effect>
                         <DropShadowEffect ShadowDepth="3"/>
                     </TextBlock.Effect>
@@ -64,36 +64,40 @@
                                     Visibility="{Binding IsInstalled, Converter={StaticResource InvertableBooleanToVisibilityConverter}, ConverterParameter=Inverted}" />
                             </UserControl>
                         </StackPanel>
-                        <Button Name="ButtonSetupProgress" Width="100" Content="Setup Running..." Click="ButtonSetupProgress_Click"
+                        <Button Name="ButtonSetupProgress" Content="Setup Running..." Click="ButtonSetupProgress_Click"
                                 Visibility="{Binding IsSetupInProgress, Converter={StaticResource BooleanToVisibilityConverter}, Mode=OneWay}"/>
                         <Button Name="ButtonMore" Width="100" Margin="10, 0, 0, 0" Click="ButtonMore_Click" Content="More" />
                     </StackPanel>
                     <StackPanel  Orientation="Horizontal">
-                        <TextBlock Margin="0,5,5,5" Background="#66000000" Padding="5" Width="75" TextAlignment="Center"
+                        <TextBlock Margin="0,5,5,5" Background="#66000000" Padding="7" Width="75" TextAlignment="Center" VerticalAlignment="Center"
                                    Visibility="{Binding CommunityHubUrl, Converter={StaticResource StringNullOrEmptyToVisibilityConverter}}">                        
                             <Hyperlink Name="HyperlinkForum" Style="{DynamicResource DetailsHyperlink}" NavigateUri="{Binding CommunityHubUrl, TargetNullValue={x:Null}}"
-                                       TextDecorations="{x:Null}" RequestNavigate="Link_RequestNavigate">
+                                       RequestNavigate="Link_RequestNavigate">
                                 Forum
                             </Hyperlink>
                         </TextBlock>
-                        <TextBlock Margin="5" Background="#66000000" Padding="5" Width="75" TextAlignment="Center"
+                        <TextBlock Margin="5" Background="#66000000" Padding="7" Width="75" TextAlignment="Center" VerticalAlignment="Center"
                                    Visibility="{Binding StoreUrl, Converter={StaticResource StringNullOrEmptyToVisibilityConverter}}">  
                             <Hyperlink Name="HyperlinkStore" Style="{DynamicResource DetailsHyperlink}" NavigateUri="{Binding StoreUrl, TargetNullValue={x:Null}}"
-                                       TextDecorations="{x:Null}" RequestNavigate="Link_RequestNavigate">
+                                       RequestNavigate="Link_RequestNavigate">
                                 Store
                             </Hyperlink>
                         </TextBlock>
-                        <TextBlock Margin="5,5,0,5" Background="#66000000" Padding="5" Width="75" TextAlignment="Center"
+                        <TextBlock Margin="5,5,0,5" Background="#66000000" Padding="7" Width="75" TextAlignment="Center" VerticalAlignment="Center"
                                    Visibility="{Binding WikiUrl, Converter={StaticResource StringNullOrEmptyToVisibilityConverter}}">
                             <Hyperlink Name="HyperlinkWiki" Style="{DynamicResource DetailsHyperlink}" NavigateUri="{Binding WikiUrl, TargetNullValue={x:Null}}"
-                                       TextDecorations="{x:Null}" RequestNavigate="Link_RequestNavigate">
+                                       RequestNavigate="Link_RequestNavigate">
                                 Wiki
                             </Hyperlink>
                         </TextBlock>
                     </StackPanel>
                 </WrapPanel>
-            </DockPanel>            
-            <html:HtmlPanel Background="Transparent" Text="{Binding DescriptionView, Mode=OneWay}" Margin="10,20,0,0"/>
+            </DockPanel>
+            <ScrollViewer>
+                <html:HtmlPanel Background="Transparent" Text="{Binding DescriptionView, Mode=OneWay}" Margin="10,20,0,0" BorderThickness="0"
+                                ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                                ScrollViewer.VerticalScrollBarVisibility="Disabled"/>
+            </ScrollViewer>
         </DockPanel>
     </Grid>    
 </UserControl>
diff --git a/source/PlayniteUI/Controls/GameDetails.xaml.cs b/source/PlayniteUI/Controls/GameDetails.xaml.cs
index 91dafc44c..5a983a9e0 100644
--- a/source/PlayniteUI/Controls/GameDetails.xaml.cs
+++ b/source/PlayniteUI/Controls/GameDetails.xaml.cs
@@ -83,7 +83,25 @@ private void UserControl_DataContextChanged(object sender, DependencyPropertyCha
             if (e.NewValue != null)
             {
                 var game = (IGame)e.NewValue;
-                this.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString(Theme.BackgroundColors[game.Provider]));
+
+                switch (game.Provider)
+                {
+                    case Provider.Custom:
+                        Background = FindResource("ControlBackgroundBrush") as Brush;
+                        break;
+                    case Provider.GOG:
+                        Background = FindResource("GogGameBackgroundBrush") as Brush;
+                        break;
+                    case Provider.Origin:
+                        Background = FindResource("ControlBackgroundBrush") as Brush;
+                        break;
+                    case Provider.Steam:
+                        Background = FindResource("SteamGameBackgroundBrush") as Brush;
+                        break;
+                    default:
+                        Background = FindResource("ControlBackgroundBrush") as Brush;
+                        break;
+                }
             }
 
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("ShowContent"));
diff --git a/source/PlayniteUI/Controls/GamePopupMenu.xaml b/source/PlayniteUI/Controls/GamePopupMenu.xaml
index dc2313cba..daef73d6a 100644
--- a/source/PlayniteUI/Controls/GamePopupMenu.xaml
+++ b/source/PlayniteUI/Controls/GamePopupMenu.xaml
@@ -27,7 +27,7 @@
         </playniteUI:ValueConverterGroup>
     </Popup.Resources>
 
-    <ItemsControl Background="{StaticResource NormalBrushDark}" BorderBrush="{StaticResource NormalBorderBrush}" BorderThickness="2">
+    <ItemsControl Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupBorderBrush}" BorderThickness="{StaticResource PopupBorderThickness}">
         <UserControl Visibility="{Binding IsSetupInProgress, Converter={StaticResource InvertableBooleanToVisibilityConverter}, ConverterParameter=Inverted}">
             <StackPanel Visibility="{Binding RelativeSource={RelativeSource AncestorType=Popup}, Path=ShowPlayInstallButton, Converter={StaticResource BooleanToVisibilityConverter}}">
                 <MenuItem Header="Play" Click="Play_Click" FontWeight="Bold"
@@ -36,7 +36,7 @@
                     <MenuItem Header="Install" Click="Install_Click" FontWeight="Bold"
                                 Visibility="{Binding IsInstalled, Converter={StaticResource InvertableBooleanToVisibilityConverter}, ConverterParameter=Inverted}"/>
                 </UserControl>
-                <Separator Name="SeparatorPlayInstall"/>
+                <Separator Name="SeparatorPlayInstall" Margin="0,2,0,2" />
             </StackPanel>
         </UserControl>
         <ItemsControl ItemsSource="{Binding OtherTasks}">
@@ -46,7 +46,7 @@
                 </DataTemplate>
             </ItemsControl.ItemTemplate>
         </ItemsControl>
-        <Separator Name="SeparatorTasks"/>
+        <Separator Name="SeparatorTasks" Margin="0,2,0,2" />
 
         <MenuItem Header="Open Game Location" Click="OpenLocation_Click"
                   Visibility="{Binding IsInstalled, Converter={StaticResource BooleanToVisibilityConverter}}"/>
diff --git a/source/PlayniteUI/Controls/GamePopupMenuMulti.xaml b/source/PlayniteUI/Controls/GamePopupMenuMulti.xaml
index 11755d7c4..21a049bc4 100644
--- a/source/PlayniteUI/Controls/GamePopupMenuMulti.xaml
+++ b/source/PlayniteUI/Controls/GamePopupMenuMulti.xaml
@@ -12,7 +12,7 @@
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
     </Popup.Resources>
 
-    <ItemsControl Background="{StaticResource NormalBrushDark}" BorderBrush="{StaticResource NormalBorderBrush}" BorderThickness="2">
+    <ItemsControl Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupBorderBrush}" BorderThickness="{StaticResource PopupBorderThickness}">
         <MenuItem Header="Hide" Click="Hide_Click"
                   Visibility="{Binding ShowHideButton, RelativeSource={RelativeSource AncestorType=Popup}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
         <MenuItem Header="Show in Library" Click="UnHide_Click"
diff --git a/source/PlayniteUI/Controls/GameTaskView.xaml b/source/PlayniteUI/Controls/GameTaskView.xaml
index b3254bebe..bf67a6d58 100644
--- a/source/PlayniteUI/Controls/GameTaskView.xaml
+++ b/source/PlayniteUI/Controls/GameTaskView.xaml
@@ -5,12 +5,20 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:PlayniteUI"
              mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="300">
+             d:DesignWidth="300">
     <UserControl.Resources>
         <local:BidirectionalEnumAndNumberConverter x:Key="BidirectionalEnumAndNumberConverter" />
     </UserControl.Resources>
 
     <Grid>
+        <Grid.Resources>
+            <Style TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}" >
+                <Setter Property="Margin" Value="0,3,0,3" />
+            </Style>
+            <Style TargetType="Label" BasedOn="{StaticResource {x:Type Label}}" >
+                <Setter Property="VerticalAlignment" Value="Center" />
+            </Style>
+        </Grid.Resources>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="100"/>
             <ColumnDefinition Width="*"/>
@@ -23,26 +31,26 @@
             <RowDefinition Name="RowWorkingDir" Height="Auto"/>
         </Grid.RowDefinitions>
 
-        <TextBlock Text="Name" Grid.Column="0" Grid.Row="0" Margin="0,1,0,1"/>
-        <TextBox Name="TextName" Grid.Column="1" Grid.Row="0" Text="{Binding Name}" Margin="0,1,0,1"/>
+        <Label Content="Name" Grid.Column="0" Grid.Row="0"/>
+        <TextBox Name="TextName" Grid.Column="1" Grid.Row="0" Text="{Binding Name}"/>
 
-        <TextBlock Text="Type" Grid.Column="0" Grid.Row="1"  Margin="0,1,0,1"/>
-        <ComboBox Name="ComboType" Grid.Column="1" Grid.Row="1" SelectedIndex="{Binding Type, Converter={StaticResource BidirectionalEnumAndNumberConverter}}" Margin="0,1,0,1"
-                  SelectionChanged="ComboType_SelectionChanged">
+        <Label Content="Type" Grid.Column="0" Grid.Row="1"/>
+        <ComboBox Name="ComboType" Grid.Column="1" Grid.Row="1" SelectedIndex="{Binding Type, Converter={StaticResource BidirectionalEnumAndNumberConverter}}"
+                  SelectionChanged="ComboType_SelectionChanged" Margin="0,3,0,3">
             <ComboBoxItem Content="File" />
             <ComboBoxItem Content="URL" />
         </ComboBox>
 
-        <TextBlock Text="Path" Grid.Column="0" Grid.Row="2"  Margin="0,1,0,1"/>
-        <DockPanel Grid.Column="1" Grid.Row="2" LastChildFill="True" Margin="0,1,0,1">
-            <Button Name="ButtonBrowse" Content=". . ." Padding="5,0,5,0" DockPanel.Dock="Right" Click="ButtonBrowsePath_Click"/>
-            <TextBox Name="TextPath" Text="{Binding Path, UpdateSourceTrigger=PropertyChanged}" DockPanel.Dock="Right"/>
+        <Label Content="Path" Grid.Column="0" Grid.Row="2"/>
+        <DockPanel Grid.Column="1" Grid.Row="2" LastChildFill="True">
+            <Button Name="ButtonBrowse" Content="..." DockPanel.Dock="Right" Click="ButtonBrowsePath_Click" Padding="5,0,5,0" Margin="2"/>
+            <TextBox Name="TextPath" Text="{Binding Path, UpdateSourceTrigger=PropertyChanged}" DockPanel.Dock="Left"/>
         </DockPanel>
 
-        <TextBlock Text="Arguments" Grid.Column="0" Grid.Row="3" Margin="0,1,0,1" />
+        <Label Content="Arguments" Grid.Column="0" Grid.Row="3" />
         <TextBox Name="TextArguments" Grid.Column="1" Grid.Row="3" Text="{Binding Arguments}" Margin="0,1,0,1"/>
 
-        <TextBlock Text="WorkingDir" Grid.Column="0" Grid.Row="4" Margin="0,1,0,1"/>
+        <Label Content="WorkingDir" Grid.Column="0" Grid.Row="4"/>
         <TextBox Name="TextWorkDir" Grid.Column="1" Grid.Row="4" Text="{Binding WorkingDir}" Margin="0,1,0,1"/>
     </Grid>
 </UserControl>
diff --git a/source/PlayniteUI/Controls/GamesGridView.xaml b/source/PlayniteUI/Controls/GamesGridView.xaml
index 5147ca12e..bb24c8151 100644
--- a/source/PlayniteUI/Controls/GamesGridView.xaml
+++ b/source/PlayniteUI/Controls/GamesGridView.xaml
@@ -16,6 +16,10 @@
         <local:BoolToAutoWidthConverter x:Key="BoolToAutoWidthConverter" />        
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
         <local:InvertableBooleanToVisibilityConverter x:Key="InvertableBooleanToVisibilityConverter" />
+
+        <Style x:Key="TextItemStyle" BasedOn="{StaticResource {x:Type TextBlock}}" TargetType="TextBlock">
+            <Setter Property="Margin" Value="0,5,0,5" />
+        </Style>
     </UserControl.Resources>
 
     <Grid>
@@ -27,9 +31,9 @@
                 <Style TargetType="{x:Type ListViewItem}" BasedOn="{StaticResource {x:Type ListViewItem}}">
                     <EventSetter Event="MouseRightButtonUp" Handler="Grid_MouseRightButtonUp" />
                     <EventSetter Event="MouseDoubleClick" Handler="Grid_MouseDoubleClick" />
+                    <Setter Property="FontSize" Value="12" />
                 </Style>
             </ListView.ItemContainerStyle>
-
             <ListView.GroupStyle>
                 <GroupStyle>
                     <GroupStyle.ContainerStyle>
@@ -37,7 +41,7 @@
                             <Setter Property="Template">
                                 <Setter.Value>
                                     <ControlTemplate>
-                                        <Expander Header="{Binding Name, TargetNullValue=None}" IsExpanded="True" Margin="3">
+                                        <Expander Header="{Binding Name, TargetNullValue='None'}" IsExpanded="True">
                                             <ItemsPresenter />
                                         </Expander>
                                     </ControlTemplate>
@@ -55,7 +59,6 @@
                             <EventSetter Event="Loaded" Handler="GridViewColumnHeader_Loaded" />
                         </Style>                        
                     </GridView.ColumnHeaderContainerStyle>
-                    
                     <GridView.ColumnHeaderContextMenu>
                         <ContextMenu Name="HeaderMenu">
                             <MenuItem Header="Icon"
@@ -110,7 +113,7 @@
                         </GridViewColumn.Header>
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
-                                <TextBlock Text="{Binding Name, Mode=OneWay}" Padding="0,5,0,5" />
+                                <TextBlock Text="{Binding Name, Mode=OneWay}" Style="{StaticResource TextItemStyle}"/>
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
@@ -120,7 +123,7 @@
                         </GridViewColumn.Header>
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
-                                <TextBlock Text="{Binding Developers, Mode=OneWay, Converter={StaticResource ListToStringConverter}}" Padding="0,5,0,5"/>
+                                <TextBlock Text="{Binding Developers, Mode=OneWay, Converter={StaticResource ListToStringConverter}}" />
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
@@ -130,7 +133,7 @@
                         </GridViewColumn.Header>
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
-                                <TextBlock Text="{Binding Publishers, Mode=OneWay, Converter={StaticResource ListToStringConverter}}" Padding="0,5,0,5"/>
+                                <TextBlock Text="{Binding Publishers, Mode=OneWay, Converter={StaticResource ListToStringConverter}}" />
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
@@ -140,7 +143,7 @@
                         </GridViewColumn.Header>
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
-                                <TextBlock Text="{Binding ReleaseDate, Mode=OneWay, Converter={StaticResource NullableDateToStringConverter}}" Padding="0,5,0,5"/>
+                                <TextBlock Text="{Binding ReleaseDate, Mode=OneWay, Converter={StaticResource NullableDateToStringConverter}}" />
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
@@ -150,7 +153,7 @@
                         </GridViewColumn.Header>
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
-                                <TextBlock Text="{Binding Genres, Mode=OneWay, Converter={StaticResource ListToStringConverter}}" Padding="0,5,0,5"/>
+                                <TextBlock Text="{Binding Genres, Mode=OneWay, Converter={StaticResource ListToStringConverter}}" />
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
@@ -160,7 +163,7 @@
                         </GridViewColumn.Header>
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
-                                <TextBlock Text="{Binding LastActivity, Mode=OneWay, Converter={StaticResource NullableDateToStringConverter}}" Padding="0,5,0,5"/>
+                                <TextBlock Text="{Binding LastActivity, Mode=OneWay, Converter={StaticResource NullableDateToStringConverter}}" />
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
@@ -170,7 +173,7 @@
                         </GridViewColumn.Header>
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
-                                <TextBlock Text="{Binding Categories, Mode=OneWay, Converter={StaticResource ListToStringConverter}}" Padding="0,5,0,5"/>
+                                <TextBlock Text="{Binding Categories, Mode=OneWay, Converter={StaticResource ListToStringConverter}}" />
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
@@ -180,7 +183,7 @@
                         </GridViewColumn.Header>
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
-                                <TextBlock Text="{Binding StoreUrl, Mode=OneWay}" Padding="0,5,0,5"/>
+                                <TextBlock Text="{Binding StoreUrl, Mode=OneWay}" />
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
@@ -190,7 +193,7 @@
                         </GridViewColumn.Header>
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
-                                <TextBlock Text="{Binding WikiUrl, Mode=OneWay}" Padding="0,5,0,5"/>
+                                <TextBlock Text="{Binding WikiUrl, Mode=OneWay}" />
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
@@ -200,7 +203,7 @@
                         </GridViewColumn.Header>
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
-                                <TextBlock Text="{Binding CommunityHubUrl, Mode=OneWay}" Padding="0,5,0,5"/>
+                                <TextBlock Text="{Binding CommunityHubUrl, Mode=OneWay}" />
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
@@ -210,7 +213,7 @@
                         </GridViewColumn.Header>
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
-                                <TextBlock Text="{Binding IsInstalled, Mode=OneWay, Converter={StaticResource BoolToYesNoConverter}}" Padding="0,5,0,5"/>
+                                <TextBlock Text="{Binding IsInstalled, Mode=OneWay, Converter={StaticResource BoolToYesNoConverter}}" />
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
@@ -220,7 +223,7 @@
                         </GridViewColumn.Header>
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
-                                <TextBlock Text="{Binding InstallDirectory, Mode=OneWay}" Padding="0,5,0,5"/>
+                                <TextBlock Text="{Binding InstallDirectory, Mode=OneWay}" />
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
diff --git a/source/PlayniteUI/Controls/GamesGridView.xaml.cs b/source/PlayniteUI/Controls/GamesGridView.xaml.cs
index 096a9d780..45391c663 100644
--- a/source/PlayniteUI/Controls/GamesGridView.xaml.cs
+++ b/source/PlayniteUI/Controls/GamesGridView.xaml.cs
@@ -48,7 +48,7 @@ private void Grid_MouseRightButtonUp(object sender, MouseButtonEventArgs e)
                 PopupGameMulti.DataContext = GridGames.SelectedItems.Cast<IGame>().ToList();
                 PopupGameMulti.IsOpen = true;
             }
-            else
+            else if (GridGames.SelectedItems.Count == 1)
             {
                 var game = GridGames.SelectedItem as IGame;
                 PopupGame.DataContext = game;
diff --git a/source/PlayniteUI/Controls/GamesImagesView.xaml b/source/PlayniteUI/Controls/GamesImagesView.xaml
index 658933906..7e013cbd2 100644
--- a/source/PlayniteUI/Controls/GamesImagesView.xaml
+++ b/source/PlayniteUI/Controls/GamesImagesView.xaml
@@ -32,13 +32,15 @@
         <CommandBinding Command="{x:Static commands:GenericCommands.ZoomOutCmd}" Executed="ZoomOut_Executed" />
     </UserControl.CommandBindings>
 
-    <Grid Background="#222222">
+    <Grid Background="{StaticResource NormalBrushDark}">
         <DockPanel>
-            <DockPanel DockPanel.Dock="Top" LastChildFill="False" Margin="4,4,25,6">
-                <Slider Name="SliderZoom" SmallChange="1" Value="180" Maximum="260" Minimum="100"
-                        IsSnapToTickEnabled="True" Width="150" DockPanel.Dock="Right" VerticalAlignment="Center"/>
-                <TextBlock Text="Zoom" DockPanel.Dock="Right" Margin="0,0,10,0"/>
-            </DockPanel>
+            <Border BorderThickness="0,1,0,0" BorderBrush="{StaticResource NormalBorderBrush}" DockPanel.Dock="Bottom">
+                <StackPanel Margin="5" Orientation="Horizontal">
+                    <Label Content="Zoom" DockPanel.Dock="Right" Margin="10,0,10,0"/>
+                    <Slider Name="SliderZoom" SmallChange="1" Value="180" Maximum="260" Minimum="100"
+                            IsSnapToTickEnabled="True" Width="150" DockPanel.Dock="Right" VerticalAlignment="Center"/>
+                </StackPanel>
+            </Border>
             <Grid DockPanel.Dock="Top">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*"/>
@@ -74,7 +76,7 @@
                                         <Setter Property="Template">
                                             <Setter.Value>
                                                 <ControlTemplate TargetType="GroupItem">
-                                                    <Expander Header="{Binding Name, TargetNullValue=None}" IsExpanded="true" Padding="5" FontSize="16" BorderThickness="0,0,0,1" BorderBrush="Gray">
+                                                    <Expander Header="{Binding Name, TargetNullValue='None'}" IsExpanded="true">
                                                         <ItemsPresenter />
                                                     </Expander>
                                                 </ControlTemplate>
@@ -95,7 +97,7 @@
                                                     <Setter Property="Border.BorderBrush" Value="Transparent"/>
                                                 </Trigger>
                                                 <Trigger Property="Border.IsMouseOver" Value="True">
-                                                    <Setter Property="Border.BorderBrush" Value="LightBlue"/>
+                                                    <Setter Property="Border.BorderBrush" Value="{StaticResource IndicatorBrush}"/>
                                                 </Trigger>
                                             </Style.Triggers>
                                         </Style>
@@ -104,7 +106,7 @@
                                     <Image RenderOptions.BitmapScalingMode="Fant" Width="{Binding Path=Value, ElementName=SliderZoom}"
                                            Name="ImageViewImage" StretchDirection="Both"
                                            MouseLeftButtonUp="ImageGrid_MouseLeftButtonUp"
-                                           AutomationProperties.HelpText="{Binding Image}"
+                                           AutomationProperties.HelpText="{Binding Image, TargetNullValue=''}"
                                            AutomationProperties.Name="{Binding Name}">                                        
                                         <Image.Source>
                                             <PriorityBinding>
@@ -119,9 +121,9 @@
                     </ItemsControl>
                 </ScrollViewer>
 
-                <GridSplitter Grid.Column="1" Width="4" HorizontalAlignment="Stretch"/>
+                <GridSplitter Grid.Column="1" Width="4" HorizontalAlignment="Stretch" Background="{StaticResource NormalBorderBrush}"/>
                 
-                <Grid DockPanel.Dock="Right" Grid.Column="2">
+                <Grid Grid.Column="2">
                     <playniteUI:GameDetails x:Name="GameDetails"/>
                     <Image Name="ImageCloseDetails" Source="/Images/close.png" Width="28" Margin="10" Cursor="Hand"
                            VerticalAlignment="Top" HorizontalAlignment="Right"
diff --git a/source/PlayniteUI/Controls/GamesListView.xaml b/source/PlayniteUI/Controls/GamesListView.xaml
index c9715c275..0c1516ef6 100644
--- a/source/PlayniteUI/Controls/GamesListView.xaml
+++ b/source/PlayniteUI/Controls/GamesListView.xaml
@@ -25,9 +25,9 @@
             <playniteControls:GamePopupMenu x:Name="PopupGame" StaysOpen="False" Placement="MousePoint"
                                             AutomationProperties.AutomationId="MenuGameMulti"/>
 
-            <ListBox Name="ListGames" SelectionMode="Extended"
-                     SelectionChanged="GamesListList_SelectionChanged"
-                     DockPanel.Dock="Left" Width="310" ScrollViewer.HorizontalScrollBarVisibility="Hidden" BorderThickness="0" >
+            <ListBox Name="ListGames" SelectionMode="Extended" BorderThickness="0,0,1,0" BorderBrush="{StaticResource NormalBorderBrush}"
+                     SelectionChanged="GamesListList_SelectionChanged" Width="310"
+                     DockPanel.Dock="Left" ScrollViewer.HorizontalScrollBarVisibility="Hidden">
                 <ListBox.ItemContainerStyle>
                     <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource {x:Type ListBoxItem}}">
                         <EventSetter Event="MouseRightButtonUp" Handler="ListItem_MouseRightButtonUp" />
@@ -41,7 +41,7 @@
                                 <Setter Property="Template">
                                     <Setter.Value>
                                         <ControlTemplate>
-                                            <Expander Header="{Binding Name, TargetNullValue=None}" IsExpanded="True">
+                                            <Expander Header="{Binding Name, TargetNullValue='None'}" IsExpanded="True">
                                                 <ItemsPresenter />
                                             </Expander>
                                         </ControlTemplate>
@@ -53,22 +53,18 @@
                 </ListBox.GroupStyle>
                 <ListBox.ItemTemplate>
                     <DataTemplate>
-                        <Border Background="Transparent" Width="285">
-                            <DockPanel LastChildFill="True">
-                                <Image Height="32" DockPanel.Dock="Left" RenderOptions.BitmapScalingMode="HighQuality">
-                                    <Image.Source>
-                                        <PriorityBinding>
-                                            <Binding Path="Icon" IsAsync="True" Mode="OneWay" Converter="{StaticResource LiteDBImageToImageConverter}" ConverterParameter="Icon"/>
-                                            <Binding Path="DefaultIcon" Mode="OneTime"/>
-                                        </PriorityBinding>
-                                    </Image.Source>
-                                </Image>
-                                <Border DockPanel.Dock="Left" Height="32" Margin="5,0,0,0">
-                                    <TextBlock Text="{Binding Name, Mode=OneWay}" TextTrimming="CharacterEllipsis"
-                                               TextAlignment="Left" VerticalAlignment="Center" FontSize="12"/>
-                                </Border>
-                            </DockPanel>
-                        </Border>
+                        <DockPanel Margin="3">
+                            <Image Height="32" RenderOptions.BitmapScalingMode="HighQuality" DockPanel.Dock="Left">
+                                <Image.Source>
+                                    <PriorityBinding>
+                                        <Binding Path="Icon" IsAsync="True" Mode="OneWay" Converter="{StaticResource LiteDBImageToImageConverter}" ConverterParameter="Icon"/>
+                                        <Binding Path="DefaultIcon" Mode="OneTime"/>
+                                    </PriorityBinding>
+                                </Image.Source>
+                            </Image>                                
+                            <TextBlock Text="{Binding Name, Mode=OneWay}" TextTrimming="CharacterEllipsis" Foreground="{StaticResource TextBrush}"
+                                       Margin="8,0,0,0" VerticalAlignment="Center" DockPanel.Dock="Left" />
+                        </DockPanel>
                     </DataTemplate>
                 </ListBox.ItemTemplate>
             </ListBox>
diff --git a/source/PlayniteUI/Controls/GamesListView.xaml.cs b/source/PlayniteUI/Controls/GamesListView.xaml.cs
index 11920bb33..667de97e1 100644
--- a/source/PlayniteUI/Controls/GamesListView.xaml.cs
+++ b/source/PlayniteUI/Controls/GamesListView.xaml.cs
@@ -113,7 +113,7 @@ private void ListItem_MouseRightButtonUp(object sender, MouseButtonEventArgs e)
                 PopupGameMulti.DataContext = ListGames.SelectedItems.Cast<IGame>().ToList();
                 PopupGameMulti.IsOpen = true;
             }
-            else
+            else if (ListGames.SelectedItems.Count == 1)
             {
                 var game = ListGames.SelectedItem as IGame;
                 PopupGame.DataContext = game;
diff --git a/source/PlayniteUI/Controls/ProgressControl.xaml b/source/PlayniteUI/Controls/ProgressControl.xaml
index 13be5d571..a8760a547 100644
--- a/source/PlayniteUI/Controls/ProgressControl.xaml
+++ b/source/PlayniteUI/Controls/ProgressControl.xaml
@@ -8,7 +8,7 @@
              d:DesignHeight="35" d:DesignWidth="300">
     <Grid>
         <ProgressBar Name="ProgressBarBar" />
-        <TextBlock Name="TextProgressDescription" Margin="10,0,0,0"
+        <TextBlock Name="TextProgressDescription" Margin="10,0,0,0" Foreground="{StaticResource TextBrush}"
                    VerticalAlignment="Center" HorizontalAlignment="Center" />
     </Grid>
 </UserControl>
diff --git a/source/PlayniteUI/Controls/SearchBox.xaml b/source/PlayniteUI/Controls/SearchBox.xaml
index 945818445..e11973dd9 100644
--- a/source/PlayniteUI/Controls/SearchBox.xaml
+++ b/source/PlayniteUI/Controls/SearchBox.xaml
@@ -4,16 +4,17 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:PlayniteUI.Controls"
-             mc:Ignorable="d" 
-             BorderThickness="1"
+             mc:Ignorable="d"              
              d:DesignHeight="60" d:DesignWidth="300">
 
-    <DockPanel Background="{StaticResource ControlBackgroundBrush}">
-        <Image Source="/Images/searchicon.png" DockPanel.Dock="Left" RenderOptions.BitmapScalingMode="Fant"/>        
-        <Image Source="/Images/clear.png" Name="ImageClear" DockPanel.Dock="Right" RenderOptions.BitmapScalingMode="Fant"
-               MouseUp="clearImage_MouseUp" Margin="0,0,4,0" Visibility="Hidden"/>
-        <TextBox Name="TextFilter" BorderThickness="0" VerticalContentAlignment="Center" FontSize="14"                 
-                 Text="{Binding Text, RelativeSource={RelativeSource AncestorType=UserControl}, UpdateSourceTrigger=PropertyChanged}"
-                 TextChanged="TextFilter_TextChanged"/>
-    </DockPanel>
+    <Border BorderThickness="2" CornerRadius="2" Background="Transparent" Style="{StaticResource HighlightBorder}">
+        <DockPanel Background="{StaticResource ControlBackgroundBrush}" Name="dock">
+            <Image Source="/Images/searchicon.png" DockPanel.Dock="Left" RenderOptions.BitmapScalingMode="Fant"/>
+            <Image Source="/Images/clear.png" Name="ImageClear" DockPanel.Dock="Right" RenderOptions.BitmapScalingMode="Fant"
+                   MouseUp="ClearImage_MouseUp" Margin="0,0,4,0" Visibility="Hidden"/>
+            <TextBox Name="TextFilter" BorderThickness="0" VerticalContentAlignment="Center" FontSize="14"                 
+                     Text="{Binding Text, RelativeSource={RelativeSource AncestorType=UserControl}, UpdateSourceTrigger=PropertyChanged}"
+                     TextChanged="TextFilter_TextChanged" Foreground="{StaticResource TextBrush}"/>
+        </DockPanel>
+    </Border>
 </UserControl>
diff --git a/source/PlayniteUI/Controls/SearchBox.xaml.cs b/source/PlayniteUI/Controls/SearchBox.xaml.cs
index 69d046582..419f953b6 100644
--- a/source/PlayniteUI/Controls/SearchBox.xaml.cs
+++ b/source/PlayniteUI/Controls/SearchBox.xaml.cs
@@ -44,7 +44,7 @@ public SearchBox()
             InitializeComponent();
         }
 
-        private void clearImage_MouseUp(object sender, MouseButtonEventArgs e)
+        private void ClearImage_MouseUp(object sender, MouseButtonEventArgs e)
         {
             Text = string.Empty;
         }
diff --git a/source/PlayniteUI/Converters/ListToStringConverter.cs b/source/PlayniteUI/Converters/ListToStringConverter.cs
index 9203e6d92..7b8fcb030 100644
--- a/source/PlayniteUI/Converters/ListToStringConverter.cs
+++ b/source/PlayniteUI/Converters/ListToStringConverter.cs
@@ -11,11 +11,6 @@ public class ListToStringConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
-            if (targetType != typeof(string))
-            {
-                throw new InvalidOperationException("The target must be a String");
-            }
-
             if (value == null)
             {
                 return string.Empty;
diff --git a/source/PlayniteUI/Theme.xaml b/source/PlayniteUI/Theme.xaml
index 398e62207..f8fb7d2ae 100644
--- a/source/PlayniteUI/Theme.xaml
+++ b/source/PlayniteUI/Theme.xaml
@@ -11,30 +11,94 @@
   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
   xmlns:controls="clr-namespace:PlayniteUI.Controls"
   mc:Ignorable="d"
-  xmlns:d="http://schemas.microsoft.com/expression/blend/2008">
+  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
     
     <!-- Main Colors -->
 
-    <Color x:Key="MainColor">#FF595959</Color>
-    <Color x:Key="MainColorDark">#222222</Color>
-    <Color x:Key="HoverColor">#FF393939</Color>
+
+    <!--<Color x:Key="TextColor">#D8DBE2</Color>
+    <Color x:Key="TextColorDark">#FFFCF2</Color>
+    <Color x:Key="MainColorLight">#A9BCD0</Color>
+    <Color x:Key="MainColor">#373F51</Color>
+    <Color x:Key="MainColorDark">#1B1B1E</Color>
+    <Color x:Key="HoverColor">#247BA0</Color>
+    <Color x:Key="DefaultColor">#FF9BB1C5</Color>
+    <Color x:Key="IndicatorColor">#58A4B0</Color>
+    <Color x:Key="PopupBackgroundColor">#252422</Color>
+    <Color x:Key="PopupBorderColor">#75290b</Color>-->
+
+    <!--<Color x:Key="TextColor">#D8DBE2</Color>
+    <Color x:Key="TextColorDark">#FFFCF2</Color>
+    <Color x:Key="MainColorLight">#A9BCD0</Color>
+    <Color x:Key="MainColor">#373F51</Color>
+    <Color x:Key="MainColorDark">#1B1B1E</Color>
+    <Color x:Key="HoverColor">#247BA0</Color>
+    <Color x:Key="DefaultColor">#FF9BB1C5</Color>
+    <Color x:Key="IndicatorColor">#58A4B0</Color>
+    <Color x:Key="PopupBackgroundColor">#252422</Color>
+    <Color x:Key="PopupBorderColor">#75290b</Color>-->
+
+    <!--<Color x:Key="TextColor">#FFFCF2</Color>
+    <Color x:Key="TextColorDark">#FFFCF2</Color>
+    <Color x:Key="MainColorLight">#007EA7</Color>
+    <Color x:Key="MainColor">#003459</Color>
+    <Color x:Key="MainColorDark">#00171F</Color>
+    <Color x:Key="HoverColor">#247BA0</Color>
+    <Color x:Key="DefaultColor">#FF9BB1C5</Color>
+    <Color x:Key="IndicatorColor">#00A8E8</Color>
+    <Color x:Key="PopupBackgroundColor">#252422</Color>
+    <Color x:Key="PopupBorderColor">#75290b</Color>-->
+
+    <Color x:Key="TextColor">#f2f2f2</Color>
+    <Color x:Key="TextColorDark">#FFFCF2</Color>
+    <Color x:Key="MainColorLight">#CCC5B9</Color>
+    <Color x:Key="MainColor">#403D39</Color>
+    <Color x:Key="MainColorDark">#252422</Color>
+    <Color x:Key="HoverColor">#247BA0</Color>
     <Color x:Key="DefaultColor">#FF9BB1C5</Color>
+    <Color x:Key="IndicatorColor">#019fcb</Color>
+    <Color x:Key="PopupBackgroundColor">#252422</Color>
+    <Color x:Key="PopupBorderColor">#006b99</Color>
+    
     <SolidColorBrush x:Key="LightBrush" Color="#FF333333" />
     <SolidColorBrush x:Key="ShadeBrush" Color="#FF434343" />
+    <SolidColorBrush x:Key="ControlBackgroundBrush" Color="{StaticResource MainColorDark}" />
 
-    <Color x:Key="TopGradientSelectColor">#FFFFFFFF</Color>
-    <Color x:Key="BottomGradientSelectColor">#FF737373</Color>
+    <DynamicResource x:Key="TopGradientSelectColor" ResourceKey="IndicatorColor" />
+    <DynamicResource x:Key="BottomGradientSelectColor" ResourceKey="IndicatorColor" />
 
     <Color x:Key="BlackColor">#FF000000</Color>
     <Color x:Key="WhiteColor">#FFFFFFFF</Color>
 
-    <SolidColorBrush x:Key="TextBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="TextBrush" Color="{StaticResource TextColor}" />
+    <SolidColorBrush x:Key="TextBrushDark" Color="{StaticResource TextColorDark}" />
+    <SolidColorBrush x:Key="NormalBrushLight" Color="{StaticResource MainColorLight}" />
     <SolidColorBrush x:Key="NormalBrush" Color="{StaticResource MainColor}" />
     <SolidColorBrush x:Key="NormalBrushDark" Color="{StaticResource MainColorDark}" />
-    <SolidColorBrush x:Key="NormalBorderBrush" Color="#FF333333" />
-    <SolidColorBrush x:Key="HoverBrush" Color="{StaticResource HoverColor}" />
-    <SolidColorBrush x:Key="GlyphBrush" Color="#FFD1D1D1" />
+    <SolidColorBrush x:Key="NormalBorderBrush" Color="{StaticResource MainColor}" />
+    <SolidColorBrush x:Key="HoverBrush" Color="{StaticResource IndicatorColor}" />
+    <SolidColorBrush x:Key="GlyphBrush" Color="{StaticResource IndicatorColor}" />
+    <SolidColorBrush x:Key="IndicatorBrush" Color="{StaticResource IndicatorColor}" />
+    <SolidColorBrush x:Key="PopupBackgroundBrush" Color="{StaticResource PopupBackgroundColor}" />
+    <SolidColorBrush x:Key="PopupBorderBrush" Color="{StaticResource PopupBorderColor}" />
+    
+    <Thickness x:Key="PopupBorderThickness">2</Thickness>
+
+    <Style x:Key="BaseStyle" TargetType="Control">
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="FontFamily" Value="Trebuchet MS" />
+    </Style>
+
+    <Style x:Key="BaseTextBlockStyle" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="FontFamily" Value="Trebuchet MS" />
+        <Setter Property="Foreground" Value="{StaticResource TextBrush}" />
+    </Style>
+
+    <SolidColorBrush x:Key="SteamGameBackgroundBrush" Color="#1B2838" />
+    <SolidColorBrush x:Key="GogGameBackgroundBrush" Color="#CCCCCC" />
 
     <LinearGradientBrush x:Key="SpecialBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
         <GradientStop Color="#a2ca2b" Offset="0" />
@@ -60,9 +124,6 @@
         <GradientStop Color="#444" Offset="0.0" />
         <GradientStop Color="#888" Offset="1.0" />
     </LinearGradientBrush>
-    
-
-    <SolidColorBrush x:Key="ControlBackgroundBrush" Color="#FF333333" />
 
     <LinearGradientBrush x:Key="SelectedBackgroundBrush" EndPoint="0.5,1" StartPoint="0.5,0">
         <GradientStop Color="{StaticResource BottomGradientSelectColor}" Offset="0" />
@@ -82,8 +143,8 @@
     </LinearGradientBrush>
     
     <LinearGradientBrush x:Key="ShineBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
-        <GradientStop Color="#59FFFFFF" Offset="0" />
-        <GradientStop Color="#00FFFFFF" Offset="1" />
+        <GradientStop Color="{DynamicResource IndicatorColor}" Offset="0" />
+        <GradientStop Color="{DynamicResource MainColor}" Offset="1" />
     </LinearGradientBrush>
 
     <LinearGradientBrush x:Key="HoverShineBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
@@ -111,206 +172,66 @@
         </Setter>
     </Style>
 
-    <Style x:Key="PlayButton" TargetType="{x:Type Button}" BasedOn="{x:Null}">
-        <Setter Property="Background" Value="{DynamicResource SpecialBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
-        <Setter Property="Template" Value="{DynamicResource SpecialButtonTemplate}" />
-    </Style>
-
-    <ControlTemplate x:Key="SpecialButtonTemplate" TargetType="{x:Type Button}">
-        <ControlTemplate.Resources>
-            <Storyboard x:Key="HoverOn">
-                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverShineBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-                    <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1" />
-                </DoubleAnimationUsingKeyFrames>
-                <!--<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-                    <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1" />
-                </DoubleAnimationUsingKeyFrames>-->
-
-            </Storyboard>
-            <Storyboard x:Key="HoverOff">
-                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverShineBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-                    <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0" />
-                </DoubleAnimationUsingKeyFrames>
-                <!--<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-                    <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0" />
-                </DoubleAnimationUsingKeyFrames>-->
-
-            </Storyboard>
-            <Storyboard x:Key="PressedOn">
-
-                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="PressedBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-                    <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1" />
-                </DoubleAnimationUsingKeyFrames>
-
-            </Storyboard>
-            <Storyboard x:Key="PressedOff">
-
-                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="PressedBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-                    <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0" />
-                </DoubleAnimationUsingKeyFrames>
-
-            </Storyboard>
-            <Storyboard x:Key="FocusedOn">
-                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="FocusVisualElement" Storyboard.TargetProperty="(UIElement.Opacity)">
-                    <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1" />
-                </DoubleAnimationUsingKeyFrames>
-            </Storyboard>
-            <Storyboard x:Key="FocussedOff">
-                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="FocusVisualElement" Storyboard.TargetProperty="(UIElement.Opacity)">
-                    <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0" />
-                </DoubleAnimationUsingKeyFrames>
-            </Storyboard>
-
-        </ControlTemplate.Resources>
-        <Grid x:Name="Grid">
-            <Border x:Name="Background" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" CornerRadius="3"/>
-            <Border x:Name="HoverBorder" Opacity="0" Background="{StaticResource HoverBrush}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0" CornerRadius="3" />
-            <Border x:Name="HoverShineBorder" Opacity="0" Background="{StaticResource SpecialHoverShineBrush}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" CornerRadius="3"/>
-            <Border x:Name="PressedBorder" Opacity="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1"  Background="{StaticResource SpecialPressedBrush}" CornerRadius="3"/>
-            <Border x:Name="ShineBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1"  Background="{StaticResource SpecialShineBrush}" Opacity="1" CornerRadius="3"/>
-            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" />
-            <Border x:Name="FocusVisualElement" IsHitTestVisible="false" BorderBrush="{StaticResource HoverShineBrush}" BorderThickness="1" Margin="1,1,1,1" Opacity="0" />
-        </Grid>
-        <ControlTemplate.Triggers>
-            <Trigger Property="IsDefault" Value="True">
-                <Setter Property="BorderBrush" TargetName="ShineBorder" Value="{DynamicResource DefaultedBorderBrush}" />
-            </Trigger>
-            <Trigger Property="IsKeyboardFocused" Value="true">
-                <Trigger.ExitActions>
-                    <BeginStoryboard Storyboard="{StaticResource FocussedOff}" x:Name="FocussedOff_BeginStoryboard" />
-                </Trigger.ExitActions>
-                <Trigger.EnterActions>
-                    <BeginStoryboard Storyboard="{StaticResource FocusedOn}" x:Name="FocusedOn_BeginStoryboard" />
-                </Trigger.EnterActions>
-
-            </Trigger>
+    <Style TargetType="{x:Type Button}" BasedOn="{StaticResource BaseStyle}">
+        <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource IndicatorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}" />
+        <Setter Property="BorderThickness" Value="2" />
+        <Setter Property="Padding" Value="10,5,10,5" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Grid x:Name="Grid">
+                        <Border x:Name="DefaultBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"  Background="{TemplateBinding Background}" Opacity="1" CornerRadius="3"/>
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" />                        
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="true">
-                <Trigger.ExitActions>
-                    <BeginStoryboard Storyboard="{StaticResource HoverOff}" x:Name="HoverOff_BeginStoryboard" />
-                </Trigger.ExitActions>
-                <Trigger.EnterActions>
-                    <BeginStoryboard Storyboard="{StaticResource HoverOn}" />
-                </Trigger.EnterActions>
-
+                <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource HoverBrush}" />
             </Trigger>
-            <Trigger Property="IsPressed" Value="true">
-                <Trigger.ExitActions>
-                    <BeginStoryboard Storyboard="{StaticResource PressedOff}" />
-                </Trigger.ExitActions>
-                <Trigger.EnterActions>
-                    <BeginStoryboard Storyboard="{StaticResource PressedOn}" />
-                </Trigger.EnterActions>
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="true" />
-            <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Background" Value="{DynamicResource DisabledBackgroundBrush}" TargetName="Background" />
-                <Setter Property="BorderBrush" Value="{DynamicResource DisabledBorderBrush}" TargetName="ShineBorder" />
-                <Setter Property="Opacity" TargetName="Grid" Value="0.5" />
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Opacity" Value="0.5" />
             </Trigger>
-        </ControlTemplate.Triggers>
-    </ControlTemplate>
+        </Style.Triggers>
+    </Style>
 
-    <Style TargetType="{x:Type Button}" BasedOn="{x:Null}">
-        <Setter Property="Background" Value="{DynamicResource NormalBrush}" />
+    <Style x:Key="PlayButton" TargetType="{x:Type Button}" BasedOn="{StaticResource BaseStyle}">
+        <Setter Property="Background" Value="{DynamicResource IndicatorBrush}" />
         <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}" />
-        <Setter Property="Template" Value="{DynamicResource ButtonTemplate}" />
-   </Style>
-
-    <ControlTemplate x:Key="ButtonTemplate" TargetType="{x:Type Button}">
-        <ControlTemplate.Resources>
-            <Storyboard x:Key="HoverOn">
-                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverShineBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-                    <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1" />
-                </DoubleAnimationUsingKeyFrames>
-                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-                    <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1" />
-                </DoubleAnimationUsingKeyFrames>
-
-            </Storyboard>
-            <Storyboard x:Key="HoverOff">
-                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverShineBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-                    <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0" />
-                </DoubleAnimationUsingKeyFrames>
-                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-                    <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0" />
-                </DoubleAnimationUsingKeyFrames>
-
-            </Storyboard>
-            <Storyboard x:Key="PressedOn">
-
-                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="PressedBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-                    <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1" />
-                </DoubleAnimationUsingKeyFrames>
-
-            </Storyboard>
-            <Storyboard x:Key="PressedOff">
-
-                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="PressedBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-                    <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0" />
-                </DoubleAnimationUsingKeyFrames>
-
-            </Storyboard>
-            <Storyboard x:Key="FocusedOn">
-                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="FocusVisualElement" Storyboard.TargetProperty="(UIElement.Opacity)">
-                    <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1" />
-                </DoubleAnimationUsingKeyFrames>
-            </Storyboard>
-            <Storyboard x:Key="FocussedOff">
-                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="FocusVisualElement" Storyboard.TargetProperty="(UIElement.Opacity)">
-                    <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0" />
-                </DoubleAnimationUsingKeyFrames>
-            </Storyboard>
-
-        </ControlTemplate.Resources>
-        <Grid x:Name="Grid">
-            <Border x:Name="Background" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3"/>
-            <Border x:Name="HoverBorder" Opacity="0" Background="{StaticResource HoverBrush}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"  CornerRadius="3"/>
-            <Border x:Name="HoverShineBorder" Opacity="0" Background="{StaticResource HoverShineBrush}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3"/>
-            <Border x:Name="PressedBorder" Opacity="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"  Background="{StaticResource PressedBrush}" CornerRadius="3"/>
-            <Border x:Name="ShineBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"  Background="{StaticResource ShineBrush}" Opacity="1" CornerRadius="3"/>
-            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" />
-            <Border x:Name="FocusVisualElement" IsHitTestVisible="false" BorderBrush="{StaticResource HoverShineBrush}" BorderThickness="1" Margin="1,1,1,1" Opacity="0" CornerRadius="3"/>
-        </Grid>
-        <ControlTemplate.Triggers>
-            <Trigger Property="IsDefault" Value="True">
-                <Setter Property="BorderBrush" TargetName="ShineBorder" Value="{DynamicResource DefaultedBorderBrush}" />
-            </Trigger>
-            <Trigger Property="IsKeyboardFocused" Value="true">
-                <Trigger.ExitActions>
-                    <BeginStoryboard Storyboard="{StaticResource FocussedOff}" x:Name="FocussedOff_BeginStoryboard" />
-                </Trigger.ExitActions>
-                <Trigger.EnterActions>
-                    <BeginStoryboard Storyboard="{StaticResource FocusedOn}" x:Name="FocusedOn_BeginStoryboard" />
-                </Trigger.EnterActions>
-
-            </Trigger>
+        <Setter Property="BorderThickness" Value="2" />
+        <Setter Property="Padding" Value="10,5,10,5" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Grid x:Name="Grid">
+                        <Border x:Name="DefaultBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"  Background="{TemplateBinding Background}" Opacity="1" CornerRadius="3"/>
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" />
+                        <Border x:Name="HoverShine" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"  Background="{DynamicResource NormalBrushLight}" Opacity="0" CornerRadius="3"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="true" />
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Background" Value="{DynamicResource DisabledBackgroundBrush}" TargetName="DefaultBorder" />
+                            <Setter Property="Opacity" TargetName="Grid" Value="0.5" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="Opacity" Value="0.2" TargetName="HoverShine" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="true">
-                <Trigger.ExitActions>
-                    <BeginStoryboard Storyboard="{StaticResource HoverOff}" x:Name="HoverOff_BeginStoryboard" />
-                </Trigger.ExitActions>
-                <Trigger.EnterActions>
-                    <BeginStoryboard Storyboard="{StaticResource HoverOn}" />
-                </Trigger.EnterActions>
-
-            </Trigger>
-            <Trigger Property="IsPressed" Value="true">
-                <Trigger.ExitActions>
-                    <BeginStoryboard Storyboard="{StaticResource PressedOff}" />
-                </Trigger.ExitActions>
-                <Trigger.EnterActions>
-                    <BeginStoryboard Storyboard="{StaticResource PressedOn}" />
-                </Trigger.EnterActions>
+                <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
             </Trigger>
-            <Trigger Property="IsEnabled" Value="true" />
-            <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Background" Value="{DynamicResource DisabledBackgroundBrush}" TargetName="Background" />
-                <Setter Property="BorderBrush" Value="{DynamicResource DisabledBorderBrush}" TargetName="ShineBorder" />
-                <Setter Property="Opacity" TargetName="Grid" Value="0.5" />
-            </Trigger>
-        </ControlTemplate.Triggers>
-    </ControlTemplate>
+        </Style.Triggers>
+    </Style>
 
     <Style x:Key="RadioButtonFocusVisual">
         <Setter Property="Control.Template">
@@ -334,10 +255,10 @@
             </Setter.Value>
         </Setter>
     </Style>
-    <Style TargetType="{x:Type CheckBox}">
+    <Style TargetType="{x:Type CheckBox}" BasedOn="{StaticResource BaseStyle}">
         <Setter Property="SnapsToDevicePixels" Value="true" />
         <Setter Property="FocusVisualStyle" Value="{DynamicResource CheckBoxFocusVisual}" />
-        <Setter Property="Background" Value="{DynamicResource NormalBrush}" />
+        <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
         <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}" />
         <Setter Property="Template" Value="{DynamicResource CheckBoxTemplate}" />
@@ -398,18 +319,17 @@
         </ControlTemplate.Resources>
         <BulletDecorator Background="Transparent" x:Name="bulletDecorator">
             <BulletDecorator.Bullet>
-                <Grid Width="16" Height="16">
-                    <Rectangle Height="14" Margin="1" x:Name="Background" Width="14" Fill="{TemplateBinding Background}" Stroke="{TemplateBinding BorderBrush}" StrokeThickness="{TemplateBinding BorderThickness}" />
-                    <Rectangle Height="14" Margin="1" x:Name="BackgroundOverlay" Width="14" Opacity="0" Fill="{x:Null}" Stroke="{StaticResource HoverBrush}" StrokeThickness="2" />
+                <Grid Width="18" Height="18">
+                    <Rectangle Height="16" Margin="1" x:Name="Background" Width="16" Fill="{TemplateBinding Background}" Stroke="{TemplateBinding BorderBrush}" StrokeThickness="{TemplateBinding BorderThickness}" />
+                    <Rectangle Height="16" Margin="1" x:Name="BackgroundOverlay" Width="16" Opacity="0" Fill="{x:Null}" Stroke="{StaticResource HoverBrush}" StrokeThickness="2" />
                     <Rectangle Height="16" x:Name="PressedRectangle" Width="16" IsHitTestVisible="false" Opacity="0" Stroke="{StaticResource HoverBrush}" StrokeThickness="1" />
-                    <Path Height="10" Margin="1,1,0,1.5" x:Name="CheckIcon" Width="10.5" Opacity="0" Fill="{StaticResource GlyphBrush}" Stretch="Fill" Data="M102.03442,598.79645 L105.22962,597.78918 L106.78825,600.42358 C106.78825,600.42358 108.51028,595.74304 110.21724,593.60419 C112.00967,591.35822 114.89314,591.42316 114.89314,591.42316 C114.89314,591.42316 112.67844,593.42645 111.93174,594.44464 C110.7449,596.06293 107.15683,604.13837 107.15683,604.13837 z" />
+                    <Path Height="12" Margin="1,1,0,1.5" x:Name="CheckIcon" Width="10.5" Opacity="0" Fill="{StaticResource IndicatorBrush}" Stretch="Fill" Data="M102.03442,598.79645 L105.22962,597.78918 L106.78825,600.42358 C106.78825,600.42358 108.51028,595.74304 110.21724,593.60419 C112.00967,591.35822 114.89314,591.42316 114.89314,591.42316 C114.89314,591.42316 112.67844,593.42645 111.93174,594.44464 C110.7449,596.06293 107.15683,604.13837 107.15683,604.13837 z" />
                     <Rectangle Height="8" x:Name="IndeterminateIcon" Width="10" Opacity="0" Fill="{StaticResource GlyphBrush}" />
-                    <Rectangle Height="14" x:Name="DisabledVisualElement" Width="14" Opacity="0" Fill="{StaticResource DisabledBackgroundBrush}" />
-                    <Rectangle Height="16" x:Name="ContentFocusVisualElement" Width="16" IsHitTestVisible="false" Opacity="0" Stroke="{StaticResource HoverShineBrush}" StrokeThickness="1" />
-                    <Rectangle Height="12" x:Name="ShineRectangle" Width="14" IsHitTestVisible="false" Opacity="1" Stroke="{x:Null}" StrokeThickness="1" Fill="{StaticResource ShineBrush}" Margin="2,2,2,2" />
+                    <Rectangle Height="16" x:Name="DisabledVisualElement" Width="16" Opacity="0" Fill="{StaticResource DisabledBackgroundBrush}" />
+                    <Rectangle Height="16" x:Name="ContentFocusVisualElement" Width="16" IsHitTestVisible="false" Opacity="0" Stroke="{StaticResource HoverShineBrush}" StrokeThickness="1" />                    
                 </Grid>
             </BulletDecorator.Bullet>
-            <ContentPresenter RecognizesAccessKey="True" Margin="5,0,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" />
+            <ContentPresenter RecognizesAccessKey="True" Margin="5,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Left"/>
         </BulletDecorator>
         <ControlTemplate.Triggers>
             <Trigger Property="IsFocused" Value="True">
@@ -461,19 +381,16 @@
                     <BeginStoryboard Storyboard="{StaticResource HoverOff}" />
                 </Trigger.ExitActions>
             </Trigger>
-            <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Fill" Value="{DynamicResource DisabledBackgroundBrush}" TargetName="Background" />
-                <Setter Property="Stroke" Value="{DynamicResource DisabledBorderBrush}" TargetName="Background" />
-                <Setter Property="Foreground" Value="{DynamicResource DisabledForegroundBrush}" />
-                <Setter Property="Opacity" TargetName="bulletDecorator" Value="0.5" />
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Opacity" Value="0.5" />
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style TargetType="{x:Type RadioButton}">
+    <Style TargetType="{x:Type RadioButton}"  BasedOn="{StaticResource BaseStyle}">
         <Setter Property="SnapsToDevicePixels" Value="true" />
         <Setter Property="FocusVisualStyle" Value="{DynamicResource RadioButtonFocusVisual}" />
-        <Setter Property="Background" Value="{DynamicResource NormalBrush}" />
+        <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
         <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}" />
         <Setter Property="Template" Value="{DynamicResource RadioButtonTemplate}" />
@@ -526,17 +443,16 @@
         </ControlTemplate.Resources>
         <BulletDecorator Background="Transparent" x:Name="bulletDecorator">
             <BulletDecorator.Bullet>
-                <Grid Width="16" Height="16">
-                    <Ellipse Height="14" Margin="1" x:Name="Background" Width="14" Fill="{TemplateBinding Background}" Stroke="{TemplateBinding BorderBrush}" StrokeThickness="{TemplateBinding BorderThickness}" />
-                    <Ellipse Height="14" Margin="1" x:Name="BackgroundOverlay" Width="14" StrokeThickness="2" Stroke="{StaticResource HoverBrush}" Opacity="0" />
-                    <Ellipse Height="14" Margin="1" x:Name="PressedEllipse" Width="14" StrokeThickness="{TemplateBinding BorderThickness}" Stroke="{StaticResource HoverBrush}" Opacity="0" />
-                    <Ellipse Height="6" x:Name="CheckIcon" Width="6" Opacity="0" Fill="{StaticResource GlyphBrush}" />
-                    <Ellipse Height="14" x:Name="DisabledVisualElement" Width="14" Opacity="0" Fill="{StaticResource DisabledBackgroundBrush}" />
-                    <Ellipse Height="16" x:Name="ContentFocusVisualElement" Width="16" IsHitTestVisible="false" Opacity="0" Stroke="{StaticResource HoverShineBrush}" StrokeThickness="1" />
-                    <Ellipse Height="12" Margin="2,2,2,2" x:Name="ShineEllipse" Width="12" StrokeThickness="{TemplateBinding BorderThickness}" Stroke="{x:Null}" Fill="{StaticResource ShineBrush}" />
+                <Grid Width="18" Height="18">
+                    <Ellipse Height="16" Margin="1" x:Name="Background" Width="16" Fill="{TemplateBinding Background}" Stroke="{TemplateBinding BorderBrush}" StrokeThickness="{TemplateBinding BorderThickness}" />
+                    <Ellipse Height="16" Margin="1" x:Name="BackgroundOverlay" Width="16" StrokeThickness="2" Stroke="{StaticResource HoverBrush}" Opacity="0" />
+                    <Ellipse Height="16" Margin="1" x:Name="PressedEllipse" Width="16" StrokeThickness="{TemplateBinding BorderThickness}" Stroke="{StaticResource HoverBrush}" Opacity="0" />
+                    <Ellipse Height="6" x:Name="CheckIcon" Width="6" Opacity="0" Fill="{StaticResource IndicatorBrush}" />
+                    <Ellipse Height="16" x:Name="DisabledVisualElement" Width="16" Opacity="0" Fill="{StaticResource DisabledBackgroundBrush}" />
+                    <Ellipse Height="16" x:Name="ContentFocusVisualElement" Width="16" IsHitTestVisible="false" Opacity="0" Stroke="{StaticResource HoverShineBrush}" StrokeThickness="1" />                    
                 </Grid>
             </BulletDecorator.Bullet>
-            <ContentPresenter RecognizesAccessKey="True" Margin="5,0,0,0" />
+            <ContentPresenter RecognizesAccessKey="True" Margin="5,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center"/>
         </BulletDecorator>
         <ControlTemplate.Triggers>
             <Trigger Property="IsFocused" Value="True">
@@ -565,30 +481,23 @@
             </Trigger>
             <Trigger Property="IsChecked" Value="True" />
             <Trigger Property="IsMouseOver" Value="true">
-
                 <Trigger.ExitActions>
                     <BeginStoryboard x:Name="HoverOff_BeginStoryboard" Storyboard="{StaticResource HoverOff}" />
                 </Trigger.ExitActions>
                 <Trigger.EnterActions>
                     <BeginStoryboard Storyboard="{StaticResource HoverOn}" />
                 </Trigger.EnterActions>
-
             </Trigger>
             <Trigger Property="IsPressed" Value="true">
-
                 <Trigger.ExitActions>
                     <BeginStoryboard x:Name="PressedOff_BeginStoryboard" Storyboard="{StaticResource PressedOff}" />
                 </Trigger.ExitActions>
                 <Trigger.EnterActions>
                     <BeginStoryboard x:Name="PressedOn_BeginStoryboard" Storyboard="{StaticResource PressedOn}" />
                 </Trigger.EnterActions>
-
             </Trigger>
-            <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Fill" TargetName="Background" Value="{DynamicResource DisabledBackgroundBrush}" />
-                <Setter Property="Stroke" TargetName="Background" Value="{DynamicResource DisabledBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource DisabledForegroundBrush}" />
-                <Setter Property="Opacity" TargetName="bulletDecorator" Value="0.5" />
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Opacity" Value="0.5" />
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
@@ -678,14 +587,14 @@
                         </Storyboard>
                     </ControlTemplate.Resources>
                     <Grid Margin="0,0,0,0" x:Name="Grid">
-                        <Rectangle HorizontalAlignment="Stretch" x:Name="HoverRectangle" VerticalAlignment="Stretch" Width="Auto" Height="Auto" RadiusX="3" RadiusY="4" Stroke="{x:Null}" Margin="4.5,-2,4.5,-2" Opacity="0.3" MinHeight="10">
+                        <Rectangle HorizontalAlignment="Stretch" x:Name="HoverRectangle" VerticalAlignment="Stretch" Width="Auto" Height="Auto" RadiusX="3" RadiusY="4" Stroke="{x:Null}" Margin="4.5,1,4.5,1" Opacity="1" MinHeight="10">
                             <Rectangle.Fill>
-                                <SolidColorBrush Color="{DynamicResource WhiteColor}" />
+                                <SolidColorBrush Color="{StaticResource MainColorLight}" />
                             </Rectangle.Fill>
                         </Rectangle>
-                        <Rectangle HorizontalAlignment="Stretch" x:Name="PressedRectangle" VerticalAlignment="Stretch" Width="Auto" Height="Auto" RadiusX="3" RadiusY="4" Stroke="{x:Null}" Margin="4.5,-2,4.5,-2" Opacity="0.3" MinHeight="10">
+                        <Rectangle HorizontalAlignment="Stretch" x:Name="PressedRectangle" VerticalAlignment="Stretch" Width="Auto" Height="Auto" RadiusX="3" RadiusY="4" Stroke="{x:Null}" Margin="4.5,1,4.5,1" Opacity="1" MinHeight="10">
                             <Rectangle.Fill>
-                                <SolidColorBrush Color="{DynamicResource WhiteColor}" />
+                                <SolidColorBrush Color="{DynamicResource MainColorLight}" />
                             </Rectangle.Fill>
                         </Rectangle>
                     </Grid>
@@ -736,18 +645,16 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ScrollBar}">
-                    <Grid x:Name="GridRoot" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Background="{DynamicResource NormalBrush}">
-                        <Grid.RowDefinitions>
-                            <RowDefinition MaxHeight="18" />
+                    <!--<Grid x:Name="GridRoot" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">-->
+                        <!--<Grid.RowDefinitions>
                             <RowDefinition Height="0.00001*" />
-                            <RowDefinition MaxHeight="18" />
-                        </Grid.RowDefinitions>
-                        <RepeatButton x:Name="DecreaseRepeat" Command="ScrollBar.LineUpCommand" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="{x:Null}">
+                        </Grid.RowDefinitions>-->
+                        <!--<RepeatButton x:Name="DecreaseRepeat" Command="ScrollBar.LineUpCommand" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="{x:Null}">
                             <Grid Margin="0,0,0,0">
                                 <Path Margin="4.742,3.997,4.946,5.327" VerticalAlignment="Stretch" Height="Auto" Fill="{DynamicResource GlyphBrush}" Stretch="Fill" Stroke="{DynamicResource GlyphBrush}" StrokeThickness="1" Data="M5.2422477,11.132184 L11.5544,11.132184 8.6412958,4.4969033 z" x:Name="DecreaseArrow" />
                             </Grid>
-                        </RepeatButton>
-                        <Track Grid.Row="1" x:Name="PART_Track" Orientation="Vertical" IsDirectionReversed="true">
+                        </RepeatButton>-->
+                        <Track Grid.Row="1" x:Name="PART_Track" Orientation="Vertical" IsDirectionReversed="true" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
                             <Track.Thumb>
                                 <Thumb Style="{DynamicResource NuclearThumbStyle}" Background="{x:Null}" Foreground="{x:Null}" />
                             </Track.Thumb>
@@ -758,7 +665,7 @@
                                 <RepeatButton x:Name="PageDown" Style="{DynamicResource NuclearScrollRepeatButtonStyle}" Command="ScrollBar.PageUpCommand" />
                             </Track.DecreaseRepeatButton>
                         </Track>
-                        <RepeatButton Grid.Row="2" x:Name="IncreaseRepeat" Command="ScrollBar.LineDownCommand">
+                        <!--<RepeatButton Grid.Row="2" x:Name="IncreaseRepeat" Command="ScrollBar.LineDownCommand">
                             <Grid>
                                 <Path Margin="4.742,3.997,4.946,5.327" x:Name="IncreaseArrow" VerticalAlignment="Stretch" Height="Auto" Fill="{DynamicResource GlyphBrush}" Stretch="Fill" Stroke="{DynamicResource GlyphBrush}" StrokeThickness="1" Data="M5.2422477,11.132184 L11.5544,11.132184 8.6412958,4.4969033 z" RenderTransformOrigin="0.5,0.5">
                                     <Path.RenderTransform>
@@ -771,18 +678,18 @@
                                     </Path.RenderTransform>
                                 </Path>
                             </Grid>
-                        </RepeatButton>
-                    </Grid>
+                        </RepeatButton>-->
+                    <!--</Grid>-->
                     <ControlTemplate.Triggers>
                         <Trigger Property="Orientation" Value="Horizontal">
-                            <Setter Property="LayoutTransform" TargetName="GridRoot">
+                            <Setter Property="LayoutTransform" TargetName="PART_Track">
                                 <Setter.Value>
                                     <RotateTransform Angle="-90" />
                                 </Setter.Value>
                             </Setter>
                             <Setter TargetName="PART_Track" Property="Orientation" Value="Vertical" />
-                            <Setter Property="Command" Value="ScrollBar.LineLeftCommand" TargetName="DecreaseRepeat" />
-                            <Setter Property="Command" Value="ScrollBar.LineRightCommand" TargetName="IncreaseRepeat" />
+                            <!--<Setter Property="Command" Value="ScrollBar.LineLeftCommand" TargetName="DecreaseRepeat" />
+                            <Setter Property="Command" Value="ScrollBar.LineRightCommand" TargetName="IncreaseRepeat" />-->
                             <Setter Property="Command" Value="ScrollBar.PageLeftCommand" TargetName="PageDown" />
                             <Setter Property="Command" Value="ScrollBar.PageRightCommand" TargetName="PageUp" />
                         </Trigger>
@@ -805,7 +712,7 @@
                             <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
                         <ScrollContentPresenter Grid.Column="0" Grid.Row="0" Margin="{TemplateBinding Padding}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" CanContentScroll="{TemplateBinding CanContentScroll}" />
-                        <Rectangle Grid.Column="1" Grid.Row="1" Fill="{DynamicResource NormalBrush}"/>
+                        <Rectangle Grid.Column="1" Grid.Row="1" Fill="{DynamicResource ControlBackgroundBrush}"/>
                         <ScrollBar Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Grid.Column="0" Grid.Row="1" x:Name="PART_HorizontalScrollBar" Orientation="Horizontal" Value="{Binding Path=HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" Minimum="0" Maximum="{TemplateBinding ScrollableWidth}" AutomationProperties.AutomationId="HorizontalScrollBar" />
                         <ScrollBar Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Grid.Column="1" Grid.Row="0" x:Name="PART_VerticalScrollBar" Orientation="Vertical" Value="{Binding Path=VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" Minimum="0" Maximum="{TemplateBinding ScrollableHeight}" AutomationProperties.AutomationId="VerticalScrollBar" />
                     </Grid>
@@ -817,16 +724,8 @@
     <Style TargetType="{x:Type ListBox}">
         <Setter Property="SnapsToDevicePixels" Value="true" />
         <Setter Property="Background" Value="{StaticResource ControlBackgroundBrush}" />
-        <Setter Property="BorderBrush">
-            <Setter.Value>
-                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                    <GradientStop Color="#FFA3AEB9" Offset="0" />
-                    <GradientStop Color="#FF8399A9" Offset="0.375" />
-                    <GradientStop Color="#FF718597" Offset="0.375" />
-                    <GradientStop Color="#FF617584" Offset="1" />
-                </LinearGradientBrush>
-            </Setter.Value>
-        </Setter>
+        <Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}" />
+        <Setter Property="BorderThickness" Value="0" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
@@ -834,10 +733,12 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ListBox}">
                     <Grid>
-                        <Border x:Name="Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{DynamicResource ControlBackgroundBrush}" />
-                        <ScrollViewer Margin="1" Style="{DynamicResource NuclearScrollViewer}" Focusable="false" Background="{x:Null}">
-                            <ItemsPresenter/>
-                        </ScrollViewer>
+                        <Border x:Name="Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{DynamicResource ControlBackgroundBrush}">
+                            <ScrollViewer Padding="{TemplateBinding Padding}" Style="{DynamicResource NuclearScrollViewer}" Focusable="false"
+                                          HorizontalScrollBarVisibility="Disabled">
+                                <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                            </ScrollViewer>
+                        </Border>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsEnabled" Value="false">
@@ -856,74 +757,25 @@
     <Style d:IsControlPart="True" TargetType="{x:Type ListBoxItem}">
         <Setter Property="SnapsToDevicePixels" Value="true" />
         <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="Margin" Value="1" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                    <ControlTemplate.Resources>
-                        <Storyboard x:Key="HoverOn">
-
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-                            </DoubleAnimationUsingKeyFrames>
-
-                        </Storyboard>
-                        <Storyboard x:Key="HoverOff">
-
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.4000000" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-
-                        </Storyboard>
-                        <Storyboard x:Key="SelectedOn">
-
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-                            </DoubleAnimationUsingKeyFrames>
-
-                        </Storyboard>
-                        <Storyboard x:Key="SelectedOff">
-
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.4000000" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-
-                        </Storyboard>
-                        <Storyboard x:Key="FocussedOn">
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="FocusVisualElement" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                        <Storyboard x:Key="FocussedOff">
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="FocusVisualElement" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                    </ControlTemplate.Resources>
-                    <Grid SnapsToDevicePixels="true" Margin="1,1,1,1">
-                        <Rectangle x:Name="Background" IsHitTestVisible="False" Opacity="0.25" Fill="{StaticResource NormalBrush}" RadiusX="1" RadiusY="1"/>
-                        <Rectangle x:Name="HoverRectangle" IsHitTestVisible="False" Opacity="0" Fill="{StaticResource NormalBrush}" RadiusX="1" RadiusY="1"/>
-                        <Rectangle x:Name="SelectedRectangle" IsHitTestVisible="False" Opacity="0" Fill="{StaticResource SelectedBackgroundBrush}" RadiusX="1" RadiusY="1"/>
-                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="5,2,0,2" x:Name="contentPresenter" />
-                        <Rectangle x:Name="FocusVisualElement" Stroke="{StaticResource HoverShineBrush}" StrokeThickness="1" RadiusX="1" RadiusY="1" Opacity="0"/>
-                    </Grid>
+                    <Border SnapsToDevicePixels="true" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0" CornerRadius="0" x:Name="border" Background="Transparent">
+                        <Grid>
+                            <Rectangle x:Name="Background" IsHitTestVisible="False" Opacity="0.25" Fill="{StaticResource NormalBrush}" RadiusX="1" RadiusY="1"/>
+                            <Rectangle x:Name="HoverRectangle" IsHitTestVisible="False" Opacity="0" Fill="{StaticResource NormalBrush}" RadiusX="1" RadiusY="1"/>
+                            <Rectangle x:Name="SelectedRectangle" IsHitTestVisible="False" Opacity="0" Fill="{StaticResource SelectedBackgroundBrush}" RadiusX="1" RadiusY="1"/>
+                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="contentPresenter" />
+                            <Rectangle x:Name="FocusVisualElement" Stroke="{StaticResource HoverShineBrush}" StrokeThickness="1" RadiusX="1" RadiusY="1" Opacity="0"/>
+                        </Grid>
+                    </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsFocused" Value="True">
-                            <Trigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource FocussedOff}" x:Name="FocussedOff_BeginStoryboard"/>
-                            </Trigger.ExitActions>
-                            <Trigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource FocussedOn}" x:Name="FocussedOn_BeginStoryboard"/>
-                            </Trigger.EnterActions>
+                            <Setter Property="Opacity" Value="1" TargetName="FocusVisualElement" />
                         </Trigger>
                         <Trigger Property="IsSelected" Value="true">
-
-                            <Trigger.ExitActions>
-                                <BeginStoryboard x:Name="SelectedOff_BeginStoryboard" Storyboard="{StaticResource SelectedOff}"/>
-                            </Trigger.ExitActions>
-                            <Trigger.EnterActions>
-                                <BeginStoryboard x:Name="SelectedOn_BeginStoryboard" Storyboard="{StaticResource SelectedOn}"/>
-                            </Trigger.EnterActions>
-
+                            <Setter Property="Opacity" Value="1" TargetName="SelectedRectangle" />                            
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
@@ -931,20 +783,13 @@
                                 <Condition Property="Selector.IsSelected" Value="False" />
                             </MultiTrigger.Conditions>
 
-                            <MultiTrigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource HoverOn}"/>
-                            </MultiTrigger.EnterActions>
-                            <MultiTrigger.ExitActions>
-                                <BeginStoryboard x:Name="HoverOff_BeginStoryboard" Storyboard="{StaticResource HoverOff}"/>
-                            </MultiTrigger.ExitActions>
-
+                            <Setter Property="Opacity" Value="1" TargetName="HoverRectangle" />
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="Selector.IsSelected" Value="True" />
                                 <Condition Property="IsMouseOver" Value="True" />
                             </MultiTrigger.Conditions>
-
                         </MultiTrigger>
                         <Trigger Property="IsEnabled" Value="false">
                             <Setter Property="Foreground" Value="{DynamicResource DisabledForegroundBrush}" />
@@ -982,72 +827,28 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
-                    <ControlTemplate.Resources>
-                        <Storyboard x:Key="HoverOn">
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-                            </DoubleAnimationUsingKeyFrames>
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverShineRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                        <Storyboard x:Key="HoverOff">
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverShineRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                        <Storyboard x:Key="PressedOn">
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="PressedRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                        <Storyboard x:Key="PressedOff">
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="PressedRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                    </ControlTemplate.Resources>
                     <Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
                         <Grid SnapsToDevicePixels="False" Background="Transparent">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="25" />
+                                <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition Width="*" />
                             </Grid.ColumnDefinitions>
-                            <Rectangle Margin="2,2,2,2" x:Name="Rectangle" Fill="{DynamicResource NormalBrush}" Stroke="{DynamicResource NormalBorderBrush}" StrokeThickness="1" RadiusX="1" RadiusY="1" />
-                            <Rectangle Margin="2,2,2,2" x:Name="ShineRectangle" Fill="{DynamicResource ShineBrush}" Stroke="{DynamicResource NormalBorderBrush}" StrokeThickness="1" RadiusX="1" RadiusY="1" />
-                            <Rectangle Margin="2,2,2,2" x:Name="HoverRectangle" Fill="{DynamicResource HoverBrush}" Stroke="{DynamicResource NormalBorderBrush}" StrokeThickness="1" RadiusX="1" RadiusY="1" Opacity="0" />
-                            <Rectangle Margin="2,2,2,2" x:Name="HoverShineRectangle" Fill="{DynamicResource HoverShineBrush}" Stroke="{DynamicResource NormalBorderBrush}" StrokeThickness="1" RadiusX="1" RadiusY="1" Opacity="0" />
-                            <Rectangle Margin="2,2,2,2" x:Name="PressedRectangle" Fill="{DynamicResource PressedBrush}" Stroke="{DynamicResource PressedBorderBrush}" StrokeThickness="1" RadiusX="1" RadiusY="1" Opacity="0" />
-                            <Path HorizontalAlignment="Center" x:Name="Up_Arrow" VerticalAlignment="Center" Fill="{DynamicResource GlyphBrush}" Data="M 0 0 L 4 4 L 8 0 Z" />
-                            <Path Visibility="Collapsed" HorizontalAlignment="Center" x:Name="Down_Arrow" VerticalAlignment="Center" Fill="{DynamicResource GlyphBrush}" Data="M 0 4 L 4 0 L 8 4 Z" />                            
-                            <ContentPresenter SnapsToDevicePixels="True" HorizontalAlignment="Left" Margin="4,2,0,2" VerticalAlignment="Center" Grid.Column="1" RecognizesAccessKey="True" />
+                            <Path Margin="5,0,5,0" Width="12" Height="12" Stretch="Uniform"
+                                  HorizontalAlignment="Center" x:Name="Up_Arrow" VerticalAlignment="Center" Fill="{DynamicResource GlyphBrush}" Data="M 0 0 L 4 4 L 8 0 Z" />
+                            <Path Margin="5,0,5,0" Width="12" Height="12" Stretch="Uniform"
+                                  Visibility="Collapsed" HorizontalAlignment="Center" x:Name="Down_Arrow" VerticalAlignment="Center" Fill="{DynamicResource GlyphBrush}" Data="M 0 4 L 4 0 L 8 4 Z" />             
+                            <TextBlock Style="{StaticResource BaseTextBlockStyle}" Grid.Column="1" VerticalAlignment="Center">
+                                <ContentPresenter SnapsToDevicePixels="True" HorizontalAlignment="Left" RecognizesAccessKey="True" />
+                            </TextBlock>
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsChecked" Value="true">
                             <Setter Property="Visibility" TargetName="Down_Arrow" Value="Visible" />
                             <Setter Property="Visibility" TargetName="Up_Arrow" Value="Collapsed" />
-
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="true">
-                            <Trigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource HoverOff}" x:Name="HoverOff_BeginStoryboard"/>
-                            </Trigger.ExitActions>
-                            <Trigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource HoverOn}"/>
-                            </Trigger.EnterActions>
-
-                        </Trigger>
-                        <Trigger Property="IsPressed" Value="true">
-                            <Trigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource PressedOff}" x:Name="PressedOff_BeginStoryboard"/>
-                            </Trigger.ExitActions>
-                            <Trigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource PressedOn}" x:Name="PressedOn_BeginStoryboard"/>
-                            </Trigger.EnterActions>
+                            <Setter Property="Opacity" Value="0.75" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -1059,34 +860,6 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
-                    <ControlTemplate.Resources>
-                        <Storyboard x:Key="HoverOn">
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-                            </DoubleAnimationUsingKeyFrames>
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverShineRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                        <Storyboard x:Key="HoverOff">
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverShineRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                        <Storyboard x:Key="PressedOn">
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="PressedRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                        <Storyboard x:Key="PressedOff">
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="PressedRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                    </ControlTemplate.Resources>
                     <Border Padding="{TemplateBinding Padding}" Background="{DynamicResource NormalBrush}" BorderBrush="{DynamicResource NormalBorderBrush}" BorderThickness="1,1,1,1">
                         <Grid SnapsToDevicePixels="False" Background="Transparent">
                             <Grid.RowDefinitions>
@@ -1103,25 +876,22 @@
                                         </TransformGroup.Children>
                                     </TransformGroup>
                                 </Grid.LayoutTransform>
-                                <Rectangle Margin="2,2,2,2" x:Name="Rectangle" Fill="{DynamicResource NormalBrush}" Stroke="{DynamicResource NormalBorderBrush}" StrokeThickness="1" RadiusX="1" RadiusY="1" />
-                                <Rectangle Margin="2,2,2,2" x:Name="ShineRectangle" Fill="{DynamicResource ShineBrush}" Stroke="{DynamicResource NormalBorderBrush}" StrokeThickness="1" RadiusX="1" RadiusY="1" />
-                                <Rectangle Margin="2,2,2,2" x:Name="HoverRectangle" Fill="{DynamicResource HoverBrush}" Stroke="{DynamicResource NormalBorderBrush}" StrokeThickness="1" RadiusX="1" RadiusY="1" Opacity="0" />
-                                <Rectangle Margin="2,2,2,2" x:Name="HoverShineRectangle" Fill="{DynamicResource HoverShineBrush}" Stroke="{DynamicResource NormalBorderBrush}" StrokeThickness="1" RadiusX="1" RadiusY="1" Opacity="0" />
-                                <Rectangle Margin="2,2,2,2" x:Name="PressedRectangle" Fill="{DynamicResource PressedBrush}" Stroke="{DynamicResource PressedBorderBrush}" StrokeThickness="1" RadiusX="1" RadiusY="1" Opacity="0" />
-                                <Path HorizontalAlignment="Center" x:Name="Up_Arrow" VerticalAlignment="Center" Fill="{DynamicResource GlyphBrush}" Data="M 0 0 L 4 4 L 8 0 Z" />
-                                <Path Visibility="Collapsed" HorizontalAlignment="Center" x:Name="Down_Arrow" VerticalAlignment="Center" Fill="{DynamicResource GlyphBrush}" Data="M 0 4 L 4 0 L 8 4 Z" />
+                                <Path Stretch="Uniform" HorizontalAlignment="Center" x:Name="Up_Arrow" VerticalAlignment="Center" Fill="{DynamicResource GlyphBrush}" Data="M 0 0 L 4 4 L 8 0 Z" />
+                                <Path Stretch="Uniform" Visibility="Collapsed" HorizontalAlignment="Center" x:Name="Down_Arrow" VerticalAlignment="Center" Fill="{DynamicResource GlyphBrush}" Data="M 0 4 L 4 0 L 8 4 Z" />
                             </Grid>
-                            <ContentPresenter SnapsToDevicePixels="True" HorizontalAlignment="Center" Margin="2,4,4,0" VerticalAlignment="Top" Grid.Row="1" RecognizesAccessKey="True">
-                                <ContentPresenter.LayoutTransform>
-                                    <TransformGroup>
-                                        <TransformGroup.Children>
-                                            <TransformCollection>
-                                                <RotateTransform Angle="-90" />
-                                            </TransformCollection>
-                                        </TransformGroup.Children>
-                                    </TransformGroup>
-                                </ContentPresenter.LayoutTransform>
-                            </ContentPresenter>
+                            <TextBlock Foreground="{TemplateBinding Foreground}" Style="{StaticResource BaseTextBlockStyle}" Grid.Row="1" >
+                                <ContentPresenter SnapsToDevicePixels="True" HorizontalAlignment="Center" VerticalAlignment="Top" RecognizesAccessKey="True">
+                                    <ContentPresenter.LayoutTransform>
+                                        <TransformGroup>
+                                            <TransformGroup.Children>
+                                                <TransformCollection>
+                                                    <RotateTransform Angle="-90" />
+                                                </TransformCollection>
+                                            </TransformGroup.Children>
+                                        </TransformGroup>
+                                    </ContentPresenter.LayoutTransform>
+                                </ContentPresenter>
+                            </TextBlock>
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
@@ -1130,21 +900,7 @@
                             <Setter Property="Visibility" TargetName="Down_Arrow" Value="Visible" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="true">
-                            <Trigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource HoverOff}" x:Name="HoverOff_BeginStoryboard"/>
-                            </Trigger.ExitActions>
-                            <Trigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource HoverOn}"/>
-                            </Trigger.EnterActions>
-
-                        </Trigger>
-                        <Trigger Property="IsPressed" Value="true">
-                            <Trigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource PressedOff}" x:Name="PressedOff_BeginStoryboard"/>
-                            </Trigger.ExitActions>
-                            <Trigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource PressedOn}" x:Name="PressedOn_BeginStoryboard"/>
-                            </Trigger.EnterActions>
+                            <Setter Property="Opacity" Value="0.75" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -1156,34 +912,6 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
-                    <ControlTemplate.Resources>
-                        <Storyboard x:Key="HoverOn">
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-                            </DoubleAnimationUsingKeyFrames>
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverShineRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                        <Storyboard x:Key="HoverOff">
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverShineRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                        <Storyboard x:Key="PressedOn">
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="PressedRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                        <Storyboard x:Key="PressedOff">
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="PressedRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                    </ControlTemplate.Resources>
                     <Border Padding="{TemplateBinding Padding}" BorderThickness="1,1,1,1" Background="{DynamicResource NormalBrush}" BorderBrush="{DynamicResource NormalBorderBrush}">
                         <Grid SnapsToDevicePixels="False" Background="Transparent">
                             <Grid.ColumnDefinitions>
@@ -1200,15 +928,12 @@
                                         </TransformGroup.Children>
                                     </TransformGroup>
                                 </Grid.LayoutTransform>
-                                <Rectangle Margin="2,2,2,2" x:Name="Rectangle" Fill="{DynamicResource NormalBrush}" Stroke="{DynamicResource NormalBorderBrush}" StrokeThickness="1" RadiusX="1" RadiusY="1" />
-                                <Rectangle Margin="2,2,2,2" x:Name="ShineRectangle" Fill="{DynamicResource ShineBrush}" Stroke="{DynamicResource NormalBorderBrush}" StrokeThickness="1" RadiusX="1" RadiusY="1" />
-                                <Rectangle Margin="2,2,2,2" x:Name="HoverRectangle" Fill="{DynamicResource HoverBrush}" Stroke="{DynamicResource NormalBorderBrush}" StrokeThickness="1" RadiusX="1" RadiusY="1" Opacity="0" />
-                                <Rectangle Margin="2,2,2,2" x:Name="HoverShineRectangle" Fill="{DynamicResource HoverShineBrush}" Stroke="{DynamicResource NormalBorderBrush}" StrokeThickness="1" RadiusX="1" RadiusY="1" Opacity="0" />
-                                <Rectangle Margin="2,2,2,2" x:Name="PressedRectangle" Fill="{DynamicResource PressedBrush}" Stroke="{DynamicResource PressedBorderBrush}" StrokeThickness="1" RadiusX="1" RadiusY="1" Opacity="0" />
-                                <Path HorizontalAlignment="Center" x:Name="Up_Arrow" VerticalAlignment="Center" Fill="{DynamicResource GlyphBrush}" Data="M 0 0 L 4 4 L 8 0 Z" />
-                                <Path Visibility="Collapsed" HorizontalAlignment="Center" x:Name="Down_Arrow" VerticalAlignment="Center" Fill="{DynamicResource GlyphBrush}" Data="M 0 4 L 4 0 L 8 4 Z" />
+                                <Path Stretch="Uniform" HorizontalAlignment="Center" x:Name="Up_Arrow" VerticalAlignment="Center" Fill="{DynamicResource GlyphBrush}" Data="M 0 0 L 4 4 L 8 0 Z" />
+                                <Path Stretch="Uniform" Visibility="Collapsed" HorizontalAlignment="Center" x:Name="Down_Arrow" VerticalAlignment="Center" Fill="{DynamicResource GlyphBrush}" Data="M 0 4 L 4 0 L 8 4 Z" />
                             </Grid>
-                            <ContentPresenter SnapsToDevicePixels="True" HorizontalAlignment="Left" Margin="4,2,0,2" VerticalAlignment="Center" Grid.Column="1" RecognizesAccessKey="True" />
+                            <TextBlock Foreground="{TemplateBinding Foreground}" Style="{StaticResource BaseTextBlockStyle}" Grid.Column="1">
+                                <ContentPresenter SnapsToDevicePixels="True" HorizontalAlignment="Left" VerticalAlignment="Center" RecognizesAccessKey="True" />
+                            </TextBlock>
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
@@ -1217,21 +942,7 @@
                             <Setter Property="Visibility" TargetName="Down_Arrow" Value="Visible" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="true">
-                            <Trigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource HoverOff}" x:Name="HoverOff_BeginStoryboard"/>
-                            </Trigger.ExitActions>
-                            <Trigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource HoverOn}"/>
-                            </Trigger.EnterActions>
-
-                        </Trigger>
-                        <Trigger Property="IsPressed" Value="true">
-                            <Trigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource PressedOff}" x:Name="PressedOff_BeginStoryboard"/>
-                            </Trigger.ExitActions>
-                            <Trigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource PressedOn}" x:Name="PressedOn_BeginStoryboard"/>
-                            </Trigger.EnterActions>
+                            <Setter Property="Opacity" Value="0.75" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -1239,38 +950,10 @@
         </Setter>
     </Style>
     <Style x:Key="ExpanderLeftHeaderStyle" TargetType="{x:Type ToggleButton}">
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ToggleButton}">
-                    <ControlTemplate.Resources>
-                        <Storyboard x:Key="HoverOn">
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-                            </DoubleAnimationUsingKeyFrames>
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverShineRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                        <Storyboard x:Key="HoverOff">
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverShineRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                        <Storyboard x:Key="PressedOn">
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="PressedRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                        <Storyboard x:Key="PressedOff">
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="PressedRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                    </ControlTemplate.Resources>
+        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
                     <Border Padding="{TemplateBinding Padding}" Background="{DynamicResource NormalBrush}" BorderBrush="{DynamicResource NormalBorderBrush}" BorderThickness="1,1,1,1">
                         <Grid SnapsToDevicePixels="False" Background="Transparent">
                             <Grid.RowDefinitions>
@@ -1292,20 +975,22 @@
                                 <Rectangle Margin="2,2,2,2" x:Name="HoverRectangle" Fill="{DynamicResource HoverBrush}" Stroke="{DynamicResource NormalBorderBrush}" StrokeThickness="1" RadiusX="1" RadiusY="1" Opacity="0" />
                                 <Rectangle Margin="2,2,2,2" x:Name="HoverShineRectangle" Fill="{DynamicResource HoverShineBrush}" Stroke="{DynamicResource NormalBorderBrush}" StrokeThickness="1" RadiusX="1" RadiusY="1" Opacity="0" />
                                 <Rectangle Margin="2,2,2,2" x:Name="PressedRectangle" Fill="{DynamicResource PressedBrush}" Stroke="{DynamicResource PressedBorderBrush}" StrokeThickness="1" RadiusX="1" RadiusY="1" Opacity="0" />
-                                <Path HorizontalAlignment="Center" x:Name="Up_Arrow" VerticalAlignment="Center" Fill="{DynamicResource GlyphBrush}" Data="M 0 0 L 4 4 L 8 0 Z" />
-                                <Path Visibility="Collapsed" HorizontalAlignment="Center" x:Name="Down_Arrow" VerticalAlignment="Center" Fill="{DynamicResource GlyphBrush}" Data="M 0 4 L 4 0 L 8 4 Z" />
+                                <Path Stretch="Uniform" HorizontalAlignment="Center" x:Name="Up_Arrow" VerticalAlignment="Center" Fill="{DynamicResource GlyphBrush}" Data="M 0 0 L 4 4 L 8 0 Z" />
+                                <Path Stretch="Uniform" Visibility="Collapsed" HorizontalAlignment="Center" x:Name="Down_Arrow" VerticalAlignment="Center" Fill="{DynamicResource GlyphBrush}" Data="M 0 4 L 4 0 L 8 4 Z" />
                             </Grid>
-                            <ContentPresenter SnapsToDevicePixels="True" HorizontalAlignment="Center" Margin="4,4,2,0" VerticalAlignment="Top" Grid.Row="1" RecognizesAccessKey="True">
-                                <ContentPresenter.LayoutTransform>
-                                    <TransformGroup>
-                                        <TransformGroup.Children>
-                                            <TransformCollection>
-                                                <RotateTransform Angle="90" />
-                                            </TransformCollection>
-                                        </TransformGroup.Children>
-                                    </TransformGroup>
-                                </ContentPresenter.LayoutTransform>
-                            </ContentPresenter>
+                            <TextBlock Foreground="{TemplateBinding Foreground}" Style="{StaticResource BaseTextBlockStyle}" Grid.Column="1">
+                                <ContentPresenter SnapsToDevicePixels="True" HorizontalAlignment="Center" Margin="4,4,2,0" VerticalAlignment="Top" RecognizesAccessKey="True">
+                                    <ContentPresenter.LayoutTransform>
+                                        <TransformGroup>
+                                            <TransformGroup.Children>
+                                                <TransformCollection>
+                                                    <RotateTransform Angle="90" />
+                                                </TransformCollection>
+                                            </TransformGroup.Children>
+                                        </TransformGroup>
+                                    </ContentPresenter.LayoutTransform>
+                                </ContentPresenter>
+                            </TextBlock>
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
@@ -1314,21 +999,7 @@
                             <Setter Property="Visibility" TargetName="Down_Arrow" Value="Visible" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="true">
-                            <Trigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource HoverOff}" x:Name="HoverOff_BeginStoryboard"/>
-                            </Trigger.ExitActions>
-                            <Trigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource HoverOn}"/>
-                            </Trigger.EnterActions>
-
-                        </Trigger>
-                        <Trigger Property="IsPressed" Value="true">
-                            <Trigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource PressedOff}" x:Name="PressedOff_BeginStoryboard"/>
-                            </Trigger.ExitActions>
-                            <Trigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource PressedOn}" x:Name="PressedOn_BeginStoryboard"/>
-                            </Trigger.EnterActions>
+                            <Setter Property="Opacity" Value="0.75" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -1343,13 +1014,13 @@
                     <DockPanel x:Name="dockPanel">
                         <ToggleButton FontFamily="{TemplateBinding FontFamily}" FontSize="{TemplateBinding FontSize}" FontStretch="{TemplateBinding FontStretch}"
                                       BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"
-                                        FontStyle="{TemplateBinding FontStyle}" FontWeight="{TemplateBinding FontWeight}" Foreground="{TemplateBinding Foreground}"
-                                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}"
-                                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Background="Transparent"
-                                        Margin="1,1,1,0" MinHeight="25"
-                                        x:Name="HeaderSite" Style="{StaticResource ExpanderDownHeaderStyle}" Content="{TemplateBinding Header}"
-                                        IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" DockPanel.Dock="Top"/>
-                        <Border Visibility="Collapsed" x:Name="border">
+                                      FontStyle="{TemplateBinding FontStyle}" FontWeight="{TemplateBinding FontWeight}" Foreground="{TemplateBinding Foreground}"
+                                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}"
+                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Background="Transparent"
+                                      Margin="1,1,1,0" MinHeight="25"
+                                      x:Name="HeaderSite" Style="{StaticResource ExpanderDownHeaderStyle}" Content="{TemplateBinding Header}"
+                                      IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" DockPanel.Dock="Top"/>
+                        <Border Visibility="Collapsed" x:Name="border" BorderThickness="1" BorderBrush="{DynamicResource NormalBorderBrush}">
                             <ContentPresenter Focusable="false" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="1,1,1,1" x:Name="ExpandSite"
                                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}" DockPanel.Dock="Bottom" />
                         </Border>
@@ -1384,46 +1055,17 @@
     </Style>
     
     <ControlTemplate x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
-        <ControlTemplate.Resources>
-            <Storyboard x:Key="HoverOn">
-                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-                    <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-                </DoubleAnimationUsingKeyFrames>
-                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverShineBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-                    <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-                </DoubleAnimationUsingKeyFrames>
-            </Storyboard>
-            <Storyboard x:Key="HoverOff">
-                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverShineBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-                    <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0"/>
-                </DoubleAnimationUsingKeyFrames>
-                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-                    <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0"/>
-                </DoubleAnimationUsingKeyFrames>
-            </Storyboard>
-        </ControlTemplate.Resources>
         <Grid x:Name="grid">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition />
                 <ColumnDefinition Width="20" />
             </Grid.ColumnDefinitions>
-            <Rectangle Grid.ColumnSpan="2" HorizontalAlignment="Stretch" x:Name="Rectangle" VerticalAlignment="Stretch" Width="Auto" Height="Auto" RadiusX="3" RadiusY="3" Fill="{DynamicResource LightBrush}" Stroke="{DynamicResource NormalBorderBrush}" />
-            <Rectangle Grid.Column="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Width="Auto" Height="Auto" RadiusX="3" RadiusY="3" Fill="{DynamicResource LightBrush}" Stroke="{DynamicResource NormalBorderBrush}" />
-            <Border Margin="2,2,2,2" Grid.Column="1" Background="{DynamicResource NormalBrush}" x:Name="border" />
-            <Border Margin="2,2,2,2" Background="{DynamicResource HoverBrush}" x:Name="HoverBorder" Grid.Column="1" Opacity="0" />
-            <Border Margin="2,2,2,2" Background="{DynamicResource HoverShineBrush}" x:Name="HoverShineBorder" Grid.Column="1" Opacity="0" />
-            <Path Grid.Column="1" HorizontalAlignment="Center" x:Name="Arrow" VerticalAlignment="Center" Fill="{x:Null}" Data="M0.5,0.5 L3,6.5 5.5,0.5" Stroke="{DynamicResource GlyphBrush}" Margin="5,0,5,0" Height="7" StrokeThickness="2" Stretch="Fill" />
-            <Border Margin="2,2,2,2" Background="{DynamicResource ShineBrush}" x:Name="ShineBorder" Grid.Column="1" />
+            <Border Grid.Column="0" Background="Transparent" x:Name="border" />
+            <Border Grid.Column="1" Background="Transparent">
+                <Path HorizontalAlignment="Center" x:Name="Arrow" VerticalAlignment="Center" Fill="Transparent" Data="M0.5,0.5 L3,6.5 5.5,0.5" Stroke="{DynamicResource IndicatorBrush}" Margin="5,0,5,0" Height="7" StrokeThickness="2" Stretch="Fill" />
+            </Border>
         </Grid>
         <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver" Value="true">
-                <Trigger.ExitActions>
-                    <BeginStoryboard Storyboard="{StaticResource HoverOff}" x:Name="HoverOff_BeginStoryboard"/>
-                </Trigger.ExitActions>
-                <Trigger.EnterActions>
-                    <BeginStoryboard Storyboard="{StaticResource HoverOn}"/>
-                </Trigger.EnterActions>
-            </Trigger>
             <Trigger Property="IsChecked" Value="true" />
             <Trigger Property="IsEnabled" Value="False">
                 <Setter Property="Foreground" Value="{DynamicResource DisabledForegroundBrush}" />
@@ -1434,40 +1076,64 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
     <ControlTemplate x:Key="ComboBoxTextBox" TargetType="{x:Type TextBox}">
-        <Border x:Name="PART_ContentHost" Focusable="False" Background="{TemplateBinding Background}" />
+        <Border x:Name="PART_ContentHost" Focusable="False" Background="{DynamicResource ControlBackgroundBrush}" />
         <ControlTemplate.Triggers>
         </ControlTemplate.Triggers>
     </ControlTemplate>
     
-    <Style TargetType="{x:Type ComboBox}">
+    <Style TargetType="{x:Type ComboBox}" BasedOn="{StaticResource BaseStyle}">
         <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
         <Setter Property="SnapsToDevicePixels" Value="true" />
         <Setter Property="Template" Value="{DynamicResource ComboBoxTemplate}" />
         <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}"/>
-        <Setter Property="BorderBrush" Value="#FF000000"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource NormalBrush}"/>
+        <Setter Property="BorderThickness" Value="2" />
     </Style>
 
     <ControlTemplate x:Key="ComboBoxTemplate" TargetType="{x:Type ComboBox}">
+        <ControlTemplate.Resources>
+            <Storyboard x:Key="HoverOn">
+                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
+                    <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="0.5" />
+                </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+            <Storyboard x:Key="HoverOff">
+                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
+                    <SplineDoubleKeyFrame KeyTime="00:00:00.4000000" Value="0" />
+                </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+        </ControlTemplate.Resources>
         <Grid x:Name="grid">
-            <Border x:Name="Border" Opacity="1" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+            <Border x:Name="Border" Opacity="1" CornerRadius="3"
+                    BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
                 <Grid>
                     <ToggleButton Grid.Column="2" Template="{DynamicResource ComboBoxToggleButton}" x:Name="ToggleButton" Focusable="false" IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" ClickMode="Press" />
                     <ContentPresenter HorizontalAlignment="Left" Margin="3,3,23,3" x:Name="ContentSite" VerticalAlignment="Center" Content="{TemplateBinding SelectionBoxItem}" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" IsHitTestVisible="False" />
-                    <TextBox Visibility="Hidden" Template="{DynamicResource ComboBoxTextBox}" HorizontalAlignment="Left" Margin="3,3,23,3" x:Name="PART_EditableTextBox" Style="{x:Null}" VerticalAlignment="Center" Focusable="True" Background="{DynamicResource LightBrush}" IsReadOnly="{TemplateBinding IsReadOnly}" BorderBrush="{DynamicResource NormalBorderBrush}" Foreground="{DynamicResource TextBrush}" />
+                    <TextBox Visibility="Hidden" Template="{DynamicResource ComboBoxTextBox}" HorizontalAlignment="Left" Margin="3,3,23,3" x:Name="PART_EditableTextBox" Style="{x:Null}" VerticalAlignment="Center" Focusable="True"
+                             Background="{TemplateBinding Background}" IsReadOnly="{TemplateBinding IsReadOnly}" BorderBrush="{DynamicResource NormalBorderBrush}" Foreground="{DynamicResource TextBrush}" />
                     <Popup IsOpen="{TemplateBinding IsDropDownOpen}" Placement="Bottom" x:Name="Popup" Focusable="False" AllowsTransparency="True" PopupAnimation="Slide">
                         <Grid MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{TemplateBinding ActualWidth}" x:Name="DropDown" SnapsToDevicePixels="True">
-                            <Border x:Name="DropDownBorder" Background="{DynamicResource ControlBackgroundBrush}" />
-                            <ScrollViewer Margin="4,6,4,6" Style="{DynamicResource NuclearScrollViewer}" SnapsToDevicePixels="True" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" CanContentScroll="True" Foreground="{DynamicResource {x:Static SystemColors.ActiveCaptionTextBrushKey}}">
+                            <Border x:Name="DropDownBorder" Background="{DynamicResource PopupBackgroundBrush}" BorderThickness="{DynamicResource PopupBorderThickness}" BorderBrush="{DynamicResource PopupBorderBrush}" />
+                            <ScrollViewer Style="{DynamicResource NuclearScrollViewer}" SnapsToDevicePixels="True" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" CanContentScroll="True" Foreground="{DynamicResource {x:Static SystemColors.ActiveCaptionTextBrushKey}}">
                                 <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Contained" />
                             </ScrollViewer>
                         </Grid>
                     </Popup>
                 </Grid>
             </Border>
-            <Border x:Name="HoverBorder" IsHitTestVisible="False" Opacity="0" BorderBrush="{StaticResource GlyphBrush}" BorderThickness="{TemplateBinding BorderThickness}"  />
+            <Border x:Name="HoverBorder" IsHitTestVisible="False" Opacity="0" BorderBrush="{StaticResource GlyphBrush}" BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="3"/>
             <Border x:Name="FocusVisualElement" IsHitTestVisible="False" Opacity="0" BorderBrush="{StaticResource HoverShineBrush}" BorderThickness="{TemplateBinding BorderThickness}"  />
         </Grid>
         <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Trigger.ExitActions>
+                    <BeginStoryboard Storyboard="{StaticResource HoverOff}" x:Name="HoverOff_BeginStoryboard" />
+                </Trigger.ExitActions>
+                <Trigger.EnterActions>
+                    <BeginStoryboard Storyboard="{StaticResource HoverOn}" x:Name="HoverOn_BeginStoryboard" />
+                </Trigger.EnterActions>
+            </Trigger>
             <Trigger Property="HasItems" Value="false">
                 <Setter Property="MinHeight" Value="95" TargetName="DropDownBorder" />
             </Trigger>
@@ -1528,8 +1194,8 @@
                     </ControlTemplate.Resources>
                     <Grid SnapsToDevicePixels="true" Margin="1,1,1,1">
                         <Rectangle x:Name="Background" IsHitTestVisible="False" Opacity="0.25" Fill="{StaticResource NormalBrush}" RadiusX="1" RadiusY="1" />
-                        <Rectangle x:Name="HoverRectangle" IsHitTestVisible="False" Opacity="0" Fill="{StaticResource NormalBrush}" RadiusX="1" RadiusY="1" />
-                        <Rectangle x:Name="SelectedRectangle" IsHitTestVisible="False" Opacity="0" Fill="{StaticResource SelectedBackgroundBrush}" RadiusX="1" RadiusY="1" />
+                        <Rectangle x:Name="HoverRectangle" IsHitTestVisible="False" Opacity="0" Fill="{StaticResource GlyphBrush}" RadiusX="1" RadiusY="1" />
+                        <Rectangle x:Name="SelectedRectangle" IsHitTestVisible="False" Opacity="0" Fill="{StaticResource GlyphBrush}" RadiusX="1" RadiusY="1" />
                         <ContentPresenter Margin="5,2,0,2" x:Name="contentPresenter" VerticalAlignment="Center" />
                         <Rectangle x:Name="FocusVisualElement" Visibility="Collapsed" Stroke="{StaticResource HoverShineBrush}" StrokeThickness="1" RadiusX="1" RadiusY="1" />
                     </Grid>
@@ -1571,47 +1237,59 @@
                                 <SplineDoubleKeyFrame KeyTime="00:00:02" Value="0" />
                             </DoubleAnimationUsingKeyFrames>
                         </Storyboard>
-                        <Storyboard x:Key="IndeterminateOn">
+                        <!--<Storyboard x:Key="IndeterminateOn">
                             <DoubleAnimationUsingKeyFrames Storyboard.TargetName="IndeterminateGradientFill" Storyboard.TargetProperty="(Shape.Fill).(LinearGradientBrush.Transform).(TransformGroup.Children)[0].X" RepeatBehavior="Forever">
                                 <SplineDoubleKeyFrame KeyTime="0" Value="0" />
                                 <SplineDoubleKeyFrame KeyTime="00:00:2.4" Value="145" />
                             </DoubleAnimationUsingKeyFrames>
 
-                        </Storyboard>
+                        </Storyboard>-->
                     </ControlTemplate.Resources>
                     <Grid>
-                        <Border x:Name="PART_Track" BorderBrush="{DynamicResource SolidBorderBrush}" BorderThickness="1" CornerRadius="0,0,0,0" Background="{DynamicResource LightBrush}">
+                        <Border x:Name="PART_Track" BorderBrush="{DynamicResource NormalBorderBrush}" BorderThickness="2" CornerRadius="3"
+                                Background="{DynamicResource ControlBackgroundBrush}">
                             <Border.BitmapEffect>
                                 <OuterGlowBitmapEffect Opacity="0" GlowColor="{DynamicResource WhiteColor}" GlowSize="3" />
                             </Border.BitmapEffect>
                         </Border>
-                        <Border HorizontalAlignment="Left" x:Name="PART_Indicator" BorderBrush="{DynamicResource NormalBorderBrush}" BorderThickness="1" CornerRadius="0,0,0,0">
-                            <Border.Background>
-                                <LinearGradientBrush EndPoint=".7,1" StartPoint=".7,0">
-                                    <GradientStop Color="DarkGray" Offset="0" />
-                                    <GradientStop Color="{StaticResource MainColor}" Offset="1" />
-                                </LinearGradientBrush>
-                            </Border.Background>
-                        </Border>
+                        <Border HorizontalAlignment="Left" x:Name="PART_Indicator" BorderBrush="{DynamicResource NormalBorderBrush}"
+                                Background="{DynamicResource GlyphBrush}" BorderThickness="1" CornerRadius="3" />
                         <Grid x:Name="IndeterminateRoot" Visibility="Collapsed">
-                            <Rectangle Margin="{TemplateBinding BorderThickness}" x:Name="IndeterminateSolidFill" Opacity="1" RenderTransformOrigin="0.5,0.5" RadiusX="2" RadiusY="2" Fill="{DynamicResource ControlBackgroundBrush}" Stroke="#FF448DCA" StrokeThickness="0" />
-                            <Rectangle Margin="{TemplateBinding BorderThickness}" x:Name="IndeterminateGradientFill" RadiusX="2" RadiusY="2" StrokeThickness="1">
-                                <Rectangle.Fill>
-                                    <LinearGradientBrush EndPoint="0.508,1.394" StartPoint="0.401,-0.394" SpreadMethod="Repeat">
-                                        <GradientStop Color="#00FFFFFF" />
-                                        <GradientStop Color="#FEA1A1A1" Offset="1" />
-                                        <GradientStop Color="#00FEFEFE" Offset="0.517" />
-                                        <GradientStop Color="#FEA1A1A1" Offset="0.517" />
-                                        <LinearGradientBrush.Transform>
-                                            <TransformGroup>
-                                                <TranslateTransform X="0" />
-                                            </TransformGroup>
-                                        </LinearGradientBrush.Transform>
-                                    </LinearGradientBrush>
-                                </Rectangle.Fill>
-                            </Rectangle>
+                            <VisualStateManager.VisualStateGroups>
+                                <VisualStateGroup x:Name="CommonStates">
+                                    <VisualState x:Name="Determinate" />
+                                    <VisualState x:Name="Indeterminate" />
+                                </VisualStateGroup>
+                            </VisualStateManager.VisualStateGroups>
+
+                            <Border BorderBrush="{DynamicResource NormalBorderBrush}" BorderThickness="2" CornerRadius="3"
+                                Background="{DynamicResource ControlBackgroundBrush}" HorizontalAlignment="Left" ClipToBounds="True">
+                                <Border x:Name="DiagonalDecorator" Width="5000">
+                                    <Border.Background>
+                                        <DrawingBrush TileMode="Tile" Stretch="None" Viewbox="0,0,1,1" Viewport="0,0,36,34" ViewportUnits="Absolute">
+                                            <DrawingBrush.RelativeTransform>
+                                                <TranslateTransform X="0" Y="0" />
+                                            </DrawingBrush.RelativeTransform>
+                                            <DrawingBrush.Drawing>
+                                                <GeometryDrawing Brush="{DynamicResource IndicatorBrush}" Geometry="M0,0 18,0 36,34 18,34 Z" />
+                                            </DrawingBrush.Drawing>
+                                        </DrawingBrush>
+                                    </Border.Background>
+                                    <Border.Triggers>
+                                        <EventTrigger RoutedEvent="FrameworkElement.Loaded">
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <DoubleAnimation
+                                                    Storyboard.TargetProperty="(Border.Background).(DrawingBrush.RelativeTransform).(TranslateTransform.X)"
+                                                    From="0" To=".36" RepeatBehavior="Forever" Duration="0:0:40" />
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                        </EventTrigger>
+                                    </Border.Triggers>
+                                </Border>
+                            </Border>
                         </Grid>
-                        <Border Background="{DynamicResource DisabledBackgroundBrush}" Opacity="0" BorderThickness="1,1,1,1" BorderBrush="{DynamicResource DisabledBorderBrush}" x:Name="border"/>
+                        <Border Background="{DynamicResource DisabledBackgroundBrush}" Opacity="0" BorderThickness="1" BorderBrush="{DynamicResource DisabledBorderBrush}" x:Name="border"/>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsEnabled" Value="False">
@@ -1621,9 +1299,6 @@
                             <BeginStoryboard Storyboard="{StaticResource ValueChangedOn}" />
                         </EventTrigger>
                         <Trigger Property="IsIndeterminate" Value="True">
-                            <Trigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource IndeterminateOn}" />
-                            </Trigger.EnterActions>
                             <Setter Property="Visibility" TargetName="IndeterminateRoot" Value="Visible"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
@@ -1631,20 +1306,18 @@
             </Setter.Value>
         </Setter>
     </Style>
-    <Style TargetType="{x:Type TextBox}">
+    <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource BaseStyle}">
         <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="AllowDrop" Value="true" />
         <Setter Property="Template" Value="{DynamicResource TextBoxTemplate}" />
         <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
         <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}"/>
-        <Setter Property="BorderBrush" Value="#FF000000"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource NormalBrush}"/>
+        <Setter Property="BorderThickness" Value="2" />
+        <Setter Property="Padding" Value="3" />
     </Style>
 
-    <!--<Style TargetType="{x:Type controls:SearchBox}" BasedOn="{StaticResource {x:Type TextBox}}">
-        
-    </Style>-->
-
     <ControlTemplate x:Key="TextBoxTemplate" TargetType="{x:Type TextBox}">
         <ControlTemplate.Resources>
             <Storyboard x:Key="HoverOn">
@@ -1669,15 +1342,14 @@
             </Storyboard>
         </ControlTemplate.Resources>
         <Grid>
-            <Border x:Name="Border" Opacity="1" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-                <Grid>
-                    <Border BorderThickness="1">
-                        <ScrollViewer Margin="0" x:Name="PART_ContentHost" Style="{DynamicResource NuclearScrollViewer}" />
-                    </Border>
-                </Grid>
+            <Border x:Name="Border" Opacity="1" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" 
+                    Background="{TemplateBinding Background}" CornerRadius="3">
+                    <ScrollViewer Margin="0" x:Name="PART_ContentHost" Style="{DynamicResource NuclearScrollViewer}" />
             </Border>
-            <Border x:Name="HoverBorder" IsHitTestVisible="False" Opacity="0" BorderBrush="{StaticResource GlyphBrush}" BorderThickness="{TemplateBinding BorderThickness}"  />
-            <Border x:Name="FocusVisualElement" IsHitTestVisible="False" Opacity="0" BorderBrush="{StaticResource HoverShineBrush}" BorderThickness="{TemplateBinding BorderThickness}"  />
+            <Border x:Name="HoverBorder" IsHitTestVisible="False" Opacity="0" BorderBrush="{StaticResource GlyphBrush}" BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="3"/>
+            <Border x:Name="FocusVisualElement" IsHitTestVisible="False" Opacity="0" BorderBrush="{StaticResource HoverShineBrush}" BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="3"/>
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsFocused" Value="True">
@@ -1687,7 +1359,6 @@
                 <Trigger.EnterActions>
                     <BeginStoryboard Storyboard="{StaticResource FocusedOn}" x:Name="FocusedOn_BeginStoryboard" />
                 </Trigger.EnterActions>
-
             </Trigger>
             <MultiTrigger>
                 <MultiTrigger.ExitActions>
@@ -1700,12 +1371,9 @@
                     <Condition Property="IsMouseOver" Value="True" />
                     <Condition Property="IsFocused" Value="False" />
                 </MultiTrigger.Conditions>
-
             </MultiTrigger>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Background" TargetName="Border" Value="{DynamicResource DisabledBackgroundBrush}" />
-                <Setter Property="BorderBrush" TargetName="Border" Value="{DynamicResource DisabledBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource DisabledForegroundBrush}" />
+                <Setter Property="Opacity" Value="0.5" />
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
@@ -1867,7 +1535,8 @@
         <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}"/>
         <Setter Property="BorderBrush" Value="#FF000000"/>
     </Style>
-    <Style TargetType="{x:Type Label}">
+    <Style TargetType="{x:Type Label}" BasedOn="{StaticResource BaseStyle}">
+        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="VerticalContentAlignment" Value="Top" />
         <Setter Property="Template">
@@ -1882,22 +1551,19 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
     </Style>
 
     <Style TargetType="ContextMenu">
-        <Setter Property="Background" Value="{DynamicResource NormalBrushDark}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}" />
-        <Setter Property="BorderThickness" Value="2" />
+        <Setter Property="Background" Value="{DynamicResource PopupBackgroundBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource PopupBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource PopupBorderThickness}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ContextMenu}">
-                    <Grid>
-                        <Border Margin="1" x:Name="Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-                            <StackPanel Background="{DynamicResource NormalBrushDark}" IsItemsHost="True" ClipToBounds="True"/>
-                        </Border>
-                    </Grid>
+                    <Border x:Name="Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                        <StackPanel Background="{TemplateBinding Background}" IsItemsHost="True" ClipToBounds="True"/>
+                    </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter Property="Background" Value="{DynamicResource DisabledBackgroundBrush}" TargetName="Border" />
@@ -1914,54 +1580,32 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type MenuItem}">
-                    <ControlTemplate.Resources>
-                        <Storyboard x:Key="HighlightedOn">
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-                            </DoubleAnimationUsingKeyFrames>
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverShineBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                        <Storyboard x:Key="HightlightedOff">
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverShineBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                    </ControlTemplate.Resources>
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition MinWidth="17" Width="Auto" SharedSizeGroup="MenuItemIconColumnGroup" />
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIGTColumnGroup" />
-                                <ColumnDefinition Width="14" />
-                            </Grid.ColumnDefinitions>
-                            <Border Grid.Column="0" Grid.ColumnSpan="4" Background="{DynamicResource HoverBrush}" Opacity="0" x:Name="HoverBorder" />
-                            <Border Grid.ColumnSpan="4" Background="{DynamicResource HoverShineBrush}" Opacity="0" x:Name="HoverShineBorder" />
-                            <ContentPresenter Margin="4,0,6,0" x:Name="Icon" VerticalAlignment="Center" ContentSource="Icon" />
-                            <Grid Visibility="Hidden" Margin="8,0,6,0" x:Name="GlyphPanel" VerticalAlignment="Center">
-                                <Path x:Name="GlyphPanelpath" VerticalAlignment="Center" Fill="{TemplateBinding Foreground}" Data="M0,2 L0,4.8 L2.5,7.4 L7.1,2.8 L7.1,0 L2.5,4.6 z" FlowDirection="LeftToRight" />
-                            </Grid>
-                            <TextBlock VerticalAlignment="Center" Grid.Column="1" Padding="5" x:Name="HeaderHost" Foreground="{TemplateBinding Foreground}" >
-                                <ContentPresenter RecognizesAccessKey="True" ContentSource="Header"/>
-                            </TextBlock>
-                            <Grid Grid.Column="3" Margin="4,0,6,0" x:Name="ArrowPanel" VerticalAlignment="Center">
-                                <Path x:Name="ArrowPanelPath" VerticalAlignment="Center" Fill="{TemplateBinding Foreground}" Data="M0,0 L0,8 L4,4 z" />
-                            </Grid>
-                            <Popup IsOpen="{Binding Path=IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}" Placement="Right" x:Name="SubMenuPopup" Focusable="false" AllowsTransparency="true" PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimationKey}}">
-                                <Grid x:Name="SubMenu">
-                                    <Border x:Name="SubMenuBorder" Background="{DynamicResource LightBrush}" BorderThickness="1" Opacity="0.8">
-                                        <Border.BorderBrush>
-                                            <SolidColorBrush Color="{DynamicResource WhiteColor}" />
-                                        </Border.BorderBrush>
-                                    </Border>
-                                    <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
-                                </Grid>
-                            </Popup>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition MinWidth="17" Width="Auto" SharedSizeGroup="MenuItemIconColumnGroup" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIGTColumnGroup" />
+                            <ColumnDefinition Width="14" />
+                        </Grid.ColumnDefinitions>
+                        <Border Grid.Column="0" Grid.ColumnSpan="4" Background="{DynamicResource HoverBrush}" Opacity="0" x:Name="HoverBorder" />
+                        <ContentPresenter Margin="4,0,6,0" x:Name="Icon" VerticalAlignment="Center" ContentSource="Icon" />
+                        <Grid Visibility="Hidden" Margin="8,0,6,0" x:Name="GlyphPanel" VerticalAlignment="Center">
+                            <Path x:Name="GlyphPanelpath" VerticalAlignment="Center" Fill="{TemplateBinding Foreground}" Data="M0,2 L0,4.8 L2.5,7.4 L7.1,2.8 L7.1,0 L2.5,4.6 z" FlowDirection="LeftToRight" />
+                        </Grid>
+                        <TextBlock VerticalAlignment="Center" Grid.Column="1" Padding="5" x:Name="HeaderHost" Foreground="{TemplateBinding Foreground}"
+                                    Style="{StaticResource BaseTextBlockStyle}">
+                            <ContentPresenter RecognizesAccessKey="True" ContentSource="Header"/>
+                        </TextBlock>
+                        <Grid Grid.Column="3" Margin="4,0,6,0" x:Name="ArrowPanel" VerticalAlignment="Center">
+                            <Path x:Name="ArrowPanelPath" VerticalAlignment="Center" Fill="{TemplateBinding Foreground}" Data="M0,0 L0,8 L4,4 z" />
                         </Grid>
+                        <Popup IsOpen="{Binding Path=IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}" Placement="Right" x:Name="SubMenuPopup" Focusable="false" AllowsTransparency="true" PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimationKey}}">
+                            <Grid x:Name="SubMenu">
+                            <Border x:Name="SubMenuBorder" Background="{DynamicResource NormalBrushLight}" BorderBrush="{DynamicResource NormalBorderBrush}" BorderThickness="2"/>
+                                <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
+                            </Grid>
+                        </Popup>
+                    </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="Role" Value="TopLevelHeader">
                             <Setter Property="Margin" Value="0,1,0,1" />
@@ -2001,22 +1645,17 @@
                             <Setter Property="BitmapEffect" Value="{DynamicResource PopupDropShadow}" TargetName="SubMenuBorder" />
                         </Trigger>
                         <Trigger Property="IsHighlighted" Value="true">
-                            <Trigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource HightlightedOff}" x:Name="HightlightedOff_BeginStoryboard"/>
-                            </Trigger.ExitActions>
-                            <Trigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource HighlightedOn}"/>
-                            </Trigger.EnterActions>
+                            <Setter Property="Opacity" Value="1" TargetName="HoverBorder" />
                         </Trigger>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="Gray" TargetName="HeaderHost"/>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
-    <Style TargetType="{x:Type TabControl}">
+    <Style TargetType="{x:Type TabControl}" BasedOn="{StaticResource BaseStyle}">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabControl}">
@@ -2029,8 +1668,9 @@
                             <RowDefinition Height="Auto" x:Name="RowDefinition0" />
                             <RowDefinition Height="*" x:Name="RowDefinition1" />
                         </Grid.RowDefinitions>
-                        <Border Background="{DynamicResource LightBrush}" x:Name="border">
-                            <TabPanel x:Name="HeaderPanel" IsItemsHost="true" Panel.ZIndex="1" KeyboardNavigation.TabIndex="1" RenderTransformOrigin="0.5,0.5" Width="Auto" Height="Auto">
+                        <Border x:Name="border" Background="{DynamicResource ControlBackgroundBrush}"
+                                BorderThickness="0,0,0,1" BorderBrush="{DynamicResource NormalBorderBrush}">
+                            <TabPanel x:Name="HeaderPanel" IsItemsHost="true" Panel.ZIndex="1" KeyboardNavigation.TabIndex="1" RenderTransformOrigin="0.5,0.5" Width="Auto" Height="Auto" >
                                 <TabPanel.LayoutTransform>
                                     <TransformGroup>
                                         <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -2049,7 +1689,8 @@
                                 </TabPanel.RenderTransform>
                             </TabPanel>
                         </Border>
-                        <Border x:Name="ContentPanel" Grid.Column="0" Grid.Row="1" KeyboardNavigation.DirectionalNavigation="Contained" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local" Background="{DynamicResource ShadeBrush}" CornerRadius="0,0,2,2">
+                        <Border x:Name="ContentPanel" Grid.Column="0" Grid.Row="1" KeyboardNavigation.DirectionalNavigation="Contained" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local"
+                                Background="{DynamicResource ControlBackgroundBrush}">
                             <ContentPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" />
                         </Border>
                         <Border HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Width="Auto" Height="Auto" BorderThickness="0,0,0,1" Opacity="0.5" Margin="2,0,2,0" x:Name="border1">
@@ -2069,6 +1710,7 @@
                             <Setter Property="Height" TargetName="RowDefinition0" Value="*" />
                             <Setter Property="Height" TargetName="RowDefinition1" Value="Auto" />
                             <Setter Property="Grid.Row" TargetName="border" Value="1"/>
+                            <Setter Property="BorderThickness" TargetName="border" Value="0,1,0,0"/>
                             <Setter Property="CornerRadius" TargetName="ContentPanel" Value="2,2,0,0"/>
                             <Setter Property="CornerRadius" TargetName="border" Value="0,0,2,2"/>
                         </Trigger>
@@ -2082,6 +1724,7 @@
                             <Setter Property="Height" TargetName="RowDefinition0" Value="*" />
                             <Setter Property="Height" TargetName="RowDefinition1" Value="0" />
                             <Setter Property="Grid.Column" TargetName="border" Value="0"/>
+                            <Setter Property="BorderThickness" TargetName="border" Value="0,0,1,0"/>
                             <Setter Property="Margin" TargetName="border" Value="0,0,0,0"/>
                             <Setter Property="Margin" TargetName="ContentPanel" Value="0,0,0,0"/>
                             <Setter Property="LayoutTransform" TargetName="border1">
@@ -2108,6 +1751,7 @@
                             <Setter Property="Height" TargetName="RowDefinition0" Value="*" />
                             <Setter Property="Height" TargetName="RowDefinition1" Value="0" />
                             <Setter Property="Grid.Column" TargetName="border" Value="1"/>
+                            <Setter Property="BorderThickness" TargetName="border" Value="1,0,0,0"/>
                             <Setter Property="LayoutTransform" TargetName="border1">
                                 <Setter.Value>
                                     <TransformGroup>
@@ -2131,7 +1775,7 @@
         </Setter>
     </Style>
     <Style d:IsControlPart="True" TargetType="{x:Type TabItem}">
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource TextBrushDark}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabItem}">
@@ -2166,27 +1810,18 @@
                                 <TranslateTransform X="0" Y="0"/>
                             </TransformGroup>
                         </Grid.LayoutTransform>
-                        <Border x:Name="border" BorderBrush="{x:Null}" CornerRadius="2,2,2,2" Opacity="0.5">
-                            <Border.Background>
-                                <LinearGradientBrush EndPoint="0.5,0.976" StartPoint="0.5,0.039">
-                                    <GradientStop Color="#7F595959" Offset="0" />
-                                    <GradientStop Color="#19FFFFFF" Offset="1" />
-                                </LinearGradientBrush>
-                            </Border.Background>
+                        <Border x:Name="border" BorderBrush="{x:Null}" Opacity="0.5">
                         </Border>
-                        <Border x:Name="SelectedBorder" BorderBrush="{x:Null}" CornerRadius="2,2,2,2" Opacity="0" Background="{DynamicResource SelectedBackgroundBrush}"/>
-                        <Border x:Name="HoverBorder" BorderBrush="{x:Null}" CornerRadius="2,2,2,2" Opacity="0">
-                            <Border.Background>
-                                <LinearGradientBrush EndPoint="0.5,0.976" StartPoint="0.5,0.039">
-                                    <GradientStop Color="#7F595959" Offset="0" />
-                                    <GradientStop Color="#19FFFFFF" Offset="1" />
-                                </LinearGradientBrush>
-                            </Border.Background>
+                        <Border x:Name="SelectedBorder" Opacity="0"
+                                BorderThickness="0,0,0,2" BorderBrush="{DynamicResource IndicatorBrush}"/>
+                        <Border x:Name="HoverBorder" Opacity="0"
+                                BorderThickness="0,0,0,2" BorderBrush="{DynamicResource IndicatorBrush}">
                         </Border>
                         <Grid>
-                            <Border Padding="5">
-                            <ContentPresenter x:Name="ContentSite" RecognizesAccessKey="True" ContentSource="Header" d:LayoutOverrides="Width, Height" HorizontalAlignment="Center" Margin="6,1,6,1" VerticalAlignment="Center" />
-                            </Border>
+                            <TextBlock Padding="5" Foreground="{TemplateBinding Foreground}" x:Name="TextContent">
+                                <ContentPresenter x:Name="ContentSite" RecognizesAccessKey="True" ContentSource="Header" d:LayoutOverrides="Width, Height"
+                                                  HorizontalAlignment="Center" Margin="5" VerticalAlignment="Center"/>
+                            </TextBlock>
                         </Grid>
                     </Grid>
                     <ControlTemplate.Triggers>
@@ -2247,6 +1882,7 @@
                                 <Condition Property="IsMouseOver" Value="True" />
                                 <Condition Property="Selector.IsSelected" Value="False" />
                             </MultiTrigger.Conditions>
+                            <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
                         </MultiTrigger>
                         <Trigger Property="IsSelected" Value="True">
                             <Trigger.ExitActions>
@@ -2256,14 +1892,14 @@
                                 <BeginStoryboard Storyboard="{StaticResource SelectedOn}" x:Name="SelectedOn_BeginStoryboard"/>
                             </Trigger.EnterActions>
                             <Setter Property="Panel.ZIndex" Value="100" />
+                            <Setter Property="Foreground" Value="{DynamicResource TextBrush}" TargetName="TextContent"/>
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsMouseOver" Value="True" SourceName="grid" />
                                 <Condition Property="Selector.IsSelected" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter Property="Background" TargetName="border" Value="{DynamicResource SelectedBackgroundBrush}" />
-                            <Setter Property="Opacity" TargetName="border" Value="0.9" />
+                            <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
                         </MultiTrigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter Property="Foreground" Value="{DynamicResource DisabledForegroundBrush}" />
@@ -2704,70 +2340,25 @@
     </Style>
 
     <BorderGapMaskConverter x:Key="BorderGapMaskConverter" />
-    <Style TargetType="{x:Type GroupBox}">
+    <Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource BaseStyle}">
         <Setter Property="BorderBrush" Value="#D5DFE5" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type GroupBox}">
-                    <Grid SnapsToDevicePixels="true">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="6" />
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="6" />
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="*" />
-                            <RowDefinition Height="6" />
-                        </Grid.RowDefinitions>
-                        <Border Grid.ColumnSpan="4" Grid.RowSpan="4" Background="{DynamicResource LightBrush}" CornerRadius="4,4,4,4" BorderThickness="1,1,1,1" />
-                        <Border Grid.ColumnSpan="4" Grid.Row="1" Grid.RowSpan="3" BorderThickness="1,1,1,1" CornerRadius="4" BorderBrush="{DynamicResource NormalBorderBrush}">
-                            <Border.OpacityMask>
-                                <MultiBinding Converter="{StaticResource BorderGapMaskConverter}" ConverterParameter="7">
-                                    <Binding Path="ActualWidth" ElementName="Header" />
-                                    <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}" />
-                                    <Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}" />
-                                </MultiBinding>
-                            </Border.OpacityMask>
-                            <Border BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3">
-                                <Border.BorderBrush>
-                                    <SolidColorBrush Color="{DynamicResource MainColor}" />
-                                </Border.BorderBrush>
-                                <Border BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2">
-                                    <Border.BorderBrush>
-                                        <SolidColorBrush Color="{DynamicResource MainColor}" />
-                                    </Border.BorderBrush>
-                                </Border>
-                            </Border>
-                        </Border>
-                        <Border Grid.Column="0" Grid.ColumnSpan="4" Grid.Row="1" Grid.RowSpan="3" Background="{TemplateBinding Background}" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="4" />
-                        <Border Grid.ColumnSpan="4" Grid.RowSpan="2" Background="{DynamicResource NormalBrush}" BorderThickness="1,1,1,0" CornerRadius="2,2,0,0" x:Name="Main" BorderBrush="{DynamicResource NormalBorderBrush}" />
-                        <Rectangle Opacity="1" Stroke="{x:Null}" RadiusX="3" RadiusY="3" VerticalAlignment="Stretch" Height="Auto" x:Name="Shine" Grid.ColumnSpan="4" Grid.RowSpan="2" Margin="1,1,1,1">
-                            <Rectangle.Fill>
-                                <LinearGradientBrush EndPoint="0.5,0.971" StartPoint="0.5,0.042">
-                                    <GradientStop Color="#26FFFFFF" Offset="0" />
-                                    <GradientStop Color="#00FFFFFF" Offset="1" />
-                                </LinearGradientBrush>
-                            </Rectangle.Fill>
-                        </Rectangle>
-
-                        <Border x:Name="Header" Grid.Column="1" Grid.Row="0" Grid.RowSpan="2" Padding="3,1,3,0">
-                            <ContentPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" ContentSource="Header" RecognizesAccessKey="True" Margin="0,4,0,4" />
-                        </Border>
+                    <DockPanel Margin="{TemplateBinding Padding}">
+                        <Border x:Name="Header" DockPanel.Dock="Top" BorderThickness="0,0,0,1" BorderBrush="{StaticResource NormalBrush}" Padding="5,5,0,5">
+                            <TextBlock Style="{StaticResource BaseTextBlockStyle}">
+                                <ContentPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" ContentSource="Header" RecognizesAccessKey="True" />
+                            </TextBlock>
+                        </Border>                        
 
-                        <ContentPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Margin="{TemplateBinding Padding}" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="2" />
-                    </Grid>
+                        <ContentPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" DockPanel.Dock="Top"
+                                          Margin="{TemplateBinding Padding}"/>
+                    </DockPanel>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <Setter Property="Foreground">
-            <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource WhiteColor}" />
-            </Setter.Value>
-        </Setter>
     </Style>
 
     <SolidColorBrush x:Key="ListBorder" Color="#828790" />
@@ -2793,7 +2384,7 @@
                         </DockPanel>
                         <ScrollBar Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Cursor="Arrow" x:Name="PART_HorizontalScrollBar" Grid.Row="1" Orientation="Horizontal" ViewportSize="{TemplateBinding ViewportWidth}" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0.0" Value="{Binding Path=HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" />
                         <ScrollBar Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Cursor="Arrow" x:Name="PART_VerticalScrollBar" Grid.Column="1" Orientation="Vertical" ViewportSize="{TemplateBinding ViewportHeight}" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0.0" Value="{Binding Path=VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" />
-                        <Rectangle Grid.Row="1" Grid.Column="1" Fill="{DynamicResource NormalBrush}"/>
+                        <Rectangle Grid.Row="1" Grid.Column="1" Fill="{DynamicResource ControlBackgroundBrush}"/>
                         
                         <!--<DockPanel Grid.Column="1" Grid.Row="1" Background="Transparent" LastChildFill="false">
                             <Rectangle Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Width="1" Fill="White" DockPanel.Dock="Left" />
@@ -2805,10 +2396,9 @@
         </Setter>
     </Style>
     <Style TargetType="{x:Type ListView}">
-        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-        <Setter Property="BorderBrush" Value="{StaticResource ListBorder}" />
+        <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Foreground" Value="#FF042271" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
@@ -2817,7 +2407,6 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ListView}">
                     <Border x:Name="Bd" BorderThickness="0" CornerRadius="0,0,0,0" BorderBrush="{DynamicResource DefaultedBorderBrush}" Background="{DynamicResource ControlBackgroundBrush}">
-
                         <ScrollViewer Padding="{TemplateBinding Padding}" Style="{DynamicResource {x:Static GridView.GridViewScrollViewerStyleKey}}">
                             <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </ScrollViewer>
@@ -2835,95 +2424,36 @@
             </Setter.Value>
         </Setter>
     </Style>
-    <Style x:Key="ListViewItemFocusVisual">
-        <Setter Property="Control.Template">
-            <Setter.Value>
-                <ControlTemplate>
-                    <Rectangle Stroke="#8E6EA6F5" StrokeThickness="1" RadiusX="2" RadiusY="2" />
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
 
     <Style TargetType="{x:Type ListViewItem}">
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
-        <Setter Property="FocusVisualStyle" Value="{StaticResource ListViewItemFocusVisual}" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Margin" Value="1"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ListViewItem}">
-                    <ControlTemplate.Resources>
-                        <Storyboard x:Key="HoverOn">
-
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-                            </DoubleAnimationUsingKeyFrames>
-
-                        </Storyboard>
-                        <Storyboard x:Key="HoverOff">
-
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="HoverRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.4000000" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-
-                        </Storyboard>
-                        <Storyboard x:Key="SelectedOn">
-
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-                            </DoubleAnimationUsingKeyFrames>
-
-                        </Storyboard>
-                        <Storyboard x:Key="SelectedOff">
-
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.4000000" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-
-                        </Storyboard>
-                        <Storyboard x:Key="FocussedOn">
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="FocusVisualElement" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                        <Storyboard x:Key="FocussedOff">
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="FocusVisualElement" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                    </ControlTemplate.Resources>
-                    <Border SnapsToDevicePixels="true" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0" CornerRadius="0" x:Name="border" Background="Transparent">
-
-                        <Grid Margin="0">
+                    <Border SnapsToDevicePixels="true" BorderThickness="0" CornerRadius="0" x:Name="border" Background="Transparent">
+                        <Grid>
                             <Rectangle x:Name="Background" IsHitTestVisible="False" Opacity="0.25" Fill="{StaticResource NormalBrush}" RadiusX="1" RadiusY="1"/>
                             <Rectangle x:Name="HoverRectangle" IsHitTestVisible="False" Opacity="0" Fill="{StaticResource NormalBrush}" RadiusX="1" RadiusY="1"/>
                             <Rectangle x:Name="SelectedRectangle" IsHitTestVisible="False" Opacity="0" Fill="{StaticResource SelectedBackgroundBrush}" RadiusX="1" RadiusY="1"/>
-                            <GridViewRowPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Margin="0" VerticalAlignment="Stretch" />
+                            <GridViewRowPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Stretch"/>
+                            <Rectangle x:Name="FocusVisualElement" Stroke="{StaticResource HoverShineBrush}" StrokeThickness="1" RadiusX="1" RadiusY="1" Opacity="0"/>
                         </Grid>
-
                     </Border>
                     <ControlTemplate.Triggers>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter Property="Opacity" Value="1" TargetName="FocusVisualElement" />
+                        </Trigger>
                         <Trigger Property="IsSelected" Value="true">
-                            <Trigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource SelectedOff}" x:Name="SelectedOff_BeginStoryboard"/>
-                            </Trigger.ExitActions>
-                            <Trigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource SelectedOn}" x:Name="SelectedOn_BeginStoryboard"/>
-                            </Trigger.EnterActions>
+                            <Setter Property="Opacity" Value="1" TargetName="SelectedRectangle" />
                         </Trigger>
                         <MultiTrigger>
-                            <MultiTrigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource HoverOff}" x:Name="HoverOff_BeginStoryboard"/>
-                            </MultiTrigger.ExitActions>
-                            <MultiTrigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource HoverOn}"/>
-                            </MultiTrigger.EnterActions>
+                            <Setter Property="Opacity" Value="1" TargetName="HoverRectangle" />
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsMouseOver" Value="True" />
                                 <Condition Property="Selector.IsSelected" Value="False" />
@@ -2949,15 +2479,6 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <Style.Triggers>
-            <Trigger Property="Selector.IsSelected" Value="True">
-                <Setter Property="Foreground">
-                    <Setter.Value>
-                        <SolidColorBrush Color="{DynamicResource BlackColor}" />
-                    </Setter.Value>
-                </Setter>
-            </Trigger>
-        </Style.Triggers>
     </Style>
 
 
@@ -3043,7 +2564,9 @@
                                 <Border.BorderBrush>
                                     <SolidColorBrush Color="{DynamicResource WhiteColor}"/>
                                 </Border.BorderBrush>
-                                <ContentPresenter VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="Left" RecognizesAccessKey="True" Margin="2,2,2,2" />
+                                <TextBlock Style="{StaticResource BaseTextBlockStyle}">
+                                    <ContentPresenter VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="Left" RecognizesAccessKey="True" Margin="2,2,2,2" />
+                                </TextBlock>
                             </Border>
                             <Thumb x:Name="PART_HeaderGripper" HorizontalAlignment="Right" Margin="0,0,-9,0" Style="{StaticResource GridViewColumnHeaderGripper}" />
                         </Grid>
@@ -3327,9 +2850,10 @@
             </Setter.Value>
         </Setter>
         <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
-    </Style>   
+    </Style>
 
     <Style TargetType="Hyperlink">
+        <Setter Property="FontSize" Value="14" />
         <Setter Property="Foreground" Value="LightGray" />
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
@@ -3338,9 +2862,10 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="DetailsHyperlink" TargetType="Hyperlink">
-        <Setter Property="FontSize" Value="16"/>
-        <Setter Property="Foreground" Value="LightGray" />        
+    <Style x:Key="DetailsHyperlink" TargetType="Hyperlink" BasedOn="{StaticResource {x:Type Hyperlink}}">
+        <Setter Property="FontSize" Value="16" />
+        <Setter Property="Foreground" Value="LightGray" />
+        <Setter Property="TextDecorations" Value="{x:Null}" />
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
                 <Setter Property="Foreground" Value="White" />
@@ -3379,8 +2904,6 @@
                             </LinearGradientBrush>
                         </Border.Background>
 
-
-
                         <StackPanel Name="PART_Root" Orientation="Horizontal">
                             <CalendarItem Name="PART_CalendarItem" Style="{TemplateBinding CalendarItemStyle}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" VerticalAlignment="Center" />
                             <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Margin="4 4 0 4">
@@ -3407,9 +2930,36 @@
         <Setter Property="Background" Value="{StaticResource NormalBrushDark}" />
     </Style>
 
-    <Style x:Key="ContextSeparator" TargetType="Separator">
+    <Style TargetType="Separator">
+        <Setter Property="Background" Value="{DynamicResource NormalBorderBrush}" />
         <Setter Property="Margin" Value="-50,2,0,2" />
-        <Setter Property="Background" Value="DarkGray" />
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Separator}">
+                    <Border BorderBrush="{TemplateBinding BorderBrush}"  BorderThickness="{TemplateBinding BorderThickness}" 
+                            Background="{TemplateBinding Background}" Height="2" SnapsToDevicePixels="true"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="BottomButton" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Margin" Value="5" />
+        <Setter Property="Padding" Value="15,8,15,8" />
+        <Setter Property="MinWidth" Value="60" />
+    </Style>
+
+    <Style x:Key="HighlightBorder" TargetType="Border">
+        <Setter Property="BorderBrush" Value="{StaticResource NormalBrush}" />
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="BorderBrush" Value="{StaticResource GlyphBrush}" />
+            </Trigger>
+            <Trigger Property="IsFocused" Value="True">
+                <Setter Property="BorderBrush" Value="{StaticResource GlyphBrush}" />
+            </Trigger>
+        </Style.Triggers>
     </Style>
 </ResourceDictionary>
 
diff --git a/source/PlayniteUI/Windows/AboutWindow.xaml b/source/PlayniteUI/Windows/AboutWindow.xaml
index 9709fdc82..1ccf354f6 100644
--- a/source/PlayniteUI/Windows/AboutWindow.xaml
+++ b/source/PlayniteUI/Windows/AboutWindow.xaml
@@ -7,45 +7,46 @@
         mc:Ignorable="d"
         WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
         Title="About Playnite" ResizeMode="NoResize" Height="315" Width="400"
-        AutomationProperties.AutomationId="WindowAbout">
-    <Grid Background="{StaticResource NormalBrush}">
-        <DockPanel Margin="10">
-            <StackPanel Orientation="Horizontal" DockPanel.Dock="Top">
-                <Image Source="/Images/applogo.png" Width="64" Height="64" RenderOptions.BitmapScalingMode="Fant"/>             
+        AutomationProperties.AutomationId="WindowAbout"
+        Background="{StaticResource NormalBrush}">   
 
-                <StackPanel Margin="15,0,0,0">
-                    <TextBlock Name="TextVersionInfo" Text="{Binding VersionInfo, RelativeSource={RelativeSource AncestorType=Window}}"
-                               Foreground="{StaticResource TextBrush}" FontSize="20"/>
-                    <TextBlock Text="by Josef Nemec" Foreground="LightGray"/>
-                    <TextBlock>
-                        <Hyperlink Name="HyperlinkHomepage" FontSize="12" NavigateUri="http://www.playnite.link"
-                                   RequestNavigate="Hyperlink_RequestNavigate">
-                            Homepage at www.playnite.link
-                        </Hyperlink>
-                    </TextBlock>
-                    <TextBlock>
-                        <Hyperlink Name="HyperlinkSource" FontSize="12" NavigateUri="https://github.com/JosefNemec/Playnite/"
-                                   RequestNavigate="Hyperlink_RequestNavigate">
-                            Source Code at GitHub
-                        </Hyperlink>
-                    </TextBlock>
-                </StackPanel>
-            </StackPanel>
+    <DockPanel Margin="5">
+        <DockPanel  Margin="-5,0,-5,-5" LastChildFill="False" DockPanel.Dock="Bottom">
+            <Button Name="ButtonCreatePackage" Content="Create diag. package" Click="DiagButton_Click"
+                    Style="{StaticResource BottomButton}"/>
+            <Button Name="ButtonClose" Content="Close" DockPanel.Dock="Right" Click="CloseButton_Click" IsCancel="True"
+                    Style="{StaticResource BottomButton}"/>
+        </DockPanel>
             
-            <DockPanel Margin="0,10,0,0" LastChildFill="False" DockPanel.Dock="Bottom">
-                <Button Name="ButtonCreatePackage" Content="Create diag. package" Padding="5" Click="DiagButton_Click"/>
-                <Button Name="ButtonClose" Content="Close" Padding="10,5,10,5"  DockPanel.Dock="Right" Click="CloseButton_Click" IsCancel="True"/>
-            </DockPanel>
+        <StackPanel Orientation="Horizontal" DockPanel.Dock="Top" Margin="10">
+            <Image Source="/Images/applogo.png" Width="64" Height="64" RenderOptions.BitmapScalingMode="Fant"/>             
 
-            <ScrollViewer Margin="0,5,0,0" DockPanel.Dock="Top">
-            <TextBox AcceptsReturn="True" IsReadOnly="True" TextWrapping="Wrap" Text="MIT License&#x0a;&#x0a;Copyright (c) 2017 Josef Nemec&#x0a;&#x0a;Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &quot;Software&quot;), to deal
+            <StackPanel Margin="15,0,0,0">
+                <Label Name="TextVersionInfo" Content="{Binding VersionInfo, RelativeSource={RelativeSource AncestorType=Window}}"
+                        Foreground="{StaticResource TextBrush}" FontSize="20"/>
+                <TextBlock Text="by Josef Nemec" Foreground="LightGray"/>
+                <TextBlock>
+                    <Hyperlink Name="HyperlinkHomepage" FontSize="12" NavigateUri="http://www.playnite.link"
+                                RequestNavigate="Hyperlink_RequestNavigate">
+                        Homepage at www.playnite.link
+                    </Hyperlink>
+                </TextBlock>
+                <TextBlock>
+                    <Hyperlink Name="HyperlinkSource" FontSize="12" NavigateUri="https://github.com/JosefNemec/Playnite/"
+                                RequestNavigate="Hyperlink_RequestNavigate">
+                        Source Code at GitHub
+                    </Hyperlink>
+                </TextBlock>
+            </StackPanel>
+        </StackPanel>
+
+        <TextBox AcceptsReturn="True" IsReadOnly="True" TextWrapping="Wrap" DockPanel.Dock="Top"
+                    Margin="0,5,0,0" ScrollViewer.VerticalScrollBarVisibility="Auto"
+                    Text="MIT License&#x0a;&#x0a;Copyright (c) 2017 Josef Nemec&#x0a;&#x0a;Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &quot;Software&quot;), to deal
 in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:&#x0a;&#x0a;The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.&#x0a;&#x0a;THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-            "/>
-            </ScrollViewer>
-        </DockPanel>
-        
-    </Grid>
+        "/>
+    </DockPanel>
 </Window>
diff --git a/source/PlayniteUI/Windows/CategoryConfigWindow.xaml b/source/PlayniteUI/Windows/CategoryConfigWindow.xaml
index 0e990e99e..bdba9ae5b 100644
--- a/source/PlayniteUI/Windows/CategoryConfigWindow.xaml
+++ b/source/PlayniteUI/Windows/CategoryConfigWindow.xaml
@@ -9,31 +9,35 @@
         Background="{StaticResource NormalBrush}"
         WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
         AutomationProperties.AutomationId="WindowCategories">
-    <Grid>
-        <DockPanel>
-            <DockPanel Margin="10" LastChildFill="False" Height="25" DockPanel.Dock="Bottom">
-                <Button Name="ButtonCancel" Click="ButtonCancel_Click" Content="Cancel" Padding="15,0,15,0" DockPanel.Dock="Right" Margin="10,0,0,0"  IsCancel="True"/>
-                <Button Name="ButtonOK" Click="ButtonOK_Click" Content="OK" Padding="20,0,20,0" DockPanel.Dock="Right"/>
-            </DockPanel>
+ 
+    <DockPanel Margin="5">
+        <DockPanel LastChildFill="False" DockPanel.Dock="Bottom" Margin="-5,0,-5,-5">
+            <Button Name="ButtonCancel" Click="ButtonCancel_Click" Content="Cancel" 
+                    Style="{StaticResource BottomButton}" DockPanel.Dock="Right" IsCancel="True"/>
+            <Button Name="ButtonOK" Click="ButtonOK_Click" Content="Set Categories"
+                    Style="{StaticResource BottomButton}" DockPanel.Dock="Right"/>
+        </DockPanel>
 
-            <DockPanel DockPanel.Dock="Bottom" Margin="10,5,10,5" >
-                <Button Name="ButtonAddCat" Content="Add Category" DockPanel.Dock="Left" Padding="10,0,10,0"
+        <Border Padding="8" Background="{StaticResource NormalBrushDark}" DockPanel.Dock="Bottom"
+                BorderThickness="0">
+            <DockPanel>
+                <Button Name="ButtonAddCat" Content="Add Category" DockPanel.Dock="Left" Padding="10,5,10,5"
                         Click="ButtonAddCat_Click"/>
-                <TextBox Name="TextNewCat" DockPanel.Dock="Left" Margin="10,0,0,0"/>
+                <TextBox Name="TextNewCat" DockPanel.Dock="Left" Margin="10,0,0,0" VerticalAlignment="Center"/>
             </DockPanel>
+        </Border>
 
-            <ListBox Name="ListCategories" DockPanel.Dock="Top" BorderThickness="0" Margin="10">
-                <ListBox.ItemContainerStyle>
-                    <Style TargetType="ListBoxItem">
-                        <Setter Property="BorderThickness" Value="0"/>
-                    </Style>
-                </ListBox.ItemContainerStyle>
-                <ListBox.ItemTemplate>
-                    <DataTemplate>
-                        <CheckBox IsChecked="{Binding Enabled}" Content="{Binding Name}" IsThreeState="True" />
-                    </DataTemplate>
-                </ListBox.ItemTemplate>
-            </ListBox>
-        </DockPanel>
-    </Grid>
+        <ListBox Name="ListCategories" DockPanel.Dock="Top" BorderThickness="0">
+            <ListBox.ItemContainerStyle>
+                <Style TargetType="ListBoxItem">
+                    <Setter Property="BorderThickness" Value="0"/>
+                </Style>
+            </ListBox.ItemContainerStyle>
+            <ListBox.ItemTemplate>
+                <DataTemplate>
+                    <CheckBox IsChecked="{Binding Enabled}" Content="{Binding Name}" IsThreeState="True" />
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+        </ListBox>
+    </DockPanel>
 </Window>
diff --git a/source/PlayniteUI/Windows/CrashHandlerWindow.xaml b/source/PlayniteUI/Windows/CrashHandlerWindow.xaml
index e57687c3c..147143178 100644
--- a/source/PlayniteUI/Windows/CrashHandlerWindow.xaml
+++ b/source/PlayniteUI/Windows/CrashHandlerWindow.xaml
@@ -7,29 +7,26 @@
         mc:Ignorable="d"
         Title="Oh no, something bad happened..." Height="400" Width="600"
         WindowStartupLocation="CenterScreen"
-        AutomationProperties.AutomationId="WindowCrash">
-    <Grid Background="{DynamicResource NormalBrush}">
-        <DockPanel>            
-            <DockPanel Margin="10" LastChildFill="False" Height="25" DockPanel.Dock="Bottom">
-                <Button Name="ButtonClose" Click="ButtonClose_Click" Content="Close Playnite" Padding="15,0,15,0" DockPanel.Dock="Right" Margin="10,0,0,0"/>
-                <Button Name="ButtonSaveDiag" Click="ButtonSaveDiag_Click" Content="Create diag. package" Padding="15,0,15,0" DockPanel.Dock="Right"/>
-            </DockPanel>
-            <DockPanel DockPanel.Dock="Top" Margin="20">
-                <Image Source="/Images/Icons/warn_big.png" Width="64" RenderOptions.BitmapScalingMode="Fant" />
-                <StackPanel Margin="20,10,10,10">
-                    <TextBlock Text="Playnite come across problem, which cannot be solved. If you want to help us solving it, please create diagnostics package and file an issue:" 
-                               FontSize="14" TextWrapping="Wrap" />
-                    <TextBlock FontSize="14" Margin="0,10,0,0">
-                        <Hyperlink Style="{DynamicResource DetailsHyperlink}" Foreground="LightCoral"
-                            NavigateUri="https://github.com/JosefNemec/Playnite/issues" RequestNavigate="Hyperlink_RequestNavigate">
-                            Create Issue
-                        </Hyperlink>
-                    </TextBlock>
-                </StackPanel>
-            </DockPanel>
-            <ScrollViewer DockPanel.Dock="Top">
-                <TextBox IsReadOnly="True" TextWrapping="Wrap" AcceptsReturn="True" Name="TextDetails" />
-            </ScrollViewer>
+        AutomationProperties.AutomationId="WindowCrash"
+        Background="{DynamicResource NormalBrush}">
+   
+    <DockPanel Margin="5">
+        <DockPanel LastChildFill="False" DockPanel.Dock="Bottom" Margin="-5,0,-5,-5">
+            <Button Name="ButtonClose" Click="ButtonClose_Click" Content="Close Playnite" DockPanel.Dock="Right" 
+                    Style="{StaticResource BottomButton}"/>
+            <Button Name="ButtonSaveDiag" Click="ButtonSaveDiag_Click" Content="Create diag. package" DockPanel.Dock="Left"
+                    Style="{StaticResource BottomButton}"/>
+            <Button Name="ButtonReportIssue" Click="ButtonReportIssue_Click" Content="Report Issue" DockPanel.Dock="Left"
+                    Style="{StaticResource BottomButton}"/>
         </DockPanel>
-    </Grid>
+        <DockPanel DockPanel.Dock="Top" Margin="10">
+            <Image Source="/Images/Icons/warn_big.png" Width="64" RenderOptions.BitmapScalingMode="Fant" />
+            <StackPanel Margin="20,10,10,10">
+                <TextBlock Text="Playnite come across problem, which cannot be solved. If you want to help us solving it, please create diagnostics package and report an issue." 
+                           FontSize="14" TextWrapping="Wrap" Foreground="{StaticResource TextBrush}" />               
+            </StackPanel>
+        </DockPanel>
+        <TextBox IsReadOnly="True" TextWrapping="Wrap" AcceptsReturn="True" Name="TextDetails"
+                 DockPanel.Dock="Top" VerticalScrollBarVisibility="Auto"/>
+    </DockPanel>
 </Window>
diff --git a/source/PlayniteUI/Windows/CrashHandlerWindow.xaml.cs b/source/PlayniteUI/Windows/CrashHandlerWindow.xaml.cs
index ed79ae3b5..84c54d01f 100644
--- a/source/PlayniteUI/Windows/CrashHandlerWindow.xaml.cs
+++ b/source/PlayniteUI/Windows/CrashHandlerWindow.xaml.cs
@@ -57,10 +57,9 @@ private void ButtonSaveDiag_Click(object sender, RoutedEventArgs e)
             }
         }
 
-        private void Hyperlink_RequestNavigate(object sender, System.Windows.Navigation.RequestNavigateEventArgs e)
+        private void ButtonReportIssue_Click(object sender, RoutedEventArgs e)
         {
-            Process.Start(e.Uri.AbsoluteUri);
-            e.Handled = true;
+            Process.Start(@"https://github.com/JosefNemec/Playnite/issues");
         }
     }
 }
diff --git a/source/PlayniteUI/Windows/FirstTimeStartupWindow.xaml b/source/PlayniteUI/Windows/FirstTimeStartupWindow.xaml
index 77e2c7395..fb5bb632d 100644
--- a/source/PlayniteUI/Windows/FirstTimeStartupWindow.xaml
+++ b/source/PlayniteUI/Windows/FirstTimeStartupWindow.xaml
@@ -16,16 +16,16 @@
         <playniteUI:EnumBooleanConverter x:Key="EnumBooleanConverter" />
     </Window.Resources>
 
-    <Grid Margin="4">
+    <Grid Margin="5">
         <Grid.RowDefinitions>
             <RowDefinition Height="*"/>
-            <RowDefinition Height="30"/>
+            <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
         <TabControl DockPanel.Dock="Top" Grid.Column="0" Grid.Row="0"
                     Name="TabMain"
                     SelectionChanged="TabControl_SelectionChanged">
-            <TabItem Header="Welcome" Visibility="Collapsed">
+            <TabItem Header="Welcome" Visibility="Collapsed" Foreground="{StaticResource TextBrush}">
                 <DockPanel LastChildFill="False" Margin="20">
                     <TextBlock Text="Welcome" VerticalAlignment="Center" FontSize="16" DockPanel.Dock="Top"/>
                     <TextBlock Text="This wizard will guide you through automatic game import process and configuration of external game libraries. Playnite can automatically import games from multiple game services like Steam or GOG, and also keep your library up to date by updating it automaticaly during application startup." 
@@ -34,7 +34,7 @@
                                TextWrapping="Wrap" DockPanel.Dock="Top" Margin="0,20,0,0"/>
                 </DockPanel>                
             </TabItem>
-            <TabItem Header="Database" Visibility="Collapsed">
+            <TabItem Header="Database" Visibility="Collapsed" Foreground="{StaticResource TextBrush}">
                 <DockPanel Margin="20" LastChildFill="False">
                     <TextBlock Text="Database Location" VerticalAlignment="Center" FontSize="16" DockPanel.Dock="Top"/>
                     <TextBlock Text="Choose location for library database file. Location can be also changed later via Settings menu." DockPanel.Dock="Top" Margin="5,20,5,0" TextWrapping="Wrap"/>
@@ -45,14 +45,14 @@
                                  IsChecked="{Binding Path=DatabaseLocation, Converter={StaticResource EnumBooleanConverter}, ConverterParameter=Custom, ElementName=WindowMain}"
                                  DockPanel.Dock="Top" Margin="5"/>
                     <DockPanel DockPanel.Dock="Top" Margin="15,5,5,5" IsEnabled="{Binding IsChecked, ElementName=RadioDbCustom}">
-                        <Button Content=". . ." DockPanel.Dock="Right" Padding="5,0,5,0" Name="ButtonBrowserDbFile"
+                        <Button Content=" ... " DockPanel.Dock="Right" Padding="5,0,5,0" Name="ButtonBrowserDbFile"
                                 Click="ButtonBrowserDbFile_Click" />
                         <TextBox AcceptsReturn="False" Margin="10,0,5,0" DockPanel.Dock="Left"
                                  Name="TextDbFile" Text="{Binding DatabasePath, ElementName=WindowMain}"/>
                     </DockPanel>
                 </DockPanel>
             </TabItem>
-            <TabItem Header="General" Visibility="Collapsed">                
+            <TabItem Header="General" Visibility="Collapsed" Foreground="{StaticResource TextBrush}">                
                 <DockPanel Margin="20" LastChildFill="False">
                     <TextBlock Text="External Library Integration" VerticalAlignment="Center" FontSize="16" DockPanel.Dock="Top"/>
                     <TextBlock Text="Automatically import games from following services:" DockPanel.Dock="Top" Margin="5,20,5,0"/>
@@ -65,7 +65,7 @@
                               DockPanel.Dock="Top" Margin="5" Name="CheckEnableOrigin"/>
                 </DockPanel>
             </TabItem>
-            <TabItem Header="Steam" Visibility="Collapsed">
+            <TabItem Header="Steam" Visibility="Collapsed" Foreground="{StaticResource TextBrush}">
                 <DockPanel Margin="20" LastChildFill="False">
                     <StackPanel Orientation="Horizontal" DockPanel.Dock="Top" Margin="0,0,0,10">
                         <Image Source="/Images/steamicon.png" Width="32" RenderOptions.BitmapScalingMode="Fant"/>
@@ -78,8 +78,8 @@
                                  IsChecked="{Binding SteamImportLibrary, ElementName=WindowMain}"
                                  DockPanel.Dock="Top" Margin="5"/>
                     <DockPanel DockPanel.Dock="Top" Margin="30,5,5,5">
-                        <TextBlock Text="Account name:" />
-                        <TextBlock DockPanel.Dock="Right">           
+                        <TextBlock Text="Account name:" VerticalAlignment="Center" />
+                        <TextBlock DockPanel.Dock="Right" VerticalAlignment="Center">           
                             <Hyperlink NavigateUri="https://github.com/JosefNemec/Playnite/wiki/How-to-get-Steam-account-name"  RequestNavigate="Hyperlink_RequestNavigate">
                                 What's my account name?
                             </Hyperlink>
@@ -90,7 +90,7 @@
                     </DockPanel>
                 </DockPanel>
             </TabItem>
-            <TabItem Header="GOG" Visibility="Collapsed">
+            <TabItem Header="GOG" Visibility="Collapsed" Foreground="{StaticResource TextBrush}">
                 <DockPanel Margin="20" LastChildFill="False">
                     <StackPanel Orientation="Horizontal" DockPanel.Dock="Top" Margin="0,0,0,10">
                         <Image Source="/Images/gogicon.png" Width="32" RenderOptions.BitmapScalingMode="Fant"/>
@@ -107,7 +107,7 @@
                             Click="ButtonGogAuthenticate_Click"/>
                 </DockPanel>
             </TabItem>
-            <TabItem Header="Origin" Visibility="Collapsed">
+            <TabItem Header="Origin" Visibility="Collapsed" Foreground="{StaticResource TextBrush}">
                 <DockPanel Margin="20" LastChildFill="False">
                     <StackPanel Orientation="Horizontal" DockPanel.Dock="Top" Margin="0,0,0,10">
                         <Image Source="/Images/originicon.png" Width="32" RenderOptions.BitmapScalingMode="Fant"/>
@@ -124,20 +124,20 @@
                             Click="ButtonOriginAuthenticate_Click"/>
                 </DockPanel>
             </TabItem>
-            <TabItem Header="Custom" Visibility="Collapsed">
+            <TabItem Header="Custom" Visibility="Collapsed" Foreground="{StaticResource TextBrush}">
                 <DockPanel Margin="20" LastChildFill="False">
                     <StackPanel Orientation="Horizontal" DockPanel.Dock="Top" Margin="0,0,0,10">
                         <Image Source="/Images/applogo.png" Width="32" RenderOptions.BitmapScalingMode="Fant"/>
                         <TextBlock Text="Other games" VerticalAlignment="Center" FontSize="16" Margin="10,0,0,0"/>
                     </StackPanel>
-                    <TextBlock Text="Click on 'Import Games' button to import other installed games or browser for them manually."
+                    <TextBlock Text="Click on the button bellow to import other installed games or browse for them manually."
                                DockPanel.Dock="Top" Padding="5" TextWrapping="Wrap"/>
-                    <Button Name="ButtonImportGames" HorizontalAlignment="Center" Content="Import Games" DockPanel.Dock="Top" Padding="5"
-                            Click="ButtonImportGames_Click"/>
+                    <Button Name="ButtonImportGames" HorizontalAlignment="Center" Content="Import Games" DockPanel.Dock="Top"
+                            Click="ButtonImportGames_Click" Margin="0,20,0,0"/>
                 </DockPanel>
             </TabItem>
 
-            <TabItem Header="Done" Visibility="Collapsed">
+            <TabItem Header="Done" Visibility="Collapsed" Foreground="{StaticResource TextBrush}">
                 <DockPanel LastChildFill="False" Margin="20">
                     <TextBlock Text="Configuration Finished" VerticalAlignment="Center" FontSize="16" DockPanel.Dock="Top"/>
                     <TextBlock Text="Intial setup has been completed. Remember that you can change all settings later via 'Settings' menu." 
@@ -150,13 +150,13 @@
             </TabItem>
         </TabControl>
 
-        <DockPanel Margin="0,5,0,0" LastChildFill="False" Grid.Column="0" Grid.Row="1">
-            <Button Content="Finish" Name="ButtonFinish" Click="ButtonFinish_Click"
-                    DockPanel.Dock="Right" Margin="10,0,5,0" Width="60" />
-            <Button Content="Next" Name="ButtonNext" Click="ButtonNext_Click"
-                    DockPanel.Dock="Right" Margin="10,0,10,0" Width="60" />
-            <Button Content="Back" Name="ButtonBack" Click="ButtonBack_Click"
-                    DockPanel.Dock="Right" Width="60"/>
+        <DockPanel Margin="-5,0,-5,-5" LastChildFill="False" Grid.Column="0" Grid.Row="1">
+            <Button Content="Finish" Name="ButtonFinish" Click="ButtonFinish_Click" DockPanel.Dock="Right" 
+                    Style="{StaticResource BottomButton}" />
+            <Button Content="Next" Name="ButtonNext" Click="ButtonNext_Click" DockPanel.Dock="Right" 
+                    Style="{StaticResource BottomButton}" />
+            <Button Content="Back" Name="ButtonBack" Click="ButtonBack_Click" DockPanel.Dock="Right" 
+                    Style="{StaticResource BottomButton}" />
         </DockPanel>
     </Grid>
 </Window>
diff --git a/source/PlayniteUI/Windows/GameEditWindow.xaml b/source/PlayniteUI/Windows/GameEditWindow.xaml
index 3179b29ae..6d0e239c8 100644
--- a/source/PlayniteUI/Windows/GameEditWindow.xaml
+++ b/source/PlayniteUI/Windows/GameEditWindow.xaml
@@ -8,9 +8,9 @@
         xmlns:playnite="clr-namespace:Playnite;assembly=Playnite"
         mc:Ignorable="d"
         Title="Edit Game Details"
-        Background="{StaticResource NormalBrush}" Height="650" Width="900"
+        Background="{StaticResource NormalBrush}" Height="550" Width="800"
         WindowStartupLocation="CenterOwner"
-        Name="mainWindow" ResizeMode="CanResizeWithGrip"
+        Name="mainWindow"
         LocationChanged="MainWindow_LocationChanged"
         Loaded="MainWindow_Loaded"
         SizeChanged="MainWindow_SizeChanged"
@@ -22,28 +22,41 @@
         <local:NullableDateToStringConverter x:Key="NullableDateToStringConverter" />
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
         <local:InvertableBooleanToVisibilityConverter x:Key="InvertableBooleanToVisibilityConverter" />
+
+        <Style TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}" />
     </Window.Resources>
 
-    <Grid Margin="4">
+    <Grid Margin="5">
         <Grid.RowDefinitions>
             <RowDefinition Height="*"/>
-            <RowDefinition Height="30"/>
+            <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
         <TabControl Name="TabControlMain" DockPanel.Dock="Top" Grid.Column="0" Grid.Row="0">
-            <TabItem Header="General" >
-                <Grid Margin="5,3,0,0">
+            <TabItem Header="General">
+                <Grid Margin="5">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="70*"/>
-                        <ColumnDefinition Width="30*"/>
+                        <ColumnDefinition Width="35*"/>
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition />
                     </Grid.RowDefinitions>
                     <Grid Grid.Column="0" Grid.Row="0" Margin="5,0,3,0">
+                        <Grid.Resources>
+                            <Style TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}" >
+                                <Setter Property="Margin" Value="3" />
+                            </Style>
+                            <Style TargetType="CheckBox" BasedOn="{StaticResource {x:Type CheckBox}}" >
+                                <Setter Property="Margin" Value="0,5,0,0" />
+                            </Style>
+                            <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}" >
+                                <Setter Property="Margin" Value="0,3,0,0" />
+                            </Style>
+                        </Grid.Resources>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="100"/>
-                            <ColumnDefinition Width="18"/>
+                            <ColumnDefinition Width="Auto"/>
                             <ColumnDefinition Width="*"/>
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
@@ -60,32 +73,32 @@
                             <RowDefinition Height="*"/>
                         </Grid.RowDefinitions>
 
-                        <TextBlock Text="Id" Grid.Column="0" Grid.Row="0" Margin="0,1,0,0"
+                        <TextBlock Text="Id" Grid.Column="0" Grid.Row="0"
                                    Visibility="{Binding Source={x:Static playnite:Constants.IsDebugBuild}, Converter={StaticResource BooleanToVisibilityConverter}}" />
-                        <TextBox Grid.Column="2" Grid.Row="0" IsReadOnly="True" Text="{Binding ProviderId, Mode=OneTime}" Margin="0,1,0,0"
+                        <TextBox Grid.Column="2" Grid.Row="0" IsReadOnly="True" Text="{Binding ProviderId, Mode=OneTime}"
                                  Visibility="{Binding Source={x:Static playnite:Constants.IsDebugBuild}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
 
-                        <TextBlock  Grid.Column="0" Grid.Row="1" Text="Name" Margin="0,1,0,0"/>
-                        <CheckBox   Grid.Column="1" Grid.Row="1" Name="CheckName" VerticalAlignment="Center"
+                        <TextBlock  Grid.Column="0" Grid.Row="1" Text="Name"/>
+                        <CheckBox   Grid.Column="1" Grid.Row="1" Name="CheckName"
                                     Visibility="{Binding CheckBoxesVisible, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
                                     IsChecked="{Binding IsNameBindingDirty, ElementName=mainWindow, Mode=OneWay}"/>
-                        <TextBox    Grid.Column="2" Grid.Row="1" Name="TextName" Margin="0,1,0,0"
+                        <TextBox    Grid.Column="2" Grid.Row="1" Name="TextName"
                                     Text="{Binding Name, UpdateSourceTrigger=Explicit}"
                                     TextChanged="TextBox_TextChanged" Tag="IsNameBindingDirty"/>
 
-                        <TextBlock  Grid.Column="0" Grid.Row="2" Text="Genre(s)"  Margin="0,1,0,0"/>
-                        <CheckBox   Grid.Column="1" Grid.Row="2" Name="CheckGenres" VerticalAlignment="Center"
+                        <TextBlock  Grid.Column="0" Grid.Row="2" Text="Genre(s)" />
+                        <CheckBox   Grid.Column="1" Grid.Row="2" Name="CheckGenres"
                                     Visibility="{Binding CheckBoxesVisible, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
                                     IsChecked="{Binding IsGenreBindingDirty, ElementName=mainWindow, Mode=OneWay}"/>
-                        <TextBox    Grid.Column="2" Grid.Row="2" Name="TextGenres" Margin="0,1,0,0"
+                        <TextBox    Grid.Column="2" Grid.Row="2" Name="TextGenres"
                                     Text="{Binding Genres, UpdateSourceTrigger=Explicit, Converter={StaticResource ListToStringConverter}}"
                                     TextChanged="TextBox_TextChanged" Tag="IsGenreBindingDirty"/>
 
-                        <TextBlock  Grid.Column="0" Grid.Row="3" Text="Release date" Margin="0,1,0,0"/>
-                        <CheckBox   Grid.Column="1" Grid.Row="3" Name="CheckReleaseDate" VerticalAlignment="Center"
+                        <TextBlock  Grid.Column="0" Grid.Row="3" Text="Release date"/>
+                        <CheckBox   Grid.Column="1" Grid.Row="3" Name="CheckReleaseDate"
                                     Visibility="{Binding CheckBoxesVisible, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
                                     IsChecked="{Binding IsReleaseDateBindingDirty, ElementName=mainWindow, Mode=OneWay}"/>
-                        <Grid       Grid.Column="2" Grid.Row="3" Margin="0,1,0,0">
+                        <Grid       Grid.Column="2" Grid.Row="3">
                             <TextBox Text="{x:Static playnite:Constants.DateUiFormat}" Foreground="LightGray"
                                      Visibility="{Binding ElementName=TextReleaseDate, Path=Text.IsEmpty, Converter={StaticResource BooleanToVisibilityConverter}}" />
                             <TextBox Name="TextReleaseDate" Background="Transparent"
@@ -93,117 +106,113 @@
                                      TextChanged="TextBox_TextChanged" Tag="IsReleaseDateBindingDirty"/>
                         </Grid>
 
-                        <TextBlock  Grid.Column="0" Grid.Row="4" Text="Developer(s)" Margin="0,1,0,0" />
-                        <CheckBox   Grid.Column="1" Grid.Row="4" Name="CheckDeveloper" VerticalAlignment="Center"
+                        <TextBlock  Grid.Column="0" Grid.Row="4" Text="Developer(s)"/>
+                        <CheckBox   Grid.Column="1" Grid.Row="4" Name="CheckDeveloper"
                                     Visibility="{Binding CheckBoxesVisible, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
                                     IsChecked="{Binding IsDeveloperBindingDirty, ElementName=mainWindow, Mode=OneWay}"/>
-                        <TextBox    Grid.Column="2" Grid.Row="4" Name="TextDeveloper" Margin="0,1,0,0"
+                        <TextBox    Grid.Column="2" Grid.Row="4" Name="TextDeveloper"
                                     Text="{Binding Developers, UpdateSourceTrigger=Explicit, Converter={StaticResource ListToStringConverter}}"
                                     TextChanged="TextBox_TextChanged" Tag="IsDeveloperBindingDirty"/>
 
-                        <TextBlock  Grid.Column="0" Grid.Row="5" Text="Publisher(s)" Margin="0,1,0,0" />
-                        <CheckBox   Grid.Column="1" Grid.Row="5" Name="CheckPublisher" VerticalAlignment="Center"
+                        <TextBlock  Grid.Column="0" Grid.Row="5" Text="Publisher(s)" />
+                        <CheckBox   Grid.Column="1" Grid.Row="5" Name="CheckPublisher"
                                     Visibility="{Binding CheckBoxesVisible, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
                                     IsChecked="{Binding IsPublisherBindingDirty, ElementName=mainWindow, Mode=OneWay}"/>
-                        <TextBox    Grid.Column="2" Grid.Row="5" Name="TextPublisher" Margin="0,1,0,0"
+                        <TextBox    Grid.Column="2" Grid.Row="5" Name="TextPublisher"
                                     Text="{Binding Publishers, UpdateSourceTrigger=Explicit, Converter={StaticResource ListToStringConverter}}"
                                     TextChanged="TextBox_TextChanged" Tag="IsPublisherBindingDirty"/>
 
-                        <TextBlock  Grid.Column="0" Grid.Row="6" Text="Categories" Margin="0,1,0,0" />
-                        <CheckBox   Grid.Column="1" Grid.Row="6" Name="CheckCategories" VerticalAlignment="Center"
+                        <TextBlock  Grid.Column="0" Grid.Row="6" Text="Categories" />
+                        <CheckBox   Grid.Column="1" Grid.Row="6" Name="CheckCategories"
                                     Visibility="{Binding CheckBoxesVisible, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
                                     IsChecked="{Binding IsCategoriesBindingDirty, ElementName=mainWindow, Mode=OneWay}"/>
-                        <DockPanel Grid.Column="2" Grid.Row="6" Margin="0,1,0,0">
-                            <Button Name="ButtonPickCat" Click="ButtonPickCat_Click" Content=". . ."  DockPanel.Dock="Right" Padding="5,0,5,0"/>
+                        <DockPanel Grid.Column="2" Grid.Row="6">
+                            <Button Name="ButtonPickCat" Click="ButtonPickCat_Click" Content="..."  DockPanel.Dock="Right" Padding="5,0,5,0" Margin="2" />
                             <TextBox Name="TextCategories"  Text="{Binding Categories, UpdateSourceTrigger=Explicit, Converter={StaticResource ListToStringConverter}}"
                                     TextChanged="TextBox_TextChanged" Tag="IsCategoriesBindingDirty" DockPanel.Dock="Left"/>
                         </DockPanel>
 
-                        <TextBlock  Grid.Column="0" Grid.Row="7" Text="Store URL" Margin="0,1,0,0" />
-                        <CheckBox   Grid.Column="1" Grid.Row="7" Name="CheckStore" VerticalAlignment="Center"
+                        <TextBlock  Grid.Column="0" Grid.Row="7" Text="Store URL" />
+                        <CheckBox   Grid.Column="1" Grid.Row="7" Name="CheckStore"
                                     Visibility="{Binding CheckBoxesVisible, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
                                     IsChecked="{Binding IsStoreBindingDirty, ElementName=mainWindow, Mode=OneWay}"/>
-                        <TextBox    Grid.Column="2" Grid.Row="7" Name="TextStore" Margin="0,1,0,0"
+                        <TextBox    Grid.Column="2" Grid.Row="7" Name="TextStore"
                                     Text="{Binding StoreUrl, UpdateSourceTrigger=Explicit}"
                                     TextChanged="TextBox_TextChanged" Tag="IsStoreBindingDirty"/>
 
-                        <TextBlock  Grid.Column="0" Grid.Row="8" Text="Wiki URL" Margin="0,1,0,0" />
-                        <CheckBox   Grid.Column="1" Grid.Row="8" Name="CheckWiki" VerticalAlignment="Center"
+                        <TextBlock  Grid.Column="0" Grid.Row="8" Text="Wiki URL" />
+                        <CheckBox   Grid.Column="1" Grid.Row="8" Name="CheckWiki"
                                     Visibility="{Binding CheckBoxesVisible, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
                                     IsChecked="{Binding IsWikiBindingDirty, ElementName=mainWindow, Mode=OneWay}"/>
-                        <TextBox    Grid.Column="2" Grid.Row="8" Name="TextWiki" Margin="0,1,0,0"
+                        <TextBox    Grid.Column="2" Grid.Row="8" Name="TextWiki"
                                     Text="{Binding WikiUrl, UpdateSourceTrigger=Explicit}"
                                     TextChanged="TextBox_TextChanged" Tag="IsWikiBindingDirty"/>
 
-                        <TextBlock  Grid.Column="0" Grid.Row="9" Text="Forums URL" Margin="0,1,0,0" />
-                        <CheckBox   Grid.Column="1" Grid.Row="9" Name="CheckForums" VerticalAlignment="Center"
+                        <TextBlock  Grid.Column="0" Grid.Row="9" Text="Forums URL" />
+                        <CheckBox   Grid.Column="1" Grid.Row="9" Name="CheckForums"
                                     Visibility="{Binding CheckBoxesVisible, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
                                     IsChecked="{Binding IsForumsBindingDirty, ElementName=mainWindow, Mode=OneWay}"/>                        
-                        <TextBox    Grid.Column="2" Grid.Row="9" Name="TextForums" Margin="0,1,0,0"
+                        <TextBox    Grid.Column="2" Grid.Row="9" Name="TextForums"
                                     Text="{Binding CommunityHubUrl, UpdateSourceTrigger=Explicit}"
                                     TextChanged="TextBox_TextChanged" Tag="IsForumsBindingDirty"/>
 
-                        <TextBlock  Grid.Column="0" Grid.Row="10" Text="Description" Margin="0,1,0,0" />
-                        <CheckBox   Grid.Column="1" Grid.Row="10" Name="CheckDescription" Margin="0,2,0,0"
+                        <TextBlock  Grid.Column="0" Grid.Row="10" Text="Description" />
+                        <CheckBox   Grid.Column="1" Grid.Row="10" Name="CheckDescription"
                                     Visibility="{Binding CheckBoxesVisible, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
-                                    IsChecked="{Binding IsDescriptionBindingDirty, ElementName=mainWindow, Mode=OneWay}"/>
-                        <ScrollViewer Grid.Column="2" Grid.Row="10" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" Margin="0,1,0,0">
-                            <TextBox TextWrapping="Wrap" AcceptsReturn="True" Name="TextDescription"
-                                     Text="{Binding Description, UpdateSourceTrigger=Explicit}"
-                                     TextChanged="TextBox_TextChanged" Tag="IsDescriptionBindingDirty"/>
-                        </ScrollViewer>
+                                    IsChecked="{Binding IsDescriptionBindingDirty, ElementName=mainWindow, Mode=OneWay}"/>                        
+                        <TextBox    Grid.Column="2" Grid.Row="10" TextWrapping="Wrap" AcceptsReturn="True" Name="TextDescription"
+                                    ScrollViewer.VerticalScrollBarVisibility="Auto"
+                                    Text="{Binding Description, UpdateSourceTrigger=Explicit}"
+                                    TextChanged="TextBox_TextChanged" Tag="IsDescriptionBindingDirty"/>
                     </Grid>
                     <Grid Grid.Column="1" Grid.Row="0"  Margin="0,0,2,0">
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="110" />
+                            <RowDefinition Height="Auto" />
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition/>
                         </Grid.ColumnDefinitions>
-                        <GroupBox Grid.Column="0" Grid.Row="0" Header="Icon">
+                        <GroupBox Grid.Column="0" Grid.Row="0" Header="Icon" Padding="10,10,10,0">
                             <GroupBox.HeaderTemplate>
                                 <DataTemplate>
                                     <StackPanel Orientation="Horizontal">
                                         <CheckBox Name="CheckIcon" VerticalAlignment="Center" Loaded="CheckIcon_Loaded"
                                                   Visibility="{Binding CheckBoxesVisible, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
                                                   IsChecked="{Binding IsIconBindingDirty, ElementName=mainWindow, Mode=OneWay}"/>
-                                    <TextBlock Text="{Binding}" />
+                                        <TextBlock Text="{Binding}" Style="{StaticResource BaseTextBlockStyle}" />
                                     </StackPanel>
                                 </DataTemplate>
                             </GroupBox.HeaderTemplate>
                             <DockPanel LastChildFill="True">
-                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,5,0,5" DockPanel.Dock="Top">
-                                    <Button Name="ButtonSelectIcon" Content="Select Icon" Width="80" Height="25" Click="ButtonSelectIcon_Click" />
-                                    <Button Name="ButtonUseExeIcon" Content=" Use exe's icon " Height="25" Click="ButtonExecIcon_Click" Margin="5,0,0,0"/>
+                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,0,0,5" DockPanel.Dock="Top">
+                                    <Button Name="ButtonSelectIcon" Content="Select Icon" Click="ButtonSelectIcon_Click" />
+                                    <Button Name="ButtonUseExeIcon" Content=" Use exe's icon " Click="ButtonExecIcon_Click" Margin="5,0,0,0"/>
                                 </StackPanel>
                                 <Image Source="{Binding Icon, UpdateSourceTrigger=Explicit, Mode=TwoWay, Converter={StaticResource LiteDBImageToImageConverter}}"
                                        Stretch="Uniform" StretchDirection="DownOnly" RenderOptions.BitmapScalingMode="Fant" Name="ImageIcon"
-                                       DockPanel.Dock="Top" Tag="IsIconBindingDirty"
-                                       AutomationProperties.HelpText="{Binding Icon}"/>
-
+                                       DockPanel.Dock="Top" Tag="IsIconBindingDirty" MaxHeight="64"
+                                       AutomationProperties.HelpText="{Binding Icon, TargetNullValue=''}"/>
                             </DockPanel>
                         </GroupBox>
-                        <GroupBox Grid.Column="0" Grid.Row="1" Header="Cover Image" Margin="0,2,0,0">
+                        <GroupBox Grid.Column="0" Grid.Row="1" Header="Cover Image" Margin="0,5,0,0" Padding="10">
                             <GroupBox.HeaderTemplate>
                                 <DataTemplate>
                                     <StackPanel Orientation="Horizontal">
                                         <CheckBox Name="CheckImage" VerticalAlignment="Center" Loaded="CheckImage_Loaded"
                                                   Visibility="{Binding CheckBoxesVisible, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
                                                   IsChecked="{Binding IsImageBindingDirty, ElementName=mainWindow, Mode=OneWay}"/>
-                                        <TextBlock Text="{Binding}" />
+                                        <TextBlock Text="{Binding}" Style="{StaticResource BaseTextBlockStyle}" />
                                     </StackPanel>
                                 </DataTemplate>
                             </GroupBox.HeaderTemplate>
-                            <DockPanel LastChildFill="True">
-                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,5,0,5" DockPanel.Dock="Top">
-                                    <Button Name="ButtonSelectImage" Width="80" Height="25" Content="Select Image" Click="ButtonSelectImage_Click"
-                                            Margin="0,0,5,0"/>
-                                </StackPanel>
+                            <DockPanel LastChildFill="True">                                
+                                <Button Name="ButtonSelectImage" Content="Select Image" Click="ButtonSelectImage_Click"
+                                        DockPanel.Dock="Top" MaxWidth="120" Margin="0,0,0,5" />
                                 <Image Source="{Binding Image, UpdateSourceTrigger=Explicit, Mode=TwoWay, Converter={StaticResource LiteDBImageToImageConverter}}"
                                        Stretch="Uniform" StretchDirection="DownOnly" RenderOptions.BitmapScalingMode="Fant" Name="ImageImage"
                                        DockPanel.Dock="Top" Tag="IsImageBindingDirty"
-                                       AutomationProperties.HelpText="{Binding Image}"/>
+                                       AutomationProperties.HelpText="{Binding Image, TargetNullValue=''}"/>
                             </DockPanel>
                         </GroupBox>
                     </Grid>
@@ -213,33 +222,33 @@
             <TabItem Header="Actions" Name="TabActions">
                 <ScrollViewer VerticalScrollBarVisibility="Auto">
                     <StackPanel>
-                        <GroupBox Header="Play Action" Padding="2" Margin="2,5,2,0">
+                        <GroupBox Header="Play Action" Padding="10">
                             <StackPanel>
-                                <Button Name="ButtonAddPlay" Content="Add Play Action" Width="120" Height="25" Click="ButtonAddPlayAction_Click" HorizontalAlignment="Left"
+                                <Button Name="ButtonAddPlay" Content="Add Play Action"  Click="ButtonAddPlayAction_Click" HorizontalAlignment="Left"
                                         Visibility="{Binding ShowAddPlayAction, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
                                         Margin="0,5,0,5"/>
-                                <Button Name="ButtonRemovePlay" Content="Remove Play Action" Width="120" Height="25" Click="ButtonRemovePlayAction_Click" HorizontalAlignment="Left"
+                                <Button Name="ButtonRemovePlay" Content="Remove Play Action"  Click="ButtonRemovePlayAction_Click" HorizontalAlignment="Left"
                                         Visibility="{Binding ShowRemovePlayAction, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
                                         Margin="0,5,0,5"/>
                                 <local:GameTaskView x:Name="TaskPlay" DataContext="{Binding TempPlayTask, ElementName=mainWindow}"
                                         Visibility="{Binding ShowPlayActionEdit, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"/>
                             </StackPanel>
                         </GroupBox>
-                        <GroupBox Header="Other Actions" Padding="2" Margin="2,5,2,0">
+                        <GroupBox Header="Other Actions" Padding="10">
                             <StackPanel>
                                 <ItemsControl Name="OtherTasksItems">
                                     <ItemsControl.ItemTemplate>
                                         <DataTemplate>
-                                            <Border BorderThickness="2" BorderBrush="{StaticResource NormalBrush}" CornerRadius="2" Padding="3" Margin="0,5,0,0">
-                                                <StackPanel>
+                                            <Border BorderThickness="1" BorderBrush="{StaticResource NormalBrush}" CornerRadius="3" Padding="5" Margin="0,0,0,10">
+                                                <StackPanel Margin="10">
                                                     <local:GameTaskView x:Name="TaskCustom"/>
-                                                    <Button Content="Delete Action" Width="120" Height="25" Click="ButtonDeleteAction_Click" HorizontalAlignment="Right" Margin="0,3,5,3"/>
+                                                    <Button Content="Delete Action" Click="ButtonDeleteAction_Click" HorizontalAlignment="Right" Margin="0,10,0,0"/>
                                                 </StackPanel>
                                             </Border>
                                         </DataTemplate>
                                     </ItemsControl.ItemTemplate>
                                 </ItemsControl>
-                                <Button Name="ButtonAddAction" Content="Add Action" Width="80" Height="25" Click="ButtonAddAction_Click" HorizontalAlignment="Left"
+                                <Button Name="ButtonAddAction" Content="Add Action" Click="ButtonAddAction_Click" HorizontalAlignment="Left"
                                         Margin="0,5,0,5"/>
                             </StackPanel>
                         </GroupBox>
@@ -248,13 +257,13 @@
             </TabItem>
         </TabControl>
 
-        <DockPanel Margin="0,5,0,0" LastChildFill="False" Grid.Column="0" Grid.Row="1">
-            <Button Name="ButtonDownload" Content=" Download data from Web... " DockPanel.Dock="Left" Padding="7,0,7,0"
-                    Click="ButtonDownload_Click"/>
-            <Button Name="ButtonCancel" Content="Cancel" Width="60" DockPanel.Dock="Right" Margin="10,0,10,0" IsCancel="True"
-                    Click="ButtonCancel_Click"/>
-            <Button Name="ButtonOK" Content="OK" Width="60" DockPanel.Dock="Right"
-                    Click="ButtonOK_Click"/>
-        </DockPanel>
+        <DockPanel LastChildFill="False" Grid.Column="0" Grid.Row="1" Margin="-5,0,-5,-5">
+            <Button Name="ButtonDownload" Content=" Download data from Web... " DockPanel.Dock="Left"
+                    Click="ButtonDownload_Click" Style="{StaticResource BottomButton}"/>
+            <Button Name="ButtonCancel" Content="Cancel" DockPanel.Dock="Right" IsCancel="True"
+                    Click="ButtonCancel_Click" Style="{StaticResource BottomButton}"/>
+            <Button Name="ButtonOK" Content="Save" DockPanel.Dock="Right"
+                    Click="ButtonOK_Click" Style="{StaticResource BottomButton}"/>
+        </DockPanel>        
     </Grid>
 </Window>
diff --git a/source/PlayniteUI/Windows/InstalledGamesWindow.xaml b/source/PlayniteUI/Windows/InstalledGamesWindow.xaml
index 0c6e02f53..0c97892f3 100644
--- a/source/PlayniteUI/Windows/InstalledGamesWindow.xaml
+++ b/source/PlayniteUI/Windows/InstalledGamesWindow.xaml
@@ -7,24 +7,30 @@
         xmlns:playniteUI="clr-namespace:PlayniteUI"
         mc:Ignorable="d"
         Background="{StaticResource NormalBrush}" WindowStartupLocation="CenterOwner"
-        Title="Select games to import" Height="400" Width="700" ResizeMode="CanResizeWithGrip"
+        Title="Select games to import" Height="400" Width="700"
         Loaded="Window_Loaded"
         AutomationProperties.AutomationId="WindowInstalledGames">
     <Window.Resources>
         <playniteUI:IconToImageSourceConverter x:Key="IconToImageSourceConverter" />
     </Window.Resources>
 
-    <Grid Margin="4">
+    <Grid Margin="5">
         <Grid.RowDefinitions>
             <RowDefinition Height="*"/>
-            <RowDefinition Height="30"/>
+            <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>        
         
         <ListView Grid.Column="0" Grid.Row="0" Name="ListPrograms" SelectionMode="Single"
                   ItemsSource="{Binding Programs, RelativeSource={RelativeSource AncestorType=Window}}">
+            <ListView.ItemContainerStyle>
+                <Style TargetType="ListViewItem" BasedOn="{StaticResource {x:Type ListViewItem}}">
+                    <Setter Property="AutomationProperties.Name" Value="{Binding Name}" />
+                    <Setter Property="AutomationProperties.HelpText" Value="{Binding Path}" />
+                </Style>
+            </ListView.ItemContainerStyle>
             <ListView.View>
                 <GridView>
-                    <GridViewColumn Header="Import">
+                    <GridViewColumn Header="Import?">
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
                                 <CheckBox IsChecked="{Binding Import}" Padding="5" HorizontalAlignment="Right" />
@@ -35,9 +41,9 @@
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal">
-                                <Image Source="{Binding IconSource, Mode=OneWay, Converter={StaticResource IconToImageSourceConverter}}"
-                                       RenderOptions.BitmapScalingMode="HighQuality" Width="18"/>
-                                <TextBlock Text="{Binding Name, Mode=OneWay}" Margin="5,0,0,0" />
+                                    <Image Source="{Binding IconSource, Mode=OneWay, Converter={StaticResource IconToImageSourceConverter}}"
+                                           RenderOptions.BitmapScalingMode="HighQuality" Width="18"/>
+                                    <TextBlock Text="{Binding Name, Mode=OneWay}" Margin="5,0,0,0" Foreground="{StaticResource TextBrush}" />
                                 </StackPanel>
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
@@ -45,7 +51,7 @@
                     <GridViewColumn Header="Path">
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
-                                <TextBlock Text="{Binding Path, Mode=OneWay}" Padding="5" />
+                                <TextBlock Text="{Binding Path, Mode=OneWay}" Padding="5" Foreground="{StaticResource TextBrush}"/>
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
@@ -53,16 +59,16 @@
             </ListView.View>
         </ListView>
 
-        <TextBlock Grid.Column="0" Grid.Row="0" Text="Searching Programs..." HorizontalAlignment="Center" VerticalAlignment="Center"
-                   Name="TextDownloading"/>
-        
-        <DockPanel Margin="0,5,0,0" LastChildFill="False" Grid.Column="0" Grid.Row="1">
-            <Button Name="ButtonBrowse" Content="Browse..." Padding="10,0,10,0" DockPanel.Dock="Left"
-                    Click="buttonBrowse_Click"/>
-            <Button Name="ButtonCancel" Content="Cancel" Padding="10,0,10,0" Margin="10,0,10,0" DockPanel.Dock="Right" IsCancel="True"
-                    Click="buttonCancel_Click"/>
-            <Button Name="ButtonOK" Content="Add games" Padding="10,0,10,0" DockPanel.Dock="Right"
-                    Click="buttonOK_Click"/>
+        <Label Grid.Column="0" Grid.Row="0" Content="Searching Programs..." HorizontalAlignment="Center" VerticalAlignment="Center"
+               Name="TextDownloading"/>
+
+        <DockPanel Margin="-5,0,-5,-5" LastChildFill="False" Grid.Column="0" Grid.Row="1">
+            <Button Name="ButtonBrowse" Content="Browse..." DockPanel.Dock="Left"
+                    Click="ButtonBrowse_Click" Style="{StaticResource BottomButton}"/>
+            <Button Name="ButtonCancel" Content="Cancel" DockPanel.Dock="Right" IsCancel="True"
+                    Click="ButtonCancel_Click" Style="{StaticResource BottomButton}"/>
+            <Button Name="ButtonOK" Content="Add games" DockPanel.Dock="Right"
+                    Click="ButtonOK_Click" Style="{StaticResource BottomButton}"/>
         </DockPanel>
     </Grid>
 </Window>
diff --git a/source/PlayniteUI/Windows/InstalledGamesWindow.xaml.cs b/source/PlayniteUI/Windows/InstalledGamesWindow.xaml.cs
index 893e386d8..4569edd8e 100644
--- a/source/PlayniteUI/Windows/InstalledGamesWindow.xaml.cs
+++ b/source/PlayniteUI/Windows/InstalledGamesWindow.xaml.cs
@@ -116,13 +116,13 @@ public InstalledGamesWindow()
             InitializeComponent();
         }
 
-        private void buttonCancel_Click(object sender, RoutedEventArgs e)
+        private void ButtonCancel_Click(object sender, RoutedEventArgs e)
         {
             DialogResult = false;
             Close();
         }
 
-        private void buttonOK_Click(object sender, RoutedEventArgs e)
+        private void ButtonOK_Click(object sender, RoutedEventArgs e)
         {
             games = new List<InstalledGameMetadata>();
             foreach (var program in Programs)
@@ -175,7 +175,7 @@ private void buttonOK_Click(object sender, RoutedEventArgs e)
             Close();
         }
 
-        private void buttonBrowse_Click(object sender, RoutedEventArgs e)
+        private void ButtonBrowse_Click(object sender, RoutedEventArgs e)
         {
             var dialog = new OpenFileDialog()
             {
diff --git a/source/PlayniteUI/Windows/MainWindow.xaml b/source/PlayniteUI/Windows/MainWindow.xaml
index 7007fd30a..38099c77d 100644
--- a/source/PlayniteUI/Windows/MainWindow.xaml
+++ b/source/PlayniteUI/Windows/MainWindow.xaml
@@ -26,6 +26,7 @@
         <local:NegateConverter x:Key="NegateConverter" />
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
         <local:InvertableBooleanToVisibilityConverter x:Key="InvertableBooleanToVisibilityConverter" />
+        <local:BidirectionalEnumAndNumberConverter x:Key="BidirectionalEnumAndNumberConverter" />
         <sys:Boolean x:Key="True">True</sys:Boolean>
         <sys:Boolean x:Key="False">False</sys:Boolean>
         <local:ValueConverterGroup x:Key="EnumCompVisibilityConverter">
@@ -40,9 +41,9 @@
     </Window.Resources>
 
     <DockPanel>
-        <DockPanel LastChildFill="True" DockPanel.Dock="Top" Background="#222222">
+        <DockPanel LastChildFill="True" DockPanel.Dock="Top" Background="{StaticResource NormalBrushDark}">
             <DockPanel MouseUp="ImageLogo_MouseDown" Cursor="Hand" Margin="10,0,5,0"
-                       Opacity="{Binding IsMouseOver, Converter={StaticResource OpacityBoolConverter}, ConverterParameter={StaticResource True}, RelativeSource={RelativeSource AncestorType=DockPanel}}">
+                       Opacity="{Binding IsMouseOver, Converter={StaticResource OpacityBoolConverter}, ConverterParameter={StaticResource True}, RelativeSource={RelativeSource Self}}">
                 <Border DockPanel.Dock="Left" Background="Transparent">
                     <Image Source="/Images/applogo.png" Height="40" Name="ImageLogo" RenderOptions.BitmapScalingMode="Fant" Margin="5"/>
                 </Border>
@@ -53,32 +54,33 @@
                     <ContextMenu StaysOpen="False" Name="MenuMainMenu" Placement="Bottom">                        
                         <MenuItem Header="Add Game..." Click="AddNewGame_Click" IsEnabled="{Binding GameAdditionAllowed}"/>
                         <MenuItem Header="Add Installed Game(s)..." Click="AddInstalledGames_Click" IsEnabled="{Binding GameAdditionAllowed}" />
-                        <Separator Style="{StaticResource ContextSeparator}"/>
+                        <Separator Style="{DynamicResource {x:Type Separator}}" />
                         <MenuItem Header="Reload Games List" Click="ReloadGames_Click" IsEnabled="{Binding GameAdditionAllowed}" />
                         <MenuItem Header="Settings..." Click="Settings_Click" />
                         <MenuItem Header="About Playnite..." Click="About_Click" />
                         <MenuItem Header="Request Feature or Report Issue..." Click="Issue_Click" />
-                        <Separator Style="{StaticResource ContextSeparator}"/>
+                        <Separator Style="{DynamicResource {x:Type Separator}}" />
                         <MenuItem Header="Exit Playnite" Click="Exitappp_Click" />
                     </ContextMenu>
                 </DockPanel.ContextMenu>
             </DockPanel>
 
-            <controls:SearchBox BorderBrush="DarkGray" Margin="5,8,5,8" DockPanel.Dock="Left" Padding="0"
+            <controls:SearchBox Margin="5,8,10,8" DockPanel.Dock="Left" Padding="0"
                 x:Name="SearchBoxFilter" Height="24" Width="235"
                 Text="{Binding FilterText, RelativeSource={RelativeSource AncestorType=Window},
                 Mode=OneWayToSource, Delay=500}" />
 
-            <Border BorderBrush="DarkGray" Background="Transparent" BorderThickness="1,1,1,1" Width="30" Height="24"
-                    Cursor="Hand" MouseUp="ViewConfigElement_MouseUp">
-                <TextBlock Name="TextGroup" Text=". . ." HorizontalAlignment="Center" FontWeight="Bold"/>
+            <Border CornerRadius="3" Background="Transparent" Style="{StaticResource HighlightBorder}"
+                    BorderThickness="2" Width="35" Height="24" Cursor="Hand" MouseUp="ViewConfigElement_MouseUp">
+                <TextBlock Name="TextGroup" Text=". . ." HorizontalAlignment="Center" FontWeight="Bold"
+                           Foreground="{StaticResource TextBrush}"/>
                 <Border.ContextMenu>
                     <ContextMenu StaysOpen="False" Name="MenuViewSettings" Placement="Bottom">
                         <MenuItem Header="Sort by Name" IsCheckable="True"
                                   IsChecked="{Binding Path=SortingOrder, Converter={StaticResource EnumConverter}, ConverterParameter={x:Static shared:SortOrder.Name}}"/>
                         <MenuItem Header="Sort by Last Activity" IsCheckable="True"
                                   IsChecked="{Binding Path=SortingOrder, Converter={StaticResource EnumConverter}, ConverterParameter={x:Static shared:SortOrder.Activity}}"/>
-                        <Separator Style="{StaticResource ContextSeparator}" />
+                        <Separator Style="{DynamicResource {x:Type Separator}}" />
                         <MenuItem Header="Don't group" IsCheckable="True"
                                   IsChecked="{Binding Path=GroupingOrder, Converter={StaticResource EnumConverter}, ConverterParameter={x:Static shared:GroupOrder.None}}"/>
                         <MenuItem Header="Group by Store" IsCheckable="True"
@@ -89,21 +91,6 @@
                 </Border.ContextMenu>
             </Border>
 
-            <Border BorderBrush="DarkGray" Background="Transparent" BorderThickness="1,1,1,1"  Height="24"
-                    Cursor="Hand" MouseUp="ViewModeElement_MouseUp" Margin="5,0,0,0">
-                <TextBlock Name="TextView" Text="VIEW" HorizontalAlignment="Center" FontWeight="Bold" VerticalAlignment="Center" Padding="5"/>
-                <Border.ContextMenu>
-                    <ContextMenu StaysOpen="False" Name="MenuViewMode" Placement="Bottom">
-                        <MenuItem Header="List" IsCheckable="True"
-                                  IsChecked="{Binding Path=GamesViewType, Converter={StaticResource EnumConverter}, ConverterParameter={x:Static shared:ViewType.List}}"/>
-                        <MenuItem Header="Images" IsCheckable="True"
-                                  IsChecked="{Binding Path=GamesViewType, Converter={StaticResource EnumConverter}, ConverterParameter={x:Static shared:ViewType.Images}}"/>
-                        <MenuItem Header="Details" IsCheckable="True"
-                                  IsChecked="{Binding Path=GamesViewType, Converter={StaticResource EnumConverter}, ConverterParameter={x:Static shared:ViewType.Grid}}"/>                        
-                    </ContextMenu>
-                </Border.ContextMenu>
-            </Border>
-
             <CheckBox Name="CheckFilterView" DockPanel.Dock="Right" Margin="30,0,30,0" IsChecked="True">
                 <CheckBox.Style>
                     <Style TargetType="CheckBox">
@@ -121,32 +108,37 @@
                         </Setter>
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding Active}" Value="True">
-                                <Setter Property="Foreground" Value="#FF6600" />
+                                <Setter Property="Foreground" Value="{StaticResource IndicatorBrush}" />
+                            </DataTrigger>
+                            <DataTrigger Binding="{Binding Active}" Value="False">
+                                <Setter Property="Foreground" Value="{StaticResource TextBrush}" />
                             </DataTrigger>
                         </Style.Triggers>
                     </Style>                        
                 </CheckBox.Style>
             </CheckBox>
-
             <local:ProgressControl x:Name="ProgressControl" DockPanel.Dock="Left" Margin="40,0,40,0" Height="25"/>
         </DockPanel>
-        
-        <DockPanel>
-            <Border BorderThickness="1,0,0,0" BorderBrush="{StaticResource NormalBrush}" DockPanel.Dock="Right" >
-                <controls:FilterSelector x:Name="FilterSelector" Width="140"
-                                         Visibility="{Binding IsChecked, ElementName=CheckFilterView, Converter={StaticResource BooleanToVisibilityConverter}}"/>
-            </Border>
-            <TabControl Name="TabControlView" BorderThickness="0" Padding="0" DockPanel.Dock="Left">
-                <TabItem Header="List" Visibility="Collapsed">
-                    <controls:GamesListView x:Name="ListGamesView"/>
-                </TabItem>
-                <TabItem Header="Images" Visibility="Collapsed">
-                    <controls:GamesImagesView x:Name="ImagesGamesView"/>
-                </TabItem>
-                <TabItem Header="Grid" Visibility="Collapsed">
-                    <controls:GamesGridView x:Name="GridGamesView" />
-                </TabItem>
-            </TabControl>
-        </DockPanel>
+
+        <Border BorderThickness="0,1,0,0" BorderBrush="{StaticResource NormalBorderBrush}" >
+            <DockPanel>
+                <Border BorderThickness="1,0,0,0" BorderBrush="{StaticResource NormalBorderBrush}" DockPanel.Dock="Right" >
+                    <controls:FilterSelector x:Name="FilterSelector" Width="140"
+                                             Visibility="{Binding IsChecked, ElementName=CheckFilterView, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+                </Border>
+                <TabControl Name="TabControlView" DockPanel.Dock="Left" TabStripPlacement="Bottom"
+                            SelectedIndex="{Binding Path=GamesViewType, Source={x:Static shared:Settings.Instance}, Converter={StaticResource BidirectionalEnumAndNumberConverter}}">
+                    <TabItem Header="List" >
+                        <controls:GamesListView x:Name="ListGamesView"/>
+                    </TabItem>
+                    <TabItem Header="Covers" >
+                        <controls:GamesImagesView x:Name="ImagesGamesView"/>
+                    </TabItem>
+                    <TabItem Header="Details" >
+                        <controls:GamesGridView x:Name="GridGamesView" />
+                    </TabItem>
+                </TabControl>
+            </DockPanel>
+        </Border>
     </DockPanel>
 </Window>
diff --git a/source/PlayniteUI/Windows/MainWindow.xaml.cs b/source/PlayniteUI/Windows/MainWindow.xaml.cs
index 4cebceb55..e0cc96448 100644
--- a/source/PlayniteUI/Windows/MainWindow.xaml.cs
+++ b/source/PlayniteUI/Windows/MainWindow.xaml.cs
@@ -35,7 +35,11 @@ namespace PlayniteUI
     /// </summary>
     public partial class MainWindow : Window, INotifyPropertyChanged
     {
-        public Settings Config;
+        public Settings Config
+        {
+            get; set;
+        }
+
         private static Logger logger = LogManager.GetCurrentClassLogger();
         private static object gamesLock = new object();
         private WindowPositionHandler positionManager;
@@ -90,7 +94,6 @@ public MainWindow()
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
-            Settings.LoadSettings();
             Config = Settings.Instance;
             NotificationsWin.AutoOpen = true;
 
@@ -111,7 +114,6 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
 
             MenuMainMenu.DataContext = this;
             MenuViewSettings.DataContext = Config;
-            MenuViewMode.DataContext = Config;
             FilterSelector.DataContext = new Controls.FilterSelectorConfig(gamesStats, Config.FilterSettings);
             CheckFilterView.DataContext = Config.FilterSettings;
             GridGamesView.HeaderMenu.DataContext = Config;
@@ -517,7 +519,7 @@ private void Config_PropertyChanged(object sender, PropertyChangedEventArgs e)
 
             if (e != null && e.PropertyName == "GamesViewType")
             {
-                TabControlView.SelectedIndex = (int)Config.GamesViewType;
+                //TabControlView.SelectedIndex = (int)Config.GamesViewType;
                 return;
             }
 
@@ -567,7 +569,7 @@ private void Config_PropertyChanged(object sender, PropertyChangedEventArgs e)
                     MainCollectionView.LiveFilteringProperties.Add("Provider");
                     MainCollectionView.Filter = GamesFilter;
 
-                    TabControlView.SelectedIndex = (int)Config.GamesViewType;
+                    //TabControlView.SelectedIndex = (int)Config.GamesViewType;
                 }
                 else
                 {
@@ -644,12 +646,6 @@ private void ViewConfigElement_MouseUp(object sender, MouseButtonEventArgs e)
             MenuViewSettings.IsOpen = true;
         }
 
-        private void ViewModeElement_MouseUp(object sender, MouseButtonEventArgs e)
-        {
-            MenuViewMode.PlacementTarget = (UIElement)sender;
-            MenuViewMode.IsOpen = true;
-        }
-
         private void ListViewSelection_MouseUp(object sender, MouseButtonEventArgs e)
         {
             Config.GamesViewType = ViewType.List;
diff --git a/source/PlayniteUI/Windows/MetadataLookupWindow.xaml b/source/PlayniteUI/Windows/MetadataLookupWindow.xaml
index 921371b9d..7e1040dcb 100644
--- a/source/PlayniteUI/Windows/MetadataLookupWindow.xaml
+++ b/source/PlayniteUI/Windows/MetadataLookupWindow.xaml
@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:PlayniteUI.Windows"
         mc:Ignorable="d"
         Title="Metadata search" Height="600" Width="800"
-        Background="{StaticResource NormalBrush}" Loaded="Window_Loaded" ResizeMode="CanResizeWithGrip"
+        Background="{StaticResource NormalBrush}" Loaded="Window_Loaded"
         AutomationProperties.AutomationId="WindowMetaSearch">
     
     <Window.CommandBindings>
@@ -17,7 +17,7 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="*"/>
             <RowDefinition Height="Auto"/>
-            <RowDefinition Height="35"/>
+            <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
         <ListBox Name="ListSearch" Grid.Row="0" Grid.Column="0" HorizontalAlignment="Stretch" BorderThickness="0" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
@@ -25,30 +25,35 @@
             <ListBox.ItemTemplate>
                 <DataTemplate>
                     <DockPanel Width="{Binding ActualWidth, Mode=OneWay, RelativeSource={RelativeSource AncestorType=ListBox}}">
-                        <TextBlock Text="{Binding title}" DockPanel.Dock="Top" Margin="0,0,10,0" FontWeight="Bold"/>
-                        <TextBlock Text="{Binding snippet}" DockPanel.Dock="Bottom" FontStyle="Italic" TextWrapping="Wrap"/>
+                        <TextBlock Text="{Binding title}" DockPanel.Dock="Top" Margin="0,0,10,0" FontWeight="Bold" Foreground="{StaticResource TextBrush}"/>
+                        <TextBlock Text="{Binding snippet}" DockPanel.Dock="Bottom" FontStyle="Italic" TextWrapping="Wrap" Foreground="{StaticResource TextBrush}"/>
                     </DockPanel>
                 </DataTemplate>
             </ListBox.ItemTemplate>
         </ListBox>
 
-        <TextBlock Grid.Row="0" Grid.Column="0" Text="Downloading data..." HorizontalAlignment="Center" VerticalAlignment="Center"
-                   Name="TextDownloading"/>
-        
-        <DockPanel Grid.Row="1">
-            <Button Name="ButtonSearch" Command="Search" Content="Search" Padding="5" Margin="3" DockPanel.Dock="Left" />
-            <TextBox Name="TextSearch" Margin="3" DockPanel.Dock="Right" VerticalAlignment="Center">
-                <TextBox.InputBindings>
-                    <KeyBinding Command="Search" Key="Return" />
-                </TextBox.InputBindings>
-            </TextBox>
-        </DockPanel>
+        <Label Grid.Row="0" Grid.Column="0" Content="Downloading data..." Background="Pink"
+               Name="TextDownloading" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
+
+        <Border Padding="8" Background="{StaticResource NormalBrushDark}" DockPanel.Dock="Bottom"
+                BorderThickness="0" Grid.Row="1">
+            <DockPanel>
+                <Button Name="ButtonSearch" Command="Search" Content="Search" Padding="10,5,10,5" DockPanel.Dock="Left" />
+                <TextBox Name="TextSearch" Margin="10,0,0,0" DockPanel.Dock="Right" VerticalAlignment="Center" Foreground="{StaticResource TextBrush}">
+                    <TextBox.InputBindings>
+                        <KeyBinding Command="Search" Key="Return" />
+                    </TextBox.InputBindings>
+                </TextBox>
+            </DockPanel>
+        </Border>
 
-        <DockPanel Margin="5" LastChildFill="False" Height="25"  Grid.Column="0" Grid.Row="2">
-            <Button Name="ButtonCancel" Content="Cancel" Width="60" DockPanel.Dock="Right" Margin="10,0,10,0"
-                    Click="ButtonCancel_Click" IsCancel="True"/>
-            <Button Name="ButtonOK" Content="OK" Width="60" DockPanel.Dock="Right" IsEnabled="False"
-                    Click="ButtonOK_Click"/>
+        <DockPanel Margin="-5,0,-5,-5" LastChildFill="False" Grid.Column="0" Grid.Row="2">
+            <Button Name="ButtonCancel" Content="Cancel" DockPanel.Dock="Right"
+                    Click="ButtonCancel_Click" IsCancel="True"
+                    Style="{StaticResource BottomButton}"/>
+            <Button Name="ButtonOK" Content="Download" DockPanel.Dock="Right" IsEnabled="False"
+                    Click="ButtonOK_Click"
+                    Style="{StaticResource BottomButton}"/>
         </DockPanel>
     </Grid>
 </Window>
diff --git a/source/PlayniteUI/Windows/NotificationsWindow.xaml b/source/PlayniteUI/Windows/NotificationsWindow.xaml
index 98479a595..959fe8750 100644
--- a/source/PlayniteUI/Windows/NotificationsWindow.xaml
+++ b/source/PlayniteUI/Windows/NotificationsWindow.xaml
@@ -14,7 +14,7 @@
         <local:NotificationIconConverter x:Key="NotificationIconConverter" />
     </Window.Resources>
 
-    <ScrollViewer VerticalScrollBarVisibility="Auto">        
+    <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="2">        
         <ListBox Name="ListNotifications" BorderThickness="0" MouseDoubleClick="ListNotifications_MouseDoubleClick" SelectionMode="Single">
             <ListBox.Resources>
                 <Style TargetType="ListBoxItem">
@@ -26,7 +26,7 @@
                     <DockPanel DockPanel.Dock="Top" Margin="0,5,5,5">
                         <Image Source="{Binding Type, Converter={StaticResource NotificationIconConverter}}"
                                Height="20" DockPanel.Dock="Left" Stretch="Uniform" RenderOptions.BitmapScalingMode="HighQuality" />
-                        <TextBlock Text="{Binding Text}" VerticalAlignment="Center" DockPanel.Dock="Left" Margin="5,0,0,0" TextWrapping="Wrap" />
+                        <TextBlock Text="{Binding Text}" VerticalAlignment="Center" DockPanel.Dock="Left" Margin="5,0,0,0" TextWrapping="Wrap" Foreground="{StaticResource TextBrush}"/>
                     </DockPanel>
                 </DataTemplate>
             </ListBox.ItemTemplate>
diff --git a/source/PlayniteUI/Windows/SettingsWindow.xaml b/source/PlayniteUI/Windows/SettingsWindow.xaml
index 143dcd318..7845a385d 100644
--- a/source/PlayniteUI/Windows/SettingsWindow.xaml
+++ b/source/PlayniteUI/Windows/SettingsWindow.xaml
@@ -6,33 +6,39 @@
         xmlns:local="clr-namespace:PlayniteUI"
         mc:Ignorable="d"
         WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
-        Title="Configuration" ResizeMode="CanResizeWithGrip" Width="500" Height="330"
-        AutomationProperties.AutomationId="WindowSettings">
+        Title="Configuration" Width="500" Height="330"
+        AutomationProperties.AutomationId="WindowSettings"
+        Background="{StaticResource NormalBrush}">
 
     <Window.Resources>
         <local:NegateConverter x:Key="NegateConverter" />
+        
+        <Style TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}" />
     </Window.Resources>    
     
-    <Grid Background="{StaticResource NormalBrush}">
-        <DockPanel Margin="10">
-            <DockPanel Margin="0,10,0,0" LastChildFill="False" Height="25" DockPanel.Dock="Bottom">
-                <Button Name="ButtonCancel" Click="ButtonCancel_Click" Content="Cancel" Width="60" DockPanel.Dock="Right" Margin="10,0,0,0"/>
-                <Button Name="ButtonOK" Click="ButtonOK_Click" Content="OK" Width="60" DockPanel.Dock="Right"/>
+    <Grid Margin="5">
+        <DockPanel>
+            <DockPanel LastChildFill="False" DockPanel.Dock="Bottom" Margin="-5,0,-5,-5"
+                       Background="{StaticResource NormalBrush}">
+                <Button Name="ButtonCancel" Click="ButtonCancel_Click" Content="Cancel" DockPanel.Dock="Right"
+                        Style="{StaticResource BottomButton}" />
+                <Button Name="ButtonOK" Click="ButtonOK_Click" Content="OK" DockPanel.Dock="Right"
+                        Style="{StaticResource BottomButton}" />
             </DockPanel>
             <TabControl DockPanel.Dock="Bottom">
                 <TabItem Header="General" >
-                    <DockPanel Margin="5" LastChildFill="False">
-                        <TextBlock Text="Database location:" DockPanel.Dock="Top" Margin="5"/>
+                    <DockPanel Margin="10" LastChildFill="False">
+                        <Label Content="Database location:" DockPanel.Dock="Top" Margin="5"/>
                         <DockPanel DockPanel.Dock="Top" Margin="5">
-                            <Button Name="ButtonBrowserDbFile" Content=". . ." DockPanel.Dock="Right" Padding="5,0,5,0"
+                            <Button Name="ButtonBrowserDbFile" Content="..." DockPanel.Dock="Right" Padding="5,0,5,0"
                                     Click="ButtonBrowserDbFile_Click"/>                        
                             <TextBox Name="TextDatabase" Text="{Binding DatabasePath, UpdateSourceTrigger=Explicit}"
                                      DockPanel.Dock="Left" Margin="0,0,5,0"/>
                         </DockPanel>
                     </DockPanel>
                 </TabItem>                
-                <TabItem Header="Steam" >
-                    <DockPanel Margin="5" LastChildFill="False">
+                <TabItem Header="Steam">
+                    <DockPanel Margin="10" LastChildFill="False">
                         <CheckBox IsChecked="{Binding SteamSettings.IntegrationEnabled, UpdateSourceTrigger=Explicit}"
                                   Name="CheckSteamEnabled" Content="Import Steam Games" HorizontalAlignment="Left"  VerticalAlignment="Center"
                                   DockPanel.Dock="Top" Margin="5"/>
@@ -47,8 +53,8 @@
                                      DockPanel.Dock="Top" Margin="20,5,5,5"/>
 
                         <DockPanel DockPanel.Dock="Top" Margin="40,5,5,5">
-                            <TextBlock Text="Account name:" DockPanel.Dock="Left"/>
-                            <TextBlock DockPanel.Dock="Right">           
+                            <Label Content="Account name:" DockPanel.Dock="Left" VerticalContentAlignment="Center"/>
+                            <TextBlock DockPanel.Dock="Right" VerticalAlignment="Center">           
                                 <Hyperlink NavigateUri="https://github.com/JosefNemec/Playnite/wiki/How-to-get-Steam-account-name" RequestNavigate="Hyperlink_RequestNavigate">
                                     What's my account name?
                                 </Hyperlink>
@@ -59,7 +65,7 @@
                     </DockPanel>
                 </TabItem>
                 <TabItem Header="GOG" >
-                    <DockPanel Margin="5" LastChildFill="False">
+                    <DockPanel Margin="10" LastChildFill="False">
                         <CheckBox IsChecked="{Binding GOGSettings.IntegrationEnabled, UpdateSourceTrigger=Explicit}"
                                   Name="CheckGogEnabled" Content="Import GOG Games" HorizontalAlignment="Left"  VerticalAlignment="Center"
                                   DockPanel.Dock="Top" Margin="5"/>
@@ -74,7 +80,7 @@
                                      DockPanel.Dock="Top" Margin="20,5,5,5"/>
                         <DockPanel DockPanel.Dock="Top" Margin="20,5,5,5" IsEnabled="{Binding IsChecked, ElementName=CheckGogEnabled}"
                                    LastChildFill="False">
-                            <Button Content="Authenticate" DockPanel.Dock="Left" Padding="5"
+                            <Button Content="Authenticate" DockPanel.Dock="Left"
                                     IsEnabled="{Binding IsChecked, ElementName=RadioLibraryGOG}"
                                     Name="ButtonGogAuth" Click="ButtonGogAuth_Click"/>
                         </DockPanel>
@@ -87,7 +93,7 @@
                     </DockPanel>
                 </TabItem>
                 <TabItem Header="Origin" >
-                    <DockPanel Margin="5" LastChildFill="False">
+                    <DockPanel Margin="10" LastChildFill="False">
                         <CheckBox IsChecked="{Binding OriginSettings.IntegrationEnabled, UpdateSourceTrigger=Explicit}"
                                   Name="CheckOriginEnabled" Content="Import Origin Games" HorizontalAlignment="Left"  VerticalAlignment="Center"
                                   DockPanel.Dock="Top" Margin="5"/>
@@ -102,7 +108,7 @@
                                      DockPanel.Dock="Top" Margin="20,5,5,5"/>
                         <DockPanel DockPanel.Dock="Top" Margin="20,5,5,5" IsEnabled="{Binding IsChecked, ElementName=CheckOriginEnabled}"
                                    LastChildFill="False">
-                            <Button Content="Authenticate" DockPanel.Dock="Left" Padding="5"
+                            <Button Content="Authenticate" DockPanel.Dock="Left"
                                     IsEnabled="{Binding IsChecked, ElementName=RadioLibraryOrigin}"
                                     Name="ButtonOriginAuth" Click="ButtonOriginAuth_Click"/>
                         </DockPanel>
diff --git a/tests/Mapping/AboutWindow.ps1 b/tests/Mapping/AboutWindow.ps1
index 462f14195..c0ec1ec42 100644
--- a/tests/Mapping/AboutWindow.ps1
+++ b/tests/Mapping/AboutWindow.ps1
@@ -1,4 +1,4 @@
-using module c:\devel\PowerShell\PSNativeAutomation\source\PSNativeAutomation\bin\Debug\PSNativeAutomation.psd1
+using module PSNativeAutomation
 
 class AboutWindow : Window
 {
diff --git a/tests/Mapping/CategoryConfigWindow.ps1 b/tests/Mapping/CategoryConfigWindow.ps1
index f8707a0e5..539202589 100644
--- a/tests/Mapping/CategoryConfigWindow.ps1
+++ b/tests/Mapping/CategoryConfigWindow.ps1
@@ -1,4 +1,4 @@
-using module c:\devel\PowerShell\PSNativeAutomation\source\PSNativeAutomation\bin\Debug\PSNativeAutomation.psd1
+using module PSNativeAutomation
 
 class CategoryConfigWindow : Window
 {
diff --git a/tests/Mapping/CrashHandlerWindow.ps1 b/tests/Mapping/CrashHandlerWindow.ps1
index c7c31c714..085e37ebc 100644
--- a/tests/Mapping/CrashHandlerWindow.ps1
+++ b/tests/Mapping/CrashHandlerWindow.ps1
@@ -1,4 +1,4 @@
-using module c:\devel\PowerShell\PSNativeAutomation\source\PSNativeAutomation\bin\Debug\PSNativeAutomation.psd1
+using module PSNativeAutomation
 
 class CrashHandlerWindow : Window
 {
diff --git a/tests/Mapping/FirstTimeWizardWindow.ps1 b/tests/Mapping/FirstTimeWizardWindow.ps1
index ce07e882c..afaed075c 100644
--- a/tests/Mapping/FirstTimeWizardWindow.ps1
+++ b/tests/Mapping/FirstTimeWizardWindow.ps1
@@ -1,4 +1,4 @@
-using module c:\devel\PowerShell\PSNativeAutomation\source\PSNativeAutomation\bin\Debug\PSNativeAutomation.psd1
+using module PSNativeAutomation
 
 class FirstTimeWizardWindow : Window
 {
diff --git a/tests/Mapping/GameEditWindow.ps1 b/tests/Mapping/GameEditWindow.ps1
index 3335015ab..17be0dba7 100644
--- a/tests/Mapping/GameEditWindow.ps1
+++ b/tests/Mapping/GameEditWindow.ps1
@@ -1,4 +1,4 @@
-using module c:\devel\PowerShell\PSNativeAutomation\source\PSNativeAutomation\bin\Debug\PSNativeAutomation.psd1
+using module PSNativeAutomation
 
 class GameTaskControl : UIObject
 {
diff --git a/tests/Mapping/InstalledGamesWindow.ps1 b/tests/Mapping/InstalledGamesWindow.ps1
index 17f33360d..f52a51dc2 100644
--- a/tests/Mapping/InstalledGamesWindow.ps1
+++ b/tests/Mapping/InstalledGamesWindow.ps1
@@ -1,4 +1,4 @@
-using module c:\devel\PowerShell\PSNativeAutomation\source\PSNativeAutomation\bin\Debug\PSNativeAutomation.psd1
+using module PSNativeAutomation
 
 class InstalledGamesWindow : Window
 {
diff --git a/tests/Mapping/MainWindow.ps1 b/tests/Mapping/MainWindow.ps1
index 0b79b2e4d..bb6495e9b 100644
--- a/tests/Mapping/MainWindow.ps1
+++ b/tests/Mapping/MainWindow.ps1
@@ -1,4 +1,4 @@
-using module c:\devel\PowerShell\PSNativeAutomation\source\PSNativeAutomation\bin\Debug\PSNativeAutomation.psd1
+using module PSNativeAutomation
 
 class MainWindow : Window
 {
diff --git a/tests/Mapping/MetadataLookupWindow.ps1 b/tests/Mapping/MetadataLookupWindow.ps1
index a53415fb0..f8588c87b 100644
--- a/tests/Mapping/MetadataLookupWindow.ps1
+++ b/tests/Mapping/MetadataLookupWindow.ps1
@@ -1,4 +1,4 @@
-using module c:\devel\PowerShell\PSNativeAutomation\source\PSNativeAutomation\bin\Debug\PSNativeAutomation.psd1
+using module PSNativeAutomation
 
 class MetadataLookupWindow : Window
 {
diff --git a/tests/Mapping/NotificationsWindow.ps1 b/tests/Mapping/NotificationsWindow.ps1
index 2e9bb19fe..585c9350b 100644
--- a/tests/Mapping/NotificationsWindow.ps1
+++ b/tests/Mapping/NotificationsWindow.ps1
@@ -1,4 +1,4 @@
-using module c:\devel\PowerShell\PSNativeAutomation\source\PSNativeAutomation\bin\Debug\PSNativeAutomation.psd1
+using module PSNativeAutomation
 
 class NotificationsWindow : Window
 {
diff --git a/tests/Mapping/OpenFileWindow.ps1 b/tests/Mapping/OpenFileWindow.ps1
index 3b80a6fec..0702a6124 100644
--- a/tests/Mapping/OpenFileWindow.ps1
+++ b/tests/Mapping/OpenFileWindow.ps1
@@ -1,4 +1,4 @@
-using module c:\devel\PowerShell\PSNativeAutomation\source\PSNativeAutomation\bin\Debug\PSNativeAutomation.psd1
+using module PSNativeAutomation
 
 class OpenFileWindow : Window
 {
diff --git a/tests/Mapping/SettingsWindow.ps1 b/tests/Mapping/SettingsWindow.ps1
index 653b171d7..2b801848b 100644
--- a/tests/Mapping/SettingsWindow.ps1
+++ b/tests/Mapping/SettingsWindow.ps1
@@ -1,4 +1,4 @@
-using module c:\devel\PowerShell\PSNativeAutomation\source\PSNativeAutomation\bin\Debug\PSNativeAutomation.psd1
+using module PSNativeAutomation
 
 class SettingsWindow : Window
 {
diff --git a/tests/Mapping/SetupUninstallWindow.ps1 b/tests/Mapping/SetupUninstallWindow.ps1
index 285d3f337..19f08db51 100644
--- a/tests/Mapping/SetupUninstallWindow.ps1
+++ b/tests/Mapping/SetupUninstallWindow.ps1
@@ -1,5 +1,4 @@
-
-using module c:\devel\PowerShell\PSNativeAutomation\source\PSNativeAutomation\bin\Debug\PSNativeAutomation.psd1
+using module PSNativeAutomation
 
 class SetupUninstallWindow : Window
 {
diff --git a/tests/Mapping/SetupWindow.ps1 b/tests/Mapping/SetupWindow.ps1
index 6f35ba6b8..44ea02c63 100644
--- a/tests/Mapping/SetupWindow.ps1
+++ b/tests/Mapping/SetupWindow.ps1
@@ -1,5 +1,4 @@
-
-using module c:\devel\PowerShell\PSNativeAutomation\source\PSNativeAutomation\bin\Debug\PSNativeAutomation.psd1
+using module PSNativeAutomation
 
 class SetupWindow : Window
 {
diff --git a/tests/Mapping/SystemDialog.ps1 b/tests/Mapping/SystemDialog.ps1
new file mode 100644
index 000000000..baeebff16
--- /dev/null
+++ b/tests/Mapping/SystemDialog.ps1
@@ -0,0 +1,15 @@
+using module PSNativeAutomation
+
+class SystemDialog : Window
+{
+    [UIObject]$ButtonYes
+    [UIObject]$ButtonNo
+    
+    SystemDialog() : base({Get-UIWindow -ProcessName "PlayniteUI" | Get-UIControl -ControlType "Dialog" -First}, "SystemDialog")
+    {
+        $this.ButtonYes = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "6" -First}), "ButtonYes")
+        $this.ButtonNo  = [UIObject]::New($this.GetChildReference({Get-UIButton -AutomationId "7" -First}), "ButtonNo")
+    }
+}
+
+return [SystemDialog]::New()
\ No newline at end of file
diff --git a/tests/RunTests.ps1 b/tests/RunTests.ps1
index 814f76b0f..d363be0c8 100644
--- a/tests/RunTests.ps1
+++ b/tests/RunTests.ps1
@@ -1,7 +1,7 @@
 $ErrorActionPreference = "Stop"
 
 Import-Module "Pester"
-Import-Module "c:\devel\PowerShell\PSNativeAutomation\source\PSNativeAutomation\bin\Debug\PSNativeAutomation.psd1"
+Import-Module "PSNativeAutomation"
 Invoke-Expression ".\TestExtensions.ps1"
 
 Invoke-Pester -TestName $args[0]
diff --git a/tests/UI/CustomGames.Tests.ps1 b/tests/UI/CustomGames.Tests.ps1
new file mode 100644
index 000000000..62fdf7e1b
--- /dev/null
+++ b/tests/UI/CustomGames.Tests.ps1
@@ -0,0 +1,56 @@
+function CleanWindows()
+{
+    if ($windowGameEdit.Exists())
+    {
+        $windowGameEdit.Close()
+    }
+}
+
+Describe "Custom Games - Game Creation" {
+    BeforeAll {
+        $windowMain = & (Join-Path $PSScriptRoot "..\Mapping\MainWindow.ps1")
+        $windowGameEdit = & (Join-Path $PSScriptRoot "..\Mapping\GameEditWindow.ps1")
+        $dialogSystem = & (Join-Path $PSScriptRoot "..\Mapping\SystemDialog.ps1")
+        
+        $gameName = "AA Test Game"
+        $gamePath = "C:\Windows\System32\notepad.exe"
+        $windowMain.Focus()
+    }
+
+    It "Custom game can be added" {
+        $windowMain.ImageLogo.Click()
+        $windowMain.PopupMenu.InvokeItem("Add Game...")
+        $windowGameEdit.WaitForObject(2000)
+
+        # Fill fields
+        $windowGameEdit.TextName.SetValue($gameName)
+
+        # Add Play Action
+        $windowGameEdit.TabControlMain.SelectItem("Actions")
+        $windowGameEdit.ButtonAddPlay.Invoke()
+        $windowGameEdit.TaskPlay.TextPath.SetValue($gamePath)
+
+        $windowGameEdit.ButtonOK.Invoke()
+    }
+
+    It "Custom game can be started" {
+        $windowMain.ListBoxGames.GetItemNames() -contains $gameName | Should Be $true
+        $windowMain.ListBoxGames.GetItem($gameName).ClickDouble()
+        Start-Sleep -Seconds 1
+        Get-Process -Name "notepad" -EA 0 | Should Not Be $null        
+        Get-Process -Name "notepad" -EA 0 | Stop-Process
+    }
+
+    It "Custom game can be removed" {
+        $windowMain.ListBoxGames.SelectItem($gameName)
+        $windowMain.ButtonMore.Invoke()
+        $windowMain.PopupMenu.InvokeItem("Remove")
+        $dialogSystem.WaitForObject(2000)
+        $dialogSystem.ButtonYes.Invoke()
+        $windowMain.ListBoxGames.GetItemNames() -contains $gameName | Should Be $false
+    }
+
+    AfterAll {
+        CleanWindows
+    }
+}
\ No newline at end of file
diff --git a/tests/UI/GameEditWindow.Tests.ps1 b/tests/UI/GameEditWindow.Tests.ps1
index 3d10b27d8..7825f7270 100644
--- a/tests/UI/GameEditWindow.Tests.ps1
+++ b/tests/UI/GameEditWindow.Tests.ps1
@@ -1,3 +1,16 @@
+function CleanWindows()
+{
+    if ($windowOpenFile.Exists())
+    {
+        $windowOpenFile.Close()
+    }
+
+    if ($windowGameEdit.Exists())
+    {
+        $windowGameEdit.Close()
+    }
+}
+
 Describe "Edit Window - Basic Test" {
     BeforeAll {
         $windowMain = & (Join-Path $PSScriptRoot "..\Mapping\MainWindow.ps1")
@@ -18,6 +31,8 @@ Describe "Edit Window - Basic Test" {
             "Icon" = Join-Path $PSScriptRoot "..\TestFiles\TestIcon.png";
             "Image" = Join-Path $PSScriptRoot "..\TestFiles\TestCover.jpg";
         }
+
+        $windowMain.Focus()
     }
 
     It "Edit window can be opened" {
@@ -132,6 +147,10 @@ Describe "Edit Window - Basic Test" {
 
         $windowGameEdit.Close()
     }
+
+    AfterAll {
+        CleanWindows
+    }
 }
 
 Describe "Edit Window - Bulk editing" {
@@ -142,7 +161,8 @@ Describe "Edit Window - Categories" {
     BeforeAll {
         $windowMain = & (Join-Path $PSScriptRoot "..\Mapping\MainWindow.ps1")
         $windowGameEdit = & (Join-Path $PSScriptRoot "..\Mapping\GameEditWindow.ps1")
-        $windowCategoryConfig = & (Join-Path $PSScriptRoot "..\Mapping\CategoryConfigWindow.ps1")        
+        $windowCategoryConfig = & (Join-Path $PSScriptRoot "..\Mapping\CategoryConfigWindow.ps1")      
+        $windowMain.Focus()  
     }
 
     It "Cancel doesn't change category" { 
@@ -177,16 +197,29 @@ Describe "Edit Window - Categories" {
 
         $windowGameEdit.Close()
     }
+
+    AfterAll {
+        CleanWindows
+    }
 }
 
 Describe "Edit Window - Icon from EXE" {
 
+    AfterAll {
+        CleanWindows
+    }
 }
 
 Describe "Edit Window - Metadata Download" {
 
+    AfterAll {
+        CleanWindows
+    }
 }
 
 Describe "Edit Window - Tasks" {
 
+    AfterAll {
+        CleanWindows
+    }
 }
\ No newline at end of file
diff --git a/tests/UI/InstalledGamesImport.Tests.ps1 b/tests/UI/InstalledGamesImport.Tests.ps1
new file mode 100644
index 000000000..50426f158
--- /dev/null
+++ b/tests/UI/InstalledGamesImport.Tests.ps1
@@ -0,0 +1,66 @@
+function CleanWindows()
+{
+    Get-Process -Name "notepad" -EA 0 | Stop-Process
+
+    if ($windowOpenFile.Exists())
+    {
+        $windowOpenFile.Close()
+    }
+
+    if ($windowInstalled.Exists())
+    {
+        $windowInstalled.Close()
+    }
+}
+
+Describe "Installed Games Window - Game import test" {
+    BeforeAll {
+        $windowMain = & (Join-Path $PSScriptRoot "..\Mapping\MainWindow.ps1")
+        $windowInstalled = & (Join-Path $PSScriptRoot "..\Mapping\InstalledGamesWindow.ps1")
+        $windowOpenFile = & (Join-Path $PSScriptRoot "..\Mapping\OpenFileWindow.ps1")
+        $windowMain.Focus()
+    }
+
+    It "Import window can be opened and import is possible" {
+        $windowMain.ImageLogo.Click()
+        $windowMain.PopupMenu.InvokeItem("Add Installed Game(s)...")
+        $windowInstalled.WaitForObject(2000)
+        $windowInstalled.ListPrograms.WaitForObjectVisible(5000)
+
+        # Import first program in list
+        $items = $windowInstalled.ListPrograms.GetItems()
+        $items.Count | Should BeGreaterThan 0
+        $importedGame = $items[0]
+        $importedName = $importedGame.GetName()
+        $importedName | Should Not BeNullOrEmpty
+        $importedGame.GetHelpText() | Should Not BeNullOrEmpty
+        $importedGame.GetNativeObject() | Get-UICheckBox | Set-UIToggleState
+        
+        # Import custom program
+        $windowInstalled.ButtonBrowse.Invoke()
+        $windowOpenFile.EditFileName.SetValue("C:\Windows\System32\notepad.exe")
+        $windowOpenFile.ButtonOpen.Invoke()
+        $newItem = $windowInstalled.ListPrograms.GetItems() | Select-Object -Last 1
+        $newItem.GetName() | Should Be "System32"
+        $newItem.GetHelpText() | Should Be "C:\Windows\System32\notepad.exe"
+        $newItem.GetNativeObject() | Get-UICheckBox | Get-UIToggleState | Should Be "On"
+
+        $windowInstalled.ButtonOK.Invoke()
+
+        # Verify that programs are added
+        $items = $windowMain.ListBoxGames.GetItemNames() 
+        $items -contains $importedName | Should Be $true
+        $items -contains "System32" | Should Be $true
+
+        # Imported programs can be started
+        $windowMain.ListBoxGames.SelectItem("System32")
+        $windowMain.ButtonPlay.Invoke()
+        Start-Sleep -Seconds 1
+        Get-Process -Name "notepad" -EA 0 | Should Not Be $null
+        Get-Process -Name "notepad" -EA 0 | Stop-Process
+    }
+
+    AfterAll {
+        CleanWindows
+    }
+}
\ No newline at end of file