I agree - but it would make more sense it the code already was like that (Check the switch($worldZone) in some of the classes). I was actually duplicating the current styles. Maybe it's worth pulling in, and then fixing it all up to use the constants at the same time