diff --git a/.github/deno.jsonc b/.github/deno.jsonc
index 20758006..2b6ddf6a 100644
--- a/.github/deno.jsonc
+++ b/.github/deno.jsonc
@@ -9,6 +9,7 @@
     }
   },
   "imports": {
-    "pkgx": "https://deno.land/x/libpkgx@v0.14.1/mod.ts"
+    "pkgx": "https://deno.land/x/libpkgx@v0.15.1/mod.ts",
+    "pkgx/": "https://deno.land/x/libpkgx@v0.15.1/src/"
   }
 }
diff --git a/.github/scripts/utils/indexer.ts b/.github/scripts/utils/indexer.ts
index 5fae5a58..19864868 100644
--- a/.github/scripts/utils/indexer.ts
+++ b/.github/scripts/utils/indexer.ts
@@ -5,16 +5,17 @@ interface Package {
   birthtime: Date,
   name?: string
   description?: string
+  labels?: string[]
 }
 
-export async function getKettleRemoteMetadata(): Promise<Record<string, string>> {
+export async function getKettleRemoteMetadata() {
   const headers = { Authorization: 'public' }
   const rsp = await fetch(`https://app.pkgx.dev/v1/packages/`, {headers})
   const foo = await rsp.json() as {project: string, short_description: string}[]
   return foo.reduce((acc, {project, short_description}) => {
     acc[project] = short_description
     return acc
-  }, {})
+  }, {} as Record<string, string>)
 }
 
 const descriptions = await getKettleRemoteMetadata();
@@ -48,9 +49,14 @@ async function getPackageYmlCreationDates(): Promise<Package[]> {
 
       const birthtime = new Date(currentCommitDate!)
       const name = await get_name(line, project)
-      const description = descriptions[project]
 
-      rv.push({ project, birthtime, name, description })
+      let description: string | undefined = descriptions[project]?.trim()
+      if (!description) description = undefined
+
+      let labels: string[] | undefined = [...await get_labels(line)]
+      if (labels.length == 0) labels = undefined
+
+      rv.push({ project, birthtime, name, description, labels })
     }
   }
 
@@ -67,6 +73,7 @@ console.log(JSON.stringify(pkgs, null, 2));
 //////////////////////////////////////////////////////
 import { parse } from "https://deno.land/std@0.204.0/yaml/mod.ts";
 import { isArray } from "https://deno.land/x/is_what@v4.1.15/src/index.ts";
+import get_pkg_name from "https://raw.githubusercontent.com/pkgxdev/www/main/src/utils/pkg-name.ts";
 
 async function get_name(path: string, project: string): Promise<string | undefined> {
   const txt = await Deno.readTextFileSync(path)
@@ -75,7 +82,45 @@ async function get_name(path: string, project: string): Promise<string | undefin
     return yml['display-name']
   } else if (isArray(yml.provides) && yml.provides.length == 1) {
     return yml.provides[0].slice(4)
-  } else if (project.startsWith("github.com")) {
-    return project.slice(11)
+  } else {
+    return get_pkg_name(project)
   }
 }
+
+import { parse_pkgs_node } from "pkgx/hooks/usePantry.ts"
+
+async function get_labels(path: string) {
+  const txt = await Deno.readTextFileSync(path)
+  const yml = await parse(txt) as Record<string, any>
+  const deps = parse_pkgs_node(yml.dependencies) //NOTE will ignore other platforms than linux, but should be fine
+
+  const labels = new Set<string>(deps.compact(({ project }) => {
+    switch (project) {
+    case 'nodejs.org':
+    case 'npmjs.com':
+      return 'node'
+    case 'python.org':
+    case 'pip.pypa.io':
+      return 'python'
+    case 'ruby-lang.org':
+    case 'rubygems.org':
+      return 'ruby'
+    case 'rust-lang.org':
+    case 'rust-lang.org/cargo':
+      return 'rust'
+    }
+  }))
+
+  for (const dep of parse_pkgs_node(yml.build.dependencies)) {
+    switch (dep.project) {
+    case 'rust-lang.org':
+    case 'rust-lang.org/cargo':
+      labels.add('rust')
+      break
+    case 'go.dev':
+      labels.add('go')
+    }
+  }
+
+  return labels
+}