Updated: Use COLOR_CHAR for better forwards compatibility
Added: More thirst drainers