border colors, some global structure rework