simplify and fix broken color resources