diff --git a/academic_material.html b/academic_material.html
index c9b7ea2..ce0aec9 100644
--- a/academic_material.html
+++ b/academic_material.html
@@ -147,7 +147,7 @@
                             <p><img src="images/icons/icon_getting_started.png" alt="" ></p>
                             <div>
                                 <h4>Guides</h4>
-                                <p><a href="https://wiki.eclipse.org/Capella/Installation_Guide#Capella_Installation" target="_blank">Capella installation <i class="fa fa-arrow-circle-right" aria-hidden="true"></i></a></p>
+                                <p><a href="https://github.com/eclipse/capella/blob/master/doc/plugins/org.polarsys.capella.ui.doc/html/Installation Guide/How to install Capella and Addons.mediawiki#table-of-contents" target="_blank">Capella installation <i class="fa fa-arrow-circle-right" aria-hidden="true"></i></a></p>
                                 <p><a href="https://esd.sutd.edu.sg/40014-capella-tutorial/index.html" target="_blank">Toy Catapult tutorial <i class="fa fa-arrow-circle-right" aria-hidden="true"></i></a></p>
                             </div>
                     </div>
diff --git a/addons.html b/addons.html
index 7036f6c..84f7791 100644
--- a/addons.html
+++ b/addons.html
@@ -100,7 +100,7 @@
 				<div class="container">
 				
 					<div class="row">
-						<p><i>To install Capella extensions have a look to the <a href="https://wiki.eclipse.org/Capella/Extensions/Installation_Guide#Installation_Procedure" target="_blank">installation procedure</a></i></p>
+						<p><i>To install Capella extensions have a look to the <a href="https://github.com/eclipse/capella/blob/master/doc/plugins/org.polarsys.capella.ui.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.mediawiki#Configuration_and_Extensibility" target="_blank">installation procedure</a></i></p>
 					</div>
 					
 					<div class="row">
diff --git a/download.html b/download.html
index 8b7fab1..696a568 100644
--- a/download.html
+++ b/download.html
@@ -121,7 +121,7 @@
                         <figure class="wow fadeInLeft animated" data-wow-duration="300ms" data-wow-delay="300ms">
                             <div>
                                 <h4 class="txt_white">Resources</h4><br>
-           	     				<p><a class="wow fadeInUp animated" data-wow-delay=".2s" href="https://wiki.eclipse.org/Capella/Installation_Guide#Capella_Installation" target="_blank">Installation <i class="fa fa-external-link" aria-hidden="true"></i></a></p>
+           	     				<p><a class="wow fadeInUp animated" data-wow-delay=".2s" href="https://github.com/eclipse/capella/blob/master/doc/plugins/org.polarsys.capella.ui.doc/html/Installation Guide/How to install Capella and Addons.mediawiki#table-of-contents" target="_blank">Installation <i class="fa fa-external-link" aria-hidden="true"></i></a></p>
            	     				<p><a class="wow fadeInUp animated" data-wow-delay=".3s" href="getstarted.html" target="_blank">Getting Started <i class="fa fa-external-link" aria-hidden="true"></i></a></p>
            	     				<p><a class="wow fadeInUp animated" data-wow-delay=".4s" href="https://github.com/eclipse/capella" target="_blank">Source Code <i class="fa fa-github" aria-hidden="true"></i></a></p>
 								<p><a class="wow fadeInUp animated" data-wow-delay=".5s" href="support.html" target="_self">Documentation <i class="fa fa-fexternal-link" aria-hidden="true"></i></a></p>
@@ -166,7 +166,7 @@
                		<p><a class="wow fadeInDown btn btn-default" data-wow-delay=".6s" href="addons.html"><i class="fa fa-puzzle-piece" aria-hidden="true"></i> Discover all the available add-ons</a></p>
                		
                     <p class="wow fadeInDown" data-wow-delay=".5s"><br>
-                    To install Capella extensions have a look to the <a href="https://wiki.eclipse.org/Capella/Extensions/Installation_Guide#Installation_Procedure" target="_blank">installation procedure</a></p>
+                    To install Capella extensions have a look to the <a href="https://github.com/eclipse/capella/blob/master/doc/plugins/org.polarsys.capella.ui.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.mediawiki#Configuration_and_Extensibility" target="_blank">installation procedure</a></p>
                     <br>
                     <br>
                     <br>
diff --git a/getstarted.html b/getstarted.html
index 6196fab..cd81eb0 100644
--- a/getstarted.html
+++ b/getstarted.html
@@ -98,7 +98,7 @@
             		<div class="row">
 	                	<h3>Installation</h3>
                     <p>Get Capella on the <a href="/capella/download.html"><b>download page</b></a>.</p>
-                    <p>Then, please read through <a href="https://wiki.polarsys.org/Capella/Installation_Guide#Capella_Installation" target="_blank"><b>this guide</b></a> that provides instructions for installing Capella.</p>
+                    <p>Then, please read through <a href="https://github.com/eclipse/capella/blob/master/doc/plugins/org.polarsys.capella.ui.doc/html/Installation Guide/How to install Capella and Addons.mediawiki#table-of-contents" target="_blank"><b>this guide</b></a> that provides instructions for installing Capella.</p>
 
 					<h3>Tutorial</h3>
 					<p>This project is a tutorial that follows the steps to design a Toy Catapult to enable a parent and child to have fun together.</p>
@@ -183,7 +183,7 @@
 					</div>
 					<h3>Extensions and Viewpoints</h3>
 					<p>Some <a href="/capella/addons.html">add-ons</a> to Capella can be installed to provide additional features (team work, documentation generation, etc).</p>
-					<p>The wiki has also a dedicated section for the <a href="https://polarsys.org/wiki/Capella/Addons" target="_blank">extensions</a> and <a href="https://polarsys.org/wiki/Capella/Viewpoints" target="_blank">viewpoints</a> for Capella and their <a href="https://wiki.polarsys.org/Capella/Extensions/Installation_Guide#Installation_Procedures" target="_blank">installation</a>.</p>
+					<p>The wiki has also a dedicated section for the <a href="https://polarsys.org/wiki/Capella/Addons" target="_blank">extensions</a> and <a href="https://polarsys.org/wiki/Capella/Viewpoints" target="_blank">viewpoints</a> for Capella and their <a href="https://github.com/eclipse/capella/blob/master/doc/plugins/org.polarsys.capella.ui.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.mediawiki#Configuration_and_Extensibility" target="_blank">installation</a>.</p>
 					<h3>Support</h3>
 					<p>If you need help about the Capella workbench, you can post questions on the <a href="https://www.eclipse.org/forums/index.php/i/11/" target="_blank">forum</a> or contact <a href="/capella/services.html" target="_blank">professional experts</a>.</p>
 
diff --git a/json/download.schema.json b/json/download.schema.json
index bb89940..ce7ac5d 100644
--- a/json/download.schema.json
+++ b/json/download.schema.json
@@ -51,7 +51,9 @@
                 "updateSite": { "type": "string" },
                 "installAddon": { "type": "string" },
                 "dandi": { "type": "string" },
-                "learnMore": { "type": "string" }
+                "learnMore": { "type": "string" },
+                "release": { "type": "string" },
+                "userManual": { "type": "string" }
             }
         }, 
         "lang": {
@@ -64,7 +66,11 @@
                 "learnMore": { "$ref" : "#/definitions/langitem" },
                 "main": { "$ref" : "#/definitions/langitem" },
                 "mirror": { "$ref" : "#/definitions/langitem" },
-
+                "release": { "$ref" : "#/definitions/langitem" },
+                "userManual": { "$ref" : "#/definitions/langitem" },
+                "product": { "$ref" : "#/definitions/langitem" },
+                "compatibility": { "$ref" : "#/definitions/langitem" },
+                
                 "windows": { "$ref" : "#/definitions/langplatform" },
                 "linux": { "$ref" : "#/definitions/langplatform" },
                 "mac": { "$ref" : "#/definitions/langplatform" }
diff --git a/json/downloads.json b/json/downloads.json
index 34cade1..981165b 100644
--- a/json/downloads.json
+++ b/json/downloads.json
@@ -5,8 +5,9 @@
       "release": { "text": "Download", "icon": "fa fa-download" }, 
       "dropin": { "text": "Drop-in", "icon": "fa fa-download" }, 
       "updateSite": { "text": "Update Site", "icon": "fa fa-download" },
+      "userManual": { "text": "User manual", "icon": "fa fa-book" },
       "product": { "text": "Product", "icon": "fa fa-download" },
-      "installAddon": { "text": "Install the Addon", "icon": "fa fa-external-link-square", "target":"_blank" },
+      "installAddon": { "text": "Installation procedure", "icon": "fa fa-external-link-square", "target":"_blank" },
       "dandi": { "text": "Download and Installation", "icon": "fa fa-download" },
       "learnMore": { "text": "Learn More", "icon": "fa fa-arrow-circle-right", "target":"_blank" },
       "windows": { "text": "Windows", "icon": "fa fa-windows", "key":"WIN" },
@@ -62,10 +63,11 @@
       "licence":"EPL",
       "compatibleWithCurrentVersion": true,
       "contact":"<a href='industry-consortium/thales.html' target='_blank'>Thales</a>",
-      "description": "<p>This addon is a System to SubSystem Transition. It initializes a new Capella project from existing model. This transition extracts suitable model information from a selected Capella Component and manage top/down update propagation.</p><p>The automated and iterative transition between system and subsystems is a great help for managing several levels of engineering. The contract and model of the subsystems are computed from the system. Ideally, subsystems stakeholders are involved in co-engineering activities at system level before the transition occurs.</p><p>For more information, please install the addon within Capella and check dedicated section for the addon in Help Content or access to the <a href='https://github.com/eclipse/capella-sss-transition/wiki'>online version of the documentation</a>.</p>",
+      "description": "<p>This addon is a System to SubSystem Transition. It initializes a new Capella project from existing model. This transition extracts suitable model information from a selected Capella Component and manage top/down update propagation.</p><p>The automated and iterative transition between system and subsystems is a great help for managing several levels of engineering. The contract and model of the subsystems are computed from the system. Ideally, subsystems stakeholders are involved in co-engineering activities at system level before the transition occurs.</p>",
       "download": { 
-        "release": "https://github.com/eclipse/capella-sss-transition/releases/tag/v1.5.0", 
-        "installAddon": "https://wiki.eclipse.org/Capella/Extensions/Installation_Guide#Installation_Procedures"
+        "release": "https://github.com/eclipse/capella-sss-transition/releases", 
+        "userManual": "https://github.com/eclipse/capella-sss-transition/wiki",
+        "installAddon": "https://github.com/eclipse/capella/blob/master/doc/plugins/org.polarsys.capella.ui.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.mediawiki#Configuration_and_Extensibility"
       }
     },
     { "name":"XHTML Documentation Generation",
@@ -79,7 +81,7 @@
       "download": { 
         "dropin": "https://download.eclipse.org/capella/addons/xhtmldocgen/dropins/release/5.0.0/CapellaXHTMLDocGen-5.0.0.202012170838-Capella-5.0.0-dropins.zip",
         "updateSite": "https://download.eclipse.org/capella/addons/xhtmldocgen/updates/release/5.0.0/",
-        "installAddon": "https://wiki.eclipse.org/Capella/Extensions/Installation_Guide#Installation_Procedures"        
+        "installAddon": "https://github.com/eclipse/capella/blob/master/doc/plugins/org.polarsys.capella.ui.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.mediawiki#Configuration_and_Extensibility"
       }
     }, 
     { "name":"Filtering",
@@ -89,10 +91,11 @@
       "licence":"EPL",
       "compatibleWithCurrentVersion": true,
       "contact":"<a href='industry-consortium/thales.html' target='_blank'>Thales</a>",
-      "description": "<p>Filtering is an addon to filter capella models. It provides several capabilities:</p><ul><li>Definition of filtering criteria to be associated with model elements</li><li>Definition of results containing criteria</li><li>Visualization of criteria and results in diagrams</li><li>Creation of filtered models</li></ul><p>For more information, please install the addon within Capella and check dedicated section for the addon in Help Content or access to the <a href='https://github.com/eclipse/capella-filtering/wiki'>online version of the documentation</a>.</p>",
+      "description": "<p>Filtering is an addon to filter capella models. It provides several capabilities:</p><ul><li>Definition of filtering criteria to be associated with model elements</li><li>Definition of results containing criteria</li><li>Visualization of criteria and results in diagrams</li><li>Creation of filtered models</li></ul>",
       "download": { 
-        "release": "https://github.com/eclipse/capella-filtering/releases/tag/v1.5.0", 
-        "installAddon": "https://wiki.eclipse.org/Capella/Extensions/Installation_Guide#Installation_Procedures"
+        "release": "https://github.com/eclipse/capella-filtering/releases", 
+        "userManual": "https://github.com/eclipse/capella-filtering/wiki",
+        "installAddon": "https://github.com/eclipse/capella/blob/master/doc/plugins/org.polarsys.capella.ui.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.mediawiki#Configuration_and_Extensibility"
       }
     }, 
     { "name":"Property Values Management Tools (PVMT)",
@@ -252,8 +255,9 @@
        "contact":"<a href='industry-consortium/thales.html' target='_blank'>Thales</a>",
        "description": "<p>This add-on allows importing a set of requirements from a ReqIF file (Requirement Interchange Format / OMG Standard).</p><p>The import is iterative (diff/merge based) and a set of tools is provided to link the model elements to the requirements.</p><p>For more information, please install the addon within Capella and check online help then dedicated section for the addon.</p>",
        "download": { 
-        "release": "https://github.com/eclipse/capella-requirements-vp/releases/tag/v0.12.0", 
-        "installAddon": "https://wiki.eclipse.org/Capella/Extensions/Installation_Guide#Installation_Procedures"
+        "release": "https://github.com/eclipse/capella-requirements-vp/releases", 
+        "userManual": "https://github.com/eclipse/capella-requirements-vp/wiki",
+        "installAddon": "https://github.com/eclipse/capella/blob/master/doc/plugins/org.polarsys.capella.ui.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.mediawiki#Configuration_and_Extensibility"
        },
        "tags":["requirements"]
     }, 
@@ -269,7 +273,7 @@
       "download": { 
         "dropin": "https://download.eclipse.org/capella/addons/basicmass/dropins/releases/5.0.0/BasicMass-dropins-5.0.0.202012150812.zip", 
         "updateSite": "https://download.eclipse.org/capella/addons/basicmass/updates/releases/5.0.0/",
-        "installAddon": "https://wiki.eclipse.org/Capella/Extensions/Installation_Guide#Installation_Procedures"
+        "installAddon": "https://github.com/eclipse/capella/blob/master/doc/plugins/org.polarsys.capella.ui.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.mediawiki#Configuration_and_Extensibility"
       }
     },
     { "name":"Basic Price",
@@ -284,7 +288,7 @@
       "download": { 
         "dropin": "https://download.eclipse.org/capella/addons/basicprice/dropins/releases/5.0.0/BasicPrice-dropins-5.0.0.202012150812.zip",
         "updateSite": "https://download.eclipse.org/capella/addons/basicprice/updates/releases/5.0.0/",
-        "installAddon": "https://wiki.eclipse.org/Capella/Extensions/Installation_Guide#Installation_Procedures"
+        "installAddon": "https://github.com/eclipse/capella/blob/master/doc/plugins/org.polarsys.capella.ui.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.mediawiki#Configuration_and_Extensibility"
       }
     },
     { "name":"Basic Performance",
@@ -299,7 +303,7 @@
       "download": { 
         "dropin": "https://download.eclipse.org/capella/addons/basicperfo/dropins/releases/5.0.0/BasicPerfo-dropins-5.0.0.202012150812.zip", 
         "updateSite": "https://download.eclipse.org/capella/addons/basicperfo/updates/releases/5.0.0/",
-        "installAddon": "https://wiki.eclipse.org/Capella/Extensions/Installation_Guide#Installation_Procedures"
+        "installAddon": "https://github.com/eclipse/capella/blob/master/doc/plugins/org.polarsys.capella.ui.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.mediawiki#Configuration_and_Extensibility"
       }
     },
     { "name":"Capella-TASTE-Plugin",
diff --git a/json/resources.json b/json/resources.json
index 88ee53d..6d18ef7 100644
--- a/json/resources.json
+++ b/json/resources.json
@@ -1759,7 +1759,7 @@
                 "topic_order": "99",
                 "type": "Documentation",
                 "type_order": "99",
-                "link": "https://wiki.eclipse.org/Capella/Installation_Guide#Capella_Installation",
+                "link": "https://github.com/eclipse/capella/blob/master/doc/plugins/org.polarsys.capella.ui.doc/html/Installation Guide/How to install Capella and Addons.mediawiki#table-of-contents",
                 "thumb": ""
             },
             {