diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Shape.kt b/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Shape.kt
index 8634fe9..ceff6af 100644
--- a/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Shape.kt
+++ b/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Shape.kt
@@ -5,7 +5,7 @@ import androidx.compose.material.Shapes
 import androidx.compose.ui.unit.dp
 
 val Shapes = Shapes(
-    small = RoundedCornerShape(4.dp),
-    medium = RoundedCornerShape(4.dp),
+    small = RoundedCornerShape(6.dp),
+    medium = RoundedCornerShape(12.dp),
     large = RoundedCornerShape(0.dp)
 )
\ No newline at end of file
diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Type.kt b/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Type.kt
index 0750dd6..13ae2e8 100644
--- a/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Type.kt
+++ b/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Type.kt
@@ -27,21 +27,20 @@ val productSansFont = FontFamily(
 // Set of Material typography styles to start with
 val Typography = Typography(
     body1 = TextStyle(
-        fontFamily = FontFamily.Default,
+        fontFamily = productSansFont,
         fontWeight = FontWeight.Normal,
         fontSize = 16.sp
-    )
-    /* Other default text styles to override
+    ),
     button = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.W500,
+        fontFamily = productSansFont,
+        fontWeight = FontWeight.Medium,
         fontSize = 14.sp
     ),
     caption = TextStyle(
-        fontFamily = FontFamily.Default,
+        fontFamily = productSansFont,
         fontWeight = FontWeight.Normal,
         fontSize = 12.sp
-    )
-    */
+    ),
+    defaultFontFamily = productSansFont
 )