Fix "New Theme" button. Close #367