Adding theme state visibility - currently quirky - will debug with team tommorow