fix and oraganize theme system
Merge remote-tracking branch 'upstream/master' into uno
fix "can't delete plugin from side container"
Merge pull request #150 from rodmcnew/uno

fix "cant delete plugin from side container"
Merge remote-tracking branch 'upstream/master' into sandbox