some more fixes including removing the theme