Shove my junk into a theme, and restore the robbyrussell defaults.
Match upstream/master exactly