diff --git a/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/bookmark_edit.xhtml b/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/bookmark_edit.xhtml
index c1bf422..6705a45 100644
--- a/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/bookmark_edit.xhtml
+++ b/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/bookmark_edit.xhtml
@@ -1,22 +1,17 @@
-<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:p="http://primefaces.org/ui" xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://java.sun.com/jsf/facelets" template="/template/main.xhtml">
-
+<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui"
+	xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" template="/template/main.xhtml">
 	<ui:define name="body">
 		<h:form prependId="false">
 			<p:toolbar>
 				<p:toolbarGroup align="left">
-					<p:commandButton value="#{messages['button.save']}" action="#{bookmarkEditMB.insert}"
-						rendered="#{!bookmarkEditMB.updateMode}" ajax="false" />
-					<p:commandButton value="#{messages['button.save']}" action="#{bookmarkEditMB.update}"
-						rendered="#{bookmarkEditMB.updateMode}" ajax="false" />
-					<p:commandButton value="#{messages['button.delete']}" onclick="confirmation.show()"
-						rendered="#{bookmarkEditMB.updateMode}" type="button" immediate="true" ajax="false" />
-					<p:confirmDialog message="#{messages['label.confirm.delete']}" showEffect="bounce" hideEffect="explode"
-						header="#{messages['label.dialog.delete']}" severity="alert" widgetVar="confirmation">
-						<h:commandButton value="#{messages['button.dialog.yes']}" action="#{bookmarkEditMB.delete}" immediate="true"
-							ajax="false" />
-						<h:commandButton value="#{messages['button.dialog.no']}" onclick="confirmation.hide()" type="button" />
+					<p:commandButton value="#{messages['button.save']}" action="#{bookmarkEditMB.insert}" rendered="#{!bookmarkEditMB.updateMode}" ajax="false" />
+					<p:commandButton value="#{messages['button.save']}" action="#{bookmarkEditMB.update}" rendered="#{bookmarkEditMB.updateMode}" ajax="false" />
+					<p:commandButton value="#{messages['button.delete']}" rendered="#{bookmarkEditMB.updateMode}" onclick="PF('confirmation').show()" type="button"
+						immediate="true" ajax="false" />
+					<p:confirmDialog message="#{messages['label.confirm.delete']}" header="#{messages['label.dialog.delete']}" showEffect="bounce"
+						hideEffect="explode" severity="alert" widgetVar="confirmation">
+						<p:commandButton value="#{messages['button.dialog.yes']}" action="#{bookmarkEditMB.delete}" immediate="true" ajax="false" />
+						<p:commandButton value="#{messages['button.dialog.no']}" onclick="PF('confirmation').hide();" type="button" />
 					</p:confirmDialog>
 				</p:toolbarGroup>
 			</p:toolbar>
@@ -30,8 +25,7 @@
 					<p:message for="id" />
 
 					<h:outputLabel value="#{messages['bookmark.label.description']}: " for="description" styleClass="text-input" />
-					<h:inputText id="description" value="#{bookmarkEditMB.bean.description}"
-						title="#{messages['bookmark.alt.description']}" />
+					<h:inputText id="description" value="#{bookmarkEditMB.bean.description}" title="#{messages['bookmark.alt.description']}" />
 					<p:message for="description" />
 
 					<h:outputLabel value="#{messages['bookmark.label.link']}: " for="link" styleClass="text-input" />
diff --git a/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/bookmark_list.xhtml b/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/bookmark_list.xhtml
index b4af609..fcf52f8 100644
--- a/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/bookmark_list.xhtml
+++ b/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/bookmark_list.xhtml
@@ -1,6 +1,5 @@
-<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:p="http://primefaces.org/ui" xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://java.sun.com/jsf/facelets" template="/template/main.xhtml">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui"
+	xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" template="/template/main.xhtml">
 
 	<ui:define name="body">
 		<h:form>
@@ -9,15 +8,14 @@
 					<p:commandButton title="#{messages['button.new']}" icon="ui-icon-document" action="#{bookmarkListMB.getNextView}"
 						actionListener="#{bookmarkListMB.clear}" ajax="false" />
 
-					<p:commandButton title="#{messages['button.delete']}" icon="ui-icon-trash" onclick="confirmation.show()"
-						type="button" immediate="true" ajax="false" />
+					<p:commandButton title="#{messages['button.delete']}" icon="ui-icon-trash" onclick="PF('confirmation').show();" type="button" immediate="true"
+						ajax="false" />
 
 					<p:confirmDialog message="#{messages['label.confirm.delete']}" showEffect="bounce" hideEffect="explode"
 						header="#{messages['label.dialog.alert']}!" severity="alert" widgetVar="confirmation">
 
-						<h:commandButton value="#{messages['button.dialog.yes']}" action="#{bookmarkListMB.deleteSelection}"
-							actionListener="#{bookmarkListMB.clear}" />
-						<h:commandButton value="#{messages['button.dialog.no']}" onclick="confirmation.hide()" type="button" />
+						<h:commandButton value="#{messages['button.dialog.yes']}" action="#{bookmarkListMB.deleteSelection}" actionListener="#{bookmarkListMB.clear}" />
+						<h:commandButton value="#{messages['button.dialog.no']}" onclick="PF('confirmation').hide();" type="button" />
 					</p:confirmDialog>
 				</p:toolbarGroup>
 			</p:toolbar>
diff --git a/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/index.xhtml b/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
index 210fd7f..4d3a8bf 100644
--- a/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
+++ b/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
@@ -1,6 +1,5 @@
-<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:p="http://primefaces.org/ui" xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://java.sun.com/jsf/facelets" template="/template/main.xhtml">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui"
+	xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" template="/template/main.xhtml">
 
 	<ui:define name="body">
 		<p:panel>
diff --git a/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/menu.xhtml b/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/menu.xhtml
index faa1a60..8d4a034 100644
--- a/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/menu.xhtml
+++ b/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/menu.xhtml
@@ -1,6 +1,5 @@
-<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:p="http://primefaces.org/ui" xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://java.sun.com/jsf/facelets">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui"
+	xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets">
 
 	<h:form>
 		<p:menubar>
@@ -9,8 +8,7 @@
 				<p:menuitem value="#{messages['menu.menuitem.list']}" url="/bookmark_list.jsf" />
 			</p:submenu>
 
-			<p:menuitem value="#{messages['menu.menuitem.quit']}" url="http://www.frameworkdemoiselle.gov.br/"
-				action="#{securityContext.logout}" />
+			<p:menuitem value="#{messages['menu.menuitem.quit']}" url="http://www.frameworkdemoiselle.gov.br/" action="#{securityContext.logout}" />
 		</p:menubar>
 	</h:form>
 
diff --git a/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/template/main.xhtml b/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/template/main.xhtml
index 37c5fa1..795b2ae 100644
--- a/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/template/main.xhtml
+++ b/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/template/main.xhtml
@@ -1,5 +1,5 @@
-<html xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui"
-	xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets">
+<html xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui" xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://java.sun.com/jsf/facelets">
 
 <f:view contentType="text/html" locale="#{locales.currentLocale}" />
 
@@ -11,19 +11,17 @@
 <h:body style="background-color:#f1f1f1">
 	<table style="width: 100%">
 		<tr>
-			<td height="70" align="left">
-				<a href="index.jsf"><img src="images/logo.png" border="0" /></a>
+			<td height="70" align="left"><a href="index.jsf"><img src="images/logo.png" border="0" /></a>
 				<div style="float: right;">
 					<h:form id="language_form" prependId="true">
 						<h:commandLink action="#{locales.setCurrentLocale('pt')}">
-							<span class="ui-icon-locale-pt" ></span>
+							<span class="ui-icon-locale-pt"></span>
 						</h:commandLink>
 						<h:commandLink action="#{locales.setCurrentLocale('en')}">
-							<span class="ui-icon-locale-en" ></span>
+							<span class="ui-icon-locale-en"></span>
 						</h:commandLink>
 					</h:form>
-				</div>
-			</td>
+				</div></td>
 		</tr>
 		<tr>
 			<td height="20"><ui:include src="/menu.xhtml" /></td>
@@ -46,6 +44,5 @@
 			<h:outputText value="" />
 		</f:facet>
 	</p:ajaxStatus>
-	<link type="text/css" rel="stylesheet" href="css/aristo/skin.css" />
 </h:body>
 </html>
\ No newline at end of file
diff --git a/parent/bom/pom.xml b/parent/bom/pom.xml
index 6d991b9..2ab5042 100755
--- a/parent/bom/pom.xml
+++ b/parent/bom/pom.xml
@@ -198,11 +198,6 @@
 				<artifactId>jsf-impl</artifactId>
 				<version>${jsf.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.primefaces</groupId>
-				<artifactId>primefaces</artifactId>
-				<version>${primefaces.version}</version>
-			</dependency>
 
 			<!-- jsr-316 api -->
 			<dependency>
@@ -435,7 +430,6 @@
 		<maven.surefire.plugin.version>2.16</maven.surefire.plugin.version>
 
 		<powermock.version>1.4.6</powermock.version>
-		<primefaces.version>3.5</primefaces.version>
 		<slf4j.version>1.6.1</slf4j.version>
 		<weld.version>1.1.8.Final</weld.version>
 		<commons.configuration.version>1.9</commons.configuration.version>
--
libgit2 0.21.2