code refactoring in brush, widget, draw, builder
 - except grid