diff --git a/include/repeaterinfo.php b/include/repeaterinfo.php
index 386fd99..629f74f 100644
--- a/include/repeaterinfo.php
+++ b/include/repeaterinfo.php
@@ -6,18 +6,38 @@
   <table class="table repeaterinfo">
     <tr>
       <th>Current Mode</th>
+<?php
+   if (getEnabled("D-Star", $mmdvmconfigs) == 1) {
+?>
       <th>D-Star linked to</th>
+<?php
+   }
+   if (getEnabled("System Fusion", $mmdvmconfigs) == 1) {
+?>
       <th>YSF linked to</th>
+<?php
+   }
+   if (getEnabled("DMR", $mmdvmconfigs) == 1) {
+?>
       <th>DMR TS1 last linked to</th>
       <th>DMR TS2 last linked to</th>
+<?php
+   }
+?>
     </tr>
 <?php
    echo"<tr>";
    echo"<td id=\"mode\">".getActualMode($lastHeard, $mmdvmconfigs)."</td>";
-   echo"<td>".getActualLink($reverseLogLinesMMDVM, "D-Star")."</td>";
-   echo"<td>".getYSFReflectorById(getActualLink($reverseLogLinesYSFGateway, "YSF"), $activeYSFReflectors)."</td>";
-   echo"<td>".getActualLink($reverseLogLinesMMDVM, "DMR Slot 1")."</td>";
-   echo"<td>".getActualLink($reverseLogLinesMMDVM, "DMR Slot 2")."/". getActualReflector($reverseLogLinesMMDVM, "DMR Slot 2") ."</td>";
+   if (getEnabled("D-Star", $mmdvmconfigs) == 1) {
+     echo"<td>".getActualLink($reverseLogLinesMMDVM, "D-Star")."</td>";
+   }
+   if (getEnabled("System Fusion", $mmdvmconfigs) == 1) {
+     echo"<td>".getYSFReflectorById(getActualLink($reverseLogLinesYSFGateway, "YSF"), $activeYSFReflectors)."</td>";
+   }
+   if (getEnabled("DMR", $mmdvmconfigs) == 1) {
+     echo"<td>".getActualLink($reverseLogLinesMMDVM, "DMR Slot 1")."</td>";
+     echo"<td>".getActualLink($reverseLogLinesMMDVM, "DMR Slot 2")."/". getActualReflector($reverseLogLinesMMDVM, "DMR Slot 2") ."</td>";
+   }
    echo"</tr>\n";
 ?>
     <tr>
diff --git a/version.php b/version.php
index 8fc8fba..e897ede 100644
--- a/version.php
+++ b/version.php
@@ -1,3 +1,3 @@
 <?php
-define("VERSION", "20170113-1");
+define("VERSION", "20170120-1");
 ?>