Colour mode switching improved

Now preserves the colour, moves to equivalent position in cylinder for
the other colour model.