Do not ignore ribbon theme
Update from master