diff --git a/src/system_vip_scripts.cpp b/src/system_vip_scripts.cpp
index ea2774b..d8abcac 100644
--- a/src/system_vip_scripts.cpp
+++ b/src/system_vip_scripts.cpp
@@ -3,6 +3,7 @@
  */
 
 #include "SystemVip.h"
+#include "WorldSessionMgr.h"
 
 #define sV sSystemVip
 
@@ -10,47 +11,53 @@
 class SystemVipPlayer : public PlayerScript
 {
 public:
-    SystemVipPlayer() : PlayerScript("SystemVipPlayer") { }
-
-    void OnLogin(Player* player) override
+    SystemVipPlayer() : PlayerScript("SystemVipPlayer", {
+        PLAYERHOOK_ON_LOGIN,
+        PLAYERHOOK_ON_LOGOUT,
+        PLAYERHOOK_ON_GIVE_EXP,
+        PLAYERHOOK_ON_BEFORE_LOOT_MONEY,
+        PLAYERHOOK_ON_PLAYER_RELEASED_GHOST,
+        PLAYERHOOK_ON_VICTIM_REWARD_AFTER
+    }) { }
+
+    void OnPlayerLogin(Player* player) override
     {
         if (sConfigMgr->GetOption<bool>("SystemVip.Announce", false))
-        {
             ChatHandler(player->GetSession()).SendSysMessage("This server is running the |cff4CFF00SystemVip |rmodule.");
-        }
 
-        if (sV->isVip(player) && sV->loginAnnounce) {
-            sWorld->SendServerMessage(SERVER_MSG_STRING, sV->getLoginMessage(player));
-        }
+        if (sV->isVip(player) && sV->loginAnnounce)
+            sWorldSessionMgr->SendServerMessage(SERVER_MSG_STRING, sV->getLoginMessage(player));
 
-        if (sV->isVip(player)) {
+        if (sV->isVip(player))
             ChatHandler(player->GetSession()).PSendSysMessage("Tiempo de suscripcion vip disponible: |cff4CFF00%s|r", sV->getFormatedVipTime(player).c_str());
-        }
 
         sV->delExpireVip(player);
         if (sV->saveTeleport && sV->isVip(player))
             sV->loadTeleportVip(player);
     }
 
-    void OnLogout(Player* player) override {
+    void OnPlayerLogout(Player* player) override
+    {
         if (sV->saveTeleport && sV->isVip(player))
             sV->teleportMap.erase(player->GetSession()->GetAccountId());
     }
 
-    void OnGiveXP(Player* player, uint32& amount, Unit* /*victim*/, uint8 /*xpSource*/) override {
-        if (sV->isVip(player) && sV->rateCustom) {
+    void OnPlayerGiveXP(Player* player, uint32& amount, Unit* /*victim*/, uint8 /*xpSource*/) override
+    {
+        if (sV->isVip(player) && sV->rateCustom)
             amount *= sV->rateXp;
-        }
     }
 
-    void OnBeforeLootMoney(Player* player, Loot* loot) override {
-        if (sV->isVip(player) && sV->rateCustom) {
+    void OnPlayerBeforeLootMoney(Player* player, Loot* loot) override
+    {
+        if (sV->isVip(player) && sV->rateCustom)
             loot->gold *= sV->goldRate;
-        }
     }
 
-    void OnPlayerReleasedGhost(Player* player) override {
-        if (sV->isVip(player) && sV->ghostMount) {
+    void OnPlayerReleasedGhost(Player* player) override
+    {
+        if (sV->isVip(player) && sV->ghostMount)
+        {
             // Cast Mount Speed
             if (!player->HasAura(55164))
                 player->AddAura(55164, player);
@@ -58,11 +65,12 @@ class SystemVipPlayer : public PlayerScript
         }
     }
 
-    void OnVictimRewardAfter(Player* player, Player* /*victim*/, uint32& /*killer_title*/, uint32& /*victim_rank*/, float& honor_f) override {
-        if (sV->isVip(player) && sV->rateCustom) {
-            if (sV->honorRate > 1) {
+    void OnPlayerVictimRewardAfter(Player* player, Player* /*victim*/, uint32& /*killer_title*/, uint32& /*victim_rank*/, float& honor_f) override
+    {
+        if (sV->isVip(player) && sV->rateCustom)
+        {
+            if (sV->honorRate > 1)
                 player->ModifyHonorPoints((honor_f * sV->honorRate) - honor_f);
-            }
         }
     }
 };
@@ -89,41 +97,45 @@ class SystemVipVendor : public CreatureScript {
         ClearGossipMenuFor(player);
         switch (action)
         {
-        case 1:
-            if (player->HasItemCount(sV->TokenEntry, sV->TokenAmount)) {
-                player->DestroyItemCount(sV->TokenEntry, sV->TokenAmount, true);
-                sV->addRemainingVipTime(player);
-                if (!player->HasItemCount(44824, 1, true)) {
+            case 1:
+                if (player->HasItemCount(sV->TokenEntry, sV->TokenAmount))
+                {
+                    player->DestroyItemCount(sV->TokenEntry, sV->TokenAmount, true);
+                    sV->addRemainingVipTime(player);
+                    if (!player->HasItemCount(44824, 1, true))
+                        player->AddItem(44824, 1);
+
+                    ChatHandler(player->GetSession()).PSendSysMessage("Gracias por tu suscripcion vip.");
+                    ChatHandler(player->GetSession()).PSendSysMessage("Tiempo de suscripcion vip disponible: %s", sV->getFormatedVipTime(player).c_str());
+                    OnGossipSelect(player, creature, 0, 2);
+                }
+                else
+                {
+                    ChatHandler(player->GetSession()).PSendSysMessage("No tienes suficientes Tokens.");
+                    CloseGossipMenuFor(player);
+                }
+                break;
+            case 2:
+                sV->sendGossipInformation(player, true);
+                AddGossipItemFor(player, 0, "|TInterface/ICONS/Trade_Engineering:28:28:-15:0|t Cerrar.", 0, 3);
+                SendGossipMenuFor(player, VENDOR_INFO, creature->GetGUID());
+                break;
+            case 4:
+                if (!player->HasItemCount(44824, 1, true))
+                {
                     player->AddItem(44824, 1);
+                    creature->Whisper("No lo vuelvas a perder.", LANG_UNIVERSAL, player, false);
+                    CloseGossipMenuFor(player);
                 }
-                ChatHandler(player->GetSession()).PSendSysMessage("Gracias por tu suscripcion vip.");
-                ChatHandler(player->GetSession()).PSendSysMessage("Tiempo de suscripcion vip disponible: %s", sV->getFormatedVipTime(player).c_str());
-                OnGossipSelect(player, creature, 0, 2);
-            }
-            else {
-                ChatHandler(player->GetSession()).PSendSysMessage("No tienes suficientes Tokens.");
-                CloseGossipMenuFor(player);
-            }
-            break;
-        case 2:
-            sV->sendGossipInformation(player, true);
-            AddGossipItemFor(player, 0, "|TInterface/ICONS/Trade_Engineering:28:28:-15:0|t Cerrar.", 0, 3);
-            SendGossipMenuFor(player, VENDOR_INFO, creature->GetGUID());
-            break;
-        case 4:
-            if (!player->HasItemCount(44824, 1, true)) {
-                player->AddItem(44824, 1);
-                creature->Whisper("No lo vuelvas a perder.", LANG_UNIVERSAL, player, false);
+                else
+                {
+                    creature->Whisper("Ya tienes un item para invocar a tu mascota VIP.", LANG_UNIVERSAL, player, false);
+                    OnGossipHello(player, creature);
+                }
+                break;
+            default:
                 CloseGossipMenuFor(player);
-            }
-            else {
-                creature->Whisper("Ya tienes un item para invocar a tu mascota VIP.", LANG_UNIVERSAL, player, false);
-                OnGossipHello(player, creature);
-            }
-            break;
-        default:
-            CloseGossipMenuFor(player);
-            break;
+                break;
         }
         return true;
     }
@@ -133,8 +145,10 @@ class SystemVipPocket : ItemScript {
 public:
     SystemVipPocket() : ItemScript("SystemVipPocket") {}
 
-    bool OnUse(Player* player, Item* /*item*/, SpellCastTargets const& /*targets*/) {
-        if (!sV->isVip(player)) {
+    bool OnUse(Player* player, Item* /*item*/, SpellCastTargets const& /*targets*/)
+    {
+        if (!sV->isVip(player))
+        {
             ChatHandler(player->GetSession()).PSendSysMessage("No eres Vip!");
             ChatHandler(player->GetSession()).PSendSysMessage("Por favor renueva tu suscription vip.");
             return false;
@@ -145,7 +159,8 @@ class SystemVipPocket : ItemScript {
             return false;
         }*/
 
-        if (player->GetMap()->IsBattleArena()) {
+        if (player->GetMap()->IsBattleArena())
+        {
             ChatHandler(player->GetSession()).PSendSysMessage("No puedes usar en arena!");
             return false;
         }
@@ -172,16 +187,16 @@ class SystemVipPet : CreatureScript {
 public:
     SystemVipPet() : CreatureScript("SystemVipPet") {}
 
-    bool OnGossipHello(Player* player, Creature* creature) {
+    bool OnGossipHello(Player* player, Creature* creature)
+    {
         ClearGossipMenuFor(player);
         sV->sendGossipInformation(player, false);
-        if (creature->GetCreatorGUID() != player->GetGUID()) {
+        if (creature->GetCreatorGUID() != player->GetGUID())
             return true;
-        }
 
-        if (!sV->petEnable) {
+        if (!sV->petEnable)
             return true;
-        }
+
         if(sV->vipZone)
             AddGossipItemFor(player, 0, "|TInterface/ICONS/Achievement_Zone_ZulDrak_12:28:28:-15:0|t Vip Zone", 0, 1);
         if(sV->armorRep)
@@ -190,7 +205,8 @@ class SystemVipPet : CreatureScript {
             AddGossipItemFor(player, 0, "|TInterface/ICONS/INV_Ingot_03:28:28:-15:0|t Mi Banco.", 0, 3);
         if(sV->mailEnable)
             AddGossipItemFor(player, 0, "|TInterface/ICONS/inv_letter_15:28:28:-15:0|t Mi Correo.", 0, 8);
-        if (sV->buffsEnable) {
+        if (sV->buffsEnable)
+        {
             AddGossipItemFor(player, 0, "|TInterface/ICONS/Spell_Magic_GreaterBlessingofKings:28:28:-15:0|t Buffs", 0, 4);
             AddGossipItemFor(player, 0, "|TInterface/PAPERDOLLINFOFRAME/UI-GearManager-Undo:28:28:-15:0|t Remover Buffs", 0, 11);
         }
@@ -209,135 +225,140 @@ class SystemVipPet : CreatureScript {
         SendGossipMenuFor(player, PET_INFO, creature->GetGUID());
         return true;
     }
-    bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action) {
+    bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action)
+    {
         ClearGossipMenuFor(player);
         switch (action)
         {
-        case 1:
-            if (player->IsInCombat()) {
-                ChatHandler(player->GetSession()).PSendSysMessage("Estás en combate!");
-                CloseGossipMenuFor(player);
-            }
-            else {
-                player->TeleportTo(sV->vipZoneMapId, sV->vipZonePosX, sV->vipZonePosY, sV->vipZonePosZ, sV->vipZoneO);
-                CloseGossipMenuFor(player);
-            }
-            break;
-        case 2:
-            player->DurabilityRepairAll(false, 0, false);
-            ChatHandler(player->GetSession()).PSendSysMessage("Reparaste tus armaduras.");
-            OnGossipHello(player, creature);
-            break;
-        case 3:
-            player->GetSession()->SendShowBank(creature->GetGUID());
-            break;
-        case 4:
-            for (size_t i = 0; i < sV->buffIds.size(); i++) {
-                player->AddAura(sV->buffIds[i], player);
-            }
-            player->CastSpell(player, 16609);
-            ChatHandler(player->GetSession()).PSendSysMessage("Buffos para ti!");
-            OnGossipHello(player, creature);
-            break;
-        case 5:
-            if (player->IsInCombat())
-            {
+            case 1:
+                if (player->IsInCombat())
+                {
+                    ChatHandler(player->GetSession()).PSendSysMessage("Estás en combate!");
+                    CloseGossipMenuFor(player);
+                }
+                else
+                {
+                    player->TeleportTo(sV->vipZoneMapId, sV->vipZonePosX, sV->vipZonePosY, sV->vipZonePosZ, sV->vipZoneO);
+                    CloseGossipMenuFor(player);
+                }
+                break;
+            case 2:
+                player->DurabilityRepairAll(false, 0, false);
+                ChatHandler(player->GetSession()).PSendSysMessage("Reparaste tus armaduras.");
+                OnGossipHello(player, creature);
+                break;
+            case 3:
+                player->GetSession()->SendShowBank(creature->GetGUID());
+                break;
+            case 4:
+                for (size_t i = 0; i < sV->buffIds.size(); i++)
+                    player->AddAura(sV->buffIds[i], player);
+
+                player->CastSpell(player, 16609);
+                ChatHandler(player->GetSession()).PSendSysMessage("Buffos para ti!");
+                OnGossipHello(player, creature);
+                break;
+            case 5:
+                if (player->IsInCombat())
+                {
+                    CloseGossipMenuFor(player);
+                    ChatHandler(player->GetSession()).PSendSysMessage("Estás en combate!");
+                    return false;
+                }
+                else if (player->getPowerType() == POWER_MANA)
+                    player->SetPower(POWER_MANA, player->GetMaxPower(POWER_MANA));
+
+                player->SetHealth(player->GetMaxHealth());
+                ChatHandler(player->GetSession()).PSendSysMessage("HP/MANA Restaurados!");
+                creature->CastSpell(player, 31726, true);
+                OnGossipHello(player, creature);
+                break;
+            case 6:
+                if (player->HasAura(15007))
+                    player->RemoveAura(15007);
+                ChatHandler(player->GetSession()).PSendSysMessage("Tu dolencia fué removido.");
+                creature->CastSpell(player, 31726, true);
+                OnGossipHello(player, creature);
+                break;
+            case 7:
+                // remover desertor
+                if(player->HasAura(26013))
+                    player->RemoveAura(26013);
+                ChatHandler(player->GetSession()).PSendSysMessage("Tu marca de desertor fué removido.");
+                creature->CastSpell(player, 31726);
+                OnGossipHello(player, creature);
+                break;
+            case 8:
+                // mostrar correo
                 CloseGossipMenuFor(player);
-                ChatHandler(player->GetSession()).PSendSysMessage("Estás en combate!");
-                return false;
-            }
-            else if (player->getPowerType() == POWER_MANA)
-                player->SetPower(POWER_MANA, player->GetMaxPower(POWER_MANA));
-
-            player->SetHealth(player->GetMaxHealth());
-            ChatHandler(player->GetSession()).PSendSysMessage("HP/MANA Restaurados!");
-            creature->CastSpell(player, 31726, true);
-            OnGossipHello(player, creature);
-            break;
-        case 6:
-            if (player->HasAura(15007))
-                player->RemoveAura(15007);
-            ChatHandler(player->GetSession()).PSendSysMessage("Tu dolencia fué removido.");
-            creature->CastSpell(player, 31726, true);
-            OnGossipHello(player, creature);
-            break;
-        case 7:
-            // remover desertor
-            if(player->HasAura(26013))
-                player->RemoveAura(26013);
-            ChatHandler(player->GetSession()).PSendSysMessage("Tu marca de desertor fué removido.");
-            creature->CastSpell(player, 31726);
-            OnGossipHello(player, creature);
-            break;
-        case 8:
-            // mostrar correo
-            CloseGossipMenuFor(player);
-            player->GetSession()->SendShowMailBox(creature->GetGUID());
-            break;
-        case 9:
-            // reiniciar cds
-            for (uint8 i = 0; i < MAX_DIFFICULTY; ++i)
-            {
-                BoundInstancesMap const& m_boundInstances = sInstanceSaveMgr->PlayerGetBoundInstances(player->GetGUID(), Difficulty(i));
-                for (BoundInstancesMap::const_iterator itr = m_boundInstances.begin(); itr != m_boundInstances.end();)
+                player->GetSession()->SendShowMailBox(creature->GetGUID());
+                break;
+            case 9:
+                // reiniciar cds
+                for (uint8 i = 0; i < MAX_DIFFICULTY; ++i)
                 {
-                    if (itr->first != player->GetMapId())
+                    BoundInstancesMap const& m_boundInstances = sInstanceSaveMgr->PlayerGetBoundInstances(player->GetGUID(), Difficulty(i));
+                    for (BoundInstancesMap::const_iterator itr = m_boundInstances.begin(); itr != m_boundInstances.end();)
                     {
-                        sInstanceSaveMgr->PlayerUnbindInstance(player->GetGUID(), itr->first, Difficulty(i), true, player);
-                        itr = m_boundInstances.begin();
+                        if (itr->first != player->GetMapId())
+                        {
+                            sInstanceSaveMgr->PlayerUnbindInstance(player->GetGUID(), itr->first, Difficulty(i), true, player);
+                            itr = m_boundInstances.begin();
+                        }
+                        else
+                            ++itr;
                     }
-                    else
-                        ++itr;
                 }
-            }
 
-            ChatHandler(player->GetSession()).PSendSysMessage("Tus instancias fueron reinicidas!");
-            creature->CastSpell(player, 59908);
-            OnGossipHello(player, creature);
-            return true;
-            break;
-        case 11:
-            for (size_t i = 0; i < sV->buffIds.size(); i++) {
-                if (player->HasAura(sV->buffIds[i]))
-                    player->RemoveAura(sV->buffIds[i]);
-            }
-            if (player->HasAura(16609))
-                player->RemoveAura(16609);
-            creature->CastSpell(player, 31726);
-            ChatHandler(player->GetSession()).PSendSysMessage("Buffos para ti!");
-            OnGossipHello(player, creature);
-            break;
-        case 10:
-            // Sistema teleports
-            AddGossipItemFor(player, 0, "|TInterface/GUILDBANKFRAME/UI-GuildBankFrame-NewTab:28:28:-15:0|t Añadir nuevo.", 0, 1, "Nombre para guardar sus coordenadas.", 0, true);
-            AddGossipItemFor(player, 0, "|TInterface/PAPERDOLLINFOFRAME/UI-GearManager-Undo:28:28:-15:0|t Eliminar.", 0, 2, "Nombre a eliminar.", 0, true);
-            sV->getTeleports(player);
-            SendGossipMenuFor(player, 1, creature->GetGUID());
-            break;
-        case 12:
-            sV->teleportPlayer(player, sender);
-            CloseGossipMenuFor(player);
-        default:
-            CloseGossipMenuFor(player);
-            break;
+                ChatHandler(player->GetSession()).PSendSysMessage("Tus instancias fueron reinicidas!");
+                creature->CastSpell(player, 59908);
+                OnGossipHello(player, creature);
+                return true;
+                break;
+            case 11:
+                for (size_t i = 0; i < sV->buffIds.size(); i++)
+                {
+                    if (player->HasAura(sV->buffIds[i]))
+                        player->RemoveAura(sV->buffIds[i]);
+                }
+                if (player->HasAura(16609))
+                    player->RemoveAura(16609);
+                creature->CastSpell(player, 31726);
+                ChatHandler(player->GetSession()).PSendSysMessage("Buffos para ti!");
+                OnGossipHello(player, creature);
+                break;
+            case 10:
+                // Sistema teleports
+                AddGossipItemFor(player, 0, "|TInterface/GUILDBANKFRAME/UI-GuildBankFrame-NewTab:28:28:-15:0|t Añadir nuevo.", 0, 1, "Nombre para guardar sus coordenadas.", 0, true);
+                AddGossipItemFor(player, 0, "|TInterface/PAPERDOLLINFOFRAME/UI-GearManager-Undo:28:28:-15:0|t Eliminar.", 0, 2, "Nombre a eliminar.", 0, true);
+                sV->getTeleports(player);
+                SendGossipMenuFor(player, 1, creature->GetGUID());
+                break;
+            case 12:
+                sV->teleportPlayer(player, sender);
+                CloseGossipMenuFor(player);
+            default:
+                CloseGossipMenuFor(player);
+                break;
         }
         return true;
     }
 
-    bool OnGossipSelectCode(Player* player, Creature* creature, uint32 /*sender*/, uint32 action, const char* code) {
+    bool OnGossipSelectCode(Player* player, Creature* creature, uint32 /*sender*/, uint32 action, const char* code)
+    {
         switch (action)
         {
-        case 1:
-            sV->addTeleportVip(player, code);
-            OnGossipSelect(player, creature, 0, 10);
-            break;
-        case 2:
-            sV->delTeleportVip(player, code);
-            OnGossipSelect(player, creature, 0, 10);
-            break;
-        default:
-            CloseGossipMenuFor(player);
-            break;
+            case 1:
+                sV->addTeleportVip(player, code);
+                OnGossipSelect(player, creature, 0, 10);
+                break;
+            case 2:
+                sV->delTeleportVip(player, code);
+                OnGossipSelect(player, creature, 0, 10);
+                break;
+            default:
+                CloseGossipMenuFor(player);
+                break;
         }
         return true;
     }
@@ -347,13 +368,17 @@ class SystemVipPet : CreatureScript {
 
 class SystemVipWorld : WorldScript {
 public:
-    SystemVipWorld() : WorldScript("SystemVipWorld") {}
+    SystemVipWorld() : WorldScript("SystemVipWorld", {
+        WORLDHOOK_ON_AFTER_CONFIG_LOAD
+    }) {}
 
-    virtual void OnAfterConfigLoad(bool /*reload*/) {
+    virtual void OnAfterConfigLoad(bool /*reload*/)
+    {
         sV->LoadConfig();
         sV->vipMap.clear();
         QueryResult result = LoginDatabase.Query("SELECT * FROM account_vip;");
-        if (result) {
+        if (result)
+        {
             do
             {
                 sV->vipMap.emplace((*result)[0].Get<uint32>(), (*result)[1].Get<uint32>());