Moved theme init to before pedisable.
Resolved merge conflict.