diff --git a/php/controller.php b/php/controller.php
index 8732f34f..6ab89e1a 100755
--- a/php/controller.php
+++ b/php/controller.php
@@ -16,7 +16,7 @@
                   <li><a class="waves-effect green" title="Remote control a Zöff player" href="remote">Remote</a></li>
                   <li><a class="modal-trigger waves-effect waves-orange" onclick="$('#about').openModal()">About</a></li>
                   <li><a class="modal-trigger waves-effect waves-yellow" onclick="$('#legal').openModal()">Legal</a></li>
-                  <li><a class="waves-effect waves-purple" href="https://github.com/nixolas1/Zoff">GitHub</a></li>
+                  <li><a class="waves-effect waves-purple" href="https://github.com/zoff-music/Zoff">GitHub</a></li>
                 </ul>
             </div>
         </nav>
@@ -40,7 +40,7 @@
                 <h4>About</h4>
                 <p>Zöff is a shared (free) YouTube based radio service, built upon the YouTube API. <br><br>
                 Zöff is mainly a webbased service, but an <a href="https://play.google.com/store/apps/details?id=no.lqasse.zoff&amp;hl=en">Android app</a> is made by Lasse Drevland, which has been a huge asset for the dev. team.<br><br>
-                The website uses <a href="https://nodejs.org/">NodeJS</a> with <a href="http://socket.io/">Socket.IO</a>, <a href="https://www.mongodb.org/">MongoDB</a> and PHP on the backend, with JavaScript, jQuery and <a href="http://materializecss.com/">Materialize</a> on the frontend. More about the project itself can be found on <a href="https://github.com/nixolas1/Zoff">GitHub</a><br><br>
+                The website uses <a href="https://nodejs.org/">NodeJS</a> with <a href="http://socket.io/">Socket.IO</a>, <a href="https://www.mongodb.org/">MongoDB</a> and PHP on the backend, with JavaScript, jQuery and <a href="http://materializecss.com/">Materialize</a> on the frontend. More about the project itself can be found on <a href="https://github.com/zoff-music/Zoff">GitHub</a><br><br>
                 The team consists of Kasper Rynning-Tønnesen and Nicolas Almagro Tonne, and the project has been worked on since late 2014.<br><br>
                 The team can be reached on <a href="mailto:contact@zoff.no?Subject=Contact%20Zoff">contact@zoff.no</a>
                 </p>
diff --git a/php/footer.php b/php/footer.php
index 3cf31768..9fc3c02c 100755
--- a/php/footer.php
+++ b/php/footer.php
@@ -19,7 +19,7 @@
                         <!--<a href="https://play.google.com/store/apps/details?id=no.lqasse.zoff">
                             <img title="Get it on Google Play" src="/static/images/google_play.png">
                         </a>-->
-                        <a href="https://github.com/nixolas1/Zoff">
+                        <a href="https://github.com/zoff-music/Zoff">
                             <img title="Contribute on GitHub" src="/static/images/GitHub_Logo.png" alt="GitHub" />
                         </a>
                         <p>
diff --git a/php/header.php b/php/header.php
index 1ed11b68..bfa29fed 100755
--- a/php/header.php
+++ b/php/header.php
@@ -1,7 +1,7 @@
 
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 |    Zöff                                                         |
-|    Project is on github: https://github.com/nixolas1/Zoff       |
+|    Project is on github: https://github.com/zoff-music/Zoff       |
 |    Made by: Nicolas Almagro Tonne and Kasper Rynning-Tønnesen   |
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
diff --git a/php/nochan.php b/php/nochan.php
index 933e478b..7a3b3c21 100755
--- a/php/nochan.php
+++ b/php/nochan.php
@@ -22,7 +22,7 @@ if(isset($_GET['chan'])){
                     <li><a class="waves-effect green" title="Remote control a Zöff player" href="remote">Remote</a></li>
                     <li><a class="modal-trigger waves-effect waves-orange" onclick="$('#about').openModal()">About</a></li>
                     <li><a class="modal-trigger waves-effect waves-yellow" onclick="$('#legal').openModal()">Legal</a></li>
-                    <li><a class="waves-effect waves-purple" href="https://github.com/nixolas1/Zoff">GitHub</a></li>
+                    <li><a class="waves-effect waves-purple" href="https://github.com/zoff-music/Zoff">GitHub</a></li>
                 </ul>
             </div>
         </nav>
@@ -46,7 +46,7 @@ if(isset($_GET['chan'])){
                 <h4>About</h4>
                 <p>Zöff is a shared (free) YouTube based radio service, built upon the YouTube API. <br><br>
                 Zöff is mainly a webbased service, but an <a href="https://play.google.com/store/apps/details?id=no.lqasse.zoff&amp;hl=en">Android app</a> is made by Lasse Drevland, which has been a huge asset for the dev. team.<br><br>
-                The website uses <a href="https://nodejs.org/">NodeJS</a> with <a href="http://socket.io/">Socket.IO</a>, <a href="https://www.mongodb.org/">MongoDB</a> and PHP on the backend, with JavaScript, jQuery and <a href="http://materializecss.com/">Materialize</a> on the frontend. More about the project itself can be found on <a href="https://github.com/nixolas1/Zoff">GitHub</a><br><br>
+                The website uses <a href="https://nodejs.org/">NodeJS</a> with <a href="http://socket.io/">Socket.IO</a>, <a href="https://www.mongodb.org/">MongoDB</a> and PHP on the backend, with JavaScript, jQuery and <a href="http://materializecss.com/">Materialize</a> on the frontend. More about the project itself can be found on <a href="https://github.com/zoff-music/Zoff">GitHub</a><br><br>
                 The team consists of Kasper Rynning-Tønnesen and Nicolas Almagro Tonne, and the project has been worked on since late 2014.<br><br>
                 The team can be reached on <a href="mailto:contact@zoff.no?Subject=Contact%20Zoff">contact@zoff.no</a><br><br>
                 </p>
@@ -134,7 +134,7 @@ if(isset($_GET['chan'])){
                           <!--<a href="https://play.google.com/store/apps/details?id=no.lqasse.zoff">
                               <img title="Get it on Google Play" src="static/images/google_play.png">
                           </a>-->
-                          <a href="https://github.com/nixolas1/Zoff">
+                          <a href="https://github.com/zoff-music/Zoff">
                               <img title="Contribute on GitHub" src="static/images/GitHub_Logo.png" alt="GitHub" />
                           </a>
                           <p>