Add color patches + bug fixes