update and enhancements
Merge branch 'master' of https://github.com/davidhickeyicfi/orbis-themes
updates for save and other bugs