diff --git a/_includes/boolean.html b/_includes/boolean.html
deleted file mode 120000
index b123d46..0000000
--- a/_includes/boolean.html
+++ /dev/null
@@ -1 +0,0 @@
-form/boolean.html
\ No newline at end of file
diff --git a/_includes/boolean.html b/_includes/boolean.html
new file mode 100644
index 0000000..32d35b4
--- /dev/null
+++ b/_includes/boolean.html
@@ -0,0 +1,30 @@
+{%- assign name = include.field[0] -%}
+{%- assign id = include.field[1].id | default: name -%}
+{%- assign label = include.field[1].label[site.locale] -%}
+{%- assign help = include.field[1].help[site.locale] -%}
+{%- assign autocomplete = include.field[1].autocomplete -%}
+
+
+
+
+
+
+ {%- if help -%}
+
+ {{ help }}
+
+ {%- endif -%}
+
diff --git a/_includes/email.html b/_includes/email.html
deleted file mode 120000
index 01f349c..0000000
--- a/_includes/email.html
+++ /dev/null
@@ -1 +0,0 @@
-form/email.html
\ No newline at end of file
diff --git a/_includes/email.html b/_includes/email.html
new file mode 100644
index 0000000..a92aa57
--- /dev/null
+++ b/_includes/email.html
@@ -0,0 +1 @@
+{% include input.html field=field %}
diff --git a/_includes/form/boolean.html b/_includes/form/boolean.html
deleted file mode 100644
index 32d35b4..0000000
--- a/_includes/form/boolean.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{%- assign name = include.field[0] -%}
-{%- assign id = include.field[1].id | default: name -%}
-{%- assign label = include.field[1].label[site.locale] -%}
-{%- assign help = include.field[1].help[site.locale] -%}
-{%- assign autocomplete = include.field[1].autocomplete -%}
-
-
-
-
-
-
- {%- if help -%}
-
- {{ help }}
-
- {%- endif -%}
-
diff --git a/_includes/form/boolean.html b/_includes/form/boolean.html
new file mode 120000
index 0000000..74093f3
--- /dev/null
+++ b/_includes/form/boolean.html
@@ -0,0 +1 @@
+../boolean.html
\ No newline at end of file
diff --git a/_includes/form/email.html b/_includes/form/email.html
deleted file mode 100644
index a92aa57..0000000
--- a/_includes/form/email.html
+++ /dev/null
@@ -1 +0,0 @@
-{% include input.html field=field %}
diff --git a/_includes/form/email.html b/_includes/form/email.html
new file mode 120000
index 0000000..a343ef4
--- /dev/null
+++ b/_includes/form/email.html
@@ -0,0 +1 @@
+../email.html
\ No newline at end of file
diff --git a/_includes/form/hidden.html b/_includes/form/hidden.html
deleted file mode 100644
index e9ab603..0000000
--- a/_includes/form/hidden.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{%- assign name = include.field[0] -%}
-{%- assign id = include.field[1].id | default: name -%}
-{%- assign value = include.field[1].value -%}
-
-
diff --git a/_includes/form/hidden.html b/_includes/form/hidden.html
new file mode 120000
index 0000000..e1c2670
--- /dev/null
+++ b/_includes/form/hidden.html
@@ -0,0 +1 @@
+../hidden.html
\ No newline at end of file
diff --git a/_includes/form/input.html b/_includes/form/input.html
deleted file mode 100644
index cc674c2..0000000
--- a/_includes/form/input.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{%- assign name = include.field[0] -%}
-{%- assign id = include.field[1].id | default: name -%}
-{%- assign label = include.field[1].label[site.locale] -%}
-{%- assign help = include.field[1].help[site.locale] -%}
-{%- assign autocomplete = include.field[1].autocomplete -%}
-
-
-
-
-
-
- {%- if help -%}
-
- {{ help }}
-
- {%- endif -%}
-
diff --git a/_includes/form/input.html b/_includes/form/input.html
new file mode 120000
index 0000000..1a026ad
--- /dev/null
+++ b/_includes/form/input.html
@@ -0,0 +1 @@
+../input.html
\ No newline at end of file
diff --git a/_includes/form/number.html b/_includes/form/number.html
deleted file mode 100644
index a92aa57..0000000
--- a/_includes/form/number.html
+++ /dev/null
@@ -1 +0,0 @@
-{% include input.html field=field %}
diff --git a/_includes/form/number.html b/_includes/form/number.html
new file mode 120000
index 0000000..b829ffc
--- /dev/null
+++ b/_includes/form/number.html
@@ -0,0 +1 @@
+../number.html
\ No newline at end of file
diff --git a/_includes/form/predefined_array.html b/_includes/form/predefined_array.html
deleted file mode 100644
index bdbf6ad..0000000
--- a/_includes/form/predefined_array.html
+++ /dev/null
@@ -1,39 +0,0 @@
-{%- assign name = include.field[0] -%}
-{%- assign id = include.field[1].id | default: name -%}
-{%- assign label = include.field[1].label[site.locale] -%}
-{%- assign help = include.field[1].help[site.locale] -%}
-{%- assign autocomplete = include.field[1].autocomplete -%}
-
-
-
-
-
-
- {%- if help -%}
-
- {{ help }}
-
- {%- endif -%}
-
diff --git a/_includes/form/predefined_array.html b/_includes/form/predefined_array.html
new file mode 120000
index 0000000..ffa1b85
--- /dev/null
+++ b/_includes/form/predefined_array.html
@@ -0,0 +1 @@
+../predefined_array.html
\ No newline at end of file
diff --git a/_includes/form/section.html b/_includes/form/section.html
deleted file mode 100644
index 711e1a0..0000000
--- a/_includes/form/section.html
+++ /dev/null
@@ -1 +0,0 @@
-{{ include.field[1].title }}
diff --git a/_includes/form/section.html b/_includes/form/section.html
new file mode 120000
index 0000000..0a3546a
--- /dev/null
+++ b/_includes/form/section.html
@@ -0,0 +1 @@
+../section.html
\ No newline at end of file
diff --git a/_includes/form/separator.html b/_includes/form/separator.html
deleted file mode 100644
index 031bf8e..0000000
--- a/_includes/form/separator.html
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/_includes/form/separator.html b/_includes/form/separator.html
new file mode 120000
index 0000000..1d4a66c
--- /dev/null
+++ b/_includes/form/separator.html
@@ -0,0 +1 @@
+../separator.html
\ No newline at end of file
diff --git a/_includes/form/string.html b/_includes/form/string.html
deleted file mode 100644
index 8f6c389..0000000
--- a/_includes/form/string.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{% assign f = field %}
-{% assign f.type = 'text' %}
-{% include input.html field=f %}
diff --git a/_includes/form/string.html b/_includes/form/string.html
new file mode 120000
index 0000000..79724e0
--- /dev/null
+++ b/_includes/form/string.html
@@ -0,0 +1 @@
+../string.html
\ No newline at end of file
diff --git a/_includes/form/submit.html b/_includes/form/submit.html
deleted file mode 100644
index 5032564..0000000
--- a/_includes/form/submit.html
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/_includes/form/submit.html b/_includes/form/submit.html
new file mode 120000
index 0000000..9090199
--- /dev/null
+++ b/_includes/form/submit.html
@@ -0,0 +1 @@
+../submit.html
\ No newline at end of file
diff --git a/_includes/form/text.html b/_includes/form/text.html
deleted file mode 100644
index 3f145ef..0000000
--- a/_includes/form/text.html
+++ /dev/null
@@ -1,32 +0,0 @@
-{%- assign name = include.field[0] -%}
-{%- assign id = include.field[1].id | default: name -%}
-{%- assign label = include.field[1].label[site.locale] -%}
-{%- assign help = include.field[1].help[site.locale] -%}
-{%- assign autocomplete = include.field[1].autocomplete -%}
-
-
-
-
-
-
- {%- if .help -%}
-
- {{ help }}
-
- {%- endif -%}
-
diff --git a/_includes/form/text.html b/_includes/form/text.html
new file mode 120000
index 0000000..590120b
--- /dev/null
+++ b/_includes/form/text.html
@@ -0,0 +1 @@
+../text.html
\ No newline at end of file
diff --git a/_includes/form/url.html b/_includes/form/url.html
deleted file mode 100644
index a92aa57..0000000
--- a/_includes/form/url.html
+++ /dev/null
@@ -1 +0,0 @@
-{% include input.html field=field %}
diff --git a/_includes/form/url.html b/_includes/form/url.html
new file mode 120000
index 0000000..2430c8b
--- /dev/null
+++ b/_includes/form/url.html
@@ -0,0 +1 @@
+../url.html
\ No newline at end of file
diff --git a/_includes/hidden.html b/_includes/hidden.html
deleted file mode 120000
index ac3f4a3..0000000
--- a/_includes/hidden.html
+++ /dev/null
@@ -1 +0,0 @@
-form/hidden.html
\ No newline at end of file
diff --git a/_includes/hidden.html b/_includes/hidden.html
new file mode 100644
index 0000000..e9ab603
--- /dev/null
+++ b/_includes/hidden.html
@@ -0,0 +1,5 @@
+{%- assign name = include.field[0] -%}
+{%- assign id = include.field[1].id | default: name -%}
+{%- assign value = include.field[1].value -%}
+
+
diff --git a/_includes/input.html b/_includes/input.html
deleted file mode 120000
index b4b7e3f..0000000
--- a/_includes/input.html
+++ /dev/null
@@ -1 +0,0 @@
-form/input.html
\ No newline at end of file
diff --git a/_includes/input.html b/_includes/input.html
new file mode 100644
index 0000000..cc674c2
--- /dev/null
+++ b/_includes/input.html
@@ -0,0 +1,33 @@
+{%- assign name = include.field[0] -%}
+{%- assign id = include.field[1].id | default: name -%}
+{%- assign label = include.field[1].label[site.locale] -%}
+{%- assign help = include.field[1].help[site.locale] -%}
+{%- assign autocomplete = include.field[1].autocomplete -%}
+
+
+
+
+
+
+ {%- if help -%}
+
+ {{ help }}
+
+ {%- endif -%}
+
diff --git a/_includes/number.html b/_includes/number.html
deleted file mode 120000
index 7830eaf..0000000
--- a/_includes/number.html
+++ /dev/null
@@ -1 +0,0 @@
-form/number.html
\ No newline at end of file
diff --git a/_includes/number.html b/_includes/number.html
new file mode 100644
index 0000000..a92aa57
--- /dev/null
+++ b/_includes/number.html
@@ -0,0 +1 @@
+{% include input.html field=field %}
diff --git a/_includes/predefined_array.html b/_includes/predefined_array.html
deleted file mode 120000
index afc504e..0000000
--- a/_includes/predefined_array.html
+++ /dev/null
@@ -1 +0,0 @@
-form/predefined_array.html
\ No newline at end of file
diff --git a/_includes/predefined_array.html b/_includes/predefined_array.html
new file mode 100644
index 0000000..bdbf6ad
--- /dev/null
+++ b/_includes/predefined_array.html
@@ -0,0 +1,39 @@
+{%- assign name = include.field[0] -%}
+{%- assign id = include.field[1].id | default: name -%}
+{%- assign label = include.field[1].label[site.locale] -%}
+{%- assign help = include.field[1].help[site.locale] -%}
+{%- assign autocomplete = include.field[1].autocomplete -%}
+
+
+
+
+
+
+ {%- if help -%}
+
+ {{ help }}
+
+ {%- endif -%}
+
diff --git a/_includes/section.html b/_includes/section.html
deleted file mode 120000
index 2eddc80..0000000
--- a/_includes/section.html
+++ /dev/null
@@ -1 +0,0 @@
-form/section.html
\ No newline at end of file
diff --git a/_includes/section.html b/_includes/section.html
new file mode 100644
index 0000000..711e1a0
--- /dev/null
+++ b/_includes/section.html
@@ -0,0 +1 @@
+{{ include.field[1].title }}
diff --git a/_includes/separator.html b/_includes/separator.html
deleted file mode 120000
index ddaebe8..0000000
--- a/_includes/separator.html
+++ /dev/null
@@ -1 +0,0 @@
-form/separator.html
\ No newline at end of file
diff --git a/_includes/separator.html b/_includes/separator.html
new file mode 100644
index 0000000..031bf8e
--- /dev/null
+++ b/_includes/separator.html
@@ -0,0 +1 @@
+
diff --git a/_includes/string.html b/_includes/string.html
deleted file mode 120000
index 31d86f9..0000000
--- a/_includes/string.html
+++ /dev/null
@@ -1 +0,0 @@
-form/string.html
\ No newline at end of file
diff --git a/_includes/string.html b/_includes/string.html
new file mode 100644
index 0000000..8f6c389
--- /dev/null
+++ b/_includes/string.html
@@ -0,0 +1,3 @@
+{% assign f = field %}
+{% assign f.type = 'text' %}
+{% include input.html field=f %}
diff --git a/_includes/submit.html b/_includes/submit.html
deleted file mode 120000
index c9f32ca..0000000
--- a/_includes/submit.html
+++ /dev/null
@@ -1 +0,0 @@
-form/submit.html
\ No newline at end of file
diff --git a/_includes/submit.html b/_includes/submit.html
new file mode 100644
index 0000000..5032564
--- /dev/null
+++ b/_includes/submit.html
@@ -0,0 +1 @@
+
diff --git a/_includes/text.html b/_includes/text.html
deleted file mode 120000
index 140239f..0000000
--- a/_includes/text.html
+++ /dev/null
@@ -1 +0,0 @@
-form/text.html
\ No newline at end of file
diff --git a/_includes/text.html b/_includes/text.html
new file mode 100644
index 0000000..3f145ef
--- /dev/null
+++ b/_includes/text.html
@@ -0,0 +1,32 @@
+{%- assign name = include.field[0] -%}
+{%- assign id = include.field[1].id | default: name -%}
+{%- assign label = include.field[1].label[site.locale] -%}
+{%- assign help = include.field[1].help[site.locale] -%}
+{%- assign autocomplete = include.field[1].autocomplete -%}
+
+
+
+
+
+
+ {%- if .help -%}
+
+ {{ help }}
+
+ {%- endif -%}
+
diff --git a/_includes/url.html b/_includes/url.html
deleted file mode 120000
index bc57cd1..0000000
--- a/_includes/url.html
+++ /dev/null
@@ -1 +0,0 @@
-form/url.html
\ No newline at end of file
diff --git a/_includes/url.html b/_includes/url.html
new file mode 100644
index 0000000..a92aa57
--- /dev/null
+++ b/_includes/url.html
@@ -0,0 +1 @@
+{% include input.html field=field %}