added border colors, more shortcuts work