diff --git a/TornadoAce_CJOnStyle/App.xaml b/TornadoAce_CJOnStyle/App.xaml
index 684e555..9dc88a2 100644
--- a/TornadoAce_CJOnStyle/App.xaml
+++ b/TornadoAce_CJOnStyle/App.xaml
@@ -29,9 +29,10 @@
             <SolidColorBrush x:Key="AccentRedBrush" Color="#FF626E" />
             <SolidColorBrush x:Key="AccentVioletBrush" Color="#7B2CBF" />
             <SolidColorBrush x:Key="AccentRoseBrush" Color="#F04C8B" />
-            <SolidColorBrush x:Key="LoginSurfaceBrush" Color="#F7F5EE" />
-            <SolidColorBrush x:Key="LoginTextBrush" Color="#17101F" />
-            <SolidColorBrush x:Key="LoginMutedBrush" Color="#6C6474" />
+            <SolidColorBrush x:Key="LoginSurfaceBrush" Color="#DDE5E0D2" />
+            <SolidColorBrush x:Key="LoginFieldBrush" Color="#EEEADF" />
+            <SolidColorBrush x:Key="LoginTextBrush" Color="#211827" />
+            <SolidColorBrush x:Key="LoginMutedBrush" Color="#766D7B" />
 
             <Style x:Key="PageTitleTextStyle" TargetType="TextBlock">
                 <Setter Property="FontFamily" Value="Bahnschrift SemiBold" />
diff --git a/TornadoAce_CJOnStyle/Views/MainPage.xaml b/TornadoAce_CJOnStyle/Views/MainPage.xaml
index e2693eb..83c89ec 100644
--- a/TornadoAce_CJOnStyle/Views/MainPage.xaml
+++ b/TornadoAce_CJOnStyle/Views/MainPage.xaml
@@ -1006,10 +1006,22 @@
                     Grid.Column="1"
                     Padding="26"
                     Background="{StaticResource LoginSurfaceBrush}"
-                    BorderBrush="#66D9B76E"
+                    BorderBrush="#44D9B76E"
                     BorderThickness="1"
                     CornerRadius="8">
                     <StackPanel Spacing="16">
+                        <StackPanel.Resources>
+                            <SolidColorBrush x:Key="TextControlBackground" Color="#EEEADF" />
+                            <SolidColorBrush x:Key="TextControlBackgroundPointerOver" Color="#F3EFE6" />
+                            <SolidColorBrush x:Key="TextControlBackgroundFocused" Color="#F3EFE6" />
+                            <SolidColorBrush x:Key="TextControlForeground" Color="#211827" />
+                            <SolidColorBrush x:Key="TextControlForegroundFocused" Color="#211827" />
+                            <SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="#887F8A" />
+                            <SolidColorBrush x:Key="TextControlPlaceholderForegroundFocused" Color="#887F8A" />
+                            <SolidColorBrush x:Key="TextControlBorderBrush" Color="#2417101F" />
+                            <SolidColorBrush x:Key="TextControlBorderBrushPointerOver" Color="#4034293F" />
+                            <SolidColorBrush x:Key="TextControlBorderBrushFocused" Color="#7B2CBF" />
+                        </StackPanel.Resources>
                         <Grid ColumnSpacing="12">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto" />
@@ -1041,7 +1053,7 @@
                             </StackPanel>
                         </Grid>
 
-                        <Border Height="1" Background="#2217101F" />
+                        <Border Height="1" Background="#1A17101F" />
 
                         <StackPanel Spacing="6">
                             <TextBlock
@@ -1052,8 +1064,8 @@
                             <TextBox
                                 x:Name="OperatorNameTextBox"
                                 MinHeight="42"
-                                Background="White"
-                                BorderBrush="#2517101F"
+                                Background="{StaticResource LoginFieldBrush}"
+                                BorderBrush="#2217101F"
                                 Foreground="{StaticResource LoginTextBrush}"
                                 PlaceholderText="operator"
                                 Text="{x:Bind ViewModel.LoginOperatorName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
@@ -1068,8 +1080,8 @@
                             <PasswordBox
                                 x:Name="OperatorPasswordBox"
                                 MinHeight="42"
-                                Background="White"
-                                BorderBrush="#2517101F"
+                                Background="{StaticResource LoginFieldBrush}"
+                                BorderBrush="#2217101F"
                                 Foreground="{StaticResource LoginTextBrush}"
                                 PlaceholderText="access code" />
                         </StackPanel>
@@ -1110,7 +1122,7 @@
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
                 Background="{StaticResource LoginSurfaceBrush}"
-                BorderBrush="#66D9B76E"
+                BorderBrush="#44D9B76E"
                 BorderThickness="1"
                 CornerRadius="8">
                 <StackPanel Spacing="12">