diff --git a/html/js/beneoverlay.js b/html/js/beneoverlay.js
index 186822e..3eaf587 100644
--- a/html/js/beneoverlay.js
+++ b/html/js/beneoverlay.js
@@ -57,12 +57,12 @@ function setSecondaryColor(element, val) {
 
 function setPrimaryFont(element, val) {
     let font_data = val.split(",");
-    element.find(".primary-font").css({"font-family": font_data[0], "font-size": font_data[1] + "pt"});
+    element.find(".primary-font").css({"font-family": '"' + font_data[0] + '"', "font-size": font_data[1] + "pt"});
 }
 
 function setSecondaryFont(element, val) {
     let font_data = val.split(",");
-    element.find(".secondary-font").css({"font-family": font_data[0], "font-size": font_data[1] + "pt"});
+    element.find(".secondary-font").css({"font-family": '"' + font_data[0] + '"', "font-size": font_data[1] + "pt"});
 }
 
 function attachToText(element, data_ref) {
diff --git a/html/js/landing/attitude.js b/html/js/landing/attitude.js
index 3977f4f..a853df5 100644
--- a/html/js/landing/attitude.js
+++ b/html/js/landing/attitude.js
@@ -25,8 +25,8 @@ function setupAttitude(data_refs) {
             "icon_size": data_refs["landing/attitude/icon_size"],
             "primary_color": data_refs["landing/attitude/primary_color"],
             "secondary_color": data_refs["landing/attitude/secondary_color"],
-            "primary_font": data_refs["landing/attitude/primary_font"],
-            "secondary_font": data_refs["landing/attitude/secondary_font"]
+            "primary_font": '"' + data_refs["landing/attitude/primary_font"] + '"',
+            "secondary_font": '"' + data_refs["landing/attitude/secondary_font"] + '"'
         },
         data_refs
     );
diff --git a/html/js/landing/rate.js b/html/js/landing/rate.js
index ac05e5b..5df6217 100644
--- a/html/js/landing/rate.js
+++ b/html/js/landing/rate.js
@@ -25,8 +25,8 @@ function setupRate(data_refs) {
             "icon_size": data_refs["landing/rate/icon_size"],
             "primary_color": data_refs["landing/rate/primary_color"],
             "secondary_color": data_refs["landing/rate/secondary_color"],
-            "primary_font": data_refs["landing/rate/primary_font"],
-            "secondary_font": data_refs["landing/rate/secondary_font"]
+            "primary_font": '"' + data_refs["landing/rate/primary_font"] + '"',
+            "secondary_font": '"' + data_refs["landing/rate/secondary_font"] + '"'
         },
         data_refs
     );
diff --git a/html/js/landing/speed.js b/html/js/landing/speed.js
index 1e0be94..4aab928 100644
--- a/html/js/landing/speed.js
+++ b/html/js/landing/speed.js
@@ -25,8 +25,8 @@ function setupSpeed(data_refs) {
             "icon_size": data_refs["landing/speed/icon_size"],
             "primary_color": data_refs["landing/speed/primary_color"],
             "secondary_color": data_refs["landing/speed/secondary_color"],
-            "primary_font": data_refs["landing/speed/primary_font"],
-            "secondary_font": data_refs["landing/speed/secondary_font"]
+            "primary_font": '"' + data_refs["landing/speed/primary_font"] + '"',
+            "secondary_font": '"' + data_refs["landing/speed/secondary_font"] + '"'
         },
         data_refs
     );
diff --git a/html/js/landing/title.js b/html/js/landing/title.js
index 2c5d358..29c3880 100644
--- a/html/js/landing/title.js
+++ b/html/js/landing/title.js
@@ -25,8 +25,8 @@ function setupTitle(data_refs) {
             "icon_size": data_refs["landing/title/icon_size"],
             "primary_color": data_refs["landing/title/primary_color"],
             "secondary_color": data_refs["landing/title/secondary_color"],
-            "primary_font": data_refs["landing/title/primary_font"],
-            "secondary_font": data_refs["landing/title/secondary_font"]
+            "primary_font": '"' + data_refs["landing/title/primary_font"] + '"',
+            "secondary_font": '"' + data_refs["landing/title/secondary_font"] + '"'
         },
         data_refs
     );
diff --git a/html/js/progress/progress.js b/html/js/progress/progress.js
index f66f1fc..2d5d341 100644
--- a/html/js/progress/progress.js
+++ b/html/js/progress/progress.js
@@ -25,8 +25,8 @@ function setupProgress(data_refs) {
             "icon_size": data_refs["progress/icon_size"],
             "primary_color": data_refs["progress/primary_color"],
             "secondary_color": data_refs["progress/secondary_color"],
-            "primary_font": data_refs["progress/primary_font"],
-            "secondary_font": data_refs["progress/secondary_font"]
+            "primary_font": '"' + data_refs["progress/primary_font"] + '"',
+            "secondary_font": '"' + data_refs["progress/secondary_font"] + '"'
         },
         data_refs
     );
diff --git a/html/js/widgets/altitude.js b/html/js/widgets/altitude.js
index adb9ccd..6d2f7e9 100644
--- a/html/js/widgets/altitude.js
+++ b/html/js/widgets/altitude.js
@@ -25,8 +25,8 @@ function setupAltitude(data_refs) {
             "icon_size": data_refs["widget/altitude/icon_size"],
             "primary_color": data_refs["widget/altitude/primary_color"],
             "secondary_color": data_refs["widget/altitude/secondary_color"],
-            "primary_font": data_refs["widget/altitude/primary_font"],
-            "secondary_font": data_refs["widget/altitude/secondary_font"]
+            "primary_font": '"' + data_refs["widget/altitude/primary_font"] + '"',
+            "secondary_font": '"' + data_refs["widget/altitude/secondary_font"] + '"'
         },
         data_refs
     );
diff --git a/html/js/widgets/callsign.js b/html/js/widgets/callsign.js
index dde805d..1a15bc3 100644
--- a/html/js/widgets/callsign.js
+++ b/html/js/widgets/callsign.js
@@ -25,8 +25,8 @@ function setupCallsign(data_refs) {
             "icon_size": data_refs["widget/callsign/icon_size"],
             "primary_color": data_refs["widget/callsign/primary_color"],
             "secondary_color": data_refs["widget/callsign/secondary_color"],
-            "primary_font": data_refs["widget/callsign/primary_font"],
-            "secondary_font": data_refs["widget/callsign/secondary_font"]
+            "primary_font": '"' + data_refs["widget/callsign/primary_font"] + '"',
+            "secondary_font": '"' + data_refs["widget/callsign/secondary_font"] + '"'
         },
         data_refs
     );
diff --git a/html/js/widgets/heading.js b/html/js/widgets/heading.js
index 4676680..1d99deb 100644
--- a/html/js/widgets/heading.js
+++ b/html/js/widgets/heading.js
@@ -25,8 +25,8 @@ function setupHeading(data_refs) {
             "icon_size": data_refs["widget/heading/icon_size"],
             "primary_color": data_refs["widget/heading/primary_color"],
             "secondary_color": data_refs["widget/heading/secondary_color"],
-            "primary_font": data_refs["widget/heading/primary_font"],
-            "secondary_font": data_refs["widget/heading/secondary_font"]
+            "primary_font": '"' + data_refs["widget/heading/primary_font"] + '"',
+            "secondary_font": '"' + data_refs["widget/heading/secondary_font"] + '"'
         },
         data_refs
     );
diff --git a/html/js/widgets/network.js b/html/js/widgets/network.js
index de872f5..7fd91c9 100644
--- a/html/js/widgets/network.js
+++ b/html/js/widgets/network.js
@@ -25,8 +25,8 @@ function setupNetwork(data_refs) {
             "icon_size": data_refs["widget/network/icon_size"],
             "primary_color": data_refs["widget/network/primary_color"],
             "secondary_color": data_refs["widget/network/secondary_color"],
-            "primary_font": data_refs["widget/network/primary_font"],
-            "secondary_font": data_refs["widget/network/secondary_font"]
+            "primary_font": '"' + data_refs["widget/network/primary_font"] + '"',
+            "secondary_font": '"' + data_refs["widget/network/secondary_font"] + '"'
         },
         data_refs
     );
diff --git a/html/js/widgets/performance.js b/html/js/widgets/performance.js
index 5b9c4ec..bdb87c8 100644
--- a/html/js/widgets/performance.js
+++ b/html/js/widgets/performance.js
@@ -25,8 +25,8 @@ function setupPerformance(data_refs) {
             "icon_size": data_refs["widget/performance/icon_size"],
             "primary_color": data_refs["widget/performance/primary_color"],
             "secondary_color": data_refs["widget/performance/secondary_color"],
-            "primary_font": data_refs["widget/performance/primary_font"],
-            "secondary_font": data_refs["widget/performance/secondary_font"]
+            "primary_font": '"' + data_refs["widget/performance/primary_font"] + '"',
+            "secondary_font": '"' + data_refs["widget/performance/secondary_font"] + '"'
         },
         data_refs
     );
diff --git a/html/js/widgets/speed.js b/html/js/widgets/speed.js
index 666e828..8fdcfbf 100644
--- a/html/js/widgets/speed.js
+++ b/html/js/widgets/speed.js
@@ -25,8 +25,8 @@ function setupSpeed(data_refs) {
             "icon_size": data_refs["widget/speed/icon_size"],
             "primary_color": data_refs["widget/speed/primary_color"],
             "secondary_color": data_refs["widget/speed/secondary_color"],
-            "primary_font": data_refs["widget/speed/primary_font"],
-            "secondary_font": data_refs["widget/speed/secondary_font"]
+            "primary_font": '"' + data_refs["widget/speed/primary_font"] + '"',
+            "secondary_font": '"' + data_refs["widget/speed/secondary_font"] + '"'
         },
         data_refs
     );
diff --git a/html/js/widgets/temperature.js b/html/js/widgets/temperature.js
index b487447..3ceaa63 100644
--- a/html/js/widgets/temperature.js
+++ b/html/js/widgets/temperature.js
@@ -25,8 +25,8 @@ function setupTemperature(data_refs) {
             "icon_size": data_refs["widget/temperature/icon_size"],
             "primary_color": data_refs["widget/temperature/primary_color"],
             "secondary_color": data_refs["widget/temperature/secondary_color"],
-            "primary_font": data_refs["widget/temperature/primary_font"],
-            "secondary_font": data_refs["widget/temperature/secondary_font"]
+            "primary_font": '"' + data_refs["widget/temperature/primary_font"] + '"',
+            "secondary_font": '"' + data_refs["widget/temperature/secondary_font"] + '"'
         },
         data_refs
     );
diff --git a/html/js/widgets/wind.js b/html/js/widgets/wind.js
index 070249b..832c0bc 100644
--- a/html/js/widgets/wind.js
+++ b/html/js/widgets/wind.js
@@ -25,8 +25,8 @@ function setupWind(data_refs) {
             "icon_size": data_refs["widget/wind/icon_size"],
             "primary_color": data_refs["widget/wind/primary_color"],
             "secondary_color": data_refs["widget/wind/secondary_color"],
-            "primary_font": data_refs["widget/wind/primary_font"],
-            "secondary_font": data_refs["widget/wind/secondary_font"]
+            "primary_font": '"' + data_refs["widget/wind/primary_font"] + '"',
+            "secondary_font": '"' + data_refs["widget/wind/secondary_font"] + '"'
         },
         data_refs
     );