diff --git a/_headers b/_headers
index 5692ef1..dac38bd 100644
--- a/_headers
+++ b/_headers
@@ -1,8 +1,3 @@
-/.well-known/*
-  Access-Control-Allow-Origin: *
-
-/.well-known/*.json
-  Content-Type: application/json
-
 /.well-known/atproto-did
+  Access-Control-Allow-Origin: *
   Content-Type: text/plain
diff --git a/.well-known/site.exosphere.featureRequest.json b/lexicons/site/exosphere/featureRequest.json
similarity index 71%
rename from .well-known/site.exosphere.featureRequest.json
rename to lexicons/site/exosphere/featureRequest.json
index 7120beb..43e09fb 100644
--- a/.well-known/site.exosphere.featureRequest.json
+++ b/lexicons/site/exosphere/featureRequest.json
@@ -8,7 +8,11 @@
       "key": "tid",
       "record": {
         "type": "object",
-        "required": ["title", "subject", "createdAt"],
+        "required": [
+          "title",
+          "subject",
+          "createdAt"
+        ],
         "properties": {
           "title": {
             "type": "string",
@@ -20,7 +24,13 @@
           },
           "category": {
             "type": "string",
-            "knownValues": ["general", "enhancement", "bug", "integration", "ui-ux"]
+            "knownValues": [
+              "general",
+              "enhancement",
+              "bug",
+              "integration",
+              "ui-ux"
+            ]
           },
           "subject": {
             "type": "string",
@@ -30,6 +40,10 @@
           "createdAt": {
             "type": "string",
             "format": "datetime"
+          },
+          "updatedAt": {
+            "type": "string",
+            "format": "datetime"
           }
         }
       }
diff --git a/.well-known/site.exosphere.featureRequestComment.json b/lexicons/site/exosphere/featureRequestComment.json
similarity index 85%
rename from .well-known/site.exosphere.featureRequestComment.json
rename to lexicons/site/exosphere/featureRequestComment.json
index 8dee436..b44438f 100644
--- a/.well-known/site.exosphere.featureRequestComment.json
+++ b/lexicons/site/exosphere/featureRequestComment.json
@@ -8,7 +8,11 @@
       "key": "tid",
       "record": {
         "type": "object",
-        "required": ["subject", "content", "createdAt"],
+        "required": [
+          "subject",
+          "content",
+          "createdAt"
+        ],
         "properties": {
           "subject": {
             "type": "string",
@@ -17,7 +21,7 @@
           },
           "content": {
             "type": "string",
-            "maxLength": 10000
+            "maxLength": 5000
           },
           "createdAt": {
             "type": "string",
diff --git a/.well-known/site.exosphere.featureRequestCommentVote.json b/lexicons/site/exosphere/featureRequestCommentVote.json
similarity index 88%
rename from .well-known/site.exosphere.featureRequestCommentVote.json
rename to lexicons/site/exosphere/featureRequestCommentVote.json
index 0fec63d..4cea367 100644
--- a/.well-known/site.exosphere.featureRequestCommentVote.json
+++ b/lexicons/site/exosphere/featureRequestCommentVote.json
@@ -8,7 +8,10 @@
       "key": "tid",
       "record": {
         "type": "object",
-        "required": ["subject", "createdAt"],
+        "required": [
+          "subject",
+          "createdAt"
+        ],
         "properties": {
           "subject": {
             "type": "string",
diff --git a/.well-known/site.exosphere.featureRequestStatus.json b/lexicons/site/exosphere/featureRequestStatus.json
similarity index 72%
rename from .well-known/site.exosphere.featureRequestStatus.json
rename to lexicons/site/exosphere/featureRequestStatus.json
index ed52abd..90f1b84 100644
--- a/.well-known/site.exosphere.featureRequestStatus.json
+++ b/lexicons/site/exosphere/featureRequestStatus.json
@@ -8,7 +8,11 @@
       "key": "tid",
       "record": {
         "type": "object",
-        "required": ["subject", "status", "createdAt"],
+        "required": [
+          "subject",
+          "status",
+          "createdAt"
+        ],
         "properties": {
           "subject": {
             "type": "string",
@@ -17,7 +21,14 @@
           },
           "status": {
             "type": "string",
-            "knownValues": ["requested", "not-planned", "approved", "in-progress", "done"]
+            "knownValues": [
+              "requested",
+              "not-planned",
+              "approved",
+              "in-progress",
+              "done",
+              "duplicate"
+            ]
           },
           "createdAt": {
             "type": "string",
diff --git a/.well-known/site.exosphere.featureRequestVote.json b/lexicons/site/exosphere/featureRequestVote.json
similarity index 88%
rename from .well-known/site.exosphere.featureRequestVote.json
rename to lexicons/site/exosphere/featureRequestVote.json
index 41deaca..bb11fdd 100644
--- a/.well-known/site.exosphere.featureRequestVote.json
+++ b/lexicons/site/exosphere/featureRequestVote.json
@@ -8,7 +8,10 @@
       "key": "tid",
       "record": {
         "type": "object",
-        "required": ["subject", "createdAt"],
+        "required": [
+          "subject",
+          "createdAt"
+        ],
         "properties": {
           "subject": {
             "type": "string",
diff --git a/.well-known/site.exosphere.moderation.json b/lexicons/site/exosphere/moderation.json
similarity index 81%
rename from .well-known/site.exosphere.moderation.json
rename to lexicons/site/exosphere/moderation.json
index 6f95906..552f53e 100644
--- a/.well-known/site.exosphere.moderation.json
+++ b/lexicons/site/exosphere/moderation.json
@@ -8,7 +8,12 @@
       "key": "tid",
       "record": {
         "type": "object",
-        "required": ["sphere", "subject", "action", "createdAt"],
+        "required": [
+          "sphere",
+          "subject",
+          "action",
+          "createdAt"
+        ],
         "properties": {
           "sphere": {
             "type": "string",
@@ -22,7 +27,9 @@
           },
           "action": {
             "type": "string",
-            "knownValues": ["remove"]
+            "knownValues": [
+              "remove"
+            ]
           },
           "createdAt": {
             "type": "string",
diff --git a/.well-known/site.exosphere.sphere.json b/lexicons/site/exosphere/sphere.json
similarity index 64%
rename from .well-known/site.exosphere.sphere.json
rename to lexicons/site/exosphere/sphere.json
index cc6fa5f..b264e5e 100644
--- a/.well-known/site.exosphere.sphere.json
+++ b/lexicons/site/exosphere/sphere.json
@@ -4,11 +4,16 @@
   "defs": {
     "main": {
       "type": "record",
-      "description": "Declaration of a Exosphere Sphere, published on the owner's PDS. Enables third-party discovery and indexing of Spheres across the AT Protocol network.",
-      "key": "self",
+      "description": "Declaration of an Exosphere Sphere, published on the owner's PDS. Enables third-party discovery and indexing of Spheres across the AT Protocol network.",
+      "key": "literal:self",
       "record": {
         "type": "object",
-        "required": ["name", "visibility", "writeAccess", "createdAt"],
+        "required": [
+          "name",
+          "visibility",
+          "writeAccess",
+          "createdAt"
+        ],
         "properties": {
           "name": {
             "type": "string",
@@ -23,17 +28,25 @@
           "visibility": {
             "type": "string",
             "description": "Whether the Sphere's content is publicly readable.",
-            "knownValues": ["public", "private"]
+            "knownValues": [
+              "public",
+              "private"
+            ]
           },
           "writeAccess": {
             "type": "string",
             "description": "Who can create content in this Sphere.",
-            "knownValues": ["open", "members"]
+            "knownValues": [
+              "open",
+              "members"
+            ]
           },
           "modules": {
             "type": "array",
             "description": "Module names enabled for this Sphere.",
-            "items": { "type": "string" }
+            "items": {
+              "type": "string"
+            }
           },
           "createdAt": {
             "type": "string",
diff --git a/.well-known/site.exosphere.sphereMember.json b/lexicons/site/exosphere/sphereMember.json
similarity index 91%
rename from .well-known/site.exosphere.sphereMember.json
rename to lexicons/site/exosphere/sphereMember.json
index edbba9b..a2094c0 100644
--- a/.well-known/site.exosphere.sphereMember.json
+++ b/lexicons/site/exosphere/sphereMember.json
@@ -8,7 +8,10 @@
       "key": "tid",
       "record": {
         "type": "object",
-        "required": ["sphere", "createdAt"],
+        "required": [
+          "sphere",
+          "createdAt"
+        ],
         "properties": {
           "sphere": {
             "type": "string",
diff --git a/.well-known/site.exosphere.sphereMemberApproval.json b/lexicons/site/exosphere/sphereMemberApproval.json
similarity index 83%
rename from .well-known/site.exosphere.sphereMemberApproval.json
rename to lexicons/site/exosphere/sphereMemberApproval.json
index c51f24a..2483948 100644
--- a/.well-known/site.exosphere.sphereMemberApproval.json
+++ b/lexicons/site/exosphere/sphereMemberApproval.json
@@ -8,7 +8,12 @@
       "key": "tid",
       "record": {
         "type": "object",
-        "required": ["sphere", "subject", "role", "createdAt"],
+        "required": [
+          "sphere",
+          "subject",
+          "role",
+          "createdAt"
+        ],
         "properties": {
           "sphere": {
             "type": "string",
@@ -23,7 +28,10 @@
           "role": {
             "type": "string",
             "description": "Role granted to the member.",
-            "knownValues": ["admin", "member"]
+            "knownValues": [
+              "admin",
+              "member"
+            ]
           },
           "createdAt": {
             "type": "string",