Properly handle "Theme" styles group
Updates for v2.0.2 release