fix: correct handling of tag-related theme elements in layout