diff --git a/ui/components/src/main/scala/works/iterative/services/files/components/tailwind/FileTable.scala b/ui/components/src/main/scala/works/iterative/services/files/components/tailwind/FileTable.scala
index 62ff5db..9d75795 100644
--- a/ui/components/src/main/scala/works/iterative/services/files/components/tailwind/FileTable.scala
+++ b/ui/components/src/main/scala/works/iterative/services/files/components/tailwind/FileTable.scala
@@ -95,7 +95,8 @@
           ),
           name
         )
-      ) :: (if o.contains(name) then files.map(renderRow) else Nil)
+      ) :: (if o.contains(name) then files.sortBy(_.name).map(renderRow)
+            else Nil)
     )
 
   div(
@@ -129,6 +130,7 @@
                   .combineSeq(
                     f.groupBy(_.category)
                       .to(List)
+                      .sortBy(_._1)
                       .map(renderCategory(_, _))
                   )
                   .map(_.flatten)

diff --git a/ui/components/src/main/scala/works/iterative/services/files/components/tailwind/FileTable.scala b/ui/components/src/main/scala/works/iterative/services/files/components/tailwind/FileTable.scala
index 62ff5db..9d75795 100644
--- a/ui/components/src/main/scala/works/iterative/services/files/components/tailwind/FileTable.scala
+++ b/ui/components/src/main/scala/works/iterative/services/files/components/tailwind/FileTable.scala
@@ -95,7 +95,8 @@
           ),
           name
         )
-      ) :: (if o.contains(name) then files.map(renderRow) else Nil)
+      ) :: (if o.contains(name) then files.sortBy(_.name).map(renderRow)
+            else Nil)
     )
 
   div(
@@ -129,6 +130,7 @@
                   .combineSeq(
                     f.groupBy(_.category)
                       .to(List)
+                      .sortBy(_._1)
                       .map(renderCategory(_, _))
                   )
                   .map(_.flatten)
diff --git a/ui/components/src/main/scala/works/iterative/ui/components/tailwind/list/RowTag.scala b/ui/components/src/main/scala/works/iterative/ui/components/tailwind/list/RowTag.scala
index 4ad12f4..5998707 100644
--- a/ui/components/src/main/scala/works/iterative/ui/components/tailwind/list/RowTag.scala
+++ b/ui/components/src/main/scala/works/iterative/ui/components/tailwind/list/RowTag.scala
@@ -13,10 +13,12 @@
       cls := "px-2 inline-flex text-xs leading-5 font-semibold rounded-full",
       // cls(colorClass(color)),
       cls := (color match {
-        case Color.red   => "text-red-800 bg-red-100"
-        case Color.amber => "text-amber-800 bg-amber-100"
-        case Color.green => "text-green-800 bg-green-100"
-        case _           => "text-gray-800 bg-gray-100"
+        case Color.red    => "text-red-800 bg-red-100"
+        case Color.amber  => "text-amber-800 bg-amber-100"
+        case Color.orange => "text-orange-800 bg-orange-100"
+        case Color.yellow => "text-yellow-800 bg-yellow-100"
+        case Color.green  => "text-green-800 bg-green-100"
+        case _            => "text-gray-800 bg-gray-100"
       }),
       text
     )