SOS-1935 Upgrade the theme for the groups
SOS-1935 Fix indentation