diff --git a/template/app/public/fonts/Satoshi-Black.woff2 b/opensaas-sh/app_diff/public/fonts/Satoshi-Black.woff2.copy
similarity index 100%
rename from template/app/public/fonts/Satoshi-Black.woff2
rename to opensaas-sh/app_diff/public/fonts/Satoshi-Black.woff2.copy
diff --git a/template/app/public/fonts/Satoshi-Bold.woff2 b/opensaas-sh/app_diff/public/fonts/Satoshi-Bold.woff2.copy
similarity index 100%
rename from template/app/public/fonts/Satoshi-Bold.woff2
rename to opensaas-sh/app_diff/public/fonts/Satoshi-Bold.woff2.copy
diff --git a/template/app/public/fonts/Satoshi-Light.woff2 b/opensaas-sh/app_diff/public/fonts/Satoshi-Light.woff2.copy
similarity index 100%
rename from template/app/public/fonts/Satoshi-Light.woff2
rename to opensaas-sh/app_diff/public/fonts/Satoshi-Light.woff2.copy
diff --git a/template/app/public/fonts/Satoshi-Medium.woff2 b/opensaas-sh/app_diff/public/fonts/Satoshi-Medium.woff2.copy
similarity index 100%
rename from template/app/public/fonts/Satoshi-Medium.woff2
rename to opensaas-sh/app_diff/public/fonts/Satoshi-Medium.woff2.copy
diff --git a/template/app/public/fonts/Satoshi-Regular.woff2 b/opensaas-sh/app_diff/public/fonts/Satoshi-Regular.woff2.copy
similarity index 100%
rename from template/app/public/fonts/Satoshi-Regular.woff2
rename to opensaas-sh/app_diff/public/fonts/Satoshi-Regular.woff2.copy
diff --git a/opensaas-sh/app_diff/src/admin/dashboards/analytics/RevenueAndProfitChart.tsx.diff b/opensaas-sh/app_diff/src/admin/dashboards/analytics/RevenueAndProfitChart.tsx.diff
new file mode 100644
index 000000000..350bb69f4
--- /dev/null
+++ b/opensaas-sh/app_diff/src/admin/dashboards/analytics/RevenueAndProfitChart.tsx.diff
@@ -0,0 +1,11 @@
+--- template/app/src/admin/dashboards/analytics/RevenueAndProfitChart.tsx
++++ opensaas-sh/app/src/admin/dashboards/analytics/RevenueAndProfitChart.tsx
+@@ -11,7 +11,7 @@
+   },
+   colors: ["#3C50E0", "#80CAEE"],
+   chart: {
+-    fontFamily: "system-ui, sans-serif",
++    fontFamily: "Satoshi, system-ui, sans-serif",
+     height: 335,
+     type: "area",
+     dropShadow: {
diff --git a/opensaas-sh/app_diff/src/client/Main.css.diff b/opensaas-sh/app_diff/src/client/Main.css.diff
index 819a22420..774270a25 100644
--- a/opensaas-sh/app_diff/src/client/Main.css.diff
+++ b/opensaas-sh/app_diff/src/client/Main.css.diff
@@ -1,6 +1,6 @@
 --- template/app/src/client/Main.css
 +++ opensaas-sh/app/src/client/Main.css
-@@ -56,6 +56,23 @@
+@@ -56,6 +56,64 @@
    .border-gradient-primary > * {
      background: hsl(var(--background));
    }
@@ -21,13 +21,7 @@
 +      hsl(var(--card)) 100%
 +    );
 +  }
- }
- 
- /* Here is an example of how to add a custom font. 
-@@ -63,6 +80,16 @@
- * They are defined first here, then need to be referenced in the tailwind.config.js file
- * under `theme.extend.fontFamily`, and then can be used as a tailwind class, e.g. className='font-satoshi'.
- */
++}
 +
 +/* Satoshi Font Family */
 +@font-face {
@@ -38,13 +32,14 @@
 +  font-display: swap;
 +}
 +
- @font-face {
-   font-family: "Satoshi";
-   src: url("/fonts/Satoshi-Regular.woff2") format("woff2");
-@@ -71,6 +98,30 @@
-   font-display: swap;
- }
- 
++@font-face {
++  font-family: "Satoshi";
++  src: url("/fonts/Satoshi-Regular.woff2") format("woff2");
++  font-weight: normal;
++  font-style: normal;
++  font-display: swap;
++}
++
 +@font-face {
 +  font-family: "Satoshi";
 +  src: url("/fonts/Satoshi-Medium.woff2") format("woff2");
@@ -67,12 +62,10 @@
 +  font-weight: 900;
 +  font-style: normal;
 +  font-display: swap;
-+}
-+
- /* third-party libraries CSS */
+ }
  
- .tableCheckbox:checked ~ div span {
-@@ -189,4 +240,22 @@
+ /* third-party libraries CSS */
+@@ -176,4 +234,22 @@
    body {
      @apply bg-background text-foreground;
    }
diff --git a/opensaas-sh/app_diff/tailwind.config.js.diff b/opensaas-sh/app_diff/tailwind.config.js.diff
index 050b8fb9e..597d218f7 100644
--- a/opensaas-sh/app_diff/tailwind.config.js.diff
+++ b/opensaas-sh/app_diff/tailwind.config.js.diff
@@ -1,6 +1,16 @@
 --- template/app/tailwind.config.js
 +++ opensaas-sh/app/tailwind.config.js
-@@ -254,6 +254,10 @@
+@@ -12,6 +12,9 @@
+   darkMode: "class",
+   theme: {
+     extend: {
++      fontFamily: {
++        satoshi: ["Satoshi", "system-ui", "sans-serif"],
++      },
+       colors: {
+         current: "currentColor",
+         transparent: "transparent",
+@@ -251,6 +254,10 @@
          7: "-5px 0 0 #313D4A, 5px 0 0 #313D4A",
          8: "1px 0 0 #313D4A, -1px 0 0 #313D4A, 0 1px 0 #313D4A, 0 -1px 0 #313D4A, 0 3px 13px rgb(0 0 0 / 8%)",
          default: "0px 8px 13px -3px rgba(0, 0, 0, 0.07)",
diff --git a/template/app/public/fonts/Satoshi-Black.eot b/template/app/public/fonts/Satoshi-Black.eot
deleted file mode 100644
index 11747f362..000000000
Binary files a/template/app/public/fonts/Satoshi-Black.eot and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-Black.ttf b/template/app/public/fonts/Satoshi-Black.ttf
deleted file mode 100644
index 62015aca0..000000000
Binary files a/template/app/public/fonts/Satoshi-Black.ttf and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-Black.woff b/template/app/public/fonts/Satoshi-Black.woff
deleted file mode 100644
index a6bee36dd..000000000
Binary files a/template/app/public/fonts/Satoshi-Black.woff and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-BlackItalic.eot b/template/app/public/fonts/Satoshi-BlackItalic.eot
deleted file mode 100644
index de2edbbc1..000000000
Binary files a/template/app/public/fonts/Satoshi-BlackItalic.eot and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-BlackItalic.ttf b/template/app/public/fonts/Satoshi-BlackItalic.ttf
deleted file mode 100644
index 74410b974..000000000
Binary files a/template/app/public/fonts/Satoshi-BlackItalic.ttf and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-BlackItalic.woff b/template/app/public/fonts/Satoshi-BlackItalic.woff
deleted file mode 100644
index 0e07e1c5e..000000000
Binary files a/template/app/public/fonts/Satoshi-BlackItalic.woff and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-BlackItalic.woff2 b/template/app/public/fonts/Satoshi-BlackItalic.woff2
deleted file mode 100644
index 9d5c911dc..000000000
Binary files a/template/app/public/fonts/Satoshi-BlackItalic.woff2 and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-Bold.eot b/template/app/public/fonts/Satoshi-Bold.eot
deleted file mode 100644
index 390ae252b..000000000
Binary files a/template/app/public/fonts/Satoshi-Bold.eot and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-Bold.ttf b/template/app/public/fonts/Satoshi-Bold.ttf
deleted file mode 100644
index 00bc985b2..000000000
Binary files a/template/app/public/fonts/Satoshi-Bold.ttf and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-Bold.woff b/template/app/public/fonts/Satoshi-Bold.woff
deleted file mode 100644
index bba8257f6..000000000
Binary files a/template/app/public/fonts/Satoshi-Bold.woff and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-BoldItalic.eot b/template/app/public/fonts/Satoshi-BoldItalic.eot
deleted file mode 100644
index 426be2ac1..000000000
Binary files a/template/app/public/fonts/Satoshi-BoldItalic.eot and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-BoldItalic.ttf b/template/app/public/fonts/Satoshi-BoldItalic.ttf
deleted file mode 100644
index 24f012cbf..000000000
Binary files a/template/app/public/fonts/Satoshi-BoldItalic.ttf and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-BoldItalic.woff b/template/app/public/fonts/Satoshi-BoldItalic.woff
deleted file mode 100644
index 8bcb7a6e2..000000000
Binary files a/template/app/public/fonts/Satoshi-BoldItalic.woff and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-BoldItalic.woff2 b/template/app/public/fonts/Satoshi-BoldItalic.woff2
deleted file mode 100644
index 225527f78..000000000
Binary files a/template/app/public/fonts/Satoshi-BoldItalic.woff2 and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-Italic.eot b/template/app/public/fonts/Satoshi-Italic.eot
deleted file mode 100644
index 64039a84e..000000000
Binary files a/template/app/public/fonts/Satoshi-Italic.eot and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-Italic.ttf b/template/app/public/fonts/Satoshi-Italic.ttf
deleted file mode 100644
index c214f4fe5..000000000
Binary files a/template/app/public/fonts/Satoshi-Italic.ttf and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-Italic.woff b/template/app/public/fonts/Satoshi-Italic.woff
deleted file mode 100644
index edd4d9322..000000000
Binary files a/template/app/public/fonts/Satoshi-Italic.woff and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-Italic.woff2 b/template/app/public/fonts/Satoshi-Italic.woff2
deleted file mode 100644
index 8b98599d3..000000000
Binary files a/template/app/public/fonts/Satoshi-Italic.woff2 and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-Light.eot b/template/app/public/fonts/Satoshi-Light.eot
deleted file mode 100644
index d8fcaccd9..000000000
Binary files a/template/app/public/fonts/Satoshi-Light.eot and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-Light.ttf b/template/app/public/fonts/Satoshi-Light.ttf
deleted file mode 100644
index b41a2d4a5..000000000
Binary files a/template/app/public/fonts/Satoshi-Light.ttf and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-Light.woff b/template/app/public/fonts/Satoshi-Light.woff
deleted file mode 100644
index 8f05e4e9f..000000000
Binary files a/template/app/public/fonts/Satoshi-Light.woff and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-LightItalic.eot b/template/app/public/fonts/Satoshi-LightItalic.eot
deleted file mode 100644
index e34a0df4a..000000000
Binary files a/template/app/public/fonts/Satoshi-LightItalic.eot and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-LightItalic.ttf b/template/app/public/fonts/Satoshi-LightItalic.ttf
deleted file mode 100644
index 08f5db573..000000000
Binary files a/template/app/public/fonts/Satoshi-LightItalic.ttf and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-LightItalic.woff b/template/app/public/fonts/Satoshi-LightItalic.woff
deleted file mode 100644
index a03a50d7b..000000000
Binary files a/template/app/public/fonts/Satoshi-LightItalic.woff and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-LightItalic.woff2 b/template/app/public/fonts/Satoshi-LightItalic.woff2
deleted file mode 100644
index 6bd15ad54..000000000
Binary files a/template/app/public/fonts/Satoshi-LightItalic.woff2 and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-Medium.eot b/template/app/public/fonts/Satoshi-Medium.eot
deleted file mode 100644
index 83caceca5..000000000
Binary files a/template/app/public/fonts/Satoshi-Medium.eot and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-Medium.ttf b/template/app/public/fonts/Satoshi-Medium.ttf
deleted file mode 100644
index ab149b719..000000000
Binary files a/template/app/public/fonts/Satoshi-Medium.ttf and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-Medium.woff b/template/app/public/fonts/Satoshi-Medium.woff
deleted file mode 100644
index cef3226e5..000000000
Binary files a/template/app/public/fonts/Satoshi-Medium.woff and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-MediumItalic.eot b/template/app/public/fonts/Satoshi-MediumItalic.eot
deleted file mode 100644
index 25d229a5b..000000000
Binary files a/template/app/public/fonts/Satoshi-MediumItalic.eot and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-MediumItalic.ttf b/template/app/public/fonts/Satoshi-MediumItalic.ttf
deleted file mode 100644
index 387f278e2..000000000
Binary files a/template/app/public/fonts/Satoshi-MediumItalic.ttf and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-MediumItalic.woff b/template/app/public/fonts/Satoshi-MediumItalic.woff
deleted file mode 100644
index 46d8995af..000000000
Binary files a/template/app/public/fonts/Satoshi-MediumItalic.woff and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-MediumItalic.woff2 b/template/app/public/fonts/Satoshi-MediumItalic.woff2
deleted file mode 100644
index 212adc92a..000000000
Binary files a/template/app/public/fonts/Satoshi-MediumItalic.woff2 and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-Regular.eot b/template/app/public/fonts/Satoshi-Regular.eot
deleted file mode 100644
index 452666f4a..000000000
Binary files a/template/app/public/fonts/Satoshi-Regular.eot and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-Regular.ttf b/template/app/public/fonts/Satoshi-Regular.ttf
deleted file mode 100644
index fe85cd6c9..000000000
Binary files a/template/app/public/fonts/Satoshi-Regular.ttf and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-Regular.woff b/template/app/public/fonts/Satoshi-Regular.woff
deleted file mode 100644
index 03ac19525..000000000
Binary files a/template/app/public/fonts/Satoshi-Regular.woff and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-Variable.eot b/template/app/public/fonts/Satoshi-Variable.eot
deleted file mode 100644
index f42624e18..000000000
Binary files a/template/app/public/fonts/Satoshi-Variable.eot and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-Variable.ttf b/template/app/public/fonts/Satoshi-Variable.ttf
deleted file mode 100644
index 976e85cb5..000000000
Binary files a/template/app/public/fonts/Satoshi-Variable.ttf and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-Variable.woff b/template/app/public/fonts/Satoshi-Variable.woff
deleted file mode 100644
index f8dcd1d60..000000000
Binary files a/template/app/public/fonts/Satoshi-Variable.woff and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-Variable.woff2 b/template/app/public/fonts/Satoshi-Variable.woff2
deleted file mode 100644
index b00e833ed..000000000
Binary files a/template/app/public/fonts/Satoshi-Variable.woff2 and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-VariableItalic.eot b/template/app/public/fonts/Satoshi-VariableItalic.eot
deleted file mode 100644
index 5f4554af9..000000000
Binary files a/template/app/public/fonts/Satoshi-VariableItalic.eot and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-VariableItalic.ttf b/template/app/public/fonts/Satoshi-VariableItalic.ttf
deleted file mode 100644
index 4c2677c6f..000000000
Binary files a/template/app/public/fonts/Satoshi-VariableItalic.ttf and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-VariableItalic.woff b/template/app/public/fonts/Satoshi-VariableItalic.woff
deleted file mode 100644
index 3fe029e25..000000000
Binary files a/template/app/public/fonts/Satoshi-VariableItalic.woff and /dev/null differ
diff --git a/template/app/public/fonts/Satoshi-VariableItalic.woff2 b/template/app/public/fonts/Satoshi-VariableItalic.woff2
deleted file mode 100644
index e7ab3a09a..000000000
Binary files a/template/app/public/fonts/Satoshi-VariableItalic.woff2 and /dev/null differ
diff --git a/template/app/src/admin/dashboards/analytics/RevenueAndProfitChart.tsx b/template/app/src/admin/dashboards/analytics/RevenueAndProfitChart.tsx
index dbcd2ded7..9f12690f0 100644
--- a/template/app/src/admin/dashboards/analytics/RevenueAndProfitChart.tsx
+++ b/template/app/src/admin/dashboards/analytics/RevenueAndProfitChart.tsx
@@ -11,7 +11,7 @@ const options: ApexOptions = {
   },
   colors: ["#3C50E0", "#80CAEE"],
   chart: {
-    fontFamily: "Satoshi, sans-serif",
+    fontFamily: "system-ui, sans-serif",
     height: 335,
     type: "area",
     dropShadow: {
diff --git a/template/app/src/client/Main.css b/template/app/src/client/Main.css
index 935e2dde5..2c06aad0f 100644
--- a/template/app/src/client/Main.css
+++ b/template/app/src/client/Main.css
@@ -58,19 +58,6 @@
   }
 }
 
-/* Here is an example of how to add a custom font. 
-* Fonts are stored in the public/fonts folder.
-* They are defined first here, then need to be referenced in the tailwind.config.js file
-* under `theme.extend.fontFamily`, and then can be used as a tailwind class, e.g. className='font-satoshi'.
-*/
-@font-face {
-  font-family: "Satoshi";
-  src: url("/fonts/Satoshi-Regular.woff2") format("woff2");
-  font-weight: normal;
-  font-style: normal;
-  font-display: swap;
-}
-
 /* third-party libraries CSS */
 
 .tableCheckbox:checked ~ div span {
diff --git a/template/app/tailwind.config.js b/template/app/tailwind.config.js
index f437b3b7a..cd53f99c8 100644
--- a/template/app/tailwind.config.js
+++ b/template/app/tailwind.config.js
@@ -12,9 +12,6 @@ export default {
   darkMode: "class",
   theme: {
     extend: {
-      fontFamily: {
-        satoshi: ["Satoshi", "system-ui", "sans-serif"],
-      },
       colors: {
         current: "currentColor",
         transparent: "transparent",