3 files changed, 32 insertions, 9 deletions

diff --git a/src/gmdocument.c b/src/gmdocument.c
index 49a19cb9..17c44105 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -301,6 +301,11 @@ static iBool isNormalized_GmDocument_(const iGmDocument *d) {
     return iTrue;
 }
 
+static enum iGmDocumentTheme currentTheme_(void) {
+    return (isDark_ColorTheme(colorTheme_App()) ? prefs_App()->docThemeDark
+                                                : prefs_App()->docThemeLight);
+}
+
 static void doLayout_GmDocument_(iGmDocument *d) {
     const iBool isMono = isForcedMonospace_GmDocument_(d);
     const iBool isNarrow = d->size.x < 90 * gap_Text;
@@ -313,7 +318,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
         heading1_FontId,
         heading2_FontId,
         heading3_FontId,
-        isMono ? regularMonospace_FontId : regular_FontId,
+        isMono ? regularMonospace_FontId : bold_FontId,
     };
     static const int colors[max_GmLineType] = {
         tmParagraph_ColorId,
@@ -820,8 +825,7 @@ static void updateIconBasedOnUrl_GmDocument_(iGmDocument *d) {
 
 void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
     const iPrefs *        prefs = prefs_App();
-    enum iGmDocumentTheme theme =
-        (isDark_ColorTheme(colorTheme_App()) ? prefs->docThemeDark : prefs->docThemeLight);
+    enum iGmDocumentTheme theme = currentTheme_();
     static const iChar siteIcons[] = {
         0x203b,  0x2042,  0x205c,  0x2182,  0x25ed,  0x2600,  0x2601,  0x2604,  0x2605,  0x2606,
         0x265c,  0x265e,  0x2690,  0x2691,  0x2693,  0x2698,  0x2699,  0x26f0,  0x270e,  0x2728,
@@ -971,6 +975,9 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
             set_Color(tmBannerBackground_ColorId, mix_Color(get_Color(tmBackground_ColorId), get_Color(brown_ColorId), 0.15f));
             set_Color(tmBannerTitle_ColorId, get_Color(brown_ColorId));
             set_Color(tmBannerIcon_ColorId, get_Color(brown_ColorId));
+            set_Color(tmLinkText_ColorId, get_Color(tmHeading2_ColorId));
+            set_Color(tmHypertextLinkText_ColorId, get_Color(tmHeading2_ColorId));
+            set_Color(tmGopherLinkText_ColorId, get_Color(tmHeading2_ColorId));
         }
         else if (theme == white_GmDocumentTheme) {
             const iHSLColor base = { 40, 0, 1.0f, 1.0f };
@@ -1177,7 +1184,14 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
             setHsl_Color(tmBannerTitle_ColorId, primDim);
             setHsl_Color(tmBannerIcon_ColorId, primDim);
         }
-
+        /* Tone down the link colors a bit because bold white is quite strong to look at. */
+        if (isDark_GmDocumentTheme(theme) || theme == white_GmDocumentTheme) {
+            iHSLColor base = { hues[primIndex], 1.0f, normLum[primIndex], 1.0f };
+            set_Color(tmLinkText_ColorId, mix_Color(get_Color(tmLinkText_ColorId),
+                                                    rgb_HSLColor(base), 0.25f));
+            set_Color(tmHypertextLinkText_ColorId, get_Color(tmLinkText_ColorId));
+            set_Color(tmGopherLinkText_ColorId, get_Color(tmLinkText_ColorId));
+        }
         /* Adjust colors based on light/dark mode. */
         for (int i = tmFirst_ColorId; i < max_ColorId; i++) {
             iHSLColor color = hsl_Color(get_Color(i));
diff --git a/src/ui/text.c b/src/ui/text.c
index d9ddf2b2..520ae74a 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -210,41 +210,48 @@ static void initFonts_Text_(iText *d) {
     const float monoSize = textSize * 0.71f;
     const float smallMonoSize = monoSize * 0.8f;
     const iBlock *regularFont  = &fontNunitoRegular_Embedded;
+    const iBlock *boldFont     = &fontNunitoExtraBold_Embedded;
     const iBlock *italicFont   = &fontNunitoLightItalic_Embedded;
     const iBlock *h12Font      = &fontNunitoExtraBold_Embedded;
     const iBlock *h3Font       = &fontNunitoRegular_Embedded;
     const iBlock *lightFont    = &fontNunitoExtraLight_Embedded;
     float         scaling      = 1.0f; /* glyph scaling (<=1.0), for increasing line spacing */
+    float         italicScaling= 1.0f;
     float         lightScaling = 1.0f;
     float         h123Scaling  = 1.0f; /* glyph scaling (<=1.0), for increasing line spacing */
     if (d->contentFont == firaSans_TextFont) {
         regularFont = &fontFiraSansRegular_Embedded;
+        boldFont    = &fontFiraSansBold_Embedded;
         lightFont   = &fontFiraSansLight_Embedded;
         italicFont  = &fontFiraSansItalic_Embedded;
-        scaling     = lightScaling = 0.85f;
+        scaling     = italicScaling = lightScaling = 0.85f;
     }
     else if (d->contentFont == tinos_TextFont) {
         regularFont = &fontTinosRegular_Embedded;
+        boldFont    = &fontTinosBold_Embedded;
         lightFont   = &fontLiterataExtraLightopsz18_Embedded;
         italicFont  = &fontTinosItalic_Embedded;
-        scaling      = 0.85f;
+        scaling      = italicScaling = 0.85f;
     }
     else if (d->contentFont == literata_TextFont) {
         regularFont = &fontLiterataRegularopsz14_Embedded;
+        boldFont    = &fontLiterataBoldopsz36_Embedded;
         italicFont  = &fontLiterataLightItalicopsz10_Embedded;
         lightFont   = &fontLiterataExtraLightopsz18_Embedded;
     }
     else if (d->contentFont == sourceSansPro_TextFont) {
         regularFont = &fontSourceSansProRegular_Embedded;
+        boldFont    = &fontSourceSansProBold_Embedded;
         italicFont  = &fontFiraSansItalic_Embedded;
         lightFont   = &fontFiraSansLight_Embedded;
-        lightScaling = 0.85f;
+        lightScaling = italicScaling = 0.85f;
     }
     else if (d->contentFont == iosevka_TextFont) {
         regularFont = &fontIosevkaTermExtended_Embedded;
+        boldFont    = &fontIosevkaTermExtended_Embedded;
         italicFont  = &fontIosevkaTermExtended_Embedded;
         lightFont   = &fontIosevkaTermExtended_Embedded;
-        scaling     = lightScaling = 0.866f;
+        scaling     = italicScaling = lightScaling = 0.866f;
     }
     if (d->headingFont == firaSans_TextFont) {
         h12Font     = &fontFiraSansBold_Embedded;
@@ -291,11 +298,12 @@ static void initFonts_Text_(iText *d) {
         { &fontSourceSansProRegular_Embedded, textSize,             scaling, symbols_FontId },
         /* content fonts */
         { regularFont,                        textSize,             scaling,      symbols_FontId },
+        { boldFont,                           textSize,             scaling,      symbols_FontId },
         { &fontIosevkaTermExtended_Embedded,  monoSize,             1.0f,         monospaceSymbols_FontId },
         { &fontIosevkaTermExtended_Embedded,  smallMonoSize,        1.0f,         monospaceSmallSymbols_FontId },
         { regularFont,                        textSize * 1.200f,    scaling,      mediumSymbols_FontId },
         { h3Font,                             textSize * 1.333f,    h123Scaling,  bigSymbols_FontId },
-        { italicFont,                         textSize,             scaling,      symbols_FontId },
+        { italicFont,                         textSize,             italicScaling,symbols_FontId },
         { h12Font,                            textSize * 1.666f,    h123Scaling,  largeSymbols_FontId },
         { h12Font,                            textSize * 2.000f,    h123Scaling,  hugeSymbols_FontId },
         { lightFont,                          textSize * 1.666f,    lightScaling, largeSymbols_FontId },
diff --git a/src/ui/text.h b/src/ui/text.h
index 99f81d9f..b46c15c6 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -42,6 +42,7 @@ enum iFontId {
     defaultContentSized_FontId,
     /* content fonts */
     regular_FontId,
+    bold_FontId,
     monospace_FontId,
     monospaceSmall_FontId,
     medium_FontId,