More colorbutton fixes
Colorbutton
Merge branch 'master' of https://github.com/EdanLTHgit/MultiDraw