Fix shift/control highlighting