Fix highlighting + string literal matching