diff --git a/src/xenia/xbox.h b/src/xenia/xbox.h
index 484bcafe8..87bc5455e 100644
--- a/src/xenia/xbox.h
+++ b/src/xenia/xbox.h
@@ -272,6 +272,13 @@ constexpr uint8_t XUserIndexAny = 0xFF;
 // https://github.com/ThirteenAG/Ultimate-ASI-Loader/blob/master/source/xlive/xliveless.h
 typedef uint32_t XNotificationID;
 enum : XNotificationID {
+  /* Notes:
+     - Notification Ids are split into three Sections: Area, Version, and
+     Message Id.
+     - Each Area has the potential to hold 65535 unique notifications as it
+     always starts at 1.
+  */
+
   // Notification Areas
   kXNotifySystem = 0x00000001,
   kXNotifyLive = 0x00000002,
@@ -283,28 +290,28 @@ enum : XNotificationID {
   kXNotifyParty = 0x00000080,
   kXNotifyAll = 0x000000EF,
 
-  // XNotification System (35 total)
+  // XNotification System
   kXNotificationSystemUI = 0x00000009,
   kXNotificationSystemSignInChanged = 0x0000000A,
   kXNotificationSystemStorageDevicesChanged = 0x0000000B,
   kXNotificationSystemProfileSettingChanged = 0x0000000E,
   kXNotificationSystemMuteListChanged = 0x00000011,
   kXNotificationSystemInputDevicesChanged = 0x00000012,
-  kXNotificationSystemInputDeviceConfigChanged = 0x00000013,
-  kXNotificationSystemPlayerTimerNotice = 0x00000015,
-  kXNotificationSystemPXLiveSystemUpdate = 0x00000016,
-  kXNotificationSystemAvatarChanged = 0x00000017,
-  kXNotificationSystemUnknown = 0x00000018,
-  kXNotificationSystemNUIHardwareStatusChanged = 0x00000019,
-  kXNotificationSystemNUIPause = 0x0000001A,
-  kXNotificationSystemNUIUIApproach = 0x0000001B,
-  kXNotificationSystemDeviceRemap = 0x0000001C,
-  kXNotificationSystemNUIBindingChanged = 0x0000001D,
-  kXNotificationSystemAudioLatencyChanged = 0x0000001E,
-  kXNotificationSystemNUIChatBindingChanged = 0x0000001F,
-  kXNotificationSystemInputActivityChanged = 0x00000020,
+  kXNotificationSystemXLiveTitleUpdate = 0x00000015,
+  kXNotificationSystemXLiveSystemUpdate = 0x00000016,
+  kXNotificationSystemInputDeviceConfigChanged = 0x00010013,
+  kXNotificationSystemPlayerTimerNotice = 0x00030015,
+  kXNotificationSystemAvatarChanged = 0x00040017,
+  kXNotificationSystemNUIHardwareStatusChanged = 0x00060019,
+  kXNotificationSystemNUIPause = 0x0006001A,
+  kXNotificationSystemNUIUIApproach = 0x0006001B,
+  kXNotificationSystemDeviceRemap = 0x0006001C,
+  kXNotificationSystemNUIBindingChanged = 0x0006001D,
+  kXNotificationSystemAudioLatencyChanged = 0x0008001E,
+  kXNotificationSystemNUIChatBindingChanged = 0x0008001F,
+  kXNotificationSystemInputActivityChanged = 0x00009020,
 
-  // XNotification Live (20 total)
+  // XNotification Live
   kXNotificationLiveConnectionChanged = 0x02000001,
   kXNotificationLiveInviteAccepted = 0x02000002,
   kXNotificationLiveLinkStateChanged = 0x02000003,
@@ -312,32 +319,28 @@ enum : XNotificationID {
   kXNotificationLiveMembershipPurchased = 0x02000008,
   kXNotificationLiveVoicechatAway = 0x02000009,
   kXNotificationLivePresenceChanged = 0x0200000A,
-  kXNotificationLiveUnknown = 0x02000012,
 
-  // XNotification Friends (9 total)
+  // XNotification Friends
   kXNotificationFriendsPresenceChanged = 0x04000001,
   kXNotificationFriendsFriendAdded = 0x04000002,
   kXNotificationFriendsFriendRemoved = 0x04000003,
-  kXNotificationFriendsUnknown = 0x04000008,
 
-  // XNotification Custom (5 total)
+  // XNotification Custom
   kXNotificationCustomActionPressed = 0x06000003,
-  kXNotificationCustomGamercard = 0x06000004,
+  kXNotificationCustomGamercard = 0x06010004,
 
   // XNotification Dvd ?
   kXNotificationDvdDriveUnknown = 0x80000003,
   kXNotificationDvdDriveUnknownDashContext = 0x8000000C,
   kXNotificationDvdDriveTrayStateChanged = 0x8000000D,
 
-  // XNotification XMP (13 total)
+  // XNotification XMP
   kXNotificationXmpStateChanged = 0x0A000001,
   kXNotificationXmpPlaybackBehaviorChanged = 0x0A000002,
   kXNotificationXmpPlaybackControllerChanged = 0x0A000003,
-  kXNotificationXmpUnknown = 0x0A00000C,
 
-  // XNotification Party (6 total)
-  kXNotificationPartyMembersChanged = 0x0E000002,
-  kXNotificationFriendUnknown = 0x0E000005,
+  // XNotification Party
+  kXNotificationPartyMembersChanged = 0x0E040002,
 
   // XNotification Msgr
   kXNotificationMsgrUnknown = 0x0C00000E,