Revert refactor of themes permissions so themes created for upstream will work with this.  Fixes #2