Moved #define into constants, split out globals for better readablity.

Removed excess newlines from switch statements for the various color waves. Less whitespace seems to yield better readability here.