Structuring this state to more accurately capture the initial state of a theme