Can you make these match the consts we have elsewhere?

`const int SWATCH_WIDTH = 64;`

Put each one on a new line, do the same for the width and height and margin and step.