diff --git a/boot.php b/boot.php
index 48330212d9..d8bc174b4a 100644
--- a/boot.php
+++ b/boot.php
@@ -1946,3 +1946,18 @@ function clear_cache($basepath = "", $path = "") {
 		closedir($dh);
 	}
 }
+
+function set_template_engine(&$a, $engine = 'internal') {
+
+	$a->theme['template_engine'] = 'internal';
+
+	if(is_writable('view/smarty3/')) {
+		switch($engine) {
+			case 'smarty3':
+				$a->theme['template_engine'] = 'smarty3';
+				break;
+			default:
+				break;
+		}
+	}
+}
diff --git a/include/conversation.php b/include/conversation.php
index 9cc6a83427..a5a6a992ff 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -920,7 +920,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 
 	$o = '';
 
-	$geotag = (($x['allow_location']) ? get_markup_template('jot_geotag.tpl') : '');
+	$geotag = (($x['allow_location']) ? replace_macros(get_markup_template('jot_geotag.tpl'), array()) : '');
 
 /*	$plaintext = false;
 	if( local_user() && (intval(get_pconfig(local_user(),'system','plaintext')) || !feature_enabled(local_user(),'richtext')) )
diff --git a/view/theme/cleanzero/theme.php b/view/theme/cleanzero/theme.php
index c7c0b2d640..356a1b71cb 100644
--- a/view/theme/cleanzero/theme.php
+++ b/view/theme/cleanzero/theme.php
@@ -8,7 +8,7 @@
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 function cleanzero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
diff --git a/view/theme/comix-plain/theme.php b/view/theme/comix-plain/theme.php
index a85d535a72..4e5fd0d0e9 100644
--- a/view/theme/comix-plain/theme.php
+++ b/view/theme/comix-plain/theme.php
@@ -11,7 +11,7 @@
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 $a->page['htmlhead'] .= <<< EOT
 <script>
diff --git a/view/theme/comix/theme.php b/view/theme/comix/theme.php
index 52aa0a927d..ce28ebf189 100644
--- a/view/theme/comix/theme.php
+++ b/view/theme/comix/theme.php
@@ -11,7 +11,7 @@
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 $a->page['htmlhead'] .= <<< EOT
 <script>
diff --git a/view/theme/darkbubble/theme.php b/view/theme/darkbubble/theme.php
index 6a2266dd80..ecd14da772 100644
--- a/view/theme/darkbubble/theme.php
+++ b/view/theme/darkbubble/theme.php
@@ -10,7 +10,7 @@
 $a->theme_info = array(
   'extends' => 'testbubble',
 );
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 
 $a->page['htmlhead'] .= <<< EOT
diff --git a/view/theme/darkzero/theme.php b/view/theme/darkzero/theme.php
index 9fa248ceac..ceafdf5956 100644
--- a/view/theme/darkzero/theme.php
+++ b/view/theme/darkzero/theme.php
@@ -11,7 +11,7 @@
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 function darkzero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index dbfe5a8e8c..becf1584e6 100644
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -8,7 +8,7 @@
  */
 
 $a = get_app();
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 function get_diabook_config($key, $default = false) {
 	if (local_user()) {
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index 71e4e62e19..5168fa8e05 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -22,7 +22,7 @@ $a->theme_info = array(
     'family' => 'dispy',
 	'version' => '1.2.2'
 );
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 function dispy_init(&$a) {
 
diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php
index 6c9048ad7e..bf5a4111fd 100644
--- a/view/theme/duepuntozero/theme.php
+++ b/view/theme/duepuntozero/theme.php
@@ -1,6 +1,6 @@
 <?php
 $a->theme_info = array();
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 function duepuntozero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
diff --git a/view/theme/facepark/theme.php b/view/theme/facepark/theme.php
index eeb4841948..ec1ab1c671 100644
--- a/view/theme/facepark/theme.php
+++ b/view/theme/facepark/theme.php
@@ -1,6 +1,6 @@
 <?php
 $a->theme_info = array();
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 $a->page['htmlhead'] .= <<< EOT
 <script>
diff --git a/view/theme/frost-mobile/theme.php b/view/theme/frost-mobile/theme.php
index 7a2602e602..48dd3ef03d 100644
--- a/view/theme/frost-mobile/theme.php
+++ b/view/theme/frost-mobile/theme.php
@@ -15,7 +15,7 @@ $a->videowidth = 250;
 $a->videoheight = 200;
 $a->theme_thread_allow = false;
 $a->force_max_items = 10;
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 function frost_mobile_content_loaded(&$a) {
 
diff --git a/view/theme/frost/theme.php b/view/theme/frost/theme.php
index 3faf73d2fc..77ada64185 100644
--- a/view/theme/frost/theme.php
+++ b/view/theme/frost/theme.php
@@ -13,7 +13,7 @@ $a->theme_info = array();
 $a->videowidth = 400;
 $a->videoheight = 330;
 $a->theme_thread_allow = false;
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 function frost_content_loaded(&$a) {
 
diff --git a/view/theme/greenzero/theme.php b/view/theme/greenzero/theme.php
index 0818091f63..09a63c040d 100644
--- a/view/theme/greenzero/theme.php
+++ b/view/theme/greenzero/theme.php
@@ -2,7 +2,7 @@
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 function greenzero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
diff --git a/view/theme/purplezero/theme.php b/view/theme/purplezero/theme.php
index a514da669d..fc9d5f91c8 100644
--- a/view/theme/purplezero/theme.php
+++ b/view/theme/purplezero/theme.php
@@ -2,7 +2,7 @@
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 function purplezero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
diff --git a/view/theme/quattro/theme.php b/view/theme/quattro/theme.php
index e21deb8ab5..73d35a1628 100644
--- a/view/theme/quattro/theme.php
+++ b/view/theme/quattro/theme.php
@@ -8,7 +8,7 @@
  */
  
 $a->theme_info = array();
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 function quattro_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
diff --git a/view/theme/slackr/theme.php b/view/theme/slackr/theme.php
index cbd028f7d6..bc09299794 100644
--- a/view/theme/slackr/theme.php
+++ b/view/theme/slackr/theme.php
@@ -2,7 +2,7 @@
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 function slackr_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php
index 3dff381b22..742cb0d1e6 100644
--- a/view/theme/smoothly/theme.php
+++ b/view/theme/smoothly/theme.php
@@ -11,7 +11,7 @@
 
 $a = get_app();
 $a->theme_info = array();
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 function smoothly_init(&$a) {
 	$cssFile = null;
diff --git a/view/theme/testbubble/theme.php b/view/theme/testbubble/theme.php
index b71ab06f79..ab5d175fe5 100644
--- a/view/theme/testbubble/theme.php
+++ b/view/theme/testbubble/theme.php
@@ -8,7 +8,7 @@
  * Maintainer: Mike Macgirvin <mike@macgirvin.com>
  */
 
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 $a->page['htmlhead'] .= <<< EOT
 <script>
diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 7749a26bca..7c0f3d3f8d 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -8,7 +8,7 @@
  * Description: "Vier" uses the font awesome font library: http://fortawesome.github.com/Font-Awesome/
  */
 
-$a->theme['template_engine'] = 'smarty3';
+set_template_engine($a, 'smarty3');
 
 $a->theme_info = array();