More fixes
Merge branch 'develop' of github.com:klpdotorg/dubdubdub-skin into develop
Merge