Merge "Updating colors as part of bluetooth refactoring"