diff --git a/_layouts/default.html b/_layouts/default.html
index 5ac6c6e..dafa41b 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -98,7 +98,7 @@ <h1>Mission Pinball Hardware</h1>
                         <a href="https://missionpinball.org">Software</a>
                     </li>
                     <li>
-                        <a href="https://missionpinball.org/about.html">About</a>
+                        <a href="https://missionpinball.org/latest/about/">About</a>
                     </li>
                 </ul>
                 <ul class="nav navbar-nav navbar-right">
diff --git a/index.html b/index.html
index 06789d5..01c5d53 100644
--- a/index.html
+++ b/index.html
@@ -70,19 +70,19 @@
                 <div class="panel panel-default">
                     <div class="panel-heading">
                         <a href=
-                        "https://docs.missionpinball.org/en/dev/physical_building/index.html">
+                        "https://missionpinball.org/latest/physical_building/">
                         Physical Machine Building</a>
                     </div>
                     <div class="panel-footer">
-                        <p>Furthermore, the <a href="https://docs.missionpinball.org/en/dev/">MPF documentation</a> contains
+                        <p>Furthermore, the <a href="https://missionpinball.org/">MPF documentation</a> contains
                         a section about
-                            <a href="https://docs.missionpinball.org/en/dev/physical_building/index.html">wiring, physical layout and more</a>
+                            <a href="https://missionpinball.org/latest/physical_building/">wiring, physical layout and more</a>
                         about building a machine.</p>
                         <p>If you are interested more about the software side of things head over to the
                         <a href="https://missionpinball.org/">MPF Website</a>.
                         We also cover how to use
-                            <a href="https://docs.missionpinball.org/en/dev/hardware/index.html">various hardware platforms and existing machines</a>
-                            and how to use <a href="https://docs.missionpinball.org/en/dev/mechs/index.html">all kinds of pinball mechs</a> with MPF.
+                            <a href="https://missionpinball.org/latest/hardware/">various hardware platforms and existing machines</a>
+                            and how to use <a href="https://missionpinball.org/latest/mechs/">all kinds of pinball mechs</a> with MPF.
                         </p>
                     </div>
                 </div>
@@ -94,7 +94,7 @@
         <div class="row">
             <div class="col-sm-4">
                 <a class="btn btn-success center-block" href=
-                "https://docs.missionpinball.org/en/latest/tutorial/"
+                "https://missionpinball.org/latest/tutorial/"
                 role="button">Start the Tutorial</a>
             </div>
             <div class="col-sm-4">
@@ -104,8 +104,7 @@
             </div>
             <div class="col-sm-4">
                 <a class="btn btn-info center-block" href=
-                "https://docs.missionpinball.org/" role="button">Read the
-                Docs</a>
+                "https://missionpinball.org/" role="button">Read the Docs</a>
             </div>
         </div>
     </div>