diff --git a/apps/app/components/account/email-code-form.tsx b/apps/app/components/account/email-code-form.tsx
index e6b3eeac3..29891f624 100644
--- a/apps/app/components/account/email-code-form.tsx
+++ b/apps/app/components/account/email-code-form.tsx
@@ -136,6 +136,7 @@ export const EmailCodeForm = ({ handleSignIn }: any) => {
             }}
             error={errors.email}
             placeholder="Enter your email address..."
+            className="border-custom-border-300"
           />
         </div>
 
@@ -151,6 +152,7 @@ export const EmailCodeForm = ({ handleSignIn }: any) => {
               }}
               error={errors.token}
               placeholder="Enter code..."
+              className="border-custom-border-300"
             />
             <button
               type="button"
diff --git a/apps/app/components/account/email-password-form.tsx b/apps/app/components/account/email-password-form.tsx
index ab902ee96..c21b629e7 100644
--- a/apps/app/components/account/email-password-form.tsx
+++ b/apps/app/components/account/email-password-form.tsx
@@ -71,6 +71,7 @@ export const EmailPasswordForm: React.FC<Props> = ({ onSubmit }) => {
               }}
               error={errors.email}
               placeholder="Enter your email address..."
+              className="border-custom-border-300"
             />
           </div>
           <div className="space-y-1">
@@ -84,6 +85,7 @@ export const EmailPasswordForm: React.FC<Props> = ({ onSubmit }) => {
               }}
               error={errors.password}
               placeholder="Enter your password..."
+              className="border-custom-border-300"
             />
           </div>
           <div className="text-right text-xs">
diff --git a/apps/app/components/account/email-reset-password-form.tsx b/apps/app/components/account/email-reset-password-form.tsx
index 2fa787a5f..3fe46815a 100644
--- a/apps/app/components/account/email-reset-password-form.tsx
+++ b/apps/app/components/account/email-reset-password-form.tsx
@@ -78,6 +78,7 @@ export const EmailResetPasswordForm: React.FC<Props> = ({ setIsResettingPassword
           }}
           error={errors.email}
           placeholder="Enter registered email address.."
+          className="border-custom-border-300"
         />
       </div>
       <div className="mt-5 flex flex-col-reverse sm:flex-row items-center gap-2">
diff --git a/apps/app/components/analytics/custom-analytics/create-update-analytics-modal.tsx b/apps/app/components/analytics/custom-analytics/create-update-analytics-modal.tsx
index 28f8c0fba..66917ed7c 100644
--- a/apps/app/components/analytics/custom-analytics/create-update-analytics-modal.tsx
+++ b/apps/app/components/analytics/custom-analytics/create-update-analytics-modal.tsx
@@ -111,7 +111,7 @@ export const CreateUpdateAnalyticsModal: React.FC<Props> = ({ isOpen, handleClos
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative transform rounded-lg border border-custom-border-300 bg-custom-background-100 px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl sm:p-6">
+              <Dialog.Panel className="relative transform rounded-lg border border-custom-border-200 bg-custom-background-100 px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl sm:p-6">
                 <form onSubmit={handleSubmit(onSubmit)}>
                   <div>
                     <Dialog.Title
diff --git a/apps/app/components/analytics/custom-analytics/graph/custom-tooltip.tsx b/apps/app/components/analytics/custom-analytics/graph/custom-tooltip.tsx
index 206b09fd7..573cda25c 100644
--- a/apps/app/components/analytics/custom-analytics/graph/custom-tooltip.tsx
+++ b/apps/app/components/analytics/custom-analytics/graph/custom-tooltip.tsx
@@ -31,7 +31,7 @@ export const CustomTooltip: React.FC<Props> = ({ datum, analytics, params }) =>
   }
 
   return (
-    <div className="flex items-center gap-2 rounded-md border border-custom-border-300 bg-custom-background-80 p-2 text-xs">
+    <div className="flex items-center gap-2 rounded-md border border-custom-border-200 bg-custom-background-80 p-2 text-xs">
       <span
         className="h-3 w-3 rounded"
         style={{
diff --git a/apps/app/components/analytics/custom-analytics/sidebar.tsx b/apps/app/components/analytics/custom-analytics/sidebar.tsx
index 46e2264b1..fbef3913c 100644
--- a/apps/app/components/analytics/custom-analytics/sidebar.tsx
+++ b/apps/app/components/analytics/custom-analytics/sidebar.tsx
@@ -185,7 +185,7 @@ export const AnalyticsSidebar: React.FC<Props> = ({
     <div
       className={`px-5 py-2.5 flex items-center justify-between space-y-2 ${
         fullScreen
-          ? "border-l border-custom-border-300 md:h-full md:border-l md:border-custom-border-300 md:space-y-4 overflow-hidden md:flex-col md:items-start md:py-5"
+          ? "border-l border-custom-border-200 md:h-full md:border-l md:border-custom-border-200 md:space-y-4 overflow-hidden md:flex-col md:items-start md:py-5"
           : ""
       }`}
     >
diff --git a/apps/app/components/analytics/custom-analytics/table.tsx b/apps/app/components/analytics/custom-analytics/table.tsx
index 7dcdfb7d9..92eac5085 100644
--- a/apps/app/components/analytics/custom-analytics/table.tsx
+++ b/apps/app/components/analytics/custom-analytics/table.tsx
@@ -37,9 +37,9 @@ export const AnalyticsTable: React.FC<Props> = ({ analytics, barGraphData, param
     <div className="flow-root">
       <div className="overflow-x-auto">
         <div className="inline-block min-w-full align-middle">
-          <table className="min-w-full divide-y divide-custom-border-300 whitespace-nowrap border-y border-custom-border-300">
+          <table className="min-w-full divide-y divide-custom-border-200 whitespace-nowrap border-y border-custom-border-200">
             <thead className="bg-custom-background-80">
-              <tr className="divide-x divide-custom-border-300 text-sm text-custom-text-100">
+              <tr className="divide-x divide-custom-border-200 text-sm text-custom-text-100">
                 <th scope="col" className="py-3 px-2.5 text-left font-medium">
                   {ANALYTICS_X_AXIS_VALUES.find((v) => v.value === params.x_axis)?.label}
                 </th>
@@ -80,11 +80,11 @@ export const AnalyticsTable: React.FC<Props> = ({ analytics, barGraphData, param
                 )}
               </tr>
             </thead>
-            <tbody className="divide-y divide-custom-border-300">
+            <tbody className="divide-y divide-custom-border-200">
               {barGraphData.data.map((item, index) => (
                 <tr
                   key={`table-row-${index}`}
-                  className="divide-x divide-custom-border-300 text-xs text-custom-text-200"
+                  className="divide-x divide-custom-border-200 text-xs text-custom-text-200"
                 >
                   <td
                     className={`flex items-center gap-2 whitespace-nowrap py-2 px-2.5 font-medium ${
diff --git a/apps/app/components/analytics/project-modal.tsx b/apps/app/components/analytics/project-modal.tsx
index e0f0e5c53..d8bb841f7 100644
--- a/apps/app/components/analytics/project-modal.tsx
+++ b/apps/app/components/analytics/project-modal.tsx
@@ -155,7 +155,7 @@ export const AnalyticsProjectModal: React.FC<Props> = ({ isOpen, onClose }) => {
       } ${isOpen ? "right-0" : "-right-full"} duration-300 transition-all`}
     >
       <div
-        className={`flex h-full flex-col overflow-hidden border-custom-border-300 bg-custom-background-100 text-left ${
+        className={`flex h-full flex-col overflow-hidden border-custom-border-200 bg-custom-background-100 text-left ${
           fullScreen ? "rounded-lg border" : "border-l"
         }`}
       >
@@ -186,12 +186,12 @@ export const AnalyticsProjectModal: React.FC<Props> = ({ isOpen, onClose }) => {
           </div>
         </div>
         <Tab.Group as={Fragment}>
-          <Tab.List as="div" className="space-x-2 border-b border-custom-border-300 p-5 pt-0">
+          <Tab.List as="div" className="space-x-2 border-b border-custom-border-200 p-5 pt-0">
             {tabsList.map((tab) => (
               <Tab
                 key={tab}
                 className={({ selected }) =>
-                  `rounded-3xl border border-custom-border-300 px-4 py-2 text-xs hover:bg-custom-background-80 ${
+                  `rounded-3xl border border-custom-border-200 px-4 py-2 text-xs hover:bg-custom-background-80 ${
                     selected ? "bg-custom-background-80" : ""
                   }`
                 }
diff --git a/apps/app/components/analytics/scope-and-demand/demand.tsx b/apps/app/components/analytics/scope-and-demand/demand.tsx
index c19382c31..ad3781247 100644
--- a/apps/app/components/analytics/scope-and-demand/demand.tsx
+++ b/apps/app/components/analytics/scope-and-demand/demand.tsx
@@ -10,7 +10,7 @@ type Props = {
 };
 
 export const AnalyticsDemand: React.FC<Props> = ({ defaultAnalytics }) => (
-  <div className="space-y-3 rounded-[10px] border border-custom-border-300 p-3">
+  <div className="space-y-3 rounded-[10px] border border-custom-border-200 p-3">
     <h5 className="text-xs text-red-500">DEMAND</h5>
     <div>
       <h4 className="text-custom-text-100 text-base font-medium">Total open tasks</h4>
@@ -50,7 +50,7 @@ export const AnalyticsDemand: React.FC<Props> = ({ defaultAnalytics }) => (
         );
       })}
     </div>
-    <div className="!mt-6 flex w-min items-center gap-2 whitespace-nowrap rounded-md border border-custom-border-300 bg-custom-background-80 p-2 text-xs">
+    <div className="!mt-6 flex w-min items-center gap-2 whitespace-nowrap rounded-md border border-custom-border-200 bg-custom-background-80 p-2 text-xs">
       <p className="flex items-center gap-1 text-custom-text-200">
         <PlayIcon className="h-4 w-4 -rotate-90" aria-hidden="true" />
         <span>Estimate Demand:</span>
diff --git a/apps/app/components/analytics/scope-and-demand/leaderboard.tsx b/apps/app/components/analytics/scope-and-demand/leaderboard.tsx
index 2bf8c0d68..081fc6302 100644
--- a/apps/app/components/analytics/scope-and-demand/leaderboard.tsx
+++ b/apps/app/components/analytics/scope-and-demand/leaderboard.tsx
@@ -10,7 +10,7 @@ type Props = {
 };
 
 export const AnalyticsLeaderboard: React.FC<Props> = ({ users, title }) => (
-  <div className="p-3 border border-custom-border-300 rounded-[10px]">
+  <div className="p-3 border border-custom-border-200 rounded-[10px]">
     <h6 className="text-base font-medium">{title}</h6>
     {users.length > 0 ? (
       <div className="mt-3 space-y-3">
diff --git a/apps/app/components/analytics/scope-and-demand/scope.tsx b/apps/app/components/analytics/scope-and-demand/scope.tsx
index 0d63c70ea..ac605c8f9 100644
--- a/apps/app/components/analytics/scope-and-demand/scope.tsx
+++ b/apps/app/components/analytics/scope-and-demand/scope.tsx
@@ -8,9 +8,9 @@ type Props = {
 };
 
 export const AnalyticsScope: React.FC<Props> = ({ defaultAnalytics }) => (
-  <div className="rounded-[10px] border border-custom-border-300">
+  <div className="rounded-[10px] border border-custom-border-200">
     <h5 className="p-3 text-xs text-green-500">SCOPE</h5>
-    <div className="divide-y divide-custom-border-300">
+    <div className="divide-y divide-custom-border-200">
       <div>
         <h6 className="px-3 text-base font-medium">Pending issues</h6>
         {defaultAnalytics.pending_issue_user.length > 0 ? (
@@ -27,7 +27,7 @@ export const AnalyticsScope: React.FC<Props> = ({ defaultAnalytics }) => (
               );
 
               return (
-                <div className="rounded-md border border-custom-border-300 bg-custom-background-80 p-2 text-xs">
+                <div className="rounded-md border border-custom-border-200 bg-custom-background-80 p-2 text-xs">
                   <span className="font-medium text-custom-text-200">
                     {assignee
                       ? assignee.assignees__first_name + " " + assignee.assignees__last_name
diff --git a/apps/app/components/analytics/scope-and-demand/year-wise-issues.tsx b/apps/app/components/analytics/scope-and-demand/year-wise-issues.tsx
index 335ef993c..4510b6738 100644
--- a/apps/app/components/analytics/scope-and-demand/year-wise-issues.tsx
+++ b/apps/app/components/analytics/scope-and-demand/year-wise-issues.tsx
@@ -15,7 +15,7 @@ export const AnalyticsYearWiseIssues: React.FC<Props> = ({ defaultAnalytics }) =
   const quarterMonthsList = [startMonth, startMonth + 1, startMonth + 2];
 
   return (
-    <div className="py-3 border border-custom-border-300 rounded-[10px]">
+    <div className="py-3 border border-custom-border-200 rounded-[10px]">
       <h1 className="px-3 text-base font-medium">Issues closed in a year</h1>
       {defaultAnalytics.issue_completed_month_wise.length > 0 ? (
         <LineGraph
@@ -43,7 +43,7 @@ export const AnalyticsYearWiseIssues: React.FC<Props> = ({ defaultAnalytics }) =
           margin={{ top: 20 }}
           enableSlices="x"
           sliceTooltip={(datum) => (
-            <div className="rounded-md border border-custom-border-300 bg-custom-background-80 p-2 text-xs">
+            <div className="rounded-md border border-custom-border-200 bg-custom-background-80 p-2 text-xs">
               {datum.slice.points[0].data.yFormatted}
               <span className="text-custom-text-200"> issues closed in </span>
               {datum.slice.points[0].data.xFormatted}
diff --git a/apps/app/components/auth-screens/not-authorized-view.tsx b/apps/app/components/auth-screens/not-authorized-view.tsx
index f0917a640..32d96eff2 100644
--- a/apps/app/components/auth-screens/not-authorized-view.tsx
+++ b/apps/app/components/auth-screens/not-authorized-view.tsx
@@ -22,7 +22,7 @@ export const NotAuthorizedView: React.FC<Props> = ({ actionButton, type }) => {
 
   return (
     <DefaultLayout>
-      <div className="flex h-full w-full flex-col items-center justify-center gap-y-5 bg-custom-background-90 text-center">
+      <div className="flex h-full w-full flex-col items-center justify-center gap-y-5 bg-custom-background-100 text-center">
         <div className="h-44 w-72">
           <Image
             src={type === "project" ? ProjectNotAuthorizedImg : WorkspaceNotAuthorizedImg}
diff --git a/apps/app/components/auth-screens/project/join-project.tsx b/apps/app/components/auth-screens/project/join-project.tsx
index 854773632..73b824b63 100644
--- a/apps/app/components/auth-screens/project/join-project.tsx
+++ b/apps/app/components/auth-screens/project/join-project.tsx
@@ -41,7 +41,7 @@ export const JoinProject: React.FC = () => {
   };
 
   return (
-    <div className="flex h-full w-full flex-col items-center justify-center gap-y-5 bg-custom-background-90 text-center">
+    <div className="flex h-full w-full flex-col items-center justify-center gap-y-5 bg-custom-background-100 text-center">
       <div className="h-44 w-72">
         <Image src={JoinProjectImg} height="176" width="288" alt="JoinProject" />
       </div>
diff --git a/apps/app/components/breadcrumbs/index.tsx b/apps/app/components/breadcrumbs/index.tsx
index 893d6fde1..8a67c92b9 100644
--- a/apps/app/components/breadcrumbs/index.tsx
+++ b/apps/app/components/breadcrumbs/index.tsx
@@ -17,7 +17,7 @@ const Breadcrumbs = ({ children }: BreadcrumbsProps) => {
       <div className="flex items-center">
         <button
           type="button"
-          className="group grid h-7 w-7 flex-shrink-0 cursor-pointer place-items-center rounded border border-custom-sidebar-border-100 text-center text-sm hover:bg-custom-sidebar-background-90"
+          className="group grid h-7 w-7 flex-shrink-0 cursor-pointer place-items-center rounded border border-custom-sidebar-border-200 text-center text-sm hover:bg-custom-sidebar-background-90"
           onClick={() => router.back()}
         >
           <Icon
@@ -41,7 +41,7 @@ const BreadcrumbItem: React.FC<BreadcrumbItemProps> = ({ title, link, icon }) =>
   <>
     {link ? (
       <Link href={link}>
-        <a className="border-r-2 border-custom-sidebar-border-100 px-3 text-sm">
+        <a className="border-r-2 border-custom-sidebar-border-200 px-3 text-sm">
           <p className={`${icon ? "flex items-center gap-2" : ""}`}>
             {icon ?? null}
             {title}
diff --git a/apps/app/components/command-palette/command-pallette.tsx b/apps/app/components/command-palette/command-pallette.tsx
index 293b3557b..3df2770c5 100644
--- a/apps/app/components/command-palette/command-pallette.tsx
+++ b/apps/app/components/command-palette/command-pallette.tsx
@@ -421,7 +421,7 @@ export const CommandPalette: React.FC = () => {
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative mx-auto max-w-2xl transform divide-y divide-custom-border-300 divide-opacity-10 rounded-xl border border-custom-border-300 bg-custom-background-100 shadow-2xl transition-all">
+              <Dialog.Panel className="relative mx-auto max-w-2xl transform divide-y divide-custom-border-200 divide-opacity-10 rounded-xl border border-custom-border-200 bg-custom-background-100 shadow-2xl transition-all">
                 <Command
                   filter={(value, search) => {
                     if (value.toLowerCase().includes(search.toLowerCase())) return 1;
@@ -456,7 +456,7 @@ export const CommandPalette: React.FC = () => {
                       aria-hidden="true"
                     />
                     <Command.Input
-                      className="w-full border-0 border-b border-custom-border-300 bg-transparent p-4 pl-11 text-custom-text-100 outline-none focus:ring-0 sm:text-sm"
+                      className="w-full border-0 border-b border-custom-border-200 bg-transparent p-4 pl-11 text-custom-text-100 outline-none focus:ring-0 sm:text-sm"
                       placeholder={placeholder}
                       value={searchTerm}
                       onValueChange={(e) => {
diff --git a/apps/app/components/command-palette/shortcuts-modal.tsx b/apps/app/components/command-palette/shortcuts-modal.tsx
index 41793f83f..86b4aeb46 100644
--- a/apps/app/components/command-palette/shortcuts-modal.tsx
+++ b/apps/app/components/command-palette/shortcuts-modal.tsx
@@ -104,7 +104,7 @@ export const ShortcutsModal: React.FC<Props> = ({ isOpen, setIsOpen }) => {
                         </span>
                       </Dialog.Title>
                       <div>
-                        <div className="flex w-full items-center justify-start gap-1 rounded border-[0.6px] border-custom-border-300 bg-custom-background-90 px-3 py-2">
+                        <div className="flex w-full items-center justify-start gap-1 rounded border-[0.6px] border-custom-border-200 bg-custom-background-90 px-3 py-2">
                           <MagnifyingGlassIcon className="h-3.5 w-3.5 text-custom-text-200" />
                           <Input
                             className="w-full  border-none bg-transparent py-1 px-2 text-xs text-custom-text-200 focus:outline-none"
@@ -130,15 +130,15 @@ export const ShortcutsModal: React.FC<Props> = ({ isOpen, setIsOpen }) => {
                                       {shortcut.keys.split(",").map((key, index) => (
                                         <span key={index} className="flex items-center gap-1">
                                           {key === "Ctrl" ? (
-                                            <span className="flex h-full items-center rounded-sm border border-custom-border-300 bg-custom-background-90 p-1.5">
+                                            <span className="flex h-full items-center rounded-sm border border-custom-border-200 bg-custom-background-90 p-1.5">
                                               <CommandIcon className="h-4 w-4 fill-current text-custom-text-200" />
                                             </span>
                                           ) : key === "Ctrl" ? (
-                                            <kbd className="rounded-sm border border-custom-border-300 bg-custom-background-90 p-1.5 text-sm font-medium text-custom-text-200">
+                                            <kbd className="rounded-sm border border-custom-border-200 bg-custom-background-90 p-1.5 text-sm font-medium text-custom-text-200">
                                               <CommandIcon className="h-4 w-4 fill-current text-custom-text-200" />
                                             </kbd>
                                           ) : (
-                                            <kbd className="rounded-sm border border-custom-border-300 bg-custom-background-90 px-2 py-1 text-sm font-medium text-custom-text-200">
+                                            <kbd className="rounded-sm border border-custom-border-200 bg-custom-background-90 px-2 py-1 text-sm font-medium text-custom-text-200">
                                               {key}
                                             </kbd>
                                           )}
@@ -173,15 +173,15 @@ export const ShortcutsModal: React.FC<Props> = ({ isOpen, setIsOpen }) => {
                                       {keys.split(",").map((key, index) => (
                                         <span key={index} className="flex items-center gap-1">
                                           {key === "Ctrl" ? (
-                                            <span className="flex h-full items-center rounded-sm border border-custom-border-300 bg-custom-background-90 p-1.5 text-custom-text-200">
+                                            <span className="flex h-full items-center rounded-sm border border-custom-border-200 bg-custom-background-90 p-1.5 text-custom-text-200">
                                               <CommandIcon className="h-4 w-4 fill-current text-custom-text-200" />
                                             </span>
                                           ) : key === "Ctrl" ? (
-                                            <kbd className="rounded-sm border border-custom-border-300 bg-custom-background-90 p-1.5 text-sm font-medium text-custom-text-200">
+                                            <kbd className="rounded-sm border border-custom-border-200 bg-custom-background-90 p-1.5 text-sm font-medium text-custom-text-200">
                                               <CommandIcon className="h-4 w-4 fill-current text-custom-text-200" />
                                             </kbd>
                                           ) : (
-                                            <kbd className="rounded-sm border border-custom-border-300 bg-custom-background-90 px-2 py-1 text-sm font-medium text-custom-text-200">
+                                            <kbd className="rounded-sm border border-custom-border-200 bg-custom-background-90 px-2 py-1 text-sm font-medium text-custom-text-200">
                                               {key}
                                             </kbd>
                                           )}
diff --git a/apps/app/components/core/board-view/single-issue.tsx b/apps/app/components/core/board-view/single-issue.tsx
index ba7368ce1..e532a200e 100644
--- a/apps/app/components/core/board-view/single-issue.tsx
+++ b/apps/app/components/core/board-view/single-issue.tsx
@@ -392,7 +392,7 @@ export const SingleBoardIssue: React.FC<Props> = ({
               />
             )}
             {properties.sub_issue_count && (
-              <div className="flex cursor-default items-center rounded-md border border-custom-border-300 px-2.5 py-1 text-xs shadow-sm">
+              <div className="flex cursor-default items-center rounded-md border border-custom-border-200 px-2.5 py-1 text-xs shadow-sm">
                 <Tooltip tooltipHeading="Sub-issue" tooltipContent={`${issue.sub_issues_count}`}>
                   <div className="flex items-center gap-1 text-custom-text-200">
                     <LayerDiagonalIcon className="h-3.5 w-3.5" />
@@ -402,7 +402,7 @@ export const SingleBoardIssue: React.FC<Props> = ({
               </div>
             )}
             {properties.link && (
-              <div className="flex cursor-default items-center rounded-md border border-custom-border-300 px-2.5 py-1 text-xs shadow-sm">
+              <div className="flex cursor-default items-center rounded-md border border-custom-border-200 px-2.5 py-1 text-xs shadow-sm">
                 <Tooltip tooltipHeading="Link" tooltipContent={`${issue.link_count}`}>
                   <div className="flex items-center gap-1 text-custom-text-200">
                     <LinkIcon className="h-3.5 w-3.5" />
@@ -412,7 +412,7 @@ export const SingleBoardIssue: React.FC<Props> = ({
               </div>
             )}
             {properties.attachment_count && (
-              <div className="flex cursor-default items-center rounded-md border border-custom-border-300 px-2.5 py-1 text-xs shadow-sm">
+              <div className="flex cursor-default items-center rounded-md border border-custom-border-200 px-2.5 py-1 text-xs shadow-sm">
                 <Tooltip tooltipHeading="Attachment" tooltipContent={`${issue.attachment_count}`}>
                   <div className="flex items-center gap-1 text-custom-text-200">
                     <PaperClipIcon className="h-3.5 w-3.5 -rotate-45" />
diff --git a/apps/app/components/core/calendar-view/calendar-header.tsx b/apps/app/components/core/calendar-view/calendar-header.tsx
index 9e9ea1916..271423cd4 100644
--- a/apps/app/components/core/calendar-view/calendar-header.tsx
+++ b/apps/app/components/core/calendar-view/calendar-header.tsx
@@ -92,7 +92,7 @@ export const CalendarHeader: React.FC<Props> = ({
                       </button>
                     ))}
                   </div>
-                  <div className="grid grid-cols-4  border-t border-custom-border-300 px-2">
+                  <div className="grid grid-cols-4  border-t border-custom-border-200 px-2">
                     {MONTHS_LIST.map((month) => (
                       <button
                         onClick={() =>
@@ -152,7 +152,7 @@ export const CalendarHeader: React.FC<Props> = ({
 
       <div className="flex w-full items-center justify-end gap-2">
         <button
-          className="group flex cursor-pointer items-center gap-2 rounded-md border border-custom-border-300 px-3 py-1 text-sm hover:bg-custom-background-80 hover:text-custom-text-100 focus:outline-none"
+          className="group flex cursor-pointer items-center gap-2 rounded-md border border-custom-border-200 px-3 py-1 text-sm hover:bg-custom-background-80 hover:text-custom-text-100 focus:outline-none"
           onClick={() => {
             if (isMonthlyView) {
               updateDate(new Date());
@@ -170,7 +170,7 @@ export const CalendarHeader: React.FC<Props> = ({
 
         <CustomMenu
           customButton={
-            <div className="group flex cursor-pointer items-center gap-2 rounded-md border border-custom-border-300 px-3 py-1 text-sm hover:bg-custom-background-80 hover:text-custom-text-100 focus:outline-none ">
+            <div className="group flex cursor-pointer items-center gap-2 rounded-md border border-custom-border-200 px-3 py-1 text-sm hover:bg-custom-background-80 hover:text-custom-text-100 focus:outline-none ">
               {isMonthlyView ? "Monthly" : "Weekly"}
               <ChevronDownIcon className="h-3 w-3" aria-hidden="true" />
             </div>
@@ -207,7 +207,7 @@ export const CalendarHeader: React.FC<Props> = ({
               />
             </div>
           </CustomMenu.MenuItem>
-          <div className="mt-1 flex w-52 items-center justify-between border-t border-custom-border-300 py-2 px-1  text-sm text-custom-text-200">
+          <div className="mt-1 flex w-52 items-center justify-between border-t border-custom-border-200 py-2 px-1  text-sm text-custom-text-200">
             <h4>Show weekends</h4>
             <ToggleSwitch value={showWeekEnds} onChange={() => setShowWeekEnds(!showWeekEnds)} />
           </div>
diff --git a/apps/app/components/core/calendar-view/calendar.tsx b/apps/app/components/core/calendar-view/calendar.tsx
index 719d5d19d..29d6ae446 100644
--- a/apps/app/components/core/calendar-view/calendar.tsx
+++ b/apps/app/components/core/calendar-view/calendar.tsx
@@ -191,7 +191,7 @@ export const CalendarView: React.FC<Props> = ({
             {weeks.map((date, index) => (
               <div
                 key={index}
-                className={`flex  items-center justify-start gap-2 border-custom-border-300 bg-custom-background-90 p-1.5 text-base font-medium text-custom-text-200 ${
+                className={`flex  items-center justify-start gap-2 border-custom-border-200 bg-custom-background-90 p-1.5 text-base font-medium text-custom-text-200 ${
                   !isMonthlyView
                     ? showWeekEnds
                       ? (index + 1) % 7 === 0
diff --git a/apps/app/components/core/calendar-view/single-date.tsx b/apps/app/components/core/calendar-view/single-date.tsx
index dccf952f4..075737f4f 100644
--- a/apps/app/components/core/calendar-view/single-date.tsx
+++ b/apps/app/components/core/calendar-view/single-date.tsx
@@ -49,7 +49,7 @@ export const SingleCalendarDate: React.FC<Props> = ({
           key={index}
           ref={provided.innerRef}
           {...provided.droppableProps}
-          className={`group relative flex min-h-[150px] flex-col gap-1.5 border-t border-custom-border-300 p-2.5 text-left text-sm font-medium hover:bg-custom-background-90 ${
+          className={`group relative flex min-h-[150px] flex-col gap-1.5 border-t border-custom-border-200 p-2.5 text-left text-sm font-medium hover:bg-custom-background-90 ${
             isMonthlyView ? "" : "pt-9"
           } ${
             showWeekEnds
@@ -83,7 +83,7 @@ export const SingleCalendarDate: React.FC<Props> = ({
           {totalIssues > 4 && (
             <button
               type="button"
-              className="w-min whitespace-nowrap rounded-md border border-custom-border-300 bg-custom-background-80 px-1.5 py-1 text-xs"
+              className="w-min whitespace-nowrap rounded-md border border-custom-border-200 bg-custom-background-80 px-1.5 py-1 text-xs"
               onClick={() => setShowAllIssues((prevData) => !prevData)}
             >
               {showAllIssues ? "Hide" : totalIssues - 4 + " more"}
diff --git a/apps/app/components/core/calendar-view/single-issue.tsx b/apps/app/components/core/calendar-view/single-issue.tsx
index bf64941f9..258676411 100644
--- a/apps/app/components/core/calendar-view/single-issue.tsx
+++ b/apps/app/components/core/calendar-view/single-issue.tsx
@@ -163,7 +163,7 @@ export const SingleCalendarIssue: React.FC<Props> = ({
       ref={provided.innerRef}
       {...provided.draggableProps}
       {...provided.dragHandleProps}
-      className={`w-full relative cursor-pointer rounded border border-custom-border-300 px-1.5 py-1.5 text-xs duration-300 hover:cursor-move hover:bg-custom-background-80 ${
+      className={`w-full relative cursor-pointer rounded border border-custom-border-200 px-1.5 py-1.5 text-xs duration-300 hover:cursor-move hover:bg-custom-background-80 ${
         snapshot.isDragging ? "bg-custom-background-80 shadow-lg" : ""
       }`}
     >
@@ -267,7 +267,7 @@ export const SingleCalendarIssue: React.FC<Props> = ({
               />
             )}
             {properties.sub_issue_count && (
-              <div className="flex cursor-default items-center rounded-md border border-custom-border-300 px-2.5 py-1 text-xs shadow-sm">
+              <div className="flex cursor-default items-center rounded-md border border-custom-border-200 px-2.5 py-1 text-xs shadow-sm">
                 <Tooltip tooltipHeading="Sub-issue" tooltipContent={`${issue.sub_issues_count}`}>
                   <div className="flex items-center gap-1 text-custom-text-200">
                     <LayerDiagonalIcon className="h-3.5 w-3.5" />
@@ -277,7 +277,7 @@ export const SingleCalendarIssue: React.FC<Props> = ({
               </div>
             )}
             {properties.link && (
-              <div className="flex cursor-default items-center rounded-md border border-custom-border-300 px-2.5 py-1 text-xs shadow-sm">
+              <div className="flex cursor-default items-center rounded-md border border-custom-border-200 px-2.5 py-1 text-xs shadow-sm">
                 <Tooltip tooltipHeading="Links" tooltipContent={`${issue.link_count}`}>
                   <div className="flex items-center gap-1 text-custom-text-200">
                     <LinkIcon className="h-3.5 w-3.5" />
@@ -287,7 +287,7 @@ export const SingleCalendarIssue: React.FC<Props> = ({
               </div>
             )}
             {properties.attachment_count && (
-              <div className="flex cursor-default items-center rounded-md border border-custom-border-300 px-2.5 py-1 text-xs shadow-sm">
+              <div className="flex cursor-default items-center rounded-md border border-custom-border-200 px-2.5 py-1 text-xs shadow-sm">
                 <Tooltip tooltipHeading="Attachments" tooltipContent={`${issue.attachment_count}`}>
                   <div className="flex items-center gap-1 text-custom-text-200">
                     <PaperClipIcon className="h-3.5 w-3.5 -rotate-45" />
diff --git a/apps/app/components/core/feeds.tsx b/apps/app/components/core/feeds.tsx
index b0de524c7..6b6576b36 100644
--- a/apps/app/components/core/feeds.tsx
+++ b/apps/app/components/core/feeds.tsx
@@ -5,25 +5,16 @@ import Link from "next/link";
 // icons
 import {
   ArrowTopRightOnSquareIcon,
-  CalendarDaysIcon,
-  ChartBarIcon,
-  ChatBubbleBottomCenterTextIcon,
   ChatBubbleLeftEllipsisIcon,
-  LinkIcon,
-  PaperClipIcon,
-  PlayIcon,
-  RectangleGroupIcon,
   Squares2X2Icon,
-  TrashIcon,
-  UserIcon,
 } from "@heroicons/react/24/outline";
-import { BlockedIcon, BlockerIcon, CyclesIcon, TagIcon, UserGroupIcon } from "components/icons";
+import { BlockedIcon, BlockerIcon } from "components/icons";
+import { Icon } from "components/ui";
 // helpers
 import { renderShortDateWithYearFormat, timeAgo } from "helpers/date-time.helper";
 import { addSpaceIfCamelCase } from "helpers/string.helper";
 // types
 import RemirrorRichTextEditor from "components/rich-text-editor";
-import { Icon } from "components/ui";
 
 const activityDetails: {
   [key: string]: {
@@ -33,11 +24,11 @@ const activityDetails: {
 } = {
   assignee: {
     message: "removed the assignee",
-    icon: <UserGroupIcon className="h-3 w-3" color="#6b7280" aria-hidden="true" />,
+    icon: <Icon iconName="group" className="!text-sm" aria-hidden="true" />,
   },
   assignees: {
     message: "added a new assignee",
-    icon: <UserGroupIcon className="h-3 w-3" color="#6b7280" aria-hidden="true" />,
+    icon: <Icon iconName="group" className="!text-sm" aria-hidden="true" />,
   },
   blocks: {
     message: "marked this issue being blocked by",
@@ -49,14 +40,14 @@ const activityDetails: {
   },
   cycles: {
     message: "set the cycle to",
-    icon: <CyclesIcon height="12" width="12" color="#6b7280" />,
+    icon: <Icon iconName="contrast" className="!text-sm" aria-hidden="true" />,
   },
   labels: {
-    icon: <TagIcon height="12" width="12" color="#6b7280" />,
+    icon: <Icon iconName="sell" className="!text-sm" aria-hidden="true" />,
   },
   modules: {
     message: "set the module to",
-    icon: <RectangleGroupIcon className="h-3 w-3 text-custom-text-200" aria-hidden="true" />,
+    icon: <Icon iconName="dataset" className="!text-sm" aria-hidden="true" />,
   },
   state: {
     message: "set the state to",
@@ -64,51 +55,47 @@ const activityDetails: {
   },
   priority: {
     message: "set the priority to",
-    icon: <ChartBarIcon className="h-3 w-3 text-custom-text-200" aria-hidden="true" />,
+    icon: <Icon iconName="signal_cellular_alt" className="!text-sm" aria-hidden="true" />,
   },
   name: {
     message: "set the name to",
-    icon: (
-      <ChatBubbleBottomCenterTextIcon className="h-3 w-3 text-custom-text-200" aria-hidden="true" />
-    ),
+    icon: <Icon iconName="chat" className="!text-sm" aria-hidden="true" />,
   },
   description: {
     message: "updated the description.",
-    icon: (
-      <ChatBubbleBottomCenterTextIcon className="h-3 w-3 text-custom-text-200" aria-hidden="true" />
-    ),
+    icon: <Icon iconName="chat" className="!text-sm" aria-hidden="true" />,
   },
   estimate_point: {
     message: "set the estimate point to",
-    icon: <PlayIcon className="h-3 w-3 -rotate-90 text-custom-text-200" aria-hidden="true" />,
+    icon: <Icon iconName="change_history" className="!text-sm" aria-hidden="true" />,
   },
   target_date: {
     message: "set the due date to",
-    icon: <CalendarDaysIcon className="h-3 w-3 text-custom-text-200" aria-hidden="true" />,
+    icon: <Icon iconName="calendar_today" className="!text-sm" aria-hidden="true" />,
   },
   parent: {
     message: "set the parent to",
-    icon: <UserIcon className="h-3 w-3 text-custom-text-200" aria-hidden="true" />,
+    icon: <Icon iconName="supervised_user_circle" className="!text-sm" aria-hidden="true" />,
   },
   issue: {
     message: "deleted the issue.",
-    icon: <TrashIcon className="h-3 w-3 text-custom-text-200" aria-hidden="true" />,
+    icon: <Icon iconName="delete" className="!text-sm" aria-hidden="true" />,
   },
   estimate: {
     message: "updated the estimate",
-    icon: <PlayIcon className="h-3 w-3 -rotate-90 text-custom-text-200" aria-hidden="true" />,
+    icon: <Icon iconName="change_history" className="!text-sm" aria-hidden="true" />,
   },
   link: {
     message: "updated the link",
-    icon: <LinkIcon className="h-3 w-3 text-custom-text-200" aria-hidden="true" />,
+    icon: <Icon iconName="link" className="!text-sm" aria-hidden="true" />,
   },
   attachment: {
     message: "updated the attachment",
-    icon: <PaperClipIcon className="h-3 w-3 text-custom-text-200 " aria-hidden="true" />,
+    icon: <Icon iconName="attach_file" className="!text-sm" aria-hidden="true" />,
   },
   archived_at: {
     message: "archived",
-    icon: <Icon iconName="archive" className="text-sm text-custom-text-200" aria-hidden="true" />,
+    icon: <Icon iconName="archive" className="!text-sm text-custom-text-200" aria-hidden="true" />,
   },
 };
 
@@ -263,7 +250,7 @@ export const Feeds: React.FC<any> = ({ activities }) => (
                       }
                       editable={false}
                       noBorder
-                      customClassName="text-xs border border-custom-border-300 bg-custom-background-100"
+                      customClassName="text-xs border border-custom-border-200 bg-custom-background-100"
                     />
                   </div>
                 </div>
@@ -287,7 +274,7 @@ export const Feeds: React.FC<any> = ({ activities }) => (
                     <div>
                       <div className="relative px-1.5">
                         <div className="mt-1.5">
-                          <div className="ring-6 flex h-7 w-7 items-center justify-center rounded-full bg-custom-background-80 ring-white">
+                          <div className="ring-6 flex h-7 w-7 items-center justify-center rounded-full bg-custom-background-80 text-custom-text-200 ring-white">
                             {activity.field ? (
                               activityDetails[activity.field as keyof typeof activityDetails]?.icon
                             ) : activity.actor_detail.avatar &&
diff --git a/apps/app/components/core/filters/due-date-filter-modal.tsx b/apps/app/components/core/filters/due-date-filter-modal.tsx
index c63f76497..9556bd193 100644
--- a/apps/app/components/core/filters/due-date-filter-modal.tsx
+++ b/apps/app/components/core/filters/due-date-filter-modal.tsx
@@ -109,7 +109,7 @@ export const DueDateFilterModal: React.FC<Props> = ({ isOpen, handleClose }) =>
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative flex transform rounded-lg border border-custom-border-300 bg-custom-background-100 px-5 py-8 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl sm:p-6">
+              <Dialog.Panel className="relative flex transform rounded-lg border border-custom-border-200 bg-custom-background-100 px-5 py-8 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl sm:p-6">
                 <form className="space-y-4" onSubmit={handleSubmit(handleFormSubmit)}>
                   <div className="flex w-full justify-between">
                     <Controller
diff --git a/apps/app/components/core/filters/filters-list.tsx b/apps/app/components/core/filters/filters-list.tsx
index d4215cf3c..b7928de68 100644
--- a/apps/app/components/core/filters/filters-list.tsx
+++ b/apps/app/components/core/filters/filters-list.tsx
@@ -58,7 +58,7 @@ export const FilterList: React.FC<any> = ({ filters, setFilters }) => {
           return (
             <div
               key={key}
-              className="flex items-center gap-x-2 rounded-full border border-custom-border-300 bg-custom-background-80 px-2 py-1"
+              className="flex items-center gap-x-2 rounded-full border border-custom-border-200 bg-custom-background-80 px-2 py-1"
             >
               <span className="capitalize text-custom-text-200">
                 {key === "target_date" ? "Due Date" : replaceUnderscoreIfSnakeCase(key)}:
@@ -310,7 +310,7 @@ export const FilterList: React.FC<any> = ({ filters, setFilters }) => {
                         return (
                           <div
                             key={date}
-                            className="inline-flex items-center gap-x-1 rounded-full border border-custom-border-300 bg-custom-background-100 px-1 py-0.5"
+                            className="inline-flex items-center gap-x-1 rounded-full border border-custom-border-200 bg-custom-background-100 px-1 py-0.5"
                           >
                             <div className="h-1.5 w-1.5 rounded-full" />
                             <span className="capitalize">
@@ -381,7 +381,7 @@ export const FilterList: React.FC<any> = ({ filters, setFilters }) => {
               target_date: null,
             })
           }
-          className="flex items-center gap-x-1 rounded-full border border-custom-border-300 bg-custom-background-80 px-3 py-1.5 text-xs"
+          className="flex items-center gap-x-1 rounded-full border border-custom-border-200 bg-custom-background-80 px-3 py-1.5 text-xs"
         >
           <span>Clear all filters</span>
           <XMarkIcon className="h-3 w-3" />
diff --git a/apps/app/components/core/filters/issues-view-filter.tsx b/apps/app/components/core/filters/issues-view-filter.tsx
index 7a4fb246b..722dfc1a2 100644
--- a/apps/app/components/core/filters/issues-view-filter.tsx
+++ b/apps/app/components/core/filters/issues-view-filter.tsx
@@ -146,7 +146,7 @@ export const IssuesFilterView: React.FC = () => {
         {({ open }) => (
           <>
             <Popover.Button
-              className={`group flex items-center gap-2 rounded-md border border-custom-sidebar-border-100 bg-transparent px-3 py-1.5 text-xs hover:bg-custom-sidebar-background-90 hover:text-custom-sidebar-text-100 focus:outline-none duration-300 ${
+              className={`group flex items-center gap-2 rounded-md border border-custom-sidebar-border-200 bg-transparent px-3 py-1.5 text-xs hover:bg-custom-sidebar-background-90 hover:text-custom-sidebar-text-100 focus:outline-none duration-300 ${
                 open
                   ? "bg-custom-sidebar-background-90 text-custom-sidebar-text-100"
                   : "text-custom-sidebar-text-200"
@@ -165,8 +165,8 @@ export const IssuesFilterView: React.FC = () => {
               leaveFrom="opacity-100 translate-y-0"
               leaveTo="opacity-0 translate-y-1"
             >
-              <Popover.Panel className="absolute right-0 z-30 mt-1 w-screen max-w-xs transform rounded-lg border border-custom-border-300 bg-custom-background-90 p-3 shadow-lg">
-                <div className="relative divide-y-2 divide-custom-border-300">
+              <Popover.Panel className="absolute right-0 z-30 mt-1 w-screen max-w-xs transform rounded-lg border border-custom-border-200 bg-custom-background-90 p-3 shadow-lg">
+                <div className="relative divide-y-2 divide-custom-border-200">
                   <div className="space-y-4 pb-3 text-xs">
                     {issueView !== "calendar" && issueView !== "spreadsheet" && (
                       <>
@@ -292,7 +292,7 @@ export const IssuesFilterView: React.FC = () => {
                             className={`rounded border px-2 py-1 text-xs capitalize ${
                               properties[key as keyof Properties]
                                 ? "border-custom-primary bg-custom-primary text-white"
-                                : "border-custom-border-300"
+                                : "border-custom-border-200"
                             }`}
                             onClick={() => setProperties(key as keyof Properties)}
                           >
diff --git a/apps/app/components/core/image-picker-popover.tsx b/apps/app/components/core/image-picker-popover.tsx
index 84c90d9a4..1611f6f82 100644
--- a/apps/app/components/core/image-picker-popover.tsx
+++ b/apps/app/components/core/image-picker-popover.tsx
@@ -62,7 +62,7 @@ export const ImagePickerPopover: React.FC<Props> = ({ label, value, onChange })
   return (
     <Popover className="relative z-[2]" ref={ref}>
       <Popover.Button
-        className="rounded-md border border-custom-border-300 bg-custom-background-80 px-2 py-1 text-xs text-custom-text-200"
+        className="rounded-md border border-custom-border-200 bg-custom-background-80 px-2 py-1 text-xs text-custom-text-200"
         onClick={() => setIsOpen((prev) => !prev)}
       >
         {label}
@@ -76,8 +76,8 @@ export const ImagePickerPopover: React.FC<Props> = ({ label, value, onChange })
         leaveFrom="transform opacity-100 scale-100"
         leaveTo="transform opacity-0 scale-95"
       >
-        <Popover.Panel className="absolute right-0 z-10 mt-2 rounded-md border border-custom-border-300 bg-custom-background-80 shadow-lg">
-          <div className="h-96 w-80 overflow-auto rounded border border-custom-border-300 bg-custom-background-80 p-5 shadow-2xl sm:max-w-2xl md:w-96 lg:w-[40rem]">
+        <Popover.Panel className="absolute right-0 z-10 mt-2 rounded-md border border-custom-border-200 bg-custom-background-80 shadow-lg">
+          <div className="h-96 w-80 overflow-auto rounded border border-custom-border-200 bg-custom-background-80 p-5 shadow-2xl sm:max-w-2xl md:w-96 lg:w-[40rem]">
             <Tab.Group>
               <Tab.List as="span" className="inline-block rounded bg-custom-background-80 p-1">
                 {tabOptions.map((tab) => (
diff --git a/apps/app/components/core/issues-view.tsx b/apps/app/components/core/issues-view.tsx
index 7b22cb11f..be5abaea5 100644
--- a/apps/app/components/core/issues-view.tsx
+++ b/apps/app/components/core/issues-view.tsx
@@ -488,7 +488,7 @@ export const IssuesView: React.FC<Props> = ({
               {viewId ? "Update" : "Save"} view
             </PrimaryButton>
           </div>
-          {<div className="mt-3 border-t border-custom-border-300" />}
+          {<div className="mt-3 border-t border-custom-border-200" />}
         </>
       )}
 
diff --git a/apps/app/components/core/list-view/single-issue.tsx b/apps/app/components/core/list-view/single-issue.tsx
index af4e59edc..b810ac2a9 100644
--- a/apps/app/components/core/list-view/single-issue.tsx
+++ b/apps/app/components/core/list-view/single-issue.tsx
@@ -219,7 +219,7 @@ export const SingleListIssue: React.FC<Props> = ({
         </a>
       </ContextMenu>
       <div
-        className="flex flex-wrap items-center justify-between px-4 py-2.5 gap-2 border-b border-custom-border-300 bg-custom-background-100 last:border-b-0"
+        className="flex flex-wrap items-center justify-between px-4 py-2.5 gap-2 border-b border-custom-border-200 bg-custom-background-100 last:border-b-0"
         onContextMenu={(e) => {
           e.preventDefault();
           setContextMenu(true);
@@ -307,7 +307,7 @@ export const SingleListIssue: React.FC<Props> = ({
             />
           )}
           {properties.sub_issue_count && (
-            <div className="flex cursor-default items-center rounded-md border border-custom-border-300 px-2.5 py-1 text-xs shadow-sm">
+            <div className="flex cursor-default items-center rounded-md border border-custom-border-200 px-2.5 py-1 text-xs shadow-sm">
               <Tooltip tooltipHeading="Sub-issue" tooltipContent={`${issue.sub_issues_count}`}>
                 <div className="flex items-center gap-1 text-custom-text-200">
                   <LayerDiagonalIcon className="h-3.5 w-3.5" />
@@ -317,7 +317,7 @@ export const SingleListIssue: React.FC<Props> = ({
             </div>
           )}
           {properties.link && (
-            <div className="flex cursor-default items-center rounded-md border border-custom-border-300 px-2.5 py-1 text-xs shadow-sm">
+            <div className="flex cursor-default items-center rounded-md border border-custom-border-200 px-2.5 py-1 text-xs shadow-sm">
               <Tooltip tooltipHeading="Links" tooltipContent={`${issue.link_count}`}>
                 <div className="flex items-center gap-1 text-custom-text-200">
                   <LinkIcon className="h-3.5 w-3.5" />
@@ -327,7 +327,7 @@ export const SingleListIssue: React.FC<Props> = ({
             </div>
           )}
           {properties.attachment_count && (
-            <div className="flex cursor-default items-center rounded-md border border-custom-border-300 px-2.5 py-1 text-xs shadow-sm">
+            <div className="flex cursor-default items-center rounded-md border border-custom-border-200 px-2.5 py-1 text-xs shadow-sm">
               <Tooltip tooltipHeading="Attachments" tooltipContent={`${issue.attachment_count}`}>
                 <div className="flex items-center gap-1 text-custom-text-200">
                   <PaperClipIcon className="h-3.5 w-3.5 -rotate-45" />
diff --git a/apps/app/components/core/modals/bulk-delete-issues-modal.tsx b/apps/app/components/core/modals/bulk-delete-issues-modal.tsx
index 3232cfbca..59e7c8a84 100644
--- a/apps/app/components/core/modals/bulk-delete-issues-modal.tsx
+++ b/apps/app/components/core/modals/bulk-delete-issues-modal.tsx
@@ -173,7 +173,7 @@ export const BulkDeleteIssuesModal: React.FC<Props> = ({ isOpen, setIsOpen, user
             leaveFrom="opacity-100 scale-100"
             leaveTo="opacity-0 scale-95"
           >
-            <Dialog.Panel className="relative mx-auto max-w-2xl transform rounded-xl border border-custom-border-300 bg-custom-background-100 shadow-2xl transition-all">
+            <Dialog.Panel className="relative mx-auto max-w-2xl transform rounded-xl border border-custom-border-200 bg-custom-background-100 shadow-2xl transition-all">
               <form>
                 <Combobox
                   onChange={(val: string) => {
@@ -201,7 +201,7 @@ export const BulkDeleteIssuesModal: React.FC<Props> = ({ isOpen, setIsOpen, user
 
                   <Combobox.Options
                     static
-                    className="max-h-80 scroll-py-2 divide-y divide-custom-border-300 overflow-y-auto"
+                    className="max-h-80 scroll-py-2 divide-y divide-custom-border-200 overflow-y-auto"
                   >
                     {filteredIssues.length > 0 ? (
                       <li className="p-2">
diff --git a/apps/app/components/core/modals/existing-issues-list-modal.tsx b/apps/app/components/core/modals/existing-issues-list-modal.tsx
index c3d3c5f28..39237ce9a 100644
--- a/apps/app/components/core/modals/existing-issues-list-modal.tsx
+++ b/apps/app/components/core/modals/existing-issues-list-modal.tsx
@@ -154,7 +154,7 @@ export const ExistingIssuesListModal: React.FC<Props> = ({
               leaveFrom="opacity-100 scale-100"
               leaveTo="opacity-0 scale-95"
             >
-              <Dialog.Panel className="relative mx-auto max-w-2xl transform rounded-xl border border-custom-border-300 bg-custom-background-100 shadow-2xl transition-all">
+              <Dialog.Panel className="relative mx-auto max-w-2xl transform rounded-xl border border-custom-border-200 bg-custom-background-100 shadow-2xl transition-all">
                 <Combobox
                   as="div"
                   onChange={(val: ISearchIssueResponse) => {
@@ -182,7 +182,7 @@ export const ExistingIssuesListModal: React.FC<Props> = ({
                         {selectedIssues.map((issue) => (
                           <div
                             key={issue.id}
-                            className="flex items-center gap-1 text-xs border border-custom-border-300 bg-custom-background-80 pl-2 py-1 rounded-md text-custom-text-100 whitespace-nowrap"
+                            className="flex items-center gap-1 text-xs border border-custom-border-200 bg-custom-background-80 pl-2 py-1 rounded-md text-custom-text-100 whitespace-nowrap"
                           >
                             {issue.project__identifier}-{issue.sequence_id}
                             <button
@@ -200,7 +200,7 @@ export const ExistingIssuesListModal: React.FC<Props> = ({
                         ))}
                       </div>
                     ) : (
-                      <div className="w-min text-xs border border-custom-border-300 bg-custom-background-80 p-2 rounded-md whitespace-nowrap">
+                      <div className="w-min text-xs border border-custom-border-200 bg-custom-background-80 p-2 rounded-md whitespace-nowrap">
                         No issues selected
                       </div>
                     )}
diff --git a/apps/app/components/core/modals/gpt-assistant-modal.tsx b/apps/app/components/core/modals/gpt-assistant-modal.tsx
index 5dce1d5ad..f1b24c65b 100644
--- a/apps/app/components/core/modals/gpt-assistant-modal.tsx
+++ b/apps/app/components/core/modals/gpt-assistant-modal.tsx
@@ -143,7 +143,7 @@ export const GptAssistantModal: React.FC<Props> = ({
 
   return (
     <div
-      className={`absolute ${inset} z-20 w-full space-y-4 rounded-[10px] border border-custom-border-300 bg-custom-background-100 p-4 shadow ${
+      className={`absolute ${inset} z-20 w-full space-y-4 rounded-[10px] border border-custom-border-200 bg-custom-background-100 p-4 shadow ${
         isOpen ? "block" : "hidden"
       }`}
     >
diff --git a/apps/app/components/core/modals/image-upload-modal.tsx b/apps/app/components/core/modals/image-upload-modal.tsx
index ee25ff6e2..2564f3732 100644
--- a/apps/app/components/core/modals/image-upload-modal.tsx
+++ b/apps/app/components/core/modals/image-upload-modal.tsx
@@ -118,7 +118,7 @@ export const ImageUploadModal: React.FC<Props> = ({
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-300 bg-custom-background-100 px-5 py-8 text-left shadow-xl transition-all sm:w-full sm:max-w-xl sm:p-6">
+              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-200 bg-custom-background-100 px-5 py-8 text-left shadow-xl transition-all sm:w-full sm:max-w-xl sm:p-6">
                 <div className="space-y-5">
                   <Dialog.Title
                     as="h3"
@@ -132,7 +132,7 @@ export const ImageUploadModal: React.FC<Props> = ({
                         {...getRootProps()}
                         className={`relative grid h-80 w-full cursor-pointer place-items-center rounded-lg p-12 text-center focus:outline-none focus:ring-2 focus:ring-custom-primary focus:ring-offset-2 ${
                           (image === null && isDragActive) || !value
-                            ? "border-2 border-dashed border-custom-border-300 hover:bg-custom-background-90"
+                            ? "border-2 border-dashed border-custom-border-200 hover:bg-custom-background-90"
                             : ""
                         }`}
                       >
diff --git a/apps/app/components/core/sidebar/progress-chart.tsx b/apps/app/components/core/sidebar/progress-chart.tsx
index d6f06a806..cfa28c5e1 100644
--- a/apps/app/components/core/sidebar/progress-chart.tsx
+++ b/apps/app/components/core/sidebar/progress-chart.tsx
@@ -119,7 +119,7 @@ const ProgressChart: React.FC<Props> = ({ distribution, startDate, endDate, tota
         gridXValues={chartData.map((item, index) => (index % 2 === 0 ? item.currentDate : ""))}
         enableSlices="x"
         sliceTooltip={(datum) => (
-          <div className="rounded-md border border-custom-border-300 bg-custom-background-80 p-2 text-xs">
+          <div className="rounded-md border border-custom-border-200 bg-custom-background-80 p-2 text-xs">
             {datum.slice.points[0].data.yFormatted}
             <span className="text-custom-text-200"> issues pending on </span>
             {datum.slice.points[0].data.xFormatted}
diff --git a/apps/app/components/core/sidebar/sidebar-progress-stats.tsx b/apps/app/components/core/sidebar/sidebar-progress-stats.tsx
index 92630026f..062c16eb5 100644
--- a/apps/app/components/core/sidebar/sidebar-progress-stats.tsx
+++ b/apps/app/components/core/sidebar/sidebar-progress-stats.tsx
@@ -87,7 +87,7 @@ export const SidebarProgressStats: React.FC<Props> = ({
         <Tab
           className={({ selected }) =>
             `w-full  ${
-              roundedTab ? "rounded-3xl border border-custom-border-300" : "rounded"
+              roundedTab ? "rounded-3xl border border-custom-border-200" : "rounded"
             } px-3 py-1 text-custom-text-100 ${
               selected ? " bg-custom-primary text-white" : "  hover:bg-custom-background-80"
             }`
@@ -98,7 +98,7 @@ export const SidebarProgressStats: React.FC<Props> = ({
         <Tab
           className={({ selected }) =>
             `w-full ${
-              roundedTab ? "rounded-3xl border border-custom-border-300" : "rounded"
+              roundedTab ? "rounded-3xl border border-custom-border-200" : "rounded"
             } px-3 py-1 text-custom-text-100 ${
               selected ? " bg-custom-primary text-white" : " hover:bg-custom-background-80"
             }`
@@ -109,7 +109,7 @@ export const SidebarProgressStats: React.FC<Props> = ({
         <Tab
           className={({ selected }) =>
             `w-full ${
-              roundedTab ? "rounded-3xl border border-custom-border-300" : "rounded"
+              roundedTab ? "rounded-3xl border border-custom-border-200" : "rounded"
             } px-3 py-1  text-custom-text-100 ${
               selected ? " bg-custom-primary text-white" : " hover:bg-custom-background-80"
             }`
@@ -159,7 +159,7 @@ export const SidebarProgressStats: React.FC<Props> = ({
                   key={`unassigned-${index}`}
                   title={
                     <div className="flex items-center gap-2">
-                      <div className="h-5 w-5 rounded-full border-2 border-custom-border-300 bg-custom-background-80">
+                      <div className="h-5 w-5 rounded-full border-2 border-custom-border-200 bg-custom-background-80">
                         <img
                           src="/user.png"
                           height="100%"
diff --git a/apps/app/components/core/spreadsheet-view/single-issue.tsx b/apps/app/components/core/spreadsheet-view/single-issue.tsx
index a6c6726cc..e85814ea7 100644
--- a/apps/app/components/core/spreadsheet-view/single-issue.tsx
+++ b/apps/app/components/core/spreadsheet-view/single-issue.tsx
@@ -179,10 +179,10 @@ export const SingleSpreadsheetIssue: React.FC<Props> = ({
 
   return (
     <div
-      className="relative group grid auto-rows-[minmax(44px,1fr)] hover:rounded-sm hover:bg-custom-background-80 border-b border-custom-border-300 w-full min-w-max"
+      className="relative group grid auto-rows-[minmax(44px,1fr)] hover:rounded-sm hover:bg-custom-background-80 border-b border-custom-border-200 w-full min-w-max"
       style={{ gridTemplateColumns }}
     >
-      <div className="flex gap-1.5 items-center px-4 sticky z-[1] left-0 text-custom-text-200 bg-custom-background-100 group-hover:text-custom-text-100 group-hover:bg-custom-background-80 border-custom-border-300 w-full">
+      <div className="flex gap-1.5 items-center px-4 sticky z-[1] left-0 text-custom-text-200 bg-custom-background-100 group-hover:text-custom-text-100 group-hover:bg-custom-background-80 border-custom-border-200 w-full">
         <div className="flex gap-1.5 items-center" style={issue.parent ? { paddingLeft } : {}}>
           <div className="relative flex items-center cursor-pointer text-xs text-center hover:text-custom-text-100 w-14">
             {properties.key && (
@@ -198,7 +198,7 @@ export const SingleSpreadsheetIssue: React.FC<Props> = ({
                   onInteraction={(nextOpenState) => setIsOpen(nextOpenState)}
                   content={
                     <div
-                      className={`flex flex-col gap-1.5 overflow-y-scroll whitespace-nowrap rounded-md border p-1 text-xs shadow-lg focus:outline-none max-h-44 min-w-full border-custom-border-300 bg-custom-background-90`}
+                      className={`flex flex-col gap-1.5 overflow-y-scroll whitespace-nowrap rounded-md border p-1 text-xs shadow-lg focus:outline-none max-h-44 min-w-full border-custom-border-200 bg-custom-background-90`}
                     >
                       <button
                         type="button"
@@ -270,7 +270,7 @@ export const SingleSpreadsheetIssue: React.FC<Props> = ({
         </Link>
       </div>
       {properties.state && (
-        <div className="flex items-center text-xs text-custom-text-200 text-center p-2 group-hover:bg-custom-background-80 border-custom-border-300">
+        <div className="flex items-center text-xs text-custom-text-200 text-center p-2 group-hover:bg-custom-background-80 border-custom-border-200">
           <ViewStateSelect
             issue={issue}
             partialUpdateIssue={partialUpdateIssue}
@@ -284,7 +284,7 @@ export const SingleSpreadsheetIssue: React.FC<Props> = ({
         </div>
       )}
       {properties.priority && (
-        <div className="flex items-center text-xs text-custom-text-200 text-center p-2 group-hover:bg-custom-background-80 border-custom-border-300">
+        <div className="flex items-center text-xs text-custom-text-200 text-center p-2 group-hover:bg-custom-background-80 border-custom-border-200">
           <ViewPrioritySelect
             issue={issue}
             partialUpdateIssue={partialUpdateIssue}
@@ -297,7 +297,7 @@ export const SingleSpreadsheetIssue: React.FC<Props> = ({
         </div>
       )}
       {properties.assignee && (
-        <div className="flex items-center text-xs text-custom-text-200 text-center p-2 group-hover:bg-custom-background-80 border-custom-border-300">
+        <div className="flex items-center text-xs text-custom-text-200 text-center p-2 group-hover:bg-custom-background-80 border-custom-border-200">
           <ViewAssigneeSelect
             issue={issue}
             partialUpdateIssue={partialUpdateIssue}
@@ -310,7 +310,7 @@ export const SingleSpreadsheetIssue: React.FC<Props> = ({
         </div>
       )}
       {properties.labels && (
-        <div className="flex items-center text-xs text-custom-text-200 text-center p-2 group-hover:bg-custom-background-80 border-custom-border-300">
+        <div className="flex items-center text-xs text-custom-text-200 text-center p-2 group-hover:bg-custom-background-80 border-custom-border-200">
           <ViewLabelSelect
             issue={issue}
             partialUpdateIssue={partialUpdateIssue}
@@ -324,7 +324,7 @@ export const SingleSpreadsheetIssue: React.FC<Props> = ({
       )}
 
       {properties.due_date && (
-        <div className="flex items-center text-xs text-custom-text-200 text-center p-2 group-hover:bg-custom-background-80 border-custom-border-300">
+        <div className="flex items-center text-xs text-custom-text-200 text-center p-2 group-hover:bg-custom-background-80 border-custom-border-200">
           <ViewDueDateSelect
             issue={issue}
             partialUpdateIssue={partialUpdateIssue}
@@ -336,7 +336,7 @@ export const SingleSpreadsheetIssue: React.FC<Props> = ({
         </div>
       )}
       {properties.estimate && (
-        <div className="flex items-center text-xs text-custom-text-200 text-center p-2 group-hover:bg-custom-background-80 border-custom-border-300">
+        <div className="flex items-center text-xs text-custom-text-200 text-center p-2 group-hover:bg-custom-background-80 border-custom-border-200">
           <ViewEstimateSelect
             issue={issue}
             partialUpdateIssue={partialUpdateIssue}
@@ -348,12 +348,12 @@ export const SingleSpreadsheetIssue: React.FC<Props> = ({
         </div>
       )}
       {properties.created_on && (
-        <div className="flex items-center text-xs cursor-default text-custom-text-200 text-center p-2 group-hover:bg-custom-background-80 border-custom-border-300">
+        <div className="flex items-center text-xs cursor-default text-custom-text-200 text-center p-2 group-hover:bg-custom-background-80 border-custom-border-200">
           {renderLongDetailDateFormat(issue.created_at)}
         </div>
       )}
       {properties.updated_on && (
-        <div className="flex items-center text-xs cursor-default text-custom-text-200 text-center p-2 group-hover:bg-custom-background-80 border-custom-border-300">
+        <div className="flex items-center text-xs cursor-default text-custom-text-200 text-center p-2 group-hover:bg-custom-background-80 border-custom-border-200">
           {renderLongDetailDateFormat(issue.updated_at)}
         </div>
       )}
diff --git a/apps/app/components/core/spreadsheet-view/spreadsheet-view.tsx b/apps/app/components/core/spreadsheet-view/spreadsheet-view.tsx
index b47ab97a0..7acecc17b 100644
--- a/apps/app/components/core/spreadsheet-view/spreadsheet-view.tsx
+++ b/apps/app/components/core/spreadsheet-view/spreadsheet-view.tsx
@@ -62,7 +62,7 @@ export const SpreadsheetView: React.FC<Props> = ({
 
   return (
     <div className="h-full rounded-lg text-custom-text-200 overflow-x-auto whitespace-nowrap bg-custom-background-100">
-      <div className="sticky z-[2] top-0 border-b border-custom-border-300 bg-custom-background-90 w-full min-w-max">
+      <div className="sticky z-[2] top-0 border-b border-custom-border-200 bg-custom-background-90 w-full min-w-max">
         <SpreadsheetColumns columnData={columnData} gridTemplateColumns={gridTemplateColumns} />
       </div>
       {spreadsheetIssues ? (
@@ -84,12 +84,12 @@ export const SpreadsheetView: React.FC<Props> = ({
             />
           ))}
           <div
-            className="relative group grid auto-rows-[minmax(44px,1fr)] hover:rounded-sm hover:bg-custom-background-80 border-b border-custom-border-300 w-full min-w-max"
+            className="relative group grid auto-rows-[minmax(44px,1fr)] hover:rounded-sm hover:bg-custom-background-80 border-b border-custom-border-200 w-full min-w-max"
             style={{ gridTemplateColumns }}
           >
             {type === "issue" ? (
               <button
-                className="flex gap-1.5 items-center  pl-7 py-2.5 text-sm sticky left-0 z-[1] text-custom-text-200 bg-custom-background-100 group-hover:text-custom-text-100 group-hover:bg-custom-background-80 border-custom-border-300 w-full"
+                className="flex gap-1.5 items-center  pl-7 py-2.5 text-sm sticky left-0 z-[1] text-custom-text-200 bg-custom-background-100 group-hover:text-custom-text-100 group-hover:bg-custom-background-80 border-custom-border-200 w-full"
                 onClick={() => {
                   const e = new KeyboardEvent("keydown", { key: "c" });
                   document.dispatchEvent(e);
@@ -104,7 +104,7 @@ export const SpreadsheetView: React.FC<Props> = ({
                   className="sticky left-0 z-[1]"
                   customButton={
                     <button
-                      className="flex gap-1.5 items-center  pl-7 py-2.5 text-sm sticky left-0 z-[1] text-custom-text-200 bg-custom-background-100 group-hover:text-custom-text-100 group-hover:bg-custom-background-80 border-custom-border-300 w-full"
+                      className="flex gap-1.5 items-center  pl-7 py-2.5 text-sm sticky left-0 z-[1] text-custom-text-200 bg-custom-background-100 group-hover:text-custom-text-100 group-hover:bg-custom-background-80 border-custom-border-200 w-full"
                       type="button"
                     >
                       <PlusIcon className="h-4 w-4" />
diff --git a/apps/app/components/core/theme/color-picker-input.tsx b/apps/app/components/core/theme/color-picker-input.tsx
index e08e3a196..f848dd59e 100644
--- a/apps/app/components/core/theme/color-picker-input.tsx
+++ b/apps/app/components/core/theme/color-picker-input.tsx
@@ -81,7 +81,7 @@ export const ColorPickerInput: React.FC<Props> = ({ name, watch, setValue, error
               >
                 {watch(name) && watch(name) !== "" ? (
                   <span
-                    className="h-4 w-4 rounded border border-custom-border-300"
+                    className="h-4 w-4 rounded border border-custom-border-200"
                     style={{
                       backgroundColor: `${watch(name)}`,
                     }}
diff --git a/apps/app/components/core/theme/custom-theme-selector.tsx b/apps/app/components/core/theme/custom-theme-selector.tsx
index 4ee904b11..e584e23aa 100644
--- a/apps/app/components/core/theme/custom-theme-selector.tsx
+++ b/apps/app/components/core/theme/custom-theme-selector.tsx
@@ -21,11 +21,11 @@ type Props = {
 };
 
 const defaultValues: ICustomTheme = {
-  background: "#fff7f7",
-  text: "#ffc9c9",
-  primary: "#fe5050",
-  sidebarBackground: "#ffffff",
-  sidebarText: "#000000",
+  background: "#292d3e",
+  text: "#ffffff",
+  primary: "#7d57c1",
+  sidebarBackground: "#292d3e",
+  sidebarText: "#ffffff",
   darkPalette: false,
   palette: "",
 };
diff --git a/apps/app/components/core/theme/theme-switch.tsx b/apps/app/components/core/theme/theme-switch.tsx
index 1d67c8ef5..e514255b0 100644
--- a/apps/app/components/core/theme/theme-switch.tsx
+++ b/apps/app/components/core/theme/theme-switch.tsx
@@ -71,9 +71,8 @@ export const ThemeSwitch: React.FC<Props> = ({
         }
         onChange={({ value, type }: { value: string; type: string }) => {
           if (value === "custom") {
-            if (user?.theme.palette) {
-              setPreLoadedData(user.theme);
-            }
+            if (user?.theme.palette) setPreLoadedData(user.theme);
+
             if (!customThemeSelectorOptions) setCustomThemeSelectorOptions(true);
           } else {
             if (customThemeSelectorOptions) setCustomThemeSelectorOptions(false);
diff --git a/apps/app/components/cycles/active-cycle-details.tsx b/apps/app/components/cycles/active-cycle-details.tsx
index b8ed189b6..a876b9b11 100644
--- a/apps/app/components/cycles/active-cycle-details.tsx
+++ b/apps/app/components/cycles/active-cycle-details.tsx
@@ -209,8 +209,8 @@ export const ActiveCycleDetails: React.FC = () => {
   }));
 
   return (
-    <div className="grid-row-2 grid rounded-[10px] shadow divide-y bg-custom-background-100 border border-custom-border-300">
-      <div className="grid grid-cols-1 divide-y border-custom-border-300 lg:divide-y-0 lg:divide-x lg:grid-cols-3">
+    <div className="grid-row-2 grid rounded-[10px] shadow divide-y bg-custom-background-100 border border-custom-border-200">
+      <div className="grid grid-cols-1 divide-y border-custom-border-200 lg:divide-y-0 lg:divide-x lg:grid-cols-3">
         <div className="flex flex-col text-xs">
           <div className="h-full w-full">
             <div className="flex h-60 flex-col gap-5 justify-between rounded-b-[10px] p-4">
@@ -362,8 +362,8 @@ export const ActiveCycleDetails: React.FC = () => {
             </div>
           </div>
         </div>
-        <div className="grid col-span-2 grid-cols-1 divide-y border-custom-border-300 md:divide-y-0 md:divide-x md:grid-cols-2">
-          <div className="flex h-60 flex-col border-custom-border-300">
+        <div className="grid col-span-2 grid-cols-1 divide-y border-custom-border-200 md:divide-y-0 md:divide-x md:grid-cols-2">
+          <div className="flex h-60 flex-col border-custom-border-200">
             <div className="flex h-full w-full flex-col text-custom-text-200 p-4">
               <div className="flex w-full items-center gap-2 py-1">
                 <span>Progress</span>
@@ -391,12 +391,12 @@ export const ActiveCycleDetails: React.FC = () => {
               </div>
             </div>
           </div>
-          <div className="border-custom-border-300 h-60 overflow-y-scroll">
+          <div className="border-custom-border-200 h-60 overflow-y-scroll">
             <ActiveCycleProgressStats cycle={cycle} />
           </div>
         </div>
       </div>
-      <div className="grid grid-cols-1 divide-y border-custom-border-300 lg:divide-y-0 lg:divide-x lg:grid-cols-2">
+      <div className="grid grid-cols-1 divide-y border-custom-border-200 lg:divide-y-0 lg:divide-x lg:grid-cols-2">
         <div className="flex flex-col justify-between p-4">
           <div>
             <div className="text-custom-primary">High Priority Issues</div>
@@ -406,7 +406,7 @@ export const ActiveCycleDetails: React.FC = () => {
                   issues.map((issue) => (
                     <div
                       key={issue.id}
-                      className="flex flex-wrap rounded-md items-center justify-between gap-2 border border-custom-border-300 bg-custom-background-90 px-3 py-1.5"
+                      className="flex flex-wrap rounded-md items-center justify-between gap-2 border border-custom-border-200 bg-custom-background-90 px-3 py-1.5"
                     >
                       <div className="flex flex-col gap-1">
                         <div>
@@ -444,7 +444,7 @@ export const ActiveCycleDetails: React.FC = () => {
                             {issue.label_details.map((label) => (
                               <span
                                 key={label.id}
-                                className="group flex items-center gap-1 rounded-2xl border border-custom-border-300 px-2 py-0.5 text-xs text-custom-text-200"
+                                className="group flex items-center gap-1 rounded-2xl border border-custom-border-200 px-2 py-0.5 text-xs text-custom-text-200"
                               >
                                 <span
                                   className="h-1.5 w-1.5  rounded-full"
@@ -517,7 +517,7 @@ export const ActiveCycleDetails: React.FC = () => {
             </div>
           )}
         </div>
-        <div className="flex flex-col justify-between border-custom-border-300 p-4">
+        <div className="flex flex-col justify-between border-custom-border-200 p-4">
           <div className="flex items-start justify-between gap-4 py-1.5 text-xs">
             <div className="flex items-center gap-3 text-custom-text-100">
               <div className="flex items-center justify-center gap-1">
diff --git a/apps/app/components/cycles/active-cycle-stats.tsx b/apps/app/components/cycles/active-cycle-stats.tsx
index 3a4638503..d51c5da41 100644
--- a/apps/app/components/cycles/active-cycle-stats.tsx
+++ b/apps/app/components/cycles/active-cycle-stats.tsx
@@ -52,7 +52,7 @@ export const ActiveCycleProgressStats: React.FC<Props> = ({ cycle }) => {
       >
         <Tab
           className={({ selected }) =>
-            `px-3 py-1 text-custom-text-100 rounded-3xl border border-custom-border-300 ${
+            `px-3 py-1 text-custom-text-100 rounded-3xl border border-custom-border-200 ${
               selected ? " bg-custom-primary text-white" : "  hover:bg-custom-background-80"
             }`
           }
@@ -61,7 +61,7 @@ export const ActiveCycleProgressStats: React.FC<Props> = ({ cycle }) => {
         </Tab>
         <Tab
           className={({ selected }) =>
-            `px-3 py-1 text-custom-text-100 rounded-3xl border border-custom-border-300 ${
+            `px-3 py-1 text-custom-text-100 rounded-3xl border border-custom-border-200 ${
               selected ? " bg-custom-primary text-white" : "  hover:bg-custom-background-80"
             }`
           }
@@ -103,7 +103,7 @@ export const ActiveCycleProgressStats: React.FC<Props> = ({ cycle }) => {
                     key={`unassigned-${index}`}
                     title={
                       <div className="flex items-center gap-2">
-                        <div className="h-5 w-5 rounded-full border-2 border-custom-border-300 bg-custom-background-80">
+                        <div className="h-5 w-5 rounded-full border-2 border-custom-border-200 bg-custom-background-80">
                           <img
                             src="/user.png"
                             height="100%"
diff --git a/apps/app/components/cycles/cycles-list-gantt-chart.tsx b/apps/app/components/cycles/cycles-list-gantt-chart.tsx
index ddb9a5b13..938fd9a39 100644
--- a/apps/app/components/cycles/cycles-list-gantt-chart.tsx
+++ b/apps/app/components/cycles/cycles-list-gantt-chart.tsx
@@ -22,7 +22,7 @@ export const CyclesListGanttChartView: FC<Props> = ({ cycles }) => {
     <div className="relative flex w-full h-full items-center p-1 overflow-hidden gap-1">
       <div
         className="rounded-sm flex-shrink-0 w-[10px] h-[10px] flex justify-center items-center"
-        style={{ backgroundColor: "#858e96" }}
+        style={{ backgroundColor: "rgb(var(--color-primary-100))" }}
       />
       <div className="text-custom-text-100 text-sm">{data?.name}</div>
     </div>
@@ -32,7 +32,10 @@ export const CyclesListGanttChartView: FC<Props> = ({ cycles }) => {
   const GanttBlockView = ({ data }: { data: ICycle }) => (
     <Link href={`/${workspaceSlug}/projects/${projectId}/cycles/${data?.id}`}>
       <a className="relative flex items-center w-full h-full overflow-hidden shadow-sm">
-        <div className="flex-shrink-0 w-[4px] h-full" style={{ backgroundColor: "#858e96" }} />
+        <div
+          className="flex-shrink-0 w-[4px] h-full"
+          style={{ backgroundColor: "rgb(var(--color-primary-100))" }}
+        />
         <Tooltip tooltipContent={data?.name} className={`z-[999999]`}>
           <div className="text-custom-text-100 text-[15px] whitespace-nowrap py-[4px] px-2.5 overflow-hidden w-full">
             {data?.name}
diff --git a/apps/app/components/cycles/cycles-view.tsx b/apps/app/components/cycles/cycles-view.tsx
index 1f019002a..ad0a8e7d5 100644
--- a/apps/app/components/cycles/cycles-view.tsx
+++ b/apps/app/components/cycles/cycles-view.tsx
@@ -173,10 +173,10 @@ export const CyclesView: React.FC<Props> = ({ cycles, viewType }) => {
       {cycles ? (
         cycles.length > 0 ? (
           viewType === "list" ? (
-            <div className="divide-y divide-custom-border-300">
+            <div className="divide-y divide-custom-border-200">
               {cycles.map((cycle) => (
                 <div className="hover:bg-custom-background-80">
-                  <div className="flex flex-col border-custom-border-300">
+                  <div className="flex flex-col border-custom-border-200">
                     <SingleCycleList
                       key={cycle.id}
                       cycle={cycle}
diff --git a/apps/app/components/cycles/delete-cycle-modal.tsx b/apps/app/components/cycles/delete-cycle-modal.tsx
index 3ac4f372e..00bd8b9ad 100644
--- a/apps/app/components/cycles/delete-cycle-modal.tsx
+++ b/apps/app/components/cycles/delete-cycle-modal.tsx
@@ -124,7 +124,7 @@ export const DeleteCycleModal: React.FC<TConfirmCycleDeletionProps> = ({
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-300 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-[40rem]">
+              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-200 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-[40rem]">
                 <div className="px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
                   <div className="sm:flex sm:items-start">
                     <div className="mx-auto flex h-12 w-12 flex-shrink-0 items-center justify-center rounded-full bg-red-500/20 sm:mx-0 sm:h-10 sm:w-10">
diff --git a/apps/app/components/cycles/form.tsx b/apps/app/components/cycles/form.tsx
index 6dea3bba1..071577b3f 100644
--- a/apps/app/components/cycles/form.tsx
+++ b/apps/app/components/cycles/form.tsx
@@ -107,7 +107,7 @@ export const CycleForm: React.FC<Props> = ({ handleFormSubmit, handleClose, stat
           </div>
         </div>
       </div>
-      <div className="-mx-5 mt-5 flex justify-end gap-2 border-t border-custom-border-300 px-5 pt-5">
+      <div className="-mx-5 mt-5 flex justify-end gap-2 border-t border-custom-border-200 px-5 pt-5">
         <SecondaryButton onClick={handleClose}>Cancel</SecondaryButton>
         <PrimaryButton type="submit" loading={isSubmitting}>
           {status
diff --git a/apps/app/components/cycles/gantt-chart.tsx b/apps/app/components/cycles/gantt-chart.tsx
index f484365e2..0deb10079 100644
--- a/apps/app/components/cycles/gantt-chart.tsx
+++ b/apps/app/components/cycles/gantt-chart.tsx
@@ -26,7 +26,7 @@ export const CycleIssuesGanttChartView: FC<Props> = ({}) => {
     <div className="relative flex w-full h-full items-center p-1 overflow-hidden gap-1">
       <div
         className="rounded-sm flex-shrink-0 w-[10px] h-[10px] flex justify-center items-center"
-        style={{ backgroundColor: data?.state_detail?.color || "#858e96" }}
+        style={{ backgroundColor: data?.state_detail?.color || "rgb(var(--color-primary-100))" }}
       />
       <div className="text-custom-text-100 text-sm">{data?.name}</div>
     </div>
@@ -38,7 +38,7 @@ export const CycleIssuesGanttChartView: FC<Props> = ({}) => {
       <a className="relative flex items-center w-full h-full overflow-hidden shadow-sm">
         <div
           className="flex-shrink-0 w-[4px] h-full"
-          style={{ backgroundColor: data?.state_detail?.color || "#858e96" }}
+          style={{ backgroundColor: data?.state_detail?.color || "rgb(var(--color-primary-100))" }}
         />
         <Tooltip tooltipContent={data?.name} className={`z-[999999]`}>
           <div className="text-custom-text-100 text-[15px] whitespace-nowrap py-[4px] px-2.5 overflow-hidden w-full">
diff --git a/apps/app/components/cycles/modal.tsx b/apps/app/components/cycles/modal.tsx
index c68acceb6..c83d1d851 100644
--- a/apps/app/components/cycles/modal.tsx
+++ b/apps/app/components/cycles/modal.tsx
@@ -247,7 +247,7 @@ export const CreateUpdateCycleModal: React.FC<CycleModalProps> = ({
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative transform rounded-lg border border-custom-border-300 bg-custom-background-100 px-5 py-8 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl sm:p-6">
+              <Dialog.Panel className="relative transform rounded-lg border border-custom-border-200 bg-custom-background-100 px-5 py-8 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl sm:p-6">
                 <CycleForm
                   handleFormSubmit={handleFormSubmit}
                   handleClose={handleClose}
diff --git a/apps/app/components/cycles/select.tsx b/apps/app/components/cycles/select.tsx
index 59b9ecd08..9241c8a4d 100644
--- a/apps/app/components/cycles/select.tsx
+++ b/apps/app/components/cycles/select.tsx
@@ -66,7 +66,7 @@ export const CycleSelect: React.FC<IssueCycleSelectProps> = ({
         {({ open }) => (
           <>
             <Listbox.Button
-              className={`flex cursor-pointer items-center gap-1 rounded-md border border-custom-border-300 px-2 py-1 text-xs shadow-sm duration-300 hover:bg-custom-background-90 focus:border-indigo-500 focus:outline-none focus:ring-1 focus:ring-indigo-500`}
+              className={`flex cursor-pointer items-center gap-1 rounded-md border border-custom-border-200 px-2 py-1 text-xs shadow-sm duration-300 hover:bg-custom-background-90 focus:border-indigo-500 focus:outline-none focus:ring-1 focus:ring-indigo-500`}
             >
               <CyclesIcon className="h-3 w-3 text-custom-text-200" />
               <div className="flex items-center gap-2 truncate">
diff --git a/apps/app/components/cycles/sidebar.tsx b/apps/app/components/cycles/sidebar.tsx
index 55a500776..48edb7178 100644
--- a/apps/app/components/cycles/sidebar.tsx
+++ b/apps/app/components/cycles/sidebar.tsx
@@ -292,14 +292,14 @@ export const CycleDetailsSidebar: React.FC<Props> = ({
       <div
         className={`fixed top-[66px] ${
           isOpen ? "right-0" : "-right-[24rem]"
-        } h-full w-[24rem] overflow-y-auto border-l border-custom-border-300 bg-custom-sidebar-background-100 pt-5 pb-10 duration-300`}
+        } h-full w-[24rem] overflow-y-auto border-l border-custom-border-200 bg-custom-sidebar-background-100 pt-5 pb-10 duration-300`}
       >
         {cycle ? (
           <>
             <div className="flex flex-col items-start justify-center">
               <div className="flex gap-2.5 px-5 text-sm">
                 <div className="flex items-center">
-                  <span className="flex items-center rounded border-[0.5px] border-custom-border-300 bg-custom-background-90 px-2 py-1 text-center text-xs capitalize">
+                  <span className="flex items-center rounded border-[0.5px] border-custom-border-200 bg-custom-background-90 px-2 py-1 text-center text-xs capitalize">
                     {capitalizeFirstLetter(cycleStatus)}
                   </span>
                 </div>
@@ -309,7 +309,7 @@ export const CycleDetailsSidebar: React.FC<Props> = ({
                       <>
                         <Popover.Button
                           disabled={isCompleted ?? false}
-                          className={`group flex h-full items-center gap-2 whitespace-nowrap rounded border-[0.5px] border-custom-border-300 bg-custom-background-90 px-2 py-1 text-xs ${
+                          className={`group flex h-full items-center gap-2 whitespace-nowrap rounded border-[0.5px] border-custom-border-200 bg-custom-background-90 px-2 py-1 text-xs ${
                             cycle.start_date ? "" : "text-custom-text-200"
                           }`}
                         >
@@ -359,7 +359,7 @@ export const CycleDetailsSidebar: React.FC<Props> = ({
                       <>
                         <Popover.Button
                           disabled={isCompleted ?? false}
-                          className={`group flex items-center gap-2 whitespace-nowrap rounded border-[0.5px] border-custom-border-300 bg-custom-background-90 px-2 py-1 text-xs ${
+                          className={`group flex items-center gap-2 whitespace-nowrap rounded border-[0.5px] border-custom-border-200 bg-custom-background-90 px-2 py-1 text-xs ${
                             cycle.end_date ? "" : "text-custom-text-200"
                           }`}
                         >
@@ -477,7 +477,7 @@ export const CycleDetailsSidebar: React.FC<Props> = ({
                 </div>
               </div>
             </div>
-            <div className="flex w-full flex-col items-center justify-start gap-2 border-t border-custom-border-300 p-6">
+            <div className="flex w-full flex-col items-center justify-start gap-2 border-t border-custom-border-200 p-6">
               <Disclosure defaultOpen>
                 {({ open }) => (
                   <div
@@ -561,7 +561,7 @@ export const CycleDetailsSidebar: React.FC<Props> = ({
                 )}
               </Disclosure>
             </div>
-            <div className="flex w-full flex-col items-center justify-start gap-2 border-t border-custom-border-300 p-6">
+            <div className="flex w-full flex-col items-center justify-start gap-2 border-t border-custom-border-200 p-6">
               <Disclosure defaultOpen>
                 {({ open }) => (
                   <div
diff --git a/apps/app/components/cycles/single-cycle-card.tsx b/apps/app/components/cycles/single-cycle-card.tsx
index 817ca902f..f18d0e588 100644
--- a/apps/app/components/cycles/single-cycle-card.tsx
+++ b/apps/app/components/cycles/single-cycle-card.tsx
@@ -128,7 +128,7 @@ export const SingleCycleCard: React.FC<TSingleStatProps> = ({
 
   return (
     <div>
-      <div className="flex flex-col rounded-[10px] bg-custom-background-100 border border-custom-border-300 text-xs shadow">
+      <div className="flex flex-col rounded-[10px] bg-custom-background-100 border border-custom-border-200 text-xs shadow">
         <Link href={`/${workspaceSlug}/projects/${projectId}/cycles/${cycle.id}`}>
           <a className="w-full">
             <div className="flex h-full flex-col gap-4 rounded-b-[10px] p-4">
@@ -321,7 +321,7 @@ export const SingleCycleCard: React.FC<TSingleStatProps> = ({
           <Disclosure>
             {({ open }) => (
               <div
-                className={`flex h-full w-full flex-col rounded-b-[10px] border-t border-custom-border-300 bg-custom-background-80 text-custom-text-200 ${
+                className={`flex h-full w-full flex-col rounded-b-[10px] border-t border-custom-border-200 bg-custom-background-80 text-custom-text-200 ${
                   open ? "" : "flex-row"
                 }`}
               >
diff --git a/apps/app/components/cycles/transfer-issues-modal.tsx b/apps/app/components/cycles/transfer-issues-modal.tsx
index b3889e024..e4c26994d 100644
--- a/apps/app/components/cycles/transfer-issues-modal.tsx
+++ b/apps/app/components/cycles/transfer-issues-modal.tsx
@@ -119,7 +119,7 @@ export const TransferIssuesModal: React.FC<Props> = ({ isOpen, handleClose }) =>
                       <XMarkIcon className="h-4 w-4" />
                     </button>
                   </div>
-                  <div className="flex items-center gap-2 border-b border-custom-border-300 px-5 pb-3">
+                  <div className="flex items-center gap-2 border-b border-custom-border-200 px-5 pb-3">
                     <MagnifyingGlassIcon className="h-4 w-4 text-custom-text-200" />
                     <input
                       className="bg-custom-background-90 outline-none"
diff --git a/apps/app/components/emoji-icon-picker/index.tsx b/apps/app/components/emoji-icon-picker/index.tsx
index c8f05c422..61ba80843 100644
--- a/apps/app/components/emoji-icon-picker/index.tsx
+++ b/apps/app/components/emoji-icon-picker/index.tsx
@@ -63,8 +63,8 @@ const EmojiIconPicker: React.FC<Props> = ({ label, value, onChange, onIconColorC
         leaveFrom="transform opacity-100 scale-100"
         leaveTo="transform opacity-0 scale-95"
       >
-        <Popover.Panel className="absolute z-10 mt-2 w-[250px] rounded-[4px] border border-custom-border-300 bg-custom-background-80 shadow-lg">
-          <div className="h-[230px] w-[250px] overflow-auto rounded-[4px] border border-custom-border-300 bg-custom-background-80 p-2 shadow-xl">
+        <Popover.Panel className="absolute z-10 mt-2 w-[250px] rounded-[4px] border border-custom-border-200 bg-custom-background-80 shadow-lg">
+          <div className="h-[230px] w-[250px] overflow-auto rounded-[4px] border border-custom-border-200 bg-custom-background-80 p-2 shadow-xl">
             <Tab.Group as="div" className="flex h-full w-full flex-col">
               <Tab.List className="flex-0 -mx-2 flex justify-around gap-1 p-1">
                 {tabOptions.map((tab) => (
@@ -107,7 +107,7 @@ const EmojiIconPicker: React.FC<Props> = ({ label, value, onChange, onIconColorC
                       </div>
                     </div>
                   )}
-                  <hr className="mb-2 h-[1px] w-full border-custom-border-300" />
+                  <hr className="mb-2 h-[1px] w-full border-custom-border-200" />
                   <div>
                     <div className="grid grid-cols-8 gap-x-2 gap-y-3">
                       {emojis.map((emoji) => (
@@ -173,7 +173,7 @@ const EmojiIconPicker: React.FC<Props> = ({ label, value, onChange, onIconColorC
                         />
                       </div>
                     </div>
-                    <hr className="mb-1 h-[1px] w-full border-custom-border-300" />
+                    <hr className="mb-1 h-[1px] w-full border-custom-border-200" />
                     <div className="mt-1 ml-1 grid grid-cols-8 gap-x-2 gap-y-3">
                       {icons.material_rounded.map((icon, index) => (
                         <button
diff --git a/apps/app/components/estimates/create-update-estimate-modal.tsx b/apps/app/components/estimates/create-update-estimate-modal.tsx
index 3fc86662d..c1dfab86f 100644
--- a/apps/app/components/estimates/create-update-estimate-modal.tsx
+++ b/apps/app/components/estimates/create-update-estimate-modal.tsx
@@ -254,7 +254,7 @@ export const CreateUpdateEstimateModal: React.FC<Props> = ({ handleClose, data,
                 leaveFrom="opacity-100 translate-y-0 sm:scale-100"
                 leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
               >
-                <Dialog.Panel className="relative transform rounded-lg border border-custom-border-300 bg-custom-background-100 px-5 py-8 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl sm:p-6">
+                <Dialog.Panel className="relative transform rounded-lg border border-custom-border-200 bg-custom-background-100 px-5 py-8 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl sm:p-6">
                   <form onSubmit={handleSubmit(onSubmit)}>
                     <div className="space-y-3">
                       <div className="text-lg font-medium leading-6">
diff --git a/apps/app/components/estimates/delete-estimate-modal.tsx b/apps/app/components/estimates/delete-estimate-modal.tsx
index f1b725ff3..b4c08b421 100644
--- a/apps/app/components/estimates/delete-estimate-modal.tsx
+++ b/apps/app/components/estimates/delete-estimate-modal.tsx
@@ -60,7 +60,7 @@ export const DeleteEstimateModal: React.FC<Props> = ({
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-300 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl">
+              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-200 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl">
                 <div className="flex flex-col gap-6 p-6">
                   <div className="flex w-full items-center justify-start gap-6">
                     <span className="place-items-center rounded-full bg-red-500/20 p-4">
diff --git a/apps/app/components/gantt-chart/blocks/index.tsx b/apps/app/components/gantt-chart/blocks/index.tsx
index aa3311c29..dcc3a2910 100644
--- a/apps/app/components/gantt-chart/blocks/index.tsx
+++ b/apps/app/components/gantt-chart/blocks/index.tsx
@@ -44,7 +44,7 @@ export const GanttChartBlocks: FC<{
                     </div>
 
                     <div
-                      className="rounded shadow-sm bg-custom-background-100 overflow-hidden relative flex items-center h-[34px] border border-custom-border-300"
+                      className="rounded shadow-sm bg-custom-background-100 overflow-hidden relative flex items-center h-[34px] border border-custom-border-200"
                       style={{
                         width: `${block?.position?.width}px`,
                       }}
@@ -68,7 +68,7 @@ export const GanttChartBlocks: FC<{
       </div>
 
       {/* sidebar */}
-      {/* <div className="fixed top-0 bottom-0 w-[300px] flex-shrink-0 divide-y divide-custom-border-300 border-r border-custom-border-300 overflow-y-auto">
+      {/* <div className="fixed top-0 bottom-0 w-[300px] flex-shrink-0 divide-y divide-custom-border-200 border-r border-custom-border-200 overflow-y-auto">
         {blocks &&
           blocks.length > 0 &&
           blocks.map((block: any, _idx: number) => (
diff --git a/apps/app/components/gantt-chart/chart/bi-week.tsx b/apps/app/components/gantt-chart/chart/bi-week.tsx
index a53ba8a3c..1e1173ad4 100644
--- a/apps/app/components/gantt-chart/chart/bi-week.tsx
+++ b/apps/app/components/gantt-chart/chart/bi-week.tsx
@@ -7,18 +7,18 @@ export const BiWeekChartView: FC<any> = () => {
 
   return (
     <>
-      <div className="absolute flex h-full flex-grow divide-x divide-custom-border-300">
+      <div className="absolute flex h-full flex-grow divide-x divide-custom-border-200">
         {renderView &&
           renderView.length > 0 &&
           renderView.map((_itemRoot: any, _idxRoot: any) => (
             <div key={`title-${_idxRoot}`} className="relative flex flex-col">
-              <div className="relative border-b border-custom-border-300">
+              <div className="relative border-b border-custom-border-200">
                 <div className="sticky left-0 inline-flex whitespace-nowrap px-2 py-1 text-sm font-medium capitalize">
                   {_itemRoot?.title}
                 </div>
               </div>
 
-              <div className="flex h-full w-full divide-x divide-custom-border-300">
+              <div className="flex h-full w-full divide-x divide-custom-border-200">
                 {_itemRoot.children &&
                   _itemRoot.children.length > 0 &&
                   _itemRoot.children.map((_item: any, _idx: any) => (
@@ -29,7 +29,7 @@ export const BiWeekChartView: FC<any> = () => {
                     >
                       <div
                         className={`flex-shrink-0 border-b py-1 text-center text-sm capitalize font-medium ${
-                          _item?.today ? `text-red-500 border-red-500` : `border-custom-border-300`
+                          _item?.today ? `text-red-500 border-red-500` : `border-custom-border-200`
                         }`}
                       >
                         <div>{_item.title}</div>
diff --git a/apps/app/components/gantt-chart/chart/day.tsx b/apps/app/components/gantt-chart/chart/day.tsx
index 18fd9cabf..9d3ceb030 100644
--- a/apps/app/components/gantt-chart/chart/day.tsx
+++ b/apps/app/components/gantt-chart/chart/day.tsx
@@ -7,18 +7,18 @@ export const DayChartView: FC<any> = () => {
 
   return (
     <>
-      <div className="absolute flex h-full flex-grow divide-x divide-custom-border-300">
+      <div className="absolute flex h-full flex-grow divide-x divide-custom-border-200">
         {renderView &&
           renderView.length > 0 &&
           renderView.map((_itemRoot: any, _idxRoot: any) => (
             <div key={`title-${_idxRoot}`} className="relative flex flex-col">
-              <div className="relative border-b border-custom-border-300">
+              <div className="relative border-b border-custom-border-200">
                 <div className="sticky left-0 inline-flex whitespace-nowrap px-2 py-1 text-sm font-medium capitalize">
                   {_itemRoot?.title}
                 </div>
               </div>
 
-              <div className="flex h-full w-full divide-x divide-custom-border-300">
+              <div className="flex h-full w-full divide-x divide-custom-border-200">
                 {_itemRoot.children &&
                   _itemRoot.children.length > 0 &&
                   _itemRoot.children.map((_item: any, _idx: any) => (
@@ -29,7 +29,7 @@ export const DayChartView: FC<any> = () => {
                     >
                       <div
                         className={`flex-shrink-0 border-b py-1 text-center text-sm capitalize font-medium ${
-                          _item?.today ? `text-red-500 border-red-500` : `border-custom-border-300`
+                          _item?.today ? `text-red-500 border-red-500` : `border-custom-border-200`
                         }`}
                       >
                         <div>{_item.title}</div>
diff --git a/apps/app/components/gantt-chart/chart/hours.tsx b/apps/app/components/gantt-chart/chart/hours.tsx
index b1f235464..552a9cd2c 100644
--- a/apps/app/components/gantt-chart/chart/hours.tsx
+++ b/apps/app/components/gantt-chart/chart/hours.tsx
@@ -7,18 +7,18 @@ export const HourChartView: FC<any> = () => {
 
   return (
     <>
-      <div className="absolute flex h-full flex-grow divide-x divide-custom-border-300">
+      <div className="absolute flex h-full flex-grow divide-x divide-custom-border-200">
         {renderView &&
           renderView.length > 0 &&
           renderView.map((_itemRoot: any, _idxRoot: any) => (
             <div key={`title-${_idxRoot}`} className="relative flex flex-col">
-              <div className="relative border-b border-custom-border-300">
+              <div className="relative border-b border-custom-border-200">
                 <div className="sticky left-0 inline-flex whitespace-nowrap px-2 py-1 text-sm font-medium capitalize">
                   {_itemRoot?.title}
                 </div>
               </div>
 
-              <div className="flex h-full w-full divide-x divide-custom-border-300">
+              <div className="flex h-full w-full divide-x divide-custom-border-200">
                 {_itemRoot.children &&
                   _itemRoot.children.length > 0 &&
                   _itemRoot.children.map((_item: any, _idx: any) => (
@@ -29,7 +29,7 @@ export const HourChartView: FC<any> = () => {
                     >
                       <div
                         className={`flex-shrink-0 border-b py-1 text-center text-sm capitalize font-medium ${
-                          _item?.today ? `text-red-500 border-red-500` : `border-custom-border-300`
+                          _item?.today ? `text-red-500 border-red-500` : `border-custom-border-200`
                         }`}
                       >
                         <div>{_item.title}</div>
diff --git a/apps/app/components/gantt-chart/chart/index.tsx b/apps/app/components/gantt-chart/chart/index.tsx
index 8bfbcee16..94556422f 100644
--- a/apps/app/components/gantt-chart/chart/index.tsx
+++ b/apps/app/components/gantt-chart/chart/index.tsx
@@ -219,11 +219,11 @@ export const ChartViewRoot: FC<ChartViewRootProps> = ({
           ? `fixed top-0 bottom-0 left-0 right-0 z-[999999] bg-custom-background-100`
           : `relative`
       } ${
-        border ? `border border-custom-border-300` : ``
+        border ? `border border-custom-border-200` : ``
       } flex h-full flex-col rounded-sm select-none bg-custom-background-100 shadow`}
     >
       {/* chart title */}
-      {/* <div className="flex w-full flex-shrink-0 flex-wrap items-center gap-5 gap-y-3 whitespace-nowrap p-2 border-b border-custom-border-300">
+      {/* <div className="flex w-full flex-shrink-0 flex-wrap items-center gap-5 gap-y-3 whitespace-nowrap p-2 border-b border-custom-border-200">
         {title && (
           <div className="text-lg font-medium flex gap-2 items-center">
             <div>{title}</div>
@@ -244,7 +244,7 @@ export const ChartViewRoot: FC<ChartViewRootProps> = ({
       {/* chart header */}
       <div className="flex w-full flex-shrink-0 flex-wrap items-center gap-5 gap-y-3 whitespace-nowrap p-2">
         {/* <div
-          className="transition-all border border-custom-border-300 w-[30px] h-[30px] flex justify-center items-center cursor-pointer rounded-sm hover:bg-custom-background-80"
+          className="transition-all border border-custom-border-200 w-[30px] h-[30px] flex justify-center items-center cursor-pointer rounded-sm hover:bg-custom-background-80"
           onClick={() => setBlocksSidebarView(() => !blocksSidebarView)}
         >
           {blocksSidebarView ? (
@@ -279,7 +279,7 @@ export const ChartViewRoot: FC<ChartViewRootProps> = ({
             allViews.map((_chatView: any, _idx: any) => (
               <div
                 key={_chatView?.key}
-                className={`cursor-pointer rounded-sm border border-custom-border-300 p-1 px-2 text-xs ${
+                className={`cursor-pointer rounded-sm border border-custom-border-200 p-1 px-2 text-xs ${
                   currentView === _chatView?.key
                     ? `bg-custom-background-80`
                     : `hover:bg-custom-background-90`
@@ -293,7 +293,7 @@ export const ChartViewRoot: FC<ChartViewRootProps> = ({
 
         <div className="flex items-center gap-1">
           <div
-            className={`cursor-pointer rounded-sm border border-custom-border-300 p-1 px-2 text-xs hover:bg-custom-background-80`}
+            className={`cursor-pointer rounded-sm border border-custom-border-200 p-1 px-2 text-xs hover:bg-custom-background-80`}
             onClick={handleToday}
           >
             Today
@@ -301,7 +301,7 @@ export const ChartViewRoot: FC<ChartViewRootProps> = ({
         </div>
 
         <div
-          className="transition-all border border-custom-border-300 w-[30px] h-[30px] flex justify-center items-center cursor-pointer rounded-sm hover:bg-custom-background-80"
+          className="transition-all border border-custom-border-200 w-[30px] h-[30px] flex justify-center items-center cursor-pointer rounded-sm hover:bg-custom-background-80"
           onClick={() => setFullScreenMode(() => !fullScreenMode)}
         >
           {fullScreenMode ? (
@@ -313,7 +313,7 @@ export const ChartViewRoot: FC<ChartViewRootProps> = ({
       </div>
 
       {/* content */}
-      <div className="relative flex h-full w-full flex-1 overflow-hidden border-t border-custom-border-300">
+      <div className="relative flex h-full w-full flex-1 overflow-hidden border-t border-custom-border-200">
         <div
           className="relative flex h-full w-full flex-1 flex-col overflow-hidden overflow-x-auto"
           id="scroll-container"
diff --git a/apps/app/components/gantt-chart/chart/month.tsx b/apps/app/components/gantt-chart/chart/month.tsx
index e3b32fe40..68e517960 100644
--- a/apps/app/components/gantt-chart/chart/month.tsx
+++ b/apps/app/components/gantt-chart/chart/month.tsx
@@ -7,18 +7,18 @@ export const MonthChartView: FC<any> = () => {
 
   return (
     <>
-      <div className="absolute flex h-full flex-grow divide-x divide-custom-border-300">
+      <div className="absolute flex h-full flex-grow divide-x divide-custom-border-200">
         {renderView &&
           renderView.length > 0 &&
           renderView.map((_itemRoot: any, _idxRoot: any) => (
             <div key={`title-${_idxRoot}`} className="relative flex flex-col">
-              <div className="relative border-b border-custom-border-300">
+              <div className="relative border-b border-custom-border-200">
                 <div className="sticky left-0 inline-flex whitespace-nowrap px-2 py-1 text-sm font-medium capitalize">
                   {_itemRoot?.title}
                 </div>
               </div>
 
-              <div className="flex h-full w-full divide-x divide-custom-border-300">
+              <div className="flex h-full w-full divide-x divide-custom-border-200">
                 {_itemRoot.children &&
                   _itemRoot.children.length > 0 &&
                   _itemRoot.children.map((_item: any, _idx: any) => (
@@ -29,7 +29,7 @@ export const MonthChartView: FC<any> = () => {
                     >
                       <div
                         className={`flex-shrink-0 border-b py-1 text-center text-sm capitalize font-medium ${
-                          _item?.today ? `text-red-500 border-red-500` : `border-custom-border-300`
+                          _item?.today ? `text-red-500 border-red-500` : `border-custom-border-200`
                         }`}
                       >
                         <div>{_item.title}</div>
diff --git a/apps/app/components/gantt-chart/chart/quarter.tsx b/apps/app/components/gantt-chart/chart/quarter.tsx
index 538bed920..67605b6b5 100644
--- a/apps/app/components/gantt-chart/chart/quarter.tsx
+++ b/apps/app/components/gantt-chart/chart/quarter.tsx
@@ -7,18 +7,18 @@ export const QuarterChartView: FC<any> = () => {
 
   return (
     <>
-      <div className="absolute flex h-full flex-grow divide-x divide-custom-border-300">
+      <div className="absolute flex h-full flex-grow divide-x divide-custom-border-200">
         {renderView &&
           renderView.length > 0 &&
           renderView.map((_itemRoot: any, _idxRoot: any) => (
             <div key={`title-${_idxRoot}`} className="relative flex flex-col">
-              <div className="relative border-b border-custom-border-300">
+              <div className="relative border-b border-custom-border-200">
                 <div className="sticky left-0 inline-flex whitespace-nowrap px-2 py-1 text-sm font-medium capitalize">
                   {_itemRoot?.title}
                 </div>
               </div>
 
-              <div className="flex h-full w-full divide-x divide-custom-border-300">
+              <div className="flex h-full w-full divide-x divide-custom-border-200">
                 {_itemRoot.children &&
                   _itemRoot.children.length > 0 &&
                   _itemRoot.children.map((_item: any, _idx: any) => (
@@ -29,7 +29,7 @@ export const QuarterChartView: FC<any> = () => {
                     >
                       <div
                         className={`flex-shrink-0 border-b py-1 text-center text-sm capitalize font-medium ${
-                          _item?.today ? `text-red-500 border-red-500` : `border-custom-border-300`
+                          _item?.today ? `text-red-500 border-red-500` : `border-custom-border-200`
                         }`}
                       >
                         <div>{_item.title}</div>
diff --git a/apps/app/components/gantt-chart/chart/week.tsx b/apps/app/components/gantt-chart/chart/week.tsx
index 281f67681..8b72f27c6 100644
--- a/apps/app/components/gantt-chart/chart/week.tsx
+++ b/apps/app/components/gantt-chart/chart/week.tsx
@@ -7,18 +7,18 @@ export const WeekChartView: FC<any> = () => {
 
   return (
     <>
-      <div className="absolute flex h-full flex-grow divide-x divide-custom-border-300">
+      <div className="absolute flex h-full flex-grow divide-x divide-custom-border-200">
         {renderView &&
           renderView.length > 0 &&
           renderView.map((_itemRoot: any, _idxRoot: any) => (
             <div key={`title-${_idxRoot}`} className="relative flex flex-col">
-              <div className="relative border-b border-custom-border-300">
+              <div className="relative border-b border-custom-border-200">
                 <div className="sticky left-0 inline-flex whitespace-nowrap px-2 py-1 text-sm font-medium capitalize">
                   {_itemRoot?.title}
                 </div>
               </div>
 
-              <div className="flex h-full w-full divide-x divide-custom-border-300">
+              <div className="flex h-full w-full divide-x divide-custom-border-200">
                 {_itemRoot.children &&
                   _itemRoot.children.length > 0 &&
                   _itemRoot.children.map((_item: any, _idx: any) => (
@@ -29,7 +29,7 @@ export const WeekChartView: FC<any> = () => {
                     >
                       <div
                         className={`flex-shrink-0 border-b py-1 text-center text-sm capitalize font-medium ${
-                          _item?.today ? `text-red-500 border-red-500` : `border-custom-border-300`
+                          _item?.today ? `text-red-500 border-red-500` : `border-custom-border-200`
                         }`}
                       >
                         <div>{_item.title}</div>
diff --git a/apps/app/components/gantt-chart/chart/year.tsx b/apps/app/components/gantt-chart/chart/year.tsx
index 2be0b5a10..983dccc68 100644
--- a/apps/app/components/gantt-chart/chart/year.tsx
+++ b/apps/app/components/gantt-chart/chart/year.tsx
@@ -7,18 +7,18 @@ export const YearChartView: FC<any> = () => {
 
   return (
     <>
-      <div className="absolute flex h-full flex-grow divide-x divide-custom-border-300">
+      <div className="absolute flex h-full flex-grow divide-x divide-custom-border-200">
         {renderView &&
           renderView.length > 0 &&
           renderView.map((_itemRoot: any, _idxRoot: any) => (
             <div key={`title-${_idxRoot}`} className="relative flex flex-col">
-              <div className="relative border-b border-custom-border-300">
+              <div className="relative border-b border-custom-border-200">
                 <div className="sticky left-0 inline-flex whitespace-nowrap px-2 py-1 text-sm font-medium capitalize">
                   {_itemRoot?.title}
                 </div>
               </div>
 
-              <div className="flex h-full w-full divide-x divide-custom-border-300">
+              <div className="flex h-full w-full divide-x divide-custom-border-200">
                 {_itemRoot.children &&
                   _itemRoot.children.length > 0 &&
                   _itemRoot.children.map((_item: any, _idx: any) => (
@@ -29,7 +29,7 @@ export const YearChartView: FC<any> = () => {
                     >
                       <div
                         className={`flex-shrink-0 border-b py-1 text-center text-sm capitalize font-medium ${
-                          _item?.today ? `text-red-500 border-red-500` : `border-custom-border-300`
+                          _item?.today ? `text-red-500 border-red-500` : `border-custom-border-200`
                         }`}
                       >
                         <div>{_item.title}</div>
diff --git a/apps/app/components/inbox/accept-issue-modal.tsx b/apps/app/components/inbox/accept-issue-modal.tsx
index d6eef1d3e..be557536b 100644
--- a/apps/app/components/inbox/accept-issue-modal.tsx
+++ b/apps/app/components/inbox/accept-issue-modal.tsx
@@ -56,7 +56,7 @@ export const AcceptIssueModal: React.FC<Props> = ({ isOpen, handleClose, data, o
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-300 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl">
+              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-200 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl">
                 <div className="flex flex-col gap-6 p-6">
                   <div className="flex w-full items-center justify-start gap-6">
                     <span className="place-items-center rounded-full bg-green-500/20 p-4">
diff --git a/apps/app/components/inbox/decline-issue-modal.tsx b/apps/app/components/inbox/decline-issue-modal.tsx
index a14e4277d..b3168915a 100644
--- a/apps/app/components/inbox/decline-issue-modal.tsx
+++ b/apps/app/components/inbox/decline-issue-modal.tsx
@@ -56,7 +56,7 @@ export const DeclineIssueModal: React.FC<Props> = ({ isOpen, handleClose, data,
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-300 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl">
+              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-200 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl">
                 <div className="flex flex-col gap-6 p-6">
                   <div className="flex w-full items-center justify-start gap-6">
                     <span className="place-items-center rounded-full bg-red-500/20 p-4">
diff --git a/apps/app/components/inbox/delete-issue-modal.tsx b/apps/app/components/inbox/delete-issue-modal.tsx
index 3fa2ffe67..a00057113 100644
--- a/apps/app/components/inbox/delete-issue-modal.tsx
+++ b/apps/app/components/inbox/delete-issue-modal.tsx
@@ -111,7 +111,7 @@ export const DeleteIssueModal: React.FC<Props> = ({ isOpen, handleClose, data })
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-300 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl">
+              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-200 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl">
                 <div className="flex flex-col gap-6 p-6">
                   <div className="flex w-full items-center justify-start gap-6">
                     <span className="place-items-center rounded-full bg-red-500/20 p-4">
diff --git a/apps/app/components/inbox/filters-dropdown.tsx b/apps/app/components/inbox/filters-dropdown.tsx
index a8ed04c20..308f0bc64 100644
--- a/apps/app/components/inbox/filters-dropdown.tsx
+++ b/apps/app/components/inbox/filters-dropdown.tsx
@@ -72,7 +72,7 @@ export const FiltersDropdown: React.FC = () => {
         ]}
       />
       {filtersLength > 0 && (
-        <div className="absolute -top-2 -right-2 h-4 w-4 text-[0.65rem] grid place-items-center rounded-full text-custom-text-100 bg-custom-background-80 border border-custom-border-300 z-10">
+        <div className="absolute -top-2 -right-2 h-4 w-4 text-[0.65rem] grid place-items-center rounded-full text-custom-text-100 bg-custom-background-80 border border-custom-border-200 z-10">
           <span>{filtersLength}</span>
         </div>
       )}
diff --git a/apps/app/components/inbox/filters-list.tsx b/apps/app/components/inbox/filters-list.tsx
index aef9e02ee..503c4ab04 100644
--- a/apps/app/components/inbox/filters-list.tsx
+++ b/apps/app/components/inbox/filters-list.tsx
@@ -22,7 +22,7 @@ export const InboxFiltersList = () => {
           return (
             <div
               key={key}
-              className="flex items-center gap-x-2 rounded-full border border-custom-border-300 bg-custom-background-80 px-2 py-1"
+              className="flex items-center gap-x-2 rounded-full border border-custom-border-200 bg-custom-background-80 px-2 py-1"
             >
               <span className="capitalize text-custom-text-200">
                 {replaceUnderscoreIfSnakeCase(key)}:
@@ -116,7 +116,7 @@ export const InboxFiltersList = () => {
       <button
         type="button"
         onClick={clearAllFilters}
-        className="flex items-center gap-x-1 rounded-full border border-custom-border-300 bg-custom-background-80 px-3 py-1.5 text-custom-text-200 hover:text-custom-text-100"
+        className="flex items-center gap-x-1 rounded-full border border-custom-border-200 bg-custom-background-80 px-3 py-1.5 text-custom-text-200 hover:text-custom-text-100"
       >
         <span>Clear all</span>
         <XMarkIcon className="h-3 w-3" />
diff --git a/apps/app/components/inbox/inbox-action-headers.tsx b/apps/app/components/inbox/inbox-action-headers.tsx
index d19e028c9..6659485ed 100644
--- a/apps/app/components/inbox/inbox-action-headers.tsx
+++ b/apps/app/components/inbox/inbox-action-headers.tsx
@@ -162,7 +162,7 @@ export const InboxActionHeader = () => {
         handleClose={() => setDeleteIssueModal(false)}
         data={inboxIssues?.find((i) => i.bridge_id === inboxIssueId)}
       />
-      <div className="grid grid-cols-4 border-b border-custom-border-300 divide-x divide-custom-border-300">
+      <div className="grid grid-cols-4 border-b border-custom-border-200 divide-x divide-custom-border-200">
         <div className="col-span-1 flex justify-between p-4">
           <div className="flex items-center gap-2">
             <InboxIcon className="h-4 w-4 text-custom-text-200" />
@@ -175,7 +175,7 @@ export const InboxActionHeader = () => {
             <div className="flex items-center gap-x-2">
               <button
                 type="button"
-                className="rounded border border-custom-border-300 bg-custom-background-90 p-1.5 hover:bg-custom-background-80"
+                className="rounded border border-custom-border-200 bg-custom-background-90 p-1.5 hover:bg-custom-background-80"
                 onClick={() => {
                   const e = new KeyboardEvent("keydown", { key: "ArrowUp" });
                   document.dispatchEvent(e);
@@ -185,7 +185,7 @@ export const InboxActionHeader = () => {
               </button>
               <button
                 type="button"
-                className="rounded border border-custom-border-300 bg-custom-background-90 p-1.5 hover:bg-custom-background-80"
+                className="rounded border border-custom-border-200 bg-custom-background-90 p-1.5 hover:bg-custom-background-80"
                 onClick={() => {
                   const e = new KeyboardEvent("keydown", { key: "ArrowDown" });
                   document.dispatchEvent(e);
@@ -207,7 +207,7 @@ export const InboxActionHeader = () => {
                         <span>Snooze</span>
                       </SecondaryButton>
                     </Popover.Button>
-                    <Popover.Panel className="w-80 p-2 absolute right-0 z-10 mt-2 rounded-md border border-custom-border-300 bg-custom-background-80 shadow-lg">
+                    <Popover.Panel className="w-80 p-2 absolute right-0 z-10 mt-2 rounded-md border border-custom-border-200 bg-custom-background-80 shadow-lg">
                       {({ close }) => (
                         <div className="w-full h-full flex flex-col gap-y-1">
                           <DatePicker
diff --git a/apps/app/components/inbox/inbox-issue-card.tsx b/apps/app/components/inbox/inbox-issue-card.tsx
index 187940e68..9cc8deb76 100644
--- a/apps/app/components/inbox/inbox-issue-card.tsx
+++ b/apps/app/components/inbox/inbox-issue-card.tsx
@@ -40,7 +40,7 @@ export const InboxIssueCard: React.FC<Props> = (props) => {
       <a>
         <div
           id={issue.id}
-          className={`relative min-h-[5rem] cursor-pointer select-none space-y-3 py-2 px-4 border-b border-custom-border-300 hover:bg-custom-primary/5 ${
+          className={`relative min-h-[5rem] cursor-pointer select-none space-y-3 py-2 px-4 border-b border-custom-border-200 hover:bg-custom-primary/5 ${
             active ? "bg-custom-primary/5" : " "
           } ${issue.issue_inbox[0].status !== -2 ? "opacity-60" : ""}`}
         >
@@ -62,7 +62,7 @@ export const InboxIssueCard: React.FC<Props> = (props) => {
                     ? "border-yellow-500/20 bg-yellow-500/20 text-yellow-500"
                     : issue.priority === "low"
                     ? "border-green-500/20 bg-green-500/20 text-green-500"
-                    : "border-custom-border-300"
+                    : "border-custom-border-200"
                 }`}
               >
                 {getPriorityIcon(
@@ -75,7 +75,7 @@ export const InboxIssueCard: React.FC<Props> = (props) => {
               tooltipHeading="Created on"
               tooltipContent={`${renderShortDateWithYearFormat(issue.created_at ?? "")}`}
             >
-              <div className="flex items-center gap-1 rounded border border-custom-border-300 shadow-sm text-xs px-2 py-[0.19rem] text-custom-text-200">
+              <div className="flex items-center gap-1 rounded border border-custom-border-200 shadow-sm text-xs px-2 py-[0.19rem] text-custom-text-200">
                 <CalendarDaysIcon className="h-3.5 w-3.5" />
                 <span>{renderShortDateWithYearFormat(issue.created_at ?? "")}</span>
               </div>
diff --git a/apps/app/components/inbox/inbox-main-content.tsx b/apps/app/components/inbox/inbox-main-content.tsx
index 14a9be325..49a3baf91 100644
--- a/apps/app/components/inbox/inbox-main-content.tsx
+++ b/apps/app/components/inbox/inbox-main-content.tsx
@@ -310,7 +310,7 @@ export const InboxMainContent: React.FC = () => {
             </div>
           </div>
 
-          <div className="basis-1/3 space-y-5 border-custom-border-300 p-5">
+          <div className="basis-1/3 space-y-5 border-custom-border-200 p-5">
             <IssueDetailsSidebar
               control={control}
               issueDetail={issueDetails}
diff --git a/apps/app/components/inbox/issues-list-sidebar.tsx b/apps/app/components/inbox/issues-list-sidebar.tsx
index ec9b39c3d..5f0fd116a 100644
--- a/apps/app/components/inbox/issues-list-sidebar.tsx
+++ b/apps/app/components/inbox/issues-list-sidebar.tsx
@@ -18,7 +18,7 @@ export const IssuesListSidebar = () => {
       <InboxFiltersList />
       {inboxIssues ? (
         inboxIssues.length > 0 ? (
-          <div className="divide-y divide-custom-border-300 overflow-auto h-full">
+          <div className="divide-y divide-custom-border-200 overflow-auto h-full">
             {inboxIssues.map((issue) => (
               <InboxIssueCard
                 key={issue.id}
diff --git a/apps/app/components/inbox/select-duplicate.tsx b/apps/app/components/inbox/select-duplicate.tsx
index 6cff72d5f..1cc905080 100644
--- a/apps/app/components/inbox/select-duplicate.tsx
+++ b/apps/app/components/inbox/select-duplicate.tsx
@@ -101,7 +101,7 @@ export const SelectDuplicateInboxIssueModal: React.FC<Props> = (props) => {
                 leaveFrom="opacity-100 scale-100"
                 leaveTo="opacity-0 scale-95"
               >
-                <Dialog.Panel className="relative mx-auto max-w-2xl transform rounded-xl border border-custom-border-300 bg-custom-background-100 shadow-2xl transition-all">
+                <Dialog.Panel className="relative mx-auto max-w-2xl transform rounded-xl border border-custom-border-200 bg-custom-background-100 shadow-2xl transition-all">
                   <Combobox
                     value={selectedItem}
                     onChange={(value) => {
@@ -123,7 +123,7 @@ export const SelectDuplicateInboxIssueModal: React.FC<Props> = (props) => {
 
                     <Combobox.Options
                       static
-                      className="max-h-80 scroll-py-2 divide-y divide-custom-border-300 overflow-y-auto"
+                      className="max-h-80 scroll-py-2 divide-y divide-custom-border-200 overflow-y-auto"
                     >
                       {filteredIssues.length > 0 ? (
                         <li className="p-2">
diff --git a/apps/app/components/integration/delete-import-modal.tsx b/apps/app/components/integration/delete-import-modal.tsx
index 74bd1c973..d869ae2a6 100644
--- a/apps/app/components/integration/delete-import-modal.tsx
+++ b/apps/app/components/integration/delete-import-modal.tsx
@@ -88,7 +88,7 @@ export const DeleteImportModal: React.FC<Props> = ({ isOpen, handleClose, data,
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-300 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl">
+              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-200 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl">
                 <div className="flex flex-col gap-6 p-6">
                   <div className="flex w-full items-center justify-start gap-6">
                     <span className="place-items-center rounded-full bg-red-500/20 p-4">
diff --git a/apps/app/components/integration/github/root.tsx b/apps/app/components/integration/github/root.tsx
index 34b122ee3..fea02bb86 100644
--- a/apps/app/components/integration/github/root.tsx
+++ b/apps/app/components/integration/github/root.tsx
@@ -185,7 +185,7 @@ export const GithubImporterRoot: React.FC<Props> = ({ user }) => {
           </div>
         </Link>
 
-        <div className="space-y-4 rounded-[10px] border border-custom-border-300 bg-custom-background-100 p-4">
+        <div className="space-y-4 rounded-[10px] border border-custom-border-200 bg-custom-background-100 p-4">
           <div className="flex items-center gap-2">
             <div className="h-10 w-10 flex-shrink-0">
               <Image src={GithubLogo} alt="GithubLogo" />
@@ -201,7 +201,7 @@ export const GithubImporterRoot: React.FC<Props> = ({ user }) => {
                               ? "border-opacity-100 bg-opacity-100"
                               : "border-opacity-80 bg-opacity-80"
                           }`
-                        : "border-custom-border-300"
+                        : "border-custom-border-200"
                     }`}
                   >
                     <integration.icon
@@ -216,7 +216,7 @@ export const GithubImporterRoot: React.FC<Props> = ({ user }) => {
                       className={`border-b px-7 ${
                         index <= activeIntegrationState() - 1
                           ? `border-custom-primary`
-                          : `border-custom-border-300`
+                          : `border-custom-border-200`
                       }`}
                     >
                       {" "}
diff --git a/apps/app/components/integration/guide.tsx b/apps/app/components/integration/guide.tsx
index 9cf6a06d4..8c8d05671 100644
--- a/apps/app/components/integration/guide.tsx
+++ b/apps/app/components/integration/guide.tsx
@@ -83,7 +83,7 @@ const IntegrationGuide = () => {
               {IMPORTERS_EXPORTERS_LIST.map((service) => (
                 <div
                   key={service.provider}
-                  className="rounded-[10px] border border-custom-border-300 bg-custom-background-100 p-4"
+                  className="rounded-[10px] border border-custom-border-200 bg-custom-background-100 p-4"
                 >
                   <div className="flex items-center gap-4 whitespace-nowrap">
                     <div className="relative h-10 w-10 flex-shrink-0">
@@ -113,7 +113,7 @@ const IntegrationGuide = () => {
                 </div>
               ))}
             </div>
-            <div className="rounded-[10px] border border-custom-border-300 bg-custom-background-100 p-4">
+            <div className="rounded-[10px] border border-custom-border-200 bg-custom-background-100 p-4">
               <h3 className="mb-2 flex gap-2 text-lg font-medium">
                 Previous Imports
                 <button
@@ -133,7 +133,7 @@ const IntegrationGuide = () => {
               {importerServices ? (
                 importerServices.length > 0 ? (
                   <div className="space-y-2">
-                    <div className="divide-y divide-custom-border-300">
+                    <div className="divide-y divide-custom-border-200">
                       {importerServices.map((service) => (
                         <SingleImport
                           key={service.id}
diff --git a/apps/app/components/integration/jira/import-users.tsx b/apps/app/components/integration/jira/import-users.tsx
index 57d35a964..3409e6d54 100644
--- a/apps/app/components/integration/jira/import-users.tsx
+++ b/apps/app/components/integration/jira/import-users.tsx
@@ -51,7 +51,7 @@ export const JiraImportUsers: FC = () => {
   }));
 
   return (
-    <div className="h-full w-full space-y-10 divide-y-2 divide-custom-border-300 overflow-y-auto">
+    <div className="h-full w-full space-y-10 divide-y-2 divide-custom-border-200 overflow-y-auto">
       <div className="grid grid-cols-1 gap-10 md:grid-cols-2">
         <div className="col-span-1">
           <h3 className="font-semibold">Users</h3>
diff --git a/apps/app/components/integration/jira/root.tsx b/apps/app/components/integration/jira/root.tsx
index ee7fcd871..b9d08550c 100644
--- a/apps/app/components/integration/jira/root.tsx
+++ b/apps/app/components/integration/jira/root.tsx
@@ -118,7 +118,7 @@ export const JiraImporterRoot: React.FC<Props> = ({ user }) => {
         </div>
       </Link>
 
-      <div className="flex h-full flex-col space-y-4 rounded-[10px] border border-custom-border-300 bg-custom-background-100 p-4">
+      <div className="flex h-full flex-col space-y-4 rounded-[10px] border border-custom-border-200 bg-custom-background-100 p-4">
         <div className="flex items-center gap-2">
           <div className="h-10 w-10 flex-shrink-0">
             <Image src={JiraLogo} alt="jira logo" />
@@ -135,14 +135,14 @@ export const JiraImporterRoot: React.FC<Props> = ({ user }) => {
                     index > activeIntegrationState() + 1 ||
                     Boolean(index === activeIntegrationState() + 1 && disableTopBarAfter)
                   }
-                  className={`flex h-10 w-10 flex-shrink-0 items-center justify-center rounded-full border border-custom-border-300 ${
+                  className={`flex h-10 w-10 flex-shrink-0 items-center justify-center rounded-full border border-custom-border-200 ${
                     index <= activeIntegrationState()
                       ? `border-custom-primary bg-custom-primary ${
                           index === activeIntegrationState()
                             ? "border-opacity-100 bg-opacity-100"
                             : "border-opacity-80 bg-opacity-80"
                         }`
-                      : "border-custom-border-300"
+                      : "border-custom-border-200"
                   }`}
                 >
                   <integration.icon
@@ -157,7 +157,7 @@ export const JiraImporterRoot: React.FC<Props> = ({ user }) => {
                     className={`border-b px-7 ${
                       index <= activeIntegrationState() - 1
                         ? `border-custom-primary`
-                        : `border-custom-border-300`
+                        : `border-custom-border-200`
                     }`}
                   >
                     {" "}
@@ -183,7 +183,7 @@ export const JiraImporterRoot: React.FC<Props> = ({ user }) => {
                 {currentStep?.state === "import-confirmation" && <JiraConfirmImport />}
               </div>
 
-              <div className="-mx-4 mt-4 flex justify-end gap-4 border-t border-custom-border-300 p-4 pb-0">
+              <div className="-mx-4 mt-4 flex justify-end gap-4 border-t border-custom-border-200 p-4 pb-0">
                 {currentStep?.state !== "import-configure" && (
                   <SecondaryButton
                     onClick={() => {
diff --git a/apps/app/components/integration/single-integration-card.tsx b/apps/app/components/integration/single-integration-card.tsx
index 48ff7e7e2..0a59de8b7 100644
--- a/apps/app/components/integration/single-integration-card.tsx
+++ b/apps/app/components/integration/single-integration-card.tsx
@@ -99,7 +99,7 @@ export const SingleIntegrationCard: React.FC<Props> = ({ integration }) => {
   );
 
   return (
-    <div className="flex items-center justify-between gap-2 rounded-[10px] border border-custom-border-300 bg-custom-background-100 p-5">
+    <div className="flex items-center justify-between gap-2 rounded-[10px] border border-custom-border-200 bg-custom-background-100 p-5">
       <div className="flex items-start gap-4">
         <div className="h-12 w-12 flex-shrink-0">
           <Image
diff --git a/apps/app/components/issues/activity.tsx b/apps/app/components/issues/activity.tsx
index cc4ce16ba..617b35266 100644
--- a/apps/app/components/issues/activity.tsx
+++ b/apps/app/components/issues/activity.tsx
@@ -13,18 +13,8 @@ import { CommentCard } from "components/issues/comment";
 // ui
 import { Icon, Loader } from "components/ui";
 // icons
-import {
-  CalendarDaysIcon,
-  ChartBarIcon,
-  ChatBubbleBottomCenterTextIcon,
-  LinkIcon,
-  PaperClipIcon,
-  PlayIcon,
-  RectangleGroupIcon,
-  Squares2X2Icon,
-  UserIcon,
-} from "@heroicons/react/24/outline";
-import { BlockedIcon, BlockerIcon, CyclesIcon, TagIcon, UserGroupIcon } from "components/icons";
+import { Squares2X2Icon } from "@heroicons/react/24/outline";
+import { BlockedIcon, BlockerIcon } from "components/icons";
 // helpers
 import { renderShortDateWithYearFormat, timeAgo } from "helpers/date-time.helper";
 import { addSpaceIfCamelCase } from "helpers/string.helper";
@@ -41,11 +31,11 @@ const activityDetails: {
 } = {
   assignee: {
     message: "removed the assignee",
-    icon: <UserGroupIcon className="h-3 w-3" color="#6b7280" aria-hidden="true" />,
+    icon: <Icon iconName="group" className="!text-sm" aria-hidden="true" />,
   },
   assignees: {
     message: "added a new assignee",
-    icon: <UserGroupIcon className="h-3 w-3" color="#6b7280" aria-hidden="true" />,
+    icon: <Icon iconName="group" className="!text-sm" aria-hidden="true" />,
   },
   blocks: {
     message: "marked this issue being blocked by",
@@ -57,62 +47,58 @@ const activityDetails: {
   },
   cycles: {
     message: "set the cycle to",
-    icon: <CyclesIcon height="12" width="12" color="#6b7280" />,
+    icon: <Icon iconName="contrast" className="!text-sm" aria-hidden="true" />,
   },
   estimate_point: {
     message: "set the estimate point to",
-    icon: <PlayIcon className="h-3 w-3 -rotate-90 text-custom-text-200" aria-hidden="true" />,
+    icon: <Icon iconName="change_history" className="!text-sm" aria-hidden="true" />,
   },
   labels: {
-    icon: <TagIcon height="12" width="12" color="#6b7280" />,
+    icon: <Icon iconName="sell" className="!text-sm" aria-hidden="true" />,
   },
   modules: {
     message: "set the module to",
-    icon: <RectangleGroupIcon className="h-3 w-3 text-custom-text-200" aria-hidden="true" />,
+    icon: <Icon iconName="dataset" className="!text-sm" aria-hidden="true" />,
   },
   state: {
     message: "set the state to",
-    icon: <Squares2X2Icon className="h-3 w-3 text-custom-text-200" aria-hidden="true" />,
+    icon: <Squares2X2Icon className="h-3 w-3" aria-hidden="true" />,
   },
   priority: {
     message: "set the priority to",
-    icon: <ChartBarIcon className="h-3 w-3 text-custom-text-200" aria-hidden="true" />,
+    icon: <Icon iconName="signal_cellular_alt" className="!text-sm" aria-hidden="true" />,
   },
   name: {
     message: "set the name to",
-    icon: (
-      <ChatBubbleBottomCenterTextIcon className="h-3 w-3 text-custom-text-200" aria-hidden="true" />
-    ),
+    icon: <Icon iconName="chat" className="!text-sm" aria-hidden="true" />,
   },
   description: {
     message: "updated the description.",
-    icon: (
-      <ChatBubbleBottomCenterTextIcon className="h-3 w-3 text-custom-text-200" aria-hidden="true" />
-    ),
+    icon: <Icon iconName="chat" className="!text-sm" aria-hidden="true" />,
   },
   target_date: {
     message: "set the due date to",
-    icon: <CalendarDaysIcon className="h-3 w-3 text-custom-text-200" aria-hidden="true" />,
+    icon: <Icon iconName="calendar_today" className="!text-sm" aria-hidden="true" />,
   },
   parent: {
     message: "set the parent to",
-    icon: <UserIcon className="h-3 w-3 text-custom-text-200" aria-hidden="true" />,
+    icon: <Icon iconName="supervised_user_circle" className="!text-sm" aria-hidden="true" />,
   },
   estimate: {
     message: "updated the estimate",
-    icon: <PlayIcon className="h-3 w-3 -rotate-90 text-custom-text-200" aria-hidden="true" />,
+    icon: <Icon iconName="change_history" className="!text-sm" aria-hidden="true" />,
   },
   link: {
     message: "updated the link",
-    icon: <LinkIcon className="h-3 w-3 text-custom-text-200" aria-hidden="true" />,
+    icon: <Icon iconName="link" className="!text-sm" aria-hidden="true" />,
   },
   attachment: {
     message: "updated the attachment",
-    icon: <PaperClipIcon className="h-3 w-3 text-custom-text-200" aria-hidden="true" />,
+    icon: <Icon iconName="attach_file" className="!text-sm" aria-hidden="true" />,
   },
   archived_at: {
     message: "archived",
-    icon: <Icon iconName="archive" className="text-sm text-custom-text-200" aria-hidden="true" />,
+    icon: <Icon iconName="archive" className="!text-sm" aria-hidden="true" />,
   },
 };
 
@@ -288,7 +274,7 @@ export const IssueActivitySection: React.FC<Props> = ({ issueId, user }) => {
             }
 
             value = (
-              <span className="relative inline-flex items-center rounded-full border border-custom-border-300 px-2 py-0.5 text-xs">
+              <span className="relative inline-flex items-center rounded-full border border-custom-border-200 px-2 py-0.5 text-xs">
                 <span className="absolute flex flex-shrink-0 items-center justify-center">
                   <span
                     className="h-1.5 w-1.5 rounded-full"
@@ -352,7 +338,7 @@ export const IssueActivitySection: React.FC<Props> = ({ issueId, user }) => {
                       <div>
                         <div className="relative px-1.5">
                           <div className="mt-1.5">
-                            <div className="ring-6 flex h-7 w-7 items-center justify-center rounded-full bg-custom-background-80 ring-white">
+                            <div className="ring-6 flex h-7 w-7 items-center justify-center rounded-full bg-custom-background-80 text-custom-text-200 ring-white">
                               {activityItem.field ? (
                                 activityItem.new_value === "restore" ? (
                                   <Icon
diff --git a/apps/app/components/issues/attachment-upload.tsx b/apps/app/components/issues/attachment-upload.tsx
index f71f07fe6..bf43a536b 100644
--- a/apps/app/components/issues/attachment-upload.tsx
+++ b/apps/app/components/issues/attachment-upload.tsx
@@ -90,7 +90,7 @@ export const IssueAttachmentUpload: React.FC<Props> = ({ disabled = false }) =>
     <div
       {...getRootProps()}
       className={`flex items-center justify-center h-[60px] border-2 border-dashed text-custom-primary bg-custom-primary/5 text-xs rounded-md px-4 ${
-        isDragActive ? "bg-custom-primary/10 border-custom-primary" : "border-custom-border-300"
+        isDragActive ? "bg-custom-primary/10 border-custom-primary" : "border-custom-border-200"
       } ${isDragReject ? "bg-red-100" : ""} ${disabled ? "cursor-not-allowed" : "cursor-pointer"}`}
     >
       <input {...getInputProps()} />
diff --git a/apps/app/components/issues/attachments.tsx b/apps/app/components/issues/attachments.tsx
index a3ccd32d7..ee4bf1134 100644
--- a/apps/app/components/issues/attachments.tsx
+++ b/apps/app/components/issues/attachments.tsx
@@ -61,7 +61,7 @@ export const IssueAttachments = () => {
         attachments.map((file) => (
           <div
             key={file.id}
-            className="flex h-[60px] items-center justify-between gap-1 rounded-md border-[2px] border-custom-border-300 bg-custom-background-100 px-4 py-2 text-sm"
+            className="flex h-[60px] items-center justify-between gap-1 rounded-md border-[2px] border-custom-border-200 bg-custom-background-100 px-4 py-2 text-sm"
           >
             <Link href={file.asset}>
               <a target="_blank">
diff --git a/apps/app/components/issues/comment/comment-card.tsx b/apps/app/components/issues/comment/comment-card.tsx
index df49faa63..e99f78bc5 100644
--- a/apps/app/components/issues/comment/comment-card.tsx
+++ b/apps/app/components/issues/comment/comment-card.tsx
@@ -72,7 +72,7 @@ export const CommentCard: React.FC<Props> = ({ comment, onSubmit, handleCommentD
             alt={comment.actor_detail.first_name}
             height={30}
             width={30}
-            className="grid h-7 w-7 place-items-center rounded-full border-2 border-custom-border-300"
+            className="grid h-7 w-7 place-items-center rounded-full border-2 border-custom-border-200"
           />
         ) : (
           <div
@@ -135,7 +135,7 @@ export const CommentCard: React.FC<Props> = ({ comment, onSubmit, handleCommentD
               value={comment.comment_html}
               editable={false}
               noBorder
-              customClassName="text-xs border border-custom-border-300 bg-custom-background-100"
+              customClassName="text-xs border border-custom-border-200 bg-custom-background-100"
               ref={showEditorRef}
             />
           </div>
diff --git a/apps/app/components/issues/delete-issue-modal.tsx b/apps/app/components/issues/delete-issue-modal.tsx
index a59832f5c..a63d0f369 100644
--- a/apps/app/components/issues/delete-issue-modal.tsx
+++ b/apps/app/components/issues/delete-issue-modal.tsx
@@ -40,7 +40,7 @@ export const DeleteIssueModal: React.FC<Props> = ({ isOpen, handleClose, data, u
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
   const router = useRouter();
-  const { workspaceSlug, projectId, cycleId, moduleId, viewId } = router.query;
+  const { workspaceSlug, projectId, cycleId, moduleId, viewId, issueId } = router.query;
   const isArchivedIssues = router.pathname.includes("archived-issues");
 
   const { issueView, params } = useIssuesView();
@@ -121,7 +121,8 @@ export const DeleteIssueModal: React.FC<Props> = ({ isOpen, handleClose, data, u
           type: "success",
           message: "Issue deleted successfully",
         });
-        router.back();
+
+        if (issueId) router.back();
       })
       .catch((error) => {
         console.log(error);
@@ -180,7 +181,7 @@ export const DeleteIssueModal: React.FC<Props> = ({ isOpen, handleClose, data, u
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-300 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl">
+              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-200 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl">
                 <div className="flex flex-col gap-6 p-6">
                   <div className="flex w-full items-center justify-start gap-6">
                     <span className="place-items-center rounded-full bg-red-500/20 p-4">
diff --git a/apps/app/components/issues/form.tsx b/apps/app/components/issues/form.tsx
index 6cc792c5e..5faa4073b 100644
--- a/apps/app/components/issues/form.tsx
+++ b/apps/app/components/issues/form.tsx
@@ -529,7 +529,7 @@ export const IssueForm: FC<IssueFormProps> = ({
             </div>
           </div>
         </div>
-        <div className="-mx-5 mt-5 flex items-center justify-between gap-2 border-t border-custom-border-300 px-5 pt-5">
+        <div className="-mx-5 mt-5 flex items-center justify-between gap-2 border-t border-custom-border-200 px-5 pt-5">
           <div
             className="flex cursor-pointer items-center gap-1"
             onClick={() => setCreateMore((prevData) => !prevData)}
diff --git a/apps/app/components/issues/gantt-chart.tsx b/apps/app/components/issues/gantt-chart.tsx
index 533badd7d..d8a54619f 100644
--- a/apps/app/components/issues/gantt-chart.tsx
+++ b/apps/app/components/issues/gantt-chart.tsx
@@ -25,7 +25,7 @@ export const IssueGanttChartView: FC<Props> = ({}) => {
     <div className="relative flex w-full h-full items-center p-1 overflow-hidden gap-1">
       <div
         className="rounded-sm flex-shrink-0 w-[10px] h-[10px] flex justify-center items-center"
-        style={{ backgroundColor: data?.state_detail?.color || "#858e96" }}
+        style={{ backgroundColor: data?.state_detail?.color || "#rgb(var(--color-primary-100))" }}
       />
       <div className="text-custom-text-100 text-sm">{data?.name}</div>
     </div>
@@ -37,7 +37,7 @@ export const IssueGanttChartView: FC<Props> = ({}) => {
       <a className="relative flex items-center w-full h-full overflow-hidden shadow-sm font-normal">
         <div
           className="flex-shrink-0 w-[4px] h-full"
-          style={{ backgroundColor: data?.state_detail?.color || "#858e96" }}
+          style={{ backgroundColor: data?.state_detail?.color || "rgb(var(--color-primary-100))" }}
         />
         <Tooltip tooltipContent={data?.name} className={`z-[999999]`}>
           <div className="text-custom-text-100 text-[15px] whitespace-nowrap py-[4px] px-2.5 overflow-hidden w-full">
diff --git a/apps/app/components/issues/modal.tsx b/apps/app/components/issues/modal.tsx
index 5ac890fc4..f1ec9db29 100644
--- a/apps/app/components/issues/modal.tsx
+++ b/apps/app/components/issues/modal.tsx
@@ -343,7 +343,7 @@ export const CreateUpdateIssueModal: React.FC<IssuesModalProps> = ({
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative transform rounded-lg border border-custom-border-300 bg-custom-background-100 p-5 text-left shadow-xl transition-all sm:w-full sm:max-w-2xl">
+              <Dialog.Panel className="relative transform rounded-lg border border-custom-border-200 bg-custom-background-100 p-5 text-left shadow-xl transition-all sm:w-full sm:max-w-2xl">
                 <IssueForm
                   issues={issues ?? []}
                   handleFormSubmit={handleFormSubmit}
diff --git a/apps/app/components/issues/my-issues-list-item.tsx b/apps/app/components/issues/my-issues-list-item.tsx
index 14247e930..806cc7e1d 100644
--- a/apps/app/components/issues/my-issues-list-item.tsx
+++ b/apps/app/components/issues/my-issues-list-item.tsx
@@ -87,7 +87,7 @@ export const MyIssuesListItem: React.FC<Props> = ({ issue, properties, projectId
   const isNotAllowed = false;
 
   return (
-    <div className="border-b border-custom-border-300 bg-custom-background-100 px-4 py-2.5 last:border-b-0">
+    <div className="border-b border-custom-border-200 bg-custom-background-100 px-4 py-2.5 last:border-b-0">
       <div key={issue.id} className="flex items-center justify-between gap-2">
         <Link href={`/${workspaceSlug}/projects/${issue?.project_detail?.id}/issues/${issue.id}`}>
           <a className="group relative flex items-center gap-2">
@@ -139,7 +139,7 @@ export const MyIssuesListItem: React.FC<Props> = ({ issue, properties, projectId
               {issue.label_details.map((label) => (
                 <span
                   key={label.id}
-                  className="group flex items-center gap-1 rounded-2xl border border-custom-border-300 px-2 py-0.5 text-xs text-custom-text-200"
+                  className="group flex items-center gap-1 rounded-2xl border border-custom-border-200 px-2 py-0.5 text-xs text-custom-text-200"
                 >
                   <span
                     className="h-1.5 w-1.5 rounded-full"
@@ -155,7 +155,7 @@ export const MyIssuesListItem: React.FC<Props> = ({ issue, properties, projectId
             ""
           )}
           {properties.assignee && (
-            <div className="flex cursor-default items-center rounded-md border border-custom-border-300 px-2 py-1 text-xs shadow-sm">
+            <div className="flex cursor-default items-center rounded-md border border-custom-border-200 px-2 py-1 text-xs shadow-sm">
               <Tooltip
                 position="top-right"
                 tooltipHeading="Assignees"
@@ -176,7 +176,7 @@ export const MyIssuesListItem: React.FC<Props> = ({ issue, properties, projectId
             </div>
           )}
           {properties.sub_issue_count && (
-            <div className="flex cursor-default items-center rounded-md border border-custom-border-300 px-2.5 py-1 text-xs shadow-sm">
+            <div className="flex cursor-default items-center rounded-md border border-custom-border-200 px-2.5 py-1 text-xs shadow-sm">
               <Tooltip tooltipHeading="Sub-issue" tooltipContent={`${issue.sub_issues_count}`}>
                 <div className="flex items-center gap-1 text-custom-text-200">
                   <LayerDiagonalIcon className="h-3.5 w-3.5" />
@@ -186,7 +186,7 @@ export const MyIssuesListItem: React.FC<Props> = ({ issue, properties, projectId
             </div>
           )}
           {properties.link && (
-            <div className="flex cursor-default items-center rounded-md border border-custom-border-300 px-2 py-1 text-xs shadow-sm">
+            <div className="flex cursor-default items-center rounded-md border border-custom-border-200 px-2 py-1 text-xs shadow-sm">
               <Tooltip tooltipHeading="Link" tooltipContent={`${issue.link_count}`}>
                 <div className="flex items-center gap-1 text-custom-text-200">
                   <LinkIcon className="h-3.5 w-3.5 text-custom-text-200" />
@@ -196,7 +196,7 @@ export const MyIssuesListItem: React.FC<Props> = ({ issue, properties, projectId
             </div>
           )}
           {properties.attachment_count && (
-            <div className="flex cursor-default items-center rounded-md border border-custom-border-300 px-2 py-1 text-xs shadow-sm">
+            <div className="flex cursor-default items-center rounded-md border border-custom-border-200 px-2 py-1 text-xs shadow-sm">
               <Tooltip tooltipHeading="Attachment" tooltipContent={`${issue.attachment_count}`}>
                 <div className="flex items-center gap-1 text-custom-text-200">
                   <PaperClipIcon className="h-3.5 w-3.5 -rotate-45 text-custom-text-200" />
diff --git a/apps/app/components/issues/parent-issues-list-modal.tsx b/apps/app/components/issues/parent-issues-list-modal.tsx
index 1983023b9..c8939caab 100644
--- a/apps/app/components/issues/parent-issues-list-modal.tsx
+++ b/apps/app/components/issues/parent-issues-list-modal.tsx
@@ -108,7 +108,7 @@ export const ParentIssuesListModal: React.FC<Props> = ({
               leaveFrom="opacity-100 scale-100"
               leaveTo="opacity-0 scale-95"
             >
-              <Dialog.Panel className="relative mx-auto max-w-2xl transform rounded-xl border border-custom-border-300 bg-custom-background-100 shadow-2xl transition-all">
+              <Dialog.Panel className="relative mx-auto max-w-2xl transform rounded-xl border border-custom-border-200 bg-custom-background-100 shadow-2xl transition-all">
                 <Combobox value={value} onChange={onChange}>
                   <div className="relative m-1">
                     <MagnifyingGlassIcon
diff --git a/apps/app/components/issues/select/date.tsx b/apps/app/components/issues/select/date.tsx
index 56d6bf880..203f3ad60 100644
--- a/apps/app/components/issues/select/date.tsx
+++ b/apps/app/components/issues/select/date.tsx
@@ -16,7 +16,7 @@ export const IssueDateSelect: React.FC<Props> = ({ value, onChange }) => (
   <Popover className="relative flex items-center justify-center  rounded-lg">
     {({ open }) => (
       <>
-        <Popover.Button className="flex cursor-pointer items-center rounded-md border border-custom-border-300 text-xs shadow-sm duration-200">
+        <Popover.Button className="flex cursor-pointer items-center rounded-md border border-custom-border-200 text-xs shadow-sm duration-200">
           <span className="flex items-center justify-center gap-2 px-2 py-1 text-xs text-custom-text-200">
             {value ? (
               <>
diff --git a/apps/app/components/issues/select/label.tsx b/apps/app/components/issues/select/label.tsx
index eda23927f..6d7e2f391 100644
--- a/apps/app/components/issues/select/label.tsx
+++ b/apps/app/components/issues/select/label.tsx
@@ -59,7 +59,7 @@ export const IssueLabelSelect: React.FC<Props> = ({ setIsOpen, value, onChange,
     >
       {({ open }: any) => (
         <>
-          <Combobox.Button className="flex cursor-pointer items-center rounded-md border border-custom-border-300 text-xs shadow-sm duration-200 hover:bg-custom-background-80">
+          <Combobox.Button className="flex cursor-pointer items-center rounded-md border border-custom-border-200 text-xs shadow-sm duration-200 hover:bg-custom-background-80">
             {value && value.length > 0 ? (
               <span className="flex items-center justify-center gap-2 px-3 py-1 text-xs">
                 <IssueLabelsList
@@ -90,7 +90,7 @@ export const IssueLabelSelect: React.FC<Props> = ({ setIsOpen, value, onChange,
               className={`absolute z-10 mt-1 max-h-52 min-w-[8rem] overflow-auto rounded-md border-none
                 bg-custom-background-90 px-2 py-2 text-xs shadow-md focus:outline-none`}
             >
-              <div className="flex w-full items-center justify-start rounded-sm  border-[0.6px] border-custom-border-300 bg-custom-background-90 px-2">
+              <div className="flex w-full items-center justify-start rounded-sm  border-[0.6px] border-custom-border-200 bg-custom-background-90 px-2">
                 <MagnifyingGlassIcon className="h-3 w-3 text-custom-text-200" />
                 <Combobox.Input
                   className="w-full bg-transparent py-1 px-2 text-xs text-custom-text-200 focus:outline-none"
@@ -141,7 +141,7 @@ export const IssueLabelSelect: React.FC<Props> = ({ setIsOpen, value, onChange,
                           );
                       } else
                         return (
-                          <div className="border-y border-custom-border-300">
+                          <div className="border-y border-custom-border-200">
                             <div className="flex select-none items-center gap-2 truncate p-2 text-custom-text-100">
                               <RectangleGroupIcon className="h-3 w-3" /> {label.name}
                             </div>
diff --git a/apps/app/components/issues/sidebar-select/blocked.tsx b/apps/app/components/issues/sidebar-select/blocked.tsx
index 66eb0b2ca..792482736 100644
--- a/apps/app/components/issues/sidebar-select/blocked.tsx
+++ b/apps/app/components/issues/sidebar-select/blocked.tsx
@@ -92,7 +92,7 @@ export const SidebarBlockedSelect: React.FC<Props> = ({
               ? watch("blocked_issues").map((issue) => (
                   <div
                     key={issue.blocked_issue_detail?.id}
-                    className="group flex cursor-pointer items-center gap-1 rounded-2xl border border-custom-border-300 px-1.5 py-0.5 text-xs text-red-500 duration-300 hover:border-red-500/20 hover:bg-red-500/20"
+                    className="group flex cursor-pointer items-center gap-1 rounded-2xl border border-custom-border-200 px-1.5 py-0.5 text-xs text-red-500 duration-300 hover:border-red-500/20 hover:bg-red-500/20"
                   >
                     <Link
                       href={`/${workspaceSlug}/projects/${projectId}/issues/${issue.blocked_issue_detail?.id}`}
@@ -126,7 +126,7 @@ export const SidebarBlockedSelect: React.FC<Props> = ({
             type="button"
             className={`flex w-full text-custom-text-200 ${
               isNotAllowed ? "cursor-not-allowed" : "cursor-pointer hover:bg-custom-background-80"
-            } items-center justify-between gap-1 rounded-md border border-custom-border-300 px-2 py-1 text-xs shadow-sm duration-300 focus:outline-none`}
+            } items-center justify-between gap-1 rounded-md border border-custom-border-200 px-2 py-1 text-xs shadow-sm duration-300 focus:outline-none`}
             onClick={() => setIsBlockedModalOpen(true)}
             disabled={isNotAllowed}
           >
diff --git a/apps/app/components/issues/sidebar-select/blocker.tsx b/apps/app/components/issues/sidebar-select/blocker.tsx
index 8d1e8b131..a7136927f 100644
--- a/apps/app/components/issues/sidebar-select/blocker.tsx
+++ b/apps/app/components/issues/sidebar-select/blocker.tsx
@@ -92,7 +92,7 @@ export const SidebarBlockerSelect: React.FC<Props> = ({
               ? watch("blocker_issues").map((issue) => (
                   <div
                     key={issue.blocker_issue_detail?.id}
-                    className="group flex cursor-pointer items-center gap-1 rounded-2xl border border-custom-border-300 px-1.5 py-0.5 text-xs text-yellow-500 duration-300 hover:border-yellow-500/20 hover:bg-yellow-500/20"
+                    className="group flex cursor-pointer items-center gap-1 rounded-2xl border border-custom-border-200 px-1.5 py-0.5 text-xs text-yellow-500 duration-300 hover:border-yellow-500/20 hover:bg-yellow-500/20"
                   >
                     <Link
                       href={`/${workspaceSlug}/projects/${projectId}/issues/${issue.blocker_issue_detail?.id}`}
@@ -128,7 +128,7 @@ export const SidebarBlockerSelect: React.FC<Props> = ({
             type="button"
             className={`flex w-full text-custom-text-200 ${
               isNotAllowed ? "cursor-not-allowed" : "cursor-pointer hover:bg-custom-background-80"
-            } items-center justify-between gap-1 rounded-md border border-custom-border-300 px-2 py-1 text-xs shadow-sm duration-300 focus:outline-none`}
+            } items-center justify-between gap-1 rounded-md border border-custom-border-200 px-2 py-1 text-xs shadow-sm duration-300 focus:outline-none`}
             onClick={() => setIsBlockerModalOpen(true)}
             disabled={isNotAllowed}
           >
diff --git a/apps/app/components/issues/sidebar-select/cycle.tsx b/apps/app/components/issues/sidebar-select/cycle.tsx
index 09c509d5a..1eacba245 100644
--- a/apps/app/components/issues/sidebar-select/cycle.tsx
+++ b/apps/app/components/issues/sidebar-select/cycle.tsx
@@ -91,7 +91,7 @@ export const SidebarCycleSelect: React.FC<Props> = ({
               ? removeIssueFromCycle(issueCycle?.id ?? "", issueCycle?.cycle ?? "")
               : handleCycleChange(incompleteCycles?.find((c) => c.id === value) as ICycle);
           }}
-          width="auto"
+          width="w-full"
           position="right"
           maxHeight="rg"
           disabled={isNotAllowed}
diff --git a/apps/app/components/issues/sidebar-select/module.tsx b/apps/app/components/issues/sidebar-select/module.tsx
index f4f3a7848..a8770e03d 100644
--- a/apps/app/components/issues/sidebar-select/module.tsx
+++ b/apps/app/components/issues/sidebar-select/module.tsx
@@ -92,7 +92,7 @@ export const SidebarModuleSelect: React.FC<Props> = ({
               ? removeIssueFromModule(issueModule?.id ?? "", issueModule?.module ?? "")
               : handleModuleChange(modules?.find((m) => m.id === value) as IModule);
           }}
-          width="auto"
+          width="w-full"
           position="right"
           maxHeight="rg"
           disabled={isNotAllowed}
diff --git a/apps/app/components/issues/sidebar-select/parent.tsx b/apps/app/components/issues/sidebar-select/parent.tsx
index 67ff55022..07d4e8317 100644
--- a/apps/app/components/issues/sidebar-select/parent.tsx
+++ b/apps/app/components/issues/sidebar-select/parent.tsx
@@ -78,7 +78,7 @@ export const SidebarParentSelect: React.FC<Props> = ({
           type="button"
           className={`flex w-full ${
             isNotAllowed ? "cursor-not-allowed" : "cursor-pointer hover:bg-custom-background-80"
-          } items-center justify-between gap-1 rounded-md border border-custom-border-300 px-2 py-1 text-xs shadow-sm duration-300 focus:outline-none`}
+          } items-center justify-between gap-1 rounded-md border border-custom-border-200 px-2 py-1 text-xs shadow-sm duration-300 focus:outline-none`}
           onClick={() => setIsParentModalOpen(true)}
           disabled={isNotAllowed}
         >
diff --git a/apps/app/components/issues/sidebar.tsx b/apps/app/components/issues/sidebar.tsx
index 24f66e803..ad7747844 100644
--- a/apps/app/components/issues/sidebar.tsx
+++ b/apps/app/components/issues/sidebar.tsx
@@ -235,7 +235,7 @@ export const IssueDetailsSidebar: React.FC<Props> = ({
             {(fieldsToShow.includes("all") || fieldsToShow.includes("link")) && (
               <button
                 type="button"
-                className="rounded-md border border-custom-border-300 p-2 shadow-sm duration-300 hover:bg-custom-background-90 focus:border-custom-primary focus:outline-none focus:ring-1 focus:ring-custom-primary"
+                className="rounded-md border border-custom-border-200 p-2 shadow-sm duration-300 hover:bg-custom-background-90 focus:border-custom-primary focus:outline-none focus:ring-1 focus:ring-custom-primary"
                 onClick={handleCopyText}
               >
                 <LinkIcon className="h-3.5 w-3.5" />
diff --git a/apps/app/components/issues/view-select/label.tsx b/apps/app/components/issues/view-select/label.tsx
index 80b8b276a..7f38c1bea 100644
--- a/apps/app/components/issues/view-select/label.tsx
+++ b/apps/app/components/issues/view-select/label.tsx
@@ -95,7 +95,7 @@ export const ViewLabelSelect: React.FC<Props> = ({
               return (
                 <div className={`flex h-4 w-4 rounded-full ${index ? "-ml-3.5" : ""}`}>
                   <span
-                    className={`h-4 w-4 flex-shrink-0 rounded-full border group-hover:bg-custom-background-80 border-custom-border-300`}
+                    className={`h-4 w-4 flex-shrink-0 rounded-full border group-hover:bg-custom-background-80 border-custom-border-200`}
                     style={{
                       backgroundColor: label?.color ?? "#000000",
                     }}
diff --git a/apps/app/components/issues/view-select/priority.tsx b/apps/app/components/issues/view-select/priority.tsx
index 4b5a36a20..5d3bcd089 100644
--- a/apps/app/components/issues/view-select/priority.tsx
+++ b/apps/app/components/issues/view-select/priority.tsx
@@ -74,7 +74,7 @@ export const ViewPrioritySelect: React.FC<Props> = ({
               ? "border-yellow-500/20 bg-yellow-500/20"
               : issue.priority === "low"
               ? "border-green-500/20 bg-green-500/20"
-              : "border-custom-border-300 bg-custom-background-80"
+              : "border-custom-border-200 bg-custom-background-80"
           } items-center`}
         >
           <Tooltip
diff --git a/apps/app/components/labels/create-update-label-inline.tsx b/apps/app/components/labels/create-update-label-inline.tsx
index ceb1f9447..ca4fdf3dc 100644
--- a/apps/app/components/labels/create-update-label-inline.tsx
+++ b/apps/app/components/labels/create-update-label-inline.tsx
@@ -115,7 +115,7 @@ export const CreateUpdateLabelInline = forwardRef<Ref, Props>(function CreateUpd
 
   return (
     <div
-      className={`flex scroll-m-8 items-center gap-2 rounded-[10px] border border-custom-border-300 bg-custom-background-100 p-5 ${
+      className={`flex scroll-m-8 items-center gap-2 rounded-[10px] border border-custom-border-200 bg-custom-background-100 p-5 ${
         labelForm ? "" : "hidden"
       }`}
       ref={ref}
diff --git a/apps/app/components/labels/delete-label-modal.tsx b/apps/app/components/labels/delete-label-modal.tsx
index e94f2059e..8535539f9 100644
--- a/apps/app/components/labels/delete-label-modal.tsx
+++ b/apps/app/components/labels/delete-label-modal.tsx
@@ -91,7 +91,7 @@ export const DeleteLabelModal: React.FC<Props> = ({ isOpen, onClose, data, user
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative transform overflow-hidden rounded-lg bg-custom-background-100 border border-custom-border-300 text-left shadow-xl transition-all sm:my-8 sm:w-[40rem]">
+              <Dialog.Panel className="relative transform overflow-hidden rounded-lg bg-custom-background-100 border border-custom-border-200 text-left shadow-xl transition-all sm:my-8 sm:w-[40rem]">
                 <div className="px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
                   <div className="sm:flex sm:items-start">
                     <div className="mx-auto flex h-12 w-12 flex-shrink-0 items-center justify-center rounded-full bg-red-100 sm:mx-0 sm:h-10 sm:w-10">
diff --git a/apps/app/components/labels/labels-list-modal.tsx b/apps/app/components/labels/labels-list-modal.tsx
index 369c8feec..265b42908 100644
--- a/apps/app/components/labels/labels-list-modal.tsx
+++ b/apps/app/components/labels/labels-list-modal.tsx
@@ -96,7 +96,7 @@ export const LabelsListModal: React.FC<Props> = ({ isOpen, handleClose, parent,
             leaveFrom="opacity-100 scale-100"
             leaveTo="opacity-0 scale-95"
           >
-            <Dialog.Panel className="relative mx-auto max-w-2xl transform rounded-xl border border-custom-border-300 bg-custom-background-100 shadow-2xl transition-all">
+            <Dialog.Panel className="relative mx-auto max-w-2xl transform rounded-xl border border-custom-border-200 bg-custom-background-100 shadow-2xl transition-all">
               <Combobox>
                 <div className="relative m-1">
                   <MagnifyingGlassIcon
diff --git a/apps/app/components/labels/single-label-group.tsx b/apps/app/components/labels/single-label-group.tsx
index 1f0fd781b..d489ce057 100644
--- a/apps/app/components/labels/single-label-group.tsx
+++ b/apps/app/components/labels/single-label-group.tsx
@@ -76,7 +76,7 @@ export const SingleLabelGroup: React.FC<Props> = ({
   return (
     <Disclosure
       as="div"
-      className="rounded-[10px] border border-custom-border-300 bg-custom-background-100 p-5 text-custom-text-100"
+      className="rounded-[10px] border border-custom-border-200 bg-custom-background-100 p-5 text-custom-text-100"
       defaultOpen
     >
       {({ open }) => (
@@ -132,7 +132,7 @@ export const SingleLabelGroup: React.FC<Props> = ({
                 {labelChildren.map((child) => (
                   <div
                     key={child.id}
-                    className="group flex items-center justify-between rounded-md border border-custom-border-300 p-2 text-sm"
+                    className="group flex items-center justify-between rounded-md border border-custom-border-200 p-2 text-sm"
                   >
                     <h5 className="flex items-center gap-3">
                       <span
diff --git a/apps/app/components/labels/single-label.tsx b/apps/app/components/labels/single-label.tsx
index 1f0f284fe..15fcf896d 100644
--- a/apps/app/components/labels/single-label.tsx
+++ b/apps/app/components/labels/single-label.tsx
@@ -20,7 +20,7 @@ export const SingleLabel: React.FC<Props> = ({
   editLabel,
   handleLabelDelete,
 }) => (
-  <div className="gap-2 space-y-3 divide-y divide-custom-border-300 rounded-[10px]  border border-custom-border-300 bg-custom-background-100 p-5">
+  <div className="gap-2 space-y-3 divide-y divide-custom-border-200 rounded-[10px]  border border-custom-border-200 bg-custom-background-100 p-5">
     <div className="flex items-center justify-between">
       <div className="flex items-center gap-3">
         <span
diff --git a/apps/app/components/modules/delete-module-modal.tsx b/apps/app/components/modules/delete-module-modal.tsx
index 5cba26696..9faede08f 100644
--- a/apps/app/components/modules/delete-module-modal.tsx
+++ b/apps/app/components/modules/delete-module-modal.tsx
@@ -92,7 +92,7 @@ export const DeleteModuleModal: React.FC<Props> = ({ isOpen, setIsOpen, data, us
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-300 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-[40rem]">
+              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-200 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-[40rem]">
                 <div className="px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
                   <div className="sm:flex sm:items-start">
                     <div className="mx-auto flex h-12 w-12 flex-shrink-0 items-center justify-center rounded-full bg-red-500/20 sm:mx-0 sm:h-10 sm:w-10">
diff --git a/apps/app/components/modules/form.tsx b/apps/app/components/modules/form.tsx
index 348dac9be..0b36176c5 100644
--- a/apps/app/components/modules/form.tsx
+++ b/apps/app/components/modules/form.tsx
@@ -164,7 +164,7 @@ export const ModuleForm: React.FC<Props> = ({ handleFormSubmit, handleClose, sta
           </div>
         </div>
       </div>
-      <div className="-mx-5 mt-5 flex justify-end gap-2 border-t border-custom-border-300 px-5 pt-5">
+      <div className="-mx-5 mt-5 flex justify-end gap-2 border-t border-custom-border-200 px-5 pt-5">
         <SecondaryButton onClick={handleClose}>Cancel</SecondaryButton>
         <PrimaryButton type="submit" loading={isSubmitting || isDateValid ? false : true}>
           {status
diff --git a/apps/app/components/modules/gantt-chart.tsx b/apps/app/components/modules/gantt-chart.tsx
index 4117483c1..3ef46deb4 100644
--- a/apps/app/components/modules/gantt-chart.tsx
+++ b/apps/app/components/modules/gantt-chart.tsx
@@ -26,7 +26,7 @@ export const ModuleIssuesGanttChartView: FC<Props> = ({}) => {
     <div className="relative flex w-full h-full items-center p-1 overflow-hidden gap-1">
       <div
         className="rounded-sm flex-shrink-0 w-[10px] h-[10px] flex justify-center items-center"
-        style={{ backgroundColor: data?.state_detail?.color || "#858e96" }}
+        style={{ backgroundColor: data?.state_detail?.color || "rgb(var(--color-primary-100))" }}
       />
       <div className="text-custom-text-100 text-sm">{data?.name}</div>
     </div>
@@ -38,7 +38,7 @@ export const ModuleIssuesGanttChartView: FC<Props> = ({}) => {
       <a className="relative flex items-center w-full h-full overflow-hidden shadow-sm">
         <div
           className="flex-shrink-0 w-[4px] h-full"
-          style={{ backgroundColor: data?.state_detail?.color || "#858e96" }}
+          style={{ backgroundColor: data?.state_detail?.color || "rgb(var(--color-primary-100))" }}
         />
         <Tooltip tooltipContent={data?.name} className={`z-[999999]`}>
           <div className="text-custom-text-100 text-[15px] whitespace-nowrap py-[4px] px-2.5 overflow-hidden w-full">
diff --git a/apps/app/components/modules/modal.tsx b/apps/app/components/modules/modal.tsx
index e8dcbb216..e1aec085f 100644
--- a/apps/app/components/modules/modal.tsx
+++ b/apps/app/components/modules/modal.tsx
@@ -140,7 +140,7 @@ export const CreateUpdateModuleModal: React.FC<Props> = ({ isOpen, setIsOpen, da
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative transform rounded-lg border border-custom-border-300 bg-custom-background-100 px-5 py-8 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl sm:p-6">
+              <Dialog.Panel className="relative transform rounded-lg border border-custom-border-200 bg-custom-background-100 px-5 py-8 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl sm:p-6">
                 <ModuleForm
                   handleFormSubmit={handleFormSubmit}
                   handleClose={handleClose}
diff --git a/apps/app/components/modules/sidebar.tsx b/apps/app/components/modules/sidebar.tsx
index 14f7c1068..1e63f960a 100644
--- a/apps/app/components/modules/sidebar.tsx
+++ b/apps/app/components/modules/sidebar.tsx
@@ -186,7 +186,7 @@ export const ModuleDetailsSidebar: React.FC<Props> = ({ module, isOpen, moduleIs
       <div
         className={`fixed top-[66px] ${
           isOpen ? "right-0" : "-right-[24rem]"
-        } h-full w-[24rem] overflow-y-auto border-l border-custom-border-300 bg-custom-sidebar-background-100 pt-5 pb-10 duration-300`}
+        } h-full w-[24rem] overflow-y-auto border-l border-custom-border-200 bg-custom-sidebar-background-100 pt-5 pb-10 duration-300`}
       >
         {module ? (
           <>
@@ -199,7 +199,7 @@ export const ModuleDetailsSidebar: React.FC<Props> = ({ module, isOpen, moduleIs
                     render={({ field: { value } }) => (
                       <CustomSelect
                         customButton={
-                          <span className="flex cursor-pointer items-center rounded border-[0.5px] border-custom-border-300 bg-custom-background-90 px-2 py-1 text-center text-xs capitalize">
+                          <span className="flex cursor-pointer items-center rounded border-[0.5px] border-custom-border-200 bg-custom-background-90 px-2 py-1 text-center text-xs capitalize">
                             {capitalizeFirstLetter(`${watch("status")}`)}
                           </span>
                         }
@@ -222,7 +222,7 @@ export const ModuleDetailsSidebar: React.FC<Props> = ({ module, isOpen, moduleIs
                     {({ open }) => (
                       <>
                         <Popover.Button
-                          className={`group flex h-full items-center gap-2 whitespace-nowrap rounded border-[0.5px] border-custom-border-300 bg-custom-background-90 px-2 py-1 text-xs ${
+                          className={`group flex h-full items-center gap-2 whitespace-nowrap rounded border-[0.5px] border-custom-border-200 bg-custom-background-90 px-2 py-1 text-xs ${
                             module.start_date ? "" : "text-custom-text-200"
                           }`}
                         >
@@ -275,7 +275,7 @@ export const ModuleDetailsSidebar: React.FC<Props> = ({ module, isOpen, moduleIs
                     {({ open }) => (
                       <>
                         <Popover.Button
-                          className={`group flex items-center gap-2 whitespace-nowrap rounded border-[0.5px] border-custom-border-300 bg-custom-background-90 px-2 py-1 text-xs ${
+                          className={`group flex items-center gap-2 whitespace-nowrap rounded border-[0.5px] border-custom-border-200 bg-custom-background-90 px-2 py-1 text-xs ${
                             module.target_date ? "" : "text-custom-text-200"
                           }`}
                         >
@@ -400,7 +400,7 @@ export const ModuleDetailsSidebar: React.FC<Props> = ({ module, isOpen, moduleIs
               </div>
             </div>
 
-            <div className="flex w-full flex-col items-center justify-start gap-2 border-t border-custom-border-300 p-6">
+            <div className="flex w-full flex-col items-center justify-start gap-2 border-t border-custom-border-200 p-6">
               <Disclosure defaultOpen>
                 {({ open }) => (
                   <div
@@ -484,7 +484,7 @@ export const ModuleDetailsSidebar: React.FC<Props> = ({ module, isOpen, moduleIs
               </Disclosure>
             </div>
 
-            <div className="flex w-full flex-col items-center justify-start gap-2 border-t border-custom-border-300 p-6">
+            <div className="flex w-full flex-col items-center justify-start gap-2 border-t border-custom-border-200 p-6">
               <Disclosure defaultOpen>
                 {({ open }) => (
                   <div
@@ -544,7 +544,7 @@ export const ModuleDetailsSidebar: React.FC<Props> = ({ module, isOpen, moduleIs
               </Disclosure>
             </div>
 
-            <div className="flex w-full flex-col border-t border-custom-border-300 px-6 py-6 text-xs">
+            <div className="flex w-full flex-col border-t border-custom-border-200 px-6 py-6 text-xs">
               <div className="flex w-full items-center justify-between">
                 <h4 className="text-sm font-medium text-custom-text-200">Links</h4>
                 <button
diff --git a/apps/app/components/modules/single-module-card.tsx b/apps/app/components/modules/single-module-card.tsx
index 65d8c01b5..7f7d761b5 100644
--- a/apps/app/components/modules/single-module-card.tsx
+++ b/apps/app/components/modules/single-module-card.tsx
@@ -131,7 +131,7 @@ export const SingleModuleCard: React.FC<Props> = ({ module, handleEditModule, us
         data={module}
         user={user}
       />
-      <div className="flex flex-col divide-y divide-custom-border-300 overflow-hidden rounded-[10px] border border-custom-border-300 bg-custom-background-100 text-xs">
+      <div className="flex flex-col divide-y divide-custom-border-200 overflow-hidden rounded-[10px] border border-custom-border-200 bg-custom-background-100 text-xs">
         <div className="p-4">
           <div className="flex w-full flex-col gap-5">
             <div className="flex items-start justify-between gap-2">
diff --git a/apps/app/components/onboarding/join-workspaces.tsx b/apps/app/components/onboarding/join-workspaces.tsx
index 50a7c2a2d..d16009a1a 100644
--- a/apps/app/components/onboarding/join-workspaces.tsx
+++ b/apps/app/components/onboarding/join-workspaces.tsx
@@ -99,7 +99,7 @@ export const JoinWorkspaces: React.FC<Props> = ({ stepChange }) => {
                 className={`flex cursor-pointer items-center gap-2 border py-5 px-3.5 rounded ${
                   isSelected
                     ? "border-custom-primary-100"
-                    : "border-custom-border-300 hover:bg-custom-background-80"
+                    : "border-custom-border-200 hover:bg-custom-background-80"
                 }`}
                 onClick={() => handleInvitation(invitation, isSelected ? "withdraw" : "accepted")}
               >
diff --git a/apps/app/components/pages/create-block.tsx b/apps/app/components/pages/create-block.tsx
index 20e481abf..d6186dda5 100644
--- a/apps/app/components/pages/create-block.tsx
+++ b/apps/app/components/pages/create-block.tsx
@@ -96,7 +96,7 @@ export const CreateBlock: React.FC<Props> = ({ user }) => {
   return (
     <div className="relative">
       <form
-        className="flex flex-col items-center justify-between rounded border-2 border-custom-border-300 p-2"
+        className="flex flex-col items-center justify-between rounded border-2 border-custom-border-200 p-2"
         onSubmit={handleSubmit(createPageBlock)}
       >
         <div className="flex min-h-[75px] w-full">
diff --git a/apps/app/components/pages/create-update-block-inline.tsx b/apps/app/components/pages/create-update-block-inline.tsx
index 42f61f89e..5e2dcb43c 100644
--- a/apps/app/components/pages/create-update-block-inline.tsx
+++ b/apps/app/components/pages/create-update-block-inline.tsx
@@ -280,7 +280,7 @@ export const CreateUpdateBlockInline: React.FC<Props> = ({
   return (
     <div className="relative">
       <form
-        className="divide-y divide-custom-border-300 rounded border border-custom-border-300 shadow"
+        className="divide-y divide-custom-border-200 rounded border border-custom-border-200 shadow"
         onSubmit={data ? handleSubmit(updatePageBlock) : handleSubmit(createPageBlock)}
       >
         <div className="pt-2">
diff --git a/apps/app/components/pages/create-update-page-modal.tsx b/apps/app/components/pages/create-update-page-modal.tsx
index 36e207966..4835449e1 100644
--- a/apps/app/components/pages/create-update-page-modal.tsx
+++ b/apps/app/components/pages/create-update-page-modal.tsx
@@ -166,7 +166,7 @@ export const CreateUpdatePageModal: React.FC<Props> = ({ isOpen, handleClose, da
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative transform rounded-lg border border-custom-border-300 bg-custom-background-100 px-5 py-8 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl sm:p-6">
+              <Dialog.Panel className="relative transform rounded-lg border border-custom-border-200 bg-custom-background-100 px-5 py-8 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl sm:p-6">
                 <PageForm
                   handleFormSubmit={handleFormSubmit}
                   handleClose={handleClose}
diff --git a/apps/app/components/pages/delete-page-modal.tsx b/apps/app/components/pages/delete-page-modal.tsx
index d29e761c8..68c2d6732 100644
--- a/apps/app/components/pages/delete-page-modal.tsx
+++ b/apps/app/components/pages/delete-page-modal.tsx
@@ -117,7 +117,7 @@ export const DeletePageModal: React.FC<TConfirmPageDeletionProps> = ({
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-300 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-[40rem]">
+              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-200 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-[40rem]">
                 <div className="px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
                   <div className="sm:flex sm:items-start">
                     <div className="mx-auto flex h-12 w-12 flex-shrink-0 items-center justify-center rounded-full bg-red-500/20 sm:mx-0 sm:h-10 sm:w-10">
diff --git a/apps/app/components/pages/pages-view.tsx b/apps/app/components/pages/pages-view.tsx
index 3f2b896a8..c08d09241 100644
--- a/apps/app/components/pages/pages-view.tsx
+++ b/apps/app/components/pages/pages-view.tsx
@@ -210,7 +210,7 @@ export const PagesView: React.FC<Props> = ({ pages, viewType }) => {
         <div className="space-y-4 h-full overflow-y-auto">
           {pages.length > 0 ? (
             viewType === "list" ? (
-              <ul role="list" className="divide-y divide-custom-border-300">
+              <ul role="list" className="divide-y divide-custom-border-200">
                 {pages.map((page) => (
                   <SinglePageListItem
                     key={page.id}
@@ -225,7 +225,7 @@ export const PagesView: React.FC<Props> = ({ pages, viewType }) => {
                 ))}
               </ul>
             ) : viewType === "detailed" ? (
-              <div className="divide-y divide-custom-border-300 rounded-[10px] border border-custom-border-300 bg-custom-background-100">
+              <div className="divide-y divide-custom-border-200 rounded-[10px] border border-custom-border-200 bg-custom-background-100">
                 {pages.map((page) => (
                   <SinglePageDetailedItem
                     key={page.id}
@@ -240,7 +240,7 @@ export const PagesView: React.FC<Props> = ({ pages, viewType }) => {
                 ))}
               </div>
             ) : (
-              <div className="rounded-[10px] border border-custom-border-300">
+              <div className="rounded-[10px] border border-custom-border-200">
                 {pages.map((page) => (
                   <SinglePageDetailedItem
                     key={page.id}
diff --git a/apps/app/components/pages/single-page-detailed-item.tsx b/apps/app/components/pages/single-page-detailed-item.tsx
index fdda288bc..928ddb935 100644
--- a/apps/app/components/pages/single-page-detailed-item.tsx
+++ b/apps/app/components/pages/single-page-detailed-item.tsx
@@ -79,7 +79,7 @@ export const SinglePageDetailedItem: React.FC<TSingleStatProps> = ({
                 page.label_details.map((label) => (
                   <div
                     key={label.id}
-                    className="group flex items-center gap-1 rounded-2xl border border-custom-border-300 px-2 py-0.5 text-xs"
+                    className="group flex items-center gap-1 rounded-2xl border border-custom-border-200 px-2 py-0.5 text-xs"
                     style={{
                       backgroundColor: `${
                         label?.color && label.color !== "" ? label.color : "#000000"
diff --git a/apps/app/components/pages/single-page-list-item.tsx b/apps/app/components/pages/single-page-list-item.tsx
index 0a4c0da71..e60e2d304 100644
--- a/apps/app/components/pages/single-page-list-item.tsx
+++ b/apps/app/components/pages/single-page-list-item.tsx
@@ -84,7 +84,7 @@ export const SinglePageListItem: React.FC<TSingleStatProps> = ({
                   page.label_details.map((label) => (
                     <div
                       key={label.id}
-                      className="group flex items-center gap-1 rounded-2xl border border-custom-border-300 px-2 py-0.5 text-xs"
+                      className="group flex items-center gap-1 rounded-2xl border border-custom-border-200 px-2 py-0.5 text-xs"
                       style={{
                         backgroundColor: `${label?.color}20`,
                       }}
diff --git a/apps/app/components/project/create-project-modal.tsx b/apps/app/components/project/create-project-modal.tsx
index 09914e169..e97451a02 100644
--- a/apps/app/components/project/create-project-modal.tsx
+++ b/apps/app/components/project/create-project-modal.tsx
@@ -328,7 +328,7 @@ export const CreateProjectModal: React.FC<Props> = (props) => {
                     </div>
                   </div>
 
-                  <div className="mt-5 flex justify-end gap-2 border-t-2 border-custom-border-300 px-4 py-3">
+                  <div className="mt-5 flex justify-end gap-2 border-t-2 border-custom-border-200 px-4 py-3">
                     <SecondaryButton onClick={handleClose}>Cancel</SecondaryButton>
                     <PrimaryButton type="submit" size="sm" loading={isSubmitting}>
                       {isSubmitting ? "Adding project..." : "Add Project"}
diff --git a/apps/app/components/project/delete-project-modal.tsx b/apps/app/components/project/delete-project-modal.tsx
index 1b8bd58b5..863711f0b 100644
--- a/apps/app/components/project/delete-project-modal.tsx
+++ b/apps/app/components/project/delete-project-modal.tsx
@@ -113,7 +113,7 @@ export const DeleteProjectModal: React.FC<TConfirmProjectDeletionProps> = ({
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-300 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl">
+              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-200 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl">
                 <div className="flex flex-col gap-6 p-6">
                   <div className="flex w-full items-center justify-start gap-6">
                     <span className="place-items-center rounded-full bg-red-500/20 p-4">
diff --git a/apps/app/components/project/send-project-invitation-modal.tsx b/apps/app/components/project/send-project-invitation-modal.tsx
index 81f3011b2..02c24e9e2 100644
--- a/apps/app/components/project/send-project-invitation-modal.tsx
+++ b/apps/app/components/project/send-project-invitation-modal.tsx
@@ -172,7 +172,7 @@ const SendProjectInvitationModal: React.FC<Props> = ({ isOpen, setIsOpen, member
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative transform rounded-lg border border-custom-border-300 bg-custom-background-80 p-5 text-left shadow-xl transition-all sm:w-full sm:max-w-2xl">
+              <Dialog.Panel className="relative transform rounded-lg border border-custom-border-200 bg-custom-background-80 p-5 text-left shadow-xl transition-all sm:w-full sm:max-w-2xl">
                 <form onSubmit={handleSubmit(onSubmit)}>
                   <div className="space-y-5">
                     <Dialog.Title
@@ -202,7 +202,7 @@ const SendProjectInvitationModal: React.FC<Props> = ({ isOpen, setIsOpen, member
                                 <CustomSearchSelect
                                   value={value}
                                   customButton={
-                                    <button className="flex w-full items-center justify-between gap-1 rounded-md border border-custom-border-300 shadow-sm duration-300 text-custom-text-200 hover:text-custom-text-100 hover:bg-custom-background-80 focus:outline-none px-3 py-2 text-sm text-left">
+                                    <button className="flex w-full items-center justify-between gap-1 rounded-md border border-custom-border-200 shadow-sm duration-300 text-custom-text-200 hover:text-custom-text-100 hover:bg-custom-background-80 focus:outline-none px-3 py-2 text-sm text-left">
                                       {value && value !== "" ? (
                                         <div className="flex items-center gap-2">
                                           <Avatar
diff --git a/apps/app/components/project/settings/single-label.tsx b/apps/app/components/project/settings/single-label.tsx
index 8b3ca47b3..f6ed8be3b 100644
--- a/apps/app/components/project/settings/single-label.tsx
+++ b/apps/app/components/project/settings/single-label.tsx
@@ -40,7 +40,7 @@ const SingleLabel: React.FC<Props> = ({ label, issueLabels, editLabel, handleLab
   return (
     <>
       {children && children.length === 0 ? (
-        <div className="gap-2 space-y-3 divide-y rounded-md border  border-custom-border-300 p-3 md:w-2/3">
+        <div className="gap-2 space-y-3 divide-y rounded-md border  border-custom-border-200 p-3 md:w-2/3">
           <div className="flex items-center justify-between">
             <div className="flex items-center gap-2">
               <span
diff --git a/apps/app/components/project/single-integration-card.tsx b/apps/app/components/project/single-integration-card.tsx
index b966fe601..582ae685e 100644
--- a/apps/app/components/project/single-integration-card.tsx
+++ b/apps/app/components/project/single-integration-card.tsx
@@ -93,7 +93,7 @@ export const SingleIntegration: React.FC<Props> = ({ integration }) => {
   return (
     <>
       {integration && (
-        <div className="flex items-center justify-between gap-2 rounded-[10px] border border-custom-border-300 bg-custom-background-100 p-5">
+        <div className="flex items-center justify-between gap-2 rounded-[10px] border border-custom-border-200 bg-custom-background-100 p-5">
           <div className="flex items-start gap-4">
             <div className="h-12 w-12 flex-shrink-0">
               <Image
diff --git a/apps/app/components/rich-text-editor/index.tsx b/apps/app/components/rich-text-editor/index.tsx
index 32ad16e81..f2eef2a48 100644
--- a/apps/app/components/rich-text-editor/index.tsx
+++ b/apps/app/components/rich-text-editor/index.tsx
@@ -186,10 +186,10 @@ const RemirrorRichTextEditor: React.FC<IRemirrorRichTextEditor> = (props) => {
         manager={manager}
         initialContent={state}
         classNames={[
-          `p-3 relative focus:outline-none rounded-md focus:border-custom-border-300 ${
-            noBorder ? "" : "border border-custom-border-300"
+          `p-3 relative focus:outline-none rounded-md focus:border-custom-border-200 ${
+            noBorder ? "" : "border border-custom-border-200"
           } ${
-            borderOnFocus ? "focus:border border-custom-border-300" : "focus:border-0"
+            borderOnFocus ? "focus:border border-custom-border-200" : "focus:border-0"
           } ${customClassName}`,
         ]}
         editable={editable}
diff --git a/apps/app/components/rich-text-editor/toolbar/float-tool-tip.tsx b/apps/app/components/rich-text-editor/toolbar/float-tool-tip.tsx
index 5f3be9c7a..9fd825807 100644
--- a/apps/app/components/rich-text-editor/toolbar/float-tool-tip.tsx
+++ b/apps/app/components/rich-text-editor/toolbar/float-tool-tip.tsx
@@ -209,8 +209,8 @@ export const CustomFloatingToolbar: React.FC<Props> = ({
   }, [clickEdit]);
 
   return (
-    <div className="z-[99999] flex flex-col items-center gap-y-2 divide-x divide-y divide-custom-border-300 rounded border border-custom-border-300 bg-custom-background-80 p-1 px-0.5 shadow-md">
-      <div className="flex items-center gap-y-2 divide-x divide-custom-border-300">
+    <div className="z-[99999] flex flex-col items-center gap-y-2 divide-x divide-y divide-custom-border-200 rounded border border-custom-border-200 bg-custom-background-80 p-1 px-0.5 shadow-md">
+      <div className="flex items-center gap-y-2 divide-x divide-custom-border-200">
         <div className="flex items-center gap-x-1 px-2">
           <ToggleHeadingButton
             attrs={{
diff --git a/apps/app/components/search-listbox/index.tsx b/apps/app/components/search-listbox/index.tsx
index e31c7fd94..d563bcc6f 100644
--- a/apps/app/components/search-listbox/index.tsx
+++ b/apps/app/components/search-listbox/index.tsx
@@ -84,7 +84,7 @@ const SearchListbox: React.FC<Props> = ({
         <>
           <Combobox.Label className="sr-only">{title}</Combobox.Label>
           <Combobox.Button
-            className={`flex cursor-pointer items-center gap-1 rounded-md border  border-custom-border-300 px-2 py-1 text-xs shadow-sm duration-300 hover:bg-custom-background-90 focus:border-custom-primary focus:outline-none focus:ring-1 focus:ring-custom-primary ${
+            className={`flex cursor-pointer items-center gap-1 rounded-md border  border-custom-border-200 px-2 py-1 text-xs shadow-sm duration-300 hover:bg-custom-background-90 focus:border-custom-primary focus:outline-none focus:ring-1 focus:ring-custom-primary ${
               buttonClassName || ""
             }`}
           >
diff --git a/apps/app/components/states/single-state.tsx b/apps/app/components/states/single-state.tsx
index 681867a9e..813afdc79 100644
--- a/apps/app/components/states/single-state.tsx
+++ b/apps/app/components/states/single-state.tsx
@@ -160,7 +160,7 @@ export const SingleState: React.FC<Props> = ({
   };
 
   return (
-    <div className="group flex items-center justify-between gap-2 border-custom-border-300 bg-custom-background-100 p-5 first:rounded-t-[10px] last:rounded-b-[10px]">
+    <div className="group flex items-center justify-between gap-2 border-custom-border-200 bg-custom-background-100 p-5 first:rounded-t-[10px] last:rounded-b-[10px]">
       <div className="flex items-center gap-3">
         {getStateGroupIcon(state.group, "20", "20", state.color)}
         <div>
diff --git a/apps/app/components/ui/avatar.tsx b/apps/app/components/ui/avatar.tsx
index b22cd5e7b..8d476a936 100644
--- a/apps/app/components/ui/avatar.tsx
+++ b/apps/app/components/ui/avatar.tsx
@@ -37,7 +37,7 @@ export const Avatar: React.FC<AvatarProps> = ({
     {user && user.avatar && user.avatar !== "" ? (
       <div
         className={`rounded-full border-2 ${
-          index ? "border-custom-border-300 bg-custom-background-80" : "border-transparent"
+          index ? "border-custom-border-200 bg-custom-background-80" : "border-transparent"
         }`}
         style={{
           height: height,
@@ -52,7 +52,7 @@ export const Avatar: React.FC<AvatarProps> = ({
       </div>
     ) : (
       <div
-        className="grid place-items-center rounded-full border-2 border-custom-border-300 bg-gray-700 text-xs capitalize text-white"
+        className="grid place-items-center rounded-full border-2 border-custom-border-200 bg-gray-700 text-xs capitalize text-white"
         style={{
           height: height,
           width: width,
diff --git a/apps/app/components/ui/buttons/secondary-button.tsx b/apps/app/components/ui/buttons/secondary-button.tsx
index e6aecc43b..492f1feb8 100644
--- a/apps/app/components/ui/buttons/secondary-button.tsx
+++ b/apps/app/components/ui/buttons/secondary-button.tsx
@@ -13,13 +13,13 @@ export const SecondaryButton: React.FC<ButtonProps> = ({
 }) => (
   <button
     type={type}
-    className={`${className} border border-custom-border-300 font-medium duration-300 ${
+    className={`${className} border border-custom-border-200 font-medium duration-300 ${
       size === "sm"
         ? "rounded px-3 py-2 text-xs"
         : size === "md"
         ? "rounded-md px-3.5 py-2 text-sm"
         : "rounded-lg px-4 py-2 text-base"
-    } ${disabled ? "cursor-not-allowed border-custom-border-300 bg-custom-background-90" : ""} ${
+    } ${disabled ? "cursor-not-allowed border-custom-border-200 bg-custom-background-90" : ""} ${
       outline
         ? "bg-transparent hover:bg-custom-background-80"
         : "bg-custom-background-80 hover:border-opacity-70 hover:bg-opacity-70"
diff --git a/apps/app/components/ui/context-menu.tsx b/apps/app/components/ui/context-menu.tsx
index b37e46a98..d7ecb4de7 100644
--- a/apps/app/components/ui/context-menu.tsx
+++ b/apps/app/components/ui/context-menu.tsx
@@ -37,14 +37,14 @@ const ContextMenu = ({ position, children, title, isOpen, setIsOpen }: Props) =>
       }`}
     >
       <div
-        className={`fixed z-20 flex min-w-[8rem] flex-col items-stretch gap-1 rounded-md border border-custom-border-300 bg-custom-background-90 p-2 text-xs shadow-lg`}
+        className={`fixed z-20 flex min-w-[8rem] flex-col items-stretch gap-1 rounded-md border border-custom-border-200 bg-custom-background-90 p-2 text-xs shadow-lg`}
         style={{
           left: `${position.x}px`,
           top: `${position.y}px`,
         }}
       >
         {title && (
-          <h4 className="border-b border-custom-border-300 px-1 py-1 pb-2 text-[0.8rem] font-medium">
+          <h4 className="border-b border-custom-border-200 px-1 py-1 pb-2 text-[0.8rem] font-medium">
             {title}
           </h4>
         )}
diff --git a/apps/app/components/ui/custom-menu.tsx b/apps/app/components/ui/custom-menu.tsx
index f8e3704c1..0e434bfd6 100644
--- a/apps/app/components/ui/custom-menu.tsx
+++ b/apps/app/components/ui/custom-menu.tsx
@@ -81,7 +81,7 @@ const CustomMenu = ({
                 } ${
                   noBorder
                     ? "rounded-md"
-                    : "rounded-md border border-custom-border-300 shadow-sm focus:outline-none"
+                    : "rounded-md border border-custom-border-200 shadow-sm focus:outline-none"
                 } ${
                   width === "sm"
                     ? "w-10"
@@ -136,7 +136,7 @@ const CustomMenu = ({
             } ${
               menuItemsWhiteBg
                 ? "border-custom-border-200 bg-custom-background-100"
-                : "border-custom-border-300 bg-custom-background-90"
+                : "border-custom-border-200 bg-custom-background-90"
             } ${menuItemsClassName}`}
           >
             <div className="py-1">{children}</div>
diff --git a/apps/app/components/ui/custom-search-select.tsx b/apps/app/components/ui/custom-search-select.tsx
index 3f39a30e2..70fc4d6c3 100644
--- a/apps/app/components/ui/custom-search-select.tsx
+++ b/apps/app/components/ui/custom-search-select.tsx
@@ -81,7 +81,7 @@ export const CustomSearchSelect = ({
             <Combobox.Button as="div">{customButton}</Combobox.Button>
           ) : (
             <Combobox.Button
-              className={`flex w-full border border-custom-border-300 ${
+              className={`flex w-full border border-custom-border-200 ${
                 disabled ? "cursor-not-allowed" : "cursor-pointer hover:bg-custom-background-80"
               } ${
                 input ? "px-3 py-2 text-sm" : "px-2.5 py-1 text-xs"
@@ -110,7 +110,7 @@ export const CustomSearchSelect = ({
             leaveTo="opacity-0 translate-y-1"
           >
             <Combobox.Options
-              className={`${optionsClassName} absolute min-w-[10rem] border border-custom-border-300 p-2 ${
+              className={`${optionsClassName} absolute min-w-[10rem] border border-custom-border-200 p-2 ${
                 position === "right" ? "right-0" : "left-0"
               } ${
                 verticalPosition === "top" ? "bottom-full mb-1" : "mt-1"
@@ -118,7 +118,7 @@ export const CustomSearchSelect = ({
                 dropdownWidth ? dropdownWidth : ``
               } `}
             >
-              <div className="flex w-full items-center justify-start rounded-sm border-[0.6px] border-custom-border-300 bg-custom-background-90 px-2">
+              <div className="flex w-full items-center justify-start rounded-sm border-[0.6px] border-custom-border-200 bg-custom-background-90 px-2">
                 <MagnifyingGlassIcon className="h-3 w-3 text-custom-text-200" />
                 <Combobox.Input
                   className="w-full bg-transparent py-1 px-2 text-xs text-custom-text-200 focus:outline-none"
diff --git a/apps/app/components/ui/custom-select.tsx b/apps/app/components/ui/custom-select.tsx
index af2e15157..08e9f9e5e 100644
--- a/apps/app/components/ui/custom-select.tsx
+++ b/apps/app/components/ui/custom-select.tsx
@@ -57,8 +57,8 @@ const CustomSelect = ({
             disabled
               ? "cursor-not-allowed text-custom-text-200"
               : "cursor-pointer hover:bg-custom-background-80"
-          } items-center justify-between gap-1 rounded-md border border-custom-border-300 shadow-sm duration-300 focus:outline-none ${
-            input ? "border-custom-border-300 px-3 py-2 text-sm" : "px-2.5 py-1 text-xs"
+          } items-center justify-between gap-1 rounded-md border border-custom-border-200 shadow-sm duration-300 focus:outline-none ${
+            input ? "border-custom-border-200 px-3 py-2 text-sm" : "px-2.5 py-1 text-xs"
           } ${
             textAlignment === "right"
               ? "text-right"
@@ -83,7 +83,7 @@ const CustomSelect = ({
       leaveTo="transform opacity-0 scale-95"
     >
       <Listbox.Options
-        className={`${optionsClassName} absolute border border-custom-border-300 ${
+        className={`${optionsClassName} absolute border border-custom-border-200 ${
           position === "right" ? "right-0" : "left-0"
         } ${
           verticalPosition === "top" ? "bottom-full mb-1" : "mt-1"
diff --git a/apps/app/components/ui/date.tsx b/apps/app/components/ui/date.tsx
index 2c57366e9..3ff92e443 100644
--- a/apps/app/components/ui/date.tsx
+++ b/apps/app/components/ui/date.tsx
@@ -17,7 +17,7 @@ export const DateSelect: React.FC<Props> = ({ value, onChange, label }) => (
   <Popover className="relative flex items-center justify-center  rounded-lg">
     {({ open }) => (
       <>
-        <Popover.Button className="flex cursor-pointer items-center rounded-md border border-custom-border-300 text-xs shadow-sm duration-300 hover:bg-custom-background-80">
+        <Popover.Button className="flex cursor-pointer items-center rounded-md border border-custom-border-200 text-xs shadow-sm duration-300 hover:bg-custom-background-80">
           <span className="flex items-center justify-center gap-2 px-2 py-1 text-xs text-custom-text-200">
             {value ? (
               <>
diff --git a/apps/app/components/ui/datepicker.tsx b/apps/app/components/ui/datepicker.tsx
index b0f5208c4..b98642b28 100644
--- a/apps/app/components/ui/datepicker.tsx
+++ b/apps/app/components/ui/datepicker.tsx
@@ -47,7 +47,7 @@ export const CustomDatePicker: React.FC<Props> = ({
     } ${error ? "border-red-500 bg-red-100" : ""} ${
       disabled ? "cursor-not-allowed" : "cursor-pointer"
     } ${
-      noBorder ? "" : "border border-custom-border-300"
+      noBorder ? "" : "border border-custom-border-200"
     } w-full rounded-md caret-transparent outline-none ${className}`}
     dateFormat="MMM dd, yyyy"
     isClearable={isClearable}
diff --git a/apps/app/components/ui/empty-space.tsx b/apps/app/components/ui/empty-space.tsx
index 72abf4d8f..1a8c5d9a3 100644
--- a/apps/app/components/ui/empty-space.tsx
+++ b/apps/app/components/ui/empty-space.tsx
@@ -26,7 +26,7 @@ const EmptySpace: React.FC<EmptySpaceProps> = ({ title, description, children, I
       <div className="mt-1 text-sm text-custom-text-200">{description}</div>
       <ul
         role="list"
-        className="mt-6 divide-y divide-custom-border-300 border-t border-b border-custom-border-300"
+        className="mt-6 divide-y divide-custom-border-200 border-t border-b border-custom-border-200"
       >
         {children}
       </ul>
diff --git a/apps/app/components/ui/index.ts b/apps/app/components/ui/index.ts
index e66f369df..ef250f37d 100644
--- a/apps/app/components/ui/index.ts
+++ b/apps/app/components/ui/index.ts
@@ -14,7 +14,6 @@ export * from "./empty-state";
 export * from "./labels-list";
 export * from "./linear-progress-indicator";
 export * from "./loader";
-export * from "./multi-input";
 export * from "./multi-level-dropdown";
 export * from "./multi-level-select";
 export * from "./progress-bar";
diff --git a/apps/app/components/ui/input/index.tsx b/apps/app/components/ui/input/index.tsx
index e664c37f8..d00d1386f 100644
--- a/apps/app/components/ui/input/index.tsx
+++ b/apps/app/components/ui/input/index.tsx
@@ -36,7 +36,7 @@ export const Input: React.FC<Props> = ({
       }}
       className={`block rounded-md bg-transparent text-sm focus:outline-none placeholder-custom-text-400 ${
         mode === "primary"
-          ? "rounded-md border border-custom-border-300"
+          ? "rounded-md border border-custom-border-200"
           : mode === "transparent"
           ? "rounded border-none bg-transparent ring-0 transition-all focus:ring-1 focus:ring-custom-primary"
           : mode === "trueTransparent"
diff --git a/apps/app/components/ui/labels-list.tsx b/apps/app/components/ui/labels-list.tsx
index b1b7b3b67..90658dd62 100644
--- a/apps/app/components/ui/labels-list.tsx
+++ b/apps/app/components/ui/labels-list.tsx
@@ -17,7 +17,7 @@ export const IssueLabelsList: React.FC<IssueLabelsListProps> = ({
         {labels.slice(0, length).map((color, index) => (
           <div className={`flex h-4 w-4 rounded-full ${index ? "-ml-3.5" : ""}`}>
             <span
-              className={`h-4 w-4 flex-shrink-0 rounded-full border border-custom-border-300
+              className={`h-4 w-4 flex-shrink-0 rounded-full border border-custom-border-200
               `}
               style={{
                 backgroundColor: color && color !== "" ? color : "#000000",
diff --git a/apps/app/components/ui/multi-input.tsx b/apps/app/components/ui/multi-input.tsx
deleted file mode 100644
index 94daf711f..000000000
--- a/apps/app/components/ui/multi-input.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-// react
-import React from "react";
-
-const isEmailValid = (email: string) =>
-  String(email)
-    .toLowerCase()
-    .match(
-      /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
-    );
-
-export const MultiInput = ({ label, name, placeholder, setValue, watch }: any) => {
-  const handleKeyDown = (e: any) => {
-    if (e.key !== "Enter") return;
-    const value = e.target.value;
-    if (!value.trim()) return;
-    if (isEmailValid(value) && !watch(name)?.find((item: any) => item.email === value)) {
-      setValue(name, [...(watch(name) || []), { email: value }]);
-      e.target.value = "";
-    }
-  };
-
-  const handleBlur = (e: React.FocusEvent<HTMLInputElement, Element>) => {
-    const value = e.target.value;
-    if (!value.trim()) return;
-    if (isEmailValid(value) && !watch(name)?.find((item: any) => item.email === value)) {
-      setValue(name, [...(watch(name) || []), { email: value }]);
-      e.target.value = "";
-    } else {
-      e.target.value = "";
-    }
-  };
-
-  const handleChange = (e: any) => {
-    const value = e.target.value.trim();
-    if (!value) return;
-    if (value.includes(",")) {
-      const tags = value.split(",");
-      tags.forEach((tag: string) => {
-        if (isEmailValid(tag) && !watch(name)?.find((item: any) => item.email === tag)) {
-          setValue(name, [...(watch(name) || []), { email: tag }]);
-        }
-      });
-      e.target.value = "";
-    }
-  };
-
-  const removeTag = (index: Number) => {
-    setValue(
-      name,
-      watch(name).filter((_: string, i: any) => i !== index)
-    );
-  };
-
-  return (
-    <>
-      {label && <label className="mb-2 text-custom-text-200">{label}</label>}
-      <div className="rounded-md border border-custom-border-300 p-2">
-        {watch(name)?.map((tag: any, index: number) => (
-          <button
-            type="button"
-            className="m-1.5 rounded-full bg-custom-background-80 px-3 py-2 "
-            key={index}
-          >
-            {tag.email} <span onClick={() => removeTag(index)}>&times;</span>
-          </button>
-        ))}
-        <input
-          onKeyDown={handleKeyDown}
-          onBlur={handleBlur}
-          onChange={handleChange}
-          type="text"
-          placeholder={placeholder}
-          className="block w-full rounded-md bg-transparent p-1.5 text-sm focus:outline-none"
-        />
-      </div>
-    </>
-  );
-};
diff --git a/apps/app/components/ui/multi-level-dropdown.tsx b/apps/app/components/ui/multi-level-dropdown.tsx
index ebc41d57e..8cdda00d4 100644
--- a/apps/app/components/ui/multi-level-dropdown.tsx
+++ b/apps/app/components/ui/multi-level-dropdown.tsx
@@ -43,7 +43,7 @@ export const MultiLevelDropdown: React.FC<MultiLevelDropdownProps> = ({
             <div>
               <Menu.Button
                 onClick={() => setOpenChildFor(null)}
-                className={`group flex items-center justify-between gap-2 rounded-md border border-custom-border-300 px-3 py-1.5 text-xs shadow-sm duration-300 focus:outline-none hover:text-custom-text-100 hover:bg-custom-background-90 ${
+                className={`group flex items-center justify-between gap-2 rounded-md border border-custom-border-200 px-3 py-1.5 text-xs shadow-sm duration-300 focus:outline-none hover:text-custom-text-100 hover:bg-custom-background-90 ${
                   open ? "bg-custom-background-90 text-custom-text-100" : "text-custom-text-200"
                 }`}
               >
diff --git a/apps/app/components/ui/multi-level-select.tsx b/apps/app/components/ui/multi-level-select.tsx
index 2e8ae5eee..4d0340604 100644
--- a/apps/app/components/ui/multi-level-select.tsx
+++ b/apps/app/components/ui/multi-level-select.tsx
@@ -88,7 +88,7 @@ export const MultiLevelSelect: React.FC<TMultipleSelectProps> = ({
                       <>
                         {openChildFor?.id === option.id && (
                           <div
-                            className={`absolute h-auto max-h-72 w-72 rounded-lg border border-custom-border-300 bg-custom-background-80 ${
+                            className={`absolute h-auto max-h-72 w-72 rounded-lg border border-custom-border-200 bg-custom-background-80 ${
                               direction === "right"
                                 ? "left-full translate-x-2 rounded-tl-none shadow-md"
                                 : "right-full -translate-x-2 rounded-tr-none shadow-md"
@@ -123,7 +123,7 @@ export const MultiLevelSelect: React.FC<TMultipleSelectProps> = ({
                             ))}
 
                             <div
-                              className={`absolute h-0 w-0 border-t-8 border-custom-border-300 ${
+                              className={`absolute h-0 w-0 border-t-8 border-custom-border-200 ${
                                 direction === "right"
                                   ? "top-0 left-0 -translate-x-2 border-r-8 border-b-8 border-b-transparent border-t-transparent border-l-transparent"
                                   : "top-0 right-0 translate-x-2 border-l-8 border-b-8 border-b-transparent border-t-transparent border-r-transparent"
diff --git a/apps/app/components/ui/product-updates-modal.tsx b/apps/app/components/ui/product-updates-modal.tsx
index 559a02b03..5ae3ac461 100644
--- a/apps/app/components/ui/product-updates-modal.tsx
+++ b/apps/app/components/ui/product-updates-modal.tsx
@@ -67,12 +67,12 @@ export const ProductUpdatesModal: React.FC<Props> = ({ isOpen, setIsOpen }) => {
                         updates.map((item, index) => (
                           <React.Fragment key={item.id}>
                             <div className="flex items-center gap-3 text-xs text-custom-text-200">
-                              <span className="flex items-center rounded-full border border-custom-border-300 bg-custom-background-90 px-3 py-1.5 text-xs">
+                              <span className="flex items-center rounded-full border border-custom-border-200 bg-custom-background-90 px-3 py-1.5 text-xs">
                                 {item.tag_name}
                               </span>
                               <span>{renderLongDateFormat(item.published_at)}</span>
                               {index === 0 && (
-                                <span className="flex items-center rounded-full border border-custom-border-300 bg-custom-primary px-3 py-1.5 text-xs text-white">
+                                <span className="flex items-center rounded-full border border-custom-border-200 bg-custom-primary px-3 py-1.5 text-xs text-white">
                                   New
                                 </span>
                               )}
diff --git a/apps/app/components/ui/range-datepicker.tsx b/apps/app/components/ui/range-datepicker.tsx
index 61e011761..1ad3e45b1 100644
--- a/apps/app/components/ui/range-datepicker.tsx
+++ b/apps/app/components/ui/range-datepicker.tsx
@@ -50,7 +50,7 @@ export const CustomRangeDatePicker: React.FC<Props> = ({
         : ""
     } ${error ? "border-red-500 bg-red-100" : ""} ${
       disabled ? "cursor-not-allowed" : "cursor-pointer"
-    } w-full rounded-md border border-custom-border-300 bg-transparent caret-transparent ${className}`}
+    } w-full rounded-md border border-custom-border-200 bg-transparent caret-transparent ${className}`}
     dateFormat="dd-MM-yyyy"
     disabled={disabled}
     selectsStart={selectsStart}
diff --git a/apps/app/components/ui/text-area/index.tsx b/apps/app/components/ui/text-area/index.tsx
index 042ef4507..26879985e 100644
--- a/apps/app/components/ui/text-area/index.tsx
+++ b/apps/app/components/ui/text-area/index.tsx
@@ -70,7 +70,7 @@ export const TextArea: React.FC<Props> = ({
           noPadding ? "" : "px-3 py-2"
         } outline-none ${
           mode === "primary"
-            ? "rounded-md border border-custom-border-300"
+            ? "rounded-md border border-custom-border-200"
             : mode === "transparent"
             ? "rounded border-none bg-transparent ring-0 transition-all focus:ring-1 focus:ring-theme"
             : ""
diff --git a/apps/app/components/ui/toggle-switch.tsx b/apps/app/components/ui/toggle-switch.tsx
index 5fb1b0a89..ebabd3c81 100644
--- a/apps/app/components/ui/toggle-switch.tsx
+++ b/apps/app/components/ui/toggle-switch.tsx
@@ -19,7 +19,7 @@ export const ToggleSwitch: React.FC<Props> = (props) => {
       onChange={onChange}
       className={`relative inline-flex ${
         size === "sm" ? "h-3.5 w-6" : size === "md" ? "h-4 w-7" : "h-6 w-11"
-      } flex-shrink-0 cursor-pointer rounded-full border-2 border-custom-border-300 transition-colors duration-200 ease-in-out focus:outline-none ${
+      } flex-shrink-0 cursor-pointer rounded-full border-2 border-custom-border-200 transition-colors duration-200 ease-in-out focus:outline-none ${
         value ? "bg-green-500" : "bg-custom-background-80"
       } ${className || ""}`}
     >
diff --git a/apps/app/components/views/delete-view-modal.tsx b/apps/app/components/views/delete-view-modal.tsx
index 313837840..61c627430 100644
--- a/apps/app/components/views/delete-view-modal.tsx
+++ b/apps/app/components/views/delete-view-modal.tsx
@@ -96,7 +96,7 @@ export const DeleteViewModal: React.FC<Props> = ({ isOpen, data, setIsOpen, user
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-300 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-[40rem]">
+              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-200 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-[40rem]">
                 <div className="px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
                   <div className="sm:flex sm:items-start">
                     <div className="mx-auto flex h-12 w-12 flex-shrink-0 items-center justify-center rounded-full bg-red-500/20 sm:mx-0 sm:h-10 sm:w-10">
diff --git a/apps/app/components/views/gantt-chart.tsx b/apps/app/components/views/gantt-chart.tsx
index cd586b500..6687cb93f 100644
--- a/apps/app/components/views/gantt-chart.tsx
+++ b/apps/app/components/views/gantt-chart.tsx
@@ -26,7 +26,7 @@ export const ViewIssuesGanttChartView: FC<Props> = ({}) => {
     <div className="relative flex w-full h-full items-center p-1 overflow-hidden gap-1">
       <div
         className="rounded-sm flex-shrink-0 w-[10px] h-[10px] flex justify-center items-center"
-        style={{ backgroundColor: data?.state_detail?.color || "#858e96" }}
+        style={{ backgroundColor: data?.state_detail?.color || "rgb(var(--color-primary-100))" }}
       />
       <div className="text-custom-text-100 text-sm">{data?.name}</div>
     </div>
@@ -38,7 +38,7 @@ export const ViewIssuesGanttChartView: FC<Props> = ({}) => {
       <a className="relative flex items-center w-full h-full overflow-hidden shadow-sm">
         <div
           className="flex-shrink-0 w-[4px] h-full"
-          style={{ backgroundColor: data?.state_detail?.color || "#858e96" }}
+          style={{ backgroundColor: data?.state_detail?.color || "rgb(var(--color-primary-100))" }}
         />
         <Tooltip tooltipContent={data?.name} className={`z-[999999]`}>
           <div className="text-custom-text-100 text-[15px] whitespace-nowrap py-[4px] px-2.5 overflow-hidden w-full">
diff --git a/apps/app/components/views/modal.tsx b/apps/app/components/views/modal.tsx
index d5a2befa6..c1ff54231 100644
--- a/apps/app/components/views/modal.tsx
+++ b/apps/app/components/views/modal.tsx
@@ -135,7 +135,7 @@ export const CreateUpdateViewModal: React.FC<Props> = ({
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative transform rounded-lg border border-custom-border-300 bg-custom-background-100 px-5 py-8 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl sm:p-6">
+              <Dialog.Panel className="relative transform rounded-lg border border-custom-border-200 bg-custom-background-100 px-5 py-8 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl sm:p-6">
                 <ViewForm
                   handleFormSubmit={handleFormSubmit}
                   handleClose={handleClose}
diff --git a/apps/app/components/workspace/completed-issues-graph.tsx b/apps/app/components/workspace/completed-issues-graph.tsx
index eb9eaf5f2..5f0512660 100644
--- a/apps/app/components/workspace/completed-issues-graph.tsx
+++ b/apps/app/components/workspace/completed-issues-graph.tsx
@@ -38,7 +38,7 @@ export const CompletedIssuesGraph: React.FC<Props> = ({ month, issues, setMonth
           ))}
         </CustomMenu>
       </div>
-      <div className="rounded-[10px] border border-custom-border-300 bg-custom-background-100 p-8 pl-4">
+      <div className="rounded-[10px] border border-custom-border-200 bg-custom-background-100 p-8 pl-4">
         {data.every((item) => item.completed_count === 0) ? (
           <div className="flex items-center justify-center h-72">
             <h4 className="text-[#d687ff]">No issues closed this month</h4>
@@ -62,7 +62,7 @@ export const CompletedIssuesGraph: React.FC<Props> = ({ month, issues, setMonth
               colors={(datum) => datum.color}
               enableSlices="x"
               sliceTooltip={(datum) => (
-                <div className="rounded-md border border-custom-border-300 bg-custom-background-80 p-2 text-xs">
+                <div className="rounded-md border border-custom-border-200 bg-custom-background-80 p-2 text-xs">
                   {datum.slice.points[0].data.yFormatted}
                   <span className="text-custom-text-200"> issues closed in </span>
                   {datum.slice.points[0].data.xFormatted}
diff --git a/apps/app/components/workspace/create-workspace-form.tsx b/apps/app/components/workspace/create-workspace-form.tsx
index c825a3eb9..695962d2f 100644
--- a/apps/app/components/workspace/create-workspace-form.tsx
+++ b/apps/app/components/workspace/create-workspace-form.tsx
@@ -138,7 +138,7 @@ export const CreateWorkspaceForm: React.FC<Props> = ({
         </div>
         <div className="space-y-1 text-sm">
           <label htmlFor="workspaceUrl">Workspace URL</label>
-          <div className="flex w-full items-center rounded-md border border-custom-border-300 px-3">
+          <div className="flex w-full items-center rounded-md border border-custom-border-200 px-3">
             <span className="whitespace-nowrap text-sm text-custom-text-200">
               {window && window.location.host}/
             </span>
diff --git a/apps/app/components/workspace/delete-workspace-modal.tsx b/apps/app/components/workspace/delete-workspace-modal.tsx
index e43f18982..54ddedc3b 100644
--- a/apps/app/components/workspace/delete-workspace-modal.tsx
+++ b/apps/app/components/workspace/delete-workspace-modal.tsx
@@ -103,7 +103,7 @@ export const DeleteWorkspaceModal: React.FC<Props> = ({ isOpen, data, onClose, u
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-300 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl">
+              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-200 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl">
                 <div className="flex flex-col gap-6 p-6">
                   <div className="flex w-full items-center justify-start gap-6">
                     <span className="place-items-center rounded-full bg-red-500/20 p-4">
diff --git a/apps/app/components/workspace/help-section.tsx b/apps/app/components/workspace/help-section.tsx
index 45eb89b74..7cc5c9f3f 100644
--- a/apps/app/components/workspace/help-section.tsx
+++ b/apps/app/components/workspace/help-section.tsx
@@ -92,7 +92,7 @@ export const WorkspaceHelpSection: React.FC<WorkspaceHelpSectionProps> = ({ setS
       />
       {!sidebarCollapse && (alert || issueNumber >= 750) && (
         <div
-          className={`border-t border-custom-sidebar-border-100 p-4 ${
+          className={`border-t border-custom-sidebar-border-200 p-4 ${
             issueNumber >= 750
               ? "bg-red-500/10 text-red-600"
               : issueNumber >= 500
@@ -120,7 +120,7 @@ export const WorkspaceHelpSection: React.FC<WorkspaceHelpSectionProps> = ({ setS
         </div>
       )}
       <div
-        className={`flex w-full items-center justify-between gap-1 self-baseline border-t border-custom-border-300 bg-custom-sidebar-background-100 px-4 py-2 ${
+        className={`flex w-full items-center justify-between gap-1 self-baseline border-t border-custom-border-200 bg-custom-sidebar-background-100 px-4 py-2 ${
           sidebarCollapse ? "flex-col" : ""
         }`}
       >
diff --git a/apps/app/components/workspace/issues-list.tsx b/apps/app/components/workspace/issues-list.tsx
index eaa2c0f10..baf61da73 100644
--- a/apps/app/components/workspace/issues-list.tsx
+++ b/apps/app/components/workspace/issues-list.tsx
@@ -37,7 +37,7 @@ export const IssuesList: React.FC<Props> = ({ issues, type }) => {
     <div>
       <h3 className="mb-2 font-semibold capitalize">{type} Issues</h3>
       {issues ? (
-        <div className="h-[calc(100%-2.25rem)] rounded-[10px] border border-custom-border-300 bg-custom-background-100 p-4 text-sm">
+        <div className="h-[calc(100%-2.25rem)] rounded-[10px] border border-custom-border-200 bg-custom-background-100 p-4 text-sm">
           <div
             className={`mb-2 grid grid-cols-4 gap-2 rounded-lg px-3 py-2 font-medium ${
               type === "overdue" ? "bg-red-500/20 bg-opacity-20" : "bg-custom-background-80"
diff --git a/apps/app/components/workspace/issues-pie-chart.tsx b/apps/app/components/workspace/issues-pie-chart.tsx
index 4a0222453..2d055c2c6 100644
--- a/apps/app/components/workspace/issues-pie-chart.tsx
+++ b/apps/app/components/workspace/issues-pie-chart.tsx
@@ -14,7 +14,7 @@ type Props = {
 export const IssuesPieChart: React.FC<Props> = ({ groupedIssues }) => (
   <div>
     <h3 className="mb-2 font-semibold">Issues by States</h3>
-    <div className="rounded-[10px] border border-custom-border-100 bg-custom-background-100 p-4">
+    <div className="rounded-[10px] border border-custom-border-200 bg-custom-background-100 p-4">
       <div className="grid grid-cols-1 sm:grid-cols-4">
         <div className="sm:col-span-3">
           <PieGraph
@@ -36,7 +36,7 @@ export const IssuesPieChart: React.FC<Props> = ({ groupedIssues }) => (
             activeInnerRadiusOffset={5}
             colors={(datum) => datum.data.color}
             tooltip={(datum) => (
-              <div className="flex items-center gap-2 rounded-md border border-custom-border-100 bg-custom-background-80 p-2 text-xs">
+              <div className="flex items-center gap-2 rounded-md border border-custom-border-200 bg-custom-background-80 p-2 text-xs">
                 <span className="text-custom-text-200 capitalize">{datum.datum.label} issues:</span>{" "}
                 {datum.datum.value}
               </div>
diff --git a/apps/app/components/workspace/issues-stats.tsx b/apps/app/components/workspace/issues-stats.tsx
index 5fba3444c..1b327227a 100644
--- a/apps/app/components/workspace/issues-stats.tsx
+++ b/apps/app/components/workspace/issues-stats.tsx
@@ -12,8 +12,8 @@ type Props = {
 };
 
 export const IssuesStats: React.FC<Props> = ({ data }) => (
-  <div className="grid grid-cols-1 rounded-[10px] border border-custom-border-300 bg-custom-background-100 lg:grid-cols-3">
-    <div className="grid grid-cols-1 divide-y divide-custom-border-300 border-b border-custom-border-300 lg:border-r lg:border-b-0">
+  <div className="grid grid-cols-1 rounded-[10px] border border-custom-border-200 bg-custom-background-100 lg:grid-cols-3">
+    <div className="grid grid-cols-1 divide-y divide-custom-border-200 border-b border-custom-border-200 lg:border-r lg:border-b-0">
       <div className="flex">
         <div className="basis-1/2 p-4">
           <h4 className="text-sm">Issues assigned to you</h4>
@@ -27,7 +27,7 @@ export const IssuesStats: React.FC<Props> = ({ data }) => (
             )}
           </h5>
         </div>
-        <div className="basis-1/2 border-l border-custom-border-300 p-4">
+        <div className="basis-1/2 border-l border-custom-border-200 p-4">
           <h4 className="text-sm">Pending issues</h4>
           <h5 className="mt-2 text-2xl font-semibold">
             {data ? (
@@ -53,7 +53,7 @@ export const IssuesStats: React.FC<Props> = ({ data }) => (
             )}
           </h5>
         </div>
-        <div className="basis-1/2 border-l border-custom-border-300 p-4">
+        <div className="basis-1/2 border-l border-custom-border-200 p-4">
           <h4 className="text-sm">Issues due by this week</h4>
           <h5 className="mt-2 text-2xl font-semibold">
             {data ? (
@@ -72,7 +72,7 @@ export const IssuesStats: React.FC<Props> = ({ data }) => (
         Activity Graph
         <Tooltip
           tooltipContent="Your profile activity graph is a record of actions you've performed on issues across the workspace."
-          className="w-72 border border-custom-border-300"
+          className="w-72 border border-custom-border-200"
         >
           <InformationCircleIcon className="h-3 w-3" />
         </Tooltip>
diff --git a/apps/app/components/workspace/sidebar-dropdown.tsx b/apps/app/components/workspace/sidebar-dropdown.tsx
index 1f44905a2..4031e5612 100644
--- a/apps/app/components/workspace/sidebar-dropdown.tsx
+++ b/apps/app/components/workspace/sidebar-dropdown.tsx
@@ -136,7 +136,7 @@ export const WorkspaceSidebarDropdown = () => {
       >
         <Menu.Items
           className="fixed left-2 z-20 mt-1 flex w-full max-w-[17rem] origin-top-left flex-col rounded-md
-          border border-custom-sidebar-border-100 bg-custom-sidebar-background-90 shadow-lg focus:outline-none"
+          border border-custom-sidebar-border-200 bg-custom-sidebar-background-90 shadow-lg focus:outline-none"
         >
           <div className="flex flex-col items-start justify-start gap-3 p-3">
             <div className="text-sm text-custom-sidebar-text-200">{user?.email}</div>
@@ -210,7 +210,7 @@ export const WorkspaceSidebarDropdown = () => {
               </div>
             )}
           </div>
-          <div className="flex w-full flex-col items-start justify-start gap-2 border-t border-custom-sidebar-border-100 px-3 py-2 text-sm">
+          <div className="flex w-full flex-col items-start justify-start gap-2 border-t border-custom-sidebar-border-200 px-3 py-2 text-sm">
             {userLinks(workspaceSlug as string).map((link, index) => (
               <Menu.Item
                 key={index}
diff --git a/apps/app/components/workspace/single-invitation.tsx b/apps/app/components/workspace/single-invitation.tsx
index bd12cec7e..833ac7ae8 100644
--- a/apps/app/components/workspace/single-invitation.tsx
+++ b/apps/app/components/workspace/single-invitation.tsx
@@ -51,7 +51,7 @@ const SingleInvitation: React.FC<Props> = ({
             invitationsRespond.includes(invitation.id)
               ? "bg-custom-background-80 text-custom-text-200"
               : "bg-custom-primary text-white"
-          } text-sm px-4 py-2 border border-custom-border-300 rounded-3xl`}
+          } text-sm px-4 py-2 border border-custom-border-200 rounded-3xl`}
           onClick={(e) => {
             handleInvitation(
               invitation,
diff --git a/apps/app/components/workspace/upgrade-to-pro-modal.tsx b/apps/app/components/workspace/upgrade-to-pro-modal.tsx
index 19a43b6e6..99190c9cc 100644
--- a/apps/app/components/workspace/upgrade-to-pro-modal.tsx
+++ b/apps/app/components/workspace/upgrade-to-pro-modal.tsx
@@ -137,7 +137,7 @@ const UpgradeToProModal: React.FC<Props> = ({ isOpen, onClose, user, issueNumber
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-300 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-4xl">
+              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-200 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-4xl">
                 <div className="flex flex-wrap">
                   <div className="w-full md:w-3/5 p-6 flex flex-col gap-y-6">
                     <div className="flex gap-2">
diff --git a/apps/app/constants/themes.ts b/apps/app/constants/themes.ts
index edc517b78..78420843a 100644
--- a/apps/app/constants/themes.ts
+++ b/apps/app/constants/themes.ts
@@ -43,7 +43,7 @@ export const THEMES_OBJ = [
   },
   {
     value: "custom",
-    label: "Custom",
+    label: "Custom Theming",
     type: "light",
     icon: {
       border: "#FFC9C9",
diff --git a/apps/app/layouts/app-layout/app-header.tsx b/apps/app/layouts/app-layout/app-header.tsx
index 725c678ca..b8eff97a9 100644
--- a/apps/app/layouts/app-layout/app-header.tsx
+++ b/apps/app/layouts/app-layout/app-header.tsx
@@ -11,7 +11,7 @@ type Props = {
 
 const Header: React.FC<Props> = ({ breadcrumbs, left, right, setToggleSidebar, noHeader }) => (
   <div
-    className={`relative flex w-full flex-shrink-0 flex-row z-10 items-center justify-between gap-y-4 border-b border-custom-border-300 bg-custom-sidebar-background-100 px-5 py-4 ${
+    className={`relative flex w-full flex-shrink-0 flex-row z-10 items-center justify-between gap-y-4 border-b border-custom-border-200 bg-custom-sidebar-background-100 px-5 py-4 ${
       noHeader ? "md:hidden" : ""
     }`}
   >
@@ -19,7 +19,7 @@ const Header: React.FC<Props> = ({ breadcrumbs, left, right, setToggleSidebar, n
       <div className="block md:hidden">
         <button
           type="button"
-          className="grid h-8 w-8 place-items-center rounded border border-custom-border-300"
+          className="grid h-8 w-8 place-items-center rounded border border-custom-border-200"
           onClick={() => setToggleSidebar((prevData) => !prevData)}
         >
           <Bars3Icon className="h-5 w-5" />
diff --git a/apps/app/layouts/app-layout/app-sidebar.tsx b/apps/app/layouts/app-layout/app-sidebar.tsx
index c9d7e5411..8ea9e00a1 100644
--- a/apps/app/layouts/app-layout/app-sidebar.tsx
+++ b/apps/app/layouts/app-layout/app-sidebar.tsx
@@ -19,7 +19,7 @@ const Sidebar: React.FC<SidebarProps> = ({ toggleSidebar, setToggleSidebar }) =>
 
   return (
     <div
-      className={`fixed md:relative inset-y-0 flex flex-col bg-custom-sidebar-background-100 h-full flex-shrink-0 flex-grow-0 border-r border-custom-sidebar-border-100 z-20 duration-300 ${
+      className={`fixed md:relative inset-y-0 flex flex-col bg-custom-sidebar-background-100 h-full flex-shrink-0 flex-grow-0 border-r border-custom-sidebar-border-200 z-20 duration-300 ${
         sidebarCollapse ? "" : "md:w-[280px]"
       } ${toggleSidebar ? "left-0" : "-left-full md:left-0"}`}
     >
diff --git a/apps/app/layouts/auth-layout/project-authorization-wrapper.tsx b/apps/app/layouts/auth-layout/project-authorization-wrapper.tsx
index 61d84394e..a9c9fec1f 100644
--- a/apps/app/layouts/auth-layout/project-authorization-wrapper.tsx
+++ b/apps/app/layouts/auth-layout/project-authorization-wrapper.tsx
@@ -12,9 +12,11 @@ import AppSidebar from "layouts/app-layout/app-sidebar";
 import { NotAuthorizedView, JoinProject } from "components/auth-screens";
 import { CommandPalette } from "components/command-palette";
 // ui
-import { PrimaryButton, Spinner } from "components/ui";
+import { EmptyState, PrimaryButton, Spinner } from "components/ui";
 // icons
 import { LayerDiagonalIcon } from "components/icons";
+// images
+import emptyProject from "public/empty-state/project.svg";
 
 type Props = {
   children: React.ReactNode;
@@ -55,7 +57,7 @@ const ProjectAuthorizationWrapped: React.FC<Props> = ({
         <AppSidebar toggleSidebar={toggleSidebar} setToggleSidebar={setToggleSidebar} />
 
         {loading ? (
-          <div className="grid h-full w-full place-items-center p-4">
+          <div className="grid h-full w-full place-items-center p-4 bg-custom-background-100">
             <div className="flex flex-col items-center gap-3 text-center">
               <h3 className="text-xl">Loading your project...</h3>
               <Spinner />
@@ -64,18 +66,19 @@ const ProjectAuthorizationWrapped: React.FC<Props> = ({
         ) : error?.status === 401 || error?.status === 403 ? (
           <JoinProject />
         ) : error?.status === 404 ? (
-          <div className="container grid h-screen place-items-center">
-            <div className="space-y-4 text-center">
-              <p className="text-2xl font-semibold">No such project exists. Create one?</p>
-              <PrimaryButton
-                onClick={() => {
-                  const e = new KeyboardEvent("keydown", { key: "p" });
-                  document.dispatchEvent(e);
-                }}
-              >
-                Create project
-              </PrimaryButton>
-            </div>
+          <div className="container grid h-screen place-items-center bg-custom-background-100">
+            <EmptyState
+              title="No such project exists"
+              description="Try creating a new project"
+              image={emptyProject}
+              buttonText="Create Project"
+              onClick={() => {
+                const e = new KeyboardEvent("keydown", {
+                  key: "p",
+                });
+                document.dispatchEvent(e);
+              }}
+            />
           </div>
         ) : settingsLayout && (memberType?.isGuest || memberType?.isViewer) ? (
           <NotAuthorizedView
diff --git a/apps/app/layouts/auth-layout/workspace-authorization-wrapper.tsx b/apps/app/layouts/auth-layout/workspace-authorization-wrapper.tsx
index 3ce21058d..9d74c9135 100644
--- a/apps/app/layouts/auth-layout/workspace-authorization-wrapper.tsx
+++ b/apps/app/layouts/auth-layout/workspace-authorization-wrapper.tsx
@@ -51,7 +51,7 @@ export const WorkspaceAuthorizationLayout: React.FC<Props> = ({
 
   if (!workspaceMemberMe && !error)
     return (
-      <div className="grid h-screen place-items-center p-4">
+      <div className="grid h-screen place-items-center p-4 bg-custom-background-100">
         <div className="flex flex-col items-center gap-3 text-center">
           <h3 className="text-xl">Loading your workspace...</h3>
           <Spinner />
@@ -64,8 +64,8 @@ export const WorkspaceAuthorizationLayout: React.FC<Props> = ({
   // FIXME: show 404 for workspace not workspace member
   if (error?.status === 404) {
     return (
-      <div className="container flex h-screen items-center justify-center">
-        <p className="text-2xl font-semibold">No such workspace exist. Create one?</p>
+      <div className="container flex h-screen items-center justify-center bg-custom-background-100">
+        <p className="text-2xl font-semibold">No such workspace exists. Create one?</p>
       </div>
     );
   }
diff --git a/apps/app/layouts/settings-navbar.tsx b/apps/app/layouts/settings-navbar.tsx
index 6ee70a5c2..d6962940d 100644
--- a/apps/app/layouts/settings-navbar.tsx
+++ b/apps/app/layouts/settings-navbar.tsx
@@ -108,7 +108,7 @@ const SettingsNavbar: React.FC<Props> = ({ profilePage = false }) => {
                     : router.asPath === link.href
                 )
                   ? "border-custom-primary bg-custom-primary text-white"
-                  : "border-custom-border-300 bg-custom-background-100 hover:bg-custom-background-90"
+                  : "border-custom-border-200 bg-custom-background-100 hover:bg-custom-background-90"
               }`}
             >
               {link.label}
diff --git a/apps/app/pages/[workspaceSlug]/analytics.tsx b/apps/app/pages/[workspaceSlug]/analytics.tsx
index b17127e6b..493e708aa 100644
--- a/apps/app/pages/[workspaceSlug]/analytics.tsx
+++ b/apps/app/pages/[workspaceSlug]/analytics.tsx
@@ -96,12 +96,12 @@ const Analytics = () => {
         projects.length > 0 ? (
           <div className="h-full flex flex-col overflow-hidden bg-custom-background-100">
             <Tab.Group as={Fragment}>
-              <Tab.List as="div" className="space-x-2 border-b border-custom-border-300 px-5 py-3">
+              <Tab.List as="div" className="space-x-2 border-b border-custom-border-200 px-5 py-3">
                 {tabsList.map((tab) => (
                   <Tab
                     key={tab}
                     className={({ selected }) =>
-                      `rounded-3xl border border-custom-border-300 px-4 py-2 text-xs hover:bg-custom-background-80 ${
+                      `rounded-3xl border border-custom-border-200 px-4 py-2 text-xs hover:bg-custom-background-80 ${
                         selected ? "bg-custom-background-80" : ""
                       }`
                     }
diff --git a/apps/app/pages/[workspaceSlug]/index.tsx b/apps/app/pages/[workspaceSlug]/index.tsx
index 83413427c..0492f2bfe 100644
--- a/apps/app/pages/[workspaceSlug]/index.tsx
+++ b/apps/app/pages/[workspaceSlug]/index.tsx
@@ -93,21 +93,21 @@ const WorkspacePage: NextPage = () => {
         projects.length > 0 ? (
           <div className="p-8">
             <div className="flex flex-col gap-8">
-              <div className="text-custom-text-200 flex flex-col justify-between gap-x-2 gap-y-6 rounded-lg border border-custom-border-300 bg-custom-background-100 px-4 py-6 md:flex-row md:items-center md:py-3">
-                <p className="font-semibold">
+              <div className="text-custom-text-200 flex flex-col justify-between gap-x-2 gap-y-6 rounded-lg border border-custom-border-200 bg-custom-background-100 px-4 py-6 md:flex-row md:items-center md:py-3">
+                <p className="font-medium text-custom-text-100">
                   Plane is open source, support us by starring us on GitHub.
                 </p>
                 <div className="flex items-center gap-2">
                   <button
                     onClick={() => setIsProductUpdatesModalOpen(true)}
-                    className="rounded-md border-2 border-custom-border-300 px-3 py-1.5 text-sm font-medium duration-300"
+                    className="rounded-md border-2 border-custom-border-200 px-3 py-1.5 text-sm font-medium hover:text-custom-text-100 duration-300"
                   >
-                    {`What's New?`}
+                    What{"'"}s New?
                   </button>
                   <a
                     href="https://github.com/makeplane/plane"
                     target="_blank"
-                    className="rounded-md border-2 border-custom-border-300 px-3 py-1.5 text-sm font-medium duration-300"
+                    className="rounded-md border-2 border-custom-border-200 px-3 py-1.5 text-sm font-medium hover:text-custom-text-100 duration-300"
                     rel="noopener noreferrer"
                   >
                     Star us on GitHub
diff --git a/apps/app/pages/[workspaceSlug]/me/my-issues.tsx b/apps/app/pages/[workspaceSlug]/me/my-issues.tsx
index d03b3939c..1e7914089 100644
--- a/apps/app/pages/[workspaceSlug]/me/my-issues.tsx
+++ b/apps/app/pages/[workspaceSlug]/me/my-issues.tsx
@@ -50,7 +50,7 @@ const MyIssuesPage: NextPage = () => {
               {({ open }) => (
                 <>
                   <Popover.Button
-                    className={`group flex items-center gap-2 rounded-md border border-custom-border-300 bg-transparent px-3 py-1.5 text-xs hover:bg-custom-background-90 hover:text-custom-text-100 focus:outline-none ${
+                    className={`group flex items-center gap-2 rounded-md border border-custom-border-200 bg-transparent px-3 py-1.5 text-xs hover:bg-custom-background-90 hover:text-custom-text-100 focus:outline-none ${
                       open ? "bg-custom-background-90 text-custom-text-100" : "text-custom-text-200"
                     }`}
                   >
@@ -81,7 +81,7 @@ const MyIssuesPage: NextPage = () => {
                                 className={`rounded border px-2 py-1 text-xs capitalize ${
                                   properties[key as keyof Properties]
                                     ? "border-custom-primary bg-custom-primary text-white"
-                                    : "border-custom-border-300"
+                                    : "border-custom-border-200"
                                 }`}
                                 onClick={() => setProperties(key as keyof Properties)}
                               >
diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/archived-issues/[archivedIssueId].tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/archived-issues/[archivedIssueId].tsx
index 3e3f2e257..f5b48b52a 100644
--- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/archived-issues/[archivedIssueId].tsx
+++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/archived-issues/[archivedIssueId].tsx
@@ -170,7 +170,7 @@ const ArchivedIssueDetailsPage: NextPage = () => {
                 </button>
               </div>
             )}
-            <div className="space-y-5 divide-y-2 divide-custom-border-300 opacity-60">
+            <div className="space-y-5 divide-y-2 divide-custom-border-200 opacity-60">
               <IssueMainContent
                 issueDetails={issueDetails}
                 submitChanges={submitChanges}
@@ -178,7 +178,7 @@ const ArchivedIssueDetailsPage: NextPage = () => {
               />
             </div>
           </div>
-          <div className="w-1/3 space-y-5 border-l border-custom-border-300 p-5">
+          <div className="w-1/3 space-y-5 border-l border-custom-border-200 p-5">
             <IssueDetailsSidebar
               control={control}
               issueDetail={issueDetails}
diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/archived-issues/index.tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/archived-issues/index.tsx
index 2f2c983e0..e944301d3 100644
--- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/archived-issues/index.tsx
+++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/archived-issues/index.tsx
@@ -55,11 +55,11 @@ const ProjectArchivedIssues: NextPage = () => {
         }
       >
         <div className="h-full w-full flex flex-col">
-          <div className="flex items-center ga-1 px-4 py-2.5 shadow-sm border-b border-custom-border-300">
+          <div className="flex items-center ga-1 px-4 py-2.5 shadow-sm border-b border-custom-border-200">
             <button
               type="button"
               onClick={() => router.push(`/${workspaceSlug}/projects/${projectId}/issues/`)}
-              className="flex items-center gap-1.5 rounded-full border border-custom-border-300 px-3 py-1.5 text-xs"
+              className="flex items-center gap-1.5 rounded-full border border-custom-border-200 px-3 py-1.5 text-xs"
             >
               <Icon iconName="archive" className="text-base" />
               <span>Archived Issues</span>
diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/cycles/index.tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/cycles/index.tsx
index 2389b023b..6c33d97ce 100644
--- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/cycles/index.tsx
+++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/cycles/index.tsx
@@ -177,7 +177,7 @@ const ProjectCycles: NextPage = () => {
                     `rounded-3xl border px-6 py-1 outline-none ${
                       selected
                         ? "border-custom-primary bg-custom-primary text-white font-medium"
-                        : "border-custom-border-300 bg-custom-background-100 hover:bg-custom-background-80"
+                        : "border-custom-border-200 bg-custom-background-100 hover:bg-custom-background-80"
                     }`
                   }
                 >
diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/inbox/[inboxId].tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/inbox/[inboxId].tsx
index 43de121ea..cad3c3830 100644
--- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/inbox/[inboxId].tsx
+++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/inbox/[inboxId].tsx
@@ -52,7 +52,7 @@ const ProjectInbox: NextPage = () => {
       >
         <div className="flex flex-col h-full">
           <InboxActionHeader />
-          <div className="grid grid-cols-4 flex-1 divide-x divide-custom-border-300 overflow-hidden">
+          <div className="grid grid-cols-4 flex-1 divide-x divide-custom-border-200 overflow-hidden">
             <IssuesListSidebar />
             <div className="col-span-3 h-full overflow-auto">
               <InboxMainContent />
diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/issues/[issueId].tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/issues/[issueId].tsx
index 9af7f7c7e..b6152f82c 100644
--- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/issues/[issueId].tsx
+++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/issues/[issueId].tsx
@@ -120,10 +120,10 @@ const IssueDetailsPage: NextPage = () => {
     >
       {issueDetails && projectId ? (
         <div className="flex h-full overflow-hidden">
-          <div className="w-2/3 h-full overflow-y-auto space-y-5 divide-y-2 divide-custom-border-300 p-5">
+          <div className="w-2/3 h-full overflow-y-auto space-y-5 divide-y-2 divide-custom-border-200 p-5">
             <IssueMainContent issueDetails={issueDetails} submitChanges={submitChanges} />
           </div>
-          <div className="w-1/3 h-full space-y-5 border-l border-custom-border-300 p-5 overflow-hidden">
+          <div className="w-1/3 h-full space-y-5 border-l border-custom-border-200 p-5 overflow-hidden">
             <IssueDetailsSidebar
               control={control}
               issueDetail={issueDetails}
diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/issues/index.tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/issues/index.tsx
index 6f87366f8..63d7ffb51 100644
--- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/issues/index.tsx
+++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/issues/index.tsx
@@ -63,7 +63,7 @@ const ProjectIssues: NextPage = () => {
             <IssuesFilterView />
             <SecondaryButton
               onClick={() => setAnalyticsModal(true)}
-              className="!py-1.5 rounded-md font-normal text-custom-sidebar-text-200 border-custom-sidebar-border-100 hover:text-custom-text-100 hover:bg-custom-sidebar-background-90"
+              className="!py-1.5 rounded-md font-normal text-custom-sidebar-text-200 border-custom-sidebar-border-200 hover:text-custom-text-100 hover:bg-custom-sidebar-background-90"
               outline
             >
               Analytics
@@ -72,12 +72,12 @@ const ProjectIssues: NextPage = () => {
               <Link href={`/${workspaceSlug}/projects/${projectId}/inbox/${inboxList?.[0]?.id}`}>
                 <a>
                   <SecondaryButton
-                    className="relative !py-1.5 rounded-md font-normal text-custom-sidebar-text-200 border-custom-sidebar-border-100 hover:text-custom-text-100 hover:bg-custom-sidebar-background-90"
+                    className="relative !py-1.5 rounded-md font-normal text-custom-sidebar-text-200 border-custom-sidebar-border-200 hover:text-custom-text-100 hover:bg-custom-sidebar-background-90"
                     outline
                   >
                     <span>Inbox</span>
                     {inboxList && inboxList?.[0]?.pending_issue_count !== 0 && (
-                      <span className="absolute -top-1 -right-1 h-4 w-4 rounded-full text-custom-text-100 bg-custom-sidebar-background-80 border border-custom-sidebar-border-100">
+                      <span className="absolute -top-1 -right-1 h-4 w-4 rounded-full text-custom-text-100 bg-custom-sidebar-background-80 border border-custom-sidebar-border-200">
                         {inboxList?.[0]?.pending_issue_count}
                       </span>
                     )}
diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/pages/[pageId].tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/pages/[pageId].tsx
index 1e6c091e0..659437ce3 100644
--- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/pages/[pageId].tsx
+++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/pages/[pageId].tsx
@@ -337,7 +337,7 @@ const SinglePage: NextPage = () => {
                         return (
                           <div
                             key={label.id}
-                            className="group flex cursor-pointer items-center gap-1 rounded-2xl border border-custom-border-300 px-2 py-0.5 text-xs hover:border-red-500 hover:bg-red-50"
+                            className="group flex cursor-pointer items-center gap-1 rounded-2xl border border-custom-border-200 px-2 py-0.5 text-xs hover:border-red-500 hover:bg-red-50"
                             onClick={() => {
                               const updatedLabels = pageDetails.labels.filter((l) => l !== labelId);
                               partialUpdatePage({ labels_list: updatedLabels });
@@ -455,13 +455,13 @@ const SinglePage: NextPage = () => {
                                       height: "1.85rem",
                                       fontSize: "0.875rem",
                                       paddingLeft: "0.25rem",
-                                      color: `rgba(var(--color-text-secondary))`,
+                                      color: `rgba(var(--color-text-200))`,
                                       boxShadow: "none",
                                       backgroundColor: `rgba(var(--color-background-90))`,
                                       borderLeft: `1px solid rgba(var(--color-background-80))`,
                                     },
                                     hash: {
-                                      color: `rgba(var(--color-text-secondary))`,
+                                      color: `rgba(var(--color-text-200))`,
                                       boxShadow: "none",
                                       backgroundColor: `rgba(var(--color-background-90))`,
                                     },
diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/pages/index.tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/pages/index.tsx
index 50f724a80..a07bcce26 100644
--- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/pages/index.tsx
+++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/pages/index.tsx
@@ -177,7 +177,7 @@ const ProjectPages: NextPage = () => {
                       `rounded-full border px-5 py-1.5 text-sm outline-none ${
                         selected
                           ? "border-custom-primary bg-custom-primary text-white"
-                          : "border-custom-border-300 bg-custom-background-100 hover:bg-custom-background-90"
+                          : "border-custom-border-200 bg-custom-background-100 hover:bg-custom-background-90"
                       }`
                     }
                   >
diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/estimates.tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/estimates.tsx
index 2a37b97c5..39efc12c3 100644
--- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/estimates.tsx
+++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/estimates.tsx
@@ -146,7 +146,7 @@ const EstimatesSettings: NextPage = () => {
           </section>
           {estimatesList ? (
             estimatesList.length > 0 ? (
-              <section className="h-full mt-5 divide-y divide-custom-border-300 rounded-xl border border-custom-border-300 bg-custom-background-100 px-6 overflow-y-auto">
+              <section className="h-full mt-5 divide-y divide-custom-border-200 rounded-xl border border-custom-border-200 bg-custom-background-100 px-6 overflow-y-auto">
                 {estimatesList.map((estimate) => (
                   <SingleEstimate
                     key={estimate.id}
diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/features.tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/features.tsx
index e673d3940..517004dac 100644
--- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/features.tsx
+++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/features.tsx
@@ -154,7 +154,7 @@ const FeaturesSettings: NextPage = () => {
             {featuresList.map((feature) => (
               <div
                 key={feature.property}
-                className="flex items-center justify-between gap-x-8 gap-y-2 rounded-[10px] border border-custom-border-300 bg-custom-background-100 p-5"
+                className="flex items-center justify-between gap-x-8 gap-y-2 rounded-[10px] border border-custom-border-200 bg-custom-background-100 p-5"
               >
                 <div className="flex items-start gap-3">
                   {feature.icon}
diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx
index 67f4ad9ad..ad22c35d6 100644
--- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx
+++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx
@@ -261,7 +261,7 @@ const GeneralSettings: NextPage = () => {
             </div>
             <div className="col-span-12 sm:col-span-6">
               {watch("cover_image") ? (
-                <div className="h-32 w-full rounded border border-custom-border-300 p-1">
+                <div className="h-32 w-full rounded border border-custom-border-200 p-1">
                   <div className="relative h-full w-full rounded">
                     <img
                       src={watch("cover_image")!}
diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/members.tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/members.tsx
index f47a11ee9..61e285542 100644
--- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/members.tsx
+++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/members.tsx
@@ -168,7 +168,7 @@ const MembersSettings: NextPage = () => {
               <Loader.Item height="40px" />
             </Loader>
           ) : (
-            <div className="divide-y divide-custom-border-300 rounded-[10px] border border-custom-border-300 bg-custom-background-100 px-6">
+            <div className="divide-y divide-custom-border-200 rounded-[10px] border border-custom-border-200 bg-custom-background-100 px-6">
               {members.length > 0
                 ? members.map((member) => (
                     <div key={member.id} className="flex items-center justify-between py-6">
diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/states.tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/states.tsx
index 3656042b4..fa71bb8c1 100644
--- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/states.tsx
+++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/states.tsx
@@ -95,7 +95,7 @@ const StatesSettings: NextPage = () => {
                             Add
                           </button>
                         </div>
-                        <div className="divide-y divide-custom-border-300 rounded-[10px] border border-custom-border-300">
+                        <div className="divide-y divide-custom-border-200 rounded-[10px] border border-custom-border-200">
                           {key === activeGroup && (
                             <CreateUpdateStateInline
                               groupLength={orderedStateGroups[key].length}
@@ -121,7 +121,7 @@ const StatesSettings: NextPage = () => {
                               />
                             ) : (
                               <div
-                                className="border-b border-custom-border-300 last:border-b-0"
+                                className="border-b border-custom-border-200 last:border-b-0"
                                 key={state.id}
                               >
                                 <CreateUpdateStateInline
diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/views/index.tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/views/index.tsx
index cc587ee40..1034b741d 100644
--- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/views/index.tsx
+++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/views/index.tsx
@@ -102,7 +102,7 @@ const ProjectViews: NextPage = () => {
         views.length > 0 ? (
           <div className="space-y-5 p-8">
             <h3 className="text-2xl font-semibold text-custom-text-100">Views</h3>
-            <div className="divide-y divide-custom-border-300 rounded-[10px] border border-custom-border-300">
+            <div className="divide-y divide-custom-border-200 rounded-[10px] border border-custom-border-200">
               {views.map((view) => (
                 <SingleViewItem
                   key={view.id}
diff --git a/apps/app/pages/[workspaceSlug]/settings/billing.tsx b/apps/app/pages/[workspaceSlug]/settings/billing.tsx
index 65169e5d9..3c2934c6c 100644
--- a/apps/app/pages/[workspaceSlug]/settings/billing.tsx
+++ b/apps/app/pages/[workspaceSlug]/settings/billing.tsx
@@ -48,7 +48,7 @@ const BillingSettings: NextPage = () => {
           </div>
           <div className="space-y-8 md:w-2/3">
             <div>
-              <div className="w-80 rounded-md border border-custom-border-300 bg-custom-background-100 p-4 text-center">
+              <div className="w-80 rounded-md border border-custom-border-200 bg-custom-background-100 p-4 text-center">
                 <h4 className="text-md mb-1 leading-6">Payment due</h4>
                 <h2 className="text-3xl font-extrabold">--</h2>
               </div>
diff --git a/apps/app/pages/[workspaceSlug]/settings/members.tsx b/apps/app/pages/[workspaceSlug]/settings/members.tsx
index f8c126a4b..e6c93de48 100644
--- a/apps/app/pages/[workspaceSlug]/settings/members.tsx
+++ b/apps/app/pages/[workspaceSlug]/settings/members.tsx
@@ -169,7 +169,7 @@ const MembersSettings: NextPage = () => {
               <Loader.Item height="40px" />
             </Loader>
           ) : (
-            <div className="divide-y divide-custom-border-300 rounded-[10px] border border-custom-border-300 bg-custom-background-100 px-6">
+            <div className="divide-y divide-custom-border-200 rounded-[10px] border border-custom-border-200 bg-custom-background-100 px-6">
               {members.length > 0
                 ? members.map((member) => (
                     <div key={member.id} className="flex items-center justify-between py-6">
diff --git a/apps/app/pages/invitations.tsx b/apps/app/pages/invitations.tsx
index 34291c9a3..e93fabd17 100644
--- a/apps/app/pages/invitations.tsx
+++ b/apps/app/pages/invitations.tsx
@@ -120,7 +120,7 @@ const OnBoard: NextPage = () => {
                         className={`flex cursor-pointer items-center gap-2 border py-5 px-3.5 rounded ${
                           isSelected
                             ? "border-custom-primary-100"
-                            : "border-custom-border-300 hover:bg-custom-background-80"
+                            : "border-custom-border-200 hover:bg-custom-background-80"
                         }`}
                         onClick={() =>
                           handleInvitation(invitation, isSelected ? "withdraw" : "accepted")
diff --git a/apps/app/pages/reset-password.tsx b/apps/app/pages/reset-password.tsx
index 7f2b3c428..e4de8f630 100644
--- a/apps/app/pages/reset-password.tsx
+++ b/apps/app/pages/reset-password.tsx
@@ -121,6 +121,7 @@ const ResetPasswordPage: NextPage = () => {
                 }}
                 error={errors.password}
                 placeholder="Enter new password..."
+                className="border-custom-border-300"
               />
             </div>
             <div className="space-y-1">
@@ -134,6 +135,7 @@ const ResetPasswordPage: NextPage = () => {
                 }}
                 error={errors.confirmPassword}
                 placeholder="Confirm new password..."
+                className="border-custom-border-300"
               />
             </div>
             <PrimaryButton type="submit" className="w-full text-center" loading={isSubmitting}>
diff --git a/apps/app/pages/workspace-member-invitation.tsx b/apps/app/pages/workspace-member-invitation.tsx
index 334d29480..e351310a4 100644
--- a/apps/app/pages/workspace-member-invitation.tsx
+++ b/apps/app/pages/workspace-member-invitation.tsx
@@ -66,7 +66,7 @@ const WorkspaceInvitation: NextPage = () => {
         {invitationDetail ? (
           <>
             {error ? (
-              <div className="flex w-full flex-col space-y-4 rounded border border-custom-border-300 bg-custom-background-100 px-4 py-8 text-center shadow-2xl md:w-1/3">
+              <div className="flex w-full flex-col space-y-4 rounded border border-custom-border-200 bg-custom-background-100 px-4 py-8 text-center shadow-2xl md:w-1/3">
                 <h2 className="text-xl uppercase">INVITATION NOT FOUND</h2>
               </div>
             ) : (
diff --git a/apps/app/public/auth/join-project.svg b/apps/app/public/auth/join-project.svg
deleted file mode 100644
index f8288dd6c..000000000
--- a/apps/app/public/auth/join-project.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-<svg width="280" height="184" viewBox="0 0 280 184" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="53.5723" y="27.7246" width="79.5849" height="13.5513" rx="6.16937" fill="#EBEBEB"/>
-<rect x="148.581" y="27.7246" width="79.5849" height="13.5513" rx="6.16937" fill="#E2E2E2"/>
-<g filter="url(#filter0_d_1551_41871)">
-<rect x="17" y="3" width="260" height="160" rx="6.16937" fill="white"/>
-</g>
-<path d="M31.5043 100V90.5455H35.0498C35.7761 90.5455 36.3855 90.6809 36.8779 90.9517C37.3734 91.2225 37.7473 91.5949 37.9997 92.0689C38.2551 92.5398 38.3829 93.0753 38.3829 93.6754C38.3829 94.2817 38.2551 94.8203 37.9997 95.2912C37.7442 95.7621 37.3672 96.1329 36.8687 96.4038C36.3701 96.6715 35.7561 96.8054 35.0267 96.8054H32.6769V95.3974H34.7959C35.2206 95.3974 35.5683 95.3235 35.8392 95.1758C36.11 95.0281 36.3101 94.8249 36.4393 94.5664C36.5717 94.3079 36.6378 94.0109 36.6378 93.6754C36.6378 93.34 36.5717 93.0445 36.4393 92.7891C36.3101 92.5336 36.1085 92.3351 35.8346 92.1935C35.5637 92.0489 35.2144 91.9766 34.7866 91.9766H33.217V100H31.5043ZM39.7967 100V92.9091H41.417V94.0909H41.4909C41.6202 93.6816 41.8418 93.3661 42.1557 93.1445C42.4727 92.9199 42.8343 92.8075 43.2405 92.8075C43.3329 92.8075 43.436 92.8121 43.5498 92.8214C43.6668 92.8275 43.7637 92.8383 43.8407 92.8537V94.391C43.7699 94.3664 43.6576 94.3448 43.5037 94.3263C43.3529 94.3048 43.2067 94.294 43.0651 94.294C42.7604 94.294 42.4865 94.3602 42.2434 94.4925C42.0033 94.6218 41.8141 94.8018 41.6756 95.0327C41.5371 95.2635 41.4678 95.5297 41.4678 95.8313V100H39.7967ZM47.752 100.138C47.0595 100.138 46.4594 99.9862 45.9516 99.6815C45.4438 99.3768 45.0498 98.9505 44.7698 98.4027C44.4928 97.8549 44.3543 97.2147 44.3543 96.4822C44.3543 95.7498 44.4928 95.1081 44.7698 94.5572C45.0498 94.0063 45.4438 93.5785 45.9516 93.2738C46.4594 92.9691 47.0595 92.8168 47.752 92.8168C48.4445 92.8168 49.0446 92.9691 49.5524 93.2738C50.0602 93.5785 50.4526 94.0063 50.7296 94.5572C51.0097 95.1081 51.1497 95.7498 51.1497 96.4822C51.1497 97.2147 51.0097 97.8549 50.7296 98.4027C50.4526 98.9505 50.0602 99.3768 49.5524 99.6815C49.0446 99.9862 48.4445 100.138 47.752 100.138ZM47.7612 98.7997C48.1367 98.7997 48.4506 98.6966 48.703 98.4904C48.9554 98.2811 49.1431 98.0011 49.2662 97.6502C49.3924 97.2994 49.4555 96.9085 49.4555 96.4776C49.4555 96.0437 49.3924 95.6513 49.2662 95.3004C49.1431 94.9465 48.9554 94.6649 48.703 94.4556C48.4506 94.2463 48.1367 94.1417 47.7612 94.1417C47.3765 94.1417 47.0564 94.2463 46.801 94.4556C46.5486 94.6649 46.3594 94.9465 46.2332 95.3004C46.1101 95.6513 46.0485 96.0437 46.0485 96.4776C46.0485 96.9085 46.1101 97.2994 46.2332 97.6502C46.3594 98.0011 46.5486 98.2811 46.801 98.4904C47.0564 98.6966 47.3765 98.7997 47.7612 98.7997ZM52.5681 92.9091H54.2393V100.406C54.2393 100.917 54.1424 101.339 53.9485 101.671C53.7546 102.004 53.4745 102.251 53.1083 102.414C52.742 102.578 52.2973 102.659 51.7741 102.659C51.7126 102.659 51.6556 102.658 51.6033 102.654C51.551 102.654 51.494 102.653 51.4325 102.65V101.288C51.4786 101.291 51.5202 101.293 51.5571 101.293C51.5941 101.296 51.6325 101.297 51.6725 101.297C51.9926 101.297 52.2219 101.219 52.3604 101.062C52.4989 100.908 52.5681 100.682 52.5681 100.383V92.9091ZM53.3991 91.9027C53.1313 91.9027 52.9021 91.815 52.7112 91.6396C52.5235 91.4611 52.4296 91.2472 52.4296 90.9979C52.4296 90.7455 52.5235 90.5316 52.7112 90.3562C52.9021 90.1777 53.1313 90.0884 53.3991 90.0884C53.6638 90.0884 53.89 90.1777 54.0777 90.3562C54.2685 90.5316 54.3639 90.7455 54.3639 90.9979C54.3639 91.2472 54.2685 91.4611 54.0777 91.6396C53.89 91.815 53.6638 91.9027 53.3991 91.9027ZM59.097 100.138C58.3861 100.138 57.7721 99.9908 57.255 99.6953C56.741 99.3968 56.3456 98.9751 56.0686 98.4304C55.7916 97.8826 55.6531 97.2378 55.6531 96.4961C55.6531 95.7667 55.7916 95.1265 56.0686 94.5756C56.3486 94.0217 56.7395 93.5908 57.2412 93.283C57.7428 92.9722 58.3322 92.8168 59.0093 92.8168C59.4463 92.8168 59.8587 92.8875 60.2465 93.0291C60.6374 93.1676 60.9821 93.383 61.2806 93.6754C61.5822 93.9678 61.8192 94.3402 61.9915 94.7926C62.1639 95.242 62.25 95.7775 62.25 96.3991V96.9116H56.4379V95.7852H60.6481C60.645 95.4651 60.5758 95.1804 60.4404 94.9311C60.305 94.6787 60.1157 94.4802 59.8726 94.3356C59.6325 94.1909 59.3524 94.1186 59.0324 94.1186C58.6907 94.1186 58.3907 94.2017 58.1321 94.3679C57.8736 94.531 57.672 94.7464 57.5274 95.0142C57.3858 95.2789 57.3135 95.5697 57.3104 95.8867V96.87C57.3104 97.2824 57.3858 97.6364 57.5366 97.9318C57.6874 98.2242 57.8982 98.4489 58.1691 98.6058C58.4399 98.7597 58.7569 98.8366 59.1201 98.8366C59.3632 98.8366 59.5833 98.8028 59.7802 98.7351C59.9772 98.6643 60.148 98.5612 60.2927 98.4258C60.4373 98.2904 60.5466 98.1226 60.6204 97.9226L62.1808 98.098C62.0823 98.5104 61.8946 98.8705 61.6176 99.1783C61.3437 99.483 60.9928 99.7199 60.565 99.8892C60.1372 100.055 59.6479 100.138 59.097 100.138ZM66.7569 100.138C66.049 100.138 65.4412 99.9831 64.9334 99.6722C64.4286 99.3614 64.0393 98.9321 63.7654 98.3842C63.4946 97.8333 63.3592 97.1993 63.3592 96.4822C63.3592 95.7621 63.4976 95.1265 63.7746 94.5756C64.0516 94.0217 64.4425 93.5908 64.9472 93.283C65.455 92.9722 66.0552 92.8168 66.7476 92.8168C67.3232 92.8168 67.8325 92.9229 68.2757 93.1353C68.722 93.3446 69.0774 93.6416 69.3421 94.0263C69.6068 94.4079 69.7576 94.8542 69.7945 95.3651H68.1972C68.1326 95.0234 67.9787 94.7388 67.7356 94.511C67.4955 94.2802 67.1739 94.1648 66.7707 94.1648C66.4291 94.1648 66.129 94.2571 65.8705 94.4418C65.612 94.6233 65.4104 94.8849 65.2658 95.2266C65.1242 95.5682 65.0534 95.9775 65.0534 96.4545C65.0534 96.9377 65.1242 97.3532 65.2658 97.701C65.4073 98.0457 65.6058 98.3119 65.8613 98.4996C66.1198 98.6843 66.423 98.7766 66.7707 98.7766C67.0169 98.7766 67.237 98.7305 67.4309 98.6381C67.6279 98.5427 67.7925 98.4058 67.9248 98.2273C68.0572 98.0488 68.148 97.8318 68.1972 97.5763H69.7945C69.7545 98.078 69.6068 98.5227 69.3513 98.9105C69.0959 99.2952 68.7481 99.5968 68.308 99.8153C67.8679 100.031 67.3509 100.138 66.7569 100.138ZM74.7076 92.9091V94.2017H70.6313V92.9091H74.7076ZM71.6377 91.2102H73.3088V97.8672C73.3088 98.0919 73.3427 98.2642 73.4104 98.3842C73.4812 98.5012 73.5735 98.5812 73.6874 98.6243C73.8012 98.6674 73.9274 98.6889 74.0659 98.6889C74.1706 98.6889 74.266 98.6812 74.3521 98.6658C74.4414 98.6504 74.5091 98.6366 74.5553 98.6243L74.8369 99.9308C74.7476 99.9615 74.6199 99.9954 74.4537 100.032C74.2906 100.069 74.0905 100.091 73.8536 100.097C73.435 100.109 73.058 100.046 72.7225 99.9077C72.3871 99.7661 72.1208 99.5476 71.9239 99.2521C71.73 98.9567 71.6346 98.5874 71.6377 98.1442V91.2102ZM87.1733 90.5455V100H85.6498L81.1949 93.56H81.1164V100H79.4037V90.5455H80.9364L85.3867 96.9901H85.4698V90.5455H87.1733ZM91.0061 100.143C90.5567 100.143 90.152 100.063 89.7919 99.9031C89.4349 99.7399 89.1518 99.4999 88.9425 99.1829C88.7363 98.8659 88.6332 98.475 88.6332 98.0103C88.6332 97.6102 88.7071 97.2794 88.8548 97.0178C89.0025 96.7562 89.2041 96.5469 89.4596 96.3899C89.715 96.233 90.0028 96.1145 90.3228 96.0344C90.646 95.9513 90.9799 95.8913 91.3246 95.8544C91.7401 95.8113 92.0771 95.7728 92.3356 95.739C92.5941 95.7021 92.7819 95.6467 92.8988 95.5728C93.0189 95.4959 93.0789 95.3774 93.0789 95.2173V95.1896C93.0789 94.8419 92.9758 94.5726 92.7696 94.3817C92.5634 94.1909 92.2664 94.0955 91.8786 94.0955C91.4693 94.0955 91.1446 94.1848 90.9045 94.3633C90.6675 94.5418 90.5075 94.7526 90.4244 94.9957L88.864 94.7741C88.9871 94.3433 89.1903 93.9832 89.4734 93.6939C89.7566 93.4015 90.1028 93.183 90.5121 93.0384C90.9214 92.8906 91.3739 92.8168 91.8694 92.8168C92.211 92.8168 92.5511 92.8568 92.8896 92.9368C93.2281 93.0168 93.5374 93.1491 93.8175 93.3338C94.0976 93.5154 94.3223 93.7631 94.4915 94.0771C94.6639 94.391 94.75 94.7834 94.75 95.2543V100H93.1435V99.0259H93.0881C92.9866 99.2229 92.8434 99.4076 92.6588 99.5799C92.4772 99.7492 92.2479 99.8861 91.9709 99.9908C91.697 100.092 91.3754 100.143 91.0061 100.143ZM91.44 98.9151C91.7755 98.9151 92.0663 98.849 92.3125 98.7166C92.5588 98.5812 92.748 98.4027 92.8804 98.1811C93.0158 97.9595 93.0835 97.7179 93.0835 97.4563V96.6207C93.0312 96.6638 92.9419 96.7038 92.8157 96.7408C92.6926 96.7777 92.5541 96.81 92.4003 96.8377C92.2464 96.8654 92.094 96.89 91.9432 96.9116C91.7924 96.9331 91.6616 96.9516 91.5508 96.967C91.3015 97.0008 91.0784 97.0562 90.8814 97.1332C90.6845 97.2101 90.529 97.3178 90.4152 97.4563C90.3013 97.5917 90.2444 97.7672 90.2444 97.9826C90.2444 98.2904 90.3567 98.5227 90.5814 98.6797C90.806 98.8366 91.0923 98.9151 91.44 98.9151ZM96.4304 100V92.9091H98.0277V94.114H98.1108C98.2586 93.7077 98.5032 93.3907 98.8449 93.163C99.1865 92.9322 99.5943 92.8168 100.068 92.8168C100.548 92.8168 100.953 92.9337 101.282 93.1676C101.615 93.3984 101.849 93.7139 101.984 94.114H102.058C102.215 93.7201 102.48 93.4061 102.852 93.1722C103.227 92.9353 103.672 92.8168 104.186 92.8168C104.839 92.8168 105.371 93.023 105.783 93.4354C106.196 93.8478 106.402 94.4495 106.402 95.2404V100H104.726V95.4989C104.726 95.0588 104.609 94.7372 104.375 94.5341C104.141 94.3279 103.855 94.2248 103.517 94.2248C103.114 94.2248 102.798 94.351 102.57 94.6033C102.346 94.8526 102.233 95.1773 102.233 95.5774V100H100.595V95.4297C100.595 95.0634 100.484 94.7711 100.262 94.5526C100.044 94.334 99.7574 94.2248 99.4035 94.2248C99.1634 94.2248 98.9449 94.2863 98.7479 94.4094C98.5509 94.5295 98.394 94.7003 98.277 94.9219C98.1601 95.1404 98.1016 95.3958 98.1016 95.6882V100H96.4304ZM111.237 100.138C110.526 100.138 109.912 99.9908 109.395 99.6953C108.881 99.3968 108.485 98.9751 108.208 98.4304C107.931 97.8826 107.793 97.2378 107.793 96.4961C107.793 95.7667 107.931 95.1265 108.208 94.5756C108.488 94.0217 108.879 93.5908 109.381 93.283C109.882 92.9722 110.472 92.8168 111.149 92.8168C111.586 92.8168 111.998 92.8875 112.386 93.0291C112.777 93.1676 113.122 93.383 113.42 93.6754C113.722 93.9678 113.959 94.3402 114.131 94.7926C114.304 95.242 114.39 95.7775 114.39 96.3991V96.9116H108.578V95.7852H112.788C112.785 95.4651 112.715 95.1804 112.58 94.9311C112.445 94.6787 112.255 94.4802 112.012 94.3356C111.772 94.1909 111.492 94.1186 111.172 94.1186C110.83 94.1186 110.53 94.2017 110.272 94.3679C110.013 94.531 109.812 94.7464 109.667 95.0142C109.525 95.2789 109.453 95.5697 109.45 95.8867V96.87C109.45 97.2824 109.525 97.6364 109.676 97.9318C109.827 98.2242 110.038 98.4489 110.309 98.6058C110.58 98.7597 110.897 98.8366 111.26 98.8366C111.503 98.8366 111.723 98.8028 111.92 98.7351C112.117 98.6643 112.288 98.5612 112.432 98.4258C112.577 98.2904 112.686 98.1226 112.76 97.9226L114.32 98.098C114.222 98.5104 114.034 98.8705 113.757 99.1783C113.483 99.483 113.132 99.7199 112.705 99.8892C112.277 100.055 111.788 100.138 111.237 100.138Z" fill="black"/>
-<rect x="31" y="112.811" width="232" height="8" rx="4" fill="#EBEBEB"/>
-<rect x="31" y="128.811" width="79.5849" height="8.02018" rx="4.01009" fill="#E2E2E2"/>
-<rect x="31" y="145" width="8" height="8" rx="4" fill="#E2E2E2"/>
-<rect x="255" y="145" width="8" height="8" rx="4" fill="#E2E2E2"/>
-<rect x="241" y="145" width="8" height="8" rx="4" fill="#E2E2E2"/>
-<rect x="44" y="145" width="42" height="8" rx="4" fill="#E2E2E2"/>
-<path d="M17 9C17 5.68629 19.6863 3 23 3H271C274.314 3 277 5.68629 277 9V74H17V9Z" fill="#FCECEF"/>
-<path d="M162.95 60.0221L159.212 56.3326H134.104C133.689 56.3326 133.345 56.1968 133.074 55.9253C132.802 55.6537 132.667 55.3103 132.667 54.8951V51.8284C132.667 50.6145 132.97 49.5763 133.577 48.7138C134.184 47.8513 134.967 47.1964 135.925 46.7492C137.842 45.8867 139.686 45.2159 141.459 44.7367C143.232 44.2576 145.013 43.986 146.802 43.9221L128.929 26.0492C128.642 25.7617 128.506 25.4263 128.522 25.043C128.538 24.6596 128.689 24.3242 128.977 24.0367C129.264 23.7492 129.608 23.6055 130.007 23.6055C130.406 23.6055 130.75 23.7492 131.037 24.0367L165.01 58.0096C165.298 58.2971 165.442 58.6326 165.442 59.0159C165.442 59.3992 165.298 59.7346 165.01 60.0221C164.723 60.3096 164.379 60.4534 163.98 60.4534C163.581 60.4534 163.237 60.3096 162.95 60.0221ZM135.542 53.4576H156.337L149.677 46.7971C149.421 46.7652 149.15 46.7492 148.862 46.7492H148C146.179 46.7492 144.406 46.9329 142.681 47.3003C140.956 47.6676 139.087 48.3464 137.075 49.3367C136.628 49.5603 136.26 49.9037 135.973 50.3669C135.685 50.8301 135.542 51.3173 135.542 51.8284V53.4576ZM160.027 46.7492C161.017 47.1964 161.816 47.8513 162.423 48.7138C163.03 49.5763 163.333 50.6145 163.333 51.8284V52.2117L156.481 45.3596C157.056 45.5513 157.639 45.7669 158.23 46.0065C158.821 46.2461 159.42 46.4937 160.027 46.7492ZM151.354 40.2326L149.054 37.9326C150.012 37.7089 150.795 37.2138 151.402 36.4471C152.009 35.6805 152.312 34.786 152.312 33.7638C152.312 32.5499 151.897 31.5277 151.067 30.6971C150.236 29.8666 149.214 29.4513 148 29.4513C146.978 29.4513 146.083 29.7548 145.317 30.3617C144.55 30.9687 144.055 31.7513 143.831 32.7096L141.531 30.4096C142.138 29.1957 143.025 28.2534 144.191 27.5826C145.356 26.9117 146.626 26.5763 148 26.5763C150.012 26.5763 151.713 27.2711 153.103 28.6607C154.493 30.0503 155.187 31.7513 155.187 33.7638C155.187 35.1374 154.852 36.4072 154.181 37.5732C153.51 38.7391 152.568 39.6256 151.354 40.2326Z" fill="#F19FA9"/>
-<rect x="39.5723" y="45.7246" width="79.5849" height="13.5513" rx="6.16937" fill="#EBEBEB"/>
-<rect x="134.581" y="45.7246" width="79.5849" height="13.5513" rx="6.16937" fill="#E2E2E2"/>
-<g filter="url(#filter1_d_1551_41871)">
-<rect x="3" y="21" width="260" height="160" rx="6.16937" fill="white"/>
-</g>
-<path d="M17.5043 118V108.545H21.0498C21.7761 108.545 22.3855 108.681 22.8779 108.952C23.3734 109.223 23.7473 109.595 23.9997 110.069C24.2551 110.54 24.3829 111.075 24.3829 111.675C24.3829 112.282 24.2551 112.82 23.9997 113.291C23.7442 113.762 23.3672 114.133 22.8687 114.404C22.3701 114.672 21.7561 114.805 21.0267 114.805H18.6769V113.397H20.7959C21.2206 113.397 21.5683 113.324 21.8392 113.176C22.11 113.028 22.3101 112.825 22.4393 112.566C22.5717 112.308 22.6378 112.011 22.6378 111.675C22.6378 111.34 22.5717 111.045 22.4393 110.789C22.3101 110.534 22.1085 110.335 21.8346 110.194C21.5637 110.049 21.2144 109.977 20.7866 109.977H19.217V118H17.5043ZM25.7967 118V110.909H27.417V112.091H27.4909C27.6202 111.682 27.8418 111.366 28.1557 111.145C28.4727 110.92 28.8343 110.808 29.2405 110.808C29.3329 110.808 29.436 110.812 29.5498 110.821C29.6668 110.828 29.7637 110.838 29.8407 110.854V112.391C29.7699 112.366 29.6576 112.345 29.5037 112.326C29.3529 112.305 29.2067 112.294 29.0651 112.294C28.7604 112.294 28.4865 112.36 28.2434 112.493C28.0033 112.622 27.8141 112.802 27.6756 113.033C27.5371 113.263 27.4678 113.53 27.4678 113.831V118H25.7967ZM33.752 118.138C33.0595 118.138 32.4594 117.986 31.9516 117.681C31.4438 117.377 31.0498 116.951 30.7698 116.403C30.4928 115.855 30.3543 115.215 30.3543 114.482C30.3543 113.75 30.4928 113.108 30.7698 112.557C31.0498 112.006 31.4438 111.578 31.9516 111.274C32.4594 110.969 33.0595 110.817 33.752 110.817C34.4445 110.817 35.0446 110.969 35.5524 111.274C36.0602 111.578 36.4526 112.006 36.7296 112.557C37.0097 113.108 37.1497 113.75 37.1497 114.482C37.1497 115.215 37.0097 115.855 36.7296 116.403C36.4526 116.951 36.0602 117.377 35.5524 117.681C35.0446 117.986 34.4445 118.138 33.752 118.138ZM33.7612 116.8C34.1367 116.8 34.4506 116.697 34.703 116.49C34.9554 116.281 35.1431 116.001 35.2662 115.65C35.3924 115.299 35.4555 114.908 35.4555 114.478C35.4555 114.044 35.3924 113.651 35.2662 113.3C35.1431 112.946 34.9554 112.665 34.703 112.456C34.4506 112.246 34.1367 112.142 33.7612 112.142C33.3765 112.142 33.0564 112.246 32.801 112.456C32.5486 112.665 32.3594 112.946 32.2332 113.3C32.1101 113.651 32.0485 114.044 32.0485 114.478C32.0485 114.908 32.1101 115.299 32.2332 115.65C32.3594 116.001 32.5486 116.281 32.801 116.49C33.0564 116.697 33.3765 116.8 33.7612 116.8ZM38.5681 110.909H40.2393V118.406C40.2393 118.917 40.1424 119.339 39.9485 119.671C39.7546 120.004 39.4745 120.251 39.1083 120.414C38.742 120.578 38.2973 120.659 37.7741 120.659C37.7126 120.659 37.6556 120.658 37.6033 120.654C37.551 120.654 37.494 120.653 37.4325 120.65V119.288C37.4786 119.291 37.5202 119.293 37.5571 119.293C37.5941 119.296 37.6325 119.297 37.6725 119.297C37.9926 119.297 38.2219 119.219 38.3604 119.062C38.4989 118.908 38.5681 118.682 38.5681 118.383V110.909ZM39.3991 109.903C39.1313 109.903 38.9021 109.815 38.7112 109.64C38.5235 109.461 38.4296 109.247 38.4296 108.998C38.4296 108.746 38.5235 108.532 38.7112 108.356C38.9021 108.178 39.1313 108.088 39.3991 108.088C39.6638 108.088 39.89 108.178 40.0777 108.356C40.2685 108.532 40.3639 108.746 40.3639 108.998C40.3639 109.247 40.2685 109.461 40.0777 109.64C39.89 109.815 39.6638 109.903 39.3991 109.903ZM45.097 118.138C44.3861 118.138 43.7721 117.991 43.255 117.695C42.741 117.397 42.3456 116.975 42.0686 116.43C41.7916 115.883 41.6531 115.238 41.6531 114.496C41.6531 113.767 41.7916 113.127 42.0686 112.576C42.3486 112.022 42.7395 111.591 43.2412 111.283C43.7428 110.972 44.3322 110.817 45.0093 110.817C45.4463 110.817 45.8587 110.888 46.2465 111.029C46.6374 111.168 46.9821 111.383 47.2806 111.675C47.5822 111.968 47.8192 112.34 47.9915 112.793C48.1639 113.242 48.25 113.777 48.25 114.399V114.912H42.4379V113.785H46.6481C46.645 113.465 46.5758 113.18 46.4404 112.931C46.305 112.679 46.1157 112.48 45.8726 112.336C45.6325 112.191 45.3524 112.119 45.0324 112.119C44.6907 112.119 44.3907 112.202 44.1321 112.368C43.8736 112.531 43.672 112.746 43.5274 113.014C43.3858 113.279 43.3135 113.57 43.3104 113.887V114.87C43.3104 115.282 43.3858 115.636 43.5366 115.932C43.6874 116.224 43.8982 116.449 44.1691 116.606C44.4399 116.76 44.7569 116.837 45.1201 116.837C45.3632 116.837 45.5833 116.803 45.7802 116.735C45.9772 116.664 46.148 116.561 46.2927 116.426C46.4373 116.29 46.5466 116.123 46.6204 115.923L48.1808 116.098C48.0823 116.51 47.8946 116.871 47.6176 117.178C47.3437 117.483 46.9928 117.72 46.565 117.889C46.1372 118.055 45.6479 118.138 45.097 118.138ZM52.7569 118.138C52.049 118.138 51.4412 117.983 50.9334 117.672C50.4286 117.361 50.0393 116.932 49.7654 116.384C49.4946 115.833 49.3592 115.199 49.3592 114.482C49.3592 113.762 49.4976 113.127 49.7746 112.576C50.0516 112.022 50.4425 111.591 50.9472 111.283C51.455 110.972 52.0552 110.817 52.7476 110.817C53.3232 110.817 53.8325 110.923 54.2757 111.135C54.722 111.345 55.0774 111.642 55.3421 112.026C55.6068 112.408 55.7576 112.854 55.7945 113.365H54.1972C54.1326 113.023 53.9787 112.739 53.7356 112.511C53.4955 112.28 53.1739 112.165 52.7707 112.165C52.4291 112.165 52.129 112.257 51.8705 112.442C51.612 112.623 51.4104 112.885 51.2658 113.227C51.1242 113.568 51.0534 113.978 51.0534 114.455C51.0534 114.938 51.1242 115.353 51.2658 115.701C51.4073 116.046 51.6058 116.312 51.8613 116.5C52.1198 116.684 52.423 116.777 52.7707 116.777C53.0169 116.777 53.237 116.73 53.4309 116.638C53.6279 116.543 53.7925 116.406 53.9248 116.227C54.0572 116.049 54.148 115.832 54.1972 115.576H55.7945C55.7545 116.078 55.6068 116.523 55.3513 116.911C55.0959 117.295 54.7481 117.597 54.308 117.815C53.8679 118.031 53.3509 118.138 52.7569 118.138ZM60.7076 110.909V112.202H56.6313V110.909H60.7076ZM57.6377 109.21H59.3088V115.867C59.3088 116.092 59.3427 116.264 59.4104 116.384C59.4812 116.501 59.5735 116.581 59.6874 116.624C59.8012 116.667 59.9274 116.689 60.0659 116.689C60.1706 116.689 60.266 116.681 60.3521 116.666C60.4414 116.65 60.5091 116.637 60.5553 116.624L60.8369 117.931C60.7476 117.962 60.6199 117.995 60.4537 118.032C60.2906 118.069 60.0905 118.091 59.8536 118.097C59.435 118.109 59.058 118.046 58.7225 117.908C58.3871 117.766 58.1208 117.548 57.9239 117.252C57.73 116.957 57.6346 116.587 57.6377 116.144V109.21ZM73.1733 108.545V118H71.6498L67.1949 111.56H67.1164V118H65.4037V108.545H66.9364L71.3867 114.99H71.4698V108.545H73.1733ZM77.0061 118.143C76.5567 118.143 76.152 118.063 75.7919 117.903C75.4349 117.74 75.1518 117.5 74.9425 117.183C74.7363 116.866 74.6332 116.475 74.6332 116.01C74.6332 115.61 74.7071 115.279 74.8548 115.018C75.0025 114.756 75.2041 114.547 75.4596 114.39C75.715 114.233 76.0028 114.114 76.3228 114.034C76.646 113.951 76.9799 113.891 77.3246 113.854C77.7401 113.811 78.0771 113.773 78.3356 113.739C78.5941 113.702 78.7819 113.647 78.8988 113.573C79.0189 113.496 79.0789 113.377 79.0789 113.217V113.19C79.0789 112.842 78.9758 112.573 78.7696 112.382C78.5634 112.191 78.2664 112.096 77.8786 112.096C77.4693 112.096 77.1446 112.185 76.9045 112.363C76.6675 112.542 76.5075 112.753 76.4244 112.996L74.864 112.774C74.9871 112.343 75.1903 111.983 75.4734 111.694C75.7566 111.402 76.1028 111.183 76.5121 111.038C76.9214 110.891 77.3739 110.817 77.8694 110.817C78.211 110.817 78.5511 110.857 78.8896 110.937C79.2281 111.017 79.5374 111.149 79.8175 111.334C80.0976 111.515 80.3223 111.763 80.4915 112.077C80.6639 112.391 80.75 112.783 80.75 113.254V118H79.1435V117.026H79.0881C78.9866 117.223 78.8434 117.408 78.6588 117.58C78.4772 117.749 78.2479 117.886 77.9709 117.991C77.697 118.092 77.3754 118.143 77.0061 118.143ZM77.44 116.915C77.7755 116.915 78.0663 116.849 78.3125 116.717C78.5588 116.581 78.748 116.403 78.8804 116.181C79.0158 115.96 79.0835 115.718 79.0835 115.456V114.621C79.0312 114.664 78.9419 114.704 78.8157 114.741C78.6926 114.778 78.5541 114.81 78.4003 114.838C78.2464 114.865 78.094 114.89 77.9432 114.912C77.7924 114.933 77.6616 114.952 77.5508 114.967C77.3015 115.001 77.0784 115.056 76.8814 115.133C76.6845 115.21 76.529 115.318 76.4152 115.456C76.3013 115.592 76.2444 115.767 76.2444 115.983C76.2444 116.29 76.3567 116.523 76.5814 116.68C76.806 116.837 77.0923 116.915 77.44 116.915ZM82.4304 118V110.909H84.0277V112.114H84.1108C84.2586 111.708 84.5032 111.391 84.8449 111.163C85.1865 110.932 85.5943 110.817 86.0682 110.817C86.5483 110.817 86.9531 110.934 87.2824 111.168C87.6147 111.398 87.8486 111.714 87.9841 112.114H88.0579C88.2149 111.72 88.4796 111.406 88.852 111.172C89.2274 110.935 89.6722 110.817 90.1861 110.817C90.8386 110.817 91.371 111.023 91.7834 111.435C92.1958 111.848 92.402 112.449 92.402 113.24V118H90.7263V113.499C90.7263 113.059 90.6093 112.737 90.3754 112.534C90.1415 112.328 89.8553 112.225 89.5167 112.225C89.1136 112.225 88.7981 112.351 88.5704 112.603C88.3457 112.853 88.2334 113.177 88.2334 113.577V118H86.5945V113.43C86.5945 113.063 86.4837 112.771 86.2621 112.553C86.0436 112.334 85.7574 112.225 85.4035 112.225C85.1634 112.225 84.9449 112.286 84.7479 112.409C84.5509 112.529 84.394 112.7 84.277 112.922C84.1601 113.14 84.1016 113.396 84.1016 113.688V118H82.4304ZM97.2366 118.138C96.5257 118.138 95.9117 117.991 95.3947 117.695C94.8807 117.397 94.4852 116.975 94.2082 116.43C93.9312 115.883 93.7927 115.238 93.7927 114.496C93.7927 113.767 93.9312 113.127 94.2082 112.576C94.4883 112.022 94.8792 111.591 95.3808 111.283C95.8825 110.972 96.4718 110.817 97.1489 110.817C97.586 110.817 97.9984 110.888 98.3861 111.029C98.777 111.168 99.1217 111.383 99.4202 111.675C99.7218 111.968 99.9588 112.34 100.131 112.793C100.304 113.242 100.39 113.777 100.39 114.399V114.912H94.5775V113.785H98.7878C98.7847 113.465 98.7155 113.18 98.58 112.931C98.4446 112.679 98.2553 112.48 98.0122 112.336C97.7722 112.191 97.4921 112.119 97.172 112.119C96.8304 112.119 96.5303 112.202 96.2718 112.368C96.0133 112.531 95.8117 112.746 95.667 113.014C95.5255 113.279 95.4531 113.57 95.4501 113.887V114.87C95.4501 115.282 95.5255 115.636 95.6763 115.932C95.8271 116.224 96.0379 116.449 96.3087 116.606C96.5796 116.76 96.8966 116.837 97.2597 116.837C97.5029 116.837 97.7229 116.803 97.9199 116.735C98.1168 116.664 98.2877 116.561 98.4323 116.426C98.577 116.29 98.6862 116.123 98.7601 115.923L100.32 116.098C100.222 116.51 100.034 116.871 99.7572 117.178C99.4833 117.483 99.1325 117.72 98.7047 117.889C98.2769 118.055 97.7875 118.138 97.2366 118.138Z" fill="black"/>
-<rect x="17" y="130.811" width="232" height="8" rx="4" fill="#EBEBEB"/>
-<rect x="17" y="146.811" width="79.5849" height="8.02018" rx="4.01009" fill="#E2E2E2"/>
-<rect x="17" y="163" width="8" height="8" rx="4" fill="#E2E2E2"/>
-<rect x="241" y="163" width="8" height="8" rx="4" fill="#E2E2E2"/>
-<rect x="227" y="163" width="8" height="8" rx="4" fill="#E2E2E2"/>
-<rect x="30" y="163" width="42" height="8" rx="4" fill="#E2E2E2"/>
-<path d="M3 27C3 23.6863 5.68629 21 9 21H257C260.314 21 263 23.6863 263 27V92H3V27Z" fill="#FCECEF"/>
-<path d="M148.95 78.0221L145.212 74.3326H120.104C119.689 74.3326 119.345 74.1968 119.074 73.9253C118.802 73.6537 118.667 73.3103 118.667 72.8951V69.8284C118.667 68.6145 118.97 67.5763 119.577 66.7138C120.184 65.8513 120.967 65.1964 121.925 64.7492C123.842 63.8867 125.686 63.2159 127.459 62.7367C129.232 62.2576 131.013 61.986 132.802 61.9221L114.929 44.0492C114.642 43.7617 114.506 43.4263 114.522 43.043C114.538 42.6596 114.689 42.3242 114.977 42.0367C115.264 41.7492 115.608 41.6055 116.007 41.6055C116.406 41.6055 116.75 41.7492 117.037 42.0367L151.01 76.0096C151.298 76.2971 151.442 76.6326 151.442 77.0159C151.442 77.3992 151.298 77.7346 151.01 78.0221C150.723 78.3096 150.379 78.4534 149.98 78.4534C149.581 78.4534 149.237 78.3096 148.95 78.0221ZM121.542 71.4576H142.337L135.677 64.7971C135.421 64.7652 135.15 64.7492 134.862 64.7492H134C132.179 64.7492 130.406 64.9329 128.681 65.3003C126.956 65.6676 125.087 66.3464 123.075 67.3367C122.628 67.5603 122.26 67.9037 121.973 68.3669C121.685 68.8301 121.542 69.3173 121.542 69.8284V71.4576ZM146.027 64.7492C147.017 65.1964 147.816 65.8513 148.423 66.7138C149.03 67.5763 149.333 68.6145 149.333 69.8284V70.2117L142.481 63.3596C143.056 63.5513 143.639 63.7669 144.23 64.0065C144.821 64.2461 145.42 64.4937 146.027 64.7492ZM137.354 58.2326L135.054 55.9326C136.012 55.7089 136.795 55.2138 137.402 54.4471C138.009 53.6805 138.312 52.786 138.312 51.7638C138.312 50.5499 137.897 49.5277 137.067 48.6971C136.236 47.8666 135.214 47.4513 134 47.4513C132.978 47.4513 132.083 47.7548 131.317 48.3617C130.55 48.9687 130.055 49.7513 129.831 50.7096L127.531 48.4096C128.138 47.1957 129.025 46.2534 130.191 45.5826C131.356 44.9117 132.626 44.5763 134 44.5763C136.012 44.5763 137.713 45.2711 139.103 46.6607C140.493 48.0503 141.187 49.7513 141.187 51.7638C141.187 53.1374 140.852 54.4072 140.181 55.5732C139.51 56.7391 138.568 57.6256 137.354 58.2326Z" fill="#F19FA9"/>
-<defs>
-<filter id="filter0_d_1551_41871" x="14.5323" y="0.532252" width="264.935" height="164.935" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="1.23387"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_1551_41871"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_1551_41871" result="shape"/>
-</filter>
-<filter id="filter1_d_1551_41871" x="0.532252" y="18.5323" width="264.935" height="164.935" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="1.23387"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_1551_41871"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_1551_41871" result="shape"/>
-</filter>
-</defs>
-</svg>
diff --git a/apps/app/public/empty-state/empty-inbox.svg b/apps/app/public/empty-state/empty-inbox.svg
deleted file mode 100644
index 39d7ca5e2..000000000
--- a/apps/app/public/empty-state/empty-inbox.svg
+++ /dev/null
@@ -1,57 +0,0 @@
-<svg width="304" height="87" viewBox="0 0 304 87" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_4142_75678)">
-<rect x="28.5747" y="3" width="272.425" height="56.8476" rx="5.90624" fill="white"/>
-</g>
-<path d="M39.6906 20.6406V14.1975H41.8677C42.3732 14.1975 42.7864 14.2887 43.1073 14.4712C43.4303 14.6515 43.6694 14.8959 43.8246 15.2042C43.9798 15.5125 44.0574 15.8565 44.0574 16.2361C44.0574 16.6157 43.9798 16.9608 43.8246 17.2712C43.6715 17.5816 43.4345 17.8291 43.1136 18.0136C42.7927 18.1961 42.3816 18.2874 41.8803 18.2874H40.3198V17.5952H41.8551C42.2012 17.5952 42.4791 17.5354 42.6888 17.4159C42.8986 17.2963 43.0506 17.1348 43.145 16.9314C43.2415 16.7259 43.2897 16.4941 43.2897 16.2361C43.2897 15.9781 43.2415 15.7474 43.145 15.544C43.0506 15.3405 42.8975 15.1811 42.6857 15.0658C42.4739 14.9483 42.1928 14.8896 41.8425 14.8896H40.4709V20.6406H39.6906ZM45.3142 20.6406V14.1975H46.0945V19.9485H49.0895V20.6406H45.3142ZM52.2128 17.073V17.7651H49.3939V17.073H52.2128ZM55.7718 14.1975V20.6406H54.9916V15.0154H54.9538L53.3808 16.0599V15.2671L54.9916 14.1975H55.7718ZM57.4738 19.3193V18.6775L60.3053 14.1975H60.7709V15.1916H60.4563L58.317 18.5768V18.6271H62.13V19.3193H57.4738ZM60.5067 20.6406V19.1242V18.8253V14.1975H61.2491V20.6406H60.5067ZM63.5104 20.6406L66.3922 14.9399V14.8896H63.0699V14.1975H67.1976V14.9273L64.3284 20.6406H63.5104Z" fill="#858E96"/>
-<path d="M80.5308 21.1641H78.211V13.647H80.6335C81.3627 13.647 81.9867 13.7975 82.5054 14.0985C83.0242 14.397 83.4218 14.8265 83.6983 15.3868C83.9748 15.9447 84.1131 16.6127 84.1131 17.3909C84.1131 18.1739 83.9736 18.848 83.6947 19.4133C83.4157 19.9761 83.0095 20.4092 82.4761 20.7126C81.9426 21.0136 81.2942 21.1641 80.5308 21.1641ZM79.1213 20.3566H80.472C81.0936 20.3566 81.6086 20.2367 82.0173 19.9969C82.4259 19.7571 82.7306 19.4157 82.9312 18.9728C83.1319 18.5299 83.2322 18.0026 83.2322 17.3909C83.2322 16.784 83.1331 16.2616 82.9349 15.8236C82.7367 15.3831 82.4406 15.0455 82.0466 14.8106C81.6527 14.5732 81.1621 14.4545 80.5748 14.4545H79.1213V20.3566ZM87.8863 21.2815C87.3431 21.2815 86.8745 21.1616 86.4805 20.9218C86.089 20.6796 85.7868 20.3419 85.5739 19.9088C85.3635 19.4732 85.2583 18.9667 85.2583 18.3892C85.2583 17.8117 85.3635 17.3028 85.5739 16.8623C85.7868 16.4194 86.0829 16.0744 86.4622 15.8273C86.8439 15.5777 87.2892 15.4529 87.7982 15.4529C88.0918 15.4529 88.3818 15.5018 88.6681 15.5997C88.9544 15.6976 89.215 15.8566 89.4499 16.0769C89.6848 16.2946 89.872 16.5834 90.0115 16.9431C90.1509 17.3028 90.2207 17.7457 90.2207 18.2718V18.6388H85.8749V17.89H89.3398C89.3398 17.5719 89.2762 17.2881 89.1489 17.0385C89.0241 16.7889 88.8455 16.5919 88.613 16.4476C88.383 16.3032 88.1114 16.231 87.7982 16.231C87.4532 16.231 87.1547 16.3167 86.9026 16.4879C86.653 16.6568 86.4609 16.877 86.3264 17.1486C86.1918 17.4202 86.1245 17.7114 86.1245 18.0222V18.5214C86.1245 18.9471 86.1979 19.3081 86.3447 19.6041C86.494 19.8978 86.7007 20.1217 86.965 20.2758C87.2293 20.4275 87.5364 20.5034 87.8863 20.5034C88.1139 20.5034 88.3194 20.4716 88.5029 20.408C88.6889 20.3419 88.8492 20.244 88.9837 20.1143C89.1183 19.9822 89.2223 19.8182 89.2957 19.6225L90.1326 19.8574C90.0445 20.1412 89.8965 20.3908 89.6885 20.6062C89.4805 20.819 89.2236 20.9854 88.9177 21.1053C88.6118 21.2228 88.268 21.2815 87.8863 21.2815ZM95.9768 15.5263L93.892 21.1641H93.0111L90.9263 15.5263H91.866L93.4222 20.0189H93.4809L95.0372 15.5263H95.9768ZM99.282 21.2815C98.7388 21.2815 98.2702 21.1616 97.8763 20.9218C97.4848 20.6796 97.1826 20.3419 96.9697 19.9088C96.7592 19.4732 96.654 18.9667 96.654 18.3892C96.654 17.8117 96.7592 17.3028 96.9697 16.8623C97.1826 16.4194 97.4786 16.0744 97.8579 15.8273C98.2396 15.5777 98.685 15.4529 99.194 15.4529C99.4876 15.4529 99.7776 15.5018 100.064 15.5997C100.35 15.6976 100.611 15.8566 100.846 16.0769C101.081 16.2946 101.268 16.5834 101.407 16.9431C101.547 17.3028 101.616 17.7457 101.616 18.2718V18.6388H97.2707V17.89H100.736C100.736 17.5719 100.672 17.2881 100.545 17.0385C100.42 16.7889 100.241 16.5919 100.009 16.4476C99.7788 16.3032 99.5072 16.231 99.194 16.231C98.8489 16.231 98.5504 16.3167 98.2984 16.4879C98.0488 16.6568 97.8567 16.877 97.7221 17.1486C97.5875 17.4202 97.5202 17.7114 97.5202 18.0222V18.5214C97.5202 18.9471 97.5937 19.3081 97.7405 19.6041C97.8897 19.8978 98.0965 20.1217 98.3608 20.2758C98.625 20.4275 98.9321 20.5034 99.282 20.5034C99.5096 20.5034 99.7152 20.4716 99.8987 20.408C100.085 20.3419 100.245 20.244 100.38 20.1143C100.514 19.9822 100.618 19.8182 100.691 19.6225L101.528 19.8574C101.44 20.1412 101.292 20.3908 101.084 20.6062C100.876 20.819 100.619 20.9854 100.313 21.1053C100.008 21.2228 99.6638 21.2815 99.282 21.2815ZM103.8 13.647V21.1641H102.934V13.647H103.8ZM107.677 21.2815C107.168 21.2815 106.722 21.1604 106.338 20.9181C105.956 20.6759 105.657 20.337 105.442 19.9014C105.229 19.4659 105.123 18.9569 105.123 18.3745C105.123 17.7873 105.229 17.2746 105.442 16.8366C105.657 16.3986 105.956 16.0585 106.338 15.8163C106.722 15.574 107.168 15.4529 107.677 15.4529C108.186 15.4529 108.632 15.574 109.013 15.8163C109.397 16.0585 109.696 16.3986 109.909 16.8366C110.124 17.2746 110.232 17.7873 110.232 18.3745C110.232 18.9569 110.124 19.4659 109.909 19.9014C109.696 20.337 109.397 20.6759 109.013 20.9181C108.632 21.1604 108.186 21.2815 107.677 21.2815ZM107.677 20.5034C108.064 20.5034 108.382 20.4043 108.632 20.2061C108.881 20.0079 109.066 19.7473 109.186 19.4243C109.306 19.1013 109.366 18.7514 109.366 18.3745C109.366 17.9977 109.306 17.6466 109.186 17.3211C109.066 16.9957 108.881 16.7326 108.632 16.532C108.382 16.3313 108.064 16.231 107.677 16.231C107.291 16.231 106.973 16.3313 106.723 16.532C106.473 16.7326 106.289 16.9957 106.169 17.3211C106.049 17.6466 105.989 17.9977 105.989 18.3745C105.989 18.7514 106.049 19.1013 106.169 19.4243C106.289 19.7473 106.473 20.0079 106.723 20.2061C106.973 20.4043 107.291 20.5034 107.677 20.5034ZM111.554 23.2782V15.5263H112.391V16.4219H112.494C112.557 16.324 112.645 16.1992 112.758 16.0475C112.873 15.8933 113.037 15.7563 113.25 15.6364C113.465 15.5141 113.756 15.4529 114.123 15.4529C114.598 15.4529 115.017 15.5716 115.379 15.8089C115.741 16.0463 116.023 16.3827 116.227 16.8183C116.43 17.2538 116.531 17.7677 116.531 18.3599C116.531 18.9569 116.43 19.4744 116.227 19.9124C116.023 20.348 115.742 20.6857 115.382 20.9255C115.023 21.1628 114.608 21.2815 114.138 21.2815C113.776 21.2815 113.486 21.2216 113.268 21.1017C113.05 20.9793 112.883 20.8411 112.765 20.6869C112.648 20.5303 112.557 20.4006 112.494 20.2978H112.42V23.2782H111.554ZM112.406 18.3452C112.406 18.7709 112.468 19.1466 112.593 19.472C112.718 19.795 112.9 20.0483 113.14 20.2318C113.38 20.4128 113.673 20.5034 114.021 20.5034C114.383 20.5034 114.685 20.408 114.927 20.2171C115.172 20.0238 115.355 19.7644 115.478 19.439C115.603 19.1111 115.665 18.7465 115.665 18.3452C115.665 17.9488 115.604 17.5915 115.481 17.2734C115.362 16.9529 115.179 16.6996 114.935 16.5136C114.692 16.3252 114.388 16.231 114.021 16.231C113.668 16.231 113.372 16.3203 113.132 16.499C112.893 16.6751 112.712 16.9223 112.589 17.2404C112.467 17.556 112.406 17.9243 112.406 18.3452ZM122.419 21.2962C122.061 21.2962 121.737 21.2289 121.446 21.0943C121.155 20.9573 120.923 20.7603 120.752 20.5034C120.581 20.244 120.495 19.9308 120.495 19.5638C120.495 19.2408 120.559 18.9789 120.686 18.7783C120.813 18.5752 120.983 18.4161 121.196 18.3011C121.409 18.1861 121.644 18.1005 121.901 18.0442C122.16 17.9855 122.421 17.939 122.683 17.9047C123.025 17.8607 123.303 17.8276 123.516 17.8056C123.731 17.7812 123.888 17.7408 123.986 17.6845C124.086 17.6282 124.136 17.5303 124.136 17.3909V17.3615C124.136 16.9994 124.037 16.718 123.839 16.5173C123.643 16.3167 123.346 16.2163 122.947 16.2163C122.534 16.2163 122.209 16.3069 121.974 16.4879C121.74 16.669 121.574 16.8623 121.479 17.0679L120.657 16.7742C120.804 16.4317 120.999 16.1649 121.244 15.9741C121.491 15.7808 121.76 15.6462 122.052 15.5703C122.345 15.492 122.634 15.4529 122.918 15.4529C123.099 15.4529 123.307 15.4749 123.542 15.5189C123.779 15.5605 124.008 15.6474 124.228 15.7795C124.451 15.9117 124.636 16.1111 124.782 16.3778C124.929 16.6445 125.003 17.0018 125.003 17.4496V21.1641H124.136V20.4006H124.092C124.034 20.523 123.936 20.6539 123.799 20.7933C123.662 20.9328 123.479 21.0515 123.252 21.1494C123.024 21.2473 122.746 21.2962 122.419 21.2962ZM122.551 20.5181C122.893 20.5181 123.182 20.4508 123.417 20.3162C123.654 20.1816 123.833 20.0079 123.953 19.795C124.075 19.5821 124.136 19.3582 124.136 19.1233V18.3305C124.1 18.3745 124.019 18.4149 123.894 18.4516C123.772 18.4859 123.63 18.5165 123.468 18.5434C123.309 18.5678 123.154 18.5899 123.002 18.6094C122.853 18.6266 122.732 18.6413 122.639 18.6535C122.414 18.6829 122.203 18.7306 122.007 18.7966C121.814 18.8603 121.658 18.9569 121.538 19.0866C121.42 19.2138 121.362 19.3876 121.362 19.6078C121.362 19.9088 121.473 20.1363 121.696 20.2905C121.921 20.4422 122.206 20.5181 122.551 20.5181ZM133.484 16.7889L132.706 17.0091C132.657 16.8795 132.585 16.7534 132.489 16.6311C132.396 16.5063 132.269 16.4035 132.108 16.3228C131.946 16.242 131.739 16.2016 131.487 16.2016C131.142 16.2016 130.855 16.2812 130.625 16.4402C130.397 16.5968 130.283 16.7963 130.283 17.0385C130.283 17.2538 130.362 17.4239 130.518 17.5487C130.675 17.6735 130.92 17.7775 131.252 17.8607L132.089 18.0662C132.593 18.1886 132.969 18.3758 133.216 18.6278C133.463 18.8774 133.587 19.1992 133.587 19.5931C133.587 19.9161 133.494 20.2049 133.308 20.4593C133.124 20.7138 132.867 20.9145 132.537 21.0613C132.207 21.2081 131.823 21.2815 131.385 21.2815C130.809 21.2815 130.334 21.1567 129.957 20.9071C129.58 20.6575 129.341 20.2929 129.241 19.8133L130.063 19.6078C130.141 19.9112 130.29 20.1388 130.507 20.2905C130.728 20.4422 131.015 20.5181 131.37 20.5181C131.774 20.5181 132.094 20.4324 132.331 20.2611C132.571 20.0874 132.691 19.8794 132.691 19.6372C132.691 19.4414 132.623 19.2775 132.486 19.1453C132.349 19.0107 132.138 18.9104 131.854 18.8444L130.915 18.6241C130.398 18.5018 130.019 18.3121 129.777 18.0552C129.537 17.7958 129.417 17.4716 129.417 17.0825C129.417 16.7644 129.506 16.483 129.685 16.2384C129.866 15.9937 130.112 15.8016 130.423 15.6621C130.736 15.5226 131.091 15.4529 131.487 15.4529C132.045 15.4529 132.483 15.5752 132.801 15.8199C133.122 16.0646 133.349 16.3876 133.484 16.7889ZM135.449 23.2782C135.302 23.2782 135.171 23.266 135.056 23.2415C134.941 23.2195 134.861 23.1975 134.817 23.1755L135.038 22.412C135.248 22.4658 135.434 22.4854 135.595 22.4707C135.757 22.4561 135.9 22.3839 136.025 22.2542C136.152 22.1269 136.268 21.9202 136.374 21.6339L136.535 21.1934L134.45 15.5263H135.39L136.946 20.0189H137.005L138.561 15.5263H139.501L137.108 21.9862C137 22.2774 136.867 22.5184 136.708 22.7093C136.549 22.9026 136.364 23.0458 136.153 23.1388C135.945 23.2317 135.71 23.2782 135.449 23.2782ZM144.638 16.7889L143.859 17.0091C143.81 16.8795 143.738 16.7534 143.643 16.6311C143.55 16.5063 143.423 16.4035 143.261 16.3228C143.1 16.242 142.893 16.2016 142.641 16.2016C142.296 16.2016 142.008 16.2812 141.778 16.4402C141.551 16.5968 141.437 16.7963 141.437 17.0385C141.437 17.2538 141.515 17.4239 141.672 17.5487C141.828 17.6735 142.073 17.7775 142.406 17.8607L143.243 18.0662C143.747 18.1886 144.122 18.3758 144.37 18.6278C144.617 18.8774 144.74 19.1992 144.74 19.5931C144.74 19.9161 144.647 20.2049 144.461 20.4593C144.278 20.7138 144.021 20.9145 143.691 21.0613C143.36 21.2081 142.976 21.2815 142.538 21.2815C141.963 21.2815 141.487 21.1567 141.11 20.9071C140.733 20.6575 140.495 20.2929 140.394 19.8133L141.217 19.6078C141.295 19.9112 141.443 20.1388 141.661 20.2905C141.881 20.4422 142.169 20.5181 142.523 20.5181C142.927 20.5181 143.248 20.4324 143.485 20.2611C143.725 20.0874 143.845 19.8794 143.845 19.6372C143.845 19.4414 143.776 19.2775 143.639 19.1453C143.502 19.0107 143.292 18.9104 143.008 18.8444L142.068 18.6241C141.552 18.5018 141.173 18.3121 140.93 18.0552C140.691 17.7958 140.571 17.4716 140.571 17.0825C140.571 16.7644 140.66 16.483 140.839 16.2384C141.02 15.9937 141.266 15.8016 141.576 15.6621C141.89 15.5226 142.244 15.4529 142.641 15.4529C143.199 15.4529 143.637 15.5752 143.955 15.8199C144.275 16.0646 144.503 16.3876 144.638 16.7889ZM148.496 15.5263V16.2604H145.574V15.5263H148.496ZM146.426 14.1756H147.292V19.5491C147.292 19.7938 147.328 19.9773 147.399 20.0996C147.472 20.2195 147.565 20.3003 147.678 20.3419C147.793 20.381 147.914 20.4006 148.041 20.4006C148.136 20.4006 148.215 20.3957 148.276 20.3859C148.337 20.3737 148.386 20.3639 148.423 20.3566L148.599 21.1347C148.54 21.1567 148.458 21.1787 148.353 21.2008C148.248 21.2252 148.114 21.2375 147.953 21.2375C147.708 21.2375 147.468 21.1849 147.233 21.0796C147.001 20.9744 146.808 20.8141 146.653 20.5988C146.502 20.3835 146.426 20.1119 146.426 19.784V14.1756ZM152.102 21.2815C151.559 21.2815 151.09 21.1616 150.696 20.9218C150.305 20.6796 150.003 20.3419 149.79 19.9088C149.579 19.4732 149.474 18.9667 149.474 18.3892C149.474 17.8117 149.579 17.3028 149.79 16.8623C150.003 16.4194 150.299 16.0744 150.678 15.8273C151.06 15.5777 151.505 15.4529 152.014 15.4529C152.308 15.4529 152.598 15.5018 152.884 15.5997C153.17 15.6976 153.431 15.8566 153.666 16.0769C153.901 16.2946 154.088 16.5834 154.227 16.9431C154.367 17.3028 154.437 17.7457 154.437 18.2718V18.6388H150.091V17.89H153.556C153.556 17.5719 153.492 17.2881 153.365 17.0385C153.24 16.7889 153.061 16.5919 152.829 16.4476C152.599 16.3032 152.327 16.231 152.014 16.231C151.669 16.231 151.371 16.3167 151.119 16.4879C150.869 16.6568 150.677 16.877 150.542 17.1486C150.408 17.4202 150.34 17.7114 150.34 18.0222V18.5214C150.34 18.9471 150.414 19.3081 150.561 19.6041C150.71 19.8978 150.917 20.1217 151.181 20.2758C151.445 20.4275 151.752 20.5034 152.102 20.5034C152.33 20.5034 152.535 20.4716 152.719 20.408C152.905 20.3419 153.065 20.244 153.2 20.1143C153.334 19.9822 153.438 19.8182 153.512 19.6225L154.349 19.8574C154.26 20.1412 154.112 20.3908 153.904 20.6062C153.696 20.819 153.439 20.9854 153.134 21.1053C152.828 21.2228 152.484 21.2815 152.102 21.2815ZM155.754 21.1641V15.5263H156.591V16.4072H156.665C156.782 16.1062 156.972 15.8725 157.233 15.7061C157.495 15.5373 157.81 15.4529 158.177 15.4529C158.549 15.4529 158.858 15.5373 159.105 15.7061C159.355 15.8725 159.55 16.1062 159.689 16.4072H159.748C159.892 16.116 160.109 15.8848 160.397 15.7135C160.686 15.5397 161.032 15.4529 161.436 15.4529C161.94 15.4529 162.353 15.6107 162.673 15.9264C162.994 16.2396 163.154 16.7277 163.154 17.3909V21.1641H162.288V17.3909C162.288 16.9749 162.174 16.6776 161.946 16.499C161.719 16.3203 161.451 16.231 161.143 16.231C160.746 16.231 160.439 16.3509 160.221 16.5907C160.003 16.8281 159.895 17.129 159.895 17.4936V21.1641H159.014V17.3028C159.014 16.9822 158.91 16.7241 158.702 16.5283C158.494 16.3301 158.226 16.231 157.898 16.231C157.673 16.231 157.462 16.291 157.267 16.4109C157.073 16.5308 156.917 16.6972 156.797 16.91C156.679 17.1205 156.621 17.3639 156.621 17.6405V21.1641H155.754ZM170.155 15.5263V16.2604H167.116V15.5263H170.155ZM168.026 21.1641V14.7482C168.026 14.4252 168.102 14.156 168.254 13.9407C168.406 13.7253 168.603 13.5638 168.845 13.4562C169.087 13.3485 169.343 13.2947 169.612 13.2947C169.825 13.2947 169.999 13.3118 170.133 13.3461C170.268 13.3803 170.368 13.4121 170.434 13.4415L170.185 14.1903C170.141 14.1756 170.079 14.1572 170.001 14.1352C169.925 14.1132 169.825 14.1022 169.7 14.1022C169.414 14.1022 169.207 14.1743 169.08 14.3187C168.955 14.4631 168.893 14.6747 168.893 14.9537V21.1641H168.026ZM173.427 21.2815C172.918 21.2815 172.472 21.1604 172.088 20.9181C171.706 20.6759 171.407 20.337 171.192 19.9014C170.979 19.4659 170.873 18.9569 170.873 18.3745C170.873 17.7873 170.979 17.2746 171.192 16.8366C171.407 16.3986 171.706 16.0585 172.088 15.8163C172.472 15.574 172.918 15.4529 173.427 15.4529C173.936 15.4529 174.382 15.574 174.763 15.8163C175.148 16.0585 175.446 16.3986 175.659 16.8366C175.874 17.2746 175.982 17.7873 175.982 18.3745C175.982 18.9569 175.874 19.4659 175.659 19.9014C175.446 20.337 175.148 20.6759 174.763 20.9181C174.382 21.1604 173.936 21.2815 173.427 21.2815ZM173.427 20.5034C173.814 20.5034 174.132 20.4043 174.382 20.2061C174.631 20.0079 174.816 19.7473 174.936 19.4243C175.056 19.1013 175.116 18.7514 175.116 18.3745C175.116 17.9977 175.056 17.6466 174.936 17.3211C174.816 16.9957 174.631 16.7326 174.382 16.532C174.132 16.3313 173.814 16.231 173.427 16.231C173.041 16.231 172.723 16.3313 172.473 16.532C172.224 16.7326 172.039 16.9957 171.919 17.3211C171.799 17.6466 171.739 17.9977 171.739 18.3745C171.739 18.7514 171.799 19.1013 171.919 19.4243C172.039 19.7473 172.224 20.0079 172.473 20.2061C172.723 20.4043 173.041 20.5034 173.427 20.5034ZM177.304 21.1641V15.5263H178.141V16.3778H178.2C178.303 16.0989 178.489 15.8725 178.758 15.6988C179.027 15.5251 179.33 15.4382 179.668 15.4382C179.732 15.4382 179.811 15.4394 179.907 15.4419C180.002 15.4443 180.074 15.448 180.123 15.4529V16.3338C180.094 16.3264 180.027 16.3154 179.921 16.3007C179.819 16.2836 179.71 16.2751 179.595 16.2751C179.321 16.2751 179.076 16.3326 178.861 16.4476C178.648 16.5601 178.479 16.7167 178.354 16.9174C178.232 17.1156 178.171 17.3419 178.171 17.5964V21.1641H177.304ZM184.057 21.1641V15.5263H184.923V21.1641H184.057ZM184.497 14.5867C184.329 14.5867 184.183 14.5292 184.061 14.4141C183.941 14.2991 183.881 14.1609 183.881 13.9994C183.881 13.8379 183.941 13.6996 184.061 13.5846C184.183 13.4696 184.329 13.4121 184.497 13.4121C184.666 13.4121 184.811 13.4696 184.931 13.5846C185.053 13.6996 185.114 13.8379 185.114 13.9994C185.114 14.1609 185.053 14.2991 184.931 14.4141C184.811 14.5292 184.666 14.5867 184.497 14.5867ZM187.376 17.7726V21.1641H186.51V15.5263H187.347V16.4072H187.42C187.552 16.1209 187.753 15.8909 188.022 15.7171C188.291 15.541 188.639 15.4529 189.064 15.4529C189.446 15.4529 189.78 15.5312 190.066 15.6878C190.353 15.8419 190.575 16.0769 190.734 16.3925C190.893 16.7057 190.973 17.1021 190.973 17.5817V21.1641H190.107V17.6405C190.107 17.1976 189.992 16.8525 189.762 16.6054C189.532 16.3558 189.216 16.231 188.815 16.231C188.538 16.231 188.291 16.291 188.073 16.4109C187.858 16.5308 187.688 16.7057 187.563 16.9357C187.438 17.1657 187.376 17.4447 187.376 17.7726ZM195.066 15.5263V16.2604H192.027V15.5263H195.066ZM192.938 21.1641V14.7482C192.938 14.4252 193.013 14.156 193.165 13.9407C193.317 13.7253 193.514 13.5638 193.756 13.4562C193.998 13.3485 194.254 13.2947 194.523 13.2947C194.736 13.2947 194.91 13.3118 195.044 13.3461C195.179 13.3803 195.279 13.4121 195.345 13.4415L195.096 14.1903C195.052 14.1756 194.991 14.1572 194.912 14.1352C194.836 14.1132 194.736 14.1022 194.611 14.1022C194.325 14.1022 194.118 14.1743 193.991 14.3187C193.866 14.4631 193.804 14.6747 193.804 14.9537V21.1641H192.938ZM196.28 21.1641V15.5263H197.117V16.3778H197.176C197.279 16.0989 197.465 15.8725 197.734 15.6988C198.003 15.5251 198.306 15.4382 198.644 15.4382C198.708 15.4382 198.787 15.4394 198.883 15.4419C198.978 15.4443 199.05 15.448 199.099 15.4529V16.3338C199.07 16.3264 199.003 16.3154 198.897 16.3007C198.795 16.2836 198.686 16.2751 198.571 16.2751C198.297 16.2751 198.052 16.3326 197.837 16.4476C197.624 16.5601 197.455 16.7167 197.33 16.9174C197.208 17.1156 197.147 17.3419 197.147 17.5964V21.1641H196.28ZM201.785 21.2962C201.428 21.2962 201.104 21.2289 200.812 21.0943C200.521 20.9573 200.29 20.7603 200.119 20.5034C199.947 20.244 199.862 19.9308 199.862 19.5638C199.862 19.2408 199.925 18.9789 200.053 18.7783C200.18 18.5752 200.35 18.4161 200.563 18.3011C200.776 18.1861 201.011 18.1005 201.268 18.0442C201.527 17.9855 201.788 17.939 202.049 17.9047C202.392 17.8607 202.67 17.8276 202.883 17.8056C203.098 17.7812 203.255 17.7408 203.352 17.6845C203.453 17.6282 203.503 17.5303 203.503 17.3909V17.3615C203.503 16.9994 203.404 16.718 203.206 16.5173C203.01 16.3167 202.713 16.2163 202.314 16.2163C201.9 16.2163 201.576 16.3069 201.341 16.4879C201.106 16.669 200.941 16.8623 200.846 17.0679L200.023 16.7742C200.17 16.4317 200.366 16.1649 200.611 15.9741C200.858 15.7808 201.127 15.6462 201.418 15.5703C201.712 15.492 202 15.4529 202.284 15.4529C202.465 15.4529 202.673 15.4749 202.908 15.5189C203.146 15.5605 203.374 15.6474 203.595 15.7795C203.817 15.9117 204.002 16.1111 204.149 16.3778C204.296 16.6445 204.369 17.0018 204.369 17.4496V21.1641H203.503V20.4006H203.459C203.4 20.523 203.302 20.6539 203.165 20.7933C203.028 20.9328 202.846 21.0515 202.618 21.1494C202.391 21.2473 202.113 21.2962 201.785 21.2962ZM201.917 20.5181C202.26 20.5181 202.549 20.4508 202.783 20.3162C203.021 20.1816 203.199 20.0079 203.319 19.795C203.442 19.5821 203.503 19.3582 203.503 19.1233V18.3305C203.466 18.3745 203.385 18.4149 203.261 18.4516C203.138 18.4859 202.996 18.5165 202.835 18.5434C202.676 18.5678 202.52 18.5899 202.369 18.6094C202.219 18.6266 202.098 18.6413 202.005 18.6535C201.78 18.6829 201.57 18.7306 201.374 18.7966C201.181 18.8603 201.024 18.9569 200.904 19.0866C200.787 19.2138 200.728 19.3876 200.728 19.6078C200.728 19.9088 200.839 20.1363 201.062 20.2905C201.287 20.4422 201.572 20.5181 201.917 20.5181ZM209.944 16.7889L209.165 17.0091C209.117 16.8795 209.044 16.7534 208.949 16.6311C208.856 16.5063 208.729 16.4035 208.567 16.3228C208.406 16.242 208.199 16.2016 207.947 16.2016C207.602 16.2016 207.314 16.2812 207.084 16.4402C206.857 16.5968 206.743 16.7963 206.743 17.0385C206.743 17.2538 206.821 17.4239 206.978 17.5487C207.134 17.6735 207.379 17.7775 207.712 17.8607L208.549 18.0662C209.053 18.1886 209.428 18.3758 209.676 18.6278C209.923 18.8774 210.046 19.1992 210.046 19.5931C210.046 19.9161 209.953 20.2049 209.767 20.4593C209.584 20.7138 209.327 20.9145 208.997 21.0613C208.666 21.2081 208.282 21.2815 207.844 21.2815C207.269 21.2815 206.793 21.1567 206.416 20.9071C206.039 20.6575 205.801 20.2929 205.701 19.8133L206.523 19.6078C206.601 19.9112 206.749 20.1388 206.967 20.2905C207.187 20.4422 207.475 20.5181 207.829 20.5181C208.233 20.5181 208.554 20.4324 208.791 20.2611C209.031 20.0874 209.151 19.8794 209.151 19.6372C209.151 19.4414 209.082 19.2775 208.945 19.1453C208.808 19.0107 208.598 18.9104 208.314 18.8444L207.374 18.6241C206.858 18.5018 206.479 18.3121 206.236 18.0552C205.997 17.7958 205.877 17.4716 205.877 17.0825C205.877 16.7644 205.966 16.483 206.145 16.2384C206.326 15.9937 206.572 15.8016 206.882 15.6621C207.196 15.5226 207.55 15.4529 207.947 15.4529C208.505 15.4529 208.943 15.5752 209.261 15.8199C209.581 16.0646 209.809 16.3876 209.944 16.7889ZM213.802 15.5263V16.2604H210.88V15.5263H213.802ZM211.732 14.1756H212.598V19.5491C212.598 19.7938 212.634 19.9773 212.705 20.0996C212.778 20.2195 212.871 20.3003 212.984 20.3419C213.099 20.381 213.22 20.4006 213.347 20.4006C213.442 20.4006 213.521 20.3957 213.582 20.3859C213.643 20.3737 213.692 20.3639 213.729 20.3566L213.905 21.1347C213.846 21.1567 213.764 21.1787 213.659 21.2008C213.554 21.2252 213.42 21.2375 213.259 21.2375C213.014 21.2375 212.774 21.1849 212.539 21.0796C212.307 20.9744 212.114 20.8141 211.96 20.5988C211.808 20.3835 211.732 20.1119 211.732 19.784V14.1756ZM215.105 21.1641V15.5263H215.942V16.3778H216.001C216.103 16.0989 216.289 15.8725 216.559 15.6988C216.828 15.5251 217.131 15.4382 217.469 15.4382C217.532 15.4382 217.612 15.4394 217.707 15.4419C217.803 15.4443 217.875 15.448 217.924 15.4529V16.3338C217.895 16.3264 217.827 16.3154 217.722 16.3007C217.619 16.2836 217.51 16.2751 217.395 16.2751C217.121 16.2751 216.877 16.3326 216.661 16.4476C216.448 16.5601 216.28 16.7167 216.155 16.9174C216.033 17.1156 215.971 17.3419 215.971 17.5964V21.1641H215.105ZM222.504 18.859V15.5263H223.37V21.1641H222.504V20.2098H222.445C222.313 20.496 222.107 20.7395 221.828 20.9402C221.549 21.1384 221.197 21.2375 220.771 21.2375C220.419 21.2375 220.106 21.1604 219.832 21.0062C219.558 20.8496 219.342 20.6147 219.186 20.3015C219.029 19.9859 218.951 19.5882 218.951 19.1086V15.5263H219.817V19.0499C219.817 19.461 219.932 19.7889 220.162 20.0336C220.395 20.2783 220.691 20.4006 221.05 20.4006C221.266 20.4006 221.485 20.3456 221.707 20.2354C221.932 20.1253 222.121 19.9565 222.273 19.7289C222.427 19.5014 222.504 19.2114 222.504 18.859ZM227.247 21.2815C226.718 21.2815 226.263 21.1567 225.881 20.9071C225.5 20.6575 225.206 20.3137 225.001 19.8757C224.795 19.4377 224.692 18.9373 224.692 18.3745C224.692 17.802 224.797 17.2967 225.008 16.8587C225.221 16.4182 225.517 16.0744 225.896 15.8273C226.278 15.5777 226.723 15.4529 227.232 15.4529C227.629 15.4529 227.986 15.5263 228.304 15.6731C228.622 15.8199 228.883 16.0255 229.086 16.2897C229.289 16.554 229.415 16.8623 229.464 17.2147H228.598C228.532 16.9578 228.385 16.7302 228.157 16.532C227.932 16.3313 227.629 16.231 227.247 16.231C226.909 16.231 226.613 16.3191 226.359 16.4953C226.107 16.669 225.91 16.9149 225.768 17.233C225.628 17.5487 225.558 17.9194 225.558 18.3452C225.558 18.7807 225.627 19.16 225.764 19.483C225.904 19.806 226.099 20.0568 226.351 20.2354C226.606 20.4141 226.904 20.5034 227.247 20.5034C227.472 20.5034 227.676 20.4642 227.86 20.3859C228.043 20.3076 228.199 20.1951 228.326 20.0483C228.453 19.9014 228.544 19.7253 228.598 19.5197H229.464C229.415 19.8525 229.294 20.1522 229.1 20.419C228.91 20.6832 228.656 20.8937 228.341 21.0503C228.027 21.2044 227.663 21.2815 227.247 21.2815ZM233.182 15.5263V16.2604H230.26V15.5263H233.182ZM231.112 14.1756H231.978V19.5491C231.978 19.7938 232.014 19.9773 232.085 20.0996C232.158 20.2195 232.251 20.3003 232.363 20.3419C232.478 20.381 232.6 20.4006 232.727 20.4006C232.822 20.4006 232.901 20.3957 232.962 20.3859C233.023 20.3737 233.072 20.3639 233.109 20.3566L233.285 21.1347C233.226 21.1567 233.144 21.1787 233.039 21.2008C232.934 21.2252 232.8 21.2375 232.639 21.2375C232.394 21.2375 232.154 21.1849 231.919 21.0796C231.687 20.9744 231.494 20.8141 231.339 20.5988C231.188 20.3835 231.112 20.1119 231.112 19.784V14.1756ZM238.038 18.859V15.5263H238.904V21.1641H238.038V20.2098H237.979C237.847 20.496 237.642 20.7395 237.363 20.9402C237.084 21.1384 236.731 21.2375 236.305 21.2375C235.953 21.2375 235.64 21.1604 235.366 21.0062C235.092 20.8496 234.876 20.6147 234.72 20.3015C234.563 19.9859 234.485 19.5882 234.485 19.1086V15.5263H235.351V19.0499C235.351 19.461 235.466 19.7889 235.696 20.0336C235.929 20.2783 236.225 20.4006 236.584 20.4006C236.8 20.4006 237.019 20.3456 237.241 20.2354C237.467 20.1253 237.655 19.9565 237.807 19.7289C237.961 19.5014 238.038 19.2114 238.038 18.859ZM240.491 21.1641V15.5263H241.328V16.3778H241.386C241.489 16.0989 241.675 15.8725 241.944 15.6988C242.213 15.5251 242.517 15.4382 242.854 15.4382C242.918 15.4382 242.998 15.4394 243.093 15.4419C243.188 15.4443 243.261 15.448 243.31 15.4529V16.3338C243.28 16.3264 243.213 16.3154 243.108 16.3007C243.005 16.2836 242.896 16.2751 242.781 16.2751C242.507 16.2751 242.262 16.3326 242.047 16.4476C241.834 16.5601 241.665 16.7167 241.54 16.9174C241.418 17.1156 241.357 17.3419 241.357 17.5964V21.1641H240.491ZM246.529 21.2815C245.985 21.2815 245.517 21.1616 245.123 20.9218C244.731 20.6796 244.429 20.3419 244.216 19.9088C244.006 19.4732 243.901 18.9667 243.901 18.3892C243.901 17.8117 244.006 17.3028 244.216 16.8623C244.429 16.4194 244.725 16.0744 245.104 15.8273C245.486 15.5777 245.931 15.4529 246.44 15.4529C246.734 15.4529 247.024 15.5018 247.31 15.5997C247.597 15.6976 247.857 15.8566 248.092 16.0769C248.327 16.2946 248.514 16.5834 248.654 16.9431C248.793 17.3028 248.863 17.7457 248.863 18.2718V18.6388H244.517V17.89H247.982C247.982 17.5719 247.918 17.2881 247.791 17.0385C247.666 16.7889 247.488 16.5919 247.255 16.4476C247.025 16.3032 246.754 16.231 246.44 16.231C246.095 16.231 245.797 16.3167 245.545 16.4879C245.295 16.6568 245.103 16.877 244.969 17.1486C244.834 17.4202 244.767 17.7114 244.767 18.0222V18.5214C244.767 18.9471 244.84 19.3081 244.987 19.6041C245.136 19.8978 245.343 20.1217 245.607 20.2758C245.872 20.4275 246.179 20.5034 246.529 20.5034C246.756 20.5034 246.962 20.4716 247.145 20.408C247.331 20.3419 247.491 20.244 247.626 20.1143C247.761 19.9822 247.865 19.8182 247.938 19.6225L248.775 19.8574C248.687 20.1412 248.539 20.3908 248.331 20.6062C248.123 20.819 247.866 20.9854 247.56 21.1053C247.254 21.2228 246.91 21.2815 246.529 21.2815ZM255.378 21.2815C254.849 21.2815 254.394 21.1567 254.013 20.9071C253.631 20.6575 253.337 20.3137 253.132 19.8757C252.926 19.4377 252.823 18.9373 252.823 18.3745C252.823 17.802 252.929 17.2967 253.139 16.8587C253.352 16.4182 253.648 16.0744 254.027 15.8273C254.409 15.5777 254.854 15.4529 255.363 15.4529C255.76 15.4529 256.117 15.5263 256.435 15.6731C256.753 15.8199 257.014 16.0255 257.217 16.2897C257.42 16.554 257.546 16.8623 257.595 17.2147H256.729C256.663 16.9578 256.516 16.7302 256.288 16.532C256.063 16.3313 255.76 16.231 255.378 16.231C255.04 16.231 254.744 16.3191 254.49 16.4953C254.238 16.669 254.041 16.9149 253.899 17.233C253.759 17.5487 253.69 17.9194 253.69 18.3452C253.69 18.7807 253.758 19.16 253.895 19.483C254.035 19.806 254.23 20.0568 254.482 20.2354C254.737 20.4141 255.035 20.5034 255.378 20.5034C255.603 20.5034 255.807 20.4642 255.991 20.3859C256.174 20.3076 256.33 20.1951 256.457 20.0483C256.584 19.9014 256.675 19.7253 256.729 19.5197H257.595C257.546 19.8525 257.425 20.1522 257.232 20.419C257.041 20.6832 256.787 20.8937 256.472 21.0503C256.159 21.2044 255.794 21.2815 255.378 21.2815ZM261.152 21.2815C260.643 21.2815 260.196 21.1604 259.812 20.9181C259.43 20.6759 259.132 20.337 258.916 19.9014C258.703 19.4659 258.597 18.9569 258.597 18.3745C258.597 17.7873 258.703 17.2746 258.916 16.8366C259.132 16.3986 259.43 16.0585 259.812 15.8163C260.196 15.574 260.643 15.4529 261.152 15.4529C261.66 15.4529 262.106 15.574 262.488 15.8163C262.872 16.0585 263.17 16.3986 263.383 16.8366C263.598 17.2746 263.706 17.7873 263.706 18.3745C263.706 18.9569 263.598 19.4659 263.383 19.9014C263.17 20.337 262.872 20.6759 262.488 20.9181C262.106 21.1604 261.66 21.2815 261.152 21.2815ZM261.152 20.5034C261.538 20.5034 261.856 20.4043 262.106 20.2061C262.355 20.0079 262.54 19.7473 262.66 19.4243C262.78 19.1013 262.84 18.7514 262.84 18.3745C262.84 17.9977 262.78 17.6466 262.66 17.3211C262.54 16.9957 262.355 16.7326 262.106 16.532C261.856 16.3313 261.538 16.231 261.152 16.231C260.765 16.231 260.447 16.3313 260.197 16.532C259.948 16.7326 259.763 16.9957 259.643 17.3211C259.523 17.6466 259.463 17.9977 259.463 18.3745C259.463 18.7514 259.523 19.1013 259.643 19.4243C259.763 19.7473 259.948 20.0079 260.197 20.2061C260.447 20.4043 260.765 20.5034 261.152 20.5034ZM269.022 16.7889L268.244 17.0091C268.195 16.8795 268.123 16.7534 268.027 16.6311C267.934 16.5063 267.807 16.4035 267.645 16.3228C267.484 16.242 267.277 16.2016 267.025 16.2016C266.68 16.2016 266.393 16.2812 266.163 16.4402C265.935 16.5968 265.821 16.7963 265.821 17.0385C265.821 17.2538 265.9 17.4239 266.056 17.5487C266.213 17.6735 266.457 17.7775 266.79 17.8607L267.627 18.0662C268.131 18.1886 268.507 18.3758 268.754 18.6278C269.001 18.8774 269.125 19.1992 269.125 19.5931C269.125 19.9161 269.032 20.2049 268.846 20.4593C268.662 20.7138 268.405 20.9145 268.075 21.0613C267.745 21.2081 267.36 21.2815 266.922 21.2815C266.347 21.2815 265.871 21.1567 265.495 20.9071C265.118 20.6575 264.879 20.2929 264.779 19.8133L265.601 19.6078C265.679 19.9112 265.827 20.1388 266.045 20.2905C266.265 20.4422 266.553 20.5181 266.908 20.5181C267.311 20.5181 267.632 20.4324 267.869 20.2611C268.109 20.0874 268.229 19.8794 268.229 19.6372C268.229 19.4414 268.161 19.2775 268.023 19.1453C267.886 19.0107 267.676 18.9104 267.392 18.8444L266.453 18.6241C265.936 18.5018 265.557 18.3121 265.315 18.0552C265.075 17.7958 264.955 17.4716 264.955 17.0825C264.955 16.7644 265.044 16.483 265.223 16.2384C265.404 15.9937 265.65 15.8016 265.961 15.6621C266.274 15.5226 266.629 15.4529 267.025 15.4529C267.583 15.4529 268.021 15.5752 268.339 15.8199C268.66 16.0646 268.887 16.3876 269.022 16.7889ZM272.88 15.5263V16.2604H269.959V15.5263H272.88ZM270.81 14.1756H271.676V19.5491C271.676 19.7938 271.712 19.9773 271.783 20.0996C271.856 20.2195 271.949 20.3003 272.062 20.3419C272.177 20.381 272.298 20.4006 272.425 20.4006C272.521 20.4006 272.599 20.3957 272.66 20.3859C272.721 20.3737 272.77 20.3639 272.807 20.3566L272.983 21.1347C272.924 21.1567 272.842 21.1787 272.737 21.2008C272.632 21.2252 272.499 21.2375 272.337 21.2375C272.092 21.2375 271.853 21.1849 271.618 21.0796C271.385 20.9744 271.192 20.8141 271.038 20.5988C270.886 20.3835 270.81 20.1119 270.81 19.784V14.1756ZM274.815 21.2228C274.634 21.2228 274.478 21.1579 274.349 21.0283C274.219 20.8986 274.154 20.7432 274.154 20.5621C274.154 20.381 274.219 20.2257 274.349 20.096C274.478 19.9663 274.634 19.9014 274.815 19.9014C274.996 19.9014 275.151 19.9663 275.281 20.096C275.411 20.2257 275.475 20.381 275.475 20.5621C275.475 20.682 275.445 20.7921 275.384 20.8925C275.325 20.9928 275.245 21.0735 275.145 21.1347C275.047 21.1934 274.937 21.2228 274.815 21.2228ZM277.661 21.2228C277.48 21.2228 277.325 21.1579 277.195 21.0283C277.065 20.8986 277 20.7432 277 20.5621C277 20.381 277.065 20.2257 277.195 20.096C277.325 19.9663 277.48 19.9014 277.661 19.9014C277.842 19.9014 277.998 19.9663 278.127 20.096C278.257 20.2257 278.322 20.381 278.322 20.5621C278.322 20.682 278.291 20.7921 278.23 20.8925C278.171 20.9928 278.092 21.0735 277.991 21.1347C277.894 21.1934 277.783 21.2228 277.661 21.2228ZM280.508 21.2228C280.326 21.2228 280.171 21.1579 280.041 21.0283C279.912 20.8986 279.847 20.7432 279.847 20.5621C279.847 20.381 279.912 20.2257 280.041 20.096C280.171 19.9663 280.326 19.9014 280.508 19.9014C280.689 19.9014 280.844 19.9663 280.974 20.096C281.103 20.2257 281.168 20.381 281.168 20.5621C281.168 20.682 281.138 20.7921 281.076 20.8925C281.018 20.9928 280.938 21.0735 280.838 21.1347C280.74 21.1934 280.63 21.2228 280.508 21.2228Z" fill="#343A40"/>
-<rect x="60.3208" y="36.2188" width="13.289" height="13.289" rx="2.95312" fill="#FFEDD5"/>
-<rect x="63.6431" y="39.543" width="6.09081" height="6.09081" rx="3.04541" fill="#FFEDD5"/>
-<path d="M68.4014 44.6191C68.3126 44.6191 68.2375 44.5885 68.1762 44.5271C68.1148 44.4658 68.0842 44.3907 68.0842 44.3019V40.8758C68.0842 40.787 68.1148 40.7119 68.1762 40.6506C68.2375 40.5893 68.3126 40.5586 68.4014 40.5586C68.4902 40.5586 68.5653 40.5893 68.6266 40.6506C68.688 40.7119 68.7186 40.787 68.7186 40.8758V44.3019C68.7186 44.3907 68.688 44.4658 68.6266 44.5271C68.5653 44.5885 68.4902 44.6191 68.4014 44.6191ZM65.2354 44.6191C65.1889 44.6191 65.1456 44.6107 65.1054 44.5938C65.0652 44.5768 65.0314 44.5546 65.0039 44.5271C64.9764 44.4996 64.9542 44.4658 64.9372 44.4256C64.9203 44.3854 64.9119 44.3442 64.9119 44.3019V43.4137C64.9119 43.3248 64.9425 43.2498 65.0039 43.1884C65.0652 43.1271 65.1403 43.0964 65.2291 43.0964C65.3179 43.0964 65.393 43.1271 65.4543 43.1884C65.5157 43.2498 65.5463 43.3248 65.5463 43.4137V44.3019C65.5463 44.3442 65.5379 44.3854 65.5209 44.4256C65.504 44.4658 65.4818 44.4996 65.4543 44.5271C65.4268 44.5546 65.3941 44.5768 65.356 44.5938C65.3179 44.6107 65.2777 44.6191 65.2354 44.6191ZM66.8152 44.6191C66.7264 44.6191 66.6513 44.5885 66.59 44.5271C66.5287 44.4658 66.498 44.3907 66.498 44.3019V42.1447C66.498 42.0559 66.5287 41.9808 66.59 41.9195C66.6513 41.8582 66.7264 41.8275 66.8152 41.8275C66.9041 41.8275 66.9791 41.8582 67.0405 41.9195C67.1018 41.9808 67.1325 42.0559 67.1325 42.1447V44.3019C67.1325 44.3907 67.1018 44.4658 67.0405 44.5271C66.9791 44.5885 66.9041 44.6191 66.8152 44.6191Z" fill="#FF6B00"/>
-<circle cx="45.5547" cy="42.8633" r="6.64452" stroke="#FCBE1D" stroke-width="0.55371" stroke-linecap="round" stroke-dasharray="0 11.07 0 5.54"/>
-<path d="M48.7205 38.7783C47.8076 38.0709 46.684 37.6896 45.5291 37.6954C44.3742 37.7011 43.2545 38.0936 42.3487 38.8102L45.5549 42.8633L48.7205 38.7783Z" fill="#FCBE1D"/>
-<path d="M42.3803 46.9482C43.2932 47.6557 44.4168 48.037 45.5717 48.0312C46.7267 48.0254 47.8464 47.6329 48.7522 46.9164L45.5459 42.8633L42.3803 46.9482Z" fill="#FCBE1D"/>
-<g clip-path="url(#clip0_4142_75678)">
-<path d="M89.3569 43.957C89.2474 43.957 89.1555 43.92 89.0814 43.8458C89.0073 43.7717 88.9702 43.6799 88.9702 43.5703C88.9702 43.4607 89.0073 43.3689 89.0814 43.2948C89.1555 43.2206 89.2474 43.1836 89.3569 43.1836C89.4665 43.1836 89.5583 43.2206 89.6325 43.2948C89.7066 43.3689 89.7436 43.4607 89.7436 43.5703C89.7436 43.6799 89.7066 43.7717 89.6325 43.8458C89.5583 43.92 89.4665 43.957 89.3569 43.957ZM87.8101 43.957C87.7005 43.957 87.6086 43.92 87.5345 43.8458C87.4604 43.7717 87.4233 43.6799 87.4233 43.5703C87.4233 43.4607 87.4604 43.3689 87.5345 43.2948C87.6086 43.2206 87.7005 43.1836 87.8101 43.1836C87.9196 43.1836 88.0115 43.2206 88.0856 43.2948C88.1597 43.3689 88.1968 43.4607 88.1968 43.5703C88.1968 43.6799 88.1597 43.7717 88.0856 43.8458C88.0115 43.92 87.9196 43.957 87.8101 43.957ZM90.9038 43.957C90.7942 43.957 90.7024 43.92 90.6283 43.8458C90.5541 43.7717 90.5171 43.6799 90.5171 43.5703C90.5171 43.4607 90.5541 43.3689 90.6283 43.2948C90.7024 43.2206 90.7942 43.1836 90.9038 43.1836C91.0134 43.1836 91.1052 43.2206 91.1793 43.2948C91.2535 43.3689 91.2905 43.4607 91.2905 43.5703C91.2905 43.6799 91.2535 43.7717 91.1793 43.8458C91.1052 43.92 91.0134 43.957 90.9038 43.957ZM89.3569 45.5039C89.2474 45.5039 89.1555 45.4668 89.0814 45.3927C89.0073 45.3186 88.9702 45.2267 88.9702 45.1172C88.9702 45.0076 89.0073 44.9158 89.0814 44.8416C89.1555 44.7675 89.2474 44.7305 89.3569 44.7305C89.4665 44.7305 89.5583 44.7675 89.6325 44.8416C89.7066 44.9158 89.7436 45.0076 89.7436 45.1172C89.7436 45.2267 89.7066 45.3186 89.6325 45.3927C89.5583 45.4668 89.4665 45.5039 89.3569 45.5039ZM87.8101 45.5039C87.7005 45.5039 87.6086 45.4668 87.5345 45.3927C87.4604 45.3186 87.4233 45.2267 87.4233 45.1172C87.4233 45.0076 87.4604 44.9158 87.5345 44.8416C87.6086 44.7675 87.7005 44.7305 87.8101 44.7305C87.9196 44.7305 88.0115 44.7675 88.0856 44.8416C88.1597 44.9158 88.1968 45.0076 88.1968 45.1172C88.1968 45.2267 88.1597 45.3186 88.0856 45.3927C88.0115 45.4668 87.9196 45.5039 87.8101 45.5039ZM90.9038 45.5039C90.7942 45.5039 90.7024 45.4668 90.6283 45.3927C90.5541 45.3186 90.5171 45.2267 90.5171 45.1172C90.5171 45.0076 90.5541 44.9158 90.6283 44.8416C90.7024 44.7675 90.7942 44.7305 90.9038 44.7305C91.0134 44.7305 91.1052 44.7675 91.1793 44.8416C91.2535 44.9158 91.2905 45.0076 91.2905 45.1172C91.2905 45.2267 91.2535 45.3186 91.1793 45.3927C91.1052 45.4668 91.0134 45.5039 90.9038 45.5039ZM86.4565 47.0508C86.3019 47.0508 86.1665 46.9928 86.0505 46.8767C85.9345 46.7607 85.8765 46.6254 85.8765 46.4707V40.4766C85.8765 40.3219 85.9345 40.1865 86.0505 40.0705C86.1665 39.9545 86.3019 39.8965 86.4565 39.8965H87.085V39.6258C87.085 39.5355 87.114 39.4614 87.172 39.4034C87.23 39.3454 87.3041 39.3164 87.3943 39.3164C87.4846 39.3164 87.5603 39.3454 87.6215 39.4034C87.6828 39.4614 87.7134 39.5355 87.7134 39.6258V39.8965H91.0005V39.6258C91.0005 39.5355 91.0295 39.4614 91.0875 39.4034C91.1455 39.3454 91.2196 39.3164 91.3099 39.3164C91.4001 39.3164 91.4758 39.3454 91.5371 39.4034C91.5983 39.4614 91.6289 39.5355 91.6289 39.6258V39.8965H92.2573C92.412 39.8965 92.5474 39.9545 92.6634 40.0705C92.7794 40.1865 92.8374 40.3219 92.8374 40.4766V46.4707C92.8374 46.6254 92.7794 46.7607 92.6634 46.8767C92.5474 46.9928 92.412 47.0508 92.2573 47.0508H86.4565ZM86.4565 46.4707H92.2573V42.3135H86.4565V46.4707ZM86.4565 41.7334H92.2573V40.4766H86.4565V41.7334ZM86.4565 41.7334V40.4766V41.7334Z" fill="#858E96"/>
-</g>
-<path d="M98.4932 46.8203H96.9309V41.7578H98.5624C99.0535 41.7578 99.4737 41.8592 99.8231 42.0619C100.172 42.2629 100.44 42.5521 100.626 42.9295C100.813 43.3052 100.906 43.7551 100.906 44.2792C100.906 44.8065 100.812 45.2605 100.624 45.6412C100.436 46.0202 100.163 46.3119 99.8033 46.5163C99.444 46.719 99.0073 46.8203 98.4932 46.8203ZM97.5439 46.2765H98.4536C98.8722 46.2765 99.2191 46.1957 99.4943 46.0342C99.7695 45.8727 99.9747 45.6429 100.11 45.3446C100.245 45.0463 100.312 44.6912 100.312 44.2792C100.312 43.8705 100.246 43.5187 100.112 43.2237C99.9788 42.927 99.7794 42.6996 99.5141 42.5414C99.2487 42.3816 98.9183 42.3016 98.5228 42.3016H97.5439V46.2765ZM103.447 46.8994C103.081 46.8994 102.765 46.8187 102.5 46.6572C102.236 46.494 102.033 46.2666 101.89 45.9749C101.748 45.6816 101.677 45.3405 101.677 44.9515C101.677 44.5626 101.748 44.2199 101.89 43.9232C102.033 43.6249 102.232 43.3926 102.488 43.2261C102.745 43.058 103.045 42.974 103.388 42.974C103.585 42.974 103.781 43.007 103.973 43.0729C104.166 43.1388 104.342 43.2459 104.5 43.3942C104.658 43.5409 104.784 43.7354 104.878 43.9776C104.972 44.2199 105.019 44.5181 105.019 44.8724V45.1196H102.092V44.6154H104.426C104.426 44.4011 104.383 44.21 104.297 44.0419C104.213 43.8738 104.093 43.7411 103.936 43.6439C103.781 43.5467 103.599 43.4981 103.388 43.4981C103.155 43.4981 102.954 43.5557 102.784 43.6711C102.616 43.7848 102.487 43.9331 102.396 44.116C102.306 44.299 102.26 44.4951 102.26 44.7043V45.0405C102.26 45.3273 102.31 45.5703 102.409 45.7697C102.509 45.9675 102.648 46.1183 102.826 46.2221C103.004 46.3243 103.211 46.3754 103.447 46.3754C103.6 46.3754 103.739 46.3539 103.862 46.3111C103.987 46.2666 104.095 46.2007 104.186 46.1133C104.277 46.0244 104.347 45.9139 104.396 45.7821L104.96 45.9403C104.9 46.1315 104.801 46.2996 104.661 46.4446C104.521 46.588 104.347 46.7 104.141 46.7808C103.936 46.8599 103.704 46.8994 103.447 46.8994ZM107.449 46.8994C107.093 46.8994 106.786 46.8154 106.529 46.6473C106.272 46.4792 106.075 46.2477 105.936 45.9527C105.798 45.6577 105.728 45.3207 105.728 44.9417C105.728 44.556 105.799 44.2157 105.941 43.9207C106.084 43.6241 106.284 43.3926 106.539 43.2261C106.796 43.058 107.096 42.974 107.439 42.974C107.706 42.974 107.947 43.0234 108.161 43.1223C108.375 43.2212 108.551 43.3596 108.687 43.5376C108.824 43.7156 108.909 43.9232 108.942 44.1605H108.359C108.314 43.9875 108.215 43.8342 108.062 43.7007C107.91 43.5656 107.706 43.4981 107.449 43.4981C107.222 43.4981 107.022 43.5574 106.851 43.676C106.681 43.793 106.548 43.9587 106.453 44.1729C106.359 44.3855 106.312 44.6351 106.312 44.9219C106.312 45.2152 106.358 45.4706 106.45 45.6882C106.544 45.9057 106.676 46.0746 106.846 46.1949C107.017 46.3152 107.218 46.3754 107.449 46.3754C107.601 46.3754 107.738 46.349 107.862 46.2963C107.985 46.2435 108.09 46.1677 108.176 46.0688C108.261 45.97 108.322 45.8513 108.359 45.7129H108.942C108.909 45.937 108.827 46.1389 108.697 46.3185C108.569 46.4965 108.398 46.6382 108.186 46.7437C107.975 46.8475 107.729 46.8994 107.449 46.8994ZM113.522 41.7578V46.8203H112.909V42.4005H112.88L111.644 43.2212V42.5983L112.909 41.7578H113.522ZM114.978 46.8203V46.3754L116.649 44.5461C116.846 44.3319 117.007 44.1457 117.134 43.9875C117.261 43.8276 117.355 43.6777 117.416 43.5376C117.478 43.3959 117.51 43.2476 117.51 43.0927C117.51 42.9147 117.467 42.7606 117.381 42.6304C117.297 42.5002 117.182 42.3997 117.035 42.3288C116.888 42.258 116.724 42.2225 116.541 42.2225C116.346 42.2225 116.176 42.2629 116.031 42.3437C115.888 42.4228 115.777 42.534 115.698 42.6774C115.62 42.8207 115.582 42.9888 115.582 43.1816H114.998C114.998 42.885 115.067 42.6246 115.203 42.4005C115.34 42.1764 115.526 42.0017 115.762 41.8765C115.999 41.7512 116.265 41.6886 116.56 41.6886C116.857 41.6886 117.12 41.7512 117.349 41.8765C117.578 42.0017 117.758 42.1706 117.888 42.3832C118.018 42.5958 118.083 42.8323 118.083 43.0927C118.083 43.2789 118.049 43.461 117.982 43.639C117.916 43.8153 117.801 44.0122 117.636 44.2297C117.473 44.4456 117.246 44.7093 116.956 45.0208L115.819 46.2369V46.2765H118.172V46.8203H114.978Z" fill="#495057"/>
-<rect x="81.922" y="36.4103" width="40.2223" height="13.5388" rx="2.12877" stroke="#DEE2E6" stroke-width="0.38307"/>
-<g filter="url(#filter1_d_4142_75678)">
-<rect x="3" y="26.3516" width="272.425" height="56.8476" rx="5.90624" fill="white"/>
-</g>
-<path d="M14.1162 43.9922V37.549H16.2933C16.7987 37.549 17.2119 37.6403 17.5328 37.8227C17.8558 38.0031 18.0949 38.2474 18.2501 38.5558C18.4053 38.8641 18.4829 39.208 18.4829 39.5877C18.4829 39.9673 18.4053 40.3123 18.2501 40.6227C18.097 40.9331 17.86 41.1806 17.5391 41.3652C17.2182 41.5477 16.8071 41.6389 16.3058 41.6389H14.7454V40.9468H16.2807C16.6267 40.9468 16.9046 40.887 17.1144 40.7675C17.3241 40.6479 17.4762 40.4864 17.5706 40.283C17.667 40.0774 17.7153 39.8457 17.7153 39.5877C17.7153 39.3297 17.667 39.099 17.5706 38.8955C17.4762 38.6921 17.3231 38.5327 17.1112 38.4173C16.8994 38.2999 16.6183 38.2412 16.2681 38.2412H14.8964V43.9922H14.1162ZM19.7398 43.9922V37.549H20.52V43.3H23.5151V43.9922H19.7398ZM26.6384 40.4245V41.1167H23.8195V40.4245H26.6384ZM30.1974 37.549V43.9922H29.4171V38.367H29.3794L27.8063 39.4115V38.6187L29.4171 37.549H30.1974ZM31.8994 42.6708V42.029L34.7309 37.549H35.1965V38.5432H34.8819L32.7425 41.9284V41.9787H36.5556V42.6708H31.8994ZM34.9322 43.9922V42.4758V42.1769V37.549H35.6747V43.9922H34.9322ZM37.5836 42.6708V42.029L40.415 37.549H40.8807V38.5432H40.566L38.4267 41.9284V41.9787H42.2398V42.6708H37.5836ZM40.6164 43.9922V42.4758V42.1769V37.549H41.3589V43.9922H40.6164Z" fill="#858E96"/>
-<path d="M52.6366 44.5156V36.9986H57.1732V37.8061H53.5469V40.346H56.9383V41.1535H53.5469V43.7081H57.232V44.5156H52.6366ZM62.6899 40.1405L61.9118 40.3607C61.8628 40.231 61.7906 40.105 61.6952 39.9826C61.6022 39.8579 61.475 39.7551 61.3135 39.6743C61.152 39.5936 60.9452 39.5532 60.6932 39.5532C60.3482 39.5532 60.0606 39.6327 59.8306 39.7918C59.6031 39.9484 59.4893 40.1478 59.4893 40.3901C59.4893 40.6054 59.5676 40.7755 59.7242 40.9003C59.8808 41.025 60.1255 41.129 60.4583 41.2122L61.2951 41.4178C61.7992 41.5401 62.1748 41.7273 62.4219 41.9794C62.6691 42.2289 62.7927 42.5507 62.7927 42.9447C62.7927 43.2677 62.6997 43.5564 62.5137 43.8109C62.3302 44.0654 62.0733 44.266 61.7429 44.4129C61.4126 44.5597 61.0284 44.6331 60.5904 44.6331C60.0154 44.6331 59.5394 44.5083 59.1626 44.2587C58.7858 44.0091 58.5472 43.6445 58.4469 43.1649L59.269 42.9594C59.3473 43.2628 59.4954 43.4904 59.7132 43.6421C59.9334 43.7938 60.2209 43.8696 60.5757 43.8696C60.9795 43.8696 61.3 43.784 61.5374 43.6127C61.7772 43.439 61.8971 43.231 61.8971 42.9887C61.8971 42.793 61.8286 42.629 61.6915 42.4969C61.5545 42.3623 61.3441 42.262 61.0602 42.1959L60.1206 41.9757C59.6043 41.8533 59.225 41.6637 58.9828 41.4068C58.743 41.1474 58.6231 40.8232 58.6231 40.4341C58.6231 40.116 58.7124 39.8346 58.891 39.5899C59.0721 39.3452 59.318 39.1531 59.6287 39.0137C59.942 38.8742 60.2968 38.8044 60.6932 38.8044C61.2511 38.8044 61.6891 38.9268 62.0072 39.1715C62.3277 39.4162 62.5553 39.7392 62.6899 40.1405ZM66.5484 38.8778V39.6119H63.6268V38.8778H66.5484ZM64.4783 37.5271H65.3445V42.9006C65.3445 43.1453 65.38 43.3289 65.451 43.4512C65.5244 43.5711 65.6174 43.6519 65.7299 43.6934C65.8449 43.7326 65.966 43.7522 66.0933 43.7522C66.1887 43.7522 66.267 43.7473 66.3282 43.7375C66.3894 43.7253 66.4383 43.7155 66.475 43.7081L66.6512 44.4863C66.5925 44.5083 66.5105 44.5303 66.4053 44.5523C66.3001 44.5768 66.1667 44.589 66.0052 44.589C65.7605 44.589 65.5207 44.5364 65.2858 44.4312C65.0533 44.326 64.86 44.1657 64.7059 43.9504C64.5542 43.735 64.4783 43.4634 64.4783 43.1355V37.5271ZM69.5105 44.6478C69.1532 44.6478 68.829 44.5805 68.5378 44.4459C68.2466 44.3089 68.0154 44.1119 67.8441 43.8549C67.6728 43.5956 67.5871 43.2824 67.5871 42.9153C67.5871 42.5923 67.6508 42.3305 67.778 42.1298C67.9053 41.9268 68.0753 41.7677 68.2882 41.6527C68.5011 41.5377 68.736 41.452 68.9929 41.3958C69.2523 41.337 69.5129 41.2905 69.7747 41.2563C70.1173 41.2122 70.395 41.1792 70.6079 41.1572C70.8232 41.1327 70.9798 41.0923 71.0777 41.0361C71.1781 40.9798 71.2282 40.8819 71.2282 40.7424V40.7131C71.2282 40.3509 71.1291 40.0695 70.9309 39.8689C70.7352 39.6682 70.4378 39.5679 70.039 39.5679C69.6255 39.5679 69.3012 39.6584 69.0663 39.8395C68.8314 40.0206 68.6663 40.2139 68.5708 40.4194L67.7486 40.1258C67.8955 39.7832 68.0912 39.5165 68.3359 39.3256C68.5831 39.1323 68.8522 38.9978 69.1434 38.9219C69.437 38.8436 69.7258 38.8044 70.0096 38.8044C70.1907 38.8044 70.3987 38.8265 70.6336 38.8705C70.871 38.9121 71.0997 38.999 71.32 39.1311C71.5426 39.2632 71.7274 39.4627 71.8742 39.7294C72.021 39.9961 72.0944 40.3534 72.0944 40.8012V44.5156H71.2282V43.7522H71.1842C71.1254 43.8745 71.0276 44.0054 70.8905 44.1449C70.7535 44.2844 70.5712 44.4031 70.3436 44.5009C70.1161 44.5988 69.8383 44.6478 69.5105 44.6478ZM69.6426 43.8696C69.9852 43.8696 70.2739 43.8023 70.5088 43.6678C70.7462 43.5332 70.9248 43.3594 71.0447 43.1466C71.167 42.9337 71.2282 42.7098 71.2282 42.4749V41.6821C71.1915 41.7261 71.1108 41.7665 70.986 41.8032C70.8636 41.8374 70.7217 41.868 70.5602 41.8949C70.4011 41.9194 70.2458 41.9414 70.0941 41.961C69.9448 41.9781 69.8237 41.9928 69.7307 42.0051C69.5056 42.0344 69.2951 42.0821 69.0994 42.1482C68.9061 42.2118 68.7495 42.3085 68.6296 42.4382C68.5121 42.5654 68.4534 42.7391 68.4534 42.9594C68.4534 43.2603 68.5647 43.4879 68.7874 43.6421C69.0125 43.7938 69.2976 43.8696 69.6426 43.8696ZM73.7929 44.5156V36.9986H74.6591V39.7734H74.7326C74.7962 39.6756 74.8843 39.5508 74.9968 39.3991C75.1118 39.2449 75.2758 39.1079 75.4887 38.988C75.704 38.8656 75.9952 38.8044 76.3622 38.8044C76.8369 38.8044 77.2554 38.9231 77.6175 39.1605C77.9797 39.3978 78.2623 39.7343 78.4654 40.1698C78.6685 40.6054 78.77 41.1193 78.77 41.7114C78.77 42.3085 78.6685 42.826 78.4654 43.264C78.2623 43.6996 77.9809 44.0372 77.6212 44.277C77.2615 44.5144 76.8467 44.6331 76.3769 44.6331C76.0148 44.6331 75.7248 44.5731 75.507 44.4532C75.2892 44.3309 75.1216 44.1926 75.0042 44.0385C74.8867 43.8819 74.7962 43.7522 74.7326 43.6494H74.6298V44.5156H73.7929ZM74.6445 41.6967C74.6445 42.1225 74.7069 42.4981 74.8317 42.8236C74.9564 43.1466 75.1387 43.3998 75.3785 43.5833C75.6183 43.7644 75.912 43.8549 76.2595 43.8549C76.6216 43.8549 76.9238 43.7595 77.166 43.5687C77.4107 43.3753 77.5943 43.116 77.7166 42.7905C77.8414 42.4626 77.9038 42.098 77.9038 41.6967C77.9038 41.3003 77.8426 40.9431 77.7203 40.625C77.6004 40.3044 77.4181 40.0512 77.1734 39.8652C76.9311 39.6768 76.6265 39.5826 76.2595 39.5826C75.9071 39.5826 75.611 39.6719 75.3712 39.8505C75.1314 40.0267 74.9503 40.2738 74.828 40.5919C74.7056 40.9076 74.6445 41.2759 74.6445 41.6967ZM80.9613 36.9986V44.5156H80.095V36.9986H80.9613ZM82.5478 44.5156V38.8778H83.414V44.5156H82.5478ZM82.9883 37.9382C82.8194 37.9382 82.6738 37.8807 82.5515 37.7657C82.4316 37.6507 82.3716 37.5125 82.3716 37.351C82.3716 37.1895 82.4316 37.0512 82.5515 36.9362C82.6738 36.8212 82.8194 36.7637 82.9883 36.7637C83.1571 36.7637 83.3015 36.8212 83.4214 36.9362C83.5437 37.0512 83.6049 37.1895 83.6049 37.351C83.6049 37.5125 83.5437 37.6507 83.4214 37.7657C83.3015 37.8807 83.1571 37.9382 82.9883 37.9382ZM88.994 40.1405L88.2159 40.3607C88.1669 40.231 88.0947 40.105 87.9993 39.9826C87.9063 39.8579 87.7791 39.7551 87.6176 39.6743C87.4561 39.5936 87.2493 39.5532 86.9973 39.5532C86.6523 39.5532 86.3647 39.6327 86.1347 39.7918C85.9072 39.9484 85.7934 40.1478 85.7934 40.3901C85.7934 40.6054 85.8717 40.7755 86.0283 40.9003C86.1849 41.025 86.4296 41.129 86.7624 41.2122L87.5992 41.4178C88.1033 41.5401 88.4789 41.7273 88.7261 41.9794C88.9732 42.2289 89.0968 42.5507 89.0968 42.9447C89.0968 43.2677 89.0038 43.5564 88.8178 43.8109C88.6343 44.0654 88.3774 44.266 88.047 44.4129C87.7167 44.5597 87.3325 44.6331 86.8945 44.6331C86.3195 44.6331 85.8435 44.5083 85.4667 44.2587C85.0899 44.0091 84.8513 43.6445 84.751 43.1649L85.5732 42.9594C85.6515 43.2628 85.7995 43.4904 86.0173 43.6421C86.2375 43.7938 86.525 43.8696 86.8798 43.8696C87.2836 43.8696 87.6041 43.784 87.8415 43.6127C88.0813 43.439 88.2012 43.231 88.2012 42.9887C88.2012 42.793 88.1327 42.629 87.9956 42.4969C87.8586 42.3623 87.6482 42.262 87.3643 42.1959L86.4247 41.9757C85.9084 41.8533 85.5291 41.6637 85.2869 41.4068C85.0471 41.1474 84.9272 40.8232 84.9272 40.4341C84.9272 40.116 85.0165 39.8346 85.1951 39.5899C85.3762 39.3452 85.6221 39.1531 85.9329 39.0137C86.2461 38.8742 86.6009 38.8044 86.9973 38.8044C87.5552 38.8044 87.9932 38.9268 88.3113 39.1715C88.6318 39.4162 88.8594 39.7392 88.994 40.1405ZM91.2669 41.1242V44.5156H90.4007V36.9986H91.2669V39.7588H91.3403C91.4724 39.4676 91.6707 39.2363 91.9349 39.065C92.2016 38.8913 92.5564 38.8044 92.9993 38.8044C93.3835 38.8044 93.72 38.8815 94.0087 39.0357C94.2975 39.1874 94.5213 39.4211 94.6804 39.7367C94.8419 40.0499 94.9226 40.4488 94.9226 40.9333V44.5156H94.0564V40.992C94.0564 40.5442 93.9402 40.198 93.7077 39.9533C93.4777 39.7061 93.1584 39.5826 92.7498 39.5826C92.4659 39.5826 92.2114 39.6425 91.9863 39.7624C91.7636 39.8823 91.5875 40.0573 91.4578 40.2873C91.3305 40.5173 91.2669 40.7963 91.2669 41.1242ZM101.925 38.8778V39.6119H98.8858V38.8778H101.925ZM99.7961 44.5156V38.0997C99.7961 37.7767 99.8719 37.5076 100.024 37.2922C100.175 37.0769 100.372 36.9154 100.615 36.8077C100.857 36.7001 101.113 36.6462 101.382 36.6462C101.595 36.6462 101.768 36.6634 101.903 36.6976C102.037 36.7319 102.138 36.7637 102.204 36.793L101.954 37.5418C101.91 37.5271 101.849 37.5088 101.771 37.4868C101.695 37.4647 101.595 37.4537 101.47 37.4537C101.183 37.4537 100.977 37.5259 100.849 37.6703C100.725 37.8146 100.662 38.0263 100.662 38.3053V44.5156H99.7961ZM103.139 44.5156V38.8778H104.005V44.5156H103.139ZM103.579 37.9382C103.411 37.9382 103.265 37.8807 103.143 37.7657C103.023 37.6507 102.963 37.5125 102.963 37.351C102.963 37.1895 103.023 37.0512 103.143 36.9362C103.265 36.8212 103.411 36.7637 103.579 36.7637C103.748 36.7637 103.893 36.8212 104.012 36.9362C104.135 37.0512 104.196 37.1895 104.196 37.351C104.196 37.5125 104.135 37.6507 104.012 37.7657C103.893 37.8807 103.748 37.9382 103.579 37.9382ZM106.458 41.1242V44.5156H105.592V38.8778H106.429V39.7588H106.502C106.634 39.4725 106.835 39.2424 107.104 39.0687C107.373 38.8925 107.721 38.8044 108.146 38.8044C108.528 38.8044 108.862 38.8827 109.148 39.0393C109.435 39.1935 109.657 39.4284 109.816 39.7441C109.975 40.0573 110.055 40.4537 110.055 40.9333V44.5156H109.189V40.992C109.189 40.5491 109.074 40.2041 108.844 39.957C108.614 39.7074 108.298 39.5826 107.897 39.5826C107.62 39.5826 107.373 39.6425 107.155 39.7624C106.94 39.8823 106.77 40.0573 106.645 40.2873C106.52 40.5173 106.458 40.7963 106.458 41.1242ZM113.297 44.6478C112.94 44.6478 112.615 44.5805 112.324 44.4459C112.033 44.3089 111.802 44.1119 111.63 43.8549C111.459 43.5956 111.374 43.2824 111.374 42.9153C111.374 42.5923 111.437 42.3305 111.564 42.1298C111.692 41.9268 111.862 41.7677 112.075 41.6527C112.287 41.5377 112.522 41.452 112.779 41.3958C113.039 41.337 113.299 41.2905 113.561 41.2563C113.904 41.2122 114.181 41.1792 114.394 41.1572C114.61 41.1327 114.766 41.0923 114.864 41.0361C114.964 40.9798 115.015 40.8819 115.015 40.7424V40.7131C115.015 40.3509 114.915 40.0695 114.717 39.8689C114.522 39.6682 114.224 39.5679 113.825 39.5679C113.412 39.5679 113.088 39.6584 112.853 39.8395C112.618 40.0206 112.453 40.2139 112.357 40.4194L111.535 40.1258C111.682 39.7832 111.878 39.5165 112.122 39.3256C112.369 39.1323 112.639 38.9978 112.93 38.9219C113.223 38.8436 113.512 38.8044 113.796 38.8044C113.977 38.8044 114.185 38.8265 114.42 38.8705C114.657 38.9121 114.886 38.999 115.106 39.1311C115.329 39.2632 115.514 39.4627 115.661 39.7294C115.807 39.9961 115.881 40.3534 115.881 40.8012V44.5156H115.015V43.7522H114.971C114.912 43.8745 114.814 44.0054 114.677 44.1449C114.54 44.2844 114.358 44.4031 114.13 44.5009C113.902 44.5988 113.625 44.6478 113.297 44.6478ZM113.429 43.8696C113.772 43.8696 114.06 43.8023 114.295 43.6678C114.533 43.5332 114.711 43.3594 114.831 43.1466C114.953 42.9337 115.015 42.7098 115.015 42.4749V41.6821C114.978 41.7261 114.897 41.7665 114.772 41.8032C114.65 41.8374 114.508 41.868 114.347 41.8949C114.187 41.9194 114.032 41.9414 113.88 41.961C113.731 41.9781 113.61 41.9928 113.517 42.0051C113.292 42.0344 113.081 42.0821 112.886 42.1482C112.692 42.2118 112.536 42.3085 112.416 42.4382C112.298 42.5654 112.24 42.7391 112.24 42.9594C112.24 43.2603 112.351 43.4879 112.574 43.6421C112.799 43.7938 113.084 43.8696 113.429 43.8696ZM118.328 41.1242V44.5156H117.462V38.8778H118.299V39.7588H118.372C118.504 39.4725 118.705 39.2424 118.974 39.0687C119.243 38.8925 119.591 38.8044 120.016 38.8044C120.398 38.8044 120.732 38.8827 121.018 39.0393C121.305 39.1935 121.527 39.4284 121.686 39.7441C121.846 40.0573 121.925 40.4537 121.925 40.9333V44.5156H121.059V40.992C121.059 40.5491 120.944 40.2041 120.714 39.957C120.484 39.7074 120.168 39.5826 119.767 39.5826C119.49 39.5826 119.243 39.6425 119.025 39.7624C118.81 39.8823 118.64 40.0573 118.515 40.2873C118.39 40.5173 118.328 40.7963 118.328 41.1242ZM125.798 44.6331C125.27 44.6331 124.815 44.5083 124.433 44.2587C124.051 44.0091 123.758 43.6653 123.552 43.2273C123.346 42.7893 123.244 42.2889 123.244 41.7261C123.244 41.1535 123.349 40.6482 123.559 40.2102C123.772 39.7698 124.068 39.426 124.448 39.1788C124.829 38.9292 125.275 38.8044 125.784 38.8044C126.18 38.8044 126.537 38.8778 126.855 39.0247C127.173 39.1715 127.434 39.377 127.637 39.6413C127.84 39.9056 127.966 40.2139 128.015 40.5662H127.149C127.083 40.3093 126.936 40.0817 126.709 39.8835C126.483 39.6829 126.18 39.5826 125.798 39.5826C125.461 39.5826 125.165 39.6707 124.91 39.8468C124.658 40.0206 124.461 40.2665 124.319 40.5846C124.18 40.9003 124.11 41.271 124.11 41.6967C124.11 42.1323 124.178 42.5116 124.315 42.8346C124.455 43.1576 124.651 43.4084 124.903 43.587C125.157 43.7656 125.456 43.8549 125.798 43.8549C126.023 43.8549 126.228 43.8158 126.411 43.7375C126.595 43.6592 126.75 43.5466 126.877 43.3998C127.005 43.253 127.095 43.0768 127.149 42.8713H128.015C127.966 43.2041 127.845 43.5038 127.652 43.7705C127.461 44.0348 127.208 44.2452 126.892 44.4018C126.579 44.556 126.214 44.6331 125.798 44.6331ZM129.282 44.5156V38.8778H130.148V44.5156H129.282ZM129.722 37.9382C129.553 37.9382 129.408 37.8807 129.285 37.7657C129.165 37.6507 129.105 37.5125 129.105 37.351C129.105 37.1895 129.165 37.0512 129.285 36.9362C129.408 36.8212 129.553 36.7637 129.722 36.7637C129.891 36.7637 130.035 36.8212 130.155 36.9362C130.277 37.0512 130.339 37.1895 130.339 37.351C130.339 37.5125 130.277 37.6507 130.155 37.7657C130.035 37.8807 129.891 37.9382 129.722 37.9382ZM133.393 44.6478C133.036 44.6478 132.712 44.5805 132.421 44.4459C132.129 44.3089 131.898 44.1119 131.727 43.8549C131.556 43.5956 131.47 43.2824 131.47 42.9153C131.47 42.5923 131.534 42.3305 131.661 42.1298C131.788 41.9268 131.958 41.7677 132.171 41.6527C132.384 41.5377 132.619 41.452 132.876 41.3958C133.135 41.337 133.396 41.2905 133.658 41.2563C134 41.2122 134.278 41.1792 134.491 41.1572C134.706 41.1327 134.863 41.0923 134.961 41.0361C135.061 40.9798 135.111 40.8819 135.111 40.7424V40.7131C135.111 40.3509 135.012 40.0695 134.814 39.8689C134.618 39.6682 134.321 39.5679 133.922 39.5679C133.508 39.5679 133.184 39.6584 132.949 39.8395C132.714 40.0206 132.549 40.2139 132.454 40.4194L131.632 40.1258C131.778 39.7832 131.974 39.5165 132.219 39.3256C132.466 39.1323 132.735 38.9978 133.026 38.9219C133.32 38.8436 133.609 38.8044 133.892 38.8044C134.074 38.8044 134.282 38.8265 134.516 38.8705C134.754 38.9121 134.983 38.999 135.203 39.1311C135.426 39.2632 135.61 39.4627 135.757 39.7294C135.904 39.9961 135.977 40.3534 135.977 40.8012V44.5156H135.111V43.7522H135.067C135.008 43.8745 134.91 44.0054 134.773 44.1449C134.636 44.2844 134.454 44.4031 134.226 44.5009C133.999 44.5988 133.721 44.6478 133.393 44.6478ZM133.525 43.8696C133.868 43.8696 134.157 43.8023 134.392 43.6678C134.629 43.5332 134.808 43.3594 134.928 43.1466C135.05 42.9337 135.111 42.7098 135.111 42.4749V41.6821C135.074 41.7261 134.994 41.7665 134.869 41.8032C134.746 41.8374 134.605 41.868 134.443 41.8949C134.284 41.9194 134.129 41.9414 133.977 41.961C133.828 41.9781 133.707 41.9928 133.614 42.0051C133.388 42.0344 133.178 42.0821 132.982 42.1482C132.789 42.2118 132.632 42.3085 132.512 42.4382C132.395 42.5654 132.336 42.7391 132.336 42.9594C132.336 43.2603 132.448 43.4879 132.67 43.6421C132.895 43.7938 133.18 43.8696 133.525 43.8696ZM138.425 36.9986V44.5156H137.558V36.9986H138.425ZM145.208 44.6331C144.68 44.6331 144.225 44.5083 143.843 44.2587C143.461 44.0091 143.168 43.6653 142.962 43.2273C142.757 42.7893 142.654 42.2889 142.654 41.7261C142.654 41.1535 142.759 40.6482 142.969 40.2102C143.182 39.7698 143.478 39.426 143.858 39.1788C144.239 38.9292 144.685 38.8044 145.194 38.8044C145.59 38.8044 145.947 38.8778 146.265 39.0247C146.584 39.1715 146.844 39.377 147.047 39.6413C147.25 39.9056 147.376 40.2139 147.425 40.5662H146.559C146.493 40.3093 146.346 40.0817 146.119 39.8835C145.894 39.6829 145.59 39.5826 145.208 39.5826C144.871 39.5826 144.575 39.6707 144.32 39.8468C144.068 40.0206 143.871 40.2665 143.729 40.5846C143.59 40.9003 143.52 41.271 143.52 41.6967C143.52 42.1323 143.589 42.5116 143.726 42.8346C143.865 43.1576 144.061 43.4084 144.313 43.587C144.567 43.7656 144.866 43.8549 145.208 43.8549C145.434 43.8549 145.638 43.8158 145.821 43.7375C146.005 43.6592 146.16 43.5466 146.288 43.3998C146.415 43.253 146.505 43.0768 146.559 42.8713H147.425C147.376 43.2041 147.255 43.5038 147.062 43.7705C146.871 44.0348 146.618 44.2452 146.302 44.4018C145.989 44.556 145.624 44.6331 145.208 44.6331ZM150.982 44.6331C150.473 44.6331 150.026 44.512 149.642 44.2697C149.261 44.0275 148.962 43.6886 148.747 43.253C148.534 42.8174 148.427 42.3085 148.427 41.7261C148.427 41.1388 148.534 40.6262 148.747 40.1882C148.962 39.7502 149.261 39.4101 149.642 39.1678C150.026 38.9256 150.473 38.8044 150.982 38.8044C151.491 38.8044 151.936 38.9256 152.318 39.1678C152.702 39.4101 153.001 39.7502 153.214 40.1882C153.429 40.6262 153.537 41.1388 153.537 41.7261C153.537 42.3085 153.429 42.8174 153.214 43.253C153.001 43.6886 152.702 44.0275 152.318 44.2697C151.936 44.512 151.491 44.6331 150.982 44.6331ZM150.982 43.8549C151.369 43.8549 151.687 43.7558 151.936 43.5576C152.186 43.3594 152.371 43.0988 152.491 42.7758C152.61 42.4528 152.67 42.1029 152.67 41.7261C152.67 41.3493 152.61 40.9981 152.491 40.6727C152.371 40.3472 152.186 40.0842 151.936 39.8835C151.687 39.6829 151.369 39.5826 150.982 39.5826C150.595 39.5826 150.277 39.6829 150.028 39.8835C149.778 40.0842 149.593 40.3472 149.473 40.6727C149.354 40.9981 149.294 41.3493 149.294 41.7261C149.294 42.1029 149.354 42.4528 149.473 42.7758C149.593 43.0988 149.778 43.3594 150.028 43.5576C150.277 43.7558 150.595 43.8549 150.982 43.8549ZM155.725 41.1242V44.5156H154.859V38.8778H155.696V39.7588H155.769C155.901 39.4725 156.102 39.2424 156.371 39.0687C156.64 38.8925 156.988 38.8044 157.413 38.8044C157.795 38.8044 158.129 38.8827 158.416 39.0393C158.702 39.1935 158.924 39.4284 159.084 39.7441C159.243 40.0573 159.322 40.4537 159.322 40.9333V44.5156H158.456V40.992C158.456 40.5491 158.341 40.2041 158.111 39.957C157.881 39.7074 157.565 39.5826 157.164 39.5826C156.887 39.5826 156.64 39.6425 156.422 39.7624C156.207 39.8823 156.037 40.0573 155.912 40.2873C155.788 40.5173 155.725 40.7963 155.725 41.1242ZM163.357 38.8778V39.6119H160.435V38.8778H163.357ZM161.287 37.5271H162.153V42.9006C162.153 43.1453 162.188 43.3289 162.259 43.4512C162.333 43.5711 162.426 43.6519 162.538 43.6934C162.653 43.7326 162.774 43.7522 162.902 43.7522C162.997 43.7522 163.075 43.7473 163.137 43.7375C163.198 43.7253 163.247 43.7155 163.283 43.7081L163.46 44.4863C163.401 44.5083 163.319 44.5303 163.214 44.5523C163.108 44.5768 162.975 44.589 162.814 44.589C162.569 44.589 162.329 44.5364 162.094 44.4312C161.862 44.326 161.668 44.1657 161.514 43.9504C161.363 43.735 161.287 43.4634 161.287 43.1355V37.5271ZM164.66 44.5156V38.8778H165.497V39.7294H165.555C165.658 39.4504 165.844 39.2241 166.113 39.0504C166.382 38.8766 166.686 38.7898 167.024 38.7898C167.087 38.7898 167.167 38.791 167.262 38.7934C167.358 38.7959 167.43 38.7995 167.479 38.8044V39.6853C167.449 39.678 167.382 39.667 167.277 39.6523C167.174 39.6352 167.065 39.6266 166.95 39.6266C166.676 39.6266 166.431 39.6841 166.216 39.7991C166.003 39.9117 165.834 40.0683 165.71 40.2689C165.587 40.4671 165.526 40.6935 165.526 40.948V44.5156H164.66ZM170.624 44.6331C170.115 44.6331 169.669 44.512 169.285 44.2697C168.903 44.0275 168.604 43.6886 168.389 43.253C168.176 42.8174 168.07 42.3085 168.07 41.7261C168.07 41.1388 168.176 40.6262 168.389 40.1882C168.604 39.7502 168.903 39.4101 169.285 39.1678C169.669 38.9256 170.115 38.8044 170.624 38.8044C171.133 38.8044 171.579 38.9256 171.96 39.1678C172.344 39.4101 172.643 39.7502 172.856 40.1882C173.071 40.6262 173.179 41.1388 173.179 41.7261C173.179 42.3085 173.071 42.8174 172.856 43.253C172.643 43.6886 172.344 44.0275 171.96 44.2697C171.579 44.512 171.133 44.6331 170.624 44.6331ZM170.624 43.8549C171.011 43.8549 171.329 43.7558 171.579 43.5576C171.828 43.3594 172.013 43.0988 172.133 42.7758C172.253 42.4528 172.313 42.1029 172.313 41.7261C172.313 41.3493 172.253 40.9981 172.133 40.6727C172.013 40.3472 171.828 40.0842 171.579 39.8835C171.329 39.6829 171.011 39.5826 170.624 39.5826C170.238 39.5826 169.92 39.6829 169.67 39.8835C169.42 40.0842 169.236 40.3472 169.116 40.6727C168.996 40.9981 168.936 41.3493 168.936 41.7261C168.936 42.1029 168.996 42.4528 169.116 42.7758C169.236 43.0988 169.42 43.3594 169.67 43.5576C169.92 43.7558 170.238 43.8549 170.624 43.8549ZM175.367 36.9986V44.5156H174.501V36.9986H175.367ZM180.947 40.1405L180.169 40.3607C180.12 40.231 180.048 40.105 179.953 39.9826C179.86 39.8579 179.732 39.7551 179.571 39.6743C179.409 39.5936 179.203 39.5532 178.951 39.5532C178.606 39.5532 178.318 39.6327 178.088 39.7918C177.861 39.9484 177.747 40.1478 177.747 40.3901C177.747 40.6054 177.825 40.7755 177.982 40.9003C178.138 41.025 178.383 41.129 178.716 41.2122L179.553 41.4178C180.057 41.5401 180.432 41.7273 180.679 41.9794C180.927 42.2289 181.05 42.5507 181.05 42.9447C181.05 43.2677 180.957 43.5564 180.771 43.8109C180.588 44.0654 180.331 44.266 180 44.4129C179.67 44.5597 179.286 44.6331 178.848 44.6331C178.273 44.6331 177.797 44.5083 177.42 44.2587C177.043 44.0091 176.805 43.6445 176.704 43.1649L177.527 42.9594C177.605 43.2628 177.753 43.4904 177.971 43.6421C178.191 43.7938 178.478 43.8696 178.833 43.8696C179.237 43.8696 179.557 43.784 179.795 43.6127C180.035 43.439 180.155 43.231 180.155 42.9887C180.155 42.793 180.086 42.629 179.949 42.4969C179.812 42.3623 179.602 42.262 179.318 42.1959L178.378 41.9757C177.862 41.8533 177.482 41.6637 177.24 41.4068C177 41.1474 176.881 40.8232 176.881 40.4341C176.881 40.116 176.97 39.8346 177.148 39.5899C177.33 39.3452 177.575 39.1531 177.886 39.0137C178.199 38.8742 178.554 38.8044 178.951 38.8044C179.509 38.8044 179.947 38.9268 180.265 39.1715C180.585 39.4162 180.813 39.7392 180.947 40.1405ZM186.92 44.6478C186.563 44.6478 186.239 44.5805 185.947 44.4459C185.656 44.3089 185.425 44.1119 185.254 43.8549C185.082 43.5956 184.997 43.2824 184.997 42.9153C184.997 42.5923 185.06 42.3305 185.188 42.1298C185.315 41.9268 185.485 41.7677 185.698 41.6527C185.911 41.5377 186.146 41.452 186.403 41.3958C186.662 41.337 186.923 41.2905 187.184 41.2563C187.527 41.2122 187.805 41.1792 188.018 41.1572C188.233 41.1327 188.389 41.0923 188.487 41.0361C188.588 40.9798 188.638 40.8819 188.638 40.7424V40.7131C188.638 40.3509 188.539 40.0695 188.341 39.8689C188.145 39.6682 187.847 39.5679 187.449 39.5679C187.035 39.5679 186.711 39.6584 186.476 39.8395C186.241 40.0206 186.076 40.2139 185.98 40.4194L185.158 40.1258C185.305 39.7832 185.501 39.5165 185.746 39.3256C185.993 39.1323 186.262 38.9978 186.553 38.9219C186.847 38.8436 187.135 38.8044 187.419 38.8044C187.6 38.8044 187.808 38.8265 188.043 38.8705C188.281 38.9121 188.509 38.999 188.73 39.1311C188.952 39.2632 189.137 39.4627 189.284 39.7294C189.431 39.9961 189.504 40.3534 189.504 40.8012V44.5156H188.638V43.7522H188.594C188.535 43.8745 188.437 44.0054 188.3 44.1449C188.163 44.2844 187.981 44.4031 187.753 44.5009C187.526 44.5988 187.248 44.6478 186.92 44.6478ZM187.052 43.8696C187.395 43.8696 187.684 43.8023 187.918 43.6678C188.156 43.5332 188.334 43.3594 188.454 43.1466C188.577 42.9337 188.638 42.7098 188.638 42.4749V41.6821C188.601 41.7261 188.52 41.7665 188.396 41.8032C188.273 41.8374 188.131 41.868 187.97 41.8949C187.811 41.9194 187.655 41.9414 187.504 41.961C187.354 41.9781 187.233 41.9928 187.14 42.0051C186.915 42.0344 186.705 42.0821 186.509 42.1482C186.316 42.2118 186.159 42.3085 186.039 42.4382C185.922 42.5654 185.863 42.7391 185.863 42.9594C185.863 43.2603 185.974 43.4879 186.197 43.6421C186.422 43.7938 186.707 43.8696 187.052 43.8696ZM191.951 41.1242V44.5156H191.085V38.8778H191.922V39.7588H191.995C192.127 39.4725 192.328 39.2424 192.597 39.0687C192.866 38.8925 193.214 38.8044 193.64 38.8044C194.021 38.8044 194.355 38.8827 194.642 39.0393C194.928 39.1935 195.151 39.4284 195.31 39.7441C195.469 40.0573 195.548 40.4537 195.548 40.9333V44.5156H194.682V40.992C194.682 40.5491 194.567 40.2041 194.337 39.957C194.107 39.7074 193.791 39.5826 193.39 39.5826C193.114 39.5826 192.866 39.6425 192.649 39.7624C192.433 39.8823 192.263 40.0573 192.138 40.2873C192.014 40.5173 191.951 40.7963 191.951 41.1242ZM199.26 44.6331C198.79 44.6331 198.375 44.5144 198.016 44.277C197.656 44.0372 197.375 43.6996 197.172 43.264C196.968 42.826 196.867 42.3085 196.867 41.7114C196.867 41.1193 196.968 40.6054 197.172 40.1698C197.375 39.7343 197.657 39.3978 198.019 39.1605C198.382 38.9231 198.8 38.8044 199.275 38.8044C199.642 38.8044 199.932 38.8656 200.145 38.988C200.36 39.1079 200.524 39.2449 200.636 39.3991C200.751 39.5508 200.841 39.6756 200.904 39.7734H200.978V36.9986H201.844V44.5156H201.007V43.6494H200.904C200.841 43.7522 200.75 43.8819 200.633 44.0385C200.515 44.1926 200.348 44.3309 200.13 44.4532C199.912 44.5731 199.622 44.6331 199.26 44.6331ZM199.377 43.8549C199.725 43.8549 200.019 43.7644 200.258 43.5833C200.498 43.3998 200.68 43.1466 200.805 42.8236C200.93 42.4981 200.992 42.1225 200.992 41.6967C200.992 41.2759 200.931 40.9076 200.809 40.5919C200.687 40.2738 200.506 40.0267 200.266 39.8505C200.026 39.6719 199.73 39.5826 199.377 39.5826C199.01 39.5826 198.705 39.6768 198.46 39.8652C198.218 40.0512 198.035 40.3044 197.913 40.625C197.793 40.9431 197.733 41.3003 197.733 41.6967C197.733 42.098 197.794 42.4626 197.917 42.7905C198.041 43.116 198.225 43.3753 198.467 43.5687C198.712 43.7595 199.015 43.8549 199.377 43.8549ZM206.458 44.5156V38.8778H207.295V39.7294H207.353C207.456 39.4504 207.642 39.2241 207.911 39.0504C208.18 38.8766 208.484 38.7898 208.821 38.7898C208.885 38.7898 208.965 38.791 209.06 38.7934C209.156 38.7959 209.228 38.7995 209.277 38.8044V39.6853C209.247 39.678 209.18 39.667 209.075 39.6523C208.972 39.6352 208.863 39.6266 208.748 39.6266C208.474 39.6266 208.229 39.6841 208.014 39.7991C207.801 39.9117 207.632 40.0683 207.507 40.2689C207.385 40.4671 207.324 40.6935 207.324 40.948V44.5156H206.458ZM212.496 44.6331C211.952 44.6331 211.484 44.5132 211.09 44.2734C210.698 44.0311 210.396 43.6934 210.183 43.2603C209.973 42.8248 209.868 42.3183 209.868 41.7408C209.868 41.1633 209.973 40.6543 210.183 40.2139C210.396 39.771 210.692 39.426 211.071 39.1788C211.453 38.9292 211.899 38.8044 212.407 38.8044C212.701 38.8044 212.991 38.8534 213.277 38.9513C213.564 39.0491 213.824 39.2082 214.059 39.4284C214.294 39.6462 214.481 39.9349 214.621 40.2946C214.76 40.6543 214.83 41.0972 214.83 41.6233V41.9904H210.484V41.2416H213.949C213.949 40.9235 213.885 40.6397 213.758 40.3901C213.633 40.1405 213.455 39.9435 213.222 39.7991C212.992 39.6548 212.721 39.5826 212.407 39.5826C212.062 39.5826 211.764 39.6682 211.512 39.8395C211.262 40.0083 211.07 40.2286 210.936 40.5002C210.801 40.7718 210.734 41.063 210.734 41.3737V41.8729C210.734 42.2987 210.807 42.6596 210.954 42.9557C211.103 43.2493 211.31 43.4732 211.574 43.6274C211.839 43.7791 212.146 43.8549 212.496 43.8549C212.723 43.8549 212.929 43.8231 213.112 43.7595C213.298 43.6934 213.458 43.5956 213.593 43.4659C213.728 43.3337 213.832 43.1698 213.905 42.974L214.742 43.209C214.654 43.4928 214.506 43.7424 214.298 43.9577C214.09 44.1706 213.833 44.337 213.527 44.4569C213.221 44.5744 212.877 44.6331 212.496 44.6331ZM216.148 46.6298V38.8778H216.985V39.7734H217.087C217.151 39.6756 217.239 39.5508 217.352 39.3991C217.467 39.2449 217.631 39.1079 217.843 38.988C218.059 38.8656 218.35 38.8044 218.717 38.8044C219.192 38.8044 219.61 38.9231 219.972 39.1605C220.334 39.3978 220.617 39.7343 220.82 40.1698C221.023 40.6054 221.125 41.1193 221.125 41.7114C221.125 42.3085 221.023 42.826 220.82 43.264C220.617 43.6996 220.336 44.0372 219.976 44.277C219.616 44.5144 219.201 44.6331 218.732 44.6331C218.37 44.6331 218.08 44.5731 217.862 44.4532C217.644 44.3309 217.476 44.1926 217.359 44.0385C217.241 43.8819 217.151 43.7522 217.087 43.6494H217.014V46.6298H216.148ZM216.999 41.6967C216.999 42.1225 217.062 42.4981 217.186 42.8236C217.311 43.1466 217.493 43.3998 217.733 43.5833C217.973 43.7644 218.267 43.8549 218.614 43.8549C218.976 43.8549 219.279 43.7595 219.521 43.5687C219.765 43.3753 219.949 43.116 220.071 42.7905C220.196 42.4626 220.259 42.098 220.259 41.6967C220.259 41.3003 220.197 40.9431 220.075 40.625C219.955 40.3044 219.773 40.0512 219.528 39.8652C219.286 39.6768 218.981 39.5826 218.614 39.5826C218.262 39.5826 217.966 39.6719 217.726 39.8505C217.486 40.0267 217.305 40.2738 217.183 40.5919C217.06 40.9076 216.999 41.2759 216.999 41.6967ZM224.736 44.6331C224.227 44.6331 223.781 44.512 223.397 44.2697C223.015 44.0275 222.717 43.6886 222.501 43.253C222.288 42.8174 222.182 42.3085 222.182 41.7261C222.182 41.1388 222.288 40.6262 222.501 40.1882C222.717 39.7502 223.015 39.4101 223.397 39.1678C223.781 38.9256 224.227 38.8044 224.736 38.8044C225.245 38.8044 225.691 38.9256 226.072 39.1678C226.457 39.4101 226.755 39.7502 226.968 40.1882C227.183 40.6262 227.291 41.1388 227.291 41.7261C227.291 42.3085 227.183 42.8174 226.968 43.253C226.755 43.6886 226.457 44.0275 226.072 44.2697C225.691 44.512 225.245 44.6331 224.736 44.6331ZM224.736 43.8549C225.123 43.8549 225.441 43.7558 225.691 43.5576C225.94 43.3594 226.125 43.0988 226.245 42.7758C226.365 42.4528 226.425 42.1029 226.425 41.7261C226.425 41.3493 226.365 40.9981 226.245 40.6727C226.125 40.3472 225.94 40.0842 225.691 39.8835C225.441 39.6829 225.123 39.5826 224.736 39.5826C224.35 39.5826 224.032 39.6829 223.782 39.8835C223.533 40.0842 223.348 40.3472 223.228 40.6727C223.108 40.9981 223.048 41.3493 223.048 41.7261C223.048 42.1029 223.108 42.4528 223.228 42.7758C223.348 43.0988 223.533 43.3594 223.782 43.5576C224.032 43.7558 224.35 43.8549 224.736 43.8549ZM228.613 44.5156V38.8778H229.45V39.7294H229.509C229.612 39.4504 229.798 39.2241 230.067 39.0504C230.336 38.8766 230.639 38.7898 230.977 38.7898C231.041 38.7898 231.12 38.791 231.216 38.7934C231.311 38.7959 231.383 38.7995 231.432 38.8044V39.6853C231.403 39.678 231.336 39.667 231.23 39.6523C231.128 39.6352 231.019 39.6266 230.904 39.6266C230.63 39.6266 230.385 39.6841 230.17 39.7991C229.957 39.9117 229.788 40.0683 229.663 40.2689C229.541 40.4671 229.48 40.6935 229.48 40.948V44.5156H228.613ZM235.264 38.8778V39.6119H232.342V38.8778H235.264ZM233.194 37.5271H234.06V42.9006C234.06 43.1453 234.096 43.3289 234.167 43.4512C234.24 43.5711 234.333 43.6519 234.446 43.6934C234.561 43.7326 234.682 43.7522 234.809 43.7522C234.904 43.7522 234.983 43.7473 235.044 43.7375C235.105 43.7253 235.154 43.7155 235.191 43.7081L235.367 44.4863C235.308 44.5083 235.226 44.5303 235.121 44.5523C235.016 44.5768 234.882 44.589 234.721 44.589C234.476 44.589 234.236 44.5364 234.002 44.4312C233.769 44.326 233.576 44.1657 233.422 43.9504C233.27 43.735 233.194 43.4634 233.194 43.1355V37.5271ZM236.567 44.5156V38.8778H237.433V44.5156H236.567ZM237.008 37.9382C236.839 37.9382 236.693 37.8807 236.571 37.7657C236.451 37.6507 236.391 37.5125 236.391 37.351C236.391 37.1895 236.451 37.0512 236.571 36.9362C236.693 36.8212 236.839 36.7637 237.008 36.7637C237.176 36.7637 237.321 36.8212 237.441 36.9362C237.563 37.0512 237.624 37.1895 237.624 37.351C237.624 37.5125 237.563 37.6507 237.441 37.7657C237.321 37.8807 237.176 37.9382 237.008 37.9382ZM239.886 41.1242V44.5156H239.02V38.8778H239.857V39.7588H239.93C240.062 39.4725 240.263 39.2424 240.532 39.0687C240.801 38.8925 241.149 38.8044 241.575 38.8044C241.956 38.8044 242.29 38.8827 242.577 39.0393C242.863 39.1935 243.086 39.4284 243.245 39.7441C243.404 40.0573 243.483 40.4537 243.483 40.9333V44.5156H242.617V40.992C242.617 40.5491 242.502 40.2041 242.272 39.957C242.042 39.7074 241.726 39.5826 241.325 39.5826C241.048 39.5826 240.801 39.6425 240.584 39.7624C240.368 39.8823 240.198 40.0573 240.073 40.2873C239.949 40.5173 239.886 40.7963 239.886 41.1242ZM247.342 46.7472C246.923 46.7472 246.564 46.6934 246.263 46.5857C245.962 46.4805 245.711 46.3411 245.51 46.1673C245.312 45.996 245.154 45.8125 245.037 45.6168L245.727 45.1323C245.805 45.235 245.904 45.3525 246.024 45.4846C246.144 45.6192 246.308 45.7354 246.516 45.8333C246.726 45.9336 247.002 45.9838 247.342 45.9838C247.797 45.9838 248.172 45.8737 248.469 45.6535C248.765 45.4332 248.913 45.0882 248.913 44.6184V43.4732H248.839C248.776 43.576 248.685 43.7032 248.568 43.8549C248.453 44.0042 248.286 44.1376 248.068 44.255C247.853 44.37 247.562 44.4275 247.195 44.4275C246.74 44.4275 246.331 44.3199 245.969 44.1045C245.609 43.8892 245.324 43.576 245.114 43.1649C244.906 42.7538 244.802 42.2546 244.802 41.6674C244.802 41.0899 244.903 40.587 245.106 40.1588C245.31 39.7282 245.592 39.3954 245.954 39.1605C246.316 38.9231 246.735 38.8044 247.21 38.8044C247.577 38.8044 247.868 38.8656 248.083 38.988C248.301 39.1079 248.467 39.2449 248.582 39.3991C248.7 39.5508 248.79 39.6756 248.854 39.7734H248.942V38.8778H249.779V44.6771C249.779 45.1616 249.669 45.5556 249.449 45.859C249.231 46.1649 248.937 46.3888 248.568 46.5307C248.201 46.6751 247.792 46.7472 247.342 46.7472ZM247.312 43.6494C247.66 43.6494 247.953 43.5699 248.193 43.4108C248.433 43.2518 248.615 43.023 248.74 42.7245C248.865 42.4259 248.927 42.0687 248.927 41.6527C248.927 41.2465 248.866 40.888 248.744 40.5773C248.621 40.2665 248.44 40.023 248.201 39.8468C247.961 39.6707 247.665 39.5826 247.312 39.5826C246.945 39.5826 246.639 39.6756 246.395 39.8615C246.152 40.0475 245.97 40.2971 245.848 40.6103C245.728 40.9235 245.668 41.271 245.668 41.6527C245.668 42.0442 245.729 42.3904 245.852 42.6914C245.976 42.99 246.16 43.2249 246.402 43.3961C246.647 43.565 246.95 43.6494 247.312 43.6494ZM254.903 44.5744C254.722 44.5744 254.566 44.5095 254.437 44.3798C254.307 44.2501 254.242 44.0947 254.242 43.9137C254.242 43.7326 254.307 43.5772 254.437 43.4475C254.566 43.3178 254.722 43.253 254.903 43.253C255.084 43.253 255.239 43.3178 255.369 43.4475C255.499 43.5772 255.563 43.7326 255.563 43.9137C255.563 44.0336 255.533 44.1437 255.472 44.244C255.413 44.3443 255.333 44.4251 255.233 44.4863C255.135 44.545 255.025 44.5744 254.903 44.5744ZM257.749 44.5744C257.568 44.5744 257.413 44.5095 257.283 44.3798C257.153 44.2501 257.089 44.0947 257.089 43.9137C257.089 43.7326 257.153 43.5772 257.283 43.4475C257.413 43.3178 257.568 43.253 257.749 43.253C257.93 43.253 258.086 43.3178 258.215 43.4475C258.345 43.5772 258.41 43.7326 258.41 43.9137C258.41 44.0336 258.379 44.1437 258.318 44.244C258.259 44.3443 258.18 44.4251 258.08 44.4863C257.982 44.545 257.872 44.5744 257.749 44.5744ZM260.596 44.5744C260.415 44.5744 260.259 44.5095 260.129 44.3798C260 44.2501 259.935 44.0947 259.935 43.9137C259.935 43.7326 260 43.5772 260.129 43.4475C260.259 43.3178 260.415 43.253 260.596 43.253C260.777 43.253 260.932 43.3178 261.062 43.4475C261.191 43.5772 261.256 43.7326 261.256 43.9137C261.256 44.0336 261.226 44.1437 261.165 44.244C261.106 44.3443 261.026 44.4251 260.926 44.4863C260.828 44.545 260.718 44.5744 260.596 44.5744Z" fill="#343A40"/>
-<rect x="34.7461" y="59.5703" width="13.289" height="13.289" rx="2.95312" fill="#FFEDD5"/>
-<rect x="38.0684" y="62.8945" width="6.09081" height="6.09081" rx="3.04541" fill="#FFEDD5"/>
-<path d="M42.8269 67.9707C42.7381 67.9707 42.663 67.94 42.6017 67.8787C42.5404 67.8174 42.5097 67.7423 42.5097 67.6535V64.2274C42.5097 64.1386 42.5404 64.0635 42.6017 64.0022C42.663 63.9408 42.7381 63.9102 42.8269 63.9102C42.9158 63.9102 42.9908 63.9408 43.0522 64.0022C43.1135 64.0635 43.1442 64.1386 43.1442 64.2274V67.6535C43.1442 67.7423 43.1135 67.8174 43.0522 67.8787C42.9908 67.94 42.9158 67.9707 42.8269 67.9707ZM39.661 67.9707C39.6144 67.9707 39.5711 67.9622 39.5309 67.9453C39.4907 67.9284 39.4569 67.9062 39.4294 67.8787C39.4019 67.8512 39.3797 67.8174 39.3628 67.7772C39.3459 67.737 39.3374 67.6958 39.3374 67.6535V66.7652C39.3374 66.6764 39.3681 66.6013 39.4294 66.54C39.4907 66.4787 39.5658 66.448 39.6546 66.448C39.7435 66.448 39.8185 66.4787 39.8799 66.54C39.9412 66.6013 39.9719 66.6764 39.9719 66.7652V67.6535C39.9719 67.6958 39.9634 67.737 39.9465 67.7772C39.9296 67.8174 39.9074 67.8512 39.8799 67.8787C39.8524 67.9062 39.8196 67.9284 39.7815 67.9453C39.7435 67.9622 39.7033 67.9707 39.661 67.9707ZM41.2408 67.9707C41.152 67.9707 41.0769 67.94 41.0155 67.8787C40.9542 67.8174 40.9236 67.7423 40.9236 67.6535V65.4963C40.9236 65.4075 40.9542 65.3324 41.0155 65.2711C41.0769 65.2097 41.152 65.1791 41.2408 65.1791C41.3296 65.1791 41.4047 65.2097 41.466 65.2711C41.5273 65.3324 41.558 65.4075 41.558 65.4963V67.6535C41.558 67.7423 41.5273 67.8174 41.466 67.8787C41.4047 67.94 41.3296 67.9707 41.2408 67.9707Z" fill="#FF6B00"/>
-<circle cx="19.9805" cy="66.2148" r="6.64452" stroke="#FCBE1D" stroke-width="0.55371" stroke-linecap="round" stroke-dasharray="0 11.07 0 5.54"/>
-<path d="M23.1463 62.1299C22.2334 61.4224 21.1098 61.0412 19.9549 61.0469C18.8 61.0527 17.6802 61.4452 16.7744 62.1617L19.9807 66.2148L23.1463 62.1299Z" fill="#FCBE1D"/>
-<path d="M16.8061 70.2998C17.719 71.0072 18.8426 71.3885 19.9975 71.3827C21.1524 71.377 22.2721 70.9845 23.1779 70.268L19.9717 66.2149L16.8061 70.2998Z" fill="#FCBE1D"/>
-<path d="M63.783 67.3086C63.6734 67.3086 63.5815 67.2715 63.5074 67.1974C63.4333 67.1233 63.3962 67.0314 63.3962 66.9219C63.3962 66.8123 63.4333 66.7205 63.5074 66.6463C63.5815 66.5722 63.6734 66.5352 63.783 66.5352C63.8925 66.5352 63.9844 66.5722 64.0585 66.6463C64.1326 66.7205 64.1697 66.8123 64.1697 66.9219C64.1697 67.0314 64.1326 67.1233 64.0585 67.1974C63.9844 67.2715 63.8925 67.3086 63.783 67.3086ZM62.2361 67.3086C62.1265 67.3086 62.0347 67.2715 61.9605 67.1974C61.8864 67.1233 61.8494 67.0314 61.8494 66.9219C61.8494 66.8123 61.8864 66.7205 61.9605 66.6463C62.0347 66.5722 62.1265 66.5352 62.2361 66.5352C62.3457 66.5352 62.4375 66.5722 62.5116 66.6463C62.5857 66.7205 62.6228 66.8123 62.6228 66.9219C62.6228 67.0314 62.5857 67.1233 62.5116 67.1974C62.4375 67.2715 62.3457 67.3086 62.2361 67.3086ZM65.3298 67.3086C65.2203 67.3086 65.1284 67.2715 65.0543 67.1974C64.9802 67.1233 64.9431 67.0314 64.9431 66.9219C64.9431 66.8123 64.9802 66.7205 65.0543 66.6463C65.1284 66.5722 65.2203 66.5352 65.3298 66.5352C65.4394 66.5352 65.5312 66.5722 65.6054 66.6463C65.6795 66.7205 65.7165 66.8123 65.7165 66.9219C65.7165 67.0314 65.6795 67.1233 65.6054 67.1974C65.5312 67.2715 65.4394 67.3086 65.3298 67.3086ZM63.783 68.8555C63.6734 68.8555 63.5815 68.8184 63.5074 68.7443C63.4333 68.6702 63.3962 68.5783 63.3962 68.4687C63.3962 68.3592 63.4333 68.2673 63.5074 68.1932C63.5815 68.1191 63.6734 68.082 63.783 68.082C63.8925 68.082 63.9844 68.1191 64.0585 68.1932C64.1326 68.2673 64.1697 68.3592 64.1697 68.4687C64.1697 68.5783 64.1326 68.6702 64.0585 68.7443C63.9844 68.8184 63.8925 68.8555 63.783 68.8555ZM62.2361 68.8555C62.1265 68.8555 62.0347 68.8184 61.9605 68.7443C61.8864 68.6702 61.8494 68.5783 61.8494 68.4687C61.8494 68.3592 61.8864 68.2673 61.9605 68.1932C62.0347 68.1191 62.1265 68.082 62.2361 68.082C62.3457 68.082 62.4375 68.1191 62.5116 68.1932C62.5857 68.2673 62.6228 68.3592 62.6228 68.4687C62.6228 68.5783 62.5857 68.6702 62.5116 68.7443C62.4375 68.8184 62.3457 68.8555 62.2361 68.8555ZM65.3298 68.8555C65.2203 68.8555 65.1284 68.8184 65.0543 68.7443C64.9802 68.6702 64.9431 68.5783 64.9431 68.4687C64.9431 68.3592 64.9802 68.2673 65.0543 68.1932C65.1284 68.1191 65.2203 68.082 65.3298 68.082C65.4394 68.082 65.5312 68.1191 65.6054 68.1932C65.6795 68.2673 65.7165 68.3592 65.7165 68.4687C65.7165 68.5783 65.6795 68.6702 65.6054 68.7443C65.5312 68.8184 65.4394 68.8555 65.3298 68.8555ZM60.8826 70.4023C60.7279 70.4023 60.5925 70.3443 60.4765 70.2283C60.3605 70.1123 60.3025 69.9769 60.3025 69.8223V63.8281C60.3025 63.6734 60.3605 63.5381 60.4765 63.4221C60.5925 63.3061 60.7279 63.248 60.8826 63.248H61.511V62.9773C61.511 62.8871 61.54 62.813 61.598 62.755C61.656 62.697 61.7301 62.668 61.8204 62.668C61.9106 62.668 61.9863 62.697 62.0476 62.755C62.1088 62.813 62.1394 62.8871 62.1394 62.9773V63.248H65.4265V62.9773C65.4265 62.8871 65.4555 62.813 65.5135 62.755C65.5715 62.697 65.6456 62.668 65.7359 62.668C65.8261 62.668 65.9018 62.697 65.9631 62.755C66.0243 62.813 66.0549 62.8871 66.0549 62.9773V63.248H66.6833C66.838 63.248 66.9734 63.3061 67.0894 63.4221C67.2054 63.5381 67.2634 63.6734 67.2634 63.8281V69.8223C67.2634 69.9769 67.2054 70.1123 67.0894 70.2283C66.9734 70.3443 66.838 70.4023 66.6833 70.4023H60.8826ZM60.8826 69.8223H66.6833V65.665H60.8826V69.8223ZM60.8826 65.085H66.6833V63.8281H60.8826V65.085ZM60.8826 65.085V63.8281V65.085Z" fill="#858E96"/>
-<path d="M72.9189 70.1719H71.3567V65.1094H72.9882C73.4792 65.1094 73.8995 65.2107 74.2488 65.4134C74.5982 65.6145 74.866 65.9037 75.0522 66.2811C75.2384 66.6568 75.3315 67.1067 75.3315 67.6307C75.3315 68.1581 75.2376 68.6121 75.0497 68.9928C74.8619 69.3718 74.5883 69.6635 74.2291 69.8678C73.8698 70.0705 73.4331 70.1719 72.9189 70.1719ZM71.9697 69.6281H72.8794C73.298 69.6281 73.6449 69.5473 73.9201 69.3858C74.1953 69.2243 74.4004 68.9944 74.5356 68.6961C74.6707 68.3979 74.7383 68.0427 74.7383 67.6307C74.7383 67.2221 74.6715 66.8702 74.538 66.5752C74.4046 66.2786 74.2052 66.0512 73.9398 65.893C73.6745 65.7331 73.3441 65.6532 72.9486 65.6532H71.9697V69.6281ZM77.8727 70.251C77.5068 70.251 77.1912 70.1702 76.9259 70.0087C76.6623 69.8456 76.4587 69.6182 76.3154 69.3265C76.1736 69.0331 76.1028 68.692 76.1028 68.3031C76.1028 67.9142 76.1736 67.5714 76.3154 67.2748C76.4587 66.9765 76.6581 66.7441 76.9136 66.5777C77.1706 66.4096 77.4706 66.3256 77.8133 66.3256C78.0111 66.3256 78.2064 66.3585 78.3992 66.4244C78.592 66.4904 78.7675 66.5975 78.9257 66.7458C79.0839 66.8925 79.21 67.0869 79.3039 67.3292C79.3978 67.5714 79.4448 67.8697 79.4448 68.224V68.4712H76.5181V67.9669H78.8516C78.8516 67.7527 78.8087 67.5615 78.723 67.3934C78.639 67.2253 78.5187 67.0927 78.3621 66.9955C78.2072 66.8982 78.0243 66.8496 77.8133 66.8496C77.581 66.8496 77.3799 66.9073 77.2102 67.0226C77.0421 67.1364 76.9127 67.2847 76.8221 67.4676C76.7315 67.6505 76.6861 67.8466 76.6861 68.0559V68.3921C76.6861 68.6788 76.7356 68.9219 76.8345 69.1213C76.935 69.3191 77.0742 69.4698 77.2522 69.5737C77.4302 69.6758 77.637 69.7269 77.8727 69.7269C78.0259 69.7269 78.1644 69.7055 78.288 69.6627C78.4132 69.6182 78.5211 69.5522 78.6118 69.4649C78.7024 69.3759 78.7724 69.2655 78.8219 69.1337L79.3855 69.2919C79.3262 69.483 79.2265 69.6511 79.0864 69.7961C78.9463 69.9395 78.7733 70.0516 78.5673 70.1323C78.3613 70.2114 78.1298 70.251 77.8727 70.251ZM81.8747 70.251C81.5188 70.251 81.2122 70.1669 80.9552 69.9988C80.6981 69.8307 80.5003 69.5992 80.3619 69.3042C80.2235 69.0092 80.1543 68.6722 80.1543 68.2932C80.1543 67.9076 80.2251 67.5673 80.3668 67.2723C80.5102 66.9757 80.7096 66.7441 80.965 66.5777C81.2221 66.4096 81.522 66.3256 81.8648 66.3256C82.1318 66.3256 82.3724 66.375 82.5866 66.4739C82.8009 66.5728 82.9764 66.7112 83.1131 66.8892C83.2499 67.0671 83.3348 67.2748 83.3677 67.5121H82.7844C82.7399 67.3391 82.641 67.1858 82.4877 67.0523C82.3361 66.9172 82.1318 66.8496 81.8747 66.8496C81.6473 66.8496 81.4479 66.9089 81.2765 67.0276C81.1068 67.1446 80.9741 67.3102 80.8785 67.5244C80.7846 67.737 80.7376 67.9867 80.7376 68.2734C80.7376 68.5668 80.7838 68.8222 80.8761 69.0397C80.97 69.2573 81.1018 69.4262 81.2716 69.5465C81.4429 69.6668 81.644 69.7269 81.8747 69.7269C82.0263 69.7269 82.1639 69.7006 82.2875 69.6478C82.4111 69.5951 82.5158 69.5193 82.6015 69.4204C82.6871 69.3215 82.7481 69.2029 82.7844 69.0645H83.3677C83.3348 69.2886 83.2532 69.4904 83.123 69.6701C82.9945 69.8481 82.8239 69.9898 82.6113 70.0952C82.4004 70.1991 82.1549 70.251 81.8747 70.251ZM87.9482 65.1094V70.1719H87.3352V65.7521H87.3055L86.0696 66.5728V65.9498L87.3352 65.1094H87.9482ZM89.4042 70.1719V69.7269L91.0752 67.8977C91.2713 67.6835 91.4328 67.4973 91.5597 67.3391C91.6866 67.1792 91.7805 67.0292 91.8415 66.8892C91.9041 66.7474 91.9354 66.5991 91.9354 66.4442C91.9354 66.2662 91.8926 66.1122 91.8069 65.982C91.7228 65.8518 91.6075 65.7513 91.4608 65.6804C91.3141 65.6095 91.1494 65.5741 90.9664 65.5741C90.772 65.5741 90.6022 65.6145 90.4572 65.6952C90.3138 65.7743 90.2026 65.8856 90.1235 66.0289C90.0461 66.1723 90.0073 66.3404 90.0073 66.5332H89.424C89.424 66.2366 89.4923 65.9762 89.6291 65.7521C89.7659 65.528 89.9521 65.3533 90.1878 65.228C90.4251 65.1028 90.6912 65.0402 90.9862 65.0402C91.2828 65.0402 91.5457 65.1028 91.7747 65.228C92.0038 65.3533 92.1834 65.5222 92.3136 65.7348C92.4438 65.9474 92.5089 66.1838 92.5089 66.4442C92.5089 66.6304 92.4751 66.8125 92.4076 66.9905C92.3416 67.1668 92.2263 67.3638 92.0615 67.5813C91.8983 67.7972 91.6718 68.0609 91.3817 68.3723L90.2446 69.5885V69.6281H92.5979V70.1719H89.4042Z" fill="#495057"/>
-<rect x="56.3478" y="59.7618" width="40.2223" height="13.5388" rx="2.12877" stroke="#DEE2E6" stroke-width="0.38307"/>
-<defs>
-<filter id="filter0_d_4142_75678" x="25.6216" y="0.0468795" width="278.332" height="62.7539" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="1.47656"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_4142_75678"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_4142_75678" result="shape"/>
-</filter>
-<filter id="filter1_d_4142_75678" x="0.0468795" y="23.3984" width="278.332" height="62.7539" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="1.47656"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_4142_75678"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_4142_75678" result="shape"/>
-</filter>
-<clipPath id="clip0_4142_75678">
-<rect width="9.28124" height="9.28124" fill="white" transform="translate(84.7163 38.5391)"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/apps/app/public/logo-with-text.png b/apps/app/public/logo-with-text.png
deleted file mode 100644
index ee922a2a0..000000000
Binary files a/apps/app/public/logo-with-text.png and /dev/null differ
diff --git a/apps/app/public/sign-in-bg.png b/apps/app/public/sign-in-bg.png
deleted file mode 100644
index 893fbd6c8..000000000
Binary files a/apps/app/public/sign-in-bg.png and /dev/null differ
diff --git a/apps/app/public/site-image.png b/apps/app/public/site-image.png
deleted file mode 100644
index fca512f17..000000000
Binary files a/apps/app/public/site-image.png and /dev/null differ
diff --git a/apps/app/public/vercel.svg b/apps/app/public/vercel.svg
deleted file mode 100644
index fbf0e25a6..000000000
--- a/apps/app/public/vercel.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="283" height="64" viewBox="0 0 283 64" fill="none" 
-    xmlns="http://www.w3.org/2000/svg">
-    <path d="M141.04 16c-11.04 0-19 7.2-19 18s8.96 18 20 18c6.67 0 12.55-2.64 16.19-7.09l-7.65-4.42c-2.02 2.21-5.09 3.5-8.54 3.5-4.79 0-8.86-2.5-10.37-6.5h28.02c.22-1.12.35-2.28.35-3.5 0-10.79-7.96-17.99-19-17.99zm-9.46 14.5c1.25-3.99 4.67-6.5 9.45-6.5 4.79 0 8.21 2.51 9.45 6.5h-18.9zM248.72 16c-11.04 0-19 7.2-19 18s8.96 18 20 18c6.67 0 12.55-2.64 16.19-7.09l-7.65-4.42c-2.02 2.21-5.09 3.5-8.54 3.5-4.79 0-8.86-2.5-10.37-6.5h28.02c.22-1.12.35-2.28.35-3.5 0-10.79-7.96-17.99-19-17.99zm-9.45 14.5c1.25-3.99 4.67-6.5 9.45-6.5 4.79 0 8.21 2.51 9.45 6.5h-18.9zM200.24 34c0 6 3.92 10 10 10 4.12 0 7.21-1.87 8.8-4.92l7.68 4.43c-3.18 5.3-9.14 8.49-16.48 8.49-11.05 0-19-7.2-19-18s7.96-18 19-18c7.34 0 13.29 3.19 16.48 8.49l-7.68 4.43c-1.59-3.05-4.68-4.92-8.8-4.92-6.07 0-10 4-10 10zm82.48-29v46h-9V5h9zM36.95 0L73.9 64H0L36.95 0zm92.38 5l-27.71 48L73.91 5H84.3l17.32 30 17.32-30h10.39zm58.91 12v9.69c-1-.29-2.06-.49-3.2-.49-5.81 0-10 4-10 10V51h-9V17h9v9.2c0-5.08 5.91-9.2 13.2-9.2z" fill="#000"/>
-</svg>
\ No newline at end of file
diff --git a/apps/app/styles/globals.css b/apps/app/styles/globals.css
index 9a0d9541c..2a11a8d03 100644
--- a/apps/app/styles/globals.css
+++ b/apps/app/styles/globals.css
@@ -62,8 +62,8 @@
     --color-sidebar-background-80: 245, 245, 245; /* tertiary sidebar bg */
 
     --color-sidebar-text-100: 23, 23, 23; /* primary sidebar text */
-    --color-sidebar-text-200: 58, 58, 58; /* secondary sidebar text */
-    --color-sidebar-text-300: 82, 82, 82; /* tertiary sidebar text */
+    --color-sidebar-text-200: 82, 82, 82; /* secondary sidebar text */
+    --color-sidebar-text-300: 115, 115, 115; /* tertiary sidebar text */
     --color-sidebar-text-400: 163, 163, 163; /* sidebar placeholder text */
 
     --color-sidebar-border-100: 245, 245, 245; /* subtle sidebar border= 1 */
@@ -209,6 +209,7 @@ body {
   outline: none;
 }
 
+/* emoji icon picker */
 .conical-gradient {
   background: conic-gradient(
     from 180deg at 50% 50%,
@@ -222,13 +223,12 @@ body {
   );
 }
 
+/* progress bar */
 .progress-bar {
   fill: currentColor;
   color: rgba(var(--color-sidebar-background-100));
 }
 
-/* end react datepicker styling */
-
 /* lineclamp */
 .lineclamp {
   overflow: hidden;
diff --git a/apps/app/tailwind.config.js b/apps/app/tailwind.config.js
index 2a247c388..fbe0994b4 100644
--- a/apps/app/tailwind.config.js
+++ b/apps/app/tailwind.config.js
@@ -83,7 +83,7 @@ module.exports = {
             300: convertToRGB("--color-border-300"),
             400: convertToRGB("--color-border-400"),
             1000: "rgb(0, 0, 0)",
-            DEFAULT: convertToRGB("--color-border-300"),
+            DEFAULT: convertToRGB("--color-border-200"),
           },
           sidebar: {
             background: {
@@ -139,7 +139,7 @@ module.exports = {
               300: convertToRGB("--color-sidebar-border-300"),
               400: convertToRGB("--color-sidebar-border-400"),
               1000: "rgb(0, 0, 0)",
-              DEFAULT: convertToRGB("--color-sidebar-border-300"),
+              DEFAULT: convertToRGB("--color-sidebar-border-200"),
             },
           },
           backdrop: "#131313",