Make imported theme <create new> unique name and code
Clean up new theme on exception
Fix module theme header message