From 7989d5180b34a42bca31bbf10a62c7ecd6545120 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 4 Feb 2023 14:25:21 +0800
Subject: [PATCH] adjust style

---
 v2rayN/v2rayN/App.xaml                        | 46 +++++++---
 v2rayN/v2rayN/Views/AddServer2Window.xaml     |  7 +-
 v2rayN/v2rayN/Views/AddServerWindow.xaml      | 42 ++++++---
 .../Views/GlobalHotkeySettingWindow.xaml      | 10 +--
 v2rayN/v2rayN/Views/MainWindow.xaml           |  8 +-
 v2rayN/v2rayN/Views/MsgView.xaml              |  7 +-
 v2rayN/v2rayN/Views/OptionSettingWindow.xaml  | 89 +++++++++++++------
 .../Views/RoutingRuleDetailsWindow.xaml       | 13 ++-
 .../Views/RoutingRuleSettingWindow.xaml       |  3 +
 v2rayN/v2rayN/Views/RoutingSettingWindow.xaml | 18 ++--
 v2rayN/v2rayN/Views/SubEditWindow.xaml        | 10 +--
 11 files changed, 171 insertions(+), 82 deletions(-)

diff --git a/v2rayN/v2rayN/App.xaml b/v2rayN/v2rayN/App.xaml
index 66027569..12b81534 100644
--- a/v2rayN/v2rayN/App.xaml
+++ b/v2rayN/v2rayN/App.xaml
@@ -17,6 +17,9 @@
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <system:Double x:Key="MenuItemHeight">26</system:Double>
+            <system:Double x:Key="StdFontSize">12</system:Double>
+            <system:Double x:Key="StdFontSize1">14</system:Double>
+            <system:Double x:Key="StdFontSize2">16</system:Double>
             <Thickness
                 x:Key="ServerItemMargin"
                 Bottom="4"
@@ -33,19 +36,19 @@
                 x:Key="ModuleTitle"
                 BasedOn="{StaticResource MaterialDesignTextBlock}"
                 TargetType="{x:Type TextBlock}">
-                <Setter Property="FontSize" Value="16" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize2}" />
             </Style>
             <Style
                 x:Key="ToolbarTextBlock"
                 BasedOn="{StaticResource MaterialDesignTextBlock}"
                 TargetType="{x:Type TextBlock}">
-                <Setter Property="FontSize" Value="12" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
             </Style>
             <Style
                 x:Key="StatusbarItem"
                 BasedOn="{StaticResource MaterialDesignTextBlock}"
                 TargetType="{x:Type TextBlock}">
-                <Setter Property="FontSize" Value="12" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
                 <Setter Property="Padding" Value="0" />
             </Style>
             <Style TargetType="{x:Type TextElement}">
@@ -58,7 +61,7 @@
             </Style>
             <Style x:Key="lvItemSelected" TargetType="{x:Type ListViewItem}">
                 <Setter Property="Height" Value="20" />
-                <Setter Property="FontSize" Value="12" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
                 <Style.Triggers>
                     <Trigger Property="IsSelected" Value="true">
                         <Setter Property="Background" Value="{DynamicResource PrimaryHueLightBrush}" />
@@ -76,22 +79,19 @@
                 x:Key="ListItemCheckBox"
                 BasedOn="{StaticResource MaterialDesignUserForegroundCheckBox}"
                 TargetType="{x:Type CheckBox}">
-                <Setter Property="FontSize" Value="12" />
-            </Style>
-            <Style x:Key="ListItemChip" TargetType="{x:Type materialDesign:Chip}">
-                <Setter Property="FontSize" Value="11" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
             </Style>
             <Style
                 x:Key="DefButton"
                 BasedOn="{StaticResource MaterialDesignRaisedButton}"
                 TargetType="{x:Type ButtonBase}">
-                <Setter Property="FontSize" Value="14" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize1}" />
             </Style>
             <Style
                 x:Key="DefContextMenu"
                 BasedOn="{StaticResource MaterialDesignContextMenu}"
                 TargetType="{x:Type ContextMenu}">
-                <Setter Property="FontSize" Value="13" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize1}" />
                 <Setter Property="FontFamily" Value="{x:Static conv:MaterialDesignFonts.MyFont}" />
             </Style>
 
@@ -99,7 +99,7 @@
                 x:Key="ToolbarMenu"
                 BasedOn="{StaticResource MaterialDesignMenu}"
                 TargetType="{x:Type Menu}">
-                <Setter Property="FontSize" Value="13" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize1}" />
                 <Setter Property="FontFamily" Value="{x:Static conv:MaterialDesignFonts.MyFont}" />
             </Style>
 
@@ -107,15 +107,35 @@
                 x:Key="DefComboBox"
                 BasedOn="{StaticResource MaterialDesignComboBox}"
                 TargetType="{x:Type ComboBox}">
-                <Setter Property="FontSize" Value="12" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
                 <Setter Property="HorizontalAlignment" Value="Left" />
             </Style>
             <Style
                 x:Key="DefDataGrid"
                 BasedOn="{StaticResource MaterialDesignDataGrid}"
                 TargetType="{x:Type DataGrid}">
-                <Setter Property="FontSize" Value="12" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
             </Style>
+            <Style
+                x:Key="DefTextBox"
+                BasedOn="{StaticResource MaterialDesignTextBox}"
+                TargetType="{x:Type TextBox}">
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
+            </Style>
+            <Style
+                x:Key="MyOutlinedTextBox"
+                BasedOn="{StaticResource MaterialDesignOutlinedTextBox}"
+                TargetType="{x:Type TextBox}">
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
+            </Style>
+            <Style
+                x:Key="MyGroupBox"
+                BasedOn="{StaticResource MaterialDesignGroupBox}"
+                TargetType="{x:Type GroupBox}">
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
+            </Style>
+
+
         </ResourceDictionary>
 
     </Application.Resources>
diff --git a/v2rayN/v2rayN/Views/AddServer2Window.xaml b/v2rayN/v2rayN/Views/AddServer2Window.xaml
index f1a4fff3..8f0de688 100644
--- a/v2rayN/v2rayN/Views/AddServer2Window.xaml
+++ b/v2rayN/v2rayN/Views/AddServer2Window.xaml
@@ -73,7 +73,7 @@
                     Margin="4"
                     VerticalAlignment="Top"
                     AcceptsReturn="True"
-                    Style="{StaticResource MaterialDesignOutlinedTextBox}" />
+                    Style="{StaticResource MyOutlinedTextBox}" />
 
                 <TextBlock
                     Grid.Row="2"
@@ -91,7 +91,7 @@
                     VerticalAlignment="Top"
                     AcceptsReturn="True"
                     IsReadOnly="True"
-                    Style="{StaticResource MaterialDesignOutlinedTextBox}" />
+                    Style="{StaticResource MyOutlinedTextBox}" />
                 <StackPanel
                     Grid.Row="2"
                     Grid.Column="2"
@@ -125,6 +125,7 @@
                     Width="200"
                     Margin="4"
                     HorizontalAlignment="Left"
+                    FontSize="{DynamicResource StdFontSize}"
                     MaxDropDownHeight="1000"
                     Style="{StaticResource MaterialDesignOutlinedComboBox}" />
 
@@ -157,7 +158,7 @@
                     Margin="4"
                     HorizontalAlignment="Left"
                     AcceptsReturn="True"
-                    Style="{StaticResource MaterialDesignOutlinedTextBox}" />
+                    Style="{StaticResource MyOutlinedTextBox}" />
                 <StackPanel
                     Grid.Row="6"
                     Grid.Column="1"
diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml b/v2rayN/v2rayN/Views/AddServerWindow.xaml
index 1f34d9f7..bd24e213 100644
--- a/v2rayN/v2rayN/Views/AddServerWindow.xaml
+++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml
@@ -83,7 +83,8 @@
                     Grid.Row="1"
                     Grid.Column="1"
                     Width="400"
-                    Margin="{StaticResource ServerItemMargin}" />
+                    Margin="{StaticResource ServerItemMargin}"
+                    Style="{StaticResource DefTextBox}" />
 
                 <TextBlock
                     Grid.Row="2"
@@ -97,7 +98,8 @@
                     Grid.Row="2"
                     Grid.Column="1"
                     Width="400"
-                    Margin="{StaticResource ServerItemMargin}" />
+                    Margin="{StaticResource ServerItemMargin}"
+                    Style="{StaticResource DefTextBox}" />
 
                 <TextBlock
                     Grid.Row="3"
@@ -112,7 +114,8 @@
                     Grid.Column="1"
                     Width="100"
                     Margin="{StaticResource ServerItemMargin}"
-                    HorizontalAlignment="Left" />
+                    HorizontalAlignment="Left"
+                    Style="{StaticResource DefTextBox}" />
             </Grid>
 
             <Separator
@@ -148,7 +151,8 @@
                     Grid.Row="1"
                     Grid.Column="1"
                     Width="400"
-                    Margin="{StaticResource ServerItemMargin}" />
+                    Margin="{StaticResource ServerItemMargin}"
+                    Style="{StaticResource DefTextBox}" />
                 <Button
                     x:Name="btnGUID"
                     Grid.Row="1"
@@ -171,7 +175,8 @@
                     Grid.Column="1"
                     Width="100"
                     Margin="{StaticResource ServerItemMargin}"
-                    HorizontalAlignment="Left" />
+                    HorizontalAlignment="Left"
+                    Style="{StaticResource DefTextBox}" />
 
                 <TextBlock
                     Grid.Row="3"
@@ -216,7 +221,8 @@
                     Grid.Row="1"
                     Grid.Column="1"
                     Width="400"
-                    Margin="{StaticResource ServerItemMargin}" />
+                    Margin="{StaticResource ServerItemMargin}"
+                    Style="{StaticResource DefTextBox}" />
 
                 <TextBlock
                     Grid.Row="2"
@@ -261,7 +267,8 @@
                     Grid.Row="1"
                     Grid.Column="1"
                     Width="400"
-                    Margin="{StaticResource ServerItemMargin}" />
+                    Margin="{StaticResource ServerItemMargin}"
+                    Style="{StaticResource DefTextBox}" />
 
                 <TextBlock
                     Grid.Row="2"
@@ -275,7 +282,8 @@
                     Grid.Row="2"
                     Grid.Column="1"
                     Width="400"
-                    Margin="{StaticResource ServerItemMargin}" />
+                    Margin="{StaticResource ServerItemMargin}"
+                    Style="{StaticResource DefTextBox}" />
 
             </Grid>
             <Grid
@@ -306,7 +314,8 @@
                     Grid.Row="1"
                     Grid.Column="1"
                     Width="400"
-                    Margin="{StaticResource ServerItemMargin}" />
+                    Margin="{StaticResource ServerItemMargin}"
+                    Style="{StaticResource DefTextBox}" />
                 <Button
                     x:Name="btnGUID5"
                     Grid.Row="1"
@@ -344,7 +353,8 @@
                     Grid.Column="1"
                     Width="200"
                     Margin="{StaticResource ServerItemMargin}"
-                    HorizontalAlignment="Left" />
+                    HorizontalAlignment="Left"
+                    Style="{StaticResource DefTextBox}" />
             </Grid>
             <Grid
                 x:Name="gridTrojan"
@@ -373,7 +383,8 @@
                     Grid.Row="1"
                     Grid.Column="1"
                     Width="400"
-                    Margin="{StaticResource ServerItemMargin}" />
+                    Margin="{StaticResource ServerItemMargin}"
+                    Style="{StaticResource DefTextBox}" />
 
                 <TextBlock
                     Grid.Row="2"
@@ -478,7 +489,8 @@
                     Grid.Row="3"
                     Grid.Column="1"
                     Width="400"
-                    Margin="{StaticResource ServerItemMargin}" />
+                    Margin="{StaticResource ServerItemMargin}"
+                    Style="{StaticResource DefTextBox}" />
                 <TextBlock
                     x:Name="tipRequestHost"
                     Grid.Row="3"
@@ -500,7 +512,8 @@
                     Grid.Row="4"
                     Grid.Column="1"
                     Width="400"
-                    Margin="{StaticResource ServerItemMargin}" />
+                    Margin="{StaticResource ServerItemMargin}"
+                    Style="{StaticResource DefTextBox}" />
                 <TextBlock
                     x:Name="tipPath"
                     Grid.Row="4"
@@ -572,7 +585,8 @@
                     Grid.Column="1"
                     Width="400"
                     Margin="{StaticResource ServerItemMargin}"
-                    HorizontalAlignment="Left" />
+                    HorizontalAlignment="Left"
+                    Style="{StaticResource DefTextBox}" />
 
                 <TextBlock
                     Grid.Row="2"
diff --git a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
index 07210497..086bd56d 100644
--- a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
@@ -71,7 +71,7 @@
                     VerticalAlignment="Top"
                     AcceptsReturn="True"
                     IsReadOnly="True"
-                    Style="{StaticResource MaterialDesignOutlinedTextBox}" />
+                    Style="{StaticResource MyOutlinedTextBox}" />
 
                 <TextBlock
                     Grid.Row="2"
@@ -88,7 +88,7 @@
                     VerticalAlignment="Top"
                     AcceptsReturn="True"
                     IsReadOnly="True"
-                    Style="{StaticResource MaterialDesignOutlinedTextBox}" />
+                    Style="{StaticResource MyOutlinedTextBox}" />
 
                 <TextBlock
                     Grid.Row="3"
@@ -105,7 +105,7 @@
                     VerticalAlignment="Top"
                     AcceptsReturn="True"
                     IsReadOnly="True"
-                    Style="{StaticResource MaterialDesignOutlinedTextBox}" />
+                    Style="{StaticResource MyOutlinedTextBox}" />
                 <TextBlock
                     Grid.Row="4"
                     Grid.Column="0"
@@ -121,7 +121,7 @@
                     VerticalAlignment="Top"
                     AcceptsReturn="True"
                     IsReadOnly="True"
-                    Style="{StaticResource MaterialDesignOutlinedTextBox}" />
+                    Style="{StaticResource MyOutlinedTextBox}" />
                 <TextBlock
                     Grid.Row="5"
                     Grid.Column="0"
@@ -137,7 +137,7 @@
                     VerticalAlignment="Top"
                     AcceptsReturn="True"
                     IsReadOnly="True"
-                    Style="{StaticResource MaterialDesignOutlinedTextBox}" />
+                    Style="{StaticResource MyOutlinedTextBox}" />
             </Grid>
 
             <TextBlock
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml
index e7849602..712233fe 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml
@@ -323,7 +323,8 @@
                             Width="200"
                             Margin="8,0"
                             materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgServerTitle}"
-                            materialDesign:TextFieldAssist.HasClearButton="True" />
+                            materialDesign:TextFieldAssist.HasClearButton="True"
+                            Style="{StaticResource DefTextBox}" />
                     </ToolBar>
                 </ToolBarTray>
 
@@ -374,6 +375,7 @@
                                 Width="120"
                                 Margin="8,0"
                                 materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuSystemproxy}"
+                                FontSize="{DynamicResource StdFontSize}"
                                 Style="{StaticResource MaterialDesignFloatingHintComboBox}">
                                 <ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyClear}" />
                                 <ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxySet}" />
@@ -387,6 +389,7 @@
                                 Margin="8,0"
                                 materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuRouting}"
                                 DisplayMemberPath="remarks"
+                                FontSize="{DynamicResource StdFontSize}"
                                 Style="{StaticResource MaterialDesignFloatingHintComboBox}" />
                         </StackPanel>
 
@@ -495,6 +498,7 @@
                                                     Width="200"
                                                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuSubscription}"
                                                     DisplayMemberPath="remarks"
+                                                    FontSize="{DynamicResource StdFontSize}"
                                                     Style="{StaticResource MaterialDesignFilledComboBox}" />
                                             </DockPanel>
                                         </MenuItem.Header>
@@ -703,6 +707,7 @@
                                         MaxWidth="300"
                                         materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuRouting}"
                                         DisplayMemberPath="remarks"
+                                        FontSize="{DynamicResource StdFontSize}"
                                         Style="{StaticResource MaterialDesignFilledComboBox}" />
                                 </DockPanel>
                             </MenuItem.Header>
@@ -715,6 +720,7 @@
                                         MaxWidth="300"
                                         materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuServers}"
                                         DisplayMemberPath="Text"
+                                        FontSize="{DynamicResource StdFontSize}"
                                         Style="{StaticResource MaterialDesignFilledComboBox}" />
                                 </DockPanel>
                             </MenuItem.Header>
diff --git a/v2rayN/v2rayN/Views/MsgView.xaml b/v2rayN/v2rayN/Views/MsgView.xaml
index 220ad9af..1eca1cb7 100644
--- a/v2rayN/v2rayN/Views/MsgView.xaml
+++ b/v2rayN/v2rayN/Views/MsgView.xaml
@@ -20,6 +20,7 @@
                 Margin="8,0"
                 VerticalAlignment="Center"
                 Foreground="{DynamicResource PrimaryHueLightBrush}"
+                Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.MsgInformationTitle}" />
             <ComboBox
                 x:Name="cmbMsgFilter"
@@ -27,10 +28,12 @@
                 Margin="8,0"
                 materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgFilterTitle}"
                 materialDesign:TextFieldAssist.HasClearButton="True"
-                IsEditable="True" />
+                IsEditable="True"
+                Style="{StaticResource DefComboBox}" />
             <TextBlock
                 Margin="8,0"
                 VerticalAlignment="Center"
+                Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.TbAutoRefresh}" />
             <ToggleButton
                 x:Name="togAutoRefresh"
@@ -41,7 +44,7 @@
         <TextBox
             Name="txtMsg"
             BorderThickness="0"
-            FontSize="11"
+            FontSize="{DynamicResource StdFontSize}"
             HorizontalScrollBarVisibility="Auto"
             IsReadOnly="True"
             TextWrapping="Wrap"
diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
index 68935d24..d78b6fe4 100644
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
@@ -85,7 +85,8 @@
                             Grid.Row="0"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}" />
+                            Margin="{StaticResource SettingItemMargin}"
+                            Style="{StaticResource DefTextBox}" />
                         <TextBlock
                             Grid.Row="0"
                             Grid.Column="2"
@@ -176,7 +177,8 @@
                             Grid.Row="6"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}" />
+                            Margin="{StaticResource SettingItemMargin}"
+                            Style="{StaticResource DefTextBox}" />
 
                         <TextBlock
                             Grid.Row="7"
@@ -190,7 +192,8 @@
                             Grid.Row="7"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}" />
+                            Margin="{StaticResource SettingItemMargin}"
+                            Style="{StaticResource DefTextBox}" />
 
                         <TextBlock
                             Grid.Row="8"
@@ -231,8 +234,10 @@
                             x:Name="cmbloglevel"
                             Grid.Row="10"
                             Grid.Column="1"
+                            Width="200"
                             Margin="{StaticResource SettingItemMargin}"
-                            materialDesign:HintAssist.Hint="Level" />
+                            materialDesign:HintAssist.Hint="Level"
+                            Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
                             Grid.Row="11"
@@ -259,8 +264,10 @@
                             x:Name="cmbdefFingerprint"
                             Grid.Row="12"
                             Grid.Column="1"
+                            Width="200"
                             Margin="{StaticResource SettingItemMargin}"
-                            IsEditable="True" />
+                            IsEditable="True"
+                            Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
                             Grid.Row="13"
@@ -273,8 +280,10 @@
                             x:Name="cmbdefUserAgent"
                             Grid.Row="13"
                             Grid.Column="1"
+                            Width="200"
                             Margin="{StaticResource SettingItemMargin}"
-                            IsEditable="True" />
+                            IsEditable="True"
+                            Style="{StaticResource DefComboBox}" />
                         <TextBlock
                             Grid.Row="13"
                             Grid.Column="3"
@@ -296,7 +305,8 @@
                         <ComboBox
                             x:Name="cmbdomainStrategy4Freedom"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}" />
+                            Margin="{StaticResource SettingItemMargin}"
+                            Style="{StaticResource DefComboBox}" />
                     </StackPanel>
 
                     <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
@@ -320,6 +330,7 @@
                         VerticalAlignment="Stretch"
                         AcceptsReturn="True"
                         BorderThickness="1"
+                        Style="{StaticResource DefTextBox}"
                         TextWrapping="Wrap"
                         VerticalScrollBarVisibility="Auto" />
                 </DockPanel>
@@ -353,7 +364,7 @@
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="mtu" />
-                    <TextBox
+                    <TextBox Style="{StaticResource DefTextBox}"
                         x:Name="txtKcpmtu"
                         Grid.Row="1"
                         Grid.Column="1"
@@ -367,7 +378,7 @@
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="tti" />
-                    <TextBox
+                    <TextBox Style="{StaticResource DefTextBox}"
                         x:Name="txtKcptti"
                         Grid.Row="2"
                         Grid.Column="1"
@@ -381,7 +392,7 @@
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="uplinkCapacity" />
-                    <TextBox
+                    <TextBox Style="{StaticResource DefTextBox}"
                         x:Name="txtKcpuplinkCapacity"
                         Grid.Row="3"
                         Grid.Column="1"
@@ -395,7 +406,7 @@
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="downlinkCapacity" />
-                    <TextBox
+                    <TextBox Style="{StaticResource DefTextBox}"
                         x:Name="txtKcpdownlinkCapacity"
                         Grid.Row="4"
                         Grid.Column="1"
@@ -409,7 +420,7 @@
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="readBufferSize" />
-                    <TextBox
+                    <TextBox Style="{StaticResource DefTextBox}"
                         x:Name="txtKcpreadBufferSize"
                         Grid.Row="5"
                         Grid.Column="1"
@@ -423,7 +434,7 @@
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="writeBufferSize" />
-                    <TextBox
+                    <TextBox Style="{StaticResource DefTextBox}"
                         x:Name="txtKcpwriteBufferSize"
                         Grid.Row="6"
                         Grid.Column="1"
@@ -521,7 +532,8 @@
                             Grid.Row="3"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}" />
+                            Margin="{StaticResource SettingItemMargin}"
+                            Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
                             Grid.Row="4"
@@ -647,7 +659,8 @@
                             Grid.Row="12"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}" />
+                            Margin="{StaticResource SettingItemMargin}"
+                            Style="{StaticResource DefTextBox}" />
 
                         <TextBlock
                             Grid.Row="13"
@@ -661,7 +674,8 @@
                             Grid.Row="13"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}" />
+                            Margin="{StaticResource SettingItemMargin}"
+                            Style="{StaticResource DefTextBox}" />
 
                         <TextBlock
                             Grid.Row="14"
@@ -675,7 +689,8 @@
                             Grid.Row="14"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}" />
+                            Margin="{StaticResource SettingItemMargin}"
+                            Style="{StaticResource DefTextBox}" />
 
                         <TextBlock
                             Grid.Row="15"
@@ -688,8 +703,10 @@
                             x:Name="cmbcurrentFontFamily"
                             Grid.Row="15"
                             Grid.Column="1"
+                            Width="200"
                             Margin="{StaticResource SettingItemMargin}"
-                            MaxDropDownHeight="1000" />
+                            MaxDropDownHeight="1000"
+                            Style="{StaticResource DefComboBox}" />
                         <TextBlock
                             Grid.Row="15"
                             Grid.Column="2"
@@ -713,8 +730,10 @@
                         <ComboBox
                             x:Name="cmbsystemProxyAdvancedProtocol"
                             Grid.Row="4"
+                            MinWidth="200"
                             Margin="{StaticResource SettingItemMargin}"
-                            materialDesign:HintAssist.Hint="Protocol" />
+                            materialDesign:HintAssist.Hint="Protocol"
+                            Style="{StaticResource DefComboBox}" />
 
                     </StackPanel>
 
@@ -731,6 +750,7 @@
                         VerticalAlignment="Stretch"
                         AcceptsReturn="True"
                         BorderThickness="1"
+                        Style="{StaticResource DefTextBox}"
                         TextWrapping="Wrap"
                         VerticalScrollBarVisibility="Auto" />
                 </DockPanel>
@@ -799,7 +819,8 @@
                             Grid.Column="1"
                             Width="200"
                             Margin="{StaticResource SettingItemMargin}"
-                            HorizontalAlignment="Left" />
+                            HorizontalAlignment="Left"
+                            Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
                             Grid.Row="4"
@@ -814,7 +835,8 @@
                             Grid.Column="1"
                             Width="200"
                             Margin="{StaticResource SettingItemMargin}"
-                            HorizontalAlignment="Left" />
+                            HorizontalAlignment="Left"
+                            Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
                             Grid.Row="5"
@@ -831,6 +853,7 @@
                             Margin="{StaticResource SettingItemMargin}"
                             VerticalAlignment="Top"
                             AcceptsReturn="True"
+                            Style="{StaticResource DefTextBox}"
                             TextWrapping="Wrap" />
                         <Button
                             x:Name="btnBrowse"
@@ -852,10 +875,11 @@
                         <GroupBox
                             Grid.Column="0"
                             Header="{x:Static resx:ResUI.TbSettingsTunModeDirectIP}"
-                            Style="{StaticResource MaterialDesignGroupBox}">
+                            Style="{StaticResource MyGroupBox}">
                             <TextBox
                                 Name="txtDirectIP"
                                 AcceptsReturn="True"
+                                Style="{StaticResource DefTextBox}"
                                 TextWrapping="Wrap"
                                 VerticalScrollBarVisibility="Auto" />
                         </GroupBox>
@@ -863,10 +887,11 @@
                         <GroupBox
                             Grid.Column="2"
                             Header="{x:Static resx:ResUI.TbSettingsTunModeDirectProcess}"
-                            Style="{StaticResource MaterialDesignGroupBox}">
+                            Style="{StaticResource MyGroupBox}">
                             <TextBox
                                 Name="txtDirectProcess"
                                 AcceptsReturn="True"
+                                Style="{StaticResource DefTextBox}"
                                 TextWrapping="Wrap"
                                 VerticalScrollBarVisibility="Auto" />
                         </GroupBox>
@@ -901,7 +926,8 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}" />
+                        Margin="{StaticResource SettingItemMargin}"
+                        Style="{StaticResource DefComboBox}" />
 
                     <TextBlock
                         Grid.Row="2"
@@ -915,7 +941,8 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}" />
+                        Margin="{StaticResource SettingItemMargin}"
+                        Style="{StaticResource DefComboBox}" />
 
                     <TextBlock
                         Grid.Row="3"
@@ -929,7 +956,8 @@
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}" />
+                        Margin="{StaticResource SettingItemMargin}"
+                        Style="{StaticResource DefComboBox}" />
 
                     <TextBlock
                         Grid.Row="4"
@@ -943,7 +971,8 @@
                         Grid.Row="4"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}" />
+                        Margin="{StaticResource SettingItemMargin}"
+                        Style="{StaticResource DefComboBox}" />
 
                     <TextBlock
                         Grid.Row="5"
@@ -957,7 +986,8 @@
                         Grid.Row="5"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}" />
+                        Margin="{StaticResource SettingItemMargin}"
+                        Style="{StaticResource DefComboBox}" />
 
                     <TextBlock
                         Grid.Row="6"
@@ -971,7 +1001,8 @@
                         Grid.Row="6"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}" />
+                        Margin="{StaticResource SettingItemMargin}"
+                        Style="{StaticResource DefComboBox}" />
                 </Grid>
             </TabItem>
         </TabControl>
diff --git a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
index ef4b2fa2..69f0a7f2 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
@@ -65,7 +65,8 @@
                 Grid.Column="1"
                 Width="200"
                 Margin="4"
-                HorizontalAlignment="Left" />
+                HorizontalAlignment="Left"
+                Style="{StaticResource DefTextBox}" />
 
             <TextBlock
                 Grid.Row="2"
@@ -80,6 +81,7 @@
                 Grid.Column="1"
                 Margin="4"
                 HorizontalAlignment="Left"
+                FontSize="{DynamicResource StdFontSize}"
                 Style="{StaticResource MaterialDesignFilterChipPrimaryListBox}" />
 
             <TextBlock
@@ -94,6 +96,7 @@
                 Grid.Row="3"
                 Grid.Column="1"
                 Margin="4"
+                FontSize="{DynamicResource StdFontSize}"
                 Style="{StaticResource MaterialDesignFilterChipPrimaryListBox}" />
 
             <TextBlock
@@ -143,7 +146,7 @@
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center">
                 <CheckBox x:Name="chkAutoSort">
-                    <TextBlock Text="{x:Static resx:ResUI.TbAutoSort}" />
+                    <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.TbAutoSort}" />
                 </CheckBox>
             </StackPanel>
             <Button
@@ -172,10 +175,11 @@
             <GroupBox
                 Grid.Column="0"
                 Header="Domain"
-                Style="{StaticResource MaterialDesignGroupBox}">
+                Style="{StaticResource MyGroupBox}">
                 <TextBox
                     Name="txtDomain"
                     AcceptsReturn="True"
+                    Style="{StaticResource DefTextBox}"
                     TextWrapping="Wrap"
                     VerticalScrollBarVisibility="Auto" />
             </GroupBox>
@@ -183,10 +187,11 @@
             <GroupBox
                 Grid.Column="2"
                 Header="IP"
-                Style="{StaticResource MaterialDesignGroupBox}">
+                Style="{StaticResource MyGroupBox}">
                 <TextBox
                     Name="txtIP"
                     AcceptsReturn="True"
+                    Style="{StaticResource DefTextBox}"
                     TextWrapping="Wrap"
                     VerticalScrollBarVisibility="Auto" />
             </GroupBox>
diff --git a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
index 1f132b55..9a0c1ad8 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
@@ -114,6 +114,7 @@
                 HorizontalAlignment="Left"
                 VerticalAlignment="Top"
                 AcceptsReturn="True"
+                Style="{StaticResource DefTextBox}"
                 TextWrapping="Wrap" />
 
             <TextBlock
@@ -146,6 +147,7 @@
                 Margin="4"
                 VerticalAlignment="Top"
                 AcceptsReturn="True"
+                Style="{StaticResource DefTextBox}"
                 TextWrapping="Wrap" />
 
             <TextBlock
@@ -163,6 +165,7 @@
                 Margin="4"
                 VerticalAlignment="Top"
                 AcceptsReturn="True"
+                Style="{StaticResource DefTextBox}"
                 TextWrapping="Wrap" />
             <Button
                 x:Name="btnBrowse"
diff --git a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
index 54309ea3..a2eae352 100644
--- a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
@@ -224,10 +224,11 @@
                         <GroupBox
                             Grid.Column="0"
                             Header="Domain"
-                            Style="{StaticResource MaterialDesignGroupBox}">
+                            Style="{StaticResource MyGroupBox}">
                             <TextBox
                                 Name="txtProxyDomain"
                                 AcceptsReturn="True"
+                                Style="{StaticResource DefTextBox}"
                                 TextWrapping="Wrap"
                                 VerticalScrollBarVisibility="Auto" />
                         </GroupBox>
@@ -235,10 +236,11 @@
                         <GroupBox
                             Grid.Column="2"
                             Header="IP"
-                            Style="{StaticResource MaterialDesignGroupBox}">
+                            Style="{StaticResource MyGroupBox}">
                             <TextBox
                                 Name="txtProxyIP"
                                 AcceptsReturn="True"
+                                Style="{StaticResource DefTextBox}"
                                 TextWrapping="Wrap"
                                 VerticalScrollBarVisibility="Auto" />
                         </GroupBox>
@@ -255,10 +257,11 @@
                         <GroupBox
                             Grid.Column="0"
                             Header="Domain"
-                            Style="{StaticResource MaterialDesignGroupBox}">
+                            Style="{StaticResource MyGroupBox}">
                             <TextBox
                                 Name="txtDirectDomain"
                                 AcceptsReturn="True"
+                                Style="{StaticResource DefTextBox}"
                                 TextWrapping="Wrap"
                                 VerticalScrollBarVisibility="Auto" />
                         </GroupBox>
@@ -266,10 +269,11 @@
                         <GroupBox
                             Grid.Column="2"
                             Header="IP"
-                            Style="{StaticResource MaterialDesignGroupBox}">
+                            Style="{StaticResource MyGroupBox}">
                             <TextBox
                                 Name="txtDirectIP"
                                 AcceptsReturn="True"
+                                Style="{StaticResource DefTextBox}"
                                 TextWrapping="Wrap"
                                 VerticalScrollBarVisibility="Auto" />
                         </GroupBox>
@@ -286,10 +290,11 @@
                         <GroupBox
                             Grid.Column="0"
                             Header="Domain"
-                            Style="{StaticResource MaterialDesignGroupBox}">
+                            Style="{StaticResource MyGroupBox}">
                             <TextBox
                                 Name="txtBlockDomain"
                                 AcceptsReturn="True"
+                                Style="{StaticResource DefTextBox}"
                                 TextWrapping="Wrap"
                                 VerticalScrollBarVisibility="Auto" />
                         </GroupBox>
@@ -297,10 +302,11 @@
                         <GroupBox
                             Grid.Column="2"
                             Header="IP"
-                            Style="{StaticResource MaterialDesignGroupBox}">
+                            Style="{StaticResource MyGroupBox}">
                             <TextBox
                                 Name="txtBlockIP"
                                 AcceptsReturn="True"
+                                Style="{StaticResource DefTextBox}"
                                 TextWrapping="Wrap"
                                 VerticalScrollBarVisibility="Auto" />
                         </GroupBox>
diff --git a/v2rayN/v2rayN/Views/SubEditWindow.xaml b/v2rayN/v2rayN/Views/SubEditWindow.xaml
index cbc9143b..37f77770 100644
--- a/v2rayN/v2rayN/Views/SubEditWindow.xaml
+++ b/v2rayN/v2rayN/Views/SubEditWindow.xaml
@@ -69,7 +69,7 @@
                     Margin="4"
                     VerticalAlignment="Top"
                     AcceptsReturn="True"
-                    Style="{StaticResource MaterialDesignOutlinedTextBox}"
+                    Style="{StaticResource MyOutlinedTextBox}"
                     TextWrapping="Wrap" />
 
                 <TextBlock
@@ -88,7 +88,7 @@
                     VerticalAlignment="Top"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
                     AcceptsReturn="True"
-                    Style="{StaticResource MaterialDesignOutlinedTextBox}"
+                    Style="{StaticResource MyOutlinedTextBox}"
                     TextWrapping="Wrap" />
 
                 <TextBlock
@@ -120,7 +120,7 @@
                     VerticalAlignment="Top"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
                     AcceptsReturn="True"
-                    Style="{StaticResource MaterialDesignOutlinedTextBox}"
+                    Style="{StaticResource MyOutlinedTextBox}"
                     TextWrapping="Wrap" />
 
                 <TextBlock
@@ -139,7 +139,7 @@
                     VerticalAlignment="Top"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
                     AcceptsReturn="True"
-                    Style="{StaticResource MaterialDesignOutlinedTextBox}" />
+                    Style="{StaticResource MyOutlinedTextBox}" />
 
                 <TextBlock
                     Grid.Row="6"
@@ -156,7 +156,7 @@
                     Margin="4"
                     VerticalAlignment="Top"
                     AcceptsReturn="True"
-                    Style="{StaticResource MaterialDesignOutlinedTextBox}" />
+                    Style="{StaticResource MyOutlinedTextBox}" />
 
             </Grid>
             <Grid