Fixes for Colors.xml