Colored Borders fixed