Container color and labels, waypoint of train and boat.
Reformatted 6234d2af
Merge branch 'commit_van_thom'