Backporting theme changes