Remove two more color styles and fix issues that came up