Renamed 'sets' to 'themes'.
Added pixel space between grouped and tabbed buttons.