diff --git a/system/default/menu.dat b/system/default/menu.dat
index 0b4c4f7ac..2a954d7b9 100644
--- a/system/default/menu.dat
+++ b/system/default/menu.dat
@@ -1,91 +1,150 @@
-[domains\{lang_open_in_browser}]
+[0]
 
-command              = "%COMSPEC%" /c "start "" "http://{host_decoded}""
-hide                 = on
-need_active_state    = on
+caption               = {lang_open_in_browser}
+category              = domains
+command               = "%COMSPEC%" /c "start "" "http://{host_decoded}""
+hide                  = on
+need_state            = on
 
-[domains\{lang_open_in_console}]
+[1]
 
-command              = "%COMSPEC%" /k "osp reset init noprint & osp project {host_decoded}"
+caption               = {lang_open_in_console}
+category              = domains
+command               = wt.exe new-tab -p "Command Prompt" -d "{root_dir}" "%COMSPEC%" /k "osp reset init noprint & osp project {host_decoded}"
+need_use_win_terminal = on
 
-[domains\{lang_open_in_explorer}]
+[2]
 
-command              = "%SystemRoot%\explorer.exe" "{project_home_dir}"
-work_directory       = {project_home_dir}
+caption               = {lang_open_in_console}
+category              = domains
+command               = "%COMSPEC%" /k "osp reset init noprint & osp project {host_decoded}"
+need_use_win_terminal = off
 
-[modules\{lang_open_in_console}]
+[3]
 
-command              = "%COMSPEC%" /k "osp reset init noprint & osp use {module_name}"
+caption               = {lang_open_in_explorer}
+category              = domains
+command               = "%SystemRoot%\explorer.exe" "{project_home_dir}"
+work_directory        = {project_home_dir}
 
-[modules\{lang_launch_shell}]
+[4]
 
-command              = "%COMSPEC%" /k "osp reset init noprint & osp shell {module_name}"
-need_active_state    = on
-need_module_shell    = on
+caption               = {lang_open_in_console}
+category              = modules
+command               = wt.exe new-tab -p "Command Prompt" -d "{root_dir}" "%COMSPEC%" /k "osp reset init noprint & osp use {module_name}"
+need_use_win_terminal = on
 
-[modules\{lang_open_data_in_explorer}]
+[5]
 
-command              = "%SystemRoot%\explorer.exe" "{root_dir}\data\{module_name}\{profile_name}"
-work_directory       = {root_dir}\data\{module_name}\{profile_name}
+caption               = {lang_open_in_console}
+category              = modules
+command               = "%COMSPEC%" /k "osp reset init noprint & osp use {module_name}"
+need_use_win_terminal = off
 
-[modules\{lang_open_profile_in_explorer}]
+[6]
 
-command              = "%SystemRoot%\explorer.exe" "{root_dir}\config\{module_name}\{profile_name}"
-work_directory       = {root_dir}\config\{module_name}\{profile_name}
+caption               = {lang_launch_shell}
+category              = modules
+command               = wt.exe new-tab -p "Command Prompt" -d "{root_dir}" "%COMSPEC%" /k "osp reset init noprint & osp shell {module_name}"
+need_state            = on
+need_module_shell     = on
+need_use_win_terminal = on
 
-[modules\{lang_open_main_dir_in_explorer}]
+[7]
 
-command              = "%SystemRoot%\explorer.exe" "{root_dir}\modules\{module_name}"
-hr_after             = on
-work_directory       = {root_dir}\modules\{module_name}
+caption               = {lang_launch_shell}
+category              = modules
+command               = "%COMSPEC%" /k "osp reset init noprint & osp shell {module_name}"
+need_state            = on
+need_module_shell     = on
+need_use_win_terminal = off
 
-[modules\{lang_initialize}]
+[8]
 
-command              = "%COMSPEC%" /c "osp init {module_name}"
-hide                 = on
-need_inactive_state  = on
+caption               = {lang_open_data_in_explorer}
+category              = modules
+command               = "%SystemRoot%\explorer.exe" "{root_dir}\data\{module_name}\{profile_name}"
+work_directory        = {root_dir}\data\{module_name}\{profile_name}
 
-[modules\{lang_switch_on}]
+[9]
 
-command              = "%COMSPEC%" /c "osp on {module_name}"
-hide                 = on
-need_active_type     = on
-need_inactive_state  = on
+caption               = {lang_open_profile_in_explorer}
+category              = modules
+command               = "%SystemRoot%\explorer.exe" "{root_dir}\config\{module_name}\{profile_name}"
+work_directory        = {root_dir}\config\{module_name}\{profile_name}
 
-[modules\{lang_restart}]
+[10]
 
-command              = "%COMSPEC%" /c "osp restart {module_name}"
-hide                 = on
-need_active_state    = on
-need_active_type     = on
+caption               = {lang_open_main_dir_in_explorer}
+category              = modules
+command               = "%SystemRoot%\explorer.exe" "{root_dir}\modules\{module_name}"
+hr_after              = on
+work_directory        = {root_dir}\modules\{module_name}
 
-[modules\{lang_switch_off}]
+[11]
 
-command              = "%COMSPEC%" /c "osp off {module_name}"
-hide                 = on
-need_active_state    = on
-need_active_type     = on
+caption               = {lang_initialize}
+category              = modules
+command               = "%COMSPEC%" /c "osp init {module_name}"
+hide                  = on
+need_state            = off
 
-[{lang_control_panel}]
+[12]
 
-command              = "%COMSPEC%" /c "start "" "{web_panel_url}""
-hide                 = on
-enabled              = off
+caption               = {lang_switch_on}
+category              = modules
+command               = "%COMSPEC%" /c "osp on {module_name}"
+hide                  = on
+need_state            = off
 
-[{lang_cli}]
+[13]
 
-command              = "%COMSPEC%" /k "osp reset init"
+caption               = {lang_restart}
+category              = modules
+command               = "%COMSPEC%" /c "osp restart {module_name}"
+hide                  = on
+need_state            = on
 
-[{lang_root_dir}]
+[14]
 
-command              = "%SystemRoot%\explorer.exe" "{root_dir}"
+caption               = {lang_switch_off}
+category              = modules
+command               = "%COMSPEC%" /c "osp off {module_name}"
+hide                  = on
+need_state            = on
 
-[{lang_idn_menu_caption}]
+[15]
 
-command              = "{root_dir}\system\bin\idnconverter.exe"
+caption               = {lang_control_panel}
+command               = "%COMSPEC%" /c "start "" "{web_panel_url}""
+hide                  = on
+enabled               = off
 
-[{lang_sp_tool}]
+[16]
 
-command              = "{root_dir}\system\bin\syspreptool.exe"
-hr_after             = on
-hr_before            = on
+caption               = {lang_cli}
+command               = wt.exe new-tab -p "Command Prompt" -d "{root_dir}" "%COMSPEC%" /k "osp reset init"
+need_use_win_terminal = on
+
+[17]
+
+caption               = {lang_cli}
+command               = "%COMSPEC%" /k "osp reset init"
+need_use_win_terminal = off
+
+[18]
+
+caption               = {lang_root_dir}
+command               = "%SystemRoot%\explorer.exe" "{root_dir}"
+
+[19]
+
+caption               = {lang_idn_menu_caption}
+command               = "{root_dir}\system\bin\idnconverter.exe"
+
+[20]
+
+caption               = {lang_sp_tool}
+command               = "{root_dir}\system\bin\syspreptool.exe"
+hr_after              = on
+hr_before             = on