Consider scripts from subthemes - 3.6 branch.

#3131 

This is a PR against SCHOLAR 3.6