diff --git a/application/controllers/Components.php b/application/controllers/Components.php
index 7fc0e27a..94fdd0f9 100644
--- a/application/controllers/Components.php
+++ b/application/controllers/Components.php
@@ -15,7 +15,7 @@ class Components extends CI_Controller {
 
     public function index() {
         $this->load->model('stations');
-        $url = 'https://oscarwatch.org/scripts/hamsat_json.php';
+        $url = 'https://hams.at/api/alerts/upcoming';
         $json = file_get_contents($url);
         $data['rovedata'] = json_decode($json, true);
         $data['gridsquare'] = strtoupper($this->stations->find_gridsquare());
diff --git a/application/views/components/hamsat/table.php b/application/views/components/hamsat/table.php
index 80dad90b..0a76fade 100644
--- a/application/views/components/hamsat/table.php
+++ b/application/views/components/hamsat/table.php
@@ -21,7 +21,7 @@
             </tr>
         </thead>
         <tbody>
-            <?php foreach ($rovedata as $rove) : ?>
+            <?php foreach ($rovedata['data'] as $rove) : ?>
                 <tr>
                     <td>
                         <?php
@@ -37,18 +37,18 @@
 
                         ?>
 
-                        <?php $timestamp = strtotime($rove['date']);
+                        <?php $timestamp = strtotime($rove['aos_at']);
                            echo date($custom_date_format, $timestamp); ?>
 
                     </td>
                     <td>
-                        <?php echo $rove['start_time']." - ".$rove['end_time']; ?>
+                        <?php echo date("H:i:s", $timestamp)." - ".date("H:i:s", strtotime($rove['los_at'])); ?>
                     </td>
                     <td>
                         <?php
                         $CI = &get_instance();
-			$CI->load->model('logbooks_model');
-			$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
+                        $CI->load->model('logbooks_model');
+                        $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
                         $CI->load->model('logbook_model');
                         $call_worked = $CI->logbook_model->check_if_callsign_worked_in_logbook($rove['callsign'], $logbooks_locations_array, "SAT");
                         if ($call_worked != 0) {
@@ -60,48 +60,54 @@
                     </td>
                     <td>
                         <?php
-                        echo xss_clean($rove['comment']);
+                        echo xss_clean($rove['comment'] ?? '-');
                         ?>
                     </td>
-                    <td><span data-bs-toggle="tooltip" title="<?php echo $rove['frequency']; ?> - <?php echo $rove['mode']; ?>"><?= $rove['satellite'] ?></span></td>
+                    <?php
+                       $direction = '';
+                       if ($rove['mhz_direction'] == 'up') {
+                          $direction = '&uarr;';
+                       } else if ($rove['mhz_direction'] == 'down') {
+                          $direction = '&darr;';
+                       }
+                       $modeclass = '';
+                       if ($rove['mode'] == 'SSB' || $rove['mode'] == 'CW') {
+                          $modeclass = 'hamsatBgLin';
+                       } else if ($rove['mode'] == 'Data') {
+                          $modeclass = 'hamsatBgData';
+                       } else if ($rove['mode'] == 'FM') {
+                          $modeclass = 'hamsatBgFm';
+                       }
+
+                    ?>
+                    <td><span data-bs-toggle="tooltip" title="<?php if ($rove['mhz'] != '') { printf("%.3f", $rove['mhz']); echo " ".$direction ?? ''; } ?>"><?= $rove['satellite']['name'] ?></span> <span title="<?php echo $rove['mode']; ?>" class="badge <?php echo $modeclass; ?>"><?php echo $rove['mode']; ?></span></td>
                     <td>
 
 
                         <?php
-
                         // Load the logbook model and call check_if_grid_worked_in_logbook
-                        if (strpos($rove['gridsquare'], '/') !== false) {
-                           $grids = explode('/', $rove['gridsquare']);
-                           foreach ($grids as $grid) {
-                           $worked = $CI->logbook_model->check_if_grid_worked_in_logbook($grid, null, "SAT");
-                              if ($worked != 0) {
-                                  echo " <span data-bs-toggle=\"tooltip\" title=\"Worked\" class=\"badge bg-success\">" . $grid . "</span>";
-                              } else {
-                                  echo " <span data-bs-toggle=\"tooltip\" title=\"Not Worked\" class=\"badge bg-danger\">" . $grid . "</span>";
-                              }
-                           }
-                        } else {
-                           $worked = $CI->logbook_model->check_if_grid_worked_in_logbook($rove['gridsquare'], null, "SAT");
+                        foreach ($rove['grids'] as $grid) {
+                        $worked = $CI->logbook_model->check_if_grid_worked_in_logbook($grid, null, "SAT");
                            if ($worked != 0) {
-                               echo " <span data-bs-toggle=\"tooltip\" title=\"Worked\" class=\"badge bg-success\">" . $rove['gridsquare'] . "</span>";
+                               echo " <span data-bs-toggle=\"tooltip\" title=\"Worked\" class=\"badge bg-success\">" . $grid . "</span>";
                            } else {
-                               echo " <span data-bs-toggle=\"tooltip\" title=\"Not Worked\" class=\"badge bg-danger\">" . $rove['gridsquare'] . "</span>";
+                               echo " <span data-bs-toggle=\"tooltip\" title=\"Not Worked\" class=\"badge bg-danger\">" . $grid . "</span>";
                            }
                         }
                         ?>
 
 
                     </td>
-                    <td><a href="<?php echo $rove['track_link']; ?>" target="_blank">Track</a></td>
+                    <td><a href="<?php echo $rove['url']; ?>" target="_blank">Track</a></td>
                     <?php
-                        $sat = $rove['satellite'];
-                        switch (strtoupper($rove['satellite'])) {
+                        $sat = $rove['satellite']['name'];
+                        switch (strtoupper($rove['satellite']['name'])) {
                         case "GREENCUBE":
                            $sat = 'IO-117';
                            break;
                         }
                     ?>
-                    <td><a href="https://sat.fg8oj.com/sked.php?s%5B%5D=<?php echo $sat; ?>&l=<?php echo strtoupper($gridsquare); ?>&el1=0&l2=<?php echo $rove['gridsquare']; ?>&el2=0&duration=1&start=0&OK=Search" target="_blank">Sked</a></td>
+                    <td><a href="https://sat.fg8oj.com/sked.php?s%5B%5D=<?php echo $sat; ?>&l=<?php echo strtoupper($gridsquare); ?>&el1=0&l2=<?php echo $rove['grids'][0]; ?>&el2=0&duration=1&start=0&OK=Search" target="_blank">Sked</a></td>
                 </tr>
             <?php endforeach; ?>
         </tbody>
diff --git a/assets/css/default/overrides.css b/assets/css/default/overrides.css
index 943d0165..ae07e3e7 100644
--- a/assets/css/default/overrides.css
+++ b/assets/css/default/overrides.css
@@ -60,4 +60,4 @@ thead > tr > td {
 
 .dxccsummaryheader:after {
 	background-image: linear-gradient(to right, black 0, black 12ch, black 12ch, black 100%);
-}
\ No newline at end of file
+}
diff --git a/assets/css/general.css b/assets/css/general.css
index 1443a1e8..4f17f87b 100644
--- a/assets/css/general.css
+++ b/assets/css/general.css
@@ -767,4 +767,19 @@ label {
 
 .dxccsummaryheaderopened:after {
 	content: "\2796"; /* Unicode character for "minus" sign (-) */
-}
\ No newline at end of file
+}
+
+.hamsatBgLin {
+	background-color: rgb(224 242 254) !important;
+	--bs-badge-color: rgb(2 132 199) !important;
+}
+
+.hamsatBgData {
+	background-color: rgb(250 232 255) !important;
+	--bs-badge-color: rgb(192 38 211) !important;
+}
+
+.hamsatBgFm {
+	background-color: rgb(254 243 199) !important;
+	--bs-badge-color: rgb(217 119 6) !important;
+}