JSF upgrade

The project is to convert ~25 Java Server Faces, basically upgrading the look and feel, ideally I would like I have already chosen to use prime faces, and the "widget library", but I'm open to other commercial friendly options also. Basically I would give you about 25 jsf files and you would make my site look good while keeping all the functions intact. Pretty simple for someone who knows what they are doing. Not looking to spend a lot, Some notes: It does make use JSF template system. Example: From..... <h:form> <h:panelGroup style="float: left"> <h:outputLabel value="#{[login to view URL]}" /> <br/> <h:outputLabel value="Active office ID:"/> <h:outputLabel value="#{[login to view URL]}"/> <br/> <h:dataTable value="#{[login to view URL]}" var="role" style=" border-style: none"> <h:column> <h:outputText value="#{[login to view URL]}"/> </h:column> </h:dataTable> </h:panelGroup> <h:panelGroup style="float: right" > <h:commandLink value="Logout" action="#{[login to view URL]}" style="float: inherit" /> <br/> <h:commandLink value="Change Password" action="#{[login to view URL]}" style="float: inherit"/> <br/> <br/> <h:selectOneMenu value="#{[login to view URL]}" style="float: inherit"> <f:selectItems value="#{[login to view URL]}"/> </h:selectOneMenu> <br/> <h:commandLink value="Switch Office" style="float: inherit"> <f:ajax execute="@form" event="click" render="@all" listener="#{[login to view URL]}"/> </h:commandLink> <br/> <h:commandLink style="float: inherit" rendered="#{[login to view URL]}" value="Add Security Question!!!!" action="#{[login to view URL]}" /> </h:panelGroup> </h:form> To.... <p:layoutUnit position="top" height="75" resizable="true" closable="false" collapsible="false"> <h:form> <h:panelGroup style="float: left"> <h:outputLabel value="#{[login to view URL]}" /> <h:outputLabel value="Active office ID:"/> <h:outputLabel value="#{[login to view URL]}"/> <br/> <h:dataTable value="#{[login to view URL]}" var="role" style=" border-style: none"> <h:column> <h:outputText value="#{[login to view URL]}"/> </h:column> </h:dataTable> </h:panelGroup> <h:panelGroup style="float: right" > <h:commandLink value="Logout" action="#{[login to view URL]}" style="float: inherit" /> <br/> <h:commandLink value="Change Password" action="#{[login to view URL]}" style="float: inherit"/> <br/> <br/> <h:selectOneMenu value="#{[login to view URL]}" style="float: inherit">