Finalized color scheme
Fixed line collision
Fixed collision with indicator