diff --git a/views/includes/nav.ejs b/views/includes/nav.ejs
index 95911b9..8327dec 100644
--- a/views/includes/nav.ejs
+++ b/views/includes/nav.ejs
@@ -39,7 +39,7 @@
               <a class="nav-link" href="/stats">Statistics</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="https://github.com/Starystars67/BeamMP">GitHub</a>
+              <a class="nav-link" href="https://github.com/BeamMP/BeamMP">GitHub</a>
             </li>
             <li class="nav-item">
               <a class="nav-link" href="https://www.patreon.com/BeamMP">Patreon</a>
@@ -56,7 +56,7 @@
             <a href="https://wiki.beammp.com">Docs</a>
             <a href="/servers">Servers</a>
             <a href="/stats">Statistics</a>
-            <a href="https://github.com/Starystars67/BeamMP">GitHub</a>
+            <a href="https://github.com/BeamMP/BeamMP">GitHub</a>
             <a href="https://www.patreon.com/BeamMP">Patreon</a>
           </div>
 
@@ -73,7 +73,7 @@
             </a>
           </li>
           <li>
-            <a href="https://wiki.beamng-mp.com">
+            <a href="https://wiki.beammp.com">
               <span class="text">Docs</span>
             </a>
           </li>
@@ -88,7 +88,7 @@
             </a>
           </li>
           <li>
-            <a href="https://github.com/Starystars67/BeamNG-MP">
+            <a href="https://github.com/BeamMP/BeamMP">
               <span class="text">Github</span>
             </a>
           </li>
diff --git a/views/index.ejs b/views/index.ejs
index de94959..5bbfecd 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -112,9 +112,9 @@
                 <h3 id="faq-heading"> Does this work with pirated versions of BeamNG.drive?</h3>
                 <p>We don’t know if it works with pirated versions of BeamNG.drive, but we <b>will not</b> provide any support to non legit copies of the game. Nor will we change to support it.</p>
                 <h3 id="faq-heading">How do I host a server?</h3>
-                <p>The server files required for hosting your own server can be found at the top of this page below the client download. You will also require a authentication key which can be found from <a href="https://beammp.com/k/keys">keymaster</a>. Further information around the setup can be found on our <a href="https://wiki.beammp.com/en/home/Server_Mod">wiki</a>.</p>
+                <p>The server files required for hosting your own server can be found at the top of this page below the client download. You will also require a authentication key which can be found from <a href="https://beammp.com/k/keys">keymaster</a>. Further information around the setup can be found on our <a href="https://wiki.beammp.com/en/home/server-installation">wiki</a>.</p>
                 <h3 id="faq-heading">Can I use mods?</h3>
-                <p>Mods are supported, These are installed on the server. See our <a href="https://wiki.beammp.com/en/home/Server_Mod">wiki</a> for more infomation.</p>
+                <p>Mods are supported, These are installed on the server. See our <a href="https://wiki.beammp.com/en/home/server-installation">wiki</a> for more infomation.</p>
                 </div>
 				<!--Start of Tawk.to Script
 <script type="text/javascript">
@@ -138,7 +138,7 @@ End of Tawk.to Script-->
     <div class="container">
         <div class="row">
             <div class="col-6 col-sm-4 text-xs-center order-sm-2">
-                <a class="text-white" target="_blank" href="https://www.reddit.com/user/BeamNG-MP_Mod_Team">
+                <a class="text-white" target="_blank" href="https://www.reddit.com/r/BeamMP">
                     <i class="fab fa-reddit"></i>
                 </a>
 
@@ -146,14 +146,14 @@ End of Tawk.to Script-->
                     <i class="fab fa-twitter"></i>
                 </a>
 
-                <a class="text-white" target="_blank" href="https://www.facebook.com/BeamNGMP">
+                <a class="text-white" target="_blank" href="https://www.facebook.com/BeamMPTeam">
                     <i class="fab fa-facebook"></i>
                 </a>
             </div>
 
             <div class="col-6 justify-content-between col-sm-4 text-right text-xs-center order-sm-3">
 
-                <a class="text-white" target="_blank" href="https://github.com/Starystars67/BeamMP-docs">
+                <a class="text-white" target="_blank" href="https://github.com/BeamMP/BeamMP">
                     <i class="fab fa-github"></i>
                 </a>
 
@@ -169,7 +169,7 @@ End of Tawk.to Script-->
         </div>
         <div class="col-12 col-sm-4 text-center py-4 order-sm-2">
             <small class="text-white">© 2020 BeamMP Mod Team All Rights Reserved</small>
-            <small class="ml-1"><a href="https://forum.beamng-mp.com/topic/95/privacy-policy-v1-0" target="_blank">Privacy Policy</a></small>
+            <small class="ml-1"><a href="https://forum.beammp.com/t/privacy-policy/6" target="_blank">Privacy Policy</a></small>
 
         </div>
     </div>
@@ -179,7 +179,7 @@ End of Tawk.to Script-->
 <ul class="list-inline">
 
 <li class="col-xs-4 list-inline-item h3" data-toggle="tooltip" data-placement="top" title="" aria-label="Reddit" data-original-title="Reddit">
-<a class="text-white" target="_blank" href="https://www.reddit.com/user/BeamNG-MP_Mod_Team">
+<a class="text-white" target="_blank" href="https://www.reddit.com/r/BeamMP">
 <i class="fab fa-reddit"></i>
 </a>
 </li>
@@ -191,7 +191,7 @@ End of Tawk.to Script-->
 </li>
 
 <li class="col-xs-4 list-inline-item h3" data-toggle="tooltip" data-placement="top" title="" aria-label="Facebook" data-original-title="Facebook">
-<a class="text-white" target="_blank" href="https://www.facebook.com/BeamNGMP">
+<a class="text-white" target="_blank" href="https://www.facebook.com/BeamMPTeam">
 <i class="fab fa-facebook"></i>
 </a>
 </li>