add variant scope to element queries
Merge remote-tracking branch 'theme-globals/master'