generic styles
Merge branch 'fix_convenios'