diff --git a/densaku_lib b/densaku_lib
index e19a5e6..fedd3d9 160000
--- a/densaku_lib
+++ b/densaku_lib
@@ -1 +1 @@
-Subproject commit e19a5e659e24d4bf9c97e5a4f313f80a86414f5e
+Subproject commit fedd3d949174b60ead3215c6aea0f8bf3e73e053
diff --git a/hayamiki_generator.aproj b/hayamiki_generator.aproj
index 3605e5e..1a46299 100644
--- a/hayamiki_generator.aproj
+++ b/hayamiki_generator.aproj
@@ -49,6 +49,8 @@
     <Compile Include="calexium_lib\database\vtm\view_table_manager_types.anubis" />
     <Compile Include="calexium_lib\database\vtm\view_table_renderer.anubis" />
     <Compile Include="calexium_lib\database\vtm\view_table_types.anubis" />
+    <Compile Include="calexium_lib\ds_files\ds_messages.anubis" />
+    <Compile Include="calexium_lib\ds_files\ds_types.anubis" />
     <Compile Include="calexium_lib\extensions\json.anubis" />
     <Compile Include="calexium_lib\mail\authentication.anubis" />
     <Compile Include="calexium_lib\mail\lexers\enhanced_status.anubis" />
@@ -696,6 +698,7 @@
     <Folder Include="calexium_lib\database" />
     <Folder Include="calexium_lib\database\model" />
     <Folder Include="calexium_lib\database\vtm" />
+    <Folder Include="calexium_lib\ds_files" />
     <Folder Include="calexium_lib\extensions" />
     <Folder Include="calexium_lib\mail" />
     <Folder Include="calexium_lib\mail\lexers" />
diff --git a/hayamiki_lib b/hayamiki_lib
index 69ab626..b0635c5 160000
--- a/hayamiki_lib
+++ b/hayamiki_lib
@@ -1 +1 @@
-Subproject commit 69ab62634297a08d77f0be8147aaf1177ba61827
+Subproject commit b0635c56b0ff5113b85301a06aee7b71ce76bc22
diff --git a/src/generation/edit_view_table_form.anubis b/src/generation/edit_view_table_form.anubis
index e0bd223..2b37ecb 100644
--- a/src/generation/edit_view_table_form.anubis
+++ b/src/generation/edit_view_table_form.anubis
@@ -29,23 +29,23 @@ public define String
   )=
   if cell_description is
   {
-    empty             then  "empty"
+    empty             then  "hk_form_table_cell(empty)"
     column(col_name)  then  
       if get_column_type_from_name(columns, col_name) is 
       {
-        failure           then  "label(\"column ["+col_name+"] not found\")",
+        failure           then  "hk_form_table_cell(label(\"column ["+col_name+"] not found\"))",
         success(col_type) then  
           if get_HK_Form_Entry(col_type, type_name) is
           {
-            failure               then  "label(\" form for column ["+col_name+"] not found\")",
-            success(form_string)  then  form_string
+            failure               then  "hk_form_table_cell(label(\" form for column ["+col_name+"] not found\"))",
+            success(form_string)  then  "hk_form_table_cell("+form_string+")"
           }
       }
-    label(label_str)  then  "label(\""+label_str+"\")"
+    label(label_str)  then  "hk_form_table_cell(label(\""+label_str+"\"))"
     table(lines)      then  
-      "cell(["+
-        make_lines(lines, columns, type_name, indent)+
-      "])"
+      "hk_form_table_cell_table(["+
+        make_lines(lines, columns, type_name, indent+"  ")+
+      "\n"+indent+"])"
   }
 .
 
@@ -63,7 +63,7 @@ public define String
   if is_empty(cells) then
     ""
   else
-    "\n"+indent+ join(",\n"+indent, map((HK_Editor_Table_Cell cell) |-> "hk_form_table_cell("+ make_cell(cell, columns, table_name, indent) +")", cells))
+    "\n"+indent+ join(",\n"+indent, map((HK_Editor_Table_Cell cell) |->  make_cell(cell, columns, table_name, indent), cells))
 .
 
   
--
libgit2 0.21.4