Updating styles
Merge branch 'devel'