Fix the theme form and diagnostics#new page