Changed circle colours to match type