diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBoxItem.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBoxItem.cs
index 17649cee..af1b723c 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBoxItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBoxItem.cs
@@ -22,6 +22,11 @@ namespace Microsoft.Windows.Controls
             DefaultStyleKeyProperty.OverrideMetadata(typeof(CheckListBoxItem), new FrameworkPropertyMetadata(typeof(CheckListBoxItem)));
         }
 
+        public CheckListBoxItem()
+        {
+            AddHandler(Mouse.MouseDownEvent, new MouseButtonEventHandler(CheckListBoxItem_MouseDown));
+        }
+
         #region Properties
 
         public static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register("IsSelected", typeof(bool), typeof(CheckListBoxItem), new FrameworkPropertyMetadata(false, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnIsSelectedChanged));
@@ -55,6 +60,15 @@ namespace Microsoft.Windows.Controls
 
         #endregion
 
+        #region Event Hanlders
+
+        void CheckListBoxItem_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            IsSelected = !IsSelected;
+        }
+
+        #endregion //Event Hanlders
+
         #region Methods
 
         private void RaiseSelectionChangedEvent(RoutedEventArgs e)
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Themes/Generic.xaml
index 4714eca7..ed0f08c6 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Themes/Generic.xaml
@@ -5,6 +5,8 @@
                     xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters">
     
     <Style TargetType="{x:Type local:CheckListBox}">
+        <Setter Property="BorderBrush" Value="#FF707070" />
+        <Setter Property="BorderThickness" Value="1" />
         <Setter Property="KeyboardNavigation.TabNavigation" Value="Once"/>
         <Setter Property="Template">
             <Setter.Value>
@@ -21,7 +23,7 @@
         </Setter>
     </Style>
 
-    <Style TargetType="{x:Type local:CheckListBoxItem}">
+    <Style TargetType="{x:Type local:CheckListBoxItem}" >
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type local:CheckListBoxItem}">
@@ -35,23 +37,19 @@
                                 <ColumnDefinition Width="*" />
                             </Grid.ColumnDefinitions>
                             <CheckBox Name="PART_CheckBox" IsChecked="{Binding IsSelected, RelativeSource={RelativeSource TemplatedParent}}"
-                                      VerticalAlignment="Center" Focusable="False"  Margin="1,1,5,1"/>
+                                      VerticalAlignment="Center" Focusable="False"  Margin="3,1,5,1"/>
                             <Border Grid.Column="1">
                                 <ContentPresenter Margin="2" ContentSource="Content" />
                             </Border>
                         </Grid>
                     </Border>
                     
-                    <!--<ControlTemplate.Triggers>
-                        <Trigger Property="IsChecked" Value="true">
-                            <Setter TargetName="_background" Property="Background" Value="Blue"/>
-                            <Setter Property="Foreground" Value="White"/>
-                        </Trigger>
+                    <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="true">
                             <Setter TargetName="_background" Property="Background" Value="Blue"/>
                             <Setter Property="Foreground" Value="White"/>
                         </Trigger>
-                    </ControlTemplate.Triggers>-->
+                    </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>