diff --git a/Samples/Properties/Settings.Designer.cs b/Samples/Properties/Settings.Designer.cs
deleted file mode 100644
index 22031024..00000000
--- a/Samples/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-
-namespace Samples.Properties
-{
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
-
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-        public static Settings Default
-        {
-            get
-            {
-                return defaultInstance;
-            }
-        }
-    }
-}
diff --git a/Samples/Properties/Settings.settings b/Samples/Properties/Settings.settings
deleted file mode 100644
index 033d7a5e..00000000
--- a/Samples/Properties/Settings.settings
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
\ No newline at end of file
diff --git a/Samples/Samples.csproj b/Samples/Samples.csproj
index aec6a71d..e5d2119e 100644
--- a/Samples/Samples.csproj
+++ b/Samples/Samples.csproj
@@ -174,16 +174,7 @@
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
     <None Include="Properties\app.manifest" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/MultiComboBoxItemTemplate.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/MultiComboBoxItemTemplate.xaml
index a4b082d8..3dca3054 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/MultiComboBoxItemTemplate.xaml
+++ b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/MultiComboBoxItemTemplate.xaml
@@ -18,7 +18,7 @@
                     BorderBrush="{Binding Path=(i:VisualStateHelper.BorderBrush), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                     BorderThickness="{Binding Path=(i:VisualStateHelper.BorderThickness), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                     CornerRadius="{Binding Path=(i:VisualStateHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                    Effect="{Binding Path=(i:VisualStateHelper.Effect), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+                    Effect="{Binding Path=(i:VisualStateHelper.Effect), RelativeSource={ RelativeSource TemplatedParent}, Mode=OneWay}" />
             <Border Margin="{Binding Path=(i:VisualStateHelper.BorderThickness), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
                 <Grid x:Name="DockContainer"
                       TextElement.Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
@@ -94,7 +94,7 @@
                        Visibility="{Binding SeparatorVisibility, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
         </Grid>
         <ControlTemplate.Triggers>
-            
+
             <DataTrigger Value="False">
                 <DataTrigger.Binding>
                     <MultiBinding Converter="{x:Static irs:Converters.IsItemSeparatorShallVisibleControlConverter}">
@@ -246,5 +246,5 @@
             </MultiDataTrigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
-    
-</ResourceDictionary>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/MultiComboBoxTemplate.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/MultiComboBoxTemplate.xaml
index 7d1a2d0b..e0ea6077 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/MultiComboBoxTemplate.xaml
+++ b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/MultiComboBoxTemplate.xaml
@@ -13,7 +13,6 @@
             <its:WatermarkTemplateSelector x:Key="WatermarkTemplateSelector" />
         </ControlTemplate.Resources>
         <local:DropDown x:Name="PART_DropDown"
-                        InitBeforeOpen="True"
                         IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
                         local:DropDownHelper.Background="{Binding Path=(local:DropDownHelper.Background), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                         local:DropDownHelper.BorderBrush="{Binding Path=(local:DropDownHelper.BorderBrush), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
@@ -46,6 +45,7 @@
                             <ColumnDefinition />
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
+                        <Border x:Name="PART_BorderContainer" Grid.ColumnSpan="3" Visibility="Hidden"/>
                         <i:IconPresenter x:Name="IpIcon"
                                          Content="{TemplateBinding Icon}"
                                          Margin="{Binding Path=(local:IconHelper.Margin), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/NumberInputTemplate.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/NumberInputTemplate.xaml
index ec901490..acc2e8ed 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/NumberInputTemplate.xaml
+++ b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/NumberInputTemplate.xaml
@@ -12,92 +12,122 @@
         <ControlTemplate.Resources>
             <its:WatermarkTemplateSelector x:Key="WatermarkTemplateSelector" />
         </ControlTemplate.Resources>
-        <local:ContentControlX x:Name="CcMain"
-                               Source="{Binding RelativeSource={RelativeSource TemplatedParent}}"
-                               Background="{Binding Path=(i:VisualStateHelper.Background), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                               BorderBrush="{Binding Path=(i:VisualStateHelper.BorderBrush), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                               Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                               BorderThickness="{Binding Path=(i:VisualStateHelper.BorderThickness), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                               CornerRadius="{Binding Path=(i:VisualStateHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                               Effect="{Binding Path=(i:VisualStateHelper.Effect), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                               Icon="{Binding Icon, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <TextBox x:Name="PART_InputTextBox"
-                         IsReadOnly="{TemplateBinding IsReadOnly}"
-                         Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                         local:TextBoxHelper.Hook="True"
-                         local:TextBoxHelper.InputLimit="Digit,Point"
-                         local:TextBoxHelper.SelectAllOnFocus="{TemplateBinding SelectAllOnFocus}">
-                    <TextBox.Style>
-                        <Style TargetType="TextBox">
-                            <Setter Property="InputMethod.IsInputMethodEnabled"
-                                    Value="False" />
-                            <Setter Property="VerticalContentAlignment"
-                                    Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" />
-                            <Setter Property="HorizontalContentAlignment"
-                                    Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" />
-                            <Setter Property="Padding"
-                                    Value="{Binding Padding, RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" />
-                            <Setter Property="CaretBrush"
-                                    Value="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
-                            <Setter Property="Template">
-                                <Setter.Value>
-                                    <ControlTemplate TargetType="TextBox">
-                                        <ScrollViewer x:Name="PART_ContentHost"
-                                                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-                                    </ControlTemplate>
-                                </Setter.Value>
-                            </Setter>
-                        </Style>
-                    </TextBox.Style>
-                </TextBox>
-                <Border Margin="{TemplateBinding Padding}">
-                    <ContentControl Margin="2,0,0,0"
-                                    IsHitTestVisible="False"
-                                    Focusable="False"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    Visibility="{Binding Text, Converter={x:Static pw:Converters.StringNonnullAndNotEmptyToCollapseConverter}, ElementName=PART_InputTextBox, Mode=OneWay}"
-                                    Content="{Binding Watermark, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                    ContentTemplateSelector="{StaticResource WatermarkTemplateSelector}"
-                                    Foreground="{Binding Path=(i:VisualStateHelper.WatermarkForeground),RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
-                </Border>
-                <Button x:Name="BtnClear"
-                        Grid.Column="1"
-                        Visibility="Collapsed"
-                        Style="{TemplateBinding ClearButtonStyle}"
-                        Command="{TemplateBinding ClearCommand}"
-                        CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=local:NumberInput}}" />
-                <Grid x:Name="GrdUpDown"
-                      Grid.Column="2"
-                      Visibility="Collapsed">
-                    <Grid.RowDefinitions>
-                        <RowDefinition />
-                        <RowDefinition />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition />
-                        <ColumnDefinition />
-                    </Grid.ColumnDefinitions>
-                    <RepeatButton x:Name="PART_UpButton"
-                                  Tag="Up"
-                                  Style="{TemplateBinding UpDownButtonStyle}"
-                                  Command="{Binding UpCommand, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                  CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
-                    <RepeatButton x:Name="PART_DownButton"
-                                  Tag="Down"
-                                  Style="{TemplateBinding UpDownButtonStyle}"
-                                  Command="{Binding DownCommand, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                  CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"/>
-                </Grid>
-            </Grid>
-        </local:ContentControlX>
+        <Grid>
+            <Border x:Name="BdrContainer"
+                    Background="{Binding Path=(i:VisualStateHelper.Background), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                    BorderBrush="{Binding Path=(i:VisualStateHelper.BorderBrush), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                    BorderThickness="{Binding Path=(i:VisualStateHelper.BorderThickness), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                    CornerRadius="{Binding Path=(i:VisualStateHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                    Effect="{Binding Path=(i:VisualStateHelper.Effect), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+            <Border Margin="{Binding Path=(i:VisualStateHelper.BorderThickness), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
+                <DockPanel x:Name="DockContainer"
+                           TextElement.Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                           TextBlock.Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
+                    <i:IconPresenter x:Name="IpIcon"
+                                     Content="{Binding Icon, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                     Margin="{Binding Path=(local:IconHelper.Margin), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                     Width="{Binding Path=(local:IconHelper.Width), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                     Height="{Binding Path=(local:IconHelper.Height), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                     MinWidth="{Binding Path=(local:IconHelper.MinWidth), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                     MinHeight="{Binding Path=(local:IconHelper.MinHeight), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                     MaxWidth="{Binding Path=(local:IconHelper.MaxWidth), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                     MaxHeight="{Binding Path=(local:IconHelper.MaxHeight), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                     HorizontalContentAlignment="{Binding Path=(local:IconHelper.HorizontalAlignment), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                     VerticalContentAlignment="{Binding Path=(local:IconHelper.VerticalAlignment), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                     Foreground="{Binding Path=(local:IconHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                     FontFamily="{Binding Path=(local:IconHelper.FontFamily), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                     FontSize="{Binding Path=(local:IconHelper.FontSize), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                     ToolTip="{Binding Path=(local:IconHelper.ToolTip), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
+                        <i:IconPresenter.Visibility>
+                            <MultiBinding Converter="{x:Static irs:Converters.IconVisibilityConverter}">
+                                <Binding Path="Icon"
+                                         RelativeSource="{RelativeSource TemplatedParent}"
+                                         Mode="OneWay" />
+                                <Binding Path="(local:IconHelper.HiddenOnNull)"
+                                         RelativeSource="{RelativeSource TemplatedParent}"
+                                         Mode="OneWay" />
+                            </MultiBinding>
+                        </i:IconPresenter.Visibility>
+                    </i:IconPresenter>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <TextBox x:Name="PART_InputTextBox"
+                                 IsReadOnly="{TemplateBinding IsReadOnly}"
+                                 Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                 local:TextBoxHelper.Hook="True"
+                                 local:TextBoxHelper.InputLimit="Digit,Point"
+                                 local:TextBoxHelper.SelectAllOnFocus="{TemplateBinding SelectAllOnFocus}">
+                            <TextBox.Style>
+                                <Style TargetType="TextBox">
+                                    <Setter Property="InputMethod.IsInputMethodEnabled"
+                                            Value="False" />
+                                    <Setter Property="VerticalContentAlignment"
+                                            Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" />
+                                    <Setter Property="HorizontalContentAlignment"
+                                            Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" />
+                                    <Setter Property="Padding"
+                                            Value="{Binding Padding, RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" />
+                                    <Setter Property="CaretBrush"
+                                            Value="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+                                    <Setter Property="Template">
+                                        <Setter.Value>
+                                            <ControlTemplate TargetType="TextBox">
+                                                <ScrollViewer x:Name="PART_ContentHost"
+                                                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+                                            </ControlTemplate>
+                                        </Setter.Value>
+                                    </Setter>
+                                </Style>
+                            </TextBox.Style>
+                        </TextBox>
+                        <Border Margin="{TemplateBinding Padding}">
+                            <ContentControl Margin="2,0,0,0"
+                                            IsHitTestVisible="False"
+                                            Focusable="False"
+                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                            Visibility="{Binding Text, Converter={x:Static pw:Converters.StringNonnullAndNotEmptyToCollapseConverter}, ElementName=PART_InputTextBox, Mode=OneWay}"
+                                            Content="{Binding Watermark, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                            ContentTemplateSelector="{StaticResource WatermarkTemplateSelector}"
+                                            Foreground="{Binding Path=(i:VisualStateHelper.WatermarkForeground),RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+                        </Border>
+                        <Button x:Name="BtnClear"
+                                Grid.Column="1"
+                                Visibility="Collapsed"
+                                Style="{TemplateBinding ClearButtonStyle}"
+                                Command="{TemplateBinding ClearCommand}"
+                                CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=local:NumberInput}}" />
+                        <Grid x:Name="GrdUpDown"
+                              Grid.Column="2"
+                              Visibility="Collapsed">
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+                            <RepeatButton x:Name="PART_UpButton"
+                                          Tag="Up"
+                                          Style="{TemplateBinding UpDownButtonStyle}"
+                                          Command="{Binding UpCommand, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                          CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+                            <RepeatButton x:Name="PART_DownButton"
+                                          Tag="Down"
+                                          Style="{TemplateBinding UpDownButtonStyle}"
+                                          Command="{Binding DownCommand, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                          CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+                        </Grid>
+                    </Grid>
+                </DockPanel>
+            </Border>
+        </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsReadOnly"
                      Value="True">
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI/Controls/MultiComboBox.cs b/SourceCode/SharedResources/Panuon.WPF.UI/Controls/MultiComboBox.cs
index 0a0530bf..d82c3d6c 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI/Controls/MultiComboBox.cs
+++ b/SourceCode/SharedResources/Panuon.WPF.UI/Controls/MultiComboBox.cs
@@ -3,10 +3,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
@@ -23,6 +20,10 @@ public class MultiComboBox
     {
         #region Fields
         private List<object> _selectionBoxItems;
+        private ItemsPresenter _itemsPresenter;
+        private DropDown _dropDown;
+        private ScrollViewer _itemsScrollViewer;
+        private Border _containerBorder;
         #endregion
 
         #region Ctor
@@ -802,16 +803,38 @@ protected override DependencyObject GetContainerForItemOverride()
 
         protected override void OnSelectionChanged(SelectionChangedEventArgs e)
         {
-            UpdateSelectionBoxItems();
             base.OnSelectionChanged(e);
+            UpdateSelectionBoxItems();
         }
 
         public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
 
+            _containerBorder = GetTemplateChild("PART_BorderContainer") as Border;
+            _itemsPresenter = GetTemplateChild("PART_ItemsPresenter") as ItemsPresenter;
+            _itemsScrollViewer = _itemsPresenter.Parent as ScrollViewer;
+
+            _dropDown = GetTemplateChild("PART_DropDown") as DropDown;
+            _dropDown.Opened += DropDown_Opened;
+            _dropDown.Closed += DropDown_Closed;
+
+            DropDown_Closed(null, null);
             UpdateSelectionBoxItems();
         }
+
+        private void DropDown_Opened(object sender, EventArgs e)
+        {
+            _containerBorder.Child = null;
+            _itemsScrollViewer.Content = _itemsPresenter;
+            
+        }
+
+        private void DropDown_Closed(object sender, EventArgs e)
+        {
+            _itemsScrollViewer.Content = null;
+            _containerBorder.Child = _itemsPresenter;
+        }
         #endregion
 
         #region Functions
@@ -873,6 +896,7 @@ private static void OnUnselectCommandExecute(object sender)
 
         private void UpdateSelectionBoxItems()
         {
+
             _selectionBoxItems = new List<object>();
             foreach (var selectedItem in SelectedItems)
             {
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI/Properties/AssemblyInfo.cs b/SourceCode/SharedResources/Panuon.WPF.UI/Properties/AssemblyInfo.cs
index f1d05ffd..fc8a94a6 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI/Properties/AssemblyInfo.cs
+++ b/SourceCode/SharedResources/Panuon.WPF.UI/Properties/AssemblyInfo.cs
@@ -25,5 +25,5 @@
     ResourceDictionaryLocation.SourceAssembly
 )]
 
-[assembly: AssemblyVersion("1.2.1.5")]
-[assembly: AssemblyFileVersion("1.2.1.5")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.2.1.6")]
+[assembly: AssemblyFileVersion("1.2.1.6")]
\ No newline at end of file
diff --git a/SourceCode/sharedResources/Panuon.WPF.UI/Resources/KeyOnlyStyleDictionary.cs b/SourceCode/sharedResources/Panuon.WPF.UI/Resources/KeyOnlyStyleDictionary.cs
index d5557f85..25b3d7c3 100644
--- a/SourceCode/sharedResources/Panuon.WPF.UI/Resources/KeyOnlyStyleDictionary.cs
+++ b/SourceCode/sharedResources/Panuon.WPF.UI/Resources/KeyOnlyStyleDictionary.cs
@@ -16,6 +16,57 @@ protected override void SetIncludeStyles()
                     || Includes.HasFlag(flag))
                 {
                     AddToMergedDictionaries(new SharedResourceDictionary() { Source = new Uri($"pack://application:,,,/Panuon.WPF.UI;component/Styles/{flag}Style.xaml") });
+
+                    switch (flag)
+                    {
+                        case StyleDictionaryFlags.ComboBox:
+                        case StyleDictionaryFlags.ListBox:
+                        case StyleDictionaryFlags.ListView:
+                        case StyleDictionaryFlags.TreeView:
+                        case StyleDictionaryFlags.Menu:
+                            AddToMergedDictionaries(new SharedResourceDictionary() { Source = new Uri($"pack://application:,,,/Panuon.WPF.UI;component/Styles/{flag}ItemStyle.xaml") });
+                            break;
+                        case StyleDictionaryFlags.TabControl:
+                            AddToMergedDictionaries(new SharedResourceDictionary() { Source = new Uri($"pack://application:,,,/Panuon.WPF.UI;component/Styles/TabItemStyle.xaml") });
+                            break;
+                        case StyleDictionaryFlags.ContextMenu:
+                            var contextMenuItemDic = new SharedResourceDictionary() { Source = new Uri($"pack://application:,,,/Panuon.WPF.UI;component/Styles/MenuItemStyle.xaml") };
+                            AddToMergedDictionaries(contextMenuItemDic);
+                            break;
+                    }
+                }
+            }
+        }
+
+        protected override void SetExcludeStyles()
+        {
+            MergedDictionaries.Clear();
+            MergedDictionaries.Add(DefaultResourceDictionary);
+
+            foreach (var flag in Flags)
+            {
+                if (!Excludes.HasFlag(StyleDictionaryFlags.All)
+                   && !Excludes.HasFlag(flag))
+                {
+                    AddToMergedDictionaries(new SharedResourceDictionary() { Source = new Uri($"pack://application:,,,/Panuon.WPF.UI;component/Styles/{flag}Style.xaml") });
+
+                    switch (flag)
+                    {
+                        case StyleDictionaryFlags.ComboBox:
+                        case StyleDictionaryFlags.ListBox:
+                        case StyleDictionaryFlags.ListView:
+                        case StyleDictionaryFlags.TreeView:
+                        case StyleDictionaryFlags.Menu:
+                            AddToMergedDictionaries(new SharedResourceDictionary() { Source = new Uri($"pack://application:,,,/Panuon.WPF.UI;component/Styles/{flag}ItemStyle.xaml") });
+                            break;
+                        case StyleDictionaryFlags.TabControl:
+                            AddToMergedDictionaries(new SharedResourceDictionary() { Source = new Uri($"pack://application:,,,/Panuon.WPF.UI;component/Styles/TabItemStyle.xaml") });
+                            break;
+                        case StyleDictionaryFlags.ContextMenu:
+                            var contextMenuItemDic = new SharedResourceDictionary() { Source = new Uri($"pack://application:,,,/Panuon.WPF.UI;component/Styles/MenuItemStyle.xaml") };
+                            AddToMergedDictionaries(contextMenuItemDic);
+                            break;
+                    }
                 }
             }
         }
diff --git a/SourceCode/sharedResources/Panuon.WPF.UI/Resources/StyleDictionary.cs b/SourceCode/sharedResources/Panuon.WPF.UI/Resources/StyleDictionary.cs
index 8e67c24e..bdc854b6 100644
--- a/SourceCode/sharedResources/Panuon.WPF.UI/Resources/StyleDictionary.cs
+++ b/SourceCode/sharedResources/Panuon.WPF.UI/Resources/StyleDictionary.cs
@@ -38,5 +38,35 @@ protected override void SetIncludeStyles()
             }
         }
 
+        protected override void SetExcludeStyles()
+        {
+            foreach (var flag in Flags)
+            {
+                if (!Excludes.HasFlag(StyleDictionaryFlags.All)
+                    && !Excludes.HasFlag(flag))
+                {
+                    AddToMergedDictionaries(new SharedResourceDictionary() { Source = new Uri($"pack://application:,,,/Panuon.WPF.UI;component/Styles/{flag}.xaml") });
+
+                    switch (flag)
+                    {
+                        case StyleDictionaryFlags.ComboBox:
+                        case StyleDictionaryFlags.ListBox:
+                        case StyleDictionaryFlags.ListView:
+                        case StyleDictionaryFlags.TreeView:
+                        case StyleDictionaryFlags.Menu:
+                            AddToMergedDictionaries(new SharedResourceDictionary() { Source = new Uri($"pack://application:,,,/Panuon.WPF.UI;component/Styles/{flag}Item.xaml") });
+                            break;
+                        case StyleDictionaryFlags.TabControl:
+                            AddToMergedDictionaries(new SharedResourceDictionary() { Source = new Uri($"pack://application:,,,/Panuon.WPF.UI;component/Styles/TabItem.xaml") });
+                            break;
+                        case StyleDictionaryFlags.ContextMenu:
+                            var contextMenuItemDic = new SharedResourceDictionary() { Source = new Uri($"pack://application:,,,/Panuon.WPF.UI;component/Styles/MenuItem.xaml") };
+                            AddToMergedDictionaries(contextMenuItemDic);
+                            break;
+                    }
+                }
+            }
+        }
+
     }
 }
\ No newline at end of file
diff --git a/SourceCode/sharedResources/Panuon.WPF.UI/Resources/StyleDictionaryBase.cs b/SourceCode/sharedResources/Panuon.WPF.UI/Resources/StyleDictionaryBase.cs
index d51a7e0a..a0403f16 100644
--- a/SourceCode/sharedResources/Panuon.WPF.UI/Resources/StyleDictionaryBase.cs
+++ b/SourceCode/sharedResources/Panuon.WPF.UI/Resources/StyleDictionaryBase.cs
@@ -36,16 +36,37 @@ public StyleDictionaryFlags Includes
             get => _inclues;
             set
             {
+                if(_excludes != StyleDictionaryFlags.None)
+                {
+                    throw new InvalidOperationException("Cannot set Includes property when Excludes property is not None.");
+                }
                 _inclues = value;
                 SetIncludeStyles();
             }
         }
         private StyleDictionaryFlags _inclues;
+
+        public StyleDictionaryFlags Excludes
+        {
+            get => _excludes;
+            set
+            {
+                if(_inclues != StyleDictionaryFlags.None)
+                {
+                    throw new InvalidOperationException("Cannot set Excludes property when Includes property is not None.");
+                }
+                _excludes = value;
+                SetExcludeStyles();
+            }
+        }
+        private StyleDictionaryFlags _excludes;
         #endregion
 
         #region Methods
         protected abstract void SetIncludeStyles();
 
+        protected abstract void SetExcludeStyles();
+
         protected void AddToMergedDictionaries(ResourceDictionary dictionary)
         {
             if (!MergedDictionaries.Contains(dictionary))