corrected switches, marked lines and light colors

Also, increased the width of the marked lines to make them better
distinguishable.