diff --git a/classes/themes.class.php b/classes/themes.class.php
index 40709ae..c10857e 100644
--- a/classes/themes.class.php
+++ b/classes/themes.class.php
@@ -107,7 +107,7 @@ class themes{
 		preg_match_all($patron,$this->output,$out);
 
 		foreach($out[1] as $k=>$v){
-				$this->output = str_replace("{__('$v')}",$this->l10n->__($v),$this->output);
+				$this->output = preg_replace("/{__\((?:'|\")$v(?:'|\")\)}/",__($v),$this->output);
 			}
 	}
 }