diff --git a/templates/EditableFormField.ss b/templates/EditableFormField.ss
index c53169f..045297a 100755
--- a/templates/EditableFormField.ss
+++ b/templates/EditableFormField.ss
@@ -30,9 +30,9 @@
<% if canEdit %>
- <% control Options %>
+ <% loop Options %>
$EditSegment
- <% end_control %>
+ <% end_loop %>
<% if HasAddableOptions %>
-
@@ -41,9 +41,9 @@
<% end_if %>
<% else %>
- <% control Options %>
+ <% loop Options %>
$ReadonlyOption
- <% end_control %>
+ <% end_loop %>
<% end_if %>
@@ -52,18 +52,18 @@
<% if FieldConfiguration %>
<% end_if %>
<% if FieldValidationOptions %>
<% end_if %>
@@ -90,13 +90,13 @@
@@ -117,11 +117,11 @@
<% if CustomRules %>
- <% control CustomRules %>
+ <% loop CustomRules %>
<% include CustomRule %>
- <% end_control %>
+ <% end_loop %>
<% end_if %>
diff --git a/templates/FieldEditor.ss b/templates/FieldEditor.ss
index 522c924..d2c7f1c 100755
--- a/templates/FieldEditor.ss
+++ b/templates/FieldEditor.ss
@@ -5,9 +5,9 @@
- <% control Fields %>
+ <% loop Fields %>
$EditSegment
- <% end_control %>
+ <% end_loop %>
@@ -18,13 +18,13 @@
<% end_if %>
-
\ No newline at end of file
+
diff --git a/templates/Includes/CustomRule.ss b/templates/Includes/CustomRule.ss
index 618aeab..8fb5e16 100644
--- a/templates/Includes/CustomRule.ss
+++ b/templates/Includes/CustomRule.ss
@@ -6,9 +6,9 @@
diff --git a/templates/email/SubmittedFormEmail.ss b/templates/email/SubmittedFormEmail.ss
index 2180029..1a8b3cf 100755
--- a/templates/email/SubmittedFormEmail.ss
+++ b/templates/email/SubmittedFormEmail.ss
@@ -4,9 +4,9 @@ $Body
<% if HideFormData %>
<% else %>
- <% control Fields %>
+ <% loop Fields %>
- <% if Title %>$Title<% else %>$Name<% end_if %>
- $FormattedValue
- <% end_control %>
+ <% end_loop %>
<% end_if %>