new theme and some cleanup