Large clean up effort, added color scrots