Fixed tasks, colors and a couple of small style things
Merge origin/master