Fixed colors so there are no gray colors. Also added disclosure indicators.