diff --git a/struct-wikipages/ALL_LANGUAGES/Template:BeginAxiom b/struct-wikipages/ALL_LANGUAGES/Template:BeginAxiom
index 918da00..a586f59 100644
--- a/struct-wikipages/ALL_LANGUAGES/Template:BeginAxiom
+++ b/struct-wikipages/ALL_LANGUAGES/Template:BeginAxiom
@@ -1,14 +1,14 @@
-<div class="beginenvironment beginaxiom"><b>{{{title|Axiom}}}</b></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>
\ No newline at end of file
+</noinclude>
diff --git a/struct-wikipages/ALL_LANGUAGES/Template:BeginCorollary b/struct-wikipages/ALL_LANGUAGES/Template:BeginCorollary
index 7ba2eb6..682c62f 100644
--- a/struct-wikipages/ALL_LANGUAGES/Template:BeginCorollary
+++ b/struct-wikipages/ALL_LANGUAGES/Template:BeginCorollary
@@ -1,14 +1,14 @@
-<div class="beginenvironment begincorollary"><b>{{{title|Corollary}}}</b></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>
\ No newline at end of file
+</noinclude>
diff --git a/struct-wikipages/ALL_LANGUAGES/Template:BeginDefinition b/struct-wikipages/ALL_LANGUAGES/Template:BeginDefinition
index d79daee..9f1fa5e 100644
--- a/struct-wikipages/ALL_LANGUAGES/Template:BeginDefinition
+++ b/struct-wikipages/ALL_LANGUAGES/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/ALL_LANGUAGES/Template:BeginExample b/struct-wikipages/ALL_LANGUAGES/Template:BeginExample
index 94d93f4..5117dcb 100644
--- a/struct-wikipages/ALL_LANGUAGES/Template:BeginExample
+++ b/struct-wikipages/ALL_LANGUAGES/Template:BeginExample
@@ -1,14 +1,14 @@
-<div class="beginenvironment beginexample"><b>{{{title|Example}}}</b></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",
+            "type": "string"
         }
     }
 }
 </templatedata>
-</noinclude>
\ No newline at end of file
+</noinclude>
diff --git a/struct-wikipages/ALL_LANGUAGES/Template:BeginExercise b/struct-wikipages/ALL_LANGUAGES/Template:BeginExercise
index e68222d..a8f3075 100644
--- a/struct-wikipages/ALL_LANGUAGES/Template:BeginExercise
+++ b/struct-wikipages/ALL_LANGUAGES/Template:BeginExercise
@@ -1,14 +1,14 @@
-<div class="beginenvironment beginexercise"><b>{{{title|Exercise}}}</b></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>
\ No newline at end of file
+</noinclude>
diff --git a/struct-wikipages/ALL_LANGUAGES/Template:BeginLemma b/struct-wikipages/ALL_LANGUAGES/Template:BeginLemma
index 30eb5e8..93d3017 100644
--- a/struct-wikipages/ALL_LANGUAGES/Template:BeginLemma
+++ b/struct-wikipages/ALL_LANGUAGES/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/ALL_LANGUAGES/Template:BeginNote b/struct-wikipages/ALL_LANGUAGES/Template:BeginNote
index 1e54b6d..069e084 100644
--- a/struct-wikipages/ALL_LANGUAGES/Template:BeginNote
+++ b/struct-wikipages/ALL_LANGUAGES/Template:BeginNote
@@ -1,14 +1,14 @@
-<div class="beginenvironment beginnote"><b>{{{title|Note}}}</b></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>
\ No newline at end of file
+</noinclude>
diff --git a/struct-wikipages/ALL_LANGUAGES/Template:BeginProof b/struct-wikipages/ALL_LANGUAGES/Template:BeginProof
index da1c05b..fb4b67d 100644
--- a/struct-wikipages/ALL_LANGUAGES/Template:BeginProof
+++ b/struct-wikipages/ALL_LANGUAGES/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/ALL_LANGUAGES/Template:BeginProposition b/struct-wikipages/ALL_LANGUAGES/Template:BeginProposition
index 2de7fb9..d6af637 100644
--- a/struct-wikipages/ALL_LANGUAGES/Template:BeginProposition
+++ b/struct-wikipages/ALL_LANGUAGES/Template:BeginProposition
@@ -1,14 +1,14 @@
-<div class="beginenvironment beginproposition"><b>{{{title|Proposition}}}</b></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>
\ No newline at end of file
+</noinclude>
diff --git a/struct-wikipages/ALL_LANGUAGES/Template:BeginRemark b/struct-wikipages/ALL_LANGUAGES/Template:BeginRemark
index c250bad..7c9c33a 100644
--- a/struct-wikipages/ALL_LANGUAGES/Template:BeginRemark
+++ b/struct-wikipages/ALL_LANGUAGES/Template:BeginRemark
@@ -1,14 +1,14 @@
-<div class="beginenvironment baginremark"><b>{{{title|Remark}}}</b></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>
\ No newline at end of file
+</noinclude>
diff --git a/struct-wikipages/ALL_LANGUAGES/Template:BeginTheorem b/struct-wikipages/ALL_LANGUAGES/Template:BeginTheorem
index 89aa575..5f89205 100644
--- a/struct-wikipages/ALL_LANGUAGES/Template:BeginTheorem
+++ b/struct-wikipages/ALL_LANGUAGES/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>
\ No newline at end of file
+</noinclude>
diff --git a/struct-wikipages/en/Template:BeginAxiom b/struct-wikipages/en/Template:BeginAxiom
deleted file mode 100644
index a586f59..0000000
--- a/struct-wikipages/en/Template:BeginAxiom
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index 682c62f..0000000
--- a/struct-wikipages/en/Template:BeginCorollary
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index 9f1fa5e..0000000
--- a/struct-wikipages/en/Template:BeginDefinition
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index 5117dcb..0000000
--- a/struct-wikipages/en/Template:BeginExample
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index a8f3075..0000000
--- a/struct-wikipages/en/Template:BeginExercise
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index 93d3017..0000000
--- a/struct-wikipages/en/Template:BeginLemma
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index 069e084..0000000
--- a/struct-wikipages/en/Template:BeginNote
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index fb4b67d..0000000
--- a/struct-wikipages/en/Template:BeginProof
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index d6af637..0000000
--- a/struct-wikipages/en/Template:BeginProposition
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index 7c9c33a..0000000
--- a/struct-wikipages/en/Template:BeginRemark
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index 5f89205..0000000
--- a/struct-wikipages/en/Template:BeginTheorem
+++ /dev/null
@@ -1,14 +0,0 @@
-<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/en/Template:EndAxiom b/struct-wikipages/en/Template:EndAxiom
deleted file mode 100644
index 558ba63..0000000
--- a/struct-wikipages/en/Template:EndAxiom
+++ /dev/null
@@ -1 +0,0 @@
-<div class="endenvironment endaxiom" data-endenvstring="End of Axiom">&nbsp;</div>
\ No newline at end of file
diff --git a/struct-wikipages/en/Template:EndCorollary b/struct-wikipages/en/Template:EndCorollary
deleted file mode 100644
index 87d32f5..0000000
--- a/struct-wikipages/en/Template:EndCorollary
+++ /dev/null
@@ -1 +0,0 @@
-<div class="endenvironment endcorollary" data-endenvstring="End of Corollary">&nbsp;</div>
\ No newline at end of file
diff --git a/struct-wikipages/en/Template:EndDefinition b/struct-wikipages/en/Template:EndDefinition
deleted file mode 100644
index b551151..0000000
--- a/struct-wikipages/en/Template:EndDefinition
+++ /dev/null
@@ -1 +0,0 @@
-<div class="endenvironment enddefinition" data-endenvstring="End of Definition">&nbsp;</div>
\ No newline at end of file
diff --git a/struct-wikipages/en/Template:EndExample b/struct-wikipages/en/Template:EndExample
deleted file mode 100644
index 1c834af..0000000
--- a/struct-wikipages/en/Template:EndExample
+++ /dev/null
@@ -1 +0,0 @@
-<div class="endenvironment endexample" data-endenvstring="End of Example">&nbsp;</div>
\ No newline at end of file
diff --git a/struct-wikipages/en/Template:EndExercise b/struct-wikipages/en/Template:EndExercise
deleted file mode 100644
index 217f570..0000000
--- a/struct-wikipages/en/Template:EndExercise
+++ /dev/null
@@ -1 +0,0 @@
-<div class="endenvironment endexercise" data-endenvstring="End of Exercise">&nbsp;</div>
\ No newline at end of file
diff --git a/struct-wikipages/en/Template:EndLemma b/struct-wikipages/en/Template:EndLemma
deleted file mode 100644
index 693914f..0000000
--- a/struct-wikipages/en/Template:EndLemma
+++ /dev/null
@@ -1 +0,0 @@
-<div class="endenvironment endlemma" data-endenvstring="End of Lemma">&nbsp;</div>
\ No newline at end of file
diff --git a/struct-wikipages/en/Template:EndNote b/struct-wikipages/en/Template:EndNote
deleted file mode 100644
index 62942ba..0000000
--- a/struct-wikipages/en/Template:EndNote
+++ /dev/null
@@ -1 +0,0 @@
-<div class="endenvironment endnote" data-endenvstring="End of Note">&nbsp;</div>
\ No newline at end of file
diff --git a/struct-wikipages/en/Template:EndProof b/struct-wikipages/en/Template:EndProof
deleted file mode 100644
index b1de15a..0000000
--- a/struct-wikipages/en/Template:EndProof
+++ /dev/null
@@ -1 +0,0 @@
-<div class="endenvironment endproof" data-endenvstring="End of Proof">&nbsp;</div>
\ No newline at end of file
diff --git a/struct-wikipages/en/Template:EndProposition b/struct-wikipages/en/Template:EndProposition
deleted file mode 100644
index 08c3a5c..0000000
--- a/struct-wikipages/en/Template:EndProposition
+++ /dev/null
@@ -1 +0,0 @@
-<div class="endenvironment endproposition" data-endenvstring="End of Proposition">&nbsp;</div>
\ No newline at end of file
diff --git a/struct-wikipages/en/Template:EndRemark b/struct-wikipages/en/Template:EndRemark
deleted file mode 100644
index 1fb8cf9..0000000
--- a/struct-wikipages/en/Template:EndRemark
+++ /dev/null
@@ -1 +0,0 @@
-<div class="endenvironment endremark" data-endenvstring="End of Remark">&nbsp;</div>
\ No newline at end of file
diff --git a/struct-wikipages/en/Template:EndTheorem b/struct-wikipages/en/Template:EndTheorem
deleted file mode 100644
index 4b78544..0000000
--- a/struct-wikipages/en/Template:EndTheorem
+++ /dev/null
@@ -1 +0,0 @@
-<div class="endenvironment endtheorem" data-endenvstring="End of Theorem">&nbsp;</div>
\ No newline at end of file