diff --git a/view/admin_site.tpl b/view/admin_site.tpl
index 4892dc3145..24cd12b0cb 100644
--- a/view/admin_site.tpl
+++ b/view/admin_site.tpl
@@ -41,13 +41,13 @@
 	<form action="$baseurl/admin/site" method="post">
     <input type='hidden' name='form_security_token' value='$form_security_token'>
 
-	{{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
-	{{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$language }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$theme }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$new_share }}{{ endinc }}
+	{{ inc $field_input with $field=$sitename }}{{ endinc }}
+	{{ inc $field_textarea with $field=$banner }}{{ endinc }}
+	{{ inc $field_select with $field=$language }}{{ endinc }}
+	{{ inc $field_select with $field=$theme }}{{ endinc }}
+	{{ inc $field_select with $field=$theme_mobile }}{{ endinc }}
+	{{ inc $field_select with $field=$ssl_policy }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$new_share }}{{ endinc }}
 
 	
 	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
@@ -83,23 +83,23 @@
 	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
 	
 	<h3>$advanced</h3>
-	{{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$lockpath }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$temppath }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$basepath }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$no_utf }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$verifyssl }}{{ endinc }}
+	{{ inc $field_input with $field=$proxy }}{{ endinc }}
+	{{ inc $field_input with $field=$proxyuser }}{{ endinc }}
+	{{ inc $field_input with $field=$timeout }}{{ endinc }}
+	{{ inc $field_input with $field=$delivery_interval }}{{ endinc }}
+	{{ inc $field_input with $field=$poll_interval }}{{ endinc }}
+	{{ inc $field_input with $field=$maxloadavg }}{{ endinc }}
+	{{ inc $field_input with $field=$abandon_days }}{{ endinc }}
+	{{ inc $field_input with $field=$lockpath }}{{ endinc }}
+	{{ inc $field_input with $field=$temppath }}{{ endinc }}
+	{{ inc $field_input with $field=$basepath }}{{ endinc }}
 
 	<h3>$performance</h3>
-	{{ inc field_checkbox.tpl with $field=$use_fulltext_engine }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$itemcache }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$itemcache_duration }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$use_fulltext_engine }}{{ endinc }}
+	{{ inc $field_input with $field=$itemcache }}{{ endinc }}
+	{{ inc $field_input with $field=$itemcache_duration }}{{ endinc }}
 
 	
 	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
diff --git a/view/smarty3/admin_site.tpl b/view/smarty3/admin_site.tpl
index 60959eb414..290ee0bb1a 100644
--- a/view/smarty3/admin_site.tpl
+++ b/view/smarty3/admin_site.tpl
@@ -47,6 +47,8 @@
 	{{include file="file:{{$field_select}}" field=$theme}}
 	{{include file="file:{{$field_select}}" field=$theme_mobile}}
 	{{include file="file:{{$field_select}}" field=$ssl_policy}}
+	{{include file="file:{{$field_checkbox}}" field=$new_share}}
+
 	
 	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 	
@@ -90,6 +92,15 @@
 	{{include file="file:{{$field_input}}" field=$poll_interval}}
 	{{include file="file:{{$field_input}}" field=$maxloadavg}}
 	{{include file="file:{{$field_input}}" field=$abandon_days}}
+	{{include file="file:{{$field_input}}" field=$lockpath}}
+	{{include file="file:{{$field_input}}" field=$temppath}}
+	{{include file="file:{{$field_input}}" field=$basepath}}
+
+	<h3>{{$performance}}</h3>
+	{{include file="file:{{$field_checkbox}}" field=$use_fulltext_engine}}
+	{{include file="file:{{$field_input}}" field=$itemcache}}
+	{{include file="file:{{$field_input}}" field=$itemcache_duration}}
+
 	
 	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 	
diff --git a/view/theme/dispy/config.php b/view/theme/dispy/config.php
index f2fe11b3d2..78166312dc 100644
--- a/view/theme/dispy/config.php
+++ b/view/theme/dispy/config.php
@@ -65,7 +65,6 @@ function dispy_form(&$a, $font_size, $line_height, $colour) {
 		'dark' => 'dark',						
 	);
 
-	//$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
 	$t = get_markup_template("theme_settings.tpl" );
 
 	$includes = array(
diff --git a/view/theme/dispy/smarty3/theme_settings.tpl b/view/theme/dispy/smarty3/theme_settings.tpl
index 9fcf76b883..0d2d0de3a8 100644
--- a/view/theme/dispy/smarty3/theme_settings.tpl
+++ b/view/theme/dispy/smarty3/theme_settings.tpl
@@ -1,8 +1,8 @@
-{{include file="field_select.tpl" field=$colour}}
+{{include file="file:{{$field_select}}" field=$colour}}
 
-{{include file="field_select.tpl" field=$font_size}}
+{{include file="file:{{$field_select}}" field=$font_size}}
 
-{{include file="field_select.tpl" field=$line_height}}
+{{include file="file:{{$field_select}}" field=$line_height}}
 
 <div class="settings-submit-wrapper">
 	<input type="submit" value="{{$submit}}" class="settings-submit" name="dispy-settings-submit" />
diff --git a/view/theme/dispy/theme_settings.tpl b/view/theme/dispy/theme_settings.tpl
index 9d250cb3aa..9b5af70032 100644
--- a/view/theme/dispy/theme_settings.tpl
+++ b/view/theme/dispy/theme_settings.tpl
@@ -1,8 +1,8 @@
-{{inc field_select.tpl with $field=$colour}}{{endinc}}
+{{inc $field_select with $field=$colour}}{{endinc}}
 
-{{inc field_select.tpl with $field=$font_size}}{{endinc}}
+{{inc $field_select with $field=$font_size}}{{endinc}}
 
-{{inc field_select.tpl with $field=$line_height}}{{endinc}}
+{{inc $field_select with $field=$line_height}}{{endinc}}
 
 <div class="settings-submit-wrapper">
 	<input type="submit" value="$submit" class="settings-submit" name="dispy-settings-submit" />
diff --git a/view/theme/frost-mobile/contact_edit.tpl b/view/theme/frost-mobile/contact_edit.tpl
index b87b3b651c..da192da7d8 100644
--- a/view/theme/frost-mobile/contact_edit.tpl
+++ b/view/theme/frost-mobile/contact_edit.tpl
@@ -70,7 +70,7 @@
 	{{ endif }}
 	<div id="contact-edit-end" ></div>
 
-	{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
+	{{inc $field_checkbox with $field=$hidden }}{{endinc}}
 
 <div id="contact-edit-info-wrapper">
 <h4>$lbl_info1</h4>
diff --git a/view/theme/frost-mobile/smarty3/contact_edit.tpl b/view/theme/frost-mobile/smarty3/contact_edit.tpl
index d5ade11bc0..537a7b22f6 100644
--- a/view/theme/frost-mobile/smarty3/contact_edit.tpl
+++ b/view/theme/frost-mobile/smarty3/contact_edit.tpl
@@ -70,7 +70,7 @@
 	{{/if}}
 	<div id="contact-edit-end" ></div>
 
-	{{include file="field_checkbox.tpl" field=$hidden}}
+	{{include file="file:{{$field_checkbox}}" field=$hidden}}
 
 <div id="contact-edit-info-wrapper">
 <h4>{{$lbl_info1}}</h4>
diff --git a/view/theme/quattro/smarty3/theme_settings.tpl b/view/theme/quattro/smarty3/theme_settings.tpl
index cf2a4935de..4b87ac24c8 100644
--- a/view/theme/quattro/smarty3/theme_settings.tpl
+++ b/view/theme/quattro/smarty3/theme_settings.tpl
@@ -1,8 +1,8 @@
  <script src="{{$baseurl}}/view/theme/quattro/jquery.tools.min.js"></script>
  
-{{include file="field_select.tpl" field=$color}}
+{{include file="file:{{$field_select}}" field=$color}}
 
-{{include file="field_select.tpl" field=$align}}
+{{include file="file:{{$field_select}}" field=$align}}
 
 
 <div class="field">
@@ -29,4 +29,4 @@
 <script>
     
     $(".inputRange").rangeinput();
-</script>
\ No newline at end of file
+</script>
diff --git a/view/theme/quattro/theme_settings.tpl b/view/theme/quattro/theme_settings.tpl
index 47105d7aa4..db70f07e76 100644
--- a/view/theme/quattro/theme_settings.tpl
+++ b/view/theme/quattro/theme_settings.tpl
@@ -1,8 +1,8 @@
  <script src="$baseurl/view/theme/quattro/jquery.tools.min.js"></script>
  
-{{inc field_select.tpl with $field=$color}}{{endinc}}
+{{inc $field_select with $field=$color}}{{endinc}}
 
-{{inc field_select.tpl with $field=$align}}{{endinc}}
+{{inc $field_select with $field=$align}}{{endinc}}
 
 
 <div class="field">
@@ -29,4 +29,4 @@
 <script>
     
     $(".inputRange").rangeinput();
-</script>
\ No newline at end of file
+</script>