Index: uspace/app/terminal/terminal.c
===================================================================
--- uspace/app/terminal/terminal.c	(revision d0fd86ae039182ebf31bdd28374f168b1afac9c5)
+++ uspace/app/terminal/terminal.c	(revision 805a149bb760f7dc7a16bc1442f6c3e5b0186395)
@@ -141,19 +141,19 @@
 static pixel_t color_table[16] = {
 	[COLOR_BLACK]       = PIXEL(255, 0, 0, 0),
-	[COLOR_BLUE]        = PIXEL(255, 0, 0, 240),
-	[COLOR_GREEN]       = PIXEL(255, 0, 240, 0),
-	[COLOR_CYAN]        = PIXEL(255, 0, 240, 240),
-	[COLOR_RED]         = PIXEL(255, 240, 0, 0),
-	[COLOR_MAGENTA]     = PIXEL(255, 240, 0, 240),
-	[COLOR_YELLOW]      = PIXEL(255, 240, 240, 0),
-	[COLOR_WHITE]       = PIXEL(255, 240, 240, 240),
-
-	[COLOR_BLACK + 8]   = PIXEL(255, 0, 0, 0),
-	[COLOR_BLUE + 8]    = PIXEL(255, 0, 0, 255),
-	[COLOR_GREEN + 8]   = PIXEL(255, 0, 255, 0),
-	[COLOR_CYAN + 8]    = PIXEL(255, 0, 255, 255),
-	[COLOR_RED + 8]     = PIXEL(255, 255, 0, 0),
-	[COLOR_MAGENTA + 8] = PIXEL(255, 255, 0, 255),
-	[COLOR_YELLOW + 8]  = PIXEL(255, 255, 255, 0),
+	[COLOR_BLUE]        = PIXEL(255, 0, 0, 170),
+	[COLOR_GREEN]       = PIXEL(255, 0, 170, 0),
+	[COLOR_CYAN]        = PIXEL(255, 0, 170, 170),
+	[COLOR_RED]         = PIXEL(255, 170, 0, 0),
+	[COLOR_MAGENTA]     = PIXEL(255, 170, 0, 170),
+	[COLOR_YELLOW]      = PIXEL(255, 170, 85, 0),
+	[COLOR_WHITE]       = PIXEL(255, 170, 170, 170),
+
+	[COLOR_BLACK + 8]   = PIXEL(255, 85, 85, 85),
+	[COLOR_BLUE + 8]    = PIXEL(255, 85, 85, 255),
+	[COLOR_GREEN + 8]   = PIXEL(255, 85, 255, 85),
+	[COLOR_CYAN + 8]    = PIXEL(255, 85, 255, 255),
+	[COLOR_RED + 8]     = PIXEL(255, 255, 85, 85),
+	[COLOR_MAGENTA + 8] = PIXEL(255, 255, 85, 255),
+	[COLOR_YELLOW + 8]  = PIXEL(255, 255, 255, 85),
 	[COLOR_WHITE + 8]   = PIXEL(255, 255, 255, 255),
 };
@@ -165,24 +165,23 @@
 		switch (attrs.val.style) {
 		case STYLE_NORMAL:
-			*bgcolor = color_table[COLOR_WHITE];
+			*bgcolor = color_table[COLOR_WHITE + 8];
 			*fgcolor = color_table[COLOR_BLACK];
 			break;
 		case STYLE_EMPHASIS:
-			*bgcolor = color_table[COLOR_WHITE];
-			*fgcolor = color_table[COLOR_RED];
+			*bgcolor = color_table[COLOR_WHITE + 8];
+			*fgcolor = color_table[COLOR_RED + 8];
 			break;
 		case STYLE_INVERTED:
 			*bgcolor = color_table[COLOR_BLACK];
-			*fgcolor = color_table[COLOR_WHITE];
+			*fgcolor = color_table[COLOR_WHITE + 8];
 			break;
 		case STYLE_SELECTED:
-			*bgcolor = color_table[COLOR_RED];
-			*fgcolor = color_table[COLOR_WHITE];
+			*bgcolor = color_table[COLOR_RED + 8];
+			*fgcolor = color_table[COLOR_WHITE + 8];
 			break;
 		}
 		break;
 	case CHAR_ATTR_INDEX:
-		*bgcolor = color_table[(attrs.val.index.bgcolor & 7) |
-		    ((attrs.val.index.attr & CATTR_BRIGHT) ? 8 : 0)];
+		*bgcolor = color_table[(attrs.val.index.bgcolor & 7)];
 		*fgcolor = color_table[(attrs.val.index.fgcolor & 7) |
 		    ((attrs.val.index.attr & CATTR_BRIGHT) ? 8 : 0)];
Index: uspace/app/tester/console/console1.c
===================================================================
--- uspace/app/tester/console/console1.c	(revision d0fd86ae039182ebf31bdd28374f168b1afac9c5)
+++ uspace/app/tester/console/console1.c	(revision 805a149bb760f7dc7a16bc1442f6c3e5b0186395)
@@ -106,5 +106,5 @@
 		}
 		console_flush(console);
-		console_set_color(console, COLOR_WHITE, COLOR_BLACK, 0);
+		console_set_style(console, STYLE_NORMAL);
 		putchar('\n');
 
@@ -115,5 +115,5 @@
 		}
 		console_flush(console);
-		console_set_color(console, COLOR_WHITE, COLOR_BLACK, 0);
+		console_set_style(console, STYLE_NORMAL);
 		putchar('\n');
 
Index: uspace/lib/congfx/src/console.c
===================================================================
--- uspace/lib/congfx/src/console.c	(revision d0fd86ae039182ebf31bdd28374f168b1afac9c5)
+++ uspace/lib/congfx/src/console.c	(revision 805a149bb760f7dc7a16bc1442f6c3e5b0186395)
@@ -300,5 +300,5 @@
  * @param cgc Console GC
  * @return EOK on success or an error code
- */ 
+ */
 errno_t console_gc_resume(console_gc_t *cgc)
 {