new theme and more changes