diff --git a/msg_hash_lbl_str.h b/msg_hash_lbl_str.h
index f0de77e0ae..8e4145cd82 100644
--- a/msg_hash_lbl_str.h
+++ b/msg_hash_lbl_str.h
@@ -969,9 +969,11 @@
 #define MENU_ENUM_LABEL_AUDIO_FASTPATH_S16_STR "audio_fastpath_s16"
 #define MENU_ENUM_LABEL_AUDIO_FILTER_DIR_STR "audio_filter_dir"
 #define MENU_ENUM_LABEL_AUDIO_FORMAT_NEGOTIATION_STR "audio_format_negotiation"
+#define MENU_ENUM_LABEL_AUDIO_HEADPHONE_VIRTUAL_SURROUND_STR "audio_headphone_virtual_surround"
 #define MENU_ENUM_LABEL_AUDIO_MAX_TIMING_SKEW_STR "audio_max_timing_skew"
 #define MENU_ENUM_LABEL_AUDIO_MIXER_SETTINGS_STR "audio_mixer_settings"
 #define MENU_ENUM_LABEL_AUDIO_MIXER_VOLUME_STR "audio_mixer_volume"
+#define MENU_ENUM_LABEL_AUDIO_OUTPUT_LAYOUT_STR "audio_output_layout"
 #define MENU_ENUM_LABEL_AUDIO_OUTPUT_RATE_STR "audio_output_rate"
 #define MENU_ENUM_LABEL_AUDIO_OUTPUT_SETTINGS_STR "audio_output_settings"
 #define MENU_ENUM_LABEL_AUDIO_RESAMPLER_QUALITY_STR "audio_resampler_quality"
@@ -1515,6 +1517,7 @@
 #define MENU_ENUM_LABEL_SAVESTATE_AUTO_INDEX_STR "savestate_auto_index"
 #define MENU_ENUM_LABEL_SAVESTATE_FILE_COMPRESSION_STR "savestate_file_compression"
 #define MENU_ENUM_LABEL_SAVESTATE_MAX_KEEP_STR "savestate_max_keep"
+#define MENU_ENUM_LABEL_SAVE_COMPRESSION_CODEC_STR "save_compression_codec"
 #define MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_STR "save_current_config"
 #define MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CONTENT_DIR_STR "save_current_config_override_content_dir"
 #define MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CORE_STR "save_current_config_override_core"
diff --git a/tools/settings_table.reference b/tools/settings_table.reference
index ebd581ef0b..0ba598f9b2 100644
--- a/tools/settings_table.reference
+++ b/tools/settings_table.reference
@@ -225,6 +225,7 @@ bool	video_window_custom_size_enable	1	0
 bool	input_overlay_auto_scale	1	1
 bool	video_font_enable	1	1
 bool	smb_client_enable	1	0
+bool	audio_headphone_virtual_surround	1	0
 bool	network_cmd_enable	1	0
 bool	menu_use_preferred_system_color_theme	1	0
 bool	core_updater_auto_backup	1	0
@@ -501,7 +502,6 @@ uint	accessibility_narrator_engine	1	ACCESSIBILITY_NARRATOR_ENGINE_ESPEAK
 uint	menu_screensaver_animation	1	MENU_SCREENSAVER_BLANK
 uint	libretro_log_level	1	1
 uint	video_autoswitch_refresh_rate	1	AUTOSWITCH_REFRESH_RATE_EXCLUSIVE_FULLSCREEN
-uint	audio_block_frames	1	0
 uint	content_history_size	1	200
 uint	input_menu_toggle_gamepad_combo	1	INPUT_COMBO_NONE
 uint	input_quit_gamepad_combo	1	INPUT_COMBO_NONE
@@ -565,6 +565,7 @@ uint	rewind_buffer_size_step	1	10
 uint	input_block_timeout	1	1
 uint	ai_service_mode	1	1
 uint	audio_format_negotiation	1	AUDIO_FORMAT_NEGOTIATION_FLOAT
+uint	audio_output_layout	1	0
 uint	microphone_block_frames	1	0
 uint	video_scale	1	3
 uint	video_window_auto_width_max	1	1920
@@ -880,6 +881,7 @@ bool	video_window_custom_size_enable	1	0
 bool	input_overlay_auto_scale	1	0
 bool	video_font_enable	1	1
 bool	smb_client_enable	1	0
+bool	audio_headphone_virtual_surround	1	0
 bool	network_cmd_enable	1	0
 bool	menu_use_preferred_system_color_theme	1	0
 bool	core_updater_auto_backup	1	0
@@ -1154,7 +1156,6 @@ uint	accessibility_narrator_engine	1	ACCESSIBILITY_NARRATOR_ENGINE_ESPEAK
 uint	menu_screensaver_animation	1	MENU_SCREENSAVER_BLANK
 uint	libretro_log_level	1	1
 uint	video_autoswitch_refresh_rate	1	AUTOSWITCH_REFRESH_RATE_EXCLUSIVE_FULLSCREEN
-uint	audio_block_frames	1	0
 uint	content_history_size	1	200
 uint	input_menu_toggle_gamepad_combo	1	INPUT_COMBO_NONE
 uint	input_quit_gamepad_combo	1	INPUT_COMBO_NONE
@@ -1216,6 +1217,7 @@ uint	video_monitor_index	1	0
 uint	rewind_buffer_size_step	1	10
 uint	ai_service_mode	1	1
 uint	audio_format_negotiation	1	AUDIO_FORMAT_NEGOTIATION_FLOAT
+uint	audio_output_layout	1	0
 uint	microphone_block_frames	1	0
 uint	video_scale	1	3
 uint	video_window_auto_width_max	1	1920
@@ -1540,6 +1542,7 @@ bool	video_window_custom_size_enable	1	0
 bool	input_overlay_auto_scale	1	0
 bool	video_font_enable	1	1
 bool	smb_client_enable	1	0
+bool	audio_headphone_virtual_surround	1	0
 bool	network_cmd_enable	1	0
 bool	menu_use_preferred_system_color_theme	1	0
 bool	core_updater_auto_backup	1	0
@@ -1830,7 +1833,6 @@ uint	accessibility_narrator_engine	1	ACCESSIBILITY_NARRATOR_ENGINE_ESPEAK
 uint	menu_screensaver_animation	1	MENU_SCREENSAVER_BLANK
 uint	libretro_log_level	1	1
 uint	video_autoswitch_refresh_rate	1	AUTOSWITCH_REFRESH_RATE_EXCLUSIVE_FULLSCREEN
-uint	audio_block_frames	1	0
 uint	content_history_size	1	200
 uint	input_menu_toggle_gamepad_combo	1	INPUT_COMBO_NONE
 uint	input_quit_gamepad_combo	1	INPUT_COMBO_NONE
@@ -1893,6 +1895,7 @@ uint	video_monitor_index	1	0
 uint	rewind_buffer_size_step	1	10
 uint	ai_service_mode	1	1
 uint	audio_format_negotiation	1	AUDIO_FORMAT_NEGOTIATION_FLOAT
+uint	audio_output_layout	1	0
 uint	microphone_block_frames	1	0
 uint	video_scale	1	3
 uint	video_window_auto_width_max	1	1920