css and theme fix