diff --git a/app/client/src/routes/crf2022.tsx b/app/client/src/routes/crf2022.tsx
index 7bd63b93..cbdf2da7 100644
--- a/app/client/src/routes/crf2022.tsx
+++ b/app/client/src/routes/crf2022.tsx
@@ -276,16 +276,16 @@ function CloseOutRequestForm(props: { email: string }) {
       )}
 
       <Dialog as="div" open={dataIsPosting.current} onClose={(_value) => {}}>
-        <div className={clsx("tw-fixed tw-inset-0 tw-bg-black/30")} />
-        <div className={clsx("tw-fixed tw-inset-0 tw-z-20")}>
+        <div className={clsx("tw:fixed tw:inset-0 tw:bg-black/30")} />
+        <div className={clsx("tw:fixed tw:inset-0 tw:z-20")}>
           <div
             className={clsx(
-              "tw-flex tw-min-h-full tw-items-center tw-justify-center",
+              "tw:flex tw:min-h-full tw:items-center tw:justify-center",
             )}
           >
             <Dialog.Panel
               className={clsx(
-                "tw-rounded-lg tw-bg-white tw-px-4 tw-pb-4 tw-shadow-xl",
+                "tw:rounded-lg tw:bg-white tw:px-4 tw:pb-4 tw:shadow-xl",
               )}
             >
               <Loading />
@@ -353,7 +353,7 @@ function CloseOutRequestForm(props: { email: string }) {
                   body: (
                     <p
                       className={clsx(
-                        "tw-text-sm tw-font-medium tw-text-gray-900",
+                        "tw:text-sm tw:font-medium tw:text-gray-900",
                       )}
                     >
                       {onSubmitSubmission.state === "submitted" ? (
@@ -385,7 +385,7 @@ function CloseOutRequestForm(props: { email: string }) {
                   body: (
                     <p
                       className={clsx(
-                        "tw-text-sm tw-font-medium tw-text-gray-900",
+                        "tw:text-sm tw:font-medium tw:text-gray-900",
                       )}
                     >
                       {onSubmitSubmission.state === "submitted" ? (
@@ -452,7 +452,7 @@ function CloseOutRequestForm(props: { email: string }) {
                   body: (
                     <p
                       className={clsx(
-                        "tw-text-sm tw-font-medium tw-text-gray-900",
+                        "tw:text-sm tw:font-medium tw:text-gray-900",
                       )}
                     >
                       Draft saved successfully.
@@ -468,7 +468,7 @@ function CloseOutRequestForm(props: { email: string }) {
                   body: (
                     <p
                       className={clsx(
-                        "tw-text-sm tw-font-medium tw-text-gray-900",
+                        "tw:text-sm tw:font-medium tw:text-gray-900",
                       )}
                     >
                       Error saving draft.
diff --git a/app/client/src/routes/prf2022.tsx b/app/client/src/routes/prf2022.tsx
index 1bda0afa..43ad7554 100644
--- a/app/client/src/routes/prf2022.tsx
+++ b/app/client/src/routes/prf2022.tsx
@@ -297,16 +297,16 @@ function PaymentRequestForm(props: { email: string }) {
       )}
 
       <Dialog as="div" open={dataIsPosting.current} onClose={(_value) => {}}>
-        <div className={clsx("tw-fixed tw-inset-0 tw-bg-black/30")} />
-        <div className={clsx("tw-fixed tw-inset-0 tw-z-20")}>
+        <div className={clsx("tw:fixed tw:inset-0 tw:bg-black/30")} />
+        <div className={clsx("tw:fixed tw:inset-0 tw:z-20")}>
           <div
             className={clsx(
-              "tw-flex tw-min-h-full tw-items-center tw-justify-center",
+              "tw:flex tw:min-h-full tw:items-center tw:justify-center",
             )}
           >
             <Dialog.Panel
               className={clsx(
-                "tw-rounded-lg tw-bg-white tw-px-4 tw-pb-4 tw-shadow-xl",
+                "tw:rounded-lg tw:bg-white tw:px-4 tw:pb-4 tw:shadow-xl",
               )}
             >
               <Loading />
@@ -380,7 +380,7 @@ function PaymentRequestForm(props: { email: string }) {
                   body: (
                     <p
                       className={clsx(
-                        "tw-text-sm tw-font-medium tw-text-gray-900",
+                        "tw:text-sm tw:font-medium tw:text-gray-900",
                       )}
                     >
                       {onSubmitSubmission.state === "submitted" ? (
@@ -413,7 +413,7 @@ function PaymentRequestForm(props: { email: string }) {
                   body: (
                     <p
                       className={clsx(
-                        "tw-text-sm tw-font-medium tw-text-gray-900",
+                        "tw:text-sm tw:font-medium tw:text-gray-900",
                       )}
                     >
                       {onSubmitSubmission.state === "submitted" ? (
@@ -503,7 +503,7 @@ function PaymentRequestForm(props: { email: string }) {
                   body: (
                     <p
                       className={clsx(
-                        "tw-text-sm tw-font-medium tw-text-gray-900",
+                        "tw:text-sm tw:font-medium tw:text-gray-900",
                       )}
                     >
                       Draft saved successfully.
@@ -519,7 +519,7 @@ function PaymentRequestForm(props: { email: string }) {
                   body: (
                     <p
                       className={clsx(
-                        "tw-text-sm tw-font-medium tw-text-gray-900",
+                        "tw:text-sm tw:font-medium tw:text-gray-900",
                       )}
                     >
                       Error saving draft.
diff --git a/app/client/src/routes/prf2023.tsx b/app/client/src/routes/prf2023.tsx
index 1ec178ec..a7a1ad6b 100644
--- a/app/client/src/routes/prf2023.tsx
+++ b/app/client/src/routes/prf2023.tsx
@@ -295,16 +295,16 @@ function PaymentRequestForm(props: { email: string }) {
       )}
 
       <Dialog as="div" open={dataIsPosting.current} onClose={(_value) => {}}>
-        <div className={clsx("tw-fixed tw-inset-0 tw-bg-black/30")} />
-        <div className={clsx("tw-fixed tw-inset-0 tw-z-20")}>
+        <div className={clsx("tw:fixed tw:inset-0 tw:bg-black/30")} />
+        <div className={clsx("tw:fixed tw:inset-0 tw:z-20")}>
           <div
             className={clsx(
-              "tw-flex tw-min-h-full tw-items-center tw-justify-center",
+              "tw:flex tw:min-h-full tw:items-center tw:justify-center",
             )}
           >
             <Dialog.Panel
               className={clsx(
-                "tw-rounded-lg tw-bg-white tw-px-4 tw-pb-4 tw-shadow-xl",
+                "tw:rounded-lg tw:bg-white tw:px-4 tw:pb-4 tw:shadow-xl",
               )}
             >
               <Loading />
@@ -375,7 +375,7 @@ function PaymentRequestForm(props: { email: string }) {
                   body: (
                     <p
                       className={clsx(
-                        "tw-text-sm tw-font-medium tw-text-gray-900",
+                        "tw:text-sm tw:font-medium tw:text-gray-900",
                       )}
                     >
                       {onSubmitSubmission.state === "submitted" ? (
@@ -408,7 +408,7 @@ function PaymentRequestForm(props: { email: string }) {
                   body: (
                     <p
                       className={clsx(
-                        "tw-text-sm tw-font-medium tw-text-gray-900",
+                        "tw:text-sm tw:font-medium tw:text-gray-900",
                       )}
                     >
                       {onSubmitSubmission.state === "submitted" ? (
@@ -476,7 +476,7 @@ function PaymentRequestForm(props: { email: string }) {
                   body: (
                     <p
                       className={clsx(
-                        "tw-text-sm tw-font-medium tw-text-gray-900",
+                        "tw:text-sm tw:font-medium tw:text-gray-900",
                       )}
                     >
                       Draft saved successfully.
@@ -492,7 +492,7 @@ function PaymentRequestForm(props: { email: string }) {
                   body: (
                     <p
                       className={clsx(
-                        "tw-text-sm tw-font-medium tw-text-gray-900",
+                        "tw:text-sm tw:font-medium tw:text-gray-900",
                       )}
                     >
                       Error saving draft.
diff --git a/app/client/src/routes/prf2024.tsx b/app/client/src/routes/prf2024.tsx
index 1c32bea9..74ac0ddd 100644
--- a/app/client/src/routes/prf2024.tsx
+++ b/app/client/src/routes/prf2024.tsx
@@ -295,16 +295,16 @@ function PaymentRequestForm(props: { email: string }) {
       )}
 
       <Dialog as="div" open={dataIsPosting.current} onClose={(_value) => {}}>
-        <div className={clsx("tw-fixed tw-inset-0 tw-bg-black/30")} />
-        <div className={clsx("tw-fixed tw-inset-0 tw-z-20")}>
+        <div className={clsx("tw:fixed tw:inset-0 tw:bg-black/30")} />
+        <div className={clsx("tw:fixed tw:inset-0 tw:z-20")}>
           <div
             className={clsx(
-              "tw-flex tw-min-h-full tw-items-center tw-justify-center",
+              "tw:flex tw:min-h-full tw:items-center tw:justify-center",
             )}
           >
             <Dialog.Panel
               className={clsx(
-                "tw-rounded-lg tw-bg-white tw-px-4 tw-pb-4 tw-shadow-xl",
+                "tw:rounded-lg tw:bg-white tw:px-4 tw:pb-4 tw:shadow-xl",
               )}
             >
               <Loading />
@@ -375,7 +375,7 @@ function PaymentRequestForm(props: { email: string }) {
                   body: (
                     <p
                       className={clsx(
-                        "tw-text-sm tw-font-medium tw-text-gray-900",
+                        "tw:text-sm tw:font-medium tw:text-gray-900",
                       )}
                     >
                       {onSubmitSubmission.state === "submitted" ? (
@@ -408,7 +408,7 @@ function PaymentRequestForm(props: { email: string }) {
                   body: (
                     <p
                       className={clsx(
-                        "tw-text-sm tw-font-medium tw-text-gray-900",
+                        "tw:text-sm tw:font-medium tw:text-gray-900",
                       )}
                     >
                       {onSubmitSubmission.state === "submitted" ? (
@@ -476,7 +476,7 @@ function PaymentRequestForm(props: { email: string }) {
                   body: (
                     <p
                       className={clsx(
-                        "tw-text-sm tw-font-medium tw-text-gray-900",
+                        "tw:text-sm tw:font-medium tw:text-gray-900",
                       )}
                     >
                       Draft saved successfully.
@@ -492,7 +492,7 @@ function PaymentRequestForm(props: { email: string }) {
                   body: (
                     <p
                       className={clsx(
-                        "tw-text-sm tw-font-medium tw-text-gray-900",
+                        "tw:text-sm tw:font-medium tw:text-gray-900",
                       )}
                     >
                       Error saving draft.