ThemeSetServiceImpl last changes, BuildingKitServiceTest update