diff --git a/struct-wikipages/en/Template:BeginAxiom b/struct-wikipages/en/Template:BeginAxiom
index 81d1ed8..a586f59 100644
--- a/struct-wikipages/en/Template:BeginAxiom
+++ b/struct-wikipages/en/Template:BeginAxiom
@@ -1,14 +1,14 @@
-<div class="beginenvironment beginaxiom"><b>Axiom</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
+<div class="beginenvironment beginaxiom" id="{{#if: {{{anchor|}}}| {{{anchor}}} }}"><b>Axiom {{#if: {{{number|}}}| {{{number}}} }}</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
 <noinclude>
 <templatedata>
 {
     "params": {
         "title": {
             "label": "Title",
             "description": "Title of the axiom",
             "type": "string"
         }
     }
 }
 </templatedata>
 </noinclude>
diff --git a/struct-wikipages/en/Template:BeginCorollary b/struct-wikipages/en/Template:BeginCorollary
index 3ea216e..682c62f 100644
--- a/struct-wikipages/en/Template:BeginCorollary
+++ b/struct-wikipages/en/Template:BeginCorollary
@@ -1,14 +1,14 @@
-<div class="beginenvironment begincorollary"><b>corollary</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
+<div class="beginenvironment begincorollary" id="{{#if: {{{anchor|}}}| {{{anchor}}} }}"><b>Corollary  {{#if: {{{number|}}}| {{{number}}} }}</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
 <noinclude>
 <templatedata>
 {
     "params": {
         "title": {
             "label": "Title",
             "description": "Title of the corollary",
             "type": "string"
         }
     }
 }
 </templatedata>
 </noinclude>
diff --git a/struct-wikipages/en/Template:BeginDefinition b/struct-wikipages/en/Template:BeginDefinition
index d79daee..9f1fa5e 100644
--- a/struct-wikipages/en/Template:BeginDefinition
+++ b/struct-wikipages/en/Template:BeginDefinition
@@ -1,14 +1,14 @@
-<div class="beginenvironment begindefinition"><b>Definition</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
+<div class="beginenvironment begindefinition" id="{{#if: {{{anchor|}}}| {{{anchor}}} }}"><b>Definition {{#if: {{{number|}}}| {{{number}}} }}</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
 <noinclude>
 <templatedata>
 {
     "params": {
         "title": {
             "label": "Title",
             "description": "Title of the definition",
             "type": "string"
         }
     }
 }
 </templatedata>
 </noinclude>
\ No newline at end of file
diff --git a/struct-wikipages/en/Template:BeginExample b/struct-wikipages/en/Template:BeginExample
index a9e6927..5117dcb 100644
--- a/struct-wikipages/en/Template:BeginExample
+++ b/struct-wikipages/en/Template:BeginExample
@@ -1,14 +1,14 @@
-<div class="beginenvironment beginexample"><b>Example</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
+<div class="beginenvironment beginexample" id="{{#if: {{{anchor|}}}| {{{anchor}}} }}"><b>Example {{#if: {{{number|}}}| {{{number}}} }}</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
 <noinclude>
 <templatedata>
 {
     "params": {
         "title": {
             "label": "Title",
             "description": "Title of the example",
             "type": "string"
         }
     }
 }
 </templatedata>
 </noinclude>
diff --git a/struct-wikipages/en/Template:BeginExercise b/struct-wikipages/en/Template:BeginExercise
index 1b93348..a8f3075 100644
--- a/struct-wikipages/en/Template:BeginExercise
+++ b/struct-wikipages/en/Template:BeginExercise
@@ -1,14 +1,14 @@
-<div class="beginenvironment beginexercise"><b>Exercise</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
+<div class="beginenvironment beginexercise" id="{{#if: {{{anchor|}}}| {{{anchor}}} }}"><b>Exercise {{#if: {{{number|}}}| {{{number}}} }}</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
 <noinclude>
 <templatedata>
 {
     "params": {
         "title": {
             "label": "Title",
             "description": "Title of the exercise",
             "type": "string"
         }
     }
 }
 </templatedata>
 </noinclude>
diff --git a/struct-wikipages/en/Template:BeginLemma b/struct-wikipages/en/Template:BeginLemma
index 30eb5e8..93d3017 100644
--- a/struct-wikipages/en/Template:BeginLemma
+++ b/struct-wikipages/en/Template:BeginLemma
@@ -1,14 +1,14 @@
-<div class="beginenvironment beginlemma"><b>Lemma</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
+<div class="beginenvironment beginlemma" id="{{#if: {{{anchor|}}}| {{{anchor}}} }}"><b>Lemma {{#if: {{{number|}}}| {{{number}}} }}</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
 <noinclude>
 <templatedata>
 {
     "params": {
         "title": {
             "label": "Title",
             "description": "Title of the lemma",
             "type": "string"
         }
     }
 }
 </templatedata>
 </noinclude>
\ No newline at end of file
diff --git a/struct-wikipages/en/Template:BeginNote b/struct-wikipages/en/Template:BeginNote
index 8e338f8..069e084 100644
--- a/struct-wikipages/en/Template:BeginNote
+++ b/struct-wikipages/en/Template:BeginNote
@@ -1,14 +1,14 @@
-<div class="beginenvironment beginnote"><b>Note</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
+<div class="beginenvironment beginnote" id="{{#if: {{{anchor|}}}| {{{anchor}}} }}"><b>Note {{#if: {{{number|}}}| {{{number}}} }}</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
 <noinclude>
 <templatedata>
 {
     "params": {
         "title": {
             "label": "Title",
             "description": "Title of the note",
             "type": "string"
         }
     }
 }
 </templatedata>
 </noinclude>
diff --git a/struct-wikipages/en/Template:BeginProof b/struct-wikipages/en/Template:BeginProof
index da1c05b..fb4b67d 100644
--- a/struct-wikipages/en/Template:BeginProof
+++ b/struct-wikipages/en/Template:BeginProof
@@ -1,14 +1,14 @@
-<div class="beginenvironment beginproof"><i>Proof</i> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
+<div class="beginenvironment beginproof" id="{{#if: {{{anchor|}}}| {{{anchor}}} }}"><i>Proof {{#if: {{{number|}}}| {{{number}}} }}</i> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
 <noinclude>
 <templatedata>
 {
     "params": {
         "title": {
             "label": "Title",
             "description": "Title of the proof",
             "type": "string"
         }
     }
 }
 </templatedata>
 </noinclude>
\ No newline at end of file
diff --git a/struct-wikipages/en/Template:BeginProposition b/struct-wikipages/en/Template:BeginProposition
index e931d04..d6af637 100644
--- a/struct-wikipages/en/Template:BeginProposition
+++ b/struct-wikipages/en/Template:BeginProposition
@@ -1,14 +1,14 @@
-<div class="beginenvironment beginproposition"><b>Proposition</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
+<div class="beginenvironment beginproposition" id="{{#if: {{{anchor|}}}| {{{anchor}}} }}"><b>Proposition {{#if: {{{number|}}}| {{{number}}} }}</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
 <noinclude>
 <templatedata>
 {
     "params": {
         "title": {
             "label": "Title",
             "description": "Title of the proposition",
             "type": "string"
         }
     }
 }
 </templatedata>
 </noinclude>
diff --git a/struct-wikipages/en/Template:BeginRemark b/struct-wikipages/en/Template:BeginRemark
index 05f7a33..7c9c33a 100644
--- a/struct-wikipages/en/Template:BeginRemark
+++ b/struct-wikipages/en/Template:BeginRemark
@@ -1,14 +1,14 @@
-<div class="beginenvironment beginremark"><b>Remark</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
+<div class="beginenvironment beginremark" id="{{#if: {{{anchor|}}}| {{{anchor}}} }}"><b>Remark {{#if: {{{number|}}}| {{{number}}} }}</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
 <noinclude>
 <templatedata>
 {
     "params": {
         "title": {
             "label": "Title",
             "description": "Title of the remark",
             "type": "string"
         }
     }
 }
 </templatedata>
 </noinclude>
diff --git a/struct-wikipages/en/Template:BeginTheorem b/struct-wikipages/en/Template:BeginTheorem
index dc99d41..5f89205 100644
--- a/struct-wikipages/en/Template:BeginTheorem
+++ b/struct-wikipages/en/Template:BeginTheorem
@@ -1,14 +1,14 @@
-<div class="beginenvironment begintheorem"><b>Theorem</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
+<div class="beginenvironment begintheorem" id="{{#if: {{{anchor|}}}| {{{anchor}}} }}"><b>Theorem {{#if: {{{number|}}}| {{{number}}} }}</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
 <noinclude>
 <templatedata>
 {
     "params": {
         "title": {
             "label": "Title",
             "description": "Title of the theorem",
             "type": "string"
         }
     }
 }
 </templatedata>
 </noinclude>
diff --git a/struct-wikipages/it/Template:InizioAssioma b/struct-wikipages/it/Template:InizioAssioma
index bb54822..378e5ec 100644
--- a/struct-wikipages/it/Template:InizioAssioma
+++ b/struct-wikipages/it/Template:InizioAssioma
@@ -1,14 +1,14 @@
-<div class="beginenvironment beginaxiom"><b>Assioma</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
+<div class="beginenvironment beginaxiom" id="{{#if: {{{anchor|}}}| {{{anchor}}} }}"><b>Assioma {{#if: {{{number|}}}| {{{number}}} }}</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
 <noinclude>
 <templatedata>
 {
     "params": {
         "title": {
             "label": "Titolo",
             "description": "Titolo dell'assioma",
             "type": "string"
         }
     }
 }
 </templatedata>
 </noinclude>
diff --git a/struct-wikipages/it/Template:InizioCorollario b/struct-wikipages/it/Template:InizioCorollario
index f380a57..f9d5cf5 100644
--- a/struct-wikipages/it/Template:InizioCorollario
+++ b/struct-wikipages/it/Template:InizioCorollario
@@ -1,14 +1,14 @@
-<div class="beginenvironment begincorollary"><b>Corollario</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
+<div class="beginenvironment begincorollary" id="{{#if: {{{anchor|}}}| {{{anchor}}} }}"><b>Corollario {{#if: {{{number|}}}| {{{number}}} }}</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
 <noinclude>
 <templatedata>
 {
     "params": {
         "title": {
             "label": "Titolo",
             "description": "Titolo del corollario",
             "type": "string"
         }
     }
 }
 </templatedata>
 </noinclude>
diff --git a/struct-wikipages/it/Template:InizioDefinizione b/struct-wikipages/it/Template:InizioDefinizione
index 29f3168..9995a0f 100644
--- a/struct-wikipages/it/Template:InizioDefinizione
+++ b/struct-wikipages/it/Template:InizioDefinizione
@@ -1,14 +1,14 @@
-<div class="beginenvironment begindefinition"><b>Definizione</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
+<div class="beginenvironment begindefinition" id="{{#if: {{{anchor|}}}| {{{anchor}}} }}"><b>Definizione {{#if: {{{number|}}}| {{{number}}} }}</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
 <noinclude>
 <templatedata>
 {
     "params": {
         "title": {
             "label": "Titolo",
             "description": "Titolo della definizione",
             "type": "string"
         }
     }
 }
 </templatedata>
 </noinclude>
\ No newline at end of file
diff --git a/struct-wikipages/it/Template:InizioDimostrazione b/struct-wikipages/it/Template:InizioDimostrazione
index c09c80a..97c2b86 100644
--- a/struct-wikipages/it/Template:InizioDimostrazione
+++ b/struct-wikipages/it/Template:InizioDimostrazione
@@ -1,14 +1,14 @@
-<div class="beginenvironment beginproof"><i>Dimostrazione</i> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
+<div class="beginenvironment beginproof" id="{{#if: {{{anchor|}}}| {{{anchor}}} }}"><i>Dimostrazione {{#if: {{{number|}}}| {{{number}}} }}</i> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
 <noinclude>
 <templatedata>
 {
     "params": {
         "title": {
             "label": "Titolo",
             "description": "Titolo della dimostrazione",
             "type": "string"
         }
     }
 }
 </templatedata>
 </noinclude>
\ No newline at end of file
diff --git a/struct-wikipages/it/Template:InizioEsempio b/struct-wikipages/it/Template:InizioEsempio
index 35a0e81..598d5d3 100644
--- a/struct-wikipages/it/Template:InizioEsempio
+++ b/struct-wikipages/it/Template:InizioEsempio
@@ -1,14 +1,14 @@
-<div class="beginenvironment beginexample"><b>Esempio</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
+<div class="beginenvironment beginexample" id="{{#if: {{{anchor|}}}| {{{anchor}}} }}"><b>Esempio {{#if: {{{number|}}}| {{{number}}} }}</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
 <noinclude>
 <templatedata>
 {
     "params": {
         "title": {
             "label": "Titolo",
             "description": "Titolo dell'esempio",
             "type": "string"
         }
     }
 }
 </templatedata>
 </noinclude>
diff --git a/struct-wikipages/it/Template:InizioEsercizio b/struct-wikipages/it/Template:InizioEsercizio
index fa3a6fb..e59f8bf 100644
--- a/struct-wikipages/it/Template:InizioEsercizio
+++ b/struct-wikipages/it/Template:InizioEsercizio
@@ -1,14 +1,14 @@
-<div class="beginenvironment beginexercise"><b>Esercizio</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
+<div class="beginenvironment beginexercise" id="{{#if: {{{anchor|}}}| {{{anchor}}} }}"><b>Esercizio {{#if: {{{number|}}}| {{{number}}} }}</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
 <noinclude>
 <templatedata>
 {
     "params": {
         "title": {
             "label": "Titolo",
             "description": "Titolo dell'esercizio",
             "type": "string"
         }
     }
 }
 </templatedata>
 </noinclude>
diff --git a/struct-wikipages/it/Template:InizioLemma b/struct-wikipages/it/Template:InizioLemma
index e07edce..2e76384 100644
--- a/struct-wikipages/it/Template:InizioLemma
+++ b/struct-wikipages/it/Template:InizioLemma
@@ -1,14 +1,14 @@
-<div class="beginenvironment beginlemma"><b>Lemma</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
+<div class="beginenvironment beginlemma" id="{{#if: {{{anchor|}}}| {{{anchor}}} }}"><b>Lemma {{#if: {{{number|}}}| {{{number}}} }}</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
 <noinclude>
 <templatedata>
 {
     "params": {
         "title": {
             "label": "Titolo",
             "description": "Titolo del lemma",
             "type": "string"
         }
     }
 }
 </templatedata>
 </noinclude>
\ No newline at end of file
diff --git a/struct-wikipages/it/Template:InizioNota b/struct-wikipages/it/Template:InizioNota
index 2eb6626..99bb05f 100644
--- a/struct-wikipages/it/Template:InizioNota
+++ b/struct-wikipages/it/Template:InizioNota
@@ -1,14 +1,14 @@
-<div class="beginenvironment beginnote"><b>Nota</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
+<div class="beginenvironment beginnote" id="{{#if: {{{anchor|}}}| {{{anchor}}} }}"><b>Nota {{#if: {{{number|}}}| {{{number}}} }}</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
 <noinclude>
 <templatedata>
 {
     "params": {
         "title": {
             "label": "Titolo",
             "description": "Titolo della nota",
             "type": "string"
         }
     }
 }
 </templatedata>
 </noinclude>
diff --git a/struct-wikipages/it/Template:InizioOsservazione b/struct-wikipages/it/Template:InizioOsservazione
index af1bd60..ce05bd8 100644
--- a/struct-wikipages/it/Template:InizioOsservazione
+++ b/struct-wikipages/it/Template:InizioOsservazione
@@ -1,14 +1,14 @@
-<div class="beginenvironment beginremark"><b>Osservazione</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
+<div class="beginenvironment beginremark" id="{{#if: {{{anchor|}}}| {{{anchor}}} }}"><b>Osservazione {{#if: {{{number|}}}| {{{number}}} }}</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
 <noinclude>
 <templatedata>
 {
     "params": {
         "title": {
             "label": "Titolo",
             "description": "Titolo dell'osservazione",
             "type": "string"
         }
     }
 }
 </templatedata>
 </noinclude>
diff --git a/struct-wikipages/it/Template:InizioProposizione b/struct-wikipages/it/Template:InizioProposizione
index 9447a41..2a37c78 100644
--- a/struct-wikipages/it/Template:InizioProposizione
+++ b/struct-wikipages/it/Template:InizioProposizione
@@ -1,14 +1,14 @@
-<div class="beginenvironment beginproposition"><b>Proposizione</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
+<div class="beginenvironment beginproposition" id="{{#if: {{{anchor|}}}| {{{anchor}}} }}"><b>Proposizione {{#if: {{{number|}}}| {{{number}}} }}</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
 <noinclude>
 <templatedata>
 {
     "params": {
         "title": {
             "label": "Titolo",
             "description": "Titolo della proposizione",
             "type": "string"
         }
     }
 }
 </templatedata>
 </noinclude>
diff --git a/struct-wikipages/it/Template:InizioTeorema b/struct-wikipages/it/Template:InizioTeorema
index a5efe50..0cc32ce 100644
--- a/struct-wikipages/it/Template:InizioTeorema
+++ b/struct-wikipages/it/Template:InizioTeorema
@@ -1,14 +1,14 @@
-<div class="beginenvironment begintheorem"><b>Teorema</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
+<div class="beginenvironment begintheorem" id="{{#if: {{{anchor|}}}| {{{anchor}}} }}"><b>Teorema {{#if: {{{number|}}}| {{{number}}} }}</b> {{#if: {{{title|}}}| ({{{title}}}) }}</div>
 <noinclude>
 <templatedata>
 {
     "params": {
         "title": {
             "label": "Titolo",
             "description": "Title of the theorem",
             "type": "string"
         }
     }
 }
 </templatedata>
 </noinclude>