diff --git a/css/i3geo7.css.php b/css/i3geo7.css.php
old mode 100644
new mode 100755
index 7321a98..7321a98
--- a/css/i3geo7.css.php
+++ b/css/i3geo7.css.php
diff --git a/ferramentas/conectarservicos/index.js b/ferramentas/conectarservicos/index.js
index b94bfa4..0c71fba 100755
--- a/ferramentas/conectarservicos/index.js
+++ b/ferramentas/conectarservicos/index.js
@@ -6,187 +6,163 @@ if (typeof (i3GEOF) === 'undefined') {
  */
 i3GEOF.conectarservicos =
 {
-	/**
-	 * Template no formato mustache. E preenchido na carga do javascript com o programa dependencias.php
-	 */
-	MUSTACHE : "",
-	/**
-	 * Susbtitutos para o template
-	 */
-	mustacheHash : function() {
-		var dicionario = i3GEO.idioma.objetoIdioma(i3GEOF.conectarservicos.dicionario);
-		dicionario["locaplic"] = i3GEO.configura.locaplic;
-		return dicionario;
-	},
-	/*
-	 * Function: iniciaDicionario (Depreciado na versao 6.0)
-	 *
-	 */
-	iniciaDicionario : function() {
-		i3GEOF.conectarservicos.iniciaJanelaFlutuante();
-	},
-	/*
-	 * Function: inicia
-	 *
-	 * Inicia a ferramenta. É chamado por criaJanelaFlutuante
-	 *
-	 * Parametro:
-	 *
-	 * iddiv {String} - id do div que receberá o conteudo HTML da ferramenta
-	 */
-	inicia : function(iddiv) {
-		if(i3GEOF.conectarservicos.MUSTACHE == ""){
-			$.get(i3GEO.configura.locaplic + "/ferramentas/conectarservicos/template_mst.html", function(template) {
-				i3GEOF.conectarservicos.MUSTACHE = template;
-				i3GEOF.conectarservicos.inicia(iddiv);
-			});
-			return;
-		}
-		$i(iddiv).innerHTML = i3GEOF.conectarservicos.html();
-		new YAHOO.widget.Button("i3GEOFconectarservicosKml", {
-			onclick : {
-				fn : function() {
-					i3GEO.util.scriptTag(i3GEO.configura.locaplic
-						+ "/ferramentas/carregakml/dependencias.php",
-						"i3GEOF.carregakml.iniciaJanelaFlutuante()",
-					"i3GEOF.carregakml_script");
-				}
+		/**
+		 * Template no formato mustache. E preenchido na carga do javascript com o programa dependencias.php
+		 */
+		MUSTACHE : "",
+		/**
+		 * Susbtitutos para o template
+		 */
+		mustacheHash : function() {
+			var dicionario = i3GEO.idioma.objetoIdioma(i3GEOF.conectarservicos.dicionario);
+			dicionario["locaplic"] = i3GEO.configura.locaplic;
+			return dicionario;
+		},
+		/*
+		 * Function: iniciaDicionario (Depreciado na versao 6.0)
+		 *
+		 */
+		iniciaDicionario : function() {
+			i3GEOF.conectarservicos.iniciaJanelaFlutuante();
+		},
+		/*
+		 * Function: inicia
+		 *
+		 * Inicia a ferramenta. É chamado por criaJanelaFlutuante
+		 *
+		 * Parametro:
+		 *
+		 * iddiv {String} - id do div que receberá o conteudo HTML da ferramenta
+		 */
+		inicia : function(iddiv) {
+			if(i3GEOF.conectarservicos.MUSTACHE == ""){
+				$.get(i3GEO.configura.locaplic + "/ferramentas/conectarservicos/template_mst.html", function(template) {
+					i3GEOF.conectarservicos.MUSTACHE = template;
+					i3GEOF.conectarservicos.inicia(iddiv);
+				});
+				return;
 			}
-		});
-		new YAHOO.widget.Button("i3GEOFconectarservicosWms", {
-			onclick : {
-				fn : function() {
-					i3GEO.janela
-					.cria(
-						"400px",
-						"300px",
-						i3GEO.configura.locaplic
-						+ "/ferramentas/conectarwms/index.htm",
-						"",
-						"",
-
-						+ "</div><a class='i3GeoTituloJanelaBs' target=_blank href='"
-						+ i3GEO.configura.locaplic
-						+ "/ajuda_usuario.php?idcategoria=4&idajuda=28' >" + $trad("a4") + "</a>",
-						"i3GEO.conectarwms",
-						false,
-						"hd",
-						"",
-						"",
-						"",
-						true
-					);
-				}
+			$i(iddiv).innerHTML = i3GEOF.conectarservicos.html();
+		},
+		geojson: function(){
+			i3GEO.util.scriptTag(i3GEO.configura.locaplic
+					+ "/ferramentas/conectargeojson/dependencias.php",
+					"i3GEOF.conectargeojson.iniciaJanelaFlutuante()",
+			"i3GEOF.conectargeojson_script");
+		},
+		georss: function(){
+			i3GEO.janela.cria(
+					"400px",
+					"300px",
+					i3GEO.configura.locaplic
+					+ "/ferramentas/conectargeorss/index.htm",
+					"",
+					"",
+					$trad("x47")
+					+ "&nbsp;<a class=ajuda_usuario target=_blank href='"
+					+ i3GEO.configura.locaplic
+					+ "/ajuda_usuario.php?idcategoria=4&idajuda=29' ><b> </b></a>",
+					"i3GEO.conectargeorss",
+					false,
+					"hd",
+					"",
+					"",
+					"",
+					true
+			);
+		},
+		wmst: function(){
+			i3GEO.janela.cria(
+					"600px",
+					"400px",
+					i3GEO.configura.locaplic
+					+ "/ferramentas/wmstime/index.htm",
+					"",
+					"",
+					$trad("x46")
+					+ "&nbsp;<a class=ajuda_usuario target=_blank href='"
+					+ i3GEO.configura.locaplic
+					+ "/ajuda_usuario.php?idcategoria=4&idajuda=76' ><b> </b></a>",
+					"i3GEO.conectarwmst",
+					false,
+					"hd",
+					"",
+					"",
+					"",
+					true
+			);
+		},
+		wms: function(){
+			i3GEO.janela.cria(
+					"400px",
+					"300px",
+					i3GEO.configura.locaplic
+					+ "/ferramentas/conectarwms/index.htm",
+					"",
+					"",
+					"</div><a class='i3GeoTituloJanelaBs' target=_blank href='"
+					+ i3GEO.configura.locaplic
+					+ "/ajuda_usuario.php?idcategoria=4&idajuda=28' >" + $trad("a4") + "</a>",
+					"i3GEO.conectarwms",
+					false,
+					"hd",
+					"",
+					"",
+					"",
+					true
+			);
+		},
+		kml: function() {
+			i3GEO.util.scriptTag(i3GEO.configura.locaplic
+					+ "/ferramentas/carregakml/dependencias.php",
+					"i3GEOF.carregakml.iniciaJanelaFlutuante()",
+			"i3GEOF.carregakml_script");
+		},
+		/*
+		 * 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.conectarservicos.MUSTACHE, i3GEOF.conectarservicos.mustacheHash());
+			return ins;
+		},
+		/*
+		 * Function: criaJanelaFlutuante
+		 *
+		 * Cria a janela flutuante para controle da ferramenta.
+		 */
+		iniciaJanelaFlutuante : function() {
+			var cabecalho, janela, divid, titulo;
+			if($i("i3GEOF.conectarservicos")){
+				return;
 			}
-		});
-		new YAHOO.widget.Button("i3GEOFconectarservicosWmst", {
-			onclick : {
-				fn : function() {
-					i3GEO.janela
-					.cria(
-						"600px",
-						"400px",
-						i3GEO.configura.locaplic
-						+ "/ferramentas/wmstime/index.htm",
-						"",
-						"",
-						$trad("x46")
-						+ "&nbsp;<a class=ajuda_usuario target=_blank href='"
-						+ i3GEO.configura.locaplic
-						+ "/ajuda_usuario.php?idcategoria=4&idajuda=76' ><b> </b></a>",
-						"i3GEO.conectarwmst",
-						false,
-						"hd",
-						"",
-						"",
+			cabecalho = function() {
+			};
+			// cria a janela flutuante
+			titulo = "</div><div class='i3GeoTituloJanelaBs'>" + $trad("conexao",i3GEOF.conectarservicos.dicionario)+"</div>";
+			janela =
+				i3GEO.janela.cria(
+						"230px",
+						"270px",
 						"",
-						true
-					);
-				}
-			}
-		});
-		new YAHOO.widget.Button("i3GEOFconectarservicosGeorss", {
-			onclick : {
-				fn : function() {
-					i3GEO.janela
-					.cria(
-						"400px",
-						"300px",
-						i3GEO.configura.locaplic
-						+ "/ferramentas/conectargeorss/index.htm",
 						"",
 						"",
-						$trad("x47")
-						+ "&nbsp;<a class=ajuda_usuario target=_blank href='"
-						+ i3GEO.configura.locaplic
-						+ "/ajuda_usuario.php?idcategoria=4&idajuda=29' ><b> </b></a>",
-						"i3GEO.conectargeorss",
+						titulo,
+						"i3GEOF.conectarservicos",
 						false,
 						"hd",
-						"",
+						cabecalho,
 						"",
 						"",
 						true
-					);
-				}
-			}
-		});
-		new YAHOO.widget.Button("i3GEOFconectarservicosGeojson", {
-			onclick : {
-				fn : function() {
-					i3GEO.util.scriptTag(i3GEO.configura.locaplic
-						+ "/ferramentas/conectargeojson/dependencias.php",
-						"i3GEOF.conectargeojson.iniciaJanelaFlutuante()",
-					"i3GEOF.conectargeojson_script");
-				}
-			}
-		});
-	},
-	/*
-	 * 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.conectarservicos.MUSTACHE, i3GEOF.conectarservicos.mustacheHash());
-		return ins;
-	},
-	/*
-	 * Function: criaJanelaFlutuante
-	 *
-	 * Cria a janela flutuante para controle da ferramenta.
-	 */
-	iniciaJanelaFlutuante : function() {
-		var cabecalho, janela, divid, titulo;
-		if($i("i3GEOF.conectarservicos")){
-			return;
+				);
+			divid = janela[2].id;
+			$i("i3GEOF.conectarservicos_corpo").style.backgroundColor = "white";
+			i3GEOF.conectarservicos.inicia(divid);
 		}
-		cabecalho = function() {
-		};
-		// cria a janela flutuante
-		titulo = "</div><div class='i3GeoTituloJanelaBs'>" + $trad("conexao",i3GEOF.conectarservicos.dicionario)+"</div>";
-		janela =
-			i3GEO.janela.cria(
-				"230px",
-				"180px",
-				"",
-				"",
-				"",
-				titulo,
-				"i3GEOF.conectarservicos",
-				false,
-				"hd",
-				cabecalho,
-				"",
-				"",
-				true
-			);
-		divid = janela[2].id;
-		$i("i3GEOF.conectarservicos_corpo").style.backgroundColor = "white";
-		i3GEOF.conectarservicos.inicia(divid);
-	}
 };
diff --git a/ferramentas/conectarservicos/template_mst.html b/ferramentas/conectarservicos/template_mst.html
index 4d38399..fe6bc64 100755
--- a/ferramentas/conectarservicos/template_mst.html
+++ b/ferramentas/conectarservicos/template_mst.html
@@ -1,39 +1,7 @@
-<style>
-.yui-button#i3GEOFconectarservicosKml button {
-	background: url('../imagens/oxygen/16x16/text-xml.png') 5% 50% no-repeat;
-	width: 200px;
-}
-.yui-button#i3GEOFconectarservicosWms button {
-	background: url('../imagens/oxygen/16x16/text-html.png') 5% 50% no-repeat;
-	width: 200px;
-}
-.yui-button#i3GEOFconectarservicosWmst button {
-	background: url('../imagens/oxygen/16x16/text-html.png') 5% 50% no-repeat;
-	width: 200px;
-}
-.yui-button#i3GEOFconectarservicosGeorss button {
-	background: url('../imagens/oxygen/16x16/application-rss+xml.png') 5% 50% no-repeat;
-	width: 200px;
-}
-.yui-button#i3GEOFconectarservicosGeojson button {
-	background: url('../imagens/oxygen/16x16/code-context.png') 5% 50% no-repeat;
-	width: 200px;
-}
-</style>
-<div style='margin-left: 5px'>
-	<p class='paragrafo'>
-		<input id='i3GEOFconectarservicosKml' type='button' value='KML' />
-	</p>
-	<p class='paragrafo'>
-		<input id='i3GEOFconectarservicosWms' type='button' value='WMS' />
-	</p>
-	<p class='paragrafo'>
-		<input id='i3GEOFconectarservicosWmst' type='button' value='WMS-T' />
-	</p>
-	<p class='paragrafo'>
-		<input id='i3GEOFconectarservicosGeorss' type='button' value='GeoRSS' />
-	</p>
-	<p class='paragrafo'>
-		<input id='i3GEOFconectarservicosGeojson' type='button' value='GeoJson' />
-	</p>
-</div>
+<div class='container-fluid'>
+	<a href='javascript:void(0)' onclick="i3GEOF.conectarservicos.kml()" class='btn btn-primary btn-lg btn-block btn-raised'>KML</a>
+	<a href='javascript:void(0)' onclick="i3GEOF.conectarservicos.wms()" class='btn btn-primary btn-lg btn-block btn-raised'>WMS</a>
+	<a href='javascript:void(0)' onclick="i3GEOF.conectarservicos.wmst()" class='btn btn-primary btn-lg btn-block btn-raised'>WMS-T</a>
+	<a href='javascript:void(0)' onclick="i3GEOF.conectarservicos.georss()" class='btn btn-primary btn-lg btn-block btn-raised'>GeoRSS</a>
+	<a href='javascript:void(0)' onclick="i3GEOF.conectarservicos.geojson()" class='btn btn-primary btn-lg btn-block btn-raised'>GeoJson</a>
+</div>
\ No newline at end of file
diff --git a/js/i3geo_tudo_compacto7.js.php b/js/i3geo_tudo_compacto7.js.php
old mode 100644
new mode 100755
index 0dc3ced..0dc3ced
--- a/js/i3geo_tudo_compacto7.js.php
+++ b/js/i3geo_tudo_compacto7.js.php
--
libgit2 0.21.2