[IMP] new theme with some fixes and improvements