Fix language file usage and theme directory references.
Merge branch 'master' into MNF