Rename theme colors for less ambiguity

Renamed the theme colors to be more inline with the naming convention of the other colors and more self descriptive