Fixes from editor, new colour swatches