diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..7df0c973
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "assets/fonts/fa-webfonts"]
+ path = assets/fonts/fa-webfonts
+ url = git@github.com:privacyguides/fa-webfonts.git
diff --git a/_includes/head.html b/_includes/head.html
index ee49704d..8809779c 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -1,9 +1,27 @@
-
-
-
- {% if page.title %}{{ page.title }} | chat.privacytools.io{% else %}Matrix | chat.privacytools.io{% endif %}
-
-
+
+
+
+
+
+
+
+
+ {% if page.title %}
+ {{ page.title }} | {{ site.title }}
+
+ {% else %}
+ {{ site.title }}
+
+ {% endif %}
+
+
+
+
+
+
+
+
+
diff --git a/_includes/nav.html b/_includes/nav.html
index 5eaeb220..be134b51 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -1,31 +1,6 @@
-