From 6777a436147985615d7fe479d9f062af85013246 Mon Sep 17 00:00:00 2001
From: HowThatWorks <ThatIsNotHowThatWorks@gmail.com>
Date: Sat, 18 May 2024 00:27:17 +0200
Subject: [PATCH] Added freecad:autofill attribute to ISO templates

---
 .../Templates/A0_Landscape_ISO5457_advanced.svg  | 12 ++++++------
 .../Templates/A0_Landscape_ISO5457_minimal.svg   | 12 ++++++------
 .../Templates/A1_Landscape_ISO5457_advanced.svg  | 12 ++++++------
 .../Templates/A1_Landscape_ISO5457_minimal.svg   | 12 ++++++------
 .../Templates/A2_Landscape_ISO5457_advanced.svg  | 12 ++++++------
 .../Templates/A2_Landscape_ISO5457_minimal.svg   | 12 ++++++------
 .../Templates/A3_Landscape_ISO5457_advanced.svg  | 12 ++++++------
 .../Templates/A3_Landscape_ISO5457_minimal.svg   | 12 ++++++------
 .../Templates/A4_Landscape_ISO5457_advanced.svg  | 12 ++++++------
 .../Templates/A4_Landscape_ISO5457_minimal.svg   | 12 ++++++------
 .../Templates/A4_Portrait_ISO5457_advanced.svg   | 12 ++++++------
 .../Templates/A4_Portrait_ISO5457_minimal.svg    | 12 ++++++------
 .../ISO 5457/ISO7200_titleblock_1_minimal.svg    | 16 ++++++++--------
 .../Templates/ISO 5457/ISO7200_titleblock_2.svg  | 10 +++++-----
 .../ISO 5457/ISO7200_titleblock_3_advanced.svg   | 12 ++++++------
 .../Templates/ISO 5457/ISO7200_titleblock_4.svg  | 10 +++++-----
 .../ISO 5457/ISO7200_titleblock_5_maximal.svg    | 16 ++++++++--------
 17 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_advanced.svg
index ba45733e84..5f30a6fe0e 100644
--- a/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_advanced.svg
+++ b/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_advanced.svg
@@ -237,24 +237,24 @@
     <text id="part_material_label" x="999.5" y="774.6">Part Material:</text>
   </g>
   <g id="title_block_data_fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
-    <text id="legal_owner_1_data_field" x="1159" y="792.1" freecad:editable="legal_owner_1" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
+    <text id="legal_owner_1_data_field" x="1159" y="792.1" freecad:editable="legal_owner_1" freecad:autofill="organization" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_2_data_field" x="1159" y="796.1" freecad:editable="legal_owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_3_data_field" x="1159" y="800.1" freecad:editable="legal_owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_4_data_field" x="1159" y="804.1" freecad:editable="legal_owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="identification_number_data_field" x="1080" y="816.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
     <text id="revision_index_data_field" x="1149" y="828.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
-    <text id="date_of_issue_data_field" x="1100" y="828.2" freecad:editable="date_of_issue"><tspan>YYYY-MM-DD</tspan></text>
-    <text id="sheet_number_data_field" x="1169" y="828.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
+    <text id="date_of_issue_data_field" x="1100" y="828.2" freecad:editable="date_of_issue" freecad:autofill="date"><tspan>YYYY-MM-DD</tspan></text>
+    <text id="sheet_number_data_field" x="1169" y="828.2" freecad:editable="sheet_number" freecad:autofill="sheet" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
     <text id="language_data_field" x="1089" y="828.2" freecad:editable="language_code" style="text-align:center;text-anchor:middle"><tspan>EN</tspan></text>
-    <text id="title_data_field" x="1000" y="792.2" freecad:editable="title"><tspan>ISO 7200 titleblock</tspan></text>
+    <text id="title_data_field" x="1000" y="792.2" freecad:editable="title" freecad:autofill="title"><tspan>ISO 7200 titleblock</tspan></text>
     <text id="supplementary_title_1_data_field" x="1000" y="798.2" freecad:editable="supplementary_title_1"><tspan>ST1</tspan></text>
     <text id="supplementary_title_2_data_field" x="1000" y="804.2" freecad:editable="supplementary_title_2"><tspan>ST2</tspan></text>
     <text id="responsible_department_data_field" x="1140" y="816.2" freecad:editable="responsible_department"><tspan>RD</tspan></text>
     <text id="approval_person_data_field" x="1080" y="804.2" freecad:editable="approval_person"><tspan>B. Hecate</tspan></text>
-    <text id="creator_data_field" x="1080" y="792.2" freecad:editable="creator"><tspan>A. Nemesis</tspan></text>
+    <text id="creator_data_field" x="1080" y="792.2" freecad:editable="creator" freecad:autofill="author"><tspan>A. Nemesis</tspan></text>
     <text id="document_type_data_field" x="1000" y="816.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
     <text id="document_status_data_field" x="1000" y="828.2" freecad:editable="document_status"><tspan>In preparation</tspan></text>
-    <text id="sheet_scale_data_field" x="1129" y="780.2" style="text-align:center;text-anchor:middle" freecad:editable="sheet_scale"><tspan>1 : 1</tspan></text>
+    <text id="sheet_scale_data_field" x="1129" y="780.2" freecad:editable="sheet_scale" freecad:autofill="scale" style="text-align:center;text-anchor:middle"><tspan>1 : 1</tspan></text>
     <text id="general_tolerances_data_field" x="1080" y="780.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
     <text id="part_material_data_field" x="1000" y="780.2" freecad:editable="part_material"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
   </g>
diff --git a/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_minimal.svg
index cf3987b1e2..8fd52fc71f 100644
--- a/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_minimal.svg
+++ b/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_minimal.svg
@@ -233,20 +233,20 @@
     <text id="part_material_label" x="999.5" y="786.6">Part Material:</text>
   </g>
   <g id="title_block_data_fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
-    <text id="legal_owner_1_data_field" x="1159" y="804.1" freecad:editable="legal_owner_1" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
+    <text id="legal_owner_1_data_field" x="1159" y="804.1" freecad:editable="legal_owner_1" freecad:autofill="organization" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_2_data_field" x="1159" y="808.1" freecad:editable="legal_owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_3_data_field" x="1159" y="812.1" freecad:editable="legal_owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_4_data_field" x="1159" y="816.1" freecad:editable="legal_owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="identification_number_data_field" x="1000" y="828.2" freecad:editable="identification_number"><tspan>DN</tspan></text>
     <text id="revision_index_data_field" x="1149" y="828.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
-    <text id="date_of_issue_data_field" x="1100" y="828.2" freecad:editable="date_of_issue"><tspan>YYYY-MM-DD</tspan></text>
-    <text id="sheet_number_data_field" x="1169" y="828.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
+    <text id="date_of_issue_data_field" x="1100" y="828.2" freecad:editable="date_of_issue" freecad:autofill="date"><tspan>YYYY-MM-DD</tspan></text>
+    <text id="sheet_number_data_field" x="1169" y="828.2" freecad:editable="sheet_number" freecad:autofill="sheet" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
     <text id="language_code_data_field" x="1089" y="828.2" freecad:editable="language_code" style="text-align:center;text-anchor:middle"><tspan>EN</tspan></text>
-    <text id="title_data_field" x="1000" y="804.2" freecad:editable="title"><tspan>ISO 5457 template</tspan></text>
+    <text id="title_data_field" x="1000" y="804.2" freecad:editable="title" freecad:autofill="title"><tspan>ISO 5457 template</tspan></text>
     <text id="approval_person_data_field" x="1080" y="816.2" freecad:editable="approval_person"><tspan>B. Hecate</tspan></text>
-    <text id="creator_data_field" x="1080" y="804.2" freecad:editable="creator"><tspan>A. Nemesis</tspan></text>
+    <text id="creator_data_field" x="1080" y="804.2" freecad:editable="creator" freecad:autofill="author"><tspan>A. Nemesis</tspan></text>
     <text id="document_type_data_field" x="1000" y="816.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
-    <text id="sheet_scale_data_field" x="1129" y="792.2" style="text-align:center;text-anchor:middle" freecad:editable="sheet_scale"><tspan>1 : 1</tspan></text>
+    <text id="sheet_scale_data_field" x="1129" y="792.2" freecad:editable="sheet_scale" freecad:autofill="scale" style="text-align:center;text-anchor:middle"><tspan>1 : 1</tspan></text>
     <text id="general_tolerances_data_field" x="1080" y="792.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
     <text id="part_material_data_field" x="1000" y="792.2" freecad:editable="part_material"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
   </g>
diff --git a/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_advanced.svg
index d446e0b8ea..2cd04954e5 100644
--- a/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_advanced.svg
+++ b/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_advanced.svg
@@ -189,24 +189,24 @@
     <text id="part_material_label" x="651.5" y="527.6">Part Material:</text>
   </g>
   <g id="title_block_data_fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
-    <text id="legal_owner_1_data_field" x="811" y="545.1" freecad:editable="legal_owner_1" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
+    <text id="legal_owner_1_data_field" x="811" y="545.1" freecad:editable="legal_owner_1" freecad:autofill="organization" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_2_data_field" x="811" y="549.1" freecad:editable="legal_owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_3_data_field" x="811" y="553.1" freecad:editable="legal_owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_4_data_field" x="811" y="557.1" freecad:editable="legal_owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="identification_number_data_field" x="732" y="569.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
     <text id="revision_index_data_field" x="801" y="581.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
-    <text id="date_of_issue_data_field" x="752" y="581.2" freecad:editable="date_of_issue"><tspan>YYYY-MM-DD</tspan></text>
-    <text id="sheet_number_data_field" x="821" y="581.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
+    <text id="date_of_issue_data_field" x="752" y="581.2" freecad:editable="date_of_issue" freecad:autofill="date"><tspan>YYYY-MM-DD</tspan></text>
+    <text id="sheet_number_data_field" x="821" y="581.2" freecad:editable="sheet_number" freecad:autofill="sheet" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
     <text id="language_data_field" x="741" y="581.2" freecad:editable="language_code" style="text-align:center;text-anchor:middle"><tspan>EN</tspan></text>
-    <text id="title_data_field" x="652" y="545.2" freecad:editable="title"><tspan>ISO 7200 titleblock</tspan></text>
+    <text id="title_data_field" x="652" y="545.2" freecad:editable="title" freecad:autofill="title"><tspan>ISO 7200 titleblock</tspan></text>
     <text id="supplementary_title_1_data_field" x="652" y="551.2" freecad:editable="supplementary_title_1"><tspan>ST1</tspan></text>
     <text id="supplementary_title_2_data_field" x="652" y="557.2" freecad:editable="supplementary_title_2"><tspan>ST2</tspan></text>
     <text id="responsible_department_data_field" x="792" y="569.2" freecad:editable="responsible_department"><tspan>RD</tspan></text>
     <text id="approval_person_data_field" x="732" y="557.2" freecad:editable="approval_person"><tspan>B. Hecate</tspan></text>
-    <text id="creator_data_field" x="732" y="545.2" freecad:editable="creator"><tspan>A. Nemesis</tspan></text>
+    <text id="creator_data_field" x="732" y="545.2" freecad:editable="creator" freecad:autofill="author"><tspan>A. Nemesis</tspan></text>
     <text id="document_type_data_field" x="652" y="569.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
     <text id="document_status_data_field" x="652" y="581.2" freecad:editable="document_status"><tspan>In preparation</tspan></text>
-    <text id="sheet_scale_data_field" x="781" y="533.2" style="text-align:center;text-anchor:middle" freecad:editable="sheet_scale"><tspan>1 : 1</tspan></text>
+    <text id="sheet_scale_data_field" x="781" y="533.2" freecad:editable="sheet_scale" freecad:autofill="scale" style="text-align:center;text-anchor:middle"><tspan>1 : 1</tspan></text>
     <text id="general_tolerances_data_field" x="732" y="533.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
     <text id="part_material_data_field" x="652" y="533.2" freecad:editable="part_material"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
   </g>
diff --git a/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_minimal.svg
index fae560577e..8730134d48 100644
--- a/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_minimal.svg
+++ b/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_minimal.svg
@@ -186,20 +186,20 @@
     <text id="part_material_label" x="651.5" y="539.6">Part Material:</text>
   </g>
   <g id="title_block_data_fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
-    <text id="legal_owner_1_data_field" x="811" y="557.1" freecad:editable="legal_owner_1" style="font-size:3.5px;text-align:center;text-anchor:middle"> <tspan/></text>
+    <text id="legal_owner_1_data_field" x="811" y="557.1" freecad:editable="legal_owner_1" freecad:autofill="organization" style="font-size:3.5px;text-align:center;text-anchor:middle"> <tspan/></text>
     <text id="legal_owner_2_data_field" x="811" y="561.1" freecad:editable="legal_owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"> <tspan/></text>
     <text id="legal_owner_3_data_field" x="811" y="565.1" freecad:editable="legal_owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"> <tspan/></text>
     <text id="legal_owner_4_data_field" x="811" y="569.1" freecad:editable="legal_owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="identification_number_data_field" x="652" y="581.2" freecad:editable="identification_number"><tspan>DN</tspan></text>
     <text id="revision_index_data_field" x="801" y="581.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
-    <text id="date_of_issue_data_field" x="752" y="581.2" freecad:editable="date_of_issue"><tspan>YYYY-MM-DD</tspan></text>
-    <text id="sheet_number_data_field" x="821" y="581.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
+    <text id="date_of_issue_data_field" x="752" y="581.2" freecad:editable="date_of_issue" freecad:autofill="date"><tspan>YYYY-MM-DD</tspan></text>
+    <text id="sheet_number_data_field" x="821" y="581.2" freecad:editable="sheet_number" freecad:autofill="sheet" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
     <text id="language_code_data_field" x="741" y="581.2" freecad:editable="language_code" style="text-align:center;text-anchor:middle"><tspan>EN</tspan></text>
-    <text id="title_data_field" x="652" y="557.2" freecad:editable="title"><tspan>ISO 5457 template</tspan></text>
+    <text id="title_data_field" x="652" y="557.2" freecad:editable="title" freecad:autofill="title"><tspan>ISO 5457 template</tspan></text>
     <text id="approval_person_data_field" x="732" y="569.2" freecad:editable="approval_person"><tspan>B. Hecate</tspan></text>
-    <text id="creator_data_field" x="732" y="557.2" freecad:editable="creator"><tspan>A. Nemesis</tspan></text>
+    <text id="creator_data_field" x="732" y="557.2" freecad:editable="creator" freecad:autofill="author"><tspan>A. Nemesis</tspan></text>
     <text id="document_type_data_field" x="652" y="569.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
-    <text id="sheet_scale_data_field" x="781" y="545.2" style="text-align:center;text-anchor:middle" freecad:editable="sheet_scale"><tspan>1 : 1</tspan></text>
+    <text id="sheet_scale_data_field" x="781" y="545.2" freecad:editable="sheet_scale" freecad:autofill="scale" style="text-align:center;text-anchor:middle"><tspan>1 : 1</tspan></text>
     <text id="general_tolerances_data_field" x="732" y="545.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
     <text id="part_material_data_field" x="652" y="545.2" freecad:editable="part_material"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
   </g>
diff --git a/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_advanced.svg
index 1b3d058656..28eff1d5d7 100644
--- a/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_advanced.svg
+++ b/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_advanced.svg
@@ -157,24 +157,24 @@
     <text id="part_material_label" x="404.5" y="353.6">Part Material:</text>
   </g>
   <g id="title_block_data_fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
-    <text id="legal_owner_1_data_field" x="564" y="371.1" freecad:editable="legal_owner_1" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
+    <text id="legal_owner_1_data_field" x="564" y="371.1" freecad:editable="legal_owner_1" freecad:autofill="organization" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_2_data_field" x="564" y="375.1" freecad:editable="legal_owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_3_data_field" x="564" y="379.1" freecad:editable="legal_owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_4_data_field" x="564" y="383.1" freecad:editable="legal_owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="identification_number_data_field" x="485" y="395.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
     <text id="revision_index_data_field" x="554" y="407.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
-    <text id="date_of_issue_data_field" x="505" y="407.2" freecad:editable="date_of_issue"><tspan>YYYY-MM-DD</tspan></text>
-    <text id="sheet_number_data_field" x="574" y="407.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
+    <text id="date_of_issue_data_field" x="505" y="407.2" freecad:editable="date_of_issue" freecad:autofill="date"><tspan>YYYY-MM-DD</tspan></text>
+    <text id="sheet_number_data_field" x="574" y="407.2" freecad:editable="sheet_number" freecad:autofill="sheet" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
     <text id="language_data_field" x="494" y="407.2" freecad:editable="language_code" style="text-align:center;text-anchor:middle"><tspan>EN</tspan></text>
-    <text id="title_data_field" x="405" y="371.2" freecad:editable="title"><tspan>ISO 7200 titleblock</tspan></text>
+    <text id="title_data_field" x="405" y="371.2" freecad:editable="title" freecad:autofill="title"><tspan>ISO 7200 titleblock</tspan></text>
     <text id="supplementary_title_1_data_field" x="405" y="377.2" freecad:editable="supplementary_title_1"><tspan>ST1</tspan></text>
     <text id="supplementary_title_2_data_field" x="405" y="383.2" freecad:editable="supplementary_title_2"><tspan>ST2</tspan></text>
     <text id="responsible_department_data_field" x="545" y="395.2" freecad:editable="responsible_department"><tspan>RD</tspan></text>
     <text id="approval_person_data_field" x="485" y="383.2" freecad:editable="approval_person"><tspan>B. Hecate</tspan></text>
-    <text id="creator_data_field" x="485" y="371.2" freecad:editable="creator"><tspan>A. Nemesis</tspan></text>
+    <text id="creator_data_field" x="485" y="371.2" freecad:editable="creator" freecad:autofill="author"><tspan>A. Nemesis</tspan></text>
     <text id="document_type_data_field" x="405" y="395.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
     <text id="document_status_data_field" x="405" y="407.2" freecad:editable="document_status"><tspan>In preparation</tspan></text>
-    <text id="sheet_scale_data_field" x="534" y="359.2" style="text-align:center;text-anchor:middle" freecad:editable="sheet_scale"><tspan>1 : 1</tspan></text>
+    <text id="sheet_scale_data_field" x="534" y="359.2" freecad:editable="sheet_scale" freecad:autofill="scale" style="text-align:center;text-anchor:middle"><tspan>1 : 1</tspan></text>
     <text id="general_tolerances_data_field" x="485" y="359.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
     <text id="part_material_data_field" x="405" y="359.2" freecad:editable="part_material"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
   </g>
diff --git a/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_minimal.svg
index 3cd9b754d9..26b29d5622 100644
--- a/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_minimal.svg
+++ b/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_minimal.svg
@@ -153,20 +153,20 @@
     <text id="part_material_label" x="404.5" y="365.6">Part Material:</text>
   </g>
   <g id="title_block_data_fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
-    <text id="legal_owner_1_data_field" x="564" y="383.1" freecad:editable="legal_owner_1" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
+    <text id="legal_owner_1_data_field" x="564" y="383.1" freecad:editable="legal_owner_1" freecad:autofill="organization" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_2_data_field" x="564" y="387.1" freecad:editable="legal_owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_3_data_field" x="564" y="391.1" freecad:editable="legal_owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_4_data_field" x="564" y="395.1" freecad:editable="legal_owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="identification_number_data_field" x="405" y="407.2" freecad:editable="identification_number"><tspan>DN</tspan></text>
     <text id="revision_index_data_field" x="554" y="407.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
-    <text id="date_of_issue_data_field" x="505" y="407.2" freecad:editable="date_of_issue"><tspan>YYYY-MM-DD</tspan></text>
-    <text id="sheet_number_data_field" x="574" y="407.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
+    <text id="date_of_issue_data_field" x="505" y="407.2" freecad:editable="date_of_issue" freecad:autofill="date"><tspan>YYYY-MM-DD</tspan></text>
+    <text id="sheet_number_data_field" x="574" y="407.2" freecad:editable="sheet_number" freecad:autofill="sheet" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
     <text id="language_code_data_field" x="494" y="407.2" freecad:editable="language_code" style="text-align:center;text-anchor:middle"><tspan>EN</tspan></text>
-    <text id="title_data_field" x="405" y="383.2" freecad:editable="title"><tspan>ISO 5457 template</tspan></text>
+    <text id="title_data_field" x="405" y="383.2" freecad:editable="title" freecad:autofill="title"><tspan>ISO 5457 template</tspan></text>
     <text id="approval_person_data_field" x="485" y="395.2" freecad:editable="approval_person"><tspan>B. Hecate</tspan></text>
-    <text id="creator_data_field" x="485" y="383.2" freecad:editable="creator"><tspan>A. Nemesis</tspan></text>
+    <text id="creator_data_field" x="485" y="383.2" freecad:editable="creator" freecad:autofill="author"><tspan>A. Nemesis</tspan></text>
     <text id="document_type_data_field" x="405" y="395.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
-    <text id="sheet_scale_data_field" x="534" y="371.2" style="text-align:center;text-anchor:middle" freecad:editable="sheet_scale"><tspan>1 : 1</tspan></text>
+    <text id="sheet_scale_data_field" x="534" y="371.2" freecad:editable="sheet_scale" freecad:autofill="scale" style="text-align:center;text-anchor:middle"><tspan>1 : 1</tspan></text>
     <text id="general_tolerances_data_field" x="485" y="371.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
     <text id="part_material_data_field" x="405" y="371.2" freecad:editable="part_material"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
   </g>
diff --git a/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_advanced.svg
index d873c69558..93cdc2cde3 100644
--- a/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_advanced.svg
+++ b/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_advanced.svg
@@ -133,24 +133,24 @@
     <text id="part_material_label" x="230.5" y="230.6">Part Material:</text>
   </g>
   <g id="title_block_data_fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
-    <text id="legal_owner_1_data_field" x="390" y="248.1" freecad:editable="legal_owner_1" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
+    <text id="legal_owner_1_data_field" x="390" y="248.1" freecad:editable="legal_owner_1" freecad:autofill="organization" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_2_data_field" x="390" y="252.1" freecad:editable="legal_owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_3_data_field" x="390" y="256.1" freecad:editable="legal_owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_4_data_field" x="390" y="260.1" freecad:editable="legal_owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="identification_number_data_field" x="311" y="272.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
     <text id="revision_index_data_field" x="380" y="284.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
-    <text id="date_of_issue_data_field" x="331" y="284.2" freecad:editable="date_of_issue"><tspan>YYYY-MM-DD</tspan></text>
-    <text id="sheet_number_data_field" x="400" y="284.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
+    <text id="date_of_issue_data_field" x="331" y="284.2" freecad:editable="date_of_issue" freecad:autofill="date"><tspan>YYYY-MM-DD</tspan></text>
+    <text id="sheet_number_data_field" x="400" y="284.2" freecad:editable="sheet_number" freecad:autofill="sheet" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
     <text id="language_data_field" x="320" y="284.2" freecad:editable="language_code" style="text-align:center;text-anchor:middle"><tspan>EN</tspan></text>
-    <text id="title_data_field" x="231" y="248.2" freecad:editable="title"><tspan>ISO 7200 titleblock</tspan></text>
+    <text id="title_data_field" x="231" y="248.2" freecad:editable="title" freecad:autofill="title"><tspan>ISO 7200 titleblock</tspan></text>
     <text id="supplementary_title_1_data_field" x="231" y="254.2" freecad:editable="supplementary_title_1"><tspan>ST1</tspan></text>
     <text id="supplementary_title_2_data_field" x="231" y="260.2" freecad:editable="supplementary_title_2"><tspan>ST2</tspan></text>
     <text id="responsible_department_data_field" x="371" y="272.2" freecad:editable="responsible_department"><tspan>RD</tspan></text>
     <text id="approval_person_data_field" x="311" y="260.2" freecad:editable="approval_person"><tspan>B. Hecate</tspan></text>
-    <text id="creator_data_field" x="311" y="248.2" freecad:editable="creator"><tspan>A. Nemesis</tspan></text>
+    <text id="creator_data_field" x="311" y="248.2" freecad:editable="creator" freecad:autofill="author"><tspan>A. Nemesis</tspan></text>
     <text id="document_type_data_field" x="231" y="272.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
     <text id="document_status_data_field" x="231" y="284.2" freecad:editable="document_status"><tspan>In preparation</tspan></text>
-    <text id="sheet_scale_data_field" x="360" y="236.2" style="text-align:center;text-anchor:middle" freecad:editable="sheet_scale"><tspan>1 : 1</tspan></text>
+    <text id="sheet_scale_data_field" x="360" y="236.2" freecad:editable="sheet_scale" freecad:autofill="scale" style="text-align:center;text-anchor:middle"><tspan>1 : 1</tspan></text>
     <text id="general_tolerances_data_field" x="311" y="236.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
     <text id="part_material_data_field" x="231" y="236.2" freecad:editable="part_material"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
   </g>
diff --git a/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_minimal.svg
index c4f7f589e7..90fa8db7b8 100644
--- a/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_minimal.svg
+++ b/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_minimal.svg
@@ -129,20 +129,20 @@
     <text id="part_material_label" x="230.5" y="242.6">Part Material:</text>
   </g>
   <g id="title_block_data_fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
-    <text id="legal_owner_1_data_field" x="390" y="260.1" freecad:editable="legal_owner_1" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
+    <text id="legal_owner_1_data_field" x="390" y="260.1" freecad:editable="legal_owner_1" freecad:autofill="organization" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_2_data_field" x="390" y="264.1" freecad:editable="legal_owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_3_data_field" x="390" y="268.1" freecad:editable="legal_owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_4_data_field" x="390" y="272.1" freecad:editable="legal_owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="identification_number_data_field" x="231" y="284.2" freecad:editable="identification_number"><tspan>DN</tspan></text>
     <text id="revision_index_data_field" x="380" y="284.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
-    <text id="date_of_issue_data_field" x="331" y="284.2" freecad:editable="date_of_issue"><tspan>YYYY-MM-DD</tspan></text>
-    <text id="sheet_number_data_field" x="400" y="284.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
+    <text id="date_of_issue_data_field" x="331" y="284.2" freecad:editable="date_of_issue" freecad:autofill="date"><tspan>YYYY-MM-DD</tspan></text>
+    <text id="sheet_number_data_field" x="400" y="284.2" freecad:editable="sheet_number" freecad:autofill="sheet" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
     <text id="language_code_data_field" x="320" y="284.2" freecad:editable="language_code" style="text-align:center;text-anchor:middle"><tspan>EN</tspan></text>
-    <text id="title_data_field" x="231" y="260.2" freecad:editable="title"><tspan>ISO 5457 template</tspan></text>
+    <text id="title_data_field" x="231" y="260.2" freecad:editable="title" freecad:autofill="title"><tspan>ISO 5457 template</tspan></text>
     <text id="approval_person_data_field" x="311" y="272.2" freecad:editable="approval_person"><tspan>B. Hecate</tspan></text>
-    <text id="creator_data_field" x="311" y="260.2" freecad:editable="creator"><tspan>A. Nemesis</tspan></text>
+    <text id="creator_data_field" x="311" y="260.2" freecad:editable="creator" freecad:autofill="author"><tspan>A. Nemesis</tspan></text>
     <text id="document_type_data_field" x="231" y="272.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
-    <text id="sheet_scale_data_field" x="360" y="248.2" style="text-align:center;text-anchor:middle" freecad:editable="sheet_scale"><tspan>1 : 1</tspan></text>
+    <text id="sheet_scale_data_field" x="360" y="248.2" freecad:editable="sheet_scale" freecad:autofill="scale" style="text-align:center;text-anchor:middle"><tspan>1 : 1</tspan></text>
     <text id="general_tolerances_data_field" x="311" y="248.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
     <text id="part_material_data_field" x="231" y="248.2" freecad:editable="part_material"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
   </g>
diff --git a/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_advanced.svg
index 4b5f7ee2e8..6608f22522 100644
--- a/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_advanced.svg
+++ b/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_advanced.svg
@@ -108,24 +108,24 @@
     <text id="part_material_label" x="107.5" y="143.6">Part Material:</text>
   </g>
   <g id="title_block_data_fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
-    <text id="legal_owner_1_data_field" x="267" y="161.1" freecad:editable="legal_owner_1" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
+    <text id="legal_owner_1_data_field" x="267" y="161.1" freecad:editable="legal_owner_1" freecad:autofill="organization" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_2_data_field" x="267" y="165.1" freecad:editable="legal_owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_3_data_field" x="267" y="169.1" freecad:editable="legal_owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_4_data_field" x="267" y="173.1" freecad:editable="legal_owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="identification_number_data_field" x="188" y="185.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
     <text id="revision_index_data_field" x="257" y="197.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
-    <text id="date_of_issue_data_field" x="208" y="197.2" freecad:editable="date_of_issue"><tspan>YYYY-MM-DD</tspan></text>
-    <text id="sheet_number_data_field" x="277" y="197.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
+    <text id="date_of_issue_data_field" x="208" y="197.2" freecad:editable="date_of_issue" freecad:autofill="date"><tspan>YYYY-MM-DD</tspan></text>
+    <text id="sheet_number_data_field" x="277" y="197.2" freecad:editable="sheet_number" freecad:autofill="sheet" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
     <text id="language_data_field" x="197" y="197.2" freecad:editable="language_code" style="text-align:center;text-anchor:middle"><tspan>EN</tspan></text>
-    <text id="title_data_field" x="108" y="161.2" freecad:editable="title"><tspan>ISO 7200 titleblock</tspan></text>
+    <text id="title_data_field" x="108" y="161.2" freecad:editable="title" freecad:autofill="title"><tspan>ISO 7200 titleblock</tspan></text>
     <text id="supplementary_title_1_data_field" x="108" y="167.2" freecad:editable="supplementary_title_1"><tspan>ST1</tspan></text>
     <text id="supplementary_title_2_data_field" x="108" y="173.2" freecad:editable="supplementary_title_2"><tspan>ST2</tspan></text>
     <text id="responsible_department_data_field" x="248" y="185.2" freecad:editable="responsible_department"><tspan>RD</tspan></text>
     <text id="approval_person_data_field" x="188" y="173.2" freecad:editable="approval_person"><tspan>B. Hecate</tspan></text>
-    <text id="creator_data_field" x="188" y="161.2" freecad:editable="creator"><tspan>A. Nemesis</tspan></text>
+    <text id="creator_data_field" x="188" y="161.2" freecad:editable="creator" freecad:autofill="author"><tspan>A. Nemesis</tspan></text>
     <text id="document_type_data_field" x="108" y="185.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
     <text id="document_status_data_field" x="108" y="197.2" freecad:editable="document_status"><tspan>In preparation</tspan></text>
-    <text id="sheet_scale_data_field" x="237" y="149.2" style="text-align:center;text-anchor:middle" freecad:editable="sheet_scale"><tspan>1 : 1</tspan></text>
+    <text id="sheet_scale_data_field" x="237" y="149.2" freecad:editable="sheet_scale" freecad:autofill="scale" style="text-align:center;text-anchor:middle"><tspan>1 : 1</tspan></text>
     <text id="general_tolerances_data_field" x="188" y="149.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
     <text id="part_material_data_field" x="108" y="149.2" freecad:editable="part_material"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
   </g>
diff --git a/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_minimal.svg
index 9b9d7166a1..2c3a30cdec 100644
--- a/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_minimal.svg
+++ b/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_minimal.svg
@@ -104,20 +104,20 @@
     <text id="part_material_label" x="107.5" y="155.6">Part Material:</text>
   </g>
   <g id="title_block_data_fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
-    <text id="legal_owner_1_data_field" x="267" y="173.1" freecad:editable="legal_owner_1" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
+    <text id="legal_owner_1_data_field" x="267" y="173.1" freecad:editable="legal_owner_1" freecad:autofill="organization" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_2_data_field" x="267" y="177.1" freecad:editable="legal_owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_3_data_field" x="267" y="181.1" freecad:editable="legal_owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_4_data_field" x="267" y="185.1" freecad:editable="legal_owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="identification_number_data_field" x="108" y="197.2" freecad:editable="identification_number"><tspan>DN</tspan></text>
     <text id="revision_index_data_field" x="257" y="197.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
-    <text id="date_of_issue_data_field" x="208" y="197.2" freecad:editable="date_of_issue"><tspan>YYYY-MM-DD</tspan></text>
-    <text id="sheet_number_data_field" x="277" y="197.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
+    <text id="date_of_issue_data_field" x="208" y="197.2" freecad:editable="date_of_issue" freecad:autofill="date"><tspan>YYYY-MM-DD</tspan></text>
+    <text id="sheet_number_data_field" x="277" y="197.2" freecad:editable="sheet_number" freecad:autofill="sheet" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
     <text id="language_code_data_field" x="197" y="197.2" freecad:editable="language_code" style="text-align:center;text-anchor:middle"><tspan>EN</tspan></text>
-    <text id="title_data_field" x="108" y="173.2" freecad:editable="title"><tspan>ISO 5457 template</tspan></text>
+    <text id="title_data_field" x="108" y="173.2" freecad:editable="title" freecad:autofill="title"><tspan>ISO 5457 template</tspan></text>
     <text id="approval_person_data_field" x="188" y="185.2" freecad:editable="approval_person"><tspan>B. Hecate</tspan></text>
-    <text id="creator_data_field" x="188" y="173.2" freecad:editable="creator"><tspan>A. Nemesis</tspan></text>
+    <text id="creator_data_field" x="188" y="173.2" freecad:editable="creator" freecad:autofill="author"><tspan>A. Nemesis</tspan></text>
     <text id="document_type_data_field" x="108" y="185.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
-    <text id="sheet_scale_data_field" x="237" y="161.2" style="text-align:center;text-anchor:middle" freecad:editable="sheet_scale"><tspan>1 : 1</tspan></text>
+    <text id="sheet_scale_data_field" x="237" y="161.2" freecad:editable="sheet_scale" freecad:autofill="scale" style="text-align:center;text-anchor:middle"><tspan>1 : 1</tspan></text>
     <text id="general_tolerances_data_field" x="188" y="161.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
     <text id="part_material_data_field" x="108" y="161.2" freecad:editable="part_material"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
   </g>
diff --git a/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_advanced.svg
index 5b67fb0e9c..765c840596 100644
--- a/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_advanced.svg
+++ b/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_advanced.svg
@@ -108,24 +108,24 @@
     <text id="part_material_label" x="20.5" y="230.6">Part Material:</text>
   </g>
   <g id="title_block_data_fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
-    <text id="legal_owner_1_data_field" x="180" y="248.1" freecad:editable="legal_owner_1" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
+    <text id="legal_owner_1_data_field" x="180" y="248.1" freecad:editable="legal_owner_1" freecad:autofill="organization" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_2_data_field" x="180" y="252.1" freecad:editable="legal_owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_3_data_field" x="180" y="256.1" freecad:editable="legal_owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_4_data_field" x="180" y="260.1" freecad:editable="legal_owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="identification_number_data_field" x="101" y="272.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
     <text id="revision_index_data_field" x="170" y="284.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
-    <text id="date_of_issue_data_field" x="121" y="284.2" freecad:editable="date_of_issue"><tspan>YYYY-MM-DD</tspan></text>
-    <text id="sheet_number_data_field" x="190" y="284.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
+    <text id="date_of_issue_data_field" x="121" y="284.2" freecad:editable="date_of_issue" freecad:autofill="date"><tspan>YYYY-MM-DD</tspan></text>
+    <text id="sheet_number_data_field" x="190" y="284.2" freecad:editable="sheet_number" freecad:autofill="sheet" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
     <text id="language_data_field" x="110" y="284.2" freecad:editable="language_code" style="text-align:center;text-anchor:middle"><tspan>EN</tspan></text>
-    <text id="title_data_field" x="21" y="248.2" freecad:editable="title"><tspan>ISO 7200 titleblock</tspan></text>
+    <text id="title_data_field" x="21" y="248.2" freecad:editable="title" freecad:autofill="title"><tspan>ISO 7200 titleblock</tspan></text>
     <text id="supplementary_title_1_data_field" x="21" y="254.2" freecad:editable="supplementary_title_1"><tspan>ST1</tspan></text>
     <text id="supplementary_title_2_data_field" x="21" y="260.2" freecad:editable="supplementary_title_2"><tspan>ST2</tspan></text>
     <text id="responsible_department_data_field" x="161" y="272.2" freecad:editable="responsible_department"><tspan>RD</tspan></text>
     <text id="approval_person_data_field" x="101" y="260.2" freecad:editable="approval_person"><tspan>B. Hecate</tspan></text>
-    <text id="creator_data_field" x="101" y="248.2" freecad:editable="creator"><tspan>A. Nemesis</tspan></text>
+    <text id="creator_data_field" x="101" y="248.2" freecad:editable="creator" freecad:autofill="author"><tspan>A. Nemesis</tspan></text>
     <text id="document_type_data_field" x="21" y="272.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
     <text id="document_status_data_field" x="21" y="284.2" freecad:editable="document_status"><tspan>In preparation</tspan></text>
-    <text id="sheet_scale_data_field" x="150" y="236.2" style="text-align:center;text-anchor:middle" freecad:editable="sheet_scale"><tspan>1 : 1</tspan></text>
+    <text id="sheet_scale_data_field" x="150" y="236.2" freecad:editable="sheet_scale" freecad:autofill="scale" style="text-align:center;text-anchor:middle"><tspan>1 : 1</tspan></text>
     <text id="general_tolerances_data_field" x="101" y="236.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
     <text id="part_material_data_field" x="21" y="236.2" freecad:editable="part_material"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
   </g>
diff --git a/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_minimal.svg
index e4a442a47a..35f06941b4 100644
--- a/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_minimal.svg
+++ b/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_minimal.svg
@@ -104,20 +104,20 @@
     <text id="part_material_label" x="20.5" y="242.6">Part Material:</text>
   </g>
   <g id="title_block_data_fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
-    <text id="legal_owner_1_data_field" x="180" y="260.1" freecad:editable="legal_owner_1" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
+    <text id="legal_owner_1_data_field" x="180" y="260.1" freecad:editable="legal_owner_1" freecad:autofill="organization" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_2_data_field" x="180" y="264.1" freecad:editable="legal_owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_3_data_field" x="180" y="268.1" freecad:editable="legal_owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_4_data_field" x="180" y="272.1" freecad:editable="legal_owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="identification_number_data_field" x="21" y="284.2" freecad:editable="identification_number"><tspan>DN</tspan></text>
     <text id="revision_index_data_field" x="170" y="284.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
-    <text id="date_of_issue_data_field" x="121" y="284.2" freecad:editable="date_of_issue"><tspan>YYYY-MM-DD</tspan></text>
-    <text id="sheet_number_data_field" x="190" y="284.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
+    <text id="date_of_issue_data_field" x="121" y="284.2" freecad:editable="date_of_issue" freecad:autofill="date"><tspan>YYYY-MM-DD</tspan></text>
+    <text id="sheet_number_data_field" x="190" y="284.2" freecad:editable="sheet_number" freecad:autofill="sheet" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
     <text id="language_code_data_field" x="110" y="284.2" freecad:editable="language_code" style="text-align:center;text-anchor:middle"><tspan>EN</tspan></text>
-    <text id="title_data_field" x="21" y="260.2" freecad:editable="title"><tspan>ISO 5457 template</tspan></text>
+    <text id="title_data_field" x="21" y="260.2" freecad:editable="title" freecad:autofill="title"><tspan>ISO 5457 template</tspan></text>
     <text id="approval_person_data_field" x="101" y="272.2" freecad:editable="approval_person"><tspan>B. Hecate</tspan></text>
-    <text id="creator_data_field" x="101" y="260.2" freecad:editable="creator"><tspan>A. Nemesis</tspan></text>
+    <text id="creator_data_field" x="101" y="260.2" freecad:editable="creator" freecad:autofill="author"><tspan>A. Nemesis</tspan></text>
     <text id="document_type_data_field" x="21" y="272.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
-    <text id="sheet_scale_data_field" x="150" y="248.2" style="text-align:center;text-anchor:middle" freecad:editable="sheet_scale"><tspan>1 : 1</tspan></text>
+    <text id="sheet_scale_data_field" x="150" y="248.2" freecad:editable="sheet_scale" freecad:autofill="scale" style="text-align:center;text-anchor:middle"><tspan>1 : 1</tspan></text>
     <text id="general_tolerances_data_field" x="101" y="248.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
     <text id="part_material_data_field" x="21" y="248.2" freecad:editable="part_material"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
   </g>
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 d8f064c5f6..96b32d00b7 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	
@@ -60,27 +60,27 @@
     <text id="part_material_label" x="0.5" y="-8.4">Part Material:</text>
   </g>
   <g id="title_block_data_fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
-    <text id="legal_owner_1_data_field" x="160" y="9.1" freecad:editable="legal_owner_1" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
+    <text id="legal_owner_1_data_field" x="160" y="9.1" freecad:editable="legal_owner_1" freecad:autofill="organization" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="legal_owner_2_data_field" x="160" y="13.1" freecad:editable="legal_owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="legal_owner_3_data_field" x="160" y="17.1" freecad:editable="legal_owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="legal_owner_4_data_field" x="160" y="21.1" freecad:editable="legal_owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="identification_number_data_field" x="1" y="33.2" freecad:editable="identification_number"><tspan>DN</tspan></text>
     <text id="revision_index_data_field" x="150" y="33.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
-    <text id="date_of_issue_data_field" x="101" y="33.2" freecad:editable="date_of_issue"><tspan>YYYY-MM-DD</tspan></text>
-    <text id="sheet_number_data_field" x="170" y="33.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
+    <text id="date_of_issue_data_field" x="101" y="33.2" freecad:editable="date_of_issue" freecad:autofill="date"><tspan>YYYY-MM-DD</tspan></text>
+    <text id="sheet_number_data_field" x="170" y="33.2" freecad:editable="sheet_number" freecad:autofill="sheet" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
     <text id="language_code_data_field" x="90" y="33.2" freecad:editable="language_code" style="text-align:center;text-anchor:middle"><tspan>EN</tspan></text>
-    <text id="title_data_field" x="1" y="9.2" freecad:editable="title"><tspan>ISO 5457 template</tspan></text>
+    <text id="title_data_field" x="1" y="9.2" freecad:editable="title" freecad:autofill="title"><tspan>ISO 5457 template</tspan></text>
     <text id="approval_person_data_field" x="81" y="21.2" freecad:editable="approval_person"><tspan>B. Hecate</tspan></text>
-    <text id="creator_data_field" x="81" y="9.2" freecad:editable="creator"><tspan>A. Nemesis</tspan></text>
+    <text id="creator_data_field" x="81" y="9.2" freecad:editable="creator" freecad:autofill="author"><tspan>A. Nemesis</tspan></text>
     <text id="document_type_data_field" x="1" y="21.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
-    <text id="sheet_scale_data_field" x="130" y="-2.8" style="text-align:center;text-anchor:middle" freecad:editable="sheet_scale"><tspan>1 : 1</tspan></text>
+    <text id="sheet_scale_data_field" x="130" y="-2.8" freecad:editable="sheet_scale" freecad:autofill="scale" style="text-align:center;text-anchor:middle"><tspan>1 : 1</tspan></text>
     <text id="general_tolerances_data_field" x="81" y="-2.8" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
     <text id="part_material_data_field" x="1" y="-2.8" freecad:editable="part_material"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
   </g>
   <g id="extras_outlines" style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round">
     <path id="first_angle_trapezoid" d="m 159,-17 -10,2.5 v 5 l 10,2.5 z" />
-    <circle id="first_angle_inner circle" cx="166" r="2.5" cy="-12" />
-    <circle id="first_angle_outer circle" cx="166" r="5" cy="-12" />
+    <circle id="first_angle_inner circle" cx="166" cy="-12" r="2.5" />
+    <circle id="first_angle_outer circle" cx="166" cy="-12" r="5" />
   </g>
   <g id="extras_centre_lines" style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:6, 0.75, 0.125, 0.75" >
     <path id="first_angle_horizontal" d="m 148,-12 h 24" style="stroke-dashoffset:0.25" />
diff --git a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_2.svg b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_2.svg
index dfeccadea3..e29585157a 100644
--- a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_2.svg	
+++ b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_2.svg	
@@ -57,18 +57,18 @@
     <text id="document_type_label" x="0.5" y="15.6">Document type:</text>
   </g>
   <g id="title_block_data_fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
-    <text id="owner_1_data_field" x="160" y="9.1" freecad:editable="legal_owner_1" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
+    <text id="owner_1_data_field" x="160" y="9.1" freecad:editable="legal_owner_1" freecad:autofill="organization" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_2_data_field" x="160" y="13.1" freecad:editable="legal_owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_3_data_field" x="160" y="17.1" freecad:editable="legal_owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_4_data_field" x="160" y="21.1" freecad:editable="legal_owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="identification_number_data_field" y="33.2" x="1" freecad:editable="identification_number"><tspan>DN</tspan></text>
     <text id="revision_index_data_field" x="110" y="33.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
-    <text id="date_of_issue_data_field" x="61" y="33.2" freecad:editable="date_of_issue"><tspan>YYYY-MM-DD</tspan></text>
-    <text id="sheet_number_data_field" x="130" y="33.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
-    <text id="title_data_field" x="1" y="9.2" freecad:editable="title"><tspan>ISO 5457 template</tspan></text>
+    <text id="date_of_issue_data_field" x="61" y="33.2" freecad:editable="date_of_issue" freecad:autofill="date"><tspan>YYYY-MM-DD</tspan></text>
+    <text id="sheet_number_data_field" x="130" y="33.2" freecad:editable="sheet_number" freecad:autofill="sheet" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
+    <text id="title_data_field" x="1" y="9.2" freecad:editable="title" freecad:autofill="title"><tspan>ISO 5457 template</tspan></text>
     <text id="responsible_department_data_field" x="141" y="33.2" freecad:editable="responsible_department"><tspan>RD</tspan></text>
     <text id="approval_person_data_field" x="81" y="21.2" freecad:editable="approval_person"><tspan>B. Hecate</tspan></text>
-    <text id="creator_data_field" x="81" y="9.2" freecad:editable="creator"><tspan>A. Nemesis</tspan></text>
+    <text id="creator_data_field" x="81" y="9.2" freecad:editable="creator" freecad:autofill="author"><tspan>A. Nemesis</tspan></text>
     <text id="document_type_data_field" x="1" y="21.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_3_advanced.svg b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_3_advanced.svg
index 919570b088..9304f6df37 100644
--- a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_3_advanced.svg	
+++ b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_3_advanced.svg	
@@ -64,24 +64,24 @@
     <text id="part_material_label" x="0.5" y="-8.4">Part Material:</text>
   </g>
   <g id="title_block_data_fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
-    <text id="legal_owner_1_data_field" x="160" y="9.1" freecad:editable="legal_owner_1" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
+    <text id="legal_owner_1_data_field" x="160" y="9.1" freecad:editable="legal_owner_1" freecad:autofill="organization" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="legal_owner_2_data_field" x="160" y="13.1" freecad:editable="legal_owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="legal_owner_3_data_field" x="160" y="17.1" freecad:editable="legal_owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="legal_owner_4_data_field" x="160" y="21.1" freecad:editable="legal_owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="identification_number_data_field" x="81" y="33.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
     <text id="revision_index_data_field" x="150" y="45.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
-    <text id="date_of_issue_data_field" x="101" y="45.2" freecad:editable="date_of_issue"><tspan>YYYY-MM-DD</tspan></text>
-    <text id="sheet_number_data_field" x="170" y="45.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
+    <text id="date_of_issue_data_field" x="101" y="45.2" freecad:editable="date_of_issue" freecad:autofill="date"><tspan>YYYY-MM-DD</tspan></text>
+    <text id="sheet_number_data_field" x="170" y="45.2" freecad:editable="sheet_number" freecad:autofill="sheet" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
     <text id="language_data_field" x="90" y="45.2" freecad:editable="language_code" style="text-align:center;text-anchor:middle"><tspan>EN</tspan></text>
-    <text id="title_data_field" x="1" y="9.2" freecad:editable="title"><tspan>ISO 7200 titleblock</tspan></text>
+    <text id="title_data_field" x="1" y="9.2" freecad:editable="title" freecad:autofill="title"><tspan>ISO 7200 titleblock</tspan></text>
     <text id="supplementary_title_1_data_field" x="1" y="15.2" freecad:editable="supplementary_title_1"><tspan>ST1</tspan></text>
     <text id="supplementary_title_2_data_field" x="1" y="21.2" freecad:editable="supplementary_title_2"><tspan>ST2</tspan></text>
     <text id="responsible_department_data_field" x="141" y="33.2" freecad:editable="responsible_department"><tspan>RD</tspan></text>
     <text id="approval_person_data_field" x="81" y="21.2" freecad:editable="approval_person"><tspan>B. Hecate</tspan></text>
-    <text id="creator_data_field" x="81" y="9.2" freecad:editable="creator"><tspan>A. Nemesis</tspan></text>
+    <text id="creator_data_field" x="81" y="9.2" freecad:editable="creator" freecad:autofill="author"><tspan>A. Nemesis</tspan></text>
     <text id="document_type_data_field" x="1" y="33.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
     <text id="document_status_data_field" x="1" y="45.2" freecad:editable="document_status"><tspan>In preparation</tspan></text>
-    <text id="sheet_scale_data_field" x="130" y="-2.8" style="text-align:center;text-anchor:middle" freecad:editable="sheet_scale"><tspan>1 : 1</tspan></text>
+    <text id="sheet_scale_data_field" x="130" y="-2.8" freecad:editable="sheet_scale" freecad:autofill="scale" style="text-align:center;text-anchor:middle"><tspan>1 : 1</tspan></text>
     <text id="general_tolerances_data_field" x="81" y="-2.8" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
     <text id="part_material_data_field" x="1" y="-2.8" freecad:editable="part_material"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
   </g>
diff --git a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_4.svg b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_4.svg
index ce8aad49c4..ad88cf8589 100644
--- a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_4.svg	
+++ b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_4.svg	
@@ -63,21 +63,21 @@
     <text id="paper_size_label" x="80.5" y="39.6">Paper size:</text>
   </g>
   <g id="title_block_data_fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
-    <text id="legal_owner_1_data_field" x="160" y="9.1" freecad:editable="legal_owner_1" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
+    <text id="legal_owner_1_data_field" x="160" y="9.1" freecad:editable="legal_owner_1" freecad:autofill="organization" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="legal_owner_2_data_field" x="160" y="13.1" freecad:editable="legal_owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="legal_owner_3_data_field" x="160" y="17.1" freecad:editable="legal_owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="legal_owner_4_data_field" x="160" y="21.1" freecad:editable="legal_owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="identification_number_data_field" x="81" y="33.2" freecad:editable="identification_number"><tspan>DN</tspan></text>
     <text id="revision_index_data_field" x="150" y="45.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
-    <text id="date_of_issue_data_field" x="101" y="45.2" freecad:editable="date_of_issue"><tspan>YYYY-MM-DD</tspan></text>
-    <text id="sheet_number_data_field" x="170" y="45.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
+    <text id="date_of_issue_data_field" x="101" y="45.2" freecad:editable="date_of_issue" freecad:autofill="date"><tspan>YYYY-MM-DD</tspan></text>
+    <text id="sheet_number_data_field" x="170" y="45.2" freecad:editable="sheet_number" freecad:autofill="sheet" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
     <text id="language_code_data_field" x="70" y="45.2" freecad:editable="language_code" style="text-align:center;text-anchor:middle"><tspan>EN</tspan></text>
-    <text id="title_data_field" x="1" y="9.2" freecad:editable="title"><tspan>ISO 7200 titleblock</tspan></text>
+    <text id="title_data_field" x="1" y="9.2" freecad:editable="title" freecad:autofill="title"><tspan>ISO 7200 titleblock</tspan></text>
     <text id="Supplementary title 1 data field" x="1" y="15.2" freecad:editable="supplementary_title_1"><tspan>ST1</tspan></text>
     <text id="Supplementary title 2 data field" x="1" y="21.2" freecad:editable="supplementary_title_2"><tspan>ST2</tspan></text>
     <text id="responsible_department_data_field" x="141" y="33" freecad:editable="responsible_department"><tspan>RD</tspan></text>
     <text id="approval_person_data_field" x="81" y="21.2" freecad:editable="approval_person"><tspan>B. Hecate</tspan></text>
-    <text id="creator_data_field" x="81" y="9.2" freecad:editable="creator"><tspan>A. Nemesis</tspan></text>
+    <text id="creator_data_field" x="81" y="9.2" freecad:editable="creator" freecad:autofill="author"><tspan>A. Nemesis</tspan></text>
     <text id="document_type_data_field" x="1" y="33.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
     <text id="document_status_data_field" x="1" y="45.2" freecad:editable="document_status"><tspan>In preparation</tspan></text>
     <text id="paper_size_data_field" x="90" y="45.2" style="text-align:center;text-anchor:middle">A3</text>
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
index 3225a43011..5e91086995 100644
--- a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_5_maximal.svg	
+++ b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_5_maximal.svg	
@@ -74,35 +74,35 @@
   </g>
   <g id="title_block_data_fields"
      style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
-    <text id="legal_owner_1_data_field" x="160" y="9.1" freecad:editable="legal_owner_1" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
+    <text id="legal_owner_1_data_field" x="160" y="9.1" freecad:editable="legal_owner_1" freecad:autofill="organization" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="legal_owner_2_data_field" x="160" y="13.1" freecad:editable="legal_owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="legal_owner_3_data_field" x="160" y="17.1" freecad:editable="legal_owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="legal_owner_4_data_field" x="160" y="21.1" freecad:editable="legal_owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="identification_number_data_field" x="101" y="45.2" freecad:editable="identification_number"><tspan>DN</tspan></text>
     <text id="revision_index_data_field" x="150" y="57.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
-    <text id="date_of_issue_data_field" x="101" y="57.2" freecad:editable="date_of_issue"><tspan>YYYY-MM-DD</tspan></text>
-    <text id="sheet_number_data_field" x="170" y="57.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
+    <text id="date_of_issue_data_field" x="101" y="57.2" freecad:editable="date_of_issue" freecad:autofill="date"><tspan>YYYY-MM-DD</tspan></text>
+    <text id="sheet_number_data_field" x="170" y="57.2" freecad:editable="sheet_number" freecad:autofill="sheet" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
     <text id="language_code_data_field" x="70" y="57.2" freecad:editable="language_code" style="text-align:center;text-anchor:middle"><tspan>EN</tspan></text>
-    <text id="title_data_field" x="1" y="9.2" freecad:editable="title"><tspan>ISO 7200 titleblock</tspan></text>
+    <text id="title_data_field" x="1" y="9.2" freecad:editable="title" freecad:autofill="title"><tspan>ISO 7200 titleblock</tspan></text>
     <text id="Supplementary title 1 data_field" x="1" y="15.2" freecad:editable="supplementary_title_1"><tspan>ST1</tspan></text>
     <text id="Supplementary title 2 data_field" x="1" y="21.2" freecad:editable="supplementary_title_2"><tspan>ST2</tspan></text>
     <text id="responsible_department_data_field" x="141" y="33.2" freecad:editable="responsible_department"><tspan>RD</tspan></text>
     <text id="technical_reference_data_field" x="81" y="33.2" freecad:editable="technical_reference"><tspan>C. Kali</tspan></text>
     <text id="approval_person_data_field" x="81" y="21.2" freecad:editable="approval_person"><tspan>B. Hecate</tspan></text>
-    <text id="creator_data_field" x="81" y="9.2" freecad:editable="creator"><tspan>A. Nemesis</tspan></text>
+    <text id="creator_data_field" x="81" y="9.2" freecad:editable="creator" freecad:autofill="author"><tspan>A. Nemesis</tspan></text>
     <text id="document_type_data_field" x="1" y="33.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
     <text id="key_words_data_field" x="1" y="45.2" freecad:editable="key_words"><tspan>KW</tspan></text>
     <text id="document_status_data_field" x="1" y="57.2" freecad:editable="document_status"><tspan>In preparation</tspan></text>
     <text id="page_number_data_field" x="170" y="45.2" freecad:editable="page_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
     <text id="paper_size_data_field" x="90" y="57.2" style="text-align:center;text-anchor:middle">A3</text>
-    <text id="sheet_scale_data_field" x="130" y="-2.8" style="text-align:center;text-anchor:middle" freecad:editable="sheet_scale"><tspan>1 : 1</tspan></text>
+    <text id="sheet_scale_data_field" x="130" y="-2.8" freecad:editable="sheet_scale" freecad:autofill="scale" style="text-align:center;text-anchor:middle"><tspan>1 : 1</tspan></text>
     <text id="general_tolerances_data_field" x="81" y="-2.8" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
     <text id="part_material_data_field" x="1" y="-2.8" freecad:editable="part_material"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
   </g>
   <g id="extras_outlines" style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round">
     <path id="first_angle_trapezoid" d="m 159,-17 -10,2.5 v 5 l 10,2.5 z" />
-    <circle id="first_angle_inner circle" cx="166" r="2.5" cy="-12" />
-    <circle id="first_angle_outer circle" cx="166" r="5" cy="-12" />
+    <circle id="first_angle_inner circle" cx="166" cy="-12" r="2.5" />
+    <circle id="first_angle_outer circle" cx="166" cy="-12" r="5" />
   </g>
   <g id="extras_centre_lines" style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:6, 0.75, 0.125, 0.75" >
     <path id="first_angle_horizontal" d="m 148,-12 h 24" style="stroke-dashoffset:0.25" />