ThemePicker: Clean that color chip naming mess

Change-Id: If60ae844e35f81cc46a8ffab6fc2f47dff1c5a20
4 files changed