merged so-simple-theme updates prior to my butchering and eventual fork