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..bca7530e0d
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_advanced.svg
@@ -0,0 +1,262 @@
+
+
+
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..21fd90506c
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_minimal.svg
@@ -0,0 +1,253 @@
+
+
+
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..e943c8c1c8
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_advanced.svg
@@ -0,0 +1,214 @@
+
+
+
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..07a35974ed
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_minimal.svg
@@ -0,0 +1,205 @@
+
+
+
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..dd3720c36f
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_advanced.svg
@@ -0,0 +1,181 @@
+
+
+
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..a0bfb31bae
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_minimal.svg
@@ -0,0 +1,174 @@
+
+
+
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..31562c5726
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_advanced.svg
@@ -0,0 +1,158 @@
+
+
+
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..1a82198256
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_minimal.svg
@@ -0,0 +1,150 @@
+
+
+
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..50fe66d2ea
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_advanced.svg
@@ -0,0 +1,132 @@
+
+
+
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..b8ef4593ed
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_minimal.svg
@@ -0,0 +1,127 @@
+
+
+
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..6f0f23de07
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_advanced.svg
@@ -0,0 +1,132 @@
+
+
+
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..4e821c731c
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_minimal.svg
@@ -0,0 +1,124 @@
+
+
+
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/A0_Landscape_ISO5457_notitleblock.svg b/src/Mod/TechDraw/Templates/ISO 5457/A0_Landscape_ISO5457_notitleblock.svg
new file mode 100644
index 0000000000..255c18c993
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/ISO 5457/A0_Landscape_ISO5457_notitleblock.svg
@@ -0,0 +1,201 @@
+
+
+
diff --git a/src/Mod/TechDraw/Templates/ISO 5457/A1_Landscape_ISO5457_notitleblock.svg b/src/Mod/TechDraw/Templates/ISO 5457/A1_Landscape_ISO5457_notitleblock.svg
new file mode 100644
index 0000000000..1f343e0d8e
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/ISO 5457/A1_Landscape_ISO5457_notitleblock.svg
@@ -0,0 +1,153 @@
+
+
+
diff --git a/src/Mod/TechDraw/Templates/ISO 5457/A2_Landscape_ISO5457_notitleblock.svg b/src/Mod/TechDraw/Templates/ISO 5457/A2_Landscape_ISO5457_notitleblock.svg
new file mode 100644
index 0000000000..9be9d85c56
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/ISO 5457/A2_Landscape_ISO5457_notitleblock.svg
@@ -0,0 +1,120 @@
+
+
+
diff --git a/src/Mod/TechDraw/Templates/ISO 5457/A3_Landscape_ISO5457_notitleblock.svg b/src/Mod/TechDraw/Templates/ISO 5457/A3_Landscape_ISO5457_notitleblock.svg
new file mode 100644
index 0000000000..94115d03a8
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/ISO 5457/A3_Landscape_ISO5457_notitleblock.svg
@@ -0,0 +1,97 @@
+
+
+
diff --git a/src/Mod/TechDraw/Templates/ISO 5457/A4_Landscape_ISO5457_notitleblock.svg b/src/Mod/TechDraw/Templates/ISO 5457/A4_Landscape_ISO5457_notitleblock.svg
new file mode 100644
index 0000000000..408967838c
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/ISO 5457/A4_Landscape_ISO5457_notitleblock.svg
@@ -0,0 +1,71 @@
+
+
+
diff --git a/src/Mod/TechDraw/Templates/ISO 5457/A4_Portrait_ISO5457_notitleblock.svg b/src/Mod/TechDraw/Templates/ISO 5457/A4_Portrait_ISO5457_notitleblock.svg
new file mode 100644
index 0000000000..b808a2ab26
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/ISO 5457/A4_Portrait_ISO5457_notitleblock.svg
@@ -0,0 +1,71 @@
+
+
+
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
new file mode 100644
index 0000000000..20732adda0
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_1_minimal.svg
@@ -0,0 +1,85 @@
+
+
+
diff --git a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_2.svg b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_2.svg
new file mode 100644
index 0000000000..ff34e6485d
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_2.svg
@@ -0,0 +1,70 @@
+
+
+
diff --git a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_3.svg b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_3.svg
new file mode 100644
index 0000000000..c3c4727253
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_3.svg
@@ -0,0 +1,93 @@
+
+
+
diff --git a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_4.svg b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_4.svg
new file mode 100644
index 0000000000..7f75a444b9
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_4.svg
@@ -0,0 +1,81 @@
+
+
+
diff --git a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_5_maximal.svg b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_5_maximal.svg
new file mode 100644
index 0000000000..a37986e146
--- /dev/null
+++ b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_5_maximal.svg
@@ -0,0 +1,107 @@
+
+
+