diff --git a/include/itemtypes.hpp b/include/itemtypes.hpp
index 499dc7e2..ecacfe25 100644
--- a/include/itemtypes.hpp
+++ b/include/itemtypes.hpp
@@ -46,8 +46,6 @@ enum k_EItemType
     ITEM_POWERUP_LAST  = ITEM_POWERUP_CRITS,
 
     HALLOWEEN_GHOST,
-    HALLOWEEN_GHOST_NOHAT_RED,
-    HALLOWEEN_GHOST_NOHAT,
 
     BOMB_BALLOONBOMB,
     BOMB_WOODENBARREL,
@@ -57,6 +55,7 @@ enum k_EItemType
     FLAG_SKULLPICKUP,
     FLAG_GIBBUCKET,
     FLAG_BOTTLEPICKUP,
+    FLAG_GIFT,
     FLAG_AUSSIECONTAINER,
     FLAG_TICKETCASE,
 
diff --git a/src/hacks/ESP.cpp b/src/hacks/ESP.cpp
index 8d2ab9b4..a8a433cc 100644
--- a/src/hacks/ESP.cpp
+++ b/src/hacks/ESP.cpp
@@ -276,6 +276,7 @@ const std::string atombomb_str             = "Atom Bomb";
 const std::string soulpickup_str           = "Soul Pickup";
 const std::string bodyparts_str            = "Body Parts";
 const std::string beerbottle_str           = "Beer Bottle";
+const std::string gift_str                 = "Gift";
 const std::string aussiecontainer_str      = "Australium Container";
 const std::string ticketcase_str           = "Tickets";
 const std::string mediumhealth_str         = "Medium Health";
@@ -1184,16 +1185,8 @@ void _FASTCALL ProcessEntity(CachedEntity *ent)
                 break;
             }
         }
-        else
-        {
-            switch (itemtype)
-            {
-            case HALLOWEEN_GHOST:
-            case HALLOWEEN_GHOST_NOHAT_RED:
-            case HALLOWEEN_GHOST_NOHAT:
-                AddEntityString(ent, ghost_str, colors::FromRGBA8(0, 128, 0, 255));
-            }
-        }
+        else if (itemtype == HALLOWEEN_GHOST)
+            AddEntityString(ent, ghost_str, colors::FromRGBA8(0, 128, 0, 255));
     }
     if (item_esp)
     {
@@ -1249,6 +1242,10 @@ void _FASTCALL ProcessEntity(CachedEntity *ent)
             case FLAG_BOTTLEPICKUP:
                 AddEntityString(ent, beerbottle_str, color);
                 break;
+            case FLAG_GIFT:
+                if (classid == CL_CLASS(CCaptureFlag))
+                    AddEntityString(ent, gift_str, color);
+                break;
             case FLAG_AUSSIECONTAINER:
                 AddEntityString(ent, aussiecontainer_str, color);
                 break;
@@ -1393,7 +1390,7 @@ void _FASTCALL ProcessEntity(CachedEntity *ent)
             bool IsMini             = CE_BYTE(ent, netvar.m_bMiniBuilding);
 
             if (!IsMini)
-                AddEntityString(ent, format("Level ", level, ' ', name));
+                AddEntityString(ent, format(name, " (Level ", level, ")"));
             else
                 AddEntityString(ent, std::string("Mini ") + name);
         }
diff --git a/src/itemtypes.cpp b/src/itemtypes.cpp
index 04bd2448..b76f6c4b 100644
--- a/src/itemtypes.cpp
+++ b/src/itemtypes.cpp
@@ -85,8 +85,8 @@ ItemManager::ItemManager() : mapper()
 
     // == GHOSTS
     RegisterModelMapping("models/props_halloween/ghost.mdl", HALLOWEEN_GHOST);
-    RegisterModelMapping("models/props_halloween/ghost_no_hat_red.mdl", HALLOWEEN_GHOST_NOHAT_RED);
-    RegisterModelMapping("models/props_halloween/ghost_no_hat.mdl", HALLOWEEN_GHOST_NOHAT);
+    RegisterModelMapping("models/props_halloween/ghost_no_hat_red.mdl", HALLOWEEN_GHOST);
+    RegisterModelMapping("models/props_halloween/ghost_no_hat.mdl", HALLOWEEN_GHOST);
 
     // == BOMBS
     RegisterModelMapping("models/props_laughter/balloonbomb.mdl", BOMB_BALLOONBOMB);
@@ -99,6 +99,7 @@ ItemManager::ItemManager() : mapper()
     RegisterModelMapping("models/effects/playersoul.mdl", FLAG_SKULLPICKUP);
     RegisterModelMapping("models/props_monster_mash/gib_bucket.mdl", FLAG_GIBBUCKET);
     RegisterModelMapping("models/props_watergate/bottle_pickup.mdl", FLAG_BOTTLEPICKUP);
+    RegisterModelMapping("models/props_halloween/halloween_gift.mdl", FLAG_GIFT);
     RegisterModelMapping("models/props_doomsday/australium_container.mdl", FLAG_AUSSIECONTAINER);
     RegisterModelMapping("models/flag/ticket_case.mdl", FLAG_TICKETCASE);
 
@@ -108,6 +109,7 @@ ItemManager::ItemManager() : mapper()
     RegisterModelMapping("models/lilchewchew/lilchewchew_v3.mdl", CART_BOMBCART);
     RegisterModelMapping("models/props_trainyard/bomb_redmond.mdl", CART_BOMBCART);
     RegisterModelMapping("models/props_snowycoast/gasoline_bomb_cart.mdl", CART_BOMBCART);
+    RegisterModelMapping("models/props_xmas/rudy.mdl", CART_BOMBCART);
     RegisterModelMapping("models/props_trainyard/bomb_blutarch.mdl", CART_BOMBCART_RED);
     RegisterModelMapping("models/props_trainyard/bomb_cart_red.mdl", CART_BOMBCART_RED);