Tweaked connection status rules and colouring