use merged new theme