Pushed layout changes upstream
Updated config with upstream theme changes