adapted call for theme dir and locale dir
Merge remote-tracking branch 'upstream/master'