diff --git a/style.json b/style.json
index 840aaa91..2536550a 100644
--- a/style.json
+++ b/style.json
@@ -28,7 +28,7 @@
     }
   },
   "sprite": "https://openmaptiles.github.io/osm-bright-gl-style/sprite",
-  "glyphs": "https://api.maptiler.com/fonts/{fontstack}/{range}.pbf?key={key}",
+  "glyphs": "https://fonts.openmaptiles.org/{fontstack}/{range}.pbf",
   "layers": [
     {
       "id": "background",
@@ -1730,7 +1730,7 @@
         "symbol-placement": "line",
         "symbol-spacing": 350,
         "text-field": "{name:latin} {name:nonlatin}",
-        "text-font": ["Noto Sans Italic"],
+        "text-font": ["Klokantech Noto Sans Italic"],
         "text-letter-spacing": 0.2,
         "text-max-width": 5,
         "text-rotation-alignment": "map",
@@ -1752,7 +1752,7 @@
         "symbol-placement": "line",
         "symbol-spacing": 350,
         "text-field": "{name:latin}\n{name:nonlatin}",
-        "text-font": ["Noto Sans Italic"],
+        "text-font": ["Klokantech Noto Sans Italic"],
         "text-letter-spacing": 0.2,
         "text-max-width": 5,
         "text-rotation-alignment": "map",
@@ -1774,7 +1774,7 @@
         "symbol-placement": "point",
         "symbol-spacing": 350,
         "text-field": "{name:latin}",
-        "text-font": ["Noto Sans Italic"],
+        "text-font": ["Klokantech Noto Sans Italic"],
         "text-letter-spacing": 0.2,
         "text-max-width": 5,
         "text-rotation-alignment": "map",
@@ -1796,7 +1796,7 @@
         "symbol-placement": "point",
         "symbol-spacing": 350,
         "text-field": "{name:latin}\n{name:nonlatin}",
-        "text-font": ["Noto Sans Italic"],
+        "text-font": ["Klokantech Noto Sans Italic"],
         "text-letter-spacing": 0.2,
         "text-max-width": 5,
         "text-rotation-alignment": "map",
@@ -1889,7 +1889,7 @@
         "icon-image": "{class}_11",
         "text-anchor": "top",
         "text-field": "{name:latin}\n{name:nonlatin}",
-        "text-font": ["Noto Sans Regular"],
+        "text-font": ["Klokantech Noto Sans Regular"],
         "text-max-width": 9,
         "text-offset": [0, 0.6],
         "text-padding": 2,
@@ -1920,7 +1920,7 @@
         "icon-image": "{class}_11",
         "text-anchor": "top",
         "text-field": "{name:latin}\n{name:nonlatin}",
-        "text-font": ["Noto Sans Regular"],
+        "text-font": ["Klokantech Noto Sans Regular"],
         "text-max-width": 9,
         "text-offset": [0, 0.6],
         "text-padding": 2,
@@ -1951,7 +1951,7 @@
         "icon-image": "{class}_11",
         "text-anchor": "top",
         "text-field": "{name:latin}\n{name:nonlatin}",
-        "text-font": ["Noto Sans Regular"],
+        "text-font": ["Klokantech Noto Sans Regular"],
         "text-max-width": 9,
         "text-offset": [0, 0.6],
         "text-padding": 2,
@@ -1986,7 +1986,7 @@
         "text-allow-overlap": false,
         "text-anchor": "top",
         "text-field": "{name:latin}\n{name:nonlatin}",
-        "text-font": ["Noto Sans Regular"],
+        "text-font": ["Klokantech Noto Sans Regular"],
         "text-ignore-placement": false,
         "text-max-width": 9,
         "text-offset": [0, 0.6],
@@ -2011,7 +2011,7 @@
       "layout": {
         "symbol-placement": "line",
         "text-field": "{name:latin} {name:nonlatin}",
-        "text-font": ["Noto Sans Regular"],
+        "text-font": ["Klokantech Noto Sans Regular"],
         "text-rotation-alignment": "map",
         "text-size": {"base": 1, "stops": [[13, 12], [14, 13]]}
       },
@@ -2035,7 +2035,7 @@
       "layout": {
         "symbol-placement": "line",
         "text-field": "{name:latin} {name:nonlatin}",
-        "text-font": ["Noto Sans Regular"],
+        "text-font": ["Klokantech Noto Sans Regular"],
         "text-rotation-alignment": "map",
         "text-size": {"base": 1, "stops": [[13, 12], [14, 13]]}
       },
@@ -2055,7 +2055,7 @@
       "layout": {
         "symbol-placement": "line",
         "text-field": "{name:latin} {name:nonlatin}",
-        "text-font": ["Noto Sans Regular"],
+        "text-font": ["Klokantech Noto Sans Regular"],
         "text-rotation-alignment": "map",
         "text-size": {"base": 1, "stops": [[13, 12], [14, 13]]}
       },
@@ -2084,7 +2084,7 @@
         "symbol-placement": {"base": 1, "stops": [[10, "point"], [11, "line"]]},
         "symbol-spacing": 200,
         "text-field": "{ref}",
-        "text-font": ["Noto Sans Regular"],
+        "text-font": ["Klokantech Noto Sans Regular"],
         "text-rotation-alignment": "viewport",
         "text-size": 10
       },
@@ -2112,7 +2112,7 @@
         },
         "symbol-spacing": 200,
         "text-field": "{ref}",
-        "text-font": ["Noto Sans Regular"],
+        "text-font": ["Klokantech Noto Sans Regular"],
         "text-rotation-alignment": "viewport",
         "text-size": 10
       },
@@ -2137,7 +2137,7 @@
         "symbol-placement": {"base": 1, "stops": [[10, "point"], [11, "line"]]},
         "symbol-spacing": 200,
         "text-field": "{ref}",
-        "text-font": ["Noto Sans Regular"],
+        "text-font": ["Klokantech Noto Sans Regular"],
         "text-rotation-alignment": "viewport",
         "text-size": 10
       },
@@ -2155,7 +2155,7 @@
         "icon-size": 1,
         "text-anchor": "top",
         "text-field": "{name:latin}\n{name:nonlatin}",
-        "text-font": ["Noto Sans Regular"],
+        "text-font": ["Klokantech Noto Sans Regular"],
         "text-max-width": 9,
         "text-offset": [0, 0.6],
         "text-optional": true,
@@ -2188,7 +2188,7 @@
       ],
       "layout": {
         "text-field": "{name:latin}\n{name:nonlatin}",
-        "text-font": ["Noto Sans Bold"],
+        "text-font": ["Klokantech Noto Sans Bold"],
         "text-letter-spacing": 0.1,
         "text-max-width": 9,
         "text-size": {"base": 1.2, "stops": [[12, 10], [15, 14]]},
@@ -2210,7 +2210,7 @@
       "filter": ["==", "class", "village"],
       "layout": {
         "text-field": "{name:latin}\n{name:nonlatin}",
-        "text-font": ["Noto Sans Regular"],
+        "text-font": ["Klokantech Noto Sans Regular"],
         "text-max-width": 8,
         "text-size": {"base": 1.2, "stops": [[10, 12], [15, 22]]},
         "visibility": "visible"
@@ -2230,7 +2230,7 @@
       "filter": ["==", "class", "town"],
       "layout": {
         "text-field": "{name:latin}\n{name:nonlatin}",
-        "text-font": ["Noto Sans Regular"],
+        "text-font": ["Klokantech Noto Sans Regular"],
         "text-max-width": 8,
         "text-size": {"base": 1.2, "stops": [[10, 14], [15, 24]]},
         "visibility": "visible"
@@ -2250,7 +2250,7 @@
       "filter": ["all", ["!=", "capital", 2], ["==", "class", "city"]],
       "layout": {
         "text-field": "{name:latin}\n{name:nonlatin}",
-        "text-font": ["Noto Sans Regular"],
+        "text-font": ["Klokantech Noto Sans Regular"],
         "text-max-width": 8,
         "text-size": {"base": 1.2, "stops": [[7, 14], [11, 24]]},
         "visibility": "visible"
@@ -2273,7 +2273,7 @@
         "icon-size": 0.8,
         "text-anchor": "left",
         "text-field": "{name:latin}\n{name:nonlatin}",
-        "text-font": ["Noto Sans Regular"],
+        "text-font": ["Klokantech Noto Sans Regular"],
         "text-max-width": 8,
         "text-offset": [0.4, 0],
         "text-size": {"base": 1.2, "stops": [[7, 14], [11, 24]]},
@@ -2294,7 +2294,7 @@
       "filter": ["in", "class", "state"],
       "layout": {
         "text-field": "{name:latin}",
-        "text-font": ["Noto Sans Bold"],
+        "text-font": ["Klokantech Noto Sans Bold"],
         "text-letter-spacing": 0.1,
         "text-max-width": 9,
         "text-size": {"base": 1.2, "stops": [[12, 10], [15, 14]]},
@@ -2321,7 +2321,7 @@
       ],
       "layout": {
         "text-field": "{name:latin}",
-        "text-font": ["Noto Sans Italic"],
+        "text-font": ["Klokantech Noto Sans Italic"],
         "text-max-width": 6.25,
         "text-size": {"stops": [[3, 11], [7, 17]]},
         "text-transform": "uppercase",
@@ -2348,7 +2348,7 @@
       ],
       "layout": {
         "text-field": "{name:latin}",
-        "text-font": ["Noto Sans Bold"],
+        "text-font": ["Klokantech Noto Sans Bold"],
         "text-max-width": 6.25,
         "text-size": {"stops": [[3, 11], [7, 17]]},
         "text-transform": "uppercase",
@@ -2375,7 +2375,7 @@
       ],
       "layout": {
         "text-field": "{name:latin}",
-        "text-font": ["Noto Sans Bold"],
+        "text-font": ["Klokantech Noto Sans Bold"],
         "text-max-width": 6.25,
         "text-size": {"stops": [[2, 11], [5, 17]]},
         "text-transform": "uppercase",
@@ -2402,7 +2402,7 @@
       ],
       "layout": {
         "text-field": "{name:latin}",
-        "text-font": ["Noto Sans Bold"],
+        "text-font": ["Klokantech Noto Sans Bold"],
         "text-max-width": 6.25,
         "text-size": {"stops": [[1, 11], [4, 17]]},
         "text-transform": "uppercase",
@@ -2425,7 +2425,7 @@
       "filter": ["==", "class", "continent"],
       "layout": {
         "text-field": "{name:latin}",
-        "text-font": ["Noto Sans Bold"],
+        "text-font": ["Klokantech Noto Sans Bold"],
         "text-max-width": 6.25,
         "text-size": 14,
         "text-transform": "uppercase",