Some more PENSTYLE_ & BRUSHSTYLE_ Fixes