User/Theme bug fixes
Merge branch 'master' of https://github.com/reborncms/reborn