diff --git a/blog/conditional-tuples-announcement.md b/blog/conditional-tuples-announcement.md
index 1ac5c0620..69d64c29c 100644
--- a/blog/conditional-tuples-announcement.md
+++ b/blog/conditional-tuples-announcement.md
@@ -60,7 +60,7 @@ You'll get the following results for the [ListObjects](https://openfga.dev/api/s
 
 Note that:
 
-- `user:bob` will always get `allowed:true` as we has assigned as as viewer unconditionally.
+- `user:bob` will always get `allowed:true` as we have assigned as viewer unconditionally.
 - `user:anne` will get `allowed:true` if the `current_time` is before the `grant_time` + `grant_duration` and `allowed:false` otherwise.
 - If you don't provide the `current_time` in the context, the Check and ListObjects operations will fail.
 
diff --git a/docs/content/authorization-concepts.mdx b/docs/content/authorization-concepts.mdx
index 729b373bd..1dc4af315 100644
--- a/docs/content/authorization-concepts.mdx
+++ b/docs/content/authorization-concepts.mdx
@@ -48,7 +48,7 @@ ReBAC also lets you natively solve for ABAC when attributes can be expressed in
 
 <ProductName format={ProductNameFormat.ShortForm}/> extends ReBAC by making it simpler to express additional ABAC scenarios using [Conditions](./modeling/conditions.mdx) or [Contextual Tuples](./modeling/token-claims-contextual-tuples.mdx).
 
-ReBAC can also be consided PBAC, as authorization policies are centralized.
+ReBAC can also be considered PBAC, as authorization policies are centralized.
 
 ## What is Zanzibar?
 
diff --git a/docs/content/concepts.mdx b/docs/content/concepts.mdx
index 0edc42f64..995e25eef 100644
--- a/docs/content/concepts.mdx
+++ b/docs/content/concepts.mdx
@@ -584,7 +584,7 @@ The list objects endpoint responds with a list of objects for a given type that
 For example, the following returns all the objects with document type for which `anne` of type user has a `viewer` relation with:
 
 <ListObjectsRequestViewer
-  authorizationModelId="1uHxCSuTP0VKPYSnkq1pbb1jeZw"
+  authorizationModelId="01HVMMBCMGZNT3SED4Z17ECXCA"
   objectType="document"
   relation="viewer"
   user="user:anne"
diff --git a/docs/content/configuration-language.mdx b/docs/content/configuration-language.mdx
index 6c9e5d1ca..6606d1793 100644
--- a/docs/content/configuration-language.mdx
+++ b/docs/content/configuration-language.mdx
@@ -23,7 +23,7 @@ import {
 
 <DocumentationNotice />
 
-<ProductName format={ProductNameFormat.LongForm}/>'s Configuration Language builds a representation of a system's <ProductConcept section="what-is-an-authorization-model" linkName="authorization model" />, which informs <UpdateProductNameInLinks link="/api/service" name="{ProductName}'s API" /> on the <ProductConcept section="what-is-a-type" linkName="object types" /> in the system are and how they relate to each other. The Configuration Language describes the <ProductConcept section="what-is-a-relation" linkName="relations" /> possible for an object of a given type and lists the conditions under which one is related to that object.
+<ProductName format={ProductNameFormat.LongForm}/>'s Configuration Language builds a representation of a system's <ProductConcept section="what-is-an-authorization-model" linkName="authorization model" />, which informs <UpdateProductNameInLinks link="/api/service" name="{ProductName}'s API" /> on the <ProductConcept section="what-is-a-type" linkName="object types" /> in the system and how they relate to each other. The Configuration Language describes the <ProductConcept section="what-is-a-relation" linkName="relations" /> possible for an object of a given type and lists the conditions under which one is related to that object.
 
 The Configuration Language can be presented in **DSL** or **JSON** syntax. The JSON syntax is accepted by the API and closely tracks the language in the [Zanzibar paper](https://research.google/pubs/pub48190/). The DSL adds syntactic sugar on top of JSON for ease of use, but compiles down to JSON before being sent to <ProductName format={ProductNameFormat.ShortForm}/>'s API. JSON syntax is used to call API directly or through the [SDKs](./getting-started), while DSL is used to interact with <ProductName format={ProductNameFormat.ShortForm}/> in the [Playground](https://play.fga.dev/), and they can be switched between throughout this documentation. 
 
@@ -388,7 +388,7 @@ Above, `document` <ProductConcept section="what-is-a-type-definition" linkName="
 
 :::info
 
-`can_rename` does not reference the [direct relationship type restrictions](#the-direct-relationship-type-restrictions), which means a user cannot be directly assigned this relation and it must inherited when the `editor` relation is assigned. Conversely, the `viewer` relation allows both direct and indirect relationships using the [Union Operator](#the-union-operator).
+`can_rename` does not reference the [direct relationship type restrictions](#the-direct-relationship-type-restrictions), which means a user cannot be directly assigned this relation and it must be inherited when the `editor` relation is assigned. Conversely, the `viewer` relation allows both direct and indirect relationships using the [Union Operator](#the-union-operator).
 
 :::
 
@@ -1013,7 +1013,7 @@ The following snippet:
                   },
                 },
                 {
-                  // a user that is an viewer on any of the object's parents is also implicitly a viewer on the object
+                  // a user that is a viewer on any of the object's parents is also implicitly a viewer on the object
                   tupleToUserset: {
                     tupleset: {
                       relation: 'parent',
diff --git a/docs/content/getting-started/cli.mdx b/docs/content/getting-started/cli.mdx
index 990a4d1b6..31809f568 100644
--- a/docs/content/getting-started/cli.mdx
+++ b/docs/content/getting-started/cli.mdx
@@ -331,7 +331,7 @@ Delete all tuples from a store by reading all the tuples first and then deleting
 ```bash
 # Reads all the tuples and outputs them in a json format that can be used by 'fga tuple delete' and 'fga tuple write'.
 
-$ fga tuple read --simple-output --max-pages 0    > tuples.json
+$ fga tuple read --output-format=simple-json --max-pages 0    > tuples.json
 $ fga tuple delete --file  tuples.json
 ```
 
@@ -380,4 +380,4 @@ Use the `fga model get` command is used to verify that the model was correctly w
       id:  '../modeling/testing-models.mdx',
     }
   ]}
-/>
\ No newline at end of file
+/>
diff --git a/docs/content/getting-started/configure-model.mdx b/docs/content/getting-started/configure-model.mdx
index 2fabdd19c..839a389a1 100644
--- a/docs/content/getting-started/configure-model.mdx
+++ b/docs/content/getting-started/configure-model.mdx
@@ -32,14 +32,14 @@ This article explains how to configure an <ProductConcept section="what-is-an-au
 
 1. <SdkSetupPrerequisite />
 2. You have [installed the SDK](./install-sdk.mdx), [created the store](./create-store.mdx) and [setup the SDK client](./setup-sdk-client.mdx).
-3. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+3. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 <TabItem value={SupportedLanguage.GO_SDK} label={languageLabelMap.get(SupportedLanguage.GO_SDK)}>
 
 1. <SdkSetupPrerequisite />
 2. You have [installed the SDK](./install-sdk.mdx), [created the store](./create-store.mdx) and [setup the SDK client](./setup-sdk-client.mdx).
-3. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+3. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 
@@ -47,7 +47,7 @@ This article explains how to configure an <ProductConcept section="what-is-an-au
 
 1. <SdkSetupPrerequisite />
 2. You have [installed the SDK](./install-sdk.mdx), [created the store](./create-store.mdx) and [setup the SDK client](./setup-sdk-client.mdx).
-3. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+3. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 
@@ -55,7 +55,7 @@ This article explains how to configure an <ProductConcept section="what-is-an-au
 
 1. <SdkSetupPrerequisite />
 2. You have [installed the SDK](./install-sdk.mdx), [created the store](./create-store.mdx) and [setup the SDK client](./setup-sdk-client.mdx).
-3. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+3. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 
@@ -63,7 +63,7 @@ This article explains how to configure an <ProductConcept section="what-is-an-au
 
 1. <SdkSetupPrerequisite />
 2. You have [installed the SDK](./install-sdk.mdx), [created the store](./create-store.mdx) and [setup the SDK client](./setup-sdk-client.mdx).
-3. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+3. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 
@@ -71,14 +71,14 @@ This article explains how to configure an <ProductConcept section="what-is-an-au
 
 1. <SdkSetupPrerequisite />
 2. You have [installed the CLI](./install-sdk.mdx), [created the store](./create-store.mdx) and [setup your environment variables](./setup-sdk-client.mdx).
-3. You have loaded `FGA_STORE_ID` and `FGA_SERVER_URL` as environment variables.
+3. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 
 <TabItem value={SupportedLanguage.CURL} label={languageLabelMap.get(SupportedLanguage.CURL)}>
 
 1. <SdkSetupPrerequisite />
-2. You have [created the store](./create-store.mdx) and have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+2. You have [created the store](./create-store.mdx) and have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 </Tabs>
diff --git a/docs/content/getting-started/create-store.mdx b/docs/content/getting-started/create-store.mdx
index 4f20611c5..dceb6bf04 100644
--- a/docs/content/getting-started/create-store.mdx
+++ b/docs/content/getting-started/create-store.mdx
@@ -18,7 +18,7 @@ import TabItem from '@theme/TabItem';
 
 A [store](../concepts.mdx#what-is-a-store) is a OpenFGA entity that contains your authorization data. You will need to create a store in OpenFGA before adding an [authorization model](../concepts.mdx#what-is-an-authorization-model) and [relationship tuples](../concepts.mdx#what-is-a-relationship-tuple) to it.
 
-This article explains how to setup an OpenFGA store.
+This article explains how to set up an OpenFGA store.
 
 ## Step By Step
 
@@ -148,7 +148,7 @@ public class Example {
 fga store create --name "FGA Demo Store"
 
 # To create the store and directly put the Store ID into an env variable:
-# export FGA_STORE_ID=$(fga store create --name "FGA Demo Store" | jq -r .id)
+# export FGA_STORE_ID=$(fga store create --name "FGA Demo Store" | jq -r .store.id)
 ```
 
 </TabItem>
@@ -156,7 +156,7 @@ fga store create --name "FGA Demo Store"
 <TabItem value={SupportedLanguage.CURL} label={languageLabelMap.get(SupportedLanguage.CURL)}>
 
 ```shell
-curl -X POST $FGA_API_HOST/stores \
+curl -X POST $FGA_API_URL/stores \
   -H "content-type: application/json" \
   -d '{"name": "FGA Demo Store"}'
 ```
diff --git a/docs/content/getting-started/framework.mdx b/docs/content/getting-started/framework.mdx
index bec01e8d2..670390d9b 100644
--- a/docs/content/getting-started/framework.mdx
+++ b/docs/content/getting-started/framework.mdx
@@ -34,7 +34,7 @@ This section will illustrate how to integrate <ProductName format={ProductNameFo
 2. You have [installed the OpenFGA SDK](./install-sdk.mdx).
 3. You have [configured the _authorization model_](./configure-model.mdx) and [updated the _relationship tuples_](./update-tuples.mdx).
 4. You know how to [perform a Check](./perform-check.mdx).
-5. You have loaded `FGA_API_HOST` and `FGA_STORE_ID` as environment variables.
+5. You have loaded `FGA_API_URL` and `FGA_STORE_ID` as environment variables.
 
 </TabItem>
 <TabItem value={SupportedLanguage.GO_SDK} label={languageLabelMap.get(SupportedLanguage.GO_SDK)}>
@@ -43,7 +43,7 @@ This section will illustrate how to integrate <ProductName format={ProductNameFo
 2. You have [installed the OpenFGA SDK](./install-sdk.mdx).
 3. You have [configured the _authorization model_](./configure-model.mdx) and [updated the _relationship tuples_](./update-tuples.mdx).
 4. You know how to [perform a Check](./perform-check.mdx).
-5. You have loaded `FGA_API_HOST` and `FGA_STORE_ID` as environment variables.
+5. You have loaded `FGA_API_URL` and `FGA_STORE_ID` as environment variables.
 
 </TabItem>
 </Tabs>
diff --git a/docs/content/getting-started/immutable-models.mdx b/docs/content/getting-started/immutable-models.mdx
index 7ca0bd803..c577553c4 100644
--- a/docs/content/getting-started/immutable-models.mdx
+++ b/docs/content/getting-started/immutable-models.mdx
@@ -25,7 +25,7 @@ You can list all the authorization models for a store using the [ReadAuthorizati
 
 Some endpoints relating to tuples ([Check](/api/service#/Relationship%20Queries/Check), [ListObjects](/api/service#/Relationship%20Queries/ListObjects), [Expand](/api/service#/Relationship%20Queries/Expand), [Write](/api/service#/Relationship%20Tuples/Write)) accept an `authorization_model_id`, which we strongly recommend passing, especially in production.
 
-In practice, you would pin the authorization model ID alongside the store ID in your configuration management system. Your services would read this value and use it in their requests to FGA. This helps you ensure that your services are using the same consistent ID across all your applications, and that rollouts can be seemless.
+In practice, you would pin the authorization model ID alongside the store ID in your configuration management system. Your services would read this value and use it in their requests to FGA. This helps you ensure that your services are using the same consistent ID across all your applications, and that rollouts can be seamless.
 
 ### Benefits of Passing in an Authorization Model ID
 
diff --git a/docs/content/getting-started/overview.mdx b/docs/content/getting-started/overview.mdx
index 7b8380cff..bf204a06b 100644
--- a/docs/content/getting-started/overview.mdx
+++ b/docs/content/getting-started/overview.mdx
@@ -9,7 +9,7 @@ import { DocumentationNotice, IntroCard, CardGrid, ProductName } from '@componen
 
 <DocumentationNotice />
 
-The following will provide a step by step guide on how to get started with <ProductName />.
+The following will provide a step-by-step guide on how to get started with <ProductName />.
 
 <IntroCard
   title="When to use"
diff --git a/docs/content/getting-started/perform-check.mdx b/docs/content/getting-started/perform-check.mdx
index bf687cdfd..9f5733c16 100644
--- a/docs/content/getting-started/perform-check.mdx
+++ b/docs/content/getting-started/perform-check.mdx
@@ -35,7 +35,7 @@ This section will illustrate how to perform a <ProductConcept section="what-is-a
 1. <SdkSetupPrerequisite />
 2. You have [installed the SDK](./install-sdk.mdx).
 3. You have [configured the _authorization model_](./configure-model.mdx) and [updated the _relationship tuples_](./update-tuples.mdx).
-4. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+4. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 
@@ -44,7 +44,7 @@ This section will illustrate how to perform a <ProductConcept section="what-is-a
 1. <SdkSetupPrerequisite />
 2. You have [installed the SDK](./install-sdk.mdx).
 3. You have [configured the _authorization model_](./configure-model.mdx) and [updated the _relationship tuples_](./update-tuples.mdx).
-4. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+4. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 
@@ -53,7 +53,7 @@ This section will illustrate how to perform a <ProductConcept section="what-is-a
 1. <SdkSetupPrerequisite />
 2. You have [installed the SDK](./install-sdk.mdx).
 3. You have [configured the _authorization model_](./configure-model.mdx) and [updated the _relationship tuples_](./update-tuples.mdx).
-4. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+4. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 
@@ -62,7 +62,7 @@ This section will illustrate how to perform a <ProductConcept section="what-is-a
 1. <SdkSetupPrerequisite />
 2. You have [installed the SDK](./install-sdk.mdx).
 3. You have [configured the _authorization model_](./configure-model.mdx) and [updated the _relationship tuples_](./update-tuples.mdx).
-4. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+4. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 
@@ -71,7 +71,7 @@ This section will illustrate how to perform a <ProductConcept section="what-is-a
 1. <SdkSetupPrerequisite />
 2. You have [installed the SDK](./install-sdk.mdx).
 3. You have [configured the _authorization model_](./configure-model.mdx) and [updated the _relationship tuples_](./update-tuples.mdx).
-4. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+4. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 
@@ -79,7 +79,7 @@ This section will illustrate how to perform a <ProductConcept section="what-is-a
 
 1. <SdkSetupPrerequisite />
 2. You have [configured the _authorization model_](./configure-model.mdx).
-3. You have loaded `FGA_STORE_ID` and `FGA_SERVER_URL` as environment variables.
+3. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 
@@ -87,7 +87,7 @@ This section will illustrate how to perform a <ProductConcept section="what-is-a
 
 1. <SdkSetupPrerequisite />
 2. You have [configured the _authorization model_](./configure-model.mdx) and [updated the _relationship tuples_](./update-tuples.mdx).
-3. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+3. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 </Tabs>
diff --git a/docs/content/getting-started/perform-list-objects.mdx b/docs/content/getting-started/perform-list-objects.mdx
index a2f46037d..dd66fb6d6 100644
--- a/docs/content/getting-started/perform-list-objects.mdx
+++ b/docs/content/getting-started/perform-list-objects.mdx
@@ -35,7 +35,7 @@ This section will illustrate how to perform a <ProductConcept section="what-is-a
 1. <SdkSetupPrerequisite />
 2. You have [installed the SDK](./install-sdk.mdx).
 3. You have [configured the _authorization model_](./configure-model.mdx) and [updated the _relationship tuples_](./update-tuples.mdx).
-4. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+4. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 
@@ -44,7 +44,7 @@ This section will illustrate how to perform a <ProductConcept section="what-is-a
 1. <SdkSetupPrerequisite />
 2. You have [installed the SDK](./install-sdk.mdx).
 3. You have [configured the _authorization model_](./configure-model.mdx) and [updated the _relationship tuples_](./update-tuples.mdx).
-4. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+4. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 
@@ -53,7 +53,7 @@ This section will illustrate how to perform a <ProductConcept section="what-is-a
 1. <SdkSetupPrerequisite />
 2. You have [installed the SDK](./install-sdk.mdx).
 3. You have [configured the _authorization model_](./configure-model.mdx) and [updated the _relationship tuples_](./update-tuples.mdx).
-4. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+4. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 
@@ -62,7 +62,7 @@ This section will illustrate how to perform a <ProductConcept section="what-is-a
 1. <SdkSetupPrerequisite />
 2. You have [installed the SDK](./install-sdk.mdx).
 3. You have [configured the _authorization model_](./configure-model.mdx) and [updated the _relationship tuples_](./update-tuples.mdx).
-4. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+4. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 
@@ -71,7 +71,7 @@ This section will illustrate how to perform a <ProductConcept section="what-is-a
 1. <SdkSetupPrerequisite />
 2. You have [installed the SDK](./install-sdk.mdx).
 3. You have [configured the _authorization model_](./configure-model.mdx) and [updated the _relationship tuples_](./update-tuples.mdx).
-4. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+4. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 
@@ -79,7 +79,7 @@ This section will illustrate how to perform a <ProductConcept section="what-is-a
 
 1. <SdkSetupPrerequisite />
 2. You have [configured the _authorization model_](./configure-model.mdx).
-3. You have loaded `FGA_STORE_ID` and `FGA_SERVER_URL` as environment variables.
+3. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 
@@ -87,7 +87,7 @@ This section will illustrate how to perform a <ProductConcept section="what-is-a
 
 1. <SdkSetupPrerequisite />
 2. You have [configured the _authorization model_](./configure-model.mdx) and [updated the _relationship tuples_](./update-tuples.mdx).
-3. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+3. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 </Tabs>
@@ -145,7 +145,7 @@ To obtain the [access token](https://auth0.com/docs/get-started/authentication-a
 To return all documents that user `user:anne` has relationship `reader` with:
 
 <ListObjectsRequestViewer
-  authorizationModelId="1uHxCSuTP0VKPYSnkq1pbb1jeZw"
+  authorizationModelId="01HVMMBCMGZNT3SED4Z17ECXCA"
   objectType="document"
   relation="reader"
   user="user:anne"
@@ -165,7 +165,7 @@ To return all documents that user `user:anne` has relationship `reader` with:
 The result `document:otherdoc` and `document:planning` are the document objects that `user:anne` has `reader` relationship with.
 
 :::caution Warning
-The performance characteristics of the ListObjects endpoint vary drastically depending on the model complexity, number of tuples, and the relations it needs to evaluate. Relations with 'and' or 'but not' are more expensive to evaluate than relations with 'or'."
+The performance characteristics of the ListObjects endpoint vary drastically depending on the model complexity, number of tuples, and the relations it needs to evaluate. Relations with 'and' or 'but not' are more expensive to evaluate than relations with 'or'.
 :::
 
 ## Related Sections
diff --git a/docs/content/getting-started/setup-openfga/configure-openfga.mdx b/docs/content/getting-started/setup-openfga/configure-openfga.mdx
index 5111c88dc..b71c07c56 100644
--- a/docs/content/getting-started/setup-openfga/configure-openfga.mdx
+++ b/docs/content/getting-started/setup-openfga/configure-openfga.mdx
@@ -47,7 +47,7 @@ authn:
 ## Using environment variables
 
 The OpenFGA server supports **environment variables** for configuration, and they will take priority over your configuration file.
-Each variable must be prefixed with `OPENFGA_` and followed by your option in uppercase (e.g `--grpc-tls-key` becomes `OPENFGA_GRPC_TLS_KEY`).
+Each variable must be prefixed with `OPENFGA_` and followed by your option in uppercase (e.g. `--grpc-tls-key` becomes `OPENFGA_GRPC_TLS_KEY`).
 
 ## Using command line variables
 
@@ -81,7 +81,7 @@ openfga run
     --datastore-uri 'postgres://postgres:password@postgres:5432/postgres?sslmode=disable'
 ```
 
-To learn how to run in in Docker, check our [Docker documentation](./docker-setup.mdx#using-postgres).
+To learn how to run in Docker, check our [Docker documentation](./docker-setup.mdx#using-postgres).
 ### MySQL
 
 The MySQL datastore has stricter limits for the max length of some fields for tuples compared to other datastore engines, in particular:
@@ -102,7 +102,7 @@ openfga run \
     --datastore-uri 'root:secret@tcp(mysql:3306)/openfga?parseTime=true'
 ```
 
-To learn how to run in in Docker, check our [Docker documentation](./docker-setup.mdx#using-mysql).
+To learn how to run in Docker, check our [Docker documentation](./docker-setup.mdx#using-mysql).
 
 ## Configuring Authentication
 
@@ -150,7 +150,7 @@ http:
 </TabItem>
 </Tabs>
 
-To learn how to run in in Docker, check our [Docker documentation](./docker-setup.mdx#pre-shared-key-authentication).
+To learn how to run in Docker, check our [Docker documentation](./docker-setup.mdx#pre-shared-key-authentication).
 
 ### OIDC
 
@@ -196,7 +196,7 @@ http:
 
 </Tabs>
 
-To learn how to run in in Docker, check our [Docker documentation](./docker-setup.mdx#oidc-authentication).
+To learn how to run in Docker, check our [Docker documentation](./docker-setup.mdx#oidc-authentication).
 
 ## Profiler (pprof)
 :::caution Warning
@@ -232,7 +232,7 @@ OpenFGA is configured with an HTTP health check endpoint `/healthz` and a gRPC h
 <TabItem value={"health-curl"} label={"cURL"}>
 
 ```shell
-curl -X GET $FGA_API_HOST/healthz
+curl -X GET $FGA_API_URL/healthz
 
 # {"status":"SERVING"}
 ```
@@ -243,7 +243,7 @@ curl -X GET $FGA_API_HOST/healthz
 
 ```shell
 # See https://github.com/fullstorydev/grpcurl#installation
-grpcurl -plaintext $FGA_API_HOST grpc.health.v1.Health/Check
+grpcurl -plaintext $FGA_API_URL grpc.health.v1.Health/Check
 
 # {"status":"SERVING"}
 ```
diff --git a/docs/content/getting-started/setup-openfga/overview.mdx b/docs/content/getting-started/setup-openfga/overview.mdx
index 8c293a3fa..ef62e47a1 100644
--- a/docs/content/getting-started/setup-openfga/overview.mdx
+++ b/docs/content/getting-started/setup-openfga/overview.mdx
@@ -11,7 +11,7 @@ import {
 } from "@components/Docs";
 
 # Setup OpenFGA
-Follow the guides below to setup an OpenFGA server.
+Follow the guides below to set up an OpenFGA server.
 
 <DocumentationNotice />
 
diff --git a/docs/content/getting-started/setup-openfga/playground.mdx b/docs/content/getting-started/setup-openfga/playground.mdx
index dc570b8ea..6ad7ab0d2 100644
--- a/docs/content/getting-started/setup-openfga/playground.mdx
+++ b/docs/content/getting-started/setup-openfga/playground.mdx
@@ -10,7 +10,7 @@ The Playground facilitates rapid development by allowing you to visualize and mo
 
 It is enabled on port 3000 by default and accessible at http://localhost:3000/playground. 
 
-The Playground is designed for early prototyping and learning. It has serveral limitations:
+The Playground is designed for early prototyping and learning. It has several limitations:
 
 - It works by embedding the public [Playground website](https://play.fga.dev) in an `<iframe>`. To do this securely, the public Playground configures its Content Security Policies to enable running it from `localhost`. **You can't run the Playground in a host different than `localhost`.
 - It does not support OIDC authentication. 
diff --git a/docs/content/getting-started/setup-sdk-client.mdx b/docs/content/getting-started/setup-sdk-client.mdx
index 52de9720c..9419835ef 100644
--- a/docs/content/getting-started/setup-sdk-client.mdx
+++ b/docs/content/getting-started/setup-sdk-client.mdx
@@ -133,7 +133,7 @@ public class Example {
 <TabItem value={SupportedLanguage.CLI} label={languageLabelMap.get(SupportedLanguage.CLI)}>
 
 ```shell
-export FGA_SERVER_URL=https://api.fga.example # optional. Defaults to http://localhost:8080
+export FGA_API_URL=https://api.fga.example # optional. Defaults to http://localhost:8080
 export FGA_STORE_ID=YOUR_STORE_ID # required for all calls except \`store create\`, \`store list\` and \`model validate\`
 export FGA_MODEL_ID=YOUR_MODEL_ID # optional, can be overridden per request, latest is used if this is empty
 ```
@@ -288,7 +288,7 @@ public class Example {
 <TabItem value={SupportedLanguage.CLI} label={languageLabelMap.get(SupportedLanguage.CLI)}>
 
 ```shell
-export FGA_SERVER_URL=https://api.fga.example # optional. Defaults to http://localhost:8080
+export FGA_API_URL=https://api.fga.example # optional. Defaults to http://localhost:8080
 export FGA_STORE_ID=YOUR_STORE_ID # required for all calls except \`store create\`, \`store list\` and \`model validate\`
 export FGA_MODEL_ID=YOUR_MODEL_ID # optional, can be overridden per request, latest is used if this is empty
 export FGA_API_TOKEN=YOUR_API_TOKEN
@@ -456,7 +456,7 @@ public class Example {
 <TabItem value={SupportedLanguage.CLI} label={languageLabelMap.get(SupportedLanguage.CLI)}>
 
 ```shell
-export FGA_SERVER_URL=https://api.fga.example # optional. Defaults to http://localhost:8080
+export FGA_API_URL=https://api.fga.example # optional. Defaults to http://localhost:8080
 export FGA_STORE_ID=YOUR_STORE_ID # required for all calls except \`store create\`, \`store list\` and \`model validate\`
 export FGA_MODEL_ID=YOUR_MODEL_ID # optional, can be overridden per request, latest is used if this is empty
 export FGA_API_TOKEN_ISSUER=YOUR_API_TOKEN_ISSUER
diff --git a/docs/content/getting-started/tuples-api-best-practices.mdx b/docs/content/getting-started/tuples-api-best-practices.mdx
index 944737ceb..ade664afb 100644
--- a/docs/content/getting-started/tuples-api-best-practices.mdx
+++ b/docs/content/getting-started/tuples-api-best-practices.mdx
@@ -35,7 +35,7 @@ It is strongly recommended that authorization model ID be specified in your Rela
 
 Specifying authorization model ID in API calls have the following advantages:
 1. Better performance as <ProductName format={ProductNameFormat.ShortForm}/> will not need to perform a database query to get the latest authorization model ID.
-2. Allows consistent behavior in your production system until until you are ready to switch to the new model.
+2. Allows consistent behavior in your production system until you are ready to switch to the new model.
 
 ## Related Sections
 
diff --git a/docs/content/getting-started/update-tuples.mdx b/docs/content/getting-started/update-tuples.mdx
index 587483350..99e16a338 100644
--- a/docs/content/getting-started/update-tuples.mdx
+++ b/docs/content/getting-started/update-tuples.mdx
@@ -34,7 +34,7 @@ This section will illustrate how to update _<ProductConcept section="what-is-a-r
 1. <SdkSetupPrerequisite />
 2. You have [installed the SDK](./install-sdk.mdx).
 3. You have [configured the _authorization model_](./configure-model.mdx).
-4. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+4. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 <TabItem value={SupportedLanguage.GO_SDK} label={languageLabelMap.get(SupportedLanguage.GO_SDK)}>
@@ -42,7 +42,7 @@ This section will illustrate how to update _<ProductConcept section="what-is-a-r
 1. <SdkSetupPrerequisite />
 2. You have [installed the SDK](./install-sdk.mdx).
 3. You have [configured the _authorization model_](./configure-model.mdx).
-4. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+4. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 <TabItem value={SupportedLanguage.DOTNET_SDK} label={languageLabelMap.get(SupportedLanguage.DOTNET_SDK)}>
@@ -50,7 +50,7 @@ This section will illustrate how to update _<ProductConcept section="what-is-a-r
 1. <SdkSetupPrerequisite />
 2. You have [installed the SDK](./install-sdk.mdx).
 3. You have [configured the _authorization model_](./configure-model.mdx).
-4. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+4. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 <TabItem value={SupportedLanguage.PYTHON_SDK} label={languageLabelMap.get(SupportedLanguage.PYTHON_SDK)}>
@@ -58,7 +58,7 @@ This section will illustrate how to update _<ProductConcept section="what-is-a-r
 1. <SdkSetupPrerequisite />
 2. You have [installed the SDK](./install-sdk.mdx).
 3. You have [configured the _authorization model_](./configure-model.mdx).
-4. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+4. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 <TabItem value={SupportedLanguage.JAVA_SDK} label={languageLabelMap.get(SupportedLanguage.JAVA_SDK)}>
@@ -66,21 +66,21 @@ This section will illustrate how to update _<ProductConcept section="what-is-a-r
 1. <SdkSetupPrerequisite />
 2. You have [installed the SDK](./install-sdk.mdx).
 3. You have [configured the _authorization model_](./configure-model.mdx).
-4. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+4. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 <TabItem value={SupportedLanguage.CLI} label={languageLabelMap.get(SupportedLanguage.CLI)}>
 
 1. <SdkSetupPrerequisite />
 2. You have [configured the _authorization model_](./configure-model.mdx).
-3. You have loaded `FGA_STORE_ID` and `FGA_SERVER_URL` as environment variables.
+3. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 <TabItem value={SupportedLanguage.CURL} label={languageLabelMap.get(SupportedLanguage.CURL)}>
 
 1. <SdkSetupPrerequisite />
 2. You have [configured the _authorization model_](./configure-model.mdx).
-3. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+3. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 </Tabs>
diff --git a/docs/content/interacting/read-tuple-changes.mdx b/docs/content/interacting/read-tuple-changes.mdx
index 4f55aca6b..d85f083de 100644
--- a/docs/content/interacting/read-tuple-changes.mdx
+++ b/docs/content/interacting/read-tuple-changes.mdx
@@ -33,7 +33,7 @@ This section illustrates how to call the Read Changes API to get the list of rel
 1. <SdkSetupPrerequisite />
 2. You have [installed the SDK](../getting-started/install-sdk.mdx).
 3. You have [configured the _authorization model_](../modeling) and [added some _relationship tuples_](../getting-started/update-tuples.mdx#02-calling-write-api-to-add-new-relationship-tuples).
-4. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+4. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 <TabItem value={SupportedLanguage.GO_SDK} label={languageLabelMap.get(SupportedLanguage.GO_SDK)}>
@@ -41,7 +41,7 @@ This section illustrates how to call the Read Changes API to get the list of rel
 1. <SdkSetupPrerequisite />
 2. You have [installed the SDK](../getting-started/install-sdk.mdx).
 3. You have [configured the _authorization model_](../modeling) and [added some _relationship tuples_](../getting-started/update-tuples.mdx#02-calling-write-api-to-add-new-relationship-tuples).
-4. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+4. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 
@@ -50,7 +50,7 @@ This section illustrates how to call the Read Changes API to get the list of rel
 1. <SdkSetupPrerequisite />
 2. You have [installed the SDK](../getting-started/install-sdk.mdx).
 3. You have [configured the _authorization model_](../modeling).
-4. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+4. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 <TabItem value={SupportedLanguage.PYTHON_SDK} label={languageLabelMap.get(SupportedLanguage.PYTHON_SDK)}>
@@ -58,7 +58,7 @@ This section illustrates how to call the Read Changes API to get the list of rel
 1. <SdkSetupPrerequisite />
 2. You have [installed the SDK](../getting-started/install-sdk.mdx).
 3. You have [configured the _authorization model_](../modeling).
-4. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+4. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 <TabItem value={SupportedLanguage.JAVA_SDK} label={languageLabelMap.get(SupportedLanguage.JAVA_SDK)}>
@@ -66,14 +66,14 @@ This section illustrates how to call the Read Changes API to get the list of rel
 1. <SdkSetupPrerequisite />
 2. You have [installed the SDK](../getting-started/install-sdk.mdx).
 3. You have [configured the _authorization model_](../modeling).
-4. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+4. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 <TabItem value={SupportedLanguage.CURL} label={languageLabelMap.get(SupportedLanguage.CURL)}>
 
 1. <SdkSetupPrerequisite />
 2. You have [configured the _authorization model_](../modeling) and [added some _relationship tuples_](../getting-started/update-tuples.mdx#02-calling-write-api-to-add-new-relationship-tuples).
-3. You have loaded `FGA_STORE_ID` and `FGA_API_HOST` as environment variables.
+3. You have loaded `FGA_STORE_ID` and `FGA_API_URL` as environment variables.
 
 </TabItem>
 </Tabs>
diff --git a/docs/content/interacting/relationship-queries.mdx b/docs/content/interacting/relationship-queries.mdx
index 854b0d771..f97ba934e 100644
--- a/docs/content/interacting/relationship-queries.mdx
+++ b/docs/content/interacting/relationship-queries.mdx
@@ -287,7 +287,7 @@ It provides a solution to the [Search with Permissions (Option 3)](./search-with
 Use the ListObjects API to get what objects a user can see based on the relationships they have. See [Search with Permissions](./search-with-permissions.mdx) for more guidance.
 
 <ListObjectsRequestViewer
-  authorizationModelId="1uHxCSuTP0VKPYSnkq1pbb1jeZw"
+  authorizationModelId="01HVMMBCMGZNT3SED4Z17ECXCA"
   objectType="document"
   relation="reader"
   user="user:bob"
diff --git a/docs/content/intro.mdx b/docs/content/intro.mdx
index 55f1688e0..d1ed91bfc 100644
--- a/docs/content/intro.mdx
+++ b/docs/content/intro.mdx
@@ -17,7 +17,7 @@ Inspired by [Google’s Zanzibar](https://zanzibar.academy), Google’s internal
 <ProductName format={ProductNameFormat.ShortForm}/> provides developer the following benefits:
 
 - Move authorization logic outside of application code, making it easier to write, change and audit
-- Increase velocity by standardizing on a single authorization solution.
+- Increase velocity by standardizing on a single authorization solution
 - Centralize authorization decisions and audit logs making it simpler to comply with security and compliance requirements
 - Help their products to move faster because it is simpler to evolve authorization policies
 
diff --git a/docs/content/modeling/advanced/github.mdx b/docs/content/modeling/advanced/github.mdx
index 60081bd6c..40aa1dcd9 100644
--- a/docs/content/modeling/advanced/github.mdx
+++ b/docs/content/modeling/advanced/github.mdx
@@ -402,7 +402,7 @@ To add support for teams and memberships all we need to do is add this object to
   }}
 />
 
-In addition, the repo's relations should be add team member as a directly related user types.
+In addition, the repo's relations should have team member as a directly related user types.
 
 <AuthzModelSnippetViewer
   configuration={{
@@ -714,7 +714,7 @@ We can now make Erik a member of contoso and make contoso own **contoso/tooling*
   ]}
 />
 
-What we still lack is the ability to create "default permissions" for the organization and have those be considered when determining if a user has a particular relation to a repository. Let's start with the simplest case **admin**. We want to say that a user is a admin of a repo if either:
+What we still lack is the ability to create "default permissions" for the organization and have those be considered when determining if a user has a particular relation to a repository. Let's start with the simplest case **admin**. We want to say that a user is an admin of a repo if either:
 
 - [done] they have a repo admin relation (directly or through team membership)
 - [pending] their organization is configured with **repo_admin** as the base permission
diff --git a/docs/content/modeling/blocklists.mdx b/docs/content/modeling/blocklists.mdx
index 1f3144562..2fce1c8af 100644
--- a/docs/content/modeling/blocklists.mdx
+++ b/docs/content/modeling/blocklists.mdx
@@ -206,7 +206,7 @@ Now we can add relationship tuples indicating that a certain user is `blocked` f
 
 ### 02. Modify Our Model So Users Who Are Blocked Can No Longer Edit The Document
 
-Now that we can mark users as `blocked` from editing documents, we need to support denying the `editor` relationship when a user is `blocked`. We do that by modifying the relation definition of `editor`, and making use of the [**the exclusion operator**](../configuration-language.mdx#the-exclusion-operator) to exclude the set of `blocked` users, as we can see here:
+Now that we can mark users as `blocked` from editing documents, we need to support denying the `editor` relationship when a user is `blocked`. We do that by modifying the relation definition of `editor`, and making use of the [**exclusion operator**](../configuration-language.mdx#the-exclusion-operator) to exclude the set of `blocked` users, as we can see here:
 
 <AuthzModelSnippetViewer
   configuration={{
diff --git a/docs/content/modeling/building-blocks/usersets.mdx b/docs/content/modeling/building-blocks/usersets.mdx
index 4b992e3f0..f03b47508 100644
--- a/docs/content/modeling/building-blocks/usersets.mdx
+++ b/docs/content/modeling/building-blocks/usersets.mdx
@@ -118,7 +118,7 @@ Imagine the following authorization model:
                   this: {},
                 },
                 {
-                  // a user who is related as an writer is also implicitly related as a reader
+                  // a user who is related as a writer is also implicitly related as a reader
                   computedUserset: {
                     relation: 'writer',
                   },
diff --git a/docs/content/modeling/conditions.mdx b/docs/content/modeling/conditions.mdx
index 7866a1632..2c44b63b1 100644
--- a/docs/content/modeling/conditions.mdx
+++ b/docs/content/modeling/conditions.mdx
@@ -186,7 +186,7 @@ but if the current time is outside the grant window then you get a deny decision
   ]}
 />
 
-Similarly, we can use the [ListObjects API](https://openfga.dev/api/service#/Relationship%20Queries/ListObjects) to return all of the documents that `user:anne` has viewer access to given the current time. For example,
+Similarly, we can use the [ListObjects API](https://openfga.dev/api/service#/Relationship%20Queries/ListObjects) to return all of the documents that `user:anne` has viewer access given the current time. For example,
 
 <ListObjectsRequestViewer
   objectType="document"
@@ -260,8 +260,8 @@ Note that some of the types support generics, these types are indicated with `<T
 ## Limitations
 * The size of the condition `context` parameter that can be written alongside a relationship tuple is limited to 32KB in size.
 
-* The size of the condition `context` parameter for query requests (e.g. Check, ListObjects, etc..) is not explicitly limited, but the OpenFGA server has an overall request size limit of 512KB at this time.
+* The size of the condition `context` parameter for query requests (e.g. Check, ListObjects, etc.) is not explicitly limited, but the OpenFGA server has an overall request size limit of 512KB at this time.
 
-* We're still working on the changes to support Conditions in the official FGA CLI and various OpenFGA SDKs including: .NET and Python. At this moment you cannot Write conditional relationship tuples with these tools and/or query (e.g. Check, ListObjects, etc..) OpenFGA with condition context.
+* We're still working on the changes to support Conditions in the official FGA CLI and various OpenFGA SDKs including: .NET and Python. At this moment you cannot Write conditional relationship tuples with these tools and/or query (e.g. Check, ListObjects, etc.) OpenFGA with condition context.
 
 * We enforce a maximum Google CEL expression evaluation cost of 100 (by default) to protect the server from malicious conditions. The evaluation cost of a CEL expression is a function of the size the input that is being compared and the composition of the expression. For more general information please see the official [Language Definition for Google CEL](https://github.com/google/cel-spec/blob/master/doc/langdef.md). If you hit these limits with practical use-cases, please reach out to the maintainer team and we can discuss.
diff --git a/docs/content/modeling/direct-access.mdx b/docs/content/modeling/direct-access.mdx
index 4ce18197c..a1ac0d7f8 100644
--- a/docs/content/modeling/direct-access.mdx
+++ b/docs/content/modeling/direct-access.mdx
@@ -113,7 +113,7 @@ Once you add that relationship tuple to <ProductName format={ProductNameFormat.S
 
 <CheckRequestViewer user={'user:bob'} relation={'editor'} object={'document:meeting_notes.doc'} allowed={true} />
 
-Checking whether `bob` is an `editor` of `document:meeting_notes.doc` returns **false** because that relationship tuple does not exist in <ProductName format={ProductNameFormat.ShortForm}/> yet.
+Checking whether `bob` is an `viewer` of `document:meeting_notes.doc` returns **false** because that relationship tuple does not exist in <ProductName format={ProductNameFormat.ShortForm}/> yet.
 
 <CheckRequestViewer user={'user:bob'} relation={'viewer'} object={'document:meeting_notes.doc'} allowed={false} />
 
diff --git a/docs/content/modeling/getting-started.mdx b/docs/content/modeling/getting-started.mdx
index d58618add..f3f2a20ce 100644
--- a/docs/content/modeling/getting-started.mdx
+++ b/docs/content/modeling/getting-started.mdx
@@ -370,7 +370,7 @@ In those cases [**User** should also be an object type](./building-blocks/object
 
 Each of the previously defined types has a set of relations. <ProductConcept section="what-is-a-relation" linkName="Relations" /> are an important component in your model. After all, <ProductName format={ProductNameFormat.ShortForm}/> is a <IntroductionSection linkName="Relationship Based Access Control (ReBAC)" section="what-is-relationship-based-access-control-rebac"/> system.
 
-To identify relations for a type we in the write-up we can perform an exercise similar to the one we did in [list the type of objects in your system](#02-list-the-object-types).
+To identify relations for a type in the write-up we can perform an exercise similar to the one we did in [list the type of objects in your system](#02-list-the-object-types).
 
 Relations for a type \{type\} will be all of these:
 
@@ -582,7 +582,7 @@ Why? This relation definition states:
   `{ user: {user-id}, relation: "member", object: "organization:{id}" }`
 
 :::info Important
-Relation definitions of the form “define \{relation\}: [user, organization#member]" are fairly common. They are used to express that relationships "to the object with that relation" (e.g. "users" of type user or "member of organization") can be assigned by your system and that only the users that have that relation are those with a [direct relationship](./building-blocks/direct-relationships.mdx).
+Relation definitions of the form "define \{relation\}: [user, organization#member]" are fairly common. They are used to express that relationships "to the object with that relation" (e.g. "users" of type user or "member of organization") can be assigned by your system and that only the users that have that relation are those with a [direct relationship](./building-blocks/direct-relationships.mdx).
 :::
 
 You can read more about group membership and types in [Modeling User Groups](./user-groups.mdx).
@@ -594,7 +594,7 @@ For the direct relationships, we need to figure out the object types that makes
 
 However, it will not make sense for organization member's user to be of type document, folder or drive.
 
-We will specify this logic as part of directly <ProductConcept section="what-is-a-directly-related-user-type" linkName="directly related user type" />.
+We will specify this logic as part of <ProductConcept section="what-is-a-directly-related-user-type" linkName="directly related user type" />.
 
 :::note Side note
 This also automatically supports nested organizational membership if you want such a feature in your system. You could use relationship tuples like the following one to express that "members of organization A are members of organization B":
@@ -644,7 +644,7 @@ The complete <ProductConcept section="what-is-a-type-definition" linkName="type
 
 After defining your "group" like types, continue with the most important type for the feature: the one that allows the main use case. In this case "document", since the main use case for users is to create, write, read and collaborate on documents.
 
-Defining relations for the main type lets you to focus on your core use case, and will likely make other type definitions easier.
+Defining relations for the main type lets you focus on your core use case, and will likely make other type definitions easier.
 
 ##### Relation: Owner
 
diff --git a/docs/content/modeling/migrating/migrating-relations.mdx b/docs/content/modeling/migrating/migrating-relations.mdx
index 77519912b..ef975a343 100644
--- a/docs/content/modeling/migrating/migrating-relations.mdx
+++ b/docs/content/modeling/migrating/migrating-relations.mdx
@@ -31,7 +31,7 @@ This guide assumes you are familiar with the following OpenFGA concepts:
 - A <ProductConcept section="what-is-a-type" linkName="Type" />: a class of objects that have similar characteristics
 - A <ProductConcept section="what-is-a-user" linkName="User" />: an entity in the system that can be related to an object
 - A <ProductConcept section="what-is-a-relation" linkName="Relation" />: is a string defined in the type definition of an authorization model that defines the possibility of a relationship between an object of the same type as the type definition and a user in the system
-- An <ProductConcept section="what-is-an-object" linkName="Object" />: represents an entity in the system. Users' relationships to it can be define through relationship tuples and the authorization model
+- An <ProductConcept section="what-is-an-object" linkName="Object" />: represents an entity in the system. Users' relationships to it can be defined through relationship tuples and the authorization model
 - A <ProductConcept section="what-is-a-relationship-tuple" linkName="Relationship Tuple" />: a grouping consisting of a user, a relation and an object stored in <ProductName format={ProductNameFormat.ShortForm} />
 - [Intersection Operator](../../configuration-language.mdx#the-intersection-operator): the intersection operator can be used to indicate a relationship exists if the user is in all the sets of users
 
@@ -209,7 +209,7 @@ Run a check in the API for Bethany to ensure correct access.
 
 Next, migrate the existing relationship tuples. The new relation makes this definition obsolete.
 
-Use the `read` API to lookup all relationship tuples.
+Use the `read` API to look up all relationship tuples.
 
 <ReadRequestViewer
   tuples={[
diff --git a/docs/content/modeling/modular-models.mdx b/docs/content/modeling/modular-models.mdx
index c998b0601..c476e71eb 100644
--- a/docs/content/modeling/modular-models.mdx
+++ b/docs/content/modeling/modular-models.mdx
@@ -50,7 +50,7 @@ Currently, modules are stored as metadata but are not used by <ProductName forma
 
 ### Type Extensions
 
-As teams implement features, they might find that core types they are dependent upon might not contain all the realtions they need. However, it might not make sense for these relations to be owned by the owner of that type if they aren't needed across the system.
+As teams implement features, they might find that core types they are dependent upon might not contain all the relations they need. However, it might not make sense for these relations to be owned by the owner of that type if they aren't needed across the system.
 
 To solve this, individual types can be extended within other modules to implement the relations needed.
 
@@ -62,11 +62,11 @@ In order to allow this, there are certain requirements for type extension:
 
 ## Example
 
-In this example we'll look at how an authorization model for a SaaS compny with a issue tracking and wiki software could implement modular models.
+In this example we'll look at how an authorization model for a SaaS company with an issue tracking and wiki software could implement modular models.
 
 ### Core
 
-It's likely there will be a core set of types owned by a team that manages the overall identity for the company, this would provide the basics usch as users, organizations and groups that can be used by each respective product area.
+It's likely there will be a core set of types owned by a team that manages the overall identity for the company, this would provide the basics such as users, organizations and groups that can be used by each respective product area.
 
 ```dsl.openfga
 module core
@@ -141,7 +141,7 @@ schema: '1.2'
 contents:
   - core.fga
   - issue-tracker/projects.fga
-  - issue-tracker//tickets.fga
+  - issue-tracker/tickets.fga
   - wiki.fga
 ```
 
diff --git a/docs/content/modeling/overview.mdx b/docs/content/modeling/overview.mdx
index ddd8d219b..7cbfc8636 100644
--- a/docs/content/modeling/overview.mdx
+++ b/docs/content/modeling/overview.mdx
@@ -73,7 +73,7 @@ This section has guides, concepts and examples that help you define an authoriza
     },
     {
       title: 'Conditions',
-      description: 'Learn to model requring dynamic attributes.',
+      description: 'Learn to model requiring dynamic attributes.',
       to: 'modeling/conditions',
     },
     {
diff --git a/package-lock.json b/package-lock.json
index 4ecdafe98..3f42d64dc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,9 +14,9 @@
         "@docusaurus/preset-classic": "3.1.1",
         "@easyops-cn/docusaurus-search-local": "0.40.1",
         "@lottiefiles/react-lottie-player": "3.5.3",
-        "@openfga/frontend-utils": "^0.2.0-beta.6",
+        "@openfga/frontend-utils": "^0.2.0-beta.9",
         "@openfga/sdk": "^0.3.5",
-        "@openfga/syntax-transformer": "^0.2.0-beta.11",
+        "@openfga/syntax-transformer": "^0.2.0-beta.17",
         "assert-never": "1.2.1",
         "clsx": "2.1.0",
         "path-browserify": "1.0.1",
@@ -3472,11 +3472,11 @@
       }
     },
     "node_modules/@openfga/frontend-utils": {
-      "version": "0.2.0-beta.6",
-      "resolved": "https://registry.npmjs.org/@openfga/frontend-utils/-/frontend-utils-0.2.0-beta.6.tgz",
-      "integrity": "sha512-nFHUv/+PHDSYFxizV+w23rWNI5UtCHxdB2PXxbXXEn/WqHi9AuKn/NJtL/Daw05y+xdbUsVlFVMczNRR39WEug==",
+      "version": "0.2.0-beta.9",
+      "resolved": "https://registry.npmjs.org/@openfga/frontend-utils/-/frontend-utils-0.2.0-beta.9.tgz",
+      "integrity": "sha512-AzfD7WKcrH/HtUGpuWjmeL4pskV1EN9yg8NJDAkgR51oOuko6xLjjkAwH37yuxihAj9u30GdWeDeJRGxyFkx2Q==",
       "dependencies": {
-        "@openfga/syntax-transformer": "^0.2.0-beta.10"
+        "@openfga/syntax-transformer": "^0.2.0-beta.17"
       }
     },
     "node_modules/@openfga/sdk": {
@@ -3492,9 +3492,9 @@
       }
     },
     "node_modules/@openfga/syntax-transformer": {
-      "version": "0.2.0-beta.14",
-      "resolved": "https://registry.npmjs.org/@openfga/syntax-transformer/-/syntax-transformer-0.2.0-beta.14.tgz",
-      "integrity": "sha512-6P181+Jyn87bioPNW0koalisa15tpOZy/PsDU75PQ+ilhSxh/v2C7Bb/FJ+rFZgJ+bcInAxfmWPvEDPqc706SA==",
+      "version": "0.2.0-beta.17",
+      "resolved": "https://registry.npmjs.org/@openfga/syntax-transformer/-/syntax-transformer-0.2.0-beta.17.tgz",
+      "integrity": "sha512-a9ysHh//RH16x+gZbp5kAFrKAjzHHFdMLYFdqDQIx/3VMmH/sTUXh/tPn/FmPMtr0mnzV/fANO2zGFFQfYOh3Q==",
       "dependencies": {
         "antlr4": "^4.13.1",
         "yaml": "^2.4.1"
@@ -21232,11 +21232,11 @@
       }
     },
     "@openfga/frontend-utils": {
-      "version": "0.2.0-beta.6",
-      "resolved": "https://registry.npmjs.org/@openfga/frontend-utils/-/frontend-utils-0.2.0-beta.6.tgz",
-      "integrity": "sha512-nFHUv/+PHDSYFxizV+w23rWNI5UtCHxdB2PXxbXXEn/WqHi9AuKn/NJtL/Daw05y+xdbUsVlFVMczNRR39WEug==",
+      "version": "0.2.0-beta.9",
+      "resolved": "https://registry.npmjs.org/@openfga/frontend-utils/-/frontend-utils-0.2.0-beta.9.tgz",
+      "integrity": "sha512-AzfD7WKcrH/HtUGpuWjmeL4pskV1EN9yg8NJDAkgR51oOuko6xLjjkAwH37yuxihAj9u30GdWeDeJRGxyFkx2Q==",
       "requires": {
-        "@openfga/syntax-transformer": "^0.2.0-beta.10"
+        "@openfga/syntax-transformer": "^0.2.0-beta.17"
       }
     },
     "@openfga/sdk": {
@@ -21249,9 +21249,9 @@
       }
     },
     "@openfga/syntax-transformer": {
-      "version": "0.2.0-beta.14",
-      "resolved": "https://registry.npmjs.org/@openfga/syntax-transformer/-/syntax-transformer-0.2.0-beta.14.tgz",
-      "integrity": "sha512-6P181+Jyn87bioPNW0koalisa15tpOZy/PsDU75PQ+ilhSxh/v2C7Bb/FJ+rFZgJ+bcInAxfmWPvEDPqc706SA==",
+      "version": "0.2.0-beta.17",
+      "resolved": "https://registry.npmjs.org/@openfga/syntax-transformer/-/syntax-transformer-0.2.0-beta.17.tgz",
+      "integrity": "sha512-a9ysHh//RH16x+gZbp5kAFrKAjzHHFdMLYFdqDQIx/3VMmH/sTUXh/tPn/FmPMtr0mnzV/fANO2zGFFQfYOh3Q==",
       "requires": {
         "antlr4": "^4.13.1",
         "yaml": "^2.4.1"
diff --git a/package.json b/package.json
index 962d76bdf..8d4c2c2ef 100644
--- a/package.json
+++ b/package.json
@@ -28,9 +28,9 @@
     "@docusaurus/preset-classic": "3.1.1",
     "@easyops-cn/docusaurus-search-local": "0.40.1",
     "@lottiefiles/react-lottie-player": "3.5.3",
-    "@openfga/frontend-utils": "^0.2.0-beta.6",
+    "@openfga/frontend-utils": "^0.2.0-beta.9",
     "@openfga/sdk": "^0.3.5",
-    "@openfga/syntax-transformer": "^0.2.0-beta.11",
+    "@openfga/syntax-transformer": "^0.2.0-beta.17",
     "assert-never": "1.2.1",
     "clsx": "2.1.0",
     "path-browserify": "1.0.1",
diff --git a/src/components/Docs/SdkSetup/Prerequisite.tsx b/src/components/Docs/SdkSetup/Prerequisite.tsx
index 83d9621fd..4e4fa985a 100644
--- a/src/components/Docs/SdkSetup/Prerequisite.tsx
+++ b/src/components/Docs/SdkSetup/Prerequisite.tsx
@@ -4,8 +4,8 @@ import React from 'react';
 export function SdkSetupPrerequisite(): JSX.Element {
   return (
     <>
-      Deploy an instance of the OpenFGA server, and have ready the values for your setup: FGA_STORE_ID, FGA_API_HOST
-      and, if needed, FGA_API_TOKEN.
+      Deploy an instance of the OpenFGA server, and have ready the values for your setup: FGA_STORE_ID, FGA_API_URL and,
+      if needed, FGA_API_TOKEN.
     </>
   );
 }
diff --git a/src/components/Docs/SnippetViewer/CheckRequestViewer.tsx b/src/components/Docs/SnippetViewer/CheckRequestViewer.tsx
index 938e28b91..d02e1b2e8 100644
--- a/src/components/Docs/SnippetViewer/CheckRequestViewer.tsx
+++ b/src/components/Docs/SnippetViewer/CheckRequestViewer.tsx
@@ -47,7 +47,7 @@ ${
 # Response: {"allowed":${allowed}}`;
     case SupportedLanguage.CURL:
       /* eslint-disable max-len */
-      return `curl -X POST $FGA_SERVER_URL/stores/$FGA_STORE_ID/check \\
+      return `curl -X POST $FGA_API_URL/stores/$FGA_STORE_ID/check \\
   -H "Authorization: Bearer $FGA_API_TOKEN" \\ # Not needed if service does not require authorization
   -H "content-type: application/json" \\
   -d '{"authorization_model_id": "${modelId}", "tuple_key":{"user":"${user}","relation":"${relation}","object":"${object}"}${
diff --git a/src/components/Docs/SnippetViewer/ExpandRequestViewer.tsx b/src/components/Docs/SnippetViewer/ExpandRequestViewer.tsx
index 3a0d3b458..7bdf27604 100644
--- a/src/components/Docs/SnippetViewer/ExpandRequestViewer.tsx
+++ b/src/components/Docs/SnippetViewer/ExpandRequestViewer.tsx
@@ -20,7 +20,7 @@ function expandRequestViewer(lang: SupportedLanguage, opts: ExpandRequestViewerO
 # Response: {"tree": ...}`;
     case SupportedLanguage.CURL:
       // eslint-disable-next-line max-len
-      return `curl -X POST $FGA_SERVER_URL/stores/$FGA_STORE_ID/expand \\
+      return `curl -X POST $FGA_API_URL/stores/$FGA_STORE_ID/expand \\
   -H "Authorization: Bearer $FGA_API_TOKEN" \\ # Not needed if service does not require authorization
   -H "content-type: application/json" \\
   -d '{"tuple_key":{"relation":"${opts.relation}","object":"${opts.object}"}, "authorization_model_id": "${modelId}"}'
diff --git a/src/components/Docs/SnippetViewer/ListObjectsRequestViewer.tsx b/src/components/Docs/SnippetViewer/ListObjectsRequestViewer.tsx
index 6826dac5c..f76cec4aa 100644
--- a/src/components/Docs/SnippetViewer/ListObjectsRequestViewer.tsx
+++ b/src/components/Docs/SnippetViewer/ListObjectsRequestViewer.tsx
@@ -36,7 +36,7 @@ function listObjectsRequestViewer(lang: SupportedLanguage, opts: ListObjectsRequ
 # Response: {"objects": [${expectedResults.map((r) => `"${r}"`).join(', ')}]}`;
     case SupportedLanguage.CURL:
       /* eslint-disable max-len */
-      return `curl -X POST $FGA_SERVER_URL/stores/$FGA_STORE_ID/list-objects \\
+      return `curl -X POST $FGA_API_URL/stores/$FGA_STORE_ID/list-objects \\
   -H "Authorization: Bearer $FGA_API_TOKEN" \\ # Not needed if service does not require authorization
   -H "content-type: application/json" \\
   -d '{
diff --git a/src/components/Docs/SnippetViewer/ReadChangesRequestViewer.tsx b/src/components/Docs/SnippetViewer/ReadChangesRequestViewer.tsx
index f39a440b8..189e51381 100644
--- a/src/components/Docs/SnippetViewer/ReadChangesRequestViewer.tsx
+++ b/src/components/Docs/SnippetViewer/ReadChangesRequestViewer.tsx
@@ -22,7 +22,7 @@ function readChangesRequestViewer(lang: SupportedLanguage, opts: ReadChangesRequ
       const tokenString = `${opts.continuationToken ? '"continuation_token": "' + opts.continuationToken + '", ' : ''}`;
       // eslint-disable-next-line max-len
       const pageSizeString = `${opts.pageSize ? '"page_size": ' + opts.pageSize : ''}`;
-      return `curl -X POST $FGA_SERVER_URL/stores/$FGA_STORE_ID/changes \\
+      return `curl -X POST $FGA_API_URL/stores/$FGA_STORE_ID/changes \\
   -H "Authorization: Bearer $FGA_API_TOKEN" \\ # Not needed if service does not require authorization
   -H "content-type: application/json" \\
   -d '{${typeString}${tokenString}${pageSizeString}}'`;
diff --git a/src/components/Docs/SnippetViewer/ReadRequestViewer.tsx b/src/components/Docs/SnippetViewer/ReadRequestViewer.tsx
index 237897656..cb87eb457 100644
--- a/src/components/Docs/SnippetViewer/ReadRequestViewer.tsx
+++ b/src/components/Docs/SnippetViewer/ReadRequestViewer.tsx
@@ -48,7 +48,7 @@ function readRequestViewer(lang: SupportedLanguage, opts: ReadRequestViewerOpts)
         : '';
 
       // eslint-disable-next-line max-len
-      return `curl -X POST $FGA_SERVER_URL/stores/$FGA_STORE_ID/read \\
+      return `curl -X POST $FGA_API_URL/stores/$FGA_STORE_ID/read \\
   -H "Authorization: Bearer $FGA_API_TOKEN" \\ # Not needed if service does not require authorization
   -H "content-type: application/json" ${requestTuplePayload}'
 
diff --git a/src/components/Docs/SnippetViewer/SdkSetup.tsx b/src/components/Docs/SnippetViewer/SdkSetup.tsx
index 66d654f3b..790ab8a9b 100644
--- a/src/components/Docs/SnippetViewer/SdkSetup.tsx
+++ b/src/components/Docs/SnippetViewer/SdkSetup.tsx
@@ -35,7 +35,7 @@ export function sdkSetupHeader(lang: SupportedLanguage, languageMappings: Langua
   switch (lang) {
     case SupportedLanguage.CURL:
     case SupportedLanguage.CLI:
-      return `Set FGA_SERVER_URL according to the service you are using (e.g. https://api.fga.example)
+      return `Set FGA_API_URL according to the service you are using (e.g. https://api.fga.example)
 `;
 
     case SupportedLanguage.JS_SDK:
@@ -159,11 +159,11 @@ export function GenerateSetupHeader(lang: SupportedLanguage, skipSetup?: boolean
       break;
     case SupportedLanguage.CLI:
       content = sdkSetupHeader(SupportedLanguage.CLI, configuredLanguage);
-      summary = 'Set FGA_SERVER_URL according to the service you are using (e.g. https://api.fga.example)';
+      summary = 'Set FGA_API_URL according to the service you are using (e.g. https://api.fga.example)';
       break;
     case SupportedLanguage.CURL:
       content = sdkSetupHeader(SupportedLanguage.CURL, configuredLanguage);
-      summary = 'Set FGA_SERVER_URL according to the service you are using (e.g. https://api.fga.example)';
+      summary = 'Set FGA_API_URL according to the service you are using (e.g. https://api.fga.example)';
       break;
 
     case SupportedLanguage.PLAYGROUND:
diff --git a/src/components/Docs/SnippetViewer/SupportedLanguage.tsx b/src/components/Docs/SnippetViewer/SupportedLanguage.tsx
index 1ba337dce..b9e5f561f 100644
--- a/src/components/Docs/SnippetViewer/SupportedLanguage.tsx
+++ b/src/components/Docs/SnippetViewer/SupportedLanguage.tsx
@@ -71,4 +71,4 @@ export interface LanguageMappings {
   [key: string]: LanguageMapping;
 }
 
-export const DefaultAuthorizationModelId = '1uHxCSuTP0VKPYSnkq1pbb1jeZw';
+export const DefaultAuthorizationModelId = '01HVMMBCMGZNT3SED4Z17ECXCA';
diff --git a/src/components/Docs/SnippetViewer/WriteAuthzModelViewer.tsx b/src/components/Docs/SnippetViewer/WriteAuthzModelViewer.tsx
index 5c9da840e..2866c9f0b 100644
--- a/src/components/Docs/SnippetViewer/WriteAuthzModelViewer.tsx
+++ b/src/components/Docs/SnippetViewer/WriteAuthzModelViewer.tsx
@@ -14,7 +14,7 @@ function writeAuthZModelViewerCli(authorizationModel: AuthorizationModel): strin
 }
 
 function writeAuthZModelViewerCurl(authorizationModel: AuthorizationModel): string {
-  return `curl -X POST $FGA_SERVER_URL/stores/$FGA_STORE_ID/authorization-models \\
+  return `curl -X POST $FGA_API_URL/stores/$FGA_STORE_ID/authorization-models \\
   -H "Authorization: Bearer $FGA_API_TOKEN" \\ # Not needed if service does not require authorization
   -H "content-type: application/json" \\
   -d '${JSON.stringify(authorizationModel)}'`;
@@ -27,7 +27,7 @@ const { authorization_model_id: id } = await fgaClient.writeAuthorizationModel($
     null,
     2,
   )});
-// id = "1uHxCSuTP0VKPYSnkq1pbb1jeZw"`;
+// id = "01HVMMBCMGZNT3SED4Z17ECXCA"`;
 }
 
 function writeAuthZModelViewerGo(authorizationModel: AuthorizationModel): string {
@@ -48,7 +48,7 @@ function writeAuthZModelViewerGo(authorizationModel: AuthorizationModel): string
       // .. Handle error
   }
 
-  // data.AuthorizationModelId = "1uHxCSuTP0VKPYSnkq1pbb1jeZw"`;
+  // data.AuthorizationModelId = "01HVMMBCMGZNT3SED4Z17ECXCA"`;
 }
 
 function writeAuthZModelViewerDotnet(authorizationModel: AuthorizationModel): string {
@@ -57,7 +57,7 @@ function writeAuthZModelViewerDotnet(authorizationModel: AuthorizationModel): st
   var body = JsonSerializer.Deserialize<OpenFga.Sdk.Model.WriteAuthorizationModelRequest>(modelJson);
 
   var response = await fgaClient.WriteAuthorizationModel(body);
-  // response.AuthorizationModelId = "1uHxCSuTP0VKPYSnkq1pbb1jeZw"`;
+  // response.AuthorizationModelId = "01HVMMBCMGZNT3SED4Z17ECXCA"`;
 }
 
 function writeAuthZModelViewerPython(authorizationModel: AuthorizationModel): string {
@@ -67,7 +67,7 @@ function writeAuthZModelViewerPython(authorizationModel: AuthorizationModel): st
 async def write_authorization_model():
     body_string = ${JSON.stringify(JSON.stringify(authorizationModel))}
     response = await fga_client_instance.write_authorization_model(json.loads(body))
-    # response.authorization_model_id = "1uHxCSuTP0VKPYSnkq1pbb1jeZw"
+    # response.authorization_model_id = "01HVMMBCMGZNT3SED4Z17ECXCA"
 `;
 }
 
diff --git a/src/components/Docs/SnippetViewer/WriteRequestViewer.tsx b/src/components/Docs/SnippetViewer/WriteRequestViewer.tsx
index 78b42d754..c9f52e3ed 100644
--- a/src/components/Docs/SnippetViewer/WriteRequestViewer.tsx
+++ b/src/components/Docs/SnippetViewer/WriteRequestViewer.tsx
@@ -68,7 +68,7 @@ ${
       const writes = `"writes": { "tuple_keys" : [${writeTuples}] }`;
       const deletes = `"deletes": { "tuple_keys" : [${deleteTuples}] }`;
       const separator = `${opts.deleteRelationshipTuples && opts.relationshipTuples ? ',' : ''}`;
-      return `curl -X POST $FGA_SERVER_URL/stores/$FGA_STORE_ID/write \\
+      return `curl -X POST $FGA_API_URL/stores/$FGA_STORE_ID/write \\
   -H "Authorization: Bearer $FGA_API_TOKEN" \\ # Not needed if service does not require authorization
   -H "content-type: application/json" \\
   -d '{${opts.relationshipTuples ? writes : ''}${separator}${
diff --git a/src/theme/prism-include-languages.ts b/src/theme/prism-include-languages.ts
index f3b7aac66..5dd035b80 100644
--- a/src/theme/prism-include-languages.ts
+++ b/src/theme/prism-include-languages.ts
@@ -1,29 +1,9 @@
 import siteConfig from '@generated/docusaurus.config';
 import type * as PrismNamespace from 'prismjs';
-import { tools, theming } from '@openfga/frontend-utils';
-
-const { OpenFgaDslThemeTokenType } = theming;
+import { tools } from '@openfga/frontend-utils';
 
 const { PrismExtensions } = tools;
 
-const languageDefinition = {
-  ...PrismExtensions.languageDefinition,
-  [OpenFgaDslThemeTokenType.KEYWORD]:
-    /\b(type|relations|define|and|or|but not|from|as|model|schema|condition|module|extend)\b/,
-  condition: {
-    pattern: /(\bcondition\s+)\w+/i,
-    lookbehind: true,
-    greedy: true,
-  },
-  'condition-params': {
-    pattern: /\(.*\)\s*{/,
-    inside: {
-      'condition-param': /\b(\w+)\s*:/i,
-      'condition-param-type': /\b(string|int|map|uint|list|timestamp|bool|duration|double|ipaddress)\b/,
-    },
-  },
-};
-
 export default function prismIncludeLanguages(PrismObject: typeof PrismNamespace): void {
   const {
     themeConfig: { prism },
@@ -42,7 +22,7 @@ export default function prismIncludeLanguages(PrismObject: typeof PrismNamespace
     require(`prismjs/components/prism-${lang}`);
   });
 
-  PrismObject.languages[PrismExtensions.LANGUAGE_NAME] = languageDefinition;
+  PrismObject.languages[PrismExtensions.LANGUAGE_NAME] = PrismExtensions.languageDefinition;
 
   delete (globalThis as unknown as Global & { Prism?: typeof PrismNamespace }).Prism;
 }
diff --git a/static/css/openfga.css b/static/css/openfga.css
index 2c17a4b36..3b44f537d 100644
--- a/static/css/openfga.css
+++ b/static/css/openfga.css
@@ -24,6 +24,7 @@
   --ofga-color-default: #ffffff;
   --ofga-color-comment: #737981;
   --ofga-color-keyword: #aaaaaa;
+  --ofga-color-module: #79ed83;
   --ofga-color-type: #79ed83;
   --ofga-color-relation: #20f1f5;
   --ofga-color-directly-assignable: #ceec93;
@@ -591,6 +592,10 @@ pre code {
   color: var(--ofga-color-keyword) !important;
 }
 
+.language-dsl\.openfga .token.module {
+  color: var(--ofga-color-module);
+}
+
 .language-dsl\.openfga .token.type {
   color: var(--ofga-color-type);
 }