pushing this to get everything in sync before I break everything with a new theme