Cleanup: better separation of concerns between rendering layers
Cleanup: rename token :content to :text for consistency