diff --git a/board.js b/board.js
index 34486d9..aa7c49c 100644
--- a/board.js
+++ b/board.js
@@ -282,7 +282,7 @@ module.exports = class Board {
     this.ctx.fillStyle = this.options.fg;
     this.ctx.textAlign = "center";
     this.ctx.textBaseline = "middle";
-    this.ctx.font = `${this.gridsize * 0.35}px ${this.options.font}`;
+    this.ctx.font = `${this.gridsize * 0.35}px ${this.options.borderFont}`;
 
     // Drawing x axis alphabetic labels
     let num = this.panX;
diff --git a/options.js b/options.js
index 0bc0b1e..7bee8a3 100644
--- a/options.js
+++ b/options.js
@@ -11,7 +11,8 @@ module.exports = class Options {
     this._gridOpacity = 0.5;
     this._edgeOpacity = 0.6;
     this._background = { image: null, offsetX: 0, offsetY: 0, zoom: 1 };
-    this._font = 'AzoSans';
+    this._tokenFont = 'AzoSans';
+    this._borderFont = 'AzoSansBold';
   }
 
   set view(value) {
@@ -62,7 +63,8 @@ module.exports = class Options {
           break;
 
         case 'f':
-          this._font = 'FleischWurst';
+          this._borderFont = 'FleischWurst';
+          this._tokenFont = 'FleischWurst';
           break;
 
         case 'h':
@@ -151,7 +153,11 @@ module.exports = class Options {
     return this._background;
   }
 
-  get font() {
-    return this._font;
+  get tokenFont() {
+    return this._tokenFont;
+  }
+  
+  get borderFont() {
+    return this._borderFont;
   }
 }
diff --git a/overlays/token/index.js b/overlays/token/index.js
index e41bf0e..5041f0f 100644
--- a/overlays/token/index.js
+++ b/overlays/token/index.js
@@ -90,7 +90,7 @@ module.exports = class TokenOverlay {
     opts.fontsize = opts.size * (8 / (opts.label.length + 4)) * 0.30;
     opts.fontcolor = this.pickTextColor(opts.color);
     opts.gridsize = this.options.cellSizePx;
-    opts.font = this.options.font;
+    opts.font = this.options.tokenFont;
 
     template(opts, ctx);
   }
diff --git a/test/integration/__image_snapshots__/image-snapshots-test-js-background-1-snap.png b/test/integration/__image_snapshots__/image-snapshots-test-js-background-1-snap.png
index 111b821..1af74b8 100644
Binary files a/test/integration/__image_snapshots__/image-snapshots-test-js-background-1-snap.png and b/test/integration/__image_snapshots__/image-snapshots-test-js-background-1-snap.png differ
diff --git a/test/integration/__image_snapshots__/image-snapshots-test-js-complex-multiple-features-1-1-snap.png b/test/integration/__image_snapshots__/image-snapshots-test-js-complex-multiple-features-1-1-snap.png
index 02b0cb8..2efca34 100644
Binary files a/test/integration/__image_snapshots__/image-snapshots-test-js-complex-multiple-features-1-1-snap.png and b/test/integration/__image_snapshots__/image-snapshots-test-js-complex-multiple-features-1-1-snap.png differ
diff --git a/test/integration/__image_snapshots__/image-snapshots-test-js-complex-multiple-features-2-1-snap.png b/test/integration/__image_snapshots__/image-snapshots-test-js-complex-multiple-features-2-1-snap.png
index 07a7812..01bbcf7 100644
Binary files a/test/integration/__image_snapshots__/image-snapshots-test-js-complex-multiple-features-2-1-snap.png and b/test/integration/__image_snapshots__/image-snapshots-test-js-complex-multiple-features-2-1-snap.png differ
diff --git a/test/integration/__image_snapshots__/image-snapshots-test-js-dotted-lines-pan-x-only-1-snap.png b/test/integration/__image_snapshots__/image-snapshots-test-js-dotted-lines-pan-x-only-1-snap.png
index f8c34be..d560528 100644
Binary files a/test/integration/__image_snapshots__/image-snapshots-test-js-dotted-lines-pan-x-only-1-snap.png and b/test/integration/__image_snapshots__/image-snapshots-test-js-dotted-lines-pan-x-only-1-snap.png differ
diff --git a/test/integration/__image_snapshots__/image-snapshots-test-js-dotted-lines-pan-x-only-to-the-end-1-snap.png b/test/integration/__image_snapshots__/image-snapshots-test-js-dotted-lines-pan-x-only-to-the-end-1-snap.png
index c212c5a..4e62162 100644
Binary files a/test/integration/__image_snapshots__/image-snapshots-test-js-dotted-lines-pan-x-only-to-the-end-1-snap.png and b/test/integration/__image_snapshots__/image-snapshots-test-js-dotted-lines-pan-x-only-to-the-end-1-snap.png differ
diff --git a/test/integration/__image_snapshots__/image-snapshots-test-js-dotted-lines-pan-y-only-1-snap.png b/test/integration/__image_snapshots__/image-snapshots-test-js-dotted-lines-pan-y-only-1-snap.png
index 216e074..338e1e5 100644
Binary files a/test/integration/__image_snapshots__/image-snapshots-test-js-dotted-lines-pan-y-only-1-snap.png and b/test/integration/__image_snapshots__/image-snapshots-test-js-dotted-lines-pan-y-only-1-snap.png differ
diff --git a/test/integration/__image_snapshots__/image-snapshots-test-js-dotted-lines-top-right-right-bottom-left-left-1-snap.png b/test/integration/__image_snapshots__/image-snapshots-test-js-dotted-lines-top-right-right-bottom-left-left-1-snap.png
index 91c25c4..892a7f0 100644
Binary files a/test/integration/__image_snapshots__/image-snapshots-test-js-dotted-lines-top-right-right-bottom-left-left-1-snap.png and b/test/integration/__image_snapshots__/image-snapshots-test-js-dotted-lines-top-right-right-bottom-left-left-1-snap.png differ
diff --git a/test/integration/__image_snapshots__/image-snapshots-test-js-dotted-lines-top-right-right-bottom-left-left-2-snap.png b/test/integration/__image_snapshots__/image-snapshots-test-js-dotted-lines-top-right-right-bottom-left-left-2-snap.png
index 91c25c4..892a7f0 100644
Binary files a/test/integration/__image_snapshots__/image-snapshots-test-js-dotted-lines-top-right-right-bottom-left-left-2-snap.png and b/test/integration/__image_snapshots__/image-snapshots-test-js-dotted-lines-top-right-right-bottom-left-left-2-snap.png differ
diff --git a/test/integration/__image_snapshots__/image-snapshots-test-js-dotted-lines-top-right-up-pan-bottom-left-left-pan-1-snap.png b/test/integration/__image_snapshots__/image-snapshots-test-js-dotted-lines-top-right-up-pan-bottom-left-left-pan-1-snap.png
index 00d1321..4d22c1a 100644
Binary files a/test/integration/__image_snapshots__/image-snapshots-test-js-dotted-lines-top-right-up-pan-bottom-left-left-pan-1-snap.png and b/test/integration/__image_snapshots__/image-snapshots-test-js-dotted-lines-top-right-up-pan-bottom-left-left-pan-1-snap.png differ
diff --git a/test/integration/__image_snapshots__/image-snapshots-test-js-edge-case-border-between-az-and-ba-1-snap.png b/test/integration/__image_snapshots__/image-snapshots-test-js-edge-case-border-between-az-and-ba-1-snap.png
index 6499a57..883a254 100644
Binary files a/test/integration/__image_snapshots__/image-snapshots-test-js-edge-case-border-between-az-and-ba-1-snap.png and b/test/integration/__image_snapshots__/image-snapshots-test-js-edge-case-border-between-az-and-ba-1-snap.png differ
diff --git a/test/integration/__image_snapshots__/image-snapshots-test-js-edge-case-border-between-z-and-aa-1-snap.png b/test/integration/__image_snapshots__/image-snapshots-test-js-edge-case-border-between-z-and-aa-1-snap.png
index b72ef07..175b136 100644
Binary files a/test/integration/__image_snapshots__/image-snapshots-test-js-edge-case-border-between-z-and-aa-1-snap.png and b/test/integration/__image_snapshots__/image-snapshots-test-js-edge-case-border-between-z-and-aa-1-snap.png differ
diff --git a/test/integration/__image_snapshots__/image-snapshots-test-js-edge-cases-effects-1-snap.png b/test/integration/__image_snapshots__/image-snapshots-test-js-edge-cases-effects-1-snap.png
index 8438b59..492fcbe 100644
Binary files a/test/integration/__image_snapshots__/image-snapshots-test-js-edge-cases-effects-1-snap.png and b/test/integration/__image_snapshots__/image-snapshots-test-js-edge-cases-effects-1-snap.png differ
diff --git a/test/integration/__image_snapshots__/image-snapshots-test-js-edge-cases-overlays-1-snap.png b/test/integration/__image_snapshots__/image-snapshots-test-js-edge-cases-overlays-1-snap.png
index 6cb1f7a..d8a81a6 100644
Binary files a/test/integration/__image_snapshots__/image-snapshots-test-js-edge-cases-overlays-1-snap.png and b/test/integration/__image_snapshots__/image-snapshots-test-js-edge-cases-overlays-1-snap.png differ
diff --git a/test/integration/__image_snapshots__/image-snapshots-test-js-edge-cases-walls-1-snap.png b/test/integration/__image_snapshots__/image-snapshots-test-js-edge-cases-walls-1-snap.png
index b060eea..0b7196d 100644
Binary files a/test/integration/__image_snapshots__/image-snapshots-test-js-edge-cases-walls-1-snap.png and b/test/integration/__image_snapshots__/image-snapshots-test-js-edge-cases-walls-1-snap.png differ
diff --git a/test/integration/__image_snapshots__/image-snapshots-test-js-effects-1-snap.png b/test/integration/__image_snapshots__/image-snapshots-test-js-effects-1-snap.png
index 16e8c39..068362a 100644
Binary files a/test/integration/__image_snapshots__/image-snapshots-test-js-effects-1-snap.png and b/test/integration/__image_snapshots__/image-snapshots-test-js-effects-1-snap.png differ
diff --git a/test/integration/__image_snapshots__/image-snapshots-test-js-overlays-1-snap.png b/test/integration/__image_snapshots__/image-snapshots-test-js-overlays-1-snap.png
index 61f75bf..acd1c33 100644
Binary files a/test/integration/__image_snapshots__/image-snapshots-test-js-overlays-1-snap.png and b/test/integration/__image_snapshots__/image-snapshots-test-js-overlays-1-snap.png differ
diff --git a/test/integration/__image_snapshots__/image-snapshots-test-js-settings-dark-mode-1-snap.png b/test/integration/__image_snapshots__/image-snapshots-test-js-settings-dark-mode-1-snap.png
index 104cd55..46d2ea8 100644
Binary files a/test/integration/__image_snapshots__/image-snapshots-test-js-settings-dark-mode-1-snap.png and b/test/integration/__image_snapshots__/image-snapshots-test-js-settings-dark-mode-1-snap.png differ
diff --git a/test/integration/__image_snapshots__/image-snapshots-test-js-settings-grid-transparency-half-1-snap.png b/test/integration/__image_snapshots__/image-snapshots-test-js-settings-grid-transparency-half-1-snap.png
index 2d2bf26..5fabc64 100644
Binary files a/test/integration/__image_snapshots__/image-snapshots-test-js-settings-grid-transparency-half-1-snap.png and b/test/integration/__image_snapshots__/image-snapshots-test-js-settings-grid-transparency-half-1-snap.png differ
diff --git a/test/integration/__image_snapshots__/image-snapshots-test-js-settings-grid-transparency-no-grid-1-snap.png b/test/integration/__image_snapshots__/image-snapshots-test-js-settings-grid-transparency-no-grid-1-snap.png
index 2a5cfc9..6e17a89 100644
Binary files a/test/integration/__image_snapshots__/image-snapshots-test-js-settings-grid-transparency-no-grid-1-snap.png and b/test/integration/__image_snapshots__/image-snapshots-test-js-settings-grid-transparency-no-grid-1-snap.png differ
diff --git a/test/integration/__image_snapshots__/image-snapshots-test-js-settings-zoom-2-1-snap.png b/test/integration/__image_snapshots__/image-snapshots-test-js-settings-zoom-2-1-snap.png
index 0d1ffd1..4819022 100644
Binary files a/test/integration/__image_snapshots__/image-snapshots-test-js-settings-zoom-2-1-snap.png and b/test/integration/__image_snapshots__/image-snapshots-test-js-settings-zoom-2-1-snap.png differ
diff --git a/test/integration/__image_snapshots__/image-snapshots-test-js-settings-zoom-3-1-snap.png b/test/integration/__image_snapshots__/image-snapshots-test-js-settings-zoom-3-1-snap.png
index cd5b702..9188f86 100644
Binary files a/test/integration/__image_snapshots__/image-snapshots-test-js-settings-zoom-3-1-snap.png and b/test/integration/__image_snapshots__/image-snapshots-test-js-settings-zoom-3-1-snap.png differ
diff --git a/test/integration/__image_snapshots__/image-snapshots-test-js-token-image-backgrounds-1-snap.png b/test/integration/__image_snapshots__/image-snapshots-test-js-token-image-backgrounds-1-snap.png
index 02c3f56..5ebdc12 100644
Binary files a/test/integration/__image_snapshots__/image-snapshots-test-js-token-image-backgrounds-1-snap.png and b/test/integration/__image_snapshots__/image-snapshots-test-js-token-image-backgrounds-1-snap.png differ
diff --git a/test/integration/__image_snapshots__/image-snapshots-test-js-tokens-1-snap.png b/test/integration/__image_snapshots__/image-snapshots-test-js-tokens-1-snap.png
index a99ece1..0377d79 100644
Binary files a/test/integration/__image_snapshots__/image-snapshots-test-js-tokens-1-snap.png and b/test/integration/__image_snapshots__/image-snapshots-test-js-tokens-1-snap.png differ
diff --git a/test/integration/__image_snapshots__/image-snapshots-test-js-walls-1-snap.png b/test/integration/__image_snapshots__/image-snapshots-test-js-walls-1-snap.png
index c9b3e7f..283111e 100644
Binary files a/test/integration/__image_snapshots__/image-snapshots-test-js-walls-1-snap.png and b/test/integration/__image_snapshots__/image-snapshots-test-js-walls-1-snap.png differ