colors and json changes committed