Updated styles scr
Merge branch 'develop'