Merge branch 'release/0.5.3' into develop
fixed ThemeModel reference
bumped version
Merge branch 'release/0.5.4'