added theme config and db config
Merge branch 'dev-remote-db' into dev