More enum consolidation and general cleanup

Revert static color variable objects due to Windows sucking.