You are 100% correct I was in Church that day.
Absolutely!
Theophany is actually a trilogy of feasts beginning with Royal Hours on the 5th (most years) and the Vesperal Liturgy of St. Basil and the Great Blessing of the Waters; Orthros & Chrysostom Divine Liturgy and Lesser Blessing of the Waters on the 6th; and the Synaxis of John the Forerunner on the 7th.
It is second in importance only to Holy Pascha!