Change function names due to theme/framework changes
Merge branch 'master' of github.com:clearos/app-base