Merge pull request #7102 from nupplaphil/task/mod_pretheme