diff --git a/Include/Core/Globals.hpp b/Include/Core/Globals.hpp
index 30f5842..1e691bb 100644
--- a/Include/Core/Globals.hpp
+++ b/Include/Core/Globals.hpp
@@ -89,11 +89,13 @@ namespace Globals
         std::int32_t ContentChild = -1;
     } ChatWidgetDef;
 
-    const ChatWidgetDef CHAT_NPC_CHAT_WIDGETS          = { 231, 2, 3, 4 };
-    const ChatWidgetDef CHAT_PLAYER_CHAT_WIDGETS       = { 217, 2, 3, 4 };
-    const ChatWidgetDef CHAT_GAME_CHAT_WIDGETS         = { 193, 2, 3, 4 };
-    const ChatWidgetDef CHAT_LEVEL_UP_CHAT_WIDGETS     = { 233, 1, 3, 2 };
-    const ChatWidgetDef CHAT_BANK_PIN_ERROR_WIDGETS    = { 229, 1, 2 };
+    const ChatWidgetDef CHAT_NPC_CHAT_WIDGETS           = { 231, 2, 3, 4 }; // Appears when a NPC is talking (NPC head is visible in dialogue)
+    const ChatWidgetDef CHAT_PLAYER_CHAT_WIDGETS        = { 217, 2, 3, 4 }; // Appears when a Player is talking (Player head is visible in dialogue)
+    const ChatWidgetDef CHAT_GAME_CHAT_WIDGETS          = { 193, 2, 3, 4 }; // Unknown
+    const ChatWidgetDef CHAT_LEVEL_UP_CHAT_WIDGETS      = { 233, 1, 3, 2 }; // Appears when leveling up
+    const ChatWidgetDef CHAT_BANK_PIN_ERROR_WIDGETS     = { 229, 1, 2 }; // Appears when entering the bank pin wrong
+    const WidgetDef CHAT_QUEST_DIALOGUE_CONTINUE        = { 193, 0, 2 }; // Quest dialogues
+    const WidgetDef CHAT_QUEST_DIALOGUE_CONTENT         = { 193, 2 }; // Quest dialogues
 
     const WidgetDef CHAT_SELECT_OPTION_CONTAINER   = { 219, 1 }; // Container for all Select Option options
     const WidgetDef CHAT_SELECT_OPTION_TITLE       = { CHAT_SELECT_OPTION_CONTAINER.Parent, CHAT_SELECT_OPTION_CONTAINER.Child, 0 };
@@ -223,9 +225,9 @@ namespace Globals
 
         //************ Combat.cpp ************//
         const std::int32_t COMBAT_PARENT              = 593 ;
-        const WidgetDef COMBAT_AUTORETALIATE          = { COMBAT_PARENT, 29 };
-        const WidgetDef COMBAT_SPECIAL                = { COMBAT_PARENT, 34 };
-        const std::int32_t COMBAT_STYLE_CHILDREN[4]   = { 3, 7, 11, 15 }; // Uses COMBAT_PARENT as Parent
+        const WidgetDef COMBAT_AUTORETALIATE          = { COMBAT_PARENT, 30 };
+        const WidgetDef COMBAT_SPECIAL                = { COMBAT_PARENT, 36 };
+        const std::int32_t COMBAT_STYLE_CHILDREN[4]   = { 4, 8, 12, 16 }; // Uses COMBAT_PARENT as Parent
 
         //************ Equipment.cpp ************//
         const std::int32_t EQUIPMENT_CONTAINER_ID = 94;
diff --git a/Include/Core/Math.hpp b/Include/Core/Math.hpp
index 969142b..41093a1 100644
--- a/Include/Core/Math.hpp
+++ b/Include/Core/Math.hpp
@@ -5,9 +5,6 @@
 #include <vector>
 #include "Types/Point.hpp"
 
-/** @addtogroup Math
-* @{ */
-
 std::int32_t BinomialRandom(std::int32_t Min, std::int32_t Max, double Probability);
 std::int32_t UniformRandom(std::int32_t Min, std::int32_t Max);
 double UniformRandom();
@@ -16,6 +13,4 @@ std::int32_t NormalRandom(std::int32_t Low, std::int32_t High, double Percentage
 void GetLine(Point A, Point B, std::vector<Point>* Res);
 std::vector<Point> ConvexHull(std::vector<Point> Points);
 
-/** @} */
-
 #endif // MATH_HPP_INCLUDED
diff --git a/Include/Core/Paint.hpp b/Include/Core/Paint.hpp
index b774323..089b998 100644
--- a/Include/Core/Paint.hpp
+++ b/Include/Core/Paint.hpp
@@ -5,8 +5,6 @@
 #include "Types/Convex.hpp"
 #include "Types/Tile.hpp"
 
-/** @addtogroup Core
-* @{ */
 namespace Paint
 {
     struct Pixel
@@ -34,6 +32,4 @@ namespace Paint
     void SwapBuffer();
 }
 
-/** @} */
-
 #endif // PAINT_HPP_INCLUDED
diff --git a/Include/Core/Time.hpp b/Include/Core/Time.hpp
index a2bfef0..bf717e5 100644
--- a/Include/Core/Time.hpp
+++ b/Include/Core/Time.hpp
@@ -4,9 +4,6 @@
 #include <cstdint>
 #include <functional>
 
-/** @addtogroup Time
-* @{ */
-
 void Wait(std::int64_t Duration);
 std::uint64_t CurrentTimeMillis();
 std::uint64_t CurrentTimeNanos();
@@ -16,6 +13,4 @@ std::string MillisToHumanShort(std::int64_t Millseconds); // HH:MM:SS
 std::string MillisToHumanMedium(std::int64_t Milliseconds); // 1h 30m 50s
 std::string MillisToHumanLong(std::int64_t Millseconds); // Hours, Minutes, Seconds
 
-/** @} */
-
 #endif // TIME_HPP_INCLUDED
diff --git a/Include/Core/Types/Area.hpp b/Include/Core/Types/Area.hpp
index 4df7468..e38fd2d 100644
--- a/Include/Core/Types/Area.hpp
+++ b/Include/Core/Types/Area.hpp
@@ -6,8 +6,6 @@
 #include <vector>
 #include <cstdint>
 
-/** @addtogroup Types
-* @{ */
 class Area
 {
 	private:
@@ -34,6 +32,4 @@ class Area
         ~Area();
 };
 
-/** @} */
-
 #endif // AREA_HPP_INCLUDED
diff --git a/Include/Core/Types/Box.hpp b/Include/Core/Types/Box.hpp
index d5fd8d9..1db2e96 100644
--- a/Include/Core/Types/Box.hpp
+++ b/Include/Core/Types/Box.hpp
@@ -7,8 +7,6 @@
 
 class Point;
 
-/** @addtogroup Types
-* @{ */
 class Box
 {
     public:
@@ -151,6 +149,4 @@ class Box
         ~Box();
 };
 
-/** @} */
-
 #endif // BOX_HPP_INCLUDED
diff --git a/Include/Core/Types/Convex.hpp b/Include/Core/Types/Convex.hpp
index 93dd308..97234c3 100644
--- a/Include/Core/Types/Convex.hpp
+++ b/Include/Core/Types/Convex.hpp
@@ -5,8 +5,6 @@
 #include "Point.hpp"
 #include "Box.hpp"
 
-/** @addtogroup Types
-* @{ */
 class Convex
 {
     public:
@@ -31,6 +29,4 @@ class Convex
         virtual ~Convex();
 };
 
-/** @} */
-
 #endif // CONVEX_HPP_INCLUDED
diff --git a/Include/Core/Types/Countdown.hpp b/Include/Core/Types/Countdown.hpp
index c458609..1376da8 100644
--- a/Include/Core/Types/Countdown.hpp
+++ b/Include/Core/Types/Countdown.hpp
@@ -4,8 +4,6 @@
 #include <iostream>
 #include <cstdint>
 
-/** @addtogroup Types
-* @{ */
 class Countdown
 {
     public:
@@ -26,6 +24,4 @@ class Countdown
         std::uint64_t StartTime;
 };
 
-/** @} */
-
 #endif // COUNTDOWN_HPP_INCLUDED
diff --git a/Include/Core/Types/Counter.hpp b/Include/Core/Types/Counter.hpp
index 8323f1b..412ccde 100644
--- a/Include/Core/Types/Counter.hpp
+++ b/Include/Core/Types/Counter.hpp
@@ -4,8 +4,6 @@
 #include <iostream>
 #include <cstdint>
 
-/** @addtogroup Types
-* @{ */
 class Counter
 {
     public:
@@ -25,6 +23,4 @@ class Counter
         std::int32_t Iterations;
 };
 
-/** @} */
-
 #endif // COUNTER_HPP_INCLUDED
diff --git a/Include/Core/Types/Logger.hpp b/Include/Core/Types/Logger.hpp
index 2980679..0d460bc 100644
--- a/Include/Core/Types/Logger.hpp
+++ b/Include/Core/Types/Logger.hpp
@@ -4,8 +4,6 @@
 #include <iostream>
 #include <string>
 
-/** @addtogroup Types
-* @{ */
 class Logger : public std::ostream, public std::streambuf
 {
     public:
@@ -29,6 +27,4 @@ class Logger : public std::ostream, public std::streambuf
         bool NewLine = true;
 };
 
-/** @} */
-
 #endif // LOGGER_HPP_INCLUDED
diff --git a/Include/Core/Types/Point.hpp b/Include/Core/Types/Point.hpp
index 7517b73..2bda4ed 100644
--- a/Include/Core/Types/Point.hpp
+++ b/Include/Core/Types/Point.hpp
@@ -6,8 +6,6 @@
 
 class Box;
 
-/** @addtogroup Types
-* @{ */
 class Point
 {
     public:
@@ -82,6 +80,4 @@ class Point
         ~Point();
 };
 
-/** @} */
-
 #endif // POINT_HPP_INCLUDED
diff --git a/Include/Core/Types/Tile.hpp b/Include/Core/Types/Tile.hpp
index 9e2182c..cd0e5e4 100644
--- a/Include/Core/Types/Tile.hpp
+++ b/Include/Core/Types/Tile.hpp
@@ -4,8 +4,6 @@
 #include <iostream>
 #include <cstdint>
 
-/** @addtogroup Types
-* @{ */
 class Tile
 {
     public:
@@ -75,6 +73,4 @@ class Tile
         ~Tile();
 };
 
-/** @} */
-
 #endif // TILE_HPP_INCLUDED
diff --git a/Include/Core/Types/Timer.hpp b/Include/Core/Types/Timer.hpp
index eef4861..a568112 100644
--- a/Include/Core/Types/Timer.hpp
+++ b/Include/Core/Types/Timer.hpp
@@ -4,8 +4,6 @@
 #include <iostream>
 #include <cstdint>
 
-/** @addtogroup Types
-* @{ */
 class Timer
 {
     public:
@@ -83,6 +81,4 @@ class Timer
         std::int64_t Offset;
 };
 
-/** @} */
-
 #endif // TIMER_HPP_INCLUDED
diff --git a/Include/Game/Core.hpp b/Include/Game/Core.hpp
index b7104c0..c47dc55 100644
--- a/Include/Game/Core.hpp
+++ b/Include/Game/Core.hpp
@@ -62,47 +62,4 @@
 #include "Interactable/WallObject.hpp"
 #include "Interactable/Widget.hpp"
 
-//=======================================================
-// Groups
-//=======================================================
-/**
-* @defgroup Core Core
-*
-* @defgroup Types Types
-* @brief @b Types Module
-* @ingroup Core
-*
-* @defgroup Math Math
-* @brief @b Math Module
-* @ingroup Core
-*
-* @defgroup Time Time
-* @brief @b Time Module
-* @ingroup Core
-*
-* @defgroup Game Game
-*
-* @defgroup Interfaces Interfaces
-* @brief @b Interfaces Module
-* @ingroup Game
-*
-* @defgroup Models Models
-* @brief @b Models Module
-* @ingroup Game
-*
-* @defgroup Tools Tools
-* @brief @b Tools Module
-* @ingroup Game
-*
-*/
-//=======================================================
-// SubGroups
-//=======================================================
-/**
-* @defgroup GameTabs GameTabs
-* @brief @b GameTabs Module
-* @ingroup Interfaces
-*
-**/
-
 #endif // CORE_HPP_INCLUDED
diff --git a/Include/Game/Interfaces/Bank.hpp b/Include/Game/Interfaces/Bank.hpp
index 38cad8b..854d92f 100644
--- a/Include/Game/Interfaces/Bank.hpp
+++ b/Include/Game/Interfaces/Bank.hpp
@@ -8,9 +8,6 @@
 #include <cstdint>
 #include <vector>
 
-/** @addtogroup Interfaces
-* @{
-*/
 namespace Bank
 {
     enum BANK_AMOUNT
@@ -115,6 +112,4 @@ namespace Bank
     bool SetDefaultWithdrawQuantity(std::int32_t Amount);
 }
 
-/** @} */
-
 #endif // BANK_HPP_INCLUDED
diff --git a/Include/Game/Interfaces/Chat.hpp b/Include/Game/Interfaces/Chat.hpp
index 034628f..f02e468 100644
--- a/Include/Game/Interfaces/Chat.hpp
+++ b/Include/Game/Interfaces/Chat.hpp
@@ -6,8 +6,6 @@
 #include <string>
 #include <vector>
 
-/** @addtogroup Interfaces
-* @{ */
 namespace Chat
 {
     typedef enum DIALOGUE_STATE
@@ -22,34 +20,67 @@ namespace Chat
 
     typedef enum CHAT_TYPE
     {
-        SERVER = 0,
-        PUBLIC_MOD = 1,
+        /** Game message */
+        GAME_MESSAGE = 0,
+        /** Public chat message from a moderator */
+        MOD = 1,
+        /** Public chat message */
         PUBLIC = 2,
-        PRIVATE_MESSAGE_RECEIVED = 3,
-        TRADE_RECEIVED = 4,
-        PRIVATE_MESSAGE_INFO = 5,
-        PRIVATE_MESSAGE_SENT = 6,
-        PRIVATE_MESSAGE_RECEIVED_MOD = 7,
-        CLANCHAT = 9,
-        CLANCHAT_INFO = 11,
+        /** Private message from another player */
+        PRIVATE = 3,
+        ENGINE = 4,
+        /** Received when a friend logs in or out */
+        LOGIN_LOGOUT_NOTIFICATION = 5,
+        /** Private message sent to another player */
+        PRIVATE_OUT = 6,
+        /** Private message received from a moderator */
+        MOD_PRIVATE = 7,
+        /** Clan chat message */
+        FRIENDS = 9,
+        /** Message with information about the current clan chat */
+        FRIENDS_NOTIFICATION = 11,
+        /** Trade request being sent */
         TRADE_SENT = 12,
-        ABUSE_REPORT = 26,
+        /** Game broadcast */
+        BROADCAST = 14,
+        /** Abuse report submitted */
+        SNAPSHOT_FEEDBACK = 26,
+        /** Examine item message */
         EXAMINE_ITEM = 27,
+        /** Examine NPC message */
         EXAMINE_NPC = 28,
-        EXAMINE_OBJECT = 29,
-        FRIENDS_LIST_ADD = 30,
-        IGNORE_LIST_ADD = 31,
-        AUTOCHAT = 90,
-        GAME = 99,
-        TRADE = 101,
-        DUEL = 103,
-        FILTERED = 105,
-        ACTION = 109,
+        /** Examine object message */
+        EXAMINE_OBJ = 29,
+        /** Message sent when adding a player to friends list */
+        FRIEND_NOTIFICATION = 30,
+        /** Message sent when adding a player to ignore list */
+        IGNORE_NOTIFICATION = 31,
+        /** Autotyper message from a player */
+        AUTOTYPER = 90,
+        /** Autotyper message from a moderator */
+        MOD_AUTOTYPER = 91,
+        /** Message sent typically when a setting changes */
+        CONSOLE = 99,
+        /** Message recieved when another sends a trade offer to the local player */
+        TRADE_REQUEST = 101,
+        /** Message recieved when completing a trade or duel */
+        TRADE = 102,
+        /** Message received when somebody sends a duel offer */
+        CHALREQ_TRADE = 103,
+        /** Message received when another player sends a clan challenge offer */
+        CHALREQ_FRIENDS = 104,
+        /** Filtered message */
+        SPAM = 105,
+        PLAYER_RELATED = 106,
+        TENSEC_TIMEOUT = 107,
         UNKNOWN = -1
     } CHAT_TYPE;
 
+    std::vector<Internal::MessageNode> GetMessages(bool Sort = true);
     std::vector<Internal::MessageNode> GetMessages(CHAT_TYPE Type, bool Sort = true);
     std::vector<Internal::MessageNode> GetMessages(const std::vector<CHAT_TYPE>& Type, bool Sort = true);
+
+    Internal::MessageNode GetLastMessage();
     Internal::MessageNode GetLastMessage(CHAT_TYPE Type);
 
     DIALOGUE_STATE GetDialogueState();
@@ -70,6 +101,4 @@ namespace Chat
     bool WaitDialogueState(std::uint32_t Duration, std::uint32_t Step, Chat::DIALOGUE_STATE State, bool Result = true); // Waits until the current chat state equals State
 }
 
-/** @} */
-
 #endif // CHAT_HPP_INCLUDED
diff --git a/Include/Game/Interfaces/DepositBox.hpp b/Include/Game/Interfaces/DepositBox.hpp
index c2a3352..6905f26 100644
--- a/Include/Game/Interfaces/DepositBox.hpp
+++ b/Include/Game/Interfaces/DepositBox.hpp
@@ -1,8 +1,6 @@
 #ifndef DEPOSITBOX_HPP
 #define DEPOSITBOX_HPP
 
-/** @addtogroup Interfaces
-* @{ */
 namespace DepositBox
 {
     bool IsOpen();
@@ -13,6 +11,4 @@ namespace DepositBox
     bool DepositLoot();
 }
 
-/** @} */
-
 #endif // DEPOSITBOX_HPP
diff --git a/Include/Game/Interfaces/Exchange.hpp b/Include/Game/Interfaces/Exchange.hpp
index 993ee43..7dd2845 100644
--- a/Include/Game/Interfaces/Exchange.hpp
+++ b/Include/Game/Interfaces/Exchange.hpp
@@ -7,8 +7,6 @@
 #include <vector>
 #include <functional>
 
-/** @addtogroup Interfaces
-* @{ */
 namespace Exchange
 {
     typedef std::int32_t SLOT;
@@ -112,6 +110,4 @@ namespace Exchange
     bool OpenOffer(const Exchange::SLOT Slot);
 }
 
-/** @} */
-
 #endif // EXCHANGE_HPP_INCLUDED
diff --git a/Include/Game/Interfaces/GameTabs/AccountManagement.hpp b/Include/Game/Interfaces/GameTabs/AccountManagement.hpp
index 3189f1b..d6ac0c0 100644
--- a/Include/Game/Interfaces/GameTabs/AccountManagement.hpp
+++ b/Include/Game/Interfaces/GameTabs/AccountManagement.hpp
@@ -3,15 +3,11 @@
 
 #include <cstdint>
 
-/** @addtogroup GameTabs
-* @{ */
 namespace AccountManagement
 {
     bool IsOpen();
-    bool Open();
+    bool Open(bool UseHotkey = false);
     std::int32_t GetTabHotkey();
 }
 
-/** @} */
-
 #endif // ACCOUNTMANAGEMENT_HPP_INCLUDED
diff --git a/Include/Game/Interfaces/GameTabs/Clan.hpp b/Include/Game/Interfaces/GameTabs/Clan.hpp
index b490c74..7dce2dd 100644
--- a/Include/Game/Interfaces/GameTabs/Clan.hpp
+++ b/Include/Game/Interfaces/GameTabs/Clan.hpp
@@ -5,17 +5,13 @@
 #include <functional>
 #include <vector>
 
-/** @addtogroup GameTabs
-* @{ */
 namespace Clan
 {
     bool IsOpen();
-    bool Open();
+    bool Open(bool UseHotkey = false);
     std::int32_t GetTabHotkey();
     std::vector<Internal::ClanMember> GetAll();
     std::vector<Internal::ClanMember> GetAll(const std::function<bool (Internal::ClanMember&)>& Filter);
 }
 
-/** @} */
-
 #endif // CLAN_HPP_INCLUDED
diff --git a/Include/Game/Interfaces/GameTabs/Combat.hpp b/Include/Game/Interfaces/GameTabs/Combat.hpp
index 0ba4357..8f498c7 100644
--- a/Include/Game/Interfaces/GameTabs/Combat.hpp
+++ b/Include/Game/Interfaces/GameTabs/Combat.hpp
@@ -4,12 +4,10 @@
 #include <cstdint>
 #include <string>
 
-/** @addtogroup GameTabs
-* @{ */
 namespace Combat
 {
     bool IsOpen();
-    bool Open();
+    bool Open(bool UseHotkey = false);
     std::int32_t GetTabHotkey();
 
     std::int32_t GetHealth();
@@ -33,6 +31,4 @@ namespace Combat
     bool SetStyle(std::int32_t Index);
 }
 
-/** @} */
-
 #endif // COMBAT_HPP_INCLUDED
diff --git a/Include/Game/Interfaces/GameTabs/Emotes.hpp b/Include/Game/Interfaces/GameTabs/Emotes.hpp
index 8d4563e..60f08dd 100644
--- a/Include/Game/Interfaces/GameTabs/Emotes.hpp
+++ b/Include/Game/Interfaces/GameTabs/Emotes.hpp
@@ -3,15 +3,11 @@
 
 #include <cstdint>
 
-/** @addtogroup GameTabs
-* @{ */
 namespace Emotes
 {
     bool IsOpen();
-    bool Open();
+    bool Open(bool UseHotkey = false);
     std::int32_t GetTabHotkey();
 }
 
-/** @} */
-
 #endif // EMOTES_HPP_INCLUDED
diff --git a/Include/Game/Interfaces/GameTabs/Equipment.hpp b/Include/Game/Interfaces/GameTabs/Equipment.hpp
index d6832b0..2c752b3 100644
--- a/Include/Game/Interfaces/GameTabs/Equipment.hpp
+++ b/Include/Game/Interfaces/GameTabs/Equipment.hpp
@@ -7,8 +7,6 @@
 #include <string>
 #include <functional>
 
-/** @addtogroup GameTabs
-* @{ */
 namespace Equipment
 {
     typedef enum SLOT
@@ -27,7 +25,7 @@ namespace Equipment
     } SLOT;
 
     bool IsOpen();
-    bool Open();
+    bool Open(bool UseHotkey = false);
     bool IsEmpty();
     std::int32_t GetTabHotkey();
 
@@ -79,11 +77,10 @@ namespace Equipment
     bool ContainsOnly(const std::vector<std::string>& Names);
     bool ContainsOnly(const std::vector<Interactable::Item>& Items);
 
+    bool Unequip(SLOT Slot);
     bool Unequip(std::int32_t ID);
     bool Unequip(const std::string& Name);
     bool Unequip(const Interactable::Item& Item);
 }
 
-/** @} */
-
 #endif // EQUIPMENT_HPP_INCLUDED
diff --git a/Include/Game/Interfaces/GameTabs/Friends.hpp b/Include/Game/Interfaces/GameTabs/Friends.hpp
index 0e6d160..294dc5e 100644
--- a/Include/Game/Interfaces/GameTabs/Friends.hpp
+++ b/Include/Game/Interfaces/GameTabs/Friends.hpp
@@ -5,17 +5,13 @@
 #include <functional>
 #include <vector>
 
-/** @addtogroup GameTabs
-* @{ */
 namespace Friends
 {
     bool IsOpen();
-    bool Open();
+    bool Open(bool UseHotkey = false);
     std::int32_t GetTabHotkey();
     std::vector<Internal::Friend> GetAll();
     std::vector<Internal::Friend> GetAll(const std::function<bool (Internal::Friend&)>& Filter);
 }
 
-/** @} */
-
 #endif // FRIENDS_HPP_INCLUDED
diff --git a/Include/Game/Interfaces/GameTabs/Ignores.hpp b/Include/Game/Interfaces/GameTabs/Ignores.hpp
index a7315b9..1330610 100644
--- a/Include/Game/Interfaces/GameTabs/Ignores.hpp
+++ b/Include/Game/Interfaces/GameTabs/Ignores.hpp
@@ -5,8 +5,6 @@
 #include <functional>
 #include <vector>
 
-/** @addtogroup GameTabs
-* @{ */
 namespace Ignores
 {
     bool IsOpen();
@@ -16,6 +14,4 @@ namespace Ignores
     std::vector<Internal::Ignore> GetAll(const std::function<bool (Internal::Ignore&)>& Filter);
 }
 
-/** @} */
-
 #endif // IGNORES_HPP_INCLUDED
diff --git a/Include/Game/Interfaces/GameTabs/Inventory.hpp b/Include/Game/Interfaces/GameTabs/Inventory.hpp
index f118e6e..7689e6a 100644
--- a/Include/Game/Interfaces/GameTabs/Inventory.hpp
+++ b/Include/Game/Interfaces/GameTabs/Inventory.hpp
@@ -9,12 +9,10 @@
 #include <cstdint>
 #include <string>
 
-/** @addtogroup GameTabs
-* @{ */
 namespace Inventory
 {
     bool IsOpen();
-    bool Open();
+    bool Open(bool UseHotkey = false);
     std::int32_t GetTabHotkey();
 
     std::vector<std::int32_t> GetItemIDs();
@@ -99,6 +97,4 @@ namespace Inventory
     bool Drop(const Interactable::Item& Item, bool AllowShiftClick = true);
 }
 
-/** @} */
-
 #endif // INVENTORY_HPP_INCLUDED
diff --git a/Include/Game/Interfaces/GameTabs/Logout.hpp b/Include/Game/Interfaces/GameTabs/Logout.hpp
index 80e006d..95d02cf 100644
--- a/Include/Game/Interfaces/GameTabs/Logout.hpp
+++ b/Include/Game/Interfaces/GameTabs/Logout.hpp
@@ -7,12 +7,10 @@
 #include <cstdint>
 #include <vector>
 
-/** @addtogroup GameTabs
-* @{ */
 namespace Logout
 {
     bool IsOpen();
-    bool Open();
+    bool Open(bool UseHotkey = false);
     std::int32_t GetTabHotkey();
     bool LogoutPlayer();
 
@@ -29,6 +27,4 @@ namespace Logout
     Interactable::Widget GetWorldWidget(std::int32_t  WorldID);
 }
 
-/** @} */
-
 #endif // LOGOUT_HPP_INCLUDED
diff --git a/Include/Game/Interfaces/GameTabs/Magic.hpp b/Include/Game/Interfaces/GameTabs/Magic.hpp
index 89dfe7d..d74ef6b 100644
--- a/Include/Game/Interfaces/GameTabs/Magic.hpp
+++ b/Include/Game/Interfaces/GameTabs/Magic.hpp
@@ -4,8 +4,6 @@
 #include <string>
 #include <cstdint>
 
-/** @addtogroup GameTabs
-* @{ */
 namespace Magic
 {
     typedef enum SPELL
@@ -195,7 +193,7 @@ namespace Magic
     } SPELL;
 
     bool IsOpen();
-    bool Open();
+    bool Open(bool UseHotkey = false);
     std::int32_t GetTabHotkey();
 
     bool HasLevel(const SPELL& Spell);
@@ -210,6 +208,4 @@ namespace Magic
     bool SelectSpell(const SPELL& Spell);
 }
 
-/** @} */
-
 #endif // MAGIC_HPP_INCLUDED
diff --git a/Include/Game/Interfaces/GameTabs/Music.hpp b/Include/Game/Interfaces/GameTabs/Music.hpp
index 01535d6..fa87318 100644
--- a/Include/Game/Interfaces/GameTabs/Music.hpp
+++ b/Include/Game/Interfaces/GameTabs/Music.hpp
@@ -3,15 +3,11 @@
 
 #include <cstdint>
 
-/** @addtogroup GameTabs
-* @{ */
 namespace Music
 {
     bool IsOpen();
-    bool Open();
+    bool Open(bool UseHotkey = false);
     std::int32_t GetTabHotkey();
 }
 
-/** @} */
-
 #endif // MUSIC_HPP_INCLUDED
diff --git a/Include/Game/Interfaces/GameTabs/Options.hpp b/Include/Game/Interfaces/GameTabs/Options.hpp
index ff8aa7f..df3c070 100644
--- a/Include/Game/Interfaces/GameTabs/Options.hpp
+++ b/Include/Game/Interfaces/GameTabs/Options.hpp
@@ -3,12 +3,10 @@
 
 #include <cstdint>
 
-/** @addtogroup GameTabs
-* @{ */
 namespace Options
 {
     bool IsOpen();
-    bool Open();
+    bool Open(bool UseHotkey = false);
     std::int32_t GetTabHotkey();
 
     bool GetAcceptAid();
@@ -18,6 +16,4 @@ namespace Options
     bool ToggleRunMode(bool Toggle);
 }
 
-/** @} */
-
 #endif // OPTIONS_HPP_INCLUDED
diff --git a/Include/Game/Interfaces/GameTabs/Prayer.hpp b/Include/Game/Interfaces/GameTabs/Prayer.hpp
index c0965ff..5e7cdf0 100644
--- a/Include/Game/Interfaces/GameTabs/Prayer.hpp
+++ b/Include/Game/Interfaces/GameTabs/Prayer.hpp
@@ -4,8 +4,6 @@
 #include <cstdint>
 #include <vector>
 
-/** @addtogroup GameTabs
-* @{ */
 namespace Prayer
 {
     typedef enum PRAYERS
@@ -42,7 +40,7 @@ namespace Prayer
     } PRAYERS;
 
     bool IsOpen();
-    bool Open();
+    bool Open(bool UseHotkey = false);
     std::int32_t GetTabHotkey();
     std::int32_t GetPoints();
     bool HasLevel(PRAYERS Prayer);
@@ -53,6 +51,4 @@ namespace Prayer
     bool Deactivate(PRAYERS Prayer);
 }
 
-/** @} */
-
 #endif // PRAYER_HPP_INCLUDED
diff --git a/Include/Game/Interfaces/GameTabs/Quests.hpp b/Include/Game/Interfaces/GameTabs/Quests.hpp
index 3f920d0..525a8a5 100644
--- a/Include/Game/Interfaces/GameTabs/Quests.hpp
+++ b/Include/Game/Interfaces/GameTabs/Quests.hpp
@@ -3,15 +3,11 @@
 
 #include <cstdint>
 
-/** @addtogroup GameTabs
-* @{ */
 namespace Quests
 {
     bool IsOpen();
-    bool Open();
+    bool Open(bool UseHotkey = false);
     std::int32_t GetTabHotkey();
 }
 
-/** @} */
-
 #endif // QUESTS_HPP_INCLUDED
diff --git a/Include/Game/Interfaces/GameTabs/Stats.hpp b/Include/Game/Interfaces/GameTabs/Stats.hpp
index 49f1cc6..d83ae03 100644
--- a/Include/Game/Interfaces/GameTabs/Stats.hpp
+++ b/Include/Game/Interfaces/GameTabs/Stats.hpp
@@ -3,8 +3,6 @@
 
 #include <cstdint>
 
-/** @addtogroup GameTabs
-* @{ */
 namespace Stats
 {
     typedef enum SKILLS
@@ -36,7 +34,7 @@ namespace Stats
     } SKILLS;
 
     bool IsOpen();
-    bool Open();
+    bool Open(bool UseHotkey = false);
     std::int32_t GetTabHotkey();
     std::int32_t GetWeight();
     std::int32_t GetRunEnergy();
@@ -46,6 +44,4 @@ namespace Stats
     std::int32_t GetExperienceTo(SKILLS Skill, std::int32_t Level);
 }
 
-/** @} */
-
 #endif // STATS_HPP_INCLUDED
diff --git a/Include/Game/Interfaces/Login.hpp b/Include/Game/Interfaces/Login.hpp
index 12f3714..e7c18e2 100644
--- a/Include/Game/Interfaces/Login.hpp
+++ b/Include/Game/Interfaces/Login.hpp
@@ -8,8 +8,6 @@
 #include <string>
 #include <vector>
 
-/** @addtogroup Interfaces
-* @{ */
 namespace Login
 {
     typedef enum LOGIN_SCREEN_STATE
@@ -74,6 +72,4 @@ namespace Login
 
 }
 
-/** @} */
-
 #endif // LOGIN_HPP_INCLUDED
diff --git a/Include/Game/Interfaces/Mainscreen.hpp b/Include/Game/Interfaces/Mainscreen.hpp
index 03808b5..d00a203 100644
--- a/Include/Game/Interfaces/Mainscreen.hpp
+++ b/Include/Game/Interfaces/Mainscreen.hpp
@@ -8,8 +8,6 @@
 #include <string>
 #include <vector>
 
-/** @addtogroup Interfaces
-* @{ */
 /**
 * @brief A namespace containing various functions related to the Mainscreen
 */
@@ -147,6 +145,4 @@ namespace Mainscreen
     std::vector<Box> GetBlockingWidgetBoxes();
 }
 
-/** @} */
-
 #endif // MAINSCREEN_HPP_INCLUDED
diff --git a/Include/Game/Interfaces/Makescreen.hpp b/Include/Game/Interfaces/Makescreen.hpp
index c110b80..b0cfe2f 100644
--- a/Include/Game/Interfaces/Makescreen.hpp
+++ b/Include/Game/Interfaces/Makescreen.hpp
@@ -4,8 +4,6 @@
 #include <cstdint>
 #include <string>
 
-/** @addtogroup Interfaces
-* @{ */
 namespace Makescreen
 {
     enum MAKE_AMOUNT
@@ -38,6 +36,4 @@ namespace Makescreen
     std::string GetCraftingName();
 }
 
-/** @} */
-
 #endif // MAKESCREEN_HPP_INCLUDED
diff --git a/Include/Game/Interfaces/Menu.hpp b/Include/Game/Interfaces/Menu.hpp
index 87b53d3..1a25862 100644
--- a/Include/Game/Interfaces/Menu.hpp
+++ b/Include/Game/Interfaces/Menu.hpp
@@ -6,8 +6,6 @@
 #include <string>
 #include <vector>
 
-/** @addtogroup Interfaces
-* @{ */
 /**
 * @brief A namespace containing various functions for the right-click menu
 */
@@ -305,6 +303,4 @@ namespace Menu
     Box GetBox();
 }
 
-/** @} */
-
 #endif // MENU_HPP_INCLUDED
diff --git a/Include/Game/Interfaces/Minimap.hpp b/Include/Game/Interfaces/Minimap.hpp
index 54bf99d..5c31d09 100644
--- a/Include/Game/Interfaces/Minimap.hpp
+++ b/Include/Game/Interfaces/Minimap.hpp
@@ -7,8 +7,6 @@
 #include <cstdint>
 #include <functional>
 
-/** @addtogroup Interfaces
-* @{ */
 namespace Minimap
 {
     /**
@@ -88,6 +86,4 @@ namespace Minimap
     bool IsReachable(const Tile& T);
 }
 
-/** @} */
-
 #endif // MINIMAP_HPP_INCLUDED
diff --git a/Include/Game/Models/DecorativeObjects.hpp b/Include/Game/Models/DecorativeObjects.hpp
index 2af146b..665fda0 100644
--- a/Include/Game/Models/DecorativeObjects.hpp
+++ b/Include/Game/Models/DecorativeObjects.hpp
@@ -7,8 +7,6 @@
 #include <vector>
 #include <string>
 
-/** @addtogroup Models
-* @{ */
 namespace DecorativeObjects
 {
     std::vector<Interactable::DecorativeObject> GetAllWithin(std::int32_t Distance);
@@ -28,6 +26,4 @@ namespace DecorativeObjects
     Interactable::DecorativeObject Get(const std::function<bool (const Interactable::DecorativeObject&)>& Filter, std::int32_t Distance = -1);
 }
 
-/** @} */
-
 #endif // DECORATIVEOBJECTS_HPP_INCLUDED
diff --git a/Include/Game/Models/GameObjects.hpp b/Include/Game/Models/GameObjects.hpp
index 0529d6e..18d8e73 100644
--- a/Include/Game/Models/GameObjects.hpp
+++ b/Include/Game/Models/GameObjects.hpp
@@ -7,8 +7,6 @@
 #include <vector>
 #include <string>
 
-/** @addtogroup Models
-* @{ */
 namespace GameObjects
 {
     std::vector<Interactable::GameObject> GetAllWithin(std::int32_t Distance);
@@ -29,6 +27,4 @@ namespace GameObjects
     Interactable::GameObject Get(const std::function<bool (const Interactable::GameObject&)>& Filter, std::int32_t Distance = -1);
 }
 
-/** @} */
-
 #endif // GAMEOBJECTS_HPP_INCLUDED
diff --git a/Include/Game/Models/GroundItems.hpp b/Include/Game/Models/GroundItems.hpp
index e04aece..5f68e74 100644
--- a/Include/Game/Models/GroundItems.hpp
+++ b/Include/Game/Models/GroundItems.hpp
@@ -7,8 +7,6 @@
 #include <vector>
 #include <string>
 
-/** @addtogroup Models
-* @{ */
 namespace GroundItems
 {
     std::vector<Interactable::GroundItem> GetAllWithin(std::int32_t Distance);
@@ -28,6 +26,5 @@ namespace GroundItems
     Interactable::GroundItem Get(const std::vector<std::string>& Names, std::int32_t Distance = -1);
     Interactable::GroundItem Get(const std::function<bool (Interactable::GroundItem&)>& Filter, std::int32_t Distance = -1);
 }
-/** @} */
 
 #endif // GROUNDITEMS_HPP_INCLUDED
diff --git a/Include/Game/Models/GroundObjects.hpp b/Include/Game/Models/GroundObjects.hpp
index 17834e1..52893ac 100644
--- a/Include/Game/Models/GroundObjects.hpp
+++ b/Include/Game/Models/GroundObjects.hpp
@@ -7,8 +7,6 @@
 #include <vector>
 #include <string>
 
-/** @addtogroup Models
-* @{ */
 namespace GroundObjects
 {
     std::vector<Interactable::GroundObject> GetAllWithin(std::int32_t Distance);
@@ -28,6 +26,4 @@ namespace GroundObjects
     Interactable::GroundObject Get(const std::function<bool (const Interactable::GroundObject&)>& Filter, std::int32_t Distance = -1);
 }
 
-/** @} */
-
 #endif // GROUNDOBJECTS_HPP_INCLUDED
diff --git a/Include/Game/Models/NPCs.hpp b/Include/Game/Models/NPCs.hpp
index e7cd777..c4a29f5 100644
--- a/Include/Game/Models/NPCs.hpp
+++ b/Include/Game/Models/NPCs.hpp
@@ -7,9 +7,6 @@
 #include <vector>
 #include <string>
 
-
-/** @addtogroup Models
-* @{ */
 namespace NPCs
 {
     std::vector<Interactable::NPC> GetAllWithin(std::int32_t Distance);
@@ -29,6 +26,5 @@ namespace NPCs
     Interactable::NPC Get(const std::vector<std::string>& Names, std::int32_t Distance = -1);
     Interactable::NPC Get(const std::function<bool (const Interactable::NPC&)>& Filter, std::int32_t Distance = -1);
 }
-/** @} */
 
 #endif // NPCS_HPP_INCLUDED
diff --git a/Include/Game/Models/Players.hpp b/Include/Game/Models/Players.hpp
index 1f588f3..c15649d 100644
--- a/Include/Game/Models/Players.hpp
+++ b/Include/Game/Models/Players.hpp
@@ -7,8 +7,6 @@
 #include <vector>
 #include <string>
 
-/** @addtogroup Models
-* @{ */
 namespace Players
 {
     Interactable::Player GetLocal();
@@ -26,6 +24,4 @@ namespace Players
     Interactable::Player Get(const std::function<bool (const Interactable::Player&)>& Filter, std::int32_t Distance = -1);
 }
 
-/** @} */
-
 #endif // PLAYERS_HPP_INCLUDED
diff --git a/Include/Game/Models/WallObjects.hpp b/Include/Game/Models/WallObjects.hpp
index 87ffe8e..aad06ce 100644
--- a/Include/Game/Models/WallObjects.hpp
+++ b/Include/Game/Models/WallObjects.hpp
@@ -7,8 +7,6 @@
 #include <vector>
 #include <string>
 
-/** @addtogroup Models
-* @{ */
 namespace WallObjects
 {
     std::vector<Interactable::WallObject> GetAllWithin(std::int32_t Distance);
@@ -28,6 +26,4 @@ namespace WallObjects
     Interactable::WallObject Get(const std::function<bool (const Interactable::WallObject&)>& Filter, std::int32_t Distance = -1);
 }
 
-/** @} */
-
 #endif // WALLOBJECTS_HPP_INCLUDED
diff --git a/Include/Game/Tools/Camera.hpp b/Include/Game/Tools/Camera.hpp
index e26f9dc..e48ecf2 100644
--- a/Include/Game/Tools/Camera.hpp
+++ b/Include/Game/Tools/Camera.hpp
@@ -4,9 +4,6 @@
 #include "../../Core/Types/Tile.hpp"
 #include <cstdint>
 
-/** @addtogroup Tools
-* @{ */
-
 namespace Camera
 {
     typedef enum COMPASS_DIRECTION
@@ -115,6 +112,4 @@ namespace Camera
     bool SetPitch(CAMERA_PITCH Pitch);
 }
 
-/** @} */
-
 #endif // CAMERA_HPP_INCLUDED
diff --git a/Include/Game/Tools/Interact.hpp b/Include/Game/Tools/Interact.hpp
index ac5e1f2..9e2bf12 100644
--- a/Include/Game/Tools/Interact.hpp
+++ b/Include/Game/Tools/Interact.hpp
@@ -7,8 +7,6 @@
 #include <string>
 #include <cstdint>
 
-/** @addtogroup Tools
-* @{ */
 namespace Interact
 {
     bool MoveMouse(const Point& P);
@@ -39,6 +37,4 @@ namespace Interact
     bool TypeString(const std::string& String, bool PressEnter = false);
 }
 
-/** @} */
-
 #endif // INTERACT_HPP_INCLUDED
diff --git a/Include/Game/Tools/Pathfinding.hpp b/Include/Game/Tools/Pathfinding.hpp
index 29381a4..ee8557f 100644
--- a/Include/Game/Tools/Pathfinding.hpp
+++ b/Include/Game/Tools/Pathfinding.hpp
@@ -63,11 +63,11 @@ namespace Pathfinding
             /** @brief The collision flag associated with the node */
             std::int32_t Flag;
             /** @brief <B> For pathfinding use only </B> */
-            bool Inspected;
+            bool Inspected = false;
             /** @brief True if this node matches the whitelisted tiles set in Pathfinding  */
-            bool MatchesWhitelist;
+            bool MatchesWhitelist = false;
             /** @brief True if this node matches the blacklisted tiles set in Pathfinding  */
-            bool MatchesBlacklist;
+            bool MatchesBlacklist = false;
             /** @brief <B> For pathfinding use only </B>  */
             std::int32_t Parent[2];
             TileNode();
@@ -76,6 +76,8 @@ namespace Pathfinding
             bool IsBlocked() const;
             /** @brief Adds ClientX/Y to the local X and Y coordinates of the node, returning a world tile  */
             Tile ToWorldTile() const;
+            /** @brief Adds ClientX/Y to the local X and Y coordinates of the node, returning a world tile  */
+            Tile ToWorldTile(std::int32_t ClientX, std::int32_t ClientY, std::int32_t ClientPlane) const;
             bool operator==(const TileNode& N) const;
             operator bool() const;
     };
@@ -122,20 +124,14 @@ namespace Pathfinding
     std::vector<Pathfinding::TileNode> FindNodePathTo(const std::vector<Tile>& Goals,
                                                       std::int32_t Options = CHECK_COLLISION | CHECK_WHITELIST | CHECK_BLACKLIST,
                                                       PATHFINDER Finder = BREADTH_FIRST_SEARCH);
-/*private:
-    static std::vector<std::vector<TileNode>> Nodes;
-    static std::vector<Tile> Whitelist;
-    static std::vector<Tile> Blacklist;
+    //std::vector<std::vector<TileNode>> Nodes;
+    //std::vector<Tile> Whitelist;
+    //std::vector<Tile> Blacklist;
 
-    static bool IsInside(std::uint32_t X, std::uint32_t Y);
-    static std::vector<Pathfinding::TileNode*> GetNeighborsTo(std::uint32_t X, std::uint32_t Y, bool CheckCollision = true);
-
-    static std::vector<Pathfinding::TileNode> Finder_BFS(   std::uint32_t StartX, std::uint32_t StartY,
-                                                            std::uint32_t EndX, std::uint32_t EndY,
-                                                            std::int32_t Options );
-    static std::vector<Pathfinding::TileNode> Finder_BFS(   std::uint32_t StartX, std::uint32_t StartY,
-                                                            const std::vector<std::pair<std::uint32_t, std::uint32_t>>& Ends,
-                                                            std::int32_t Options );*/
+    bool IsInside(std::int32_t X, std::int32_t Y);
+    std::vector<Pathfinding::TileNode*> GetNeighborsTo(std::int32_t X, std::int32_t Y, bool CheckCollision = true);
+    std::vector<Pathfinding::TileNode> Finder_BFS(std::uint32_t StartX, std::uint32_t StartY, std::uint32_t EndX, std::uint32_t EndY, std::int32_t Options );
+    std::vector<Pathfinding::TileNode> Finder_BFS(std::uint32_t StartX, std::uint32_t StartY, const std::vector<std::pair<std::uint32_t, std::uint32_t>>& Ends, std::int32_t Options );
 }
 
 #endif // PATHFINDING_HPP_INCLUDED
diff --git a/Include/Game/Tools/Profile.hpp b/Include/Game/Tools/Profile.hpp
index ab57695..c7e487d 100644
--- a/Include/Game/Tools/Profile.hpp
+++ b/Include/Game/Tools/Profile.hpp
@@ -5,8 +5,6 @@
 #include <cstdint>
 #include <string>
 
-/** @addtogroup Tools
-* @{ */
 namespace Profile
 {
     std::string GetUsername();
@@ -126,6 +124,4 @@ namespace Profile
 
 }
 
-/** @} */
-
 #endif // PROFILE_HPP_INCLUDED
diff --git a/Include/Game/Tools/Settings.hpp b/Include/Game/Tools/Settings.hpp
index 2fd4dbc..feddbbb 100644
--- a/Include/Game/Tools/Settings.hpp
+++ b/Include/Game/Tools/Settings.hpp
@@ -4,8 +4,6 @@
 #include <cstdint>
 #include <vector>
 
-/** @addtogroup Tools
-* @{ */
 namespace Settings
 {
     std::vector<std::int32_t> GetAll();
@@ -42,6 +40,4 @@ namespace Settings
     bool IsScrollToZoomOn();
 }
 
-/** @} */
-
 #endif // SETTINGS_HPP_INCLUDED
diff --git a/Include/Game/Tools/Widgets.hpp b/Include/Game/Tools/Widgets.hpp
index 8bef426..5fc3ade 100644
--- a/Include/Game/Tools/Widgets.hpp
+++ b/Include/Game/Tools/Widgets.hpp
@@ -6,8 +6,6 @@
 #include <cstdint>
 #include <vector>
 
-/** @addtogroup Tools
-* @{ */
 namespace Widgets
 {
     std::vector<std::vector<Interactable::Widget>> GetAll();
@@ -19,6 +17,4 @@ namespace Widgets
     Interactable::Widget Get(const std::function<bool (Interactable::Widget&)>& Filter);
 }
 
-/** @} */
-
 #endif // WIDGETS_HPP_INCLUDED
diff --git a/Include/Game/Tools/Worlds.hpp b/Include/Game/Tools/Worlds.hpp
index 64dcd0a..1c2ce6f 100644
--- a/Include/Game/Tools/Worlds.hpp
+++ b/Include/Game/Tools/Worlds.hpp
@@ -7,8 +7,6 @@
 #include <string>
 #include <vector>
 
-/** @addtogroup Tools
-* @{ */
 namespace Worlds
 {
     bool Refresh();
@@ -32,6 +30,4 @@ namespace Worlds
     std::vector<Internal::World> GetBy(const std::function<bool (Internal::World&)>& Filter);
 }
 
-/** @} */
-
 #endif // WORLDS_HPP_INCLUDED
diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a
index 2406569..0a2d36b 100644
Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ