code refactoring...
 - all brush and widget...