Adjusted new theme structure