Fixed errors in theme asset calling
asset refactoring
Merge branch 'asset' into user