Refactoring of default values for state fields and enum types
Renamed Scales->Scale and Keys->Key for convention's sake