-Cleanup of set_theme file