Revert "fixed scope markup.heading"

This reverts commit dd3e6226087715d3c124782b4f5366655b60b751.
Revert "Revert "fixed scope markup.heading""

This reverts commit d211b38f289e9f1544cf15bbc8f6a227f05eb5b7.
ups, fixed heading scope in theme as well.