Improve sample-theme-adv
Fix unloadable themes

* Be sure to close buffer