[WIP] some changes for colors and brushes usage