Added border colors and fill colors