diff --git a/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_advanced.svg
new file mode 100644
index 0000000000..8b299d016a
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_advanced.svg
@@ -0,0 +1,1010 @@
+
+
+
+
diff --git a/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_minimal.svg
new file mode 100644
index 0000000000..b4cd41bff4
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_minimal.svg
@@ -0,0 +1,1010 @@
+
+
+
+
diff --git a/src/Mod/TechDraw/Templates/A0_Landscape_ISO7200TD.svg b/src/Mod/TechDraw/Templates/A0_Landscape_ISO7200TD.svg
deleted file mode 100644
index 83fd664f33..0000000000
--- a/src/Mod/TechDraw/Templates/A0_Landscape_ISO7200TD.svg
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Templates/A0_Landscape_ISO7200_Pep.svg b/src/Mod/TechDraw/Templates/A0_Landscape_ISO7200_Pep.svg
deleted file mode 100644
index 71500e19d9..0000000000
--- a/src/Mod/TechDraw/Templates/A0_Landscape_ISO7200_Pep.svg
+++ /dev/null
@@ -1,220 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_advanced.svg
new file mode 100644
index 0000000000..7d60d11ea5
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_advanced.svg
@@ -0,0 +1,812 @@
+
+
+
+
diff --git a/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_minimal.svg
new file mode 100644
index 0000000000..5ef3b528af
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_minimal.svg
@@ -0,0 +1,794 @@
+
+
+
+
diff --git a/src/Mod/TechDraw/Templates/A1_Landscape_ISO7200TD.svg b/src/Mod/TechDraw/Templates/A1_Landscape_ISO7200TD.svg
deleted file mode 100644
index 29bb9fd241..0000000000
--- a/src/Mod/TechDraw/Templates/A1_Landscape_ISO7200TD.svg
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Templates/A1_Landscape_ISO7200_Pep.svg b/src/Mod/TechDraw/Templates/A1_Landscape_ISO7200_Pep.svg
deleted file mode 100644
index b2bfcd8b43..0000000000
--- a/src/Mod/TechDraw/Templates/A1_Landscape_ISO7200_Pep.svg
+++ /dev/null
@@ -1,180 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_advanced.svg
new file mode 100644
index 0000000000..f4a4a28ced
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_advanced.svg
@@ -0,0 +1,650 @@
+
+
+
+
diff --git a/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_minimal.svg
new file mode 100644
index 0000000000..7be68784da
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_minimal.svg
@@ -0,0 +1,650 @@
+
+
+
+
diff --git a/src/Mod/TechDraw/Templates/A2_Landscape_ISO7200TD.svg b/src/Mod/TechDraw/Templates/A2_Landscape_ISO7200TD.svg
deleted file mode 100644
index 5a9e46faa9..0000000000
--- a/src/Mod/TechDraw/Templates/A2_Landscape_ISO7200TD.svg
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Templates/A2_Landscape_ISO7200_Pep.svg b/src/Mod/TechDraw/Templates/A2_Landscape_ISO7200_Pep.svg
deleted file mode 100644
index b78c891c7f..0000000000
--- a/src/Mod/TechDraw/Templates/A2_Landscape_ISO7200_Pep.svg
+++ /dev/null
@@ -1,152 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_advanced.svg
new file mode 100644
index 0000000000..f0498957a1
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_advanced.svg
@@ -0,0 +1,542 @@
+
+
+
+
diff --git a/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_minimal.svg
new file mode 100644
index 0000000000..7d75498042
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_minimal.svg
@@ -0,0 +1,542 @@
+
+
+
+
diff --git a/src/Mod/TechDraw/Templates/A3_Landscape_ISO7200TD.svg b/src/Mod/TechDraw/Templates/A3_Landscape_ISO7200TD.svg
deleted file mode 100644
index 5edb0c5e4d..0000000000
--- a/src/Mod/TechDraw/Templates/A3_Landscape_ISO7200TD.svg
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Templates/A3_Landscape_ISO7200_Pep.svg b/src/Mod/TechDraw/Templates/A3_Landscape_ISO7200_Pep.svg
deleted file mode 100644
index 964124106f..0000000000
--- a/src/Mod/TechDraw/Templates/A3_Landscape_ISO7200_Pep.svg
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_advanced.svg
new file mode 100644
index 0000000000..d0f88ab819
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_advanced.svg
@@ -0,0 +1,420 @@
+
+
+
+
diff --git a/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_minimal.svg
new file mode 100644
index 0000000000..5f71425d7e
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_minimal.svg
@@ -0,0 +1,420 @@
+
+
+
+
diff --git a/src/Mod/TechDraw/Templates/A4_Landscape_ISO7200TD.svg b/src/Mod/TechDraw/Templates/A4_Landscape_ISO7200TD.svg
deleted file mode 100644
index ab77ba9a1a..0000000000
--- a/src/Mod/TechDraw/Templates/A4_Landscape_ISO7200TD.svg
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Templates/A4_Landscape_ISO7200_Pep.svg b/src/Mod/TechDraw/Templates/A4_Landscape_ISO7200_Pep.svg
deleted file mode 100644
index 3af2ab93d9..0000000000
--- a/src/Mod/TechDraw/Templates/A4_Landscape_ISO7200_Pep.svg
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_advanced.svg
new file mode 100644
index 0000000000..6a23740f2b
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_advanced.svg
@@ -0,0 +1,420 @@
+
+
+
+
diff --git a/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_minimal.svg
new file mode 100644
index 0000000000..607f205ff9
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_minimal.svg
@@ -0,0 +1,438 @@
+
+
+
+
diff --git a/src/Mod/TechDraw/Templates/A4_Portrait_ISO7200Pep.svg b/src/Mod/TechDraw/Templates/A4_Portrait_ISO7200Pep.svg
deleted file mode 100644
index e128fb8105..0000000000
--- a/src/Mod/TechDraw/Templates/A4_Portrait_ISO7200Pep.svg
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Templates/A4_Portrait_ISO7200TD.svg b/src/Mod/TechDraw/Templates/A4_Portrait_ISO7200TD.svg
deleted file mode 100644
index c71e88e86c..0000000000
--- a/src/Mod/TechDraw/Templates/A4_Portrait_ISO7200TD.svg
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_1_minimal.svg b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_1_minimal.svg
index 16c8af42a6..7c28da665a 100644
--- a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_1_minimal.svg
+++ b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_1_minimal.svg
@@ -83,7 +83,8 @@
id="Identification number data field"
y="33.2"
freecad:editable="drawing_number"
- style="font-size:5px;line-height:1;font-family:osifont;-inkscape-font-specification:osifont;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-color:#000000;word-spacing:0px;text-orientation:sideways;text-anchor:start;fill:#000000;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000000">DN
+ style="font-size:5px;line-height:1;font-family:osifont;-inkscape-font-specification:osifont;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-color:#000000;word-spacing:0px;text-orientation:sideways;text-anchor:start;fill:#000000;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000000">DN
@@ -104,7 +105,8 @@
id="Revision index data field"
y="33.2"
freecad:editable="revision_index"
- style="font-size:5px;line-height:1;font-family:osifont;-inkscape-font-specification:osifont;text-align:center;text-decoration:none;text-decoration-line:none;text-decoration-color:#000000;word-spacing:0px;text-orientation:sideways;text-anchor:middle;fill:#000000;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000000">AAA
+ style="font-size:5px;line-height:1;font-family:osifont;-inkscape-font-specification:osifont;text-align:center;text-decoration:none;text-decoration-line:none;text-decoration-color:#000000;word-spacing:0px;text-orientation:sideways;text-anchor:middle;fill:#000000;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000000">AAA
@@ -125,7 +127,8 @@
id="Date of issue data field"
y="33.2"
freecad:editable="issue_date"
- style="font-size:5px;line-height:1;font-family:osifont;-inkscape-font-specification:osifont;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-color:#000000;word-spacing:0px;text-orientation:sideways;text-anchor:start;fill:#000000;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000000">YYYY-MM-DD
+ style="font-size:5px;line-height:1;font-family:osifont;-inkscape-font-specification:osifont;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-color:#000000;word-spacing:0px;text-orientation:sideways;text-anchor:start;fill:#000000;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000000">YYYY-MM-DD
@@ -146,7 +149,8 @@
id="Sheet number data field"
y="33.2"
freecad:editable="sheet_number"
- style="font-size:5px;line-height:1;font-family:osifont;-inkscape-font-specification:osifont;text-align:center;text-decoration:none;text-decoration-line:none;text-decoration-color:#000000;word-spacing:0px;text-orientation:sideways;text-anchor:middle;fill:#000000;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000000">X / Y
+ style="font-size:5px;line-height:1;font-family:osifont;-inkscape-font-specification:osifont;text-align:center;text-decoration:none;text-decoration-line:none;text-decoration-color:#000000;word-spacing:0px;text-orientation:sideways;text-anchor:middle;fill:#000000;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000000">X / Y
@@ -167,7 +171,8 @@
id="Title data field"
y="9.2"
freecad:editable="title"
- style="font-size:5px;line-height:1;font-family:osifont;-inkscape-font-specification:osifont;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-color:#000000;word-spacing:0px;text-orientation:sideways;text-anchor:start;fill:#000000;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000000">ISO 5457 template
+ style="font-size:5px;line-height:1;font-family:osifont;-inkscape-font-specification:osifont;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-color:#000000;word-spacing:0px;text-orientation:sideways;text-anchor:start;fill:#000000;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000000">ISO 5457 template
@@ -188,7 +193,8 @@
id="Approval person data field"
y="21.2"
freecad:editable="approved_by"
- style="font-size:5px;line-height:1;font-family:osifont;-inkscape-font-specification:osifont;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-color:#000000;word-spacing:0px;text-orientation:sideways;text-anchor:start;fill:#000000;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000000">B. Hecate
+ style="font-size:5px;line-height:1;font-family:osifont;-inkscape-font-specification:osifont;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-color:#000000;word-spacing:0px;text-orientation:sideways;text-anchor:start;fill:#000000;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000000">B. Hecate
@@ -209,7 +215,8 @@
id="Creator data field"
y="9.2"
freecad:editable="created_by"
- style="font-size:5px;line-height:1;font-family:osifont;-inkscape-font-specification:osifont;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-color:#000000;word-spacing:0px;text-orientation:sideways;text-anchor:start;fill:#000000;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000000">A. Nemesis
+ style="font-size:5px;line-height:1;font-family:osifont;-inkscape-font-specification:osifont;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-color:#000000;word-spacing:0px;text-orientation:sideways;text-anchor:start;fill:#000000;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000000">A. Nemesis
@@ -230,7 +237,8 @@
id="Document type data field"
y="21.2"
freecad:editable="document_type"
- style="font-size:5px;line-height:1;font-family:osifont;-inkscape-font-specification:osifont;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-color:#000000;word-spacing:0px;text-orientation:sideways;text-anchor:start;fill:#000000;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000000">Assembly Drawing
+ style="font-size:5px;line-height:1;font-family:osifont;-inkscape-font-specification:osifont;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-color:#000000;word-spacing:0px;text-orientation:sideways;text-anchor:start;fill:#000000;stroke:none;stroke-width:2;stroke-linejoin:round;stop-color:#000000">Assembly Drawing