Fixes #670 Theme Upgrading issues

Also fixes #215 Stylesheets may not have a disporder
The default theme can be deleted
Merge pull request #1114 from JN-Jones/fix-670

Fixes #670 Theme Upgrading issues