Brand new colors! Small cleanup and fixes.