diff --git a/packages/client-core/src/admin/adminRoutes.tsx b/packages/client-core/src/admin/adminRoutes.tsx
index 95d5f8f173..4fc8c5fa31 100644
--- a/packages/client-core/src/admin/adminRoutes.tsx
+++ b/packages/client-core/src/admin/adminRoutes.tsx
@@ -89,9 +89,9 @@ const AdminSideBar = () => {
               <li key={index}>
                 <Link to={path}>
                   <Button
-                    className={`text-theme-secondary hover:bg-theme-highlight] flex w-72 items-center justify-start rounded-xl px-2 py-3 font-medium ${
+                    className={`hover:bg-theme-highlight] text-theme-secondary flex w-72 items-center justify-start rounded-xl px-2 py-3 font-medium ${
                       relativePath === path
-                        ? 'text-theme-primary bg-theme-highlight font-semibold '
+                        ? 'bg-theme-highlight text-theme-primary font-semibold '
                         : 'bg-theme-surface-main'
                     }`}
                     startIcon={sidebarItem.icon}
diff --git a/packages/client-core/src/admin/components/project/UpdateEngineModal.tsx b/packages/client-core/src/admin/components/project/UpdateEngineModal.tsx
index 5e284f1db1..3d51e41eb3 100644
--- a/packages/client-core/src/admin/components/project/UpdateEngineModal.tsx
+++ b/packages/client-core/src/admin/components/project/UpdateEngineModal.tsx
@@ -188,7 +188,7 @@ export default function UpdateEngineModal() {
               {projectState.projects.value
                 .filter((project) => project.name !== 'default-project' && project.repositoryPath)
                 .map((project) => (
-                  <div key={project.id} className="bg-theme-surfaceInput border-theme-primary border px-3.5 py-5">
+                  <div key={project.id} className="border-theme-primary bg-theme-surfaceInput border px-3.5 py-5">
                     <Checkbox
                       label={project.name}
                       value={projectsToUpdate.value.has(project.name)}
diff --git a/packages/client-core/src/admin/components/settings/tabs/authentication.tsx b/packages/client-core/src/admin/components/settings/tabs/authentication.tsx
index 8b1ad404af..9ae888916c 100644
--- a/packages/client-core/src/admin/components/settings/tabs/authentication.tsx
+++ b/packages/client-core/src/admin/components/settings/tabs/authentication.tsx
@@ -419,7 +419,7 @@ const AuthenticationTab = forwardRef(({ open }: { open: boolean }, ref: React.Mu
       </div>
 
       <div className="mt-6 grid grid-cols-8 gap-6">
-        <Button size="small" className="bg-theme-highlight text-primary col-span-1" onClick={handleCancel} fullWidth>
+        <Button size="small" className="text-primary bg-theme-highlight col-span-1" onClick={handleCancel} fullWidth>
           {t('admin:components.common.reset')}
         </Button>
 
diff --git a/packages/client-core/src/admin/components/settings/tabs/aws.tsx b/packages/client-core/src/admin/components/settings/tabs/aws.tsx
index b404c0c3a4..9192058412 100644
--- a/packages/client-core/src/admin/components/settings/tabs/aws.tsx
+++ b/packages/client-core/src/admin/components/settings/tabs/aws.tsx
@@ -248,7 +248,7 @@ const AwsTab = forwardRef(({ open }: { open: boolean }, ref: React.MutableRefObj
       </div>
 
       <div className="grid grid-cols-8 gap-6">
-        <Button size="small" className="bg-theme-highlight text-primary col-span-1" fullWidth onClick={handleCancel}>
+        <Button size="small" className="text-primary bg-theme-highlight col-span-1" fullWidth onClick={handleCancel}>
           {t('admin:components.common.reset')}
         </Button>
         <Button size="small" variant="primary" className="col-span-1" fullWidth onClick={handleSubmit}>
diff --git a/packages/client-core/src/admin/components/settings/tabs/client.tsx b/packages/client-core/src/admin/components/settings/tabs/client.tsx
index 4cff528914..9f728a1764 100644
--- a/packages/client-core/src/admin/components/settings/tabs/client.tsx
+++ b/packages/client-core/src/admin/components/settings/tabs/client.tsx
@@ -407,7 +407,7 @@ const ClientTab = forwardRef(({ open }: { open: boolean }, ref: React.MutableRef
       </div>
 
       <div className="mt-6 grid grid-cols-8 gap-6">
-        <Button size="small" className="bg-theme-highlight text-primary col-span-1" onClick={handleCancel} fullWidth>
+        <Button size="small" className="text-primary bg-theme-highlight col-span-1" onClick={handleCancel} fullWidth>
           {t('admin:components.common.reset')}
         </Button>
         <Button
diff --git a/packages/client-core/src/admin/components/settings/tabs/email.tsx b/packages/client-core/src/admin/components/settings/tabs/email.tsx
index 0a91f7b05e..0ee1a69832 100644
--- a/packages/client-core/src/admin/components/settings/tabs/email.tsx
+++ b/packages/client-core/src/admin/components/settings/tabs/email.tsx
@@ -222,7 +222,7 @@ const EmailTab = forwardRef(({ open }: { open: boolean }, ref: React.MutableRefO
         )}
 
         <div className="col-span-1 grid grid-cols-4 gap-6">
-          <Button size="small" className="bg-theme-highlight text-primary col-span-1" fullWidth onClick={handleCancel}>
+          <Button size="small" className="text-primary bg-theme-highlight col-span-1" fullWidth onClick={handleCancel}>
             {t('admin:components.common.reset')}
           </Button>
           <Button
diff --git a/packages/client-core/src/admin/components/settings/tabs/helm.tsx b/packages/client-core/src/admin/components/settings/tabs/helm.tsx
index fef8f14a1d..9225e44ae4 100644
--- a/packages/client-core/src/admin/components/settings/tabs/helm.tsx
+++ b/packages/client-core/src/admin/components/settings/tabs/helm.tsx
@@ -125,7 +125,7 @@ const HelmTab = forwardRef(({ open }: { open: boolean }, ref: React.MutableRefOb
         />
 
         <div className="col-span-1 mt-6 grid grid-cols-4 gap-6">
-          <Button size="small" className="bg-theme-highlight text-primary col-span-1" onClick={handleCancel} fullWidth>
+          <Button size="small" className="text-primary bg-theme-highlight col-span-1" onClick={handleCancel} fullWidth>
             {t('admin:components.common.reset')}
           </Button>
 
diff --git a/packages/client-core/src/admin/components/settings/tabs/project.tsx b/packages/client-core/src/admin/components/settings/tabs/project.tsx
index ebb631852a..19cfc8a324 100644
--- a/packages/client-core/src/admin/components/settings/tabs/project.tsx
+++ b/packages/client-core/src/admin/components/settings/tabs/project.tsx
@@ -156,7 +156,7 @@ const ProjectTab = forwardRef(({ open }: { open: boolean }, ref: React.MutableRe
           <div className="mb-3 grid grid-cols-8 gap-2">
             <Button
               size="small"
-              className="bg-theme-highlight text-primary col-span-1"
+              className="text-primary bg-theme-highlight col-span-1"
               fullWidth
               onClick={handleCancel}
             >
diff --git a/packages/client-core/src/admin/components/settings/tabs/server.tsx b/packages/client-core/src/admin/components/settings/tabs/server.tsx
index 98e9a0ef19..f2845cad5c 100644
--- a/packages/client-core/src/admin/components/settings/tabs/server.tsx
+++ b/packages/client-core/src/admin/components/settings/tabs/server.tsx
@@ -236,7 +236,7 @@ const ServerTab = forwardRef(({ open }: { open: boolean }, ref: React.MutableRef
         )}
 
         <div className="col-span-1 grid grid-cols-4 gap-6">
-          <Button size="small" className="bg-theme-highlight text-primary col-span-1" fullWidth onClick={handleCancel}>
+          <Button size="small" className="text-primary bg-theme-highlight col-span-1" fullWidth onClick={handleCancel}>
             {t('admin:components.common.reset')}
           </Button>
           <Button
diff --git a/packages/ui/src/primitives/tailwind/MultiEmailInput/index.tsx b/packages/ui/src/primitives/tailwind/MultiEmailInput/index.tsx
index 9577800f63..39a0d32997 100644
--- a/packages/ui/src/primitives/tailwind/MultiEmailInput/index.tsx
+++ b/packages/ui/src/primitives/tailwind/MultiEmailInput/index.tsx
@@ -130,7 +130,7 @@ const MultiEmailInput = ({ emailList, error, label, disabled }: LabelProps) => {
       {label && <Label className="self-stretch">{label}</Label>}
 
       {emailList.length > 0 && (
-        <div className="bg-theme-surfaceInput border-theme-primary flex flex-wrap gap-2	rounded-lg border px-3.5 py-1.5">
+        <div className="border-theme-primary bg-theme-surfaceInput flex flex-wrap gap-2	rounded-lg border px-3.5 py-1.5">
           {emailList.value.map((item) => (
             <div
               className="bg-theme-surface-main text-theme-primary flex w-fit items-center justify-between gap-1 rounded px-2 py-1 text-black"
diff --git a/packages/ui/src/primitives/tailwind/MultiSelect/index.tsx b/packages/ui/src/primitives/tailwind/MultiSelect/index.tsx
index 0516fcd589..2dae9c973d 100644
--- a/packages/ui/src/primitives/tailwind/MultiSelect/index.tsx
+++ b/packages/ui/src/primitives/tailwind/MultiSelect/index.tsx
@@ -95,7 +95,7 @@ const MultiSelect = <T extends string | number>({
         </p>
       )}
       <div
-        className="bg-theme-surface-main border-theme-primary textshadow-sm mt-2 flex min-h-10 w-full flex-auto flex-wrap items-center rounded-lg border px-3.5 pr-7"
+        className="textshadow-sm border-theme-primary bg-theme-surface-main mt-2 flex min-h-10 w-full flex-auto flex-wrap items-center rounded-lg border px-3.5 pr-7"
         onClick={() => showOptions.set((value) => !value)}
       >
         {selectedOptions.length === 0 && (
diff --git a/packages/ui/src/primitives/tailwind/Radio/index.tsx b/packages/ui/src/primitives/tailwind/Radio/index.tsx
index 28ee4465d3..46a93bc030 100644
--- a/packages/ui/src/primitives/tailwind/Radio/index.tsx
+++ b/packages/ui/src/primitives/tailwind/Radio/index.tsx
@@ -51,7 +51,7 @@ export const RadioRoot = ({
         name={label}
         onChange={onChange}
         disabled={disabled}
-        className="text-blue-primary focus:ring-blue-primary checked:border-blue-primary shrink-0 rounded-full border-gray-200 disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 dark:border-gray-700 dark:bg-gray-800 dark:focus:ring-offset-gray-800"
+        className="text-blue-primary checked:border-blue-primary focus:ring-blue-primary shrink-0 rounded-full border-gray-200 disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 dark:border-gray-700 dark:bg-gray-800 dark:focus:ring-offset-gray-800"
       />
       <label
         onClick={() => onChange({ target: { value } } as any)}
diff --git a/packages/ui/src/primitives/tailwind/Select/index.tsx b/packages/ui/src/primitives/tailwind/Select/index.tsx
index 5f109039fd..9071d0ca4d 100644
--- a/packages/ui/src/primitives/tailwind/Select/index.tsx
+++ b/packages/ui/src/primitives/tailwind/Select/index.tsx
@@ -161,7 +161,7 @@ const Select = <T extends OptionValueType>({
               value={option.value}
               className={twMerge(
                 'text-theme-secondary cursor-pointer px-4 py-2',
-                option.disabled ? 'cursor-not-allowed' : 'hover:text-theme-highlight hover:bg-theme-highlight',
+                option.disabled ? 'cursor-not-allowed' : 'hover:bg-theme-highlight hover:text-theme-highlight',
                 menuItemClassName
               )}
               onClick={() => handleOptionItem(option)}
diff --git a/packages/ui/src/primitives/tailwind/Tabs/index.tsx b/packages/ui/src/primitives/tailwind/Tabs/index.tsx
index df3697e289..48816133c8 100644
--- a/packages/ui/src/primitives/tailwind/Tabs/index.tsx
+++ b/packages/ui/src/primitives/tailwind/Tabs/index.tsx
@@ -102,7 +102,7 @@ const Tabs = ({
               key={index}
               className={twMerge(
                 twTabClassName,
-                currentTab.value === index ? 'text-theme-primary border-b-blue-primary border-b font-semibold' : '',
+                currentTab.value === index ? 'border-b-blue-primary text-theme-primary border-b font-semibold' : '',
                 tab.disabled ? 'border-none' : ''
               )}
               disabled={tab.disabled}