diff --git a/libraries/classes/Table/ColumnsDefinition.php b/libraries/classes/Table/ColumnsDefinition.php
index 545956fc0c..b2926ca83d 100644
--- a/libraries/classes/Table/ColumnsDefinition.php
+++ b/libraries/classes/Table/ColumnsDefinition.php
@@ -126,7 +126,6 @@ final class ColumnsDefinition
             $available_mime = $transformations->getAvailableMimeTypes();
         }
 
-        // this will be used on templates/columns_definitions/transformation.twig
         $mime_types = [
             'input_transformation',
             'transformation',
diff --git a/templates/columns_definitions/column_adjust_privileges.twig b/templates/columns_definitions/column_adjust_privileges.twig
deleted file mode 100644
index d0d1e9156a..0000000000
--- a/templates/columns_definitions/column_adjust_privileges.twig
+++ /dev/null
@@ -1,16 +0,0 @@
-{% if privs_available %}
-    <input name="field_adjust_privileges[{{ column_number }}]"
-        id="field_{{ column_number }}_{{ ci - ci_offset }}"
-        checked="checked"
-        type="checkbox"
-        value="NULL"
-        class="allow_null">
-{% else %}
-    <input name="field_adjust_privileges[{{ column_number }}]"
-        id="field_{{ column_number }}_{{ ci - ci_offset }}"
-        disabled
-        type="checkbox"
-        value="NULL"
-        class="allow_null"
-        title="{% trans "You don't have sufficient privileges to perform this operation; Please refer to the documentation for more details" %}">
-{% endif %}
diff --git a/templates/columns_definitions/column_attributes.twig b/templates/columns_definitions/column_attributes.twig
index dc4717503b..c9f288df15 100644
--- a/templates/columns_definitions/column_attributes.twig
+++ b/templates/columns_definitions/column_attributes.twig
@@ -18,39 +18,41 @@
     {% set ci = ci + 1 %}
 </td>
 <td class="text-center">
-    {# column type #}
-    {% include 'columns_definitions/column_type.twig' with {
-        'column_number': column_number,
-        'ci': ci,
-        'ci_offset': ci_offset,
-        'column_meta': column_meta,
-        'type_upper': type_upper
-    } only %}
-    {% set ci = ci + 1 %}
+  <select class="column_type" name="field_type[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}"
+    {{- column_meta['column_status'] is defined and not column_meta['column_status']['isEditable'] ? ' disabled' }}>
+    {{ get_supported_datatypes(true, type_upper) }}
+  </select>
+  {% set ci = ci + 1 %}
 </td>
 <td class="text-center">
-    {# column length #}
-    {% include 'columns_definitions/column_length.twig' with {
-        'column_number': column_number,
-        'ci': ci,
-        'ci_offset': ci_offset,
-        'length_values_input_size': length_values_input_size,
-        'length_to_display': length
-    } only %}
-    {% set ci = ci + 1 %}
+  <input id="field_{{ column_number }}_{{ ci - ci_offset }}" type="text" name="field_length[{{ column_number }}]" size="
+    {{- length_values_input_size }}" value="{{ length }}" class="textfield">
+  <p class="enum_notice" id="enum_notice_{{ column_number }}_{{ ci - ci_offset }}">
+    <a href="#" class="open_enum_editor">{% trans 'Edit ENUM/SET values' %}</a>
+  </p>
+  {% set ci = ci + 1 %}
 </td>
 <td class="text-center">
-    {# column default #}
-    {% include 'columns_definitions/column_default.twig' with {
-        'column_number': column_number,
-        'ci': ci,
-        'ci_offset': ci_offset,
-        'column_meta': column_meta,
-        'type_upper': type_upper,
-        'default_value': default_value,
-        'char_editing': char_editing
-    } only %}
-    {% set ci = ci + 1 %}
+  <select name="field_default_type[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}" class="default_type">
+    <option value="NONE"{{ column_meta['DefaultType'] is defined and column_meta['DefaultType'] == 'NONE' ? ' selected' }}>
+      {% trans %}None{% context %}for default{% endtrans %}
+    </option>
+    <option value="USER_DEFINED"{{ column_meta['DefaultType'] is defined and column_meta['DefaultType'] == 'USER_DEFINED' ? ' selected' }}>
+      {% trans 'As defined:' %}
+    </option>
+    <option value="NULL"{{ column_meta['DefaultType'] is defined and column_meta['DefaultType'] == 'NULL' ? ' selected' }}>
+      NULL
+    </option>
+    <option value="CURRENT_TIMESTAMP"{{ column_meta['DefaultType'] is defined and column_meta['DefaultType'] == 'CURRENT_TIMESTAMP' ? ' selected' }}>
+      CURRENT_TIMESTAMP
+    </option>
+  </select>
+  {% if char_editing == 'textarea' %}
+    <textarea name="field_default_value[{{ column_number }}]" cols="15" class="textfield default_value">{{ default_value }}</textarea>
+  {% else %}
+    <input type="text" name="field_default_value[{{ column_number }}]" size="12" value="{{ default_value }}" class="textfield default_value">
+  {% endif %}
+  {% set ci = ci + 1 %}
 </td>
 <td class="text-center">
   {# column collation #}
@@ -83,76 +85,77 @@
     {% set ci = ci + 1 %}
 </td>
 <td class="text-center">
-    {# column NULL #}
-    {% include 'columns_definitions/column_null.twig' with {
-        'column_number': column_number,
-        'ci': ci,
-        'ci_offset': ci_offset,
-        'column_meta': column_meta
-    } only %}
+    <input name="field_null[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}" type="checkbox" value="YES" class="allow_null"
+      {{- column_meta['Null'] is not empty and column_meta['Null'] != 'NO' and column_meta['Null'] != 'NOT NULL' ? ' checked' }}>
     {% set ci = ci + 1 %}
 </td>
 {% if change_column is defined and change_column is not empty %}
     {# column Adjust privileges, Only for 'Edit' Column(s) #}
     <td class="text-center">
-        {% include 'columns_definitions/column_adjust_privileges.twig' with {
-            'column_number': column_number,
-            'ci': ci,
-            'ci_offset': ci_offset,
-            'privs_available': privs_available
-        } only %}
-        {% set ci = ci + 1 %}
+      <input name="field_adjust_privileges[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}" type="checkbox" value="NULL" class="allow_null"
+        {%- if privs_available %} checked>
+        {%- else %} title="{% trans "You don't have sufficient privileges to perform this operation; Please refer to the documentation for more details" %}" disabled>
+        {%- endif %}
+      {% set ci = ci + 1 %}
     </td>
 {% endif %}
 {% if not is_backup %}
     {# column indexes, See my other comment about  this 'if'. #}
     <td class="text-center">
-        {% include 'columns_definitions/column_indexes.twig' with {
-            'column_number': column_number,
-            'ci': ci,
-            'ci_offset': ci_offset,
-            'column_meta': column_meta
-        } only %}
-        {% set ci = ci + 1 %}
+      <select name="field_key[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}" data-index="">
+        <option value="none_{{ column_number }}">---</option>
+        <option value="primary_{{ column_number }}" title="{% trans "Primary" %}"
+          {{- column_meta['Key'] is defined and column_meta['Key'] == 'PRI' ? ' selected' }}>
+          PRIMARY
+        </option>
+        <option value="unique_{{ column_number }}" title="{% trans "Unique" %}"
+          {{- column_meta['Key'] is defined and column_meta['Key'] == 'UNI' ? ' selected' }}>
+          UNIQUE
+        </option>
+        <option value="index_{{ column_number }}" title="{% trans "Index" %}"
+          {{- column_meta['Key'] is defined and column_meta['Key'] == 'MUL' ? ' selected' }}>
+          INDEX
+        </option>
+        <option value="fulltext_{{ column_number }}" title="{% trans "Fulltext" %}"
+          {{- column_meta['Key'] is defined and column_meta['Key'] == 'FULLTEXT' ? ' selected' }}>
+          FULLTEXT
+        </option>
+        <option value="spatial_{{ column_number }}" title="{% trans "Spatial" %}"
+          {{- column_meta['Key'] is defined and column_meta['Key'] == 'SPATIAL' ? ' selected' }}>
+          SPATIAL
+        </option>
+      </select>
+      {% set ci = ci + 1 %}
     </td>
 {% endif %}
 <td class="text-center">
-    {# column auto_increment #}
-    {% include 'columns_definitions/column_auto_increment.twig' with {
-        'column_number': column_number,
-        'ci': ci,
-        'ci_offset': ci_offset,
-        'column_meta': column_meta
-    } only %}
-    {% set ci = ci + 1 %}
+  <input name="field_extra[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}" type="checkbox" value="AUTO_INCREMENT"
+    {{- column_meta['Extra'] is defined and column_meta['Extra']|lower == 'auto_increment' ? ' checked' }}>
+  {% set ci = ci + 1 %}
 </td>
 <td class="text-center">
-    {# column comments #}
-    {% include 'columns_definitions/column_comment.twig' with {
-        'column_number': column_number,
-        'ci': ci,
-        'ci_offset': ci_offset,
-        'max_length': max_length,
-        'value': column_meta['Field'] is defined
-            and comments_map is iterable
-            and comments_map[column_meta['Field']] is defined
-            ? comments_map[column_meta['Field']]|e
-    } only %}
-    {% set ci = ci + 1 %}
+  <textarea id="field_{{ column_number }}_{{ ci - ci_offset }}" rows="1" name="field_comments[{{ column_number }}]" maxlength="{{ max_length }}">
+    {{- column_meta['Field'] is defined and comments_map is iterable and comments_map[column_meta['Field']] is defined ? comments_map[column_meta['Field']] -}}
+  </textarea>
+  {% set ci = ci + 1 %}
 </td>
  {# column virtuality #}
 {% if is_virtual_columns_supported %}
     <td class="text-center">
-        {% include 'columns_definitions/column_virtuality.twig' with {
-            'column_number': column_number,
-            'ci': ci,
-            'ci_offset': ci_offset,
-            'column_meta': column_meta,
-            'char_editing': char_editing,
-            'expression': column_meta['Expression'] is defined ? column_meta['Expression'],
-            'options': options
-        } only %}
-        {% set ci = ci + 1 %}
+      <select name="field_virtuality[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}" class="virtuality">
+        {% for key, value in options %}
+          <option value="{{ key }}"{{ column_meta['Extra'] is defined and key != '' and column_meta['Extra']|slice(0, key|length) is same as (key) ? ' selected' }}>
+            {{ value }}
+          </option>
+        {% endfor %}
+      </select>
+
+      {% if char_editing == 'textarea' %}
+        <textarea name="field_expression[{{ column_number }}]" cols="15" class="textfield expression">{{ column_meta['Expression'] is defined ? column_meta['Expression'] }}</textarea>
+      {% else %}
+        <input type="text" name="field_expression[{{ column_number }}]" size="12" value="{{ column_meta['Expression'] is defined ? column_meta['Expression'] }}" placeholder="{% trans 'Expression' %}" class="textfield expression">
+      {% endif %}
+      {% set ci = ci + 1 %}
     </td>
 {% endif %}
 {# move column #}
@@ -168,79 +171,78 @@
     {% endfor %}
 
     <td class="text-center">
-        {% include 'columns_definitions/move_column.twig' with {
-            'column_number': column_number,
-            'ci': ci,
-            'ci_offset': ci_offset,
-            'column_meta': column_meta,
-            'move_columns': move_columns,
-            'current_index': current_index
-        } only %}
-        {% set ci = ci + 1 %}
+      <select id="field_{{ column_number }}_{{ ci - ci_offset }}" name="field_move_to[{{ column_number }}]" size="1" width="5em">
+        <option value="" selected="selected">&nbsp;</option>
+        <option value="-first"{{ current_index == 0 ? ' disabled="disabled"' }}>
+          {% trans 'first' %}
+        </option>
+        {% for mi in 0..move_columns|length - 1 %}
+          <option value="{{ move_columns[mi].name }}"
+            {{- current_index == mi or current_index == mi + 1 ? ' disabled' }}>
+            {{ 'after %s'|trans|format(backquote(move_columns[mi].name|e)) }}
+          </option>
+        {% endfor %}
+      </select>
+      {% set ci = ci + 1 %}
     </td>
 {% endif %}
 
 {% if cfg_relation['mimework'] and browse_mime and cfg_relation['commwork'] %}
     <td class="text-center">
-        {# Column Mime-type #}
-        {% include 'columns_definitions/mime_type.twig' with {
-            'column_number': column_number,
-            'ci': ci,
-            'ci_offset': ci_offset,
-            'column_meta': column_meta,
-            'available_mime': available_mime,
-            'mime_map': mime_map
-        } only %}
-        {% set ci = ci + 1 %}
+      <select id="field_{{ column_number }}_{{ ci - ci_offset }}" size="1" name="field_mimetype[{{ column_number }}]">
+        <option value="">&nbsp;</option>
+        {% if available_mime['mimetype'] is defined and available_mime['mimetype'] is iterable %}
+          {% for media_type in available_mime['mimetype'] %}
+            <option value="{{ media_type|replace({'/': '_'}) }}"
+              {{- column_meta['Field'] is defined and mime_map[column_meta['Field']]['mimetype'] is defined
+                and mime_map[column_meta['Field']]['mimetype'] == media_type|replace({'/': '_'}) ? ' selected' }}>
+              {{ media_type|lower }}
+            </option>
+          {% endfor %}
+        {% endif %}
+      </select>
+      {% set ci = ci + 1 %}
     </td>
     <td class="text-center">
-        {# Column Browser transformation #}
-        {% include 'columns_definitions/transformation.twig' with {
-            'column_number': column_number,
-            'ci': ci,
-            'ci_offset': ci_offset,
-            'column_meta': column_meta,
-            'available_mime': available_mime,
-            'mime_map': mime_map,
-            'type': 'transformation'
-        } only %}
-        {% set ci = ci + 1 %}
+      <select id="field_{{ column_number }}_{{ ci - ci_offset }}" size="1" name="field_transformation[{{ column_number }}]">
+        <option value="" title="{% trans 'None' %}"></option>
+        {% if available_mime['transformation'] is defined and available_mime['transformation'] is iterable %}
+          {% for mimekey, transform in available_mime['transformation'] %}
+            {% set parts = transform|split(':') %}
+            <option value="{{ available_mime['transformation_file'][mimekey] }}" title="{{ get_description(available_mime['transformation_file'][mimekey]) }}"
+              {{- column_meta['Field'] is defined and mime_map[column_meta['Field']]['transformation'] is defined
+                and mime_map[column_meta['Field']]['transformation'] matches '@' ~ available_mime['transformation_file_quoted'][mimekey] ~ '3?@i' ? ' selected'}}>
+              {{ get_name(available_mime['transformation_file'][mimekey]) ~ ' (' ~ parts[0]|lower ~ ':' ~ parts[1] ~ ')' }}
+            </option>
+          {% endfor %}
+        {% endif %}
+      </select>
+      {% set ci = ci + 1 %}
     </td>
     <td class="text-center">
-        {# column Transformation options #}
-        {% include 'columns_definitions/transformation_option.twig' with {
-            'column_number': column_number,
-            'ci': ci,
-            'ci_offset': ci_offset,
-            'column_meta': column_meta,
-            'mime_map': mime_map,
-            'type_prefix': ''
-        } only %}
-        {% set ci = ci + 1 %}
+      <input id="field_{{ column_number }}_{{ ci - ci_offset }}" type="text" name="field_transformation_options[{{ column_number }}]" size="16" class="textfield" value="
+        {{- column_meta['Field'] is defined and mime_map[column_meta['Field']]['transformation_options'] is defined ? mime_map[column_meta['Field']]['transformation_options'] }}">
+      {% set ci = ci + 1 %}
     </td>
     <td class="text-center">
-        {# Column Input transformation #}
-        {% include 'columns_definitions/transformation.twig' with {
-            'column_number': column_number,
-            'ci': ci,
-            'ci_offset': ci_offset,
-            'column_meta': column_meta,
-            'available_mime': available_mime,
-            'mime_map': mime_map,
-            'type': 'input_transformation'
-        } only %}
-        {% set ci = ci + 1 %}
+      <select id="field_{{ column_number }}_{{ ci - ci_offset }}" size="1" name="field_input_transformation[{{ column_number }}]">
+        <option value="" title="{% trans 'None' %}"></option>
+        {% if available_mime['input_transformation'] is defined and available_mime['input_transformation'] is iterable %}
+          {% for mimekey, transform in available_mime['input_transformation'] %}
+            {% set parts = transform|split(':') %}
+            <option value="{{ available_mime['input_transformation_file'][mimekey] }}" title="{{ get_description(available_mime['input_transformation_file'][mimekey]) }}"
+              {{- column_meta['Field'] is defined and mime_map[column_meta['Field']]['input_transformation'] is defined
+                and mime_map[column_meta['Field']]['input_transformation'] matches '@' ~ available_mime['input_transformation_file_quoted'][mimekey] ~ '3?@i' ? ' selected' }}>
+              {{ get_name(available_mime['input_transformation_file'][mimekey]) ~ ' (' ~ parts[0]|lower ~ ':' ~ parts[1] ~ ')' }}
+            </option>
+          {% endfor %}
+        {% endif %}
+      </select>
+      {% set ci = ci + 1 %}
     </td>
     <td class="text-center">
-        {# column Input transformation options #}
-        {% include 'columns_definitions/transformation_option.twig' with {
-            'column_number': column_number,
-            'ci': ci,
-            'ci_offset': ci_offset,
-            'column_meta': column_meta,
-            'mime_map': mime_map,
-            'type_prefix': 'input_'
-        } only %}
-        {% set ci = ci + 1 %}
+      <input id="field_{{ column_number }}_{{ ci - ci_offset }}" type="text" name="field_input_transformation_options[{{ column_number }}]" size="16" class="textfield" value="
+        {{- column_meta['Field'] is defined and mime_map[column_meta['Field']]['input_transformation_options'] is defined ? mime_map[column_meta['Field']]['input_transformation_options'] }}">
+      {% set ci = ci + 1 %}
     </td>
 {% endif %}
diff --git a/templates/columns_definitions/column_auto_increment.twig b/templates/columns_definitions/column_auto_increment.twig
deleted file mode 100644
index 46bfb42f6c..0000000000
--- a/templates/columns_definitions/column_auto_increment.twig
+++ /dev/null
@@ -1,7 +0,0 @@
-<input name="field_extra[{{ column_number }}]"
-    id="field_{{ column_number }}_{{ ci - ci_offset }}"
-    {% if column_meta['Extra'] is defined and column_meta['Extra']|lower == 'auto_increment' -%}
-        checked="checked"
-    {%- endif %}
-    type="checkbox"
-    value="AUTO_INCREMENT">
diff --git a/templates/columns_definitions/column_comment.twig b/templates/columns_definitions/column_comment.twig
deleted file mode 100644
index 653441bf93..0000000000
--- a/templates/columns_definitions/column_comment.twig
+++ /dev/null
@@ -1,6 +0,0 @@
-<textarea id="field_{{ column_number }}_{{ ci - ci_offset }}"
-    rows="1"
-    name="field_comments[{{ column_number }}]"
-    maxlength="{{ max_length }}">
-  {{- value|raw -}}
-</textarea>
diff --git a/templates/columns_definitions/column_default.twig b/templates/columns_definitions/column_default.twig
deleted file mode 100644
index dcb66446bb..0000000000
--- a/templates/columns_definitions/column_default.twig
+++ /dev/null
@@ -1,35 +0,0 @@
-{# here we put 'NONE' as the default value of drop-down; otherwise users would
-have problems if they forget to enter the default value (example, for an INT) #}
-{% set translation %}{% trans %}None{% context %}for default{% endtrans %}{% endset %}
-{% set default_options = {
-    'NONE': translation,
-    'USER_DEFINED': 'As defined:'|trans,
-    'NULL': 'NULL',
-    'CURRENT_TIMESTAMP': 'CURRENT_TIMESTAMP'
-} %}
-
-<select name="field_default_type[{{ column_number }}]"
-    id="field_{{ column_number }}_{{ ci - ci_offset }}"
-    class="default_type">
-    {% for key, value in default_options %}
-        <option value="{{ key }}"
-            {%- if column_meta['DefaultType'] is defined
-                and column_meta['DefaultType'] == key %}
-                selected="selected"
-            {%- endif %}>
-            {{ value }}
-        </option>
-    {% endfor %}
-</select>
-{% if char_editing == 'textarea' %}
-    <textarea name="field_default_value[{{ column_number }}]"
-        cols="15"
-        class="textfield
-        default_value">{{ default_value }}</textarea>
-{% else %}
-    <input type="text"
-        name="field_default_value[{{ column_number }}]"
-        size="12"
-        value="{{ default_value }}"
-        class="textfield default_value">
-{% endif %}
diff --git a/templates/columns_definitions/column_extra.twig b/templates/columns_definitions/column_extra.twig
deleted file mode 100644
index 7f61f5cb98..0000000000
--- a/templates/columns_definitions/column_extra.twig
+++ /dev/null
@@ -1,7 +0,0 @@
-<input name="col_extra[{{ column_number }}]"
-    id="field_{{ column_number }}_{{ ci - ci_offset }}"
-    {% if column_meta['Extra'] is not empty and column_meta['Extra'] == 'auto_increment' -%}
-        checked="checked"
-    {%- endif %}
-    type="checkbox"
-    value="auto_increment">
diff --git a/templates/columns_definitions/column_indexes.twig b/templates/columns_definitions/column_indexes.twig
deleted file mode 100644
index 398022997a..0000000000
--- a/templates/columns_definitions/column_indexes.twig
+++ /dev/null
@@ -1,24 +0,0 @@
-<select name="field_key[{{ column_number }}]"
-    id="field_{{ column_number }}_{{ ci - ci_offset }}" data-index="">
-    <option value="none_{{ column_number }}">---</option>
-    <option value="primary_{{ column_number }}" title="{% trans "Primary" %}"
-        {{- column_meta['Key'] is defined and column_meta['Key'] == 'PRI' ? ' selected="selected"' }}>
-        PRIMARY
-    </option>
-    <option value="unique_{{ column_number }}" title="{% trans "Unique" %}"
-        {{- column_meta['Key'] is defined and column_meta['Key'] == 'UNI' ? ' selected="selected"' }}>
-        UNIQUE
-    </option>
-    <option value="index_{{ column_number }}" title="{% trans "Index" %}"
-        {{- column_meta['Key'] is defined and column_meta['Key'] == 'MUL' ? ' selected="selected"' }}>
-        INDEX
-    </option>
-    <option value="fulltext_{{ column_number }}" title="{% trans "Fulltext" %}"
-        {{- column_meta['Key'] is defined and column_meta['Key'] == 'FULLTEXT' ? ' selected="selected"' }}>
-        FULLTEXT
-    </option>
-    <option value="spatial_{{ column_number }}" title="{% trans "Spatial" %}"
-        {{- column_meta['Key'] is defined and column_meta['Key'] == 'SPATIAL' ? ' selected="selected"' }}>
-        SPATIAL
-    </option>
-</select>
diff --git a/templates/columns_definitions/column_length.twig b/templates/columns_definitions/column_length.twig
deleted file mode 100644
index ef7e5f0654..0000000000
--- a/templates/columns_definitions/column_length.twig
+++ /dev/null
@@ -1,11 +0,0 @@
-<input id="field_{{ column_number }}_{{ ci - ci_offset }}"
-    type="text"
-    name="field_length[{{ column_number }}]"
-    size="{{ length_values_input_size }}"
-    value="{{ length_to_display }}"
-    class="textfield">
-<p class="enum_notice" id="enum_notice_{{ column_number }}_{{ ci - ci_offset }}">
-    <a href="#" class="open_enum_editor">
-        {% trans 'Edit ENUM/SET values' %}
-    </a>
-</p>
diff --git a/templates/columns_definitions/column_null.twig b/templates/columns_definitions/column_null.twig
deleted file mode 100644
index 5afd6497ef..0000000000
--- a/templates/columns_definitions/column_null.twig
+++ /dev/null
@@ -1,8 +0,0 @@
-<input name="field_null[{{ column_number }}]"
-    id="field_{{ column_number }}_{{ ci - ci_offset }}"
-    {% if column_meta['Null'] is not empty and column_meta['Null'] != 'NO' and column_meta['Null'] != 'NOT NULL' -%}
-        checked="checked"
-    {%- endif %}
-    type="checkbox"
-    value="YES"
-    class="allow_null">
diff --git a/templates/columns_definitions/column_type.twig b/templates/columns_definitions/column_type.twig
deleted file mode 100644
index e74eb0e135..0000000000
--- a/templates/columns_definitions/column_type.twig
+++ /dev/null
@@ -1,8 +0,0 @@
-<select class="column_type"
-    name="field_type[{{ column_number }}]"
-    id="field_{{ column_number }}_{{ ci - ci_offset }}"
-    {%- if column_meta['column_status'] is defined and not column_meta['column_status']['isEditable'] -%}
-    disabled="disabled"
-    {%- endif %}>
-    {{ get_supported_datatypes(true, type_upper) }}
-</select>
diff --git a/templates/columns_definitions/column_virtuality.twig b/templates/columns_definitions/column_virtuality.twig
deleted file mode 100644
index d53f5d55e8..0000000000
--- a/templates/columns_definitions/column_virtuality.twig
+++ /dev/null
@@ -1,30 +0,0 @@
-<select name="field_virtuality[{{ column_number }}]"
-    id="field_{{ column_number }}_{{ ci - ci_offset }}"
-    class="virtuality">
-    {% for key, value in options %}
-        <option value="{{ key }}"
-            {% set key_length = key|length %}
-            {%- if column_meta['Extra'] is defined
-                and key != ''
-                and column_meta['Extra']|slice(0,key_length) is same as (key) %}
-                selected="selected"
-            {%- endif %}>
-            {{ value }}
-        </option>
-    {% endfor %}
-</select>
-
-{% if char_editing == 'textarea' %}
-    <textarea name="field_expression[{{ column_number }}]"
-        cols="15"
-        class="textfield expression">
-        {{- expression -}}
-    </textarea>
-{% else %}
-    <input type="text"
-        name="field_expression[{{ column_number }}]"
-        size="12"
-        value="{{ expression }}"
-        placeholder="{% trans 'Expression' %}"
-        class="textfield expression">
-{% endif %}
diff --git a/templates/columns_definitions/mime_type.twig b/templates/columns_definitions/mime_type.twig
deleted file mode 100644
index ef395b65d8..0000000000
--- a/templates/columns_definitions/mime_type.twig
+++ /dev/null
@@ -1,17 +0,0 @@
-<select id="field_{{ column_number }}_{{ ci - ci_offset }}"
-    size="1"
-    name="field_mimetype[{{ column_number }}]">
-    <option value="">&nbsp;</option>
-    {% if available_mime['mimetype'] is defined
-        and available_mime['mimetype'] is iterable %}
-        {% for mimetype in available_mime['mimetype'] %}
-            {% set checked = column_meta['Field'] is defined
-                and mime_map[column_meta['Field']]['mimetype'] is defined
-                and mime_map[column_meta['Field']]['mimetype'] == mimetype|replace({'/': '_'})
-                ? ' selected' %}
-            <option value="{{ mimetype|replace({'/': '_'}) }}"{{ checked }}>
-                {{ mimetype|lower }}
-            </option>
-        {% endfor %}
-    {% endif %}
-</select>
diff --git a/templates/columns_definitions/move_column.twig b/templates/columns_definitions/move_column.twig
deleted file mode 100644
index 7c0b3f4bfc..0000000000
--- a/templates/columns_definitions/move_column.twig
+++ /dev/null
@@ -1,15 +0,0 @@
-<select id="field_{{ column_number }}_{{ ci - ci_offset }}"
-    name="field_move_to[{{ column_number }}]"
-    size="1"
-    width="5em">
-    <option value="" selected="selected">&nbsp;</option>
-    <option value="-first"{{ current_index == 0 ? ' disabled="disabled"' }}>
-        {% trans 'first' %}
-    </option>
-    {% for mi in 0..move_columns|length - 1 %}
-        <option value="{{ move_columns[mi].name }}"
-            {{- current_index == mi or current_index == mi + 1 ? ' disabled="disabled"' }}>
-            {{ 'after %s'|trans|format(backquote(move_columns[mi].name|e)) }}
-        </option>
-    {% endfor %}
-</select>
diff --git a/templates/columns_definitions/transformation.twig b/templates/columns_definitions/transformation.twig
deleted file mode 100644
index 9aec94a565..0000000000
--- a/templates/columns_definitions/transformation.twig
+++ /dev/null
@@ -1,26 +0,0 @@
-<select id="field_{{ column_number }}_{{ ci - ci_offset }}"
-    size="1"
-    name="field_{{ type }}[{{ column_number }}]">
-    <option value="" title="{% trans 'None' %}"></option>
-    {% if available_mime[type] is defined and available_mime[type] is iterable %}
-        {% for mimekey, transform in available_mime[type] %}
-            {% set checked = column_meta['Field'] is defined
-                and mime_map[column_meta['Field']][type] is defined
-                and mime_map[column_meta['Field']][type] matches
-                    '@' ~ available_mime[type ~ '_file_quoted'][mimekey] ~ '3?@i'
-                ? 'selected ' %}
-            {% set tooltip = get_description(
-                available_mime[type ~ '_file'][mimekey]
-            ) %}
-            {% set parts = transform|split(':') %}
-            {% set name = get_name(
-                available_mime[type ~ '_file'][mimekey]
-            ) ~ ' (' ~ parts[0]|lower ~ ':' ~ parts[1] ~ ')' %}
-            <option value="{{ available_mime[type ~ '_file'][mimekey] }}"
-                {{ checked }}
-                title="{{ tooltip }}">
-                {{ name }}
-            </option>
-        {% endfor %}
-    {% endif %}
-</select>
diff --git a/templates/columns_definitions/transformation_option.twig b/templates/columns_definitions/transformation_option.twig
deleted file mode 100644
index f87ba7cba9..0000000000
--- a/templates/columns_definitions/transformation_option.twig
+++ /dev/null
@@ -1,9 +0,0 @@
-{% set options_key = type_prefix ~ 'transformation_options' %}
-<input id="field_{{ column_number }}_{{ ci - ci_offset }}"
-    type="text"
-    name="field_{{ options_key }}[{{ column_number }}]"
-    size="16"
-    class="textfield"
-    value="{% if column_meta['Field'] is defined and mime_map[column_meta['Field']][options_key] is defined -%}
-        {{- mime_map[column_meta['Field']][options_key] -}}
-    {%- endif %}">
diff --git a/templates/database/central_columns/edit_table_row.twig b/templates/database/central_columns/edit_table_row.twig
index f63ef575e6..81e333cabe 100644
--- a/templates/database/central_columns/edit_table_row.twig
+++ b/templates/database/central_columns/edit_table_row.twig
@@ -12,35 +12,38 @@
   </td>
 
   <td name="col_type" class="nowrap">
-    {% include 'columns_definitions/column_type.twig' with {
-      'column_number': row_num,
-      'ci': 1,
-      'ci_offset': 0,
-      'column_meta': [],
-      'type_upper': row['col_type']|upper
-    } only %}
+    <select class="column_type" name="field_type[{{ row_num }}]" id="field_{{ row_num }}_1">
+      {{ get_supported_datatypes(true, row['col_type']|upper) }}
+    </select>
   </td>
 
   <td class="nowrap" name="col_length">
-    {% include 'columns_definitions/column_length.twig' with {
-      'column_number': row_num,
-      'ci': 2,
-      'ci_offset': 0,
-      'length_values_input_size': 8,
-      'length_to_display': row['col_length']
-    } only %}
+    <input id="field_{{ row_num }}_2" type="text" name="field_length[{{ row_num }}]" size="8" value="{{ row['col_length'] }}" class="textfield">
+    <p class="enum_notice" id="enum_notice_{{ row_num }}_2">
+      <a href="#" class="open_enum_editor">{% trans 'Edit ENUM/SET values' %}</a>
+    </p>
   </td>
 
   <td class="nowrap" name="col_default">
-    {% include 'columns_definitions/column_default.twig' with {
-      'column_number': row_num,
-      'ci': 3,
-      'ci_offset': 0,
-      'column_meta': meta,
-      'type_upper': row['col_default']|upper,
-      'default_value': '',
-      'char_editing': char_editing
-    } only %}
+    <select name="field_default_type[{{ row_num }}]" id="field_{{ row_num }}_3" class="default_type">
+      <option value="NONE"{{ meta['DefaultType'] is defined and meta['DefaultType'] == 'NONE' ? ' selected' }}>
+        {% trans %}None{% context %}for default{% endtrans %}
+      </option>
+      <option value="USER_DEFINED"{{ meta['DefaultType'] is defined and meta['DefaultType'] == 'USER_DEFINED' ? ' selected' }}>
+        {% trans 'As defined:' %}
+      </option>
+      <option value="NULL"{{ meta['DefaultType'] is defined and meta['DefaultType'] == 'NULL' ? ' selected' }}>
+        NULL
+      </option>
+      <option value="CURRENT_TIMESTAMP"{{ meta['DefaultType'] is defined and meta['DefaultType'] == 'CURRENT_TIMESTAMP' ? ' selected' }}>
+        CURRENT_TIMESTAMP
+      </option>
+    </select>
+    {% if char_editing == 'textarea' %}
+      <textarea name="field_default_value[{{ row_num }}]" cols="15" class="textfield default_value"></textarea>
+    {% else %}
+      <input type="text" name="field_default_value[{{ row_num }}]" size="12" value="" class="textfield default_value">
+    {% endif %}
   </td>
 
   <td name="collation" class="nowrap">
@@ -71,20 +74,12 @@
   </td>
 
   <td class="nowrap" name="col_isNull">
-    {% include 'columns_definitions/column_null.twig' with {
-      'column_number': row_num,
-      'ci': 6,
-      'ci_offset': 0,
-      'column_meta': {'Null': row['col_isNull']}
-    } only %}
+    <input name="field_null[{{ row_num }}]" id="field_{{ row_num }}_6" type="checkbox" value="YES" class="allow_null"
+      {{- row['col_isNull'] is not empty and row['col_isNull'] != 'NO' and row['col_isNull'] != 'NOT NULL' ? ' checked' }}>
   </td>
 
   <td class="nowrap" name="col_extra">
-    {% include 'columns_definitions/column_extra.twig' with {
-      'column_number': row_num,
-      'ci': 7,
-      'ci_offset': 0,
-      'column_meta': {'Extra': row['col_extra']}
-    } only %}
+    <input name="col_extra[{{ row_num }}]" id="field_{{ row_num }}_7" type="checkbox" value="auto_increment"
+      {{- row['col_extra'] is not empty and row['col_extra'] == 'auto_increment' }}>
   </td>
 </tr>
diff --git a/templates/database/central_columns/main.twig b/templates/database/central_columns/main.twig
index a832727399..02fc512ab8 100644
--- a/templates/database/central_columns/main.twig
+++ b/templates/database/central_columns/main.twig
@@ -63,32 +63,28 @@
                             } only %}
                         </td>
                         <td name="col_type" class="nowrap">
-                            {% include 'columns_definitions/column_type.twig' with {
-                                'column_number': 0,
-                                'ci': 1,
-                                'ci_offset': 0,
-                                'type_upper': '',
-                                'column_meta': {}
-                            } only %}
+                          <select class="column_type" name="field_type[0]" id="field_0_1">
+                            {{ get_supported_datatypes(true) }}
+                          </select>
                         </td>
                         <td class="nowrap" name="col_length">
-                            {% include 'columns_definitions/column_length.twig' with {
-                                'column_number': 0,
-                                'ci': 2,
-                                'ci_offset': 0,
-                                'length_values_input_size': 8,
-                                'length_to_display': ''
-                            } only %}
+                          <input id="field_0_2" type="text" name="field_length[0]" size="8" value="" class="textfield">
+                          <p class="enum_notice" id="enum_notice_0_2">
+                            <a href="#" class="open_enum_editor">{% trans 'Edit ENUM/SET values' %}</a>
+                          </p>
                         </td>
                         <td class="nowrap" name="col_default">
-                            {% include 'columns_definitions/column_default.twig' with {
-                                'column_number': 0,
-                                'ci': 3,
-                                'ci_offset': 0,
-                                'type_upper': '',
-                                'column_meta': {},
-                                'char_editing': char_editing,
-                            } only %}
+                          <select name="field_default_type[0]" id="field_0_3" class="default_type">
+                            <option value="NONE">{% trans %}None{% context %}for default{% endtrans %}</option>
+                            <option value="USER_DEFINED">{% trans 'As defined:' %}</option>
+                            <option value="NULL">NULL</option>
+                            <option value="CURRENT_TIMESTAMP">CURRENT_TIMESTAMP</option>
+                          </select>
+                          {% if char_editing == 'textarea' %}
+                            <textarea name="field_default_value[0]" cols="15" class="textfield default_value"></textarea>
+                          {% else %}
+                            <input type="text" name="field_default_value[0]" size="12" value="" class="textfield default_value">
+                          {% endif %}
                         </td>
                         <td name="collation" class="nowrap">
                           <select lang="en" dir="ltr" name="field_collation[0]" id="field_0_4">
@@ -116,20 +112,10 @@
                             } only %}
                         </td>
                         <td class="nowrap" name="col_isNull">
-                            {% include 'columns_definitions/column_null.twig' with {
-                                'column_number': 0,
-                                'ci': 6,
-                                'ci_offset': 0,
-                                'column_meta': {}
-                            } only %}
+                          <input name="field_null[0]" id="field_0_6" type="checkbox" value="YES" class="allow_null">
                         </td>
                         <td class="nowrap" name="col_extra">
-                            {% include 'columns_definitions/column_extra.twig' with {
-                                'column_number': 0,
-                                'ci': 7,
-                                'ci_offset': 0,
-                                'column_meta': {}
-                            } only %}
+                          <input name="col_extra[0]" id="field_0_7" type="checkbox" value="auto_increment">
                         </td>
                         <td>
                             <input id="add_column_save" class="btn btn-primary" type="submit" value="Save">
@@ -304,39 +290,43 @@
                                 } only %}
                             </td>
                             <td name = "col_type" class="nowrap">
-                                <span>{{ row['col_type'] }}</span>
-                                {% include 'columns_definitions/column_type.twig' with {
-                                    'column_number': row_num,
-                                    'ci': 1,
-                                    'ci_offset': 0,
-                                    'type_upper': types_upper[row_num],
-                                    'column_meta': {}
-                                } only %}
+                              <span>{{ row['col_type'] }}</span>
+                              <select class="column_type" name="field_type[{{ row_num }}]" id="field_{{ row_num }}_1">
+                                {{ get_supported_datatypes(true, types_upper[row_num]) }}
+                              </select>
                             </td>
                             <td class="nowrap" name="col_length">
-                                <span>{{ (row['col_length']?(row['col_length']):'') }}</span>
-                                {% include 'columns_definitions/column_length.twig' with {
-                                    'column_number': row_num,
-                                    'ci': 2,
-                                    'ci_offset': 0,
-                                    'length_values_input_size': 8,
-                                    'length_to_display': row['col_length']
-                                } only %}
+                              <span>{{ (row['col_length']?(row['col_length']):'') }}</span>
+                              <input id="field_{{ row_num }}_2" type="text" name="field_length[{{ row_num }}]" size="8" value="{{ row['col_length'] }}" class="textfield">
+                              <p class="enum_notice" id="enum_notice_{{ row_num }}_2">
+                                <a href="#" class="open_enum_editor">{% trans 'Edit ENUM/SET values' %}</a>
+                              </p>
                             </td>
                             <td class="nowrap" name="col_default">
-                                {% if row['col_default'] is defined %}
-                                    <span>{{ row['col_default'] }}</span>
-                                {% else %}
-                                    <span>None</span>
-                                {% endif %}
-                                {% include 'columns_definitions/column_default.twig' with {
-                                    'column_number': row_num,
-                                    'ci': 3,
-                                    'ci_offset': 0,
-                                    'type_upper': types_upper[row_num],
-                                    'column_meta': rows_meta[row_num],
-                                    'char_editing': char_editing,
-                                } only %}
+                              {% if row['col_default'] is defined %}
+                                <span>{{ row['col_default'] }}</span>
+                              {% else %}
+                                <span>{% trans 'None' %}</span>
+                              {% endif %}
+                              <select name="field_default_type[{{ row_num }}]" id="field_{{ row_num }}_3" class="default_type">
+                                <option value="NONE"{{ rows_meta[row_num]['DefaultType'] is defined and rows_meta[row_num]['DefaultType'] == 'NONE' ? ' selected' }}>
+                                  {% trans %}None{% context %}for default{% endtrans %}
+                                </option>
+                                <option value="USER_DEFINED"{{ rows_meta[row_num]['DefaultType'] is defined and rows_meta[row_num]['DefaultType'] == 'USER_DEFINED' ? ' selected' }}>
+                                  {% trans 'As defined:' %}
+                                </option>
+                                <option value="NULL"{{ rows_meta[row_num]['DefaultType'] is defined and rows_meta[row_num]['DefaultType'] == 'NULL' ? ' selected' }}>
+                                  NULL
+                                </option>
+                                <option value="CURRENT_TIMESTAMP"{{ rows_meta[row_num]['DefaultType'] is defined and rows_meta[row_num]['DefaultType'] == 'CURRENT_TIMESTAMP' ? ' selected' }}>
+                                  CURRENT_TIMESTAMP
+                                </option>
+                              </select>
+                              {% if char_editing == 'textarea' %}
+                                <textarea name="field_default_value[{{ row_num }}]" cols="15" class="textfield default_value"></textarea>
+                              {% else %}
+                                <input type="text" name="field_default_value[{{ row_num }}]" size="12" value="" class="textfield default_value">
+                              {% endif %}
                             </td>
                             <td name="collation" class="nowrap">
                                 <span>{{ row['col_collation'] }}</span>
@@ -368,25 +358,13 @@
                             </td>
                             <td class="nowrap" name="col_isNull">
                                 <span>{{ row['col_isNull'] ? 'Yes' | trans : 'No' | trans }}</span>
-                                {% include 'columns_definitions/column_null.twig' with {
-                                    'column_number': row_num,
-                                    'ci': 6,
-                                    'ci_offset': 0,
-                                    'column_meta': {
-                                        'Null': row['col_isNull']
-                                    }
-                                } only %}
+                                <input name="field_null[{{ row_num }}]" id="field_{{ row_num }}_6" type="checkbox" value="YES" class="allow_null"
+                                  {{- row['col_isNull'] is not empty and row['col_isNull'] != 'NO' and row['col_isNull'] != 'NOT NULL' ? ' checked' }}>
                             </td>
                             <td class="nowrap" name="col_extra">
-                                <span>{{ row['col_extra'] }}</span>
-                                {% include 'columns_definitions/column_extra.twig' with {
-                                    'column_number': row_num,
-                                    'ci': 7,
-                                    'ci_offset': 0,
-                                    'column_meta': {
-                                        'Extra': row['col_extra']
-                                    }
-                                } only %}
+                              <span>{{ row['col_extra'] }}</span>
+                              <input name="col_extra[{{ row_num }}]" id="field_{{ row_num }}_7" type="checkbox" value="auto_increment"
+                                {{- row['col_extra'] is not empty and row['col_extra'] == 'auto_increment' ? ' checked' }}>
                             </td>
                         </tr>
                         {% set row_num = row_num + 1 %}