diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 9677fdc8e..90d00b2b7 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -1897,16 +1897,16 @@
                 <ControlTemplate TargetType="Button">
                     <Border
                         x:Name="Background"
-                        Background="#fefefe"
-                        BorderBrush="#e5e5e5"
-                        BorderThickness="1,1,1,0"
+                        Background="{StaticResource ButtonBackgroundColor}"
+                        BorderBrush="{StaticResource ButtonOutBorder}"
+                        BorderThickness="{StaticResource CustomButtonOutBorderThickness}"
                         CornerRadius="4"
                         SnapsToDevicePixels="True">
                         <Border
                             x:Name="Border"
                             Padding="{TemplateBinding Padding}"
-                            BorderBrush="#d3d3d3"
-                            BorderThickness="0,0,0,2"
+                            BorderBrush="{StaticResource ButtonInsideBorder}"
+                            BorderThickness="{StaticResource CustomButtonInsideBorderThickness}"
                             CornerRadius="4">
                             <ContentPresenter
                                 x:Name="ContentPresenter"
@@ -1919,27 +1919,27 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Background" Property="Background" Value="#f6f6f6" />
-                            <Setter TargetName="Background" Property="BorderThickness" Value="1,1,1,0" />
-                            <Setter TargetName="Background" Property="BorderBrush" Value="#e5e5e5" />
-                            <Setter TargetName="Border" Property="BorderBrush" Value="#d3d3d3" />
-                            <Setter TargetName="Border" Property="BorderThickness" Value="0,0,0,2" />
+                            <Setter TargetName="Background" Property="Background" Value="{StaticResource ButtonMouseOver}" />
+                            <Setter TargetName="Background" Property="BorderThickness" Value="{StaticResource CustomButtonOutBorderThickness}" />
+                            <Setter TargetName="Background" Property="BorderBrush" Value="{StaticResource ButtonOutBorder}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource ButtonInsideBorder}" />
+                            <Setter TargetName="Border" Property="BorderThickness" Value="{StaticResource CustomButtonInsideBorderThickness}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="Background" Property="Background" Value="#f6f6f6" />
-                            <Setter TargetName="Background" Property="BorderThickness" Value="1,1,1,1" />
-                            <Setter TargetName="Background" Property="BorderBrush" Value="#e5e5e5" />
-                            <Setter TargetName="Border" Property="BorderBrush" Value="#f6f6f6" />
-                            <Setter TargetName="Border" Property="BorderThickness" Value="0,0,0,1" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="#5d5d5d" />
+                            <Setter TargetName="Background" Property="Background" Value="{StaticResource ButtonMousePressed}" />
+                            <Setter TargetName="Background" Property="BorderThickness" Value="{StaticResource PressedCustomButtonOutBorderThickness}" />
+                            <Setter TargetName="Background" Property="BorderBrush" Value="{StaticResource ButtonMousePressedInsideBorder}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource ButtonInsideMouseOverBorder}" />
+                            <Setter TargetName="Border" Property="BorderThickness" Value="{StaticResource PressedCustomButtonInsideBorderThickness}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{StaticResource ButtonMousePressedText}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="Background" Property="Background" Value="#f6f6f6" />
-                            <Setter TargetName="Background" Property="BorderThickness" Value="1,1,1,1" />
-                            <Setter TargetName="Background" Property="BorderBrush" Value="#e5e5e5" />
-                            <Setter TargetName="Border" Property="BorderBrush" Value="#f6f6f6" />
-                            <Setter TargetName="Border" Property="BorderThickness" Value="0,0,0,1" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="#9d9d9d" />
+                            <Setter TargetName="Background" Property="Background" Value="{StaticResource ButtonBackgroundDisabledColor}" />
+                            <Setter TargetName="Background" Property="BorderThickness" Value="{StaticResource DisabledCustomButtonOutBorderThickness}" />
+                            <Setter TargetName="Background" Property="BorderBrush" Value="{StaticResource ButtonOutBorder}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource ButtonInsideBorderDisabled}" />
+                            <Setter TargetName="Border" Property="BorderThickness" Value="{StaticResource DisabledCustomButtonInsideBorderThickness}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{StaticResource ButtonDisabledText}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml
index 18d5e9743..fa94a1ebc 100644
--- a/Flow.Launcher/Resources/Dark.xaml
+++ b/Flow.Launcher/Resources/Dark.xaml
@@ -17,6 +17,11 @@
     <SolidColorBrush x:Key="Color09B" Color="#292929" />
     <SolidColorBrush x:Key="Color10B" Color="#c42b1c" />
     <SolidColorBrush x:Key="Color11B" Color="#c83c31" />
+    <SolidColorBrush x:Key="Color12B" Color="#373737" />
+    <SolidColorBrush x:Key="Color13B" Color="#3f3f3f" />
+    <SolidColorBrush x:Key="Color14B" Color="#3f3f3f" />
+    <SolidColorBrush x:Key="Color15B" Color="#5d5d5d" />
+    <SolidColorBrush x:Key="Color16B" Color="#434343" />
     <Color x:Key="Color01">#202020</Color>
     <Color x:Key="Color02">#2b2b2b</Color>
     <Color x:Key="Color03">#1d1d1d</Color>
@@ -28,6 +33,30 @@
     <Color x:Key="Color09">#292929</Color>
     <Color x:Key="Color10">#c42b1c</Color>
     <Color x:Key="Color11">#c81c31</Color>
+    <Color x:Key="Color12">#373737</Color>
+    <Color x:Key="Color13">#3f3f3f</Color>
+    <Color x:Key="Color14">#3f3f3f</Color>
+    <Color x:Key="Color15">#5d5d5d</Color>
+    <Color x:Key="Color16">#434343</Color>
+
+    <SolidColorBrush x:Key="ButtonOutBorder" Color="Transparent" />
+    <SolidColorBrush x:Key="ButtonInsideBorder" Color="#3f3f3f" />
+    <SolidColorBrush x:Key="ButtonBackgroundColor" Color="#373737" />
+    <SolidColorBrush x:Key="ButtonMouseOver" Color="#323232" />
+    <SolidColorBrush x:Key="ButtonInsideMouseOverBorder" Color="#3f3f3f" />
+    <SolidColorBrush x:Key="ButtonMousePressed" Color="#272727" />
+    <SolidColorBrush x:Key="ButtonMousePressedInsideBorder" Color="#2a2a2a" />
+    <SolidColorBrush x:Key="ButtonMousePressedText" Color="#cecece" />
+    <SolidColorBrush x:Key="ButtonBackgroundDisabledColor" Color="#2a2a2a" />
+    <SolidColorBrush x:Key="ButtonInsideBorderDisabled" Color="#303030" />
+    <SolidColorBrush x:Key="ButtonDisabledText" Color="#787878" />
+    <Thickness x:Key="CustomButtonOutBorderThickness">0,0,0,0</Thickness>
+    <Thickness x:Key="CustomButtonInsideBorderThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="PressedCustomButtonOutBorderThickness">0,0,0,0</Thickness>
+    <Thickness x:Key="PressedCustomButtonInsideBorderThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="DisabledCustomButtonOutBorderThickness">0,0,0,0</Thickness>
+    <Thickness x:Key="DisabledCustomButtonInsideBorderThickness">1,1,1,1</Thickness>
+
 
 
     <CornerRadius x:Key="ControlCornerRadius">2,2,2,2</CornerRadius>
diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml
index 0e9f07513..c9bdde83a 100644
--- a/Flow.Launcher/Resources/Light.xaml
+++ b/Flow.Launcher/Resources/Light.xaml
@@ -17,6 +17,11 @@
     <SolidColorBrush x:Key="Color09B" Color="#ededed" />
     <SolidColorBrush x:Key="Color10B" Color="#c42b1c" />
     <SolidColorBrush x:Key="Color11B" Color="#c83c31" />
+    <SolidColorBrush x:Key="Color12B" Color="#fefefe" />
+    <SolidColorBrush x:Key="Color13B" Color="#e5e5e5" />
+    <SolidColorBrush x:Key="Color14B" Color="#d3d3d3" />
+    <SolidColorBrush x:Key="Color15B" Color="#5d5d5d" />
+    <SolidColorBrush x:Key="Color16B" Color="#f6f6f6" />
     <Color x:Key="Color01">#f3f3f3</Color>
     <Color x:Key="Color02">#ffffff</Color>
     <Color x:Key="Color03">#e5e5e5</Color>
@@ -28,6 +33,31 @@
     <Color x:Key="Color09">#ededed</Color>
     <Color x:Key="Color10">#c42b1c</Color>
     <Color x:Key="Color11">#c81c31</Color>
+    <Color x:Key="Color12">#fefefe</Color>
+    <Color x:Key="Color13">#e5e5e5</Color>
+    <Color x:Key="Color14">#d3d3d3</Color>
+    <Color x:Key="Color15">#5d5d5d</Color>
+    <Color x:Key="Color16">#f6f6f6</Color>
+
+    <SolidColorBrush x:Key="ButtonOutBorder" Color="#e5e5e5" />
+    <SolidColorBrush x:Key="ButtonInsideBorder" Color="#d3d3d3" />
+    <SolidColorBrush x:Key="ButtonBackgroundColor" Color="#fefefe" />
+    <SolidColorBrush x:Key="ButtonMouseOver" Color="#f6f6f6" />
+    <SolidColorBrush x:Key="ButtonInsideMouseOverBorder" Color="#f6f6f6" />
+    <SolidColorBrush x:Key="ButtonMousePressed" Color="#f6f6f6" />
+    <SolidColorBrush x:Key="ButtonMousePressedInsideBorder" Color="#d3d3d3" />
+    <SolidColorBrush x:Key="ButtonMousePressedText" Color="#5d5d5d" />
+    <SolidColorBrush x:Key="ButtonBackgroundDisabledColor" Color="#f6f6f6" />
+    <SolidColorBrush x:Key="ButtonInsideBorderDisabled" Color="#f6f6f6" />
+    <SolidColorBrush x:Key="ButtonDisabledText" Color="#9d9d9d" />
+    <Thickness x:Key="CustomButtonOutBorderThickness">1,1,1,0</Thickness>
+    <Thickness x:Key="CustomButtonInsideBorderThickness">0,0,0,2</Thickness>
+    <Thickness x:Key="PressedCustomButtonOutBorderThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="PressedCustomButtonInsideBorderThickness">0,0,0,1</Thickness>
+    <Thickness x:Key="DisabledCustomButtonOutBorderThickness">1,1,1,0</Thickness>
+    <Thickness x:Key="DisabledCustomButtonInsideBorderThickness">0,0,0,1</Thickness>
+
+
 
     <CornerRadius x:Key="ControlCornerRadius">2,2,2,2</CornerRadius>
     <CornerRadius x:Key="OverlayCornerRadius">4,4,4,4</CornerRadius>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 842fa12e4..c20ec2f73 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -996,7 +996,7 @@
                                                                         <Setter Property="Padding" Value="12,8,12,8" />
                                                                         <Setter Property="BorderThickness" Value="0" />
                                                                         <Setter Property="FontWeight" Value="DemiBold" />
-                                                                        <Setter Property="Foreground" Value="{StaticResource Color02B}" />
+                                                                        <Setter Property="Foreground" Value="{StaticResource Color05B}" />
                                                                         <Style.Triggers>
                                                                             <DataTrigger Binding="{Binding ElementName=PriorityButton, UpdateSourceTrigger=PropertyChanged, Path=Content}" Value="0">
                                                                                 <Setter Property="Foreground" Value="{StaticResource Color08B}" />
@@ -1473,8 +1473,7 @@
                                                                 HorizontalAlignment="Right"
                                                                 VerticalAlignment="Center"
                                                                 Click="OnExternalPluginInstallClick"
-                                                                Content="{DynamicResource install}"
-                                                                Foreground="Black" />
+                                                                Content="{DynamicResource install}" />
                                                         </Border>
                                                     </Grid>
                                                 </StackPanel>
@@ -1680,14 +1679,14 @@
                                                                 <Border
                                                                     x:Name="Bd"
                                                                     Padding="{TemplateBinding Padding}"
-                                                                    Background="#fefefe"
-                                                                    BorderBrush="#e5e5e5"
+                                                                    Background="{StaticResource Color12B}"
+                                                                    BorderBrush="{StaticResource Color03B}"
                                                                     BorderThickness="1,1,1,0"
                                                                     CornerRadius="4"
                                                                     SnapsToDevicePixels="true">
                                                                     <Border
                                                                         x:Name="Bd2"
-                                                                        BorderBrush="#d3d3d3"
+                                                                        BorderBrush="{StaticResource Color14B}"
                                                                         BorderThickness="0,0,0,2"
                                                                         CornerRadius="4">
                                                                         <ContentPresenter