Merge "Refactor our colors to rely on the Theme more" into pi-car-dev