Added type switching, color updating
Fixed merge conflicts [ugly]