diff --git a/database/callsigns.db b/database/callsigns.db
index f8f89f3..9ab364d 100644
Binary files a/database/callsigns.db and b/database/callsigns.db differ
diff --git a/include/functions.php b/include/functions.php
index d91a180..cdc9614 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -184,40 +184,40 @@ function getEnabled ($mode, $mmdvmconfigs) {
 function showMode($mode, $mmdvmconfigs) {
    // shows if mode is enabled or not.
 ?>
-      <td><span class="label <?php
+      <td><span class="badge <?php
    if (getEnabled($mode, $mmdvmconfigs) == 1) {
       switch ($mode) {
          case "D-Star Network":
             if (getConfigItem("D-Star Network", "GatewayAddress", $mmdvmconfigs) == "localhost" || getConfigItem("D-Star Network", "GatewayAddress", $mmdvmconfigs) == "127.0.0.1") {
                if (isProcessRunning(IRCDDBGATEWAY)) {
-                  echo "label-success";
+                  echo "badge-success";
                } else {
-                  echo "label-danger\" title=\""._("ircddbgateway is down!");
+                  echo "badge-danger\" title=\""._("ircddbgateway is down!");
                }
             } else {
-               echo "label-default\" title=\""._("Remote gateway configured - not checked!");
+               echo "badge-default\" title=\""._("Remote gateway configured - not checked!");
             }
             break;
          case "System Fusion Network":
             if (getConfigItem("System Fusion Network", "GatewayAddress", $mmdvmconfigs) == "localhost" || getConfigItem("System Fusion Network", "GatewayAddress", $mmdvmconfigs) == "127.0.0.1") {
                if (isProcessRunning("YSFGateway")) {
-                  echo "label-success";
+                  echo "badge-success";
                } else {
-                  echo "label-danger\" title=\""._("YSFGateway is down!");
+                  echo "badge-danger\" title=\""._("YSFGateway is down!");
                }
             } else {
-               echo "label-default\" title=\""._("Remote gateway configured - not checked!");
+               echo "badge-default\" title=\""._("Remote gateway configured - not checked!");
             }
             break;
          default:
             if (isProcessRunning("MMDVMHost")) {
-               echo "label-success";
+               echo "badge-success";
             } else {
-               echo "label-danger\" title=\""._("MMDVMHost is down!");
+               echo "badge-danger\" title=\""._("MMDVMHost is down!");
             }
       }
    } else {
-      echo "label-default";
+      echo "badge-default";
     }
     ?>"><?php echo $mode ?></span></td>
 <?php
@@ -577,7 +577,7 @@ function getActualMode($metaLastHeard, $mmdvmconfigs) {
       $mode = "DMR";
    }
    if (defined("ENABLEXTDLOOKUP") && $listElem[7] == null || !defined("ENABLEXTDLOOKUP") && $listElem[6] == null) {
-      return "<span class=\"label label-danger\">".$mode."</span>";
+      return "<span class=\"badge badge-danger\">".$mode."</span>";
    } else {
       $now        =  new DateTime('NOW',new DateTimeZone(TIMEZONE));
       $hangtime   = getConfigItem("General", "ModeHang", $mmdvmconfigs);
@@ -596,7 +596,7 @@ function getActualMode($metaLastHeard, $mmdvmconfigs) {
       if ($now->format('U') > $timestamp->format('U')) {
          return _("idle");
       } else {
-         return "<span class=\"label label-warning\">".$mode."</span>";
+         return "<span class=\"badge badge-warning\">".$mode."</span>";
       }
    }
 }
diff --git a/include/repeaterinfo.php b/include/repeaterinfo.php
index e11d8ff..81866f9 100644
--- a/include/repeaterinfo.php
+++ b/include/repeaterinfo.php
@@ -87,9 +87,9 @@
       if (getEnabled("DMR Network", $mmdvmconfigs) == 1) {
          echo"<td>";
          if (getDMRMasterState()) {
-            echo "<span class=\"label label-success\" title=\"Master connected\">";
+            echo "<span class=\"badge badge-success\" title=\"Master connected\">";
          } else {
-            echo "<span class=\"label label-danger\" title=\"Master not connected\">";
+            echo "<span class=\"badge badge-danger\" title=\"Master not connected\">";
          }
          echo getConfigItem("DMR Network", "Address", $mmdvmconfigs);
          if (strlen(getDMRNetwork()) > 0 ) {
@@ -98,18 +98,18 @@
 ?>
          </span>
          </td>
-            <td><span class="label <?php
+            <td><span class="badge <?php
          if (getConfigItem("DMR Network", "Slot1", $mmdvmconfigs) == 1) {
-            echo 'label-success">'._("enabled");
+            echo 'badge-success">'._("enabled");
          } else {
-            echo 'label-default">'._("disabled");
+            echo 'badge-default">'._("disabled");
           }
     ?></span></td>
-            <td><span class="label <?php
+            <td><span class="badge <?php
          if (getConfigItem("DMR Network", "Slot2", $mmdvmconfigs) == 1) {
-            echo 'label-success">'._("enabled");
+            echo 'badge-success">'._("enabled");
          } else {
-            echo 'label-default">'._("disabled");
+            echo 'badge-default">'._("disabled");
           }
     ?></span></td>
 <?php
diff --git a/include/ysfgatewayinfo.php b/include/ysfgatewayinfo.php
index 011fba9..1da1c54 100644
--- a/include/ysfgatewayinfo.php
+++ b/include/ysfgatewayinfo.php
@@ -7,12 +7,12 @@
   <!-- Tabelle -->
   <table class="table">
     <tr>
-    <td><span class="label <?php
+    <td><span class="badge <?php
       if (isProcessRunning("YSFGateway")) {
-         echo "label-success";
+         echo "badge-success";
          ?>"><?php echo _("YSFGateway Process is running"); ?></span></td><?php
       } else {
-         echo "label-danger\" title=\"YSFGateway is down!";
+         echo "badge-danger\" title=\"YSFGateway is down!";
          ?>"><?php echo _("YSFGateway Process is down!"); ?></span></td><?php
       }
     ?>
diff --git a/scripts/log.php b/scripts/log.php
index bcbf950..8a85f8b 100644
--- a/scripts/log.php
+++ b/scripts/log.php
@@ -69,7 +69,7 @@ if (!isset($_SERVER['PHP_AUTH_USER']) && VIEWLOGUSER !== "" && VIEWLOGPW !== "")
 </div>
 <div class="panel panel-log">
    <div class="panel-heading">
-      <span class="label label-info"><?php echo _("Viewing log"); ?> <?php echo $fileName ?></span>
+      <span class="badge badge-info"><?php echo _("Viewing log"); ?> <?php echo $fileName ?></span>
    </div>
   <div class="table-responsive">
   <table id="log" class="table table-condensed table-striped table-hover">
diff --git a/txinfo.php b/txinfo.php
index d85083e..f7b2d86 100644
--- a/txinfo.php
+++ b/txinfo.php
@@ -32,7 +32,7 @@ foreach ($lastHeard as $listElem) {
          echo"<td nowrap>$listElem[4]</td>";
          echo"<td nowrap>$listElem[5]</td>";
          if ($listElem[6] == "RF"){
-            echo "<td nowrap><span class=\"label label-success\">RF</span></td>";
+            echo "<td nowrap><span class=\"badge badge-success\">RF</span></td>";
          }else{
             echo"<td nowrap>$listElem[6]</td>";
          }
@@ -46,7 +46,7 @@ foreach ($lastHeard as $listElem) {
          echo"<td nowrap>$listElem[3]</td>";
          echo"<td nowrap>$listElem[4]</td>";
          if ($listElem[5] == "RF"){
-            echo "<td nowrap><span class=\"label label-success\">RF</span></td>";
+            echo "<td nowrap><span class=\"badge badge-success\">RF</span></td>";
          }else{
             echo"<td nowrap>$listElem[5]</td>";
          }
diff --git a/version.php b/version.php
index 851c1f9..c447175 100644
--- a/version.php
+++ b/version.php
@@ -1,3 +1,3 @@
 <?php
-define("VERSION", "20171031-1 (".getGitVersion().")");
+define("VERSION", "20180211-1 (".getGitVersion().")");
 ?>