diff --git a/assets/u/image/matrix-logo.png b/assets/u/image/matrix-logo.png
new file mode 100644
index 0000000..6be91ed
Binary files /dev/null and b/assets/u/image/matrix-logo.png differ
diff --git a/content/u/products/hosted-matrix-chat/contents.lr b/content/u/products/hosted-matrix-chat/contents.lr
index 473e68e..cd9ce65 100644
--- a/content/u/products/hosted-matrix-chat/contents.lr
+++ b/content/u/products/hosted-matrix-chat/contents.lr
@@ -4,76 +4,178 @@ _hidden: no
---
title: Hosted Matrix Chat
---
-subtitle: Easy, decentralised encrypted chat
+subtitle: Easy, decentralised & end-to-end encrypted chat
---
-feature1_title: Hosted in Switzerland
+header:
+
+#### generic-header ####
+headers:
+
+Open, Secure
+Decentralized Chat
+
+----
+primary_color: #00B0F0
+----
+header_color: text-light
+----
+nav_link_color: navbar-dark
+---
+description1:
+
+
What is Matrix?
+
+Matrix is a modern and decentralised,
+open-source chat solution backed by a dynamic community. It provides many
+advanced user-focused features such as end-to-end encryption, bridging or audio
+& video calls.
+
+
+
+
+
+
+
+
+ -
+ The strongest point of Matrix is *federation*: a Matrix homeserver - which is
+ what we offer - allows to manage your own community... and to join the whole
+ Matrix network. You will be able to exchange with users on any other Matrix
+ server without any special configuration!
+
+ -
+ End-to-end encryption (E2EE) means that - when enabled - only the sender and
+ intended receiver(s) will be able to read the messages: even ungleich, who
+ manages the matrix server, will not be able to access the content of E2EE
+ messages.
+
+ -
+ Our Matrix servers are provided with a TURN server, meaning that you'll be
+ able to use voice and video calls out of the box.
+
+ -
+ We support bridging to other networks such as Mattermost instances, IRC,
+ Slack, Telegram and more via Matterbridge.
+
+
+
+
+
+
+
+
+---
+feature1_title: Open
---
feature1_text:
-The Matrix chat is hosted exclusively in Switzerland,
-offering its political stability and strict privacy laws as advantages
+The evolution of Matrix is managed through an open governance process,
+supervised by [The Matrix.org Foundation](https://matrix.org/foundation).
+Moreover, all the software backing the network is [Free and Open
+Source](https://en.wikipedia.org/wiki/Free_and_open-source_software), which
+guarantees quality and security.
---
-feature2_title: Fully decentralised
+feature2_title: Secure & decentralized
---
feature2_text:
-Everyone can run a Matrix server and by default Matrix is open for
-federation. That means if you have a hosted Matrix server instance
-that you can directly connect to other servers and chat with people
-everywhere in the world. You can even try this out by talking to us on
-**#matrix:ungleich.ch**!
----
-feature3_title: Privacy by default
----
-feature3_text: Matrix allows full end-to-end encryption (E2EE) in its
-core. No additional settings required, encryption is at at the heart
-of Matrix.
-
-Because of E2EE your messages can even be encrypted at rest -
-i.e. they are not stored plaintext, if you encrypt them.
+Both end-to-end encryption and federation are *built-in* into Matrix. The
+former will be enabled by default in the near future, making it a valuable tool
+for activists and privacy-minded people all across the world.
---
-content1_image: /u/image/penguin-matrix.jpg
+feature3_title: Zero Carbon
---
-content1_text:
-
-## What is Matrix?
-
-[Matrix](https://matrix.org/) is a decentralised chat that allows you
-to have your own private conversations and at the same time be
-connected to other communities. At your choice.
-
-Matrix features real end-to-end encryption that allows you to keep
-your messages save from everyone.
-
-## Whom is Matrix Chat for?
-
-If you are interested in Open Source, if you value privacy and if
-don't mind a slightly geeky interface - well, then Matrix is certainly
-for you.
-
-If you are more looking for an end-user compatible chat, we recommend
-to look at the [Mattermost based](../zero-carbon-chat/) chat.
-
-Matrix can be used as a replacement of Slack or IRC. It is neither
-proprietary nor based on a hard to extend protocol (think of:
-pictures). Like the Mattermost chat, Matrix is also running on a Zero
-Carbon infrastructure.
+feature3_text:
+We host your Matrix homeserver in our [own
+datacenter](/u/projects/data-center-light/) in Switzerland, which we believe to
+be as ecologically-friendly as a datacenter can get: we use old buildings,
+second-hand hydroelectric, passive cooling and are directly plugged into a
+hydroelectric power plant.
---
description3:
-## Transparent costs
+
+
+
+
+
+
+
Growing fast!
+
As of February 2020, the Matrix network supports ~13.5M visible
+ accounts, ~5.0M messages a day, ~40.000 federated servers and even governments!
-When you book a Matrix chat that is running in our [Data Center
-Light](https://datacenterlight.ch), you pay for a virtual machine and
-a maintenance fee, according to the VM size.
+
A lot of privacy, security and usability work is going on... which
+ means that Matrix will get even more awesome in the coming months!
-That's it. No artifical user or room limit.
+
You can follow the Matrix.org
+ blog to get frequent updates on Matrix's development, and chat with
+ us on #matrix:ungleich.ch!
+
+
+
+
+
+
+
+
+
+
Hosted Matrix Chat
+
+
We will provide you with your own dedicated Matrix 'Home Server', as well as
+ a hosted web client. Matrix requires a domain name in order to join the global
+ networks, which will appear in your username (e.g.
+ @penguin:example.0co2.cloud): you can either use a subdomain of
+ 0co2.cloud (e.g. example.0co2.cloud) or your own domain name. We
+ will deploy a Matterbridge)
+ instance (bridging to Mattermost, IRC, Slack, Telegram, ...) on demand.
+
+
+
There are many Matrix
+ clients, although we strongly recommend Riot which is the most
+ advanced at the moment. Be aware, however, that you might be a bit
+ confused with its UI/UX at first (there is ongoing work to improve
+ onboarding): we encourage you to try
+ Riot/Matrix first if your are not already familiar with it.
+
+
+
+
+
Transparent Costs
+
+
The cost of our Matrix-as-a-Service offer is divided between a base maintenance
+ fee and the price of the dedicated Virtual Machine (VM) we deploy for you in
+ our own datacenter. There is no artifical
+ restriction on the number of users or size of rooms: the only limit is the
+ resources we allocate to your node. We will extend them on demand, following
+ the pricing model (CPU, RAM, Disk) of our VM
+ offer.
+
+
+ We also offer custom-sized deployment. You can discuss our offer with us by
+ email or even on matrix, via
#matrix:ungleich.ch!
+
+
+
+
+
You will find more details
+on our Matrix-as-a-Service FAQ and on Matrix's official documentation.
+
+
+
+You might be also interested in our [Mattermost-based chat
+offer](../zero-carbon-chat), which might be closer to what you expect for a
+enterprise team chat at the moment. We use both at ungleich, since Matrix is
+especially convenient to reach out to the world!
+
-If you need more resources, because you are using the chat
-intensively, you can upgrade your VM to a bigger model.
---
offer1_title: Matrix-S 36 CHF/Month
---
@@ -110,4 +212,3 @@ offer3_text:
---
offer3_link: https://ungleich.ch/product/hosted-matrix-l/
----
diff --git a/content/u/products/zero-carbon-chat/contents.lr b/content/u/products/zero-carbon-chat/contents.lr
index 628979c..c0cfebe 100644
--- a/content/u/products/zero-carbon-chat/contents.lr
+++ b/content/u/products/zero-carbon-chat/contents.lr
@@ -45,6 +45,12 @@ suitable for the following use case.
* If you are dealing with sensitive data over your chat that needs to be protected against the unstable political situation
* If your team needs a communication platform that does not betray the team's values: in other words, if your team values protecting the environment.
+
+You might be also interested in our [Matrix-based chat
+offer](../hosted-matrix-chat), which allows secure and decentralized
+communications.
+
+
## How can I access it?
You can access the chat easily from your browser or from the mobile app.
diff --git a/templates/product.html b/templates/product.html
index 28e432e..74015d7 100644
--- a/templates/product.html
+++ b/templates/product.html
@@ -89,7 +89,7 @@
{{ this.offer3_title }}
{{ this.offer3_text }}
-j
Order
+
Order
{% endif %}