Moverd Border stroke calculations into Border.