Cleanup of code
Theme chooser is hidden instead of being disabled. Minor fix.