Pull in previous pre-update tweaks to fix images and styles