Merge "Use theme attribute instead of named colors"