diff --git a/server/endpoints.js b/server/endpoints.js
index ab81677..c700ae6 100644
--- a/server/endpoints.js
+++ b/server/endpoints.js
@@ -62,7 +62,7 @@ router.get('/', (req, res) => {
             device: serverConfig.device,
             noPlugins,
             plugins: serverConfig.plugins,
-            fmlist_integration: serverConfig.fmlist_integration ? serverConfig.fmlist_integration : true,
+            fmlist_integration: typeof(serverConfig.extras?.fmlistIntegration) !== undefined ? serverConfig.extras.fmlistIntegration : true,
             bwSwitch: serverConfig.bwSwitch ? serverConfig.bwSwitch : false
         });
     }
diff --git a/server/server_config.js b/server/server_config.js
index 2553d94..b6cb5c4 100644
--- a/server/server_config.js
+++ b/server/server_config.js
@@ -46,8 +46,8 @@ let serverConfig = {
     adminPass: ""
   },
   extras: {
-    fmlist_integration: true,
-    fmlist_omid: "",
+    fmlistIntegration: true,
+    fmlistOmid: "",
   },
   plugins: [],
   device: 'tef',
diff --git a/web/index.ejs b/web/index.ejs
index c5eff3a..6736dd1 100644
--- a/web/index.ejs
+++ b/web/index.ejs
@@ -356,11 +356,11 @@
             
             <div class="form-group checkbox">
                 <input type="checkbox" tabindex="0"  id="extended-frequency-range" aria-label="Add decimals manually">
-                <label for="extended-frequency-range" class="tooltip" data-tooltip="Enabling this will allow you to enter the decimal point manually.<br>Useful for servers that use upconverters."><i class="fa-solid fa-toggle-off m-right-10"></i> Manual decimal entry</label>
+                <label for="extended-frequency-range" class="tooltip" data-tooltip="Enabling this will allow you to enter the decimal point manually.<br>Useful for servers that use upconverters."><i class="fa-solid fa-toggle-off m-right-10"></i> Manual decimals</label>
             </div>
             <div class="form-group checkbox">
                 <input type="checkbox" tabindex="0" id="ps-underscores" aria-label="Add underscores to RDS PS">
-                <label for="ps-underscores" class="tooltip" data-tooltip="Enabling this option replaces spaces in RDS PS with underscores."><i class="fa-solid fa-toggle-off m-right-10"></i> Underscores in RDS PS</label>
+                <label for="ps-underscores" class="tooltip" data-tooltip="Enabling this option replaces spaces in RDS PS with underscores."><i class="fa-solid fa-toggle-off m-right-10"></i> RDS PS Underscores</label>
             </div>
 
             <div class="form-group bottom-20 hide-desktop" style="float: none;">