Commit prior to upstream update
Merge with upstream
Update and rebuild theme