It's alive-ish
Changes to make it work better with production theme.
Things!