Merge primary light and extra light

I've been thinking about our style sheet recently and the split between the light and extra light colors does not make sense. Adding a new color was a non-destructive way to brighten the secondary colors, but in reality, we could just lighten `light` the same way and drop `-extra-light` altogether. Since it is not part of theming yet, this should hopefully be a fairly non-destructive change.