From dcd5ca94de0deca4a2c078d03e118a89b48c3b80 Mon Sep 17 00:00:00 2001
From: Coloryr <402067010@qq.com>
Date: Tue, 16 Jul 2024 19:38:20 +0800
Subject: [PATCH] =?UTF-8?q?up=20=E4=BF=AE=E6=94=B9=E4=B8=BB=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/ColorMC.Core/CoreMain.cs                  |   2 +-
 src/ColorMC.Gui/ColorMC.Gui.csproj            |   3 +
 src/ColorMC.Gui/Manager/ThemeManager.cs       |   6 +-
 src/ColorMC.Gui/Manager/WindowManager.cs      |   6 +-
 .../Resource/Icon/Setting/svg16.svg           |   3 +-
 .../Resource/Language/gui_zh-cn.json          |   3 +-
 src/ColorMC.Gui/Style/DataGrid.axaml          |   5 +
 .../UI/Controls/Add/AddControl.axaml          |  70 ++-
 .../UI/Controls/Add/AddControl.axaml.cs       |   6 +
 .../UI/Controls/Add/AddJavaControl.axaml      |   3 +-
 .../UI/Controls/Add/AddModPackControl.axaml   |  26 +-
 .../Controls/Add/AddModPackControl.axaml.cs   |   2 +
 .../Dialog/NbtDialogEditControl.axaml         |   3 +-
 .../GameConfigEditControl.axaml               |   2 +-
 .../UI/Controls/GameEdit/Tab4Control.axaml    |   7 +-
 .../UI/Controls/GameExport/Tab2Control.axaml  |   9 +-
 .../UI/Controls/GameExport/Tab3Control.axaml  |   2 +-
 .../UI/Controls/GameExport/Tab4Control.axaml  |   7 +-
 .../Controls/Items/DownloadItemControl.axaml  |   9 +-
 .../Controls/Items/FileItemControl.axaml.cs   |  73 +++
 .../UI/Controls/Items/GameControl.axaml       |  12 +-
 .../Controls/Items/ResourcePackControl.axaml  |   2 +-
 .../UI/Controls/Items/WorldCloudControl.axaml |   2 +-
 .../UI/Controls/Items/WorldControl.axaml      |   2 +-
 .../UI/Controls/Main/GameGroupControl.axaml   |   6 +-
 .../UI/Controls/Main/MainControl.axaml        | 528 ++++++++----------
 .../UI/Controls/Main/MainControl.axaml.cs     |  52 +-
 .../UI/Controls/Main/MainEmptyControl.axaml   |   6 +-
 .../UI/Controls/Main/MainGamesControl.axaml   |   8 +-
 .../Controls/Main/MainGamesControl.axaml.cs   |   1 -
 .../UI/Controls/Main/MainStartControl.axaml   |   5 +-
 .../Controls/Main/MainStartControl.axaml.cs   |   3 -
 .../UI/Controls/Main/MainUserControl.axaml    | 103 ++++
 .../UI/Controls/Main/MainUserControl.axaml.cs |  11 +
 .../Controls/Main/MinecraftNewsControl.axaml  |  26 +-
 .../Main/MinecraftNewsControl.axaml.cs        |  11 +-
 .../UI/Controls/ServerMotdControl.axaml       |   6 +-
 .../UI/Controls/ServerPack/Tab2Control.axaml  |   2 +-
 .../UI/Controls/ServerPack/Tab3Control.axaml  |   2 +-
 .../UI/Controls/ServerPack/Tab4Control.axaml  | 125 ++---
 .../UI/Controls/Setting/Tab5Control.axaml     | 163 +++---
 .../UI/Controls/Setting/Tab6Control.axaml     |   8 +-
 .../UI/Controls/Setting/Tab8Control.axaml     |   8 +-
 .../UI/Controls/User/UsersControl.axaml       |   2 +-
 .../UI/Controls/User/UsersControl.axaml.cs    |   6 +
 .../UI/Model/GameEdit/GameEditTab10Model.cs   |   5 +-
 .../UI/Model/Main/GameListModel.cs            |  15 +-
 src/ColorMC.Gui/UI/Model/Main/MainModel.cs    |  49 +-
 .../UI/Model/Setting/SettingTab6Model.cs      |   1 +
 src/ColorMC.Gui/UI/Model/TopModel.cs          |   4 +-
 src/ColorMC.Gui/UI/Model/User/UsersModel.cs   |  17 +
 src/ColorMC.Gui/UI/Windows/AllControl.axaml   |   2 +-
 .../UI/Windows/SelfBaseWindow.axaml           |   5 +-
 src/ColorMC.Gui/UIBinding/BaseBinding.cs      |  18 +-
 src/ColorMC.Gui/UIBinding/GameBinding.cs      |   8 +-
 55 files changed, 806 insertions(+), 665 deletions(-)
 create mode 100644 src/ColorMC.Gui/UI/Controls/Main/MainUserControl.axaml
 create mode 100644 src/ColorMC.Gui/UI/Controls/Main/MainUserControl.axaml.cs

diff --git a/src/ColorMC.Core/CoreMain.cs b/src/ColorMC.Core/CoreMain.cs
index 50897c6cb..ec1496836 100644
--- a/src/ColorMC.Core/CoreMain.cs
+++ b/src/ColorMC.Core/CoreMain.cs
@@ -15,7 +15,7 @@ namespace ColorMC.Core;
 public static class ColorMCCore
 {
     public const string TopVersion = "A27";
-    public const string DateVersion = "20240715";
+    public const string DateVersion = "20240716";
 
     /// <summary>
     /// 版本号
diff --git a/src/ColorMC.Gui/ColorMC.Gui.csproj b/src/ColorMC.Gui/ColorMC.Gui.csproj
index fdf2b7c8a..0ab75c607 100644
--- a/src/ColorMC.Gui/ColorMC.Gui.csproj
+++ b/src/ColorMC.Gui/ColorMC.Gui.csproj
@@ -333,4 +333,7 @@
     <ProjectReference Include="..\..\X11.Net\X11\X11.csproj" />
     <ProjectReference Include="..\ColorMC.Core\ColorMC.Core.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <UpToDateCheckInput Remove="UI\Controls\Main\MainUserControl.axaml" />
+  </ItemGroup>
 </Project>
diff --git a/src/ColorMC.Gui/Manager/ThemeManager.cs b/src/ColorMC.Gui/Manager/ThemeManager.cs
index 5152a47aa..a308a8132 100644
--- a/src/ColorMC.Gui/Manager/ThemeManager.cs
+++ b/src/ColorMC.Gui/Manager/ThemeManager.cs
@@ -406,7 +406,7 @@ static ThemeManager()
             ProgressBarBG = Brush.Parse("#FFe4e4e7"),
             MainGroupBG = Brush.Parse("#FFd4d4d8"),
             MainGroupBorder = Brush.Parse("#FFE0E0E0"),
-            ItemBG = Brush.Parse("#FFFFFFFF"),
+            ItemBG = Brush.Parse("#CFFFFFFF"),
             GameItemBG = Brush.Parse("#FFF2F2F2"),
             TopViewBG = Brush.Parse("#886D6D6D"),
             AllBorder = Brush.Parse("#FFe5e7eb"),
@@ -426,7 +426,7 @@ static ThemeManager()
             ProgressBarBG = Brush.Parse("#FF3f3f46"),
             MainGroupBG = Brush.Parse("#FF27272a"),
             MainGroupBorder = Brush.Parse("#FFE0E0E0"),
-            ItemBG = Brush.Parse("#FF27272a"),
+            ItemBG = Brush.Parse("#CF27272a"),
             GameItemBG = Brush.Parse("#FFc7c7cb"),
             TopViewBG = Brush.Parse("#886D6D6D"),
             AllBorder = Brush.Parse("#FFe5e7eb"),
@@ -434,7 +434,7 @@ static ThemeManager()
             TopBGColor = Brush.Parse("#FFF4F4F5"),
             TopGridColor = Brush.Parse("#FF202020"),
             OverBGColor = Brush.Parse("#FF000000"),
-            OverBrushColor = Brush.Parse("#FF1d1d1d")
+            OverBrushColor = Brush.Parse("#FF1d1d1d"),
         };
     }
 }
diff --git a/src/ColorMC.Gui/Manager/WindowManager.cs b/src/ColorMC.Gui/Manager/WindowManager.cs
index 871ba84eb..4c153dc16 100644
--- a/src/ColorMC.Gui/Manager/WindowManager.cs
+++ b/src/ColorMC.Gui/Manager/WindowManager.cs
@@ -222,7 +222,7 @@ public static DownloadArg ShowDownload()
         });
     }
 
-    public static void ShowUser(bool add = false, string? url = null)
+    public static void ShowUser(bool add = false, bool relogin = false, string? url = null)
     {
         if (UserWindow != null)
         {
@@ -242,6 +242,10 @@ public static void ShowUser(bool add = false, string? url = null)
         {
             UserWindow?.Add();
         }
+        if (relogin)
+        {
+            UserWindow?.Relogin();
+        }
     }
 
     public static void ShowMain()
diff --git a/src/ColorMC.Gui/Resource/Icon/Setting/svg16.svg b/src/ColorMC.Gui/Resource/Icon/Setting/svg16.svg
index e6aa5baac..26c2c5a12 100644
--- a/src/ColorMC.Gui/Resource/Icon/Setting/svg16.svg
+++ b/src/ColorMC.Gui/Resource/Icon/Setting/svg16.svg
@@ -1,6 +1,5 @@
 <?xml version="1.0" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none" />
-    <path
+    <path stroke="none" stroke-width="0"
         d="M4 3h16a1 1 0 0 1 1 1v16a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1zm1 2v14h14V5H5zm6 6V7h2v4h4v2h-4v4h-2v-4H7v-2h4z" />
 </svg>
\ No newline at end of file
diff --git a/src/ColorMC.Gui/Resource/Language/gui_zh-cn.json b/src/ColorMC.Gui/Resource/Language/gui_zh-cn.json
index cb5380f79..1da24181a 100644
--- a/src/ColorMC.Gui/Resource/Language/gui_zh-cn.json
+++ b/src/ColorMC.Gui/Resource/Language/gui_zh-cn.json
@@ -14,7 +14,7 @@
 	"MainWindow.Text15": "发现启动器更新！",
 	"MainWindow.Text16": "立即升级",
 	"MainWindow.Text17": "更新日志",
-	"MainWindow.Text18": "映射大厅",
+	"MainWindow.Text18": "映射大厅 一起联机！",
 	"MainWindow.Text19": "查看列表",
 	"MainWindow.Text20": "Minecraft News",
 	"MainWindow.Text21": "没有News",
@@ -84,6 +84,7 @@
 	"MainWindow.Error5": "游戏实例复制失败",
 	"MainWindow.Error6": "至少登录一个正版账户才能使用映射功能",
 	"MainWindow.Error7": "未知用户类型",
+	"MainWindow.Error8": "{0}\n是否要重新登录账户",
 	"UserWindow.Title": "用户列表",
 	"UserWindow.DataGrid.Text1": "使用",
 	"UserWindow.DataGrid.Text3": "账户类型",
diff --git a/src/ColorMC.Gui/Style/DataGrid.axaml b/src/ColorMC.Gui/Style/DataGrid.axaml
index 07e5b77c7..4dbc41908 100644
--- a/src/ColorMC.Gui/Style/DataGrid.axaml
+++ b/src/ColorMC.Gui/Style/DataGrid.axaml
@@ -21,10 +21,15 @@
 
     <Style Selector="DataGrid">
         <Setter Property="Foreground" Value="{setting:Theme FontColor}" />
+        <Style Selector="^ /template/ Rectangle#PART_ColumnHeadersAndRowsSeparator">
+            <Setter Property="Fill" Value="Transparent" />
+        </Style>
     </Style>
 
     <Style Selector="DataGridColumnHeader">
         <Setter Property="Foreground" Value="{setting:Theme FontColor}" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="SeparatorBrush" Value="Transparent" />
     </Style>
 
     <Style Selector="DataGridRow:selected /template/ Rectangle#BackgroundRectangle">
diff --git a/src/ColorMC.Gui/UI/Controls/Add/AddControl.axaml b/src/ColorMC.Gui/UI/Controls/Add/AddControl.axaml
index dc84fafb3..4212b8fac 100644
--- a/src/ColorMC.Gui/UI/Controls/Add/AddControl.axaml
+++ b/src/ColorMC.Gui/UI/Controls/Add/AddControl.axaml
@@ -213,24 +213,21 @@
                 </Panel>
             </DockPanel>
         </ScrollViewer>
-        <Panel
-            Name="VersionDisplay"
-            Background="{setting:Theme TopViewBG}"
-            IsVisible="False">
+        <Decorator Name="VersionDisplay" IsVisible="False">
             <Border
-                Margin="10"
-                Classes="t3"
+                Margin="20,10,20,20"
+                Classes="t2"
                 DockPanel.Dock="Top">
-                <DockPanel Margin="15">
-                    <WrapPanel DockPanel.Dock="Top">
-                        <TextBlock Margin="0,0,10,10" Text="{setting:Localize Text.GameVersion}" />
+                <DockPanel>
+                    <WrapPanel Margin="15,15,15,0" DockPanel.Dock="Top">
+                        <TextBlock Margin="0,0,10,0" Text="{setting:Localize Text.GameVersion}" />
                         <ComboBox
                             Width="150"
-                            Margin="0,0,10,10"
+                            Margin="0,0,10,0"
                             VerticalAlignment="Center"
                             ItemsSource="{Binding GameVersionList}"
                             SelectedItem="{Binding GameVersionDownload}" />
-                        <StackPanel Margin="0,0,10,10" Orientation="Horizontal">
+                        <StackPanel Margin="0,0,10,0" Orientation="Horizontal">
                             <TextBlock Margin="0,0,5,0" Text="{setting:Localize AddModPackWindow.Text5}" />
                             <NumericUpDown
                                 Width="110"
@@ -245,7 +242,7 @@
                             <Button
                                 Width="100"
                                 Height="35"
-                                Margin="-2,-3,3,7"
+                                Margin="-2,-3,3,-3"
                                 Classes="top"
                                 Command="{Binding Refresh1}"
                                 Content="{setting:Localize AddModPackWindow.Text10}"
@@ -254,7 +251,7 @@
                             <Button
                                 Width="100"
                                 Height="35"
-                                Margin="-2,-3,3,7"
+                                Margin="-2,-3,3,-3"
                                 Classes="top"
                                 Command="{Binding GoFile}"
                                 Content="{setting:Localize AddModPackWindow.Text12}"
@@ -264,6 +261,7 @@
                     </WrapPanel>
                     <DataGrid
                         Name="VersionFiles"
+                        Margin="5"
                         CanUserResizeColumns="True"
                         ItemsSource="{Binding FileList}"
                         SelectedItem="{Binding File}">
@@ -292,25 +290,22 @@
                     </DataGrid>
                 </DockPanel>
             </Border>
-        </Panel>
-        <Panel
-            Name="OptifineDisplay"
-            Background="{setting:Theme TopViewBG}"
-            IsVisible="False">
-            <Border Margin="10" Classes="t3">
-                <DockPanel Margin="15">
-                    <WrapPanel DockPanel.Dock="Top">
-                        <TextBlock Margin="0,0,5,10" Text="{setting:Localize Text.GameVersion}" />
+        </Decorator>
+        <Decorator Name="OptifineDisplay" IsVisible="False">
+            <Border Margin="20,10,20,20" Classes="t2">
+                <DockPanel>
+                    <WrapPanel Margin="15,15,15,0" DockPanel.Dock="Top">
+                        <TextBlock Margin="0,0,5,0" Text="{setting:Localize Text.GameVersion}" />
                         <ComboBox
                             Width="150"
-                            Margin="0,0,10,10"
+                            Margin="0,0,10,0"
                             ItemsSource="{Binding GameVersionList}"
                             SelectedItem="{Binding GameVersionOptifine}" />
                         <StackPanel Orientation="Horizontal">
                             <Button
                                 Width="100"
                                 Height="35"
-                                Margin="-2,-3,3,7"
+                                Margin="-2,-3,3,-3"
                                 Classes="top"
                                 Command="{Binding LoadOptifineList}"
                                 Content="{setting:Localize AddModPackWindow.Text10}"
@@ -319,7 +314,7 @@
                             <Button
                                 Width="100"
                                 Height="35"
-                                Margin="-2,-3,3,7"
+                                Margin="-2,-3,3,-3"
                                 Classes="top"
                                 Command="{Binding DownloadOptifine}"
                                 Content="{setting:Localize AddModPackWindow.Text12}"
@@ -329,6 +324,7 @@
                     </WrapPanel>
                     <DataGrid
                         Name="OptifineFiles"
+                        Margin="5"
                         CanUserResizeColumns="True"
                         ItemsSource="{Binding DownloadOptifineList}"
                         SelectedItem="{Binding OptifineItem}">
@@ -353,17 +349,14 @@
                     </DataGrid>
                 </DockPanel>
             </Border>
-        </Panel>
-        <Panel
-            Name="ModDownloadDisplay"
-            Background="{setting:Theme TopViewBG}"
-            IsVisible="False">
-            <Border Margin="10" Classes="t3">
-                <DockPanel Margin="15">
-                    <WrapPanel DockPanel.Dock="Top">
-                        <TextBlock Margin="0,0,10,10" Text="{setting:Localize AddWindow.Text7}" />
+        </Decorator>
+        <Decorator Name="ModDownloadDisplay" IsVisible="False">
+            <Border Margin="20,10,20,20" Classes="t2">
+                <DockPanel>
+                    <WrapPanel Margin="15,15,15,0" DockPanel.Dock="Top">
+                        <TextBlock Margin="0,0,20,0" Text="{setting:Localize AddWindow.Text7}" />
                         <ToggleSwitch
-                            Margin="0,0,10,10"
+                            Margin="0,0,10,0"
                             IsChecked="{Binding LoadMoreMod}"
                             OffContent="{setting:Localize AddWindow.Text9}"
                             OnContent="{setting:Localize AddWindow.Text9}" />
@@ -371,7 +364,7 @@
                             <Button
                                 Width="100"
                                 Height="35"
-                                Margin="-2,-3,3,7"
+                                Margin="-2,-3,3,-3"
                                 Classes="top"
                                 Command="{Binding DownloadAllMod}"
                                 Content="{setting:Localize AddWindow.Text6}"
@@ -380,7 +373,7 @@
                             <Button
                                 Width="100"
                                 Height="35"
-                                Margin="-2,-3,3,7"
+                                Margin="-2,-3,3,-3"
                                 Classes="top"
                                 Command="{Binding DownloadMod}"
                                 Content="{setting:Localize AddModPackWindow.Text12}"
@@ -390,6 +383,7 @@
                     </WrapPanel>
                     <DataGrid
                         Name="ModDownloadFiles"
+                        Margin="5"
                         CanUserResizeColumns="True"
                         ItemsSource="{Binding DownloadModList}"
                         SelectedItem="{Binding Mod}">
@@ -415,6 +409,6 @@
                     </DataGrid>
                 </DockPanel>
             </Border>
-        </Panel>
+        </Decorator>
     </Panel>
 </UserControl>
diff --git a/src/ColorMC.Gui/UI/Controls/Add/AddControl.axaml.cs b/src/ColorMC.Gui/UI/Controls/Add/AddControl.axaml.cs
index 3426975b9..88c3541f9 100644
--- a/src/ColorMC.Gui/UI/Controls/Add/AddControl.axaml.cs
+++ b/src/ColorMC.Gui/UI/Controls/Add/AddControl.axaml.cs
@@ -100,10 +100,12 @@ private void Model_PropertyChanged(object? sender, PropertyChangedEventArgs e)
                 if (model.OptifineDisplay == true)
                 {
                     App.CrossFade300.Start(null, OptifineDisplay);
+                    App.CrossFade300.Start(ScrollViewer1, null);
                 }
                 else
                 {
                     App.CrossFade300.Start(OptifineDisplay, null);
+                    App.CrossFade300.Start(null, ScrollViewer1);
                 }
             });
         }
@@ -114,10 +116,12 @@ private void Model_PropertyChanged(object? sender, PropertyChangedEventArgs e)
                 if (model.ModDownloadDisplay == true)
                 {
                     App.CrossFade300.Start(null, ModDownloadDisplay);
+                    App.CrossFade300.Start(ScrollViewer1, null);
                 }
                 else
                 {
                     App.CrossFade300.Start(ModDownloadDisplay, null);
+                    App.CrossFade300.Start(null, ScrollViewer1);
                 }
             });
         }
@@ -128,10 +132,12 @@ private void Model_PropertyChanged(object? sender, PropertyChangedEventArgs e)
                 if (model.VersionDisplay == true)
                 {
                     App.CrossFade300.Start(null, VersionDisplay);
+                    App.CrossFade300.Start(ScrollViewer1, null);
                 }
                 else
                 {
                     App.CrossFade300.Start(VersionDisplay, null);
+                    App.CrossFade300.Start(null, ScrollViewer1);
                 }
             });
         }
diff --git a/src/ColorMC.Gui/UI/Controls/Add/AddJavaControl.axaml b/src/ColorMC.Gui/UI/Controls/Add/AddJavaControl.axaml
index d8084f2b6..13e450c63 100644
--- a/src/ColorMC.Gui/UI/Controls/Add/AddJavaControl.axaml
+++ b/src/ColorMC.Gui/UI/Controls/Add/AddJavaControl.axaml
@@ -87,10 +87,11 @@
             <Panel>
                 <DataGrid
                     Name="JavaFiles"
-                    Margin="15"
+                    Margin="5"
                     AutoGenerateColumns="False"
                     CanUserResizeColumns="True"
                     CanUserSortColumns="False"
+                    IsVisible="{Binding !Display}"
                     ItemsSource="{Binding JavaList}">
                     <DataGrid.Columns>
                         <DataGridTextColumn
diff --git a/src/ColorMC.Gui/UI/Controls/Add/AddModPackControl.axaml b/src/ColorMC.Gui/UI/Controls/Add/AddModPackControl.axaml
index 593ce2d5d..a6f8f2eac 100644
--- a/src/ColorMC.Gui/UI/Controls/Add/AddModPackControl.axaml
+++ b/src/ColorMC.Gui/UI/Controls/Add/AddModPackControl.axaml
@@ -178,24 +178,21 @@
                 </Panel>
             </DockPanel>
         </ScrollViewer>
-        <Border
-            Name="ModPackFiles"
-            Background="{setting:Theme TopViewBG}"
-            IsVisible="False">
+        <Decorator Name="ModPackFiles" IsVisible="False">
             <Border
-                Margin="10"
-                Classes="t3"
+                Margin="20,10,20,20"
+                Classes="t2"
                 DockPanel.Dock="Top">
-                <DockPanel Margin="15">
-                    <WrapPanel DockPanel.Dock="Top">
-                        <TextBlock Margin="0,0,5,10" Text="{setting:Localize Text.GameVersion}" />
+                <DockPanel>
+                    <WrapPanel Margin="15,15,15,0" DockPanel.Dock="Top">
+                        <TextBlock Margin="0,0,5,0" Text="{setting:Localize Text.GameVersion}" />
                         <ComboBox
                             Width="150"
-                            Margin="0,0,10,10"
+                            Margin="0,0,10,0"
                             VerticalAlignment="Center"
                             ItemsSource="{Binding GameVersionList}"
                             SelectedItem="{Binding GameVersion1}" />
-                        <StackPanel Margin="0,0,10,10" Orientation="Horizontal">
+                        <StackPanel Margin="0,0,10,0" Orientation="Horizontal">
                             <TextBlock Margin="0,0,5,0" Text="{setting:Localize AddModPackWindow.Text5}" />
                             <NumericUpDown
                                 Width="110"
@@ -209,7 +206,7 @@
                             <Button
                                 Width="100"
                                 Height="35"
-                                Margin="-2,-3,3,7"
+                                Margin="-2,-3,3,-3"
                                 Classes="top"
                                 Command="{Binding Search}"
                                 Content="{setting:Localize AddModPackWindow.Text10}"
@@ -218,7 +215,7 @@
                             <Button
                                 Width="100"
                                 Height="35"
-                                Margin="-2,-3,3,7"
+                                Margin="-2,-3,3,-3"
                                 Classes="top"
                                 Command="{Binding Download}"
                                 Content="{setting:Localize AddModPackWindow.Text12}"
@@ -228,6 +225,7 @@
                     </WrapPanel>
                     <DataGrid
                         Name="PackFiles"
+                        Margin="5"
                         CanUserResizeColumns="True"
                         ItemsSource="{Binding FileList}"
                         SelectedItem="{Binding Item}">
@@ -252,6 +250,6 @@
                     </DataGrid>
                 </DockPanel>
             </Border>
-        </Border>
+        </Decorator>
     </Panel>
 </UserControl>
diff --git a/src/ColorMC.Gui/UI/Controls/Add/AddModPackControl.axaml.cs b/src/ColorMC.Gui/UI/Controls/Add/AddModPackControl.axaml.cs
index aa5482cc7..92c1be701 100644
--- a/src/ColorMC.Gui/UI/Controls/Add/AddModPackControl.axaml.cs
+++ b/src/ColorMC.Gui/UI/Controls/Add/AddModPackControl.axaml.cs
@@ -100,10 +100,12 @@ private void Model_PropertyChanged(object? sender, PropertyChangedEventArgs e)
                 if ((DataContext as AddModPackControlModel)!.Display)
                 {
                     App.CrossFade300.Start(null, ModPackFiles);
+                    App.CrossFade300.Start(ScrollViewer1, null);
                 }
                 else
                 {
                     App.CrossFade300.Start(ModPackFiles, null);
+                    App.CrossFade300.Start(null, ScrollViewer1);
                 }
             });
         }
diff --git a/src/ColorMC.Gui/UI/Controls/Dialog/NbtDialogEditControl.axaml b/src/ColorMC.Gui/UI/Controls/Dialog/NbtDialogEditControl.axaml
index 0fc0ba064..f696dff47 100644
--- a/src/ColorMC.Gui/UI/Controls/Dialog/NbtDialogEditControl.axaml
+++ b/src/ColorMC.Gui/UI/Controls/Dialog/NbtDialogEditControl.axaml
@@ -11,7 +11,7 @@
     mc:Ignorable="d">
     <DockPanel HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
         <DockPanel
-            Margin="5"
+            Margin="5,5,5,0"
             HorizontalAlignment="Stretch"
             VerticalAlignment="Stretch"
             DockPanel.Dock="Top">
@@ -35,6 +35,7 @@
                     <TextBlock Text="{Binding DataType}" />
                 </StackPanel>
                 <ToggleSwitch
+                    Margin="0,0,0,-5"
                     DockPanel.Dock="Right"
                     IsChecked="{Binding HexEdit}"
                     OffContent="{setting:Localize ConfigEditWindow.Text12}"
diff --git a/src/ColorMC.Gui/UI/Controls/GameConfigEdit/GameConfigEditControl.axaml b/src/ColorMC.Gui/UI/Controls/GameConfigEdit/GameConfigEditControl.axaml
index 209e2c203..6ac7587f5 100644
--- a/src/ColorMC.Gui/UI/Controls/GameConfigEdit/GameConfigEditControl.axaml
+++ b/src/ColorMC.Gui/UI/Controls/GameConfigEdit/GameConfigEditControl.axaml
@@ -14,7 +14,7 @@
     d:DesignWidth="800"
     x:DataType="vm:GameConfigEditModel"
     mc:Ignorable="d">
-    <dialog:DialogHost DisableOpeningAnimation="True" Identifier="{Binding UseName}">
+    <dialog:DialogHost OverlayBackground="Transparent" DisableOpeningAnimation="True" Identifier="{Binding UseName}">
         <dialog:DialogHost.DataTemplates>
             <DataTemplate DataType="model:NbtDialogAddModel">
                 <view:NbtDialogAddControl DataContext="{Binding}" />
diff --git a/src/ColorMC.Gui/UI/Controls/GameEdit/Tab4Control.axaml b/src/ColorMC.Gui/UI/Controls/GameEdit/Tab4Control.axaml
index 78c49ff29..4e613085f 100644
--- a/src/ColorMC.Gui/UI/Controls/GameEdit/Tab4Control.axaml
+++ b/src/ColorMC.Gui/UI/Controls/GameEdit/Tab4Control.axaml
@@ -14,9 +14,9 @@
     <Panel>
         <Decorator Margin="0,0,10,15">
             <Border Margin="10,5,10,3" Classes="t2">
-                <DockPanel Margin="15">
+                <DockPanel>
                     <StackPanel
-                        Margin="0,0,0,10"
+                        Margin="15,15,15,0"
                         DockPanel.Dock="Top"
                         IsVisible="{Binding MinMode}">
                         <DockPanel Margin="0,0,0,10">
@@ -44,7 +44,7 @@
                         </DockPanel>
                     </StackPanel>
                     <DockPanel
-                        Margin="0,0,0,10"
+                        Margin="15,15,15,0"
                         DockPanel.Dock="Top"
                         IsVisible="{Binding !MinMode}">
                         <Button
@@ -71,6 +71,7 @@
                     </DockPanel>
                     <DataGrid
                         Name="DataGrid1"
+                        Margin="5"
                         AutoGenerateColumns="False"
                         CanUserResizeColumns="True"
                         HorizontalScrollBarVisibility="Visible"
diff --git a/src/ColorMC.Gui/UI/Controls/GameExport/Tab2Control.axaml b/src/ColorMC.Gui/UI/Controls/GameExport/Tab2Control.axaml
index ac4d98a52..ba521d695 100644
--- a/src/ColorMC.Gui/UI/Controls/GameExport/Tab2Control.axaml
+++ b/src/ColorMC.Gui/UI/Controls/GameExport/Tab2Control.axaml
@@ -12,12 +12,12 @@
     mc:Ignorable="d">
     <Decorator Margin="0,0,10,15">
         <Border Margin="10,5,10,3" Classes="t2">
-            <DockPanel Margin="15">
-                <DockPanel Margin="0,0,0,10" DockPanel.Dock="Top">
+            <DockPanel>
+                <DockPanel Margin="15,15,15,0" DockPanel.Dock="Top">
                     <Button
                         Width="100"
                         Height="35"
-                        Margin="-2,-3,-2,-2"
+                        Margin="-2,-3,-2,-3"
                         Classes="top"
                         Command="{Binding OpenMod}"
                         Content="{setting:Localize Button.OpFile}"
@@ -27,7 +27,7 @@
                     <Button
                         Width="100"
                         Height="35"
-                        Margin="-2,-3,3,-2"
+                        Margin="-2,-3,3,-3"
                         Classes="top"
                         Command="{Binding LoadMod}"
                         Content="{setting:Localize Button.Refash}"
@@ -41,6 +41,7 @@
                 </DockPanel>
                 <DataGrid
                     Name="DataGrid1"
+                    Margin="5"
                     AutoGenerateColumns="False"
                     CanUserResizeColumns="True"
                     CanUserSortColumns="False"
diff --git a/src/ColorMC.Gui/UI/Controls/GameExport/Tab3Control.axaml b/src/ColorMC.Gui/UI/Controls/GameExport/Tab3Control.axaml
index 04766bc82..4872e91a2 100644
--- a/src/ColorMC.Gui/UI/Controls/GameExport/Tab3Control.axaml
+++ b/src/ColorMC.Gui/UI/Controls/GameExport/Tab3Control.axaml
@@ -14,7 +14,7 @@
     mc:Ignorable="d">
     <Decorator Margin="0,0,10,15">
         <Border Margin="10,5,10,3" Classes="t2">
-            <TreeDataGrid Margin="15" Source="{Binding Source}" />
+            <TreeDataGrid Margin="5" Source="{Binding Source}" />
         </Border>
     </Decorator>
 </UserControl>
diff --git a/src/ColorMC.Gui/UI/Controls/GameExport/Tab4Control.axaml b/src/ColorMC.Gui/UI/Controls/GameExport/Tab4Control.axaml
index f4c0bba85..81477302f 100644
--- a/src/ColorMC.Gui/UI/Controls/GameExport/Tab4Control.axaml
+++ b/src/ColorMC.Gui/UI/Controls/GameExport/Tab4Control.axaml
@@ -16,12 +16,12 @@
             Classes="t2"
             DockPanel.Dock="Top"
             IsEnabled="{Binding MoEx}">
-            <DockPanel Margin="15">
-                <DockPanel Margin="0,0,0,10" DockPanel.Dock="Top">
+            <DockPanel>
+                <DockPanel Margin="15,15,15,0" DockPanel.Dock="Top">
                     <Button
                         Width="100"
                         Height="35"
-                        Margin="-2,-3,-2,-2"
+                        Margin="-2,-3,-2,-3"
                         VerticalAlignment="Center"
                         Classes="top"
                         Command="{Binding AddFile}"
@@ -37,6 +37,7 @@
                 </DockPanel>
                 <DataGrid
                     Name="DataGrid1"
+                    Margin="5"
                     AutoGenerateColumns="False"
                     CanUserResizeColumns="True"
                     CanUserSortColumns="False"
diff --git a/src/ColorMC.Gui/UI/Controls/Items/DownloadItemControl.axaml b/src/ColorMC.Gui/UI/Controls/Items/DownloadItemControl.axaml
index da6f242bc..0d290f570 100644
--- a/src/ColorMC.Gui/UI/Controls/Items/DownloadItemControl.axaml
+++ b/src/ColorMC.Gui/UI/Controls/Items/DownloadItemControl.axaml
@@ -19,7 +19,10 @@
                     <TextBlock Text="{Binding NowProgress, StringFormat=0.00, FallbackValue=50}" />
                     <TextBlock Text="%" />
                 </StackPanel>
-                <TextBlock Text="{Binding Name, FallbackValue=Name}" TextTrimming="CharacterEllipsis" />
+                <TextBlock
+                    Foreground="{setting:Theme MainColor}"
+                    Text="{Binding Name, FallbackValue=Name}"
+                    TextTrimming="CharacterEllipsis" />
             </DockPanel>
             <ProgressBar
                 Height="10"
@@ -31,8 +34,8 @@
                 Value="{Binding NowProgress}" />
             <WrapPanel>
                 <StackPanel Margin="0,0,10,0" Orientation="Horizontal">
-                    <TextBlock Text="{setting:Localize DownloadWindow.Text5}" />
-                    <TextBlock Text="{Binding Index, FallbackValue=1}" />
+                    <TextBlock Foreground="#FF9A9A9A" Text="{setting:Localize DownloadWindow.Text5}" />
+                    <TextBlock Foreground="#FF9A9A9A" Text="{Binding Index, FallbackValue=1}" />
                 </StackPanel>
                 <TextBlock
                     Width="100"
diff --git a/src/ColorMC.Gui/UI/Controls/Items/FileItemControl.axaml.cs b/src/ColorMC.Gui/UI/Controls/Items/FileItemControl.axaml.cs
index f1dd4c56c..c24722ad7 100644
--- a/src/ColorMC.Gui/UI/Controls/Items/FileItemControl.axaml.cs
+++ b/src/ColorMC.Gui/UI/Controls/Items/FileItemControl.axaml.cs
@@ -1,6 +1,12 @@
+using System;
+using Avalonia.Animation;
+using Avalonia.Animation.Easings;
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
+using Avalonia.Media;
+using Avalonia.Styling;
 using Avalonia.Threading;
 using ColorMC.Gui.UI.Flyouts;
 using ColorMC.Gui.UI.Model.Items;
@@ -22,6 +28,12 @@ public FileItemControl()
         PointerMoved += FileItemControl_PointerMoved;
     }
 
+    protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+    {
+        base.OnApplyTemplate(e);
+        Dispatcher.UIThread.Post(FadeIn);
+    }
+
     private void FileItemControl_PointerMoved(object? sender, PointerEventArgs e)
     {
         LongPressed.Cancel();
@@ -100,4 +112,65 @@ void OpenFlyout()
             });
         }
     }
+
+    private void FadeIn()
+    {
+        var animation = new Animation
+        {
+            FillMode = FillMode.Forward,
+            Easing = new CircularEaseInOut(),
+            Children =
+            {
+                new KeyFrame
+                {
+                    Setters =
+                    {
+                        new Setter
+                        {
+                            Property = OpacityProperty,
+                            Value = 0.0d
+                        },
+                        new Setter
+                        {
+                            Property = TranslateTransform.YProperty,
+                            Value = 10d
+                        }
+                    },
+                    Cue = new Cue(0d)
+                },
+                new KeyFrame
+                {
+                    Setters =
+                    {
+                        new Setter
+                        {
+                            Property = OpacityProperty,
+                            Value = 1.0d
+                        },
+                        new Setter
+                        {
+                            Property = TranslateTransform.YProperty,
+                            Value = 10d
+                        }
+                    },
+                    Cue = new Cue(0.5d)
+                },
+                new KeyFrame
+                {
+                    Setters =
+                    {
+                        new Setter
+                        {
+                            Property = TranslateTransform.YProperty,
+                            Value = 0d
+                        }
+                    },
+                    Cue = new Cue(1d)
+                }
+            },
+            Duration = TimeSpan.FromMilliseconds(500)
+        };
+
+        animation.RunAsync(this);
+    }
 }
diff --git a/src/ColorMC.Gui/UI/Controls/Items/GameControl.axaml b/src/ColorMC.Gui/UI/Controls/Items/GameControl.axaml
index d5b58a691..bdbe1349e 100644
--- a/src/ColorMC.Gui/UI/Controls/Items/GameControl.axaml
+++ b/src/ColorMC.Gui/UI/Controls/Items/GameControl.axaml
@@ -66,12 +66,12 @@
                         Source="resm:ColorMC.Gui.Resource.Pic.load.png"
                         Stretch="UniformToFill" />
                     <Button
-                        Width="36"
-                        Height="36"
+                        Width="31"
+                        Height="31"
                         Margin="34,0,0,0"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
-                        Classes="top"
+                        BorderThickness="0"
                         ClipToBounds="False"
                         Command="{Binding EditGame}"
                         CornerRadius="20"
@@ -82,12 +82,12 @@
                         <svg:SvgControl Path="/Resource/Icon/edit.svg" />
                     </Button>
                     <Button
-                        Width="36"
-                        Height="36"
+                        Width="31"
+                        Height="31"
                         Margin="0,0,34,0"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
-                        Classes="top"
+                        BorderThickness="0"
                         ClipToBounds="False"
                         Command="{Binding Launch}"
                         CornerRadius="20"
diff --git a/src/ColorMC.Gui/UI/Controls/Items/ResourcePackControl.axaml b/src/ColorMC.Gui/UI/Controls/Items/ResourcePackControl.axaml
index 1f01ded3d..4fb7129ab 100644
--- a/src/ColorMC.Gui/UI/Controls/Items/ResourcePackControl.axaml
+++ b/src/ColorMC.Gui/UI/Controls/Items/ResourcePackControl.axaml
@@ -26,7 +26,7 @@
                     <ImageBrush Source="{Binding Pic}" Stretch="UniformToFill" />
                 </Border.Background>
             </Border>
-            <StackPanel Margin="110,0,0,0">
+            <StackPanel Margin="105,0,0,0">
                 <TextBlock
                     Margin="0,0,5,0"
                     HorizontalAlignment="Left"
diff --git a/src/ColorMC.Gui/UI/Controls/Items/WorldCloudControl.axaml b/src/ColorMC.Gui/UI/Controls/Items/WorldCloudControl.axaml
index ca99e0840..8f30ec63e 100644
--- a/src/ColorMC.Gui/UI/Controls/Items/WorldCloudControl.axaml
+++ b/src/ColorMC.Gui/UI/Controls/Items/WorldCloudControl.axaml
@@ -25,7 +25,7 @@
                     <ImageBrush Source="{Binding Pic}" Stretch="UniformToFill" />
                 </Border.Background>
             </Border>
-            <StackPanel Margin="110,0,0,0">
+            <StackPanel Margin="105,0,0,0">
                 <TextBlock
                     FontSize="16"
                     Foreground="{setting:Theme MainColor}"
diff --git a/src/ColorMC.Gui/UI/Controls/Items/WorldControl.axaml b/src/ColorMC.Gui/UI/Controls/Items/WorldControl.axaml
index 0e3429418..abc8cf182 100644
--- a/src/ColorMC.Gui/UI/Controls/Items/WorldControl.axaml
+++ b/src/ColorMC.Gui/UI/Controls/Items/WorldControl.axaml
@@ -27,7 +27,7 @@
                     <ImageBrush Source="{Binding Pic}" Stretch="UniformToFill" />
                 </Border.Background>
             </Border>
-            <StackPanel Margin="110,0,0,0">
+            <StackPanel Margin="105,0,0,0">
                 <TextBlock
                     HorizontalAlignment="Left"
                     FontSize="16"
diff --git a/src/ColorMC.Gui/UI/Controls/Main/GameGroupControl.axaml b/src/ColorMC.Gui/UI/Controls/Main/GameGroupControl.axaml
index 724a05d6a..1b8b3bcdc 100644
--- a/src/ColorMC.Gui/UI/Controls/Main/GameGroupControl.axaml
+++ b/src/ColorMC.Gui/UI/Controls/Main/GameGroupControl.axaml
@@ -32,8 +32,8 @@
                 </Style>
                 <Style Selector="Expander:pointerover /template/ ToggleButton#ExpanderHeader">
                     <Style Selector="^ /template/ Border#ToggleButtonBackground">
-                        <Setter Property="BorderBrush" Value="{setting:Theme OverBrushColor}" />
-                        <Setter Property="Background" Value="{setting:Theme ItemBG}" />
+                        <Setter Property="BorderBrush" Value="Transparent" />
+                        <Setter Property="Background" Value="Transparent" />
                     </Style>
                 </Style>
 
@@ -57,7 +57,7 @@
                     </ItemsControl.ItemsPanel>
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
-                            <views1:GameControl Margin="0,0,4,4" DataContext="{Binding}" />
+                            <views1:GameControl Margin="0,0,1,1" DataContext="{Binding}" />
                         </DataTemplate>
                     </ItemsControl.ItemTemplate>
                 </ItemsControl>
diff --git a/src/ColorMC.Gui/UI/Controls/Main/MainControl.axaml b/src/ColorMC.Gui/UI/Controls/Main/MainControl.axaml
index b46f5c0e2..9c7b7d454 100644
--- a/src/ColorMC.Gui/UI/Controls/Main/MainControl.axaml
+++ b/src/ColorMC.Gui/UI/Controls/Main/MainControl.axaml
@@ -15,7 +15,10 @@
     x:DataType="model:MainModel"
     DragDrop.AllowDrop="True"
     mc:Ignorable="d">
-    <dialog:DialogHost DisableOpeningAnimation="True" Identifier="MainCon">
+    <dialog:DialogHost
+        DisableOpeningAnimation="True"
+        Identifier="MainCon"
+        OverlayBackground="Transparent">
         <dialog:DialogHost.DataTemplates>
             <DataTemplate DataType="model:MainModel">
                 <views2:GroupEditControl DataContext="{Binding}" />
@@ -30,121 +33,31 @@
                 Height="{Binding Live2dHeight}"
                 HorizontalAlignment="{Binding L2dPos}"
                 VerticalAlignment="{Binding L2dPos1}" />
-            <DockPanel>
-                <DockPanel Margin="20,10,20,0" DockPanel.Dock="Top">
-                    <Border
-                        BorderThickness="0"
-                        Classes="t2"
-                        DockPanel.Dock="Right">
-                        <Border.Background>
-                            <ImageBrush Source="resm:ColorMC.Gui.Resource.Pic.pic1.png" Stretch="UniformToFill" />
-                        </Border.Background>
-                        <Border BorderThickness="0" Classes="t2">
-                            <Border.Background>
-                                <LinearGradientBrush StartPoint="0%,50%" EndPoint="80%,50%">
-                                    <GradientStop Offset="0.0" Color="Black" />
-                                    <GradientStop Offset="1.0" Color="#00000000" />
-                                </LinearGradientBrush>
-                            </Border.Background>
-                            <Border.Styles>
-                                <Style Selector="Button#User">
-                                    <Setter Property="Background" />
-                                    <Style Selector="^:pressed">
-                                        <Setter Property="RenderTransform" Value="scale(1)" />
-                                    </Style>
-                                    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-                                        <Setter Property="Background" Value="Transparent" />
-                                    </Style>
-                                </Style>
-                                <Style Selector="Button#Skin">
-                                    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-                                        <Setter Property="Background" Value="Transparent" />
-                                    </Style>
-                                    <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+            <ScrollViewer>
+                <DockPanel Margin="10">
+                    <DockPanel Margin="10,0,10,0" DockPanel.Dock="Top">
+                        <Decorator
+                            Name="TopRight"
+                            Width="200"
+                            DockPanel.Dock="Right">
+                            <views2:MainUserControl Name="HeadButton" />
+                        </Decorator>
+                        <Panel
+                            Name="HeadTop"
+                            Height="60"
+                            Margin="0,0,10,0"
+                            DockPanel.Dock="Top">
+                            <StackPanel
+                                Name="Buttons"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Bottom"
+                                Orientation="Horizontal">
+                                <StackPanel.Styles>
+                                    <Style Selector="Button">
                                         <Setter Property="Background" Value="Transparent" />
+                                        <Setter Property="BorderThickness" Value="0" />
                                     </Style>
-                                </Style>
-                            </Border.Styles>
-                            <Button
-                                Name="User"
-                                Width="200"
-                                Height="60"
-                                HorizontalAlignment="Stretch"
-                                HorizontalContentAlignment="Stretch"
-                                BorderThickness="0"
-                                Command="{Binding ShowUser}"
-                                IsVisible="{Binding TopSide1}">
-                                <DockPanel Margin="5,0,0,0">
-                                    <Panel HorizontalAlignment="Left">
-
-                                        <Border
-                                            Width="50"
-                                            Height="50"
-                                            VerticalAlignment="Center">
-                                            <Border.Background>
-                                                <ImageBrush Source="{Binding Head}" Stretch="UniformToFill" />
-                                            </Border.Background>
-                                        </Border>
-                                        <ProgressBar
-                                            Width="38"
-                                            Height="10"
-                                            MinWidth="38"
-                                            CornerRadius="20"
-                                            IsIndeterminate="{Binding IsHeadLoad}"
-                                            IsVisible="{Binding IsHeadLoad}" />
-                                    </Panel>
-                                    <Button
-                                        Name="Skin"
-                                        Width="35"
-                                        Height="35"
-                                        Margin="0,0,5,0"
-                                        HorizontalAlignment="Right"
-                                        Background="Transparent"
-                                        BorderThickness="0"
-                                        Command="{Binding ShowSkin}"
-                                        CornerRadius="5"
-                                        DockPanel.Dock="Right"
-                                        ToolTip.Tip="{setting:Localize ToolTip.Text9}"
-                                        ToolTip.VerticalOffset="-30">
-                                        <svg:SvgControl Path="/Resource/Icon/skin.svg" Stroke="White" />
-                                    </Button>
-                                    <StackPanel
-                                        Margin="5,0,0,0"
-                                        VerticalAlignment="Center"
-                                        DockPanel.Dock="Left"
-                                        IsVisible="{Binding TopSide1}"
-                                        RenderOptions.TextRenderingMode="Antialias">
-                                        <TextBlock
-                                            FontSize="17"
-                                            Foreground="White"
-                                            Text="{Binding UserId, FallbackValue=User Name}"
-                                            TextTrimming="CharacterEllipsis"
-                                            TextWrapping="NoWrap" />
-                                        <TextBlock
-                                            HorizontalAlignment="Left"
-                                            FontSize="12"
-                                            Foreground="White"
-                                            Text="{Binding UserType, FallbackValue=456}" />
-                                    </StackPanel>
-                                </DockPanel>
-                            </Button>
-                        </Border>
-                    </Border>
-                    <Panel
-                        Height="60"
-                        Margin="20,0,10,0"
-                        DockPanel.Dock="Top">
-                        <StackPanel
-                            HorizontalAlignment="Right"
-                            VerticalAlignment="Bottom"
-                            Orientation="Horizontal">
-                            <StackPanel.Styles>
-                                <Style Selector="Button">
-                                    <Setter Property="Background" Value="Transparent" />
-                                    <Setter Property="BorderThickness" Value="0" />
-                                </Style>
-                            </StackPanel.Styles>
-                            <StackPanel IsVisible="{Binding TopSide}" Orientation="Horizontal">
+                                </StackPanel.Styles>
                                 <Button
                                     Width="35"
                                     Height="35"
@@ -174,220 +87,219 @@
                                     <svg:SvgControl Path="/Resource/Icon/setting.svg" />
                                 </Button>
                             </StackPanel>
-                            <Button
-                                Width="35"
-                                Height="35"
-                                Command="{Binding OpenSide}"
-                                CornerRadius="5"
-                                IsVisible="{Binding TopSide2}"
-                                ToolTip.Tip="{setting:Localize ToolTip.Text126}"
-                                ToolTip.VerticalOffset="-30">
-                                <svg:SvgControl Path="{Binding SidePath}" />
-                            </Button>
-                        </StackPanel>
-                        <Panel RenderOptions.TextRenderingMode="Antialias">
-                            <TextBlock
-                                VerticalAlignment="Top"
-                                FontSize="24"
-                                Text="{setting:Localize MainWindow.Text23}" />
-                            <TextBlock
-                                VerticalAlignment="Bottom"
-                                FontSize="16"
-                                Text="{Binding HelloText}" />
+                            <Panel RenderOptions.TextRenderingMode="Antialias">
+                                <TextBlock
+                                    VerticalAlignment="Top"
+                                    FontSize="24"
+                                    Text="{setting:Localize MainWindow.Text23}" />
+                                <TextBlock
+                                    VerticalAlignment="Bottom"
+                                    FontSize="16"
+                                    Text="{Binding HelloText}" />
+                            </Panel>
                         </Panel>
-                    </Panel>
-                </DockPanel>
-                <ScrollViewer
-                    Width="200"
-                    Margin="0,10,20,0"
-                    DockPanel.Dock="Right"
-                    IsVisible="{Binding SideDisplay}">
-                    <StackPanel>
-                        <Border
-                            Margin="0,0,0,10"
-                            BorderThickness="0"
-                            Classes="t2"
-                            IsVisible="{Binding !NewsDisplay}">
-                            <Panel>
+                    </DockPanel>
+                    <Decorator
+                        Name="Right"
+                        Width="200"
+                        Margin="0,10,10,10"
+                        DockPanel.Dock="Right"
+                        IsVisible="{Binding SideDisplay}">
+                        <StackPanel Name="RightSide">
+                            <Border
+                                Margin="0,0,0,10"
+                                BorderThickness="0"
+                                Classes="t2"
+                                IsVisible="{Binding !NewsDisplay}">
                                 <Panel>
-                                    <Border MaxHeight="115" CornerRadius="5">
-                                        <Border.Background>
-                                            <ImageBrush Source="{Binding NewsImage}" Stretch="UniformToFill" />
-                                        </Border.Background>
-                                    </Border>
-                                    <Border Background="#77000000" CornerRadius="5" />
+                                    <Panel>
+                                        <Border MaxHeight="115" CornerRadius="5">
+                                            <Border.Background>
+                                                <ImageBrush Source="{Binding NewsImage}" Stretch="UniformToFill" />
+                                            </Border.Background>
+                                        </Border>
+                                        <Border Background="#77000000" CornerRadius="5" />
+                                    </Panel>
+                                    <StackPanel Margin="15">
+                                        <Panel Margin="0,0,0,5">
+                                            <TextBlock
+                                                Margin="0,0,0,5"
+                                                FontSize="16"
+                                                Foreground="White"
+                                                Text="{setting:Localize MainWindow.Text20}" />
+                                            <Button
+                                                Width="30"
+                                                Height="30"
+                                                HorizontalAlignment="Right"
+                                                Background="Transparent"
+                                                BorderThickness="0"
+                                                Command="{Binding LoadNews}"
+                                                CornerRadius="5">
+                                                <svg:SvgControl Fill="White" Path="/Resource/Icon/reload.svg" />
+                                            </Button>
+                                        </Panel>
+                                        <Panel Height="50">
+                                            <Button
+                                                HorizontalAlignment="Stretch"
+                                                VerticalAlignment="Stretch"
+                                                HorizontalContentAlignment="Stretch"
+                                                VerticalContentAlignment="Stretch"
+                                                Background="Transparent"
+                                                BorderThickness="0"
+                                                Command="{Binding OpenNews}"
+                                                IsVisible="{Binding IsHaveNews, FallbackValue=true}">
+                                                <Button.Styles>
+                                                    <Style Selector="Button:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+                                                        <Setter Property="Background" Value="Transparent" />
+                                                    </Style>
+                                                </Button.Styles>
+                                                <DockPanel>
+                                                    <svg:SvgControl
+                                                        Width="35"
+                                                        Height="35"
+                                                        VerticalAlignment="Center"
+                                                        DockPanel.Dock="Right"
+                                                        Fill="White"
+                                                        Path="/Resource/Icon/menu.svg" />
+                                                    <TextBlock
+                                                        Margin="5,0,0,0"
+                                                        Foreground="White"
+                                                        Text="{Binding DisplayNews, FallbackValue=123}"
+                                                        TextTrimming="CharacterEllipsis"
+                                                        TextWrapping="Wrap" />
+                                                </DockPanel>
+                                            </Button>
+                                            <TextBlock
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                Foreground="White"
+                                                IsVisible="{Binding !IsHaveNews}"
+                                                Text="{setting:Localize MainWindow.Text21}" />
+                                            <Border IsVisible="{Binding IsLoadNews}">
+                                                <TextBlock
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"
+                                                    Foreground="White"
+                                                    Text="{setting:Localize MainWindow.Text22}" />
+                                            </Border>
+                                        </Panel>
+                                    </StackPanel>
                                 </Panel>
-                                <StackPanel Margin="15">
+                            </Border>
+                            <Border
+                                Width="200"
+                                Margin="0,0,0,10"
+                                Padding="15"
+                                HorizontalAlignment="Stretch"
+                                Classes="t2"
+                                IsVisible="{Binding MusicDisplay}">
+                                <StackPanel>
                                     <Panel Margin="0,0,0,5">
-                                        <TextBlock
-                                            Margin="0,0,0,5"
-                                            FontSize="16"
-                                            Foreground="White"
-                                            Text="{setting:Localize MainWindow.Text20}" />
+                                        <TextBlock FontSize="16" Text="{setting:Localize MainWindow.Text14}" />
                                         <Button
                                             Width="30"
                                             Height="30"
                                             HorizontalAlignment="Right"
                                             Background="Transparent"
                                             BorderThickness="0"
-                                            Command="{Binding LoadNews}"
-                                            CornerRadius="5">
-                                            <svg:SvgControl Fill="White" Path="/Resource/Icon/reload.svg" />
+                                            Command="{Binding MusicPause}"
+                                            CornerRadius="5"
+                                            ToolTip.Tip="{setting:Localize ToolTip.Text48}"
+                                            ToolTip.VerticalOffset="-30">
+                                            <svg:SvgControl Path="/Resource/Icon/play.svg" />
                                         </Button>
                                     </Panel>
-                                    <Panel Height="50">
-                                        <Button
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Stretch"
-                                            HorizontalContentAlignment="Stretch"
-                                            VerticalContentAlignment="Stretch"
-                                            Background="Transparent"
-                                            BorderThickness="0"
-                                            Command="{Binding OpenNews}"
-                                            IsVisible="{Binding IsHaveNews, FallbackValue=true}">
-                                            <Button.Styles>
-                                                <Style Selector="Button:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-                                                    <Setter Property="Background" Value="Transparent" />
-                                                </Style>
-                                            </Button.Styles>
-                                            <DockPanel>
-                                                <svg:SvgControl
-                                                    Width="35"
-                                                    Height="35"
-                                                    VerticalAlignment="Center"
-                                                    DockPanel.Dock="Right"
-                                                    Fill="White"
-                                                    Path="/Resource/Icon/menu.svg" />
-                                                <TextBlock
-                                                    Margin="5,0,0,0"
-                                                    Foreground="White"
-                                                    Text="{Binding DisplayNews, FallbackValue=123}"
-                                                    TextTrimming="CharacterEllipsis"
-                                                    TextWrapping="Wrap" />
-                                            </DockPanel>
-                                        </Button>
+                                    <Panel>
+                                        <TextBlock Text="{setting:Localize SettingWindow.Tab6.Text18}" />
                                         <TextBlock
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                            Foreground="White"
-                                            IsVisible="{Binding !IsHaveNews}"
-                                            Text="{setting:Localize MainWindow.Text21}" />
-                                        <Border IsVisible="{Binding IsLoadNews}">
-                                            <TextBlock
-                                                HorizontalAlignment="Center"
-                                                VerticalAlignment="Center"
-                                                Foreground="White"
-                                                Text="{setting:Localize MainWindow.Text22}" />
-                                        </Border>
+                                            Width="40"
+                                            Margin="0,0,5,0"
+                                            HorizontalAlignment="Right"
+                                            Text="{Binding MusicVolume, StringFormat='{}{0}%', FallbackValue=100%}" />
                                     </Panel>
+                                    <Slider
+                                        Height="40"
+                                        Margin="0,-10,0,-10"
+                                        HorizontalAlignment="Stretch"
+                                        Foreground="{setting:Theme MainColor}"
+                                        IsSnapToTickEnabled="True"
+                                        LargeChange="1"
+                                        Maximum="100"
+                                        Minimum="0"
+                                        SmallChange="1"
+                                        TickFrequency="1"
+                                        Value="{Binding MusicVolume}" />
                                 </StackPanel>
-                            </Panel>
-                        </Border>
-                        <Border
-                            Width="200"
-                            Margin="0,0,0,10"
-                            Padding="15"
-                            HorizontalAlignment="Stretch"
-                            Classes="t2"
-                            IsVisible="{Binding MusicDisplay}">
-                            <StackPanel>
-                                <Panel Margin="0,0,0,5">
-                                    <TextBlock FontSize="16" Text="{setting:Localize MainWindow.Text14}" />
-                                    <Button
-                                        Width="30"
-                                        Height="30"
-                                        HorizontalAlignment="Right"
-                                        Background="Transparent"
-                                        BorderThickness="0"
-                                        Command="{Binding MusicPause}"
-                                        CornerRadius="5"
-                                        ToolTip.Tip="{setting:Localize ToolTip.Text48}"
-                                        ToolTip.VerticalOffset="-30">
-                                        <svg:SvgControl Path="/Resource/Icon/play.svg" />
-                                    </Button>
-                                </Panel>
-                                <Panel>
-                                    <TextBlock Text="{setting:Localize SettingWindow.Tab6.Text18}" />
+                            </Border>
+                            <Border
+                                Width="200"
+                                Margin="0,0,0,10"
+                                Padding="15"
+                                HorizontalAlignment="Stretch"
+                                Classes="t2"
+                                IsVisible="{Binding HaveUpdate}">
+                                <StackPanel>
                                     <TextBlock
-                                        Width="40"
-                                        Margin="0,0,5,0"
-                                        HorizontalAlignment="Right"
-                                        Text="{Binding MusicVolume, StringFormat='{}{0}%', FallbackValue=100%}" />
-                                </Panel>
-                                <Slider
-                                    Height="40"
-                                    Margin="0,-10,0,-10"
-                                    HorizontalAlignment="Stretch"
-                                    Foreground="{setting:Theme MainColor}"
-                                    IsSnapToTickEnabled="True"
-                                    LargeChange="1"
-                                    Maximum="100"
-                                    Minimum="0"
-                                    SmallChange="1"
-                                    TickFrequency="1"
-                                    Value="{Binding MusicVolume}" />
-                            </StackPanel>
-                        </Border>
-                        <Border
-                            Width="200"
-                            Margin="0,0,0,10"
-                            Padding="15"
-                            HorizontalAlignment="Stretch"
-                            Classes="t2"
-                            IsVisible="{Binding HaveUpdate}">
-                            <StackPanel>
-                                <TextBlock
-                                    Margin="0,0,0,5"
-                                    FontSize="16"
-                                    Text="{setting:Localize MainWindow.Text15}" />
-                                <UniformGrid Columns="2">
-                                    <Button
-                                        Height="35"
-                                        Margin="0,0,5,0"
-                                        HorizontalAlignment="Stretch"
-                                        Command="{Binding Upgrade}"
-                                        Content="{setting:Localize MainWindow.Text16}"
-                                        ToolTip.Tip="{setting:Localize ToolTip.Text73}"
-                                        ToolTip.VerticalOffset="-30" />
+                                        Margin="0,0,0,5"
+                                        FontSize="16"
+                                        Text="{setting:Localize MainWindow.Text15}" />
+                                    <UniformGrid Columns="2">
+                                        <Button
+                                            Height="35"
+                                            Margin="-3,-3,0,-3"
+                                            HorizontalAlignment="Stretch"
+                                            Classes="top"
+                                            Command="{Binding Upgrade}"
+                                            Content="{setting:Localize MainWindow.Text16}"
+                                            ToolTip.Tip="{setting:Localize ToolTip.Text73}"
+                                            ToolTip.VerticalOffset="-30" />
+                                        <Button
+                                            Height="35"
+                                            Margin="0,-3,0,-3"
+                                            HorizontalAlignment="Stretch"
+                                            Classes="top"
+                                            Command="{Binding NewInfo}"
+                                            Content="{setting:Localize MainWindow.Text17}"
+                                            ToolTip.Tip="{setting:Localize ToolTip.Text74}"
+                                            ToolTip.VerticalOffset="-30" />
+                                    </UniformGrid>
+                                </StackPanel>
+                            </Border>
+                            <Border
+                                Margin="0,0,0,10"
+                                Classes="t2"
+                                IsVisible="{Binding IsOnlineMode}">
+                                <StackPanel Margin="15">
+                                    <TextBlock
+                                        Margin="0,0,0,5"
+                                        FontSize="16"
+                                        Text="{setting:Localize MainWindow.Text18}" />
                                     <Button
                                         Height="35"
-                                        Margin="5,0,0,0"
+                                        Margin="-3"
                                         HorizontalAlignment="Stretch"
-                                        Command="{Binding NewInfo}"
-                                        Content="{setting:Localize MainWindow.Text17}"
-                                        ToolTip.Tip="{setting:Localize ToolTip.Text74}"
+                                        Classes="top"
+                                        Command="{Binding OpenNetFrp}"
+                                        Content="{setting:Localize MainWindow.Text19}"
+                                        ToolTip.Tip="{setting:Localize ToolTip.Text72}"
                                         ToolTip.VerticalOffset="-30" />
-                                </UniformGrid>
-                            </StackPanel>
-                        </Border>
-                        <Border
-                            Margin="0,0,0,10"
-                            Classes="t2"
-                            IsVisible="{Binding IsOnlineMode}">
-                            <StackPanel Margin="15">
-                                <TextBlock
-                                    Margin="0,0,0,5"
-                                    FontSize="16"
-                                    Text="{setting:Localize MainWindow.Text18}" />
-                                <Button
-                                    Height="35"
-                                    HorizontalAlignment="Stretch"
-                                    Command="{Binding OpenNetFrp}"
-                                    Content="{setting:Localize MainWindow.Text19}"
-                                    ToolTip.Tip="{setting:Localize ToolTip.Text72}"
-                                    ToolTip.VerticalOffset="-30" />
-                            </StackPanel>
-                        </Border>
-                    </StackPanel>
-                </ScrollViewer>
-
-                <views:ServerMotdControl
-                    Margin="20,10,10,0"
-                    DockPanel.Dock="Top"
-                    IPPort="{Binding Server}"
-                    IsVisible="{Binding MotdDisplay, FallbackValue=true}" />
-                <Decorator Name="Content1" Margin="20,10,10,20" />
-            </DockPanel>
+                                </StackPanel>
+                            </Border>
+                        </StackPanel>
+                    </Decorator>
+                    <StackPanel
+                        Name="ContentTop"
+                        Margin="10,10,10,0"
+                        DockPanel.Dock="Top"
+                        IsVisible="{Binding !NewsDisplay}" />
+                    <views:ServerMotdControl
+                        Margin="10,0,10,0"
+                        DockPanel.Dock="Top"
+                        IPPort="{Binding Server}"
+                        IsVisible="{Binding MotdDisplay}" />
+                    <Decorator Name="Content1" Margin="10,0,10,10" />
+                </DockPanel>
+            </ScrollViewer>
             <Decorator Name="Start" IsVisible="False" />
             <Panel
                 Name="Grid2"
diff --git a/src/ColorMC.Gui/UI/Controls/Main/MainControl.axaml.cs b/src/ColorMC.Gui/UI/Controls/Main/MainControl.axaml.cs
index 63d1f1e6d..0c6b0a4f9 100644
--- a/src/ColorMC.Gui/UI/Controls/Main/MainControl.axaml.cs
+++ b/src/ColorMC.Gui/UI/Controls/Main/MainControl.axaml.cs
@@ -69,19 +69,6 @@ private void MainControl_SizeChanged(object? sender, SizeChangedEventArgs e)
         {
             model.Live2dWidth = (int)(Bounds.Width * ((float)config.Width / 100));
             model.Live2dHeight = (int)(Bounds.Height * ((float)config.Height / 100));
-
-            if (Bounds.Width > 500 && model.TopSide2 != false)
-            {
-                model.TopSide2 = false;
-                model.TopSide = true;
-                model.TopSide1 = true;
-            }
-            else if (Bounds.Width <= 500 && model.TopSide2 != true)
-            {
-                model.TopSide2 = true;
-                model.TopSide = false;
-                model.TopSide1 = true;
-            }
         }
     }
 
@@ -139,7 +126,7 @@ private void Drop(object? sender, DragEventArgs e)
             }
             if (str.StartsWith("authlib-injector:yggdrasil-server:"))
             {
-                WindowManager.ShowUser(false, str);
+                WindowManager.ShowUser(false, url:str);
             }
             else if (str.StartsWith("cloudkey:") || str.StartsWith("cloudKey:"))
             {
@@ -332,6 +319,43 @@ private void Amodel_PropertyChanged(object? sender, PropertyChangedEventArgs e)
         {
             SwitchView();
         }
+        else if (e.PropertyName == TopModel.MinModeName)
+        {
+            if (DataContext is MainModel model)
+            {
+                if (model.MinMode)
+                {
+                    //HeadTop.Children.Remove(Buttons);
+                    //ContentTop.Children.Add(Buttons);
+                    TopRight.IsVisible = false;
+
+                    TopRight.Child = null;
+                    ContentTop.Children.Add(HeadButton);
+                    HeadButton.Margin = new(0, 0, 0, 10);
+
+                    Right.Child = null;
+                    ContentTop.Children.Add(RightSide);
+                    model.SideDisplay = false;
+                }
+                else
+                {
+                    //ContentTop.Children.Remove(Buttons);
+                    //HeadTop.Children.Add(Buttons);
+                    TopRight.IsVisible = true;
+
+                    ContentTop.Children.Remove(HeadButton);
+                    TopRight.Child = HeadButton;
+                    HeadButton.Margin = new(0);
+
+                    ContentTop.Children.Remove(RightSide);
+                    Right.Child = RightSide;
+                    if (!model.NewsDisplay)
+                    {
+                        model.SideDisplay = true;
+                    }
+                }
+            }
+        }
     }
 
     public override Bitmap GetIcon()
diff --git a/src/ColorMC.Gui/UI/Controls/Main/MainEmptyControl.axaml b/src/ColorMC.Gui/UI/Controls/Main/MainEmptyControl.axaml
index ffa7c5759..392f8c265 100644
--- a/src/ColorMC.Gui/UI/Controls/Main/MainEmptyControl.axaml
+++ b/src/ColorMC.Gui/UI/Controls/Main/MainEmptyControl.axaml
@@ -12,14 +12,12 @@
     x:DataType="model:MainModel"
     mc:Ignorable="d">
     <Panel Margin="20">
-        <StackPanel
-            HorizontalAlignment="Center"
-            VerticalAlignment="Top"
-            RenderOptions.TextRenderingMode="Antialias">
+        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Top">
             <TextBlock
                 Margin="0,5,0,5"
                 HorizontalAlignment="Center"
                 FontSize="20"
+                RenderOptions.TextRenderingMode="Antialias"
                 Text="{setting:Localize MainWindow.Text7}" />
         </StackPanel>
 
diff --git a/src/ColorMC.Gui/UI/Controls/Main/MainGamesControl.axaml b/src/ColorMC.Gui/UI/Controls/Main/MainGamesControl.axaml
index 149c0106d..0858801f7 100644
--- a/src/ColorMC.Gui/UI/Controls/Main/MainGamesControl.axaml
+++ b/src/ColorMC.Gui/UI/Controls/Main/MainGamesControl.axaml
@@ -12,7 +12,7 @@
     x:DataType="model:MainModel"
     mc:Ignorable="d">
     <Panel>
-        <ScrollViewer Name="ScrollViewer1" VerticalAlignment="Top">
+        <Decorator Name="ScrollViewer1" VerticalAlignment="Top">
             <ItemsControl ItemsSource="{Binding GameGroups}">
                 <ItemsControl.ItemTemplate>
                     <DataTemplate>
@@ -20,15 +20,13 @@
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
             </ItemsControl>
-        </ScrollViewer>
+        </Decorator>
         <Border
             Margin="10"
             Padding="10"
             HorizontalAlignment="Right"
             VerticalAlignment="Top"
-            Background="{setting:Theme ItemBG}"
-            BoxShadow="0 1 3 0 #1A000000, 0 1 2 -1 #1A000000"
-            CornerRadius="5"
+            Classes="t2"
             IsVisible="{Binding GameSearch}">
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="{setting:Localize MainWindow.Text13}" />
diff --git a/src/ColorMC.Gui/UI/Controls/Main/MainGamesControl.axaml.cs b/src/ColorMC.Gui/UI/Controls/Main/MainGamesControl.axaml.cs
index d16df152b..0b8661b85 100644
--- a/src/ColorMC.Gui/UI/Controls/Main/MainGamesControl.axaml.cs
+++ b/src/ColorMC.Gui/UI/Controls/Main/MainGamesControl.axaml.cs
@@ -32,7 +32,6 @@ private void ScrollViewer1_PointerPressed(object? sender, PointerPressedEventArg
                 model.SearchClose();
                 model.Select(null);
             }
-
         }
     }
 }
diff --git a/src/ColorMC.Gui/UI/Controls/Main/MainStartControl.axaml b/src/ColorMC.Gui/UI/Controls/Main/MainStartControl.axaml
index 02a2b7817..6f36e7d71 100644
--- a/src/ColorMC.Gui/UI/Controls/Main/MainStartControl.axaml
+++ b/src/ColorMC.Gui/UI/Controls/Main/MainStartControl.axaml
@@ -19,7 +19,10 @@
             Margin="0,0,10,0"
             HorizontalAlignment="Center"
             Source="resm:ColorMC.Gui.Resource.Pic.game.png" />
-        <StackPanel Name="Grid1" ClipToBounds="True">
+        <StackPanel
+            Name="Grid1"
+            ClipToBounds="True"
+            RenderOptions.TextRenderingMode="Antialias">
             <TextBlock
                 HorizontalAlignment="Center"
                 FontSize="40"
diff --git a/src/ColorMC.Gui/UI/Controls/Main/MainStartControl.axaml.cs b/src/ColorMC.Gui/UI/Controls/Main/MainStartControl.axaml.cs
index 54585061a..731f3997f 100644
--- a/src/ColorMC.Gui/UI/Controls/Main/MainStartControl.axaml.cs
+++ b/src/ColorMC.Gui/UI/Controls/Main/MainStartControl.axaml.cs
@@ -16,9 +16,6 @@ public partial class MainStartControl : UserControl
     public MainStartControl()
     {
         InitializeComponent();
-
-        Background = App.NowTheme == PlatformThemeVariant.Light
-            ? Brushes.White : Brushes.Black;
     }
 
     public async void Start(Control panel)
diff --git a/src/ColorMC.Gui/UI/Controls/Main/MainUserControl.axaml b/src/ColorMC.Gui/UI/Controls/Main/MainUserControl.axaml
new file mode 100644
index 000000000..d20022c64
--- /dev/null
+++ b/src/ColorMC.Gui/UI/Controls/Main/MainUserControl.axaml
@@ -0,0 +1,103 @@
+<UserControl
+    x:Class="ColorMC.Gui.UI.Controls.Main.MainUserControl"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:model="clr-namespace:ColorMC.Gui.UI.Model.Main"
+    xmlns:setting="clr-namespace:ColorMC.Gui.Utils"
+    xmlns:svg="clr-namespace:ColorMC.Gui.UI.Views.Svg"
+    x:DataType="model:MainModel"
+    mc:Ignorable="d">
+    <Border BorderThickness="0" Classes="t2">
+        <Border.Background>
+            <ImageBrush Source="resm:ColorMC.Gui.Resource.Pic.pic1.png" Stretch="UniformToFill" />
+        </Border.Background>
+        <Border BorderThickness="0" Classes="t2">
+            <Border.Background>
+                <LinearGradientBrush StartPoint="0%,50%" EndPoint="80%,50%">
+                    <GradientStop Offset="0.0" Color="Black" />
+                    <GradientStop Offset="1.0" Color="#00000000" />
+                </LinearGradientBrush>
+            </Border.Background>
+            <Border.Styles>
+                <Style Selector="Button#User">
+                    <Setter Property="Background" />
+                    <Style Selector="^:pressed">
+                        <Setter Property="RenderTransform" Value="scale(1)" />
+                    </Style>
+                    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+                        <Setter Property="Background" Value="Transparent" />
+                    </Style>
+                </Style>
+                <Style Selector="Button#Skin">
+                    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+                        <Setter Property="Background" Value="Transparent" />
+                    </Style>
+                    <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+                        <Setter Property="Background" Value="Transparent" />
+                    </Style>
+                </Style>
+            </Border.Styles>
+            <Button
+                Name="User"
+                Height="60"
+                HorizontalAlignment="Stretch"
+                HorizontalContentAlignment="Stretch"
+                BorderThickness="0"
+                Command="{Binding ShowUser}">
+                <DockPanel Margin="5,0,0,0">
+                    <Panel HorizontalAlignment="Left">
+                        <Border
+                            Width="50"
+                            Height="50"
+                            VerticalAlignment="Center">
+                            <Border.Background>
+                                <ImageBrush Source="{Binding Head}" Stretch="UniformToFill" />
+                            </Border.Background>
+                        </Border>
+                        <ProgressBar
+                            Width="38"
+                            Height="10"
+                            MinWidth="38"
+                            CornerRadius="20"
+                            IsIndeterminate="{Binding IsHeadLoad}"
+                            IsVisible="{Binding IsHeadLoad}" />
+                    </Panel>
+                    <Button
+                        Name="Skin"
+                        Width="35"
+                        Height="35"
+                        Margin="0,0,5,0"
+                        HorizontalAlignment="Right"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        Command="{Binding ShowSkin}"
+                        CornerRadius="5"
+                        DockPanel.Dock="Right"
+                        ToolTip.Tip="{setting:Localize ToolTip.Text9}"
+                        ToolTip.VerticalOffset="-30">
+                        <svg:SvgControl Path="/Resource/Icon/skin.svg" Stroke="White" />
+                    </Button>
+                    <StackPanel
+                        Margin="5,0,0,0"
+                        VerticalAlignment="Center"
+                        DockPanel.Dock="Left"
+                        RenderOptions.TextRenderingMode="Antialias">
+                        <TextBlock
+                            FontSize="17"
+                            Foreground="White"
+                            Text="{Binding UserId, FallbackValue=User Name}"
+                            TextTrimming="CharacterEllipsis"
+                            TextWrapping="NoWrap" />
+                        <TextBlock
+                            HorizontalAlignment="Left"
+                            FontSize="12"
+                            Foreground="White"
+                            Text="{Binding UserType, FallbackValue=456}" />
+                    </StackPanel>
+                </DockPanel>
+            </Button>
+        </Border>
+    </Border>
+</UserControl>
diff --git a/src/ColorMC.Gui/UI/Controls/Main/MainUserControl.axaml.cs b/src/ColorMC.Gui/UI/Controls/Main/MainUserControl.axaml.cs
new file mode 100644
index 000000000..efb2a6e4e
--- /dev/null
+++ b/src/ColorMC.Gui/UI/Controls/Main/MainUserControl.axaml.cs
@@ -0,0 +1,11 @@
+using Avalonia.Controls;
+
+namespace ColorMC.Gui.UI.Controls.Main;
+
+public partial class MainUserControl : UserControl
+{
+    public MainUserControl()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/src/ColorMC.Gui/UI/Controls/Main/MinecraftNewsControl.axaml b/src/ColorMC.Gui/UI/Controls/Main/MinecraftNewsControl.axaml
index 64a94181e..273cafa05 100644
--- a/src/ColorMC.Gui/UI/Controls/Main/MinecraftNewsControl.axaml
+++ b/src/ColorMC.Gui/UI/Controls/Main/MinecraftNewsControl.axaml
@@ -11,18 +11,16 @@
     d:DesignWidth="800"
     x:DataType="model:MainModel"
     mc:Ignorable="d">
-    <ScrollViewer HorizontalScrollBarVisibility="Disabled">
-        <ItemsControl ItemsSource="{Binding News}">
-            <ItemsControl.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <WrapPanel />
-                </ItemsPanelTemplate>
-            </ItemsControl.ItemsPanel>
-            <ItemsControl.ItemTemplate>
-                <DataTemplate>
-                    <view:NewsItemControl Margin="0,0,10,10" />
-                </DataTemplate>
-            </ItemsControl.ItemTemplate>
-        </ItemsControl>
-    </ScrollViewer>
+    <ItemsControl ItemsSource="{Binding News}">
+        <ItemsControl.ItemsPanel>
+            <ItemsPanelTemplate>
+                <WrapPanel HorizontalAlignment="Center" />
+            </ItemsPanelTemplate>
+        </ItemsControl.ItemsPanel>
+        <ItemsControl.ItemTemplate>
+            <DataTemplate>
+                <view:NewsItemControl Margin="0,0,10,10" HorizontalAlignment="Center" />
+            </DataTemplate>
+        </ItemsControl.ItemTemplate>
+    </ItemsControl>
 </UserControl>
diff --git a/src/ColorMC.Gui/UI/Controls/Main/MinecraftNewsControl.axaml.cs b/src/ColorMC.Gui/UI/Controls/Main/MinecraftNewsControl.axaml.cs
index b83fd57aa..7c8f9d74f 100644
--- a/src/ColorMC.Gui/UI/Controls/Main/MinecraftNewsControl.axaml.cs
+++ b/src/ColorMC.Gui/UI/Controls/Main/MinecraftNewsControl.axaml.cs
@@ -1,12 +1,11 @@
 using Avalonia.Controls;
 
-namespace ColorMC.Gui.UI.Controls.Main
+namespace ColorMC.Gui.UI.Controls.Main;
+
+public partial class MinecraftNewsControl : UserControl
 {
-    public partial class MinecraftNewsControl : UserControl
+    public MinecraftNewsControl()
     {
-        public MinecraftNewsControl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
 }
diff --git a/src/ColorMC.Gui/UI/Controls/ServerMotdControl.axaml b/src/ColorMC.Gui/UI/Controls/ServerMotdControl.axaml
index ce9b1b7be..5751d8e7f 100644
--- a/src/ColorMC.Gui/UI/Controls/ServerMotdControl.axaml
+++ b/src/ColorMC.Gui/UI/Controls/ServerMotdControl.axaml
@@ -21,9 +21,9 @@
                 <DockPanel Margin="5,0,0,0">
                     <Button
                         Name="Button2"
-                        Width="42"
-                        Height="42"
-                        Margin="-2"
+                        Width="38"
+                        Height="38"
+                        Margin="-3"
                         VerticalAlignment="Top"
                         Classes="top"
                         DockPanel.Dock="Right"
diff --git a/src/ColorMC.Gui/UI/Controls/ServerPack/Tab2Control.axaml b/src/ColorMC.Gui/UI/Controls/ServerPack/Tab2Control.axaml
index d7f9ac0c7..f16824350 100644
--- a/src/ColorMC.Gui/UI/Controls/ServerPack/Tab2Control.axaml
+++ b/src/ColorMC.Gui/UI/Controls/ServerPack/Tab2Control.axaml
@@ -14,7 +14,7 @@
         <Border Margin="10,5,10,3" Classes="t2">
             <DataGrid
                 Name="DataGrid1"
-                Margin="15"
+                Margin="5"
                 AutoGenerateColumns="False"
                 CanUserResizeColumns="True"
                 CanUserSortColumns="False"
diff --git a/src/ColorMC.Gui/UI/Controls/ServerPack/Tab3Control.axaml b/src/ColorMC.Gui/UI/Controls/ServerPack/Tab3Control.axaml
index fb7022990..8bc448127 100644
--- a/src/ColorMC.Gui/UI/Controls/ServerPack/Tab3Control.axaml
+++ b/src/ColorMC.Gui/UI/Controls/ServerPack/Tab3Control.axaml
@@ -14,7 +14,7 @@
         <Border Margin="10,5,10,3" Classes="t2">
             <DataGrid
                 Name="DataGrid1"
-                Margin="15"
+                Margin="5"
                 AutoGenerateColumns="False"
                 CanUserResizeColumns="True"
                 CanUserSortColumns="False"
diff --git a/src/ColorMC.Gui/UI/Controls/ServerPack/Tab4Control.axaml b/src/ColorMC.Gui/UI/Controls/ServerPack/Tab4Control.axaml
index 967074946..1aef01dac 100644
--- a/src/ColorMC.Gui/UI/Controls/ServerPack/Tab4Control.axaml
+++ b/src/ColorMC.Gui/UI/Controls/ServerPack/Tab4Control.axaml
@@ -10,70 +10,67 @@
     d:DesignWidth="800"
     x:DataType="model:ServerPackModel"
     mc:Ignorable="d">
-    <DockPanel Margin="0,0,10,15">
-        <Border
-            Margin="10,5,10,3"
-            Classes="t2"
-            DockPanel.Dock="Top">
-            <StackPanel Margin="15">
-                <DockPanel>
-                    <TextBlock
-                        Margin="0,0,5,0"
-                        DockPanel.Dock="Left"
-                        Text="{setting:Localize ServerPackWindow.Tab4.Text1}" />
-                    <Button
-                        Width="80"
-                        Height="35"
-                        Margin="-2,-2,-3,-2"
-                        Classes="top"
-                        Command="{Binding AddFile}"
-                        Content="{setting:Localize Button.Add}"
-                        DockPanel.Dock="Right"
-                        ToolTip.Tip="{setting:Localize ToolTip.Text119}"
-                        ToolTip.VerticalOffset="-30" />
-                    <ComboBox
-                        Width="140"
-                        Margin="0,0,10,0"
-                        HorizontalAlignment="Stretch"
-                        DockPanel.Dock="Right"
-                        ItemsSource="{Binding FuntionList}"
-                        SelectedIndex="{Binding Funtion}" />
-                    <TextBlock
-                        Margin="0,0,5,0"
-                        DockPanel.Dock="Right"
-                        Text="{setting:Localize ServerPackWindow.Tab4.Text2}" />
-                    <ComboBox
-                        Margin="0,0,10,0"
-                        HorizontalAlignment="Stretch"
-                        ItemsSource="{Binding NameList}"
-                        SelectedItem="{Binding Group}" />
-                </DockPanel>
-                <TextBlock
-                    Margin="0,5,0,0"
-                    DockPanel.Dock="Bottom"
-                    Text="{setting:Localize ServerPackWindow.Tab4.Text3}" />
-            </StackPanel>
-        </Border>
+    <Decorator Margin="0,0,10,15">
         <Border Margin="10,5,10,3" Classes="t2">
-            <DataGrid
-                Name="DataGrid1"
-                Margin="15"
-                AutoGenerateColumns="False"
-                CanUserResizeColumns="True"
-                CanUserSortColumns="False"
-                ItemsSource="{Binding FileList}"
-                SelectedItem="{Binding FileItem}">
-                <DataGrid.Columns>
-                    <DataGridTextColumn
-                        Binding="{Binding Group}"
-                        Header="{setting:Localize Text.Name}"
-                        IsReadOnly="True" />
-                    <DataGridTextColumn
-                        Binding="{Binding Type}"
-                        Header="{setting:Localize ServerPackWindow.Tab4.DataGrid.Text2}"
-                        IsReadOnly="True" />
-                </DataGrid.Columns>
-            </DataGrid>
+            <DockPanel>
+                <StackPanel Margin="15,15,15,0" DockPanel.Dock="Top">
+                    <DockPanel>
+                        <TextBlock
+                            Margin="0,0,5,0"
+                            DockPanel.Dock="Left"
+                            Text="{setting:Localize ServerPackWindow.Tab4.Text1}" />
+                        <Button
+                            Width="80"
+                            Height="35"
+                            Margin="-2,-2,-3,-3"
+                            Classes="top"
+                            Command="{Binding AddFile}"
+                            Content="{setting:Localize Button.Add}"
+                            DockPanel.Dock="Right"
+                            ToolTip.Tip="{setting:Localize ToolTip.Text119}"
+                            ToolTip.VerticalOffset="-30" />
+                        <ComboBox
+                            Width="140"
+                            Margin="0,0,10,0"
+                            HorizontalAlignment="Stretch"
+                            DockPanel.Dock="Right"
+                            ItemsSource="{Binding FuntionList}"
+                            SelectedIndex="{Binding Funtion}" />
+                        <TextBlock
+                            Margin="0,0,5,0"
+                            DockPanel.Dock="Right"
+                            Text="{setting:Localize ServerPackWindow.Tab4.Text2}" />
+                        <ComboBox
+                            Margin="0,0,10,0"
+                            HorizontalAlignment="Stretch"
+                            ItemsSource="{Binding NameList}"
+                            SelectedItem="{Binding Group}" />
+                    </DockPanel>
+                    <TextBlock
+                        Margin="0,5,0,0"
+                        DockPanel.Dock="Bottom"
+                        Text="{setting:Localize ServerPackWindow.Tab4.Text3}" />
+                </StackPanel>
+                <DataGrid
+                    Name="DataGrid1"
+                    Margin="5"
+                    AutoGenerateColumns="False"
+                    CanUserResizeColumns="True"
+                    CanUserSortColumns="False"
+                    ItemsSource="{Binding FileList}"
+                    SelectedItem="{Binding FileItem}">
+                    <DataGrid.Columns>
+                        <DataGridTextColumn
+                            Binding="{Binding Group}"
+                            Header="{setting:Localize Text.Name}"
+                            IsReadOnly="True" />
+                        <DataGridTextColumn
+                            Binding="{Binding Type}"
+                            Header="{setting:Localize ServerPackWindow.Tab4.DataGrid.Text2}"
+                            IsReadOnly="True" />
+                    </DataGrid.Columns>
+                </DataGrid>
+            </DockPanel>
         </Border>
-    </DockPanel>
+    </Decorator>
 </UserControl>
diff --git a/src/ColorMC.Gui/UI/Controls/Setting/Tab5Control.axaml b/src/ColorMC.Gui/UI/Controls/Setting/Tab5Control.axaml
index ce5bad081..c66bd2497 100644
--- a/src/ColorMC.Gui/UI/Controls/Setting/Tab5Control.axaml
+++ b/src/ColorMC.Gui/UI/Controls/Setting/Tab5Control.axaml
@@ -12,90 +12,87 @@
     d:DesignWidth="800"
     x:DataType="model:SettingModel"
     mc:Ignorable="d">
-    <DockPanel Margin="0,0,10,15">
-        <Border
-            Margin="10,5,10,3"
-            Classes="t2"
-            DockPanel.Dock="Top"
-            IsEnabled="{Binding !JavaFinding}">
-            <StackPanel Margin="15">
-                <StackPanel Margin="0,0,0,5" Orientation="Horizontal">
-                    <svg:SvgControl
-                        Width="24"
-                        Height="24"
-                        Margin="0,0,5,0"
-                        Fill="{setting:Theme FontColor}"
-                        Path="/Resource/Icon/Setting/svg16.svg"
-                        Stroke="{setting:Theme FontColor}" />
-                    <TextBlock FontSize="{setting:Style FontTitle}" Text="{setting:Localize SettingWindow.Tab5.Text1}" />
-                </StackPanel>
-                <DockPanel Margin="0,5,0,5" IsVisible="{Binding !Phone}">
-                    <TextBox
-                        Width="130"
-                        Margin="0,0,10,0"
-                        Text="{Binding JavaName}"
-                        Watermark="{setting:Localize SettingWindow.Tab5.Text2}" />
-                    <TextBox Text="{Binding JavaLocal}" Watermark="{setting:Localize SettingWindow.Tab5.Text3}" />
-                </DockPanel>
+    <Decorator Margin="0,0,10,15">
+        <Border Margin="10,5,10,3" Classes="t2">
+            <DockPanel>
                 <StackPanel
-                    HorizontalAlignment="Right"
-                    IsVisible="{Binding !Phone}"
-                    Orientation="Horizontal">
-                    <Button
-                        Width="90"
-                        Height="35"
-                        Margin="-2,-2,3,-2"
-                        Classes="top"
-                        Command="{Binding AddJava}"
-                        Content="{setting:Localize Button.Add}"
-                        DockPanel.Dock="Right" />
-                    <Button
-                        Width="90"
-                        Height="35"
-                        Margin="-2,-2,-3,-2"
-                        Classes="top"
-                        Command="{Binding SelectJava}"
-                        Content="{setting:Localize Button.Select}"
-                        DockPanel.Dock="Right" />
+                    Margin="15,15,15,0"
+                    DockPanel.Dock="Top"
+                    IsEnabled="{Binding !JavaFinding}">
+                    <StackPanel Margin="0,0,0,5" Orientation="Horizontal">
+                        <svg:SvgControl
+                            Width="24"
+                            Height="24"
+                            Margin="0,0,5,0"
+                            Path="/Resource/Icon/Setting/svg16.svg" />
+                        <TextBlock FontSize="{setting:Style FontTitle}" Text="{setting:Localize SettingWindow.Tab5.Text1}" />
+                    </StackPanel>
+                    <DockPanel Margin="0,5,0,5" IsVisible="{Binding !Phone}">
+                        <TextBox
+                            Width="130"
+                            Margin="0,0,10,0"
+                            Text="{Binding JavaName}"
+                            Watermark="{setting:Localize SettingWindow.Tab5.Text2}" />
+                        <TextBox Text="{Binding JavaLocal}" Watermark="{setting:Localize SettingWindow.Tab5.Text3}" />
+                    </DockPanel>
+                    <StackPanel
+                        HorizontalAlignment="Right"
+                        IsVisible="{Binding !Phone}"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="90"
+                            Height="35"
+                            Margin="-2,-2,3,-2"
+                            Classes="top"
+                            Command="{Binding AddJava}"
+                            Content="{setting:Localize Button.Add}"
+                            DockPanel.Dock="Right" />
+                        <Button
+                            Width="90"
+                            Height="35"
+                            Margin="-2,-2,-3,-2"
+                            Classes="top"
+                            Command="{Binding SelectJava}"
+                            Content="{setting:Localize Button.Select}"
+                            DockPanel.Dock="Right" />
+                    </StackPanel>
                 </StackPanel>
-            </StackPanel>
-        </Border>
-        <Border Margin="10,5,10,3" Classes="t2">
-            <DataGrid
-                Name="DataGrid1"
-                Margin="15"
-                AutoGenerateColumns="False"
-                CanUserResizeColumns="True"
-                CanUserSortColumns="False"
-                ItemsSource="{Binding JavaList}"
-                SelectedItem="{Binding JavaItem}">
-                <DataGrid.Columns>
-                    <DataGridTextColumn
-                        Binding="{Binding Name}"
-                        Header="{setting:Localize Text.Name}"
-                        IsReadOnly="True" />
-                    <DataGridTextColumn
-                        Binding="{Binding MajorVersion}"
-                        Header="{setting:Localize SettingWindow.Tab5.DataGrid.Text3}"
-                        IsReadOnly="True" />
-                    <DataGridTextColumn
-                        Binding="{Binding Version}"
-                        Header="{setting:Localize Text.Version}"
-                        IsReadOnly="True" />
-                    <DataGridTextColumn
-                        Binding="{Binding Type}"
-                        Header="{setting:Localize SettingWindow.Tab5.DataGrid.Text5}"
-                        IsReadOnly="True" />
-                    <DataGridTextColumn
-                        Binding="{Binding Arch}"
-                        Header="{setting:Localize SettingWindow.Tab5.DataGrid.Text6}"
-                        IsReadOnly="True" />
-                    <DataGridTextColumn
-                        Binding="{Binding Path}"
-                        Header="{setting:Localize Text.Path}"
-                        IsReadOnly="True" />
-                </DataGrid.Columns>
-            </DataGrid>
+                <DataGrid
+                    Name="DataGrid1"
+                    Margin="5"
+                    AutoGenerateColumns="False"
+                    CanUserResizeColumns="True"
+                    CanUserSortColumns="False"
+                    ItemsSource="{Binding JavaList}"
+                    SelectedItem="{Binding JavaItem}">
+                    <DataGrid.Columns>
+                        <DataGridTextColumn
+                            Binding="{Binding Name}"
+                            Header="{setting:Localize Text.Name}"
+                            IsReadOnly="True" />
+                        <DataGridTextColumn
+                            Binding="{Binding MajorVersion}"
+                            Header="{setting:Localize SettingWindow.Tab5.DataGrid.Text3}"
+                            IsReadOnly="True" />
+                        <DataGridTextColumn
+                            Binding="{Binding Version}"
+                            Header="{setting:Localize Text.Version}"
+                            IsReadOnly="True" />
+                        <DataGridTextColumn
+                            Binding="{Binding Type}"
+                            Header="{setting:Localize SettingWindow.Tab5.DataGrid.Text5}"
+                            IsReadOnly="True" />
+                        <DataGridTextColumn
+                            Binding="{Binding Arch}"
+                            Header="{setting:Localize SettingWindow.Tab5.DataGrid.Text6}"
+                            IsReadOnly="True" />
+                        <DataGridTextColumn
+                            Binding="{Binding Path}"
+                            Header="{setting:Localize Text.Path}"
+                            IsReadOnly="True" />
+                    </DataGrid.Columns>
+                </DataGrid>
+            </DockPanel>
         </Border>
-    </DockPanel>
+    </Decorator>
 </UserControl>
diff --git a/src/ColorMC.Gui/UI/Controls/Setting/Tab6Control.axaml b/src/ColorMC.Gui/UI/Controls/Setting/Tab6Control.axaml
index c4c867f36..742aa6e09 100644
--- a/src/ColorMC.Gui/UI/Controls/Setting/Tab6Control.axaml
+++ b/src/ColorMC.Gui/UI/Controls/Setting/Tab6Control.axaml
@@ -12,7 +12,10 @@
     d:DesignWidth="800"
     x:DataType="model:SettingModel"
     mc:Ignorable="d">
-    <dialog:DialogHost DisableOpeningAnimation="True" Identifier="AddLockLogin">
+    <dialog:DialogHost
+        DisableOpeningAnimation="True"
+        Identifier="AddLockLogin"
+        OverlayBackground="Transparent">
         <dialog:DialogHost.DataTemplates>
             <DataTemplate DataType="model:AddLockLoginModel">
                 <view:AddLockLoginControl />
@@ -90,7 +93,7 @@
                                 ItemsSource="{Binding GameList}"
                                 SelectedIndex="{Binding Game}" />
                         </StackPanel>
-                        <DockPanel Margin="0,0,0,10">
+                        <DockPanel Margin="0,0,0,0">
                             <Button
                                 Width="90"
                                 Height="30"
@@ -108,6 +111,7 @@
                         <DataGrid
                             Name="LockLoginList"
                             Height="150"
+                            Margin="-10,-5,-10,-10"
                             CanUserResizeColumns="True"
                             IsEnabled="{Binding EnableOneLogin}"
                             ItemsSource="{Binding Locks}"
diff --git a/src/ColorMC.Gui/UI/Controls/Setting/Tab8Control.axaml b/src/ColorMC.Gui/UI/Controls/Setting/Tab8Control.axaml
index 9932371b1..6fcbe440a 100644
--- a/src/ColorMC.Gui/UI/Controls/Setting/Tab8Control.axaml
+++ b/src/ColorMC.Gui/UI/Controls/Setting/Tab8Control.axaml
@@ -124,9 +124,7 @@
                             Width="24"
                             Height="24"
                             Margin="0,0,5,0"
-                            Fill="{setting:Theme FontColor}"
-                            Path="/Resource/Icon/Setting/svg23.svg"
-                            Stroke="{setting:Theme FontColor}" />
+                            Path="/Resource/Icon/Setting/svg23.svg" />
                         <TextBlock
                             Margin="0,0,10,0"
                             FontSize="{setting:Style FontTitle}"
@@ -147,7 +145,7 @@
                     <DataGrid
                         Name="DataGrid1"
                         Height="300"
-                        Margin="0,0,0,5"
+                        Margin="-10,-10,-10,5"
                         AutoGenerateColumns="False"
                         CanUserResizeColumns="True"
                         CanUserSortColumns="False"
@@ -225,7 +223,7 @@
                     <DataGrid
                         Name="DataGrid2"
                         Height="300"
-                        Margin="0,0,0,5"
+                        Margin="-10,-10,-10,5"
                         AutoGenerateColumns="False"
                         CanUserResizeColumns="True"
                         CanUserSortColumns="False"
diff --git a/src/ColorMC.Gui/UI/Controls/User/UsersControl.axaml b/src/ColorMC.Gui/UI/Controls/User/UsersControl.axaml
index 5ed727b86..23d459a20 100644
--- a/src/ColorMC.Gui/UI/Controls/User/UsersControl.axaml
+++ b/src/ColorMC.Gui/UI/Controls/User/UsersControl.axaml
@@ -15,7 +15,7 @@
     DragDrop.AllowDrop="True"
     mc:Ignorable="d">
     <Panel>
-        <dialog:DialogHost DisableOpeningAnimation="True" Identifier="UsersControl">
+        <dialog:DialogHost OverlayBackground="Transparent" DisableOpeningAnimation="True" Identifier="UsersControl">
             <dialog:DialogHost.DataTemplates>
                 <DataTemplate DataType="model:UsersControlModel">
                     <view:AddUserControl />
diff --git a/src/ColorMC.Gui/UI/Controls/User/UsersControl.axaml.cs b/src/ColorMC.Gui/UI/Controls/User/UsersControl.axaml.cs
index 702f0aa34..63e5b8a1a 100644
--- a/src/ColorMC.Gui/UI/Controls/User/UsersControl.axaml.cs
+++ b/src/ColorMC.Gui/UI/Controls/User/UsersControl.axaml.cs
@@ -1,3 +1,4 @@
+using System;
 using Avalonia.Input;
 using Avalonia.Media.Imaging;
 using ColorMC.Gui.Manager;
@@ -79,4 +80,9 @@ public override Bitmap GetIcon()
     {
         return ImageManager.GameIcon;
     }
+
+    public void Relogin()
+    {
+        (DataContext as UsersControlModel)!.ReLogin();
+    }
 }
diff --git a/src/ColorMC.Gui/UI/Model/GameEdit/GameEditTab10Model.cs b/src/ColorMC.Gui/UI/Model/GameEdit/GameEditTab10Model.cs
index 23c609486..158ec82d4 100644
--- a/src/ColorMC.Gui/UI/Model/GameEdit/GameEditTab10Model.cs
+++ b/src/ColorMC.Gui/UI/Model/GameEdit/GameEditTab10Model.cs
@@ -20,7 +20,10 @@ public partial class GameEditModel
 
     partial void OnServerItemChanged(ServerInfoObj? value)
     {
-        IPPort = (value?.IP, 0);
+        if (value != null)
+        {
+            IPPort = (value?.IP, 0);
+        }
     }
 
     private async void AddServer()
diff --git a/src/ColorMC.Gui/UI/Model/Main/GameListModel.cs b/src/ColorMC.Gui/UI/Model/Main/GameListModel.cs
index cd5a7f4f6..b6d77468a 100644
--- a/src/ColorMC.Gui/UI/Model/Main/GameListModel.cs
+++ b/src/ColorMC.Gui/UI/Model/Main/GameListModel.cs
@@ -2,6 +2,8 @@
 using System.Collections.ObjectModel;
 using System.Threading.Tasks;
 using AvaloniaEdit.Utils;
+using ColorMC.Core.Objs;
+using ColorMC.Gui.Manager;
 using ColorMC.Gui.UI.Model.Items;
 using ColorMC.Gui.UIBinding;
 using ColorMC.Gui.Utils;
@@ -308,7 +310,18 @@ public async void Launch(GameItemModel obj)
         }
         if (res.Item1 == false)
         {
-            Model.Show(res.Item2!);
+            if (res.Item3 == LaunchState.LoginFail)
+            {
+                var res1 = await Model.ShowWait(string.Format(App.Lang("MainWindow.Error8"), res.Item2!));
+                if (res1)
+                {
+                    WindowManager.ShowUser(relogin: true);
+                }
+            }
+            else
+            {
+                Model.Show(res.Item2!);
+            }
         }
         else
         {
diff --git a/src/ColorMC.Gui/UI/Model/Main/MainModel.cs b/src/ColorMC.Gui/UI/Model/Main/MainModel.cs
index 1871c07c7..e3db7eeba 100644
--- a/src/ColorMC.Gui/UI/Model/Main/MainModel.cs
+++ b/src/ColorMC.Gui/UI/Model/Main/MainModel.cs
@@ -23,12 +23,6 @@ public partial class MainModel : TopModel, IMainTop
 
     public bool IsPhone { get; } = SystemInfo.Os == OsType.Android;
 
-    private static readonly string[] _side =
-    [
-        "/Resource/Icon/left.svg",
-        "/Resource/Icon/menu.svg"
-    ];
-
     private readonly Semaphore _semaphore = new(0, 2);
     private readonly Dictionary<string, GameItemModel> Launchs = [];
 
@@ -58,15 +52,6 @@ public partial class MainModel : TopModel, IMainTop
     [ObservableProperty]
     private bool _haveUpdate;
 
-    [ObservableProperty]
-    private bool _topSide = true;
-    [ObservableProperty]
-    private bool _topSide1 = true;
-    [ObservableProperty]
-    private bool _topSide2 = false;
-    [ObservableProperty]
-    private string _sidePath = _side[0];
-
     [ObservableProperty]
     private string _helloText;
 
@@ -86,33 +71,6 @@ public MainModel(BaseModel model) : base(model)
         ShowHello();
     }
 
-    partial void OnTopSideChanged(bool value)
-    {
-        if (value)
-        {
-            SidePath = _side[1];
-        }
-        else
-        {
-            SidePath = _side[0];
-        }
-    }
-
-    [RelayCommand]
-    public void OpenSide()
-    {
-        if (TopSide)
-        {
-            TopSide1 = true;
-            TopSide = false;
-        }
-        else
-        {
-            TopSide1 = false;
-            TopSide = true;
-        }
-    }
-
     [RelayCommand]
     public async Task NewInfo()
     {
@@ -220,6 +178,7 @@ public void OpenNews()
     {
         NewsDisplay = true;
         SideDisplay = false;
+        MotdDisplay = false;
         HelloText = App.Lang("MainWindow.Text20");
         Model.PushBack(NewBack);
         OnPropertyChanged(SwitchView);
@@ -233,7 +192,11 @@ private void ShowHello()
     private void NewBack()
     {
         NewsDisplay = false;
-        SideDisplay = true;
+        if (!MinMode)
+        {
+            SideDisplay = true;
+        }
+        LoadMotd();
         ShowHello();
         Model.PopBack();
         OnPropertyChanged(SwitchView);
diff --git a/src/ColorMC.Gui/UI/Model/Setting/SettingTab6Model.cs b/src/ColorMC.Gui/UI/Model/Setting/SettingTab6Model.cs
index 98709039e..913552086 100644
--- a/src/ColorMC.Gui/UI/Model/Setting/SettingTab6Model.cs
+++ b/src/ColorMC.Gui/UI/Model/Setting/SettingTab6Model.cs
@@ -305,6 +305,7 @@ public void LoadServer()
 
             EnableOneLogin = config.LockLogin;
 
+            Locks.Clear();
             foreach (var item in config.LockLogins)
             {
                 Locks.Add(new(this, item));
diff --git a/src/ColorMC.Gui/UI/Model/TopModel.cs b/src/ColorMC.Gui/UI/Model/TopModel.cs
index d06251830..8aa922acb 100644
--- a/src/ColorMC.Gui/UI/Model/TopModel.cs
+++ b/src/ColorMC.Gui/UI/Model/TopModel.cs
@@ -4,6 +4,8 @@ namespace ColorMC.Gui.UI.Model;
 
 public abstract partial class TopModel(BaseModel model) : ObservableObject
 {
+    public const string MinModeName = nameof(MinMode);
+
     public BaseModel Model => model;
 
     [ObservableProperty]
@@ -11,7 +13,7 @@ public abstract partial class TopModel(BaseModel model) : ObservableObject
 
     public virtual void WidthChange(int index, double width)
     {
-        if (width < 450)
+        if (width < 470)
         {
             MinMode = true;
         }
diff --git a/src/ColorMC.Gui/UI/Model/User/UsersModel.cs b/src/ColorMC.Gui/UI/Model/User/UsersModel.cs
index 07822abc6..730279dc2 100644
--- a/src/ColorMC.Gui/UI/Model/User/UsersModel.cs
+++ b/src/ColorMC.Gui/UI/Model/User/UsersModel.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Linq;
 using System.Threading.Tasks;
 using System.Web;
 using Avalonia.Input;
@@ -695,6 +696,22 @@ public override void Close()
         }
     }
 
+    public void ReLogin()
+    {
+        var user = UserBinding.GetLastUser();
+        if (user == null)
+        {
+            return;
+        }
+        var obj = UserList.Where(item => item.AuthType == user.AuthType && item.UUID == user.UUID)
+            .FirstOrDefault();
+        if (obj == null)
+        {
+            return;
+        }
+        ReLogin(obj);
+    }
+
     public async void Edit(UserDisplayModel obj)
     {
         if (obj.AuthType != AuthType.Offline)
diff --git a/src/ColorMC.Gui/UI/Windows/AllControl.axaml b/src/ColorMC.Gui/UI/Windows/AllControl.axaml
index 86cb95173..605d5d66f 100644
--- a/src/ColorMC.Gui/UI/Windows/AllControl.axaml
+++ b/src/ColorMC.Gui/UI/Windows/AllControl.axaml
@@ -32,7 +32,7 @@
                 Name="Head"
                 DockPanel.Dock="Top"
                 IsVisible="{Binding EnableHead}" />
-            <dialog:DialogHost DisableOpeningAnimation="True" Identifier="{Binding Name}">
+            <dialog:DialogHost OverlayBackground="Transparent" DisableOpeningAnimation="True" Identifier="{Binding Name}">
                 <dialog:DialogHost.DataTemplates>
                     <DataTemplate DataType="dialogmodel:Info1Model">
                         <dialogview:Info1Control DataContext="{Binding}" />
diff --git a/src/ColorMC.Gui/UI/Windows/SelfBaseWindow.axaml b/src/ColorMC.Gui/UI/Windows/SelfBaseWindow.axaml
index b89900f37..cb18b02b1 100644
--- a/src/ColorMC.Gui/UI/Windows/SelfBaseWindow.axaml
+++ b/src/ColorMC.Gui/UI/Windows/SelfBaseWindow.axaml
@@ -43,7 +43,10 @@
                 Name="Head"
                 DockPanel.Dock="Top"
                 IsVisible="{Binding EnableHead}" />
-            <dialog:DialogHost DisableOpeningAnimation="True" Identifier="{Binding Name}">
+            <dialog:DialogHost
+                DisableOpeningAnimation="True"
+                Identifier="{Binding Name}"
+                OverlayBackground="Transparent">
                 <dialog:DialogHost.DataTemplates>
                     <DataTemplate DataType="dialogmodel:Info1Model">
                         <dialogview:Info1Control DataContext="{Binding}" />
diff --git a/src/ColorMC.Gui/UIBinding/BaseBinding.cs b/src/ColorMC.Gui/UIBinding/BaseBinding.cs
index f8bb5e5b8..8c7e0520a 100644
--- a/src/ColorMC.Gui/UIBinding/BaseBinding.cs
+++ b/src/ColorMC.Gui/UIBinding/BaseBinding.cs
@@ -296,7 +296,7 @@ public static void StopGame(GameSettingObj obj)
     /// <param name="obj">游戏实例</param>
     /// <param name="obj1">保存的账户</param>
     /// <returns>结果</returns>
-    public static async Task<(bool, string?)> Launch(BaseModel model, GameSettingObj obj,
+    public static async Task<(bool, string?, LaunchState)> Launch(BaseModel model, GameSettingObj obj,
         LoginObj obj1, WorldObj? world = null, bool hide = false)
     {
         if (SystemInfo.Os == OsType.Android)
@@ -308,7 +308,7 @@ public static void StopGame(GameSettingObj obj)
 
         if (RunGames.Contains(obj.UUID))
         {
-            return (false, App.Lang("Gui.Error42"));
+            return (false, App.Lang("Gui.Error42"), LaunchState.End);
         }
         //设置自动加入服务器
         if (GuiConfigUtils.Config.ServerCustom.JoinServer &&
@@ -443,7 +443,7 @@ await Launch(obj, (a) =>
 
         if (s_launchCancel.IsCancellationRequested)
         {
-            return (true, null);
+            return (true, null, LaunchState.End);
         }
 
         if (res.Item1 is { } pr)
@@ -473,7 +473,7 @@ await Launch(obj, (a) =>
             UserBinding.UnLockUser(obj1);
         }
 
-        return (res.Item1 != null, res.Item2);
+        return (res.Item1 != null, res.Item2, res.Item3);
     }
 
     /// <summary>
@@ -618,13 +618,14 @@ private static void GameHandel(BaseModel model, GameSettingObj obj, DesktopGameH
     /// <param name="world">需要运行的世界</param>
     /// <param name="cancel">取消启动</param>
     /// <returns>进程信息</returns>
-    private static async Task<(IGameHandel?, string?)> Launch(GameSettingObj obj,
+    private static async Task<(IGameHandel?, string?, LaunchState)> Launch(GameSettingObj obj,
         ColorMCCore.Request request, ColorMCCore.LaunchP pre,
         ColorMCCore.UpdateState state, ColorMCCore.ChoiseCall select,
         ColorMCCore.NoJava nojava, ColorMCCore.LoginFailRun loginfail,
         ColorMCCore.GameLaunch update2, LoginObj obj1, WorldObj? world,
         int? mixinport, CancellationToken cancel)
     {
+        var state1 = LaunchState.End;
         string? temp;
         try
         {
@@ -643,16 +644,17 @@ private static void GameHandel(BaseModel model, GameSettingObj obj, DesktopGameH
                 Mixinport = mixinport
             }, cancel);
 
-            return (p, null);
+            return (p, null, LaunchState.End);
         }
         catch (LaunchException e1)
         {
+            state1 = e1.State;
             temp = App.Lang("Gui.Error6");
             if (!string.IsNullOrWhiteSpace(e1.Message))
             {
                 temp = e1.Message;
             }
-            if (e1.Ex != null)
+            else if (e1.Ex != null)
             {
                 Logs.Error(temp, e1.Ex);
                 WindowManager.ShowError(temp, e1.Ex);
@@ -664,7 +666,7 @@ private static void GameHandel(BaseModel model, GameSettingObj obj, DesktopGameH
             Logs.Error(temp, e);
             WindowManager.ShowError(temp, e);
         }
-        return (null, temp);
+        return (null, temp, state1);
     }
 
 
diff --git a/src/ColorMC.Gui/UIBinding/GameBinding.cs b/src/ColorMC.Gui/UIBinding/GameBinding.cs
index b8979a320..37cd97910 100644
--- a/src/ColorMC.Gui/UIBinding/GameBinding.cs
+++ b/src/ColorMC.Gui/UIBinding/GameBinding.cs
@@ -357,23 +357,23 @@ public static async Task SetGameIconFromFile(BaseModel model, GameSettingObj obj
     /// <param name="world"></param>
     /// <param name="hide"></param>
     /// <returns></returns>
-    public static async Task<(bool, string?)> Launch(BaseModel model, GameSettingObj? obj,
+    public static async Task<(bool, string?, LaunchState)> Launch(BaseModel model, GameSettingObj? obj,
         WorldObj? world = null, bool hide = false)
     {
         if (obj == null)
         {
-            return (false, App.Lang("Gui.Error39"));
+            return (false, App.Lang("Gui.Error39"), LaunchState.End);
         }
 
         if (BaseBinding.IsGameRun(obj))
         {
-            return (false, App.Lang("Gui.Error42"));
+            return (false, App.Lang("Gui.Error42"), LaunchState.End);
         }
 
         var user = await GetUser(model);
         if (user.Item1 == null)
         {
-            return (false, user.Item2);
+            return (false, user.Item2, LaunchState.End);
         }
 
         var res1 = await BaseBinding.Launch(model, obj, user.Item1, world, hide);