Pull request for issues #42, #69

1. Delete of imported theme
2. Do not reapply theme on clicking ok