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 8f6fa8a..c1bf422 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,5 +1,5 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:p="http://primefaces.prime.com.tr/ui" xmlns:h="http://java.sun.com/jsf/html"
+	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">
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 413e4c3..b4af609 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,15 +1,15 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:p="http://primefaces.prime.com.tr/ui" xmlns:h="http://java.sun.com/jsf/html"
+	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>
 			<p:toolbar>
 				<p:toolbarGroup align="left">
-					<p:commandButton title="#{messages['button.new']}" image="ui-icon-document" action="#{bookmarkListMB.getNextView}"
+					<p:commandButton title="#{messages['button.new']}" icon="ui-icon-document" action="#{bookmarkListMB.getNextView}"
 						actionListener="#{bookmarkListMB.clear}" ajax="false" />
 
-					<p:commandButton title="#{messages['button.delete']}" image="ui-icon-trash" onclick="confirmation.show()"
+					<p:commandButton title="#{messages['button.delete']}" icon="ui-icon-trash" onclick="confirmation.show()"
 						type="button" immediate="true" ajax="false" />
 
 					<p:confirmDialog message="#{messages['label.confirm.delete']}" showEffect="bounce" hideEffect="explode"
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 2d68848..210fd7f 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,5 +1,5 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:p="http://primefaces.prime.com.tr/ui" xmlns:h="http://java.sun.com/jsf/html"
+	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">
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 06eeb15..faa1a60 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,5 +1,5 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:p="http://primefaces.prime.com.tr/ui" xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:p="http://primefaces.org/ui" xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://java.sun.com/jsf/facelets">
 
 	<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 9efb84d..97b4aac 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,4 +1,4 @@
-<html xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.prime.com.tr/ui"
+<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="#{currentLocale}" />
@@ -11,17 +11,16 @@
 <h:body style="background-color:#f1f1f1">
 	<table style="width: 100%">
 		<tr>
-			<td height="70" width="5%" align="left"><a href="index.jsf"><img src="images/logo.png" border="0" /></a></td>
-			<td height="70" width="95%" align="left"><p:themeSwitcher initialText="Change Skin" buttonPreText="Skin: " /></td>
+			<td height="70" align="left"><a href="index.jsf"><img src="images/logo.png" border="0" /></a></td>
 		</tr>
 		<tr>
-			<td height="20" colspan="2"><ui:include src="/menu.xhtml" /></td>
+			<td height="20"><ui:include src="/menu.xhtml" /></td>
 		</tr>
 		<tr valign="top">
-			<td height="400" colspan="2"><ui:insert name="body" /></td>
+			<td height="400"><ui:insert name="body" /></td>
 		</tr>
 		<tr align="center">
-			<td height="20" colspan="2" align="center" class="text-input">#{messages['main.footer.text']}</td>
+			<td height="20" align="center" class="text-input">#{messages['main.footer.text']}</td>
 		</tr>
 	</table>
 
diff --git a/parent/framework/pom.xml b/parent/framework/pom.xml
index 413a0d6..bf28fa6 100755
--- a/parent/framework/pom.xml
+++ b/parent/framework/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>br.gov.frameworkdemoiselle</groupId>
 		<artifactId>demoiselle-parent</artifactId>
-		<version>2</version>
+		<version>3-SNAPSHOT</version>
 		<relativePath>../../../internal/parent/demoiselle/pom.xml</relativePath>
 	</parent>
 
--
libgit2 0.21.2