backporting theme changes