new spacing, fixed color states...