[FIX] some problems with themes solved