Some PENSTYLE_ & BRUSHSTYLE_ Fixes