Added FillBrush to BORDER_FILL and made adjustion to BorderFillId