Fix async theme management (fix #176)
Merge branch 'refs/heads/fix/issue176_theme' into develop