Fix more star rating colors, cleanup