Tweaks, more consistent #define names
Undo IsHovered > IsItemHovered, shorter name wins