Merge request.

Most previous commits already applied previously.
Shouldn't you inherit this from the body tag?