Better color stuff. Reindented