fix spacings according to bitters update with $base-spacing

Same for all of the ones below.