Issue #2278565 by jstoller, nod_, Bojhan: Clean up module page grouping.
Issue #2248405 by davidhernandez, mgifford: Fixed Set Proper Contrast on the Color module's default colour scheme.