Merge "Add badge colors for dark theme" into rvc-dev