diff --git a/content/concepts/components.md b/content/concepts/components.md
index 4752dc9d..08192381 100644
--- a/content/concepts/components.md
+++ b/content/concepts/components.md
@@ -89,12 +89,6 @@ Client libraries used by applications (such as Pleuston or Jupyter notebooks) to
-## Pleuston
-
-An example marketplace/publisher front-end for developers to explore, download, and publish [assets](/concepts/terminology/#asset-or-data-asset) in an Ocean Protocol network. Implemented using [React](https://reactjs.org/) and [squid-js](https://github.com/oceanprotocol/squid-js).
-
-
-
## Commons Marketplace
An online example marketplace/publisher for consumers to explore, download, and publish open data sets in the [Pacific Network](/concepts/pacific-network/). Implemented using [React](https://reactjs.org/) and [squid-js](https://github.com/oceanprotocol/squid-js).
@@ -102,3 +96,11 @@ An online example marketplace/publisher for consumers to explore, download, and
For more information, see [the blog post about Commons Marketplace](https://blog.oceanprotocol.com/the-commons-data-marketplace-c57a44288314).
+
+The Commons Marketplace is also the default frontend when running a full Ocean network locally with [Barge](/setup/quickstart/).
+
+## Pleuston (deprecated)
+
+An example marketplace/publisher front-end for developers to explore, download, and publish [assets](/concepts/terminology/#asset-or-data-asset) in an Ocean Protocol network. Implemented using [React](https://reactjs.org/) and [squid-js](https://github.com/oceanprotocol/squid-js).
+
+
diff --git a/content/concepts/wallets.md b/content/concepts/wallets.md
index c5eb9e1e..7b78b47c 100644
--- a/content/concepts/wallets.md
+++ b/content/concepts/wallets.md
@@ -18,7 +18,7 @@ A wallet can sometimes mean (web3) _software_ for interacting with a thing that
Note how MetaMask is in both lists!
-You can also have a _chain_ of software which ultimately connects to the thing that stores the private keys. An example would be [Pleuston](/concepts/components/#pleuston) connecting to MetaMask connecting to a TREZOR wallet.
+You can also have a _chain_ of software which ultimately connects to the thing that stores the private keys. An example would be [Commons](/concepts/components/#commons) connecting to MetaMask connecting to a TREZOR wallet.
## Related Terminology
diff --git a/content/setup/marketplace.md b/content/setup/marketplace.md
index 96802514..ae668daf 100644
--- a/content/setup/marketplace.md
+++ b/content/setup/marketplace.md
@@ -31,10 +31,10 @@ At the time of writing, we recommend the following steps to develop a marketplac
1. Do the [React App Tutorial](/tutorials/react-setup/).
2. Grow your app from there.
-For more examples and inspiration, check out [the source code for Pleuston](https://github.com/oceanprotocol/pleuston) and the [the source code for the Commons Marketplace](https://github.com/oceanprotocol/commons). Both have an Apache v2 open source license. Both use React and squid-js. Both are "serverless" apps: they run entirely in the browser and have no server-side component.
+For more examples and inspiration, check out the [source code for the Commons Marketplace](https://github.com/oceanprotocol/commons) and the [source code for Pleuston](https://github.com/oceanprotocol/pleuston). Both have an Apache v2 open source license. Both use React and squid-js. Both are "serverless" apps: they run entirely in the browser and have no server-side component.
-
+
### Other Options
diff --git a/content/setup/quickstart.md b/content/setup/quickstart.md
index 45b0029c..3d262cd9 100644
--- a/content/setup/quickstart.md
+++ b/content/setup/quickstart.md
@@ -17,7 +17,7 @@ Seeing the dolphin means it's working:

-Once everything is up and running, you can interact with the components. E.g. once [Pleuston](/concepts/components/#pleuston) is running, you can interact with it at:
+Once everything is up and running, you can interact with the components. E.g. once [Commons](/concepts/components/#commons) is running, you can interact with it at:
- [http://localhost:3000/](http://localhost:3000/)
diff --git a/content/test.md b/content/test.md
index a1f615d0..75c63778 100644
--- a/content/test.md
+++ b/content/test.md
@@ -370,14 +370,14 @@ In all Markdown docs you can use some select React Components. This magic is don
The `Repository` component fetching and displaying information about a GitHub repo. Component can be used in Markdown as ``, it requires a `name` to be passed:
```html
-
+
```
Note that the component name in Markdown needs to be always in lowercase, and have a closing tag.
Resulting in:
-
+
You can also pass `readme="true"` and the readme contents of the repo will be rendered:
diff --git a/content/tutorials/example-code.md b/content/tutorials/example-code.md
index 10659baa..ce69fb78 100644
--- a/content/tutorials/example-code.md
+++ b/content/tutorials/example-code.md
@@ -13,8 +13,8 @@ description: Examples of code using the Squid libraries.
## squid-js Examples
- [The React App Tutorial](/tutorials/react-setup/)
-- [The Pleuston source code](https://github.com/oceanprotocol/pleuston)
- [The Commons Marketplace source code](https://github.com/oceanprotocol/commons)
+- [The Pleuston source code](https://github.com/oceanprotocol/pleuston)
- The squid-js tests:
- [Unit tests](https://github.com/oceanprotocol/squid-js/tree/develop/test)
- [Integration tests](https://github.com/oceanprotocol/squid-js/tree/develop/integration/ocean)
diff --git a/content/tutorials/react-setup.md b/content/tutorials/react-setup.md
index 7b775435..b4c9b264 100644
--- a/content/tutorials/react-setup.md
+++ b/content/tutorials/react-setup.md
@@ -128,7 +128,7 @@ Clone the barge repository and use its startup script:
git clone https://github.com/oceanprotocol/barge.git
cd barge/
-./start_ocean.sh --no-pleuston
+./start_ocean.sh --no-commons
```
Note that compiling and deploying the contracts in your local Docker network takes some time so it can take a few minutes until the network is ready to be interacted with. That usually is the case once `keeper-contracts_1` container doesn't show any messages anymore.
diff --git a/data/repositories.yml b/data/repositories.yml
index f3312466..e4974a84 100644
--- a/data/repositories.yml
+++ b/data/repositories.yml
@@ -15,7 +15,6 @@
- name: API reference
url: /references/brizo/
- name: events-handler
- - name: pleuston
- name: commons
- group: Libraries
diff --git a/docs/repositories.md b/docs/repositories.md
index c10f192f..2b93a4fd 100644
--- a/docs/repositories.md
+++ b/docs/repositories.md
@@ -1,8 +1,8 @@
# Repository Component
-- [Overview](#Overview)
-- [Add Links to a Repository](#Add-Links-to-a-Repository)
-- [Version Numbers](#Version-Numbers)
+- [Overview](#overview)
+- [Add Links to a Repository](#add-links-to-a-repository)
+- [Version Numbers](#version-numbers)
## Overview