diff --git a/headers/os/interface/InterfaceDefs.h b/headers/os/interface/InterfaceDefs.h
index cfda7b0930..2508497b48 100644
--- a/headers/os/interface/InterfaceDefs.h
+++ b/headers/os/interface/InterfaceDefs.h
@@ -321,28 +321,44 @@ _IMPEXP_BE mode_mouse	mouse_mode();
 
 enum color_which {
 	B_PANEL_BACKGROUND_COLOR = 1,
+	B_PANEL_TEXT_COLOR = 10,
+	B_DOCUMENT_BACKGROUND_COLOR = 11,
+	B_DOCUMENT_TEXT_COLOR = 12,
+	B_CONTROL_BACKGROUND_COLOR = 13,
+	B_CONTROL_TEXT_COLOR = 14,
+	B_CONTROL_BORDER_COLOR = 15,
+	B_CONTROL_HIGHLIGHT_COLOR = 16,
+	B_NAVIGATION_BASE_COLOR = 4,
+	B_NAVIGATION_PULSE_COLOR = 17,
+	B_SHINE_COLOR = 18,
+	B_SHADOW_COLOR = 19,
+	
 	B_MENU_BACKGROUND_COLOR = 2,
-	B_MENU_SELECTION_BACKGROUND_COLOR = 6,
+	B_MENU_SELECTED_BACKGROUND_COLOR = 6,
 	B_MENU_ITEM_TEXT_COLOR = 7,
 	B_MENU_SELECTED_ITEM_TEXT_COLOR = 8,
-	B_WINDOW_TAB_COLOR = 3,
-	B_KEYBOARD_NAVIGATION_COLOR = 4,
+	B_MENU_SELECTED_BORDER_COLOR = 9,
+	
+	B_TOOLTIP_BACKGROUND_COLOR = 20,
+	B_TOOLTIP_TEXT_COLOR = 21,
+	
+	B_SUCCESS_COLOR = 100,
+	B_FAILURE_COLOR = 101,
+	
+	// Old name synonyms.
+	B_KEYBOARD_NAVIGATION_COLOR = B_NAVIGATION_BASE_COLOR,
+	B_MENU_SELECTION_BACKGROUND_COLOR = B_MENU_SELECTED_BACKGROUND_COLOR,
+	
+	// These are deprecated -- do not use in new code.  See BScreen for
+	// the replacement for B_DESKTOP_COLOR.
 	B_DESKTOP_COLOR = 5,
+	B_WINDOW_TAB_COLOR = 3,
 
-	// OpenBeOS R1 expanded attributes
-	B_PANEL_TEXT_COLOR = 6,
-	B_DOCUMENT_BACKGROUND_COLOR = 7,
-	B_DOCUMENT_TEXT_COLOR = 8,
-	B_CONTROL_BACKGROUND_COLOR = 9,
-	B_CONTROL_TEXT_COLOR = 10,
-	B_CONTROL_HIGHLIGHT_COLOR = 11,
-	B_CONTROL_BORDER_COLOR = 12,
-	B_TOOLTIP_BACKGROUND_COLOR = 13,
-	B_TOOLTIP_TEXT_COLOR = 14,
-
-	B_WINDOW_TAB_TEXT_COLOR = 15,
-	B_INACTIVE_WINDOW_TAB_COLOR = 16,
-	B_INACTIVE_WINDOW_TAB_TEXT_COLOR = 17
+	B_RANDOM_COLOR = 0x80000000,
+	B_MICHELANGELO_FAVORITE_COLOR,
+	B_DSANDLER_FAVORITE_SKY_COLOR,
+	B_DSANDLER_FAVORITE_INK_COLOR,
+	B_DSANDLER_FAVORITE_SHOES_COLOR
 };
 
 _IMPEXP_BE rgb_color	ui_color(color_which which);