Fixed highlighting of varables across file + add 'this.' higlight restriction.