theme change and some comment changes