Moved a section around so the PDF looks better
Pull in theme changes