diff --git a/classesphp/classe_menutemas.php b/classesphp/classe_menutemas.php
index 08a4b4b..96116b9 100644
--- a/classesphp/classe_menutemas.php
+++ b/classesphp/classe_menutemas.php
@@ -154,25 +154,25 @@ array
 		foreach($this->xml->TEMA as $temar)
 		{
 			$down = "nao";
-			if (($temar->DOWNLOAD == "sim") || ($temar->DOWNLOAD == "SIM"))
+			$temp = mb_convert_encoding($temar->DOWNLOAD,"HTML-ENTITIES","auto");
+			if (($temp == "sim") || ($temp == "SIM"))
 			{$down = "sim";}
 			$link = " ";
-			if ($temar->TLINK != "")
-			{$link = mb_convert_encoding($temar->TLINK,"HTML-ENTITIES","auto");}
+			$temp = mb_convert_encoding($temar->TLINK,"HTML-ENTITIES","auto");
+			if ($temp != "")
+			{$link = $temp;}
 			$tid = mb_convert_encoding($temar->TID,"HTML-ENTITIES","auto");
-			if (function_exists("mb_convert_encoding"))
-			{$nome = mb_convert_encoding($temar->TNOME,"HTML-ENTITIES","auto");}
-			else
-			{$nome = $temar->TNOME;}
+			$nome = mb_convert_encoding($temar->TNOME,"HTML-ENTITIES","auto");
 			$temasraiz[] = array("tid"=>$tid,"nome"=>$nome,"link"=>$link,"down"=>$down);
 		}
 		foreach($this->xml->GRUPO as $grupo)
 		{
 			$incluigrupo = TRUE;
-			if ($grupo->PERFIL != "")
+			$temp = mb_convert_encoding($grupo->PERFIL,"HTML-ENTITIES","auto");
+			if ($temp != "")
 			{
 				$incluigrupo = FALSE;
-				$perfis = explode(",",$grupo->PERFIL);
+				$perfis = explode(",",$temp);
 				if (in_array($this->perfil,$perfis))
 				{$incluigrupo = TRUE;}
 			}
@@ -183,26 +183,26 @@ array
 				foreach($grupo->TEMA as $temar)
 				{
 					$down = "nao";
-					if (($temar->DOWNLOAD == "sim") || ($temar->DOWNLOAD == "SIM"))
+					$temp = mb_convert_encoding($temar->DOWNLOAD,"HTML-ENTITIES","auto");
+					if (($temp == "sim") || ($temp == "SIM"))
 					{$down = "sim";}
 					$link = " ";
-					if ($temar->TLINK != "")
-					{$link = mb_convert_encoding($temar->TLINK,"HTML-ENTITIES","auto");}
+					$temp = mb_convert_encoding($temar->TLINK,"HTML-ENTITIES","auto");
+					if ($temp != "")
+					{$link = $temp;}
 					$tid = mb_convert_encoding($temar->TID,"HTML-ENTITIES","auto");
-					if (function_exists("mb_convert_encoding"))
-					{$nome = mb_convert_encoding($temar->TNOME,"HTML-ENTITIES","auto");}
-					else
-					{$nome = $temar->TNOME;}
+					$nome = mb_convert_encoding($temar->TNOME,"HTML-ENTITIES","auto");
 					$temas[] = array("tid"=>$tid,"nome"=>$nome,"link"=>$link,"down"=>$down);
 				}
 				$subgrupos = array();
 				foreach($grupo->SGRUPO as $sgrupo)
 				{
 					$incluisgrupo = TRUE;
-					if ($sgrupo->PERFIL != "")
+					$temp = mb_convert_encoding($sgrupo->PERFIL,"HTML-ENTITIES","auto");
+					if ($temp != "")
 					{
 						$incluisgrupo = FALSE;
-						$perfis = explode(",",$sgrupo->PERFIL);
+						$perfis = explode(",",$temp);
 						if (in_array($this->perfil,$perfis))
 						{$incluisgrupo = TRUE;}
 					}
@@ -212,13 +212,11 @@ array
 						$down = "nao";
 						foreach($sgrupo->TEMA as $tema)
 						{
-							if (($tema->DOWNLOAD == "sim") || ($tema->DOWNLOAD == "SIM"))
+							$temp = mb_convert_encoding($tema->DOWNLOAD,"HTML-ENTITIES","auto");
+							if (($temp == "sim") || ($temp == "SIM"))
 							{$down = "sim";}
 						}
-						if (function_exists("mb_convert_encoding"))
-						{$nome = mb_convert_encoding($sgrupo->SDTIPO,"HTML-ENTITIES","auto");}
-						else
-						{$nome = $sgrupo->SDTIPO;}
+						$nome = mb_convert_encoding($sgrupo->SDTIPO,"HTML-ENTITIES","auto");
 						$subgrupos[] = array("nome"=>$nome,"download"=>$down);
 					}
 				}
diff --git a/symbols/simbolos.sym b/symbols/simbolos.sym
index 9628ad9..7d0df36 100644
--- a/symbols/simbolos.sym
+++ b/symbols/simbolos.sym
@@ -34,29 +34,6 @@ SYMBOLSET
     END
   END
 
-Symbol
-  Name 'ferrovia-line1'
-  Type ELLIPSE
-  Points
-    1 1
-  END
-  FILLED TRUE
-END
-
-Symbol
-  Name 'ferrovia-line2'
-  Type VECTOR
-  Points
-    0 0
-    1 0
-    1 0
-    0 0
-  END
-  FILLED TRUE
-  STYLE
-    5 13 5 13
-  END
-END
   Symbol
     Name "p3"
     Type VECTOR
@@ -160,53 +137,6 @@ END
     Transparent 0
   END
 	
-  Symbol
-    Name "linha"
-    Type ELLIPSE
-    POINTS 1 1 END
-    Transparent 0
-  END
-
-  Symbol
-    Name "linha1"
-    Type ELLIPSE
-    POINTS 1 1 END
-    STYLE 1 4 1 END
-    Transparent 0
-  END
-
-	Symbol 
-	name "dashed" 
-	Type ELLIPSE 
-	FILLED true 
-	POINTS 
-		1 1 
-		END 
-	STYLE 
-		8 3 
-	END 
-  END
-
-	Symbol 
-	name "dashed1" 
-	Type ELLIPSE 
-	FILLED true 
-	POINTS 
-		1 1 
-		END 
-	STYLE 
-		8 8 1 8 
-	END 
-  END 
-
-	Symbol 
-	name "dashed2" 
-	Type ELLIPSE 
-	FILLED true 
-	POINTS 
-    2 0
-		END 
-  END 	
 	
   Symbol
     Name "aviao"
@@ -518,6 +448,33 @@ Symbol
 		1 1 
 		END 
 END
+
+SYMBOLSET
+Symbol
+  Name 'ferrovia-line1'
+  Type ELLIPSE
+  Points
+    1 1
+  END
+  FILLED TRUE
+  STYLE
+    1 13 1 13
+  END
+END
+Symbol
+  Name 'ferrovia-line2'
+  Type VECTOR
+  Points
+    0 0
+    1 0
+    1 0
+    0 0
+  END
+  FILLED TRUE
+  STYLE
+    5 13 5 13
+  END
+END
   Symbol
     Name "pt1l"
     Type VECTOR
@@ -550,116 +507,78 @@ END
     1 13 1 13
   END
   END
-  Symbol
-    Name "setal"
-    Type PIXMAP
-    Image "seta.png"
-  STYLE
-    1 13 1 13
-  END
-  END
-
-  Symbol
-    Name "sedel"
-    Type PIXMAP
-    Image "sede.png"
-    Transparent 1
-  STYLE
-    1 13 1 13
-  END
-
-  END
-
-  Symbol
-    Name "cidmunl"
-    Type PIXMAP
-    Image "cidmun.png"
-  STYLE
-    1 13 1 13
-  END
-    
-  END
 	
   Symbol
-    Name "capitall"
-    Type PIXMAP
-    Image "capital.png"
-  STYLE
-    1 13 1 13
-  END
-
-  END
-
-  Symbol
-    Name "cidadel"
-    Type PIXMAP
-    Image "cidade.png"
-  STYLE
-    1 13 1 13
-  END
-
+    Name "linha"
+    Type ELLIPSE
+    POINTS 1 1 END
+    Transparent 0
   END
 
   Symbol
-    Name "vilal"
-    Type PIXMAP
-    Image "vila.png"
+    Name "linha1"
+    Type ELLIPSE
+    POINTS 1 1 END
+    STYLE 1 4 1 END
+    Transparent 0
   STYLE
-    1 13 1 13
+    10 20 10 20
   END
-
-  END
-
-  Symbol
-    Name "xyl"
-    Type PIXMAP
-    Image "xy.png"
-  STYLE
-    1 13 1 13
   END
 
+	Symbol 
+	name "dashed" 
+	Type ELLIPSE 
+	FILLED true 
+	POINTS 
+		1 1 
+		END 
+	STYLE 
+		8 3 
+	END 
   END
 
-	Symbol
-    Name "xyrl"
-    Type PIXMAP
-    Image "xyr.png"
-  STYLE
-    1 13 1 13
-  END
+	Symbol 
+	name "dashed1" 
+	Type ELLIPSE 
+	FILLED true 
+	POINTS 
+		1 1 
+		END 
+	STYLE 
+		8 8 1 8 
+	END 
+  END 
 
-  END
-	
-  Symbol
-    Name "portol"
-    Type PIXMAP
-    Image "porto.png"
-  STYLE
-    1 13 1 13
-  END
+	Symbol 
+	name "dashed2" 
+	Type ELLIPSE 
+	FILLED true 
+	POINTS 
+    2 0
+		END 
+  END 	
 
-  END
-	
   Symbol
-    Name "refl"
+    Name "setal"
     Type PIXMAP
-    Image "ref.png"
+    Image "seta.png"
   STYLE
     1 13 1 13
   END
-
   END
 
   Symbol
-    Name "marcal"
+    Name "sedel"
     Type PIXMAP
-    Image "marca.png"
+    Image "sede.png"
+    Transparent 1
   STYLE
     1 13 1 13
   END
 
   END
-
+		
 	
   Symbol
     Name "pontol"
@@ -732,87 +651,8 @@ END
 
 	END
 
-  SYMBOL 
-    NAME 'industrial' 
-		TYPE VECTOR 
-		FILLED TRUE 
-		POINTS 
-		0 2
-		0 5
-		4 5
-		4 0
-		3 0
-		3 2
-		0 2
-		END 
-  STYLE
-    1 13 1 13
-  END
-
-	END
 	
-  SYMBOL 
-    NAME 'torrel' 
-		TYPE VECTOR 
-		FILLED FALSE 
-		POINTS 
-		2 0
-		3 4
-		4 4
-		4 5
-		0 5
-		0 4
-		1 4
-		2 0
-		END 
-  STYLE
-    1 13 1 13
-  END
-
-	END
 	
-  SYMBOL 
-    NAME 'mineracaol' 
-		TYPE VECTOR 
-		FILLED FALSE 
-		POINTS 
-		0 0
-		5 5
-		4 6
-		3 7
-		2 6
-		0 5
-		5 0
-		END 
-  STYLE
-    1 13 1 13
-  END
-
-	END
-  SYMBOL 
-    NAME 'cruzl' 
-		TYPE VECTOR 
-		FILLED TRUE 
-		POINTS 
-		2 0
-		3 0
-		3 1
-		5 1
-		5 2
-		3 2
-		3 7
-		2 7
-		2 2
-		0 2
-		0 1
-		2 1
-		2 0
-		END 
-  STYLE
-    1 13 1 13
-  END
-
-	END
 
 Symbol 
 	name "circlel" 
@@ -830,3 +670,5 @@ END
 
 
 
+
+
diff --git a/symbols/simboloslin.sym b/symbols/simboloslin.sym
index b2ce172..51c9eae 100644
--- a/symbols/simboloslin.sym
+++ b/symbols/simboloslin.sym
@@ -1,3 +1,12 @@
+Symbol 
+	name "circle" 
+	Type ELLIPSE 
+	Filled true 
+	POINTS 
+		1 1 
+		END 
+END
+
 SYMBOLSET
 Symbol
   Name 'ferrovia-line1'
@@ -127,97 +136,7 @@ END
   END
 
   END
-
-  Symbol
-    Name "cidmunl"
-    Type PIXMAP
-    Image "cidmun.png"
-  STYLE
-    1 13 1 13
-  END
-    
-  END
-	
-  Symbol
-    Name "capitall"
-    Type PIXMAP
-    Image "capital.png"
-  STYLE
-    1 13 1 13
-  END
-
-  END
-
-  Symbol
-    Name "cidadel"
-    Type PIXMAP
-    Image "cidade.png"
-  STYLE
-    1 13 1 13
-  END
-
-  END
-
-  Symbol
-    Name "vilal"
-    Type PIXMAP
-    Image "vila.png"
-  STYLE
-    1 13 1 13
-  END
-
-  END
-
-  Symbol
-    Name "xyl"
-    Type PIXMAP
-    Image "xy.png"
-  STYLE
-    1 13 1 13
-  END
-
-  END
-
-	Symbol
-    Name "xyrl"
-    Type PIXMAP
-    Image "xyr.png"
-  STYLE
-    1 13 1 13
-  END
-
-  END
-	
-  Symbol
-    Name "portol"
-    Type PIXMAP
-    Image "porto.png"
-  STYLE
-    1 13 1 13
-  END
-
-  END
-	
-  Symbol
-    Name "refl"
-    Type PIXMAP
-    Image "ref.png"
-  STYLE
-    1 13 1 13
-  END
-
-  END
-
-  Symbol
-    Name "marcal"
-    Type PIXMAP
-    Image "marca.png"
-  STYLE
-    1 13 1 13
-  END
-
-  END
-
+		
 	
   Symbol
     Name "pontol"
@@ -290,87 +209,8 @@ END
 
 	END
 
-  SYMBOL 
-    NAME 'industrial' 
-		TYPE VECTOR 
-		FILLED TRUE 
-		POINTS 
-		0 2
-		0 5
-		4 5
-		4 0
-		3 0
-		3 2
-		0 2
-		END 
-  STYLE
-    1 13 1 13
-  END
-
-	END
 	
-  SYMBOL 
-    NAME 'torrel' 
-		TYPE VECTOR 
-		FILLED FALSE 
-		POINTS 
-		2 0
-		3 4
-		4 4
-		4 5
-		0 5
-		0 4
-		1 4
-		2 0
-		END 
-  STYLE
-    1 13 1 13
-  END
-
-	END
 	
-  SYMBOL 
-    NAME 'mineracaol' 
-		TYPE VECTOR 
-		FILLED FALSE 
-		POINTS 
-		0 0
-		5 5
-		4 6
-		3 7
-		2 6
-		0 5
-		5 0
-		END 
-  STYLE
-    1 13 1 13
-  END
-
-	END
-  SYMBOL 
-    NAME 'cruzl' 
-		TYPE VECTOR 
-		FILLED TRUE 
-		POINTS 
-		2 0
-		3 0
-		3 1
-		5 1
-		5 2
-		3 2
-		3 7
-		2 7
-		2 2
-		0 2
-		0 1
-		2 1
-		2 0
-		END 
-  STYLE
-    1 13 1 13
-  END
-
-	END
 
 Symbol 
 	name "circlel" 
@@ -384,6 +224,3 @@ Symbol
   END
 
 END
-
-
-
--
libgit2 0.21.2