diff --git a/kernel/branches/Kolibri-A/trunk/boot/bootcode.inc b/kernel/branches/Kolibri-A/trunk/boot/bootcode.inc
index 9ce4d9e8cf..01782661eb 100644
--- a/kernel/branches/Kolibri-A/trunk/boot/bootcode.inc
+++ b/kernel/branches/Kolibri-A/trunk/boot/bootcode.inc
@@ -13,6 +13,7 @@
 
 $Revision$
 
+boot_dev  db	  0  ; 0=floppy, 1=hd
 
 ;==========================================================================
 ;
@@ -87,7 +88,7 @@ FirstDataSector dw	0			; begin of data
 ;
 ;=========================================================================
 
-include 'bootvesa.inc'		       ;Include source for boot vesa
+diff16 "start_of_code: ",0,$
 
 start_of_code:
 	cld
@@ -172,7 +173,7 @@ cpugood:
 .nopci:
 ; \end{Mario79}
 
-; --------------- APM ---------------------
+; --------------- APM - removed--------------------
 	and	word [es:0x9044], 0	; ver = 0.0 (APM not found)
  if 0
 	mov	ax, 0x5300
diff --git a/kernel/branches/Kolibri-A/trunk/gui/fonts/sd_data.asm b/kernel/branches/Kolibri-A/trunk/gui/fonts/sd_data.asm
index 27dbbfef9b..a98efb2879 100644
--- a/kernel/branches/Kolibri-A/trunk/gui/fonts/sd_data.asm
+++ b/kernel/branches/Kolibri-A/trunk/gui/fonts/sd_data.asm
@@ -75,35 +75,38 @@ diff16 "sdsh_data.tick_table: ",0,$
 nsvf:
 .tick_table:
 	    db	0, 0, 0, 0, 0, 0	;32..37 (reserved)
-.v1:
-		    ; 38    39
-	    db	01b	    ; XX    XX
-	    db	11b	    ;   X    X
-.v2:
-		      ;      40    41     42    43    44   45
-	    db	0100b	  ;40    XXX    XXX   XX    XX    XX   XX
-	    db	1100b	  ;41       X     X     X     XX    X    X
-	    db	0001b	  ;42                    X          X   X
-	    db	1001b	  ;43
-	    db	0101b	  ;44
-	    db	1101b	  ;45?
-	    db	0	    ;46
-	    db	0	    ;47
-.v3:
-			      ;             48   49   50    51    52    53   54
-	    db	010100b     ;48    XXX   XX   XX    XX   XXXX   XX   XXX
-	    db	000011b     ;49       X   X     X     X     X    X     X
-	    db	010001b     ;50       X   X      X    X         X      X
-	    db	000101b     ;51           X      X    X        X
+
+.v1:                ; 38    39
+        db  01b     ; XX    XX
+        db  11b     ;   X    X
+
+.v2:                    ;      40    41     42    43    44   45
+        db  0100b       ;40    XXX    XXX   XX    XX    XX   XX
+        db  1100b       ;41       X     X     X     XX    X    X
+        db  0001b       ;42                    X          X   X
+        db  1001b       ;43    
+        db  0101b       ;44    
+        db  1101b       ;45    
+        db  0000b       ;46    
+        db  0000b       ;47    
+          
+.v3:               ;            48   49   50    51    52    53   54   
+	    db	010100b     ;48    XXX   XX   XX    XX   XXXX   XX   XXX  
+	    db	000011b     ;49       X   X     X     X     X    X     X    
+	    db	010001b     ;50       X   X      X    X         X      X    
+	    db	000101b     ;51           X      X    X        X           
 	    db	110000b     ;52
 	    db	000111b     ;53     55    56    57
 	    db	001100b     ;54     XX    XX    XXX
 	    db	010101b     ;55       X     X    XX
 	    db	011101b     ;56       X   XX
 	    db	111100b     ;57      X
-	  db	  0		;58
-	  db	  0	      ;59
-	    db	0, 0, 0, 0	;60..63
+        db  000000b     ;58
+        db  000000b     ;59
+        db  000000b     ;60
+        db  000000b     ;61
+        db  000000b     ;62
+        db  000000b     ;63
 .v4:
 			      ;            64   65   66    67     68    69     70
 	    db	01010001b   ;64:   XX    XX  XXXX   Y      XX    XX    Y
@@ -124,50 +127,59 @@ nsvf:
 	db  00000000b	;79:
 
 
-.v5:
-	    db	00000001b, 01b		;80: )(
-	    db	00000001b, 10b		;81: /7X
-	    db	01000101b, 01b		;82: 8u
-	    db	01010100b, 01b		;83:
-	    db	00000010b, 01b		;84: \X&
-	    db	00010100b, 00b		;85: hnu—
-	    db	10111000b, 00b		;86: a
+.v5:                                ;   80  81  82   83    84  85    86
+	    db	00000001b, 01b      ;80:  X  X   XX   XXX    X  XXX    X
+	    db	00000001b, 10b      ;81:   X  X    X     X  X      X   X
+	    db	01000101b, 01b      ;82:   X  X    X     X  X      X   X
+	    db	01010100b, 01b      ;83:   X  X    X   XX   X      X    X 
+        db	00000010b, 01b      ;84:   X  X   X         X      X   X
+	    db	00010100b, 00b      ;85:  X    X           X           X
+	    db	10111000b, 00b      ;86:                               X
 	    db	0, 0			;87:
 
-.v6:
-	    db	01000000b, 0101b	;88: Jfg
-	    db	01010100b, 0001b	;89: BPR
-	    db	11010010b, 0001b	;90: s$
-	    db	11010000b, 0001b	;91
-	    db	0, 0, 0, 0		;92,93
-	    db	0, 0, 0, 0		;94,95
-.v7:
-	    db	11011001b, 011001b	;96: ><vVY
-	    db	00010001b, 010001b	;97: D
-	    db	00010100b, 000101b	;98: bcdpqg
-	    db	0, 0			      ;99:
-	    db	0, 0, 0, 0		;100,101
-	    db	0, 0, 0, 0		;102,103
-.v8:
-	    db	00110000b, 00001100b	;104: 5
-	    db	01010100b, 01010001b	;105: 689
-	    db	0, 0, 0, 0, 0, 0	;106..108
-	    db	0, 0, 0, 0, 0, 0	;109..111
+.v6:                                ;     88   89    90     91
+	    db	01000000b, 0101b    ;88:    X  XXX    X       X
+	    db	01010100b, 0001b    ;89:    X     X   X       X
+	    db	11010010b, 0001b    ;90:    X     X    X    X X
+	    db	11010000b, 0001b    ;91:    X    X    X X   X X
+	    db	00000000b, 0000b    ;92: X  X   X      XX    X
+	    db	00000000b, 0000b    ;93:  XX
+	    db	00000000b, 0000b    ;94:   
+	    db	00000000b, 0000b    ;95:   
 
-.v9:
+.v7:                                    ;        96  97    98    99
+	    db	11011001b, 011001b	; 96: X   X  XX    XXX   XX
+	    db	00010001b, 010001b	; 97: X   X    X      X  X
+	    db	00010100b, 000101b	; 98:  X X      X     X  X
+	    db	00000011b, 110000b	; 99:  X X      X     X  X
+	    db	00000000b, 000000b	;100:   X       X  XXX   X
+	    db	00000000b, 000000b	;101:          X         X
+	    db	00000000b, 000000b	;102:        XX          XX
+	    db	00000000b, 000000b	;103:        
+.v8:                                  ;     104    105    106
+	    db	00110000b, 00001100b  ;104: XXXX   XXX   XXXXX
+	    db	01010100b, 01010001b  ;105:    X  X   X X     X
+	    db	00000001b, 01000101b  ;106:    X  X   X       X
+	    db	00000000b, 00000000b  ;107: XXXX   XXX        X
+	    db	00000000b, 00000000b  ;108:                  X
+	    db	00000000b, 00000000b  ;109: 
+	    db	00000000b, 00000000b  ;110: 
+	    db	00000000b, 00000000b  ;111: 
+
+.v9:                                          
 	    db	00100100b, 00100100b, 00b   ;112:  XXX
 	    db	0, 0, 0 		    ;113:     XXXX
 	    db	0, 0, 0 		    ;114:         XXX
 	    db	0, 0, 0 		;115:
 .v10:
-	    db	00010100b, 01010000b, 0100b	;116:
-	    db	01010100b, 01010001b, 0100b	;117:
-	    db	01010001b, 00000100b, 0100b ;118:
+	    db	00010100b, 01010000b, 0100b     ;116:
+	    db	01010100b, 01010001b, 0100b     ;117:
+	    db	01010001b, 00000100b, 0100b     ;118:
 	    db	0, 0, 0 			;119:
 .v11:
 	    db	10100000b, 01010010b, 000001b	; 120: $s
-	    db	0, 0, 0 			;121:
-	    db	0, 0, 0 			;122:
+	    db	01100100b, 01000000b, 000110b	; 121: )(
+	    db	01000100b, 01000100b, 000000b	; 122: 0
 	    db	0, 0, 0 			;123:
 .v12:
 	    db	10011001b, 10011001b, 10011001b ;124: