Refactor for brushes and palettes