2 files changed, 22 insertions, 5 deletions
diff --git a/src/term/color.rs b/src/term/color.rs
index d25f2f3d..6acd092a 100644
--- a/src/term/color.rs
+++ b/src/term/color.rs
@@ -4,7 +4,7 @@ use std::fmt;
 use {Rgb, ansi};
 use config::Colors;
 
-pub const COUNT: usize = 268;
+pub const COUNT: usize = 270;
 
 /// List of indexed colors
 ///
@@ -13,6 +13,7 @@ pub const COUNT: usize = 268;
 /// the configured foreground color, item 257 is the configured background
 /// color, item 258 is the cursor foreground color, item 259 is the cursor
 /// background color. Following that are 8 positions for dim colors.
+/// Item 268 is the bright foreground color, 269 the dim foreground.
 #[derive(Copy, Clone)]
 pub struct List([Rgb; COUNT]);
 
@@ -50,6 +51,10 @@ impl List {
         self[ansi::NamedColor::BrightMagenta] = colors.bright.magenta;
         self[ansi::NamedColor::BrightCyan]    = colors.bright.cyan;
         self[ansi::NamedColor::BrightWhite]   = colors.bright.white;
+        self[ansi::NamedColor::BrightForeground] = colors
+            .primary
+            .bright_foreground
+            .unwrap_or(colors.primary.foreground);
 
         // Foreground and background
         self[ansi::NamedColor::Foreground] = colors.primary.foreground;
@@ -60,6 +65,10 @@ impl List {
         self[ansi::NamedColor::Cursor]     = colors.cursor.cursor;
 
         // Dims
+        self[ansi::NamedColor::DimForeground] = colors
+            .primary
+            .dim_foreground
+            .unwrap_or(colors.primary.foreground * 0.66);
         match colors.dim {
             Some(ref dim) => {
                 trace!("Using config-provided dim colors");
diff --git a/src/term/mod.rs b/src/term/mod.rs
index ca3b5025..97f8b779 100644
--- a/src/term/mod.rs
+++ b/src/term/mod.rs
@@ -320,11 +320,18 @@ impl<'a> RenderableCellsIter<'a> {
             Color::Spec(rgb) => rgb,
             Color::Named(ansi) => {
                 match (self.config.draw_bold_text_with_bright_colors(), cell.flags & Flags::DIM_BOLD) {
+                    // If no bright foreground is set, treat it like the BOLD flag doesn't exist
+                    (_, self::cell::Flags::DIM_BOLD)
+                        if ansi == NamedColor::Foreground
+                            && self.config.colors().primary.bright_foreground.is_none() =>
+                    {
+                        self.colors[NamedColor::DimForeground]
+                    }
                     // Draw bold text in bright colors *and* contains bold flag.
-                    (true, self::cell::Flags::DIM_BOLD) |
-                    (true, self::cell::Flags::BOLD)     => self.colors[ansi.to_bright()],
+                    (true,  self::cell::Flags::BOLD)     => self.colors[ansi.to_bright()],
                     // Cell is marked as dim and not bold
-                    (_,    self::cell::Flags::DIM)      => self.colors[ansi.to_dim()],
+                    (_,     self::cell::Flags::DIM) |
+                    (false, self::cell::Flags::DIM_BOLD) => self.colors[ansi.to_dim()],
                     // None of the above, keep original color.
                     _ => self.colors[ansi]
                 }
@@ -412,6 +419,7 @@ impl<'a> Iterator for RenderableCellsIter<'a> {
                 if cell.is_empty() && !selected {
                     continue;
                 }
+
                 (cell, selected)
             };
 
@@ -1071,7 +1079,7 @@ impl Term {
             .map(|span| {
                 span.to_locations()
             });
-        let cursor = if window_focused {
+        let cursor = if window_focused || !config.unfocused_hollow_cursor() {
             self.cursor_style.unwrap_or(self.default_cursor_style)
         } else {
             CursorStyle::HollowBlock