From e20079bc2cc46349c703367bd1010beb534699d8 Mon Sep 17 00:00:00 2001
From: Tiger <tiger@stargazer-developments.com>
Date: Sat, 14 Oct 2023 18:21:53 +0200
Subject: [PATCH] Changed packet header names to Nitro's packet header names
 and make sure the events+composer files match Nitro as well (classname and
 namespace)

---
 .../RequestAchievementsMessageEvent.cs}       |   8 +-
 .../Incoming/Catalog/GetCatalogIndexEvent.cs  |   4 +-
 .../Incoming/Catalog/GetCatalogPageEvent.cs   |   2 +-
 ...veEvent.cs => InfoRetrieveMessageEvent.cs} |  10 +-
 ...icketEvent.cs => SsoTicketMessageEvent.cs} |  14 +-
 .../Messages/Incoming/IncomingHeaders.cs      | 948 +++++++++--------
 ...etBadgesEvent.cs => RequestBadgesEvent.cs} |   6 +-
 .../Badges/SetActivatedBadgesEvent.cs         |   6 +-
 .../UserCurrencyEvent.cs}                     |  14 +-
 ...ssageEvent.cs => GetPromoArticlesEvent.cs} |   8 +-
 .../Data/UserCurrentBadgesEvent.cs}           |  12 +-
 .../Data/UserFigureEvent.cs}                  |   8 +-
 .../Data/UserProfileEvent.cs}                 |  12 +-
 .../Outgoing/Avatar/FigureUpdateComposer.cs   |   2 +-
 .../Catalog/CatalogPageMessageComposer.cs     |   2 +-
 ...omposer.cs => CatalogPagesListComposer.cs} |   6 +-
 .../Achievements/AchievementComposer.cs       |   2 +-
 .../Achievements/AchievementsComposer.cs      |   2 +-
 .../Achievements/AchievementsScoreComposer.cs |   2 +-
 .../Inventory/Badges/BadgesComposer.cs        |   2 +-
 .../Currency/UserCreditsComposer.cs}          |   8 +-
 .../Currency/UserCurrencyComposer.cs}         |   8 +-
 ...ser.cs => PromoArticlesMessageComposer.cs} |   6 +-
 .../AchievementNotificationMessageComposer.cs |   2 +-
 ...ctivityPointNotificationMessageComposer.cs |   2 +-
 .../HabboBroadcastMessageComposer.cs          |   4 +-
 .../Messages/Outgoing/OutgoingHeaders.cs      | 974 +++++++++---------
 .../AuthenticatedComposer.cs}                 |   6 +-
 .../Data/UserCurrentBadgesComposer.cs}        |   8 +-
 .../Data/UserInfoComposer.cs}                 |   8 +-
 .../Data/UserProfileComposer.cs}              |   8 +-
 TigerEmu.csproj                               |   3 +
 32 files changed, 1028 insertions(+), 1079 deletions(-)
 rename Communication/Messages/Incoming/{Inventory/Achievements/GetAchievementsEvent.cs => Achievement/RequestAchievementsMessageEvent.cs} (75%)
 rename Communication/Messages/Incoming/Handshake/{InfoRetrieveEvent.cs => InfoRetrieveMessageEvent.cs} (62%)
 rename Communication/Messages/Incoming/Handshake/{SsoTicketEvent.cs => SsoTicketMessageEvent.cs} (76%)
 rename Communication/Messages/Incoming/Inventory/Badges/{GetBadgesEvent.cs => RequestBadgesEvent.cs} (79%)
 rename Communication/Messages/Incoming/Inventory/{Purse/GetCreditsInfoEvent.cs => Currency/UserCurrencyEvent.cs} (52%)
 rename Communication/Messages/Incoming/Landingview/{GetPromoArticlesMessageEvent.cs => GetPromoArticlesEvent.cs} (73%)
 rename Communication/Messages/Incoming/{Users/GetSelectedBadgesMessageEvent.cs => User/Data/UserCurrentBadgesEvent.cs} (63%)
 rename Communication/Messages/Incoming/{Register/UpdateFigureDataMessageEvent.cs => User/Data/UserFigureEvent.cs} (81%)
 rename Communication/Messages/Incoming/{Users/GetExtendedProfileEvent.cs => User/Data/UserProfileEvent.cs} (68%)
 rename Communication/Messages/Outgoing/Catalog/{CatalogIndexMessageComposer.cs => CatalogPagesListComposer.cs} (85%)
 rename Communication/Messages/Outgoing/{Users/CreditBalanceComposer.cs => Inventory/Currency/UserCreditsComposer.cs} (54%)
 rename Communication/Messages/Outgoing/{Notifications/ActivityPointsComposer.cs => Inventory/Currency/UserCurrencyComposer.cs} (65%)
 rename Communication/Messages/Outgoing/Landingview/{PromoArticlesComposer.cs => PromoArticlesMessageComposer.cs} (86%)
 rename Communication/Messages/Outgoing/{Generic/Alerts => Notifications}/HabboBroadcastMessageComposer.cs (74%)
 rename Communication/Messages/Outgoing/{Handshake/AuthenticationOkMessageComposer.cs => Security/AuthenticatedComposer.cs} (59%)
 rename Communication/Messages/Outgoing/{Users/HabboUserBadgesMessageComposer.cs => User/Data/UserCurrentBadgesComposer.cs} (66%)
 rename Communication/Messages/Outgoing/{Handshake/UserObjectMessageComposer.cs => User/Data/UserInfoComposer.cs} (80%)
 rename Communication/Messages/Outgoing/{Users/ExtendedProfileComposer.cs => User/Data/UserProfileComposer.cs} (80%)

diff --git a/Communication/Messages/Incoming/Inventory/Achievements/GetAchievementsEvent.cs b/Communication/Messages/Incoming/Achievement/RequestAchievementsMessageEvent.cs
similarity index 75%
rename from Communication/Messages/Incoming/Inventory/Achievements/GetAchievementsEvent.cs
rename to Communication/Messages/Incoming/Achievement/RequestAchievementsMessageEvent.cs
index 667a451..6452ffc 100644
--- a/Communication/Messages/Incoming/Inventory/Achievements/GetAchievementsEvent.cs
+++ b/Communication/Messages/Incoming/Achievement/RequestAchievementsMessageEvent.cs
@@ -4,20 +4,20 @@ using Tiger.Communication.Messages.Types;
 using Tiger.Game.Achievements;
 using Tiger.Networking.Game.Sessions;
 
-namespace Tiger.Communication.Messages.Incoming.Inventory.Achievements;
+namespace Tiger.Communication.Messages.Incoming.Achievement;
 
-public class GetAchievementsEvent : IMessageEvent
+public class RequestAchievementsMessageEvent : IMessageEvent
 {
     private readonly IGameSessionManager _gameSessionManager;
     private readonly IAchievementManager _achievementManager;
 
-    public GetAchievementsEvent(IGameSessionManager gameSessionManager, IAchievementManager achievementManager)
+    public RequestAchievementsMessageEvent(IGameSessionManager gameSessionManager, IAchievementManager achievementManager)
     {
         _gameSessionManager = gameSessionManager;
         _achievementManager = achievementManager;
     }
     
-    public IncomingHeaders Header => IncomingHeaders.GetAchievementsEvent;
+    public IncomingHeaders Header => IncomingHeaders.AchievementList;
     public async Task HandleAsync(GameSession gameSession, ClientMessage request)
     {
         if (gameSession.Habbo == null)
diff --git a/Communication/Messages/Incoming/Catalog/GetCatalogIndexEvent.cs b/Communication/Messages/Incoming/Catalog/GetCatalogIndexEvent.cs
index c246719..90c5969 100644
--- a/Communication/Messages/Incoming/Catalog/GetCatalogIndexEvent.cs
+++ b/Communication/Messages/Incoming/Catalog/GetCatalogIndexEvent.cs
@@ -17,7 +17,7 @@ public class GetCatalogIndexEvent : IMessageEvent
         _gameSessionManager = gameSessionManager;
     }
 
-    public IncomingHeaders Header => IncomingHeaders.GetCatalogIndexEvent;
+    public IncomingHeaders Header => IncomingHeaders.GetCatalogIndex;
     public async Task HandleAsync(GameSession gameSession, ClientMessage request)
     {
         if (gameSession.Habbo == null)
@@ -28,7 +28,7 @@ public class GetCatalogIndexEvent : IMessageEvent
         
         var categories = _catalogueManager.Pages.Values.Where(p => p.Parent is null);
 
-        await gameSession.SendComposerAsync(new CatalogIndexMessageComposer(categories,
+        await gameSession.SendComposerAsync(new CatalogPagesListComposer(categories,
             request.ReadString() ?? "normal"));
     }
 }
\ No newline at end of file
diff --git a/Communication/Messages/Incoming/Catalog/GetCatalogPageEvent.cs b/Communication/Messages/Incoming/Catalog/GetCatalogPageEvent.cs
index 2afccf6..8582409 100644
--- a/Communication/Messages/Incoming/Catalog/GetCatalogPageEvent.cs
+++ b/Communication/Messages/Incoming/Catalog/GetCatalogPageEvent.cs
@@ -17,7 +17,7 @@ public class GetCatalogPageEvent : IMessageEvent
         _gameSessionManager = gameSessionManager;
     }
     
-    public IncomingHeaders Header => IncomingHeaders.GetCatalogPageEvent;
+    public IncomingHeaders Header => IncomingHeaders.GetCatalogPage;
     public async Task HandleAsync(GameSession gameSession, ClientMessage request)
     {
         if (gameSession.Habbo == null)
diff --git a/Communication/Messages/Incoming/Handshake/InfoRetrieveEvent.cs b/Communication/Messages/Incoming/Handshake/InfoRetrieveMessageEvent.cs
similarity index 62%
rename from Communication/Messages/Incoming/Handshake/InfoRetrieveEvent.cs
rename to Communication/Messages/Incoming/Handshake/InfoRetrieveMessageEvent.cs
index 222e5f9..c703a6b 100644
--- a/Communication/Messages/Incoming/Handshake/InfoRetrieveEvent.cs
+++ b/Communication/Messages/Incoming/Handshake/InfoRetrieveMessageEvent.cs
@@ -1,20 +1,20 @@
 using Tiger.Communication.Messages.Interfaces;
-using Tiger.Communication.Messages.Outgoing.Handshake;
+using Tiger.Communication.Messages.Outgoing.User.Data;
 using Tiger.Communication.Messages.Types;
 using Tiger.Networking.Game.Sessions;
 
 namespace Tiger.Communication.Messages.Incoming.Handshake;
 
-public class InfoRetrieveEvent : IMessageEvent
+public class InfoRetrieveMessageEvent : IMessageEvent
 {
     private readonly IGameSessionManager _gameSessionManager;
 
-    public InfoRetrieveEvent(IGameSessionManager gameSessionManager)
+    public InfoRetrieveMessageEvent(IGameSessionManager gameSessionManager)
     {
         _gameSessionManager = gameSessionManager;
     }
 
-    public IncomingHeaders Header => IncomingHeaders.InfoRetrieveEvent;
+    public IncomingHeaders Header => IncomingHeaders.UserInfo;
     public async Task HandleAsync(GameSession gameSession, ClientMessage request)
     {
         if (gameSession.Habbo == null)
@@ -23,6 +23,6 @@ public class InfoRetrieveEvent : IMessageEvent
             return;
         }
 
-        await gameSession.SendComposerAsync(new UserObjectMessageComposer(gameSession.Habbo));
+        await gameSession.SendComposerAsync(new UserInfoComposer(gameSession.Habbo));
     }
 }
\ No newline at end of file
diff --git a/Communication/Messages/Incoming/Handshake/SsoTicketEvent.cs b/Communication/Messages/Incoming/Handshake/SsoTicketMessageEvent.cs
similarity index 76%
rename from Communication/Messages/Incoming/Handshake/SsoTicketEvent.cs
rename to Communication/Messages/Incoming/Handshake/SsoTicketMessageEvent.cs
index 2e809b0..6c7e28f 100644
--- a/Communication/Messages/Incoming/Handshake/SsoTicketEvent.cs
+++ b/Communication/Messages/Incoming/Handshake/SsoTicketMessageEvent.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Logging;
 using Tiger.Communication.Messages.Interfaces;
-using Tiger.Communication.Messages.Outgoing.Generic.Alerts;
-using Tiger.Communication.Messages.Outgoing.Handshake;
+using Tiger.Communication.Messages.Outgoing.Notifications;
+using Tiger.Communication.Messages.Outgoing.Security;
 using Tiger.Communication.Messages.Types;
 using Tiger.Game.Achievements;
 using Tiger.Game.Habbos;
@@ -11,15 +11,15 @@ using Tiger.Storage;
 
 namespace Tiger.Communication.Messages.Incoming.Handshake;
 
-public class SsoTicketEvent : IMessageEvent
+public class SsoTicketMessageEvent : IMessageEvent
 {
     private readonly IRepository<Habbo> _habboRepository;
     private readonly IGameSessionManager _gameSessionManager;
     private readonly ISettingManager _settingManager;
-    private readonly ILogger<SsoTicketEvent> _logger;
+    private readonly ILogger<SsoTicketMessageEvent> _logger;
     private readonly IAchievementManager _achievementManager;
 
-    public SsoTicketEvent(IRepository<Habbo> habboRepository, IGameSessionManager gameSessionManager, ISettingManager settingManager, ILogger<SsoTicketEvent> logger, IAchievementManager achievementManager)
+    public SsoTicketMessageEvent(IRepository<Habbo> habboRepository, IGameSessionManager gameSessionManager, ISettingManager settingManager, ILogger<SsoTicketMessageEvent> logger, IAchievementManager achievementManager)
     {
         _habboRepository = habboRepository;
         _gameSessionManager = gameSessionManager;
@@ -28,7 +28,7 @@ public class SsoTicketEvent : IMessageEvent
         _achievementManager = achievementManager;
     }
 
-    public IncomingHeaders Header => IncomingHeaders.SSoTicketEvent;
+    public IncomingHeaders Header => IncomingHeaders.SecurityTicket;
 
     public async Task HandleAsync(GameSession gameSession, ClientMessage request)
     {
@@ -60,7 +60,7 @@ public class SsoTicketEvent : IMessageEvent
 
         _logger.LogInformation("{User} logged in", gameSession.Habbo.Username);
         
-        await gameSession.SendComposerAsync(new AuthenticationOkMessageComposer());
+        await gameSession.SendComposerAsync(new AuthenticatedComposer());
         await gameSession.SendComposerAsync(new HabboBroadcastMessageComposer(
             _settingManager.GetSetting<string>("welcome.message")
                 .Replace("{user}", gameSession.Habbo.Username)
diff --git a/Communication/Messages/Incoming/IncomingHeaders.cs b/Communication/Messages/Incoming/IncomingHeaders.cs
index 6023ad6..60bb11c 100644
--- a/Communication/Messages/Incoming/IncomingHeaders.cs
+++ b/Communication/Messages/Incoming/IncomingHeaders.cs
@@ -2,490 +2,468 @@ namespace Tiger.Communication.Messages.Incoming;
 
 public enum IncomingHeaders : short
 {
-    AcceptFriendEvent = 137,
-    AcceptTradingEvent = 3863,
-    AddAdminRightsToMemberEvent = 2894,
-    AddFavouriteRoomEvent = 3817,
-    AddItemToTradeEvent = 3107,
-    AddItemsToTradeEvent = 1263,
-    AddJukeboxDiskEvent = 753,
-    AddSpamWallPostItEvent = 3283,
-    AmbassadorAlertEvent = 2996,
-    AnswerPollEvent = 3505,
-    ApplySnapshotEvent = 3373,
-    ApproveMembershipRequestEvent = 3386,
-    ApproveNameEvent = 2109,
-    AssignRightsEvent = 808,
-    AvatarEffectActivatedEvent = 2959,
-    AvatarEffectSelectedEvent = 1752,
-    AvatarExpressionEvent = 2456,
-    BanUserWithDurationEvent = 1477,
-    BreedPetsEvent = 1638,
-    BuildersClubPlaceWallItemEvent = 2462,
-    BuildersClubQueryFurniCountEvent = 2529,
-    BuyMarketplaceOfferEvent = 1603,
-    CallForHelpEvent = 1691,
-    CallForHelpFromForumMessageEvent = 1412,
-    CallForHelpFromForumThreadEvent = 534,
-    CallForHelpFromImEvent = 2950,
-    CallForHelpFromPhotoEvent = 2492,
-    CanCreateRoomEvent = 2128,
-    CancelMarketplaceOfferEvent = 434,
-    CancelPetBreedingEvent = 2713,
-    CancelTypingEvent = 1474,
-    ChangeMottoEvent = 2228,
-    ChangePostureEvent = 2235,
-    ChangeUserNameEvent = 2977,
-    ChatEvent = 1314,
-    ChatReviewGuideDecidesOnOfferEvent = 3365,
-    ChatReviewGuideDetachedEvent = 2501,
-    ChatReviewGuideVoteEvent = 3961,
-    ChatReviewSessionCreateEvent = 3060,
-    CheckUserNameEvent = 3950,
-    ClientHelloEvent = 4000,
-    CloseIssueDefaultActionEvent = 2717,
-    CloseIssuesEvent = 2067,
-    CloseTradingEvent = 2551,
-    CommandBotEvent = 2624,
-    CompleteDiffieHandshakeEvent = 773,
-    CompostPlantEvent = 3835,
-    ConfirmAcceptTradingEvent = 2760,
-    ConfirmDeclineTradingEvent = 2341,
-    ConfirmPetBreedingEvent = 3382,
-    ControlYoutubeDisplayPlaybackEvent = 3005,
-    CraftEvent = 3591,
-    CraftSecretEvent = 1251,
-    CreateFlatEvent = 2752,
-    CreateGuildEvent = 230,
-    CreditFurniRedeemEvent = 3115,
-    CustomizeAvatarWithFurniEvent = 3374,
-    CustomizePetWithFurniEvent = 1328,
-    DanceEvent = 2080,
-    DeactivateGuildEvent = 1134,
-    DeclineFriendEvent = 2890,
-    DeleteFavouriteRoomEvent = 309,
-    DeleteRoomEvent = 532,
-    DeselectFavouriteHabboGroupEvent = 1820,
-    DiceOffEvent = 1533,
-    DropCarryItemEvent = 2814,
-    EditEventEvent = 3991,
-    EnterOneWayDoorEvent = 2765,
-    EventLogEvent = 3457,
-    FindNewFriendsEvent = 516,
-    FollowFriendEvent = 2970,
-    ForwardToSomeRoomEvent = 1703,
-    FriendFurniConfirmLockEvent = 3775,
-    Game2GetAccountGameStatusEvent = 11,
-    GameUnloadedEvent = 3207,
-    GetAchievementsEvent = 219,
-    GetBadgePointLimitsEvent = 1371,
-    GetBadgesEvent = 2769,
-    GetBannedUsersFromRoomEvent = 2267,
-    GetBonusRareInfoEvent = 957,
-    GetBotCommandConfigurationDataEvent = 1986,
-    GetBotInventoryEvent = 3848,
-    GetBundleDiscountRulesetEvent = 223,
-    GetCatalogIndexEvent = 1195,
-    GetCatalogPageEvent = 412,
-    GetCfhChatlogEvent = 211,
-    GetCfhStatusEvent = 2746,
+    AchievementList = 219,
+    Authentication = -1,
+    BotConfiguration = 1986,
+    BotPickup = 3323,
+    BotPlace = 1592,
+    BotSkillSave = 2624,
+    GetClubOffers = 3285,
     GetClubGiftInfo = 487,
-    GetClubOffersEvent = 3285,
-    GetCraftableProductsEvent = 633,
-    GetCraftingRecipeEvent = 1173,
-    GetCraftingRecipesAvailableEvent = 3086,
-    GetCreditsInfoEvent = 273,
-    GetCurrentTimingCodeEvent = 2912,
-    GetCustomRoomFilterEvent = 1911,
-    GetExtendedProfileEvent = 3265,
-    GetFlatControllersEvent = 3385,
-    GetForumStatsEvent = 3149,
-    GetForumsListEvent = 873,
-    GetFriendRequestsEvent = 2448,
-    GetFurnitureAliasesEvent = 3898,
-    GetGameListEvent = 741,
-    GetGameStatusEvent = 3171,
-    GetGiftWrappingConfigurationEvent = 418,
-    GetGuestRoomEvent = 2230,
-    GetGuideReportingStatusEvent = 3786,
-    GetGuildCreationInfoEvent = 798,
-    GetGuildEditInfoEvent = 1004,
-    GetGuildEditorDataEvent = 813,
-    GetGuildFurniContextMenuInfoEvent = 2651,
-    GetGuildMembersEvent = 312,
-    GetGuildMembershipsEvent = 367,
-    GetHabboGroupBadgesEvent = 21,
-    GetHabboGroupDetailsEvent = 2991,
-    GetIgnoredUsersEvent = 3878,
-    GetItemDataEvent = 3964,
-    GetJukeboxPlayListEvent = 1435,
-    GetLimitedOfferAppearingNextEvent = 410,
-    GetMotdEvent = 1523,
-    GetMarketplaceCanMakeOfferEvent = 848,
-    GetMarketplaceConfigurationEvent = 2597,
-    GetMarketplaceItemStatsEvent = 3288,
-    GetMarketplaceOffersEvent = 2407,
-    GetMarketplaceOwnOffersEvent = 2105,
-    GetMemberGuildItemCountEvent = 3593,
-    GetMessagesEvent = 232,
-    GetModeratorRoomInfoEvent = 707,
-    GetModeratorUserInfoEvent = 3295,
-    GetNowPlayingEvent = 1325,
-    GetOccupiedTilesEvent = 1687,
-    GetOfficialSongIdEvent = 3189,
-    GetPendingCallsForHelpEvent = 3267,
-    GetPetCommandsEvent = 2161,
-    GetPetInfoEvent = 2934,
-    GetPetInventoryEvent = 3095,
-    GetPopularRoomTagsEvent = 826,
-    GetProductOfferEvent = 2594,
-    GetPromoArticlesEvent = 1827,
-    GetRecyclerPrizesEvent = 398,
-    GetRecyclerStatusEvent = 1342,
-    GetRelationshipStatusInfoEvent = 2138,
-    GetResolutionAchievementsEvent = 359,
-    GetRoomAdPurchaseInfoEvent = 1075,
-    GetRoomChatlogEvent = 2587,
-    GetRoomEntryDataEvent = 2300,
-    GetRoomEntryTileEvent = 3559,
-    GetRoomSettingsEvent = 3129,
-    GetRoomVisitsEvent = 3526,
-    GetSelectedBadgesMessageEvent = 2091,
-    GetSellablePetPalettesEvent = 1756,
-    GetSongInfoEvent = 3082,
-    GetSoundSettingsEvent = 2388,
-    GetTalentTrackEvent = 196,
-    GetTalentTrackLevelEvent = 2127,
-    GetThreadsEvent = 436,
-    GetUnreadForumsCountEvent = 2908,
-    GetUserChatlogEvent = 1391,
-    GetUserEventCatsEvent = 1782,
-    GetUserFlatCatsEvent = 3027,
-    GetUserTagsEvent = 17,
-    GetWardrobeEvent = 2742,
-    GetWeeklyGameRewardEvent = 2914,
-    GetWeeklyGameRewardWinnersEvent = 1054,
-    GetYoutubeDisplayStatusEvent = 336,
-    GuideSessionCreateEvent = 3338,
-    GuideSessionFeedbackEvent = 477,
-    GuideSessionGetRequesterRoomEvent = 1052,
-    GuideSessionGuideDecidesEvent = 1424,
-    GuideSessionInviteRequesterEvent = 234,
-    GuideSessionIsTypingEvent = 519,
-    GuideSessionMessageEvent = 3899,
-    GuideSessionOnDutyUpdateEvent = 1922,
-    GuideSessionReportEvent = 3969,
-    GuideSessionRequesterCancelsEvent = 291,
-    GuideSessionResolvedEvent = 887,
-    HabboSearchEvent = 1210,
-    // HotelViewClaimBadgeRewardEvent = -1,
-    HotelViewRequestBadgeRewardEvent = 2318,
-    HotelViewRequestSecondsUntilEvent = 271,
-    IgnoreUserEvent = 1117,
-    InfoRetrieveEvent = 357,
-    InitDiffieHandshakeEvent = 3110,
-    JoinHabboGroupEvent = 998,
-    JoinQueueEvent = 1458,
-    JukeBoxEventOne = 2304,
-    KickMemberEvent = 593,
-    LatencyPingRequestEvent = 295,
-    LetUserInEvent = 1644,
-    LookToEvent = 3301,
-    MakeOfferEvent = 3447,
-    MessengerInitEvent = 2781,
-    ModAlertEvent = 229,
-    ModBanEvent = 2766,
-    ModKickEvent = 2582,
-    ModMessageEvent = 1840,
-    ModMuteEvent = 1945,
-    // ModToolRequestRoomUserChatlogEvent = -1,
-    ModToolSanctionEvent = 1392,
-    // ModToolWarnEvent = -1,
-    ModTradingLockEvent = 3742,
-    ModerateMessageEvent = 286,
-    ModerateRoomEvent = 3260,
-    ModerateThreadEvent = 1397,
-    ModeratorActionEvent = 3842,
-    MountPetEvent = 1036,
-    MoveAvatarEvent = 3320,
-    MoveObjectEvent = 248,
-    MovePetEvent = 3449,
-    MoveWallItemEvent = 168,
-    MuteAllInRoomEvent = 3637,
-    MyFavouriteRoomsSearchEvent = 2578,
-    MyFriendsRoomsSearchEvent = 2266,
-    MyGuildBasesSearchEvent = 39,
-    MyRoomHistorySearchEvent = 2264,
-    MyRoomRightsSearchEvent = 272,
-    MyRoomsSearchEvent = 2277,
-    NavigatorAddCollapsedCategoryEvent = 1834,
-    NavigatorAddSavedSearchEvent = 2226,
-    NavigatorDeleteSavedSearchEvent = 1954,
-    NavigatorRemoveCollapsedCategoryEvent = 637,
-    NavigatorSetSearchCodeViewModeEvent = 1202,
-    NewNavigatorInitEvent = 2110,
-    NewNavigatorSearchEvent = 249,
-    NewUserExperienceGetGiftsEvent = 1822,
-    NewUserExperienceScriptProceedEvent = 1299,
-    OpenCampaignCalendarDoorEvent = 8809,
-    OpenCampaignCalendarDoorAsStaffEvent = 2507,
-    OpenFlatConnectionEvent = 2312,
-    OpenPetPackageEvent = 3698,
-    OpenTradingEvent = 1481,
-    PassCarryItemEvent = 2941,
-    PickIssuesEvent = 15,
-    PickupObjectEvent = 3456,
-    PlaceBotEvent = 1592,
-    PlaceObjectEvent = 1258,
-    PlacePetEvent = 2647,
-    PlacePostItEvent = 2248,
-    PollRejectEvent = 1773,
-    PollStartEvent = 109,
-    PongEvent = 2596,
-    PopularRoomsSearchEvent = 2758,
-    PostMessageEvent = 3529,
-    PresentOpenEvent = 3558,
-    PublishPhotoEvent = 2068,
-    PurchaseFromCatalogAsGiftEvent = 1411,
-    PurchaseFromCatalogEvent = 3492,
-    PurchasePhotoEvent = 2408,
-    PurchaseRoomAdEvent = 777,
-    PurchaseTargetedOfferEvent = 1826,
-    PurchaseVipMembershipExtensionEvent = 3407,
-    QuitEvent = 105,
-    RateFlatEvent = 3582,
-    RecycleItemsEvent = 2771,
-    RedeemMarketplaceOfferCreditsEvent = 2650,
-    RedeemVoucherEvent = 339,
-    RejectMembershipRequestEvent = 1894,
-    ReleaseIssuesEvent = 1572,
-    RemoveAdminRightsFromMemberEvent = 722,
-    RemoveAllRightsEvent = 2683,
-    RemoveBotFromFlatEvent = 3323,
-    RemoveFriendEvent = 1689,
-    RemoveItemEvent = 3336,
-    RemoveItemFromTradeEvent = 3845,
-    RemoveJukeboxDiskEvent = 3050,
-    RemoveOwnRoomRightsRoomEvent = 3182,
-    RemovePetFromFlatEvent = 1581,
-    RemoveRightsEvent = 2064,
-    RemoveSaddleFromPetEvent = 186,
-    RenderRoomEvent = 3226,
-    RenderRoomThumbnailEvent = 1982,
-    RentableSpaceCancelRentEvent = 1667,
-    RentableSpaceRentEvent = 2946,
-    // RequestAchievementConfigurationEvent = -1,
-    RequestCameraConfigurationEvent = 796,
-    RequestFriendEvent = 3157,
-    RequestFurniInventoryEvent = 3150,
-    RequestFurniInventoryWhenNotInRoomEvent = 3500,
-    RequestRoomPropertySet = 711,
-    RespectPetEvent = 3202,
-    RespectUserEvent = 2694,
-    RoomDimmerChangeStateEvent = 2296,
-    RoomDimmerGetPresetsEvent = 2813,
-    RoomDimmerSavePresetEvent = 1648,
-    RoomTextSearchEvent = 3943,
-    RoomUserKickEvent = 1320,
-    RoomUserMuteEvent = 3485,
-    RoomsWhereMyFriendsAreSearchEvent = 1786,
-    RoomsWithHighestScoreSearchEvent = 2939,
-    SSoTicketEvent = 2419,
-    SaveRoomSettingsEvent = 1969,
-    SaveWardrobeOutfitEvent = 800,
-    ScrGetKickbackInfoEvent = 869,
-    ScrGetUserInfoEvent = 3166,
-    // SearchRoomsByTagEvent = -1,
-    SelectClubGiftEvent = 2276,
-    SelectFavouriteHabboGroupEvent = 3549,
-    SendMsgEvent = 3567,
-    SendRoomInviteEvent = 1276,
-    SetActivatedBadgesEvent = 644,
-    SetChatPreferencesEvent = 1262,
-    SetChatStylePreferenceEvent = 1030,
-    SetClothingChangeDataEvent = 924,
-    SetCustomStackingHeightEvent = 3839,
-    SetIgnoreRoomInvitesEvent = 1086,
-    SetItemDataEvent = 3666,
-    SetMannequinFigureEvent = 2209,
-    SetMannequinNameEvent = 2850,
-    SetNewNavigatorWindowPreferencesEvent = 3159,
-    SetObjectDataEvent = 3608,
-    SetRandomStateEvent = 3617,
-    SetRelationshipStatusEvent = 3768,
-    SetRoomBackgroundColorDataEvent = 2880,
-    SetRoomCameraPreferencesEvent = 1461,
-    SetSoundSettingsEvent = 1367,
-    SetTargetedOfferStateEvent = 2041,
-    SetYoutubeDisplayPlaylistEvent = 2069,
-    ShoutEvent = 2085,
-    SignEvent = 1975,
-    SpinWheelOfFortuneEvent = 2144,
-    StartTypingEvent = 1597,
-    SubmitRoomToCompetitionEvent = 2595,
-    ThrowDiceEvent = 1990,
-    TogglePetBreedingPermissionEvent = 3379,
-    TogglePetRidingPermissionEvent = 1472,
-    ToggleStaffPickEvent = 1918,
-    UnacceptTradingEvent = 1444,
-    UnbanUserFromRoomEvent = 992,
-    UnignoreUserEvent = 2061,
-    UniqueIdEvent = 2490,
-    UpdateActionEvent = 2281,
-    UpdateConditionEvent = 3203,
-    UpdateFigureDataEvent = 2730,
-    UpdateFloorPropertiesEvent = 875,
-    UpdateForumSettingsEvent = 2214,
-    UpdateGuildBadgeEvent = 1991,
-    UpdateGuildColorsEvent = 1764,
-    UpdateGuildIdentityEvent = 3137,
-    UpdateGuildSettingsEvent = 3435,
-    UpdateHomeRoomEvent = 1740,
-    UpdateRoomFilterEvent = 3001,
-    UpdateThreadEvent = 3045,
-    UpdateTriggerEvent = 1520,
-    UpdateUiFlagsEvent = 2313,
-    UseFurnitureEvent = 99,
-    UseWallItemEvent = 210,
-    VisitUserEvent = 3997,
-    WhisperEvent = 1543,
-    AcceptGameInviteEvent = 3802,
-    AcceptQuestEvent = 3604,
-    ApproveAllMembershipRequestsEvent = 882,
-    BuildersClubPlaceRoomItemEvent = 1051,
-    BuyMarketplaceTokensEvent = 1866,
-    CallForHelpFromSelfieEvent = 2755,
-    CancelEventEvent = 2725,
-    CancelQuestEvent = 3133,
-    ChangeEmailEvent = 3965,
-    ChangeQueueEvent = 3093,
-    CommunityGoalVoteEvent = 3536,
-    CompetitionRoomsSearchEvent = 433,
-    DeletePendingCallsForHelpEvent = 3605,
-    DisconnectEvent = 2445,
-    ExtendRentOrBuyoutFurniEvent = 1071,
-    ExtendRentOrBuyoutStripItemEvent = 2115,
-    ForwardToACompetitionRoomEvent = 172,
-    ForwardToARandomPromotedRoomEvent = 10,
-    ForwardToRandomCompetitionRoomEvent = 865,
-    FriendListUpdateEvent = 1419,
-    FriendRequestQuestCompleteEvent = 1148,
-    Game2CheckGameDirectoryStatusEvent = 3259,
-    Game2ExitGameEvent = 1445,
-    Game2GameChatEvent = 2502,
-    Game2GetWeeklyFriendsLeaderboardEvent = 1232,
-    Game2GetWeeklyLeaderboardEvent = 2565,
-    Game2LoadStageReadyEvent = 2415,
-    Game2PlayAgainEvent = 3196,
-    Game2RequestFullStatusUpdateEvent = 1598,
-    GetCatalogPageExpirationEvent = 742,
-    GetCatalogPageWithEarliestExpiryEvent = 3135,
-    GetCategoriesWithUserCountEvent = 3782,
-    GetCommunityGoalEarnedPrizesEvent = 2688,
-    GetCommunityGoalHallOfFameEvent = 2167,
-    GetCommunityGoalProgressEvent = 1145,
-    GetConcurrentUsersGoalProgressEvent = 1343,
-    GetConcurrentUsersRewardEvent = 3872,
-    GetDailyQuestEvent = 2486,
-    GetDirectClubBuyAvailableEvent = 801,
-    GetEmailStatusEvent = 2557,
-    GetExtendedProfileByNameEvent = 2249,
-    GetFaqCategoryEvent = 3445,
-    GetFaqTextEvent = 1849,
-    GetGameAchievementsEvent = 2399,
-    GetHabboBasicMembershipExtendOfferEvent = 603,
-    GetInterstitialEvent = 2519,
-    GetIsBadgeRequestFulfilledEvent = 1364,
-    GetIsOfferGiftableEvent = 1347,
-    GetIsUserPartOfCompetitionEvent = 2077,
-    GetNextTargetedOfferEvent = 2487,
-    GetOfficialRoomsEvent = 1229,
-    GetQuestsEvent = 3333,
-    GetQuizQuestionsEvent = 1296,
-    GetSeasonalCalendarDailyOfferEvent = 3257,
-    GetSeasonalQuestsOnlyEvent = 1190,
-    GetSoundMachinePlayListEvent = 3498,
-    GetTargetedOfferEvent = 596,
-    GetThreadEvent = 3900,
-    GetUserGameAchievementsEvent = 389,
-    GiveSupplementToPetEvent = 749,
-    GoToFlatEvent = 685,
-    GuideAdvertisementReadEvent = 2455,
-    GuildBaseSearchEvent = 2930,
-    HarvestPetEvent = 1521,
-    IgnoreUserIdEvent = 3314,
-    InterstitialShownEvent = 1109,
-    LagWarningReportEvent = 3847,
-    LatencyPingReportEvent = 96,
-    LeaveQueueEvent = 2384,
-    ModToolPreferencesEvent = 31,
-    MyFrequentRoomHistorySearchEvent = 1002,
-    MyRecommendedRoomsEvent = 2537,
-    MysteryBoxWaitingCanceledEvent = 2012,
-    OpenMysteryTrophyEvent = 3074,
-    OpenQuestTrackerEvent = 2750,
-    OpenWelcomeGiftEvent = 2638,
-    PassCarryItemToPetEvent = 2768,
-    PeerUsersClassificationEvent = 1160,
-    PerformanceLogEvent = 3230,
-    PetSelectedEvent = 549,
-    PhotoCompetitionEvent = 3959,
-    PostQuizAnswersEvent = 3720,
-    PurchaseBasicMembershipExtensionEvent = 2735,
-    RedeemCommunityGoalPrizeEvent = 90,
-    RejectQuestEvent = 2397,
-    RentableSpaceStatusEvent = 872,
-    RequestABadgeEvent = 3077,
-    ResetPhoneNumberStateEvent = 2741,
-    ResetResolutionAchievementEvent = 3144,
-    ResetUnseenItemIdsEvent = 3493,
-    ResetUnseenItemsEvent = 2343,
-    RoomAdEventTabAdClickedEvent = 2412,
-    RoomAdEventTabViewedEvent = 2668,
-    RoomAdPurchaseInitiatedEvent = 2283,
-    RoomAdSearchEvent = 2809,
-    RoomCompetitionInitEvent = 1334,
-    RoomNetworkOpenConnectionEvent = 3736,
-    RoomUsersClassificationEvent = 2285,
-    SearchFaqsEvent = 2031,
-    SetPhoneNumberVerificationStatusEvent = 1379,
-    SetRoomSessionTagsEvent = 3305,
-    ShopTargetedOfferViewedEvent = 3483,
-    StartCampaignEvent = 1697,
-    TryPhoneNumberEvent = 790,
-    UnblockGroupMemberEvent = 2864,
-    UpdateForumReadMarkerEvent = 1855,
-    UpdateRoomCategoryAndTradeSettingsEvent = 1265,
-    UpdateRoomThumbnailEvent = 2468,
-    VerifyCodeEvent = 2721,
-    VersionCheckEvent = 1053,
-    VoteForRoomEvent = 143,
-    WelcomeGiftChangeEmailEvent = 66,
-    UnknownSnowStormEvent6000 = 6000,
-    UnknownSnowStormEvent6001 = 6001,
-    UnknownSnowStormEvent6002 = 6002,
-    UnknownSnowStormEvent6003 = 6003,
-    UnknownSnowStormEvent6004 = 6004,
-    UnknownSnowStormEvent6005 = 6005,
-    UnknownSnowStormEvent6006 = 6006,
-    UnknownSnowStormEvent6007 = 6007,
-    UnknownSnowStormEvent6008 = 6008,
-    UnknownSnowStormEvent6009 = 6009,
-    UnknownSnowStormEvent6010 = 6010,
-    UnknownSnowStormEvent6011 = 6011,
-    SnowStormJoinQueueEvent = 6012,
-    UnknownSnowStormEvent6013 = 6013,
-    UnknownSnowStormEvent6014 = 6014,
-    UnknownSnowStormEvent6015 = 6015,
-    UnknownSnowStormEvent6016 = 6016,
-    UnknownSnowStormEvent6017 = 6017,
-    UnknownSnowStormEvent6018 = 6018,
-    UnknownSnowStormEvent6019 = 6019,
-    UnknownSnowStormEvent6020 = 6020,
-    UnknownSnowStormEvent6021 = 6021,
-    UnknownSnowStormEvent6022 = 6022,
-    UnknownSnowStormEvent6023 = 6023,
-    UnknownSnowStormEvent6024 = 6024,
-    UnknownSnowStormEvent6025 = 6025,
-    SnowStormUserPickSnowballEvent = 6026,
+    GetCatalogIndex = 1195,
+    GetCatalogPage = 412,
+    CatalogPurchase = 3492,
+    CatalogPurchaseGift = 1411,
+    GetProductOffer = 2594,
+    ClientLatency = 295,
+    ClientLatencyMeasure = 96,
+    ClientPolicy = 26979,
+    ClientPong = 2596,
+    ClientToolbarToggle = 2313,
+    ClientVariables = 1053,
+    GetCurrentTimingCode = 2912,
+    DesktopView = 105,
+    GetBundleDiscountRuleset = 223,
+    EventTracker = 3457,
+    FindNewFriends = 516,
+    FurnitureAliases = 3898,
+    FurnitureFloorUpdate = 248,
+    FurnitureMultistate = 99,
+    FurniturePickup = 3456,
+    FurniturePlace = 1258,
+    FurniturePostitPlace = 2248,
+    FurniturePostitSaveStickyPole = 3283,
+    FurnitureRandomstate = 3617,
+    FurnitureWallMultistate = 210,
+    FurnitureWallUpdate = 168,
+    GamesInit = 2914,
+    GamesList = 741,
+    Acceptgameinvite = 3802,
+    Gameunloadedmessage = 3207,
+    Getgameachievementsmessage = 2399,
+    Getgamestatusmessage = 3171,
+    Getusergameachievementsmessage = 389,
+    Joinqueuemessage = 1458,
+    Leavequeuemessage = 2384,
+    Resetresolutionachievementmessage = 3144,
+    Getweeklygamerewardwinners = 1054,
+    Game2Getaccountgamestatusmessage = 11,
+    Game2Checkgamedirectorystatusmessage = 3259,
+    Game2Exitgamemessage = 1445,
+    Game2Gamechatmessage = 2502,
+    Game2Loadstagereadymessage = 2415,
+    Game2Playagainmessage = 3196,
+    Game2Requestfullstatusupdatemessage = 1598,
+    Game2Getweeklyfriendsleaderboard = 1232,
+    Game2Getweeklyleaderboard = 2565,
+    GetGiftWrappingConfig = 418,
+    GroupAdminAdd = 2894,
+    GroupAdminRemove = 722,
+    GroupCreateOptions = 798,
+    GroupFavorite = 3549,
+    GetForumStats = 3149,
+    GetForumThreads = 873,
+    GetForumsList = 436,
+    GetForumMessages = 232,
+    GetForumThread = 3900,
+    GetUnreadForumsCount = 2908,
+    ForumModerateMessage = 286,
+    ForumModerateThread = 1397,
+    ForumPostMessage = 3529,
+    UpdateForumReadMarker = 1855,
+    UpdateForumSettings = 2214,
+    ForumUpdateThread = 3045,
+    GroupInfo = 2991,
+    GroupDelete = 1134,
+    GroupMemberRemoveConfirm = 3593,
+    GroupMemberRemove = 593,
+    GroupMembers = 312,
+    GroupMemberships = 367,
+    GroupRequest = 998,
+    GroupRequestAccept = 3386,
+    GroupRequestDecline = 1894,
+    GroupSettings = 1004,
+    GroupParts = 813,
+    GroupBuy = 230,
+    GroupSaveInformation = 3137,
+    GroupSaveBadge = 1991,
+    GroupSaveColors = 1764,
+    GroupSavePreferences = 3435,
+    GroupBadges = 21,
+    GroupUnblockMember = 2864,
+    GetBadgePointsLimits = 1371,
+    Requestabadge = 3077,
+    Getisbadgerequestfulfilled = 1364,
+    ItemClothingRedeem = 3374,
+    ItemColorWheelClick = 2144,
+    ItemDiceClick = 1990,
+    ItemDiceClose = 1533,
+    ItemDimmerSave = 1648,
+    ItemDimmerSettings = 2813,
+    ItemDimmerToggle = 2296,
+    ItemExchangeRedeem = 3115,
+    ItemPaint = 711,
+    SetObjectData = 3608,
+    ItemStackHelper = 3839,
+    MarketplaceConfig = 2597,
+    AcceptFriend = 137,
+    MessengerChat = 3567,
+    DeclineFriend = 2890,
+    FollowFriend = 3997,
+    MessengerFriends = 1523,
+    MessengerInit = 2781,
+    MessengerRelationships = 2138,
+    SetRelationshipStatus = 3768,
+    RemoveFriend = 1689,
+    RequestFriend = 3157,
+    GetFriendRequests = 2448,
+    SendRoomInvite = 1276,
+    HabboSearch = 1210,
+    FriendListUpdate = 1419,
+    ModToolUserInfo = 3295,
+    GetUserFlatCats = 3027,
+    NavigatorInit = 2110,
+    NavigatorSearch = 249,
+    NavigatorSearchClose = 1834,
+    NavigatorSearchOpen = 637,
+    NavigatorSearchSave = 2226,
+    GetUserEventCats = 1782,
+    NavigatorSettingsSave = 3159,
+    NavigatorCategoryListMode = 1202,
+    NavigatorDeleteSavedSearch = 1954,
+    PetInfo = 2934,
+    PetPickup = 1581,
+    PetPlace = 2647,
+    PetRespect = 3202,
+    PetRide = 1036,
+    PetMove = 3449,
+    PetOpenPackage = 3698,
+    PetSelected = 549,
+    PetsBreed = 1638,
+    PetCancelBreeding = 2713,
+    PetConfirmBreeding = 3382,
+    GetPetTrainingPanel = 2161,
+    RecyclerPrizes = 398,
+    RecyclerStatus = 1342,
+    RecyclerItems = 2771,
+    ReleaseVersion = 4000,
+    CallForHelp = 1691,
+    RoomAmbassadorAlert = 2996,
+    RoomBanGive = 1477,
+    RoomBanList = 2267,
+    RoomBanRemove = 992,
+    RoomCreate = 2752,
+    RoomDelete = 532,
+    RoomDoorbell = 1644,
+    RoomEnter = 2312,
+    RoomFavorite = 3817,
+    RoomFavoriteRemove = 309,
+    CanCreateRoom = 2128,
+    CancelRoomEvent = 2725,
+    EditRoomEvent = 3991,
+    CompetitionRoomSearch = 433,
+    ForwardToRandomPromotedRoom = 10,
+    ForwardToSomeRoom = 1703,
+    GetCategoriesWithUserCount = 3782,
+    GetGuestRoom = 2230,
+    GetOfficialRooms = 1229,
+    GetPopularRoomTags = 826,
+    GuildBaseSearch = 2930,
+    MyFavouriteRoomsSearch = 2578,
+    MyFrequentRoomHistorySearch = 1002,
+    MyFriendsRoomSearch = 2266,
+    MyGuildBasesSearch = 39,
+    MyRecommendedRooms = 2537,
+    MyRoomHistorySearch = 2264,
+    MyRoomRightsSearch = 272,
+    MyRoomsSearch = 2277,
+    PopularRoomsSearch = 2758,
+    RoomAdEventTabClicked = 2412,
+    RoomAdEventTabViewed = 2668,
+    RoomAdSearch = 2809,
+    RoomTextSearch = 3943,
+    RoomsWhereMyFriendsAre = 1786,
+    RoomsWithHighestScoreSearch = 2939,
+    SetRoomSessionTags = 3305,
+    UpdateRoomThumbnail = 2468,
+    RoomKick = 1320,
+    RoomLike = 3582,
+    RoomModel = 2300,
+    GetOccupiedTiles = 1687,
+    GetRoomEntryTile = 3559,
+    RoomModelSave = 875,
+    RoomMute = 3637,
+    RoomMuteUser = 3485,
+    RoomRightsGive = 808,
+    RoomRightsList = 3385,
+    RoomRightsRemove = 2064,
+    RoomRightsRemoveAll = 2683,
+    RoomRightsRemoveOwn = 3182,
+    RoomSettings = 3129,
+    RoomSettingsSave = 1969,
+    RoomSettingsUpdateRoomCategoryAndTrade = 1265,
+    RoomStaffPick = 1918,
+    RoomFilterWords = 1911,
+    RoomFilterWordsModify = 3001,
+    Mysteryboxwaitingcanceledmessage = 2012,
+    MysteryboxOpenTrophy = 3074,
+    SecurityMachine = 2490,
+    SecurityTicket = 2419,
+    Trade = 1481,
+    TradeAccept = 3863,
+    TradeCancel = 2341,
+    TradeClose = 2551,
+    TradeConfirm = 2760,
+    TradeItem = 3107,
+    TradeItemRemove = 3845,
+    TradeItems = 1263,
+    TradeUnaccept = 1444,
+    UnitAction = 2456,
+    UnitChat = 1314,
+    UnitChatShout = 2085,
+    UnitChatWhisper = 1543,
+    UnitDance = 2080,
+    UnitDropHandItem = 2814,
+    UnitGiveHanditem = 2941,
+    UnitLook = 3301,
+    UnitPosture = 2235,
+    UnitSign = 1975,
+    UnitTyping = 1597,
+    UnitTypingStop = 1474,
+    UnitWalk = 3320,
+    UserBadges = 2769,
+    UserBadgesCurrent = 2091,
+    UserBadgesCurrentUpdate = 644,
+    UserBots = 3848,
+    UserCurrency = 273,
+    UserEffectActivate = 2959,
+    UserEffectEnable = 1752,
+    UserFigure = 2730,
+    UserFurniture = 3150, // sent when in room
+    Requestfurniinventorywhennotinroom = 3500, // sent when not in room
+    UserHomeRoom = 1740,
+    UserInfo = 357,
+    UserMotto = 2228,
+    UserIgnored = 3878,
+    UserPets = 3095,
+    UserProfile = 3265,
+    UserProfileByName = 2249,
+    UserRespect = 2694,
+    GetSoundSettings = 2388,
+    UserSettingsCamera = 1461,
+    UserSettingsChatStyle = 1030,
+    UserSettingsInvites = 1086,
+    UserSettingsOldChat = 1262,
+    UserSettingsVolume = 1367,
+    UserSubscription = 3166,
+    GetWardrobe = 2742,
+    SaveWardrobeOutfit = 800,
+    UserTags = 17,
+    PeerUsersClassification = 1160,
+    UserClassification = 2285,
+    VisitUser = 2970,
+    WiredActionSave = 2281,
+    WiredApplySnapshot = 3373,
+    WiredConditionSave = 3203,
+    WiredOpen = 768,
+    WiredTriggerSave = 1520,
+    GetItemData = 3964,
+    OneWayDoorClick = 2765,
+    RemoveWallItem = 3336,
+    SetItemData = 3666,
+    CatalogRedeemVoucher = 339,
+    RoomTonerApply = 2880,
+    FriendFurniConfirmLock = 3775,
+    MannequinSaveName = 2850,
+    MannequinSaveLook = 2209,
+    PresentOpenPresent = 3558,
+    CatalogSelectVipGift = 2276,
+    UserIgnoreId = 3314,
+    UserIgnore = 1117,
+    UserUnignore = 2061,
+    ModtoolRequestRoomInfo = 707,
+    ModtoolChangeRoomSettings = 3260,
+    ModtoolRequestUserChatlog = 1391,
+    ModtoolRequestRoomChatlog = 2587,
+    ModtoolSanctionAlert = 229,
+    ModtoolSanctionBan = 2766,
+    ModtoolSanctionKick = 2582,
+    ModtoolSanctionTradelock = 3742,
+    ModtoolAlertevent = 1840,
+    ModtoolSanctionMute = 1945,
+    ModtoolRequestUserRooms = 3526,
+    ModtoolRoomAlert = 3842,
+    ModtoolPreferences = 31,
+    CloseIssueDefaultAction = 2717,
+    CloseIssues = 2067,
+    DefaultSanction = 1681,
+    GetCfhChatlog = 211,
+    ModtoolSanction = 1392,
+    PickIssues = 15,
+    ReleaseIssues = 1572,
+    ConvertGlobalRoomId = 314,
+    RequestSellItem = 848,
+    RequestMarketplaceItemStats = 3288,
+    MarketplaceSellItem = 3447,
+    MarketplaceRequestOwnItems = 2105,
+    MarketplaceTakeBackItem = 434,
+    MarketplaceRedeemCredits = 2650,
+    MarketplaceRequestOffers = 2407,
+    MarketplaceBuyOffer = 1603,
+    MarketplaceBuyTokens = 1866,
+    CatalogRequesetPetBreeds = 1756,
+    ApproveName = 2109,
+    UnitGiveHanditemPet = 2768,
+    PetSupplement = 749,
+    FurnitureGroupInfo = 2651,
+    AchievementResolutionOpen = 359,
+    UsePetProduct = 1328,
+    RemovePetSaddle = 186,
+    TogglePetRiding = 1472,
+    TogglePetBreeding = 3379,
+    UnseenResetCategory = 3493,
+    UnseenResetItems = 2343,
+    CommunityGoalVoteComposer = 3536,
+    GetPromoArticles = 1827,
+    AcceptQuest = 3604,
+    ActivateQuest = 793,
+    CancelQuest = 3133,
+    FriendRequestQuestComplete = 1148,
+    GetCommunityGoalEarnedPrizes = 2688,
+    GetCommunityGoalHallOfFame = 2167,
+    GetCommunityGoalProgress = 1145,
+    GetConcurrentUsersGoalProgress = 1343,
+    GetConcurrentUsersReward = 3872,
+    GetDailyQuest = 2486,
+    GetQuests = 3333,
+    GetSeasonalQuestsOnly = 1190,
+    OpenQuestTracker = 2750,
+    RedeemCommunityGoalPrize = 90,
+    RejectQuest = 2397,
+    StartCampaign = 1697,
+    GetBonusRareInfo = 957,
+    Craft = 3591,
+    CraftSecret = 1251,
+    GetCraftableProducts = 633,
+    GetCraftingRecipe = 1173,
+    GetCraftingRecipesAvailable = 3086,
+    PhotoCompetition = 3959,
+    PublishPhoto = 2068,
+    PurchasePhoto = 2408,
+    RenderRoom = 3226,
+    RenderRoomThumbnail = 1982,
+    RequestCameraConfiguration = 796,
+    AddJukeboxDisk = 753,
+    GetJukeboxPlaylist = 1435,
+    GetNowPlaying = 1325,
+    GetOfficialSongId = 3189,
+    GetSongInfo = 3082,
+    GetSoundMachinePlaylist = 3498,
+    GetUserSongDisks = 2304,
+    RemoveJukeboxDisk = 3050,
+    InterstitialShown = 1109,
+    GetInterstitial = 2519,
+    ChangeUsername = 2977,
+    CheckUsername = 3950,
+    OpenCampaignCalendarDoorStaff= 3889,
+    OpenCampaignCalendarDoor = 2257,
+    BuildersClubPlaceRoomItem = 1051,
+    BuildersClubPlaceWallItem = 462,
+    BuildersClubQueryFurniCount = 2529,
+    GetCatalogPageExpiration = 742,
+    GetCatalogPageWithEarliestExp = 3135,
+    GetDirectClubBuyAvailable = 801,
+    GetHabboBasicMembershipExtendOffer = 603,
+    GetHabboClubExtendOffer = 2462,
+    GetIsOfferGiftable = 1347,
+    GetLimitedOfferAppearingNext = 410,
+    GetNextTargetedOffer = 596,
+    GetRoomAdPurchaseInfo = 1075,
+    GetSeasonalCalendarDailyOffer = 3257,
+    GetTargetedOffer = 2487,
+    MarkCatalogNewAdditionsPageOpened = 2150,
+    PurchaseBasicMembershipExtension = 2735,
+    PurchaseRoomAd = 777,
+    PurchaseTargetedOffer = 1826,
+    PurchaseVipMembershipExtension = 3407,
+    RoomAdPurchaseInitiated = 2283,
+    SetTargettedOfferState = 2041,
+    ShopTargetedOfferViewed = 3483,
+    HelperTalentTrack = 196,
+    TalentTrackGetLevel = 2127,
+    ForwardToACompetitionRoom = 172,
+    ForwardToASubmittableRoom = 1450,
+    ForwardToRandomCompetitionRoom = 865,
+    GetIsUserPartOfCompetition = 2077,
+    GetSecondsUntil = 271,
+    RoomCompetitionInit = 1334,
+    SubmitRoomToCompetition = 2595,
+    VoteForRoom = 143,
+    GetGift = 2436,
+    ResetPhoneNumberState = 2741,
+    SetPhoneNumberVerificationStatus = 1379,
+    TryPhoneNumber = 790,
+    VerifyCode = 2721,
+    ControlYoutubeDisplayPlayback = 3005,
+    GetYoutubeDisplayStatus = 336,
+    SetYoutubeDisplayPlaylist = 2069,
+    GoToFlat = 685,
+    ChangeQueue = 3093,
+    CallForHelpFromForumMessage = 1412,
+    CallForHelpFromForumThread = 534,
+    CallForHelpFromIm = 2950,
+    CallForHelpFromPhoto = 2492,
+    CallForHelpFromSelfie = 2755,
+    ChatReviewGuideDecides = 3365,
+    ChatReviewGuideDetached = 2501,
+    ChatReviewGuideVote = 3961,
+    ChatReviewSessionCreate = 3060,
+    DeletePendingCallsForHelp = 3605,
+    GetCfhStatus = 2746,
+    GetFaqCategory = 3445,
+    GetFaqText = 1849,
+    GetGuideReportingStatus = 3786,
+    GetPendingCallsForHelp = 3267,
+    GetQuizQuestions = 1296,
+    GuideSessionCreate = 3338,
+    GuideSessionFeedback = 477,
+    GuideSessionGetRequesterRoom = 1052,
+    GuideSessionGuideDecides = 1424,
+    GuideSessionInviteRequester = 234,
+    GuideSessionIsTyping = 519,
+    GuideSessionMessage = 3899,
+    GuideSessionOnDutyUpdate = 1922,
+    GuideSessionReport = 3969,
+    GuideSessionRequesterCancels = 291,
+    GuideSessionResolved = 887,
+    PostQuizAnswers = 3720,
+    SearchFaqs = 2031,
+    PollAnswer = 3505,
+    PollReject = 1773,
+    PollStart = 109,
+    PollVoteCounter = 6200,
+    Disconnect = 2445,
+    ScrGetKickbackInfo = 869,
+    CompostPlant = 3835,
+    HarvestPet = 1521,
+    SetClothingChangeData = 924,
+    GroupUnfavorite = 1820,
+    NewUserExperienceGetGifts = 1822,
+    NewUserExperienceScriptProceed = 1299,
+    HandshakeInitDiffie = 3110,
+    HandshakeCompleteDiffie = 773,
+    WelcomeOpenGift = 2638,
+    WelcomeGiftChangeEmail = 66,
+    EmailGetStatus = 2557,
+    EmailChange = 3965,
+    ApproveAllMembershipRequests = 882,
+    RentableSpaceCancelRent = 1667,
+    RentableSpaceRent = 2946,
+    RentableSpaceStatus = 872,
+    TrackingPerformanceLog = 3230,
+    TrackingLagWarningReport = 3847,
+    RoomDirectoryRoomNetworkOpenConnection = 3736,
+    RentableExtendRentOrBuyoutStripItem = 2115,
+    RentableExtendRentOrBuyoutFurni = 1071,
+    RentableGetRentOrBuyoutOffer = 2518,
 }
\ No newline at end of file
diff --git a/Communication/Messages/Incoming/Inventory/Badges/GetBadgesEvent.cs b/Communication/Messages/Incoming/Inventory/Badges/RequestBadgesEvent.cs
similarity index 79%
rename from Communication/Messages/Incoming/Inventory/Badges/GetBadgesEvent.cs
rename to Communication/Messages/Incoming/Inventory/Badges/RequestBadgesEvent.cs
index 85df059..d28f0d2 100644
--- a/Communication/Messages/Incoming/Inventory/Badges/GetBadgesEvent.cs
+++ b/Communication/Messages/Incoming/Inventory/Badges/RequestBadgesEvent.cs
@@ -5,16 +5,16 @@ using Tiger.Networking.Game.Sessions;
 
 namespace Tiger.Communication.Messages.Incoming.Inventory.Badges;
 
-public class GetBadgesEvent : IMessageEvent
+public class RequestBadgesEvent : IMessageEvent
 {
     private readonly IGameSessionManager _gameSessionManager;
 
-    public GetBadgesEvent(IGameSessionManager gameSessionManager)
+    public RequestBadgesEvent(IGameSessionManager gameSessionManager)
     {
         _gameSessionManager = gameSessionManager;
     }
     
-    public IncomingHeaders Header => IncomingHeaders.GetBadgesEvent;
+    public IncomingHeaders Header => IncomingHeaders.UserBadges;
     public async Task HandleAsync(GameSession gameSession, ClientMessage request)
     {
         if (gameSession.Habbo == null)
diff --git a/Communication/Messages/Incoming/Inventory/Badges/SetActivatedBadgesEvent.cs b/Communication/Messages/Incoming/Inventory/Badges/SetActivatedBadgesEvent.cs
index e018c9e..ef063d2 100644
--- a/Communication/Messages/Incoming/Inventory/Badges/SetActivatedBadgesEvent.cs
+++ b/Communication/Messages/Incoming/Inventory/Badges/SetActivatedBadgesEvent.cs
@@ -1,6 +1,6 @@
 using System.Collections.ObjectModel;
 using Tiger.Communication.Messages.Interfaces;
-using Tiger.Communication.Messages.Outgoing.Users;
+using Tiger.Communication.Messages.Outgoing.User.Data;
 using Tiger.Communication.Messages.Types;
 using Tiger.Game.Habbos;
 using Tiger.Networking.Game.Sessions;
@@ -19,7 +19,7 @@ public class SetActivatedBadgesEvent : IMessageEvent
         _badgeRepository = badgeRepository;
     }
 
-    public IncomingHeaders Header => IncomingHeaders.SetActivatedBadgesEvent;
+    public IncomingHeaders Header => IncomingHeaders.UserBadgesCurrentUpdate;
     public async Task HandleAsync(GameSession gameSession, ClientMessage request)
     {
         if (gameSession.Habbo == null)
@@ -55,6 +55,6 @@ public class SetActivatedBadgesEvent : IMessageEvent
         }
 
         await _badgeRepository.SaveManyAsync(badgesToUpdate.Values);
-        await gameSession.SendComposerAsync(new HabboUserBadgesMessageComposer(gameSession.Habbo.Id, wearingBadges));
+        await gameSession.SendComposerAsync(new UserCurrentBadgesComposer(gameSession.Habbo.Id, wearingBadges));
     }
 }
\ No newline at end of file
diff --git a/Communication/Messages/Incoming/Inventory/Purse/GetCreditsInfoEvent.cs b/Communication/Messages/Incoming/Inventory/Currency/UserCurrencyEvent.cs
similarity index 52%
rename from Communication/Messages/Incoming/Inventory/Purse/GetCreditsInfoEvent.cs
rename to Communication/Messages/Incoming/Inventory/Currency/UserCurrencyEvent.cs
index 172feb9..5bbe5bc 100644
--- a/Communication/Messages/Incoming/Inventory/Purse/GetCreditsInfoEvent.cs
+++ b/Communication/Messages/Incoming/Inventory/Currency/UserCurrencyEvent.cs
@@ -1,21 +1,21 @@
 using Tiger.Communication.Messages.Interfaces;
+using Tiger.Communication.Messages.Outgoing.Inventory.Currency;
 using Tiger.Communication.Messages.Outgoing.Notifications;
-using Tiger.Communication.Messages.Outgoing.Users;
 using Tiger.Communication.Messages.Types;
 using Tiger.Networking.Game.Sessions;
 
-namespace Tiger.Communication.Messages.Incoming.Inventory.Purse;
+namespace Tiger.Communication.Messages.Incoming.Inventory.Currency;
 
-public class GetCreditsInfoEvent : IMessageEvent
+public class UserCurrencyEvent : IMessageEvent
 {
     private readonly IGameSessionManager _gameSessionManager;
 
-    public GetCreditsInfoEvent(IGameSessionManager gameSessionManager)
+    public UserCurrencyEvent(IGameSessionManager gameSessionManager)
     {
         _gameSessionManager = gameSessionManager;
     }
 
-    public IncomingHeaders Header => IncomingHeaders.GetCreditsInfoEvent;
+    public IncomingHeaders Header => IncomingHeaders.UserCurrency;
     public async Task HandleAsync(GameSession gameSession, ClientMessage request)
     {
         if (gameSession.Habbo == null)
@@ -24,7 +24,7 @@ public class GetCreditsInfoEvent : IMessageEvent
             return;
         }
 
-        await gameSession.SendComposerAsync(new CreditBalanceComposer(gameSession.Habbo.Credits));
-        await gameSession.SendComposerAsync(new ActivityPointsComposer(gameSession.Habbo.Activitypoints.Values));
+        await gameSession.SendComposerAsync(new UserCreditsComposer(gameSession.Habbo.Credits));
+        await gameSession.SendComposerAsync(new UserCurrencyComposer(gameSession.Habbo.Activitypoints.Values));
     }
 }
\ No newline at end of file
diff --git a/Communication/Messages/Incoming/Landingview/GetPromoArticlesMessageEvent.cs b/Communication/Messages/Incoming/Landingview/GetPromoArticlesEvent.cs
similarity index 73%
rename from Communication/Messages/Incoming/Landingview/GetPromoArticlesMessageEvent.cs
rename to Communication/Messages/Incoming/Landingview/GetPromoArticlesEvent.cs
index 0ad214b..5a56aea 100644
--- a/Communication/Messages/Incoming/Landingview/GetPromoArticlesMessageEvent.cs
+++ b/Communication/Messages/Incoming/Landingview/GetPromoArticlesEvent.cs
@@ -6,18 +6,18 @@ using Tiger.Networking.Game.Sessions;
 
 namespace Tiger.Communication.Messages.Incoming.Landingview;
 
-public class GetPromoArticlesMessageEvent : IMessageEvent
+public class GetPromoArticlesEvent : IMessageEvent
 {
     private readonly IGameSessionManager _gameSessionManager;
     private readonly ILandingViewManager _landingViewManager;
 
-    public GetPromoArticlesMessageEvent(IGameSessionManager gameSessionManager, ILandingViewManager landingViewManager)
+    public GetPromoArticlesEvent(IGameSessionManager gameSessionManager, ILandingViewManager landingViewManager)
     {
         _gameSessionManager = gameSessionManager;
         _landingViewManager = landingViewManager;
     }
 
-    public IncomingHeaders Header => IncomingHeaders.GetPromoArticlesEvent;
+    public IncomingHeaders Header => IncomingHeaders.GetPromoArticles;
     public async Task HandleAsync(GameSession gameSession, ClientMessage request)
     {
         if (gameSession.Habbo == null)
@@ -26,6 +26,6 @@ public class GetPromoArticlesMessageEvent : IMessageEvent
             return;
         }
 
-        await gameSession.SendComposerAsync(new PromoArticlesComposer(_landingViewManager.PromoArticles));
+        await gameSession.SendComposerAsync(new PromoArticlesMessageComposer(_landingViewManager.PromoArticles));
     }
 }
\ No newline at end of file
diff --git a/Communication/Messages/Incoming/Users/GetSelectedBadgesMessageEvent.cs b/Communication/Messages/Incoming/User/Data/UserCurrentBadgesEvent.cs
similarity index 63%
rename from Communication/Messages/Incoming/Users/GetSelectedBadgesMessageEvent.cs
rename to Communication/Messages/Incoming/User/Data/UserCurrentBadgesEvent.cs
index eaac7eb..7b2fdbf 100644
--- a/Communication/Messages/Incoming/Users/GetSelectedBadgesMessageEvent.cs
+++ b/Communication/Messages/Incoming/User/Data/UserCurrentBadgesEvent.cs
@@ -1,24 +1,24 @@
 using Tiger.Communication.Messages.Interfaces;
-using Tiger.Communication.Messages.Outgoing.Users;
+using Tiger.Communication.Messages.Outgoing.User.Data;
 using Tiger.Communication.Messages.Types;
 using Tiger.Game.Habbos;
 using Tiger.Networking.Game.Sessions;
 using Tiger.Storage;
 
-namespace Tiger.Communication.Messages.Incoming.Users;
+namespace Tiger.Communication.Messages.Incoming.User.Data;
 
-public class GetSelectedBadgesMessageEvent : IMessageEvent
+public class UserCurrentBadgesEvent : IMessageEvent
 {
     private readonly IGameSessionManager _gameSessionManager;
     private readonly IRepository<Badge> _badgeRepository;
 
-    public GetSelectedBadgesMessageEvent(IGameSessionManager gameSessionManager, IRepository<Badge> badgeRepository)
+    public UserCurrentBadgesEvent(IGameSessionManager gameSessionManager, IRepository<Badge> badgeRepository)
     {
         _gameSessionManager = gameSessionManager;
         _badgeRepository = badgeRepository;
     }
     
-    public IncomingHeaders Header => IncomingHeaders.GetSelectedBadgesMessageEvent;
+    public IncomingHeaders Header => IncomingHeaders.UserBadgesCurrent;
     public async Task HandleAsync(GameSession gameSession, ClientMessage request)
     {
         if (gameSession.Habbo == null)
@@ -32,6 +32,6 @@ public class GetSelectedBadgesMessageEvent : IMessageEvent
         if (habboId == null) return;
 
         var badges = await _badgeRepository.FindByAsync(b => b.Habbo.Id == habboId && b.Slot > 0);
-        await gameSession.SendComposerAsync(new HabboUserBadgesMessageComposer(habboId.Value, badges.ToList()));
+        await gameSession.SendComposerAsync(new UserCurrentBadgesComposer(habboId.Value, badges.ToList()));
     }
 }
\ No newline at end of file
diff --git a/Communication/Messages/Incoming/Register/UpdateFigureDataMessageEvent.cs b/Communication/Messages/Incoming/User/Data/UserFigureEvent.cs
similarity index 81%
rename from Communication/Messages/Incoming/Register/UpdateFigureDataMessageEvent.cs
rename to Communication/Messages/Incoming/User/Data/UserFigureEvent.cs
index 3a75b7b..e71a64c 100644
--- a/Communication/Messages/Incoming/Register/UpdateFigureDataMessageEvent.cs
+++ b/Communication/Messages/Incoming/User/Data/UserFigureEvent.cs
@@ -7,16 +7,16 @@ using Tiger.Game.Habbos;
 using Tiger.Networking.Game.Sessions;
 using Tiger.Storage;
 
-namespace Tiger.Communication.Messages.Incoming.Register;
+namespace Tiger.Communication.Messages.Incoming.User.Data;
 
-public class UpdateFigureDataMessageEvent : IMessageEvent
+public class UserFigureEvent : IMessageEvent
 {
     private readonly IGameSessionManager _gameSessionManager;
     private readonly IFigureDataManager _figureDataManager;
     private readonly IRepository<Habbo> _habboRepository;
     private readonly IAchievementManager _achievementManager;
 
-    public UpdateFigureDataMessageEvent(IGameSessionManager gameSessionManager, IFigureDataManager figureDataManager, IRepository<Habbo> habboRepository, IAchievementManager achievementManager)
+    public UserFigureEvent(IGameSessionManager gameSessionManager, IFigureDataManager figureDataManager, IRepository<Habbo> habboRepository, IAchievementManager achievementManager)
     {
         _gameSessionManager = gameSessionManager;
         _figureDataManager = figureDataManager;
@@ -24,7 +24,7 @@ public class UpdateFigureDataMessageEvent : IMessageEvent
         _achievementManager = achievementManager;
     }
 
-    public IncomingHeaders Header => IncomingHeaders.UpdateFigureDataEvent;
+    public IncomingHeaders Header => IncomingHeaders.UserFigure;
     public async Task HandleAsync(GameSession gameSession, ClientMessage request)
     {
         if (gameSession.Habbo == null)
diff --git a/Communication/Messages/Incoming/Users/GetExtendedProfileEvent.cs b/Communication/Messages/Incoming/User/Data/UserProfileEvent.cs
similarity index 68%
rename from Communication/Messages/Incoming/Users/GetExtendedProfileEvent.cs
rename to Communication/Messages/Incoming/User/Data/UserProfileEvent.cs
index 9c46536..cc3b334 100644
--- a/Communication/Messages/Incoming/Users/GetExtendedProfileEvent.cs
+++ b/Communication/Messages/Incoming/User/Data/UserProfileEvent.cs
@@ -1,24 +1,24 @@
 using Tiger.Communication.Messages.Interfaces;
-using Tiger.Communication.Messages.Outgoing.Users;
+using Tiger.Communication.Messages.Outgoing.User.Data;
 using Tiger.Communication.Messages.Types;
 using Tiger.Game.Habbos;
 using Tiger.Networking.Game.Sessions;
 using Tiger.Storage;
 
-namespace Tiger.Communication.Messages.Incoming.Users;
+namespace Tiger.Communication.Messages.Incoming.User.Data;
 
-public class GetExtendedProfileEvent : IMessageEvent
+public class UserProfileEvent : IMessageEvent
 {
     private readonly IGameSessionManager _gameSessionManager;
     private readonly IRepository<Habbo> _habboRepository;
 
-    public GetExtendedProfileEvent(IGameSessionManager gameSessionManager, IRepository<Habbo> habboRepository)
+    public UserProfileEvent(IGameSessionManager gameSessionManager, IRepository<Habbo> habboRepository)
     {
         _gameSessionManager = gameSessionManager;
         _habboRepository = habboRepository;
     }
 
-    public IncomingHeaders Header => IncomingHeaders.GetExtendedProfileEvent;
+    public IncomingHeaders Header => IncomingHeaders.UserProfile;
     public async Task HandleAsync(GameSession gameSession, ClientMessage request)
     {
         var habboId = request.ReadInt32();
@@ -37,6 +37,6 @@ public class GetExtendedProfileEvent : IMessageEvent
             return;
         }
 
-        await gameSession.SendComposerAsync(new ExtendedProfileComposer(habbo));
+        await gameSession.SendComposerAsync(new UserProfileComposer(habbo));
     }
 }
\ No newline at end of file
diff --git a/Communication/Messages/Outgoing/Avatar/FigureUpdateComposer.cs b/Communication/Messages/Outgoing/Avatar/FigureUpdateComposer.cs
index 451791d..55ad1bd 100644
--- a/Communication/Messages/Outgoing/Avatar/FigureUpdateComposer.cs
+++ b/Communication/Messages/Outgoing/Avatar/FigureUpdateComposer.cs
@@ -14,7 +14,7 @@ public class FigureUpdateComposer : IMessageComposer
         _gender = gender;
     }
 
-    public OutgoingHeaders Header => OutgoingHeaders.FigureUpdateComposer;
+    public OutgoingHeaders Header => OutgoingHeaders.UserFigure;
     public void Compose(ServerMessage message)
     {
         message.AppendString(_figure);
diff --git a/Communication/Messages/Outgoing/Catalog/CatalogPageMessageComposer.cs b/Communication/Messages/Outgoing/Catalog/CatalogPageMessageComposer.cs
index e7bb3ce..9afe70c 100644
--- a/Communication/Messages/Outgoing/Catalog/CatalogPageMessageComposer.cs
+++ b/Communication/Messages/Outgoing/Catalog/CatalogPageMessageComposer.cs
@@ -17,7 +17,7 @@ public class CatalogPageMessageComposer : IMessageComposer
         _mode = mode;
     }
 
-    public OutgoingHeaders Header => OutgoingHeaders.CatalogPageMessageComposer;
+    public OutgoingHeaders Header => OutgoingHeaders.CatalogPage;
     public void Compose(ServerMessage message)
     {
         message.AppendInt32(_page.Id);
diff --git a/Communication/Messages/Outgoing/Catalog/CatalogIndexMessageComposer.cs b/Communication/Messages/Outgoing/Catalog/CatalogPagesListComposer.cs
similarity index 85%
rename from Communication/Messages/Outgoing/Catalog/CatalogIndexMessageComposer.cs
rename to Communication/Messages/Outgoing/Catalog/CatalogPagesListComposer.cs
index 861b369..4224711 100644
--- a/Communication/Messages/Outgoing/Catalog/CatalogIndexMessageComposer.cs
+++ b/Communication/Messages/Outgoing/Catalog/CatalogPagesListComposer.cs
@@ -4,18 +4,18 @@ using Tiger.Game.Catalogue;
 
 namespace Tiger.Communication.Messages.Outgoing.Catalog;
 
-public class CatalogIndexMessageComposer : IMessageComposer
+public class CatalogPagesListComposer : IMessageComposer
 {
     private readonly IEnumerable<CataloguePage> _pages;
     private readonly string _mode;
 
-    public CatalogIndexMessageComposer(IEnumerable<CataloguePage> pages, string mode)
+    public CatalogPagesListComposer(IEnumerable<CataloguePage> pages, string mode)
     {
         _pages = pages;
         _mode = mode;
     }
 
-    public OutgoingHeaders Header => OutgoingHeaders.CatalogIndexMessageComposer;
+    public OutgoingHeaders Header => OutgoingHeaders.CatalogPageList;
     public void Compose(ServerMessage message)
     {
         message.AppendBoolean(true);
diff --git a/Communication/Messages/Outgoing/Inventory/Achievements/AchievementComposer.cs b/Communication/Messages/Outgoing/Inventory/Achievements/AchievementComposer.cs
index 005556d..d51b3ad 100644
--- a/Communication/Messages/Outgoing/Inventory/Achievements/AchievementComposer.cs
+++ b/Communication/Messages/Outgoing/Inventory/Achievements/AchievementComposer.cs
@@ -16,7 +16,7 @@ public class AchievementComposer : IMessageComposer
         _habboAchievement = habboAchievement;
     }
 
-    public OutgoingHeaders Header => OutgoingHeaders.AchievementComposer;
+    public OutgoingHeaders Header => OutgoingHeaders.AchievementProgressed;
     public void Compose(ServerMessage message)
     {
         var targetLevel = _habboAchievement.Level == _achievement.Levels.Count
diff --git a/Communication/Messages/Outgoing/Inventory/Achievements/AchievementsComposer.cs b/Communication/Messages/Outgoing/Inventory/Achievements/AchievementsComposer.cs
index b7764ef..312b2c8 100644
--- a/Communication/Messages/Outgoing/Inventory/Achievements/AchievementsComposer.cs
+++ b/Communication/Messages/Outgoing/Inventory/Achievements/AchievementsComposer.cs
@@ -16,7 +16,7 @@ public class AchievementsComposer : IMessageComposer
         _habbo = habbo;
     }
 
-    public OutgoingHeaders Header => OutgoingHeaders.AchievementsComposer;
+    public OutgoingHeaders Header => OutgoingHeaders.AchievementList;
     public void Compose(ServerMessage message)
     {
         message.AppendInt32(_achievements.Count);
diff --git a/Communication/Messages/Outgoing/Inventory/Achievements/AchievementsScoreComposer.cs b/Communication/Messages/Outgoing/Inventory/Achievements/AchievementsScoreComposer.cs
index 4c7d45d..74059e7 100644
--- a/Communication/Messages/Outgoing/Inventory/Achievements/AchievementsScoreComposer.cs
+++ b/Communication/Messages/Outgoing/Inventory/Achievements/AchievementsScoreComposer.cs
@@ -12,7 +12,7 @@ public class AchievementsScoreComposer : IMessageComposer
         _score = score;
     }
 
-    public OutgoingHeaders Header => OutgoingHeaders.AchievementsScoreComposer;
+    public OutgoingHeaders Header => OutgoingHeaders.UserAchievementScore;
     public void Compose(ServerMessage message)
     {
         message.AppendInt32(_score);
diff --git a/Communication/Messages/Outgoing/Inventory/Badges/BadgesComposer.cs b/Communication/Messages/Outgoing/Inventory/Badges/BadgesComposer.cs
index 50634d6..f50e95e 100644
--- a/Communication/Messages/Outgoing/Inventory/Badges/BadgesComposer.cs
+++ b/Communication/Messages/Outgoing/Inventory/Badges/BadgesComposer.cs
@@ -13,7 +13,7 @@ public class BadgesComposer : IMessageComposer
         _badges = badges != null ? badges.ToList() : new List<Badge>();
     }
 
-    public OutgoingHeaders Header => OutgoingHeaders.BadgesComposer;
+    public OutgoingHeaders Header => OutgoingHeaders.UserBadges;
     public void Compose(ServerMessage message)
     {
         message.AppendInt32(_badges.Count);
diff --git a/Communication/Messages/Outgoing/Users/CreditBalanceComposer.cs b/Communication/Messages/Outgoing/Inventory/Currency/UserCreditsComposer.cs
similarity index 54%
rename from Communication/Messages/Outgoing/Users/CreditBalanceComposer.cs
rename to Communication/Messages/Outgoing/Inventory/Currency/UserCreditsComposer.cs
index d9fac55..f8ed4bd 100644
--- a/Communication/Messages/Outgoing/Users/CreditBalanceComposer.cs
+++ b/Communication/Messages/Outgoing/Inventory/Currency/UserCreditsComposer.cs
@@ -1,18 +1,18 @@
 using Tiger.Communication.Messages.Interfaces;
 using Tiger.Communication.Messages.Types;
 
-namespace Tiger.Communication.Messages.Outgoing.Users;
+namespace Tiger.Communication.Messages.Outgoing.Inventory.Currency;
 
-public class CreditBalanceComposer : IMessageComposer
+public class UserCreditsComposer : IMessageComposer
 {
     private readonly int _credits;
 
-    public CreditBalanceComposer(int credits)
+    public UserCreditsComposer(int credits)
     {
         _credits = credits;
     }
 
-    public OutgoingHeaders Header => OutgoingHeaders.CreditBalanceComposer;
+    public OutgoingHeaders Header => OutgoingHeaders.UserCredits;
     public void Compose(ServerMessage message)
     {
         message.AppendString($"{_credits}.0");
diff --git a/Communication/Messages/Outgoing/Notifications/ActivityPointsComposer.cs b/Communication/Messages/Outgoing/Inventory/Currency/UserCurrencyComposer.cs
similarity index 65%
rename from Communication/Messages/Outgoing/Notifications/ActivityPointsComposer.cs
rename to Communication/Messages/Outgoing/Inventory/Currency/UserCurrencyComposer.cs
index 96919c7..ce4b78f 100644
--- a/Communication/Messages/Outgoing/Notifications/ActivityPointsComposer.cs
+++ b/Communication/Messages/Outgoing/Inventory/Currency/UserCurrencyComposer.cs
@@ -2,18 +2,18 @@ using Tiger.Communication.Messages.Interfaces;
 using Tiger.Communication.Messages.Types;
 using Tiger.Game.Habbos;
 
-namespace Tiger.Communication.Messages.Outgoing.Notifications;
+namespace Tiger.Communication.Messages.Outgoing.Inventory.Currency;
 
-public class ActivityPointsComposer : IMessageComposer
+public class UserCurrencyComposer : IMessageComposer
 {
     private readonly ICollection<Activitypoints> _activitypoints;
 
-    public ActivityPointsComposer(ICollection<Activitypoints> activitypoints)
+    public UserCurrencyComposer(ICollection<Activitypoints> activitypoints)
     {
         _activitypoints = activitypoints;
     }
 
-    public OutgoingHeaders Header => OutgoingHeaders.ActivityPointsMessageComposer;
+    public OutgoingHeaders Header => OutgoingHeaders.UserCurrency;
     public void Compose(ServerMessage message)
     {
         message.AppendInt32(_activitypoints.Count);
diff --git a/Communication/Messages/Outgoing/Landingview/PromoArticlesComposer.cs b/Communication/Messages/Outgoing/Landingview/PromoArticlesMessageComposer.cs
similarity index 86%
rename from Communication/Messages/Outgoing/Landingview/PromoArticlesComposer.cs
rename to Communication/Messages/Outgoing/Landingview/PromoArticlesMessageComposer.cs
index 60e567c..8cd0bf0 100644
--- a/Communication/Messages/Outgoing/Landingview/PromoArticlesComposer.cs
+++ b/Communication/Messages/Outgoing/Landingview/PromoArticlesMessageComposer.cs
@@ -4,16 +4,16 @@ using Tiger.Game.LandingView;
 
 namespace Tiger.Communication.Messages.Outgoing.Landingview;
 
-public class PromoArticlesComposer : IMessageComposer
+public class PromoArticlesMessageComposer : IMessageComposer
 {
     private readonly ICollection<PromoArticle> _promoArticles;
 
-    public PromoArticlesComposer(ICollection<PromoArticle> promoArticles)
+    public PromoArticlesMessageComposer(ICollection<PromoArticle> promoArticles)
     {
         _promoArticles = promoArticles;
     }
 
-    public OutgoingHeaders Header => OutgoingHeaders.PromoArticlesMessageComposer;
+    public OutgoingHeaders Header => OutgoingHeaders.PromoArticles;
     public void Compose(ServerMessage message)
     {
         message.AppendInt32(_promoArticles.Count);
diff --git a/Communication/Messages/Outgoing/Notifications/AchievementNotificationMessageComposer.cs b/Communication/Messages/Outgoing/Notifications/AchievementNotificationMessageComposer.cs
index ad38cfc..fb277c2 100644
--- a/Communication/Messages/Outgoing/Notifications/AchievementNotificationMessageComposer.cs
+++ b/Communication/Messages/Outgoing/Notifications/AchievementNotificationMessageComposer.cs
@@ -15,7 +15,7 @@ public class AchievementNotificationMessageComposer : IMessageComposer
         _badgeId = badgeId;
     }
 
-    public OutgoingHeaders Header => OutgoingHeaders.AchievementNotificationMessageComposer;
+    public OutgoingHeaders Header => OutgoingHeaders.AchievementNotification;
     public void Compose(ServerMessage message)
     {
         message.AppendInt32(_habboAchievement.Achievement.Id);
diff --git a/Communication/Messages/Outgoing/Notifications/ActivityPointNotificationMessageComposer.cs b/Communication/Messages/Outgoing/Notifications/ActivityPointNotificationMessageComposer.cs
index 95b5c19..045a0ad 100644
--- a/Communication/Messages/Outgoing/Notifications/ActivityPointNotificationMessageComposer.cs
+++ b/Communication/Messages/Outgoing/Notifications/ActivityPointNotificationMessageComposer.cs
@@ -16,7 +16,7 @@ public class ActivityPointNotificationMessageComposer : IMessageComposer
         _type = type;
     }
 
-    public OutgoingHeaders Header => OutgoingHeaders.ActivityPointNotificationMessageComposer;
+    public OutgoingHeaders Header => OutgoingHeaders.ActivityPointNotification;
     public void Compose(ServerMessage message)
     {
         message.AppendInt32(_amount);
diff --git a/Communication/Messages/Outgoing/Generic/Alerts/HabboBroadcastMessageComposer.cs b/Communication/Messages/Outgoing/Notifications/HabboBroadcastMessageComposer.cs
similarity index 74%
rename from Communication/Messages/Outgoing/Generic/Alerts/HabboBroadcastMessageComposer.cs
rename to Communication/Messages/Outgoing/Notifications/HabboBroadcastMessageComposer.cs
index fae3328..0846d13 100644
--- a/Communication/Messages/Outgoing/Generic/Alerts/HabboBroadcastMessageComposer.cs
+++ b/Communication/Messages/Outgoing/Notifications/HabboBroadcastMessageComposer.cs
@@ -1,7 +1,7 @@
 using Tiger.Communication.Messages.Interfaces;
 using Tiger.Communication.Messages.Types;
 
-namespace Tiger.Communication.Messages.Outgoing.Generic.Alerts;
+namespace Tiger.Communication.Messages.Outgoing.Notifications;
 
 public class HabboBroadcastMessageComposer : IMessageComposer
 {
@@ -12,7 +12,7 @@ public class HabboBroadcastMessageComposer : IMessageComposer
         _welcomeMessage = welcomeMessage;
     }
 
-    public OutgoingHeaders Header => OutgoingHeaders.HabboBroadcastMessageComposer;
+    public OutgoingHeaders Header => OutgoingHeaders.GenericAlert;
     public void Compose(ServerMessage message)
     {
         message.AppendString(_welcomeMessage);
diff --git a/Communication/Messages/Outgoing/OutgoingHeaders.cs b/Communication/Messages/Outgoing/OutgoingHeaders.cs
index 45fd73d..4f1de21 100644
--- a/Communication/Messages/Outgoing/OutgoingHeaders.cs
+++ b/Communication/Messages/Outgoing/OutgoingHeaders.cs
@@ -1,507 +1,475 @@
 namespace Tiger.Communication.Messages.Outgoing;
 
-public enum OutgoingHeaders
+public enum OutgoingHeaders : short
 {
-    AcceptFriendResultComposer = 896,
-    AccountPreferencesComposer = 513,
-    AccountSafetyLockStatusChangeMessageComposer = 1243,
-    AchievementComposer = 2107,
-    AchievementResolutionCompletedMessageComposer = 740,
-    AchievementResolutionProgressMessageComposer = 3370,
-    AchievementResolutionsMessageComposer = 66,
-    AchievementsComposer = 305,
-    AchievementsScoreComposer = 1968,
-    ActivityPointsMessageComposer = 2018,
-    ApproveNameMessageComposer = 1503,
-    AuthenticationOkMessageComposer = 2491,
-    AvailabilityStatusMessageComposer = 2033,
-    AvailabilityTimeMessageComposer = 600,
-    AvatarEffectActivatedMessageComposer = 1959,
-    AvatarEffectAddedMessageComposer = 2867,
-    AvatarEffectExpiredMessageComposer = 2228,
-    AvatarEffectMessageComposer = 1167,
-    AvatarEffectSelectedMessageComposer = 3473,
-    AvatarEffectsMessageComposer = 340,
-    BadgePointLimitsComposer = 2501,
-    BadgeReceivedComposer = 2493,
-    BadgesComposer = 717,
-    BannedUsersFromRoomComposer = 1869,
-    BonusRareInfoMessageComposer = 1533,
-    BotAddedToInventoryComposer = 1352,
-    BotCommandConfigurationComposer = 1618,
-    BotErrorComposer = 639,
-    BotForceOpenContextMenuComposer = 296,
-    BotInventoryComposer = 3086,
-    BotReceivedMessageComposer = 3684,
-    BotRemovedFromInventoryComposer = 233,
-    BotSkillListUpdateComposer = 69,
-    BuildersClubFurniCountMessageComposer = 3828,
-    BuildersClubSubscriptionStatusMessageComposer = 1452,
-    BundleDiscountRulesetMessageComposer = 2347,
-    CallForHelpDisabledNotifyMessageComposer = 1651,
-    CallForHelpPendingCallsDeletedMessageComposer = 77,
-    CallForHelpPendingCallsMessageComposer = 1121,
-    CallForHelpReplyMessageComposer = 3796,
-    CallForHelpResultMessageComposer = 3635,
-    CameraPublishStatusMessageComposer = 2057,
-    CameraPurchaseOkMessageComposer = 2783,
-    CameraSnapshotMessageComposer = 463,
-    CameraStorageUrlMessageComposer = 3696,
-    CampaignCalendarDataMessageComposer = 2531,
-    CampaignCalendarDoorOpenedMessageComposer = 2551,
-    CanCreateRoomComposer = 378,
-    CanCreateRoomEventComposer = 2599,
-    CantConnectMessageComposer = 899,
-    CarryObjectMessageComposer = 1474,
-    CatalogPageExpirationComposer = 2668,
-    CatalogPageMessageComposer = 804,
-    CatalogIndexMessageComposer = 1032,
-    CatalogPageWithEarliestExpiryMessageComposer = 2515,
-    CatalogPublishedMessageComposer = 1866,
-    CategoriesWithVisitorCountComposer = 1455,
-    CfhChatlogComposer = 607,
-    CfhSanctionMessageComposer = 2782,
-    CfhTopicsInitComposer = 325,
-    ChangeEmailResultComposer = 1815,
-    ChangeUserNameResultMessageEvent = 118,
-    ChatMessageComposer = 1446,
-    ChatReviewSessionDetachedMessageComposer = 30,
-    ChatReviewSessionOfferedToGuideMessageComposer = 735,
-    ChatReviewSessionResultsMessageComposer = 3276,
-    ChatReviewSessionStartedMessageComposer = 143,
-    ChatReviewSessionVotingStatusMessageComposer = 1829,
-    CheckUserNameResultMessageComposer = 563,
-    CitizenshipVipOfferPromoEnabledComposer = 2278,
-    CloseConnectionMessageComposer = 122,
-    ClubGiftInfoComposer = 619,
-    ClubGiftNotificationComposer = 2188,
-    ClubGiftSelectedComposer = 659,
-    CollapsedCategoriesComposer = 1543,
-    CommunityGoalEarnedPrizesMessageComposer = 3319,
-    CommunityGoalHallOfFameMessageComposer = 3005,
-    CommunityGoalProgressMessageComposer = 2525,
-    CommunityGoalVoteMessageComposer = 1435,
-    CompetitionEntrySubmitResultComposer = 1177,
-    CompetitionRoomsDataMessageComposer = 3954,
-    CompetitionStatusMessageComposer = 133,
-    CompetitionVotingInfoMessageComposer = 3506,
-    CompleteDiffieHandshakeComposer = 3885,
-    ConcurrentUsersGoalProgressMessageComposer = 2737,
-    ConfirmBreedingRequestComposer = 634,
-    ConfirmBreedingResultComposer = 1625,
-    ConvertedRoomIdComposer = 1331,
-    CraftableProductsComposer = 1000,
-    CraftingRecipeComposer = 2774,
-    CraftingRecipesAvailableComposer = 2124,
-    CraftingResultComposer = 618,
-    CreditBalanceComposer = 3475,
-    CurrentTimingCodeMessageComposer = 1745,
-    CustomUserNotificationMessageComposer = 909,
-    DanceMessageComposer = 2233,
-    DiceValueMessageComposer = 3431,
-    DirectSmsClubBuyAvailableMessageComposer = 195,
-    DisconnectReasonComposer = 4000,
-    DoorbellMessageComposer = 2309,
-    ElementPointerMessageComposer = 1787,
-    EmailStatusResultComposer = 612,
-    EpicPopupMessageComposer = 3945,
-    ErrorReportComposer = 1004,
-    ExpressionMessageComposer = 1631,
-    ExtendedProfileChangedMessageComposer = 876,
-    ExtendedProfileMessageComposer = 3898,
-    FaqCategoriesMessageComposer = 2756,
-    FaqCategoryMessageComposer = 2819,
-    FaqClientFaqsMessageComposer = 2492,
-    FaqSearchResultsMessageComposer = 1551,
-    FaqTextMessageComposer = 3292,
-    FavoriteMembershipUpdateMessageComposer = 3403,
-    FavouriteChangedComposer = 2524,
-    FavouritesComposer = 151,
-    FigureSetIdsComposer = 1450,
-    FigureUpdateComposer = 2429,
-    FindFriendsProcessResultComposer = 1210,
-    FlatAccessDeniedMessageComposer = 878,
-    FlatAccessibleMessageComposer = 3783,
-    FlatControllerAddedComposer = 2088,
-    FlatControllerRemovedComposer = 1327,
-    FlatControllersComposer = 1284,
-    FlatCreatedComposer = 1304,
-    FloodControlMessageComposer = 566,
-    FloorHeightMapComposer = 1301,
-    FollowFriendFailedComposer = 3048,
-    ForumDataMessageComposer = 3011,
-    ForumsListMessageComposer = 3001,
-    FriendFurniCancelLockMessageComposer = 770,
-    FriendFurniOtherLockConfirmedMessageComposer = 382,
-    FriendFurniStartConfirmationMessageComposer = 3753,
-    FriendListFragmentMessageComposer = 3130,
-    FriendListUpdateComposer = 2800,
-    FriendNotificationComposer = 3082,
-    FriendRequestsComposer = 280,
-    FurniListAddOrUpdateComposer = 104,
-    FurniListComposer = 994,
-    FurniListInvalidateComposer = 3151,
-    FurniListRemoveComposer = 159,
-    FurniRentOrBuyoutOfferMessageComposer = 35,
-    FurnitureAliasesMessageComposer = 1723,
-    Game2AccountGameStatusMessageComposer = 2893,
-    Game2GameDirectoryStatusMessageComposer = 2246,
-    Game2InArenaQueueMessageComposer = 872,
-    Game2JoiningGameFailedMessageComposer = 1730,
-    Game2StopCounterMessageComposer = 2233,
-    Game2UserLeftGameMessageComposer = 2383,
-    Game2WeeklyFriendsLeaderboardComposer = 2270,
-    Game2WeeklyLeaderboardComposer = 2196,
-    GameAchievementsMessageComposer = 1689,
-    GameInviteMessageComposer = 904,
-    GameListMessageComposer = 222,
-    GamePlayerValueMessageComposer = 2324,
-    GameStatusMessageComposer = 3805,
-    GenericErrorComposer = 1600,
-    GetGuestRoomResultComposer = 687,
-    GiftReceiverNotFoundComposer = 1517,
-    GiftWrappingConfigurationComposer = 2234,
-    GotMysteryBoxPrizeMessageComposer = 3712,
-    GoToBreedingNestFailureComposer = 2621,
-    GroupDetailsChangedMessageComposer = 1459,
-    GroupMembershipRequestedMessageComposer = 1180,
-    GuestRoomSearchResultComposer = 52,
-    GuideOnDutyStatusMessageComposer = 1548,
-    GuideReportingStatusMessageComposer = 3463,
-    GuideSessionAttachedMessageComposer = 1591,
-    GuideSessionDetachedMessageComposer = 138,
-    GuideSessionEndedMessageComposer = 1456,
-    GuideSessionErrorMessageComposer = 673,
-    GuideSessionInvitedToGuideRoomMessageComposer = 219,
-    GuideSessionMessageMessageComposer = 841,
-    GuideSessionPartnerIsTypingComposer = 1016,
-    GuideSessionRequesterRoomMessageComposer = 1847,
-    GuideSessionStartedComposer = 3209,
-    GuideTicketCreationResultMessageComposer = 3285,
-    GuideTicketResolutionMessageComposer = 2674,
-    GuildCreatedMessageComposer = 2808,
-    GuildCreationInfoMessageComposer = 2159,
-    GuildEditFailedMessageComposer = 3988,
-    GuildEditInfoMessageComposer = 3965,
-    GuildEditorDataMessageComposer = 2238,
-    GuildForumThreadsComposer = 1073,
-    GuildFurniContextMenuInfoMessageComposer = 3293,
-    GuildMemberFurniCountInHqMessageComposer = 1876,
-    GuildMemberMgmtFailedMessageComposer = 818,
-    GuildMembersComposer = 1200,
-    GuildMembershipRejectedMessageComposer = 2445,
-    GuildMembershipsMessageComposer = 420,
-    GuildMembershipUpdatedMessageComposer = 265,
-    AchievementNotificationMessageComposer = 806,
-    ActivityPointNotificationMessageComposer = 2275,
-    HabboBroadcastMessageComposer = 3801,
-    HabboClubExtendOfferMessageComposer = 3964,
-    HabboClubOffersMessageComposer = 2405,
-    HabboGroupBadgesMessageComposer = 2402,
-    HabboGroupDeactivatedMessageComposer = 3129,
-    HabboGroupDetailsMessageComposer = 1702,
-    HabboGroupJoinFailedMessageComposer = 762,
-    HabboSearchResultComposer = 973,
-    HabboWayQuizComposer1 = 3379,
-    HandItemReceivedMessageComposer = 354,
-    HeightMapComposer = 2753,
-    HeightMapUpdateMessageComposer = 558,
-    HotelClosedAndOpensComposer = 3728,
-    HotelClosesAndWillOpenAtComposer = 2771,
-    HotelMergeNameChangeComposer = 1663,
-    HotelViewCatalogPageExpiringComposer = 690,
-    HotelViewCustomTimerComposer = -1,
-    HotelWillCloseInMinutesComposer = 1050,
-    IdentityAccountsComposer = 3523,
-    IgnoredUsersMessageComposer = 126,
-    IgnoreResultMessageComposer = 207,
-    InClientLinkMessageComposer = 2023,
-    InfoFeedEnableMessageComposer = 3284,
-    InitCameraMessageComposer = 3878,
-    InitDiffieHandshakeComposer = 1347,
-    InstantMessageErrorComposer = 3359,
-    InterstitialMessageComposer = 1808,
-    IsBadgeRequestFulfilledComposer = 2998,
-    IsFirstLoginOfDayComposer = 793,
-    IsOfferGiftableMessageComposer = 761,
-    IssueCloseNotificationMessageComposer = 934,
-    IssueDeletedMessageComposer = 3192,
-    IssueInfoMessageComposer = 3609,
-    IssuePickFailedMessageComposer = 3150,
-    IsUserPartOfCompetitionMessageComposer = 3841,
-    ItemAddMessageComposer = 2187,
-    ItemDataUpdateMessageComposer = 2202,
-    ItemRemoveMessageComposer = 3208,
-    ItemsComposer = 1369,
-    ItemUpdateMessageComposer = 2009,
-    JoinedQueueMessageComposer = 2260,
-    JoiningQueueFailedMessageComposer = 3035,
-    JukeBoxPlaylistFullMessageComposer = 105,
-    JukeboxSongDisksMessageComposer = 34,
-    LatencyPingResponseMessageComposer = 10,
-    LeftQueueMessageComposer = 1477,
-    LimitedEditionSoldOutComposer = 377,
-    LimitedOfferAppearingNextMessageComposer = 44,
-    LoadGameMessageComposer = 3654,
-    LoadGameUrlMessageComposer = 2624,
-    MaintenanceStatusMessageComposer = 1350,
-    MarketplaceBuyOfferResultComposer = 2032,
-    MarketplaceCancelOfferResultComposer = 3264,
-    MarketplaceCanMakeOfferResult = 54,
-    MarketplaceConfigurationComposer = 1823,
-    MarketplaceItemStatsComposer = 725,
-    MarketplaceMakeOfferResult = 1359,
-    MarketplaceOffersComposer = 680,
-    MarketPlaceOwnOffersComposer = 3884,
-    MessengerErrorComposer = 892,
-    MessengerInitComposer = 1605,
-    MiniMailNewMessageComposer = 1911,
-    MiniMailUnreadCountComposer = 2803,
-    ModeratorActionResultMessageComposer = 2335,
-    ModeratorCautionComposer = 1890,
-    ModeratorInitMessageComposer = 2696,
-    ModeratorMessageComposer = 2030,
-    ModeratorRoomInfoComposer = 1333,
-    ModeratorToolPreferencesComposer = 1576,
-    ModeratorUserInfoComposer = 2866,
-    MOtdNotificationComposer = 2035,
-    MuteAllInRoomComposer = 2533,
-    MysteryBoxClosingComposer = 596,
-    MysteryBoxKeysMessageComposer = 2833,
-    MysteryBoxStartComposer = 3201,
-    NavigatorLiftedRoomsComposer = 3104,
-    NavigatorMetaDataComposer = 3052,
-    NavigatorSavedSearchesComposer = 3984,
-    NavigatorSearchResultBlocksComposer = 2690,
-    NavigatorSettingsComposer = 2875,
-    NestBreedingSuccessComposer = 2527,
-    NewConsoleMessageComposer = 1587,
-    NewFriendRequestComposer = 2219,
-    NewNavigatorPreferencesComposer = 518,
-    NewUserExperienceGiftOfferComposer = 3575,
-    NewUserExperienceNotCompleteComposer = 3639,
-    NoobnessLevelMessageComposer = 3738,
-    NoOwnedRoomsAlertMessageComposer = 2064,
-    NoSuchFlatComposer = 84,
-    NotEnoughBalanceMessageComposer = 3914,
-    NotificationDialogMessageComposer = 1992,
-    NowPlayingMessageComposer = 469,
-    ObjectAddMessageComposer = 1534,
-    ObjectDataUpdateMessageComposer = 2547,
-    ObjectRemoveMessageComposer = 2703,
-    ObjectsDataUpdateMessageComposer = 1453,
-    ObjectsMessageComposer = 1778,
-    ObjectUpdateMessageComposer = 3776,
-    OfferRewardDeliveredMessageComposer = 2125,
-    OfficialRoomsComposer = 2726,
-    OfficialSongIdMessageComposer = 1381,
-    OneWayDoorStatusMessageComposer = 2376,
-    OpenComposer = 1830,
-    OpenConnectionMessageComposer = 758,
-    OpenPetPackageRequestedMessageComposer = 2380,
-    OpenPetPackageResultMessageComposer = 546,
-    PerkAllowancesComposer = 2586,
-    PetAddedToInventoryComposer = 2101,
-    PetBreedingComposer = 1746,
-    PetBreedingResultComposer = 1553,
-    PetExperienceComposer = 2156,
-    PetFigureUpdateComposer = 1924,
-    PetInfoMessageComposer = 2901,
-    PetInventoryComposer = 3522,
-    PetLevelNotificationComposer = 859,
-    PetLevelUpdateComposer = 2824,
-    PetPlacingErrorComposer = 2913,
-    PetReceivedMessageComposer = 1111,
-    PetRemovedFromInventoryComposer = 3253,
-    PetRespectFailedComposer = 1130,
-    PetRespectNotificationComposer = 2788,
-    PetStatusUpdateComposer = 1907,
-    PetSupplementedNotificationComposer = 3441,
-    PetTrainingPanelComposer = 1164,
-    PhoneCollectionStateMessageComposer = 2890,
-    PingMessageComposer = 3928,
-    PlayListMessageComposer = 1748,
-    PlayListSongAddedMessageComposer = 1140,
-    PollContentsComposer = 2997,
-    PollErrorComposer = 662,
-    PollOfferComposer = 3785,
-    PopularRoomTagsResultComposer = 2012,
-    PostItPlacedComposer = 1501,
-    PostMessageMessageComposer = 2049,
-    PostThreadMessageComposer = 1862,
-    PresentOpenedMessageComposer = 56,
-    ProductOfferComposer = 3388,
-    PromoArticlesMessageComposer = 286,
-    PurchaseErrorMessageComposer = 1404,
-    PurchaseNotAllowedMessageComposer = 3770,
-    PurchaseOkMessageComposer = 869,
-    QuestCancelledMessageComposer = 3027,
-    QuestCompletedMessageComposer = 949,
-    QuestDailyMessageComposer = 1878,
-    QuestionAnsweredComposer = 2589,
-    QuestionComposer = 2665,
-    QuestionFinishedComposer = 1066,
-    QuestionInfoComposer = -1,
-    QuestMessageComposer = 230,
-    QuestsMessageComposer = 3625,
-    QuizDataMessageComposer = 2927,
-    QuizResultsMessageComposer = 2772,
-    RecyclerFinishedComposer = 468,
-    RecyclerPrizesComposer = 3164,
-    RecyclerStatusComposer = 3433,
-    RelationshipStatusInfoComposer = 2016,
-    RemainingMutePeriodComposer = 826,
-    RentableSpaceRentFailedMessageComposer = 1868,
-    RentableSpaceRentOkMessageComposer = 2046,
-    RentableSpaceStatusMessageComposer = 3559,
-    RequestSpamWallPostItMessageComposer = 2366,
-    RestoreClientMessageComposer = 426,
-    RoomAdErrorComposer = 1759,
-    RoomAdPurchaseInfoComposer = 2468,
-    RoomChatlogComposer = 3434,
-    RoomChatSettingsMessageComposer = 1191,
-    RoomDimmerPresetsComposer = 2710,
-    RoomEntryInfoComposer = -1,
-    RoomEntryInfoMessageComposer = 749,
-    RoomEntryTileMessageComposer = 1664,
-    RoomEventCancelComposer = 3479,
-    RoomEventComposer = 1840,
-    RoomFilterSettingsMessageComposer = 2937,
-    RoomFloorThicknessUpdatedComposer = 3786,
-    RoomForwardMessageComposer = 160,
-    RoomInfoUpdatedComposer = 3297,
-    RoomInviteComposer = 3870,
-    RoomInviteErrorComposer = 462,
-    RoomMessageNotificationMessageComposer = 1634,
-    RoomOccupiedTilesMessageComposer = 3990,
-    RoomPropertyMessageComposer = 2454,
-    RoomQueueStatusMessageComposer = 2208,
-    RoomRatingComposer = 482,
-    RoomReadyMessageComposer = 2031,
-    RoomSettingsDataComposer = 1498,
-    RoomSettingsErrorComposer = 2897,
-    RoomSettingsSavedComposer = 948,
-    RoomSettingsSaveErrorComposer = 1555,
-    RoomThumbnailUpdateResultComposer = 1927,
-    RoomUserQuestionAnsweredComposer = -1,
-    RoomUserRespectComposer = 2815,
-    RoomVisitsComposer = 1752,
-    RoomVisualizationSettingsComposer = 3547,
-    SanctionStatusComposer = 2221,
-    ScrSendKickbackInfoMessageComposer = 3277,
-    ScrSendUserInfoComposer = 954,
-    SeasonalCalendarDailyOfferMessageComposer = 1889,
-    SeasonalQuestsMessageComposer = 1122,
-    SecondsUntilMessageComposer = 3926,
-    SellablePetPalettesMessageComposer = 3331,
-    ShoutMessageComposer = 1036,
-    ShowEnforceRoomCategoryDialogComposer = 3896,
-    SleepMessageComposer = 1797,
-    SlideObjectBundleMessageComposer = 3207,
-    Str16258Composer = 1660,
-    Str16667Composer = 3099,
-    Str17054Composer = 416,
-    TalentLevelUpComposer = 638,
-    TalentTrackLevelMessageEvent = 1203,
-    TalentTrackMessageComposer = 3406,
-    TargetedOfferComposer = 119,
-    TargetedOfferNotFoundComposer = 1237,
-    ThreadMessagesMessageComposer = 509,
-    ThumbnailStatusMessageComposer = 3595,
-    TradeCloseWindowComposer = 1001,
-    TradeCompleteComposer = 2369,
-    TradingAcceptComposer = 2568,
-    TradingCloseComposer = 1373,
-    TradingConfirmationComposer = 2720,
-    TradingItemListComposer = 2024,
-    TradingNoSuchItemComposer = 2873,
-    TradingNotOpenComposer = 3128,
-    TradingOpenComposer = 2505,
-    TradingOpenFailedComposer = 217,
-    TradingOtherNotAllowedComposer = 1254,
-    TradingYouAreNotAllowedComposer = 3058,
-    TraxSongInfoMessageComposer = 3365,
-    TryPhoneNumberResultMessageComposer = 800,
-    TryVerificationCodeResultMessageComposer = 91,
-    UniqueMachineIdComposer = 1488,
-    Unknowncomposer1188 = 1437,
-    UnloadGameMessageComposer = 1715,
-    UnreadForumsCountMessageComposer = 2379,
-    UnseenItemsComposer = 2103,
-    UpdateMessageMessageComposer = 324,
-    UpdateStackHeightTileHeightComposer = 2816,
-    UpdateThreadMessageComposer = 2528,
-    UseObjectMessageComposer = 1774,
-    HabboUserBadgesMessageComposer = 1087,
-    UserBannedMessageComposer = 1683,
-    UserBcLimitsComposer = -1,
-    UserChangeMessageComposer = 3920,
-    UserChatlogComposer = 3377,
-    UserClassificationMessageComposer = 966,
-    UserEventCatsComposer = 3244,
-    UserFlatCatsComposer = 1562,
-    UserGameAchievementsMessageComposer = 2265,
-    UserNameChangedMessageComposer = 2182,
-    UserObjectComposer = 2725,
-    UserRemoveMessageComposer = 2661,
-    UserRightsMessageComposer = 411,
-    UsersComposer = 374,
-    UserSongDisksInventoryMessageComposer = 2602,
-    UserTagsMessageComposer = 1255,
-    UserTypingMessageComposer = 1717,
-    UserUnbannedFromRoomComposer = 3429,
-    UserUpdateComposer = 1640,
-    VoucherRedeemErrorMessageComposer = 714,
-    VoucherRedeemOkMessageComposer = 3336,
-    WardrobeMessageComposer = 3315,
-    WeeklyCompetitiveFriendsLeaderboardComposer = 3560,
-    WeeklyCompetitiveLeaderboardComposer = 3512,
-    WeeklyGameRewardComposer = 2641,
-    WeeklyGameRewardWinnersComposer = 3097,
-    WelcomeGiftChangeEmailResultComposer = 2293,
-    WelcomeGiftStatusComposer = 2707,
-    WhisperMessageComposer = 2704,
-    WiredConditionDataComposer = 1108,
-    WiredEffectDataComposer = 1434,
-    WiredRewardResultMessageComposer = 178,
-    WiredSavedComposer = 1155,
-    WiredTriggerDataComposer = 383,
-    WiredValidationErrorComposer = 156,
-    YouAreControllerMessageComposer = 780,
-    YouAreNotControllerMessageComposer = 2392,
-    YouAreOwnerMessageComposer = 339,
-    YouArePlayingGameMessageComposer = 448,
-    YouAreSpectatorMessageEvent = 1033,
-    YoutubeControlVideoMessageComposer = 1554,
-    YoutubeDisplayPlaylistsComposer = 1112,
-    YoutubeDisplayVideoMessageComposer = 1411,
-    SnowStormGameStartedComposer = 5000,
-    SnowStormQuePositionComposer = 5001,
-    SnowStormStartBlockTickerComposer = 5002,
-    SnowStormStartLobbyCounterComposer = 5003,
-    SnowStormUnusedAlertGenericComposer = 5004,
-    SnowStormLongDataComposer = 5005,
-    SnowStormGameEndedComposer = 5006,
-    SnowStormQuePlayerAddedComposer = 5008,
-    SnowStormPlayAgainComposer = 5009,
-    SnowStormGamesLeftComposer = 5010,
-    SnowStormQuePlayerRemovedComposer = 5011,
-    SnowStormGamesInformationComposer = 5012,
-    SnowStormLongData2Composer = 5013,
-    UnusedSnowstorm5014 = 5014,
-    SnowStormGameStatusComposer = 5015,
-    SnowStormFullGameStatusComposer = 5016,
-    SnowStormOnStageStartComposer = 5017,
-    SnowStormIntializeGameArenaViewComposer = 5018,
-    SnowStormRejoinPreviousRoomComposer = 5019,
-    UnknownSnowstorm5020 = 5020,
-    SnowStormLevelDataComposer = 5021,
-    SnowStormOnGameEndingComposer = 5022,
-    SnowStormUserChatMessageComposer = 5023,
-    SnowStormOnStageRunningComposer = 5024,
-    SnowStormOnStageEndingComposer = 5025,
-    SnowStormIntializedPlayersComposer = 5026,
-    SnowStormOnPlayerExitedArenaComposer = 5027,
-    SnowStormGenericErrorComposer = 5028,
-    SnowStormUserRematchedComposer = 5029
+     AchievementList = 305,
+     Authenticated = 2491,
+     Authentication = -1,
+     AvailabilityStatus = 2033,
+     BuildersClubExpired = 1452,
+     ClubOffers = 2405,
+     CatalogPage = 804,
+     CatalogPageList = 1032,
+     CatalogPurchaseOk = 869,
+     CatalogPurchaseError = 1404,
+     CatalogPurchaseNotAllowed = 3770,
+     ProductOffer = 3388,
+     LimitedSoldOut = 377,
+     CatalogPublished = 1866,
+     CfhResultMessage = 3635,
+     ClientLatency = 10,
+     ClientPing = 3928,
+     DesktopCampaign = 1745,
+     DesktopNews = 286,
+     DesktopView = 122,
+     BundleDiscountRuleset = 2347,
+     FirstLoginOfDay = 793,
+     FurnitureAliases = 1723,
+     FurnitureData = 2547,
+     FurnitureFloor = 1778,
+     FurnitureFloorAdd = 1534,
+     FurnitureFloorRemove = 2703,
+     FurnitureFloorUpdate = 3776,
+     FurnitureItemdata = 2202,
+     FurnitureState = 2376,
+     FurnitureGroupContextMenuInfo = 3293,
+     FurniturePostitStickyPoleOpen = 2366,
+     GameCenterAchievements = 2265,
+     GameCenterGameList = 222,
+     GameCenterStatus = 2893,
+     GameCenterInArenaQueue = 872,
+     GameCenterStopCounter = 3191,
+     GameCenterUserLeftGame = 3138,
+     GameCenterDirectoryStatus = 2246,
+     GameCenterStartingGameFailed = 2142,
+     GameCenterJoiningFailed = 1730,
+     Gamestatusmessage = 3805,
+     Gameachievements = 1689,
+     Gameinvite = 904,
+     Joiningqueuefailed = 3035,
+     Joinedqueuemessage = 2260,
+     Leftqueue = 1477,
+     LoadGameUrl = 2624,
+     Loadgame = 3654,
+     Unloadgame = 1715,
+     Achievementresolutioncompleted = 740,
+     Achievementresolutionprogress = 3370,
+     Achievementresolutions = 66,
+     GenericAlert = 3801,
+     ModeratorMessage = 2030,
+     GenericError = 1600,
+     GiftWrapperConfig = 2234,
+     GroupBadges = 2402,
+     GroupCreateOptions = 2159,
+     GroupForumData = 3011,
+     GroupForumList = 3001,
+     GroupForumThreads = 1073,
+     GroupForumPost = 2049,
+     GroupForumPostThread = 1862,
+     GroupForumThreadMessages = 509,
+     GroupForumUnreadCount = 2379,
+     GroupForumUpdateMessage = 324,
+     GroupForumUpdateThread = 2528,
+     GroupInfo = 1702,
+     GroupList = 420,
+     GroupMember = 265,
+     GroupMembers = 1200,
+     GroupMembersRefresh = 2445,
+     GroupMemberRemoveConfirm = 1876,
+     GroupPurchased = 2808,
+     GroupSettings = 3965,
+     GroupBadgeParts = 2238,
+     GroupMembershipRequested = 1180,
+     GroupDetailsChanged = 1459,
+     GroupHabboJoinFailed = 762,
+     GuildEditFailed = 3988,
+     GuildMemberMgmtFailed = 818,
+     ItemDimmerSettings = 2710,
+     ItemStackHelper = 2816,
+     ItemWall = 1369,
+     ItemWallAdd = 2187,
+     ItemWallRemove = 3208,
+     ItemWallUpdate = 2009,
+     MarketplaceConfig = 1823,
+     MessengerAcceptFriends = 896,
+     MessengerChat = 1587,
+     MessengerFindFriends = 1210,
+     MessengerFollowFailed = 3048,
+     MessengerFriendNotification = 3082,
+     MessengerFriends = 3130,
+     MessengerInit = 1605,
+     MessengerInstanceMessageError = 3359,
+     MessengerInvite = 3870,
+     MessengerInviteError = 462,
+     MessengerMessageError = 892,
+     MessengerMinimailCount = 2803,
+     MessengerMinimailNew = 1911,
+     MessengerRelationships = 2016,
+     MessengerRequest = 2219,
+     MessengerRequestError = 892,
+     MessengerRequests = 280,
+     MessengerSearch = 973,
+     MessengerUpdate = 2800,
+     ModerationReportDisabled = 1651,
+     ModerationTool = 2696,
+     ModerationUserInfo = 2866,
+     MotdMessages = 2035,
+     NavigatorCategories = 1562,
+     NavigatorCollapsed = 1543,
+     NavigatorEventCategories = 3244,
+     NavigatorLifted = 3104,
+     NavigatorMetadata = 3052,
+     NavigatorOpenRoomCreator = 2064,
+     NavigatorSearch = 2690,
+     NavigatorSearches = 3984,
+     NavigatorSettings = 518,
+     ThumbnailUpdateResult = 1927,
+     CanCreateRoom = 378,
+     CategoriesWithVisitorCount = 1455,
+     CompetitionRoomsData = 3954,
+     ConvertedRoomId = 1331,
+     GuestRoomSearchResult = 52,
+     NotificationList = 1992,
+     NotificationOfferRewardDelivered = 2125,
+     NotificationSimpleAlert = 5100,
+     NotificationElementPointer = 1787,
+     PetFigureUpdate = 1924,
+     PetInfo = 2901,
+     PetTrainingPanel = 1164,
+     PetLevelUpdate = 2824,
+     PetScratchFailed = 1130,
+     PetOpenPackageRequested = 2380,
+     PetOpenPackageResult = 546,
+     PetBreeding = 1746,
+     PetConfirmBreedingResult = 1625,
+     PetGoToBreedingNestFailure = 2621,
+     PetNestBreedingSuccess = 2527,
+     PetConfirmBreedingRequest = 634,
+     PetBreedingResult = 1553,
+     RecyclerPrizes = 3164,
+     RecyclerStatus = 3433,
+     RecyclerFinished = 468,
+     RoomBanList = 1869,
+     RoomBanRemove = 3429,
+     RoomCreated = 1304,
+     RoomDoorbell = 2309,
+     RoomDoorbellAccepted = 3783,
+     RoomDoorbellRejected = 878,
+     RoomEnter = 758,
+     RoomEnterError = 899,
+     RoomForward = 160,
+     RoomHeightMap = 2753,
+     RoomHeightMapUpdate = 558,
+     RoomInfo = 687,
+     RoomInfoOwner = 749,
+     RoomModel = 1301,
+     RoomModelBlockedTiles = 3990,
+     RoomModelDoor = 1664,
+     RoomModelName = 2031,
+     RoomMuted = 2533,
+     RoomMuteUser = 826,
+     RoomPaint = 2454,
+     RoomPromotion = 2274,
+     RoomQueueStatus = 2208,
+     RoomRights = 780,
+     RoomRightsClear = 2392,
+     RoomRightsList = 1284,
+     RoomRightsListAdd = 2088,
+     RoomRightsListRemove = 1327,
+     RoomRightsOwner = 339,
+     RoomRolling = 3207,
+     RoomScore = 482,
+     RoomSettings = 1498,
+     RoomSettingsChat = 1191,
+     RoomSettingsSave = 948,
+     RoomSettingsSaveError = 1555,
+     RoomInfoUpdated = 3297,
+     RoomSpectator = 1033,
+     RoomThickness = 3547,
+     RoomGetFilterWords = 2937,
+     RoomMessageNotification = 1634,
+     RoomPopularTagsResult = 2012,
+     InfoFeedEnable = 3284,
+     SecurityMachine = 1488,
+     MysteryBoxKeys = 2833,
+     Gotmysteryboxprizemessage = 3712,
+     Cancelmysteryboxwaitmessage = 596,
+     Showmysteryboxwaitmessage = 3201,
+     TradeAccepted = 2568,
+     TradeClosed = 1373,
+     TradeCompleted = 1001,
+     TradeConfirmation = 2720,
+     TradeListItem = 2024,
+     TradeNotOpen = 3128,
+     TradeOpen = 2505,
+     TradeOpenFailed = 217,
+     TradeOtherNotAllowed = 1254,
+     TradeYouNotAllowed = 3058,
+     TradeNoSuchItem = 2873,
+     Unit = 374,
+     UnitChangeName = 2182,
+     UnitChat = 1446,
+     UnitChatShout = 1036,
+     UnitChatWhisper = 2704,
+     UnitDance = 2233,
+     UnitEffect = 1167,
+     UnitExpression = 1631,
+     UnitHandItem = 1474,
+     UnitIdle = 1797,
+     UnitInfo = 3920,
+     UnitNumber = 2324,
+     UnitRemove = 2661,
+     UnitStatus = 1640,
+     UnitTyping = 1717,
+     UnseenItems = 2103,
+     UserAchievementScore = 1968,
+     UserBadges = 717,
+     UserBadgesAdd = 2493,
+     UserBadgesCurrent = 1087,
+     UserBotRemove = 233,
+     UserBots = 3086,
+     UserChangeName = 118,
+     UserClothing = 1450,
+     UserCredits = 3475,
+     UserCurrency = 2018,
+     ActivityPointNotification = 2275,
+     UserEffects = 340,
+     UserFavoriteRoom = 2524,
+     UserFavoriteRoomCount = 151,
+     UserFigure = 2429,
+     UserFurniture = 994,
+     UserFurnitureAdd = 104,
+     UserFurniturePostitPlaced = 1501,
+     UserFurnitureRefresh = 3151,
+     UserFurnitureRemove = 159,
+     UserHomeRoom = 2875,
+     RoomEventCancel = 3479,
+     RoomEvent = 1840,
+     UserIgnored = 126,
+     UserIgnoredResult = 207,
+     UserInfo = 2725,
+     UserOutfits = 3315,
+     UserPerks = 2586,
+     UserPermissions = 411,
+     UserPetAdd = 2101,
+     UserPetRemove = 3253,
+     UserPets = 3522,
+     UserProfile = 3898,
+     UserRespect = 2815,
+     UserSanctionStatus = 3679,
+     UserSettings = 513,
+     UserSubscription = 954,
+     UserWardrobePage = 3315,
+     UserClassification = 966,
+     GetUserTags = 1255,
+     WiredAction = 1434,
+     WiredCondition = 1108,
+     WiredError = 156,
+     WiredOpen = 1830,
+     WiredReward = 178,
+     WiredSave = 1155,
+     WiredTrigger = 383,
+     PlayingGame = 448,
+     FurnitureState2 = 3431,
+     RemoveBotFromInventory = 233,
+     AddBotToInventory = 1352,
+     AchievementProgressed = 2107,
+     ModtoolRoomInfo = 1333,
+     ModtoolUserChatlog = 3377,
+     ModtoolRoomChatlog = 3434,
+     ModtoolVisitedRoomsUser = 1752,
+     ModeratorActionResult = 2335,
+     IssueDeleted = 3192,
+     IssueInfo = 3609,
+     IssuePickFailed = 3150,
+     CfhChatlog = 607,
+     ModeratorToolPreferences = 1576,
+     LovelockFurniStart = 3753,
+     LovelockFurniFriendComfirmed = 382,
+     LovelockFurniFinished = 770,
+     GiftReceiverNotFound = 1517,
+     GiftOpened = 56,
+     FloodControl = 566,
+     RemainingMute = 826,
+     UserEffectList = 340,
+     UserEffectListAdd = 2867,
+     UserEffectListRemove = 2228,
+     UserEffectActivate = 1959,
+     AvatarEffectSelected = 3473,
+     ClubGiftInfo = 619,
+     RedeemVoucherError = 714,
+     RedeemVoucherOk = 3336,
+     InClientLink = 2023,
+     BotCommandConfiguration = 1618,
+     BotSkillListUpdate = 69,
+     BotForceOpenContextMenu = 296,
+     HandItemReceived = 354,
+     PetPlacingError = 2913,
+     BotError = 639,
+     MarketplaceSellItem = 54,
+     MarketplaceItemStats = 725,
+     MarketplaceOwnItems = 3884,
+     MarketplaceCancelSale = 3264,
+     MarketplaceItemPosted = 1359,
+     MarketplaceItemsSearched = 680,
+     MarketplaceAfterOrderStatus = 2032,
+     CatalogReceivePetBreeds = 3331,
+     CatalogApproveNameResult = 1503,
+     ObjectsDataUpdate = 1453,
+     PetExperience = 2156,
+     CommunityGoalVoteEvent = 1435,
+     PromoArticles = 286,
+     CommunityGoalEarnedPrizes = 3319,
+     CommunityGoalProgress = 2525,
+     ConcurrentUsersGoalProgress = 2737,
+     QuestDaily = 1878,
+     QuestCancelled = 3027,
+     QuestCompleted = 949,
+     CommunityGoalHallOfFame = 3005,
+     EpicPopup = 3945,
+     SeasonalQuests = 1122,
+     Quests = 3625,
+     Quest = 230,
+     BonusRareInfo = 1533,
+     CraftableProducts = 1000,
+     CraftingRecipe = 2774,
+     CraftingRecipesAvailable = 2124,
+     CraftingResult = 618,
+     CameraPublishStatus = 2057,
+     CameraPurchaseOk = 2783,
+     CameraStorageUrl = 3696,
+     CameraSnapshot = 463,
+     CompetitionStatus = 133,
+     InitCamera = 3878,
+     ThumbnailStatus = 3595,
+     AchievementNotification = 806,
+     ClubGiftNotification = 2188,
+     InterstitialMessage = 1808,
+     RoomAdError = 1759,
+     AvailabilityTime = 600,
+     HotelClosedAndOpens = 3728,
+     HotelClosesAndOpensAt = 2771,
+     HotelWillCloseMinutes = 1050,
+     HotelMaintenance = 1350,
+     JukeboxPlaylistFull = 105,
+     JukeboxSongDisks = 34,
+     NowPlaying = 469,
+     OfficialSongId = 1381,
+     Playlist = 1748,
+     PlaylistSongAdded = 1140,
+     TraxSongInfo = 3365,
+     UserSongDisksInventory = 2602,
+     CheckUserName = 563,
+     CfhSanction = 2782,
+     CfhTopics = 325,
+     CfhSanctionStatus = 2221,
+     CampaignCalendarData = 2531,
+     CampaignCalendarDoorOpened = 2551,
+     BuildersClubFurniCount = 3828,
+     BuildersClubSubscription = 1452,
+     CatalogPageExpiration = 2668,
+     CatalogEarliestExpiry = 2515,
+     ClubGiftSelected = 659,
+     TargetOfferNotFound = 1237,
+     TargetOffer = 119,
+     DirectSmsClubBuy = 195,
+     RoomAdPurchase = 2468,
+     NotEnoughBalance = 3914,
+     LimitedOfferAppearingNext = 44,
+     IsOfferGiftable = 761,
+     ClubExtendedOffer = 3964,
+     SeasonalCalendarOffer = 1889,
+     CompetitionEntrySubmit = 1177,
+     CompetitionVotingInfo = 3506,
+     CompetitionTimingCode = 1745,
+     CompetitionUserPartOf = 3841,
+     CompetitionNoOwnedRooms = 2064,
+     CompetitionSecondsUntil = 3926,
+     BadgePointLimits = 2501,
+     BadgeRequestFulfilled = 2998,
+     HelperTalentTrack = 3406,
+     TalentTrackLevel = 1203,
+     TalentTrackLevelUp = 638,
+     UserBanned = 1683,
+     BotReceived = 3684,
+     PetLevelNotification = 859,
+     PetReceived = 1111,
+     ModerationCaution = 1890,
+     YoutubeControlVideo = 1554,
+     YoutubeDisplayPlaylists = 1112,
+     YoutubeDisplayVideo = 1411,
+     CfhDisabledNotify = 1651,
+     Question = 2665,
+     PollContents = 2997,
+     PollError = 662,
+     PollOffer = 3785,
+     PollRoomResult = 5201,
+     PollStartRoom = 5200,
+     QuestionAnswered = 2589,
+     QuestionFinished = 1066,
+     CfhPendingCalls = 1121,
+     GuideOnDutyStatus = 1548,
+     GuideSessionAttached = 1591,
+     GuideSessionDetached = 138,
+     GuideSessionEnded = 1456,
+     GuideSessionError = 673,
+     GuideSessionInvitedToGuideRoom = 219,
+     GuideSessionMessage = 841,
+     GuideSessionPartnerIsTyping = 1016,
+     GuideSessionRequesterRoom = 1847,
+     GuideSessionStarted = 3209,
+     GuideTicketCreationResult = 3285,
+     GuideTicketResolution = 2674,
+     GuideReportingStatus = 3463,
+     HotelMergeNameChange = 1663,
+     IssueCloseNotification = 934,
+     QuizData = 2927,
+     QuizResults = 2772,
+     CfhPendingCallsDeleted = 77,
+     CfhReply = 3796,
+     ChatReviewSessionDetached = 30,
+     ChatReviewSessionOfferedToGuide = 735,
+     ChatReviewSessionResults = 3276,
+     ChatReviewSessionStarted = 143,
+     ChatReviewSessionVotingStatus = 1829,
+     ScrSendKickbackInfo = 3277,
+     PetStatus = 1907,
+     GroupDeactivate = 3129,
+     PetRespected = 2788,
+     PetSupplement = 3441,
+     NoobnessLevel = 3738,
+     DisconnectReason = 4000,
+     CanCreateRoomEvent = 2599,
+     FavoriteGroupUdpate = 3403,
+     NoSuchFlat = 84,
+     RoomSettingsError = 2897,
+     ShowEnforceRoomCategory = 3896,
+     CustomUserNotification = 909,
+     NewUserExperienceGiftOffer = 3575,
+     RestoreClient = 426,
+     FireworkChargeData = 5210,
+     NewUserExperienceNotComplete = 3639,
+     ConnectionError = 1004,
+     AccountSafetyLockStatusChange = 1243,
+     PhoneCollectionState = 2890,
+     PhoneTryNumberResult = 800,
+     PhoneTryVerificationCodeResult = 91,
+     ExtendedProfileChanged = 876,
+     WelcomeGiftChangeEmailResult = 2293,
+     WelcomeGiftStatus = 2707,
+     HandshakeInitDiffie = 1347,
+     HandshakeCompleteDiffie = 3885,
+     RentableSpaceRentOk = 2046,
+     RentableSpaceStatus = 3559,
+     RentableSpaceRentFailed = 1868,
+     EmailStatus = 612,
+     ChangeEmailResult = 1815,
+     WeeklyGameReward = 2641,
+     WeeklyGameRewardWinners = 3097,
+     WeeklyCompetitiveLeaderboard = 3512,
+     WeeklyCompetitiveFriendsLeaderboard = 3560,
+     WeeklyGame2FriendsLeaderboard = 2270,
+     WeeklyGame2Leaderboard = 2196,
+     RentableFurniRentOrBuyoutOffer = 35,
+     HandshakeIdentityAccount = 3523,
 }
\ No newline at end of file
diff --git a/Communication/Messages/Outgoing/Handshake/AuthenticationOkMessageComposer.cs b/Communication/Messages/Outgoing/Security/AuthenticatedComposer.cs
similarity index 59%
rename from Communication/Messages/Outgoing/Handshake/AuthenticationOkMessageComposer.cs
rename to Communication/Messages/Outgoing/Security/AuthenticatedComposer.cs
index cf25978..a1c1e61 100644
--- a/Communication/Messages/Outgoing/Handshake/AuthenticationOkMessageComposer.cs
+++ b/Communication/Messages/Outgoing/Security/AuthenticatedComposer.cs
@@ -1,11 +1,11 @@
 using Tiger.Communication.Messages.Interfaces;
 using Tiger.Communication.Messages.Types;
 
-namespace Tiger.Communication.Messages.Outgoing.Handshake;
+namespace Tiger.Communication.Messages.Outgoing.Security;
 
-public class AuthenticationOkMessageComposer : IMessageComposer
+public class AuthenticatedComposer : IMessageComposer
 {
-    public OutgoingHeaders Header => OutgoingHeaders.AuthenticationOkMessageComposer;
+    public OutgoingHeaders Header => OutgoingHeaders.Authenticated;
  
     public void Compose(ServerMessage message)
     {
diff --git a/Communication/Messages/Outgoing/Users/HabboUserBadgesMessageComposer.cs b/Communication/Messages/Outgoing/User/Data/UserCurrentBadgesComposer.cs
similarity index 66%
rename from Communication/Messages/Outgoing/Users/HabboUserBadgesMessageComposer.cs
rename to Communication/Messages/Outgoing/User/Data/UserCurrentBadgesComposer.cs
index 56c9d32..a643fba 100644
--- a/Communication/Messages/Outgoing/Users/HabboUserBadgesMessageComposer.cs
+++ b/Communication/Messages/Outgoing/User/Data/UserCurrentBadgesComposer.cs
@@ -2,20 +2,20 @@ using Tiger.Communication.Messages.Interfaces;
 using Tiger.Communication.Messages.Types;
 using Tiger.Game.Habbos;
 
-namespace Tiger.Communication.Messages.Outgoing.Users;
+namespace Tiger.Communication.Messages.Outgoing.User.Data;
 
-public class HabboUserBadgesMessageComposer : IMessageComposer
+public class UserCurrentBadgesComposer : IMessageComposer
 {
     private readonly int _habboId;
     private readonly ICollection<Badge> _badges;
 
-    public HabboUserBadgesMessageComposer(int habboId, ICollection<Badge> badges)
+    public UserCurrentBadgesComposer(int habboId, ICollection<Badge> badges)
     {
         _habboId = habboId;
         _badges = badges;
     }
 
-    public OutgoingHeaders Header => OutgoingHeaders.HabboUserBadgesMessageComposer;
+    public OutgoingHeaders Header => OutgoingHeaders.UserBadgesCurrent;
     public void Compose(ServerMessage message)
     {
         message.AppendInt32(_habboId);
diff --git a/Communication/Messages/Outgoing/Handshake/UserObjectMessageComposer.cs b/Communication/Messages/Outgoing/User/Data/UserInfoComposer.cs
similarity index 80%
rename from Communication/Messages/Outgoing/Handshake/UserObjectMessageComposer.cs
rename to Communication/Messages/Outgoing/User/Data/UserInfoComposer.cs
index 386db52..c08f247 100644
--- a/Communication/Messages/Outgoing/Handshake/UserObjectMessageComposer.cs
+++ b/Communication/Messages/Outgoing/User/Data/UserInfoComposer.cs
@@ -3,18 +3,18 @@ using Tiger.Communication.Messages.Interfaces;
 using Tiger.Communication.Messages.Types;
 using Tiger.Game.Habbos;
 
-namespace Tiger.Communication.Messages.Outgoing.Handshake;
+namespace Tiger.Communication.Messages.Outgoing.User.Data;
 
-public class UserObjectMessageComposer : IMessageComposer
+public class UserInfoComposer : IMessageComposer
 {
     private readonly Habbo _habbo;
 
-    public UserObjectMessageComposer(Habbo habbo)
+    public UserInfoComposer(Habbo habbo)
     {
         _habbo = habbo;
     }
 
-    public OutgoingHeaders Header => OutgoingHeaders.UserObjectComposer;
+    public OutgoingHeaders Header => OutgoingHeaders.UserInfo;
     public void Compose(ServerMessage message)
     {
         message.AppendInt32(_habbo.Id);
diff --git a/Communication/Messages/Outgoing/Users/ExtendedProfileComposer.cs b/Communication/Messages/Outgoing/User/Data/UserProfileComposer.cs
similarity index 80%
rename from Communication/Messages/Outgoing/Users/ExtendedProfileComposer.cs
rename to Communication/Messages/Outgoing/User/Data/UserProfileComposer.cs
index 799f0d4..c03eb4b 100644
--- a/Communication/Messages/Outgoing/Users/ExtendedProfileComposer.cs
+++ b/Communication/Messages/Outgoing/User/Data/UserProfileComposer.cs
@@ -3,18 +3,18 @@ using Tiger.Communication.Messages.Interfaces;
 using Tiger.Communication.Messages.Types;
 using Tiger.Game.Habbos;
 
-namespace Tiger.Communication.Messages.Outgoing.Users;
+namespace Tiger.Communication.Messages.Outgoing.User.Data;
 
-public class ExtendedProfileComposer : IMessageComposer
+public class UserProfileComposer : IMessageComposer
 {
     private readonly Habbo _habbo;
 
-    public ExtendedProfileComposer(Habbo habbo)
+    public UserProfileComposer(Habbo habbo)
     {
         _habbo = habbo;
     }
 
-    public OutgoingHeaders Header => OutgoingHeaders.ExtendedProfileMessageComposer;
+    public OutgoingHeaders Header => OutgoingHeaders.UserProfile;
     public void Compose(ServerMessage message)
     {
         message.AppendInt32(_habbo.Id);
diff --git a/TigerEmu.csproj b/TigerEmu.csproj
index 1d79ada..1a02297 100644
--- a/TigerEmu.csproj
+++ b/TigerEmu.csproj
@@ -30,4 +30,7 @@
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </None>
     </ItemGroup>
+    <ItemGroup>
+      <Folder Include="Communication\Messages\Incoming\Avatar\" />
+    </ItemGroup>
 </Project>