diff --git a/src/lib/components/empty.svelte b/src/lib/components/empty.svelte
index 8591b4299..ab7d091a4 100644
--- a/src/lib/components/empty.svelte
+++ b/src/lib/components/empty.svelte
@@ -41,7 +41,7 @@
             <slot>
                 <div class="u-text-center">
                     <Heading size="7" tag="h2">Create your first {target} to get started.</Heading>
-                    <p class="body-text-2 u-margin-block-start-4">
+                    <p class="body-text-2 u-bold u-margin-block-start-4">
                         Need a hand? Check out our documentation.
                     </p>
                 </div>
diff --git a/src/lib/components/feedbackGeneral.svelte b/src/lib/components/feedbackGeneral.svelte
index b50258c44..de4f3b2c8 100644
--- a/src/lib/components/feedbackGeneral.svelte
+++ b/src/lib/components/feedbackGeneral.svelte
@@ -36,7 +36,7 @@
 
 <section class="drop-section">
     <header class="u-flex u-main-space-between u-gap-16">
-        <h4 class="body-text-1">How can we improve?</h4>
+        <h4 class="body-text-1 u-bold">How can we improve?</h4>
         <button
             type="button"
             class="button is-text is-only-icon u-margin-inline-start-auto"
diff --git a/src/lib/components/feedbackNPS.svelte b/src/lib/components/feedbackNPS.svelte
index 56be55551..ee0e4126f 100644
--- a/src/lib/components/feedbackNPS.svelte
+++ b/src/lib/components/feedbackNPS.svelte
@@ -33,7 +33,7 @@
 
 <section class="drop-section">
     <header class="u-flex u-main-space-between u-gap-16">
-        <h4 class="body-text-1">How are we doing?</h4>
+        <h4 class="body-text-1 u-bold">How are we doing?</h4>
         <button
             type="button"
             class="button is-text is-only-icon u-margin-inline-start-auto"
diff --git a/src/lib/components/innerModal.svelte b/src/lib/components/innerModal.svelte
index 7702db233..5cf1e1822 100644
--- a/src/lib/components/innerModal.svelte
+++ b/src/lib/components/innerModal.svelte
@@ -11,7 +11,7 @@
             <div class="modal-form">
                 <header class="modal-header">
                     <div class="u-flex u-main-space-between u-cross-center u-gap-16">
-                        <h4 class="modal-title body-text-1">
+                        <h4 class="modal-title body-text-1 u-bold">
                             <slot name="title" />
                         </h4>
                         {#if closable}
diff --git a/src/lib/components/labelCard.svelte b/src/lib/components/labelCard.svelte
index fe6a3835d..bd76307b9 100644
--- a/src/lib/components/labelCard.svelte
+++ b/src/lib/components/labelCard.svelte
@@ -31,7 +31,7 @@
             bind:group
             on:click />
         <div class="u-flex u-flex-vertical u-gap-4">
-            <h4 class="body-text-2"><slot name="title" /></h4>
+            <h4 class="body-text-2 u-bold"><slot name="title" /></h4>
             <p class="u-color-text-gray u-small">
                 <slot />
             </p>
diff --git a/src/lib/components/permissions/team.svelte b/src/lib/components/permissions/team.svelte
index a0e5aee1b..7b214f534 100644
--- a/src/lib/components/permissions/team.svelte
+++ b/src/lib/components/permissions/team.svelte
@@ -98,7 +98,7 @@
                                 <label class="u-flex u-cross-center u-gap-8" for={team.$id}>
                                     <AvatarInitials size={32} name={team.name} />
                                     <div class="u-line-height-1-5">
-                                        <div class="body-text-2">{team.name}</div>
+                                        <div class="body-text-2 u-bold">{team.name}</div>
                                         <div class="u-x-small">{team.$id}</div>
                                     </div>
                                 </label>
@@ -116,7 +116,7 @@
         <EmptySearch hidePages>
             <div class="common-section">
                 <div class="u-text-center common-section">
-                    <b class="body-text-2">Sorry we couldn't find "{search}"</b>
+                    <b class="body-text-2 u-bold">Sorry we couldn't find "{search}"</b>
                     <p>There are no teams that match your search.</p>
                 </div>
                 <div class="u-flex u-gap-16 common-section u-main-center">
diff --git a/src/lib/components/permissions/user.svelte b/src/lib/components/permissions/user.svelte
index 61d1f8242..4488d8f01 100644
--- a/src/lib/components/permissions/user.svelte
+++ b/src/lib/components/permissions/user.svelte
@@ -93,7 +93,7 @@
                                         {#if user.name}
                                             <AvatarInitials size={32} name={user.name} />
                                             <div class="u-line-height-1-5">
-                                                <div class="body-text-2">
+                                                <div class="body-text-2 u-bold">
                                                     {user.name}
                                                 </div>
                                                 <div class="u-x-small">{user.$id}</div>
@@ -103,7 +103,7 @@
                                                 <span class="icon-minus-sm" aria-hidden="true" />
                                             </div>
                                             <div class="u-line-height-1-5">
-                                                <div class="body-text-2">
+                                                <div class="body-text-2 u-bold">
                                                     {user.email ? user.email : user.phone}
                                                 </div>
                                                 <div class="u-x-small">{user.$id}</div>
@@ -114,7 +114,7 @@
                                             <span class="icon-anonymous" aria-hidden="true" />
                                         </div>
                                         <div class="u-line-height-1-5">
-                                            <div class="body-text-2">
+                                            <div class="body-text-2 u-bold">
                                                 {user.name ? user.name : '-'}
                                             </div>
                                             <div class="u-x-small">{user.$id}</div>
@@ -135,7 +135,7 @@
         <EmptySearch hidePages>
             <div class="common-section">
                 <div class="u-text-center common-section">
-                    <b class="body-text-2">Sorry we couldn't find "{search}"</b>
+                    <b class="body-text-2 u-bold">Sorry we couldn't find "{search}"</b>
                     <p>There are no Users that match your search.</p>
                 </div>
                 <div class="u-flex u-gap-16 common-section u-main-center">
diff --git a/src/lib/elements/forms/inputFile.svelte b/src/lib/elements/forms/inputFile.svelte
index 8642f9a2d..0c73f3dc2 100644
--- a/src/lib/elements/forms/inputFile.svelte
+++ b/src/lib/elements/forms/inputFile.svelte
@@ -93,7 +93,7 @@
             <div class="u-flex u-main-center u-cross-center u-gap-16 u-flex-vertical-mobile">
                 {#if maxSize}
                     {@const readableMaxSize = humanFileSize(maxSize)}
-                    <p class="upload-file-box-info body-text-2 u-normal">
+                    <p class="upload-file-box-info body-text-2">
                         Max file size: {readableMaxSize.value + readableMaxSize.unit}
                     </p>
                 {/if}
diff --git a/src/lib/elements/table/cellHead.svelte b/src/lib/elements/table/cellHead.svelte
index ea69e6289..6a7f9c865 100644
--- a/src/lib/elements/table/cellHead.svelte
+++ b/src/lib/elements/table/cellHead.svelte
@@ -9,7 +9,7 @@
     class:is-only-desktop={onlyDesktop}
     class="table-thead-col"
     role="columnheader">
-    <span class={eyebrow ? 'eyebrow-heading-3' : 'body-text-2'}>
+    <span class={eyebrow ? 'eyebrow-heading-3' : 'body-text-2 u-bold'}>
         <slot />
     </span>
 </div>
diff --git a/src/lib/layout/logs.svelte b/src/lib/layout/logs.svelte
index f5da38f24..fcaabd80f 100644
--- a/src/lib/layout/logs.svelte
+++ b/src/lib/layout/logs.svelte
@@ -49,7 +49,7 @@
 {#if $log.data}
     <section class="cover-frame" data-private>
         <header class="cover-frame-header u-flex u-gap-16 u-main-space-between u-cross-center">
-            <h1 class="body-text-1">Function ID: {$log.func.$id}</h1>
+            <h1 class="body-text-1 u-bold">Function ID: {$log.func.$id}</h1>
             <button
                 on:click={() => ($log.show = false)}
                 class="button is-text is-only-icon"
@@ -73,7 +73,7 @@
                     </div>
                     <div>
                         <div class="u-flex u-gap-12 u-cross-center">
-                            <h2 class="body-text-2">Deployment ID:</h2>
+                            <h2 class="body-text-2 u-bold">Deployment ID:</h2>
                             <Output value={$log.data.$id}>
                                 {$log.data.$id}
                             </Output>
@@ -145,7 +145,7 @@
                     </div>
                     <div>
                         <div class="u-flex u-gap-12 u-cross-center">
-                            <h2 class="body-text-2">Execution ID:</h2>
+                            <h2 class="body-text-2 u-bold">Execution ID:</h2>
                             <Output value={$log.data.$id}>
                                 {$log.data.$id}
                             </Output>
diff --git a/src/lib/layout/wizard.svelte b/src/lib/layout/wizard.svelte
index c655ffc2f..72321a84b 100644
--- a/src/lib/layout/wizard.svelte
+++ b/src/lib/layout/wizard.svelte
@@ -95,7 +95,7 @@
     <div class="wizard-end-bg" />
 
     <header class="wizard-header">
-        <div class="body-text-1">{title}</div>
+        <div class="body-text-1 u-bold">{title}</div>
 
         <slot name="header" />
         <button
diff --git a/src/routes/console/project-[project]/+error.svelte b/src/routes/console/project-[project]/+error.svelte
index 0dfcff9d1..243be6e42 100644
--- a/src/routes/console/project-[project]/+error.svelte
+++ b/src/routes/console/project-[project]/+error.svelte
@@ -6,5 +6,5 @@
 
 <Container>
     <Heading size="1" tag="h3">{$page.status}</Heading>
-    <p class="body-text-2 u-margin-block-start-4">{$page.error.message}</p>
+    <p class="body-text-2 u-bold u-margin-block-start-4">{$page.error.message}</p>
 </Container>
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte
index 90ac7c475..84e7d9706 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte
@@ -68,7 +68,7 @@
         <Empty single target="attribute" on:click={() => (showCreateDropdown = true)}>
             <div class="u-text-center">
                 <Heading size="7" tag="h2">Create your first attribute to get started.</Heading>
-                <p class="body-text-2 u-margin-block-start-4">
+                <p class="body-text-2 u-bold u-margin-block-start-4">
                     Need a hand? Check out our documentation.
                 </p>
             </div>
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte
index 1e00f1be2..35b588d3a 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte
@@ -165,7 +165,7 @@
         <Empty single target="attribute" on:click={() => (showEmptyCreateDropdown = true)}>
             <div class="u-text-center">
                 <Heading size="7" tag="h2">Create your first attribute to get started.</Heading>
-                <p class="body-text-2 u-margin-block-start-4">
+                <p class="body-text-2 u-bold u-margin-block-start-4">
                     Need a hand? Check out our documentation.
                 </p>
             </div>
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte
index a78168bf5..605450998 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte
@@ -124,7 +124,7 @@
         <Empty single target="attribute" on:click={() => (showCreateDropdown = true)}>
             <div class="u-text-center">
                 <Heading size="7" tag="h2">Create your first attribute to get started.</Heading>
-                <p class="body-text-2 u-margin-block-start-4">
+                <p class="body-text-2 u-bold u-margin-block-start-4">
                     Need a hand? Check out our documentation.
                 </p>
             </div>
diff --git a/src/routes/console/project-[project]/functions/function-[function]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/+page.svelte
index 5b007c2c9..2dfb08335 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/+page.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/+page.svelte
@@ -254,7 +254,7 @@
                 <div class="u-text-center">
                     <Heading size="7" tag="h2"
                         >You have no inactive deployments. Create one to see it here.</Heading>
-                    <p class="body-text-2 u-margin-block-start-4">
+                    <p class="body-text-2 u-bold u-margin-block-start-4">
                         Learn more about deployments in our Documentation.
                     </p>
                 </div>
diff --git a/src/routes/console/project-[project]/functions/function-[function]/create.svelte b/src/routes/console/project-[project]/functions/function-[function]/create.svelte
index 3cb64fe27..806ff23ca 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/create.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/create.svelte
@@ -187,7 +187,7 @@
                 <img src={GithubLight} alt="github" />
             {/if}
             <div class="u-flex u-flex-vertical u-gap-24">
-                <h3 class="body-text-1">Coming Soon!</h3>
+                <h3 class="body-text-1 u-bold">Coming Soon!</h3>
                 <p>
                     Creating deployments will be easier than ever with our upcoming Git Integration.
                     Just set up a repository and we'll do the rest.
diff --git a/src/routes/console/project-[project]/overview/+layout.svelte b/src/routes/console/project-[project]/overview/+layout.svelte
index c6f7177a3..31824cffb 100644
--- a/src/routes/console/project-[project]/overview/+layout.svelte
+++ b/src/routes/console/project-[project]/overview/+layout.svelte
@@ -119,7 +119,7 @@
                                 <div class="grid-item-1-end-start">
                                     <div class="heading-level-4">
                                         {storage.value}
-                                        <span class="body-text-2">{storage.unit}</span>
+                                        <span class="body-text-2 u-bold">{storage.unit}</span>
                                     </div>
                                     <div>Storage</div>
                                 </div>
diff --git a/src/routes/console/project-[project]/overview/bandwith.svelte b/src/routes/console/project-[project]/overview/bandwith.svelte
index f4154a8a9..1a0747d7b 100644
--- a/src/routes/console/project-[project]/overview/bandwith.svelte
+++ b/src/routes/console/project-[project]/overview/bandwith.svelte
@@ -28,7 +28,7 @@
     <div>
         <div class="heading-level-4">
             {bandwith.value}
-            <span class="body-text-2">{bandwith.unit}</span>
+            <span class="body-text-2 u-bold">{bandwith.unit}</span>
         </div>
         <div>Bandwidth</div>
     </div>
diff --git a/src/routes/console/project-[project]/overview/platforms/+page.svelte b/src/routes/console/project-[project]/overview/platforms/+page.svelte
index ae80a1cf8..328e7d88d 100644
--- a/src/routes/console/project-[project]/overview/platforms/+page.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/+page.svelte
@@ -141,7 +141,7 @@
             <slot>
                 <div class="u-text-center">
                     <Heading size="7" tag="h4">Create your first platform to get started.</Heading>
-                    <p class="body-text-2 u-margin-block-start-4">
+                    <p class="body-text-2 u-bold u-margin-block-start-4">
                         Need a hand? Check out our documentation.
                     </p>
                 </div>