Index: trunk/bootcode/airboot.md5
===================================================================
--- trunk/bootcode/airboot.md5	(revision 64)
+++ trunk/bootcode/airboot.md5	(revision 65)
@@ -1,1 +1,1 @@
-d18ec4b581b32d87a485317e1a31ecd4 *airboot.bin
+93c13f43914d4e9b6497f4011a475601 *airboot.bin
Index: trunk/bootcode/regular/bootmenu.asm
===================================================================
--- trunk/bootcode/regular/bootmenu.asm	(revision 64)
+++ trunk/bootcode/regular/bootmenu.asm	(revision 65)
@@ -48,9 +48,17 @@
    call    VideoIO_Print                 ; Print Copyright Line...
 
-   ; Boot-Window...
-CLR_BOOT_WINDOW_CLASSIC    = 0901h
-CLR_BOOT_WINDOW_BM         = 0701h
-
-   mov     cx, CLR_BOOT_WINDOW_BM
+
+
+; Boot-Window... -- background color -- still need to adjust item-bg
+CLR_BOOT_WINDOW_CLASSIC = 0901h
+CLR_BOOT_WINDOW_BM      = 0701h
+CLR_BOOT_WINDOW_TB      = 0708h
+IFDEF TESTBUILD
+CLR_BOOT_WINDOW = CLR_BOOT_WINDOW_TB
+ELSE
+CLR_BOOT_WINDOW = CLR_BOOT_WINDOW_BM
+ENDIF
+
+   mov     cx, CLR_BOOT_WINDOW
    call    VideoIO_Color
    mov     bx, 0201h
@@ -72,10 +80,17 @@
    mov     Menu_AbsoluteX, dl
 
-   ; Display Top-Infos (labels) in Boot-Window
-
-CLR_TOP_INFOS_CLASSIC    = 0b01h
-CLR_TOP_INFOS_BM  = 0301h
-
-   mov     cx, CLR_TOP_INFOS_BM
+
+
+; Display Top-Infos (labels) in Boot-Window
+CLR_TOP_INFOS_CLASSIC = 0b01h
+CLR_TOP_INFOS_BM      = 0301h
+CLR_TOP_INFOS_TB      = 0308h
+IFDEF TESTBUILD
+CLR_TOP_INFOS = CLR_TOP_INFOS_TB
+ELSE
+CLR_TOP_INFOS = CLR_TOP_INFOS_BM
+ENDIF
+
+   mov     cx, CLR_TOP_INFOS
    call    VideoIO_Color
    mov     ch, 03h
@@ -104,9 +119,17 @@
    call    VideoIO_Print
 
-   ; Now make the separating vertical lines...
-CLR_SEP_VERT_LINES_CLASSIC    = 0901h
-CLR_SEP_VERT_LINES_BM   = 0701h
-
-   mov     cx, CLR_SEP_VERT_LINES_BM
+
+
+; Now make the separating vertical lines...
+CLR_SEP_VERT_LINES_CLASSIC  = 0901h
+CLR_SEP_VERT_LINES_BM       = 0701h
+CLR_SEP_VERT_LINES_TB       = 0708h
+IFDEF TESTBUILD
+CLR_SEP_VERT_LINES = CLR_SEP_VERT_LINES_TB
+ELSE
+CLR_SEP_VERT_LINES = CLR_SEP_VERT_LINES_BM
+ENDIF
+
+   mov     cx, CLR_SEP_VERT_LINES
    call    VideoIO_Color
    mov     ch, 03h
@@ -174,19 +197,16 @@
    ; Boot-Window is DONE
 
-; Rousseau: = Colors =
-; FG
-; BG
-; 7 = grey
-; 6 = brown
-; 5 = magenta
-; 4 = red
-; 3 = cyan
-; 2 = green
-; 1 = blue
-
-CLR_INFO_WINDOW_CLASSIC    = 0c04h
-CLR_INFO_WINDOW_BM   = 0701h
-
-   mov     cx, CLR_INFO_WINDOW_BM
+
+
+CLR_INFO_WINDOW_CLASSIC = 0c04h
+CLR_INFO_WINDOW_BM      = 0701h
+CLR_INFO_WINDOW_TB      = 0708h
+IFDEF TESTBUILD
+CLR_INFO_WINDOW = CLR_INFO_WINDOW_TB
+ELSE
+CLR_INFO_WINDOW = CLR_INFO_WINDOW_BM
+ENDIF
+
+   mov     cx, CLR_INFO_WINDOW
    ;mov     cx, 0C06h ; brown, main background
    call    VideoIO_Color                    ; Color info window
@@ -207,8 +227,16 @@
    call    VideoIO_Locate
 
-CLR_INFO_TEXT_CLASSIC   = 0f04h
-CLR_INFO_TEXT_BM   = 0701h
-
-   mov     cx, CLR_INFO_TEXT_BM             ; Info text
+
+
+CLR_INFO_TEXT_CLASSIC = 0f04h
+CLR_INFO_TEXT_BM      = 0701h
+CLR_INFO_TEXT_TB      = 0708h
+IFDEF TESTBUILD
+CLR_INFO_TEXT = CLR_INFO_TEXT_TB
+ELSE
+CLR_INFO_TEXT = CLR_INFO_TEXT_BM
+ENDIF
+
+   mov     cx, CLR_INFO_TEXT            ; Info text
    call    VideoIO_Color                    ; Color info text
 
@@ -219,10 +247,17 @@
    mov     si, offset TXT_BootMenuHelpText2
    call    VideoIO_Print
+
 
 
 CLR_F10_SETUP_CLASSIC   = 0c04h
 CLR_F10_SETUP_BM        = 0901h
-
-   mov     cx, CLR_F10_SETUP_BM                            ; background F10 enter Setup
+CLR_F10_SETUP_TB        = 0908h
+IFDEF TESTBUILD
+CLR_F10_SETUP = CLR_F10_SETUP_TB
+ELSE
+CLR_F10_SETUP = CLR_F10_SETUP_BM
+ENDIF
+
+   mov     cx, CLR_F10_SETUP                            ; background F10 enter Setup
    call    VideoIO_Color
 
@@ -274,8 +309,16 @@
    ; -------------------------------------------
 
-CLR_GOODBYE_WINDOW_CLASSIC = 0d05h
-CLR_GOODBYE_WINDOW_BM   = 0f01h
-
-   mov     cx, CLR_GOODBYE_WINDOW_BM
+
+
+CLR_GOODBYE_WINDOW_CLASSIC  = 0d05h
+CLR_GOODBYE_WINDOW_BM       = 0f01h
+CLR_GOODBYE_WINDOW_TB       = 0f01h
+IFDEF TESTBUILD
+CLR_GOODBYE_WINDOW = CLR_GOODBYE_WINDOW_TB
+ELSE
+CLR_GOODBYE_WINDOW = CLR_GOODBYE_WINDOW_BM
+ENDIF
+
+   mov     cx, CLR_GOODBYE_WINDOW
    call    VideoIO_Color
    mov     bx, 0101h
@@ -314,8 +357,16 @@
    call    VideoIO_PrintSingleChar
 
-CLR_GOODBYE_AB_VERSION_CLASSIC   = 0e01h
-CLR_GOODBYE_AB_VERSION_BM  = 0e03h
-
-   mov     cx, CLR_GOODBYE_AB_VERSION_BM
+
+
+CLR_GOODBYE_AB_VERSION_CLASSIC  = 0e01h
+CLR_GOODBYE_AB_VERSION_BM       = 0e03h
+CLR_GOODBYE_AB_VERSION_TB       = 0e03h
+IFDEF TESTBUILD
+CLR_GOODBYE_AB_VERSION = CLR_GOODBYE_AB_VERSION_TB
+ELSE
+CLR_GOODBYE_AB_VERSION = CLR_GOODBYE_AB_VERSION_BM
+ENDIF
+
+   mov     cx, CLR_GOODBYE_AB_VERSION
    call    VideoIO_Color
    mov     si, offset Copyright
@@ -331,8 +382,16 @@
    call    VideoIO_Locate
 
-   CLR_GOODBYE_WINDOW_CLASSIC_2    = 0f05h
-   CLR_GOODBYE_WINDOW_BM_2   = 0701h
-
-   mov     cx,  CLR_GOODBYE_WINDOW_BM_2
+
+
+CLR_GOODBYE_WINDOW_CLASSIC_2    = 0f05h
+CLR_GOODBYE_WINDOW_BM_2         = 0701h
+CLR_GOODBYE_WINDOW_TB_2         = 0701h
+IFDEF TESTBUILD
+CLR_GOODBYE_WINDOW_2 = CLR_GOODBYE_WINDOW_TB_2
+ELSE
+CLR_GOODBYE_WINDOW_2 = CLR_GOODBYE_WINDOW_BM_2
+ENDIF
+
+   mov     cx,  CLR_GOODBYE_WINDOW_2
    call    VideoIO_Color
    inc     si
@@ -362,8 +421,16 @@
    call    VideoIO_Locate
 
-CLR_NON_TIMED_BAR_CLASSIC  = 0e04h
-CLR_NON_TIMED_BAR_BM = 0701h
-
-   mov     cx, CLR_NON_TIMED_BAR_BM                      ; non-timed time bar
+
+
+CLR_NON_TIMED_BAR_CLASSIC   = 0e04h
+CLR_NON_TIMED_BAR_BM        = 0701h
+CLR_NON_TIMED_BAR_TB        = 0708h
+IFDEF TESTBUILD
+CLR_NON_TIMED_BAR = CLR_NON_TIMED_BAR_TB
+ELSE
+CLR_NON_TIMED_BAR = CLR_NON_TIMED_BAR_BM
+ENDIF
+
+   mov     cx, CLR_NON_TIMED_BAR                      ; non-timed time bar
    call    VideoIO_Color
    call    VideoIO_Internal_SetRegs
@@ -384,8 +451,16 @@
    call    VideoIO_Locate
 
+
+
 CLR_TIMED_BAR_CLASSIC   = 0e04h
-CLR_TIMED_BAR_BM  = 0e04h
-
-   mov     cx, CLR_TIMED_BAR_BM ; timed time bar, yellow on red
+CLR_TIMED_BAR_BM        = 0e04h
+CLR_TIMED_BAR_TB        = 0e04h
+IFDEF TESTBUILD
+CLR_TIMED_BAR = CLR_TIMED_BAR_TB
+ELSE
+CLR_TIMED_BAR = CLR_TIMED_BAR_BM
+ENDIF
+
+   mov     cx, CLR_TIMED_BAR ; timed time bar, yellow on red
    call    VideoIO_Color
    mov     si, offset TXT_TimedBootLine  ; will print TimedBootEntryName too
@@ -419,6 +494,13 @@
 
 
-CLR_VOLUME_INDEX_CLASSIC   = 0f01h
-CLR_VOLUME_INDEX_BM  = 0f01h
+
+CLR_VOLUME_INDEX_CLASSIC    = 0f01h
+CLR_VOLUME_INDEX_BM         = 0f01h
+CLR_VOLUME_INDEX_TB         = 0f08h
+IFDEF TESTBUILD
+CLR_VOLUME_INDEX = CLR_VOLUME_INDEX_TB
+ELSE
+CLR_VOLUME_INDEX = CLR_VOLUME_INDEX_BM
+ENDIF
 
 ; Writes Partition-Information to Screen (Boot-Menu)
@@ -436,5 +518,5 @@
    mov     dh, cl
    call    VideoIO_Locate
-   mov     cx, CLR_VOLUME_INDEX_BM                     ; Bwhite, blue
+   mov     cx, CLR_VOLUME_INDEX                     ; Bwhite, blue
    call    VideoIO_Color
    mov     al, dl
@@ -450,8 +532,16 @@
    call    VideoIO_Locate
 
+
+
 CLR_HD_INDEX_CLASSIC    = 0d01h
-CLR_HD_INDEX_BM   = 0701h
-
-   mov     cx, CLR_HD_INDEX_BM
+CLR_HD_INDEX_BM         = 0701h
+CLR_HD_INDEX_TB         = 0708h
+IFDEF TESTBUILD
+CLR_HD_INDEX = CLR_HD_INDEX_TB
+ELSE
+CLR_HD_INDEX = CLR_HD_INDEX_BM
+ENDIF
+
+   mov     cx, CLR_HD_INDEX
    call    VideoIO_Color                 ; Violet, blue
    mov     si, PartPointer
@@ -472,8 +562,16 @@
       ; Now display Size-Element...
 
-CLR_HD_SIZE_CLASSIC  = 0501h
-CLR_HD_SIZE_BM = 0701h
-
-      mov     cx, CLR_HD_SIZE_BM
+
+
+CLR_HD_SIZE_CLASSIC = 0501h
+CLR_HD_SIZE_BM      = 0701h
+CLR_HD_SIZE_TB      = 0708h
+IFDEF TESTBUILD
+CLR_HD_SIZE = CLR_HD_SIZE_TB
+ELSE
+CLR_HD_SIZE = CLR_HD_SIZE_BM
+ENDIF
+
+      mov     cx, CLR_HD_SIZE
       call    VideoIO_Color              ; Dark-Violet, Blue
       mov     al, '/'
@@ -497,8 +595,16 @@
    call    VideoIO_Locate
 
-CLR_LABEL_CLASSIC    = 0e01h
-CLR_LABEL_BM   = 0f01h
-
-   mov     cx, CLR_LABEL_BM
+
+
+CLR_LABEL_CLASSIC   = 0e01h
+CLR_LABEL_BM        = 0f01h
+CLR_LABEL_TB        = 0f08h
+IFDEF TESTBUILD
+CLR_LABEL = CLR_LABEL_TB
+ELSE
+CLR_LABEL = CLR_LABEL_BM
+ENDIF
+
+   mov     cx, CLR_LABEL
    call    VideoIO_Color                 ; Yellow, blue
    mov     si, PartPointer
@@ -518,11 +624,16 @@
    call    PART_SearchFileSysName
 
-CLR_FS_NAME_CLASSIC  =  0c01h
-CLR_FS_NAME_BM =  0701h
-
-; Color for drive-letter
-CLR_DL_BM   = 0f01h
-
-   mov     cx, CLR_FS_NAME_BM
+
+
+CLR_FS_NAME_CLASSIC = 0c01h
+CLR_FS_NAME_BM      = 0701h
+CLR_FS_NAME_TB      = 0708h
+IFDEF TESTBUILD
+CLR_FS_NAME = CLR_FS_NAME_TB
+ELSE
+CLR_FS_NAME = CLR_FS_NAME_BM
+ENDIF
+
+   mov     cx, CLR_FS_NAME
    call    VideoIO_Color                 ; Hrot, Blau
    mov     cl, 8
@@ -530,4 +641,26 @@
 
 
+
+; Color for drive-letter
+CLR_DL_CLASSIC  = 0f01h
+CLR_DL_BM       = 0f01h
+CLR_DL_TB       = 0f08h
+IFDEF TESTBUILD
+CLR_DL = CLR_DL_TB
+ELSE
+CLR_DL = CLR_DL_BM
+ENDIF
+
+
+
+; Color for hidden drive-letter
+CLR_DL_HIDDEN_CLASSIC   = 0701h
+CLR_DL_HIDDEN_BM        = 0701h
+CLR_DL_HIDDEN_TB        = 0708h
+IFDEF TESTBUILD
+CLR_DL_HIDDEN = CLR_DL_HIDDEN_TB
+ELSE
+CLR_DL_HIDDEN = CLR_DL_HIDDEN_BM
+ENDIF
 
 DRIVELETTERS_ENABLE     EQU
@@ -605,9 +738,9 @@
 
         mov     si, offset [dl_hidden]
-        mov     cx, CLR_DL_BM
+        mov     cx, CLR_DL
         call    VideoIO_Color
         call    VideoIO_Print
 
-        mov     cx, 0701h
+        mov     cx, CLR_DL_HIDDEN
         call    VideoIO_Color
 
@@ -625,5 +758,5 @@
         call    VideoIO_Print
 
-        mov     cx, CLR_DL_BM
+        mov     cx, CLR_DL
         call    VideoIO_Color
 
@@ -657,5 +790,17 @@
    ;call  SOUND_Beep
 
-   mov     cl, 10h    ; Color BLUE, Partition DL
+
+
+; SELECTION BAR REDRAW
+CLR_SELECTION_BAR_REDRAW_CLASSIC    = 10h
+CLR_SELECTION_BAR_REDRAW_BM         = 10h
+CLR_SELECTION_BAR_REDRAW_TB         = 80h
+IFDEF TESTBUILD
+CLR_SELECTION_BAR_REDRAW = CLR_SELECTION_BAR_REDRAW_TB
+ELSE
+CLR_SELECTION_BAR_REDRAW = CLR_SELECTION_BAR_REDRAW_BM
+ENDIF
+
+   mov     cl, CLR_SELECTION_BAR_REDRAW    ; Color BROWN, Partition DL
    call    BOOTMENU_ReColorPart
 
@@ -697,31 +842,19 @@
 
 
-; Keuze bar
-; 00h black
-; 10h blue
-; 20h green (also nice)
-; 30h cyan (also nice)
-; 40h red
-; 50h magenta
-; 60h brown (nice)
-; 70h white
-; 80h grey
-; 90h light blue (nice)
-; 0a0h bright green
-; 0b0h bright cyan
-; 0c0h bright red
-; 0d0h bright magenta
-; 0e0h bright yellow
-; 0f0h bright white
-
-
-CLR_SELECTION_BAR_CLASSIC  = 50h
-CLR_SELECTION_BAR_BM = 090h
-CLR_SELECTION_BAR_WARNING = 040h
-
+
+; SELECTION BAR
+CLR_SELECTION_BAR_CLASSIC   = 50h
+CLR_SELECTION_BAR_BM        = 90h
+CLR_SELECTION_BAR_WARNING   = 40h
+CLR_SELECTION_BAR_TB        = 60h
+IFDEF TESTBUILD
+CLR_SELECTION_BAR = CLR_SELECTION_BAR_TB
+ELSE
+CLR_SELECTION_BAR = CLR_SELECTION_BAR_BM
+ENDIF
 
 
   BMBCB_AfterScrolling:
-   mov     cl, CLR_SELECTION_BAR_BM
+   mov     cl, CLR_SELECTION_BAR
    test     byte ptr [TooManyPartitions],0ffh ; Check for too many partitions.
    jz       BOOTMENU_BuildChoiceBar_normal
@@ -1131,5 +1264,2 @@
         ret
 BOOTMENU_ResetGetFloppy     EndP
-
-
-
Index: trunk/bootcode/regular/videoio.asm
===================================================================
--- trunk/bootcode/regular/videoio.asm	(revision 64)
+++ trunk/bootcode/regular/videoio.asm	(revision 65)
@@ -103,4 +103,5 @@
 VideoIO_CursorSet               EndP
 
+; Sets DI which is used across many video routines !
 VideoIO_Internal_SetRegs        Proc Near   Uses bx
    mov     ax, VideoIO_Segment
Index: trunk/bootcode/setup/main.asm
===================================================================
--- trunk/bootcode/setup/main.asm	(revision 64)
+++ trunk/bootcode/setup/main.asm	(revision 65)
@@ -324,12 +324,19 @@
 
 
-
-CLR_MENU_WINDOW_CLASSIC    = 0e01h
-CLR_MENU_WINDOW_BM   = 0e01h
+; Initial bg-colors on setup-items -- revert to item-bg when cursor moved
+CLR_MENU_WINDOW_CLASSIC = 0e01h
+CLR_MENU_WINDOW_BM      = 0e01h
+CLR_MENU_WINDOW_TB      = 0e08h
+IFDEF TESTBUILD
+CLR_MENU_WINDOW = CLR_MENU_WINDOW_TB
+ELSE
+CLR_MENU_WINDOW = CLR_MENU_WINDOW_BM
+ENDIF
+
 ;        In: BP - Pointer to Menu
 ;       Out: DH - Active Item on Screen
 SETUP_DrawMenuOnScreen          Proc Near
    call    SETUP_DrawMenuWindow
-   mov     cx, CLR_MENU_WINDOW_BM
+   mov     cx, CLR_MENU_WINDOW
    call    VideoIO_Color
    xor     ch, ch
@@ -358,12 +365,18 @@
 
 
-
 CLR_SELECTED_ITEM_CLASSIC  = 0f04h
-CLR_SELECTED_ITEM_BM = 0f04h
+CLR_SELECTED_ITEM_BM       = 0f04h
+CLR_SELECTED_ITEM_TB       = 0f04h
+IFDEF TESTBUILD
+CLR_SELECTED_ITEM = CLR_SELECTED_ITEM_TB
+ELSE
+CLR_SELECTED_ITEM = CLR_SELECTED_ITEM_BM
+ENDIF
+
 ; Displays selected Item on screen
 ;        In: DH - Active Item
 ; Destroyed: None
 SETUP_DrawSelectItem            Proc Near Uses cx
-   mov     cx, CLR_SELECTED_ITEM_BM
+   mov     cx, CLR_SELECTED_ITEM
    call    VideoIO_Color
    mov     ch, dh
@@ -373,11 +386,18 @@
 
 
-CLR_DESELECTED_ITEM_CLASSIC  = 0e01h
-CLR_DESELECTED_ITEM_BM  = 0e01h
+CLR_DESELECTED_ITEM_CLASSIC   = 0e01h
+CLR_DESELECTED_ITEM_BM        = 0e01h
+CLR_DESELECTED_ITEM_TB        = 0e08h
+IFDEF TESTBUILD
+CLR_DESELECTED_ITEM = CLR_DESELECTED_ITEM_TB
+ELSE
+CLR_DESELECTED_ITEM = CLR_DESELECTED_ITEM_BM
+ENDIF
+
 ; Display last-selected Item on screen (De-Select)
 ;        In: DL - Active Item
 ; Destroyed: None
 SETUP_DrawDeSelectItem          Proc Near Uses cx
-   mov     cx, CLR_DESELECTED_ITEM_BM
+   mov     cx, CLR_DESELECTED_ITEM
    call    VideoIO_Color
    mov     ch, dl
@@ -441,8 +461,15 @@
          call    VideoIO_Locate
 
+
 CLR_ITEM_PACK_CLASSIC   = 0f01h
-CLR_ITEM_PACK_BM  = 0f01h
-
-         mov     cx, CLR_ITEM_PACK_BM
+CLR_ITEM_PACK_BM        = 0f01h
+CLR_ITEM_PACK_TB        = 0f08h
+IFDEF TESTBUILD
+CLR_ITEM_PACK = CLR_ITEM_PACK_TB
+ELSE
+CLR_ITEM_PACK = CLR_ITEM_PACK_BM
+ENDIF
+
+         mov     cx, CLR_ITEM_PACK
          call    VideoIO_Color           ; White on blue background
          mov     si, ds:[si+LocMENU_ItemNamePtr] ; SI - Name of Item
@@ -496,8 +523,15 @@
 SETUP_FillUpItemPack_Now        EndP
 
-
+CLR_SETUP_WINDOW_CLASSIC   = 0f01h
+CLR_SETUP_WINDOW_BM        = 0901h
+CLR_SETUP_WINDOW_TB        = 0908h
+IFDEF TESTBUILD
+CLR_SETUP_WINDOW = CLR_SETUP_WINDOW_TB
+ELSE
+CLR_SETUP_WINDOW = CLR_SETUP_WINDOW_BM
+ENDIF
 
 SETUP_DrawMenuWindow            Proc Near   Uses es
-   mov     cx, 0901h
+   mov     cx, CLR_SETUP_WINDOW
    call    VideoIO_Color
    mov     bx, 0401h
@@ -627,9 +661,20 @@
 SETUP_DrawMenuBase              EndP
 
+
+; F10-SETUP Help Directions
+CLR_SETUP_HELP_CLASSIC   = 0f01h
+CLR_SETUP_HELP_BM        = 0f01h
+CLR_SETUP_HELP_TB        = 0f08h
+IFDEF TESTBUILD
+CLR_SETUP_HELP = CLR_SETUP_HELP_TB
+ELSE
+CLR_SETUP_HELP = CLR_SETUP_HELP_BM
+ENDIF
+
 ; Zeichnet die Men Hilfe aufn Bildschirm
 ;        In: SI - Pointer to 4 HelpStrings...
 ; Destroyed: None
 SETUP_DrawMenuHelp              Proc Near   Uses cx si
-   mov     cx, 0F01h
+   mov     cx, CLR_SETUP_HELP
    call    VideoIO_Color
    mov     cx, 0F05h
@@ -893,5 +938,5 @@
    cmp     ax, 0ABABh                    ; Magic Processing...
    je      SLEP_MagicLayOut
-   mov     cx, 0D05h
+   mov     cx, 0D05h                     ; Password Dialog
    call    VideoIO_Color
 
@@ -908,5 +953,5 @@
    dec     dl                            ; Size window to match given string...
    call    VideoIO_MakeWindow
-   mov     cx, 0F05h
+   mov     cx, 0F05h                     ; Password EntryField Label
    call    VideoIO_Color
 
@@ -916,5 +961,5 @@
    call    VideoIO_Locate
    call    VideoIO_Print                 ; Uses given string 'Define or Verify'
-   mov     cx, 0E05h
+   mov     cx, 0E05h                     ; Password EntryField
    call    VideoIO_Color
    mov     word ptr [EnterPwd_Location], 0E26h
@@ -923,5 +968,5 @@
 
   SLEP_MagicLayOut:
-   mov     cx, 0C04h
+   mov     cx, 0C04h                      ; Only used for different (unused) layout (ABAB)
    call    VideoIO_Color
 
Index: trunk/bootcode/setup/part_set.asm
===================================================================
--- trunk/bootcode/setup/part_set.asm	(revision 64)
+++ trunk/bootcode/setup/part_set.asm	(revision 65)
@@ -204,4 +204,14 @@
 
 
+
+CLR_SETUP_PARTITION_LABELS_CLASSIC  = 0b01h
+CLR_SETUP_PARTITION_LABELS_BM       = 0b01h
+CLR_SETUP_PARTITION_LABELS_TB       = 0b08h
+IFDEF TESTBUILD
+CLR_SETUP_PARTITION_LABELS = CLR_SETUP_PARTITION_LABELS_TB
+ELSE
+CLR_SETUP_PARTITION_LABELS = CLR_SETUP_PARTITION_LABELS_BM
+ENDIF
+
 ; Draw all standard-things for Partition Setup, dynamic content not included.
 PARTSETUP_DrawMenuBase          Proc Near   Uses dx
@@ -244,5 +254,5 @@
    call    VideoIO_Internal_MakeWinDown
 
-   mov     cx, 0B01h
+   mov     cx, CLR_SETUP_PARTITION_LABELS   ; F10-SETUP-PARTITION-SETUP labels bg
    call    VideoIO_Color
 
@@ -307,5 +317,9 @@
    jnz     PSRP_Loop
    ; At last calculate Scroll-Markers
+IFDEF TESTBUILD
+   mov     cx, 0908h
+ELSE
    mov     cx, 0901h
+ENDIF
    call    VideoIO_Color
    mov     cx, 0603h                     ; 6, 3
@@ -388,5 +402,9 @@
    call    VideoIO_Locate
    push    cx
+IFDEF TESTBUILD
+      mov     cx, 0F08h
+ELSE
       mov     cx, 0F01h
+ENDIF
       call    VideoIO_Color              ; Bright White, Blue
    pop     cx
@@ -404,5 +422,9 @@
    call    VideoIO_Locate
    push    cx
+IFDEF TESTBUILD
+      mov     cx, 0E08h
+ELSE
       mov     cx, 0E01h
+ENDIF
       call    VideoIO_Color              ; Yellow, Blue
       push    si
@@ -443,5 +465,9 @@
    call    VideoIO_Locate
    push    cx
+IFDEF TESTBUILD
+      mov     cx, 0C08h
+ELSE
       mov     cx, 0C01h
+ENDIF
       call    VideoIO_Color              ; Bright Red, Blue
    pop     cx
@@ -457,5 +483,9 @@
 ; Destroyed: None
 PARTSETUP_DrawOneFlag           Proc Near   Uses cx
+IFDEF TESTBUILD
+   mov     cx, 0A08h                     ; Bright Green
+ELSE
    mov     cx, 0A01h                     ; Bright Green
+ENDIF
    or      bl, bl
    jnz     PSDOF_FlagSet
@@ -466,4 +496,14 @@
    ret
 PARTSETUP_DrawOneFlag           EndP
+
+; F10-SETUP
+CLR_SETUP_SELECTION_BAR_CLASSIC  = 10h
+CLR_SETUP_SELECTION_BAR_BM       = 10h
+CLR_SETUP_SELECTION_BAR_TB       = 80h
+IFDEF TESTBUILD
+CLR_SETUP_SELECTION_BAR = CLR_SETUP_SELECTION_BAR_TB
+ELSE
+CLR_SETUP_SELECTION_BAR = CLR_SETUP_SELECTION_BAR_BM
+ENDIF
 
 ;        In: DL - Current Active (to be inactivated)
@@ -477,5 +517,5 @@
 
    ; Deactivate current active bar
-   mov     cl, 10h
+   mov     cl, CLR_SETUP_SELECTION_BAR
    call    PARTSETUP_ReColorPart
 
@@ -513,5 +553,5 @@
 
    ; Activate fresh active bar
-   mov     cl, 40h
+   mov     cl, 40h                       ; F10-SETUP SelectionBar Active bg
    call    PARTSETUP_ReColorPart
    ; Now DL==DH
@@ -623,5 +663,5 @@
     ; BOOKMARK: LVM Label Manipulations
     ;
-    
+
     ; ------------------------------------------------------------[LVM CHECK]---
     ; Load LVM-Sector here and seek to PartitionName
@@ -983,8 +1023,16 @@
    ; PartSetup_HiddenX1
 
-CLR_PART_HIDE_WINDOW_BASE_CLASSIC   = 0d05h
-CLR_PART_HIDE_WINDOW_BASE_BM   = 0a02h
-
-   mov     cx, CLR_PART_HIDE_WINDOW_BASE_BM                    ; Lila on lila
+
+
+CLR_PART_HIDE_WINDOW_BASE_CLASSIC  = 0d05h
+CLR_PART_HIDE_WINDOW_BASE_BM       = 0a02h
+CLR_PART_HIDE_WINDOW_BASE_TB       = 0a02h
+IFDEF TESTBUILD
+CLR_PART_HIDE_WINDOW_BASE = CLR_PART_HIDE_WINDOW_BASE_TB
+ELSE
+CLR_PART_HIDE_WINDOW_BASE = CLR_PART_HIDE_WINDOW_BASE_BM
+ENDIF
+
+   mov     cx, CLR_PART_HIDE_WINDOW_BASE                    ; Lila on lila
    call    VideoIO_Color
    mov     bh, 05h
@@ -1004,21 +1052,38 @@
    call    VideoIO_PrintSingleChar
 
-CLR_PART_HIDE_WINDOW_LABEL_CLASSIC = 0e05h
-CLR_PART_HIDE_WINDOW_LABEL_BM = 0e02h
-
-   mov     cx, CLR_PART_HIDE_WINDOW_LABEL_BM                     ; Yellow on Lila
+
+
+CLR_PART_HIDE_WINDOW_LABEL_CLASSIC  = 0e05h
+CLR_PART_HIDE_WINDOW_LABEL_BM       = 0e02h
+CLR_PART_HIDE_WINDOW_LABEL_TB       = 0e02h
+IFDEF TESTBUILD
+CLR_PART_HIDE_WINDOW_LABEL = CLR_PART_HIDE_WINDOW_LABEL_TB
+ELSE
+CLR_PART_HIDE_WINDOW_LABEL = CLR_PART_HIDE_WINDOW_LABEL_BM
+ENDIF
+
+   mov     cx, CLR_PART_HIDE_WINDOW_LABEL                     ; Yellow on Lila
    call    VideoIO_Color
    mov     si, offset TXT_SETUP_HideFeature
    call    VideoIO_Print
 
+
+
 CLR_PART_HIDE_WINDOW_BORDER_CLASSIC = 0d05h
-CLR_PART_HIDE_WINDOW_BORDER_BM = 0d02h
-
-
-   mov     cx, CLR_PART_HIDE_WINDOW_BORDER_BM                     ; Lila on lila
+CLR_PART_HIDE_WINDOW_BORDER_BM      = 0d02h
+CLR_PART_HIDE_WINDOW_BORDER_TB      = 0d02h
+IFDEF TESTBUILD
+CLR_PART_HIDE_WINDOW_BORDER = CLR_PART_HIDE_WINDOW_BORDER_TB
+ELSE
+CLR_PART_HIDE_WINDOW_BORDER = CLR_PART_HIDE_WINDOW_BORDER_BM
+ENDIF
+
+   mov     cx, CLR_PART_HIDE_WINDOW_BASE                     ; Lila on lila
    call    VideoIO_Color
    mov     al, 'Æ'
    call    VideoIO_PrintSingleChar
    ; --- Make Window-Footer - "State when booting..." at bottom right frame-line
+   mov     cx, CLR_PART_HIDE_WINDOW_BORDER                     ; Lila on lila
+   call    VideoIO_Color
    mov     dh, 10h
    mov     dl, [PartSetup_HiddenX]
@@ -1074,8 +1139,16 @@
    ; --- Make ':' Line down
 
-CLR_PART_HIDE_MENU_BASE_CLASSIC  = 0f05h
-CLR_PART_HIDE_MENU_BASE_BM  = 0f02h
-
-   mov     cx, CLR_PART_HIDE_MENU_BASE_BM                     ; Yellow on Lila
+
+
+CLR_PART_HIDE_MENU_BASE_CLASSIC = 0f05h
+CLR_PART_HIDE_MENU_BASE_BM      = 0f02h
+CLR_PART_HIDE_MENU_BASE_TB      = 0f02h
+IFDEF TESTBUILD
+CLR_PART_HIDE_MENU_BASE = CLR_PART_HIDE_MENU_BASE_TB
+ELSE
+CLR_PART_HIDE_MENU_BASE = CLR_PART_HIDE_MENU_BASE_BM
+ENDIF
+
+   mov     cx, CLR_PART_HIDE_MENU_BASE                     ; Yellow on Lila
    call    VideoIO_Color
    mov     ch, 07h
@@ -1100,9 +1173,17 @@
    jnz     PHSRP_Loop
 
+
+
 CLR_PART_HIDE_MENU_MARKERS_CLASSIC = 0d05h
-CLR_PART_HIDE_MENU_MARKERS_BM = 0a02h
+CLR_PART_HIDE_MENU_MARKERS_BM      = 0a02h
+CLR_PART_HIDE_MENU_MARKERS_TB      = 0a02h
+IFDEF TESTBUILD
+CLR_PART_HIDE_MENU_MARKERS = CLR_PART_HIDE_MENU_MARKERS_TB
+ELSE
+CLR_PART_HIDE_MENU_MARKERS = CLR_PART_HIDE_MENU_MARKERS_BM
+ENDIF
 
    ; At last calculate Scroll-Markers
-   mov     cx, CLR_PART_HIDE_MENU_MARKERS_BM                     ; Lila on lila                          ; Hide Feature Markers
+   mov     cx, CLR_PART_HIDE_MENU_MARKERS                     ; Lila on lila                          ; Hide Feature Markers
    call    VideoIO_Color
    mov     cx, 0603h                     ; 6, +3
@@ -1150,8 +1231,16 @@
       ; Display "Label" field aka "OS2" without ending NULs/Spaces
 
+
+
 CLR_PART_HIDE_LABEL_CLASSIC   = 0f05h
-CLR_PART_HIDE_LABEL_BM = 0f02h
-
-      mov     cx, CLR_PART_HIDE_LABEL_BM
+CLR_PART_HIDE_LABEL_BM        = 0f02h
+CLR_PART_HIDE_LABEL_TB        = 0f02h
+IFDEF TESTBUILD
+CLR_PART_HIDE_LABEL = CLR_PART_HIDE_LABEL_TB
+ELSE
+CLR_PART_HIDE_LABEL = CLR_PART_HIDE_LABEL_BM
+ENDIF
+
+      mov     cx, CLR_PART_HIDE_LABEL
       call    VideoIO_Color              ; Bright White on Lila
       push    si
@@ -1162,8 +1251,16 @@
       pop     si
 
-CLR_PART_HIDE_WINDOW_FS_CLASSIC   = 0d05h
-CLR_PART_HIDE_WINDOW_FS_BM = 0a02h
-
-      mov     cx, CLR_PART_HIDE_WINDOW_FS_BM
+
+
+CLR_PART_HIDE_WINDOW_FS_CLASSIC  = 0d05h
+CLR_PART_HIDE_WINDOW_FS_BM       = 0a02h
+CLR_PART_HIDE_WINDOW_FS_TB       = 0a02h
+IFDEF TESTBUILD
+CLR_PART_HIDE_WINDOW_FS = CLR_PART_HIDE_WINDOW_FS_TB
+ELSE
+CLR_PART_HIDE_WINDOW_FS = CLR_PART_HIDE_WINDOW_FS_BM
+ENDIF
+
+      mov     cx, CLR_PART_HIDE_WINDOW_FS
       call    VideoIO_Color              ; Bright Lila on Lila
       mov     al, ' '
@@ -1187,8 +1284,16 @@
    push    cx
 
+
+
 CLR_PART_HIDE_WINDOW_CHOISES_CLASSIC   = 0e05h
-CLR_PART_HIDE_WINDOW_CHOISES_BM   = 0e02h
-
-      mov     cx, CLR_PART_HIDE_WINDOW_CHOISES_BM
+CLR_PART_HIDE_WINDOW_CHOISES_BM        = 0e02h
+CLR_PART_HIDE_WINDOW_CHOISES_TB        = 0e02h
+IFDEF TESTBUILD
+CLR_PART_HIDE_WINDOW_CHOISES = CLR_PART_HIDE_WINDOW_CHOISES_TB
+ELSE
+CLR_PART_HIDE_WINDOW_CHOISES = CLR_PART_HIDE_WINDOW_CHOISES_BM
+ENDIF
+
+      mov     cx, CLR_PART_HIDE_WINDOW_CHOISES
       call    VideoIO_Color              ; Yellow on Lila
       mov     al, ' '
@@ -1222,9 +1327,17 @@
   PHSBCB_SkipRetrace:
 
+
+
 CLR_PART_HIDE_WINDOW_MENU_BAR_CLASSIC  = 5eh
-CLR_PART_HIDE_WINDOW_MENU_BAR_BM = 2eh
+CLR_PART_HIDE_WINDOW_MENU_BAR_BM       = 2eh
+CLR_PART_HIDE_WINDOW_MENU_BAR_TB       = 2eh
+IFDEF TESTBUILD
+CLR_PART_HIDE_WINDOW_MENU_BAR = CLR_PART_HIDE_WINDOW_MENU_BAR_TB
+ELSE
+CLR_PART_HIDE_WINDOW_MENU_BAR = CLR_PART_HIDE_WINDOW_MENU_BAR_BM
+ENDIF
 
    ; Deactivate current active bar
-   mov     cl, CLR_PART_HIDE_WINDOW_MENU_BAR_BM                       ; Yellow on Lila
+   mov     cl, CLR_PART_HIDE_WINDOW_MENU_BAR                       ; Yellow on Lila
    call    PARTHIDESETUP_ReColorPart
 
@@ -1259,10 +1372,17 @@
   PHSBCB_NoScrolling:
 
-   ; Activate fresh active bar
-
+
+
+; Activate fresh active bar
 CLR_PART_HIDE_WINDOW_MENU_ACTIVE_BAR_CLASSIC = 1fh
-CLR_PART_HIDE_WINDOW_MENU_ACTIVE_BAR_BM   = 1fh
-
-   mov     cl, CLR_PART_HIDE_WINDOW_MENU_ACTIVE_BAR_BM                       ; Bright White on Blue
+CLR_PART_HIDE_WINDOW_MENU_ACTIVE_BAR_BM      = 1fh
+CLR_PART_HIDE_WINDOW_MENU_ACTIVE_BAR_TB      = 1fh
+IFDEF TESTBUILD
+CLR_PART_HIDE_WINDOW_MENU_ACTIVE_BAR = CLR_PART_HIDE_WINDOW_MENU_ACTIVE_BAR_TB
+ELSE
+CLR_PART_HIDE_WINDOW_MENU_ACTIVE_BAR = CLR_PART_HIDE_WINDOW_MENU_ACTIVE_BAR_BM
+ENDIF
+
+   mov     cl, CLR_PART_HIDE_WINDOW_MENU_ACTIVE_BAR                       ; Bright White on Blue
    call    PARTHIDESETUP_ReColorPart
    ; Now DL==DH
@@ -1629,10 +1749,17 @@
    mov     PartSetup_HiddenX, al
 
-   ; Draw base-window
-
-CLR_PART_DL_XX_CLASSIC = 0d05h
-CLR_PART_DL_XX_BM = 0a02h
-
-   mov     cx, CLR_PART_DL_XX_BM                     ; Lila on lila
+
+
+; Draw base-window
+CLR_PART_DL_XX_CLASSIC  = 0d05h
+CLR_PART_DL_XX_BM       = 0a02h
+CLR_PART_DL_XX_TB       = 0a02h
+IFDEF TESTBUILD
+CLR_PART_DL_XX = CLR_PART_DL_XX_TB
+ELSE
+CLR_PART_DL_XX = CLR_PART_DL_XX_BM
+ENDIF
+
+   mov     cx, CLR_PART_DL_XX                     ; Lila on lila
    call    VideoIO_Color
    mov     bh, 06h
@@ -1652,16 +1779,32 @@
       call    VideoIO_PrintSingleChar
 
-CLR_PART_DL_WINDOW_TITLE_CLASSIC  = 0e05h
-CLR_PART_DL_WINDOW_TITLE_BM  = 0e02h
-
-      mov     cx, CLR_PART_DL_WINDOW_TITLE_BM                  ; Yellow on Lila
+
+
+CLR_PART_DL_WINDOW_TITLE_CLASSIC = 0e05h
+CLR_PART_DL_WINDOW_TITLE_BM      = 0e02h
+CLR_PART_DL_WINDOW_TITLE_TB      = 0e02h
+IFDEF TESTBUILD
+CLR_PART_DL_WINDOW_TITLE = CLR_PART_DL_WINDOW_TITLE_TB
+ELSE
+CLR_PART_DL_WINDOW_TITLE = CLR_PART_DL_WINDOW_TITLE_BM
+ENDIF
+
+      mov     cx, CLR_PART_DL_WINDOW_TITLE                  ; Yellow on Lila
       call    VideoIO_Color
       mov     si, offset TXT_SETUP_DriveLetter
       call    VideoIO_Print
 
+
+
 CLR_PART_DL_WINDOW_BORDER2_CLASSIC  = 0d05h
-CLR_PART_DL_WINDOW_BORDER2_BM  = 0a02h
-
-      mov     cx, CLR_PART_DL_WINDOW_BORDER2_BM                 ; Lila on lila
+CLR_PART_DL_WINDOW_BORDER2_BM       = 0a02h
+CLR_PART_DL_WINDOW_BORDER2_TB       = 0a02h
+IFDEF TESTBUILD
+CLR_PART_DL_WINDOW_BORDER2 = CLR_PART_DL_WINDOW_BORDER2_TB
+ELSE
+CLR_PART_DL_WINDOW_BORDER2 = CLR_PART_DL_WINDOW_BORDER2_BM
+ENDIF
+
+      mov     cx, CLR_PART_DL_WINDOW_BORDER2                 ; Lila on lila
       call    VideoIO_Color
       mov     al, 'Æ'
@@ -1671,9 +1814,16 @@
    mov     si, offset TXT_SETUPHELP_DriveLetter
 
-CLR_PART_DL_SETUP_HELP_CLASSIC = 0d05h
-CLR_PART_DL_SETUP_HELP_BM = 0a02h
-
-
-   mov     cx, CLR_PART_DL_SETUP_HELP_BM                     ; Lila on lila
+
+
+CLR_PART_DL_SETUP_HELP_CLASSIC   = 0d05h
+CLR_PART_DL_SETUP_HELP_BM        = 0a02h
+CLR_PART_DL_SETUP_HELP_TB        = 0a02h
+IFDEF TESTBUILD
+CLR_PART_DL_SETUP_HELP = CLR_PART_DL_SETUP_HELP_TB
+ELSE
+CLR_PART_DL_SETUP_HELP = CLR_PART_DL_SETUP_HELP_BM
+ENDIF
+
+   mov     cx, CLR_PART_DL_SETUP_HELP                     ; Lila on lila
    call    VideoIO_Color
 
Index: trunk/bootcode/special/apm.asm
===================================================================
--- trunk/bootcode/special/apm.asm	(revision 64)
+++ trunk/bootcode/special/apm.asm	(revision 65)
@@ -25,4 +25,6 @@
 
 ; Here is APM Code to turn off the computer
+; Does not work on all BIOSes
+; http://stackoverflow.com/questions/678458/shutdown-the-computer-using-assembly
 
 APM_TurnOffComputer            Proc Near  Uses ax bx cx
Index: trunk/bootcode/version.inc
===================================================================
--- trunk/bootcode/version.inc	(revision 64)
+++ trunk/bootcode/version.inc	(revision 65)
@@ -18,4 +18,37 @@
 ;
 
+;
+; If the EQU below is enabled, the testbuild color-scheme will be used.
+;
+TESTBUILD           EQU
+
+; COLORS basic
+; 0 = black
+; 1 = blue
+; 2 = green
+; 3 = cyan
+; 4 = red
+; 5 = magenta
+; 6 = brown
+; 7 = white
+; 8 = grey
+
+; COLORS all (fg)
+; 00h black
+; 10h blue
+; 20h green (also nice)
+; 30h cyan (also nice)
+; 40h red
+; 50h magenta
+; 60h brown (nice)
+; 70h white
+; 80h grey
+; 90h light blue (nice)
+; a0h bright green
+; b0h bright cyan
+; c0h bright red
+; d0h bright magenta
+; e0h bright yellow
+; f0h bright white
 
 ;
