merged new theme