diff --git a/Beat iOS/Localizable.strings b/Beat iOS/Localizable.strings
index b1ada51f..6c93f9ac 100644
--- a/Beat iOS/Localizable.strings	
+++ b/Beat iOS/Localizable.strings	
@@ -129,3 +129,16 @@
 
 "cards.addScene" = "Add New Scene Here";
 "cards.addScenePrompt" = "Heading For New Scene";
+
+/* Fonts (Settings) */
+"settings.customFonts" = "Fonts";
+"settings.screenplayFonts" = "Screenplay Fonts";
+"settings.customScreenplayFont" = "Choose Screenplay Font…";
+"settings.useDefaultScreenplayFont" = "Use Built-In Screenplay Font";
+"settings.novelFonts" = "Novel Fonts";
+"settings.customNovelFont" = "Choose Novel Font…";
+"settings.useDefaultNovelFont" = "Use Default Novel Font";
+"settings.useDefaultFonts" = "Use Default Fonts";
+"settings.notMonospaced.title" = "Not Monospaced";
+"settings.notMonospaced.message" = "This font isn't monospaced, so page counts may differ from the standard ~1 page per minute.";
+"general.OK" = "OK";
diff --git a/Beat iOS/User Interface Views/Settings/BeatSettingsControllers.swift b/Beat iOS/User Interface Views/Settings/BeatSettingsControllers.swift
index 221c1537..2215ed80 100644
--- a/Beat iOS/User Interface Views/Settings/BeatSettingsControllers.swift	
+++ b/Beat iOS/User Interface Views/Settings/BeatSettingsControllers.swift	
@@ -84,9 +84,12 @@ class BeatSettingsViewController:UITableViewController {
 	@IBOutlet weak var synopsisFontType:UIButton?
 	
 	@IBOutlet weak var fontStyleButton:UIButton?
-	
+
 	/// Font size switch is only available on iPhone
 	@IBOutlet var fontSizeSwitch:UISegmentedControl?
+
+	private var activeFontSettingKey:String?
+	private var activeFontRequiresMonospaced = false
 	
 	override func viewDidLoad() {
 		super.viewDidLoad()
@@ -113,6 +116,9 @@ class BeatSettingsViewController:UITableViewController {
 		if let fontStyleMenu = fontStyleButton?.menu, style < fontStyleMenu.children.count {
 			(fontStyleMenu.children[style] as? UICommand)?.state = .on
 		}
+
+		self.migrateLegacyCustomFonts()
+		self.setupCustomFontMenu()
 		
 		if let stylesheet = self.delegate?.styles.name,
 		   let availableStyles = stylesheetSwitch?.stylesheets.split(separator: ",") {
@@ -311,13 +317,146 @@ class BeatSettingsViewController:UITableViewController {
 		
 		// This is a little hacky. 0 = serif, 1 = sans serif, 2 = courier new
 		BeatUserDefaults.shared().save(style, forKey: BeatSettingFontStyle)
+		BeatUserDefaults.shared().save("", forKey: BeatSettingCustomScreenplayFont)
+		BeatUserDefaults.shared().save("", forKey: BeatSettingCustomScreenplayEditorFont)
+		BeatUserDefaults.shared().save("", forKey: BeatSettingCustomScreenplayExportFont)
+		BeatUserDefaults.shared().save("", forKey: BeatSettingCustomEditorFont)
+		BeatUserDefaults.shared().save("", forKey: BeatSettingCustomExportFont)
 		print("New font style:", style)
 
 
+		self.applyFontChange()
+	}
+
+	// MARK: Custom fonts
+
+	private func setupCustomFontMenu() {
+		guard let button = fontStyleButton else { return }
+		let existing = button.menu?.children ?? []
+
+		let screenplayCustomAction = UIAction(title: NSLocalizedString("settings.customScreenplayFont", comment: "")) { [weak self] _ in
+			self?.presentFontPicker(for: BeatSettingCustomScreenplayFont, requiresMonospaced: true)
+		}
+		let screenplayDefaultAction = UIAction(title: NSLocalizedString("settings.useDefaultScreenplayFont", comment: "")) { [weak self] _ in
+			BeatUserDefaults.shared().save("", forKey: BeatSettingCustomScreenplayFont)
+			BeatUserDefaults.shared().save("", forKey: BeatSettingCustomScreenplayEditorFont)
+			BeatUserDefaults.shared().save("", forKey: BeatSettingCustomScreenplayExportFont)
+			BeatUserDefaults.shared().save("", forKey: BeatSettingCustomEditorFont)
+			BeatUserDefaults.shared().save("", forKey: BeatSettingCustomExportFont)
+			self?.applyFontChange()
+		}
+		let novelCustomAction = UIAction(title: NSLocalizedString("settings.customNovelFont", comment: "")) { [weak self] _ in
+			self?.presentFontPicker(for: BeatSettingCustomNovelFont, requiresMonospaced: false)
+		}
+		let novelDefaultAction = UIAction(title: NSLocalizedString("settings.useDefaultNovelFont", comment: "")) { [weak self] _ in
+			BeatUserDefaults.shared().save("", forKey: BeatSettingCustomNovelFont)
+			BeatUserDefaults.shared().save("", forKey: BeatSettingCustomNovelEditorFont)
+			BeatUserDefaults.shared().save("", forKey: BeatSettingCustomNovelExportFont)
+			BeatUserDefaults.shared().save("", forKey: BeatSettingCustomEditorFont)
+			BeatUserDefaults.shared().save("", forKey: BeatSettingCustomExportFont)
+			self?.applyFontChange()
+		}
+		let resetAction = UIAction(title: NSLocalizedString("settings.useDefaultFonts", comment: "")) { [weak self] _ in
+			BeatUserDefaults.shared().save("", forKey: BeatSettingCustomEditorFont)
+			BeatUserDefaults.shared().save("", forKey: BeatSettingCustomExportFont)
+			BeatUserDefaults.shared().save("", forKey: BeatSettingCustomScreenplayFont)
+			BeatUserDefaults.shared().save("", forKey: BeatSettingCustomNovelFont)
+			BeatUserDefaults.shared().save("", forKey: BeatSettingCustomScreenplayEditorFont)
+			BeatUserDefaults.shared().save("", forKey: BeatSettingCustomScreenplayExportFont)
+			BeatUserDefaults.shared().save("", forKey: BeatSettingCustomNovelEditorFont)
+			BeatUserDefaults.shared().save("", forKey: BeatSettingCustomNovelExportFont)
+			self?.applyFontChange()
+		}
+
+		let screenplayMenu = UIMenu(title: NSLocalizedString("settings.screenplayFonts", comment: ""),
+									options: .displayInline,
+									children: [screenplayCustomAction, screenplayDefaultAction])
+		let novelMenu = UIMenu(title: NSLocalizedString("settings.novelFonts", comment: ""),
+							   options: .displayInline,
+							   children: [novelCustomAction, novelDefaultAction])
+		let resetMenu = UIMenu(title: "", options: .displayInline, children: [resetAction])
+		button.menu = UIMenu(children: existing + [screenplayMenu, novelMenu, resetMenu])
+	}
+
+	private func migrateLegacyCustomFonts() {
+		let defaults = BeatUserDefaults.shared()
+		var screenplayFont = defaults.get(BeatSettingCustomScreenplayFont) as? String ?? ""
+		var novelFont = defaults.get(BeatSettingCustomNovelFont) as? String ?? ""
+
+		if let editorFont = defaults.get(BeatSettingCustomEditorFont) as? String,
+		   !editorFont.isEmpty,
+		   screenplayFont.isEmpty,
+		   novelFont.isEmpty {
+			defaults.save(editorFont, forKey: BeatSettingCustomScreenplayFont)
+			defaults.save(editorFont, forKey: BeatSettingCustomNovelFont)
+			screenplayFont = editorFont
+			novelFont = editorFont
+		}
+
+		if let exportFont = defaults.get(BeatSettingCustomExportFont) as? String,
+		   !exportFont.isEmpty,
+		   screenplayFont.isEmpty,
+		   novelFont.isEmpty {
+			defaults.save(exportFont, forKey: BeatSettingCustomScreenplayFont)
+			defaults.save(exportFont, forKey: BeatSettingCustomNovelFont)
+		}
+
+		if screenplayFont.isEmpty,
+		   let legacyScreenplayFont = defaults.get(BeatSettingCustomScreenplayEditorFont) as? String,
+		   !legacyScreenplayFont.isEmpty {
+			defaults.save(legacyScreenplayFont, forKey: BeatSettingCustomScreenplayFont)
+		}
+		if novelFont.isEmpty,
+		   let legacyNovelFont = defaults.get(BeatSettingCustomNovelEditorFont) as? String,
+		   !legacyNovelFont.isEmpty {
+			defaults.save(legacyNovelFont, forKey: BeatSettingCustomNovelFont)
+		}
+	}
+
+	private func presentFontPicker(for settingKey:String, requiresMonospaced:Bool) {
+		self.activeFontSettingKey = settingKey
+		self.activeFontRequiresMonospaced = requiresMonospaced
+
+		let config = UIFontPickerViewController.Configuration()
+		config.includeFaces = true
+		let picker = UIFontPickerViewController(configuration: config)
+		picker.delegate = self
+		self.present(picker, animated: true)
+	}
+
+	fileprivate func applyFontChange() {
+		self.delegate?.reloadFonts()
 		self.delegate?.reloadStyles()
 		self.delegate?.formatting.formatAllLines()
+		self.delegate?.invalidatePreview()
+	}
+
+}
+
+extension BeatSettingsViewController:UIFontPickerViewControllerDelegate {
+	func fontPickerViewControllerDidPickFont(_ viewController: UIFontPickerViewController) {
+		viewController.dismiss(animated: true)
+
+		guard let key = self.activeFontSettingKey,
+			  let descriptor = viewController.selectedFontDescriptor
+		else { return }
+
+		let font = UIFont(descriptor: descriptor, size: 12.0)
+		BeatUserDefaults.shared().save(font.fontName, forKey: key)
+		self.applyFontChange()
+
+		if self.activeFontRequiresMonospaced && !font.fontDescriptor.symbolicTraits.contains(.traitMonoSpace) {
+			let alert = UIAlertController(title: NSLocalizedString("settings.notMonospaced.title", comment: ""),
+										  message: NSLocalizedString("settings.notMonospaced.message", comment: ""),
+										  preferredStyle: .alert)
+			alert.addAction(UIAlertAction(title: NSLocalizedString("general.OK", comment: ""), style: .default))
+			self.present(alert, animated: true)
+		}
+	}
+
+	func fontPickerViewControllerDidCancel(_ viewController: UIFontPickerViewController) {
+		viewController.dismiss(animated: true)
 	}
-	
 }
 
 class BeatURLButton:UIButton {
@@ -351,4 +490,3 @@ extension UIButton {
 		(menu.children[index] as? UIAction)?.state = .on
 	}
 }
-
diff --git a/Beat/Text Editor View/BeatTextView.m b/Beat/Text Editor View/BeatTextView.m
index 0d681acc..b55f692e 100755
--- a/Beat/Text Editor View/BeatTextView.m	
+++ b/Beat/Text Editor View/BeatTextView.m	
@@ -205,9 +205,15 @@ -(void)setup
 	self.layoutManager.allowsNonContiguousLayout = YES;
 	NSSpellChecker.sharedSpellChecker.automaticallyIdentifiesLanguages = true;
 	
+	CGFloat lineHeight = self.editorDelegate.editorStyles.page.lineHeight;
+	if (_editorDelegate.fonts.custom) {
+		BXFont* font = _editorDelegate.fonts.regular;
+		lineHeight = MAX(lineHeight, ceil(font.ascender - font.descender + font.leading));
+	}
+
 	NSMutableParagraphStyle *paragraphStyle = NSMutableParagraphStyle.new;
-	paragraphStyle.maximumLineHeight = self.editorDelegate.editorStyles.page.lineHeight;
-	paragraphStyle.minimumLineHeight = self.editorDelegate.editorStyles.page.lineHeight;
+	paragraphStyle.maximumLineHeight = lineHeight;
+	paragraphStyle.minimumLineHeight = lineHeight;
 	paragraphStyle.lineSpacing = 1.0;
 	[self setDefaultParagraphStyle:paragraphStyle];
 	
diff --git a/Beat/User Interface Views/Preferences/Base.lproj/BeatPreferencesPanel.xib b/Beat/User Interface Views/Preferences/Base.lproj/BeatPreferencesPanel.xib
index 9a99186f..aaa3d61f 100644
--- a/Beat/User Interface Views/Preferences/Base.lproj/BeatPreferencesPanel.xib	
+++ b/Beat/User Interface Views/Preferences/Base.lproj/BeatPreferencesPanel.xib	
@@ -19,6 +19,10 @@
                 <outlet property="backupUseDefault" destination="5Lw-3n-rPc" id="nMo-rY-3Oy"/>
                 <outlet property="defaultPageSize" destination="OOl-ZM-PBd" id="fxe-zL-gpN"/>
                 <outlet property="fontStyle" destination="b7A-fE-zyc" id="M6g-m0-4M8"/>
+                <outlet property="customFontWarningLabel" destination="CFW-lb-001" id="CFW-ol-001"/>
+                <outlet property="customFontWarningSeparator" destination="VdU-lU-CUG" id="CFW-ol-002"/>
+                <outlet property="novelFontStyle" destination="EXF-pu-001" id="EXF-ol-001"/>
+                <outlet property="screenplayFontWarning" destination="SFW-tx-001" id="SFW-ol-001"/>
                 <outlet property="headingSpacing1" destination="IO7-Hz-k6N" id="kgE-0i-OlE"/>
                 <outlet property="headingSpacing2" destination="BHk-g1-cy2" id="CHZ-to-mfu"/>
                 <outlet property="hideFountainMarkup" destination="zb1-5Z-ZFC" id="LqH-52-9Md"/>
@@ -46,24 +50,24 @@
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <window title="Preferences" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" releasedWhenClosed="NO" animationBehavior="default" toolbarStyle="preference" id="F0z-JX-Cv5">
             <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
-            <rect key="contentRect" x="196" y="240" width="564" height="476"/>
+            <rect key="contentRect" x="196" y="240" width="564" height="500"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1728" height="1079"/>
             <view key="contentView" id="se5-gp-TjO">
-                <rect key="frame" x="0.0" y="0.0" width="564" height="476"/>
+                <rect key="frame" x="0.0" y="0.0" width="564" height="500"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <tabView type="noTabsNoBorder" id="vYj-Wj-ba8">
-                        <rect key="frame" x="0.0" y="0.0" width="564" height="476"/>
+                        <rect key="frame" x="0.0" y="0.0" width="564" height="500"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/>
                         <font key="font" metaFont="system"/>
                         <tabViewItems>
                             <tabViewItem label="Tab" identifier="" id="ok7-BF-Eme" userLabel="General">
                                 <view key="view" id="a52-yh-n1m">
-                                    <rect key="frame" x="0.0" y="0.0" width="564" height="476"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="564" height="500"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <button verticalHuggingPriority="750" id="Als-Po-nVY">
-                                            <rect key="frame" x="197" y="412" width="342" height="18"/>
+                                            <rect key="frame" x="197" y="436" width="342" height="18"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <buttonCell key="cell" type="check" title="Show page numbers" bezelStyle="regularSquare" imagePosition="left" inset="2" id="yde-p1-D3O">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -74,7 +78,7 @@
                                             </connections>
                                         </button>
                                         <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" id="gEt-24-IA4">
-                                            <rect key="frame" x="24" y="435" width="155" height="16"/>
+                                            <rect key="frame" x="24" y="459" width="155" height="16"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Editor View" usesSingleLineMode="YES" id="O3D-76-kt4">
                                                 <font key="font" usesAppearanceFont="YES"/>
@@ -83,7 +87,7 @@
                                             </textFieldCell>
                                         </textField>
                                         <button verticalHuggingPriority="750" id="Fx2-XA-GLr">
-                                            <rect key="frame" x="197" y="434" width="342" height="18"/>
+                                            <rect key="frame" x="197" y="458" width="342" height="18"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <buttonCell key="cell" type="check" title="Show scene numbers" bezelStyle="regularSquare" imagePosition="left" inset="2" id="a44-hn-h2m">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -94,7 +98,7 @@
                                             </connections>
                                         </button>
                                         <button verticalHuggingPriority="750" id="zb1-5Z-ZFC">
-                                            <rect key="frame" x="197" y="371" width="342" height="18"/>
+                                            <rect key="frame" x="197" y="395" width="342" height="18"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <buttonCell key="cell" type="check" title="Automatically hide Fountain markup" bezelStyle="regularSquare" imagePosition="left" inset="2" id="KAa-hh-Rua">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -105,16 +109,16 @@
                                             </connections>
                                         </button>
                                         <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" id="nyM-eM-UVN">
-                                            <rect key="frame" x="24" y="321" width="155" height="16"/>
+                                            <rect key="frame" x="24" y="347" width="155" height="16"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                            <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Editor Font" usesSingleLineMode="YES" id="Wyn-hc-s1G">
+                                            <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Screenplay Font" usesSingleLineMode="YES" id="Wyn-hc-s1G">
                                                 <font key="font" usesAppearanceFont="YES"/>
                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
                                         <popUpButton verticalHuggingPriority="750" id="b7A-fE-zyc">
-                                            <rect key="frame" x="196" y="314" width="205" height="25"/>
+                                            <rect key="frame" x="196" y="343" width="205" height="25"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <popUpButtonCell key="cell" type="push" title="Courier Prime" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="VTU-wq-qyb" id="iTa-Q6-mMB">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -124,15 +128,60 @@
                                                         <menuItem title="Courier Prime" state="on" id="VTU-wq-qyb"/>
                                                         <menuItem title="Courier Prime Sans" tag="1" id="w8y-6i-bdp"/>
                                                         <menuItem title="Courier New" tag="2" id="7TH-Zu-8EY"/>
+                                                        <menuItem isSeparatorItem="YES" id="EDF-sp-001"/>
+                                                        <menuItem hidden="YES" title="Selected Font" tag="3" id="EDF-cu-001"/>
+                                                        <menuItem title="Choose Font…" tag="4" id="EDF-cu-002"/>
+                                                    </items>
+                                                </menu>
+                                            </popUpButtonCell>
+                                            <connections>
+                                                <action selector="selectEditorFont:" target="-2" id="AiA-OE-tTd"/>
+                                            </connections>
+                                        </popUpButton>
+                                        <imageView hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="SFW-tx-001">
+                                            <rect key="frame" x="198" y="296" width="14" height="14"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                            <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="exclamationmark.triangle.fill" catalog="system" id="SFW-cl-001"/>
+                                        </imageView>
+                                        <textField hidden="YES" focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" id="CFW-lb-001">
+                                            <rect key="frame" x="218" y="295" width="321" height="14"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                            <textFieldCell key="cell" controlSize="mini" lineBreakMode="truncatingTail" title="Custom fonts can affect pagination and standard screenplay formatting." usesSingleLineMode="YES" id="CFW-cl-001">
+                                                <font key="font" metaFont="miniSystem"/>
+                                                <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                        </textField>
+                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" id="EXF-lb-001">
+                                            <rect key="frame" x="24" y="317" width="155" height="16"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                            <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Novel Font" usesSingleLineMode="YES" id="EXF-cl-002">
+                                                <font key="font" usesAppearanceFont="YES"/>
+                                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                        </textField>
+                                        <popUpButton verticalHuggingPriority="750" id="EXF-pu-001">
+                                            <rect key="frame" x="196" y="313" width="205" height="25"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                            <popUpButtonCell key="cell" type="push" title="Default" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="EXF-i0-001" id="EXF-cl-001">
+                                                <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                                                <font key="font" metaFont="message"/>
+                                                <menu key="menu" id="EXF-mn-001">
+                                                    <items>
+                                                        <menuItem title="Default" state="on" id="EXF-i0-001"/>
+                                                        <menuItem isSeparatorItem="YES" id="EXF-sp-001"/>
+                                                        <menuItem hidden="YES" title="Selected Font" tag="1" id="EXF-i1-001"/>
+                                                        <menuItem title="Choose Font…" tag="2" id="EXF-i2-001"/>
                                                     </items>
                                                 </menu>
                                             </popUpButtonCell>
                                             <connections>
-                                                <action selector="toggle:" target="-2" id="AiA-OE-tTd"/>
+                                                <action selector="selectNovelFont:" target="-2" id="EXF-ac-001"/>
                                             </connections>
                                         </popUpButton>
                                         <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" id="F1v-qV-l7r">
-                                            <rect key="frame" x="24" y="56" width="155" height="16"/>
+                                            <rect key="frame" x="24" y="50" width="155" height="16"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Language" usesSingleLineMode="YES" id="5o4-U4-n7H">
                                                 <font key="font" usesAppearanceFont="YES"/>
@@ -141,7 +190,7 @@
                                             </textFieldCell>
                                         </textField>
                                         <popUpButton verticalHuggingPriority="750" id="Hif-pI-nQF">
-                                            <rect key="frame" x="196" y="48" width="205" height="25"/>
+                                            <rect key="frame" x="196" y="42" width="205" height="25"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="tHb-q9-LBS">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -153,7 +202,7 @@
                                             </connections>
                                         </popUpButton>
                                         <button verticalHuggingPriority="750" id="zo8-Z0-pK3">
-                                            <rect key="frame" x="197" y="349" width="262" height="18"/>
+                                            <rect key="frame" x="197" y="373" width="262" height="18"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <buttonCell key="cell" type="check" title="Show scene colors in scroll bar" bezelStyle="regularSquare" imagePosition="left" inset="2" id="xYL-rJ-JMw">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -164,7 +213,7 @@
                                             </connections>
                                         </button>
                                         <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" id="85P-cf-gYd">
-                                            <rect key="frame" x="18" y="267" width="161" height="16"/>
+                                            <rect key="frame" x="18" y="261" width="161" height="16"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Editor Behavior" usesSingleLineMode="YES" id="lzW-qc-hjs">
                                                 <font key="font" usesAppearanceFont="YES"/>
@@ -173,7 +222,7 @@
                                             </textFieldCell>
                                         </textField>
                                         <button verticalHuggingPriority="750" id="g8c-VD-hRA">
-                                            <rect key="frame" x="197" y="265" width="342" height="18"/>
+                                            <rect key="frame" x="197" y="259" width="342" height="18"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <buttonCell key="cell" type="check" title="Auto-complete scene headings and characters" bezelStyle="regularSquare" imagePosition="left" inset="2" id="d0m-zv-bHH">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -184,7 +233,7 @@
                                             </connections>
                                         </button>
                                         <button verticalHuggingPriority="750" id="GfG-mn-QkH">
-                                            <rect key="frame" x="197" y="243" width="342" height="18"/>
+                                            <rect key="frame" x="197" y="237" width="342" height="18"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <buttonCell key="cell" type="check" title="Automatic CONT'D extensions" bezelStyle="regularSquare" imagePosition="left" inset="2" id="5Bc-al-gWv">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -195,7 +244,7 @@
                                             </connections>
                                         </button>
                                         <button verticalHuggingPriority="750" id="AgT-pV-Zlk">
-                                            <rect key="frame" x="197" y="198" width="342" height="18"/>
+                                            <rect key="frame" x="197" y="192" width="342" height="18"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <buttonCell key="cell" type="check" title="Match parentheses" bezelStyle="regularSquare" imagePosition="left" inset="2" id="Gir-t4-vbC">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -206,7 +255,7 @@
                                             </connections>
                                         </button>
                                         <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" id="9A6-Fw-SDa">
-                                            <rect key="frame" x="217" y="184" width="324" height="11"/>
+                                            <rect key="frame" x="217" y="178" width="324" height="11"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <textFieldCell key="cell" controlSize="mini" lineBreakMode="clipping" title="Automatically closes elements like () and [[]]" id="fxb-nx-hJp">
                                                 <font key="font" metaFont="miniSystem"/>
@@ -215,19 +264,19 @@
                                             </textFieldCell>
                                         </textField>
                                         <box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="VdU-lU-CUG">
-                                            <rect key="frame" x="26" y="298" width="513" height="5"/>
+                                            <rect key="frame" x="26" y="280" width="513" height="5"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                         </box>
                                         <box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="2iy-Lg-Vmw">
-                                            <rect key="frame" x="26" y="140" width="513" height="5"/>
+                                            <rect key="frame" x="26" y="134" width="513" height="5"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                         </box>
                                         <box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="eTS-rF-kC3">
-                                            <rect key="frame" x="26" y="86" width="513" height="5"/>
+                                            <rect key="frame" x="26" y="80" width="513" height="5"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                         </box>
                                         <button verticalHuggingPriority="750" id="lU2-0R-Qlm">
-                                            <rect key="frame" x="197" y="221" width="347" height="18"/>
+                                            <rect key="frame" x="197" y="215" width="347" height="18"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <buttonCell key="cell" type="check" title="Automatic paragraph breaks" bezelStyle="regularSquare" imagePosition="left" inset="2" id="Br1-nj-6zn">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -238,7 +287,7 @@
                                             </connections>
                                         </button>
                                         <popUpButton verticalHuggingPriority="750" id="LS5-SQ-rLY">
-                                            <rect key="frame" x="196" y="101" width="205" height="25"/>
+                                            <rect key="frame" x="196" y="95" width="205" height="25"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <popUpButtonCell key="cell" type="push" title="Small" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="VQS-1g-QZ6" id="3RH-A7-bPE">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -257,7 +306,7 @@
                                             </connections>
                                         </popUpButton>
                                         <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" id="zBI-GC-Afr">
-                                            <rect key="frame" x="18" y="107" width="161" height="16"/>
+                                            <rect key="frame" x="18" y="101" width="161" height="16"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Outline Font Size" usesSingleLineMode="YES" id="dtT-V5-EVi">
                                                 <font key="font" usesAppearanceFont="YES"/>
@@ -266,7 +315,7 @@
                                             </textFieldCell>
                                         </textField>
                                         <button verticalHuggingPriority="750" id="Zaq-R3-ErH">
-                                            <rect key="frame" x="219" y="396" width="320" height="11"/>
+                                            <rect key="frame" x="219" y="420" width="320" height="11"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <buttonCell key="cell" type="check" title="Show Page Separators (experimental)" bezelStyle="regularSquare" imagePosition="left" controlSize="mini" inset="2" id="e3i-cN-mWC">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -277,7 +326,7 @@
                                             </connections>
                                         </button>
                                         <button verticalHuggingPriority="750" id="kFK-fC-hYf" customClass="BeatUserDefaultCheckbox" customModule="Beat" customModuleProvider="target">
-                                            <rect key="frame" x="197" y="159" width="342" height="18"/>
+                                            <rect key="frame" x="197" y="153" width="342" height="18"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <buttonCell key="cell" type="check" title="Automatically add title page" bezelStyle="regularSquare" imagePosition="left" inset="2" id="EbP-vJ-jSl">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -929,6 +978,7 @@
         <image name="bold" catalog="system" width="11" height="12"/>
         <image name="bubbles.and.sparkles" catalog="system" width="17" height="15"/>
         <image name="document" catalog="system" width="14" height="16"/>
+        <image name="exclamationmark.triangle.fill" catalog="system" width="16" height="14"/>
         <image name="folder" catalog="system" width="18" height="14"/>
         <image name="underline" catalog="system" width="11" height="14"/>
     </resources>
diff --git a/Beat/User Interface Views/Preferences/BeatPreferencesPanel.m b/Beat/User Interface Views/Preferences/BeatPreferencesPanel.m
index 87978210..9890147a 100644
--- a/Beat/User Interface Views/Preferences/BeatPreferencesPanel.m	
+++ b/Beat/User Interface Views/Preferences/BeatPreferencesPanel.m	
@@ -67,6 +67,14 @@ @interface BeatPreferencesPanel () <NSTextFieldDelegate>
 
 @property (nonatomic) NSString *headingSample;
 
+@property (nonatomic, weak) IBOutlet NSPopUpButton* novelFontStyle;
+@property (nonatomic, weak) IBOutlet NSImageView* screenplayFontWarning;
+@property (nonatomic, weak) IBOutlet NSTextField* customFontWarningLabel;
+@property (nonatomic, weak) IBOutlet NSBox* customFontWarningSeparator;
+@property (nonatomic) NSString* activeFontSettingKey;
+@property (nonatomic) bool activeFontRequiresMonospaced;
+@property (nonatomic) NSDictionary<NSValue*, NSValue*>* customFontWarningOriginalFrames;
+
 @end
 
 @implementation BeatPreferencesPanel
@@ -166,7 +174,9 @@ - (void)windowDidLoad {
 	
 	 
 	[self setupLanguages];
-	
+	[self migrateLegacyCustomFonts];
+	[self updateFontPopups];
+
 	[self.window.toolbar setSelectedItemIdentifier:@"General"];
 	[self updateHeadingSample:YES];
 }
@@ -361,7 +371,7 @@ - (IBAction)toggle:(id)sender {
 	}
 	
 	if (sender == _screenplayItemMore || sender == _screenplayItemContd) [self reloadStyles];
-	
+
 	[self apply];
 }
 
@@ -404,6 +414,211 @@ - (void)apply
 	for (Document* doc in NSDocumentController.sharedDocumentController.documents) [doc applyUserSettings];
 }
 
+#pragma mark - Custom fonts
+
+static const NSInteger BeatScreenplayFontCustomTag = 3;
+static const NSInteger BeatScreenplayFontChooseTag = 4;
+static const NSInteger BeatNovelFontCustomTag = 1;
+static const NSInteger BeatNovelFontChooseTag = 2;
+
+- (IBAction)selectEditorFont:(NSPopUpButton*)sender
+{
+	if (sender.selectedItem.tag == BeatScreenplayFontCustomTag || sender.selectedItem.tag == BeatScreenplayFontChooseTag) {
+		[self openFontPanelForSetting:BeatSettingCustomScreenplayFont requiresMonospaced:true];
+	} else {
+		[BeatUserDefaults.sharedDefaults saveInteger:sender.selectedItem.tag forKey:BeatSettingFontStyle];
+		[BeatUserDefaults.sharedDefaults save:@"" forKey:BeatSettingCustomScreenplayFont];
+		[BeatUserDefaults.sharedDefaults save:@"" forKey:BeatSettingCustomScreenplayEditorFont];
+		[BeatUserDefaults.sharedDefaults save:@"" forKey:BeatSettingCustomScreenplayExportFont];
+		[BeatUserDefaults.sharedDefaults save:@"" forKey:BeatSettingCustomEditorFont];
+		[BeatUserDefaults.sharedDefaults save:@"" forKey:BeatSettingCustomExportFont];
+		[self applyFontChanges];
+	}
+}
+
+- (IBAction)selectNovelFont:(NSPopUpButton*)sender
+{
+	if (sender.selectedItem.tag == BeatNovelFontCustomTag || sender.selectedItem.tag == BeatNovelFontChooseTag) {
+		[self openFontPanelForSetting:BeatSettingCustomNovelFont requiresMonospaced:false];
+	} else {
+		[BeatUserDefaults.sharedDefaults save:@"" forKey:BeatSettingCustomNovelFont];
+		[BeatUserDefaults.sharedDefaults save:@"" forKey:BeatSettingCustomNovelEditorFont];
+		[BeatUserDefaults.sharedDefaults save:@"" forKey:BeatSettingCustomNovelExportFont];
+		[BeatUserDefaults.sharedDefaults save:@"" forKey:BeatSettingCustomEditorFont];
+		[BeatUserDefaults.sharedDefaults save:@"" forKey:BeatSettingCustomExportFont];
+		[self applyFontChanges];
+	}
+}
+
+- (void)openFontPanelForSetting:(NSString*)key requiresMonospaced:(bool)requiresMonospaced
+{
+	self.activeFontSettingKey = key;
+	self.activeFontRequiresMonospaced = requiresMonospaced;
+
+	NSFontManager* fm = NSFontManager.sharedFontManager;
+	fm.target = self;
+	fm.action = @selector(changeFont:);
+
+	NSFont* current = [self fontForSetting:key];
+	if (current == nil) current = requiresMonospaced ? [NSFont userFixedPitchFontOfSize:12.0] : [NSFont systemFontOfSize:12.0];
+
+	[fm setSelectedFont:current isMultiple:NO];
+	[fm orderFrontFontPanel:self];
+	[self updateFontPopups];
+}
+
+- (NSFont*)fontForSetting:(NSString*)key
+{
+	NSString* name = [BeatUserDefaults.sharedDefaults get:key];
+	if (name.length == 0) return nil;
+	return [NSFont fontWithName:name size:12.0];
+}
+
+- (void)changeFont:(id)sender
+{
+	if (self.activeFontSettingKey == nil) return;
+
+	NSFontManager* fm = (NSFontManager*)sender;
+	NSFont* base = [self fontForSetting:self.activeFontSettingKey];
+	if (base == nil) base = self.activeFontRequiresMonospaced ? [NSFont userFixedPitchFontOfSize:12.0] : [NSFont systemFontOfSize:12.0];
+
+	NSFont* newFont = [fm convertFont:base];
+	if (newFont == nil) return;
+
+	[BeatUserDefaults.sharedDefaults save:newFont.fontName forKey:self.activeFontSettingKey];
+	[self applyFontChanges];
+}
+
+- (void)applyFontChanges
+{
+	[self apply];
+	[self reloadStyles];
+	[self updateHeadingSample];
+	[self updateFontPopups];
+}
+
+- (void)migrateLegacyCustomFonts
+{
+	NSString* screenplayFont = [BeatUserDefaults.sharedDefaults get:BeatSettingCustomScreenplayFont];
+	NSString* novelFont = [BeatUserDefaults.sharedDefaults get:BeatSettingCustomNovelFont];
+
+	NSString* editorFont = [BeatUserDefaults.sharedDefaults get:BeatSettingCustomEditorFont];
+	if (editorFont.length > 0 && screenplayFont.length == 0 && novelFont.length == 0) {
+		[BeatUserDefaults.sharedDefaults save:editorFont forKey:BeatSettingCustomScreenplayFont];
+		[BeatUserDefaults.sharedDefaults save:editorFont forKey:BeatSettingCustomNovelFont];
+		screenplayFont = editorFont;
+		novelFont = editorFont;
+	}
+
+	NSString* exportFont = [BeatUserDefaults.sharedDefaults get:BeatSettingCustomExportFont];
+	if (exportFont.length > 0 && screenplayFont.length == 0 && novelFont.length == 0) {
+		[BeatUserDefaults.sharedDefaults save:exportFont forKey:BeatSettingCustomScreenplayFont];
+		[BeatUserDefaults.sharedDefaults save:exportFont forKey:BeatSettingCustomNovelFont];
+		screenplayFont = exportFont;
+		novelFont = exportFont;
+	}
+
+	NSString* legacyScreenplayFont = [BeatUserDefaults.sharedDefaults get:BeatSettingCustomScreenplayEditorFont];
+	if (screenplayFont.length == 0 && legacyScreenplayFont.length > 0) {
+		[BeatUserDefaults.sharedDefaults save:legacyScreenplayFont forKey:BeatSettingCustomScreenplayFont];
+	}
+
+	NSString* legacyNovelFont = [BeatUserDefaults.sharedDefaults get:BeatSettingCustomNovelEditorFont];
+	if (novelFont.length == 0 && legacyNovelFont.length > 0) {
+		[BeatUserDefaults.sharedDefaults save:legacyNovelFont forKey:BeatSettingCustomNovelFont];
+	}
+}
+
+- (void)updateFontPopups
+{
+	[self updateFontPopup:self.fontStyle customTag:BeatScreenplayFontCustomTag chooseTag:BeatScreenplayFontChooseTag setting:BeatSettingCustomScreenplayFont builtInTag:[BeatUserDefaults.sharedDefaults getInteger:BeatSettingFontStyle]];
+	[self updateFontPopup:self.novelFontStyle customTag:BeatNovelFontCustomTag chooseTag:BeatNovelFontChooseTag setting:BeatSettingCustomNovelFont builtInTag:0];
+	[self updateCustomFontWarning];
+}
+
+- (void)updateCustomFontWarning
+{
+	NSString* screenplayFont = [BeatUserDefaults.sharedDefaults get:BeatSettingCustomScreenplayFont];
+	NSString* novelFont = [BeatUserDefaults.sharedDefaults get:BeatSettingCustomNovelFont];
+	bool showWarning = (screenplayFont.length > 0 || novelFont.length > 0);
+
+	self.screenplayFontWarning.hidden = !showWarning;
+	self.customFontWarningLabel.hidden = !showWarning;
+	self.customFontWarningLabel.stringValue = showWarning ? NSLocalizedString(@"prefs.font.customWarning", @"Custom fonts can affect pagination and standard screenplay formatting.") : @"";
+	[self layoutCustomFontWarning:showWarning];
+	if (@available(macOS 10.14, *)) {
+		self.screenplayFontWarning.contentTintColor = NSColor.systemYellowColor;
+	}
+}
+
+- (void)layoutCustomFontWarning:(bool)showWarning
+{
+	static const CGFloat compactSeparatorY = 292.0;
+	static const CGFloat warningSeparatorY = 276.0;
+	static const CGFloat compactContentOffset = 4.0;
+	static const CGFloat warningContentOffset = -12.0;
+	static const CGFloat warningIconY = 288.0;
+	static const CGFloat warningLabelY = 287.0;
+
+	NSView* container = self.customFontWarningSeparator.superview;
+	if (self.customFontWarningOriginalFrames == nil) {
+		NSMutableDictionary* frames = NSMutableDictionary.new;
+		for (NSView* view in container.subviews) {
+			if (view == self.customFontWarningSeparator || view == self.screenplayFontWarning || view == self.customFontWarningLabel) continue;
+			if (NSMaxY(view.frame) > compactSeparatorY) continue;
+			frames[[NSValue valueWithNonretainedObject:view]] = [NSValue valueWithRect:view.frame];
+		}
+		self.customFontWarningOriginalFrames = frames;
+	}
+
+	CGFloat contentOffset = showWarning ? warningContentOffset : compactContentOffset;
+	for (NSValue* key in self.customFontWarningOriginalFrames) {
+		NSView* view = key.nonretainedObjectValue;
+		NSRect frame = [self.customFontWarningOriginalFrames[key] rectValue];
+		frame.origin.y += contentOffset;
+		view.frame = frame;
+	}
+
+	NSRect separatorFrame = self.customFontWarningSeparator.frame;
+	separatorFrame.origin.y = showWarning ? warningSeparatorY : compactSeparatorY;
+	self.customFontWarningSeparator.frame = separatorFrame;
+
+	NSRect iconFrame = self.screenplayFontWarning.frame;
+	iconFrame.origin.y = warningIconY;
+	self.screenplayFontWarning.frame = iconFrame;
+
+	NSRect labelFrame = self.customFontWarningLabel.frame;
+	labelFrame.origin.y = warningLabelY;
+	self.customFontWarningLabel.frame = labelFrame;
+}
+
+- (void)updateFontPopup:(NSPopUpButton*)popup customTag:(NSInteger)customTag chooseTag:(NSInteger)chooseTag setting:(NSString*)setting builtInTag:(NSInteger)builtInTag
+{
+	popup.toolTip = nil;
+	NSMenuItem* customItem = [popup.menu itemWithTag:customTag];
+	NSMenuItem* chooseItem = [popup.menu itemWithTag:chooseTag];
+	NSString* fontName = [BeatUserDefaults.sharedDefaults get:setting];
+
+	if (fontName.length > 0) {
+		NSFont* font = [NSFont fontWithName:fontName size:12.0];
+		NSString* display = font.displayName ?: fontName;
+
+		customItem.hidden = NO;
+		customItem.title = display;
+		chooseItem.title = NSLocalizedString(@"prefs.font.change", @"Change Font…");
+		popup.toolTip = display;
+		[popup selectItem:customItem];
+		return;
+	}
+
+	customItem.hidden = YES;
+	chooseItem.title = NSLocalizedString(@"prefs.font.choose", @"Choose Font…");
+
+	NSMenuItem* builtIn = [popup.menu itemWithTag:builtInTag];
+	if (builtIn != nil) [popup selectItem:builtIn];
+	else [popup selectItemAtIndex:0];
+}
+
 - (IBAction)toggleLanguage:(id)sender {
 	NSPopUpButton *btn = sender;
 	
@@ -442,6 +657,15 @@ - (IBAction)toggleTab:(id)sender {
 - (void)windowWillClose:(NSNotification *)notification
 {
 	[[NSApplication sharedApplication] stopModal];
+
+	// Stop receiving font panel callbacks.
+	NSFontManager* fm = NSFontManager.sharedFontManager;
+	if (fm.target == self) {
+		fm.target = nil;
+		fm.action = NULL;
+	}
+	self.activeFontSettingKey = nil;
+	if (NSFontPanel.sharedFontPanelExists) [NSFontPanel.sharedFontPanel orderOut:nil];
 }
 
 -(id)valueForUndefinedKey:(NSString *)key {
diff --git a/Beat/User Interface Views/Preferences/en.lproj/BeatPreferencesPanel.strings b/Beat/User Interface Views/Preferences/en.lproj/BeatPreferencesPanel.strings
index 889727d8..d31bcf40 100644
--- a/Beat/User Interface Views/Preferences/en.lproj/BeatPreferencesPanel.strings	
+++ b/Beat/User Interface Views/Preferences/en.lproj/BeatPreferencesPanel.strings	
@@ -41,8 +41,9 @@
 /* Class = "NSMenuItem"; title = "Courier Prime"; ObjectID = "VTU-wq-qyb"; */
 "VTU-wq-qyb.title" = "Courier Prime";
 
-/* Class = "NSTextFieldCell"; title = "Editor Font"; ObjectID = "Wyn-hc-s1G"; */
-"Wyn-hc-s1G.title" = "Editor Font";
+/* Class = "NSTextFieldCell"; title = "Screenplay Font"; ObjectID = "Wyn-hc-s1G"; */
+"Wyn-hc-s1G.title" = "Screenplay Font";
+"EXF-cl-002.title" = "Novel Font";
 
 /* Class = "NSButtonCell"; title = "1 line"; ObjectID = "Yuw-0s-K2b"; */
 "Yuw-0s-K2b.title" = "1 line";
diff --git a/Beat/User Interface Views/Preferences/es.lproj/BeatPreferencesPanel.strings b/Beat/User Interface Views/Preferences/es.lproj/BeatPreferencesPanel.strings
index 33cad6d7..7b1821eb 100644
--- a/Beat/User Interface Views/Preferences/es.lproj/BeatPreferencesPanel.strings	
+++ b/Beat/User Interface Views/Preferences/es.lproj/BeatPreferencesPanel.strings	
@@ -190,8 +190,9 @@
 /* Class = "NSTextFieldCell"; title = "Section Font"; ObjectID = "wK3-T2-CKe"; */
 "wK3-T2-CKe.title" = "Fuente de la sección";
 
-/* Class = "NSTextFieldCell"; title = "Editor Font"; ObjectID = "Wyn-hc-s1G"; */
-"Wyn-hc-s1G.title" = "Editor de fuente";
+/* Class = "NSTextFieldCell"; title = "Screenplay Font"; ObjectID = "Wyn-hc-s1G"; */
+"Wyn-hc-s1G.title" = "Screenplay Font";
+"EXF-cl-002.title" = "Novel Font";
 
 /* Class = "NSTextFieldCell"; title = "Note: These settings only affect screenplay formatting"; ObjectID = "XEa-I5-p3i"; */
 "XEa-I5-p3i.title" = "Nota: Estos ajustes solo afectan al formato del guion";
@@ -219,4 +220,3 @@
 
 /* Class = "NSButtonCell"; title = "Underlined"; ObjectID = "Zfa-HM-161"; */
 "Zfa-HM-161.title" = "Subrayado";
-
diff --git a/Beat/User Interface Views/Preferences/fi.lproj/BeatPreferencesPanel.strings b/Beat/User Interface Views/Preferences/fi.lproj/BeatPreferencesPanel.strings
index 3ef3df77..878cb160 100644
--- a/Beat/User Interface Views/Preferences/fi.lproj/BeatPreferencesPanel.strings	
+++ b/Beat/User Interface Views/Preferences/fi.lproj/BeatPreferencesPanel.strings	
@@ -45,8 +45,9 @@
 /* Class = "NSMenuItem"; title = "Courier Prime"; ObjectID = "VTU-wq-qyb"; */
 "VTU-wq-qyb.title" = "Courier Prime";
 
-/* Class = "NSTextFieldCell"; title = "Editor Font"; ObjectID = "Wyn-hc-s1G"; */
-"Wyn-hc-s1G.title" = "Editorin fontti";
+/* Class = "NSTextFieldCell"; title = "Screenplay Font"; ObjectID = "Wyn-hc-s1G"; */
+"Wyn-hc-s1G.title" = "Screenplay Font";
+"EXF-cl-002.title" = "Novel Font";
 
 /* Class = "NSButtonCell"; title = "1 line"; ObjectID = "Yuw-0s-K2b"; */
 "Yuw-0s-K2b.title" = "1";
diff --git a/Beat/User Interface Views/Preferences/fr.lproj/BeatPreferencesPanel.strings b/Beat/User Interface Views/Preferences/fr.lproj/BeatPreferencesPanel.strings
index 124bcb53..e14d7671 100644
--- a/Beat/User Interface Views/Preferences/fr.lproj/BeatPreferencesPanel.strings	
+++ b/Beat/User Interface Views/Preferences/fr.lproj/BeatPreferencesPanel.strings	
@@ -190,8 +190,9 @@
 /* Class = "NSTextFieldCell"; title = "Section Font"; ObjectID = "wK3-T2-CKe"; */
 "wK3-T2-CKe.title" = "Police de section";
 
-/* Class = "NSTextFieldCell"; title = "Editor Font"; ObjectID = "Wyn-hc-s1G"; */
-"Wyn-hc-s1G.title" = "Police de l'éditeur";
+/* Class = "NSTextFieldCell"; title = "Screenplay Font"; ObjectID = "Wyn-hc-s1G"; */
+"Wyn-hc-s1G.title" = "Screenplay Font";
+"EXF-cl-002.title" = "Novel Font";
 
 /* Class = "NSTextFieldCell"; title = "Note: These settings only affect screenplay formatting"; ObjectID = "XEa-I5-p3i"; */
 "XEa-I5-p3i.title" = "Note : ces réglages s'appliquent uniquement au formatage de scénario";
@@ -219,4 +220,3 @@
 
 /* Class = "NSButtonCell"; title = "Underlined"; ObjectID = "Zfa-HM-161"; */
 "Zfa-HM-161.title" = "Souligné";
-
diff --git a/Beat/User Interface Views/Preferences/sl.lproj/BeatPreferencesPanel.strings b/Beat/User Interface Views/Preferences/sl.lproj/BeatPreferencesPanel.strings
index 9b159821..8a7a23d4 100644
--- a/Beat/User Interface Views/Preferences/sl.lproj/BeatPreferencesPanel.strings	
+++ b/Beat/User Interface Views/Preferences/sl.lproj/BeatPreferencesPanel.strings	
@@ -77,8 +77,9 @@
 /* Class = "NSMenuItem"; title = "Medium"; ObjectID = "WAb-8C-Sjl"; */
 "WAb-8C-Sjl.title" = "Srednja";
 
-/* Class = "NSTextFieldCell"; title = "Editor Font"; ObjectID = "Wyn-hc-s1G"; */
-"Wyn-hc-s1G.title" = "Pisava urejevalnika";
+/* Class = "NSTextFieldCell"; title = "Screenplay Font"; ObjectID = "Wyn-hc-s1G"; */
+"Wyn-hc-s1G.title" = "Screenplay Font";
+"EXF-cl-002.title" = "Novel Font";
 
 /* Class = "NSMenuItem"; title = "Very big"; ObjectID = "YEd-uH-lo0"; */
 "YEd-uH-lo0.title" = "Ogromna";
@@ -174,4 +175,3 @@
 "2Og-yp-uDM.label" = "Napredne";
 
 "EbP-vJ-jSl.title" = "Samodejno dodaj naslovno stran";
-
diff --git a/Beat/User Interface Views/Preferences/sv.lproj/BeatPreferencesPanel.strings b/Beat/User Interface Views/Preferences/sv.lproj/BeatPreferencesPanel.strings
index 4316ed36..ec32f6f9 100644
--- a/Beat/User Interface Views/Preferences/sv.lproj/BeatPreferencesPanel.strings	
+++ b/Beat/User Interface Views/Preferences/sv.lproj/BeatPreferencesPanel.strings	
@@ -127,8 +127,9 @@
 /* Class = "NSMenuItem"; title = "Medium"; ObjectID = "WAb-8C-Sjl"; */
 "WAb-8C-Sjl.title" = "Medelstor";
 
-/* Class = "NSTextFieldCell"; title = "Editor Font"; ObjectID = "Wyn-hc-s1G"; */
-"Wyn-hc-s1G.title" = "Skärmtypsnitt";
+/* Class = "NSTextFieldCell"; title = "Screenplay Font"; ObjectID = "Wyn-hc-s1G"; */
+"Wyn-hc-s1G.title" = "Screenplay Font";
+"EXF-cl-002.title" = "Novel Font";
 
 /* Class = "NSButtonCell"; title = "Show scene colors in scroll bar"; ObjectID = "xYL-rJ-JMw"; */
 "xYL-rJ-JMw.title" = "Visa scenfärger i rullningslisten";
@@ -170,4 +171,3 @@
 "2Og-yp-uDM.label" = "Avancerade";
 
 "EbP-vJ-jSl.title" = "Lägg till titelsida automatiskt";
-
diff --git a/Frameworks/BeatCore/BeatCore/BeatEditorDelegate.h b/Frameworks/BeatCore/BeatCore/BeatEditorDelegate.h
index cc07bf3e..740fa0b9 100644
--- a/Frameworks/BeatCore/BeatCore/BeatEditorDelegate.h
+++ b/Frameworks/BeatCore/BeatCore/BeatEditorDelegate.h
@@ -217,6 +217,7 @@ typedef void (^BeatChangeListener)(NSRange);
 
 @property (nonatomic) BeatFontSet* fonts;
 - (CGFloat)fontScale;
+- (void)reloadFonts;
 /*
 @property (readonly, nonatomic) BXFont *courier;
 @property (readonly, nonatomic) BXFont *boldCourier;
diff --git a/Frameworks/BeatCore/BeatCore/Document View/Extensions/BeatDocumentBaseController+Fonts.m b/Frameworks/BeatCore/BeatCore/Document View/Extensions/BeatDocumentBaseController+Fonts.m
index 860559d3..a7c9e5e8 100644
--- a/Frameworks/BeatCore/BeatCore/Document View/Extensions/BeatDocumentBaseController+Fonts.m	
+++ b/Frameworks/BeatCore/BeatCore/Document View/Extensions/BeatDocumentBaseController+Fonts.m	
@@ -43,11 +43,27 @@ - (BeatFontType)fontType
 
 - (void)loadFonts
 {
-    self.fonts = [BeatFontManager.shared fontsWith:self.fontType scale:1.0];
+    [self loadFontsWithScale:1.0];
 }
 
 - (void)loadFontsWithScale:(CGFloat)scale
 {
+    bool variableFont = self.editorStyles.variableFont;
+    NSString* customFontKey = (variableFont) ? BeatSettingCustomNovelFont : BeatSettingCustomScreenplayFont;
+    NSString* customFont = [BeatUserDefaults.sharedDefaults get:customFontKey];
+    if (customFont.length == 0) customFont = [BeatUserDefaults.sharedDefaults get:(variableFont) ? BeatSettingCustomNovelEditorFont : BeatSettingCustomScreenplayEditorFont];
+    if (customFont.length == 0) customFont = [BeatUserDefaults.sharedDefaults get:(variableFont) ? BeatSettingCustomNovelExportFont : BeatSettingCustomScreenplayExportFont];
+    if (customFont.length == 0) customFont = [BeatUserDefaults.sharedDefaults get:BeatSettingCustomEditorFont];
+    if (customFont.length == 0) customFont = [BeatUserDefaults.sharedDefaults get:BeatSettingCustomExportFont];
+
+    if (customFont.length > 0) {
+        BeatFontSet* customFonts = [BeatFontManager.shared customFontsWithFontName:customFont scale:scale];
+        if (customFonts != nil) {
+            self.fonts = customFonts;
+            return;
+        }
+    }
+
     self.fonts = [BeatFontManager.shared fontsWith:self.fontType scale:scale];
 }
 
@@ -57,9 +73,40 @@ - (void)reloadFonts
 {
     NSString* oldFontName = self.fonts.name.copy;
     [self loadFonts];
-    
+
     // If the font changed, let's reformat the whole document.
-    if (![oldFontName isEqualToString:self.fonts.name]) [self.formatting formatAllLines];
+    if (![oldFontName isEqualToString:self.fonts.name]) {
+        [self.formatting formatAllLines];
+        [self refreshEditorFont];
+    }
+}
+
+/// Refreshes typing attributes after a font change.
+- (void)refreshEditorFont
+{
+    BXTextView* textView = self.getTextView;
+    if (textView == nil) return;
+
+    BXFont* font = self.fonts.regular;
+    textView.font = font;
+
+    CGFloat lineHeight = self.editorStyles.page.lineHeight;
+    if (self.fonts.custom) {
+        lineHeight = MAX(lineHeight, ceil(font.ascender - font.descender + font.leading));
+    }
+
+    NSMutableParagraphStyle *paragraphStyle = NSMutableParagraphStyle.new;
+    paragraphStyle.maximumLineHeight = lineHeight;
+    paragraphStyle.minimumLineHeight = lineHeight;
+    paragraphStyle.lineSpacing = 1.0;
+    #if TARGET_OS_OSX
+    textView.defaultParagraphStyle = paragraphStyle;
+    #endif
+
+    NSMutableDictionary* typingAttributes = textView.typingAttributes.mutableCopy;
+    typingAttributes[NSFontAttributeName] = font;
+    typingAttributes[NSParagraphStyleAttributeName] = paragraphStyle;
+    textView.typingAttributes = typingAttributes;
 }
 
 - (CGFloat)fontScale
diff --git a/Frameworks/BeatCore/BeatCore/Editor Formatting/BeatEditorFormatting.m b/Frameworks/BeatCore/BeatCore/Editor Formatting/BeatEditorFormatting.m
index 8c5c9ecb..f71081e8 100644
--- a/Frameworks/BeatCore/BeatCore/Editor Formatting/BeatEditorFormatting.m	
+++ b/Frameworks/BeatCore/BeatCore/Editor Formatting/BeatEditorFormatting.m	
@@ -108,6 +108,14 @@ - (void)applyFormatChanges
 
 #pragma mark - Paragraph styles
 
+- (CGFloat)lineHeight:(CGFloat)lineHeight fittingFont:(BXFont*)font
+{
+    if (!self.fonts.custom || font == nil) return lineHeight;
+
+    CGFloat fontLineHeight = ceil(font.ascender - font.descender + font.leading);
+    return MAX(lineHeight, fontLineHeight);
+}
+
 /// Returns paragraph style for given line type
 - (NSMutableParagraphStyle*)paragraphStyleForType:(LineType)type {
 	Line *tempLine = [Line withString:@"" type:type];
@@ -178,6 +186,8 @@ - (NSMutableParagraphStyle*)paragraphStyleFor:(Line*)line
     // Create paragraph style
     NSMutableParagraphStyle *style = NSMutableParagraphStyle.new;
     
+    BXFont* font = [self fontFamilyForLine:line];
+
     // Set default line height
     CGFloat lineHeight = styles.page.lineHeight;
 
@@ -185,11 +195,11 @@ - (NSMutableParagraphStyle*)paragraphStyleFor:(Line*)line
     if (elementStyle.fontSize > 0 && elementStyle.fontSize > lineHeight) {
         lineHeight = elementStyle.fontSize;
     } else if (line.type == section) {
-        BXFont* font = [self fontFamilyForLine:line];
         lineHeight = font.pointSize;
     }
     // Scale if needed
     lineHeight *= self.delegate.fonts.scale;
+    lineHeight = [self lineHeight:lineHeight fittingFont:font];
     
     style.minimumLineHeight = lineHeight;
     style.maximumLineHeight = lineHeight;
diff --git a/Frameworks/BeatCore/BeatCore/Fonts/BeatFontManager.swift b/Frameworks/BeatCore/BeatCore/Fonts/BeatFontManager.swift
index 90790ae9..3f5d1d95 100644
--- a/Frameworks/BeatCore/BeatCore/Fonts/BeatFontManager.swift
+++ b/Frameworks/BeatCore/BeatCore/Fonts/BeatFontManager.swift
@@ -27,7 +27,8 @@ private struct BeatFontSetTemplate {
     @objc static public let shared = BeatFontManager()
 
     private var fonts:[CGFloat:[String:BeatFontSet]] = [:]
-    
+    private var customFontSets:[CGFloat:[String:BeatFontSet]] = [:]
+
     private let fontTemplates:[String:BeatFontSetTemplate] = [
         "mono serif": BeatFontSetTemplate(name: "Courier Prime",
                                   regular: "Courier Prime",
@@ -123,4 +124,20 @@ private struct BeatFontSetTemplate {
         fonts[scale]?[type] = font
         return font
     }
+
+    @objc public func customFonts(fontName:String, scale:CGFloat = 1.0) -> BeatFontSet? {
+        if fontName.isEmpty { return nil }
+
+        if let cached = customFontSets[scale]?[fontName] {
+            return cached
+        }
+
+        guard let font = BeatFontSet.customFontSet(withFontName: fontName, size: 12.0, scale: scale) else {
+            return nil
+        }
+
+        if customFontSets[scale] == nil { customFontSets[scale] = [:] }
+        customFontSets[scale]?[fontName] = font
+        return font
+    }
 }
diff --git a/Frameworks/BeatCore/BeatCore/Fonts/BeatFontSet.h b/Frameworks/BeatCore/BeatCore/Fonts/BeatFontSet.h
index f80834e8..6e8f2dc9 100644
--- a/Frameworks/BeatCore/BeatCore/Fonts/BeatFontSet.h
+++ b/Frameworks/BeatCore/BeatCore/Fonts/BeatFontSet.h
@@ -61,6 +61,7 @@ typedef NS_ENUM(NSInteger, BeatFontStyle) {
 
 @property (nonatomic, readonly) NSString* name;
 @property (nonatomic, readonly) CGFloat scale;
+@property (nonatomic, readonly) bool custom;
 @property (nonatomic, readonly) BXFont *regular;
 @property (nonatomic, readonly) BXFont *bold;
 @property (nonatomic, readonly) BXFont *italic;
@@ -70,6 +71,8 @@ typedef NS_ENUM(NSInteger, BeatFontStyle) {
 @property (nonatomic, readonly) BXFont *emojiFont;
 
 + (instancetype)name:(NSString *)name size:(CGFloat)size scale:(CGFloat)scale regular:(NSString *)regularFontName bold:(NSString *)boldFontName italic:(NSString *)italicFontName boldItalic:(NSString *)boldItalicFontName sectionFont:(NSString* _Nullable)sectionFontName synopsisFont:(NSString* _Nullable)synopsisFontName;
+
++ (nullable instancetype)customFontSetWithFontName:(NSString *)fontName size:(CGFloat)size scale:(CGFloat)scale;
 - (BXFont*)sectionFontWithSize:(CGFloat)size;
 - (BXFont*)font:(BXFont*)font inScaledSize:(CGFloat)fontSize;
 
diff --git a/Frameworks/BeatCore/BeatCore/Fonts/BeatFontSet.m b/Frameworks/BeatCore/BeatCore/Fonts/BeatFontSet.m
index 44e0bb8a..9e7cc47e 100644
--- a/Frameworks/BeatCore/BeatCore/Fonts/BeatFontSet.m
+++ b/Frameworks/BeatCore/BeatCore/Fonts/BeatFontSet.m
@@ -33,31 +33,79 @@ - (instancetype)initWithFontName:(NSString*)name
         
         _name = name;
         _scale = scale;
+        _custom = false;
         
         _regular = [BXFont fontWithName:regularFontName size:fontSize];
         _bold = [BXFont fontWithName:boldFontName size:fontSize];
         _italic = [BXFont fontWithName:italicFontName size:fontSize];
         _boldItalic = [BXFont fontWithName:boldItalicFontName size:fontSize];
-        
+
         if (_regular == nil || _bold == nil || _italic == nil)
             NSLog(@"🆘 WARNING - font not found: %@", name);
-            
-        // Fonts for sections and synopsis lines. If something goes wrong, we'll load system font as a fallback.
-        if (sectionFontName != nil) _section = [BXFont fontWithName:sectionFontName size:fontSize];
-        if (_section == nil) _section = [BXFont boldSystemFontOfSize:size];
-        
-        if (synopsisFontName != nil) _synopsis = [BXFont fontWithName:synopsisFontName size:fontSize - 1.0];
-        if (_synopsis == nil) _synopsis = [BeatFontSet fontWithTrait:BXFontDescriptorTraitItalic font:[BXFont systemFontOfSize:size - 1.0]];
-        
-        BXFont* emojis = [BXFont fontWithName:@"Noto Emoji" size:fontSize];
-        if (emojis == nil) emojis = [BXFont fontWithName:@"NotoEmoji" size:fontSize]; // Fix for Mojave
-        _emojiFont = emojis;
 
+        [self loadSectionAndSynopsisFontsWithScaledSize:fontSize baseSize:size sectionFont:sectionFontName synopsisFont:synopsisFontName];
+    }
+
+    return self;
+}
+
++ (nullable instancetype)customFontSetWithFontName:(NSString *)fontName size:(CGFloat)size scale:(CGFloat)scale
+{
+    CGFloat fontSize = (size <= 0.0) ? 12.0 : size;
+    fontSize *= scale;
+
+    BXFont* regular = [BXFont fontWithName:fontName size:fontSize];
+    if (regular == nil) {
+        NSLog(@"🆘 WARNING - custom font not found: %@", fontName);
+        return nil;
+    }
+
+    BXFont* bold = [BeatFontSet fontWithTrait:BXFontDescriptorTraitBold font:regular];
+    BXFont* italic = [BeatFontSet fontWithTrait:BXFontDescriptorTraitItalic font:regular];
+    BXFont* boldItalic = [BeatFontSet fontWithTrait:(BXFontDescriptorTraitBold | BXFontDescriptorTraitItalic) font:regular];
+
+    return [BeatFontSet.alloc initWithCustomName:fontName size:size scale:scale regular:regular bold:bold italic:italic boldItalic:boldItalic];
+}
+
+- (instancetype)initWithCustomName:(NSString*)name
+                              size:(CGFloat)size
+                             scale:(CGFloat)scale
+                           regular:(BXFont*)regular
+                              bold:(BXFont*)bold
+                            italic:(BXFont*)italic
+                        boldItalic:(BXFont*)boldItalic
+{
+    self = [super init];
+    if (self) {
+        CGFloat fontSize = (size <= 0.0) ? 12.0 : size;
+        fontSize *= scale;
+
+        _name = name;
+        _scale = scale;
+        _custom = true;
+        _regular = regular;
+        _bold = bold;
+        _italic = italic;
+        _boldItalic = boldItalic;
+
+        [self loadSectionAndSynopsisFontsWithScaledSize:fontSize baseSize:size sectionFont:nil synopsisFont:nil];
     }
-     
     return self;
 }
 
+- (void)loadSectionAndSynopsisFontsWithScaledSize:(CGFloat)fontSize baseSize:(CGFloat)size sectionFont:(NSString* _Nullable)sectionFontName synopsisFont:(NSString* _Nullable)synopsisFontName
+{
+    if (sectionFontName != nil) _section = [BXFont fontWithName:sectionFontName size:fontSize];
+    if (_section == nil) _section = [BXFont boldSystemFontOfSize:size];
+
+    if (synopsisFontName != nil) _synopsis = [BXFont fontWithName:synopsisFontName size:fontSize - 1.0];
+    if (_synopsis == nil) _synopsis = [BeatFontSet fontWithTrait:BXFontDescriptorTraitItalic font:[BXFont systemFontOfSize:size - 1.0]];
+
+    BXFont* emojis = [BXFont fontWithName:@"Noto Emoji" size:fontSize];
+    if (emojis == nil) emojis = [BXFont fontWithName:@"NotoEmoji" size:fontSize]; // Fix for Mojave
+    _emojiFont = emojis;
+}
+
 - (BXFont*)sectionFontWithSize:(CGFloat)size
 {
     #if TARGET_OS_IOS
diff --git a/Frameworks/BeatCore/BeatCore/User defaults/BeatUserDefaults.h b/Frameworks/BeatCore/BeatCore/User defaults/BeatUserDefaults.h
index e112fa37..8581c4c0 100644
--- a/Frameworks/BeatCore/BeatCore/User defaults/BeatUserDefaults.h	
+++ b/Frameworks/BeatCore/BeatCore/User defaults/BeatUserDefaults.h	
@@ -25,6 +25,16 @@ extern NSString * const BeatSettingAutocomplete;
 /// 0: Serif, 1: Sans Serif, 2: Courier New / fall back to 0
 extern NSString * const BeatSettingFontStyle;
 
+/// Custom font overrides
+extern NSString * const BeatSettingCustomEditorFont;
+extern NSString * const BeatSettingCustomExportFont;
+extern NSString * const BeatSettingCustomScreenplayFont;
+extern NSString * const BeatSettingCustomNovelFont;
+extern NSString * const BeatSettingCustomScreenplayEditorFont;
+extern NSString * const BeatSettingCustomNovelEditorFont;
+extern NSString * const BeatSettingCustomScreenplayExportFont;
+extern NSString * const BeatSettingCustomNovelExportFont;
+
 extern NSString * const BeatSettingMagnification;
 extern NSString * const BeatSettingAutomaticLineBreaks;
 extern NSString * const BeatSettingUpdatePluginsAutomatically;
diff --git a/Frameworks/BeatCore/BeatCore/User defaults/BeatUserDefaults.m b/Frameworks/BeatCore/BeatCore/User defaults/BeatUserDefaults.m
index 6ce85c8e..25cb397b 100644
--- a/Frameworks/BeatCore/BeatCore/User defaults/BeatUserDefaults.m	
+++ b/Frameworks/BeatCore/BeatCore/User defaults/BeatUserDefaults.m	
@@ -30,6 +30,14 @@ @implementation BeatUserDefaults
 NSString* const BeatSettingHideFountainMarkup 			= @"hideFountainMarkup";
 NSString* const BeatSettingAutocomplete 				= @"autocomplete";
 NSString* const BeatSettingFontStyle                    = @"fontStyle";
+NSString* const BeatSettingCustomEditorFont             = @"customEditorFont";
+NSString* const BeatSettingCustomExportFont             = @"customExportFont";
+NSString* const BeatSettingCustomScreenplayFont         = @"customScreenplayFont";
+NSString* const BeatSettingCustomNovelFont              = @"customNovelFont";
+NSString* const BeatSettingCustomScreenplayEditorFont   = @"customScreenplayEditorFont";
+NSString* const BeatSettingCustomNovelEditorFont        = @"customNovelEditorFont";
+NSString* const BeatSettingCustomScreenplayExportFont   = @"customScreenplayExportFont";
+NSString* const BeatSettingCustomNovelExportFont        = @"customNovelExportFont";
 
 NSString* const BeatSettingMagnification 				= @"magnification";
 NSString* const BeatSettingAutomaticLineBreaks 			= @"autoLineBreaks";
@@ -134,7 +142,15 @@ + (NSDictionary*)userDefaults
             BeatSettingAutocomplete: @YES,
             //BeatSettingUseSansSerif: @[FONT_STYLE_KEY, @NO],
             BeatSettingFontStyle: @0,
-            
+            BeatSettingCustomEditorFont: @"",
+            BeatSettingCustomExportFont: @"",
+            BeatSettingCustomScreenplayFont: @"",
+            BeatSettingCustomNovelFont: @"",
+            BeatSettingCustomScreenplayEditorFont: @"",
+            BeatSettingCustomNovelEditorFont: @"",
+            BeatSettingCustomScreenplayExportFont: @"",
+            BeatSettingCustomNovelExportFont: @"",
+
             BeatSettingDarkMode: @NO,
             BeatSettingForcedAppearance: @0,
 
diff --git a/Frameworks/BeatPagination2/BeatPagination2/Pagination/BeatPagination.m b/Frameworks/BeatPagination2/BeatPagination2/Pagination/BeatPagination.m
index 3c2f4634..c9d92906 100644
--- a/Frameworks/BeatPagination2/BeatPagination2/Pagination/BeatPagination.m
+++ b/Frameworks/BeatPagination2/BeatPagination2/Pagination/BeatPagination.m
@@ -134,6 +134,13 @@ - (instancetype)initWithDelegate:(__weak id<BeatPaginationDelegate>)delegate lin
         // Set up fonts
         BeatStylesheet* stylesheet = settings.styles;
         _fonts = [BeatFontManager.shared fontsFor:stylesheet.page.fontType]; // defaults to 0, which is fixed
+
+        bool variableWidthStyle = (stylesheet.page.fontType == BeatFontTypeVariableSerif || stylesheet.page.fontType == BeatFontTypeVariableSansSerif);
+        NSString* customFont = [BeatUserDefaults.sharedDefaults get:variableWidthStyle ? BeatSettingCustomNovelFont : BeatSettingCustomScreenplayFont];
+        if (customFont.length > 0) {
+            BeatFontSet* customFonts = [BeatFontManager.shared customFontsWithFontName:customFont scale:1.0];
+            if (customFonts != nil) _fonts = customFonts;
+        }
 				
 		_startTime = NSDate.new;
 	}
diff --git a/Frameworks/BeatPagination2/BeatPagination2/Pagination/BeatPaginationBlock.m b/Frameworks/BeatPagination2/BeatPagination2/Pagination/BeatPaginationBlock.m
index eef00191..a26c3eb7 100644
--- a/Frameworks/BeatPagination2/BeatPagination2/Pagination/BeatPaginationBlock.m
+++ b/Frameworks/BeatPagination2/BeatPagination2/Pagination/BeatPaginationBlock.m
@@ -154,6 +154,7 @@ - (CGFloat)heightForLine:(Line*)line
         BXFont* customFont = [self fontFor:style];
         if (customFont != nil) font = customFont;
     }
+    font = [self font:font fittingLineHeight:lineHeight];
     
     NSString* stringWithoutFormatting = [line stripFormattingWithSettings:self.delegate.settings];
     
@@ -197,6 +198,17 @@ - (BXFont*)fontFor:(RenderStyle*)style
     return font;
 }
 
+- (BXFont*)font:(BXFont*)font fittingLineHeight:(CGFloat)lineHeight
+{
+    if (!self.delegate.fonts.custom || font == nil) return font;
+
+    CGFloat fontHeight = ceil(font.ascender - font.descender + font.leading);
+    if (lineHeight <= 0.0 || fontHeight <= lineHeight || fontHeight <= 0.0) return font;
+
+    CGFloat fittedSize = font.pointSize * lineHeight / fontHeight;
+    return [BXFont fontWithName:font.fontName size:fittedSize] ?: font;
+}
+
 /// Returns the line which resides at given Y coordinate within the local height of this block.
 - (Line*)lineAt:(CGFloat)y
 {
@@ -837,6 +849,7 @@ - (NSInteger)heightForString:(NSString *)string lineType:(LineType)type
 	BXFont* font = self.delegate.fonts.regular;
 	RenderStyle *style = [self.delegate.styles forElement:[Line typeName:type]];
 	CGFloat width = (_delegate.settings.paperSize == BeatA4) ? style.widthA4 : style.widthLetter;
+    font = [self font:font fittingLineHeight:lineHeight];
 		
     // Create paragraph style
     NSMutableParagraphStyle* pStyle = NSMutableParagraphStyle.new;
@@ -881,6 +894,7 @@ - (NSLayoutManager*)layoutManagerForString:(NSString*)string line:(Line*)line te
     
     BXFont* font = _delegate.fonts.regular;
     if (style.font) font = [self fontFor:style];
+    font = [self font:font fittingLineHeight:(style.lineHeight > 0.0) ? style.lineHeight : self.delegate.styles.page.lineHeight];
     
     BeatPaperSize paperSize = self.delegate.settings.paperSize;
     CGFloat width = [self.delegate.renderer blockWidthFor:line dualDialogue:false];
diff --git a/Frameworks/BeatPagination2/BeatRenderer.m b/Frameworks/BeatPagination2/BeatRenderer.m
index 8d560fe2..f95ca4eb 100644
--- a/Frameworks/BeatPagination2/BeatRenderer.m
+++ b/Frameworks/BeatPagination2/BeatRenderer.m
@@ -57,7 +57,19 @@ - (BeatFontSet*)fonts
         if (type == BeatFontTypeFixed && [BeatUserDefaults.sharedDefaults getInteger:BeatSettingFontStyle] == 2) type = BeatFontTypeFixedNew;
         fonts = [BeatFontManager.shared fontsFor:type];
     }
-    
+
+    bool variableWidthStyle = (stylesheet != nil && (stylesheet.page.fontType == BeatFontTypeVariableSerif || stylesheet.page.fontType == BeatFontTypeVariableSansSerif));
+    NSString* customFontKey = (fonts.custom || variableWidthStyle) ? BeatSettingCustomNovelFont : BeatSettingCustomScreenplayFont;
+    NSString* customFont = [BeatUserDefaults.sharedDefaults get:customFontKey];
+    if (customFont.length == 0) customFont = [BeatUserDefaults.sharedDefaults get:(fonts.custom || variableWidthStyle) ? BeatSettingCustomNovelExportFont : BeatSettingCustomScreenplayExportFont];
+    if (customFont.length == 0) customFont = [BeatUserDefaults.sharedDefaults get:(fonts.custom || variableWidthStyle) ? BeatSettingCustomNovelEditorFont : BeatSettingCustomScreenplayEditorFont];
+    if (customFont.length == 0) customFont = [BeatUserDefaults.sharedDefaults get:BeatSettingCustomExportFont];
+    if (customFont.length == 0) customFont = [BeatUserDefaults.sharedDefaults get:BeatSettingCustomEditorFont];
+
+    if (customFont.length > 0) {
+        BeatFontSet* customFonts = [BeatFontManager.shared customFontsWithFontName:customFont scale:1.0];
+        if (customFonts != nil) fonts = customFonts;
+    }
 
     return fonts;
 }
@@ -834,7 +846,20 @@ - (BXFont*)fontWith:(RenderStyle*)style
         }
     }
     
-    return font;
+    return [self font:font fittingLineHeightForStyle:style];
+}
+
+- (BXFont*)font:(BXFont*)font fittingLineHeightForStyle:(RenderStyle*)style
+{
+    if (!self.fonts.custom || font == nil) return font;
+
+    CGFloat lineHeight = (style.lineHeight > 0.0) ? style.lineHeight : self.styles.page.lineHeight;
+    CGFloat fontHeight = ceil(font.ascender - font.descender + font.leading);
+    if (lineHeight <= 0.0 || fontHeight <= lineHeight || fontHeight <= 0.0) return font;
+
+    CGFloat fittedSize = font.pointSize * lineHeight / fontHeight;
+    if (@available(macOS 10.15, *)) return [font fontWithSize:fittedSize];
+    return [BXFont fontWithName:font.fontName size:fittedSize] ?: font;
 }
 
 /// Returns attribute dictionary for given line. We are caching the styles.
diff --git a/Frameworks/BeatPagination2/Views/BeatPaginationPageView.swift b/Frameworks/BeatPagination2/Views/BeatPaginationPageView.swift
index 41fa7dbc..55740711 100644
--- a/Frameworks/BeatPagination2/Views/BeatPaginationPageView.swift
+++ b/Frameworks/BeatPagination2/Views/BeatPaginationPageView.swift
@@ -165,7 +165,7 @@ import UXKit
             textView.isAutomaticLinkDetectionEnabled = false
             textView.textContainer?.lineFragmentPadding = linePadding
             textView.textContainerInset = NSSize(width: 0, height: 0)
-            textView.drawsBackground = true
+            textView.drawsBackground = false
         #endif
 		        
 		
@@ -268,5 +268,3 @@ import UXKit
     
 	required public init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") }
 }
-
-
diff --git a/en.lproj/Localizable.strings b/en.lproj/Localizable.strings
index eb3e3fce..7e43d0c1 100644
--- a/en.lproj/Localizable.strings
+++ b/en.lproj/Localizable.strings
@@ -356,3 +356,11 @@
 
 "versionMenu.newVersion" = "Add New Alternative for This Line";
 "versionMenu.noVersions" = "No Alternative Versions";
+
+/* Font preferences (General tab) */
+"prefs.font.custom" = "Choose Font…";
+"prefs.font.customScreenplay" = "Choose Font…";
+"prefs.font.customNovel" = "Choose Font…";
+"prefs.font.choose" = "Choose Font…";
+"prefs.font.change" = "Change Font…";
+"prefs.font.customWarning" = "Custom fonts can affect pagination and standard screenplay formatting.";
diff --git a/es.lproj/Localizable.strings b/es.lproj/Localizable.strings
index d90da090..7ad7adbb 100644
--- a/es.lproj/Localizable.strings
+++ b/es.lproj/Localizable.strings
@@ -766,3 +766,11 @@
 
 "versionMenu.newVersion" = "Añadir nueva alternativa para esta línea";
 "versionMenu.noVersions" = "Sin versiones alternativas";
+
+/* Font preferences (General tab) */
+"prefs.font.custom" = "Elegir fuente…";
+"prefs.font.customScreenplay" = "Elegir fuente…";
+"prefs.font.customNovel" = "Elegir fuente…";
+"prefs.font.choose" = "Elegir fuente…";
+"prefs.font.change" = "Cambiar fuente…";
+"prefs.font.customWarning" = "Las fuentes personalizadas pueden afectar la paginación y el formato estándar del guion.";
diff --git a/fi.lproj/Localizable.strings b/fi.lproj/Localizable.strings
index 3b8fee83..201d6dfd 100644
--- a/fi.lproj/Localizable.strings
+++ b/fi.lproj/Localizable.strings
@@ -312,3 +312,11 @@
 
 "versionMenu.newVersion" = "Lisää vaihtoehtoinen versio rivistä";
 "versionMenu.noVersions" = "Ei vaihtoehtoisia versioita";
+
+/* Font preferences (General tab) */
+"prefs.font.custom" = "Valitse fontti…";
+"prefs.font.customScreenplay" = "Valitse fontti…";
+"prefs.font.customNovel" = "Valitse fontti…";
+"prefs.font.choose" = "Valitse fontti…";
+"prefs.font.change" = "Vaihda fontti…";
+"prefs.font.customWarning" = "Mukautetut fontit voivat vaikuttaa sivutukseen ja käsikirjoituksen vakiomuotoiluun.";
diff --git a/fr.lproj/Localizable.strings b/fr.lproj/Localizable.strings
index a5c433af..113aabb9 100644
--- a/fr.lproj/Localizable.strings
+++ b/fr.lproj/Localizable.strings
@@ -785,3 +785,11 @@
 
 "versionMenu.newVersion" = "Ajouter une nouvelle alternative pour cette ligne";
 "versionMenu.noVersions" = "Aucune version alternative";
+
+/* Font preferences (General tab) */
+"prefs.font.custom" = "Choisir une police…";
+"prefs.font.customScreenplay" = "Choisir une police…";
+"prefs.font.customNovel" = "Choisir une police…";
+"prefs.font.choose" = "Choisir une police…";
+"prefs.font.change" = "Changer de police…";
+"prefs.font.customWarning" = "Les polices personnalisées peuvent affecter la pagination et la mise en forme standard du scénario.";
diff --git a/sl.lproj/Localizable.strings b/sl.lproj/Localizable.strings
index a5f9cf22..06e9584e 100644
--- a/sl.lproj/Localizable.strings
+++ b/sl.lproj/Localizable.strings
@@ -301,3 +301,11 @@
 
 "versionMenu.newVersion" = "Dodaj novo alternativo za to vrstico";
 "versionMenu.noVersions" = "Ni alternativnih verzij";
+
+/* Font preferences (General tab) */
+"prefs.font.custom" = "Izberi pisavo…";
+"prefs.font.customScreenplay" = "Izberi pisavo…";
+"prefs.font.customNovel" = "Izberi pisavo…";
+"prefs.font.choose" = "Izberi pisavo…";
+"prefs.font.change" = "Spremeni pisavo…";
+"prefs.font.customWarning" = "Pisave po meri lahko vplivajo na razporeditev strani in standardno oblikovanje scenarija.";
diff --git a/sv.lproj/Localizable.strings b/sv.lproj/Localizable.strings
index 27cc23e4..ef2861e6 100644
--- a/sv.lproj/Localizable.strings
+++ b/sv.lproj/Localizable.strings
@@ -493,3 +493,11 @@
 
 "versionMenu.newVersion" = "Lägg till nytt alternativ för den här raden";
 "versionMenu.noVersions" = "Inga alternativa versioner";
+
+/* Font preferences (General tab) */
+"prefs.font.custom" = "Välj typsnitt…";
+"prefs.font.customScreenplay" = "Välj typsnitt…";
+"prefs.font.customNovel" = "Välj typsnitt…";
+"prefs.font.choose" = "Välj typsnitt…";
+"prefs.font.change" = "Ändra typsnitt…";
+"prefs.font.customWarning" = "Anpassade typsnitt kan påverka sidbrytningen och standardformateringen av manus.";