master: f2e5a37275eda835f766ff84b2206dab152cd33d adjusted content to templating