Custom theme fix