Moved theme init to before pedisable.
Merge pull request #2271 from pjackson28/v3.0

Moved theme init to before pedisable