fix theme managment