diff --git a/extensions/odoo_theme/layout_templates/homepage.html b/extensions/odoo_theme/layout_templates/homepage.html
index 22bc0f63d..4eb63c5a3 100644
--- a/extensions/odoo_theme/layout_templates/homepage.html
+++ b/extensions/odoo_theme/layout_templates/homepage.html
@@ -1,73 +1,88 @@
 <div id="o_content">
+    <!-- TODO EDI update classes and icons -->
     <div class="row">
         <div class="col-12 col-md-4">
-            <h2 class="text-center o_title_start">Getting Started</h2>
+            <h2 class="text-center o_title_start">Applications</h2>
             <ul class="list-unstyled">
                 <li>
-                    <a href="" class="stretched-link">Overview of Odoo</a>
+                    <a href="{{ pathto('applications/finance/accounting/overview/main_concepts/intro') }}" class="stretched-link">
+                        Introduction to Odoo Accounting
+                    </a>
                     <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.</p>
                 </li>
                 <li>
-                    <a href="" class="stretched-link">Requirements</a>
+                    <a href="{{ pathto('applications/inventory_and_mrp/inventory/overview/concepts/double-entry') }}" class="stretched-link">
+                        Introduction to Inventory Management
+                    </a>
                     <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.</p>
                 </li>
                 <li>
-                    <a href="" class="stretched-link">New to Odoo – Where to start </a>
+                    <a href="{{ pathto('applications/general/base_import/import_faq') }}" class="stretched-link">Import data into Odoo
+                    </a>
                     <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.</p>
                 </li>
                 <li>
-                    <a href="" class="stretched-link">Version 14</a>
-                    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.</p>
-                </li>
-                <li>
-                    <a href="" class="stretched-link">History</a>
+                    <a href="{{ pathto('applications/productivity/discuss/email_servers') }}" class="stretched-link">
+                        Use my mail server to send and receive emails in Odoo
+                    </a>
                     <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.</p>
                 </li>
             </ul>
         </div>
         <div class="col-12 col-md-4">
-            <h2 class="text-center o_title_install">Installing Odoo</h2>
+            <h2 class="text-center o_title_install">Administration</h2>
             <ul class="list-unstyled">
                 <li>
-                    <a href="" class="stretched-link">Before you install</a>
+                    <a href=" {{ pathto('administration/install') }} " class="stretched-link">
+                        Installing Odoo
+                    </a>
                     <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.</p>
                 </li>
                 <li>
-                    <a href="{{ pathto('administration/install') }}" class="stretched-link">How to install</a>
+                    <a href="{{ pathto('administration/deployment/deploy') }}" class="stretched-link">
+                        Deploying Odoo
+                    </a>
                     <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.</p>
                 </li>
                 <li>
-                    <a href="{{ pathto('administration/deployment') }}" class="stretched-link">Deploying Odoo</a>
+                    <a href="{{ pathto('administration/update') }}" class="stretched-link">
+                        Updating Odoo
+                    </a>
                     <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.</p>
                 </li>
                 <li>
-                    <a href="{{ pathto('administration/db_management') }}" class="stretched-link">Database Management</a>
+                    <a href="{{ pathto('administration/odoo_sh/overview/introduction') }}" class="stretched-link">
+                        Introduction to Odoo.sh
+                    </a>
                     <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.</p>
                 </li>
             </ul>
         </div>
         <div class="col-12 col-md-4">
-            <h2 class="text-center o_title_basic">Basic Usage</h2>
+            <h2 class="text-center o_title_basic">Developer</h2>
             <ul class="list-unstyled">
                 <li>
-                    <a href="" class="stretched-link">Odoo in your own language</a>
+                    <a href="{{ pathto('developer/reference/orm') }}" class="stretched-link">
+                        ORM API
+                    </a>
                     <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.</p>
                 </li>
                 <li>
-                    <a href="" class="stretched-link">Add users and manage access rights</a>
+                    <a href="{{ pathto('developer/howtos/backend') }}" class="stretched-link">
+                        Building a Module
+                    </a>
                     <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.</p>
                 </li>
                 <li>
-                    <a href="" class="stretched-link">Import data to Odoo </a>
-                    <p>The button is under "Favorites" ... Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-                        eiusmod tempo.</p>
-                </li>
-                <li>
-                    <a href="" class="stretched-link">Get support</a>
+                    <a href="{{ pathto('developer/webservices/odoo') }}" class="stretched-link">
+                        External API
+                    </a>
                     <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.</p>
                 </li>
                 <li>
-                    <a href="" class="stretched-link">History</a>
+                    <a href="{{ pathto('developer/reference/cmdline') }}" class="stretched-link">
+                        Command-line interface
+                    </a>
                     <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.</p>
                 </li>
             </ul>
@@ -75,43 +90,35 @@
     </div>
     <div class="row">
         <div class="col-12 col-md-4">
-            <h2 class="text-center o_title_tutorial">Tutorials</h2>
+            <h2 class="text-center o_title_tutorial">Services</h2>
             <ul class="list-unstyled">
                 <li>
-                    <a href="{{ pathto('developer/howtos/website') }}" class="stretched-link">Building a website</a>
+                    <a href="{{ pathto('services/support/where_can_i_get_support') }}" class="stretched-link">
+                        Where to find help?
+                    </a>
                     <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.</p>
                 </li>
                 <li>
-                    <a href="{{ pathto('developer/howtos/backend') }}" class="stretched-link">Building a module</a>
+                    <a href="{{ pathto('services/support/supported_versions') }}" class="stretched-link">
+                        Supported versions
+                    </a>
                     <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.</p>
                 </li>
                 <li>
-                    <a href="{{ pathto('developer/howtos/web') }}" class="stretched-link">Customizing the web client</a>
+                    <a href="{{ pathto('legal') }}" class="stretched-link">
+                        Legal
+                    </a>
                     <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.</p>
                 </li>
             </ul>
         </div>
         <div class="col-12 col-md-4">
-            <h2 class="text-center o_title_advanced">Advanced Usage</h2>
+            <h2 class="text-center o_title_advanced">Contributing</h2>
             <ul class="list-unstyled">
                 <li>
-                    <a href="" class="stretched-link">External API</a>
-                    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.</p>
-                </li>
-                <li>
-                    <a href="" class="stretched-link">In-app purchases</a>
-                    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.</p>
-                </li>
-                <li>
-                    <a href="" class="stretched-link">Creating a localisation</a>
-                    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.</p>
-                </li>
-                <li>
-                    <a href="" class="stretched-link">Database upgrade</a>
-                    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.</p>
-                </li>
-                <li>
-                    <a href="" class="stretched-link">Odoo email gateway</a>
+                    <a href="{{ pathto('contributing/documentation/introduction_guide') }}" class="stretched-link">
+                        Introduction guide
+                    </a>
                     <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.</p>
                 </li>
             </ul>