Merge "Fix incorrectly named dim colors"