#418 Use bem-xjst, part 2