Update for iframes, and foregound color for h1+p.
Fixing merge conflict.