diff --git a/packages/lexicons/defs/sh/comet/v0/richtext/facets.json b/packages/lexicons/defs/app.bsky.richtext.facet.json
similarity index 94%
rename from packages/lexicons/defs/sh/comet/v0/richtext/facets.json
rename to packages/lexicons/defs/app.bsky.richtext.facet.json
index 29f290f..388a3a5 100644
--- a/packages/lexicons/defs/sh/comet/v0/richtext/facets.json
+++ b/packages/lexicons/defs/app.bsky.richtext.facet.json
@@ -1,6 +1,6 @@
 {
   "lexicon": 1,
-  "id": "sh.comet.v0.richtext.facets",
+  "id": "app.bsky.richtext.facet",
   "defs": {
     "main": {
       "type": "object",
@@ -35,7 +35,7 @@
       "description": "Facet feature for a hashtag. The text usually includes a '#' prefix, but the facet reference should not (except in the case of 'double hash tags').",
       "required": ["tag"],
       "properties": {
-        "tag": { "type": "ref", "ref": "sh.comet.v0.feed.defs#tag" }
+        "tag": { "type": "string", "maxLength": 640, "maxGraphemes": 64 }
       }
     },
     "byteSlice": {
diff --git a/packages/lexicons/defs/sh/comet/v0/actor/profile.json b/packages/lexicons/defs/sh/comet/v0/actor/profile.json
index c86f8e0..7790237 100644
--- a/packages/lexicons/defs/sh/comet/v0/actor/profile.json
+++ b/packages/lexicons/defs/sh/comet/v0/actor/profile.json
@@ -23,7 +23,7 @@
           "descriptionFacets": {
             "type": "ref",
             "description": "Annotations of the user's description.",
-            "ref": "sh.comet.v0.richtext.facets"
+            "ref": "app.bsky.richtext.facets"
           },
           "avatar": {
             "type": "blob",
diff --git a/packages/lexicons/defs/sh/comet/v0/feed/defs.json b/packages/lexicons/defs/sh/comet/v0/feed/defs.json
index 496c7d7..6ab794f 100644
--- a/packages/lexicons/defs/sh/comet/v0/feed/defs.json
+++ b/packages/lexicons/defs/sh/comet/v0/feed/defs.json
@@ -2,21 +2,6 @@
   "lexicon": 1,
   "id": "sh.comet.v0.feed.defs",
   "defs": {
-    "tag": {
-      "type": "string",
-      "knownValues": [
-        "sh.comet.v0.feed.tag#alternative",
-        "sh.comet.v0.feed.tag#ambient",
-        "sh.comet.v0.feed.tag#electronic",
-        "sh.comet.v0.feed.tag#experimental",
-        "sh.comet.v0.feed.tag#hiphop",
-        "sh.comet.v0.feed.tag#metal",
-        "sh.comet.v0.feed.tag#rock",
-        "sh.comet.v0.feed.tag#podcast",
-        "sh.comet.v0.feed.tag#pop",
-        "sh.comet.v0.feed.tag#punk"
-      ]
-    },
     "link": {
       "type": "object",
       "description": "Link for the track. Usually to acquire it in some way, e.g. via free download or purchase. | TODO: multiple links?",
diff --git a/packages/lexicons/defs/sh/comet/v0/feed/playlist.json b/packages/lexicons/defs/sh/comet/v0/feed/playlist.json
index 5658360..f2b6653 100644
--- a/packages/lexicons/defs/sh/comet/v0/feed/playlist.json
+++ b/packages/lexicons/defs/sh/comet/v0/feed/playlist.json
@@ -46,10 +46,9 @@
           },
           "tags": {
             "type": "array",
-            "description": "Tags/genres for the playlist. First item is used as the \"primary\" tag. | TODO: reconsider maxLength value",
-            "minLength": 1,
-            "maxLength": 5,
-            "items": { "type": "ref", "ref": "sh.comet.v0.feed.defs#tag" }
+            "description": "Hashtags for the playlist, usually for genres.",
+            "maxLength": 8,
+            "items": { "type": "string", "maxLength": 640, "maxGraphemes": 64 }
           },
           "link": {
             "type": "ref",
diff --git a/packages/lexicons/defs/sh/comet/v0/feed/tag.json b/packages/lexicons/defs/sh/comet/v0/feed/tag.json
deleted file mode 100644
index 4a46f74..0000000
--- a/packages/lexicons/defs/sh/comet/v0/feed/tag.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "lexicon": 1,
-  "id": "sh.comet.v0.feed.tag",
-  "description": "TODO: maybe instead of being like this, make tag a proper record?",
-  "defs": {
-    "alternative": { "type": "token" },
-    "ambient": { "type": "token" },
-    "electronic": { "type": "token" },
-    "experimental": { "type": "token" },
-    "hiphop": { "type": "token" },
-    "metal": { "type": "token" },
-    "rock": { "type": "token" },
-    "podcast": { "type": "token" },
-    "pop": { "type": "token" },
-    "punk": { "type": "token" }
-  }
-}
diff --git a/packages/lexicons/defs/sh/comet/v0/feed/track.json b/packages/lexicons/defs/sh/comet/v0/feed/track.json
index 20269df..9d350ab 100644
--- a/packages/lexicons/defs/sh/comet/v0/feed/track.json
+++ b/packages/lexicons/defs/sh/comet/v0/feed/track.json
@@ -38,14 +38,13 @@
           "descriptionFacets": {
             "type": "ref",
             "description": "Annotations of the track's description.",
-            "ref": "sh.comet.v0.richtext.facets"
+            "ref": "app.bsky.richtext.facets"
           },
           "tags": {
             "type": "array",
-            "description": "Tags/genres for the track. First item is used as the \"primary\" tag. | TODO: reconsider maxLength value",
-            "minLength": 1,
-            "maxLength": 5,
-            "items": { "type": "ref", "ref": "sh.comet.v0.feed.defs#tag" }
+            "description": "Hashtags for the track, usually for genres.",
+            "maxLength": 8,
+            "items": { "type": "string", "maxLength": 640, "maxGraphemes": 64 }
           },
           "link": {
             "type": "ref",