update to new theta grammar