diff --git a/SdOut/atmosphere/config/system_settings.ini b/SdOut/atmosphere/config/system_settings.ini
index b15fb71e..e4255a88 100644
--- a/SdOut/atmosphere/config/system_settings.ini
+++ b/SdOut/atmosphere/config/system_settings.ini
@@ -2,11 +2,11 @@
 [atmosphere]
 dmnt_cheats_enabled_by_default = u8!0x0
 
-;Fan Control for Mariko
+;Fan Control for IcosaMariko/Hoag
 [tc]
 tskin_rate_table_console = str!"[[-1000000, 36000, 0, 0], [36000, 43000, 51, 51], [43000, 48000, 51, 153], [48000, 56000, 153, 255], [56000, 1000000, 255, 255]]"
 tskin_rate_table_handheld = str!"[[-1000000, 40000, 0, 0], [36000, 43000, 51, 51], [43000, 48000, 51, 102], [48000, 56000, 102, 204], [56000, 1000000, 255, 255], [48000, 1000000, 255, 255]]"
-; 0xDAC0 = 56,000 = 56C
+; 0xDAC0 = 56,000 = 56˚C
 holdable_tskin = u32!0xDAC0
 
 ;Game Recording FPS and Bitrate
@@ -42,9 +42,8 @@ enable_sync_elicense_request = u8!0x0
 enable_version_list = u8!0x0
 retry_interval_min = u32!0x7FFFFFFF
 retry_interval_max = u32!0x7FFFFFFF
-
-[ns.rights]
-register_na_ids_as_valid_accounts_forcibly_even_if_not_exist = u8!0x1
+version_list_waiting_limit_bias = u32!0x7FFFFFFF
+version_list_waiting_limit_min = u32!0x7FFFFFFF
 
 [account]
 na_required_for_network_service = u8!0x0
@@ -102,4 +101,55 @@ autonomic_correction_immediate_try_count_max = u32!0x0
 autonomic_correction_immediate_try_interval_milliseconds = u32!0x7FFFFFFF
 
 [systemupdate]
-bgnup_retry_seconds = u32!0x7FFFFFFF
\ No newline at end of file
+bgnup_retry_seconds = u32!0x7FFFFFFF
+
+;Test
+[ns.rights]
+;skip_account_validation_on_rights_check = u8!0x1
+;next_available_time_of_unexpected_error = u32!0x7FFFFFFF
+
+[pctl]
+;intermittent_task_interval_seconds = u32!0x7FFFFFFF
+
+[apm]
+;throttling_for_undock_enabled = u8!0x0 ;1 for IcosaMariko/Aula, 0 for Hoag
+
+[psm]
+;cdp_dcp_input_current_limit_in_ma = u32!0x5DC ;1500mA for IcosaMariko/Aula, 1200mA for Hoag
+;enough_power_threshold_mw = u32!0x9858 ;39,000mW
+;boost_threshold_in_milli_volt = u32!0xCF8 ;3,320mV for IcosaMariko/Hoag, 0 for Aula
+;charge_configuration_number = u32!0x0 ;0 for IcosaMariko/Hoag, 1 for Aula
+
+[nvservices]
+;external_display_full_dp_lanes = u8!0x0 ;0 for IcosaMariko/Hoag, 1 for Aula
+
+;tskin table
+;[tc]-Hoag
+;holdable_tskin = u32!0xB98C ;47.5˚C
+;touchable_tskin = u32!0xEA60 ;60.0˚C
+;tskin_pcb_coefficients_console = str!"[7338, 112161]"
+;tskin_pcb_coefficients_handheld = str!"[5594, 209601]"
+;tskin_rate_table_console = str!"[[-1000000, 40000, 0, 0], [36000, 43000, 51, 51], [43000, 53000, 51, 153], [53000, 58000, 153, 255], [58000, 1000000, 255, 255]]"
+;tskin_rate_table_handheld = str!"[[-1000000, 40000, 0, 0], [36000, 43000, 51, 51], [43000, 48000, 51, 102], [48000, 53000, 102, 153], [53000, 1000000, 153, 153], [48000, 1000000, 153, 153]]"
+;tskin_soc_coefficients_console = str!"[6728, 129810]"
+;tskin_soc_coefficients_handheld = str!"[5235, 199759]"
+
+;[tc]-IcosaMariko
+;holdable_tskin = u32!0xB98C ;47.5˚C
+;touchable_tskin = u32!0xEA60 ;60.0˚C
+;tskin_pcb_coefficients_console = str!"[7338, 112161]"
+;tskin_pcb_coefficients_handheld = str!"[6357, 168124]"
+;tskin_rate_table_console = str!"[[-1000000, 40000, 0, 0], [36000, 43000, 51, 51], [43000, 53000, 51, 153], [53000, 58000, 153, 255], [58000, 1000000, 255, 255]]"
+;tskin_rate_table_handheld = str!"[[-1000000, 40000, 0, 0], [36000, 43000, 51, 51], [43000, 48000, 51, 102], [48000, 53000, 102, 153], [53000, 1000000, 153, 153], [48000, 1000000, 153, 153]]"
+;tskin_soc_coefficients_console = str!"[6728, 129810]"
+;tskin_soc_coefficients_handheld = str!"[5675, 203453]"
+
+;[tc]-Aula
+;holdable_tskin = u32!0xBCB1 ;48.3˚C
+;touchable_tskin = u32!0xC350 ;50.0˚C
+;tskin_pcb_coefficients_console = str!"[8051, -45213]"
+;tskin_pcb_coefficients_handheld = str!"[7176, -33954]"
+;tskin_rate_table_console = str!"[[-1000000, 40000, 0, 0], [36000, 43000, 51, 51], [43000, 49000, 51, 128], [49000, 53000, 128, 255], [53000, 1000000, 255, 255]]"
+;tskin_rate_table_handheld = str!"[[-1000000, 40000, 0, 0], [36000, 43000, 51, 51], [43000, 44000, 51, 76], [44000, 45000, 76, 128], [45000, 46500, 128, 255], [45500, 1000000, 255, 255]]"
+;tskin_soc_coefficients_console = str!"[7831, 57590]"
+;tskin_soc_coefficients_handheld = str!"[9029, 4274]"