fix generic styles
Merge branch 'develop'