diff --git a/classes/themes.class.php b/classes/themes.class.php
index c4b7bd6..aef559e 100755
--- a/classes/themes.class.php
+++ b/classes/themes.class.php
@@ -1,152 +1,215 @@
 <?php
 /*
-    Class name: Themes
-    Class autor: Victor De la Rocha http//mis-algoritmos.com/themes-class
-    Email: vyk2rr [at] gmail [dot] com
+Class name: Themes
+Class autor: Victor De la Rocha http//mis-algoritmos.com/themes-class
+Email: vyk2rr [at] gmail [dot] com
 */
 class themes
 {
-    public $registry;
-    public $path;
-    public $l10n;
+  public $registry;
+  public $path;
+  public $l10n;
 
-    public $output;
-    public $vars=array(); //variable para apilar las variables que se asignan a la plantilla
+  public $output;
+  public $vars=array(); //variable para apilar las variables que se asignan a la plantilla
+  
+  public function __construct()
+  {
+  }
 
-    public function __construct()
-    {
+  public function set($name, $value)
+  {
+    $this->vars[$name] = $value;
+    return true;
+  }
+
+  public function remove($name)
+  {
+    unset($this->vars[$name]);
+    return true;
+  }
+
+  //obtiene el contenido del tema ya con todos los valores sutituidos en las variables.
+  public function fetch($file)
+  {
+    $this->exec($file);
+    return $this->output;
+  }
+
+  //muestra el contenido del tema ya con todos los valroes sustituidos en las variables.
+  public function display($file)
+  {
+    $this->exec($file);
+    echo $this->output;
+  }
+
+  //corre el proceso de sustitucion de valores en las variables del theme y retorna todo en la variable $this->output para ser devuelto por: fetch o display
+  public function exec($file)
+  {
+    $this->file = $file;
+    $output = file_get_contents($file);
+    $this->output = $output;
+    $this->registrar_vars();
+    $this->__();
+    $this->eval_control_structures();
+
+    //evaluate All as PHP code
+    ob_start();
+    eval($this->output);
+    $this->output = stripslashes(ob_get_clean());
+  }
+
+  public function eval_control_structures()
+  {
+    //finding {header *}
+    preg_match_all("/{header ([^}]+?)}/s", $this->output, $out);
+    $headers = '';
+    foreach ($out[1] as $o) {
+      $headers .= "header('$o');\n";
     }
 
-    public function set($name, $value)
-    {
-        $this->vars[$name] = $value;
-        return true;
-    }
+    $this->output = preg_replace("/{header [^}]+?}/s", "", $this->output);
 
-    public function remove($name)
-    {
-        unset($this->vars[$name]);
-        return true;
-    }
+    //fake scape
+    $this->output = $this->quotemeta($this->output);
+    $this->output = str_replace('\"', '\\"', trim($this->output));
 
-    //obtiene el contenido del tema ya con todos los valores sutituidos en las variables.
-    public function fetch($file)
-    {
-        $this->exec($file);
-        return $this->output;
-    }
+    $this->output = "echo \"".str_replace('"', '\"', trim($this->output))."\";";
 
-    //muestra el contenido del tema ya con todos los valroes sustituidos en las variables.
-    public function display($file)
-    {
-        $this->exec($file);
-        echo $this->output;
-    }
+    #$this->output = preg_replace("/\n+/s","\n",$this->output);
+    $this->output = $headers.trim($this->output);
 
-    //corre el proceso de sustitucion de valores en las variables del theme y retorna todo en la variable $this->output para ser devuelto por: fetch o display
-    public function exec($file)
-    {
-        $this->file = $file;
-        $output = file_get_contents($file);
-        $this->output = $output;
-        $this->registrar_vars();
-        $this->__();
-        $this->eval_control_structures();
+    //finding IFs sentences and converting to php code
+    //echo htmlspecialchars($this->output);
+    #$this->output = preg_replace_callback("/{if ([^}]+)}/",create_function('$arr','return "\";if(".stripslashes($arr[1])."){echo\"";'),$this->output);
+    //	$this->output = preg_replace_callback("/{if ([^}]+)}/", create_function('$arr', 'return "\";if(".stripslashes(preg_replace(array("/\\\\$([a-zA-Z0-9_]+)/s","/\\\\\\$this->vars\[\\\'([a-zA-Z0-9_]+)\\\'\]\.([a-zA-Z0-9_]+)/s"),array("\$this->vars[\'\$1\']","\\\\\\$this->vars[\\\'$1\\\'][\\\'$2\\\']"),$arr[1]))."){echo\"";'), $this->output);
+    //        echo htmlspecialchars($this->output);
+    $this->output = preg_replace_callback("/{if ([^}]+)}/", function ($arr) {
+      return "\"; if (" . stripslashes(preg_replace(
+        array("/\\$([a-zA-Z0-9_]+)/s", "/\\\$this->vars\['([a-zA-Z0-9_]+)'\]\.([a-zA-Z0-9_]+)/s"),
+        array("\$this->vars['\$1']", "\\\$this->vars['$1']['$2']"),
+        $arr[1]
+        )) . ") { echo \"";
+        }, $this->output);
 
-        //evaluate All as PHP code
-        ob_start();
-        eval($this->output);
-        $this->output = stripslashes(ob_get_clean());
-    }
-
-    public function eval_control_structures()
-    {
-        //finding {header *}
-        preg_match_all("/{header ([^}]+?)}/s", $this->output, $out);
-        $headers = '';
-        foreach ($out[1] as $o) {
-            $headers .= "header('$o');\n";
-        }
-
-        $this->output = preg_replace("/{header [^}]+?}/s", "", $this->output);
-
-        //fake scape
-        $this->output = $this->quotemeta($this->output);
-        $this->output = str_replace('\"', '\\"', trim($this->output));
-
-        $this->output = "echo \"".str_replace('"', '\"', trim($this->output))."\";";
-
-        #$this->output = preg_replace("/\n+/s","\n",$this->output);
-        $this->output = $headers.trim($this->output);
-
-        //finding IFs sentences and converting to php code
-        #$this->output = preg_replace_callback("/{if ([^}]+)}/",create_function('$arr','return "\";if(".stripslashes($arr[1])."){echo\"";'),$this->output);
-        $this->output = preg_replace_callback("/{if ([^}]+)}/", create_function('$arr', 'return "\";if(".stripslashes(preg_replace(array("/\\\\$([a-zA-Z0-9_]+)/s","/\\\\\\$this->vars\[\\\'([a-zA-Z0-9_]+)\\\'\]\.([a-zA-Z0-9_]+)/s"),array("\$this->vars[\'\$1\']","\\\\\\$this->vars[\\\'$1\\\'][\\\'$2\\\']"),$arr[1]))."){echo\"";'), $this->output);
         $this->output = preg_replace("/{else}/", "\";}else{echo\"", $this->output);
-        $this->output = preg_replace_callback("/{elseif ([^}]+)}/", create_function('$arr', 'return "\";}elseif(".stripslashes(preg_replace(array("/\\\\$([a-zA-Z0-9]+)/s","/\\\\\\$this->vars\[\\\'([a-zA-Z0-9]+)\\\'\]\.([a-zA-Z0-9]+)/s"),array("\$this->vars[\'\$1\']","\\\\\\$this->vars[\\\'$1\\\'][\\\'$2\\\']"),$arr[1]))."){echo\"";'), $this->output);
-        $this->output = preg_replace("/{\/if}/", "\";} echo \"", $this->output);
+          //       	$this->output = preg_replace_callback("/{elseif ([^}]+)}/", create_function('$arr', 'return "\";}elseif(".stripslashes(preg_replace(array("/\\\\$([a-zA-Z0-9]+)/s","/\\\\\\$this->vars\[\\\'([a-zA-Z0-9]+)\\\'\]\.([a-zA-Z0-9]+)/s"),array("\$this->vars[\'\$1\']","\\\\\\$this->vars[\\\'$1\\\'][\\\'$2\\\']"),$arr[1]))."){echo\"";'), $this->output);
 
-        //finding FOREACHs or BLOCKs sentences and converting to php code
-        $this->output = preg_replace_callback("/{block ([^}]+) as ([^}]+)=>[\$]([^}]+)}/", create_function('$arr', 'return "\";foreach(".stripslashes(preg_replace(array("/\\\\$([a-zA-Z0-9_]+)/s","/\\\\\\$this->vars\[\\\'([a-zA-Z0-9_]+)\\\'\]\.([a-zA-Z0-9_]+)/s"),array("\$this->vars[\'\$1\']","\\\\\\$this->vars[\\\'$1\\\'][\\\'$2\\\']"),$arr[1]))." as ".stripslashes(preg_replace(array("/\\\\$([a-zA-Z0-9_]+)/s","/\\\\\\$this->vars\[\\\'([a-zA-Z0-9_]+)\\\'\]\.([a-zA-Z0-9_]+)/s"),array("\$this->vars[\'\$1\']","\\\\\\$this->vars[\\\'$1\\\'][\\\'$2\\\']"),$arr[2]))."=>\$this->vars[\'".stripslashes(preg_replace(array("/\\\\$([a-zA-Z0-9_]+)/s","/\\\\\\$this->vars\[\\\'([a-zA-Z0-9_]+)\\\'\]\.([a-zA-Z0-9_]+)/s"),array("\$this->vars[\'\$1\']","\\\\\\$this->vars[\\\'$1\\\'][\\\'$2\\\']"),$arr[3]))."\']){echo\"";'), $this->output);
-        $this->output = preg_replace_callback("/{block ([^}]+) as ([^}]+)}/", create_function('$arr', 'return "\";foreach(".stripslashes(preg_replace(array("/\\\\$([a-zA-Z0-9_]+)/s","/\\\\\\$this->vars\[\\\'([a-zA-Z0-9_]+)\\\'\]\.([a-zA-Z0-9_]+)/s"),array("\$this->vars[\'\$1\']","\\\\\\$this->vars[\\\'$1\\\'][\\\'$2\\\']"),$arr[1]))." as ".stripslashes(preg_replace(array("/\\\\$([a-zA-Z0-9_]+)/s","/\\\\\\$this->vars\[\\\'([a-zA-Z0-9_]+)\\\'\]\.([a-zA-Z0-9_]+)/s"),array("\$this->vars[\'\$1\']","\\\\\\$this->vars[\\\'$1\\\'][\\\'$2\\\']"),$arr[2]))."){echo\"";'), $this->output);
-        $this->output = preg_replace("/{\/block}/", "\";} echo \"", $this->output);
 
-        //Converting the $this->vars[\'variable\'] format to {$this->vars['variable']}
-        //$this->output = preg_replace("/[\$]this->vars\[\\\'([^ \.\\\]+)\\\'\]\[\\\'([^ \.\\\]+)\\\'\]/","{\$this->vars['$1']['$2']}",$this->output);
-        $this->output = preg_replace("/[\$]this->vars\[\\\'([^ \.\\\]+)\\\'\]/", "{\$this->vars['$1']}", $this->output);
+          $this->output = preg_replace_callback(
+            "/{elseif ([^}]+)}/",
+            function ($arr) {
+              return "\";}elseif(".stripslashes(preg_replace(
+                ["/\\$([a-zA-Z0-9_]+)/s", "/\\\$this->vars\['([a-zA-Z0-9_]+)'\]\.([a-zA-Z0-9_]+)/s"],
+                ["\$this->vars['\$1']", "\\\$this->vars['\$1']['\$2']"],
+                $arr[1]
+                ))."){echo\"";
+                },
+                $this->output
+              );
 
-        //Convertin the {__(\'word\')} format to {__('word')}
-        #$this->output = preg_replace("/[\$]this->vars\[\\\'([^ \.\\\]+)\\\'\]/","{\$this->vars['$1']}",$this->output);
-    }
 
-    //sustituye las variables en el output del template
-    public function registrar_vars()
-    {
-        foreach ($this->vars as $k=>$v) {
-            //pre($this->vars);
-            if (is_array($v)) {
-                //Si es un arreglo, se intenta procesar un nivel mas adentro para sustituir en el theme por lo que tenga: nombredearreglo.dato
-                foreach ($v as $_k=>$_v) {
-                    if (!is_array($_v)) {
-                        $this->output = str_replace('{'.$k.'.'.$_k.'}', $_v, $this->output);
+
+
+              $this->output = preg_replace("/{\/if}/","\";} echo \"",$this->output);
+
+              //finding FOREACHs or BLOCKs sentences and converting to php code
+              //        $this->output = preg_replace_callback("/{block ([^}]+) as ([^}]+)=>[\$]([^}]+)}/", create_function('$arr', 'return "\";foreach(".stripslashes(preg_replace(array("/\\\\$([a-zA-Z0-9_]+)/s","/\\\\\\$this->vars\[\\\'([a-zA-Z0-9_]+)\\\'\]\.([a-zA-Z0-9_]+)/s"),array("\$this->vars[\'\$1\']","\\\\\\$this->vars[\\\'$1\\\'][\\\'$2\\\']"),$arr[1]))." as ".stripslashes(preg_replace(array("/\\\\$([a-zA-Z0-9_]+)/s","/\\\\\\$this->vars\[\\\'([a-zA-Z0-9_]+)\\\'\]\.([a-zA-Z0-9_]+)/s"),array("\$this->vars[\'\$1\']","\\\\\\$this->vars[\\\'$1\\\'][\\\'$2\\\']"),$arr[2]))."=>\$this->vars[\'".stripslashes(preg_replace(array("/\\\\$([a-zA-Z0-9_]+)/s","/\\\\\\$this->vars\[\\\'([a-zA-Z0-9_]+)\\\'\]\.([a-zA-Z0-9_]+)/s"),array("\$this->vars[\'\$1\']","\\\\\\$this->vars[\\\'$1\\\'][\\\'$2\\\']"),$arr[3]))."\']){echo\"";'), $this->output);
+
+              $this->output = preg_replace_callback(
+                "/{block ([^}]+) as ([^}]+)=>[\$]([^}]+)}/",
+                function ($arr) {
+                  $var1 = preg_quote($arr[1], '/');
+                  $var2 = preg_quote($arr[2], '/');
+                  $var3 = preg_quote($arr[3], '/');
+                  return "\";foreach(\$this->vars['$var1'] as \$var2=>\$this->vars['$var3']){echo\""; // Removed unnecessary stripslashes
+                  },
+                  $this->output
+                );
+
+
+
+                //        $this->output = preg_replace_callback("/{block ([^}]+) as ([^}]+)}/", create_function('$arr', 'return "\";foreach(".stripslashes(preg_replace(array("/\\\\$([a-zA-Z0-9_]+)/s","/\\\\\\$this->vars\[\\\'([a-zA-Z0-9_]+)\\\'\]\.([a-zA-Z0-9_]+)/s"),array("\$this->vars[\'\$1\']","\\\\\\$this->vars[\\\'$1\\\'][\\\'$2\\\']"),$arr[1]))." as ".stripslashes(preg_replace(array("/\\\\$([a-zA-Z0-9_]+)/s","/\\\\\\$this->vars\[\\\'([a-zA-Z0-9_]+)\\\'\]\.([a-zA-Z0-9_]+)/s"),array("\$this->vars[\'\$1\']","\\\\\\$this->vars[\\\'$1\\\'][\\\'$2\\\']"),$arr[2]))."){echo\"";'), $this->output);
+
+
+
+
+                $this->output = preg_replace_callback(
+                  "/{block ([^}]+) as ([^}]+)}/",
+                  function ($arr) {
+                    return "\";foreach(".stripslashes(preg_replace(
+                      ["/\\$([a-zA-Z0-9_]+)/s", "/\\\$this->vars\['([a-zA-Z0-9_]+)'\]\.([a-zA-Z0-9_]+)/s"],
+                      ["\$this->vars['\$1']", "\\\$this->vars['\$1']['\$2']"],
+                      $arr[1]
+                      ))." as ".stripslashes(preg_replace(
+                        ["/\\$([a-zA-Z0-9_]+)/s", "/\\\$this->vars\['([a-zA-Z0-9_]+)'\]\.([a-zA-Z0-9_]+)/s"],
+                        ["\$this->vars['\$1']", "\\\$this->vars['\$1']['\$2']"],
+                        $arr[2]
+                        ))."){echo\"";
+                        },
+                        $this->output
+                      );
+
+
+
+                      $this->output = preg_replace("/{\/block}/", "\";} echo \"", $this->output);
+
+                      //Converting the $this->vars[\'variable\'] format to {$this->vars['variable']}
+                      //$this->output = preg_replace("/[\$]this->vars\[\\\'([^ \.\\\]+)\\\'\]\[\\\'([^ \.\\\]+)\\\'\]/","{\$this->vars['$1']['$2']}",$this->output);
+                      $this->output = preg_replace("/[\$]this->vars\[\\\'([^ \.\\\]+)\\\'\]/", "{\$this->vars['$1']}", $this->output);
+
+                      //Convertin the {__(\'word\')} format to {__('word')}
+                      $this->output = preg_replace("/[\$]this->vars\[\\\'([^ \.\\\]+)\\\'\]/","{\$this->vars['$1']}",$this->output);
                     }
-                }
-            } else {
-                // sustituimos directamente las variables {$variable}
-                $this->output = str_replace('{'.$k.'}', $v, $this->output);
-            }
-        }
 
-        //replacing {$key} format by $this->vars['key']
-        //replacing  {$array.key} format by $this->vars['array']['key']
-        $patrones = array(
-            '/{\$([^ \.}]+)}/s',
-            '/{\$([^ \.}]+)\.([^ \.}]+)}/s'
-        );
-        $reemplazos = array(
-            "{\$this->vars['$1']}",
-            "{\$this->vars['$1']['$2']}"
-        );
-        $this->output = preg_replace($patrones, $reemplazos, $this->output);
-    }
+                    //sustituye las variables en el output del template
+                    public function registrar_vars()
+                    {
+                      foreach ($this->vars as $k=>$v) {
+                        //pre($this->vars);
+                        if (is_array($v)) {
+                          //Si es un arreglo, se intenta procesar un nivel mas adentro para sustituir en el theme por lo que tenga: nombredearreglo.dato
+                          foreach ($v as $_k=>$_v) {
+                            if (!is_array($_v)) {
+                              $this->output = str_replace('{'.$k.'.'.$_k.'}', $_v, $this->output);
+                            }
+                          }
+                        } else {
+                          // sustituimos directamente las variables {$variable}
+                          $this->output = str_replace('{'.$k.'}', $v, $this->output);
+                        }
+                      }
 
-    public function quotemeta($str)
-    {
-        $chars = array(/*'.',*/ "\\", /*'+',*/ /*'*',*/ /*'?',*/ /*'[',*/ /*'^',*/ /*']',*/ /*'(',*/ /* '$' Por el momento no validar este*/);
-        foreach ($chars as $char) {
-            $this->output = str_replace($char, "\\$char", $this->output);
-        }
-        return $this->output;
-    }
+                      //replacing {$key} format by $this->vars['key']
+                      //replacing  {$array.key} format by $this->vars['array']['key']
+                      $patrones = array(
+                        '/{\$([^ \.}]+)}/s',
+                        '/{\$([^ \.}]+)\.([^ \.}]+)}/s'
+                      );
+                      $reemplazos = array(
+                        "{\$this->vars['$1']}",
+                        "{\$this->vars['$1']['$2']}"
+                      );
+                      $this->output = preg_replace($patrones, $reemplazos, $this->output);
+                    }
 
-    //Utiliza gettext
-    public function __()
-    {
-        $patron = "/{__\((?:'|\")([^\)]+?)(?:'|\")\)}/s";
-        preg_match_all($patron, $this->output, $out);
+                    public function quotemeta($str)
+                    {
+                    $chars = array(/*'.',*/ "\\", /*'+',*/ /*'*',*/ /*'?',*/ /*'[',*/ /*'^',*/ /*']',*/ /*'(',*/ /* '$' Por el momento no validar este*/);
+                      foreach ($chars as $char) {
+                        $this->output = str_replace($char, "\\$char", $this->output);
+                      }
+                      return $this->output;
+                    }
 
-        foreach ($out[1] as $k=>$v) {
-            $this->output = preg_replace("/{__\((?:'|\")$v(?:'|\")\)}/", __($v), $this->output);
-        }
-    }
-}
+                    //Utiliza gettext
+                    public function __()
+                    {
+                      $patron = "/{__\((?:'|\")([^\)]+?)(?:'|\")\)}/s";
+                      preg_match_all($patron, $this->output, $out);
+
+                      foreach ($out[1] as $k=>$v) {
+                        $this->output = preg_replace("/{__\((?:'|\")$v(?:'|\")\)}/", __($v), $this->output);
+                      }
+                    }
+                  }