diff --git a/AquaMai/AquaMai.toml b/AquaMai/AquaMai.toml
index 6aed4500..abf0af21 100644
--- a/AquaMai/AquaMai.toml
+++ b/AquaMai/AquaMai.toml
@@ -80,12 +80,6 @@ JudgeAdjustA=0.0
 JudgeAdjustB=0.0
 # Touch screen delay, unit is milliseconds, one second = 1000 milliseconds. Must be an integer
 TouchDelay=0
-# Window the game
-Windowed=false
-# Width and height for windowed mode, rendering resolution for fullscreen mode
-# If set to 0, windowed mode will remember the user-set size, fullscreen mode will use the current display resolution
-Width=0
-Height=0
 # Show detail of selected song in music selection screen
 SelectionDetail=true
 # Display framerate
@@ -114,6 +108,16 @@ SkipTrackStart=true
 # Show reason when net icon is gray
 ShowNetErrorDetail=true
 
+[WindowState]
+# If not enabled, no operations will be performed on the game window
+Enable=false
+# Window the game
+Windowed=false
+# Width and height for windowed mode, rendering resolution for fullscreen mode
+# If set to 0, windowed mode will remember the user-set size, fullscreen mode will use the current display resolution
+Width=0
+Height=0
+
 [TouchSensitivity]
 # Enable custom sensitivity
 # When enabled, the settings in Test mode will not take effect
@@ -159,3 +163,27 @@ E5=20
 E6=20
 E7=20
 E8=20
+
+[CustomKeyMap]
+Enable = false
+# These settings will work regardless of whether you have enabled segatools' io4 emulation
+Test = "ScrollLock"
+Service = "Pause"
+Button1_1P = "W"
+Button2_1P = "E"
+Button3_1P = "D"
+Button4_1P = "C"
+Button5_1P = "X"
+Button6_1P = "Z"
+Button7_1P = "A"
+Button8_1P = "Q"
+Select_1P = "Alpha3"
+Button1_2P = "Keypad8"
+Button2_2P = "Keypad9"
+Button3_2P = "Keypad6"
+Button4_2P = "Keypad3"
+Button5_2P = "Keypad2"
+Button6_2P = "Keypad1"
+Button7_2P = "Keypad4"
+Button8_2P = "Keypad7"
+Select_2P = "KeypadMultiply"
diff --git a/AquaMai/AquaMai.zh.toml b/AquaMai/AquaMai.zh.toml
index 1e4cc113..316df68e 100644
--- a/AquaMai/AquaMai.zh.toml
+++ b/AquaMai/AquaMai.zh.toml
@@ -96,12 +96,6 @@ JudgeAdjustA=0.0
 JudgeAdjustB=0.0
 # 触摸屏延迟，单位为毫秒，一秒 = 1000 毫秒。必须是整数
 TouchDelay=0
-# 窗口化游戏
-Windowed=false
-# 宽度和高度窗口化时为游戏窗口大小，全屏时为渲染分辨率
-# 如果设为 0，窗口化将记住用户设定的大小，全屏时将使用当前显示器分辨率
-Width=0
-Height=0
 # 选歌界面显示选择的歌曲的详情
 SelectionDetail=true
 # 出现灰网时显示原因
@@ -131,6 +125,16 @@ SkipGameOverScreen=true
 # 跳过乐曲开始界面
 SkipTrackStart=true
 
+[WindowState]
+# 不启用的话，不会对游戏窗口做任何操作
+Enable=false
+# 窗口化游戏
+Windowed=false
+# 宽度和高度窗口化时为游戏窗口大小，全屏时为渲染分辨率
+# 如果设为 0，窗口化将记住用户设定的大小，全屏时将使用当前显示器分辨率
+Width=0
+Height=0
+
 [TouchSensitivity]
 # 是否启用自定义灵敏度
 # 这里启用之后 Test 里的就不再起作用了
@@ -176,3 +180,27 @@ E5=20
 E6=20
 E7=20
 E8=20
+
+[CustomKeyMap]
+Enable = false
+# 这里的设置无论你是否启用了 segatools 的 io4 模拟都会工作
+Test = "ScrollLock"
+Service = "Pause"
+Button1_1P = "W"
+Button2_1P = "E"
+Button3_1P = "D"
+Button4_1P = "C"
+Button5_1P = "X"
+Button6_1P = "Z"
+Button7_1P = "A"
+Button8_1P = "Q"
+Select_1P = "Alpha3"
+Button1_2P = "Keypad8"
+Button2_2P = "Keypad9"
+Button3_2P = "Keypad6"
+Button4_2P = "Keypad3"
+Button5_2P = "Keypad2"
+Button6_2P = "Keypad1"
+Button7_2P = "Keypad4"
+Button8_2P = "Keypad7"
+Select_2P = "KeypadMultiply"