diff --git a/templates/partials/cafe_list.html b/templates/partials/cafe_list.html
index 6fadc15..ab1f941 100644
--- a/templates/partials/cafe_list.html
+++ b/templates/partials/cafe_list.html
@@ -38,7 +38,7 @@
             <td data-label="Added" class="card-date whitespace-nowrap px-4 py-3 text-xs font-medium text-stone-600">
               {{ cafe.created_at }}
             </td>
-            <td data-label="Name" class="card-title px-4 py-3 font-semibold text-amber-800">
+            <td data-label="Name" class="card-title px-4 py-3 font-medium text-stone-800">
               {{ cafe.name }}
             </td>
             <td data-label="Location" class="px-4 py-3 whitespace-nowrap">
diff --git a/templates/partials/cup_list.html b/templates/partials/cup_list.html
index ee2ab20..953491d 100644
--- a/templates/partials/cup_list.html
+++ b/templates/partials/cup_list.html
@@ -36,12 +36,12 @@
               {{ cup.created_at }}
             </td>
             <td data-label="Coffee" class="card-title px-4 py-3 whitespace-nowrap">
-              <span class="font-semibold text-amber-800">{{ cup.roast_name }}</span>
+              <div class="font-medium text-stone-800">{{ cup.roast_name }}</div>
               <div class="hidden md:block text-xs text-stone-500">{{ cup.roaster_name }}</div>
             </td>
             <td data-label="Roaster" class="px-4 py-3 whitespace-nowrap md:hidden">{{ cup.roaster_name }}</td>
             <td data-label="Cafe" class="px-4 py-3 whitespace-nowrap">
-              <span class="text-amber-800">{{ cup.cafe_name }}</span>
+              {{ cup.cafe_name }}
             </td>
             <td data-label="Rating" class="px-4 py-3 whitespace-nowrap">{{ cup.rating }}</td>
             <td data-label="" class="card-actions px-4 py-3 text-right">
diff --git a/templates/partials/roast_list.html b/templates/partials/roast_list.html
index ffc45f9..1f9e9fe 100644
--- a/templates/partials/roast_list.html
+++ b/templates/partials/roast_list.html
@@ -41,7 +41,7 @@
               {{ roast.created_at }}
             </td>
             <td data-label="Roast" class="card-title px-4 py-3">
-              <span class="font-semibold text-amber-800">{{ roast.name }}</span>
+              <div class="font-medium text-stone-800">{{ roast.name }}</div>
               <div class="hidden md:block text-xs text-stone-500">{{ roast.roaster_label }}</div>
             </td>
             <td data-label="Roaster" class="px-4 py-3 whitespace-nowrap md:hidden">{{ roast.roaster_label }}</td>
diff --git a/templates/partials/roaster_list.html b/templates/partials/roaster_list.html
index ee083c3..068d495 100644
--- a/templates/partials/roaster_list.html
+++ b/templates/partials/roaster_list.html
@@ -38,7 +38,7 @@
             <td data-label="Added" class="card-date whitespace-nowrap px-4 py-3 text-xs font-medium text-stone-600">
               {{ roaster.created_at }}
             </td>
-            <td data-label="Name" class="card-title px-4 py-3 font-semibold text-amber-800">
+            <td data-label="Name" class="card-title px-4 py-3 font-medium text-stone-800">
               {{ roaster.name }}
             </td>
             <td data-label="Location" class="px-4 py-3 whitespace-nowrap">