Commit changes to upstream themes from the 3.0.12 upgrade