General clean up, colours, and more wibble wobble