diff --git a/source/ColorPickerDemo/ColorPickerDemo.csproj b/source/ColorPickerDemo/ColorPickerDemo.csproj
index 05be32f..64b4d37 100644
--- a/source/ColorPickerDemo/ColorPickerDemo.csproj
+++ b/source/ColorPickerDemo/ColorPickerDemo.csproj
@@ -34,8 +34,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NumericUpDownLib, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dirkster.NumericUpDownLib.1.0.3\lib\net4\NumericUpDownLib.dll</HintPath>
+    <Reference Include="NumericUpDownLib, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Dirkster.NumericUpDownLib.1.1.0\lib\net4\NumericUpDownLib.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/source/ColorPickerDemo/packages.config b/source/ColorPickerDemo/packages.config
index 9a38585..f949c25 100644
--- a/source/ColorPickerDemo/packages.config
+++ b/source/ColorPickerDemo/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Dirkster.NumericUpDownLib" version="1.0.3" targetFramework="net45" />
+  <package id="Dirkster.NumericUpDownLib" version="1.1.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/source/ColorPickerLib/ColorPickerLib.csproj b/source/ColorPickerLib/ColorPickerLib.csproj
index 35e7a34..29f62b2 100644
--- a/source/ColorPickerLib/ColorPickerLib.csproj
+++ b/source/ColorPickerLib/ColorPickerLib.csproj
@@ -33,8 +33,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NumericUpDownLib, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dirkster.NumericUpDownLib.1.0.3\lib\net4\NumericUpDownLib.dll</HintPath>
+    <Reference Include="NumericUpDownLib, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Dirkster.NumericUpDownLib.1.1.0\lib\net4\NumericUpDownLib.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/source/ColorPickerLib/Controls/ColorCanvas.xaml b/source/ColorPickerLib/Controls/ColorCanvas.xaml
index c58b185..9b6fdd2 100644
--- a/source/ColorPickerLib/Controls/ColorCanvas.xaml
+++ b/source/ColorPickerLib/Controls/ColorCanvas.xaml
@@ -258,17 +258,22 @@
                                     <!-- behaviour allows only characters that conform to hexadecimal input -->
                                     <TextBox x:Name="PART_HexadecimalTextBox"
                                              Grid.Column="1"
-                                             Margin="3"
-                                             VerticalAlignment="Center"
+                                             Margin="3,9,3,3"
+                                             Padding="3"
                                              MaxLength="8"
-                                             Style="{StaticResource ColorCanvasTextBoxStyle}"
+                                             AcceptsReturn="False"
+                                             FontFamily="Courier New"
+                                             TextWrapping="NoWrap"
+                                             HorizontalAlignment="Stretch"
+                                             VerticalAlignment="Center"
                                              behav:AllowableCharactersTextBoxBehavior.RegularExpressionProperty="^[0-9|a-f|A-F]+$"
                                              />
 
                                     <TextBlock Grid.Column="1"
-                                               Margin="3"
+                                               Margin="3,9,3,3"
+                                               FontFamily="Courier New"
+                                               TextWrapping="NoWrap"
                                                VerticalAlignment="Center"
-                                               Style="{StaticResource ColorCanvasTextBlockStyle}"
                                                Text="#XXXXXXXXX"
                                                Visibility="Hidden" />
                                     <!-- Size Measuring TextBlock -->
@@ -326,10 +331,11 @@
                                             Value="{Binding R, RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                                             VerticalAlignment="Center" HorizontalAlignment="Stretch"
                                             MinValue="0"
-                                            MaxValue="255" />
+                                            MaxValue="255"
+                                            IsReadOnly="False"
+                                    />
                                     <TextBlock Grid.Row="1" Grid.Column="1"
                                                 VerticalAlignment="Center"
-                                                Style="{StaticResource ColorCanvasTextBlockStyle}"
                                                 Text="XXXX"
                                                 Visibility="Hidden" />
                                     <!-- Size Measuring TextBlock -->
@@ -349,11 +355,14 @@
                                            Margin="3,6,3,6"
                                            Value="{Binding G, RelativeSource={RelativeSource TemplatedParent}}"
                                            VerticalAlignment="Center" />
+                                    
                                     <numupdown:NumericUpDown Grid.Row="3" Grid.Column="1"
                                             Value="{Binding G, RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                                             VerticalAlignment="Center"  HorizontalAlignment="Stretch"
                                             MinValue="0"
-                                            MaxValue="255" />
+                                            MaxValue="255"
+                                            IsReadOnly="False"
+                                    />
 
                                     <TextBlock Grid.Row="4" Grid.Column="0"
                                               Text="{Binding Source={x:Static localiz:Strings.STR_BLUE_LABEL}, StringFormat={}{0}:}"
@@ -372,7 +381,9 @@
                                             Value="{Binding B, RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                                             VerticalAlignment="Center" HorizontalAlignment="Stretch"
                                             MinValue="0"
-                                            MaxValue="255" />
+                                            MaxValue="255"
+                                            IsReadOnly="False"
+                                    />
 
                                     <TextBlock Grid.Row="6" Grid.Column="0"
                                               Text="{Binding Source={x:Static localiz:Strings.STR_ALPHA_LABEL}, StringFormat={}{0}:}"
@@ -395,6 +406,7 @@
                                             MinValue="0"
                                             MaxValue="255"
                                             Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"
+                                            IsReadOnly="False"
                                     />
                                 </Grid>
                             </Border>
diff --git a/source/ColorPickerLib/Controls/ColorCanvasTextBoxStyle.xaml b/source/ColorPickerLib/Controls/ColorCanvasTextBoxStyle.xaml
index 3f61669..20feaf3 100644
--- a/source/ColorPickerLib/Controls/ColorCanvasTextBoxStyle.xaml
+++ b/source/ColorPickerLib/Controls/ColorCanvasTextBoxStyle.xaml
@@ -5,19 +5,14 @@
     <!-- ColorCanvasTextBox (Style)                                                      -->
     <!-- =============================================================================== -->
 
-    <Style x:Key="ColorCanvasTextBoxStyle"
+    <!-- Style x:Key="ColorCanvasTextBoxStyle"
            TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
-        <Setter Property="Background" Value="Transparent" />
         <Setter Property="FontFamily" Value="Courier New" />
         <Setter Property="AcceptsReturn" Value="False" />
         <Setter Property="TextWrapping" Value="NoWrap" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Style.Triggers>
-            <Trigger Property="IsFocused" Value="False">
-                <Setter Property="BorderBrush" Value="Transparent" />
-            </Trigger>
-        </Style.Triggers>
-    </Style>
+        <Setter Property="VerticalAlignment" Value="Center" />
+    </Style -->
 
     <Style x:Key="ColorCanvasTextBlockStyle"
            TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
diff --git a/source/ColorPickerLib/Controls/ColorPicker.xaml b/source/ColorPickerLib/Controls/ColorPicker.xaml
index a24d423..e60fc3a 100644
--- a/source/ColorPickerLib/Controls/ColorPicker.xaml
+++ b/source/ColorPickerLib/Controls/ColorPicker.xaml
@@ -197,9 +197,10 @@
                                Focusable="False"
                                HorizontalOffset="0" VerticalOffset="3" PopupAnimation="None"
                                >
-                            <Border BorderThickness="1"
+                            <Border BorderThickness="1" x:Name="PopUpBorder"
                                     Background="{DynamicResource PopupBackgroundBrush}"
-                                    BorderBrush="{DynamicResource ColorPickerDarkBorderBrush}" Padding="3">
+                                    BorderBrush="{DynamicResource ColorPickerDarkBorderBrush}"
+                                    Padding="3">
                                 <Grid>
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="Auto" />
@@ -310,6 +311,7 @@
                         </Trigger>
                         <Trigger Property="IsOpen" Value="True">
                             <Setter TargetName="PART_ColorPickerToggleButton" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}}" />
+                            <Setter TargetName="PopUpBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.PopUpOpenBorderBrushKey}}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/source/ColorPickerLib/Controls/ColorSpectrumSlider.xaml b/source/ColorPickerLib/Controls/ColorSpectrumSlider.xaml
index c6570e9..d43ff2b 100644
--- a/source/ColorPickerLib/Controls/ColorSpectrumSlider.xaml
+++ b/source/ColorPickerLib/Controls/ColorSpectrumSlider.xaml
@@ -19,15 +19,14 @@
                     BorderThickness="{TemplateBinding BorderThickness}"
                     Background="Transparent"
                     Margin="0,0,0,0">
-                <Border x:Name="PART_TrackBackground" Width="25">
+                <Border x:Name="PART_TrackBackground" MinWidth="24">
                     <Rectangle x:Name="PART_SpectrumDisplay"
                                Stretch="Fill"
                                VerticalAlignment="Stretch" />
                 </Border>
             </Border>
 
-            <Track Name="PART_Track"
-                   >
+            <Track Name="PART_Track">
                 <Track.DecreaseRepeatButton>
                     <RepeatButton Style="{StaticResource SliderRepeatButtonStyle}"
                                   Command="Slider.DecreaseLarge" />
diff --git a/source/ColorPickerLib/Controls/VerticalSlideThumbTemplate.xaml b/source/ColorPickerLib/Controls/VerticalSlideThumbTemplate.xaml
index 3dae289..9bb4e76 100644
--- a/source/ColorPickerLib/Controls/VerticalSlideThumbTemplate.xaml
+++ b/source/ColorPickerLib/Controls/VerticalSlideThumbTemplate.xaml
@@ -1,40 +1,75 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:reskeys="clr-namespace:ColorPickerLib.Themes"
+    >
 
     <!-- =============================================================================== -->
     <!-- VerticalSlideThumb (Template and Style)                                         -->
     <!-- =============================================================================== -->
 
     <ControlTemplate x:Key="VerticalSlideThumbTemplate" TargetType="{x:Type Thumb}">
-        <Canvas SnapsToDevicePixels="true">
-            <Path x:Name="LeftArrow" Stretch="Fill" StrokeLineJoin="Round" Stroke="#FF000000" Fill="#FF000000" Data="F1 M 276.761,316L 262.619,307.835L 262.619,324.165L 276.761,316 Z " RenderTransformOrigin="0.5,0.5" Width="6" Height="8">
-                <Path.RenderTransform>
-                    <TransformGroup>
-                        <ScaleTransform />
-                        <SkewTransform />
-                        <RotateTransform />
-                        <TranslateTransform Y="6" X="-3" />
-                    </TransformGroup>
-                </Path.RenderTransform>
-            </Path>
-            <Path x:Name="RightArrow" Stretch="Fill" StrokeLineJoin="Round" Stroke="#FF000000" Fill="#FF000000" Data="F1 M 276.761,316L 262.619,307.835L 262.619,324.165L 276.761,316 Z " RenderTransformOrigin="0.5,0.5" Width="6" Height="8">
-                <Path.RenderTransform>
-                    <TransformGroup>
-                        <ScaleTransform />
-                        <SkewTransform />
-                        <RotateTransform Angle="-180" />
-                        <TranslateTransform Y="6" X="8" />
-                    </TransformGroup>
-                </Path.RenderTransform>
-            </Path>
+        <Canvas SnapsToDevicePixels="true"
+                UseLayoutRounding="True"
+                Background="Transparent"
+                >
+            <Grid VerticalAlignment="Stretch" HorizontalAlignment="Center"
+                  MinHeight="9"
+                  Width="27">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="3" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+
+                <Path x:Name="LeftArrow" Grid.Column="0"
+                      Stretch="Uniform"
+                      Stroke="#FF000000" StrokeThickness="2"
+                      Fill="#FF000000"
+                      Data="F1 M 276.761,316L 262.619,307.835L 262.619,324.165L 276.761,316 Z "
+                      RenderTransformOrigin="0.5,0.5" 
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch">
+                    <Path.RenderTransform>
+                        <TransformGroup>
+                            <ScaleTransform />
+                            <SkewTransform />
+                            <RotateTransform />
+                            <!-- TranslateTransform Y="6" X="8" /-->
+                        </TransformGroup>
+                    </Path.RenderTransform>
+                </Path>
+                <Path x:Name="RightArrow" Grid.Column="2"
+                      Stretch="Uniform"
+                      Stroke="#FF000000" StrokeThickness="2"
+                      Fill="#FF000000"
+                      Data="F1 M 276.761,316L 262.619,307.835L 262.619,324.165L 276.761,316 Z "
+                      RenderTransformOrigin="0.5,0.5"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch">
+                    <Path.RenderTransform>
+                        <TransformGroup>
+                            <ScaleTransform />
+                            <SkewTransform />
+                            <RotateTransform Angle="-180" />
+                            <!-- TranslateTransform Y="6" X="8" /-->
+                        </TransformGroup>
+                    </Path.RenderTransform>
+                </Path>
+            </Grid>
         </Canvas>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="RightArrow" Property="Stroke" Value="{DynamicResource {x:Static reskeys:ResourceKeys.VerticalSLideThumbMouseOverBrushKey}}" />
+                <Setter TargetName="LeftArrow" Property="Stroke" Value="{DynamicResource {x:Static reskeys:ResourceKeys.VerticalSLideThumbMouseOverBrushKey}}" />
+                <Setter TargetName="RightArrow" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.VerticalSLideThumbMouseOverBrushKey}}" />
+                <Setter TargetName="LeftArrow" Property="Fill" Value="{DynamicResource {x:Static reskeys:ResourceKeys.VerticalSLideThumbMouseOverBrushKey}}" />
+            </Trigger>
+        </ControlTemplate.Triggers>
     </ControlTemplate>
 
     <Style x:Key="VerticalSlideThumbStyle" TargetType="{x:Type Thumb}">
         <Setter Property="Focusable" Value="false" />
         <Setter Property="OverridesDefaultStyle" Value="true" />
-        <Setter Property="Height" Value="12" />
-        <Setter Property="Width" Value="11" />
         <Setter Property="Foreground" Value="Gray" />
         <Setter Property="Template" Value="{StaticResource VerticalSlideThumbTemplate}" />
     </Style>
diff --git a/source/ColorPickerLib/Properties/AssemblyInfo.cs b/source/ColorPickerLib/Properties/AssemblyInfo.cs
index 55464e8..6122f1f 100644
--- a/source/ColorPickerLib/Properties/AssemblyInfo.cs
+++ b/source/ColorPickerLib/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.0.0")]
diff --git a/source/ColorPickerLib/Themes/DarkBrushs.xaml b/source/ColorPickerLib/Themes/DarkBrushs.xaml
index 0a56532..18efeba 100644
--- a/source/ColorPickerLib/Themes/DarkBrushs.xaml
+++ b/source/ColorPickerLib/Themes/DarkBrushs.xaml
@@ -1,61 +1,71 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:options="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
-                    xmlns:themes="clr-namespace:ColorPickerLib.Themes">
+                    xmlns:reskeys="clr-namespace:ColorPickerLib.Themes">
 
-    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=PanelBackgroundBrushKey}"
+    <!-- Accent Color Brush Definition
+       - Look for references on ControlAccentBrushKey to find where this is being set in code -->
+    <Color x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys},
+           ResourceId=ControlAccentColorKey}">#1ba1e2</Color>
+
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys},
+                     ResourceId=ControlAccentBrushKey}"
+                     Color="{DynamicResource {x:Static reskeys:ResourceKeys.ControlAccentColorKey}}"
+                    options:Freeze="true" />
+
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=PanelBackgroundBrushKey}"
                     Color="#FF252526"
                     options:Freeze="true" />
 
-    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlNormalBackgroundKey}"
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ControlNormalBackgroundKey}"
                     Color="#FF333333"
                     options:Freeze="true" />
     
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlDisabledBackgroundKey}"
+   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ControlDisabledBackgroundKey}"
                     Color="#FF666666"
                     options:Freeze="true" />
 
-    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlNormalBorderKey}"
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ControlNormalBorderKey}"
                     Color="#FF282828"
                     options:Freeze="true" />
     
-    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlMouseOverBorderKey}"
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ControlMouseOverBorderKey}"
                      options:Freeze="true"
                      Color="#3e3e42"
                      />
 
-    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlFocusedBorderKey}"
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ControlFocusedBorderKey}"
                     Color="#FF989898"
                     options:Freeze="true" />
 
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonNormalOuterBorderKey}"
+   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ButtonNormalOuterBorderKey}"
                     Color="#FF333333"
                     options:Freeze="true" />
 
-    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonNormalInnerBorderKey}"
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ButtonNormalInnerBorderKey}"
                     Color="#FF222222"
                     options:Freeze="true" />
 
     <SolidColorBrush options:Freeze="true"
-                     x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonNormalBackgroundKey}"
+                     x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ButtonNormalBackgroundKey}"
                      Color="#444444" />
 
-    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlSelectedBorderKey}"
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ControlSelectedBorderKey}"
                     Color="#FF569DE5"
                     options:Freeze="true" />
 
     <SolidColorBrush options:Freeze="true"
-                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonMouseOverOuterBorderKey}"
+                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ButtonMouseOverOuterBorderKey}"
                     Color="#777777" /><!-- Should be AccentColor -->
 
     <SolidColorBrush options:Freeze="true"
-                     x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonMouseOverInnerBorderKey}"
+                     x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ButtonMouseOverInnerBorderKey}"
                      Color="#3e3e42"
     />
 
     <!-- Based on ButtonBackgroundHover -->
     <SolidColorBrush options:Freeze="true" Color="#3e3e42"
-                     x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonMouseOverBackgroundKey}"/>
+                     x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ButtonMouseOverBackgroundKey}"/>
     
    <!-- LinearGradientBrush options:Freeze="true"
                         
@@ -76,10 +86,10 @@
    </LinearGradientBrush -->
 
    <SolidColorBrush options:Freeze="true"
-                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonPressedOuterBorderKey}"
+                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ButtonPressedOuterBorderKey}"
                     Color="#2C628B" />
    <LinearGradientBrush options:Freeze="true"
-                        x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonPressedInnerBorderKey}"
+                        x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ButtonPressedInnerBorderKey}"
                         StartPoint="0,0"
                         EndPoint="0,1">
       <LinearGradientBrush.GradientStops>
@@ -94,7 +104,7 @@
 
     <!-- Based on ButtonBackgroundHover -->
     <SolidColorBrush options:Freeze="true"
-                        x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonPressedBackgroundKey}"
+                        x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ButtonPressedBackgroundKey}"
                         Color="#3e3e42"
                      />
     
@@ -112,13 +122,13 @@
       </LinearGradientBrush.GradientStops>
    </LinearGradientBrush -->
 
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonFocusedOuterBorderKey}"
+   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ButtonFocusedOuterBorderKey}"
                     Color="#FF707070"
                     options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonFocusedInnerBorderKey}"
+   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ButtonFocusedInnerBorderKey}"
                     Color="#F900CCFF"
                     options:Freeze="true" />
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonFocusedBackgroundKey}"
+   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ButtonFocusedBackgroundKey}"
                         EndPoint="0,1"
                         StartPoint="0,0"
                         options:Freeze="true">
@@ -132,22 +142,23 @@
                     Offset="1" />
    </LinearGradientBrush>
 
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonDisabledOuterBorderKey}"
+   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ButtonDisabledOuterBorderKey}"
                     Color="Transparent"
                     options:Freeze="true" />
 
-    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonInnerBorderDisabledKey}"
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ButtonInnerBorderDisabledKey}"
                     Color="Transparent" />
 
     <SolidColorBrush options:Freeze="true"
-                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=GlyphNormalForegroundKey}"
+                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=GlyphNormalForegroundKey}"
                     Color="#ffffff" />
     
    <SolidColorBrush options:Freeze="true"
-                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=GlyphDisabledForegroundKey}"
+                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=GlyphDisabledForegroundKey}"
                     Color="#888888" />
 
-   <CornerRadius x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=SpinButtonCornerRadiusKey}"
+   <CornerRadius x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys},
+                 ResourceId=SpinButtonCornerRadiusKey}"
                  TopLeft="0"
                  TopRight="0"
                  BottomRight="0"
@@ -158,7 +169,10 @@
     <SolidColorBrush x:Key="PopupBackgroundBrush"  Color="#FF252526" />
 
     <!-- Popup Border -->
-    <SolidColorBrush x:Key="PopupDarkBorderBrush" Color="#FFABADB3" />
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys},
+                            ResourceId=PopUpOpenBorderBrushKey}"
+                     Color="{DynamicResource {x:Static reskeys:ResourceKeys.ControlAccentColorKey}}"
+    />
 
     <!-- =============================================================================== -->
     <!-- ColorCanvas, ColorPicker                                                        -->
@@ -186,4 +200,9 @@
 
     <SolidColorBrush x:Key="ColorPickerDarkBorderBrush" Color="#FF282828" />
 
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys},
+                            ResourceId=VerticalSLideThumbMouseOverBrushKey}"
+                     Color="{DynamicResource {x:Static reskeys:ResourceKeys.ControlAccentColorKey}}"
+    />
+
 </ResourceDictionary>
diff --git a/source/ColorPickerLib/Themes/Generic/Brushes.xaml b/source/ColorPickerLib/Themes/Generic/Brushes.xaml
index 4626188..06ef615 100644
--- a/source/ColorPickerLib/Themes/Generic/Brushes.xaml
+++ b/source/ColorPickerLib/Themes/Generic/Brushes.xaml
@@ -223,7 +223,10 @@
     </LinearGradientBrush>
 
     <!-- Popup Border -->
-    <SolidColorBrush x:Key="PopupDarkBorderBrush" Color="#FFABADB3" />
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys},
+                            ResourceId=PopUpOpenBorderBrushKey}"
+                     Color="#FFABADB3"
+    />
 
     <!-- =============================================================================== -->
     <!-- ColorCanvas, ColorPicker                                                        -->
@@ -259,4 +262,9 @@
         <GradientStop Color="#FF617584" Offset="1" />
     </LinearGradientBrush>
 
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys},
+                            ResourceId=VerticalSLideThumbMouseOverBrushKey}"
+                     Color="Gray"
+    />
+
 </ResourceDictionary>
diff --git a/source/ColorPickerLib/Themes/Generic/Common.xaml b/source/ColorPickerLib/Themes/Generic/Common.xaml
index 23a3320..cbd25bd 100644
--- a/source/ColorPickerLib/Themes/Generic/Common.xaml
+++ b/source/ColorPickerLib/Themes/Generic/Common.xaml
@@ -101,7 +101,10 @@
     </LinearGradientBrush>
 
     <!-- Popup Border -->
-    <SolidColorBrush x:Key="PopupDarkBorderBrush" Color="#FFABADB3" />
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys},
+                     ResourceId=PopUpOpenBorderBrushKey}"
+                     Color="#FFABADB3"
+    />
 
 
     <!-- =============================================================================== -->
diff --git a/source/ColorPickerLib/Themes/LightBrushs.xaml b/source/ColorPickerLib/Themes/LightBrushs.xaml
index 8dc4aff..3a168ff 100644
--- a/source/ColorPickerLib/Themes/LightBrushs.xaml
+++ b/source/ColorPickerLib/Themes/LightBrushs.xaml
@@ -1,20 +1,29 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:options="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
-                    xmlns:themes="clr-namespace:ColorPickerLib.Themes">
+                    xmlns:reskeys="clr-namespace:ColorPickerLib.Themes">
+
+    <!-- Accent Color Brush Definition
+       - Look for references on ControlAccentBrushKey to find where this is being set in code -->
+    <Color x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys},
+           ResourceId=ControlAccentColorKey}">#1ba1e2</Color>
+
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys},
+                     ResourceId=ControlAccentBrushKey}"
+                     Color="{DynamicResource {x:Static reskeys:ResourceKeys.ControlAccentColorKey}}" />
 
     <!-- Panel Background -->
-    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=PanelBackgroundBrushKey}"
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=PanelBackgroundBrushKey}"
                      Color="White" />
 
-    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlNormalBackgroundKey}"
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ControlNormalBackgroundKey}"
                     Color="#FFFFFFFF"
                     options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlDisabledBackgroundKey}"
+   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ControlDisabledBackgroundKey}"
                     Color="#F4F4F4"
                     options:Freeze="true" />
 
-    <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlNormalBorderKey}"
+    <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ControlNormalBorderKey}"
                         EndPoint="0,20"
                         MappingMode="Absolute"
                         StartPoint="0,0"
@@ -23,7 +32,7 @@
       <GradientStop Color="#E2E3EA" Offset="0.07" />
       <GradientStop Color="#E3E9EF" Offset="1" />
    </LinearGradientBrush>
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlMouseOverBorderKey}"
+   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ControlMouseOverBorderKey}"
                         StartPoint="0,0" EndPoint="0,1"
                         options:Freeze="true">
       <LinearGradientBrush.GradientStops>
@@ -34,7 +43,7 @@
          </GradientStopCollection>
       </LinearGradientBrush.GradientStops>
    </LinearGradientBrush>
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlFocusedBorderKey}"
+   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ControlFocusedBorderKey}"
                         StartPoint="0,0"
                         EndPoint="0,1"
                         options:Freeze="true">
@@ -50,14 +59,14 @@
       </LinearGradientBrush.GradientStops>
    </LinearGradientBrush>
 
-    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlSelectedBorderKey}"
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ControlSelectedBorderKey}"
                     Color="#FF569DE5"
                     options:Freeze="true" />
 
-    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonNormalOuterBorderKey}"
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ButtonNormalOuterBorderKey}"
                     Color="#FF707070"
                     options:Freeze="true" />
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonNormalInnerBorderKey}"
+   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ButtonNormalInnerBorderKey}"
                         EndPoint="0,1"
                         StartPoint="0,0"
                         options:Freeze="true">
@@ -67,7 +76,7 @@
                     Offset="1" />
    </LinearGradientBrush>
    <LinearGradientBrush options:Freeze="true"
-                        x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonNormalBackgroundKey}"
+                        x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ButtonNormalBackgroundKey}"
                         StartPoint="0,0"
                         EndPoint="0,1">
       <LinearGradientBrush.GradientStops>
@@ -79,10 +88,10 @@
    </LinearGradientBrush>
 
    <SolidColorBrush options:Freeze="true"
-                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonMouseOverOuterBorderKey}"
+                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ButtonMouseOverOuterBorderKey}"
                     Color="#3C7FB1" />
    <LinearGradientBrush options:Freeze="true"
-                        x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonMouseOverInnerBorderKey}"
+                        x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ButtonMouseOverInnerBorderKey}"
                         StartPoint="0,0"
                         EndPoint="0,1">
       <LinearGradientBrush.GradientStops>
@@ -93,14 +102,14 @@
       </LinearGradientBrush.GradientStops>
    </LinearGradientBrush>
    <SolidColorBrush options:Freeze="true"
-                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonMouseOverBackgroundKey}"
+                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ButtonMouseOverBackgroundKey}"
                     Color="#FFEAF6FD" />
 
    <SolidColorBrush options:Freeze="true"
-                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonPressedOuterBorderKey}"
+                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ButtonPressedOuterBorderKey}"
                     Color="#2C628B" />
    <LinearGradientBrush options:Freeze="true"
-                        x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonPressedInnerBorderKey}"
+                        x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ButtonPressedInnerBorderKey}"
                         StartPoint="0,0"
                         EndPoint="0,1">
       <LinearGradientBrush.GradientStops>
@@ -113,22 +122,22 @@
       </LinearGradientBrush.GradientStops>
    </LinearGradientBrush>
    <SolidColorBrush options:Freeze="true"
-                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonPressedBackgroundKey}"
+                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ButtonPressedBackgroundKey}"
                     Color="#FFEAF6FD" />
 
-    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonFocusedOuterBorderKey}"
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ButtonFocusedOuterBorderKey}"
                     Color="#FF707070"
                     options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonFocusedInnerBorderKey}"
+   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ButtonFocusedInnerBorderKey}"
                     Color="#F900CCFF"
                     options:Freeze="true" />
-    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonFocusedBackgroundKey}"
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ButtonFocusedBackgroundKey}"
                     Color="#FFEAF6FD" />
 
-    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonDisabledOuterBorderKey}"
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ButtonDisabledOuterBorderKey}"
                     Color="#ADB2B5"
                     options:Freeze="true" />
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonInnerBorderDisabledKey}"
+   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=ButtonInnerBorderDisabledKey}"
                         EndPoint="0,1"
                         StartPoint="0,0"
                         options:Freeze="true">
@@ -139,13 +148,13 @@
    </LinearGradientBrush>
 
    <SolidColorBrush options:Freeze="true"
-                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=GlyphNormalForegroundKey}"
+                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=GlyphNormalForegroundKey}"
                     Color="#FF000000" />
    <SolidColorBrush options:Freeze="true"
-                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=GlyphDisabledForegroundKey}"
+                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=GlyphDisabledForegroundKey}"
                     Color="#A9A9A9" />
 
-   <CornerRadius x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=SpinButtonCornerRadiusKey}"
+   <CornerRadius x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys}, ResourceId=SpinButtonCornerRadiusKey}"
                  TopLeft="0"
                  TopRight="0"
                  BottomRight="0"
@@ -156,7 +165,10 @@
     <SolidColorBrush x:Key="PopupBackgroundBrush"  Color="#FFFFFFFF" />
    
     <!-- Popup Border -->
-    <SolidColorBrush x:Key="PopupDarkBorderBrush" Color="#FFABADB3" />
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys},
+                            ResourceId=PopUpOpenBorderBrushKey}"
+                     Color="{DynamicResource {x:Static reskeys:ResourceKeys.ControlAccentColorKey}}"
+    />
 
     <!-- =============================================================================== -->
     <!-- ColorCanvas, ColorPicker                                                        -->
@@ -184,4 +196,9 @@
 
     <SolidColorBrush x:Key="ColorPickerDarkBorderBrush" Color="Black" />
 
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys},
+                            ResourceId=VerticalSLideThumbMouseOverBrushKey}"
+                     Color="{DynamicResource {x:Static reskeys:ResourceKeys.ControlAccentColorKey}}"
+    />
+
 </ResourceDictionary>
diff --git a/source/ColorPickerLib/Themes/ResourceKeys.cs b/source/ColorPickerLib/Themes/ResourceKeys.cs
index ede771e..cda5bc8 100644
--- a/source/ColorPickerLib/Themes/ResourceKeys.cs
+++ b/source/ColorPickerLib/Themes/ResourceKeys.cs
@@ -4,6 +4,20 @@
 
     public static class ResourceKeys
     {
+        #region Accent Keys
+        /// <summary>
+        /// Accent Color Key - This Color key is used to accent elements in the UI
+        /// (e.g.: Color of Activated Normal Window Frame, ResizeGrip, Focus or MouseOver input elements)
+        /// </summary>
+        public static readonly ComponentResourceKey ControlAccentColorKey = new ComponentResourceKey(typeof(ResourceKeys), "ControlAccentColorKey");
+
+        /// <summary>
+        /// Accent Brush Key - This Brush key is used to accent elements in the UI
+        /// (e.g.: Color of Activated Normal Window Frame, ResizeGrip, Focus or MouseOver input elements)
+        /// </summary>
+        public static readonly ComponentResourceKey ControlAccentBrushKey = new ComponentResourceKey(typeof(ResourceKeys), "ControlAccentBrushKey");
+        #endregion Accent Keys
+
         #region Brush Keys
 
         public static readonly ComponentResourceKey ControlNormalBackgroundKey = new ComponentResourceKey(typeof(ResourceKeys), "ControlNormalBackgroundKey");
@@ -42,5 +56,15 @@ public static class ResourceKeys
         public static readonly ComponentResourceKey SpinButtonCornerRadiusKey = new ComponentResourceKey(typeof(ResourceKeys), "SpinButtonCornerRadiusKey");
 
         public static readonly ComponentResourceKey SpinnerButtonStyleKey = new ComponentResourceKey(typeof(ResourceKeys), "SpinnerButtonStyleKey");
+
+        /// <summary>
+        /// Styles the border of a PopUp Control when it is open.
+        /// </summary>
+        public static readonly ComponentResourceKey PopUpOpenBorderBrushKey = new ComponentResourceKey(typeof(ResourceKeys), "PopUpOpenBorderBrushKey");
+
+        /// <summary>
+        /// Styles the border of a PopUp Control when it is open.
+        /// </summary>
+        public static readonly ComponentResourceKey VerticalSLideThumbMouseOverBrushKey = new ComponentResourceKey(typeof(ResourceKeys), "VerticalSLideThumbMouseOverBrushKey");
     }
 }
diff --git a/source/ColorPickerLib/packages.config b/source/ColorPickerLib/packages.config
index 20eb4b9..8c2a064 100644
--- a/source/ColorPickerLib/packages.config
+++ b/source/ColorPickerLib/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Dirkster.NumericUpDownLib" version="1.0.3" targetFramework="net40-client" />
+  <package id="Dirkster.NumericUpDownLib" version="1.1.0" targetFramework="net40-client" />
 </packages>
\ No newline at end of file
diff --git a/source/MLibTest/ThemedDemo/BindToMLib/ColorPickerLib/DarkLightBrushs.xaml b/source/MLibTest/ThemedDemo/BindToMLib/ColorPickerLib/DarkLightBrushs.xaml
new file mode 100644
index 0000000..7dabd73
--- /dev/null
+++ b/source/MLibTest/ThemedDemo/BindToMLib/ColorPickerLib/DarkLightBrushs.xaml
@@ -0,0 +1,28 @@
+<ResourceDictionary 
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:reskeys="clr-namespace:ColorPickerLib.Themes;assembly=ColorPickerLib"
+    xmlns:MLib_reskeys="clr-namespace:MLib.Themes;assembly=MLib"
+    >
+
+    <!-- Accent Color Brush Definition
+       - Look for references on ControlAccentBrushKey to find where this is being set in code -->
+    <Color x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys},
+           ResourceId=ControlAccentColorKey}">#FF1888b8</Color>
+
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys},
+                     ResourceId=ControlAccentBrushKey}"
+                     Color="{DynamicResource {x:Static MLib_reskeys:ResourceKeys.ControlAccentColorKey}}" />
+
+    <!-- Popup Border -->
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys},
+                            ResourceId=PopUpOpenBorderBrushKey}"
+                     Color="{DynamicResource {x:Static MLib_reskeys:ResourceKeys.ControlAccentColorKey}}"
+    />
+    
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys},
+                            ResourceId=VerticalSLideThumbMouseOverBrushKey}"
+                     Color="{DynamicResource {x:Static MLib_reskeys:ResourceKeys.ControlAccentColorKey}}"
+    />
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/source/MLibTest/ThemedDemo/BindToMLib/NumericUpDownLib/DarkLightBrushs.xaml b/source/MLibTest/ThemedDemo/BindToMLib/NumericUpDownLib/DarkLightBrushs.xaml
new file mode 100644
index 0000000..b083aab
--- /dev/null
+++ b/source/MLibTest/ThemedDemo/BindToMLib/NumericUpDownLib/DarkLightBrushs.xaml
@@ -0,0 +1,26 @@
+<ResourceDictionary 
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:reskeys="clr-namespace:NumericUpDownLib.Themes;assembly=NumericUpDownLib"
+    xmlns:MLib_reskeys="clr-namespace:MLib.Themes;assembly=MLib"
+    >
+
+    <!-- Accent Color Brush Definition
+       - Look for references on ControlAccentBrushKey to find where this is being set in code -->
+    <Color x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys},
+           ResourceId=ControlAccentColorKey}">#FF1888b8</Color>
+
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys},
+                     ResourceId=ControlAccentBrushKey}"
+                     Color="{DynamicResource {x:Static MLib_reskeys:ResourceKeys.ControlAccentColorKey}}" />
+
+    <!-- Brushes -->
+    <!-- Up/Down Glyphs -->
+    <SolidColorBrush x:Key="{x:Static reskeys:ResourceKeys.GlyphMouseOverForegroundKey}"
+                     Color="{DynamicResource {x:Static MLib_reskeys:ResourceKeys.ControlAccentColorKey}}" />
+
+    <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type reskeys:ResourceKeys},
+                     ResourceId=GlyphPressedBackroundKey}"
+                     Color="{DynamicResource {x:Static MLib_reskeys:ResourceKeys.ControlAccentColorKey}}"
+                     />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/source/MLibTest/ThemedDemo/Demos/ViewModels/DemoViewModel.cs b/source/MLibTest/ThemedDemo/Demos/ViewModels/DemoViewModel.cs
index 64fc1d3..b0be17c 100644
--- a/source/MLibTest/ThemedDemo/Demos/ViewModels/DemoViewModel.cs
+++ b/source/MLibTest/ThemedDemo/Demos/ViewModels/DemoViewModel.cs
@@ -2,6 +2,9 @@
 {
     using System.Windows.Media;
 
+    /// <summary>
+    /// This viewmodel controls all aspects of the themed control demo in this test application.
+    /// </summary>
     public class DemoViewModel : ThemedDemo.ViewModels.Base.ViewModelBase
     {
         #region private fields
diff --git a/source/MLibTest/ThemedDemo/ThemedDemo.csproj b/source/MLibTest/ThemedDemo/ThemedDemo.csproj
index fbb33a8..da2c555 100644
--- a/source/MLibTest/ThemedDemo/ThemedDemo.csproj
+++ b/source/MLibTest/ThemedDemo/ThemedDemo.csproj
@@ -89,8 +89,8 @@
     <Reference Include="MWindowLib, Version=1.0.4.2, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Dirkster.MWindowLib.1.0.4.2\lib\net452\MWindowLib.dll</HintPath>
     </Reference>
-    <Reference Include="NumericUpDownLib, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Dirkster.NumericUpDownLib.1.0.3\lib\net4\NumericUpDownLib.dll</HintPath>
+    <Reference Include="NumericUpDownLib, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Dirkster.NumericUpDownLib.1.1.0\lib\net4\NumericUpDownLib.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -128,6 +128,14 @@
     <Compile Include="ViewModels\Base\ViewModelBase.cs" />
     <Compile Include="ViewModels\ThemeDefinitionViewModel.cs" />
     <Compile Include="ViewModels\ThemeViewModel.cs" />
+    <Page Include="BindToMLib\NumericUpDownLib\DarkLightBrushs.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="BindToMLib\ColorPickerLib\DarkLightBrushs.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -177,6 +185,10 @@
       <Project>{6fb67ef1-8867-4c75-8c5d-3952a85c27da}</Project>
       <Name>ColorPickerDemoLib</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\ColorPickerLib\ColorPickerLib.csproj">
+      <Project>{e64ce47c-10a6-490e-b1b1-84f00fd6c1d2}</Project>
+      <Name>ColorPickerLib</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Components\ServiceLocator\ServiceLocator.csproj">
       <Project>{252126d1-e1d9-49c3-910b-fcf2266265ef}</Project>
       <Name>ServiceLocator</Name>
diff --git a/source/MLibTest/ThemedDemo/ViewModels/AppLifeCycleViewModel.cs b/source/MLibTest/ThemedDemo/ViewModels/AppLifeCycleViewModel.cs
index 311c7bd..7648f7e 100644
--- a/source/MLibTest/ThemedDemo/ViewModels/AppLifeCycleViewModel.cs
+++ b/source/MLibTest/ThemedDemo/ViewModels/AppLifeCycleViewModel.cs
@@ -132,7 +132,10 @@ private void CreateDefaultsSettings(ISettingsManager settings
                  ,new Uri("/NumericUpDownLib;component/Themes/DarkBrushs.xaml", UriKind.RelativeOrAbsolute)
 
                  ,new Uri("/MWindowLib;component/Themes/DarkTheme.xaml", UriKind.RelativeOrAbsolute)
+
+                 ,new Uri("/ThemedDemo;component/BindToMLib/NumericUpDownLib/DarkLightBrushs.xaml", UriKind.RelativeOrAbsolute)
                  ,new Uri("/ThemedDemo;component/BindToMLib/MWindowLib/DarkLightBrushs.xaml", UriKind.RelativeOrAbsolute)
+                 ,new Uri("/ThemedDemo;component/BindToMLib/ColorPickerLib/DarkLightBrushs.xaml", UriKind.RelativeOrAbsolute)
                 
                 }, settings.Themes);
             }
@@ -149,7 +152,10 @@ private void CreateDefaultsSettings(ISettingsManager settings
                  ,new Uri("/NumericUpDownLib;component/Themes/LightBrushs.xaml", UriKind.RelativeOrAbsolute)
 
                  ,new Uri("/MWindowLib;component/Themes/LightTheme.xaml", UriKind.RelativeOrAbsolute)
+
+                 ,new Uri("/ThemedDemo;component/BindToMLib/NumericUpDownLib/DarkLightBrushs.xaml", UriKind.RelativeOrAbsolute)
                  ,new Uri("/ThemedDemo;component/BindToMLib/MWindowLib/DarkLightBrushs.xaml", UriKind.RelativeOrAbsolute)
+                 ,new Uri("/ThemedDemo;component/BindToMLib/ColorPickerLib/DarkLightBrushs.xaml", UriKind.RelativeOrAbsolute)
 
                 }, settings.Themes);
             }
diff --git a/source/MLibTest/ThemedDemo/packages.config b/source/MLibTest/ThemedDemo/packages.config
index b37cd61..c78ec68 100644
--- a/source/MLibTest/ThemedDemo/packages.config
+++ b/source/MLibTest/ThemedDemo/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Dirkster.MLib" version="1.0.6" targetFramework="net452" />
   <package id="Dirkster.MWindowLib" version="1.0.4.2" targetFramework="net452" />
-  <package id="Dirkster.NumericUpDownLib" version="1.0.3" targetFramework="net452" />
+  <package id="Dirkster.NumericUpDownLib" version="1.1.0" targetFramework="net452" />
   <package id="Dirkster.UserNotifications" version="1.4.1" targetFramework="net452" />
   <package id="log4net" version="2.0.8" targetFramework="net452" />
 </packages>
\ No newline at end of file