Ending buffer - Fix unloadable themes
Improve sample-adv-theme