Fixed a couple of bugs on themas panel "reset" and initial load