Theme refinement