diff --git a/preview/glossy/0.2.1/src/themes/compact.typ b/preview/glossy/0.2.1/src/themes/compact.typ
index 0ec3115..86a40e3 100644
--- a/preview/glossy/0.2.1/src/themes/compact.typ
+++ b/preview/glossy/0.2.1/src/themes/compact.typ
@@ -73,6 +73,7 @@
       spacing: 0.4em,
       grid(
         columns: (auto, 1fr, auto),
+        align: left+bottom,
         gutter: 0.5em,
         // Term and description column
         box[#term#entry.label#long-form #description],
diff --git a/preview/glossy/0.2.1/src/themes/twocol.typ b/preview/glossy/0.2.1/src/themes/twocol.typ
index 94a6bbb..7183e6e 100644
--- a/preview/glossy/0.2.1/src/themes/twocol.typ
+++ b/preview/glossy/0.2.1/src/themes/twocol.typ
@@ -60,13 +60,11 @@
       size: 0.75em,
       weight: "light",
       grid(
-        columns: (auto,auto,auto,1fr,1em,auto),
-        align: (left, left, left, center, center, right),
-        [#short-display#entry.label],  // Term with label
-        [#long-display],               // Long form (if any)
-        [#description],                // Description (if any)
+        columns: (auto,1fr,1em,auto),
+        align: (left, center, center, right),
+        [#short-display#entry.label#long-display#description],  // Term with label
         [#repeat(h(0.25em) + "." + h(0.25em))],  // Dotted leader line
-        [ . ],                         // Final dot
+        [ . ], // A 1em wide dot so we definitely get some break between term and pages
         [#entry.pages]                 // Page references
       )
     )
diff --git a/preview/glossy/0.2.1/tests/demo/ref/1.png b/preview/glossy/0.2.1/tests/demo/ref/1.png
index 87cf531..9b172a6 100644
Binary files a/preview/glossy/0.2.1/tests/demo/ref/1.png and b/preview/glossy/0.2.1/tests/demo/ref/1.png differ
diff --git a/preview/glossy/0.2.1/tests/sorting/ref/1.png b/preview/glossy/0.2.1/tests/sorting/ref/1.png
index b6e1b0a..b1ed845 100644
Binary files a/preview/glossy/0.2.1/tests/sorting/ref/1.png and b/preview/glossy/0.2.1/tests/sorting/ref/1.png differ
diff --git a/preview/glossy/0.2.1/tests/theme-gallery/ref/1.png b/preview/glossy/0.2.1/tests/theme-gallery/ref/1.png
index ad363cb..43f436f 100644
Binary files a/preview/glossy/0.2.1/tests/theme-gallery/ref/1.png and b/preview/glossy/0.2.1/tests/theme-gallery/ref/1.png differ
diff --git a/preview/glossy/0.2.1/tests/theme-gallery/test.typ b/preview/glossy/0.2.1/tests/theme-gallery/test.typ
index 72484ab..3677581 100644
--- a/preview/glossy/0.2.1/tests/theme-gallery/test.typ
+++ b/preview/glossy/0.2.1/tests/theme-gallery/test.typ
@@ -6,11 +6,18 @@
     long: "Hypertext Markup Language",
     description: "A standard language for creating web pages",
   ),
+  iphone: (
+    short: "iPhone",
+    description: "Revolutionized phones."
+  ),
   css: (
     short: "CSS",
     long: "Cascading Style Sheets",
     description: "A language used for describing the presentation of a document",
   ),
+  atom: (
+    short: "atom",
+  ),
   tps: (
     short: "TPS",
     long: "test procedure specification",
@@ -23,7 +30,7 @@
 #text(size: 18pt, weight: "bold")[Theme Gallery]
 
 First, we refer to each term at least once so they'll actually show up in the
-glossaries. Our terms include: @html:cap, @css, and @tps.
+glossaries. Our terms include: @atom, @iphone, @html:cap, @css, and @tps.
 
 // TODO: ask Discord if there's a way to get a symbol (ie function) name as a
 // TODO: figure out if there's a way to get a symbol (ie function) name as a
@@ -39,7 +46,7 @@ glossaries. Our terms include: @html:cap, @css, and @tps.
     spacing: 2em,
     inset: 1em,
     stroke: 1pt+gray,
-    glossary(title: raw(theme.first()), theme: theme.last())
+    glossary(title: raw(theme.first()), theme: theme.last(), ignore-case: true)
   )
 }
 
@@ -50,5 +57,5 @@ glossaries. Our terms include: @html:cap, @css, and @tps.
   inset: 1em,
   stroke: 1pt+gray,
   height: 1.5in,
-  glossary(title: raw("theme-twocol"), theme: theme-twocol)
+  glossary(title: raw("theme-twocol"), theme: theme-twocol, ignore-case: true)
 )
diff --git a/preview/glossy/0.2.1/themeshots.png b/preview/glossy/0.2.1/themeshots.png
index 0efee07..bc758a6 100644
Binary files a/preview/glossy/0.2.1/themeshots.png and b/preview/glossy/0.2.1/themeshots.png differ