removing things, adding theme