enhanced easy theme fix