remove theme sessions, improve layout injections, add helpers for layouts