Update formatting & highlighting