diff --git a/api/activitypub/actor.ts b/api/activitypub/actor.ts
index 5270bfd7bea26862fd048d4bfbe1863e8fe6c914..32e256827f12e836ec4129aa0c8b4721b64df96e 100644
--- a/api/activitypub/actor.ts
+++ b/api/activitypub/actor.ts
@@ -13,7 +13,7 @@ export default function (req: VercelRequest, res: VercelResponse) {
   res.statusCode = 200;
   res.setHeader("Content-Type", `application/activity+json`);
   res.json({
-    "@context": ["https://www.w3.org/ns/activitystreams", { "@language": "en- GB" }],
+    "@context": "https://www.w3.org/ns/activitystreams",
     "type": "Person",
     "id": `${process.env.ACTIVITYPUB_URL}${process.env.ACTIVITYPUB_USER.toLowerCase()}`,
     "outbox": `${process.env.ACTIVITYPUB_URL}outbox`,
diff --git a/layouts/index.activity.ajson b/layouts/index.activity.ajson
index ba2192309c899bf463371d875ef3e523c14da145..0c1cb98ae8c249f0ba352f64f9467dc6beb9deed 100644
--- a/layouts/index.activity.ajson
+++ b/layouts/index.activity.ajson
@@ -1,6 +1,5 @@
 {
-  "@context": ["https://www.w3.org/ns/activitystreams",
-               {"@language": ""en-GB"}],
+  { partial "context.ajson" . }},
   "type": "Person",
   "id": "{{ $.Site.BaseURL }}",
   "outbox": "{{ $.Site.BaseURL }}outbox",
@@ -13,4 +12,4 @@
     "mediaType":"image/png",
     "url": "{{ $.Site.BaseURL }}images/logo.png"
   }
-}
\ No newline at end of file
+}
diff --git a/layouts/partials/context.ajson b/layouts/partials/context.ajson
index c165a37ee3e935f7e0ad94ae878815e63999c0ca..88967f94acbea1b4f5f0544a294b8ba4c0e5ac9b 100644
--- a/layouts/partials/context.ajson
+++ b/layouts/partials/context.ajson
@@ -1 +1,14 @@
-"@context": "https://www.w3.org/ns/activitystreams"
+"@context": [
+    "https://www.w3.org/ns/activitystreams",
+    {
+      "ostatus": "http://ostatus.org#",
+      "atomUri": "ostatus:atomUri",
+      "inReplyToAtomUri": "ostatus:inReplyToAtomUri",
+      "conversation": "ostatus:conversation",
+      "sensitive": "as:sensitive",
+      "toot": "http://joinmastodon.org/ns#",
+      "votersCount": "toot:votersCount",
+      "expiry": "toot:expiry",
+      "Hashtag": "as:Hashtag"
+    }
+  ]