Changed highlighting stuff