diff --git a/.gitmodules b/.gitmodules
index cf0a2dfca..3540ac24e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,3 @@
-[submodule "WebApp"]
-	path = WebApp
-	url = https://github.com/Human-Connection/WebApp.git
-[submodule "API"]
-	path = API
-	url = https://github.com/Human-Connection/API.git
 [submodule "Nitro-Web"]
 	path = Nitro-Web
 	url = https://github.com/Human-Connection/Nitro-Web.git
diff --git a/API b/API
deleted file mode 160000
index 8f0edaff9..000000000
--- a/API
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8f0edaff90da046bd0db34bd77f0ead7ef336d85
diff --git a/Nitro-Web b/Nitro-Web
index d84892930..64abd767e 160000
--- a/Nitro-Web
+++ b/Nitro-Web
@@ -1 +1 @@
-Subproject commit d84892930295dcfd3f6687fc33c7234446127099
+Subproject commit 64abd767e2bae0579ae776dba70d23db4b978c10
diff --git a/README.md b/README.md
index f6ead7d47..fb8c94162 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 # Human-Connection
 
 An Open Source Social Network for the positive change that we need in the World.
-Human-Connection is beeing build to provide better Communication Tools for everyone.
+Human-Connection is being built to provide better Communication Tools for everyone.
 We want to do more than comments and sharing!
 
 **Features**
@@ -22,36 +22,26 @@ We want to do more than comments and sharing!
 - Versus Challenging
 - Modular UI
 
---- 
-# BE AWARE: we are currently transitioning to our Nitro version
-> Check out https://docs.human-connection.org/nitro for more information.
---- 
-
-**REPO States**
-
-  [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Backend.svg?branch=master)](https://travis-ci.com/Human-Connection/Nitro-Backend) | [Nitro Backend](https://github.com/Human-Connection/Nitro-Backend)
-
-  [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Web.svg?branch=master)](https://travis-ci.com/Human-Connection/Nitro-Web) | [Nitro Web](https://github.com/Human-Connection/Nitro-Web)
-
-  ![Always passing](https://camo.githubusercontent.com/14b2ac1fc61cf21f2022ff3ee5ad6feca559ee18/68747470733a2f2f7472617669732d63692e636f6d2f48756d616e2d436f6e6e656374696f6e2f4e6974726f2d5374796c6567756964652e7376673f6272616e63683d6d6173746572) | [Nitro Embed](https://github.com/Human-Connection/Nitro-Embed)
-
-  [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Styleguide.svg?branch=master)](https://travis-ci.com/Human-Connection/Nitro-Styleguide) | [Nitro Styleguide](https://github.com/Human-Connection/Nitro-Styleguide)
-
-
+**Repositories**
 
+| Repo | Status |
+|---|---|
+| [Nitro Web](https://github.com/Human-Connection/Nitro-Web) | [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Web.svg?branch=master)](https://travis-ci.com/Human-Connection/Nitro-Web) | [Nitro Web](https://github.com/Human-Connection/Nitro-Web) |
+| [Nitro Backend](https://github.com/Human-Connection/Nitro-Backend) | [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Backend.svg?branch=master)](https://travis-ci.com/Human-Connection/Nitro-Styleguide) | [Nitro Backend](https://github.com/Human-Connection/Nitro-Backend) |
+| [Nitro Styleguide](https://github.com/Human-Connection/Nitro-Styleguide) | [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Styleguide.svg?branch=master)](https://travis-ci.com/Human-Connection/Nitro-Styleguide) | [Nitro Styleguide](https://github.com/Human-Connection/Nitro-Styleguide) |
+| [Nitro Embed](https://github.com/Human-Connection/Nitro-Embed) | ![Todo: add build pipeline](https://img.shields.io/badge/TODO-add%20build%20pipeline-red.svg) |
+  
 **Technology Stack**
 - vuejs
 - nuxtjs
-- mongodb
-- feathersjs
+- neo4j
+- graphql
 
-## Code
+## Documentation
+[Docs](https://docs.human-connection.org/nitro)
 
-### Frontend
-[Frontend](https://github.com/Human-Connection/Nitro-Web)
+## Translations
+You can help translating the interface by joining us on [lokalise.co](https://lokalise.co/public/556252725c18dd752dd546.13222042/).
 
-### Backend
-[Backend](https://github.com/Human-Connection/Nitro-Backend)
-
-## Developer Discord
+## Developer Chat
 [Discord](https://discord.gg/6ub73U3)
diff --git a/WebApp b/WebApp
deleted file mode 160000
index d4917da33..000000000
--- a/WebApp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d4917da335164f664837c9177c3bfb6e4a8d7432