More Brush/Palette work