Import upstream theme changes