diff --git a/openai-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs b/openai-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs
index 9d5c12e..1b84748 100644
--- a/openai-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs
+++ b/openai-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs
@@ -1,4 +1,4 @@
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.openai.connector.demo
-ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
+ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
 ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001
-eclipse.preferences.version=1
\ No newline at end of file
+eclipse.preferences.version=1
diff --git a/openai-connector-demo/src_hd/com/openai/connector/demo/MailGenerator/MailGenerator.xhtml b/openai-connector-demo/src_hd/com/openai/connector/demo/MailGenerator/MailGenerator.xhtml
index a249233..0fb060f 100644
--- a/openai-connector-demo/src_hd/com/openai/connector/demo/MailGenerator/MailGenerator.xhtml
+++ b/openai-connector-demo/src_hd/com/openai/connector/demo/MailGenerator/MailGenerator.xhtml
@@ -12,15 +12,15 @@
 		<ui:define name="content">
 			<h3>AI Mail Generator</h3>
 			<h:form id="content-form">
-				<div class="p-formgrid p-grid p-align-baseline ui-fluid">
+				<div class="formgrid grid align-items-baseline ui-fluid">
 					<!-- Row -->
-					<div class="p-field p-col-12 p-md-2 p-text-left p-text-md-right">
+					<div class="field col-12 md:col-2 p-text-left p-text-md-right">
 						<p:outputLabel value="#{ivy.cms.co('/Labels/CandidateName')}"
 							for="candidate-name">
 							<span class="ui-outputlabel-rfi">*</span>
 						</p:outputLabel>
 					</div>
-					<div class="p-field p-col-12 p-md-4">
+					<div class="field col-12 md:col-4">
 						<p:inputText id="candidate-name"
 							value="#{data.candidateInformation.name}">
 							<f:validator validatorId="commonValidator" />
@@ -28,13 +28,13 @@
 						<p:message for="candidate-name" />
 					</div>
 
-					<div class="p-field p-col-12 p-md-2 p-text-left p-text-md-right">
+					<div class="field col-12 md:col-2 p-text-left p-text-md-right">
 						<p:outputLabel value="#{ivy.cms.co('/Labels/CandidateEmail')}"
 							for="candidate-email">
 							<span class="ui-outputlabel-rfi">*</span>
 						</p:outputLabel>
 					</div>
-					<div class="p-field p-col-12 p-md-4">
+					<div class="field col-12 md:col-4">
 						<p:inputText id="candidate-email" type="email"
 							value="#{data.candidateInformation.email}">
 							<f:validator validatorId="commonValidator" />
@@ -43,13 +43,13 @@
 					</div>
 
 					<!-- Row -->
-					<div class="p-field p-col-12 p-md-2 p-text-left p-text-md-right">
+					<div class="field col-12 md:col-2 p-text-left p-text-md-right">
 						<p:outputLabel value="#{ivy.cms.co('/Labels/JobPosition')}"
 							for="job-position">
 							<span class="ui-outputlabel-rfi">*</span>
 						</p:outputLabel>
 					</div>
-					<div class="p-field p-col-12 p-md-4">
+					<div class="field col-12 md:col-4">
 						<p:selectOneMenu id="job-position"
 							value="#{data.candidateInformation.jobPosition}">
 							<f:selectItem itemLabel="Select Job Position" itemValue="" />
@@ -61,14 +61,14 @@
 						<p:message for="job-position" />
 					</div>
 
-					<div class="p-field p-col-12 p-md-2 p-text-left p-text-md-right">
+					<div class="field col-12 md:col-2 p-text-left p-text-md-right">
 						<p:outputLabel
 							value="#{ivy.cms.co('/Labels/CandiateMostImportantSkill')}"
 							for="most-important-skill">
 							<span class="ui-outputlabel-rfi">*</span>
 						</p:outputLabel>
 					</div>
-					<div class="p-field p-col-12 p-md-4">
+					<div class="field col-12 md:col-4">
 						<p:inputText id="most-important-skill"
 							value="#{data.candidateInformation.mostImportantSkill}">
 							<f:validator validatorId="commonValidator" />
@@ -77,13 +77,13 @@
 					</div>
 
 					<!-- Row -->
-					<div class="p-field p-col-12 p-md-2 p-text-left p-text-md-right">
+					<div class="field col-12 md:col-2 p-text-left p-text-md-right">
 						<p:outputLabel value="#{ivy.cms.co('/Labels/InterviewerName')}"
 							for="interviewer-name">
 							<span class="ui-outputlabel-rfi">*</span>
 						</p:outputLabel>
 					</div>
-					<div class="p-field p-col-12 p-md-4">
+					<div class="field col-12 md:col-4">
 						<p:inputText id="interviewer-name"
 							value="#{data.candidateInformation.interviewerName}">
 							<f:validator validatorId="commonValidator" />
@@ -91,13 +91,13 @@
 						<p:message for="interviewer-name" />
 					</div>
 
-					<div class="p-field p-col-12 p-md-2 p-text-left p-text-md-right">
+					<div class="field col-12 md:col-2 p-text-left p-text-md-right">
 						<p:outputLabel value="#{ivy.cms.co('/Labels/InterviewerDate')}"
 							for="interview-date">
 							<span class="ui-outputlabel-rfi">*</span>
 						</p:outputLabel>
 					</div>
-					<div class="p-field p-col-12 p-md-4">
+					<div class="field col-12 md:col-4">
 						<p:datePicker id="interview-date"
 							value="#{data.candidateInformation.interviewDate}"
 							showIcon="true" pattern="dd/MM/yyyy"
@@ -109,14 +109,14 @@
 					</div>
 
 					<!-- Row -->
-					<div class="p-field p-col-12 p-md-2 p-text-left p-text-md-right">
+					<div class="field col-12 md:col-2 p-text-left p-text-md-right">
 						<p:outputLabel
 							value="#{ivy.cms.co('/Labels/InterviewerPosition')}"
 							for="interviewer-job-position">
 							<span class="ui-outputlabel-rfi">*</span>
 						</p:outputLabel>
 					</div>
-					<div class="p-field p-col-12 p-md-4">
+					<div class="field col-12 md:col-4">
 						<p:selectOneMenu id="interviewer-job-position"
 							value="#{data.candidateInformation.interviewerPosition}">
 							<f:selectItem itemLabel="Select Job Position" itemValue="" />
@@ -129,13 +129,13 @@
 					</div>
 
 					<!-- Row -->
-					<div class="p-field p-col-12 p-md-2 p-text-left p-text-md-right">
+					<div class="field col-12 md:col-2 p-text-left p-text-md-right">
 						<p:outputLabel value="#{ivy.cms.co('/Labels/Company')}"
 							for="company">
 							<span class="ui-outputlabel-rfi">*</span>
 						</p:outputLabel>
 					</div>
-					<div class="p-field p-col-12 p-md-4">
+					<div class="field col-12 md:col-4">
 						<p:inputText id="company"
 							value="#{data.candidateInformation.company}">
 							<f:validator validatorId="commonValidator" />
@@ -144,13 +144,13 @@
 					</div>
 
 					<!-- Row -->
-					<div class="p-field p-col-12 p-md-2 p-text-left p-text-md-right">
+					<div class="field col-12 md:col-2 p-text-left p-text-md-right">
 						<p:outputLabel value="#{ivy.cms.co('/Labels/Decision')}"
 							for="decision">
 							<span class="ui-outputlabel-rfi">*</span>
 						</p:outputLabel>
 					</div>
-					<div class="p-field p-col-12 p-md-4">
+					<div class="field col-12 md:col-4">
 						<p:selectOneRadio id="decision"
 							value="#{data.candidateInformation.decision}">
 							<f:selectItems value="#{aIMailGeneratorBean.candidateStatuses}"
@@ -160,40 +160,40 @@
 						</p:selectOneRadio>
 						<p:message for="decision" />
 					</div>
-					<div class="p-field p-col-12"></div>
+					<div class="field col-12"></div>
 
-					<div class="p-field p-col-12 p-md-2 p-text-left p-text-md-right">
+					<div class="field col-12 md:col-2 p-text-left p-text-md-right">
 						<p:outputLabel value="#{ivy.cms.co('/Labels/Subject')}"
 							for="mail-subject">
 						</p:outputLabel>
 					</div>
-					<div class="p-field p-col-12 p-md-10">
+					<div class="field col-12 md:col-10">
 						<p:inputText id="mail-subject" value="#{data.mail.subject}"
 							disabled="true"></p:inputText>
 					</div>
 
-					<div class="p-field p-col-12 p-md-2 p-text-left p-text-md-right">
+					<div class="field col-12 md:col-2 p-text-left p-text-md-right">
 						<p:outputLabel value="#{ivy.cms.co('/Labels/Content')}"
 							for="mail-content">
 						</p:outputLabel>
 					</div>
-					<div class="p-field p-col-12 p-md-10">
+					<div class="field col-12 md:col-10">
 						<p:inputTextarea id="mail-content" value="#{data.mail.content}"
 							disabled="true" />
 					</div>
 
 				</div>
-				<div class="p-pb-4">
-					<h:panelGroup id="command-button" styleClass="p-text-right"
+				<div class="pb-4">
+					<h:panelGroup id="command-button" styleClass="text-right"
 						layout="block">
 						<p:commandButton id="proceed" actionListener="#{logic.generate}"
 							value="#{ivy.cms.co('/Labels/GenerateEmail')}"
 							process="content-form" update="content-form command-button"
-							icon="pi pi-check" styleClass="p-mr-2" />
+							icon="pi pi-check" styleClass="mr-2" />
 						<p:commandButton id="send-mail" actionListener="#{logic.sendMail}"
 							value="#{ivy.cms.co('/Labels/SendToCandidate')}"
 							disabled="#{data.mail.content == null || data.mail.subject == null}"
-							update="content-form" icon="pi pi-check" styleClass="p-mr-2" />
+							update="content-form" icon="pi pi-check" styleClass="mr-2" />
 					</h:panelGroup>
 				</div>
 			</h:form>
diff --git a/openai-connector-demo/webContent/layouts/frame-10-full-width.xhtml b/openai-connector-demo/webContent/layouts/frame-10-full-width.xhtml
index 768d89e..e92e01a 100644
--- a/openai-connector-demo/webContent/layouts/frame-10-full-width.xhtml
+++ b/openai-connector-demo/webContent/layouts/frame-10-full-width.xhtml
@@ -32,7 +32,7 @@ and refence it below in the head part.
   <link rel="shortcut icon" href="#{resource['ivy-branding:favicon']}" />
   <h:outputScript name="js/layout.js" library="#{ivyFreyaTheme.library}" />
   <h:outputStylesheet name="#{ivyFreyaTheme.layout}" library="#{ivyFreyaTheme.library}" />
-  <h:outputStylesheet name="primeflex-2.min.css" library="primeflex" />
+  <h:outputStylesheet name="primeflex-3.min.css" library="primeflex" />
   <h:outputStylesheet name="custom.css" library="ivy-branding" />
   <!-- Optional Style or Script files: 
   <h:outputStylesheet name="layouts/styles/style.css" /> 
diff --git a/openai-connector-demo/webContent/layouts/frame-10.xhtml b/openai-connector-demo/webContent/layouts/frame-10.xhtml
index 936a73b..b6244a1 100644
--- a/openai-connector-demo/webContent/layouts/frame-10.xhtml
+++ b/openai-connector-demo/webContent/layouts/frame-10.xhtml
@@ -32,7 +32,7 @@ and refence it below in the head part.
   <link rel="shortcut icon" href="#{resource['ivy-branding:favicon']}" />
   <h:outputScript name="js/layout.js" library="#{ivyFreyaTheme.library}" />
   <h:outputStylesheet name="#{ivyFreyaTheme.layout}" library="#{ivyFreyaTheme.library}" />
-  <h:outputStylesheet name="primeflex-2.min.css" library="primeflex" />
+  <h:outputStylesheet name="primeflex-3.min.css" library="primeflex" />
   <h:outputStylesheet name="custom.css" library="ivy-branding" />
   <!-- Optional Style or Script files: 
   <h:outputStylesheet name="layouts/styles/style.css" /> 
diff --git a/openai-connector-test/.settings/ch.ivyteam.ivy.designer.prefs b/openai-connector-test/.settings/ch.ivyteam.ivy.designer.prefs
index 197efce..a9e75b7 100644
--- a/openai-connector-test/.settings/ch.ivyteam.ivy.designer.prefs
+++ b/openai-connector-test/.settings/ch.ivyteam.ivy.designer.prefs
@@ -1,4 +1,4 @@
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.openai.test
-ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
+ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
 ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001
-eclipse.preferences.version=1
\ No newline at end of file
+eclipse.preferences.version=1
diff --git a/openai-connector/.settings/ch.ivyteam.ivy.designer.prefs b/openai-connector/.settings/ch.ivyteam.ivy.designer.prefs
index 8144d95..eb469ce 100644
--- a/openai-connector/.settings/ch.ivyteam.ivy.designer.prefs
+++ b/openai-connector/.settings/ch.ivyteam.ivy.designer.prefs
@@ -1,4 +1,4 @@
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.openai.connector
-ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
+ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
 ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001
-eclipse.preferences.version=1
\ No newline at end of file
+eclipse.preferences.version=1