3 files changed, 26 insertions, 7 deletions

diff --git a/src/defs.h b/src/defs.h
index 135cc053..6b12c86c 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -44,8 +44,9 @@ enum iFileVersion {
 enum iImageStyle {
     original_ImageStyle           = 0,
     grayscale_ImageStyle          = 1,
-    textColorized_ImageStyle      = 2,
-    preformatColorized_ImageStyle = 3,
+    bgFg_ImageStyle               = 2,
+    textColorized_ImageStyle      = 3,
+    preformatColorized_ImageStyle = 4,
 };
 
 enum iScrollType {
diff --git a/src/media.c b/src/media.c
index 94de0bc6..999368c5 100644
--- a/src/media.c
+++ b/src/media.c
@@ -91,8 +91,27 @@ static void applyImageStyle_(enum iImageStyle style, iInt2 size, uint8_t *imgDat
     if (style == original_ImageStyle) {
         return;
     }
-    iColor colorize = (iColor){ 255, 255, 255, 255};
-    float brighten = 0.0f;
+    uint8_t *pos       = imgData;
+    size_t   numPixels = size.x * size.y;
+    float    brighten  = 0.0f;
+    if (style == bgFg_ImageStyle) {
+        iColor dark  = get_Color(tmBackground_ColorId);
+        iColor light = get_Color(tmParagraph_ColorId);
+        if (hsl_Color(dark).lum > hsl_Color(light).lum) {
+            iSwap(iColor, dark, light);
+        }        
+        while (numPixels-- > 0) {
+            iHSLColor hsl = hsl_Color((iColor){ pos[0], pos[1], pos[2], 255 });
+            const float s = 1.0f - hsl.lum;
+            const float t = hsl.lum;
+            pos[0] = dark.r * s + light.r * t;
+            pos[1] = dark.g * s + light.g * t;
+            pos[2] = dark.b * s + light.b * t;
+            pos += 4;
+        }        
+        return;
+    }
+    iColor colorize = (iColor){ 255, 255, 255, 255 };
     if (style != grayscale_ImageStyle) {
         colorize = get_Color(style == textColorized_ImageStyle ? tmParagraph_ColorId
                                                                : tmPreformatted_ColorId);
@@ -100,9 +119,7 @@ static void applyImageStyle_(enum iImageStyle style, iInt2 size, uint8_t *imgDat
         const int colMax = iMax(iMax(colorize.r, colorize.g), colorize.b);
         brighten = iClamp(1.0f - (colorize.r + colorize.g + colorize.b) / (colMax * 3), 0.0f, 0.5f); /* compensate loss of light */
     }
-    uint8_t *pos = imgData;
-    size_t numPixels = size.x * size.y;
-    iHSLColor hslColorize = hsl_Color(colorize);                           
+    iHSLColor hslColorize = hsl_Color(colorize);
     while (numPixels-- > 0) {
         iHSLColor hsl = hsl_Color((iColor){ pos[0], pos[1], pos[2], 255 });
         iHSLColor out = { hslColorize.hue, hslColorize.sat, hsl.lum, 1.0f };
diff --git a/src/ui/util.c b/src/ui/util.c
index 8a42f75b..906d30ae 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1836,6 +1836,7 @@ iWidget *makePreferences_Widget(void) {
             const iMenuItem imgStyles[] = {
                 { "${prefs.imagestyle.original}",  0, 0, format_CStr("imagestyle.set arg:%d", original_ImageStyle) },
                 { "${prefs.imagestyle.grayscale}", 0, 0, format_CStr("imagestyle.set arg:%d", grayscale_ImageStyle) },
+                { "${prefs.imagestyle.bgfg}",      0, 0, format_CStr("imagestyle.set arg:%d", bgFg_ImageStyle) },
                 { "${prefs.imagestyle.text}",      0, 0, format_CStr("imagestyle.set arg:%d", textColorized_ImageStyle) },
                 { "${prefs.imagestyle.preformat}", 0, 0, format_CStr("imagestyle.set arg:%d", preformatColorized_ImageStyle) },   
             };