diff --git a/resource/config.json b/resource/config.json
index 29b02796fc..eb8eb3f198 100644
--- a/resource/config.json
+++ b/resource/config.json
@@ -268,30 +268,6 @@
             "pushMinitouch": "[Adb] -s [AdbSerial] push \"[minitouchLocalPath]\" \"/data/local/tmp/[minitouchWorkingFile]\"",
             "chmodMinitouch": "[Adb] -s [AdbSerial] shell chmod 700 \"/data/local/tmp/[minitouchWorkingFile]\"",
             "callMinitouch": "[Adb] -s [AdbSerial] shell \"/data/local/tmp/[minitouchWorkingFile]\" -i"
-        },
-        "MaaTouch": {
-            "devices": "[Adb] devices",
-            "addressRegex": "(.+)\tdevice",
-            "connect": "[Adb] connect [AdbSerial]",
-            "uuid": "[Adb] -s [AdbSerial] shell settings get secure android_id",
-            "click": "[Adb] -s [AdbSerial] shell input tap [x] [y]",
-            "swipe": "[Adb] -s [AdbSerial] shell input swipe [x1] [y1] [x2] [y2] [duration]",
-            "pressEsc": "[Adb] -s [AdbSerial] shell input keyevent 111",
-            "display": "[Adb] -s [AdbSerial] shell dumpsys window displays | grep -o -E cur=+[^\\ ]+ | grep -o -E [0-9]+",
-            "displayFormat": "%d%d",
-            "screencapRawByNC": "[Adb] -s [AdbSerial] exec-out \"screencap | nc -w 3 [NcAddress] [NcPort]\"",
-            "ncAddress": "[Adb] -s [AdbSerial] shell \" cat /proc/net/arp | grep : \"",
-            "ncPort": 6723,
-            "screencapRawWithGzip": "[Adb] -s [AdbSerial] exec-out \"screencap | gzip -1\"",
-            "screencapEncode": "[Adb] -s [AdbSerial] exec-out screencap -p",
-            "release": "[Adb] kill-server",
-            "start": "[Adb] -s [AdbSerial] shell am start -n [Intent]",
-            "stop": "[Adb] -s [AdbSerial] shell \"am force-stop `dumpsys activity activities 2>/dev/null | grep Activities= 2>/dev/null | grep -m 1 -i -o -E [^\\ ]*arknights[^/]*`\"",
-            "abilist": "[Adb] -s [AdbSerial] shell echo maatouch",
-            "orientation": "[Adb] -s [AdbSerial] shell echo 0",
-            "pushMinitouch": "[Adb] -s [AdbSerial] push \"[minitouchLocalPath]\" \"/data/local/tmp/[minitouchWorkingFile]\"",
-            "chmodMinitouch": "[Adb] -s [AdbSerial] shell chmod 700 \"/data/local/tmp/[minitouchWorkingFile]\"",
-            "callMinitouch": "[Adb] -s [AdbSerial] shell \"export CLASSPATH=/data/local/tmp/[minitouchWorkingFile]; app_process /data/local/tmp com.shxyke.MaaTouch.App\""
         }
     }
 }
diff --git a/src/MaaCore/Assistant.cpp b/src/MaaCore/Assistant.cpp
index 54d8d42895..b3343385a3 100644
--- a/src/MaaCore/Assistant.cpp
+++ b/src/MaaCore/Assistant.cpp
@@ -81,13 +81,17 @@ bool asst::Assistant::set_instance_option(InstanceOptionKey key, const std::stri
 {
     Log.info(__FUNCTION__, "| key", static_cast<int>(key), "value", value);
     switch (key) {
-    case InstanceOptionKey::MinitouchEnabled:
-        if (constexpr std::string_view Disable = "0"; value == Disable) {
+    case InstanceOptionKey::TouchMode:
+        if (constexpr std::string_view Adb = "adb"; value == Adb) {
             m_ctrler->set_minitouch_enabled(false);
             return true;
         }
-        else if (constexpr std::string_view Enable = "1"; value == Enable) {
-            m_ctrler->set_minitouch_enabled(true);
+        else if (constexpr std::string_view Minitouch = "minitouch"; value == Minitouch) {
+            m_ctrler->set_minitouch_enabled(true, false);
+            return true;
+        }
+        else if (constexpr std::string_view MaaTouch = "maatouch"; value == MaaTouch) {
+            m_ctrler->set_minitouch_enabled(true, true);
             return true;
         }
         else {
diff --git a/src/MaaCore/Common/AsstTypes.h b/src/MaaCore/Common/AsstTypes.h
index 58236f5731..7fb192c019 100644
--- a/src/MaaCore/Common/AsstTypes.h
+++ b/src/MaaCore/Common/AsstTypes.h
@@ -38,7 +38,8 @@ namespace asst
     enum class InstanceOptionKey
     {
         Invalid = 0,
-        MinitouchEnabled = 1,
+        /* Deprecated */ // MinitouchEnabled = 1,
+        TouchMode = 2,
     };
 
     struct Point
diff --git a/src/MaaCore/Controller.cpp b/src/MaaCore/Controller.cpp
index cdec680c69..fcbaa57911 100644
--- a/src/MaaCore/Controller.cpp
+++ b/src/MaaCore/Controller.cpp
@@ -1520,10 +1520,11 @@ bool asst::Controller::connect(const std::string& adb_path, const std::string& a
         return false;
     }
 
-    do {
+    while (m_minitouch_enabled) {
         m_minitouch_avaiable = false;
 
-        std::string abilist = call_command(cmd_replace(adb_cfg.abilist)).value_or("maatouch");
+        std::string abilist =
+            m_use_maa_touch ? "maatouch" : call_command(cmd_replace(adb_cfg.abilist)).value_or("maatouch");
         std::string_view optimal_abi;
         for (const auto& abi : Config.get_options().minitouch_programs_order) {
             if (abilist.find(abi) != std::string::npos) {
@@ -1550,7 +1551,8 @@ bool asst::Controller::connect(const std::string& adb_path, const std::string& a
         m_adb.call_minitouch = minitouch_cmd_rep(adb_cfg.call_minitouch);
         if (!call_and_hup_minitouch(m_adb.call_minitouch)) break;
 
-        std::string orientation_str = call_command(cmd_replace(adb_cfg.orientation)).value_or("0");
+        std::string orientation_str =
+            m_use_maa_touch ? "0" : call_command(cmd_replace(adb_cfg.orientation)).value_or("0");
         if (!orientation_str.empty()) {
             char first = orientation_str.front();
             if (first == '0' || first == '1' || first == '2' || first == '3') {
@@ -1559,7 +1561,17 @@ bool asst::Controller::connect(const std::string& adb_path, const std::string& a
         }
 
         m_minitouch_avaiable = true;
-    } while (false);
+        break;
+    };
+
+    if (m_minitouch_enabled && !m_minitouch_avaiable) {
+        json::value info = get_info_json() | json::object {
+            { "what", "TouchModeNotAvaiable" },
+            { "why", "" },
+        };
+        callback(AsstMsg::ConnectionInfo, info);
+        return false;
+    }
 
     // try to find the fastest way
     if (!screencap()) {
@@ -1628,6 +1640,12 @@ bool asst::Controller::inited() const noexcept
     return m_inited;
 }
 
+void asst::Controller::set_minitouch_enabled(bool enable, bool maa_touch) noexcept
+{
+    m_minitouch_enabled = enable;
+    m_use_maa_touch = maa_touch;
+}
+
 const std::string& asst::Controller::get_uuid() const
 {
     return m_uuid;
diff --git a/src/MaaCore/Controller.h b/src/MaaCore/Controller.h
index 6ee8a86ace..07743f772a 100644
--- a/src/MaaCore/Controller.h
+++ b/src/MaaCore/Controller.h
@@ -36,7 +36,7 @@ namespace asst
 
         bool connect(const std::string& adb_path, const std::string& address, const std::string& config);
         bool inited() const noexcept;
-        void set_minitouch_enabled(bool enable) noexcept { m_minitouch_enabled = enable; }
+        void set_minitouch_enabled(bool enable, bool maa_touch = false) noexcept;
 
         const std::string& get_uuid() const;
         cv::Mat get_image(bool raw = false);
@@ -159,7 +159,8 @@ namespace asst
             } screencap_method = ScreencapMethod::UnknownYet;
         } m_adb;
 
-        bool m_minitouch_enabled = true;   // 开关
+        bool m_minitouch_enabled = true; // 开关
+        bool m_use_maa_touch = false;
         bool m_minitouch_avaiable = false; // 状态
 
 #ifdef _WIN32
diff --git a/src/MaaWpfGui/MaaWpfGui.csproj b/src/MaaWpfGui/MaaWpfGui.csproj
index 518393e6ac..face25fa5e 100644
--- a/src/MaaWpfGui/MaaWpfGui.csproj
+++ b/src/MaaWpfGui/MaaWpfGui.csproj
@@ -131,6 +131,9 @@
     <Compile Include="Helper\StageManager.cs" />
     <Compile Include="Helper\ViewStatusStorage.cs" />
     <Compile Include="Helper\FlowDocumentPagePadding.cs" />
+    <Compile Include="Views\UserControl\GameClientUserControl.xaml.cs">
+      <DependentUpon>GameClientUserControl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\UserControl\GUISettingsUserControl.xaml.cs">
       <DependentUpon>GUISettingsUserControl.xaml</DependentUpon>
     </Compile>
@@ -213,6 +216,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\UserControl\GameClientUserControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\UserControl\HotKeyEditorUserControl.xaml" />
     <Page Include="Views\UserControl\HotKeySettingsUserControl.xaml">
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs
index cd998c3e43..9c1566371a 100644
--- a/src/MaaWpfGui/Main/AsstProxy.cs
+++ b/src/MaaWpfGui/Main/AsstProxy.cs
@@ -428,6 +428,10 @@ namespace MaaWpfGui
                 case "ScreencapFailed":
                     mainModel.AddLog(Localization.GetString("ScreencapFailed"), UILogColor.Error);
                     break;
+
+                case "TouchModeNotAvaiable":
+                    mainModel.AddLog(Localization.GetString("TouchModeNotAvaiable"), UILogColor.Error);
+                    break;
             }
         }
 
@@ -1632,7 +1636,8 @@ namespace MaaWpfGui
 
     public enum InstanceOptionKey
     {
-        MinitouchEnabled = 1,
+        /* Deprecated */ // MinitouchEnabled = 1,
+        TouchMode = 2,
     }
 }
 
diff --git a/src/MaaWpfGui/Main/CopilotViewModel.cs b/src/MaaWpfGui/Main/CopilotViewModel.cs
index 30f92053ef..cd475589ca 100644
--- a/src/MaaWpfGui/Main/CopilotViewModel.cs
+++ b/src/MaaWpfGui/Main/CopilotViewModel.cs
@@ -425,7 +425,7 @@ namespace MaaWpfGui
             {
                 AddLog(Localization.GetString("Running"));
                 var settingsModel = _container.Get<SettingsViewModel>();
-                if (!settingsModel.AdbReplaced && !settingsModel.UseAdbTouchMode)
+                if (!settingsModel.AdbReplaced && !settingsModel.IsAdbTouchMode())
                 {
                     AddLog(Localization.GetString("AdbReplacementTips"), UILogColor.Info);
                 }
diff --git a/src/MaaWpfGui/Main/SettingsViewModel.cs b/src/MaaWpfGui/Main/SettingsViewModel.cs
index 4dc85afa67..80b909f866 100644
--- a/src/MaaWpfGui/Main/SettingsViewModel.cs
+++ b/src/MaaWpfGui/Main/SettingsViewModel.cs
@@ -71,6 +71,7 @@ namespace MaaWpfGui
             _maaHotKeyManager = _container.Get<IMaaHotKeyManager>();
             DisplayName = Localization.GetString("Settings");
 
+            _listTitle.Add(Localization.GetString("GameSettings"));
             _listTitle.Add(Localization.GetString("BaseSettings"));
             _listTitle.Add(Localization.GetString("RoguelikeSettings"));
             _listTitle.Add(Localization.GetString("RecruitingSettings"));
@@ -176,10 +177,16 @@ namespace MaaWpfGui
                 new CombData { Display = Localization.GetString("Nox"), Value = "Nox" },
                 new CombData { Display = Localization.GetString("XYAZ"), Value = "XYAZ" },
                 new CombData { Display = Localization.GetString("WSA"), Value = "WSA" },
-                new CombData { Display = Localization.GetString("MaaTouch"), Value = "MaaTouch" },
                 new CombData { Display = Localization.GetString("Compatible"), Value = "Compatible" },
             };
 
+            TouchModeList = new List<CombData>
+            {
+                new CombData { Display = Localization.GetString("MiniTouchMode"), Value = "minitouch" },
+                new CombData { Display = Localization.GetString("MaaTouchMode"), Value = "maatouch" },
+                new CombData { Display = Localization.GetString("AdbTouchMode"), Value = "adb" },
+            };
+
             _dormThresholdLabel = Localization.GetString("DormThreshold") + ": " + _dormThreshold + "%";
 
             RoguelikeModeList = new List<CombData>
@@ -513,6 +520,8 @@ namespace MaaWpfGui
         /// </summary>
         public List<CombData> ConnectConfigList { get; set; }
 
+        public List<CombData> TouchModeList { get; set; }
+
         /// <summary>
         /// Gets or sets the list of inverse clear modes.
         /// </summary>
@@ -1855,15 +1864,20 @@ namespace MaaWpfGui
             }
         }
 
-        private bool _useAdbTouchMode = Convert.ToBoolean(ViewStatusStorage.Get("Connect.UseAdbTouchMode", false.ToString()));
-
-        public bool UseAdbTouchMode
+        public bool IsAdbTouchMode()
         {
-            get => _useAdbTouchMode;
+            return TouchMode == "adb";
+        }
+
+        private string _touchMode = ViewStatusStorage.Get("Connect.TouchMode", "minitouch");
+
+        public string TouchMode
+        {
+            get => _touchMode;
             set
             {
-                SetAndNotify(ref _useAdbTouchMode, value);
-                ViewStatusStorage.Set("Connect.UseAdbTouchMode", value.ToString());
+                SetAndNotify(ref _touchMode, value);
+                ViewStatusStorage.Set("Connect.TouchMode", value);
                 UpdateTouchMode();
             }
         }
@@ -1871,7 +1885,7 @@ namespace MaaWpfGui
         public void UpdateTouchMode()
         {
             var asstProxy = _container.Get<AsstProxy>();
-            asstProxy.AsstSetInstanceOption(InstanceOptionKey.MinitouchEnabled, UseAdbTouchMode ? "0" : "1");
+            asstProxy.AsstSetInstanceOption(InstanceOptionKey.TouchMode, TouchMode);
         }
 
         private static readonly string GoogleAdbDownloadUrl = "https://dl.google.com/android/repository/platform-tools-latest-windows.zip";
diff --git a/src/MaaWpfGui/Main/TaskQueueViewModel.cs b/src/MaaWpfGui/Main/TaskQueueViewModel.cs
index e4f9a60943..8b11091b59 100644
--- a/src/MaaWpfGui/Main/TaskQueueViewModel.cs
+++ b/src/MaaWpfGui/Main/TaskQueueViewModel.cs
@@ -663,7 +663,7 @@ namespace MaaWpfGui
             {
                 AddLog(Localization.GetString("Running"));
                 var settingsModel = _container.Get<SettingsViewModel>();
-                if (!settingsModel.AdbReplaced && !settingsModel.UseAdbTouchMode)
+                if (!settingsModel.AdbReplaced && !settingsModel.IsAdbTouchMode())
                 {
                     AddLog(Localization.GetString("AdbReplacementTips"), UILogColor.Info);
                 }
diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml
index 6f5e5174b5..76acc05f78 100644
--- a/src/MaaWpfGui/Res/Localizations/en-us.xaml
+++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml
@@ -6,6 +6,7 @@
     xmlns:uri="clr-namespace:System;assembly=System.Runtime">
     <!--  Settings  -->
     <system:String x:Key="Settings">Settings</system:String>
+    <system:String x:Key="GameSettings">Client</system:String>
     <system:String x:Key="BaseSettings">Base</system:String>
     <system:String x:Key="RoguelikeSettings">I.S.</system:String>
     <system:String x:Key="RecruitingSettings">Recruit</system:String>
@@ -167,13 +168,16 @@
 
     <system:String x:Key="LaunchOnSystemStartup">Auto start with PC</system:String>
     <system:String x:Key="RunTaskAfterLaunch">Auto Run task after launched</system:String>
-    <system:String x:Key="ClientVersion">Client version</system:String>
+    <system:String x:Key="ClientType">Client Type</system:String>
     <system:String x:Key="OpenEmulatorAfterLaunch">Startup Emulator after launched</system:String>
     <system:String x:Key="WaitForEmulator">Delay time</system:String>
     <system:String x:Key="EmulatorPath">Emulator exec path</system:String>
     <system:String x:Key="Select">Select</system:String>
     <system:String x:Key="ForcedReplaceADB">Forced Replace ADB File</system:String>
-    <system:String x:Key="AdbTouchMode">Compatibility Touch Mode (without minitouch)</system:String>
+    <system:String x:Key="TouchMode">Touch Mode</system:String>
+    <system:String x:Key="MiniTouchMode">Minitouch (Default)</system:String>
+    <system:String x:Key="MaaTouchMode">MaaTouch (Experimental)</system:String>
+    <system:String x:Key="AdbTouchMode">Adb Input (Compatibility)</system:String>
     <system:String x:Key="AdditionCommand">Addiction Command arguments</system:String>
 
     <system:String x:Key="RoguelikeTheme">I.S. Theme</system:String>
@@ -212,7 +216,7 @@
 
     <system:String x:Key="AutoDetectConnection">Auto detect connection</system:String>
     <system:String x:Key="AutoDetectConnectionTip">The checkbox will be automatically unchecked after each detect is completed, and can be checked again if you need to re-detect</system:String>
-    <system:String x:Key="AlwaysAutoDetectConnection">Always detect connection automatically</system:String>
+    <system:String x:Key="AlwaysAutoDetectConnection">Always detect</system:String>
     <system:String x:Key="ADBPath">ADB path (rel/abs)</system:String>
     <system:String x:Key="ConnectionAddress">Connection address</system:String>
     <system:String x:Key="ConnectionAddressTip">It will be filled in automatically when you use it for the first time. If you encounter any problems, you can try to manually modify it</system:String>
@@ -389,6 +393,7 @@
     <system:String x:Key="ReconnectSuccess">Reconnect succeeded. Continue the task</system:String>
     <system:String x:Key="ReconnectFailed">Reconnect failed. The connection is down!</system:String>
     <system:String x:Key="ScreencapFailed">Screencap failed. If it happens repeatedly, try restarting or changing the emulator.</system:String>
+    <system:String x:Key="TouchModeNotAvaiable">Touch mode is not avaiable, please enter Settings - Connection Settings to change other touch modes</system:String>
     <system:String x:Key="IdentifyTheMistakes">Identify error</system:String>
     <system:String x:Key="TaskError" xml:space="preserve">Task error: </system:String>
     <system:String x:Key="CombatError">Combat error</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
index e066192f8c..ca55f89155 100644
--- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
@@ -136,7 +136,7 @@
 
     <system:String x:Key="LaunchOnSystemStartup">スタートアップ</system:String>
     <system:String x:Key="RunTaskAfterLaunch">アプリの起動時に自動的に実行</system:String>
-    <system:String x:Key="ClientVersion">クライアントバージョン</system:String>
+    <system:String x:Key="ClientType">クライアントバージョン</system:String>
     <system:String x:Key="OpenEmulatorAfterLaunch">起動時にエミュレータ自動起動</system:String>
     <system:String x:Key="WaitForEmulator">エミュレータを待つ時間（秒）</system:String>
     <system:String x:Key="EmulatorPath">エミュレータパス</system:String>
@@ -180,7 +180,7 @@
 
     <system:String x:Key="AutoDetectConnection">接続自動認識</system:String>
     <system:String x:Key="AutoDetectConnectionTip">このチェックボックスは、検出が完了するたびに自動的にチェックが外れますが、再検出が必要な場合は再度チェックを入れることができます</system:String>
-    <system:String x:Key="AlwaysAutoDetectConnection">常時自動接続検知</system:String>
+    <system:String x:Key="AlwaysAutoDetectConnection">常時検知</system:String>
     <system:String x:Key="ADBPath">adbパス（相対/絶対）</system:String>
     <system:String x:Key="ConnectionAddress">接続先アドレス</system:String>
     <system:String x:Key="ConnectionAddressTip">問題があれば手動で修正してください。</system:String>
@@ -188,7 +188,6 @@
     <system:String x:Key="RetryOnDisconnected">adb再接続失敗時にエミュレータを自動で再起動</system:String>
     <system:String x:Key="RetryOnDisconnectedTip">再接続に20回失敗した後、エミュレータを再起動してみてください，バックグラウンドのタイムドタスクを使用し、終了時にエミュレータを終了させるタスクを設定する場合は、必ずチェックを入れること</system:String>
     <system:String x:Key="ForcedReplaceADB">ADBの強制置き換え</system:String>
-    <system:String x:Key="AdbTouchMode">互換性 タッチモード（ミニタッチなし）</system:String>
     <!--  設定  -->
 
     <!--  スタート  -->
@@ -280,7 +279,7 @@
     <system:String x:Key="UnselectedTask">タスクが選択されていません</system:String>
     <system:String x:Key="Running">動作中……</system:String>
     <system:String x:Key="Stopping">動作停止中……</system:String>
-    <system:String x:Key="AdbReplacementTips">もし全てでスタックする場合は、設定 - 接続設定 - ADBの強制置き換え、もしくは 互換性 タッチモード をチェックしてください。</system:String> 
+    <system:String x:Key="AdbReplacementTips">もし全てでスタックする場合は、設定 - 接続設定 - ADBの強制置き換え、もしくは 互換性 タッチモード をチェックしてください。</system:String>
     <!--  need help  -->
     <system:String x:Key="Stopped">動作停止</system:String>
     <system:String x:Key="UnknownErrorOccurs">不明なエラーが発生しました</system:String>
@@ -471,4 +470,4 @@
     <system:String x:Key="Hangover">つ、次は飲みすぎないようにしないと……</system:String>
     <system:String x:Key="HelloWorld">Hello World!</system:String>
     <!--  EasterEggs  -->
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
index bd37e5cbe5..eefc9b69bb 100644
--- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
@@ -167,13 +167,12 @@
 
     <system:String x:Key="LaunchOnSystemStartup">시스템 시작 시 실행</system:String>
     <system:String x:Key="RunTaskAfterLaunch">실행 후 작업 시작</system:String>
-    <system:String x:Key="ClientVersion">클라이언트 버전</system:String>
+    <system:String x:Key="ClientType">클라이언트 버전</system:String>
     <system:String x:Key="OpenEmulatorAfterLaunch">실행 후 에뮬레이터를 실행</system:String>
     <system:String x:Key="WaitForEmulator">에뮬레이터 실행 대기 (초)</system:String>
     <system:String x:Key="EmulatorPath">에뮬레이터 경로</system:String>
     <system:String x:Key="Select">선택</system:String>
     <system:String x:Key="ForcedReplaceADB">ADB 강제 교체</system:String>
-    <system:String x:Key="AdbTouchMode">터치 호환 모드 (minitouch 없이)</system:String>
     <system:String x:Key="AdditionCommand">추가 변수</system:String>
 
     <system:String x:Key="RoguelikeTheme">통합전략 테마</system:String>
@@ -212,7 +211,7 @@
 
     <system:String x:Key="AutoDetectConnection">연결 자동 감지</system:String>
     <system:String x:Key="AutoDetectConnectionTip">이 체크박스는 감지가 끝나면 자동으로 체크가 해제됩니다. 다시 감지하려면 다시 체크해주세요.</system:String>
-    <system:String x:Key="AlwaysAutoDetectConnection">항상 연결 자동 감지</system:String>
+    <system:String x:Key="AlwaysAutoDetectConnection">항상 감지</system:String>
     <system:String x:Key="ADBPath">adb 경로 (상대/절대)</system:String>
     <system:String x:Key="ConnectionAddress">연결 주소</system:String>
     <system:String x:Key="ConnectionAddressTip">문제가 있으면 수동으로 수정하십시오</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/pallas.xaml b/src/MaaWpfGui/Res/Localizations/pallas.xaml
index b9c62dc883..0d62f006f4 100644
--- a/src/MaaWpfGui/Res/Localizations/pallas.xaml
+++ b/src/MaaWpfGui/Res/Localizations/pallas.xaml
@@ -134,7 +134,7 @@
 
     <system:String x:Key="LaunchOnSystemStartup">🍺🍸🍻🍸🍻🍷💃</system:String>
     <system:String x:Key="RunTaskAfterLaunch">🍻🍸🍸🍺🍷🍺🍻🍷</system:String>
-    <system:String x:Key="ClientVersion">🍺🍷🍸🍸🍷🍻</system:String>
+    <system:String x:Key="ClientType">🍺🍷🍸🍸🍷🍻</system:String>
     <system:String x:Key="OpenEmulatorAfterLaunch">💃💃🍻🍸🍺🍸🍺🍸🕺🍺🍸</system:String>
     <system:String x:Key="WaitForEmulator">🍻💃🕺🍻🍷🍷🍷🍷🍸🕺🍺🍷🍸</system:String>
     <system:String x:Key="EmulatorPath">🍻🍸🍸🍷🍻🕺</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
index 944d9a64bb..d9f4799927 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
@@ -6,6 +6,7 @@
     xmlns:uri="clr-namespace:System;assembly=System.Runtime">
     <!--  设置  -->
     <system:String x:Key="Settings">设置</system:String>
+    <system:String x:Key="GameSettings">游戏设置</system:String>
     <system:String x:Key="BaseSettings">基建设置</system:String>
     <system:String x:Key="RoguelikeSettings">肉鸽设置</system:String>
     <system:String x:Key="RecruitingSettings">自动公招</system:String>
@@ -167,13 +168,16 @@
 
     <system:String x:Key="LaunchOnSystemStartup">开机自动启动</system:String>
     <system:String x:Key="RunTaskAfterLaunch">启动后直接运行</system:String>
-    <system:String x:Key="ClientVersion">客户端版本</system:String>
+    <system:String x:Key="ClientType">客户端类型</system:String>
     <system:String x:Key="OpenEmulatorAfterLaunch">启动后自动开启模拟器</system:String>
     <system:String x:Key="WaitForEmulator">等待模拟器启动时间（秒）</system:String>
     <system:String x:Key="EmulatorPath">模拟器路径</system:String>
     <system:String x:Key="Select">选择</system:String>
     <system:String x:Key="ForcedReplaceADB">强制替换 ADB</system:String>
-    <system:String x:Key="AdbTouchMode">兼容性的触控模式（不使用 minitouch）</system:String>
+    <system:String x:Key="TouchMode">触控模式</system:String>
+    <system:String x:Key="MiniTouchMode">Minitouch（默认）</system:String>
+    <system:String x:Key="MaaTouchMode">MaaTouch（实验功能）</system:String>
+    <system:String x:Key="AdbTouchMode">Adb Input（兼容模式）</system:String>
     <system:String x:Key="AdditionCommand">附加命令</system:String>
 
     <system:String x:Key="RoguelikeTheme">肉鸽主题</system:String>
@@ -212,7 +216,7 @@
 
     <system:String x:Key="AutoDetectConnection">自动检测连接</system:String>
     <system:String x:Key="AutoDetectConnectionTip">每次检测完成后会自动取消勾选，若需要重新检测可再次勾选，若反复连接失败可勾选始终自动检测连接</system:String>
-    <system:String x:Key="AlwaysAutoDetectConnection">始终自动检测连接</system:String>
+    <system:String x:Key="AlwaysAutoDetectConnection">始终检测</system:String>
     <system:String x:Key="ADBPath">adb 路径 (相对/绝对)</system:String>
     <system:String x:Key="ConnectionAddress">连接地址</system:String>
     <system:String x:Key="ConnectionAddressTip">若遇到问题可尝试手动修改</system:String>
@@ -388,6 +392,7 @@
     <system:String x:Key="TryToReconnect">模拟器断开，正在尝试重连</system:String>
     <system:String x:Key="ReconnectSuccess">重连成功，继续任务</system:String>
     <system:String x:Key="ReconnectFailed">重连失败，连接断开！</system:String>
+    <system:String x:Key="TouchModeNotAvaiable">触控模式不可用。请进入 设置 - 连接设置 切换其他触控模式</system:String>
     <system:String x:Key="ScreencapFailed">截图失败，如反复出现请尝试重启或更换模拟器！</system:String>
     <system:String x:Key="IdentifyTheMistakes">识别错误</system:String>
     <system:String x:Key="TaskError">任务出错：</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
index 99bd0820e4..0f30c640b7 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
@@ -134,7 +134,7 @@
 
     <system:String x:Key="LaunchOnSystemStartup">開機自動啟動</system:String>
     <system:String x:Key="RunTaskAfterLaunch">啟動後直接運行</system:String>
-    <system:String x:Key="ClientVersion">用戶端版本</system:String>
+    <system:String x:Key="ClientType">用戶端類型</system:String>
     <system:String x:Key="OpenEmulatorAfterLaunch">啟動後自動開啟模擬器</system:String>
     <system:String x:Key="WaitForEmulator">等待模擬器啟動時間（秒）</system:String>
     <system:String x:Key="EmulatorPath">模擬器路徑</system:String>
diff --git a/src/MaaWpfGui/Views/DepotView.xaml b/src/MaaWpfGui/Views/DepotView.xaml
index d431889c91..62af4d16b5 100644
--- a/src/MaaWpfGui/Views/DepotView.xaml
+++ b/src/MaaWpfGui/Views/DepotView.xaml
@@ -22,20 +22,20 @@
             <StackPanel>
                 <TextBlock
                     Height="36"
+                    Margin="10"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Top"
                     FontSize="14"
                     Style="{StaticResource TextBlockDefaultBold}"
                     Text="{Binding DepotInfo}"
-                    TextWrapping="Wrap"
-                    Margin="10" />
+                    TextWrapping="Wrap" />
                 <TextBlock
+                    Margin="10"
                     HorizontalAlignment="Left"
                     FontSize="14"
                     Style="{StaticResource TextBlockDefault}"
                     Text="{Binding DepotResult}"
-                    TextWrapping="Wrap"
-                    Margin="10" />
+                    TextWrapping="Wrap" />
             </StackPanel>
         </ScrollViewer>
         <StackPanel
diff --git a/src/MaaWpfGui/Views/ErrorView.xaml b/src/MaaWpfGui/Views/ErrorView.xaml
index 2add6bdcb8..91e9707fd2 100644
--- a/src/MaaWpfGui/Views/ErrorView.xaml
+++ b/src/MaaWpfGui/Views/ErrorView.xaml
@@ -1,34 +1,125 @@
-<Window x:Class="MaaWpfGui.Views.ErrorView"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        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:local="clr-namespace:MaaWpfGui"
-        mc:Ignorable="d"
-        Title="{DynamicResource UnknownErrorOccurs}" Height="475" Width="628" WindowStyle="SingleBorderWindow" ResizeMode="NoResize" Background="#FFE6E6E6" WindowStartupLocation="CenterScreen" Topmost="True">
+<Window
+    x:Class="MaaWpfGui.Views.ErrorView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:MaaWpfGui"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="{DynamicResource UnknownErrorOccurs}"
+    Width="628"
+    Height="475"
+    Background="#FFE6E6E6"
+    ResizeMode="NoResize"
+    Topmost="True"
+    WindowStartupLocation="CenterScreen"
+    WindowStyle="SingleBorderWindow"
+    mc:Ignorable="d">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="0*" />
             <ColumnDefinition />
         </Grid.ColumnDefinitions>
 
-        <TextBlock Grid.ColumnSpan="2" Grid.Column="0" Text="{DynamicResource Error}" HorizontalAlignment="Left" Margin="115,20,0,0" VerticalAlignment="Top" FontWeight="Bold" />
-        <TextBox Grid.ColumnSpan="2" Grid.Column="0" x:Name="Error" HorizontalAlignment="Left" TextWrapping="Wrap" Background="#FFE6E6E6" BorderThickness="0" Padding="0" Text="{DynamicResource UnknownErrorOccurs}" Margin="140,45,0,0" VerticalAlignment="Top" MaxHeight="40" Width="455" />
+        <TextBlock
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Margin="115,20,0,0"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top"
+            FontWeight="Bold"
+            Text="{DynamicResource Error}" />
+        <TextBox
+            x:Name="Error"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Width="455"
+            MaxHeight="40"
+            Margin="140,45,0,0"
+            Padding="0"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top"
+            Background="#FFE6E6E6"
+            BorderThickness="0"
+            Text="{DynamicResource UnknownErrorOccurs}"
+            TextWrapping="Wrap" />
 
-        <TextBlock Grid.ColumnSpan="2" Grid.Column="0" Text="{DynamicResource ErrorSolution}" HorizontalAlignment="Left" Margin="115,95,0,0" VerticalAlignment="Top" FontWeight="Bold" />
-        <TextBox Grid.ColumnSpan="2" Grid.Column="0" x:Name="ErrorSolution" HorizontalAlignment="Left" TextWrapping="Wrap" Background="#FFE6E6E6" BorderThickness="0" Padding="0" Text="{DynamicResource UnknownErrorOccurs}" Margin="140,120,0,0" VerticalAlignment="Top" MaxHeight="150" Width="455" />
+        <TextBlock
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Margin="115,95,0,0"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top"
+            FontWeight="Bold"
+            Text="{DynamicResource ErrorSolution}" />
+        <TextBox
+            x:Name="ErrorSolution"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Width="455"
+            MaxHeight="150"
+            Margin="140,120,0,0"
+            Padding="0"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top"
+            Background="#FFE6E6E6"
+            BorderThickness="0"
+            Text="{DynamicResource UnknownErrorOccurs}"
+            TextWrapping="Wrap" />
 
-        <TextBlock Grid.ColumnSpan="2" Grid.Column="0" Text="{DynamicResource ErrorDetails}" HorizontalAlignment="Left" Margin="115,170,0,0" VerticalAlignment="Top" FontWeight="Bold" />
-        <TextBox Grid.ColumnSpan="2" Grid.Column="0" x:Name="ErrorDetails" HorizontalAlignment="Left" TextWrapping="Wrap" Background="#FFE6E6E6" BorderThickness="0" Padding="0" Text="{DynamicResource UnknownErrorOccurs}" Margin="140,195,0,0" VerticalAlignment="Top" MaxHeight="150" Width="455" />
+        <TextBlock
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Margin="115,170,0,0"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top"
+            FontWeight="Bold"
+            Text="{DynamicResource ErrorDetails}" />
+        <TextBox
+            x:Name="ErrorDetails"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Width="455"
+            MaxHeight="150"
+            Margin="140,195,0,0"
+            Padding="0"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top"
+            Background="#FFE6E6E6"
+            BorderThickness="0"
+            Text="{DynamicResource UnknownErrorOccurs}"
+            TextWrapping="Wrap" />
 
-        <TextBlock Grid.ColumnSpan="2" Grid.Column="0" HorizontalAlignment="Left" Margin="465,375,0,0" VerticalAlignment="Top" Width="129" Height="23">
-            <Hyperlink Name="LinkToCreateGitHubIssue" Click="Hyperlink_OnClick" NavigateUri="{Binding Source={x:Static local:MaaUrls.GitHubIssues}}" FontSize="10.667">
+        <TextBlock
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Width="129"
+            Height="23"
+            Margin="465,375,0,0"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top">
+            <Hyperlink
+                Name="LinkToCreateGitHubIssue"
+                Click="Hyperlink_OnClick"
+                FontSize="10.667"
+                NavigateUri="{Binding Source={x:Static local:MaaUrls.GitHubIssues}}">
                 <Run Text="{DynamicResource ErrorFeedbackLinkText}" />
             </Hyperlink>
         </TextBlock>
 
-        <TextBlock x:Name="ErrorQqGroupLink" Grid.ColumnSpan="2" Grid.Column="0" HorizontalAlignment="Left" Margin="465,400,0,0" VerticalAlignment="Top" FontSize="10.667" Width="71">
-            <Hyperlink Name="LinkToJoinQqGroup" Click="Hyperlink_OnClick" NavigateUri="{Binding Source={x:Static local:MaaUrls.LatestQqGroup}}" FontSize="10.667">
+        <TextBlock
+            x:Name="ErrorQqGroupLink"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Width="71"
+            Margin="465,400,0,0"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top"
+            FontSize="10.667">
+            <Hyperlink
+                Name="LinkToJoinQqGroup"
+                Click="Hyperlink_OnClick"
+                FontSize="10.667"
+                NavigateUri="{Binding Source={x:Static local:MaaUrls.LatestQqGroup}}">
                 <Run Text="{DynamicResource ErrorQqGroupLinkText}" />
             </Hyperlink>
         </TextBlock>
diff --git a/src/MaaWpfGui/Views/RecruitView.xaml b/src/MaaWpfGui/Views/RecruitView.xaml
index 56afdc6d9b..d561d7aa40 100644
--- a/src/MaaWpfGui/Views/RecruitView.xaml
+++ b/src/MaaWpfGui/Views/RecruitView.xaml
@@ -22,20 +22,20 @@
             <StackPanel>
                 <TextBlock
                     Height="36"
+                    Margin="10"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Top"
                     FontSize="14"
                     Style="{StaticResource TextBlockDefaultBold}"
                     Text="{Binding RecruitInfo}"
-                    TextWrapping="Wrap"
-                    Margin="10" />
+                    TextWrapping="Wrap" />
                 <TextBlock
+                    Margin="10"
                     HorizontalAlignment="Left"
                     FontSize="14"
                     Style="{StaticResource TextBlockDefault}"
                     Text="{Binding RecruitResult}"
-                    TextWrapping="Wrap"
-                    Margin="10" />
+                    TextWrapping="Wrap" />
             </StackPanel>
         </ScrollViewer>
         <StackPanel
diff --git a/src/MaaWpfGui/Views/SettingsView.xaml b/src/MaaWpfGui/Views/SettingsView.xaml
index 0167458fe9..274eb49daf 100644
--- a/src/MaaWpfGui/Views/SettingsView.xaml
+++ b/src/MaaWpfGui/Views/SettingsView.xaml
@@ -45,7 +45,7 @@
                     Foreground="Gray"
                     Style="{StaticResource TextBlockDefault}"
                     Text="{Binding ListTitle[0]}" />
-                <local:InfrastSettingsUserControl
+                <local:GameClientUserControl
                     Margin="20"
                     HorizontalAlignment="Center"
                     IsEnabled="{Binding Idle}" />
@@ -60,7 +60,7 @@
                     Foreground="Gray"
                     Style="{StaticResource TextBlockDefault}"
                     Text="{Binding ListTitle[1]}" />
-                <local:RoguelikeSettingsUserControl
+                <local:InfrastSettingsUserControl
                     Margin="20"
                     HorizontalAlignment="Center"
                     IsEnabled="{Binding Idle}" />
@@ -75,7 +75,7 @@
                     Foreground="Gray"
                     Style="{StaticResource TextBlockDefault}"
                     Text="{Binding ListTitle[2]}" />
-                <local:AutoRecruitSettingsUserControl
+                <local:RoguelikeSettingsUserControl
                     Margin="20"
                     HorizontalAlignment="Center"
                     IsEnabled="{Binding Idle}" />
@@ -90,7 +90,7 @@
                     Foreground="Gray"
                     Style="{StaticResource TextBlockDefault}"
                     Text="{Binding ListTitle[3]}" />
-                <local:MallSettingsUserControl
+                <local:AutoRecruitSettingsUserControl
                     Margin="20"
                     HorizontalAlignment="Center"
                     IsEnabled="{Binding Idle}" />
@@ -105,7 +105,7 @@
                     Foreground="Gray"
                     Style="{StaticResource TextBlockDefault}"
                     Text="{Binding ListTitle[4]}" />
-                <local:PenguinReportSettingsUserControl
+                <local:MallSettingsUserControl
                     Margin="20"
                     HorizontalAlignment="Center"
                     IsEnabled="{Binding Idle}" />
@@ -120,7 +120,7 @@
                     Foreground="Gray"
                     Style="{StaticResource TextBlockDefault}"
                     Text="{Binding ListTitle[5]}" />
-                <local:ConnectSettingsUserControl
+                <local:PenguinReportSettingsUserControl
                     Margin="20"
                     HorizontalAlignment="Center"
                     IsEnabled="{Binding Idle}" />
@@ -135,7 +135,10 @@
                     Foreground="Gray"
                     Style="{StaticResource TextBlockDefault}"
                     Text="{Binding ListTitle[6]}" />
-                <local:StartSettingsUserControl Margin="20" HorizontalAlignment="Center" />
+                <local:ConnectSettingsUserControl
+                    Margin="20"
+                    HorizontalAlignment="Center"
+                    IsEnabled="{Binding Idle}" />
                 <Rectangle
                     Height="1"
                     HorizontalAlignment="Stretch"
@@ -147,7 +150,7 @@
                     Foreground="Gray"
                     Style="{StaticResource TextBlockDefault}"
                     Text="{Binding ListTitle[7]}" />
-                <local:TimerSettingsUserControl Margin="20" HorizontalAlignment="Center" />
+                <local:StartSettingsUserControl Margin="20" HorizontalAlignment="Center" />
                 <Rectangle
                     Height="1"
                     HorizontalAlignment="Stretch"
@@ -159,7 +162,7 @@
                     Foreground="Gray"
                     Style="{StaticResource TextBlockDefault}"
                     Text="{Binding ListTitle[8]}" />
-                <local:GUISettingsUserControl Margin="20" HorizontalAlignment="Center" />
+                <local:TimerSettingsUserControl Margin="20" HorizontalAlignment="Center" />
                 <Rectangle
                     Height="1"
                     HorizontalAlignment="Stretch"
@@ -171,6 +174,18 @@
                     Foreground="Gray"
                     Style="{StaticResource TextBlockDefault}"
                     Text="{Binding ListTitle[9]}" />
+                <local:GUISettingsUserControl Margin="20" HorizontalAlignment="Center" />
+                <Rectangle
+                    Height="1"
+                    HorizontalAlignment="Stretch"
+                    Fill="LightGray" />
+                <TextBlock
+                    Margin="5"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    Foreground="Gray"
+                    Style="{StaticResource TextBlockDefault}"
+                    Text="{Binding ListTitle[10]}" />
                 <local:HotKeySettingsUserControl
                     Margin="20"
                     HorizontalAlignment="Center"
@@ -185,7 +200,7 @@
                     VerticalAlignment="Center"
                     Foreground="Gray"
                     Style="{StaticResource TextBlockDefault}"
-                    Text="{Binding ListTitle[10]}" />
+                    Text="{Binding ListTitle[11]}" />
                 <local:VersionUpdateSettingsUserControl Margin="20" HorizontalAlignment="Center" />
                 <Rectangle
                     Height="1"
@@ -197,7 +212,7 @@
                     VerticalAlignment="Center"
                     Foreground="Gray"
                     Style="{StaticResource TextBlockDefault}"
-                    Text="{Binding ListTitle[11]}" />
+                    Text="{Binding ListTitle[12]}" />
                 <local:AboutUserControl Margin="20" HorizontalAlignment="Center" />
                 <!--<Rectangle HorizontalAlignment="Stretch" Fill="LightGray" Height="1" />-->
             </StackPanel>
diff --git a/src/MaaWpfGui/Views/TaskQueueView.xaml b/src/MaaWpfGui/Views/TaskQueueView.xaml
index 04fb3e6a63..049e35ab6d 100644
--- a/src/MaaWpfGui/Views/TaskQueueView.xaml
+++ b/src/MaaWpfGui/Views/TaskQueueView.xaml
@@ -160,7 +160,6 @@
                 <CheckBox IsChecked="{Binding Hibernate}" Content="休眠" Visibility="{Binding Visible}" HorizontalAlignment="Center" VerticalAlignment="Center" />
                 <CheckBox IsChecked="{Binding Suspend}" Content="待机" Visibility="{Binding Visible}"  HorizontalAlignment="Center" VerticalAlignment="Center" />-->
             <!--</StackPanel>-->
-
         </Grid>
         <Grid Grid.Column="1">
             <Grid.RowDefinitions>
@@ -199,20 +198,20 @@
                             <TextBlock
                                 Width="95"
                                 Margin="0,5"
+                                VerticalAlignment="Top"
                                 Foreground="Gray"
                                 Style="{StaticResource TextBlockDefault}"
                                 Text="{Binding Time}"
-                                TextWrapping="Wrap"
-                                VerticalAlignment="Top" />
+                                TextWrapping="Wrap" />
                             <TextBlock
                                 Width="135"
                                 Margin="0,5"
+                                VerticalAlignment="Top"
                                 FontWeight="{Binding Weight}"
                                 Foreground="{Binding Color}"
                                 Style="{StaticResource TextBlockDefault}"
                                 Text="{Binding Content}"
-                                TextWrapping="Wrap"
-                                VerticalAlignment="Top" />
+                                TextWrapping="Wrap" />
                         </StackPanel>
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
diff --git a/src/MaaWpfGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml
index f73783c13e..f5277f5b92 100644
--- a/src/MaaWpfGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml
@@ -19,9 +19,7 @@
             <ColumnDefinition Width="200" />
         </Grid.ColumnDefinitions>
 
-        <Grid
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Center">
+        <Grid HorizontalAlignment="Stretch" VerticalAlignment="Center">
             <StackPanel
                 Grid.Row="0"
                 Margin="0,10,0,0"
diff --git a/src/MaaWpfGui/Views/UserControl/ConnectSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/ConnectSettingsUserControl.xaml
index 7f04f7e20a..19b8a4cef0 100644
--- a/src/MaaWpfGui/Views/UserControl/ConnectSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/ConnectSettingsUserControl.xaml
@@ -2,8 +2,8 @@
     x:Class="MaaWpfGui.ConnectSettingsUserControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:c="clr-namespace:CalcBinding;assembly=CalcBinding"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:dd="urn:gong-wpf-dragdrop"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:s="https://github.com/canton7/Stylet"
@@ -14,7 +14,7 @@
     mc:Ignorable="d">
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="150" />
+            <ColumnDefinition Width="100" />
             <ColumnDefinition Width="270" />
             <ColumnDefinition Width="150" />
         </Grid.ColumnDefinitions>
@@ -25,29 +25,25 @@
             <RowDefinition />
             <RowDefinition />
             <RowDefinition />
-            <RowDefinition />
         </Grid.RowDefinitions>
         <CheckBox
             Grid.Row="0"
-            Grid.ColumnSpan="2"
-            Margin="15"
+            Grid.Column="1"
+            Margin="10"
+            HorizontalAlignment="Center"
             VerticalAlignment="Center"
-            IsChecked="{Binding AutoDetectConnection}"
             Content="{DynamicResource AutoDetectConnection}"
-            ToolTip="{DynamicResource AutoDetectConnectionTip}"
-            HorizontalAlignment="Center" />
+            IsChecked="{Binding AutoDetectConnection}"
+            ToolTip="{DynamicResource AutoDetectConnectionTip}" />
         <CheckBox
-            Grid.Row="1"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            Margin="15"
+            Grid.Column="2"
+            Margin="10"
             VerticalAlignment="Center"
-            IsChecked="{Binding AlwaysAutoDetectConnection}"
             Content="{DynamicResource AlwaysAutoDetectConnection}"
-            Visibility="{c:Binding AutoDetectConnection}"
-            HorizontalAlignment="Center" />
+            IsChecked="{Binding AlwaysAutoDetectConnection}"
+            Visibility="{c:Binding AutoDetectConnection}" />
         <TextBlock
-            Grid.Row="2"
+            Grid.Row="1"
             Grid.Column="0"
             Margin="10"
             Block.TextAlignment="Center"
@@ -55,7 +51,7 @@
             Text="{DynamicResource ADBPath}"
             TextWrapping="Wrap" />
         <TextBox
-            Grid.Row="2"
+            Grid.Row="1"
             Grid.Column="1"
             Width="250"
             Height="30"
@@ -63,18 +59,18 @@
             IsEnabled="{c:Binding !AutoDetectConnection}"
             Text="{Binding AdbPath}" />
         <Button
-            Grid.Row="2"
+            Grid.Row="1"
             Grid.Column="2"
             Width="60"
             Height="30"
             Margin="10"
-            IsEnabled="{c:Binding !AutoDetectConnection}"
             HorizontalAlignment="Left"
             Command="{s:Action SelectFile}"
-            Content="{DynamicResource Select}" />
+            Content="{DynamicResource Select}"
+            IsEnabled="{c:Binding !AutoDetectConnection}" />
 
         <TextBlock
-            Grid.Row="3"
+            Grid.Row="2"
             Grid.Column="0"
             Margin="10"
             Block.TextAlignment="Center"
@@ -82,7 +78,7 @@
             Text="{DynamicResource ConnectionAddress}"
             TextWrapping="Wrap" />
         <TextBox
-            Grid.Row="3"
+            Grid.Row="2"
             Grid.Column="1"
             Width="250"
             Height="30"
@@ -92,7 +88,7 @@
             ToolTip="{DynamicResource ConnectionAddressTip}" />
 
         <TextBlock
-            Grid.Row="4"
+            Grid.Row="3"
             Grid.Column="0"
             Margin="10"
             Block.TextAlignment="Center"
@@ -100,7 +96,7 @@
             Text="{DynamicResource ConnectionPreset}"
             TextWrapping="Wrap" />
         <ComboBox
-            Grid.Row="4"
+            Grid.Row="3"
             Grid.Column="1"
             Width="250"
             Height="30"
@@ -110,33 +106,41 @@
             ItemsSource="{Binding ConnectConfigList}"
             SelectedValue="{Binding ConnectConfig}"
             SelectedValuePath="Value" />
-
         <CheckBox
-            Grid.Row="5"
+            Grid.Row="4"
             Grid.Column="0"
             Grid.ColumnSpan="2"
             Margin="15"
+            HorizontalAlignment="Center"
             VerticalAlignment="Center"
-            IsChecked="{Binding RetryOnDisconnected}"
             Content="{DynamicResource RetryOnDisconnected}"
-            ToolTip="{DynamicResource RetryOnDisconnectedTip}"
-            HorizontalAlignment="Center" />
-        <Button
-            Grid.Row="6"
+            IsChecked="{Binding RetryOnDisconnected}"
+            ToolTip="{DynamicResource RetryOnDisconnectedTip}" />
+        <TextBlock
+            Grid.Row="5"
             Grid.Column="0"
+            VerticalAlignment="Center"
+            Style="{StaticResource TextBlockDefault}"
+            Text="{DynamicResource TouchMode}" />
+        <ComboBox
+            Grid.Row="5"
+            Grid.Column="1"
+            Width="250"
+            Height="30"
+            Margin="10"
+            DisplayMemberPath="Display"
+            IsHitTestVisible="{Binding Idle}"
+            ItemsSource="{Binding TouchModeList}"
+            SelectedValue="{Binding TouchMode}"
+            SelectedValuePath="Value" />
+        <Button
+            Grid.Row="5"
+            Grid.Column="2"
             Width="100"
             Height="30"
             Margin="10"
             HorizontalAlignment="Left"
             Command="{s:Action ReplaceADB}"
             Content="{DynamicResource ForcedReplaceADB}" />
-        <CheckBox
-            Grid.Row="6"
-            Grid.Column="1"
-            Margin="15"
-            VerticalAlignment="Center"
-            IsChecked="{Binding UseAdbTouchMode}"
-            Content="{DynamicResource AdbTouchMode}"
-            HorizontalAlignment="Center" />
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml
index e44b7955ab..a67221cfb3 100644
--- a/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml
@@ -111,11 +111,11 @@
                         DropDownClosed="{s:Action DropsListDropDownClosed}"
                         IsEditable="True"
                         IsTextSearchEnabled="False"
-                        Text="{Binding DropsItemName}"
                         ItemsSource="{Binding DropsList}"
                         Loaded="{s:Action DropsList_Loaded}"
                         SelectedValue="{Binding DropsItemId}"
-                        SelectedValuePath="Value" />
+                        SelectedValuePath="Value"
+                        Text="{Binding DropsItemName}" />
 
                     <hc:TextBox
                         Width="60"
diff --git a/src/MaaWpfGui/Views/UserControl/GUISettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/GUISettingsUserControl.xaml
index 5c4b449624..671afbc140 100644
--- a/src/MaaWpfGui/Views/UserControl/GUISettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/GUISettingsUserControl.xaml
@@ -33,8 +33,7 @@
                 HorizontalAlignment="Left"
                 Content="{DynamicResource CustomStageCode}"
                 IsChecked="{Binding CustomStageCode}"
-                ToolTip="{DynamicResource CustomStageCodeTip}"
-                />
+                ToolTip="{DynamicResource CustomStageCodeTip}" />
             <CheckBox
                 Margin="10"
                 HorizontalAlignment="Left"
diff --git a/src/MaaWpfGui/Views/UserControl/GameClientUserControl.xaml b/src/MaaWpfGui/Views/UserControl/GameClientUserControl.xaml
new file mode 100644
index 0000000000..b10daa8675
--- /dev/null
+++ b/src/MaaWpfGui/Views/UserControl/GameClientUserControl.xaml
@@ -0,0 +1,35 @@
+<UserControl
+    x:Class="MaaWpfGui.GameClientUserControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:dd="urn:gong-wpf-dragdrop"
+    xmlns:local="clr-namespace:MaaWpfGui"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:s="https://github.com/canton7/Stylet"
+    xmlns:vm="clr-namespace:MaaWpfGui"
+    d:DataContext="{d:DesignInstance {x:Type vm:SettingsViewModel}}"
+    d:DesignWidth="550"
+    mc:Ignorable="d">
+    <StackPanel
+        HorizontalAlignment="Center"
+        VerticalAlignment="Center"
+        Orientation="Vertical">
+        <TextBlock
+            Margin="10,0"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Style="{StaticResource TextBlockDefault}"
+            Text="{DynamicResource ClientType}" />
+        <ComboBox
+            Width="200"
+            Margin="10"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            DisplayMemberPath="Display"
+            IsHitTestVisible="{Binding Idle}"
+            ItemsSource="{Binding ClientTypeList}"
+            SelectedValue="{Binding ClientType}"
+            SelectedValuePath="Value" />
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/src/MaaWpfGui/Views/UserControl/GameClientUserControl.xaml.cs b/src/MaaWpfGui/Views/UserControl/GameClientUserControl.xaml.cs
new file mode 100644
index 0000000000..8b6b700377
--- /dev/null
+++ b/src/MaaWpfGui/Views/UserControl/GameClientUserControl.xaml.cs
@@ -0,0 +1,34 @@
+// <copyright file="GameClientUserControl.xaml.cs" company="MaaAssistantArknights">
+// MaaWpfGui - A part of the MaaCoreArknights project
+// Copyright (C) 2021 MistEO and Contributors
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY
+// </copyright>
+
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+
+namespace MaaWpfGui
+{
+    /// <summary>
+    /// PenguinReportSettingsUserControl.xaml 的交互逻辑
+    /// </summary>
+    public partial class GameClientUserControl : UserControl
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GameClientUserControl"/> class.
+        /// </summary>
+        public GameClientUserControl()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/src/MaaWpfGui/Views/UserControl/HotKeyEditorUserControl.xaml b/src/MaaWpfGui/Views/UserControl/HotKeyEditorUserControl.xaml
index 792de00d96..0679779345 100644
--- a/src/MaaWpfGui/Views/UserControl/HotKeyEditorUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/HotKeyEditorUserControl.xaml
@@ -7,17 +7,18 @@
     x:Name="UserControl"
     d:DesignWidth="180"
     mc:Ignorable="d">
-    <TextBox x:Name="HotKeyTextBox"
-             HorizontalContentAlignment="Center"
-             VerticalContentAlignment="Center"
-             IsReadOnly="True"
-             IsReadOnlyCaretVisible="False"
-             IsUndoEnabled="False"
-             Width="180"
-             InputMethod.IsInputMethodEnabled="False"
-             PreviewKeyDown="HotKeyTextBox_PreviewKeyDown"
-             ToolTip="{DynamicResource HotKeyChangingTip}"
-             Text="{Binding HotKey, ElementName=UserControl, Mode=OneWay, TargetNullValue=&lt; not set &gt;}">
+    <TextBox
+        x:Name="HotKeyTextBox"
+        Width="180"
+        HorizontalContentAlignment="Center"
+        VerticalContentAlignment="Center"
+        InputMethod.IsInputMethodEnabled="False"
+        IsReadOnly="True"
+        IsReadOnlyCaretVisible="False"
+        IsUndoEnabled="False"
+        PreviewKeyDown="HotKeyTextBox_PreviewKeyDown"
+        Text="{Binding HotKey, ElementName=UserControl, Mode=OneWay, TargetNullValue=&lt; not set &gt;}"
+        ToolTip="{DynamicResource HotKeyChangingTip}">
         <TextBox.ContextMenu>
             <ContextMenu Visibility="Collapsed" />
         </TextBox.ContextMenu>
diff --git a/src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml
index 0e319fe9d1..fe84ca6cd5 100644
--- a/src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml
@@ -36,7 +36,7 @@
             Block.TextAlignment="Center"
             Content="{DynamicResource CreditFight}"
             IsChecked="{Binding CreditFightTaskEnabled}"
-            ToolTip="{DynamicResource CreditFightTip}"/>
+            ToolTip="{DynamicResource CreditFightTip}" />
         <StackPanel
             Grid.Row="1"
             HorizontalAlignment="Center"
@@ -50,7 +50,7 @@
                     Margin="10"
                     Block.TextAlignment="Center"
                     Style="{StaticResource TextBlockDefault}"
-                    Text="{DynamicResource Blacklist}"/>
+                    Text="{DynamicResource Blacklist}" />
                 <TextBox
                     Width="250"
                     Height="30"
@@ -66,7 +66,7 @@
                     Margin="10"
                     Block.TextAlignment="Center"
                     Style="{StaticResource TextBlockDefault}"
-                    Text="{DynamicResource HighPriority}"/>
+                    Text="{DynamicResource HighPriority}" />
                 <TextBox
                     Width="250"
                     Height="30"
diff --git a/src/MaaWpfGui/Views/UserControl/StartSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/StartSettingsUserControl.xaml
index d398ccacbb..b47476a63b 100644
--- a/src/MaaWpfGui/Views/UserControl/StartSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/StartSettingsUserControl.xaml
@@ -34,29 +34,6 @@
                     Content="{DynamicResource RunTaskAfterLaunch}"
                     IsChecked="{Binding RunDirectly}" />
             </Grid>
-            <Grid Margin="10">
-                <TextBlock
-                    Margin="0,0,0,41"
-                    Block.TextAlignment="Center"
-                    Style="{StaticResource TextBlockDefault}"
-                    Text="{DynamicResource ClientVersion}" />
-                <ComboBox
-                    Margin="0,35,0,0"
-                    DisplayMemberPath="Display"
-                    IsHitTestVisible="{Binding Idle}"
-                    ItemsSource="{Binding ClientTypeList}"
-                    SelectedValue="{Binding ClientType}"
-                    SelectedValuePath="Value" />
-            </Grid>
-        </StackPanel>
-        <StackPanel Grid.Column="1" VerticalAlignment="Center">
-            <CheckBox
-                Margin="20,10,10,10"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Center"
-                Block.TextAlignment="Center"
-                Content="{DynamicResource OpenEmulatorAfterLaunch}"
-                IsChecked="{Binding StartEmulator}" />
             <StackPanel
                 Margin="10"
                 HorizontalAlignment="Center"
@@ -73,6 +50,15 @@
                     InputMethod.IsInputMethodEnabled="False"
                     Text="{Binding EmulatorWaitSeconds}" />
             </StackPanel>
+        </StackPanel>
+        <StackPanel Grid.Column="1" VerticalAlignment="Center">
+            <CheckBox
+                Margin="20,10,10,10"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                Block.TextAlignment="Center"
+                Content="{DynamicResource OpenEmulatorAfterLaunch}"
+                IsChecked="{Binding StartEmulator}" />
             <StackPanel
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
diff --git a/src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml
index 2b8d28e4be..36c76a7e73 100644
--- a/src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml
@@ -43,9 +43,7 @@
                     Content="{DynamicResource DownloadWithAria2}"
                     IsChecked="{Binding UseAria2}"
                     IsEnabled="{Binding UpdateCheck}" />
-                <StackPanel
-                    VerticalAlignment="Center"
-                    Orientation="Horizontal">
+                <StackPanel VerticalAlignment="Center" Orientation="Horizontal">
                     <TextBlock
                         Margin="10,10,0,10"
                         Block.TextAlignment="Center"