Theme variables fix