Fix discrepancies in adding content to layout and theme variables.