theme and cleanups