1 files changed, 30 insertions, 1 deletions
diff --git a/Map/Presentation/Theme/NSFont+theme.swift b/Map/Presentation/Theme/NSFont+theme.swift
index 5d8d8dd..cd119f2 100644
--- a/Map/Presentation/Theme/NSFont+theme.swift
+++ b/Map/Presentation/Theme/NSFont+theme.swift
@@ -15,9 +15,38 @@
 import AppKit
 
 extension NSFont {
+
+  static func libertinus(size: CGFloat) -> NSFont {
+    return NSFont(name: "Libertinus Serif", size: size) ?? .systemFont(ofSize: size)
+  }
+
+  static func ronzino(size: CGFloat) -> NSFont {
+    return NSFont(name: "Ronzino", size: size) ?? .systemFont(ofSize: size)
+  }
+
   public struct Theme {
+
+    struct Body {
+      @MainActor static let regular = NSFont.ronzino(size: Dimensions.FontSize.body)
+      @MainActor static let emphasized = NSFont.ronzino(size: Dimensions.FontSize.body)
+    }
+
+    struct Title {
+      @MainActor static let emphasized = NSFont.libertinus(size: Dimensions.FontSize.title)
+    }
+
+    struct Caption {
+      @MainActor static let regular = NSFont.ronzino(size: Dimensions.FontSize.caption)
+      @MainActor static let emphasized = NSFont.ronzino(size: Dimensions.FontSize.caption)
+    }
+
+    struct SmallControl {
+      @MainActor static let regular = NSFont.ronzino(size: Dimensions.FontSize.smallControl)
+      @MainActor static let emphasized = NSFont.ronzino(size: Dimensions.FontSize.smallControl)
+    }
+
     struct Editor {
-      static var regular: NSFont {
+      @MainActor static var regular: NSFont {
         if UserDefaults.standard.bool(forKey: "useCustomEditorFont"),
           let customEditorFontName = UserDefaults.standard.string(forKey: "customEditorFontName"),
           !customEditorFontName.isEmpty