Refining theme mocks and structure