Fix themes admin
Base theme fixes