Continuing work
fix content-body

Remove deprecated function
Merge branch 'master' of https://github.com/christianc1/sapling-theme-master