Sort color theme definition order

This is kept separate from the previous commit, to
make the earlier diff clearer.