2.2 theme refinements