new theme, and some modifications