theme refinement for 2.2