Merge "Fix up color issues as a result of theme change" into oc-dev