Improve zen mode internals.
Merge pull request #7797 from cirosantilli/zen-style

Improve zen mode internals.