Theme editor fixes

Some minor obvious fixes from reviewing theme-editor branch.