Total redesign, based on Geoffrey's Jekyll build