removed old theme, fixed conf, todo