new theme and some clean up