diff --git a/classesphp/funcoes_gerais.php b/classesphp/funcoes_gerais.php
index 396e09f..7db763f 100755
--- a/classesphp/funcoes_gerais.php
+++ b/classesphp/funcoes_gerais.php
@@ -2426,278 +2426,144 @@ function getRGBpallete($rule, $value)
     );
 }
 
-// TODO verificar ao fechar versao
-function seems_utf8($Str)
-{ // by bmorel at ssi dot fr
+function fg_seems_utf8($Str) { # by bmorel at ssi dot fr
     $length = strlen($Str);
-    for ($i = 0; $i < $length; $i ++) {
-        if (ord($Str[$i]) < 0x80)
-            continue; // 0bbbbbbb
-        elseif ((ord($Str[$i]) & 0xE0) == 0xC0)
-            $n = 1; // 110bbbbb
-        elseif ((ord($Str[$i]) & 0xF0) == 0xE0)
-            $n = 2; // 1110bbbb
-        elseif ((ord($Str[$i]) & 0xF8) == 0xF0)
-            $n = 3; // 11110bbb
-        elseif ((ord($Str[$i]) & 0xFC) == 0xF8)
-            $n = 4; // 111110bb
-        elseif ((ord($Str[$i]) & 0xFE) == 0xFC)
-            $n = 5; // 1111110b
-        else
-            return false; // Does not match any model
-        for ($j = 0; $j < $n; $j ++) { // n bytes matching 10bbbbbb follow ?
-            if ((++ $i == $length) || ((ord($Str[$i]) & 0xC0) != 0x80))
+    for ($i = 0; $i < $length; $i++) {
+        if (ord($Str[$i]) < 0x80) continue; # 0bbbbbbb
+        elseif ((ord($Str[$i]) & 0xE0) == 0xC0) $n = 1; # 110bbbbb
+        elseif ((ord($Str[$i]) & 0xF0) == 0xE0) $n = 2; # 1110bbbb
+        elseif ((ord($Str[$i]) & 0xF8) == 0xF0) $n = 3; # 11110bbb
+        elseif ((ord($Str[$i]) & 0xFC) == 0xF8) $n = 4; # 111110bb
+        elseif ((ord($Str[$i]) & 0xFE) == 0xFC) $n = 5; # 1111110b
+        else return false; # Does not match any model
+        for ($j = 0; $j < $n; $j++) { # n bytes matching 10bbbbbb follow ?
+            if ((++$i == $length) || ((ord($Str[$i]) & 0xC0) != 0x80))
                 return false;
         }
     }
     return true;
 }
-
-/**
- * TODO Verificar ao fechar versao - verificar a acentuacao das palavras nessa funcao
- */
-function removeAcentos($s)
-{
-    $s = ereg_replace("[&aacute;�&acirc;&atilde;]", "a", $s);
-    $s = ereg_replace("[&Aacute;�&Acirc;&Atilde;]", "A", $s);
-    $s = ereg_replace("[&eacute;�&ecirc;]", "e", $s);
-    $s = ereg_replace("[&iacute;]", "i", $s);
-    $s = ereg_replace("[&Iacute;]", "I", $s);
-    $s = ereg_replace("[&Eacute;�&Ecirc;]", "E", $s);
-    $s = ereg_replace("[��&ocirc;&otilde;]", "o", $s);
-    $s = ereg_replace("[��&Ocirc;&Otilde;]", "O", $s);
-    $s = ereg_replace("[&uacute;��]", "u", $s);
-    $s = ereg_replace("[&Uacute;��]", "U", $s);
-    $s = str_replace("&ccedil;", "c", $s);
-    $s = str_replace("&Ccedil;", "C", $s);
-    // $str = htmlentities($s);
-    $str = preg_replace("/(&)([a-z])([a-z]+;)/i", '$2', $s);
-    $str = preg_replace("/[^A-Z0-9]/i", ' ', $str);
-    $string = preg_replace("/\s+/i", ' ', $str);
-
-    if (! preg_match('/[\x80-\xff]/', $string)) {
+function removeAcentos($string){
+    if (!preg_match('/[\x80-\xff]/', $string)){
         return $string;
     }
-    if ($seems_utf8($string)) {
+    if (fg_seems_utf8($string)) {
         $chars = array(
             // Decompositions for Latin-1 Supplement
-            chr(195) . chr(128) => 'A',
-            chr(195) . chr(129) => 'A',
-            chr(195) . chr(130) => 'A',
-            chr(195) . chr(131) => 'A',
-            chr(195) . chr(132) => 'A',
-            chr(195) . chr(133) => 'A',
-            chr(195) . chr(135) => 'C',
-            chr(195) . chr(136) => 'E',
-            chr(195) . chr(137) => 'E',
-            chr(195) . chr(138) => 'E',
-            chr(195) . chr(139) => 'E',
-            chr(195) . chr(140) => 'I',
-            chr(195) . chr(141) => 'I',
-            chr(195) . chr(142) => 'I',
-            chr(195) . chr(143) => 'I',
-            chr(195) . chr(145) => 'N',
-            chr(195) . chr(146) => 'O',
-            chr(195) . chr(147) => 'O',
-            chr(195) . chr(148) => 'O',
-            chr(195) . chr(149) => 'O',
-            chr(195) . chr(150) => 'O',
-            chr(195) . chr(153) => 'U',
-            chr(195) . chr(154) => 'U',
-            chr(195) . chr(155) => 'U',
-            chr(195) . chr(156) => 'U',
-            chr(195) . chr(157) => 'Y',
-            chr(195) . chr(159) => 's',
-            chr(195) . chr(160) => 'a',
-            chr(195) . chr(161) => 'a',
-            chr(195) . chr(162) => 'a',
-            chr(195) . chr(163) => 'a',
-            chr(195) . chr(164) => 'a',
-            chr(195) . chr(165) => 'a',
-            chr(195) . chr(167) => 'c',
-            chr(195) . chr(168) => 'e',
-            chr(195) . chr(169) => 'e',
-            chr(195) . chr(170) => 'e',
-            chr(195) . chr(171) => 'e',
-            chr(195) . chr(172) => 'i',
-            chr(195) . chr(173) => 'i',
-            chr(195) . chr(174) => 'i',
-            chr(195) . chr(175) => 'i',
-            chr(195) . chr(177) => 'n',
-            chr(195) . chr(178) => 'o',
-            chr(195) . chr(179) => 'o',
-            chr(195) . chr(180) => 'o',
-            chr(195) . chr(181) => 'o',
-            chr(195) . chr(182) => 'o',
-            chr(195) . chr(182) => 'o',
-            chr(195) . chr(185) => 'u',
-            chr(195) . chr(186) => 'u',
-            chr(195) . chr(187) => 'u',
-            chr(195) . chr(188) => 'u',
-            chr(195) . chr(189) => 'y',
-            chr(195) . chr(191) => 'y',
+            chr(195).chr(128) => 'A', chr(195).chr(129) => 'A',
+            chr(195).chr(130) => 'A', chr(195).chr(131) => 'A',
+            chr(195).chr(132) => 'A', chr(195).chr(133) => 'A',
+            chr(195).chr(135) => 'C', chr(195).chr(136) => 'E',
+            chr(195).chr(137) => 'E', chr(195).chr(138) => 'E',
+            chr(195).chr(139) => 'E', chr(195).chr(140) => 'I',
+            chr(195).chr(141) => 'I', chr(195).chr(142) => 'I',
+            chr(195).chr(143) => 'I', chr(195).chr(145) => 'N',
+            chr(195).chr(146) => 'O', chr(195).chr(147) => 'O',
+            chr(195).chr(148) => 'O', chr(195).chr(149) => 'O',
+            chr(195).chr(150) => 'O', chr(195).chr(153) => 'U',
+            chr(195).chr(154) => 'U', chr(195).chr(155) => 'U',
+            chr(195).chr(156) => 'U', chr(195).chr(157) => 'Y',
+            chr(195).chr(159) => 's', chr(195).chr(160) => 'a',
+            chr(195).chr(161) => 'a', chr(195).chr(162) => 'a',
+            chr(195).chr(163) => 'a', chr(195).chr(164) => 'a',
+            chr(195).chr(165) => 'a', chr(195).chr(167) => 'c',
+            chr(195).chr(168) => 'e', chr(195).chr(169) => 'e',
+            chr(195).chr(170) => 'e', chr(195).chr(171) => 'e',
+            chr(195).chr(172) => 'i', chr(195).chr(173) => 'i',
+            chr(195).chr(174) => 'i', chr(195).chr(175) => 'i',
+            chr(195).chr(177) => 'n', chr(195).chr(178) => 'o',
+            chr(195).chr(179) => 'o', chr(195).chr(180) => 'o',
+            chr(195).chr(181) => 'o', chr(195).chr(182) => 'o',
+            chr(195).chr(182) => 'o', chr(195).chr(185) => 'u',
+            chr(195).chr(186) => 'u', chr(195).chr(187) => 'u',
+            chr(195).chr(188) => 'u', chr(195).chr(189) => 'y',
+            chr(195).chr(191) => 'y',
             // Decompositions for Latin Extended-A
-            chr(196) . chr(128) => 'A',
-            chr(196) . chr(129) => 'a',
-            chr(196) . chr(130) => 'A',
-            chr(196) . chr(131) => 'a',
-            chr(196) . chr(132) => 'A',
-            chr(196) . chr(133) => 'a',
-            chr(196) . chr(134) => 'C',
-            chr(196) . chr(135) => 'c',
-            chr(196) . chr(136) => 'C',
-            chr(196) . chr(137) => 'c',
-            chr(196) . chr(138) => 'C',
-            chr(196) . chr(139) => 'c',
-            chr(196) . chr(140) => 'C',
-            chr(196) . chr(141) => 'c',
-            chr(196) . chr(142) => 'D',
-            chr(196) . chr(143) => 'd',
-            chr(196) . chr(144) => 'D',
-            chr(196) . chr(145) => 'd',
-            chr(196) . chr(146) => 'E',
-            chr(196) . chr(147) => 'e',
-            chr(196) . chr(148) => 'E',
-            chr(196) . chr(149) => 'e',
-            chr(196) . chr(150) => 'E',
-            chr(196) . chr(151) => 'e',
-            chr(196) . chr(152) => 'E',
-            chr(196) . chr(153) => 'e',
-            chr(196) . chr(154) => 'E',
-            chr(196) . chr(155) => 'e',
-            chr(196) . chr(156) => 'G',
-            chr(196) . chr(157) => 'g',
-            chr(196) . chr(158) => 'G',
-            chr(196) . chr(159) => 'g',
-            chr(196) . chr(160) => 'G',
-            chr(196) . chr(161) => 'g',
-            chr(196) . chr(162) => 'G',
-            chr(196) . chr(163) => 'g',
-            chr(196) . chr(164) => 'H',
-            chr(196) . chr(165) => 'h',
-            chr(196) . chr(166) => 'H',
-            chr(196) . chr(167) => 'h',
-            chr(196) . chr(168) => 'I',
-            chr(196) . chr(169) => 'i',
-            chr(196) . chr(170) => 'I',
-            chr(196) . chr(171) => 'i',
-            chr(196) . chr(172) => 'I',
-            chr(196) . chr(173) => 'i',
-            chr(196) . chr(174) => 'I',
-            chr(196) . chr(175) => 'i',
-            chr(196) . chr(176) => 'I',
-            chr(196) . chr(177) => 'i',
-            chr(196) . chr(178) => 'IJ',
-            chr(196) . chr(179) => 'ij',
-            chr(196) . chr(180) => 'J',
-            chr(196) . chr(181) => 'j',
-            chr(196) . chr(182) => 'K',
-            chr(196) . chr(183) => 'k',
-            chr(196) . chr(184) => 'k',
-            chr(196) . chr(185) => 'L',
-            chr(196) . chr(186) => 'l',
-            chr(196) . chr(187) => 'L',
-            chr(196) . chr(188) => 'l',
-            chr(196) . chr(189) => 'L',
-            chr(196) . chr(190) => 'l',
-            chr(196) . chr(191) => 'L',
-            chr(197) . chr(128) => 'l',
-            chr(197) . chr(129) => 'L',
-            chr(197) . chr(130) => 'l',
-            chr(197) . chr(131) => 'N',
-            chr(197) . chr(132) => 'n',
-            chr(197) . chr(133) => 'N',
-            chr(197) . chr(134) => 'n',
-            chr(197) . chr(135) => 'N',
-            chr(197) . chr(136) => 'n',
-            chr(197) . chr(137) => 'N',
-            chr(197) . chr(138) => 'n',
-            chr(197) . chr(139) => 'N',
-            chr(197) . chr(140) => 'O',
-            chr(197) . chr(141) => 'o',
-            chr(197) . chr(142) => 'O',
-            chr(197) . chr(143) => 'o',
-            chr(197) . chr(144) => 'O',
-            chr(197) . chr(145) => 'o',
-            chr(197) . chr(146) => 'OE',
-            chr(197) . chr(147) => 'oe',
-            chr(197) . chr(148) => 'R',
-            chr(197) . chr(149) => 'r',
-            chr(197) . chr(150) => 'R',
-            chr(197) . chr(151) => 'r',
-            chr(197) . chr(152) => 'R',
-            chr(197) . chr(153) => 'r',
-            chr(197) . chr(154) => 'S',
-            chr(197) . chr(155) => 's',
-            chr(197) . chr(156) => 'S',
-            chr(197) . chr(157) => 's',
-            chr(197) . chr(158) => 'S',
-            chr(197) . chr(159) => 's',
-            chr(197) . chr(160) => 'S',
-            chr(197) . chr(161) => 's',
-            chr(197) . chr(162) => 'T',
-            chr(197) . chr(163) => 't',
-            chr(197) . chr(164) => 'T',
-            chr(197) . chr(165) => 't',
-            chr(197) . chr(166) => 'T',
-            chr(197) . chr(167) => 't',
-            chr(197) . chr(168) => 'U',
-            chr(197) . chr(169) => 'u',
-            chr(197) . chr(170) => 'U',
-            chr(197) . chr(171) => 'u',
-            chr(197) . chr(172) => 'U',
-            chr(197) . chr(173) => 'u',
-            chr(197) . chr(174) => 'U',
-            chr(197) . chr(175) => 'u',
-            chr(197) . chr(176) => 'U',
-            chr(197) . chr(177) => 'u',
-            chr(197) . chr(178) => 'U',
-            chr(197) . chr(179) => 'u',
-            chr(197) . chr(180) => 'W',
-            chr(197) . chr(181) => 'w',
-            chr(197) . chr(182) => 'Y',
-            chr(197) . chr(183) => 'y',
-            chr(197) . chr(184) => 'Y',
-            chr(197) . chr(185) => 'Z',
-            chr(197) . chr(186) => 'z',
-            chr(197) . chr(187) => 'Z',
-            chr(197) . chr(188) => 'z',
-            chr(197) . chr(189) => 'Z',
-            chr(197) . chr(190) => 'z',
-            chr(197) . chr(191) => 's',
+            chr(196).chr(128) => 'A', chr(196).chr(129) => 'a',
+            chr(196).chr(130) => 'A', chr(196).chr(131) => 'a',
+            chr(196).chr(132) => 'A', chr(196).chr(133) => 'a',
+            chr(196).chr(134) => 'C', chr(196).chr(135) => 'c',
+            chr(196).chr(136) => 'C', chr(196).chr(137) => 'c',
+            chr(196).chr(138) => 'C', chr(196).chr(139) => 'c',
+            chr(196).chr(140) => 'C', chr(196).chr(141) => 'c',
+            chr(196).chr(142) => 'D', chr(196).chr(143) => 'd',
+            chr(196).chr(144) => 'D', chr(196).chr(145) => 'd',
+            chr(196).chr(146) => 'E', chr(196).chr(147) => 'e',
+            chr(196).chr(148) => 'E', chr(196).chr(149) => 'e',
+            chr(196).chr(150) => 'E', chr(196).chr(151) => 'e',
+            chr(196).chr(152) => 'E', chr(196).chr(153) => 'e',
+            chr(196).chr(154) => 'E', chr(196).chr(155) => 'e',
+            chr(196).chr(156) => 'G', chr(196).chr(157) => 'g',
+            chr(196).chr(158) => 'G', chr(196).chr(159) => 'g',
+            chr(196).chr(160) => 'G', chr(196).chr(161) => 'g',
+            chr(196).chr(162) => 'G', chr(196).chr(163) => 'g',
+            chr(196).chr(164) => 'H', chr(196).chr(165) => 'h',
+            chr(196).chr(166) => 'H', chr(196).chr(167) => 'h',
+            chr(196).chr(168) => 'I', chr(196).chr(169) => 'i',
+            chr(196).chr(170) => 'I', chr(196).chr(171) => 'i',
+            chr(196).chr(172) => 'I', chr(196).chr(173) => 'i',
+            chr(196).chr(174) => 'I', chr(196).chr(175) => 'i',
+            chr(196).chr(176) => 'I', chr(196).chr(177) => 'i',
+            chr(196).chr(178) => 'IJ',chr(196).chr(179) => 'ij',
+            chr(196).chr(180) => 'J', chr(196).chr(181) => 'j',
+            chr(196).chr(182) => 'K', chr(196).chr(183) => 'k',
+            chr(196).chr(184) => 'k', chr(196).chr(185) => 'L',
+            chr(196).chr(186) => 'l', chr(196).chr(187) => 'L',
+            chr(196).chr(188) => 'l', chr(196).chr(189) => 'L',
+            chr(196).chr(190) => 'l', chr(196).chr(191) => 'L',
+            chr(197).chr(128) => 'l', chr(197).chr(129) => 'L',
+            chr(197).chr(130) => 'l', chr(197).chr(131) => 'N',
+            chr(197).chr(132) => 'n', chr(197).chr(133) => 'N',
+            chr(197).chr(134) => 'n', chr(197).chr(135) => 'N',
+            chr(197).chr(136) => 'n', chr(197).chr(137) => 'N',
+            chr(197).chr(138) => 'n', chr(197).chr(139) => 'N',
+            chr(197).chr(140) => 'O', chr(197).chr(141) => 'o',
+            chr(197).chr(142) => 'O', chr(197).chr(143) => 'o',
+            chr(197).chr(144) => 'O', chr(197).chr(145) => 'o',
+            chr(197).chr(146) => 'OE',chr(197).chr(147) => 'oe',
+            chr(197).chr(148) => 'R',chr(197).chr(149) => 'r',
+            chr(197).chr(150) => 'R',chr(197).chr(151) => 'r',
+            chr(197).chr(152) => 'R',chr(197).chr(153) => 'r',
+            chr(197).chr(154) => 'S',chr(197).chr(155) => 's',
+            chr(197).chr(156) => 'S',chr(197).chr(157) => 's',
+            chr(197).chr(158) => 'S',chr(197).chr(159) => 's',
+            chr(197).chr(160) => 'S', chr(197).chr(161) => 's',
+            chr(197).chr(162) => 'T', chr(197).chr(163) => 't',
+            chr(197).chr(164) => 'T', chr(197).chr(165) => 't',
+            chr(197).chr(166) => 'T', chr(197).chr(167) => 't',
+            chr(197).chr(168) => 'U', chr(197).chr(169) => 'u',
+            chr(197).chr(170) => 'U', chr(197).chr(171) => 'u',
+            chr(197).chr(172) => 'U', chr(197).chr(173) => 'u',
+            chr(197).chr(174) => 'U', chr(197).chr(175) => 'u',
+            chr(197).chr(176) => 'U', chr(197).chr(177) => 'u',
+            chr(197).chr(178) => 'U', chr(197).chr(179) => 'u',
+            chr(197).chr(180) => 'W', chr(197).chr(181) => 'w',
+            chr(197).chr(182) => 'Y', chr(197).chr(183) => 'y',
+            chr(197).chr(184) => 'Y', chr(197).chr(185) => 'Z',
+            chr(197).chr(186) => 'z', chr(197).chr(187) => 'Z',
+            chr(197).chr(188) => 'z', chr(197).chr(189) => 'Z',
+            chr(197).chr(190) => 'z', chr(197).chr(191) => 's',
             // Euro Sign
-            chr(226) . chr(130) . chr(172) => 'E',
+            chr(226).chr(130).chr(172) => 'E',
             // GBP (Pound) Sign
-            chr(194) . chr(163) => ''
-        );
+            chr(194).chr(163) => '');
         $string = strtr($string, $chars);
     } else {
         // Assume ISO-8859-1 if not UTF-8
-        $chars['in'] = chr(128) . chr(131) . chr(138) . chr(142) . chr(154) . chr(158) . chr(159) . chr(162) . chr(165) . chr(181) . chr(192) . chr(193) . chr(194) . chr(195) . chr(196) . chr(197) . chr(199) . chr(200) . chr(201) . chr(202) . chr(203) . chr(204) . chr(205) . chr(206) . chr(207) . chr(209) . chr(210) . chr(211) . chr(212) . chr(213) . chr(214) . chr(216) . chr(217) . chr(218) . chr(219) . chr(220) . chr(221) . chr(224) . chr(225) . chr(226) . chr(227) . chr(228) . chr(229) . chr(231) . chr(232) . chr(233) . chr(234) . chr(235) . chr(236) . chr(237) . chr(238) . chr(239) . chr(241) . chr(242) . chr(243) . chr(244) . chr(245) . chr(246) . chr(248) . chr(249) . chr(250) . chr(251) . chr(252) . chr(253) . chr(255);
+        $chars['in'] = chr(128).chr(131).chr(138).chr(142).chr(154).chr(158)
+        .chr(159).chr(162).chr(165).chr(181).chr(192).chr(193).chr(194)
+        .chr(195).chr(196).chr(197).chr(199).chr(200).chr(201).chr(202)
+        .chr(203).chr(204).chr(205).chr(206).chr(207).chr(209).chr(210)
+        .chr(211).chr(212).chr(213).chr(214).chr(216).chr(217).chr(218)
+        .chr(219).chr(220).chr(221).chr(224).chr(225).chr(226).chr(227)
+        .chr(228).chr(229).chr(231).chr(232).chr(233).chr(234).chr(235)
+        .chr(236).chr(237).chr(238).chr(239).chr(241).chr(242).chr(243)
+        .chr(244).chr(245).chr(246).chr(248).chr(249).chr(250).chr(251)
+        .chr(252).chr(253).chr(255);
         $chars['out'] = "EfSZszYcYuAAAAAACEEEEIIIINOOOOOOUUUUYaaaaaaceeeeiiiinoooooouuuuyy";
         $string = strtr($string, $chars['in'], $chars['out']);
-        $double_chars['in'] = array(
-            chr(140),
-            chr(156),
-            chr(198),
-            chr(208),
-            chr(222),
-            chr(223),
-            chr(230),
-            chr(240),
-            chr(254)
-        );
-        $double_chars['out'] = array(
-            'OE',
-            'oe',
-            'AE',
-            'DH',
-            'TH',
-            'ss',
-            'ae',
-            'dh',
-            'th'
-        );
+        $double_chars['in'] = array(chr(140), chr(156), chr(198), chr(208), chr(222), chr(223), chr(230), chr(240), chr(254));
+        $double_chars['out'] = array('OE', 'oe', 'AE', 'DH', 'TH', 'ss', 'ae', 'dh', 'th');
         $string = str_replace($double_chars['in'], $double_chars['out'], $string);
     }
     return $string;
diff --git a/ferramentas/conectargeorss/index.js b/ferramentas/conectargeorss/index.js
index 800cac1..3a0c285 100755
--- a/ferramentas/conectargeorss/index.js
+++ b/ferramentas/conectargeorss/index.js
@@ -30,6 +30,7 @@ i3GEOF.conectargeorss = {
 	},
 	destroy: function(){
 	    //nao use this aqui
+	    i3GEOF.conectargeorss.renderFunction.call();
 	},
 	html:function() {
 	    var p = this._parameters,
@@ -38,7 +39,7 @@ i3GEOF.conectargeorss = {
 		    locaplic: i3GEO.configura.locaplic,
 		    namespace: p.namespace,
 		    idContainer: p.idContainer,
-		    botao: $trad("p14"),
+		    botao: $trad("adicmapa"),
 		    ...i3GEO.idioma.objetoIdioma(i3f.dicionario)
 	    };
 	    i3f.renderFunction.call(
@@ -53,9 +54,10 @@ i3GEOF.conectargeorss = {
 	    var data = i3GEO.util.getFormData("#" + this._parameters.idContainer + " form");
 	    return data
 	},
-	adiciona: function(btn){
+	adiciona: function(formEl){
+	    var btn = $(formEl).find(":submit");
+	    btn.prop("disabled",true).find("span").removeClass("hidden");
 	    i3GEO.janela.abreAguarde();
-	    $(btn).button("disable").find("span").removeClass("hidden");
 	    var par = this.getFormData(),
 	    i3f = this;
 	    par.g_sid = i3GEO.configura.sid;
@@ -66,23 +68,23 @@ i3GEOF.conectargeorss = {
 	    )
 	    .done(
 		    function(data, status){
+			btn.prop("disabled",false).find("span").addClass("hidden");
 			i3GEO.janela.fechaAguarde();
 			if(data.errorMsg != ""){
 			    i3GEO.janela.snackBar({content: data.errorMsg, style:'red'});
 			} else {
 			    i3GEO.atualiza();
 			    i3GEO.janela.snackBar({content: $trad("concluido",i3f.dicionario)});
-			    i3f.destroy();
 			}
-			$(btn).button("disable").find("span").addClass("hidden");
+			i3f.destroy();
 		    }
 	    )
 	    .fail(
 		    function(data){
+			btn.prop("disabled",false).find("span").addClass("hidden");
 			i3GEO.janela.fechaAguarde();
 			i3GEO.janela.snackBar({content: data.status, style:'red'});
 			i3f.destroy();
-			$(btn).button("disable").find("span").addClass("hidden");
 		    }
 	    );
 	}
diff --git a/ferramentas/conectargeorss/template_mst.html b/ferramentas/conectargeorss/template_mst.html
index cdcfe33..86e68af 100755
--- a/ferramentas/conectargeorss/template_mst.html
+++ b/ferramentas/conectargeorss/template_mst.html
@@ -1,14 +1,13 @@
 <div id='{{idContainer}}' class='container-fluid container-tools'>
-    <form class="form-vertical">
+    <form action="#" onsubmit="i3GEOF.{{namespace}}.adiciona(this);return false;" class="form-vertical">
         <div class='form-group label-fixed condensed'>
             <label class="col-md-12 control-label">{{{inseregeorss}}}</label>
             <div class="col-md-12 ">
                 <input required class="form-control input-lg" type='text' id='{{namespace}}url' name="url" value='' />
             </div>
         </div>
+        <button type="submit" class='btn btn-primary btn-sm btn-raised'>
+            <span class="glyphicon glyphicon-repeat normal-right-spinner hidden"></span> {{{botao}}}
+        </button>
     </form>
-    <button onclick="i3GEOF.{{namespace}}.adiciona(this)" class='btn btn-primary btn-sm btn-raised'>
-        <span class="glyphicon glyphicon-repeat normal-right-spinner hidden"></span> {{{botao}}}
-    </button>
-    <br> <br>
 </div>
\ No newline at end of file
diff --git a/ferramentas/conectarkml/index.js b/ferramentas/conectarkml/index.js
index dc3efcc..b06c05c 100644
--- a/ferramentas/conectarkml/index.js
+++ b/ferramentas/conectarkml/index.js
@@ -29,7 +29,7 @@ i3GEOF.conectarkml = {
 	},
 	destroy: function(){
 	    //nao use this aqui
-	    //i3GEOF.conectarkml._parameters.mustache = "";
+	    i3GEOF.conectarkml.renderFunction.call();
 	},
 	html:function() {
 	    var p = this._parameters,
@@ -38,7 +38,7 @@ i3GEOF.conectarkml = {
 		    locaplic: i3GEO.configura.locaplic,
 		    namespace: p.namespace,
 		    idContainer: p.idContainer,
-		    botao: $trad("p14"),
+		    botao: $trad("adicmapa"),
 		    ...i3GEO.idioma.objetoIdioma(i3f.dicionario)
 	    };
 	    i3f.renderFunction.call(
@@ -52,9 +52,10 @@ i3GEOF.conectarkml = {
 	    var data = i3GEO.util.getFormData("#" + this._parameters.idContainer + " form");
 	    return data
 	},
-	adiciona: function(btn){
+	adiciona: function(formEl){
+	    var btn = $(formEl).find(":submit");
+	    btn.prop("disabled",true).find("span").removeClass("hidden");
 	    i3GEO.janela.abreAguarde();
-	    $(btn).button("disable").find("span").removeClass("hidden");
 	    var par = this.getFormData(),
 	    	i3f = this;
 	    par.g_sid = i3GEO.configura.sid;
@@ -68,7 +69,7 @@ i3GEOF.conectarkml = {
 			i3GEO.atualiza();
 			i3GEO.janela.fechaAguarde();
 			i3GEO.janela.snackBar({content: $trad("concluido",i3f.dicionario)});
-			$(btn).button("disable").find("span").addClass("hidden");
+			btn.prop("disabled",false).find("span").addClass("hidden");
 			i3f.destroy();
 		    }
 	    )
@@ -76,7 +77,7 @@ i3GEOF.conectarkml = {
 		    function(data){
 			i3GEO.janela.fechaAguarde();
 			i3GEO.janela.snackBar({content: data.status, style:'red'});
-			$(btn).button("disable").find("span").addClass("hidden");
+			btn.prop("disabled",false).find("span").addClass("hidden");
 			i3f.destroy();
 		    }
 	    );
diff --git a/ferramentas/conectarkml/template_mst.html b/ferramentas/conectarkml/template_mst.html
index 614f81a..15382f7 100644
--- a/ferramentas/conectarkml/template_mst.html
+++ b/ferramentas/conectarkml/template_mst.html
@@ -1,14 +1,13 @@
 <div id='{{idContainer}}' class='container-fluid container-tools'>
-    <form class="form-vertical">
+    <form action="#" onsubmit="i3GEOF.{{namespace}}.adiciona(this);return false;" class="form-vertical">
         <div class='form-group label-fixed condensed'>
             <label class="col-md-12 control-label">{{{insereKml}}}</label>
             <div class="col-md-12 ">
                 <input required class="form-control input-lg" type='text' id='{{namespace}}url' name="url" value='' />
             </div>
         </div>
+        <button type="submit" class='btn btn-primary btn-sm btn-raised'>
+            <span class="glyphicon glyphicon-repeat normal-right-spinner hidden"></span> {{{botao}}}
+        </button>
     </form>
-    <button onclick="i3GEOF.{{namespace}}.adiciona(this)" class='btn btn-primary btn-sm btn-raised'>
-        <span class="glyphicon glyphicon-repeat normal-right-spinner hidden"></span> {{{botao}}}
-    </button>
-    <br> <br>
 </div>
\ No newline at end of file
diff --git a/ferramentas/opcoesescala/index.js b/ferramentas/opcoesescala/index.js
index 9d14a73..3341044 100644
--- a/ferramentas/opcoesescala/index.js
+++ b/ferramentas/opcoesescala/index.js
@@ -83,7 +83,8 @@ i3GEOF.opcoesescala = {
 	},
 	mudaEscalaGrafica: function(btn){
 	    i3GEO.janela.abreAguarde();
-	    $(btn).button("disable").find("span").removeClass("hidden");
+	    btn = $(btn);
+	    btn.prop("disabled",true).find("span").removeClass("hidden");
 	    var par = this.getFormData(),
 	    	i3f = this;
 	    par.g_sid = i3GEO.configura.sid;
@@ -94,6 +95,7 @@ i3GEOF.opcoesescala = {
 	    )
 	    .done(
 		    function(data, status){
+			btn.prop("disabled",false).find("span").addClass("hidden");
 			i3GEO.janela.fechaAguarde();
 			i3GEO.janela.snackBar({content: $trad("concluido",i3f.dicionario)});
 			i3f.destroy();
@@ -101,6 +103,7 @@ i3GEOF.opcoesescala = {
 	    )
 	    .fail(
 		    function(data){
+			btn.prop("disabled",false).find("span").addClass("hidden");
 			i3GEO.janela.fechaAguarde();
 			i3GEO.janela.snackBar({content: data.status, style:'red'});
 			i3f.destroy();
@@ -109,7 +112,8 @@ i3GEOF.opcoesescala = {
 	},
 	test: function(btn){
 	    i3GEO.janela.abreAguarde();
-	    $(btn).button("disable").find("span").removeClass("hidden");
+	    btn = $(btn);
+	    btn.prop("disabled",true).find("span").removeClass("hidden");
 	    var par = this.getFormData(),
 	    	i3f = this;
 	    par.g_sid = i3GEO.configura.sid;
@@ -121,14 +125,14 @@ i3GEOF.opcoesescala = {
 	    .done(
 		    function(data, status){
 			i3GEO.janela.fechaAguarde();
-			$(btn).button("enable").find("span").addClass("hidden");
+			btn.prop("disabled",false).find("span").addClass("hidden");
 			i3GEO.janela.closeMsg("<img src='" + data + "' >");
 		    }
 	    )
 	    .fail(
 		    function(data){
 			i3GEO.janela.fechaAguarde();
-			$(btn).button("enable").find("span").addClass("hidden");
+			btn.prop("disabled",false).find("span").addClass("hidden");
 			i3GEO.janela.snackBar({content: data.status, style:'red'});
 		    }
 	    );
diff --git a/ferramentas/opcoeslegenda/index.js b/ferramentas/opcoeslegenda/index.js
index ca8815a..63a5e8e 100644
--- a/ferramentas/opcoeslegenda/index.js
+++ b/ferramentas/opcoeslegenda/index.js
@@ -82,7 +82,8 @@ i3GEOF.opcoeslegenda = {
 	},
 	aplicaParametrosLegImg: function(btn){
 	    i3GEO.janela.abreAguarde();
-	    $(btn).button("disable").find("span").removeClass("hidden");
+	    btn = $(btn);
+	    btn.prop("disabled",true).find("span").removeClass("hidden");
 	    var par = this.getFormData(),
 	    	i3f = this;
 	    par.g_sid = i3GEO.configura.sid;
@@ -93,6 +94,7 @@ i3GEOF.opcoeslegenda = {
 	    )
 	    .done(
 		    function(data, status){
+			btn.prop("disabled",false).find("span").addClass("hidden");
 			i3GEO.janela.fechaAguarde();
 			i3GEO.janela.snackBar({content: $trad("concluido",i3f.dicionario)});
 			i3f.destroy();
@@ -100,6 +102,7 @@ i3GEOF.opcoeslegenda = {
 	    )
 	    .fail(
 		    function(data){
+			btn.prop("disabled",false).find("span").addClass("hidden");
 			i3GEO.janela.fechaAguarde();
 			i3GEO.janela.snackBar({content: data.status, style:'red'});
 			i3f.destroy();
@@ -108,7 +111,8 @@ i3GEOF.opcoeslegenda = {
 	},
 	test: function(btn){
 	    i3GEO.janela.abreAguarde();
-	    $(btn).button("disable").find("span").removeClass("hidden");
+	    btn = $(btn);
+	    btn.prop("disabled",true).find("span").removeClass("hidden");
 	    var par = this.getFormData(),
 	    	i3f = this;
 	    par.g_sid = i3GEO.configura.sid;
@@ -120,7 +124,7 @@ i3GEOF.opcoeslegenda = {
 	    .done(
 		    function(data, status){
 			i3GEO.janela.fechaAguarde();
-			$(btn).button("enable").find("span").addClass("hidden");
+			btn.prop("disabled",false).find("span").addClass("hidden");
 			i3GEO.janela.closeMsg("<img src='" + data + "' >");
 		    }
 	    )
@@ -128,7 +132,7 @@ i3GEOF.opcoeslegenda = {
 		    function(data){
 			i3GEO.janela.fechaAguarde();
 			i3GEO.janela.snackBar({content: data.status, style:'red'});
-			$(btn).button("enable").find("span").addClass("hidden");
+			btn.prop("disabled",false).find("span").addClass("hidden");
 		    }
 	    );
 	}
diff --git a/ferramentas/opcoesmaparef/index.js b/ferramentas/opcoesmaparef/index.js
index 85864d8..14d1315 100644
--- a/ferramentas/opcoesmaparef/index.js
+++ b/ferramentas/opcoesmaparef/index.js
@@ -85,7 +85,8 @@ i3GEOF.opcoesmaparef = {
 	},
 	altera: function(btn){
 	    i3GEO.janela.abreAguarde();
-	    $(btn).button("disable").find("span").removeClass("hidden");
+	    btn = $(btn);
+	    btn.prop("disabled",true).find("span").removeClass("hidden");
 	    var par = this.getFormData(),
 	    	i3f = this;
 	    par.g_sid = i3GEO.configura.sid;
@@ -96,6 +97,7 @@ i3GEOF.opcoesmaparef = {
 	    )
 	    .done(
 		    function(data, status){
+			btn.prop("disabled",false).find("span").addClass("hidden");
 			i3GEO.janela.fechaAguarde();
 			i3GEO.janela.snackBar({content: $trad("concluido",i3f.dicionario)});
 			i3f.destroy();
@@ -103,6 +105,7 @@ i3GEOF.opcoesmaparef = {
 	    )
 	    .fail(
 		    function(data){
+			btn.prop("disabled",false).find("span").addClass("hidden");
 			i3GEO.janela.fechaAguarde();
 			i3GEO.janela.snackBar({content: data.status, style:'red'});
 			i3f.destroy();
diff --git a/ferramentas/opcoestamanho/index.js b/ferramentas/opcoestamanho/index.js
index 3b2ee06..84b08a1 100644
--- a/ferramentas/opcoestamanho/index.js
+++ b/ferramentas/opcoestamanho/index.js
@@ -62,7 +62,8 @@ i3GEOF.opcoestamanho = {
 	},
 	mudatamanho: function(btn){
 	    i3GEO.janela.abreAguarde();
-	    $(btn).button("disable").find("span").removeClass("hidden");
+	    btn = $(btn);
+	    btn.prop("disabled",true).find("span").removeClass("hidden");
 	    var par = this.getFormData(),
 	    	i3f = this;
 	    par.g_sid = i3GEO.configura.sid;
@@ -73,6 +74,7 @@ i3GEOF.opcoestamanho = {
 	    )
 	    .done(
 		    function(data, status){
+			btn.prop("disabled",false).find("span").addClass("hidden");
 			i3GEO.janela.fechaAguarde();
 			i3GEO.janela.snackBar({content: $trad("concluido",i3f.dicionario)});
 			i3f.destroy();
@@ -80,6 +82,7 @@ i3GEOF.opcoestamanho = {
 	    )
 	    .fail(
 		    function(data){
+			btn.prop("disabled",false).find("span").addClass("hidden");
 			i3GEO.janela.fechaAguarde();
 			i3GEO.janela.snackBar({content: data.status, style:'red'});
 			i3f.destroy();
diff --git a/ferramentas/uploaddbf/index.js b/ferramentas/uploaddbf/index.js
index 2a5239c..af6de4b 100755
--- a/ferramentas/uploaddbf/index.js
+++ b/ferramentas/uploaddbf/index.js
@@ -1,146 +1,67 @@
-/*
-Title: Upload de arquivo dbf
-
-Envia para o servidor um arquivo local (dbf ou csv) e insere como uma camada no mapa.
-
-Veja:
-
-<i3GEO.arvoreDeTemas.dialogo.uploaddbf>
-
-Arquivo: i3geo/ferramentas/uploaddbf/index.js.php
-
-About: Licen&ccedil;a
-
-i3Geo Interface Integrada de Ferramentas de Geoprocessamento para Internet
-
-Direitos Autorais Reservados (c) 2006 Minist&eacute;rio do Meio Ambiente Brasil
-Desenvolvedor: Edmar Moretti edmar.moretti@gmail.com
-
-Este programa &eacute; software livre; voc&ecirc; pode redistribu&iacute;-lo
-e/ou modific&aacute;-lo sob os termos da Licen&ccedil;a P&uacute;blica Geral
-GNU conforme publicada pela Free Software Foundation;
-
-Este programa &eacute; distribu&iacute;do na expectativa de que seja &uacute;til,
-por&eacute;m, SEM NENHUMA GARANTIA; nem mesmo a garantia impl&iacute;cita
-de COMERCIABILIDADE OU ADEQUA&Ccedil;&Atilde;O A UMA FINALIDADE ESPEC&Iacute;FICA.
-Consulte a Licen&ccedil;a P&uacute;blica Geral do GNU para mais detalhes.
-Voc&ecirc; deve ter recebido uma c&oacute;pia da Licen&ccedil;a P&uacute;blica Geral do
-GNU junto com este programa; se n&atilde;o, escreva para a
-Free Software Foundation, Inc., no endere&ccedil;o
-59 Temple Street, Suite 330, Boston, MA 02111-1307 USA.
-*/
 if(typeof(i3GEOF) === 'undefined'){
 	var i3GEOF = {};
 }
-/*
-Classe: i3GEOF.uploaddbf
-*/
 i3GEOF.uploaddbf = {
-	/*
-	Variavel: aguarde
-
-	Estilo do objeto DOM com a imagem de aguarde existente no cabe&ccedil;alho da janela.
-	*/
-	aguarde: "",
-	MUSTACHE: "",
-	/**
-	 * Susbtitutos para o template
-	 */
-	mustacheHash : function() {
-		var dicionario = i3GEO.idioma.objetoIdioma(i3GEOF.uploaddbf.dicionario);
-		dicionario["locaplic"] = i3GEO.configura.locaplic;
-		dicionario["sid"] = i3GEO.configura.sid;
-		return dicionario;
+	renderFunction: i3GEO.janela.formModal,
+	_parameters : {
+	    "mustache": "",
+	    "idContainer": "i3GEOuploaddbf",
+	    "namespace": "uploaddbf",
+	    "dataForm": ""
 	},
-	/*
-	Function: inicia
-
-	Inicia a ferramenta. &Eacute; chamado por criaJanelaFlutuante
-
-	Parametro:
-
-	iddiv {String} - id do div que receber&aacute; o conteudo HTML da ferramenta
-	*/
-	inicia: function(iddiv){
-		if(i3GEOF.uploaddbf.MUSTACHE == ""){
-			$.get(i3GEO.configura.locaplic + "/ferramentas/uploaddbf/template_mst.html", function(template) {
-				i3GEOF.uploaddbf.MUSTACHE = template;
-				i3GEOF.uploaddbf.inicia(iddiv);
-			});
-			return;
-		}
-		$i(iddiv).innerHTML = i3GEOF.uploaddbf.html();
-
-		i3GEO.util.radioEpsg(
-			function(retorno){
-				$i("i3GEOuploaddbfListaepsg").innerHTML = retorno.dados;
-			},
-			"i3GEOuploaddbfListaepsg",
-			"uploaddbf"
-		);
+	start : function(){
+	    var p = this._parameters,
+	    i3f = this,
+	    t1 = i3GEO.configura.locaplic + "/ferramentas/"+p.namespace+"/template_mst.html";
+	    if(p.mustache === ""){
+		i3GEO.janela.abreAguarde();
+		$.get(t1).done(function(r1) {
+		    p.mustache = r1;
+		    i3f.html();
+		    i3GEO.janela.fechaAguarde();
+		    if(p.dataForm.errorMsg && p.dataForm.errorMsg != ""){
+			i3GEO.janela.snackBar({content: p.dataForm.errorMsg, style:'red'});
+			i3GEO.janela.fechaAguarde();
+			i3f.destroy();
+		    }
+		}).fail(function(data) {
+		    i3GEO.janela.snackBar({content: "Erro. " + data.status, style:'red'});
+		    i3f.destroy();
+		});
+	    } else {
+		i3f.html();
+	    }
 	},
-	/*
-	Function: html
-
-	Gera o c&oacute;digo html para apresenta&ccedil;&atilde;o das op&ccedil;&otilde;es da ferramenta
-
-	Retorno:
-
-	String com o c&oacute;digo html
-	*/
-	html:function() {
-		var ins = Mustache.render(i3GEOF.uploaddbf.MUSTACHE, i3GEOF.uploaddbf.mustacheHash());
-		return ins;
+	destroy: function(){
+	    //nao use this aqui
+	    i3GEOF.uploaddbf.renderFunction.call();
+	},
+	doneok: function(){
+	    i3GEO.janela.snackBar({content: $trad("camadaadic")});
+	    this.destroy();
 	},
-	/*
-	Function: iniciaJanelaFlutuante
-
-	Cria a janela flutuante para controle da ferramenta.
-	*/
-	iniciaJanelaFlutuante: function(){
-		var janela,divid,titulo,cabecalho,minimiza;
-		if ($i("i3GEOF.uploaddbf")) {
-			return;
-		}
-		cabecalho = function(){};
-		minimiza = function(){
-			i3GEO.janela.minimiza("i3GEOF.uploaddbf",200);
-		};
-		titulo = "<span class='i3GeoTituloJanelaBsNolink' >" + $trad("a2b") + "</span></div>";
-		janela = i3GEO.janela.cria(
-			"320px",
-			"480px",
-			"",
-			"",
-			"",
-			titulo,
-			"i3GEOF.uploaddbf",
-			false,
-			"hd",
-			cabecalho,
-			minimiza,
-			"",
-			true,
-			"",
-			"",
-			"",
-			"",
-			"26"
-		);
-		divid = janela[2].id;
-		$i("i3GEOF.uploaddbf_corpo").style.backgroundColor = "white";
-		i3GEOF.uploaddbf.aguarde = $i("i3GEOF.uploaddbf_imagemCabecalho").style;
-		i3GEOF.uploaddbf.inicia(divid);
+	html:function() {
+	    var p = this._parameters,
+	    i3f = this,
+	    hash = {
+		    locaplic: i3GEO.configura.locaplic,
+		    namespace: p.namespace,
+		    sid: i3GEO.configura.sid,
+		    idContainer: p.idContainer,
+		    adicmapa : $trad("adicmapa"),
+		    ...i3GEO.idioma.objetoIdioma(i3f.dicionario)
+	    };
+	    i3f.renderFunction.call(
+		    this,
+		    {
+			texto: Mustache.render(p.mustache, hash),
+			onclose: i3f.destroy
+		    });
+	    i3GEO.util.comboEpsg("uploaddbfEPSG","i3GEOuploaddbfListaepsg");
 	},
-	/*
-	Function: submete
-
-	Envia o arquivo ao servidor
-	*/
-	submete: function(){
-		if(i3GEOF.uploaddbf.aguarde.visibility==="visible")
-		{return;}
-		i3GEOF.uploaddbf.aguarde.visibility="visible";
-		$i("i3GEOuploaddbff").submit();
+	submete: function(btn){
+	    i3GEO.janela.abreAguarde();
+	    $(btn).prop("disabled",true).find("span").removeClass("hidden");
+	    $("#" + this._parameters.idContainer + " form").submit();
 	}
 };
diff --git a/ferramentas/uploaddbf/template_mst.html b/ferramentas/uploaddbf/template_mst.html
index 77cd26f..a5096fe 100755
--- a/ferramentas/uploaddbf/template_mst.html
+++ b/ferramentas/uploaddbf/template_mst.html
@@ -1,40 +1,46 @@
-<div class='container-fluid'>
-<h5></h5>
-	<form class="form-horizontal" role="form" id='i3GEOuploaddbff' target='i3GEOuploaddbfiframe' action='{{{locaplic}}}/ferramentas/uploaddbf/upload.php' method='post' ENCTYPE='multipart/form-data'>
-		<div class="input-group-btn">
-			<button style="margin-right:10px;" type="button" class="btn btn-primary btn-raised pull-left" onclick="$(this).parent().find('input[type=file]').click();">{{{arquivo}}}</button>
-			<input name="i3GEOuploaddbffile" onchange="$(this).parent().find('.form-control').html($(this).val().split(/[\\|/]/).pop());" style="display: none;" type="file">
-			<span class="form-control upload"></span>
-		</div>
-		<br>
-		<div class='form-group label-fixed condensed'>
-			<label class="control-label">{{{tipoArquivo}}}</label>
-			<div style="width: 100%;" class="input-group">
-				<select class="form-control" name="i3GEOuploaddbftipoarquivo">
-					<option value='dbf' selected>dbf</option>
+<div id='{{idContainer}}' class='container-fluid container-tools'>
+	<form accept-charset="utf-8" class="form-horizontal" target="i3GEOuploaddbfiframe" action="{{{locaplic}}}/ferramentas/uploaddbf/upload.php" method="post" ENCTYPE="multipart/form-data">
+        <div class='form-group label-fixed condensed'>
+            <label class="col-md-6 control-label">{{{arquivo}}}</label>
+            <div class="col-md-6 ">
+                <input required onclick="$(this).parent().find('input[type=file]').click();" class="form-control input-lg" type='text' name="i3GEOuploaddbffile" />
+                <input name="i3GEOuploaddbffile" onchange="$(this).parent().find('.form-control').val($(this).val().split(/[\\|/]/).pop());" style="display: none;" type="file">
+                <b class="caret careti"></b>
+            </div>
+        </div>
+        <div style="width: 100%;" class='form-group label-fixed condensed'>
+            <label class="col-md-6 control-label">{{{tipoArquivo}}}</label>
+            <div class="col-md-6">
+                <select class="form-control" name="i3GEOuploaddbftipoarquivo">
+                    <option value='dbf' selected>dbf</option>
 					<option value='csvpv'>csv separado por ;</option>
 					<option value='csvv'>csv separado por ,</option>
-				</select><b class="caret careti"></b>
-			</div>
-		</div>
-		<div class='form-group label-fixed condensed'>
-			<label class="control-label" for="">{{{colunaX}}}</label>
-			<input class="form-control input-lg" type='text' name="i3GEOuploaddbfnomex" value='' />
-		</div>
-		<div class='form-group label-fixed condensed'>
-			<label class="control-label" for="">{{{colunaY}}}</label>
-			<input class="form-control input-lg" type='text' name="i3GEOuploaddbfnomey" value='' />
-		</div>
-
-		<div class='form-group label-fixed condensed'>
-			<label class="control-label" for="tipo">{{{projecao}}}</label>
-			<div style="width: 100%;" class="input-group"></div>
-			<div id=i3GEOuploaddbfListaepsg style="text-align: left; overflow: auto; height: 70px; margin-top: 8px;"></div>
-		</div>
-		<hr />
-		<button name="submit" onclick="i3GEOF.uploaddbf.submete()" class='btn btn-primary btn-sm btn-raised'>{{{criaCamada}}}</button>
+                </select><b class="caret careti"></b>
+            </div>
+        </div>
+        <div class='form-group label-fixed condensed'>
+            <label class="col-md-6 control-label">{{{colunaX}}}</label>
+            <div class="col-md-6 ">
+                <input class="form-control input-lg " type='text' name='i3GEOuploaddbfnomex' value='' />
+            </div>
+        </div>
+        <div class='form-group label-fixed condensed'>
+            <label class="col-md-6 control-label">{{{colunaY}}}</label>
+            <div class="col-md-6 ">
+                <input class="form-control input-lg " type='text' name='i3GEOuploaddbfnomey' value='' />
+            </div>
+        </div>
+        <div style="width: 100%;" class='form-group label-fixed condensed'>
+            <label class="col-md-6 control-label">{{{projecao}}}</label>
+            <div class="col-md-6">
+                <div id='i3GEOuploaddbfListaepsg'></div>
+            </div>
+        </div>
+		<button name="submit" onclick="i3GEOF.uploaddbf.submete(this)" class='btn btn-primary btn-sm btn-raised'>
+            <span class="glyphicon glyphicon-repeat normal-right-spinner hidden"></span>{{{adicmapa}}}
+        </button>
 		<input type='hidden' name='g_sid' value='{{{sid}}}'>
 		<input type='hidden' name='MAX_FILE_SIZE' value='100000'>
 	</form>
-	<iframe name='i3GEOuploaddbfiframe' style='text-align: left; border: 1px solid gray;' width='98%' height='60px'></iframe>
+    <iframe name=i3GEOuploaddbfiframe style="text-align: left; border: 1px solid rgb(242, 232, 232);" width="98%" height="60px"></iframe>
 </div>
\ No newline at end of file
diff --git a/ferramentas/uploaddbf/upload.php b/ferramentas/uploaddbf/upload.php
index f95f7cd..6c475c3 100755
--- a/ferramentas/uploaddbf/upload.php
+++ b/ferramentas/uploaddbf/upload.php
@@ -13,9 +13,6 @@ if (ob_get_level() == 0) ob_start();
 ?>
 <html>
 <head>
-<link rel="stylesheet" type="text/css" href="../../css/input.css" />
-<link rel="stylesheet" type="text/css" href="../../css/geral.css" />
-<title></title>
 </head>
 <body bgcolor="white" style="background-color:white;text-align:left;">
 <p>
@@ -198,7 +195,7 @@ if (isset($_FILES['i3GEOuploaddbffile']['name']) && strlen(basename($_FILES['i3G
 			{$novolayer->setProjection("init=epsg:".$uploaddbfEPSG);}
 			$salvo = $mapa->save($map_file);
 			echo "<b>Tema criado!!!";
-			echo "<script>window.scrollTo(0,10000);window.parent.i3GEO.atualiza()</script>";
+			echo "<script>window.scrollTo(0,10000);window.parent.i3GEO.atualiza();window.parent.i3GEOF.uploaddbf.doneok();</script>";
 		}
 	}
 	else
@@ -209,9 +206,9 @@ if (isset($_FILES['i3GEOuploaddbffile']['name']) && strlen(basename($_FILES['i3G
 	}
 }
 restauraCon($map_file,$postgis_mapa);
-paraAguarde();
+
 function paraAguarde(){
-	echo "<script>window.scrollTo(0,10000);window.parent.i3GEOF.uploaddbf.aguarde.visibility='hidden';</script>";
+	echo "<script>window.parent.i3GEOF.uploaddbf.destroy();</script>";
 }
 function verificaNome($nome)
 {
diff --git a/ferramentas/uploadgpx/dependencias.php b/ferramentas/uploadgpx/dependencias.php
index 5fb6800..e47bb5d 100755
--- a/ferramentas/uploadgpx/dependencias.php
+++ b/ferramentas/uploadgpx/dependencias.php
@@ -1,8 +1,6 @@
 <?php
 include(dirname(__FILE__)."/../blacklist.php");
 verificaBlFerramentas(basename(dirname(__FILE__)));
-
-
 /**
  * Carrega os programas javascript necessarios para a ferramenta
  * Esse programa e usado na tag <script> ou com a funcao scripttag do i3Geo
diff --git a/ferramentas/uploadgpx/index.js b/ferramentas/uploadgpx/index.js
index 7187f3b..ab73419 100755
--- a/ferramentas/uploadgpx/index.js
+++ b/ferramentas/uploadgpx/index.js
@@ -1,154 +1,67 @@
-/*
-Title: GPX
-
-Envia para o servidor um arquivo no formato GPX local e insere como novas camadas no mapa.
-
-Veja:
-
-<i3GEO.arvoreDeTemas.dialogo.uploadgpx>
-
-Arquivo:
-
-i3geo/ferramentas/uploadgpx/index.js.php
-
-Licenca:
-
-GPL2
-
-i3Geo Interface Integrada de Ferramentas de Geoprocessamento para Internet
-
-Direitos Autorais Reservados (c) 2006 Minist&eacute;rio do Meio Ambiente Brasil
-Desenvolvedor: Edmar Moretti edmar.moretti@gmail.com
-
-Este programa &eacute; software livre; voc&ecirc; pode redistribu&iacute;-lo
-e/ou modific&aacute;-lo sob os termos da Licen&ccedil;a P&uacute;blica Geral
-GNU conforme publicada pela Free Software Foundation;
-
-Este programa &eacute; distribu&iacute;do na expectativa de que seja &uacute;til,
-por&eacute;m, SEM NENHUMA GARANTIA; nem mesmo a garantia impl&iacute;cita
-de COMERCIABILIDADE OU ADEQUA&Ccedil;&Atilde;O A UMA FINALIDADE ESPEC&Iacute;FICA.
-Consulte a Licen&ccedil;a P&uacute;blica Geral do GNU para mais detalhes.
-Voc&ecirc; deve ter recebido uma c&oacute;pia da Licen&ccedil;a P&uacute;blica Geral do
-GNU junto com este programa; se n&atilde;o, escreva para a
-Free Software Foundation, Inc., no endere&ccedil;o
-59 Temple Street, Suite 330, Boston, MA 02111-1307 USA.
-*/
-
-
 if(typeof(i3GEOF) === 'undefined'){
 	var i3GEOF = {};
 }
-/*
-Classe: i3GEOF.uploadgpx
-*/
 i3GEOF.uploadgpx = {
-	/*
-	Variavel: aguarde
-
-	Estilo do objeto DOM com a imagem de aguarde existente no cabe&ccedil;alho da janela.
-	*/
-	aguarde: "",
-	/**
-	 * Susbtitutos para o template
-	 */
-	mustacheHash : function() {
-		var dicionario = i3GEO.idioma.objetoIdioma(i3GEOF.uploadgpx.dicionario);
-		dicionario["sid"] = i3GEO.configura.sid;
-		dicionario["locaplic"] = i3GEO.configura.locaplic;
-		return dicionario;
+	renderFunction: i3GEO.janela.formModal,
+	_parameters : {
+	    "mustache": "",
+	    "idContainer": "i3GEOuploadgpx",
+	    "namespace": "uploadgpx",
+	    "dataForm": ""
 	},
-	MUSTACHE: "",
-	/*
-	Function: inicia
-
-	Inicia a ferramenta. &Eacute; chamado por criaJanelaFlutuante
-
-	Parametro:
-
-	iddiv {String} - id do div que receber&aacute; o conteudo HTML da ferramenta
-	*/
-	inicia: function(iddiv){
-		if(i3GEOF.uploadgpx.MUSTACHE == ""){
-			$.get(i3GEO.configura.locaplic + "/ferramentas/uploadgpx/template_mst.html", function(template) {
-				i3GEOF.uploadgpx.MUSTACHE = template;
-				i3GEOF.uploadgpx.inicia(iddiv);
-			});
-			return;
-		}
-		try{
-			$i(iddiv).innerHTML = i3GEOF.uploadgpx.html();
-
-			i3GEO.util.radioEpsg(
-				function(retorno)
-				{$i("i3GEOuploadgpxListaepsg").innerHTML = retorno.dados;},
-				"i3GEOuploadgpxListaepsg",
-				"uploadgpx"
-			);
-		}
-		catch(erro){i3GEO.janela.tempoMsg(erro);}
+	start : function(){
+	    var p = this._parameters,
+	    i3f = this,
+	    t1 = i3GEO.configura.locaplic + "/ferramentas/"+p.namespace+"/template_mst.html";
+	    if(p.mustache === ""){
+		i3GEO.janela.abreAguarde();
+		$.get(t1).done(function(r1) {
+		    p.mustache = r1;
+		    i3f.html();
+		    i3GEO.janela.fechaAguarde();
+		    if(p.dataForm.errorMsg && p.dataForm.errorMsg != ""){
+			i3GEO.janela.snackBar({content: p.dataForm.errorMsg, style:'red'});
+			i3GEO.janela.fechaAguarde();
+			i3f.destroy();
+		    }
+		}).fail(function(data) {
+		    i3GEO.janela.snackBar({content: "Erro. " + data.status, style:'red'});
+		    i3f.destroy();
+		});
+	    } else {
+		i3f.html();
+	    }
 	},
-	/*
-	Function: html
-
-	Gera o c&oacute;digo html para apresenta&ccedil;&atilde;o das op&ccedil;&otilde;es da ferramenta
-
-	Retorno:
-
-	String com o c&oacute;digo html
-	*/
-	html : function() {
-		var ins = Mustache.render(i3GEOF.uploadgpx.MUSTACHE, i3GEOF.uploadgpx.mustacheHash());
-		return ins;
+	destroy: function(){
+	    //nao use this aqui
+	    i3GEOF.uploadgpx.renderFunction.call();
 	},
-	/*
-	Function: iniciaJanelaFlutuante
-
-	Cria a janela flutuante para controle da ferramenta.
-	*/
-	iniciaJanelaFlutuante: function(){
-		var janela,divid,titulo,cabecalho,minimiza;
-		if ($i("i3GEOF.uploadgpx")) {
-			return;
-		}
-		cabecalho = function(){};
-		minimiza = function(){
-			i3GEO.janela.minimiza("i3GEOF.uploadgpx",200);
-		};
-		titulo = "<span class='i3GeoTituloJanelaBsNolink' >GPX</span></div>";
-		janela = i3GEO.janela.cria(
-			"400px",
-			"330px",
-			"",
-			"",
-			"",
-			titulo,
-			"i3GEOF.uploadgpx",
-			false,
-			"hd",
-			cabecalho,
-			minimiza,
-			"",
-			true,
-			"",
-			"",
-			"",
-			"",
-			"103"
-		);
-		divid = janela[2].id;
-		$i("i3GEOF.uploadgpx_corpo").style.backgroundColor = "white";
-		i3GEOF.uploadgpx.aguarde = $i("i3GEOF.uploadgpx_imagemCabecalho").style;
-		i3GEOF.uploadgpx.inicia(divid);
+	doneok: function(){
+	    i3GEO.janela.snackBar({content: $trad("camadaadic")});
+	    this.destroy();
 	},
-	/*
-	Function: submete
-
-	Submete o arquivo ao servidor.
-	*/
-	submete: function(){
-		if(i3GEOF.uploadgpx.aguarde.visibility==="visible")
-		{return;}
-		i3GEOF.uploadgpx.aguarde.visibility="visible";
-		$i("i3GEOuploadgpxf").submit();
+	html:function() {
+	    var p = this._parameters,
+	    i3f = this,
+	    hash = {
+		    locaplic: i3GEO.configura.locaplic,
+		    namespace: p.namespace,
+		    sid: i3GEO.configura.sid,
+		    idContainer: p.idContainer,
+		    adicmapa : $trad("adicmapa"),
+		    ...i3GEO.idioma.objetoIdioma(i3f.dicionario)
+	    };
+	    i3f.renderFunction.call(
+		    this,
+		    {
+			texto: Mustache.render(p.mustache, hash),
+			onclose: i3f.destroy
+		    });
+	    i3GEO.util.comboEpsg("uploadgpxEPSG","i3GEOuploadgpxListaepsg");
+	},
+	submete: function(btn){
+	    i3GEO.janela.abreAguarde();
+	    $(btn).prop("disabled",true).find("span").removeClass("hidden");
+	    $("#" + this._parameters.idContainer + " form").submit();
 	}
 };
diff --git a/ferramentas/uploadgpx/template_mst.html b/ferramentas/uploadgpx/template_mst.html
index 46b9078..4e49dbb 100755
--- a/ferramentas/uploadgpx/template_mst.html
+++ b/ferramentas/uploadgpx/template_mst.html
@@ -1,24 +1,24 @@
-<div class='container-fluid'>
-	<h5></h5>
-
-	<form class="form-horizontal" role="form" id='i3GEOuploadgpxf' target='i3GEOuploadgpxiframe' action='{{{locaplic}}}/ferramentas/uploadgpx/upload.php' method='post' ENCTYPE='multipart/form-data'>
-		<div class="input-group-btn">
-			<button style="margin-right:10px;" type="button" class="btn btn-primary btn-raised pull-left" onclick="$(this).parent().find('input[type=file]').click();">{{{arquivoGpx}}}</button>
-			<input name="i3GEOuploadgpx" onchange="$(this).parent().find('.form-control').html($(this).val().split(/[\\|/]/).pop());" style="display: none;" type="file">
-			<span class="form-control upload"></span>
-		</div>
-		<br>
-		<div class='form-group label-fixed condensed'>
-			<label class="control-label" for="tipo">{{{projecao}}}</label>
-			<div class="input-group"></div>
-			<div id=i3GEOuploadgpxListaepsg style="text-align: left; overflow: auto; height: 70px; margin-top: 8px;"></div>
-		</div>
-		<hr />
-		<button name="submit" onclick="i3GEOF.uploadgpx.submete()" class='btn btn-primary btn-sm btn-raised'>{{{criaCamada}}}</button>
-
-		<input type='hidden' name='g_sid' value='{{{sid}}}'>
-		<input type='hidden' name='MAX_FILE_SIZE' value='100000'>
-
-	</form>
-	<iframe name='i3GEOuploadgpxiframe' style='text-align: left; border: 1px solid gray;' width='98%' height='60px'></iframe>
+<div id='{{idContainer}}' class='container-fluid container-tools'>
+    <form accept-charset="utf-8" class="form-horizontal" target="i3GEOuploadgpxiframe" action="{{{locaplic}}}/ferramentas/uploadgpx/upload.php" method="post" ENCTYPE="multipart/form-data">
+        <div class='form-group label-fixed condensed'>
+            <label class="col-md-6 control-label">{{{arquivoGpx}}}</label>
+            <div class="col-md-6 ">
+                <input required onclick="$(this).parent().find('input[type=file]').click();" class="form-control input-lg" type='text' name="i3GEOuploadgpx" />
+                <input name="i3GEOuploadgpx" onchange="$(this).parent().find('.form-control').val($(this).val().split(/[\\|/]/).pop());" style="display: none;" type="file">
+                <b class="caret careti"></b>
+            </div>
+        </div>
+        <div style="width: 100%;" class='form-group label-fixed condensed'>
+            <label class="col-md-6 control-label">{{{projecao}}}</label>
+            <div class="col-md-6">
+                <div id='i3GEOuploadgpxListaepsg'></div>
+            </div>
+        </div>
+        <button name="submit" onclick="i3GEOF.uploadgpx.submete(this)" class='btn btn-primary btn-sm btn-raised'>
+            <span class="glyphicon glyphicon-repeat normal-right-spinner hidden"></span>{{{adicmapa}}}
+        </button>
+        <input type='hidden' name='g_sid' value='{{{sid}}}'>
+        <input type='hidden' name='MAX_FILE_SIZE' value='100000'>
+    </form>
+    <iframe name=i3GEOuploadgpxiframe style="text-align: left; border: 1px solid rgb(242, 232, 232);" width="98%" height="60px"></iframe>
 </div>
\ No newline at end of file
diff --git a/ferramentas/uploadgpx/upload.php b/ferramentas/uploadgpx/upload.php
index 5904397..0670569 100755
--- a/ferramentas/uploadgpx/upload.php
+++ b/ferramentas/uploadgpx/upload.php
@@ -14,9 +14,6 @@ if (ob_get_level() == 0) ob_start();
 ?>
 <html>
 <head>
-<link rel="stylesheet" type="text/css" href="../../css/input.css" />
-<link rel="stylesheet" type="text/css" href="../../css/geral.css" />
-<title></title>
 </head>
 <body bgcolor="white" style="background-color:white;text-align:left;">
 <p>
@@ -102,14 +99,14 @@ if (isset($_FILES['i3GEOuploadgpx']['name']) && strlen(basename($_FILES['i3GEOup
 			// le os itens
 			$novolayer->set("status",MS_DEFAULT);
 			$novolayer->set("template","none.htm");
-			if(isset($_GET["uploadkmlEPSG"]) && $_GET["uploadkmlEPSG"] != "")
-			{$novolayer->setProjection("init=epsg:".$_GET["uploadkmlEPSG"]);}
-			//$adiciona = ms_newLayerObj($mapa, $novolayer);
+			if(isset($_GET["uploadgpxEPSG"]) && $_GET["uploadgpxEPSG"] != ""){
+			    $novolayer->setProjection("init=epsg:".$_GET["uploadgpxEPSG"]);
+			}
 		}
 		$salvo = $mapa->save($map_file);
 		//grava os templates de cada tema
 		echo "<b><p class='paragrafo' >Camadas criadas!!! Redesenhando o mapa.";
-		echo "<script>window.scrollTo(0,10000);window.parent.i3GEO.atualiza()</script>";
+		echo "<script>window.scrollTo(0,10000);window.parent.i3GEO.atualiza();window.parent.i3GEOF.uploadgpx.doneok();</script>";
 	}
 	else
 	{
@@ -126,7 +123,7 @@ else
 restauraCon($map_file,$postgis_mapa);
 paraAguarde();
 function paraAguarde(){
-	echo "<script>window.scrollTo(0,10000);window.parent.i3GEOF.uploadgpx.aguarde.visibility='hidden';</script>";
+    echo "<script>window.parent.i3GEOF.uploadgpx.destroy();</script>";
 }
 function verificaNome($nome)
 {
diff --git a/ferramentas/uploadkml/index.js b/ferramentas/uploadkml/index.js
index f68a5cb..517f1ba 100755
--- a/ferramentas/uploadkml/index.js
+++ b/ferramentas/uploadkml/index.js
@@ -1,156 +1,67 @@
-/*
-Title: Upload KML
-
-Envia para o servidor um arquivo no formato KML local e insere como novas camadas no mapa.
-
-Veja:
-
-<i3GEO.arvoreDeTemas.dialogo.uploadkml>
-
-Arquivo:
-
-i3geo/ferramentas/uploadkml/index.js.php
-
-Licenca:
-
-GPL2
-
-i3Geo Interface Integrada de Ferramentas de Geoprocessamento para Internet
-
-Direitos Autorais Reservados (c) 2006 Minist&eacute;rio do Meio Ambiente Brasil
-Desenvolvedor: Edmar Moretti edmar.moretti@gmail.com
-
-Este programa &eacute; software livre; voc&ecirc; pode redistribu&iacute;-lo
-e/ou modific&aacute;-lo sob os termos da Licen&ccedil;a P&uacute;blica Geral
-GNU conforme publicada pela Free Software Foundation;
-
-Este programa &eacute; distribu&iacute;do na expectativa de que seja &uacute;til,
-por&eacute;m, SEM NENHUMA GARANTIA; nem mesmo a garantia impl&iacute;cita
-de COMERCIABILIDADE OU ADEQUA&Ccedil;&Atilde;O A UMA FINALIDADE ESPEC&Iacute;FICA.
-Consulte a Licen&ccedil;a P&uacute;blica Geral do GNU para mais detalhes.
-Voc&ecirc; deve ter recebido uma c&oacute;pia da Licen&ccedil;a P&uacute;blica Geral do
-GNU junto com este programa; se n&atilde;o, escreva para a
-Free Software Foundation, Inc., no endere&ccedil;o
-59 Temple Street, Suite 330, Boston, MA 02111-1307 USA.
-*/
-
-
 if(typeof(i3GEOF) === 'undefined'){
 	var i3GEOF = {};
 }
-/*
-Classe: i3GEOF.uploadkml
-*/
 i3GEOF.uploadkml = {
-	/*
-	Variavel: aguarde
-
-	Estilo do objeto DOM com a imagem de aguarde existente no cabe&ccedil;alho da janela.
-	*/
-	aguarde: "",
-	mustacheHash : function() {
-		var dicionario = i3GEO.idioma.objetoIdioma(i3GEOF.uploadkml.dicionario);
-		dicionario["sid"] = i3GEO.configura.sid;
-		dicionario["locaplic"] = i3GEO.configura.locaplic;
-		return dicionario;
+	renderFunction: i3GEO.janela.formModal,
+	_parameters : {
+	    "mustache": "",
+	    "idContainer": "i3GEOuploadkml",
+	    "namespace": "uploadkml",
+	    "dataForm": ""
 	},
-	MUSTACHE: "",
-	/*
-	Function: inicia
-
-	Inicia a ferramenta. &Eacute; chamado por criaJanelaFlutuante
-
-	Parametro:
-
-	iddiv {String} - id do div que receber&aacute; o conteudo HTML da ferramenta
-	*/
-	inicia: function(iddiv){
-		if(i3GEOF.uploadkml.MUSTACHE == ""){
-			$.get(i3GEO.configura.locaplic + "/ferramentas/uploadkml/template_mst.html", function(template) {
-				i3GEOF.uploadkml.MUSTACHE = template;
-				i3GEOF.uploadkml.inicia(iddiv);
-			});
-			return;
-		}
-		try{
-			$i(iddiv).innerHTML = i3GEOF.uploadkml.html();
-
-			i3GEO.util.radioEpsg(
-				function(retorno)
-				{$i("i3GEOuploadkmlListaepsg").innerHTML = retorno.dados;},
-				"i3GEOuploadkmlListaepsg",
-				"uploadkml"
-			);
-		}
-		catch(erro){i3GEO.janela.tempoMsg(erro);}
+	start : function(){
+	    var p = this._parameters,
+	    i3f = this,
+	    t1 = i3GEO.configura.locaplic + "/ferramentas/"+p.namespace+"/template_mst.html";
+	    if(p.mustache === ""){
+		i3GEO.janela.abreAguarde();
+		$.get(t1).done(function(r1) {
+		    p.mustache = r1;
+		    i3f.html();
+		    i3GEO.janela.fechaAguarde();
+		    if(p.dataForm.errorMsg && p.dataForm.errorMsg != ""){
+			i3GEO.janela.snackBar({content: p.dataForm.errorMsg, style:'red'});
+			i3GEO.janela.fechaAguarde();
+			i3f.destroy();
+		    }
+		}).fail(function(data) {
+		    i3GEO.janela.snackBar({content: "Erro. " + data.status, style:'red'});
+		    i3f.destroy();
+		});
+	    } else {
+		i3f.html();
+	    }
 	},
-	/*
-	Function: html
-
-	Gera o c&oacute;digo html para apresenta&ccedil;&atilde;o das op&ccedil;&otilde;es da ferramenta
-
-	Retorno:
-
-	String com o c&oacute;digo html
-	*/
-	html:function() {
-		var ins = Mustache.render(i3GEOF.uploadkml.MUSTACHE, i3GEOF.uploadkml.mustacheHash());
-		return ins;
+	destroy: function(){
+	    //nao use this aqui
+	    i3GEOF.uploadkml.renderFunction.call();
+	},
+	doneok: function(){
+	    i3GEO.janela.snackBar({content: $trad("camadaadic")});
+	    this.destroy();
 	},
-	/*
-	Function: iniciaJanelaFlutuante
-
-	Cria a janela flutuante para controle da ferramenta.
-	*/
-	iniciaJanelaFlutuante: function(){
-		var janela,divid,titulo,cabecalho,minimiza;
-		if ($i("i3GEOF.uploadkml")) {
-			return;
-		}
-		cabecalho = function(){};
-		minimiza = function(){
-			i3GEO.janela.minimiza("i3GEOF.uploadkml",200);
-		};
-		titulo = "<span class='i3GeoTituloJanelaBsNolink' >KML</span></div>";
-		janela = i3GEO.janela.cria(
-			"450px",
-			"460px",
-			"",
-			"",
-			"",
-			titulo,
-			"i3GEOF.uploadkml",
-			false,
-			"hd",
-			cabecalho,
-			minimiza,
-			"",
-			true,
-			"",
-			"",
-			"",
-			"",
-			"104"
-		);
-		divid = janela[2].id;
-		$i("i3GEOF.uploadkml_corpo").style.backgroundColor = "white";
-		i3GEOF.uploadkml.aguarde = $i("i3GEOF.uploadkml_imagemCabecalho").style;
-		i3GEOF.uploadkml.inicia(divid);
+	html:function() {
+	    var p = this._parameters,
+	    i3f = this,
+	    hash = {
+		    locaplic: i3GEO.configura.locaplic,
+		    namespace: p.namespace,
+		    sid: i3GEO.configura.sid,
+		    idContainer: p.idContainer,
+		    adicmapa : $trad("adicmapa"),
+		    ...i3GEO.idioma.objetoIdioma(i3f.dicionario)
+	    };
+	    i3f.renderFunction.call(
+		    this,
+		    {
+			texto: Mustache.render(p.mustache, hash),
+			onclose: i3f.destroy
+		    });
+	    i3GEO.util.comboEpsg("uploadkmlEPSG","i3GEOuploadkmlListaepsg");
 	},
-	/*
-	Function: submete
-
-	Submete o arquivo ao servidor.
-	*/
-	submete: function(){
-		if($i("layerkml").value == ""){
-			i3GEO.janela.tempoMsg($trad("nomeLayerKml",i3GEOF.uploadkml.dicionario));
-			return;
-		}
-		if(i3GEOF.uploadkml.aguarde.visibility==="visible"){
-			return;
-		}
-		i3GEOF.uploadkml.aguarde.visibility="visible";
-		$i("i3GEOuploadkmlf").submit();
+	submete: function(btn){
+	    i3GEO.janela.abreAguarde();
+	    $(btn).prop("disabled",true).find("span").removeClass("hidden");
+	    $("#" + this._parameters.idContainer + " form").submit();
 	}
 };
diff --git a/ferramentas/uploadkml/template_mst.html b/ferramentas/uploadkml/template_mst.html
index 274783f..dfdf248 100755
--- a/ferramentas/uploadkml/template_mst.html
+++ b/ferramentas/uploadkml/template_mst.html
@@ -1,27 +1,32 @@
-<div class='container-fluid'>
-	<h5 class="alert alert-info">{{{ajuda}}}</h5>
-	<h5 class="alert alert-info">{{{ajuda2}}}</h5>
-	<form class="form-horizontal" role="form" id='i3GEOuploadkmlf' target='i3GEOuploadkmliframe' action='{{{locaplic}}}/ferramentas/uploadkml/upload.php' method='post' ENCTYPE='multipart/form-data'>
-		<div class="input-group-btn">
-			<button style="margin-right:10px;"  type="button" class="btn btn-primary btn-raised pull-left" onclick="$(this).parent().find('input[type=file]').click();">KML</button>
-			<input name="i3GEOuploadkml" onchange="$(this).parent().find('.form-control').html($(this).val().split(/[\\|/]/).pop());" style="display: none;" type="file">
-			<span class="form-control upload"></span>
-		</div>
-		<br>
-		<div class='form-group label-fixed condensed'>
-			<label class="control-label" for="">{{{nomeLayerKml}}}</label>
-			<input class="form-control input-lg" type='text' name="layerkml" id="layerkml" value='' />
-		</div>
-		<div class='form-group label-fixed condensed'>
-			<label class="control-label" for="tipo">{{{projecao}}}</label>
-			<div class="input-group"></div>
-			<div id=i3GEOuploadkmlListaepsg style="text-align: left; overflow: auto; height: 70px; margin-top: 8px;"></div>
-		</div>
-		<hr />
-
-		<input type='hidden' name='g_sid' value='{{{sid}}}'>
-		<input type='hidden' name='MAX_FILE_SIZE' value='100000'>
-	</form>
-	<button onclick="i3GEOF.uploadkml.submete()" class='btn btn-primary btn-sm btn-raised'>{{{criaCamada}}}</button>
-	<iframe name='i3GEOuploadkmliframe' style='text-align: left; border: 1px solid gray;' width='98%' height='60px'></iframe>
+<div id='{{idContainer}}' class='container-fluid container-tools'>
+    <h5 class="alert alert-info">{{{ajuda}}}</h5>
+    <h5 class="alert alert-info">{{{ajuda2}}}</h5>
+    <form accept-charset="utf-8" class="form-horizontal" target="i3GEOuploadkmliframe" action="{{{locaplic}}}/ferramentas/uploadkml/upload.php" method="post" ENCTYPE="multipart/form-data">
+        <div class='form-group label-fixed condensed'>
+            <label class="col-md-6 control-label">{{{arquivoKml}}}</label>
+            <div class="col-md-6 ">
+                <input required onclick="$(this).parent().find('input[type=file]').click();" class="form-control input-lg" type='text' name="i3GEOuploadkml" />
+                <input name="i3GEOuploadkml" onchange="$(this).parent().find('.form-control').val($(this).val().split(/[\\|/]/).pop());" style="display: none;" type="file">
+                <b class="caret careti"></b>
+            </div>
+        </div>
+        <div class='form-group label-fixed condensed'>
+            <label class="col-md-6 control-label">{{{nomeLayerKml}}}</label>
+            <div class="col-md-6 ">
+                <input required class="form-control input-lg " type='text' value='' name="layerkml"/>
+            </div>
+        </div>
+        <div style="width: 100%;" class='form-group label-fixed condensed'>
+            <label class="col-md-6 control-label">{{{projecao}}}</label>
+            <div class="col-md-6">
+                <div id='i3GEOuploadkmlListaepsg'></div>
+            </div>
+        </div>
+        <button name="submit" onclick="i3GEOF.uploadkml.submete(this)" class='btn btn-primary btn-sm btn-raised'>
+            <span class="glyphicon glyphicon-repeat normal-right-spinner hidden"></span>{{{adicmapa}}}
+        </button>
+        <input type='hidden' name='g_sid' value='{{{sid}}}'>
+        <input type='hidden' name='MAX_FILE_SIZE' value='100000'>
+    </form>
+    <iframe name=i3GEOuploadkmliframe style="text-align: left; border: 1px solid rgb(242, 232, 232);" width="98%" height="60px"></iframe>
 </div>
\ No newline at end of file
diff --git a/ferramentas/uploadkml/upload.php b/ferramentas/uploadkml/upload.php
index 31d6d4a..5a4e983 100755
--- a/ferramentas/uploadkml/upload.php
+++ b/ferramentas/uploadkml/upload.php
@@ -16,8 +16,6 @@ if (ob_get_level() == 0) ob_start();
 ?>
 <html>
 <head>
-<link rel="stylesheet" type="text/css" href="../../css/input.css" />
-<link rel="stylesheet" type="text/css" href="../../css/geral.css" />
 <title></title>
 </head>
 <body bgcolor="white" style="background-color:white;text-align:left;">
@@ -112,7 +110,7 @@ if (isset($_FILES['i3GEOuploadkml']['name']) && strlen(basename($_FILES['i3GEOup
 		$salvo = $mapa->save($map_file);
 		//grava os templates de cada tema
 		echo "<b><p class='paragrafo' >Camadas criadas!!! Redesenhando o mapa.";
-		echo "<script>window.scrollTo(0,10000);window.parent.i3GEO.atualiza()</script>";
+		echo "<script>window.scrollTo(0,10000);window.parent.i3GEO.atualiza();window.parent.i3GEOF.uploadkml.doneok();</script>";
 	}
 	else
 	{
@@ -129,7 +127,7 @@ else
 restauraCon($map_file,$postgis_mapa);
 paraAguarde();
 function paraAguarde(){
-	echo "<script>window.scrollTo(0,10000);window.parent.i3GEOF.uploadkml.aguarde.visibility='hidden';</script>";
+    echo "<script>window.parent.i3GEOF.uploadkml.destroy();</script>";
 }
 function verificaNome($nome)
 {
diff --git a/ferramentas/uploadshp/index.js b/ferramentas/uploadshp/index.js
index 0f4dd34..8814ee9 100644
--- a/ferramentas/uploadshp/index.js
+++ b/ferramentas/uploadshp/index.js
@@ -34,6 +34,11 @@ i3GEOF.uploadshp = {
 	},
 	destroy: function(){
 	    //nao use this aqui
+	    i3GEOF.uploadshp.renderFunction.call();
+	},
+	doneok: function(){
+	    i3GEO.janela.snackBar({content: $trad("camadaadic")});
+	    this.destroy();
 	},
 	html:function() {
 	    var p = this._parameters,
@@ -43,6 +48,7 @@ i3GEOF.uploadshp = {
 		    namespace: p.namespace,
 		    sid: i3GEO.configura.sid,
 		    idContainer: p.idContainer,
+		    adicmapa : $trad("adicmapa"),
 		    ...i3GEO.idioma.objetoIdioma(i3f.dicionario)
 	    };
 	    i3f.renderFunction.call(
@@ -53,11 +59,6 @@ i3GEOF.uploadshp = {
 		    });
 	    i3GEO.util.comboEpsg("uploadEPSG","i3GEOuploadListaepsg");
 	},
-	/*
-	Function: submete
-
-	Submete o arquivo ao servidor
-	 */
 	submete: function(btn){
 	    i3GEO.janela.abreAguarde();
 	    $(btn).prop("disabled",true).find("span").removeClass("hidden");
diff --git a/ferramentas/uploadshp/template_mst.html b/ferramentas/uploadshp/template_mst.html
index 2ea883a..3fa8b2f 100644
--- a/ferramentas/uploadshp/template_mst.html
+++ b/ferramentas/uploadshp/template_mst.html
@@ -51,9 +51,8 @@
             </div>
         </div>
 
-        <hr />
-        <button id="teste" name="submit" onclick="i3GEOF.uploadshp.submete(this)" class='btn btn-primary btn-sm btn-raised'>
-            <span class="glyphicon glyphicon-repeat normal-right-spinner hidden"></span>{{{envia}}}
+        <button name="submit" onclick="i3GEOF.uploadshp.submete(this)" class='btn btn-primary btn-sm btn-raised'>
+            <span class="glyphicon glyphicon-repeat normal-right-spinner hidden"></span>{{{adicmapa}}}
         </button>
 
         <input type=hidden name=g_sid value="{{{sid}}}">
diff --git a/ferramentas/uploadshp/upload.php b/ferramentas/uploadshp/upload.php
index 7a5a71e..253662d 100644
--- a/ferramentas/uploadshp/upload.php
+++ b/ferramentas/uploadshp/upload.php
@@ -182,7 +182,7 @@ if (isset($_FILES['i3GEOuploadshp']['name']))
 	$salvo = $mapa->save($map_file);
 	//grava os templates de cada tema
 	echo "<b><p class='paragrafo' >Tema criado!!! Redesenhando o mapa.";
-	echo "<script>window.scrollTo(0,10000);window.parent.i3GEO.atualiza()</script>";
+	echo "<script>window.scrollTo(0,10000);window.parent.i3GEO.atualiza();window.parent.i3GEOF.uploadshp.doneok();</script>";
 }
 else
 {
--
libgit2 0.21.2