diff --git a/chai/src/main/java/com/droidconke/chai/atoms/CFonts.kt b/chai/src/main/java/com/droidconke/chai/atoms/CFonts.kt
deleted file mode 100755
index 5087a8b..0000000
--- a/chai/src/main/java/com/droidconke/chai/atoms/CFonts.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2022 DroidconKE
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.droidconke.chai.atoms
-
-import androidx.compose.ui.text.font.Font
-import androidx.compose.ui.text.font.FontFamily
-import com.droidconke.chai.R
-
-/**
- * Chai typography:
- * Consists of 2 files that work together:
- *  - CTypography(located ion the components package) and
- *  - CFont located in the atoms directory
- * Font:
- * Defines the font family types only here
- * We use val for the purpose of making it available in the entire application
- * You first add the fonts to the res folder under fonts
- * Then just reference them here.
- * Font-  List all fonts that will be used in the application
- *
- */
-
-val MontserratRegular = FontFamily(Font(R.font.montserrat_regular))
-val MontserratBold = FontFamily(Font(R.font.montserrat_bold))
-val MontserratSemiBold = FontFamily(Font(R.font.montserrat_semi_bold))
-val MontserratLight = FontFamily(Font(R.font.montserrat_light))
-val MontserratMedium = FontFamily(Font(R.font.montserrat_medium))
-
-val MontserratExtraLight = FontFamily(Font(R.font.montserrat_extra_light))
-
-val MontserratThin = FontFamily(Font(R.font.montserrat_thin))
\ No newline at end of file
diff --git a/chai/src/main/java/com/droidconke/chai/atoms/Font.kt b/chai/src/main/java/com/droidconke/chai/atoms/Font.kt
new file mode 100755
index 0000000..7d66d86
--- /dev/null
+++ b/chai/src/main/java/com/droidconke/chai/atoms/Font.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2022 DroidconKE
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.droidconke.chai.atoms
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import com.droidconke.chai.R
+
+/**
+ * Chai typography:
+ * Consists of 2 files that work together:
+ *  - Typography(located in the main package) and
+ *  - Font located in the atoms directory
+ *
+ * Font:
+ * Defines the font family types only here
+ * We use val for the purpose of making it available in the entire application
+ * You first add the fonts to the res folder under fonts
+ * Then just reference them here.
+ *
+ * Font - List all fonts that will be used in the application
+ *
+ */
+internal val MontserratSans: FontFamily
+    @Composable
+    get() = FontFamily(
+        MontserratBold,
+        MontserratSemiBold,
+        MontserratMedium,
+        MontserratRegular,
+        MontserratLight,
+        MontserratExtraLight,
+        MontserratThin
+    )
+
+private val MontserratBold = Font(R.font.montserrat_bold, weight = FontWeight.Bold)
+private val MontserratSemiBold = Font(R.font.montserrat_semi_bold, weight = FontWeight.SemiBold)
+private val MontserratMedium = Font(R.font.montserrat_medium, weight = FontWeight.Medium)
+private val MontserratRegular = Font(R.font.montserrat_regular, weight = FontWeight.Normal)
+private val MontserratLight = Font(R.font.montserrat_light, weight = FontWeight.Light)
+private val MontserratExtraLight = Font(R.font.montserrat_extra_light, weight = FontWeight.ExtraLight)
+private val MontserratThin = Font(R.font.montserrat_thin, weight = FontWeight.Thin)