diff --git a/build/_config.yml b/build/_config.yml
index 547db589e..120e33fd1 100644
--- a/build/_config.yml
+++ b/build/_config.yml
@@ -5,7 +5,7 @@ source: ./Content
 # Release date in the format of: YYYY-MM-DD
 release_date: "2016-11-16"
 ## The application virtual path
-baseurl:  "/5_4"
+baseurl:  "/5-4"
 navigation:
 ## List your directory names and order here, like this:
     start:
diff --git a/build/_config_angular.yml b/build/_config_angular.yml
index 3d8b3fc00..798690d7c 100644
--- a/build/_config_angular.yml
+++ b/build/_config_angular.yml
@@ -3,7 +3,7 @@ url: "https://docs.nativescript.org/angular"
 destination: ./angular
 
 ## The application virtual path
-baseurl:  "/5_4/angular"
+baseurl:  "/5-4/angular"
 
 ## The highlighting in the header
 nsselected: ""
diff --git a/build/_config_nativescript.yml b/build/_config_nativescript.yml
index 1972a2187..12243ea17 100644
--- a/build/_config_nativescript.yml
+++ b/build/_config_nativescript.yml
@@ -3,7 +3,7 @@ url: "https://docs.nativescript.org"
 destination: ./nativescript
 
 ## The application virtual path
-baseurl:  "/5_4"
+baseurl:  "/5-4"
 # Exclude files which should not be in the output
 exclude: [Gemfile,Gemfile.lock,README.md,node_modules,dist, ng-framework-modules, ui/ng-ui-widgets, ng-hardware-access, ui/professional-ui-components/ng-Gauge, ui/professional-ui-components/ng-DataForm, ui/professional-ui-components/ng-AutoCompleteTextView, ui/professional-ui-components/ng-Chart, ui/professional-ui-components/ng-Calendar, ui/professional-ui-components/ng-ListView, ui/professional-ui-components/ng-SideDrawer]
 ## The highlighting in the header
diff --git a/build/_config_vuejs.yml b/build/_config_vuejs.yml
index 60a99c3e1..a0e5cddc3 100644
--- a/build/_config_vuejs.yml
+++ b/build/_config_vuejs.yml
@@ -3,7 +3,7 @@ headerbaseurl: //www.nativescript.org
 url: "https://docs.nativescript.org/vuejs"
 destination: ./vuejs
 ## The application virtual path
-baseurl:  "/5_4/vuejs"
+baseurl:  "/5-4/vuejs"
 # Exclude files which should not be in the output
 exclude: [Gemfile,Gemfile.lock,README.md,node_modules,dist, code-samples]
 ## The highlighting in the header
diff --git a/build/_layouts/landing.html b/build/_layouts/landing.html
index 4f816e60d..99201ece1 100644
--- a/build/_layouts/landing.html
+++ b/build/_layouts/landing.html
@@ -139,49 +139,49 @@ <h4 class="card__title -allcaps">Sample Apps</h4>
                     <div class="start-links__category">
                         <h3 class="start-links__title">NativeScript & Angular</h3>
                         <ul>
-                            <li><a href="/5_4/angular/start/introduction">Getting Started</a></li>
-                            <li><a href="/5_4/angular/core-concepts/navigation">Core Concepts</a></li>
-                            <li><a href="/5_4/angular/ui/components">UI Widgets</a></li>
-                            <li><a href="/5_4/angular/ui/layouts/layouts">Layouts</a></li>
-                            <li><a href="/5_4/angular/app-and-screen-templates/app-templates">Application Templates</a></li>
-                            <li><a href="/5_4/angular/tooling/testing/testing">Tooling</a></li>
-                            <li><a href="/5_4/angular/code-sharing/intro">Code Sharing</a></li>
-                            <li><a href="/5_4/angular/ui/professional-ui-components/overview">NativeScript UI</a></li>
+                            <li><a href="/5-4/angular/start/introduction">Getting Started</a></li>
+                            <li><a href="/5-4/angular/core-concepts/navigation">Core Concepts</a></li>
+                            <li><a href="/5-4/angular/ui/components">UI Widgets</a></li>
+                            <li><a href="/5-4/angular/ui/layouts/layouts">Layouts</a></li>
+                            <li><a href="/5-4/angular/app-and-screen-templates/app-templates">Application Templates</a></li>
+                            <li><a href="/5-4/angular/tooling/testing/testing">Tooling</a></li>
+                            <li><a href="/5-4/angular/code-sharing/intro">Code Sharing</a></li>
+                            <li><a href="/5-4/angular/ui/professional-ui-components/overview">NativeScript UI</a></li>
                         </ul>
                     </div>
                     <div class="start-links__category">
                         <h3 class="start-links__title">NativeScript Core</h3>
                         <ul>
-                            <li><a href="/5_4/start/introduction">Getting Started</a></li>
-                            <li><a href="/5_4/core-concepts">Core Concepts</a></li>
-                            <li><a href="/5_4/ui/components">UI Widgets</a></li>
-                            <li><a href="/5_4/ui/layouts">Layouts</a></li>
-                            <li><a href="/5_4/app-and-screen-templates/app-templates">Application Templates</a></li>
-                            <li><a href="/5_4/tooling">Tooling</a></li>
-                            <li><a href="/5_4/ui/professional-ui-components/overview">NativeScript UI</a></li>
+                            <li><a href="/5-4/start/introduction">Getting Started</a></li>
+                            <li><a href="/5-4/core-concepts">Core Concepts</a></li>
+                            <li><a href="/5-4/ui/components">UI Widgets</a></li>
+                            <li><a href="/5-4/ui/layouts">Layouts</a></li>
+                            <li><a href="/5-4/app-and-screen-templates/app-templates">Application Templates</a></li>
+                            <li><a href="/5-4/tooling">Tooling</a></li>
+                            <li><a href="/5-4/ui/professional-ui-components/overview">NativeScript UI</a></li>
                         </ul>
                     </div>
                     <div class="start-links__category">
                         <h3 class="start-links__title">NativeScript & Vue.JS</h3>
                         <ul>
-                            <li><a href="/5_4/vuejs">Getting Started</a></li>
-                            <li><a href="/5_4/vuejs/ns-ui/getting-started">NativeScript UI</a></li>
+                            <li><a href="/5-4/vuejs">Getting Started</a></li>
+                            <li><a href="/5-4/vuejs/ns-ui/getting-started">NativeScript UI</a></li>
                         </ul>
                         <hr/>
                         <h3 class="start-links__title">NativeScript Sidekick</h3>
                         <ul>
-                            <li><a href="/5_4/sidekick/getting-started/overview">Getting Started</a></li>
+                            <li><a href="/5-4/sidekick/getting-started/overview">Getting Started</a></li>
                         </ul>
                         <hr/>
                         <h3 class="start-links__title">API Reference</h3>
                         <ul>
-                            <li><a href="/5_4/api-reference">Core Modules</a></li>
+                            <li><a href="/5-4/api-reference">Core Modules</a></li>
                         </ul>
                         <ul>
-                            <li><a href="/5_4/ng-api-reference">NativeScript Angular</a></li>
+                            <li><a href="/5-4/ng-api-reference">NativeScript Angular</a></li>
                         </ul>
                         <ul>
-                            <li><a href="/5_4/ns-ui-api-reference">NativeScript UI</a></li>
+                            <li><a href="/5-4/ns-ui-api-reference">NativeScript UI</a></li>
                         </ul>
                     </div>
                 </div>