diff --git a/web/cgi-bin/horas/horascommon.pl b/web/cgi-bin/horas/horascommon.pl
index 42d666df06b..fada5deb684 100644
--- a/web/cgi-bin/horas/horascommon.pl
+++ b/web/cgi-bin/horas/horascommon.pl
@@ -809,7 +809,6 @@ sub concurrence {
 			if ($commemo =~ /tempora/i && $trank[2] < 2) { next; }	# Feria minor and Vigils have no Vespers if superseded
 			if (!(-e "$datafolder/Latin/$commemo") && $commemo !~ /txt$/i) { $commemo =~ s/$/\.txt/; }
 			%cstr = %{officestring('Latin', $commemo, 0)};
-			#$dayname[2] .= " occ: $commemo $cstr{Rank}";
 			if (%cstr) {
 				my @cr = split(";;", $cstr{Rank});
 				unless (($cr[2] < $ranklimit && !($cr[2] == 2.1 || $cr[2] == 2.99)) || $cstr{Rule} =~ /No secunda vespera/i) { push(@comentries, $commemo); }   # sort out Simplex
@@ -826,7 +825,6 @@ sub concurrence {
 			if ($commemo =~ /tempora/i && $trank[2] < 2) { next; }	# Feria minor and Vigils have no Vespers if superseded
 			if (!(-e "$datafolder/Latin/$commemo") && $commemo !~ /txt$/i) { $commemo =~ s/$/\.txt/; }
 			%cstr = %{officestring('Latin', $commemo, 0)};
-			#$dayname[2] .= " occ: $commemo $cstr{Rank}";
 			if (%cstr) {
 				my @cr = split(";;", $cstr{Rank});
 				unless (($cr[2] < $ranklimit && !($cr[2] == 2.1 || $cr[2] == 2.99)) || $cstr{Rule} =~ /No secunda vespera/i) { push(@comentries, $commemo); }   # sort out (Semi-)duplex and infra 8vam communis except for Feria major / Dominica major
diff --git a/web/cgi-bin/horas/specmatins.pl b/web/cgi-bin/horas/specmatins.pl
index c84ce28db53..fe3d5c8fdf2 100644
--- a/web/cgi-bin/horas/specmatins.pl
+++ b/web/cgi-bin/horas/specmatins.pl
@@ -678,18 +678,17 @@ sub lectio : ScriptFunc {
 	#Nat1-0 special rule
 	# TODO: Get rid of this special case by separating the temporal and sanctoral
 	# parts of Christmas, thus allowing occurring Scripture to be defined.
-	if ($num <= 3 && $rule =~ /Lectio1 Sancti/i && $winner =~ /tempora/i && $day >= 29) {
+	if ($num <= 3 && $rule =~ /Lectio1 OctNat/i) {
 		my $c;
 		
-		if ($rule =~ /no commemoratio/i) {
-			
-			# XXX: The commemoration has been suppressed, so we hardcode a path to
-			# the sanctoral part.
+		if ($day < 29) {
 			$c = officestring($lang, "Sancti/12-$day.txt");
-			$c->{'Lectio2'} .= $c->{'Lectio3'} if (contract_scripture(2));
 		} else {
-			$c = (columnsel($lang)) ? \%commemoratio : \%commemoratio2;
+			my $tfile = "Tempora/Nat$day" . ($version =~ /trident/i ? "o.txt" : ".txt");
+			$c = officestring($lang, $tfile);
 		}
+		$c->{'Lectio2'} .= $c->{'Lectio3'} if (contract_scripture(2));
+		
 		$w{"Lectio$num"} = $c->{"Lectio$num"};
 		$w{"Responsory$num"} = $c->{"Responsory$num"};
 	}
@@ -864,7 +863,7 @@ sub lectio : ScriptFunc {
 		}
 		
 		if (
-			($commemoratio =~ /tempora/i || $commemoratio =~ /01\-05/)
+			($commemoratio =~ /tempora/i && $commemoratio !~ /Nat30/i || $commemoratio =~ /01\-05/)
 			&& ($homilyflag || exists($commemoratio{Lectio7}))
 		&& $comrank > 1
 		&& ( $rank > 4
diff --git a/web/www/horas/Deutsch/Sancti/01-01.txt b/web/www/horas/Deutsch/Sancti/01-01.txt
index bbad8028aaf..de49592b197 100644
--- a/web/www/horas/Deutsch/Sancti/01-01.txt
+++ b/web/www/horas/Deutsch/Sancti/01-01.txt
@@ -54,7 +54,7 @@ V. Bekanntgemacht hat der Herr, alleluja.
 R. Sein Heil, alleluja.
 
 [Lectio1]
-De Epistola beati Pauli Apostoli ad Romanos.
+Aus dem Brief des heiligen Apostels Paulus an die Römer
 !Rom 4:1-8
 1 Quid ergo dicemus invenisse Abraham patrem nostrum secundum carnem?
 2 Si enim Abraham ex operibus justificatus est, habet gloriam, sed non apud Deum.
diff --git a/web/www/horas/Deutsch/Sancti/01-01o.txt b/web/www/horas/Deutsch/Sancti/01-01o.txt
new file mode 100644
index 00000000000..bc57aab37bb
--- /dev/null
+++ b/web/www/horas/Deutsch/Sancti/01-01o.txt
@@ -0,0 +1,9 @@
+[Lectio1]
+Aus dem Brief des heiligen Apostels Paulus an die Römer
+!Rom 3:1-6
+1 Was also hat der Jude voraus? Oder welches ist der Nutzen der Beschneidung?
+2 Viel, in jeder Hinsicht! Erstens nämlich, daß ihnen die Aussprüche Gottes anvertraut wurden.
+3 Denn wie? Wenn einige von ihnen nicht geglaubt haben, wird etwa ihr Unglaube die Treue Gottes aufheben? Das sei ferne!
+4 Vielmehr ist Gott wahrhaftig, jeder Mensch dagegen ein Lügner, wie geschrieben steht: Auf daß du gerecht befunden werdest in deinen Worten und obsiegest, wenn mit dir gerechtet wird.
+5 Wenn aber unsere Ungerechtigkeit Gottes Gerechtigkeit in's Licht stellt, was werden wir sagen? Ist etwa Gott ungerecht, wenn er Strafe verhängt?
+6 (Ich rede nach Menschenweise.) Das sei ferne! denn wie wird sonst Gott diese Welt richten? 
\ No newline at end of file
diff --git a/web/www/horas/English/Sancti/01-01o.txt b/web/www/horas/English/Sancti/01-01o.txt
new file mode 100644
index 00000000000..3e96d970970
--- /dev/null
+++ b/web/www/horas/English/Sancti/01-01o.txt
@@ -0,0 +1,9 @@
+[Lectio1]
+Lesson from the letter of St. Paul the Apostle to the Romans
+!Rom 3:1-6
+1 What advantage then hath the Jew, or what is the profit of circumcision?
+2 Much every way. First indeed, because the words of God were committed to them.
+3 For what if some of them have not believed? shall their unbelief make the faith of God without effect? God forbid.
+4 But God is true; and every man a liar, as it is written, That thou mayest be justified in thy words, and mayest overcome when thou art judged.
+5 But if our injustice commend the justice of God, what shall we say? Is God unjust, who executeth wrath? 
+6 (I speak according to man.) God forbid: otherwise how shall God judge this world?
\ No newline at end of file
diff --git a/web/www/horas/English/Sancti/01-05.txt b/web/www/horas/English/Sancti/01-05.txt
index 6a998f50ae6..887b9df6caa 100644
--- a/web/www/horas/English/Sancti/01-05.txt
+++ b/web/www/horas/English/Sancti/01-05.txt
@@ -27,6 +27,9 @@ Lesson from the letter of St. Paul the Apostle to the Romans
 3 For what the law could not do, in that it was weak through the flesh; God sending his own Son, in the likeness of sinful flesh and of sin, hath condemned sin in the flesh;
 4 That the justification of the law might be fulfilled in us, who walk not according to the flesh, but according to the spirit.
 
+[Lectio1] (rubrica tridentina)
+@Sancti/01-04
+
 [Lectio2]
 !Rom 8:5-9
 5 For they that are according to the flesh, mind the things that are of the flesh; but they that are according to the spirit, mind the things that are of the spirit.
@@ -35,12 +38,18 @@ Lesson from the letter of St. Paul the Apostle to the Romans
 8 And they who are in the flesh, cannot please God.
 9 But you are not in the flesh, but in the spirit, if so be that the Spirit of God dwell in you.
 
+[Lectio2] (rubrica tridentina)
+@Sancti/01-04
+
 [Lectio3]
 !Rom 8:9-11
 9 Now if any man have not the Spirit of Christ, he is none of his.
 10 And if Christ be in you, the body indeed is dead, because of sin; but the spirit liveth, because of justification.
 11 And if the Spirit of him that raised up Jesus from the dead, dwell in you; he that raised up Jesus Christ from the dead, shall quicken also your mortal bodies, because of his Spirit that dwelleth in you.
 
+[Lectio3] (rubrica tridentina)
+@Sancti/01-04
+
 [Lectio4]
 A sermon of St. Augustine, Bishop.
 !Serm. 13. de Tempore.
diff --git a/web/www/horas/Latin/Sancti/01-01o.txt b/web/www/horas/Latin/Sancti/01-01o.txt
index 582c1c7bcb3..1470e61802a 100644
--- a/web/www/horas/Latin/Sancti/01-01o.txt
+++ b/web/www/horas/Latin/Sancti/01-01o.txt
@@ -5,3 +5,20 @@ ex Sancti/12-25;
 Psalmi Dominica
 Antiphonas Horas
 9 lectiones
+
+[Lectio1]
+De Epístola beati Pauli Apóstoli ad Rómanos
+!Rom 3:1-6
+1 Quid ergo ámplius Iudǽo est? aut quæ utílitas circumcisiónis?
+2 Multum per omnem modum. Primum quidem quia crédita sunt illis elóquia Dei.
+3 Quid enim si quidam illórum non credidérunt? numquid incredúlitas illórum fidem Dei evacuábit? Absit.
+4 Est autem Deus verax: omnis autem homo mendax, sicut scriptum est: Ut iustificéris in sermónibus tuis: et vincas cum iudicáris.
+5 Si autem iníquitas nostra iustítiam Dei comméndat, quid dicémus? Numquid iníquus est Deus, qui infert iram?
+6 secúndum hóminem dico. Absit. Alióquin quómodo iudicábit Deus hunc mundum?
+
+[Lectio2]
+@Tempora/Nat31:Lectio3:s/27-31/29-31; 4:1-8/s s/27.*29 /29 /s~
+@Sancti/01-01:Lectio1:s/.*1 /1 /s
+
+[Lectio3]
+@Sancti/01-01:Lectio2
diff --git a/web/www/horas/Latin/Sancti/01-04o.txt b/web/www/horas/Latin/Sancti/01-04o.txt
index ed405a0619c..20a727f4b2d 100644
--- a/web/www/horas/Latin/Sancti/01-04o.txt
+++ b/web/www/horas/Latin/Sancti/01-04o.txt
@@ -9,13 +9,13 @@ Antiphonas Horas
 Feria Te Deum
 
 [Lectio1]
-@Sancti/01-04
+@Sancti/01-02
 
 [Lectio2]
-@Sancti/01-04
+@Sancti/01-02
 
 [Lectio3]
-@Sancti/01-04
+@Sancti/01-02
 
 [Lectio93]
 @Sancti/01-04
diff --git a/web/www/horas/Latin/Sancti/12-29.txt b/web/www/horas/Latin/Sancti/12-29.txt
index f2f49924c39..748e6432507 100644
--- a/web/www/horas/Latin/Sancti/12-29.txt
+++ b/web/www/horas/Latin/Sancti/12-29.txt
@@ -18,25 +18,6 @@ vide C2;
 Deus, pro cujus Ecclésia gloriósus Póntifex Thomas gládiis impiórum occúbuit: præsta, quǽsumus; ut omnes, qui ejus implórant auxílium, petitiónis suæ salutárem consequántur efféctum.
 $Per Dominum
 
-[Lectio1]
-@Tempora/Nat29
-
-[Lectio2]
-@Tempora/Nat29
-
-[Lectio3]
-@Tempora/Nat29
-
-[Responsory1]
-@Tempora/Nat29
-
-[Responsory2]
-@Tempora/Nat29
-
-[Responsory3]
-@Tempora/Nat29
-
-
 [Lectio4]
 Thomas, Londíni in Anglia natus, Theobáldo succéssit Cantuariénsi epíscopo: et qui ántea in administrándo cancelláriæ múnere præcláre se gésserat, in episcopáli offício fortis et invíctus fuit. Cum enim Henrícus secúndus Angliæ rex, convocátis ad se epíscopis et procéribus regni, leges ferret utilitáti ac dignitáti ecclesiásticæ repugnántes, ádeo constánter óbstitit régiæ cupiditáti, ut neque pollicitatiónibus, neque terróribus de senténtia decédens, próxime conjíciendus in cárcerem clam recésserit. Inde propínqui ejus omnis ætátis ejécti, amíci, fautóres omnes, iis, quibus per ætátem licéret, jurejurándo adstríctis, univérsos Thomam aditúros, si fortásse miserábili suórum calamitátis aspéctu moverétur, qui a sancto propósito privátis incómmodis deterréri mínime potuísset. Non respéxit carnem aut sánguinem, neque ullus in eo humanitátis sensus offícii constántiam labefactávit.
 
diff --git a/web/www/horas/Latin/Sancti/12-29o.txt b/web/www/horas/Latin/Sancti/12-29o.txt
index 5137b468cba..0f94ce409d2 100644
--- a/web/www/horas/Latin/Sancti/12-29o.txt
+++ b/web/www/horas/Latin/Sancti/12-29o.txt
@@ -1 +1,19 @@
 @Sancti/12-29
+
+[Lectio1] (rubrica tridentina)
+@Commune/C2
+
+[Lectio2] (rubrica tridentina)
+@Commune/C2
+
+[Lectio3] (rubrica tridentina)
+@Commune/C2
+
+[Responsory1] (rubrica tridentina)
+@Commune/C2
+
+[Responsory2] (rubrica tridentina)
+@Commune/C2
+
+[Responsory3] (rubrica tridentina)
+@Commune/C2
diff --git a/web/www/horas/Latin/Sancti/12-29r.txt b/web/www/horas/Latin/Sancti/12-29r.txt
index 9bb11708c83..d5c2ccaec06 100644
--- a/web/www/horas/Latin/Sancti/12-29r.txt
+++ b/web/www/horas/Latin/Sancti/12-29r.txt
@@ -1,5 +1,7 @@
+@Sancti/12-29
+
 [Rank](rubrica 1960)
-S. Thomæ Cantuariensis Episcopi et Martyris;;Simplex;;1.1;;vide C2
+S. Thomæ Cantuariensis Episcopi et Martyris;;Comemoratio;;5;;vide C2
 
 [Rule]
 vide C2;
diff --git a/web/www/horas/Latin/Sancti/12-30.txt b/web/www/horas/Latin/Sancti/12-30.txt
deleted file mode 100644
index 25a16d71424..00000000000
--- a/web/www/horas/Latin/Sancti/12-30.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-[Rank]
-Die VI infra Octavam Nativitatis;;Semiduplex;;2.1;;ex Sancti/12-25
-
-[Rank] (rubrica 1960)
-Die sexta post Nativitatem;;Duplex II classis;;5;;ex Sancti/12-25
-
-[Rule]
-ex Sancti/12-25;
-9 lectiones
-
-[Ant Vespera]
-@Sancti/12-25:Ant Vespera 3
-
-[Versum 1]
-@Sancti/12-25:Versum 3
-
-[Ant 1]
-@Sancti/12-25:Ant 3
-
-[Lectio1]
-De Epístola ad Romános
-!Rom 2:1-4
-1 Propter quod inexcusábilis es, o homo omnis qui iúdicas. In quo enim iúdicas álterum, teípsum condémnas: éadem enim agis quæ iúdicas.
-2 Scimus enim quóniam judícium Dei est secúndum veritátem in eos qui tália agunt.
-3 Exístimas autem hoc, o homo, qui iúdicas eos qui tália agunt, et facis ea, quia tu effúgies judícium Dei?
-4 an divítias bonitátis ejus, et patiéntiæ, et longanimitátis contémnis? Ignóras quóniam benígnitas Dei ad pœniténtiam te addúcit?
-
-[Responsory1]
-@Sancti/12-25:Responsory2
-
-[Lectio2]
-!Rom 2:5-8
-5 Secúndum autem durítiam tuam, et impǽnitens cor, thesaurízas tibi iram in die iræ, et revelatiónis justi judícii Dei,
-6 qui reddet unicuíque secúndum ópera ejus:
-7 iis quidem qui secúndum patiéntiam boni óperis, glóriam, et honórem, et incorruptiónem quærunt, vitam ætérnam:
-8 iis autem qui sunt ex contentióne, et qui non acquiéscunt veritáti, credunt autem iniquitáti, ira et indignátio.
-
-[Responsory2]
-@Sancti/12-25:Responsory3
-
-[Lectio3]
-!Rom 2:9-13
-9 Tribulátio et angústia in omnem ánimam hóminis operántis malum, Judǽi primum, et Græci:
-10 glória autem, et honor, et pax omni operánti bonum, Judǽo primum, et Græco:
-11 non enim est accéptio personárum apud Deum.
-12 Quicúmque enim sine lege peccavérunt, sine lege períbunt: et quicúmque in lege peccavérunt, per legem judicabúntur.
-13 Non enim auditóres legis justi sunt apud Deum, sed factóres legis justificabúntur.
-
-[Responsory3]
-@Sancti/12-25:Responsory4
-
-[Lectio4]
-Sermo sancti Leónis Papæ
-!Sermo 6 de Nativitáte Dómini
-Omnibus quidem diébus, dilectíssimi, atque tempóribus, ánimis fidélium divína meditántium Dómini et Salvatóris nostri ex Matre Vírgine ortus occúrrit, ut mens, ad confessiónem sui auctóris erécta, sive in gémitu supplicatiónis, sive in exsultatióne laudis, sive in sacrifícii oblatióne versétur, nihil crébrius nihílque fidéntius spiritáli attíngat intúitu, quam quod Deus, Dei Fílius, génitus de Patre coætérno, idem étiam partu est natus humáno. Sed hanc adorándam in cælo et in terra nativitátem nullus nobis dies magis quam hódiernus insínuat, et nova étiam in eleméntis luce radiánte, coram sénsibus nostris mirábilis sacraménti íngerit claritátem. Non solum enim in memóriam, sed in conspéctum quodámmodo redit Angeli Gabriélis cum María stupénte collóquium, et concéptio de Spíritu Sancto tam mire promíssa quam crédita.
-
-[Responsory4]
-@Sancti/12-25:Responsory5
-
-[Lectio5]
-Hódie enim auctor mundi éditus est útero virgináli, et qui omnes natúras cóndidit, ejus est factus fílius, quam creávit. Hódie Verbum Dei carne appáruit vestítum, et quod numquam fuit humánis óculis visíbile, cœpit étiam mánibus esse tractábile. Hódie génitum in nostræ carnis animǽque substántia Salvatórem angélicis vócibus didicére pastóres, et apud Dominicórum prǽsules gregum hódie evangelizándi forma præcóndita est; ut nos quoque cum cæléstis milítiæ dicámus exércitu: Glória in excélsis Deo, et in terra pax homínibus bonæ voluntátis.
-
-[Responsory5]
-@Sancti/12-25:Responsory6
-
-[Lectio6]
-Unde ipsa colláti múneris magnitúdo dignam a nobis éxigit suo splendóre reveréntiam. Ideo enim, sicut beátus Apóstolus docet, non spíritum hujus mundi accépimus, sed spíritum qui ex Deo est, ut sciámus quæ a Deo donáta sunt nobis; qui non áliter pie cólitur, nisi id ei, quod ipse tríbuit, offerátur. Quid autem in thesáuro Domínicæ largitátis ad honórem præséntis festi tam cóngruum póssumus inveníre, quam pacem, quæ in nativitáte Dómini prima est Angélico prædicáta concéntu? Ipsa enim est quæ parit fílios Dei, nutrix dilectiónis et génitrix unitátis, réquies beatórum et æternitátis habitáculum; cujus hoc opus próprium et speciále benefícium est, ut jungat Deo quos secérnit de mundo.
-
-[Responsory6]
-@Sancti/12-25:Responsory7
-
-[Lectio7]
-Léctio sancti Evangélii secúndum Lucam
-!Luc 2:15-20
-In illo témpore: Pastóres loquebántur ad ínvicem: Transeámus usque Béthlehem, et videámus hoc verbum quod factum est, quod Dóminus osténdit nobis. Et venérunt festinántes. Et réliqua.
-_
-Homilía sancti Ambrósii Epíscopi
-!Liber 2 in cap. 2. Lucæ, circa med.
-Vides festináre pastóres; nemo enim cum desídia Christum requírit. Vides pastóres Angelo credidísse: et tu Patri, Fílio, Spirítui Sancto, Angelis, Prophétis et Apóstolis crédere non vis? Vide, quam signánter Scriptúra singulórum libret moménta verbórum. Festínant, inquit, Verbum vidére. Etenim cum caro Dómini vidétur, Verbum vidétur, quod est Fílius.
-
-[Responsory7]
-@Sancti/12-25:Responsory8
-
-[Lectio8]
-Non médiocre fídei tibi hoc videátur exémplum, quod vilis sit persóna pastórum. Certe quo vílior ad prudéntiam, eo pretiósior ad fidem. Non gymnásia choris reférta sapiéntium, sed plebem Dóminus símplicem requisívit, quæ phaleráre audíta et fucáre nescíret. Simplícitas enim quǽritur, non ambítio desiderátur.
-
-[Responsory8]
-@Tempora/Nat1-0:Responsory8
-
-[Lectio9]
-Nec contemnénda putes quasi vília verba pastórum. A pastóribus enim María fidem cólligit, a pastóribus pópulus ad Dei reveréntiam congregátur. Miráti étiam sunt omnes qui audiérunt, de iis, quæ dicebántur a pastóribus ad ipsos. Mária autem conservábat ómnia verba hæc, cónferens in corde suo. Discámus sanctæ Vírginis in ómnibus castitátem, quæ non minus ore pudíca quam córpore, arguménta fídei conferébat in corde.
-&teDeum
diff --git a/web/www/horas/Latin/Sancti/12-30o.txt b/web/www/horas/Latin/Sancti/12-30o.txt
deleted file mode 100644
index 9e77cbbf3f8..00000000000
--- a/web/www/horas/Latin/Sancti/12-30o.txt
+++ /dev/null
@@ -1 +0,0 @@
-@Sancti/12-30
diff --git a/web/www/horas/Latin/Sancti/12-31.txt b/web/www/horas/Latin/Sancti/12-31.txt
index c5f31670d89..20783b72607 100644
--- a/web/www/horas/Latin/Sancti/12-31.txt
+++ b/web/www/horas/Latin/Sancti/12-31.txt
@@ -8,6 +8,7 @@ S. Silvestri Papæ et Confessoris;;Simplex;;1.1;;vide C4
 vide C4;
 9 lectiones
 OPapaC=Silvéstrum;
+Lectio1 OctNat
 
 [Ant Vespera]
 @Sancti/12-25:Ant Vespera 3
diff --git a/web/www/horas/Latin/Sancti/12-31r.txt b/web/www/horas/Latin/Sancti/12-31r.txt
index d03c02387b2..1e4cf9c4f8f 100644
--- a/web/www/horas/Latin/Sancti/12-31r.txt
+++ b/web/www/horas/Latin/Sancti/12-31r.txt
@@ -1,5 +1,5 @@
 [Rank](rubrica 1960)
-S. Silvestri Papæ et Confessoris;;Simplex;;1.1;;vide C4
+S. Silvestri Papæ et Confessoris;;Commemoratio;;5;;vide C4
 
 [Rule]
 vide C4;
diff --git a/web/www/horas/Latin/SanctiM/12-30.txt b/web/www/horas/Latin/SanctiM/12-30.txt
deleted file mode 100644
index fb3f4d92ccb..00000000000
--- a/web/www/horas/Latin/SanctiM/12-30.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-[Rank]
-Die VI infram Octavam Nativitatem Domini;;Duplex II class;;4.9;;ex Sancti/12-25
-
-[Lectio1]
-@Sancti/12-30:Lectio7
-
-[Responsory1]
-@SanctiM/12-25:Responsory11
-
-[Lectio2]
-@Sancti/12-30:Lectio8
-
-[Responsory2]
-@Sancti/12-25:Responsory8
-
-[Lectio3]
-@Sancti/12-30:Lectio9
-
-[Responsory3]
-@Tempora/Nat1-0:Responsory8
-
-[Ant Vespera]
-@Sancti/12-25:Ant Vespera 3:s/.*;;129/;;131/
diff --git a/web/www/horas/Latin/Tabulae/Kalendaria/1888.txt b/web/www/horas/Latin/Tabulae/Kalendaria/1888.txt
index a7c092534b4..c66d3428d7e 100644
--- a/web/www/horas/Latin/Tabulae/Kalendaria/1888.txt
+++ b/web/www/horas/Latin/Tabulae/Kalendaria/1888.txt
@@ -289,5 +289,4 @@
 12-27=12-27o=S. Joanni Apostoli=5=
 12-28=12-28o=Ss. Innocetium=5=
 12-29=12-29o=S. Thomae Episcopi et Martyris=2=
-#12-30=12-30o=Die VI infra Octavam Nativitatis=2=
 12-31=12-31o=S. Silvestri Papae et Conf=3=
diff --git a/web/www/horas/Latin/Tabulae/Tempora/1570.txt b/web/www/horas/Latin/Tabulae/Tempora/1570.txt
index 5abedbd3b90..d55e0f123ed 100644
--- a/web/www/horas/Latin/Tabulae/Tempora/1570.txt
+++ b/web/www/horas/Latin/Tabulae/Tempora/1570.txt
@@ -57,3 +57,6 @@ Tempora/Pent04-3=Tempora/Pent04-3o;;
 Tempora/Pent04-4=Tempora/Pent04-4o;;
 Tempora/Pent04-5=Tempora/Pent04-5o;;
 Tempora/Pent05-0=Tempora/Pent05-0o;;
+Tempora/Nat29=Tempora/Nat29o;;
+Tempora/Nat30=Tempora/Nat30o;;
+Tempora/Nat31=Tempora/Nat31o;;
diff --git a/web/www/horas/Latin/Tabulae/Tempora/1888.txt b/web/www/horas/Latin/Tabulae/Tempora/1888.txt
index 37f18431aa8..e920ee5f7cd 100644
--- a/web/www/horas/Latin/Tabulae/Tempora/1888.txt
+++ b/web/www/horas/Latin/Tabulae/Tempora/1888.txt
@@ -15,3 +15,6 @@ Tempora/Pent03-2=Tempora/Pent03-2Feria;;
 Tempora/Pent03-3=Tempora/Pent03-3Feria;;
 Tempora/Pent03-4=Tempora/Pent03-4Feria;;
 Tempora/Pent03-5=Tempora/Pent03-5Feria;;
+Tempora/Nat29=Tempora/Nat29o;;
+Tempora/Nat30=Tempora/Nat30o;;
+Tempora/Nat31=Tempora/Nat31o;;
diff --git a/web/www/horas/Latin/Tabulae/Tempora/1906.txt b/web/www/horas/Latin/Tabulae/Tempora/1906.txt
index 37f18431aa8..2688b181b1b 100644
--- a/web/www/horas/Latin/Tabulae/Tempora/1906.txt
+++ b/web/www/horas/Latin/Tabulae/Tempora/1906.txt
@@ -15,3 +15,6 @@ Tempora/Pent03-2=Tempora/Pent03-2Feria;;
 Tempora/Pent03-3=Tempora/Pent03-3Feria;;
 Tempora/Pent03-4=Tempora/Pent03-4Feria;;
 Tempora/Pent03-5=Tempora/Pent03-5Feria;;
+Tempora/Nat29=Tempora/Nat29o;;
+Tempora/Nat30=Tempora/Nat30o;;
+Tempora/Nat31=Tempora/Nat31o;;
\ No newline at end of file
diff --git a/web/www/horas/Latin/Tempora/Nat1-0.txt b/web/www/horas/Latin/Tempora/Nat1-0.txt
index b4b19dcc5e9..f58f873445b 100644
--- a/web/www/horas/Latin/Tempora/Nat1-0.txt
+++ b/web/www/horas/Latin/Tempora/Nat1-0.txt
@@ -10,8 +10,8 @@ Dominica Infra Octavam Nativitatis;;Semiduplex;;5.5;;ex Sancti/12-25
 [Rule]
 9 lectiones
 ex Sancti/12-25 
-Lectio1 Sancti
 Psalmi Dominica
+Lectio1 OctNat
 
 [Ant Vespera]
 @Sancti/12-25:Ant Vespera 3
diff --git a/web/www/horas/Latin/Tempora/Nat1-0a.txt b/web/www/horas/Latin/Tempora/Nat1-0a.txt
index 5abdd6e8ec3..5b74acbd084 100644
--- a/web/www/horas/Latin/Tempora/Nat1-0a.txt
+++ b/web/www/horas/Latin/Tempora/Nat1-0a.txt
@@ -6,4 +6,5 @@ This file is to be used when the Sunday falls on Dec 29.
 [Commemoratio 1] (rubrica tridentina)
 @Sancti/12-25:Octava
 @Sancti/12-26:Octava
-@Sancti/12-27:Octava
\ No newline at end of file
+@Sancti/12-27:Octava
+
diff --git a/web/www/horas/Latin/Tempora/Nat29.txt b/web/www/horas/Latin/Tempora/Nat29.txt
index 2de5795318f..dd9d17c562f 100644
--- a/web/www/horas/Latin/Tempora/Nat29.txt
+++ b/web/www/horas/Latin/Tempora/Nat29.txt
@@ -17,17 +17,6 @@ ex Sancti/12-25;
 [Ant 1]
 @Sancti/12-25:Ant 3
 
-[Commemoratio 2] (rubrica tridentina)
-@Sancti/12-26:Octava
-@Sancti/12-27:Octava
-@Sancti/12-28:Octava
-
-[Commemoratio 3] (rubrica tridentina)
-@Sancti/12-26:Octava
-@Sancti/12-27:Octava
-@Sancti/12-28:Octava
-
-
 [Lectio1]
 Incipit Epístola beáti Pauli Apóstoli ad Romános
 !Rom 1:1-7
diff --git a/web/www/horas/Latin/Tempora/Nat29o.txt b/web/www/horas/Latin/Tempora/Nat29o.txt
new file mode 100644
index 00000000000..456c738f609
--- /dev/null
+++ b/web/www/horas/Latin/Tempora/Nat29o.txt
@@ -0,0 +1,12 @@
+@Tempora/Nat29
+
+[Commemoratio 2] (rubrica tridentina)
+@Sancti/12-26:Octava
+@Sancti/12-27:Octava
+@Sancti/12-28:Octava
+
+[Commemoratio 3] (rubrica tridentina)
+@Sancti/12-26:Octava
+@Sancti/12-27:Octava
+@Sancti/12-28:Octava
+
diff --git a/web/www/horas/Latin/Tempora/Nat30.txt b/web/www/horas/Latin/Tempora/Nat30.txt
index 1681bf2b48c..25a16d71424 100644
--- a/web/www/horas/Latin/Tempora/Nat30.txt
+++ b/web/www/horas/Latin/Tempora/Nat30.txt
@@ -17,16 +17,6 @@ ex Sancti/12-25;
 [Ant 1]
 @Sancti/12-25:Ant 3
 
-[Commemoratio 2] (rubrica tridentina)
-@Sancti/12-26:Octava
-@Sancti/12-27:Octava
-@Sancti/12-28:Octava
-
-[Commemoratio 3] (rubrica tridentina)
-@Sancti/12-26:Octava
-@Sancti/12-27:Octava
-@Sancti/12-28:Octava
-
 [Lectio1]
 De Epístola ad Romános
 !Rom 2:1-4
diff --git a/web/www/horas/Latin/Tempora/Nat30o.txt b/web/www/horas/Latin/Tempora/Nat30o.txt
new file mode 100644
index 00000000000..9bf2e630675
--- /dev/null
+++ b/web/www/horas/Latin/Tempora/Nat30o.txt
@@ -0,0 +1,20 @@
+@Tempora/Nat30
+
+[Lectio1] (rubrica tridentina)
+@Tempora/Nat29
+
+[Lectio2] (rubrica tridentina)
+@Tempora/Nat29
+
+[Lectio3] (rubrica tridentina)
+@Tempora/Nat29
+
+[Commemoratio 2] (rubrica tridentina)
+@Sancti/12-26:Octava
+@Sancti/12-27:Octava
+@Sancti/12-28:Octava
+
+[Commemoratio 3] (rubrica tridentina)
+@Sancti/12-26:Octava
+@Sancti/12-27:Octava
+@Sancti/12-28:Octava
diff --git a/web/www/horas/Latin/Tempora/Nat31.txt b/web/www/horas/Latin/Tempora/Nat31.txt
index a75160f28d7..1e06f134823 100644
--- a/web/www/horas/Latin/Tempora/Nat31.txt
+++ b/web/www/horas/Latin/Tempora/Nat31.txt
@@ -18,11 +18,6 @@ no secunda vesperas
 [Ant 1]
 @Sancti/12-25:Ant 3
 
-[Commemoratio 2] (rubrica tridentina)
-@Sancti/12-26:Octava
-@Sancti/12-27:Octava
-@Sancti/12-28:Octava
-
 [Lectio1]
 De Epístola ad Romános
 !Rom 3:19-22
diff --git a/web/www/horas/Latin/Tempora/Nat31o.txt b/web/www/horas/Latin/Tempora/Nat31o.txt
new file mode 100644
index 00000000000..6c2d273aaac
--- /dev/null
+++ b/web/www/horas/Latin/Tempora/Nat31o.txt
@@ -0,0 +1,15 @@
+@Tempora/Nat31
+
+[Lectio1] (rubrica tridentina)
+@Tempora/Nat30
+
+[Lectio2] (rubrica tridentina)
+@Tempora/Nat30
+
+[Lectio3] (rubrica tridentina)
+@Tempora/Nat30
+
+[Commemoratio 2] (rubrica tridentina)
+@Sancti/12-26:Octava
+@Sancti/12-27:Octava
+@Sancti/12-28:Octava
diff --git a/web/www/horas/Latin/TemporaM/Nat30.txt b/web/www/horas/Latin/TemporaM/Nat30.txt
index e5c2dcde763..04668edfa36 100644
--- a/web/www/horas/Latin/TemporaM/Nat30.txt
+++ b/web/www/horas/Latin/TemporaM/Nat30.txt
@@ -1 +1,25 @@
-@Tempora/Nat30
\ No newline at end of file
+@Tempora/Nat30
+
+[Rank]
+Die VI infram Octavam Nativitatem Domini;;Duplex II class;;4.9;;ex Sancti/12-25
+
+[Lectio1]
+@Tempora/Nat30:Lectio7
+
+[Responsory1]
+@SanctiM/12-25:Responsory11
+
+[Lectio2]
+@Tempora/Nat30:Lectio8
+
+[Responsory2]
+@Tempora/Nat30:Responsory8
+
+[Lectio3]
+@Tempora/Nat30:Lectio9
+
+[Responsory3]
+@Tempora/Nat1-0:Responsory8
+
+[Ant Vespera]
+@Sancti/12-25:Ant Vespera 3:s/.*;;129/;;131/