colour scheme, fixed dragging
stupid controller merge conflict