fixes + theme handling
Merge branch 'master' of https://github.com/webbakers/nc