Merge new kitkat color scheme