diff --git a/demo/Ursa.Demo/Pages/DialogDemo.axaml b/demo/Ursa.Demo/Pages/DialogDemo.axaml
index b50c1ecc..2683c009 100644
--- a/demo/Ursa.Demo/Pages/DialogDemo.axaml
+++ b/demo/Ursa.Demo/Pages/DialogDemo.axaml
@@ -200,6 +200,7 @@
         <Grid Grid.Column="1">
             <Border
                 BorderBrush="{DynamicResource SemiGrey1}"
+                Background="{DynamicResource SemiColorBackground1}"
                 BorderThickness="1"
                 ClipToBounds="True"
                 CornerRadius="12">
diff --git a/demo/Ursa.Demo/Pages/DrawerDemo.axaml b/demo/Ursa.Demo/Pages/DrawerDemo.axaml
index c5202152..fb6dbbef 100644
--- a/demo/Ursa.Demo/Pages/DrawerDemo.axaml
+++ b/demo/Ursa.Demo/Pages/DrawerDemo.axaml
@@ -42,6 +42,7 @@
         <Grid Grid.Column="1" ClipToBounds="True">
             <Border
                 BorderBrush="{DynamicResource SemiGrey1}"
+                Background="{DynamicResource SemiColorBackground1}"
                 BorderThickness="1"
                 ClipToBounds="True"
                 CornerRadius="20">
diff --git a/src/Ursa.Themes.Semi/Controls/DatePicker.axaml b/src/Ursa.Themes.Semi/Controls/DatePicker.axaml
index ae353b1f..1ee23c42 100644
--- a/src/Ursa.Themes.Semi/Controls/DatePicker.axaml
+++ b/src/Ursa.Themes.Semi/Controls/DatePicker.axaml
@@ -74,7 +74,7 @@
                                 Placement="BottomEdgeAlignedLeft"
                                 PlacementTarget="{TemplateBinding}">
                                 <Border
-                                    Margin="8"
+                                    Margin="{DynamicResource ComboBoxPopupBorderMargin}"
                                     Padding="8"
                                     Background="{DynamicResource ComboBoxPopupBackground}"
                                     BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
diff --git a/src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml b/src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml
index dac29480..1eab25a8 100644
--- a/src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml
+++ b/src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml
@@ -82,7 +82,7 @@
                             Placement="BottomEdgeAlignedLeft"
                             PlacementTarget="Background">
                             <Border
-                                Margin="8"
+                                Margin="{DynamicResource ComboBoxPopupBorderMargin}"
                                 Padding="8"
                                 HorizontalAlignment="Stretch"
                                 Background="{DynamicResource ComboBoxPopupBackground}"
diff --git a/src/Ursa.Themes.Semi/Controls/DateTimePicker.axaml b/src/Ursa.Themes.Semi/Controls/DateTimePicker.axaml
index 7b55698b..172e73c1 100644
--- a/src/Ursa.Themes.Semi/Controls/DateTimePicker.axaml
+++ b/src/Ursa.Themes.Semi/Controls/DateTimePicker.axaml
@@ -73,7 +73,7 @@
                                 Placement="BottomEdgeAlignedLeft"
                                 PlacementTarget="{TemplateBinding}">
                                 <Border
-                                    Margin="8"
+                                    Margin="{DynamicResource ComboBoxPopupBorderMargin}"
                                     Padding="8"
                                     Background="{DynamicResource ComboBoxPopupBackground}"
                                     BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
diff --git a/src/Ursa.Themes.Semi/Controls/Dialog.axaml b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
index 5d761cc2..4689866b 100644
--- a/src/Ursa.Themes.Semi/Controls/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
@@ -28,6 +28,7 @@
                         VerticalAlignment="{TemplateBinding VerticalAlignment}"
                         Classes="Shadow"
                         ClipToBounds="False"
+                        Background="{DynamicResource SemiColorBackground2}"
                         CornerRadius="{TemplateBinding CornerRadius}"
                         Focusable="True"
                         IsHitTestVisible="True"
@@ -162,6 +163,7 @@
                         VerticalAlignment="{TemplateBinding VerticalAlignment}"
                         BoxShadow="0 0 8 0 #1A000000"
                         Classes="Shadow"
+                        Background="{DynamicResource SemiColorBackground2}"
                         ClipToBounds="False"
                         CornerRadius="{TemplateBinding CornerRadius}"
                         Focusable="True"
@@ -463,7 +465,7 @@
 
     <ControlTheme x:Key="{x:Type u:DialogWindow}" TargetType="u:DialogWindow">
         <Setter Property="Title" Value="{x:Null}" />
-        <Setter Property="Background" Value="{DynamicResource BorderCardBackground}" />
+        <Setter Property="Background" Value="{DynamicResource SemiColorBackground2}" />
         <Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource WindowDefaultBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource WindowDefaultForeground}" />
         <Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}" />
@@ -535,7 +537,7 @@
 
     <ControlTheme x:Key="{x:Type u:DefaultDialogWindow}" TargetType="u:DefaultDialogWindow">
         <Setter Property="Title" Value="{x:Null}" />
-        <Setter Property="Background" Value="{DynamicResource BorderCardBackground}" />
+        <Setter Property="Background" Value="{DynamicResource SemiColorBackground2}" />
         <Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource WindowDefaultBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource WindowDefaultForeground}" />
         <Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}" />
diff --git a/src/Ursa.Themes.Semi/Controls/Drawer.axaml b/src/Ursa.Themes.Semi/Controls/Drawer.axaml
index 207a3faa..82eabdc4 100644
--- a/src/Ursa.Themes.Semi/Controls/Drawer.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Drawer.axaml
@@ -19,6 +19,7 @@
                         Name="PART_Root"
                         Margin="{TemplateBinding Padding,
                                                  Converter={x:Static c:ThicknessTakeConverter.Left}}"
+                        Background="{DynamicResource SemiColorBackground2}"
                         Padding="0"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
@@ -111,6 +112,7 @@
                         Name="PART_Root"
                         Margin="{TemplateBinding Padding,
                                                  Converter={x:Static c:ThicknessTakeConverter.Left}}"
+                        Background="{DynamicResource SemiColorBackground2}"
                         Padding="0"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
diff --git a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
index c000c89d..5797196a 100644
--- a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
@@ -6,7 +6,7 @@
     <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type u:MessageBoxWindow}" TargetType="u:MessageBoxWindow">
         <Setter Property="Title" Value="{x:Null}" />
-        <Setter Property="Background" Value="{DynamicResource BorderCardBackground}" />
+        <Setter Property="Background" Value="{DynamicResource SemiColorBackground2}" />
         <Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource WindowDefaultBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource WindowDefaultForeground}" />
         <Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}" />
@@ -178,6 +178,7 @@
                     VerticalAlignment="Center"
                     Classes="Shadow"
                     ClipToBounds="False"
+                    Background="{DynamicResource SemiColorBackground2}"
                     CornerRadius="{TemplateBinding CornerRadius}"
                     IsHitTestVisible="True"
                     Theme="{DynamicResource CardBorder}">
diff --git a/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml b/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml
index aacc0c7f..0b6a8280 100644
--- a/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml
@@ -110,13 +110,12 @@
                             IsOpen="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsDropDownOpen, Mode=TwoWay}"
                             PlacementTarget="PART_RootGrid">
                             <Border
-                                Margin="0,4"
+                                Margin="{DynamicResource ComboBoxPopupBorderMargin}"
                                 HorizontalAlignment="Stretch"
                                 Background="{DynamicResource ComboBoxPopupBackground}"
                                 BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
                                 BorderThickness="{DynamicResource ComboBoxPopupBorderThickness}"
                                 BoxShadow="{DynamicResource ComboBoxPopupBoxShadow}"
-                                ClipToBounds="True"
                                 CornerRadius="6">
                                 <DockPanel LastChildFill="True">
                                     <ContentPresenter Content="{TemplateBinding PopupInnerTopContent}" DockPanel.Dock="Top"/>
@@ -217,12 +216,8 @@
         <Setter Property="Cursor" Value="Hand" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ListBoxItemCheckFontSize}" />
-        <Setter Property="CornerRadius" Value="{DynamicResource ListBoxItemCheckBoxCornerRadius}" />
         <Setter Property="MinHeight" Value="32" />
-        <Setter Property="Foreground" Value="{DynamicResource ListBoxItemCheckForeground}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ListBoxItemCheckDefaultBorderBrush}" />
+        <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackground}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:MultiComboBoxItem">
                 <Border
@@ -235,11 +230,11 @@
                         <PathIcon
                             Name="CheckGlyph"
                             Grid.Column="0"
-                            Width="{DynamicResource ListBoxItemCheckBoxGlyphWidth}"
-                            Height="{DynamicResource ListBoxItemCheckBoxGlyphHeight}"
+                            Width="{DynamicResource CheckBoxBoxGlyphWidth}"
+                            Height="{DynamicResource CheckBoxBoxGlyphHeight}"
                             Margin="8,0"
                             VerticalAlignment="Center"
-                            Data="{DynamicResource ListBoxItemCheckCheckGlyph}"
+                            Data="{DynamicResource CheckBoxCheckGlyph}"
                             Opacity="0" />
                         <ContentPresenter
                             x:Name="ContentPresenter"
@@ -268,13 +263,13 @@
         <!--  Pointerover State  -->
         <Style Selector="^:pointerover">
             <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemPointeroverForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ListBoxItemPointeroverBackground}" />
+            <Setter Property="Background" Value="{DynamicResource ComboBoxItemPointeroverBackground}" />
         </Style>
 
         <!--  Pressed State  -->
         <Style Selector="^:pressed">
             <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemPressedForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ListBoxItemPressedBackground}" />
+            <Setter Property="Background" Value="{DynamicResource ComboBoxItemPressedBackground}" />
         </Style>
 
         <!--  Selected State  -->
diff --git a/src/Ursa.Themes.Semi/Controls/TimePicker.axaml b/src/Ursa.Themes.Semi/Controls/TimePicker.axaml
index 411df8ef..ad197c86 100644
--- a/src/Ursa.Themes.Semi/Controls/TimePicker.axaml
+++ b/src/Ursa.Themes.Semi/Controls/TimePicker.axaml
@@ -159,13 +159,12 @@
                                 Placement="BottomEdgeAlignedLeft"
                                 PlacementTarget="Background">
                                 <Border
-                                    Margin="0,4"
+                                    Margin="{DynamicResource ComboBoxPopupBorderMargin}"
                                     HorizontalAlignment="Stretch"
                                     Background="{DynamicResource ComboBoxPopupBackground}"
                                     BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
                                     BorderThickness="{DynamicResource ComboBoxPopupBorderThickness}"
                                     BoxShadow="{DynamicResource ComboBoxPopupBoxShadow}"
-                                    ClipToBounds="True"
                                     CornerRadius="6">
                                     <DockPanel>
                                         <StackPanel DockPanel.Dock="Bottom" IsVisible="{TemplateBinding NeedConfirmation}">
diff --git a/src/Ursa.Themes.Semi/Controls/TimeRangePicker.axaml b/src/Ursa.Themes.Semi/Controls/TimeRangePicker.axaml
index f08f6828..8f08ba09 100644
--- a/src/Ursa.Themes.Semi/Controls/TimeRangePicker.axaml
+++ b/src/Ursa.Themes.Semi/Controls/TimeRangePicker.axaml
@@ -83,13 +83,12 @@
                             Placement="BottomEdgeAlignedLeft"
                             PlacementTarget="Background">
                             <Border
-                                Margin="0,4"
+                                Margin="{DynamicResource ComboBoxPopupBorderMargin}"
                                 HorizontalAlignment="Stretch"
                                 Background="{DynamicResource ComboBoxPopupBackground}"
                                 BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
                                 BorderThickness="{DynamicResource ComboBoxPopupBorderThickness}"
                                 BoxShadow="{DynamicResource ComboBoxPopupBoxShadow}"
-                                ClipToBounds="True"
                                 CornerRadius="6">
                                 <DockPanel>
                                     <StackPanel DockPanel.Dock="Bottom" IsVisible="{TemplateBinding NeedConfirmation}">
diff --git a/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml b/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml
index f690e667..0baf38ef 100644
--- a/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml
@@ -111,12 +111,11 @@
                         WindowManagerAddShadowHint="False">
                         <Border
                             Name="PopupBorder"
-                            Margin="0,4"
+                            Margin="{DynamicResource ComboBoxPopupBorderMargin}"
                             Background="{DynamicResource ComboBoxPopupBackground}"
                             BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
                             BorderThickness="{DynamicResource ComboBoxPopupBorderThickness}"
                             BoxShadow="{DynamicResource ComboBoxPopupBoxShadow}"
-                            ClipToBounds="True"
                             CornerRadius="6">
                             <DockPanel LastChildFill="True">
                                 <ContentPresenter
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Dialog.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Dialog.axaml
index 733792aa..c8a82a2e 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/Dialog.axaml
@@ -1,3 +1,3 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="OverlayDialogMaskBrush" Color="#FFA7ABB0" Opacity="0.2" />
+    <SolidColorBrush x:Key="OverlayDialogMaskBrush" Color="#FF16161A" Opacity="0.6" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/Dialog.axaml b/src/Ursa.Themes.Semi/Themes/Light/Dialog.axaml
index a9819865..c8a82a2e 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/Dialog.axaml
@@ -1,3 +1,3 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="OverlayDialogMaskBrush" Color="#FF555B61" Opacity="0.2" />
+    <SolidColorBrush x:Key="OverlayDialogMaskBrush" Color="#FF16161A" Opacity="0.6" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml b/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml
index e6a449ce..9d1bb413 100644
--- a/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml
@@ -24,4 +24,6 @@
         <ResourceInclude Source="Toast.axaml" />
         <ResourceInclude Source="ToolBar.axaml" />
     </ResourceDictionary.MergedDictionaries>
+    <!-- This resource definition is from Semi Avalonia 11.2.1. This can be removed after Ursa dependency is higher than Avalonia 11.2.1 -->
+    <Thickness x:Key="ComboBoxPopupBorderMargin">4</Thickness>
 </ResourceDictionary>
\ No newline at end of file