Add 16 col sizes and clean up colours.
Update wp functions and clean up.