Added percentages and fixed tapped colors