diff --git a/externals/nx_tzdb/tzdb_to_nx b/externals/nx_tzdb/tzdb_to_nx
index 9792969..5f0ca45 160000
--- a/externals/nx_tzdb/tzdb_to_nx
+++ b/externals/nx_tzdb/tzdb_to_nx
@@ -1 +1 @@
-Subproject commit 97929690234f2b4add36b33657fe3fe09bd57dfd
+Subproject commit 5f0ca45d8a040f7da3c8aac9cdff8d053f871458
diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp
index 2ebe508..2e1dffe 100644
--- a/src/core/hle/service/acc/acc.cpp
+++ b/src/core/hle/service/acc/acc.cpp
@@ -102,7 +102,8 @@ public:
             {150, nullptr, "CreateAuthorizationRequest"},
             {160, nullptr, "RequiresUpdateNetworkServiceAccountIdTokenCache"},
             {161, nullptr, "RequireReauthenticationOfNetworkServiceAccount"},
-            {170, nullptr, "CreateDeviceHistoryRequest"} // 17.0.0+
+            {170, nullptr, "CreateDeviceHistoryRequest"}, // 17.0.0+
+            {180, nullptr, "GetRequestForNintendoAccountReauthentication"} // 18.0.0+
         };
         // clang-format on
 
@@ -136,6 +137,7 @@ public:
             {13, nullptr, "GetLinkedNintendoAccountId"},
             {14, nullptr, "GetNickname"},
             {15, nullptr, "GetProfileImage"},
+            {16, nullptr, "GetProfileLargeImage"}, // 18.0.0+
             {21, nullptr, "LoadIdTokenCache"},
             {100, nullptr, "RegisterUser"}, // [1.0.0-3.0.2] RegisterAsync
             {101, nullptr, "RegisterUserWithUid"}, // [1.0.0-3.0.2] RegisterWithUidAsync
@@ -182,6 +184,7 @@ public:
             {160, nullptr, "RequiresUpdateNetworkServiceAccountIdTokenCache"},
             {161, nullptr, "RequireReauthenticationOfNetworkServiceAccount"},
             {170, nullptr, "CreateDeviceHistoryRequest"}, // 17.0.0+
+            {180, nullptr, "GetRequestForNintendoAccountReauthentication"}, // 18.0.0+
             {200, nullptr, "IsRegistered"},
             {201, nullptr, "RegisterAsync"},
             {202, nullptr, "UnregisterAsync"},
@@ -265,6 +268,7 @@ public:
             {101, nullptr, "GetLinkedNintendoAccountId"},
             {102, nullptr, "GetNickname"},
             {103, nullptr, "GetProfileImage"},
+            {104, nullptr, "GetProfileLargeImage"} // 18.0.0+
         };
         // clang-format on
 
@@ -319,6 +323,9 @@ public:
             {1, &IProfileCommon::GetBase, "GetBase"},
             {10, &IProfileCommon::GetImageSize, "GetImageSize"},
             {11, &IProfileCommon::LoadImage, "LoadImage"},
+            {20, nullptr, "GetLargeImageSize"}, // 18.0.0+
+            {21, nullptr, "LoadLargeImage"},    // 18.0.0+
+            {30, nullptr, "GetImageId"}         // 18.0.0+
         };
 
         RegisterHandlers(functions);
@@ -327,6 +334,7 @@ public:
             static const FunctionInfo editor_functions[] = {
                 {100, &IProfileCommon::Store, "Store"},
                 {101, &IProfileCommon::StoreWithImage, "StoreWithImage"},
+                {110, nullptr, "StoreWithLargeImage"} // 18.0.0+
             };
 
             RegisterHandlers(editor_functions);
@@ -532,6 +540,7 @@ public:
             {13, nullptr, "GetLinkedNintendoAccountId"},
             {14, nullptr, "GetNickname"},
             {15, nullptr, "GetProfileImage"},
+            {16, nullptr, "GetProfileLargeImage"}, // 18.0.0+
             {21, nullptr, "LoadIdTokenCache"}, // 3.0.0+
         };
         // clang-format on
@@ -686,13 +695,15 @@ public:
             {101, nullptr, "GetLinkedNintendoAccountId"},
             {102, nullptr, "GetNickname"},
             {103, nullptr, "GetProfileImage"},
+            {104, nullptr, "GetProfileLargeImage"}, // 18.0.0+
             {110, nullptr, "RegisterUserAsync"},
             {111, nullptr, "GetUid"},
             {200, nullptr, "ApplyResponseForUserCreationAsync"}, // 17.0.0+
             {205, nullptr, "SuspendAfterApplyResponse"}, // 17.0.0+
             {210, nullptr, "IsProfileAvailable"}, // 17.0.0+
             {220, nullptr, "RegisterUserAsyncWithoutProfile"}, // 17.0.0+
-            {221, nullptr, "RegisterUserWithProfileAsync"} // 17.0.0+
+            {221, nullptr, "RegisterUserWithProfileAsync"}, // 17.0.0+
+            {230, nullptr, "RegisterUserWithLargeImageProfileAsync"} // 18.0.0+
         };
         // clang-format on
 
diff --git a/src/core/hle/service/acc/acc_su.cpp b/src/core/hle/service/acc/acc_su.cpp
index e1f9ab1..cfe08da 100644
--- a/src/core/hle/service/acc/acc_su.cpp
+++ b/src/core/hle/service/acc/acc_su.cpp
@@ -58,6 +58,12 @@ ACC_SU::ACC_SU(std::shared_ptr<Module> module_, std::shared_ptr<ProfileManager>
         {290, nullptr, "ProxyProcedureForGuestLoginWithNintendoAccount"},
         {291, nullptr, "ProxyProcedureForFloatingRegistrationWithNintendoAccount"},
         {299, nullptr, "SuspendBackgroundDaemon"},
+        {400, nullptr, "SetPinCode"}, // 18.0.0+
+        {401, nullptr, "GetPinCodeLength"}, // 18.0.0+
+        {402, nullptr, "GetPinCode"}, // 18.0.0+
+        {410, nullptr, "GetPinCodeErrorCount"}, // 18.0.0+
+        {411, nullptr, "ResetPinCodeErrorCount"}, // 18.0.0+
+        {412, nullptr, "IncrementPinCodeErrorCount"}, // 18.0.0+
         {900, nullptr, "SetUserUnqualifiedForDebug"},
         {901, nullptr, "UnsetUserUnqualifiedForDebug"},
         {902, nullptr, "ListUsersUnqualifiedForDebug"},
diff --git a/src/core/hle/service/acc/acc_u1.cpp b/src/core/hle/service/acc/acc_u1.cpp
index 4ed54aa..2e303df 100644
--- a/src/core/hle/service/acc/acc_u1.cpp
+++ b/src/core/hle/service/acc/acc_u1.cpp
@@ -40,6 +40,8 @@ ACC_U1::ACC_U1(std::shared_ptr<Module> module_, std::shared_ptr<ProfileManager>
         {152, nullptr, "LoadSignedDeviceIdentifierCacheForNintendoAccount"},
         {190, nullptr, "GetUserLastOpenedApplication"},
         {191, nullptr, "ActivateOpenContextHolder"},
+        {401, nullptr, "GetPinCodeLength"}, // 18.0.0+
+        {402, nullptr, "GetPinCode"}, // 18.0.0+
         {997, nullptr, "DebugInvalidateTokenCacheForUser"},
         {998, nullptr, "DebugSetUserStateClose"},
         {999, nullptr, "DebugSetUserStateOpen"},
diff --git a/src/core/hle/service/audio/audio_device.cpp b/src/core/hle/service/audio/audio_device.cpp
index 0c61472..3f310d2 100644
--- a/src/core/hle/service/audio/audio_device.cpp
+++ b/src/core/hle/service/audio/audio_device.cpp
@@ -29,10 +29,12 @@ IAudioDevice::IAudioDevice(Core::System& system_, u64 applet_resource_user_id, u
         {12, D<&IAudioDevice::QueryAudioDeviceOutputEvent>, "QueryAudioDeviceOutputEvent"},
         {13, D<&IAudioDevice::GetActiveAudioDeviceName>, "GetActiveAudioOutputDeviceName"},
         {14, D<&IAudioDevice::ListAudioOutputDeviceName>, "ListAudioOutputDeviceName"},
-        {15, nullptr, "AcquireAudioInputDeviceNotification"},  // 17.0.0+
-        {16, nullptr, "ReleaseAudioInputDeviceNotification"},  // 17.0.0+
-        {17, nullptr, "AcquireAudioOutputDeviceNotification"}, // 17.0.0+
-        {18, nullptr, "ReleaseAudioOutputDeviceNotification"}  // 17.0.0+
+        {15, nullptr, "AcquireAudioInputDeviceNotification"},       // 17.0.0+
+        {16, nullptr, "ReleaseAudioInputDeviceNotification"},       // 17.0.0+
+        {17, nullptr, "AcquireAudioOutputDeviceNotification"},      // 17.0.0+
+        {18, nullptr, "ReleaseAudioOutputDeviceNotification"},      // 17.0.0+
+        {19, nullptr, "SetAudioDeviceOutputVolumeAutoTuneEnabled"}, // 18.0.0+
+        {20, nullptr, "IsAudioDeviceOutputVolumeAutoTuneEnabled"}   // 18.0.0+
     };
     RegisterHandlers(functions);
 
diff --git a/src/core/hle/service/friend/friend.cpp b/src/core/hle/service/friend/friend.cpp
index 519d61b..2bbbe5e 100644
--- a/src/core/hle/service/friend/friend.cpp
+++ b/src/core/hle/service/friend/friend.cpp
@@ -27,6 +27,7 @@ public:
             {10101, &IFriendService::GetFriendList, "GetFriendList"},
             {10102, nullptr, "UpdateFriendInfo"},
             {10110, nullptr, "GetFriendProfileImage"},
+            {10111, nullptr, "GetFriendProfileImageWithImageSize"}, // 18.0.0+
             {10120, &IFriendService::CheckFriendListAvailability, "CheckFriendListAvailability"},
             {10121, nullptr, "EnsureFriendListAvailable"},
             {10200, nullptr, "SendFriendRequestForApplication"},
@@ -35,6 +36,7 @@ public:
             {10420, &IFriendService::CheckBlockedUserListAvailability, "CheckBlockedUserListAvailability"},
             {10421, nullptr, "EnsureBlockedUserListAvailable"},
             {10500, nullptr, "GetProfileList"},
+            {10501, nullptr, "GetProfileListV2"}, // 18.0.0+
             {10600, nullptr, "DeclareOpenOnlinePlaySession"},
             {10601, &IFriendService::DeclareCloseOnlinePlaySession, "DeclareCloseOnlinePlaySession"},
             {10610, &IFriendService::UpdateUserPresence, "UpdateUserPresence"},
@@ -42,6 +44,7 @@ public:
             {10701, nullptr, "GetPlayHistoryRegistrationKeyWithNetworkServiceAccountId"},
             {10702, nullptr, "AddPlayHistory"},
             {11000, nullptr, "GetProfileImageUrl"},
+            {11001, nullptr, "GetProfileImageUrlV2"}, // 18.0.0+
             {20100, &IFriendService::GetFriendCount, "GetFriendCount"},
             {20101, &IFriendService::GetNewlyFriendCount, "GetNewlyFriendCount"},
             {20102, nullptr, "GetFriendDetailedInfo"},
diff --git a/src/core/hle/service/ldn/ldn.cpp b/src/core/hle/service/ldn/ldn.cpp
index 335f93a..09337ac 100644
--- a/src/core/hle/service/ldn/ldn.cpp
+++ b/src/core/hle/service/ldn/ldn.cpp
@@ -40,6 +40,7 @@ public:
         // clang-format off
         static const FunctionInfo functions[] = {
             {0, C<&ISystemServiceCreator::CreateSystemLocalCommunicationService>, "CreateSystemLocalCommunicationService"},
+            {1, nullptr, "CreateClientProcessMonitor"} // 18.0.0+
         };
         // clang-format on
 
@@ -62,6 +63,7 @@ public:
         // clang-format off
         static const FunctionInfo functions[] = {
             {0, C<&IUserServiceCreator::CreateUserLocalCommunicationService>, "CreateUserLocalCommunicationService"},
+            {1, nullptr, "CreateClientProcessMonitor"} // 18.0.0+
         };
         // clang-format on
 
diff --git a/src/core/hle/service/nifm/nifm.cpp b/src/core/hle/service/nifm/nifm.cpp
index 7422f43..d651db0 100644
--- a/src/core/hle/service/nifm/nifm.cpp
+++ b/src/core/hle/service/nifm/nifm.cpp
@@ -611,6 +611,13 @@ IGeneralService::IGeneralService(Core::System& system_)
         {41, nullptr, "GetAcceptableNetworkTypeFlag"},
         {42, nullptr, "NotifyConnectionStateChanged"},
         {43, nullptr, "SetWowlDelayedWakeTime"},
+        {44, nullptr, "IsWiredConnectionAvailable"}, // 18.0.0+
+        {45, nullptr, "IsNetworkEmulationFeatureEnabled"}, // 18.0.0+
+        {46, nullptr, "SelectActiveNetworkEmulationProfileIdForDebug"}, // 18.0.0+
+        {47, nullptr, "GetActiveNetworkEmulationProfileId"}, // 18.0.0+
+        {50, nullptr, "IsRewriteFeatureEnabled"}, // 18.0.0+
+        {51, nullptr, "CreateRewriteRule"}, // 18.0.0+
+        {52, nullptr, "DestroyRewriteRule"} // 18.0.0+
     };
     // clang-format on
 
diff --git a/src/core/hle/service/npns/npns.cpp b/src/core/hle/service/npns/npns.cpp
index 8064665..c96d165 100644
--- a/src/core/hle/service/npns/npns.cpp
+++ b/src/core/hle/service/npns/npns.cpp
@@ -24,10 +24,14 @@ public:
             {4, nullptr, "ReceiveRaw"},
             {5, C<&INpnsSystem::GetReceiveEvent>, "GetReceiveEvent"},
             {6, nullptr, "ListenUndelivered"},
-            {7, nullptr, "GetStateChangeEVent"},
+            {7, nullptr, "GetStateChangeEvent"},
+            {8, nullptr, "ListenToByName"}, // 18.0.0+
             {11, nullptr, "SubscribeTopic"},
             {12, nullptr, "UnsubscribeTopic"},
             {13, nullptr, "QueryIsTopicExist"},
+            {14, nullptr, "SubscribeTopicByAccount"}, // 18.0.0+
+            {15, nullptr, "UnsubscribeTopicByAccount"}, // 18.0.0+
+            {16, nullptr, "DownloadSubscriptionList"}, // 18.0.0+
             {21, nullptr, "CreateToken"},
             {22, nullptr, "CreateTokenWithApplicationId"},
             {23, nullptr, "DestroyToken"},
@@ -35,23 +39,29 @@ public:
             {25, nullptr, "QueryIsTokenValid"},
             {26, nullptr, "ListenToMyApplicationId"},
             {27, nullptr, "DestroyTokenAll"},
+            {28, nullptr, "CreateTokenWithName"}, // 18.0.0+
+            {29, nullptr, "DestroyTokenWithName"}, // 18.0.0+
             {31, nullptr, "UploadTokenToBaaS"},
             {32, nullptr, "DestroyTokenForBaaS"},
             {33, nullptr, "CreateTokenForBaaS"},
             {34, nullptr, "SetBaaSDeviceAccountIdList"},
             {35, nullptr, "LinkNsaId"}, // 17.0.0+
             {36, nullptr, "UnlinkNsaId"}, // 17.0.0+
+            {37, nullptr, "RelinkNsaId"}, // 18.0.0+
             {40, nullptr, "GetNetworkServiceAccountIdTokenRequestEvent"}, // 17.0.0+
             {41, nullptr, "TryPopNetworkServiceAccountIdTokenRequestUid"}, // 17.0.0+
             {42, nullptr, "SetNetworkServiceAccountIdTokenSuccess"}, // 17.0.0+
             {43, nullptr, "SetNetworkServiceAccountIdTokenFailure"}, // 17.0.0+
             {44, nullptr, "SetUidList"}, // 17.0.0+
             {45, nullptr, "PutDigitalTwinKeyValue"}, // 17.0.0+
+            {51, nullptr, "DeleteDigitalTwinKeyValue"}, // 18.0.0+
             {101, nullptr, "Suspend"},
             {102, nullptr, "Resume"},
             {103, nullptr, "GetState"},
             {104, nullptr, "GetStatistics"},
             {105, nullptr, "GetPlayReportRequestEvent"},
+            {106, nullptr, "GetLastNotifiedTime"}, // 18.0.0+
+            {107, nullptr, "SetLastNotifiedTime"}, // 18.0.0+
             {111, nullptr, "GetJid"},
             {112, nullptr, "CreateJid"},
             {113, nullptr, "DestroyJid"},
@@ -63,10 +73,17 @@ public:
             {153, nullptr, "GetDropEventWithHandover"},
             {154, nullptr, "CreateTokenAsync"},
             {155, nullptr, "CreateTokenAsyncWithApplicationId"},
+            {156, nullptr, "CreateTokenWithNameAsync"}, // 18.0.0+
             {161, nullptr, "GetRequestChangeStateCancelEvent"},
             {162, nullptr, "RequestChangeStateForceTimedWithCancelEvent"},
             {201, nullptr, "RequestChangeStateForceTimed"},
             {202, nullptr, "RequestChangeStateForceAsync"},
+            {301, nullptr, "GetPassword"}, // 18.0.0+
+            {302, nullptr, "GetAllImmigration"}, // 18.0.0+
+            {303, nullptr, "GetNotificationHistories"}, // 18.0.0+
+            {304, nullptr, "GetPersistentConnectionSummary"}, // 18.0.0+
+            {305, nullptr, "GetDigitalTwinSummary"}, // 18.0.0+
+            {306, nullptr, "GetDigitalTwinValue"}, // 18.0.0+
         };
         // clang-format on
 
@@ -106,7 +123,8 @@ public:
             {3, nullptr, "Receive"},
             {4, nullptr, "ReceiveRaw"},
             {5, nullptr, "GetReceiveEvent"},
-            {7, nullptr, "GetStateChangeEVent"},
+            {7, nullptr, "GetStateChangeEvent"},
+            {8, nullptr, "ListenToByName"}, // 18.0.0+
             {21, nullptr, "CreateToken"},
             {23, nullptr, "DestroyToken"},
             {25, nullptr, "QueryIsTokenValid"},
diff --git a/src/core/hle/service/pctl/parental_control_service.cpp b/src/core/hle/service/pctl/parental_control_service.cpp
index 64876ea..e088879 100644
--- a/src/core/hle/service/pctl/parental_control_service.cpp
+++ b/src/core/hle/service/pctl/parental_control_service.cpp
@@ -86,6 +86,7 @@ IParentalControlService::IParentalControlService(Core::System& system_, Capabili
         {1472, nullptr, "CancelNetworkRequest"},
         {1473, D<&IParentalControlService::GetUnlinkedEvent>, "GetUnlinkedEvent"},
         {1474, nullptr, "ClearUnlinkedEvent"},
+        {1475, nullptr, "GetExtendedPlayTimerEvent"}, // 18.0.0+
         {1601, nullptr, "DisableAllFeatures"},
         {1602, nullptr, "PostEnableAllFeatures"},
         {1603, nullptr, "IsAllFeaturesDisabled"},
@@ -101,6 +102,10 @@ IParentalControlService::IParentalControlService(Core::System& system_, Capabili
         {1951, nullptr, "SetPlayTimerSettingsForDebug"},
         {1952, nullptr, "GetPlayTimerSpentTimeForTest"},
         {1953, nullptr, "SetPlayTimerAlarmDisabledForDebug"},
+        {1954, nullptr, "IsBedtimeAlarmEnabled"}, // 18.0.0+
+        {1955, nullptr, "GetBedtimeAlarmTime"}, // 18.0.0+
+        {1956, nullptr, "GetBedtimeAlarmTimeHour"}, // 18.0.0+
+        {1957, nullptr, "GetBedtimeAlarmTimeMinute"}, // 18.0.0+
         {2001, nullptr, "RequestPairingAsync"},
         {2002, nullptr, "FinishRequestPairing"},
         {2003, nullptr, "AuthorizePairingAsync"},
@@ -117,6 +122,8 @@ IParentalControlService::IParentalControlService(Core::System& system_, Capabili
         {2014, nullptr, "FinishSynchronizeParentalControlSettings"},
         {2015, nullptr, "FinishSynchronizeParentalControlSettingsWithLastUpdated"},
         {2016, nullptr, "RequestUpdateExemptionListAsync"},
+        {145601, nullptr, "GetPlayTimerSettingsVer2"}, // 18.0.0+
+        {195101, nullptr, "SetPlayTimerSettingsForDebugVer2"} // 18.0.0+
     };
     // clang-format on
     RegisterHandlers(functions);
diff --git a/src/core/hle/service/pctl/pctl_module.cpp b/src/core/hle/service/pctl/pctl_module.cpp
index 4d19abc..a7d5579 100644
--- a/src/core/hle/service/pctl/pctl_module.cpp
+++ b/src/core/hle/service/pctl/pctl_module.cpp
@@ -99,6 +99,7 @@ public:
             {1472, nullptr, "CancelNetworkRequest"},
             {1473, &IParentalControlService::GetUnlinkedEvent, "GetUnlinkedEvent"},
             {1474, nullptr, "ClearUnlinkedEvent"},
+            {1475, nullptr, "GetExtendedPlayTimerEvent"}, // 18.0.0+
             {1601, nullptr, "DisableAllFeatures"},
             {1602, nullptr, "PostEnableAllFeatures"},
             {1603, nullptr, "IsAllFeaturesDisabled"},
@@ -114,6 +115,10 @@ public:
             {1951, nullptr, "SetPlayTimerSettingsForDebug"},
             {1952, nullptr, "GetPlayTimerSpentTimeForTest"},
             {1953, nullptr, "SetPlayTimerAlarmDisabledForDebug"},
+            {1954, nullptr, "IsBedtimeAlarmEnabled"}, // 18.0.0+
+            {1955, nullptr, "GetBedtimeAlarmTime"}, // 18.0.0+
+            {1956, nullptr, "GetBedtimeAlarmTimeHour"}, // 18.0.0+
+            {1957, nullptr, "GetBedtimeAlarmTimeMinute"}, // 18.0.0+
             {2001, nullptr, "RequestPairingAsync"},
             {2002, nullptr, "FinishRequestPairing"},
             {2003, nullptr, "AuthorizePairingAsync"},
@@ -130,6 +135,8 @@ public:
             {2014, nullptr, "FinishSynchronizeParentalControlSettings"},
             {2015, nullptr, "FinishSynchronizeParentalControlSettingsWithLastUpdated"},
             {2016, nullptr, "RequestUpdateExemptionListAsync"},
+            {145601, nullptr, "GetPlayTimerSettingsVer2"}, // 18.0.0+
+            {195101, nullptr, "SetPlayTimerSettingsForDebugVer2"} // 18.0.0+
         };
         // clang-format on
         RegisterHandlers(functions);