Streamline markup in themes