diff --git a/makebookmarks.pl b/makebookmarks.pl
index fb716d7f..dafb2af0 100755
--- a/makebookmarks.pl
+++ b/makebookmarks.pl
@@ -39,9 +39,14 @@
       if(lc($Mod) eq "rtty85")  { $Freq -= 1.0; }
       # Set NAVTEX/SITOR-B/DSC frequencies 1kHz lower than the left carrier
       if(lc($Mod) eq "sitorb")  { $Freq -= 1.0; }
+      if(lc($Mod) eq "navtex")  { $Freq -= 1.0; }
       if(lc($Mod) eq "dsc")     { $Freq -= 1.0; }
+      # Set BPSK frequencies 1000Hz lower than the carrier
+      if(lc($Mod) eq "bpsk31")  { $Freq -= 1.0; }
+      if(lc($Mod) eq "bpsk63")  { $Freq -= 1.0; }
       # Set CW frequencies 800Hz lower than the carrier
-      if(lc($Mod) eq "cw")      { $Freq -= 0.8; }
+      # This is now done at the client side!
+      #if(lc($Mod) eq "cw")      { $Freq -= 0.8; }
 
       printf("    {\n");
       printf("        \"name\" : \"%s\",\n", $Name);
diff --git a/owrx/eibi.py b/owrx/eibi.py
index d7a438de..83265a06 100644
--- a/owrx/eibi.py
+++ b/owrx/eibi.py
@@ -41,10 +41,12 @@ def _getCachedScheduleFile():
     @staticmethod
     def correctFreq(freq: int, mode: str) -> int:
         if mode == "cw":
-            return freq - 800
+            # This is now done on the client side
+            #return freq - 800
+            return freq
         elif mode == "fax":
             return freq - 1900
-        elif mode in ["cwdecoder", "rtty450", "rtty170", "rtty85", "sitorb", "dsc", "bpsk31", "bpsk63"]:
+        elif mode in ["cwdecoder", "rtty450", "rtty170", "rtty85", "sitorb", "navtex", "dsc", "bpsk31", "bpsk63"]:
             return freq - 1000
         else:
             return freq