theme and style fixes