Add color information, cleanup and fixes