rearrange border colors for #1316