border colors changed, fixed text color