diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte
index 4b5921e1..42b5fada 100644
--- a/src/routes/+error.svelte
+++ b/src/routes/+error.svelte
@@ -1,36 +1,37 @@
 <script>
   import { page } from "$app/stores";
   //import { trackError,trackButtonClick } from '$lib/mixpanel';
-  import logo from "$lib/images/stocknear_logo.png";
 
   const emailAddress = "support@stocknear.com";
 </script>
 
 <section class="min-h-screen pt-6">
-  <div class="bg-default mt-10 m-auto overflow-hidden w-full max-w-4xl">
+  <div class=" mt-10 m-auto overflow-hidden w-full max-w-4xl">
     <div class="lg:flex">
       <div class="mt-10 mb-5 m-auto">
-        <h1 class="text-white text-center text-2xl sm:text-4xl font-bold mb-5">
+        <h1 class=" text-center text-2xl sm:text-4xl font-bold mb-5">
           Page Not found - {$page?.status}
           <!--Server Maintenance-->
         </h1>
         <a href="/" class="flex justify-center items-center">
-          <img class="w-20 m-auto inline-block" src={logo} />
+          <img
+            class="w-20 m-auto inline-block"
+            src="/pwa-192x192.png"
+            alt="Logo"
+          />
         </a>
         <!--
-                <span class="mt-4 text-white text-lg w-5/6 m-auto text-center flex justify-center items-center">
+                <span class="mt-4  text-lg w-5/6 m-auto text-center flex justify-center items-center">
                     Sorry, our website is down for server maintenance. We will be back soon!
                 </span>
                 -->
 
-        <div
-          class="mt-4 text-white text-md w-11/12 sm:w-full m-auto text-center"
-        >
+        <div class="mt-4 text-md w-11/12 sm:w-full m-auto text-center">
           The page was not found. If this error occurs persistenly please report
           it to us via
           <a
             href={`mailto:${emailAddress}`}
-            class="inline-block text-blue-400 sm:hover:text-white sm:hover:underline"
+            class="inline-block text-blue-500 dark:text-blue-400 sm:hover:text-muted dark:sm:hover:text-white sm:hover:underline"
             >{emailAddress}</a
           >.
           <br />
@@ -39,7 +40,7 @@
 
         <a
           href="/home"
-          class="flex justify-center items-center w-1/2 m-auto py-2.5 mt-10 rounded-md duration-100 bg-[#fff] sm:hover:hover:bg-gray-300 text-black font-semibold"
+          class="flex justify-center items-center w-1/2 m-auto py-2.5 mt-10 rounded-md duration-100 bg-[#3B82F6] text-white sm:hover:bg-blue-600 dark:bg-[#fff] dark:sm:hover:hover:bg-gray-300 dark:text-black font-semibold"
         >
           Back to Home Page
         </a>
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index c14fb139..f8098e5a 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -355,7 +355,7 @@
                           <Button
                             builders={[builder]}
                             type="submit"
-                            class="w-full "
+                            class="w-full dark:bg-[#18181B]"
                           >
                             <a
                               href="/analysts"
@@ -367,7 +367,7 @@
                           <Button
                             builders={[builder]}
                             type="submit"
-                            class="w-full "
+                            class="w-full dark:bg-[#18181B]"
                           >
                             <a
                               href="/analysts/top-stocks"
@@ -379,7 +379,7 @@
                           <Button
                             builders={[builder]}
                             type="submit"
-                            class="w-full "
+                            class="w-full dark:bg-[#18181B]"
                           >
                             <a
                               href="/industry"
@@ -391,7 +391,7 @@
                           <Button
                             builders={[builder]}
                             type="submit"
-                            class="w-full "
+                            class="w-full dark:bg-[#18181B]"
                           >
                             <a
                               href="/stock-screener"
@@ -402,7 +402,7 @@
                           <Button
                             builders={[builder]}
                             type="submit"
-                            class="w-full "
+                            class="w-full dark:bg-[#18181B]"
                           >
                             <a
                               href="/market-mover/gainers"
@@ -414,7 +414,7 @@
                           <Button
                             builders={[builder]}
                             type="submit"
-                            class="w-full "
+                            class="w-full dark:bg-[#18181B]"
                           >
                             <a
                               href="/heatmap"
@@ -426,7 +426,7 @@
                           <Button
                             builders={[builder]}
                             type="submit"
-                            class="w-full "
+                            class="w-full dark:bg-[#18181B]"
                           >
                             <a
                               href="/list"
@@ -456,7 +456,7 @@
                           <Button
                             builders={[builder]}
                             type="submit"
-                            class="w-full"
+                            class="w-full dark:bg-[#18181B]"
                           >
                             <a
                               href="/etf/new-launches"
@@ -467,7 +467,7 @@
                           <Button
                             builders={[builder]}
                             type="submit"
-                            class="w-full"
+                            class="w-full dark:bg-[#18181B]"
                           >
                             <a
                               href="/etf/etf-providers"
@@ -497,7 +497,7 @@
                           <Button
                             builders={[builder]}
                             type="submit"
-                            class="w-full "
+                            class="w-full dark:bg-[#18181B]"
                           >
                             <a
                               href="/dividends-calendar"
@@ -508,7 +508,7 @@
                           <Button
                             builders={[builder]}
                             type="submit"
-                            class="w-full "
+                            class="w-full dark:bg-[#18181B]"
                           >
                             <a
                               href="/earnings-calendar"
@@ -520,7 +520,7 @@
                           <Button
                             builders={[builder]}
                             type="submit"
-                            class="w-full "
+                            class="w-full dark:bg-[#18181B]"
                           >
                             <a
                               href="/ipos"
@@ -532,7 +532,7 @@
                           <Button
                             builders={[builder]}
                             type="submit"
-                            class="w-full "
+                            class="w-full dark:bg-[#18181B]"
                           >
                             <a
                               href="/economic-calendar"
@@ -543,7 +543,7 @@
                           <Button
                             builders={[builder]}
                             type="submit"
-                            class="w-full "
+                            class="w-full dark:bg-[#18181B]"
                           >
                             <a
                               href="/economic-indicator"
@@ -556,7 +556,7 @@
                           <Button
                             builders={[builder]}
                             type="submit"
-                            class="w-full "
+                            class="w-full dark:bg-[#18181B]"
                           >
                             <a
                               href="/stock-splits-calendar"
@@ -588,7 +588,7 @@
                           <Button
                             builders={[builder]}
                             type="submit"
-                            class="w-full"
+                            class="w-full dark:bg-[#18181B]"
                           >
                             <a
                               href="/politicians/flow-data"
@@ -599,7 +599,7 @@
                           <Button
                             builders={[builder]}
                             type="submit"
-                            class="w-full"
+                            class="w-full dark:bg-[#18181B]"
                           >
                             <a
                               href="/politicians"
@@ -631,7 +631,7 @@
                           <Button
                             builders={[builder]}
                             type="submit"
-                            class="w-full"
+                            class="w-full dark:bg-[#18181B]"
                           >
                             <a
                               href="/insider-tracker"
@@ -643,7 +643,7 @@
                           <Button
                             builders={[builder]}
                             type="submit"
-                            class="w-full"
+                            class="w-full dark:bg-[#18181B]"
                           >
                             <a
                               href="/reddit-tracker"
@@ -655,7 +655,7 @@
                           <Button
                             builders={[builder]}
                             type="submit"
-                            class="w-full"
+                            class="w-full dark:bg-[#18181B]"
                           >
                             <a
                               href="/potus-tracker"
@@ -668,7 +668,7 @@
                           <Button
                             builders={[builder]}
                             type="submit"
-                            class="w-full"
+                            class="w-full dark:bg-[#18181B]"
                           >
                             <a
                               href="/sentiment-tracker"
@@ -699,7 +699,7 @@
                           <Button
                             builders={[builder]}
                             type="submit"
-                            class="w-full"
+                            class="w-full dark:bg-[#18181B]"
                           >
                             <a
                               href="/market-flow"
@@ -711,7 +711,7 @@
                           <Button
                             builders={[builder]}
                             type="submit"
-                            class="w-full"
+                            class="w-full dark:bg-[#18181B]"
                           >
                             <a
                               href="/options-flow"
@@ -722,7 +722,7 @@
                           <Button
                             builders={[builder]}
                             type="submit"
-                            class="w-full"
+                            class="w-full dark:bg-[#18181B]"
                           >
                             <a
                               href="/dark-pool-flow"
@@ -741,7 +741,7 @@
                 <Button
                   builders={[builder]}
                   type="submit"
-                  class=" -ml-4 w-full"
+                  class=" -ml-4 w-full dark:bg-[#18181B]"
                 >
                   <a
                     href="/hedge-funds"
@@ -749,7 +749,7 @@
                   >
                     <div class="flex flex-row items-center mr-auto">
                       <div
-                        class="flex h-9 w-9 items-center justify-center rounded-md text-muted dark:text-white transition-colors hover:text-muted dark:text-white md:h-8 md:w-8"
+                        class="flex h-9 w-9 items-center justify-center rounded-md text-muted dark:text-white transition-colors sm:hover:text-muted dark:text-white md:h-8 md:w-8"
                       >
                         <Boxes class="h-5.5 w-5.5" />
                       </div>
@@ -765,7 +765,7 @@
                 <Button
                   builders={[builder]}
                   type="submit"
-                  class=" -ml-4 w-full"
+                  class=" -ml-4 w-full dark:bg-[#18181B]"
                 >
                   <a
                     href="/market-news"
@@ -787,7 +787,7 @@
                   <Button
                     builders={[builder]}
                     type="submit"
-                    class=" -ml-4 w-full"
+                    class=" -ml-4 w-full dark:bg-[#18181B]"
                   >
                     <a
                       href="/pricing"
diff --git a/src/routes/market-mover/+layout.svelte b/src/routes/market-mover/+layout.svelte
index d67c7ba2..2875aa0d 100644
--- a/src/routes/market-mover/+layout.svelte
+++ b/src/routes/market-mover/+layout.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
   import ScrollToTop from "$lib/components/ScrollToTop.svelte";
-  import ArrowLogo from "lucide-svelte/icons/move-up-right";
   import { page } from "$app/stores";
 
   export let data;
diff --git a/src/routes/market-mover/active/+layout.svelte b/src/routes/market-mover/active/+layout.svelte
index 3522d275..879b09b1 100644
--- a/src/routes/market-mover/active/+layout.svelte
+++ b/src/routes/market-mover/active/+layout.svelte
@@ -110,7 +110,7 @@
             <div
               class="title-group flex flex-row items-center justify-start mb-3"
             >
-              <h1 class="text-white text-xl sm:text-2xl font-semibold">
+              <h1 class="text-xl sm:text-2xl font-semibold">
                 {displayTitle[timePeriod]?.replace("title", title)}
               </h1>
               {#if timePeriod === "1D" && ["active", "active"]?.includes(title)}
@@ -122,7 +122,7 @@
               {/if}
 
               <div
-                class="mb-0 ml-5 mt-1 whitespace-nowrap text-sm font-semiboldt text-white"
+                class="mb-0 ml-5 mt-1 whitespace-nowrap text-sm font-semibold"
               >
                 <span class="hidden lg:inline">Updated</span>
                 {lastTradingDay}
diff --git a/src/routes/market-mover/afterhours/+layout.svelte b/src/routes/market-mover/afterhours/+layout.svelte
index e5abf6f1..e4b31bbf 100644
--- a/src/routes/market-mover/afterhours/+layout.svelte
+++ b/src/routes/market-mover/afterhours/+layout.svelte
@@ -60,7 +60,7 @@
             <div
               class="title-group flex flex-row items-center justify-start mb-3"
             >
-              <h1 class="text-white text-xl sm:text-2xl font-semibold">
+              <h1 class="text-xl sm:text-2xl font-semibold">
                 Afterhours {categoryType === "gainers" ? "Gainers" : "Losers"}
               </h1>
               <InfoModal
@@ -70,7 +70,7 @@
               />
 
               <div
-                class="mb-0 ml-5 mt-1 whitespace-nowrap text-sm font-semiboldt text-white"
+                class="mb-0 ml-5 mt-1 whitespace-nowrap text-sm font-semibold"
               >
                 <span class="hidden lg:inline">Updated</span>
                 {lastTradingDay}
diff --git a/src/routes/market-mover/losers/+layout.svelte b/src/routes/market-mover/losers/+layout.svelte
index 0b0c479a..d54d939e 100644
--- a/src/routes/market-mover/losers/+layout.svelte
+++ b/src/routes/market-mover/losers/+layout.svelte
@@ -49,9 +49,7 @@
         <!--Start Top Winners/Losers-->
 
         <nav class=" pt-1 overflow-x-auto whitespace-nowrap">
-          <ul
-            class="flex flex-row items-center w-full text-sm sm:text-[1rem] text-white"
-          >
+          <ul class="flex flex-row items-center w-full text-sm sm:text-[1rem]">
             <a
               href="/market-mover/losers"
               class="p-2 px-5 cursor-pointer {timePeriod === 'losers'
@@ -110,7 +108,7 @@
             <div
               class="title-group flex flex-row items-center justify-start mb-3"
             >
-              <h1 class="text-white text-xl sm:text-2xl font-semibold">
+              <h1 class="text-xl sm:text-2xl font-semibold">
                 {displayTitle[timePeriod]?.replace("title", title)}
               </h1>
               {#if timePeriod === "1D" && ["losers", "Losers"]?.includes(title)}
@@ -122,7 +120,7 @@
               {/if}
 
               <div
-                class="mb-0 ml-5 mt-1 whitespace-nowrap text-sm font-semiboldt text-white"
+                class="mb-0 ml-5 mt-1 whitespace-nowrap text-sm font-semibold"
               >
                 <span class="hidden lg:inline">Updated</span>
                 {lastTradingDay}
diff --git a/src/routes/market-mover/premarket/+layout.svelte b/src/routes/market-mover/premarket/+layout.svelte
index 5f696831..de261fd1 100644
--- a/src/routes/market-mover/premarket/+layout.svelte
+++ b/src/routes/market-mover/premarket/+layout.svelte
@@ -60,7 +60,7 @@
             <div
               class="title-group flex flex-row items-center justify-start mb-3"
             >
-              <h1 class="text-white text-xl sm:text-2xl font-semibold">
+              <h1 class="text-xl sm:text-2xl font-semibold">
                 Premarket {categoryType === "gainers" ? "Gainers" : "Losers"}
               </h1>
               <InfoModal
@@ -69,7 +69,7 @@
                 id={"premarketId"}
               />
               <div
-                class="mb-0 ml-5 mt-1 whitespace-nowrap text-sm font-semiboldt text-white"
+                class="mb-0 ml-5 mt-1 whitespace-nowrap text-sm font-semibold"
               >
                 <span class="hidden lg:inline">Updated</span>
                 {lastTradingDay}
diff --git a/src/routes/register/+page.svelte b/src/routes/register/+page.svelte
index fdbec9ee..dbdc7b36 100644
--- a/src/routes/register/+page.svelte
+++ b/src/routes/register/+page.svelte
@@ -70,14 +70,12 @@
 >
   <div class="grid grid-cols-1 gap-4">
     <div class="relative">
-      <h1
-        class="text-center text-white text-2xl sm:text-3xl pt-10 sm:pt-0 font-bold"
-      >
+      <h1 class="text-center text-2xl sm:text-3xl pt-10 sm:pt-0 font-bold">
         Getting Started
       </h1>
     </div>
 
-    <span class="text-gray-400 text-center">
+    <span class="text-muted dark:text-gray-400 text-center">
       Create an account & start your stock analysis
     </span>
 
@@ -118,13 +116,13 @@
         {#if !loading && !isClicked}
           <button
             type="submit"
-            class="py-2.5 cursor-pointer bg-[#fff] border border-gray-600 sm:hover:bg-gray-300 transition duration-100 text-black btn-md w-full rounded-md m-auto font-semibold text-[1rem]"
+            class="cursor-pointer py-2.5 bg-[#3B82F6] dark:bg-[#fff] border-none sm:hover:bg-blue-600 dark:sm:hover:bg-gray-300 transition duration-100 btn-md w-full rounded-md m-auto text-white dark:text-black font-semibold text-[1rem]"
           >
             <span>Register</span>
           </button>
         {:else}
           <label
-            class="cursor-not-allowed btn bg-[#fff] opacity-[0.5] border border-gray-600 sm:hover:bg-gray-300 transition duration-100 text-black btn-md w-full rounded-md m-auto font-semibold text-[1rem]"
+            class="cursor-not-allowed btn bg-[#3B82F6] dark:bg-[#fff] opacity-[0.5] border border-gray-600 sm:hover:bg-blue-600 dark:sm:hover:bg-gray-300 transition duration-100 btn-md w-full rounded-md m-auto text-white dark:text-black font-semibold text-[1rem]"
           >
             <div class="flex flex-row m-auto items-center">
               <span class="loading loading-infinity"></span>
@@ -133,21 +131,23 @@
           </label>
         {/if}
       </div>
-      <p
-        class="hidden sm:block pb-1 text-xs text-center w-full max-w-lg text-white"
-      >
+      <p class="hidden sm:block pb-1 text-xs text-center w-full max-w-lg">
         By registering you agree to stocknear's
-        <a href="/terms-of-use" class="text-blue-400 hover:underline"
+        <a
+          href="/terms-of-use"
+          class="text-blue-500 dark:text-blue-400 sm:hover:underline"
           >Terms of Use</a
         >
         and acknowledge that you've read our
-        <a href="/privacy-policy" class="text-blue-400 hover:underline"
+        <a
+          href="/privacy-policy"
+          class="text-blue-500 dark:text-blue-400 sm:hover:underline"
           >Privacy Policy</a
         >.
       </p>
 
       <div class="divider divider-[#fff] pt-10 pb-10">
-        <span class="text-white text-[1rem] z-10">Or register using</span>
+        <span class=" text-[1rem] z-10">Or register using</span>
       </div>
 
       <div class="flex flex-row items-center gap-x-5 pb-6">
@@ -158,7 +158,7 @@
             on:click={() => (oauthLoading = !oauthLoading)}
             on:mouseenter={handleHoverGoogle}
             on:mouseleave={handleHoverGoogle}
-            class="cursor-pointer shrink-0 rounded-full w-12 h-12 relative bg-default flex items-center justify-center border border-gray-600 sm:hover:bg-secondary text-white"
+            class="cursor-pointer shrink-0 rounded-full w-12 h-12 relative bg-default flex items-center justify-center border border-gray-600 sm:hover:bg-secondary"
           >
             <svg
               class="{isHoveredGoogle ? 'shake-logo' : ''} w-6 h-6 inline-block"
@@ -206,7 +206,7 @@
             on:click={() => (oauthLoading = !oauthLoading)}
             on:mouseenter={handleHoverDiscord}
             on:mouseleave={handleHoverDiscord}
-            class="cursor-pointer shrink-0 rounded-full w-12 h-12 relative bg-default flex items-center justify-center border border-gray-600 sm:hover:bg-secondary text-white"
+            class="cursor-pointer shrink-0 rounded-full w-12 h-12 relative bg-default flex items-center justify-center border border-gray-600 sm:hover:bg-secondary"
           >
             <svg
               class="{isHoveredDiscord
@@ -759,10 +759,14 @@
       </div>
 
       <p
-        class="pt-2 pb-1 text-sm w-full max-w-lg text-white flex justify-center items-center"
+        class="pt-2 pb-1 text-sm w-full max-w-lg flex justify-center items-center"
       >
         You already have an account?
-        <a href="/login" class="text-blue-400 hover:underline ml-1">Sign in</a>
+        <a
+          href="/login"
+          class="text-blue-500 dark:text-blue-400 sm:hover:underline ml-1"
+          >Sign in</a
+        >
       </p>
     </form>
   </div>
@@ -773,11 +777,15 @@
     class="absolute bottom-5 pb-1 text-xs text-center w-full max-w-lg text-gray-300"
   >
     By registering you agree to stocknear's
-    <a href="/terms-of-use" class="text-blue-400 hover:underline"
+    <a
+      href="/terms-of-use"
+      class="text-blue-500 dark:text-blue-400 sm:hover:underline"
       >Terms of Use</a
     >
     and acknowledge that you've read our
-    <a href="/privacy-policy" class="text-blue-400 hover:underline"
+    <a
+      href="/privacy-policy"
+      class="text-blue-500 dark:text-blue-400 sm:hover:underline"
       >Privacy Policy</a
     >.
   </p>