diff --git a/Source/AutoHDR.Displays/DisplayManagerNvidia.cs b/Source/AutoHDR.Displays/DisplayManagerNvidia.cs
index e7fb8ea..121ec46 100644
--- a/Source/AutoHDR.Displays/DisplayManagerNvidia.cs
+++ b/Source/AutoHDR.Displays/DisplayManagerNvidia.cs
@@ -105,7 +105,7 @@ public override void SetColorDepth(Display display, ColorDepth colorDepth)
         {
             DisplayDevice nvidiaDisplay = new DisplayDevice((uint)display.Tag);
             NvAPIWrapper.Native.Display.ColorDataDepth nvColorDepth = colorDepth.ConvertNvidiaColorDepth();
-            ColorData colorData = new ColorData(nvidiaDisplay.CurrentColorData.ColorFormat, nvidiaDisplay.CurrentColorData.Colorimetry, nvidiaDisplay.CurrentColorData.DynamicRange, NvAPIWrapper.Native.Display.ColorDataDepth.BPC8, nvidiaDisplay.CurrentColorData.SelectionPolicy, nvidiaDisplay.CurrentColorData.DesktopColorDepth);
+            ColorData colorData = new ColorData(nvidiaDisplay.CurrentColorData.ColorFormat, nvidiaDisplay.CurrentColorData.Colorimetry, nvidiaDisplay.CurrentColorData.DynamicRange, nvColorDepth, nvidiaDisplay.CurrentColorData.SelectionPolicy, nvidiaDisplay.CurrentColorData.DesktopColorDepth);
             nvidiaDisplay.SetColorData(colorData);
         }
 
diff --git a/Source/AutoHDR.ProjectResources/ProjectLocales.Designer.cs b/Source/AutoHDR.ProjectResources/ProjectLocales.Designer.cs
index e0a4804..cc7e9b1 100644
--- a/Source/AutoHDR.ProjectResources/ProjectLocales.Designer.cs
+++ b/Source/AutoHDR.ProjectResources/ProjectLocales.Designer.cs
@@ -638,11 +638,11 @@ public static string IsPrimaryMonitor {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Zeichenfolge, die Last action ähnelt.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Last actions ähnelt.
         /// </summary>
-        public static string LastAction {
+        public static string LastActions {
             get {
-                return ResourceManager.GetString("LastAction", resourceCulture);
+                return ResourceManager.GetString("LastActions", resourceCulture);
             }
         }
         
diff --git a/Source/AutoHDR.ProjectResources/ProjectLocales.de.resx b/Source/AutoHDR.ProjectResources/ProjectLocales.de.resx
index d343009..96aa8ce 100644
--- a/Source/AutoHDR.ProjectResources/ProjectLocales.de.resx
+++ b/Source/AutoHDR.ProjectResources/ProjectLocales.de.resx
@@ -276,8 +276,8 @@
   <data name="IsPrimaryMonitor" xml:space="preserve">
     <value>Hauptmonitor</value>
   </data>
-  <data name="LastAction" xml:space="preserve">
-    <value>Letzte Aktion</value>
+  <data name="LastActions" xml:space="preserve">
+    <value>Letzte Aktionen</value>
   </data>
   <data name="LaunchApplication" xml:space="preserve">
     <value>Starte Anwendung</value>
diff --git a/Source/AutoHDR.ProjectResources/ProjectLocales.resx b/Source/AutoHDR.ProjectResources/ProjectLocales.resx
index bea65c2..a7f734a 100644
--- a/Source/AutoHDR.ProjectResources/ProjectLocales.resx
+++ b/Source/AutoHDR.ProjectResources/ProjectLocales.resx
@@ -310,8 +310,8 @@
   <data name="IsPrimaryMonitor" xml:space="preserve">
     <value>Primary</value>
   </data>
-  <data name="LastAction" xml:space="preserve">
-    <value>Last action</value>
+  <data name="LastActions" xml:space="preserve">
+    <value>Last actions</value>
   </data>
   <data name="LaunchApplication" xml:space="preserve">
     <value>Launch application</value>
diff --git a/Source/AutoHDR/App.xaml b/Source/AutoHDR/App.xaml
index d705f0c..dad9762 100644
--- a/Source/AutoHDR/App.xaml
+++ b/Source/AutoHDR/App.xaml
@@ -14,51 +14,18 @@
              StartupUri="Views\AutoHDRMainView.xaml">
 
     <Application.Resources>
-        <system:String x:Key="DonateLink">https://paypal.me/HeikoH89</system:String>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="Controls\Colors.xaml"/>
+                <ResourceDictionary Source="Controls\ControlProperties.xaml"/>
+                <ResourceDictionary Source="Controls\DefaultBorder.xaml"/>
+                <ResourceDictionary Source="Controls\CustomComboBox.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+            <system:String x:Key="DonateLink">https://paypal.me/HeikoH89</system:String>
         <system:String x:Key="GitHubRepoLink">https://github.com/Codectory/AutoHDR</system:String>
  
         
-        <Color x:Key="ActiveColor">#2ac987</Color>
-        <Color x:Key="AccentColor">#ff6666</Color>
 
-        <Color x:Key="ControlMouseOverColor">#fa8e8e</Color>
-        <Color x:Key="ControlPressedColor">#e36b6b</Color>
-
-        <Color x:Key="WindowColor">White</Color>
-        <Color x:Key="SelectedBackgroundColor">#fca9a9</Color>
-        <Color x:Key="SelectedUnfocusedColor">#FFDDDDDD</Color>
-        <Color x:Key="ControlLightColor">White</Color>
-        <Color x:Key="ControlMediumColor">#FFCCCCCC</Color>
-        <Color x:Key="GlyphColor">#FF444444</Color>
-        <Color x:Key="DisabledForegroundColor">#cfcfcf</Color>
-        <Color x:Key="DisabledControlDarkColor">#8a8a8a</Color>
-
-        <Color x:Key="DisabledBorderDarkColor">#FF888888</Color>
-
-        
-        
-        <system:Double x:Key="DefaultFontSize">15</system:Double>
-        
-
-
-
-
-        <SolidColorBrush x:Key="WindowBackgroundBrush" Color="{StaticResource WindowColor}"/>
-        <SolidColorBrush x:Key="ButtonForegroundBrush"  Color="{StaticResource WindowColor}"/>
-        <SolidColorBrush x:Key="ActiveBrush"  Color="{StaticResource ActiveColor}"/>
-        <SolidColorBrush x:Key="AccentBrush"  Color="{StaticResource AccentColor}"/>
-        <SolidColorBrush x:Key="HighlightedBrush"  Color="{StaticResource SelectedBackgroundColor}"/>
-        <SolidColorBrush x:Key="MouseOverBrush"  Color="{StaticResource ControlMouseOverColor}"/>
-        <SolidColorBrush x:Key="InactiveAccentBrush">#ad7b7b</SolidColorBrush>
-        <SolidColorBrush x:Key="DragScrollBrush">#757575</SolidColorBrush>
-        <SolidColorBrush x:Key="ScrollBrush">#969696</SolidColorBrush>
-        <SolidColorBrush x:Key="MouseOverScrollBrush">#a1a1a1</SolidColorBrush>
-
-        <SolidColorBrush x:Key="DisabledAccentBrush">#c6cbcf</SolidColorBrush>
-        <SolidColorBrush x:Key="HighlightedInactiveAccentBrush" Color="#95bfdb"/>
-        <StaticResource x:Key="ButtonBackgroundBrush"  ResourceKey="AccentBrush"/>
-        <system:Double x:Key="DefaultRadius">5</system:Double>
-        <CornerRadius x:Key="CornerRadius">5</CornerRadius>
 
         <Style x:Key="DefaultLabel" TargetType="Label">
             <Setter Property="FontSize" Value="{StaticResource DefaultFontSize}"/>
@@ -84,20 +51,6 @@
         <Style TargetType="UserControl" BasedOn="{StaticResource DefaultUserControl}"/>
 
 
-        <Style x:Key="DefaultBorder" TargetType="Border">
-            <Setter Property="CornerRadius" Value="{StaticResource CornerRadius}"/>
-            <Setter Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="Height" Value="Auto"/>
-            <Setter Property="Width" Value="Auto"/>
-            <Setter Property="Effect">
-                <Setter.Value>
-                       <DropShadowEffect BlurRadius="{StaticResource DefaultRadius}" ShadowDepth="1" Opacity="0.0" Direction="260" />
-                </Setter.Value>
-            </Setter>
-
-
-        </Style>
 
         <Style x:Key="HDRCircle" TargetType="Ellipse">
             <Setter Property="HorizontalAlignment"  Value="Center" />
@@ -261,14 +214,8 @@
                         <BulletDecorator Background="Transparent">
                             <BulletDecorator.Bullet>
                                 <Grid>
-                                    <Border x:Name="Border" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Style="{StaticResource DefaultBorder}">
-                                        <Border.Background>
-                                            <SolidColorBrush Color="Transparent"/>
-                                        </Border.Background>
-                                        <Border.Effect>
-                                            <DropShadowEffect BlurRadius="{StaticResource DefaultRadius}" ShadowDepth="1" Opacity="0.3" Direction="260" />
-                                        </Border.Effect>
-                                    </Border>
+                                    <Border x:Name="Border" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Style="{StaticResource DefaultBorder}"/>
+
                                     <Path Visibility="Collapsed" Width="10" Height="10" x:Name="CheckMark" SnapsToDevicePixels="False"
                                             StrokeThickness="2"
                                             Data="M 1 4 L 4 9 M 4 9 L 9 0">
@@ -297,15 +244,6 @@
                                             </ColorAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualState>
-                                    <VisualState x:Name="Disabled">
-                                        <Storyboard>
-                                            <ColorAnimationUsingKeyFrames Storyboard.TargetName="Border"
-                                                Storyboard.TargetProperty="(BorderBrush).(SolidColorBrush.Color)">
-                                                <EasingColorKeyFrame KeyTime="0" Value="{StaticResource DisabledBorderDarkColor}" />
-                                            </ColorAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-
                                 </VisualStateGroup>
                                 <VisualStateGroup x:Name="CheckStates">
                                     <VisualState x:Name="Checked">
@@ -339,291 +277,7 @@
             </Setter>
         </Style>
 
-        <Style TargetType="CheckBox" BasedOn="{StaticResource DefaultCheckBox}"/>
-
-
-
-        <ControlTemplate x:Key="ComboBoxToggleButton"
-                 TargetType="{x:Type ToggleButton}">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition />
-                    <ColumnDefinition Width="20" />
-                </Grid.ColumnDefinitions>
-                <VisualStateManager.VisualStateGroups>
-                    <VisualStateGroup x:Name="CommonStates">
-                        <VisualState x:Name="Normal" />
-                        <VisualState x:Name="MouseOver">
-                            <Storyboard>
-                                <ColorAnimationUsingKeyFrames Storyboard.TargetName="Border"
-                                                Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
-                                    <EasingColorKeyFrame KeyTime="0" Value="{StaticResource ControlMouseOverColor}" />
-                                </ColorAnimationUsingKeyFrames>
-                            </Storyboard>
-                        </VisualState>
-                        <VisualState x:Name="Pressed" />
-                        <VisualState x:Name="Disabled">
-                            <Storyboard>
-                                <ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(Panel.Background).
-                (GradientBrush.GradientStops)[1].(GradientStop.Color)"
-                                          Storyboard.TargetName="Border">
-                                    <EasingColorKeyFrame KeyTime="0"
-                                   Value="{StaticResource DisabledControlDarkColor}" />
-                                </ColorAnimationUsingKeyFrames>
-                                <ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(Shape.Fill).
-                (SolidColorBrush.Color)"
-                                          Storyboard.TargetName="Arrow">
-                                    <EasingColorKeyFrame KeyTime="0"
-                                   Value="{StaticResource DisabledForegroundColor}" />
-                                </ColorAnimationUsingKeyFrames>
-                                <ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(Border.BorderBrush).
-                (GradientBrush.GradientStops)[1].(GradientStop.Color)"
-                                          Storyboard.TargetName="Border">
-                                    <EasingColorKeyFrame KeyTime="0"
-                                   Value="{StaticResource DisabledBorderDarkColor}" />
-                                </ColorAnimationUsingKeyFrames>
-                            </Storyboard>
-                        </VisualState>
-                    </VisualStateGroup>
-                    <VisualStateGroup x:Name="CheckStates">
-                        <VisualState x:Name="Checked">
-                            <Storyboard>
-                                <ColorAnimationUsingKeyFrames Storyboard.TargetName="Border"
-                                                Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
-                                    <EasingColorKeyFrame KeyTime="0" Value="{StaticResource ControlPressedColor}" />
-                                </ColorAnimationUsingKeyFrames>
-                            </Storyboard>
-                        </VisualState>
-                        <VisualState x:Name="Unchecked" />
-                        <VisualState x:Name="Indeterminate" />
-                    </VisualStateGroup>
-                </VisualStateManager.VisualStateGroups>
-                <Border x:Name="Border"
-            Grid.ColumnSpan="2"
-            CornerRadius="{StaticResource CornerRadius}"
-            BorderThickness="1">
-                    <Border.BorderBrush>
-                        <SolidColorBrush Color="{StaticResource AccentColor}"/>
-                    </Border.BorderBrush>
-                    <Border.Background>
-                        <SolidColorBrush Color="Transparent"/>
-                    </Border.Background>
-                </Border>
-                <Path x:Name="Arrow"
-          Grid.Column="1"
-          HorizontalAlignment="Center"
-          VerticalAlignment="Center"
-          Data="M 0 0 L 4 4 L 8 0 Z" >
-                    <Path.Fill>
-                        <SolidColorBrush Color="{DynamicResource GlyphColor}"/>
-                    </Path.Fill>
-                </Path>
-            </Grid>
-        </ControlTemplate>
-
-        <ControlTemplate x:Key="ComboBoxTextBox"
-                 TargetType="{x:Type TextBox}">
-            <Border x:Name="PART_ContentHost"
-          Focusable="False"
-          Background="{TemplateBinding Background}"  />
-        </ControlTemplate>
-
-        <Style x:Key="DefaultComboBox"
-       TargetType="{x:Type ComboBox}">
-            
-            <Setter Property="SnapsToDevicePixels"
-          Value="true" />
-            <Setter Property="OverridesDefaultStyle"
-          Value="true" />
-            <Setter Property="ScrollViewer.HorizontalScrollBarVisibility"
-          Value="Auto" />
-            <Setter Property="ScrollViewer.VerticalScrollBarVisibility"
-          Value="Auto" />
-            <Setter Property="ScrollViewer.CanContentScroll"
-          Value="true" />
-            <Setter Property="MinWidth"
-          Value="120" />
-            <Setter Property="MinHeight"
-          Value="20" />
-
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type ComboBox}">
-                        <Grid>
-                            <VisualStateManager.VisualStateGroups>
-                                <VisualStateGroup x:Name="CommonStates">
-                                    <VisualState x:Name="Normal" />
-                                    <VisualState x:Name="MouseOver" />
-                                    <VisualState x:Name="Disabled">
-                                        <Storyboard>
-                                            <ColorAnimationUsingKeyFrames Storyboard.TargetName="PART_EditableTextBox"
-                                                Storyboard.TargetProperty="(TextElement.Foreground).
-                      (SolidColorBrush.Color)">
-                                                <EasingColorKeyFrame KeyTime="0"
-                                         Value="{StaticResource DisabledForegroundColor}" />
-                                            </ColorAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                </VisualStateGroup>
-                                <VisualStateGroup x:Name="EditStates">
-                                    <VisualState x:Name="Editable">
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)"
-                                                 Storyboard.TargetName="PART_EditableTextBox">
-                                                <DiscreteObjectKeyFrame KeyTime="0"
-                                            Value="{x:Static Visibility.Visible}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames
-                      Storyboard.TargetProperty="(UIElement.Visibility)"
-                                                 Storyboard.TargetName="ContentSite">
-                                                <DiscreteObjectKeyFrame KeyTime="0"
-                                            Value="{x:Static Visibility.Hidden}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                    <VisualState x:Name="Uneditable" />
-                                </VisualStateGroup>
-                            </VisualStateManager.VisualStateGroups>
-                            <ToggleButton x:Name="ToggleButton"
-                        Template="{StaticResource ComboBoxToggleButton}"
-                        Grid.Column="2"
-                        Focusable="false"
-                        ClickMode="Press"
-                        IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, 
-              RelativeSource={RelativeSource TemplatedParent}}"/>
-                            <ContentPresenter x:Name="ContentSite"
-                            IsHitTestVisible="False"
-                            Content="{TemplateBinding SelectionBoxItem}"
-                            ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
-                            ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
-                            Margin="3,3,23,3"
-                            VerticalAlignment="Stretch"
-                            HorizontalAlignment="Left">
-                            </ContentPresenter>
-                            <TextBox x:Name="PART_EditableTextBox"
-                   Style="{x:Null}"
-                   Template="{StaticResource ComboBoxTextBox}"
-                   HorizontalAlignment="Left"
-                   VerticalAlignment="Bottom"
-                   Margin="3,3,23,3"
-                   Focusable="True"
-                   Background="Transparent"
-                   IsReadOnly="{TemplateBinding IsReadOnly}" />
-                            <Popup x:Name="Popup"
-                 Placement="Bottom"
-                 IsOpen="{TemplateBinding IsDropDownOpen}"
-                 AllowsTransparency="True"
-                 Focusable="False"
-                 PopupAnimation="Slide">
-                                <Grid x:Name="DropDown"
-                  SnapsToDevicePixels="True"
-                  MinWidth="{TemplateBinding ActualWidth}"
-                  MaxHeight="{TemplateBinding MaxDropDownHeight}">
-                                    <Border x:Name="DropDownBorder" Style="{StaticResource DefaultBorder}">
-                                        <Border.Background>
-                                            <SolidColorBrush Color="{DynamicResource ControlLightColor}" />
-                                        </Border.Background>
-                                    </Border>
-                                    <ScrollViewer Margin="4,6,4,6"
-                            SnapsToDevicePixels="True">
-                                        <StackPanel IsItemsHost="True"
-                            KeyboardNavigation.DirectionalNavigation="Contained" />
-                                    </ScrollViewer>
-                                </Grid>
-                            </Popup>
-                        </Grid>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="HasItems"  Value="false">
-                                <Setter TargetName="DropDownBorder"
-                    Property="MinHeight"
-                    Value="95" />
-                            </Trigger>
-                            <Trigger Property="IsGrouping"
-                   Value="true">
-                                <Setter Property="ScrollViewer.CanContentScroll"
-                    Value="false" />
-                            </Trigger>
-                            <Trigger SourceName="Popup"
-                   Property="AllowsTransparency"
-                   Value="true">
-                                <Setter TargetName="DropDownBorder"
-                    Property="CornerRadius"
-                    Value="{StaticResource CornerRadius}" />
-                                <Setter TargetName="DropDownBorder"
-                    Property="Margin"
-                    Value="0,2,0,0" />
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-
-        </Style>
-
-        <Style x:Key="{x:Type ComboBoxItem}"
-       TargetType="{x:Type ComboBoxItem}">
-            <Setter Property="SnapsToDevicePixels"
-          Value="true" />
-            <Setter Property="OverridesDefaultStyle"
-          Value="true" />
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type ComboBoxItem}">
-                        <Grid>
-                            <Border x:Name="Border" CornerRadius="{StaticResource CornerRadius}"
-                Padding="2"
-                SnapsToDevicePixels="true">
-                                <Border.Background>
-                                    <SolidColorBrush Color="Transparent"/>
-                                </Border.Background>
-
-                            </Border>
-                            <Grid>
-                                <VisualStateManager.VisualStateGroups>
-                                    <VisualStateGroup x:Name="SelectionStates">
-                                        <VisualState x:Name="Pressed">
-                                            <Storyboard>
-                                                <ColorAnimationUsingKeyFrames Storyboard.TargetName="Border"
-                                                Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
-                                                    <EasingColorKeyFrame KeyTime="0" Value="{StaticResource ControlPressedColor}" />
-                                                </ColorAnimationUsingKeyFrames>
-                                            </Storyboard>
-
-                                        </VisualState>
-                                        <VisualState x:Name="Unselected" />
-                                        <VisualState x:Name="Selected">
-                                            <Storyboard>
-                                                <ColorAnimationUsingKeyFrames Storyboard.TargetName="Border"
-                                                Storyboard.TargetProperty="(Panel.Background).
-                    (SolidColorBrush.Color)">
-                                                    <EasingColorKeyFrame KeyTime="0"
-                                         Value="{StaticResource SelectedBackgroundColor}" />
-                                                </ColorAnimationUsingKeyFrames>
-                                            </Storyboard>
-                                        </VisualState>
-                                        <VisualState x:Name="SelectedUnfocused">
-                                            <Storyboard>
-                                                <ColorAnimationUsingKeyFrames Storyboard.TargetName="Border"
-                                                Storyboard.TargetProperty="(Panel.Background).
-                    (SolidColorBrush.Color)">
-                                                    <EasingColorKeyFrame KeyTime="0"
-                                         Value="{StaticResource SelectedUnfocusedColor}" />
-                                                </ColorAnimationUsingKeyFrames>
-                                            </Storyboard>
-                                        </VisualState>
-                                    </VisualStateGroup>
-                                </VisualStateManager.VisualStateGroups>
-                                <ContentPresenter />
-                            </Grid>
-                        </Grid>
-
-                        
-
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-        <Style TargetType="ComboBox" BasedOn="{StaticResource DefaultComboBox}"/>
+            <Style TargetType="CheckBox" BasedOn="{StaticResource DefaultCheckBox}"/>
 
         <Style x:Key="DefaultTabHeader" TargetType="TabItem">
             <Setter Property="Background" Value="{StaticResource AccentBrush}"/>
@@ -821,16 +475,6 @@
                                 <Setter TargetName="PageUp" Property="Command" Value="ScrollBar.PageRightCommand" />
                             </Trigger>
                             <Trigger Property="Orientation" Value="Vertical">
-                                <!--<Setter TargetName="GridRoot" Property="LayoutTransform">
-                                    <Setter.Value>
-                                        <RotateTransform Angle="-90" />
-                                    </Setter.Value>
-                                </Setter>
-                                <Setter TargetName="PART_Track" Property="LayoutTransform">
-                                    <Setter.Value>
-                                        <RotateTransform Angle="-90" />
-                                    </Setter.Value>
-                                </Setter>-->
                                 <Setter Property="Width" Value="10" />
                                 <Setter Property="Height" Value="Auto" />
                                 <Setter TargetName="Thumb" Property="Tag" Value="Vertical" />
@@ -849,22 +493,35 @@
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type ToggleButton}">
                         <Viewbox HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
-                            <Border x:Name="Border" Style="{StaticResource DefaultBorder}"
-                            Background="#FFFFFFFF"
+                            <Grid>
+                                <Border x:Name="Border" Style="{StaticResource DefaultBorder}"
                             Width="40" Height="20">
-                                <Border.Effect>
-                                    <DropShadowEffect ShadowDepth="0.5" Direction="0" Opacity="0.2" />
-                                </Border.Effect>
-                                <Ellipse x:Name="Ellipse" Fill="#FFFFFFFF" Stretch="Uniform"
-                                 Margin="2 1 2 1"
+                                    <VisualStateManager.VisualStateGroups>
+                                        <VisualStateGroup x:Name="CommonStates">
+                                            <VisualState x:Name="Normal"></VisualState>
+                                            <VisualState x:Name="Disabled">
+                                                <Storyboard>
+                                                    <ColorAnimationUsingKeyFrames Storyboard.TargetName="Border"
+                                                Storyboard.TargetProperty="(BorderBrush).(SolidColorBrush.Color)">
+                                                        <EasingColorKeyFrame KeyTime="0" Value="{StaticResource DisabledBorderColor}" />
+                                                    </ColorAnimationUsingKeyFrames>
+                                                </Storyboard>
+                                            </VisualState>
+                                            <VisualState x:Name="MouseOver"></VisualState>
+                                        </VisualStateGroup>
+                                    </VisualStateManager.VisualStateGroups>
+                                </Border>
+                            <Ellipse x:Name="Ellipse" Fill="#FFFFFFFF" Stretch="Uniform"
+                                 Margin="3 2 3 2"
                                  Stroke="Gray" StrokeThickness="0.2"
                                  HorizontalAlignment="Stretch">
-                                    <Ellipse.Effect>
-                                        <DropShadowEffect BlurRadius="{StaticResource DefaultRadius}" ShadowDepth="1" Opacity="0.2" Direction="260" />
-                                    </Ellipse.Effect>
-                                </Ellipse>
-                            </Border>
+                                <Ellipse.Effect>
+                                    <DropShadowEffect BlurRadius="{StaticResource DefaultRadius}" ShadowDepth="1" Opacity="0." Direction="260" />
+                                </Ellipse.Effect>
+                            </Ellipse>
+                            </Grid>
                         </Viewbox>
+
                         <ControlTemplate.Triggers>
                             <EventTrigger RoutedEvent="Checked">
                                 <BeginStoryboard>
@@ -919,7 +576,6 @@
 
 
 
-
         <corewpf:EnumLocaleConverter x:Key="EnumLocaleConverter"/>
         <corewpf:DialogService x:Key="DialogService" />
         <corewpf:DialogService x:Key="ProfileDialogService" />
@@ -963,9 +619,11 @@
         <DataTemplate DataType="{x:Type info:LogsStorage}">
             <views:AutoHDRLogsView></views:AutoHDRLogsView>
         </DataTemplate>
-        <DataTemplate x:Key="ProfileItemTemplate" DataType="Profile">
-            <TextBlock Text="{Binding Name }"/>
-        </DataTemplate>
+            <DataTemplate x:Key="ProfileItemTemplate" DataType="Profile">
+                <TextBlock Text="{Binding Name }"/>
+            </DataTemplate>
+        </ResourceDictionary>
+
     </Application.Resources>
 
 </Application>
diff --git a/Source/AutoHDR/AutoHDR.csproj b/Source/AutoHDR/AutoHDR.csproj
index 3083692..411e9f7 100644
--- a/Source/AutoHDR/AutoHDR.csproj
+++ b/Source/AutoHDR/AutoHDR.csproj
@@ -260,6 +260,22 @@
     <Compile Include="UWP\AppxManifest.cs" />
     <Compile Include="UWP\UWPAppsManager.cs" />
     <Compile Include="UWP\UWPApp.cs" />
+    <Page Include="Controls\Colors.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Controls\ControlProperties.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Controls\CustomComboBox.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Controls\DefaultBorder.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Theming\LightColors.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -385,7 +401,6 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Displays\" />
     <Folder Include="Plugins\" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Source/AutoHDR/Controls/Colors.xaml b/Source/AutoHDR/Controls/Colors.xaml
new file mode 100644
index 0000000..3bf66ab
--- /dev/null
+++ b/Source/AutoHDR/Controls/Colors.xaml
@@ -0,0 +1,37 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Color x:Key="ActiveColor">#2ac987</Color>
+    <Color x:Key="AccentColor">#ff6666</Color>
+    <Color x:Key="ControlMouseOverColor">#fa8e8e</Color>
+    <Color x:Key="ControlPressedColor">#e36b6b</Color>
+
+    <Color x:Key="WindowColor">White</Color>
+    <Color x:Key="SelectedBackgroundColor">#fca9a9</Color>
+    <Color x:Key="SelectedUnfocusedColor">#FFDDDDDD</Color>
+    <Color x:Key="ControlLightColor">White</Color>
+    <Color x:Key="ControlMediumColor">#FFCCCCCC</Color>
+    <Color x:Key="GlyphColor">#FF444444</Color>
+    <Color x:Key="DisabledForegroundColor">#cfcfcf</Color>
+    <Color x:Key="DisabledControlDarkColor">#8a8a8a</Color>
+
+    <Color x:Key="DisabledBorderColor">#adadad</Color>
+    <SolidColorBrush x:Key="WindowBackgroundBrush" Color="{StaticResource WindowColor}"/>
+    <SolidColorBrush x:Key="ButtonForegroundBrush"  Color="{StaticResource WindowColor}"/>
+    <SolidColorBrush x:Key="ActiveBrush"  Color="{StaticResource ActiveColor}"/>
+    <SolidColorBrush x:Key="AccentBrush"  Color="{StaticResource AccentColor}"/>
+    <SolidColorBrush x:Key="HighlightedBrush"  Color="{StaticResource SelectedBackgroundColor}"/>
+    <SolidColorBrush x:Key="MouseOverBrush"  Color="{StaticResource ControlMouseOverColor}"/>
+    <SolidColorBrush x:Key="ControlLightBrush"  Color="{StaticResource ControlLightColor}"/>
+    <SolidColorBrush x:Key="GlyphBrush"  Color="{StaticResource GlyphColor}"/>
+
+    <SolidColorBrush x:Key="InactiveAccentBrush">#ad7b7b</SolidColorBrush>
+    <SolidColorBrush x:Key="DragScrollBrush">#757575</SolidColorBrush>
+    <SolidColorBrush x:Key="ScrollBrush">#969696</SolidColorBrush>
+    <SolidColorBrush x:Key="MouseOverScrollBrush">#a1a1a1</SolidColorBrush>
+
+    <SolidColorBrush x:Key="DisabledAccentBrush" Color="{StaticResource DisabledControlDarkColor}"/>
+    <SolidColorBrush x:Key="HighlightedInactiveAccentBrush" Color="#95bfdb"/>
+    <StaticResource x:Key="ButtonBackgroundBrush"  ResourceKey="AccentBrush"/>
+
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Source/AutoHDR/Controls/ControlProperties.xaml b/Source/AutoHDR/Controls/ControlProperties.xaml
new file mode 100644
index 0000000..4890693
--- /dev/null
+++ b/Source/AutoHDR/Controls/ControlProperties.xaml
@@ -0,0 +1,8 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
+
+    <system:Double x:Key="DefaultFontSize">15</system:Double>
+    <system:Double x:Key="DefaultRadius">7.5</system:Double>
+    <CornerRadius x:Key="CornerRadius">7.5</CornerRadius>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Source/AutoHDR/Controls/CustomComboBox.xaml b/Source/AutoHDR/Controls/CustomComboBox.xaml
new file mode 100644
index 0000000..9364f6f
--- /dev/null
+++ b/Source/AutoHDR/Controls/CustomComboBox.xaml
@@ -0,0 +1,165 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity">
+
+    <ControlTemplate x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition Width="20" />
+            </Grid.ColumnDefinitions>
+            <Border Style="{StaticResource DefaultBorder}"
+                  x:Name="Border" 
+                  Grid.ColumnSpan="2"
+                  Background="{StaticResource ControlLightBrush}" 
+                  BorderBrush="{StaticResource AccentBrush}"
+                  BorderThickness="1" />
+            <Border 
+                  Grid.Column="0"
+                  CornerRadius="0" 
+                  Margin="10,1,0,1" 
+                  Background="{Binding ElementName=Border, Path=Background}" 
+                  BorderBrush="{Binding ElementName=Border, Path=BorderBrush}"
+                  BorderThickness="0,0,1,0" />
+            <Path 
+                  x:Name="Arrow"
+                  Grid.Column="1"     
+                  Fill="{StaticResource  GlyphBrush}"
+                  HorizontalAlignment="Center"
+                  VerticalAlignment="Center"
+                  Data="M0,0 L0,2 L4,6 L8,2 L8,0 L4,4 z"
+                />
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="ToggleButton.IsMouseOver" Value="true">
+                <Setter TargetName="Border" Property="Background" Value="{StaticResource MouseOverBrush}" />
+            </Trigger>
+            <Trigger Property="ToggleButton.IsChecked" Value="true">
+                <Setter TargetName="Border" Property="Background" Value="{StaticResource AccentBrush}" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="Border" Property="Background" Value="{StaticResource DisabledAccentBrush}" />
+                <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource DisabledAccentBrush}" />
+                <Setter Property="Foreground" Value="Black"/>
+                <Setter TargetName="Arrow" Property="Fill" Value="{StaticResource  GlyphBrush}" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <ControlTemplate x:Key="ComboBoxTextBox" TargetType="{x:Type TextBox}">
+        <Border x:Name="PART_ContentHost" Focusable="False" Background="{TemplateBinding Background}" />
+    </ControlTemplate>
+
+    <Style x:Key="StyledComboBox" TargetType="{x:Type ComboBox}">
+        <Setter Property="SnapsToDevicePixels" Value="true"/>
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
+        <Setter Property="MinWidth" Value="120"/>
+        <Setter Property="MinHeight" Value="20"/>
+        <Setter Property="Foreground" Value="Black"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ComboBox}">
+                    <Grid>
+                        <ToggleButton 
+                            Name="ToggleButton" 
+                            Template="{StaticResource ComboBoxToggleButton}" 
+                            Grid.Column="2" 
+                            Focusable="false"
+                            IsChecked="{Binding Path=IsDropDownOpen,Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent}}"
+                            ClickMode="Press">
+                        </ToggleButton>
+                        <ContentPresenter Name="ContentSite" IsHitTestVisible="False"  Content="{TemplateBinding SelectionBoxItem}"
+                            ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                            ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                            Margin="5,3,23,3"
+                            VerticalAlignment="Center"
+                            HorizontalAlignment="Left" />
+                        <TextBox x:Name="PART_EditableTextBox"
+                            Style="{x:Null}" 
+                            Template="{StaticResource ComboBoxTextBox}" 
+                            HorizontalAlignment="Left" 
+                            VerticalAlignment="Center" 
+                            Margin="5,5,23,3"
+                            Focusable="True" 
+                            Background="{StaticResource ControlLightBrush}"
+                            Visibility="Hidden"
+                            IsReadOnly="{TemplateBinding IsReadOnly}"/>
+                        <Popup 
+                            Name="Popup"
+                            Placement="Bottom"
+                            IsOpen="{TemplateBinding IsDropDownOpen}"
+                            AllowsTransparency="True" 
+                            Focusable="False"
+                            PopupAnimation="Slide">
+
+                            <Grid Name="DropDown"
+                              SnapsToDevicePixels="True"                
+                              MinWidth="{TemplateBinding ActualWidth}"
+                              MaxHeight="{TemplateBinding MaxDropDownHeight}">
+                                <Border 
+                                x:Name="DropDownBorder" Style="{StaticResource DefaultBorder}" CornerRadius="5"
+                                Background="{StaticResource ControlLightBrush}" BorderThickness="1,1,1,1"/>
+                                <ScrollViewer Margin="4,6,4,6" SnapsToDevicePixels="True">
+                                    <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Contained" />
+                                </ScrollViewer>
+                            </Grid>
+                        </Popup>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="HasItems" Value="false">
+                            <Setter TargetName="DropDownBorder" Property="MinHeight" Value="95"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{StaticResource DisabledControlDarkColor}"/>
+                        </Trigger>
+                        <Trigger Property="IsGrouping" Value="true">
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+                        </Trigger>
+                        <Trigger SourceName="Popup" Property="Popup.AllowsTransparency" Value="true">
+                            <Setter TargetName="DropDownBorder" Property="CornerRadius" Value="0"/>
+                            <Setter TargetName="DropDownBorder" Property="Margin" Value="0,2,0,0"/>
+                        </Trigger>
+                        <Trigger Property="IsEditable"  Value="true">
+                            <Setter Property="IsTabStop" Value="false"/>
+                            <Setter TargetName="PART_EditableTextBox" Property="Visibility" Value="Visible"/>
+                            <Setter TargetName="ContentSite" Property="Visibility" Value="Hidden"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="{x:Type ComboBoxItem}" TargetType="{x:Type ComboBoxItem}">
+        <Setter Property="SnapsToDevicePixels" Value="true"/>
+        <Setter Property="Foreground" Value="Black"/>
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ComboBoxItem}">
+                    <Border Name="Border"
+                              Padding="2"
+                              SnapsToDevicePixels="true">
+                        <ContentPresenter />
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsHighlighted" Value="true">
+                            <Setter TargetName="Border" Property="Background" Value="{StaticResource MouseOverBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{StaticResource DisabledControlDarkColor}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style TargetType="ComboBox" BasedOn="{StaticResource StyledComboBox}"/>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Source/AutoHDR/Controls/DefaultBorder.xaml b/Source/AutoHDR/Controls/DefaultBorder.xaml
new file mode 100644
index 0000000..9c3fa38
--- /dev/null
+++ b/Source/AutoHDR/Controls/DefaultBorder.xaml
@@ -0,0 +1,24 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style x:Key="DefaultBorder" TargetType="Border">
+        <Setter Property="CornerRadius" Value="{StaticResource CornerRadius}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Height" Value="Auto"/>
+        <Setter Property="Width" Value="Auto"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Effect">
+            <Setter.Value>
+                <DropShadowEffect BlurRadius="2.5" ShadowDepth="1" Opacity="0.2" Direction="260" />
+            </Setter.Value>
+        </Setter>
+
+        <Style.Triggers>
+            <Trigger Property="IsEnabled" Value="false">
+                <Setter Property="Background" Value="{StaticResource DisabledAccentBrush}" />
+                <Setter Property="BorderBrush" Value="{StaticResource DisabledAccentBrush}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Source/AutoHDR/ProcessWatcher.cs b/Source/AutoHDR/ProcessWatcher.cs
index 69c21e5..1de0ce8 100644
--- a/Source/AutoHDR/ProcessWatcher.cs
+++ b/Source/AutoHDR/ProcessWatcher.cs
@@ -197,6 +197,8 @@ private void UpdateApplications()
         private bool IsFocusedApplication(Process process)
         {
             Process currentProcess = GetForegroundProcess();
+            if (currentProcess == null)
+                return false;
             return process.Id.Equals(currentProcess.Id);
         }
 
diff --git a/Source/AutoHDR/Profiles/Actions/DisplayAction.cs b/Source/AutoHDR/Profiles/Actions/DisplayAction.cs
index abb35c5..c196cad 100644
--- a/Source/AutoHDR/Profiles/Actions/DisplayAction.cs
+++ b/Source/AutoHDR/Profiles/Actions/DisplayAction.cs
@@ -104,6 +104,8 @@ public override string ActionDescription
                     returnValue += $" {ProjectLocales.Resolution} {Resolution.Width}x{Resolution.Height}";
                 if (SetRefreshRate)
                     returnValue += $" {ProjectLocales.RefreshRate} {RefreshRate}Hz";
+                if (SetColorDepth)
+                    returnValue += $" {ProjectLocales.ColorDepth} {ColorDepth}";
                 return returnValue;
             }
         }
diff --git a/Source/AutoHDR/Properties/AssemblyInfo.cs b/Source/AutoHDR/Properties/AssemblyInfo.cs
index c0b38c5..1a23215 100644
--- a/Source/AutoHDR/Properties/AssemblyInfo.cs
+++ b/Source/AutoHDR/Properties/AssemblyInfo.cs
@@ -52,5 +52,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.22.0")]
-[assembly: AssemblyFileVersion("1.7.22.0")]
+[assembly: AssemblyVersion("1.8.0.0")]
+[assembly: AssemblyFileVersion("1.8.0.0")]
diff --git a/Source/AutoHDR/Views/AutoHDRMainView.xaml b/Source/AutoHDR/Views/AutoHDRMainView.xaml
index ca0b456..46be28e 100644
--- a/Source/AutoHDR/Views/AutoHDRMainView.xaml
+++ b/Source/AutoHDR/Views/AutoHDRMainView.xaml
@@ -32,8 +32,9 @@
     <Window.Resources>
 
         <DataTemplate x:Key="ProfileActionTemplate" DataType="IProfileAction">
-            <Border Style="{StaticResource DefaultBorder}" Margin="10,10,10,10" Grid.Row="0">
-                <Grid >
+            <Grid>
+                <Border Style="{StaticResource DefaultBorder}" Margin="5,5,5,5" Grid.Row="0"/>
+                <Grid  Margin="10,10,10,10" >
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto"/>
                         <RowDefinition Height="Auto"/>
@@ -41,9 +42,7 @@
                     <TextBlock Grid.Row="0" Margin="5,0,5,0"  Text="{Binding ActionTypeName}" TextAlignment="left" Width="Auto" VerticalAlignment="Center" FontSize="15" />
                     <TextBlock Grid.Row="1" Margin="5,0,5,0"   Text="{Binding ActionDescription}" TextAlignment="left" Width="Auto" VerticalAlignment="Center" FontSize="15" />
                 </Grid>
-
-
-            </Border>
+            </Grid>
         </DataTemplate>
 
         <ItemsPanelTemplate x:Key="WrapListViewTemplate">
@@ -92,7 +91,7 @@
 
                     </Grid.RowDefinitions>
                     <Border Style="{StaticResource DefaultBorder}" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="6" Margin="5"/>
-                    <Grid Height="Auto" Margin="15">
+                    <Grid Height="Auto" Margin="15"  Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="6">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto"/>
                             <ColumnDefinition Width="Auto"/>
@@ -146,7 +145,7 @@
                         </Ellipse>
                         <TextBlock Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Left"  Text="{x:Static pres:ProjectLocales.CurrentApplication}"  Width="Auto" FontWeight="Bold"  Height="Auto" FontSize="25" VerticalAlignment="Center" Margin="5"  />
                         <TextBlock Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Left"  Text="{x:Static pres:ProjectLocales.CurrentProfile}"  Width="Auto" FontWeight="Bold"  Height="Auto" FontSize="25" VerticalAlignment="Center" Margin="5"  />
-                        <TextBlock Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Left"  Text="{x:Static pres:ProjectLocales.LastAction}"  Width="Auto" FontWeight="Bold"  Height="Auto" FontSize="25" VerticalAlignment="Top" Margin="5"  />
+                        <TextBlock Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Left"  Text="{x:Static pres:ProjectLocales.LastActions}"  Width="Auto" FontWeight="Bold"  Height="Auto" FontSize="25" VerticalAlignment="Top" Margin="5"  />
 
                         <Border Grid.Row="2" Grid.Column="3" BorderThickness="1" BorderBrush="LightGray" Style="{StaticResource DefaultBorder}"  HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5" Padding="0">
                             <Rectangle RadiusX="3" RadiusY="3" Width="40" Height="40" Margin="2  ">
@@ -157,9 +156,10 @@
                         </Border>
                         <TextBlock Grid.Row="2" Grid.Column="4" Text="{Binding CurrentApplication.DisplayName , FallbackValue={x:Static pres:ProjectLocales.NoApplication}}" TextAlignment="left" Width="Auto" VerticalAlignment="Center" FontSize="15" />
                         <TextBlock Grid.Row="4" Grid.Column="3" Grid.ColumnSpan="2" Margin="5" Text="{Binding CurrentProfile.Name , FallbackValue={x:Static pres:ProjectLocales.NoProfile}}" TextAlignment="left" Width="Auto" VerticalAlignment="Center" FontSize="15" />
-                        <Border  Grid.Row="6" Grid.Column="3" Grid.ColumnSpan="2"  Style="{StaticResource DefaultBorder}" BorderBrush="{StaticResource AccentBrush}" BorderThickness="1" >
-                            <ListBox BorderThickness="0" Margin="5" ItemsSource="{Binding LastActions}" ItemTemplate="{StaticResource ProfileActionTemplate}"   ItemsPanel="{StaticResource StackListViewTemplate}"  />
+                        <Border  Grid.Row="6" Grid.Column="3" Grid.ColumnSpan="2"  Style="{StaticResource DefaultBorder}"  >
                         </Border>
+                        <ListBox  Margin="5" Grid.Row="6" Grid.Column="3" Grid.ColumnSpan="2" BorderThickness="0"  ItemsSource="{Binding LastActions}" ItemTemplate="{StaticResource ProfileActionTemplate}"   ItemsPanel="{StaticResource StackListViewTemplate}"  />
+
                     </Grid>
 
 
diff --git a/Source/AutoHDR/Views/DisplayActionView.xaml b/Source/AutoHDR/Views/DisplayActionView.xaml
index e05ed53..c6721a1 100644
--- a/Source/AutoHDR/Views/DisplayActionView.xaml
+++ b/Source/AutoHDR/Views/DisplayActionView.xaml
@@ -34,14 +34,14 @@
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
         <Label Grid.Column="0"  Grid.Row="0" Content="{x:Static pres:ProjectLocales.Display}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5"/>
-        <ComboBox Grid.Column="1" Grid.Row="0" ItemsSource="{Binding AllDisplays}" SelectedItem="{Binding Display}" ItemTemplate="{StaticResource DisplayItemTemplate}" SelectedIndex="0"  Margin="5"/>
+        <ComboBox  Grid.Column="1" Grid.Row="0" ItemsSource="{Binding AllDisplays}" SelectedItem="{Binding Display}" ItemTemplate="{StaticResource DisplayItemTemplate}" SelectedIndex="0"  Margin="5"/>
         <Label Grid.Column="0"  Grid.Row="1" Content="{x:Static pres:ProjectLocales.SetHDR}" HorizontalAlignment="Left" VerticalAlignment="Center"  Margin="5"/>
         <CheckBox  Grid.Column="1" Grid.Row="1"  VerticalContentAlignment="Center" HorizontalContentAlignment="Left" IsChecked="{Binding SetHDR, Mode=TwoWay}" VerticalAlignment="Center" HorizontalAlignment="Left"  Margin="5"/>
         <Label Grid.Column="0"  Grid.Row="2" Content="{x:Static pres:ProjectLocales.ActivateHDR}" HorizontalAlignment="Left" VerticalAlignment="Center"  Margin="5"/>
         <ToggleButton Grid.Column="1" Grid.Row="2"  IsEnabled="{Binding SetHDR}" IsChecked="{Binding EnableHDR, Mode=TwoWay}"  Margin="5" HorizontalAlignment="Left" Height="25"/>
 
         <Label Grid.Column="0"  Grid.Row="3" Content="{x:Static pres:ProjectLocales.SetResolution}" HorizontalAlignment="Left" VerticalAlignment="Center"  Margin="5"/>
-            <CheckBox  Grid.Column="1" Grid.Row="3"  VerticalContentAlignment="Center" HorizontalContentAlignment="Left" IsChecked="{Binding SetResolution, Mode=TwoWay}" VerticalAlignment="Center" HorizontalAlignment="Left"  Margin="5" />
+        <CheckBox  Grid.Column="1" Grid.Row="3"  VerticalContentAlignment="Center" HorizontalContentAlignment="Left" IsChecked="{Binding SetResolution, Mode=TwoWay}" VerticalAlignment="Center" HorizontalAlignment="Left"  Margin="5" />
 
         <Label Grid.Column="0"  Grid.Row="4" Content="{x:Static pres:ProjectLocales.Resolution}" HorizontalAlignment="Left" VerticalAlignment="Center"  Margin="5"/>
         <TextBox  Grid.Column="1" Grid.Row="4"  IsEnabled="{Binding SetResolution}" Text="{Binding Resolution, Mode=TwoWay,Converter={StaticResource SizeTextConverter}}" VerticalAlignment="Center"  Margin="5"  />
@@ -58,6 +58,13 @@
         <CheckBox Grid.Column="1" Grid.Row="7"  VerticalContentAlignment="Center" HorizontalContentAlignment="Left" IsChecked="{Binding SetColorDepth, Mode=TwoWay}" VerticalAlignment="Center" HorizontalAlignment="Left"  Margin="5" IsEnabled="{Binding ColorDepthIsSupported}"/>
 
         <Label Grid.Column="0"  Grid.Row="8" Content="{x:Static pres:ProjectLocales.ColorDepth}" HorizontalAlignment="Left" VerticalAlignment="Top"  Margin="5"/>
-        <ComboBox   Grid.Column="1" Grid.Row="8"  ItemsSource="{Binding ColorDepthValues}" DisplayMemberPath="{Binding ColorDepth, Converter={StaticResource EnumLocaleConverter}, ConverterParameter={x:Static pres:ProjectLocales.ResourceManager}}"  SelectedItem="{Binding ColorDepth}"   VerticalAlignment="Center"  Margin="5" />
+        <ComboBox IsEnabled="{Binding SetHDR}"   Grid.Column="1" Grid.Row="8"  ItemsSource="{Binding ColorDepthValues}" SelectedItem="{Binding ColorDepth}"  Margin="5" >
+            <ComboBox.ItemTemplate>
+                <DataTemplate>
+                    <ContentPresenter
+                Content="{Binding Converter={StaticResource EnumLocaleConverter}, ConverterParameter={x:Static pres:ProjectLocales.ResourceManager}}"/>
+                </DataTemplate>
+            </ComboBox.ItemTemplate>
+        </ComboBox>
     </Grid>
 </UserControl>
diff --git a/Source/AutoHDR/Views/ProfileManagerView.xaml b/Source/AutoHDR/Views/ProfileManagerView.xaml
index 89eb4f2..cff0411 100644
--- a/Source/AutoHDR/Views/ProfileManagerView.xaml
+++ b/Source/AutoHDR/Views/ProfileManagerView.xaml
@@ -50,8 +50,8 @@
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="Auto"/>
                     </Grid.RowDefinitions>
-                    <Button Grid.Column="2" Grid.Row="0" Grid.RowSpan="1" Content="..."   VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,0,5,0" Width="20"  FontSize="20" Command="{Binding  ElementName=ProfileList, Path=SelectedItem.EditProfileActionCommand}" CommandParameter="{Binding}" />
-                    <Button Grid.Column="3" Grid.Row="0" Grid.RowSpan="1"   Content="-"  VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,0,5,0" Width="20" FontSize="20" Command="{Binding  ElementName=ProfileList, Path=SelectedItem.RemoveProfileActionCommand}" CommandParameter="{Binding}" />
+                    <Button Grid.Column="2" Grid.Row="0" Grid.RowSpan="1" Content="..."   VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,0,5,0" Width="25"  FontSize="20" Command="{Binding  ElementName=ProfileList, Path=SelectedItem.EditProfileActionCommand}" CommandParameter="{Binding}" />
+                    <Button Grid.Column="3" Grid.Row="0" Grid.RowSpan="1"   Content="-"  VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,0,5,0" Width="25" FontSize="20" Command="{Binding  ElementName=ProfileList, Path=SelectedItem.RemoveProfileActionCommand}" CommandParameter="{Binding}" />
                     <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static pres:ProjectLocales.ActionType}"  Margin="5,1" VerticalAlignment="Top" HorizontalAlignment="Left" FontWeight="DemiBold" />
                     <TextBlock Grid.Column="0" Grid.ColumnSpan="3"  Grid.Row="1" Text="{Binding ActionTypeName}"  Margin="5,1" VerticalAlignment="Top" HorizontalAlignment="Left" />
                     <TextBlock Grid.Column="0" Grid.Row="3" Text="{x:Static pres:ProjectLocales.Actions}"  Margin="5,1" VerticalAlignment="Top" HorizontalAlignment="Left" FontWeight="DemiBold" />
@@ -149,7 +149,7 @@
 
                     </Grid>
                 <Border Grid.Column="1"  Grid.Row="6" Style="{StaticResource DefaultBorder}" Margin="10,2" Height="120" />
-                <Grid Grid.Column="1"  Grid.Row="6">
+                <Grid Grid.Column="1"  Grid.Row="6" Margin="10,2">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition/>
diff --git a/Source/Externals/CodectoryCore.UI.Wpf.dll b/Source/Externals/CodectoryCore.UI.Wpf.dll
index 7c9bdf6..1e160c4 100644
Binary files a/Source/Externals/CodectoryCore.UI.Wpf.dll and b/Source/Externals/CodectoryCore.UI.Wpf.dll differ