final merge

2 files changed, 154 insertions, 306 deletions

diff --git a/muse2/xpm/record_off.xpm b/muse2/xpm/record_off.xpm
index 3f25c366..d4891609 100644
--- a/muse2/xpm/record_off.xpm
+++ b/muse2/xpm/record_off.xpm
@@ -1,150 +1,70 @@
 /* XPM */
 static const char * record_off_xpm[] = {
-"15 15 132 2",
-"  	c None",
-". 	c #520002",
-"+ 	c #420002",
-"@ 	c #3F0002",
-"# 	c #350002",
-"$ 	c #3E0002",
-"% 	c #360002",
-"& 	c #370002",
-"* 	c #590006",
-"= 	c #490002",
-"- 	c #3F0000",
-"; 	c #450002",
-"> 	c #470003",
-", 	c #5A0006",
-"' 	c #430003",
-") 	c #3B0001",
-"! 	c #450200",
-"~ 	c #530006",
-"{ 	c #470000",
-"] 	c #520001",
-"^ 	c #5C0200",
-"/ 	c #760002",
-"( 	c #980201",
-"_ 	c #6E0006",
-": 	c #660004",
-"< 	c #630002",
-"[ 	c #3B0000",
-"} 	c #3B0200",
-"| 	c #5A0002",
-"1 	c #4D0004",
-"2 	c #610600",
-"3 	c #740800",
-"4 	c #990200",
-"5 	c #B20201",
-"6 	c #740000",
-"7 	c #6E0200",
-"8 	c #680200",
-"9 	c #560200",
-"0 	c #390100",
-"a 	c #460002",
-"b 	c #400000",
-"c 	c #590200",
-"d 	c #830800",
-"e 	c #A40B00",
-"f 	c #A80400",
-"g 	c #B00400",
-"h 	c #960400",
-"i 	c #6E0400",
-"j 	c #630300",
-"k 	c #450000",
-"l 	c #330000",
-"m 	c #700000",
-"n 	c #AA0300",
-"o 	c #A60300",
-"p 	c #AA0200",
-"q 	c #B40101",
-"r 	c #AC0400",
-"s 	c #8E0200",
-"t 	c #750000",
-"u 	c #590000",
-"v 	c #4B0002",
-"w 	c #680100",
-"x 	c #330002",
-"y 	c #9D0201",
-"z 	c #A70200",
-"A 	c #B00201",
-"B 	c #AC0001",
-"C 	c #B20101",
-"D 	c #C00000",
-"E 	c #AE0001",
-"F 	c #8C0004",
-"G 	c #530004",
-"H 	c #3A0000",
-"I 	c #540200",
-"J 	c #400002",
-"K 	c #560006",
-"L 	c #670006",
-"M 	c #7F0000",
-"N 	c #A70400",
-"O 	c #990300",
-"P 	c #AF0100",
-"Q 	c #8E0600",
-"R 	c #920400",
-"S 	c #9E0001",
-"T 	c #5A0004",
-"U 	c #430002",
-"V 	c #340000",
-"W 	c #510200",
-"X 	c #6A0004",
-"Y 	c #6C0200",
-"Z 	c #9C0200",
-"` 	c #B20200",
-" .	c #930300",
-"..	c #610000",
-"+.	c #4F0003",
-"@.	c #3F0003",
-"#.	c #390002",
-"$.	c #450003",
-"%.	c #640002",
-"&.	c #6A0200",
-"*.	c #6A0400",
-"=.	c #710001",
-"-.	c #810004",
-";.	c #900004",
-">.	c #650000",
-",.	c #540400",
-"'.	c #500200",
-").	c #430000",
-"!.	c #3F0004",
-"~.	c #370001",
-"{.	c #350000",
-"].	c #590300",
-"^.	c #570000",
-"/.	c #510004",
-"(.	c #5F0004",
-"_.	c #5D0002",
-":.	c #4F0200",
-"<.	c #3D0000",
-"[.	c #450004",
-"}.	c #4D0200",
-"|.	c #4C0002",
-"1.	c #440002",
-"2.	c #490003",
-"3.	c #380000",
-"4.	c #370000",
-"5.	c #3E0000",
-"6.	c #310000",
-"7.	c #390000",
-"8.	c #4A0006",
-"9.	c #440004",
-"0.	c #670100",
-"a.	c #5E0200",
-"                              ",
-"        . + @ # $ % &         ",
-"      * = - ; > , - ' ) !     ",
-"    ~ { ] ^ / ( _ : < [ }     ",
-"  | 1 ] 2 3 4 5 6 7 8 9 - 0   ",
-"  a b c d e f 5 g h i j k l   ",
-"  @ - m n o p q r s t u v [ w ",
-"  x > y z A B C D E F G = H I ",
-"  J K L M N O P Q R S T U V W ",
-"  # b X Y R Z `  .8 ..| +.@.  ",
-"  #.$.%.&.*.=.-.;.>.,.'.).!.  ",
-"    ~.{.].*.^./.(._.:.<.$ [.  ",
-"    }.} - ).a |.1.2.{ 3.}     ",
-"        0 4.5.b 6.7.8.9.      ",
-"            0.}.a.            "};
+"13 13 54 1",
+" 	c None",
+".	c #790000",
+"+	c #7A0000",
+"@	c #780000",
+"#	c #770000",
+"$	c #740000",
+"%	c #6B0000",
+"&	c #730000",
+"*	c #710000",
+"=	c #640000",
+"-	c #620000",
+";	c #6D0000",
+">	c #760000",
+",	c #6A0000",
+"'	c #5E0000",
+")	c #5A0000",
+"!	c #720000",
+"~	c #610000",
+"{	c #570000",
+"]	c #530000",
+"^	c #5B0000",
+"/	c #6F0000",
+"(	c #6E0000",
+"_	c #680000",
+":	c #600000",
+"<	c #580000",
+"[	c #4E0000",
+"}	c #4A0000",
+"|	c #510000",
+"1	c #5C0000",
+"2	c #560000",
+"3	c #450000",
+"4	c #460000",
+"5	c #4C0000",
+"6	c #520000",
+"7	c #590000",
+"8	c #550000",
+"9	c #500000",
+"0	c #4B0000",
+"a	c #440000",
+"b	c #3D0000",
+"c	c #410000",
+"d	c #490000",
+"e	c #3F0000",
+"f	c #380000",
+"g	c #360000",
+"h	c #3A0000",
+"i	c #3E0000",
+"j	c #3C0000",
+"k	c #330000",
+"l	c #2F0000",
+"m	c #310000",
+"n	c #300000",
+"o	c #2E0000",
+"    .....    ",
+"  +.@@@@@@.  ",
+" +.@.......# ",
+" #........@$ ",
+"%&.@.....@.*=",
+"-;>.......$,'",
+")=;$@...#!,~{",
+"]^-,/!!*(_:<[",
+"}|<'-===~12[3",
+" 4562<7<890a ",
+" bc3d}0}daef ",
+"  ghbieijfk  ",
+"    lmmno    "};
diff --git a/muse2/xpm/record_on.xpm b/muse2/xpm/record_on.xpm
index 64a67cf4..b0408a34 100644
--- a/muse2/xpm/record_on.xpm
+++ b/muse2/xpm/record_on.xpm
@@ -1,160 +1,88 @@
 /* XPM */
 static const char * record_on_xpm[] = {
-"15 15 142 2",
-"  	c None",
-". 	c #9B0500",
-"+ 	c #900601",
-"@ 	c #AF0205",
-"# 	c #980401",
-"$ 	c #AF0206",
-"% 	c #A70205",
-"& 	c #A80204",
-"* 	c #A9040A",
-"= 	c #990502",
-"- 	c #A00400",
-"; 	c #CC0004",
-"> 	c #A30404",
-", 	c #BD0212",
-"' 	c #B20207",
-") 	c #AC0201",
-"! 	c #A30800",
-"~ 	c #A70409",
-"{ 	c #990500",
-"] 	c #D50002",
-"^ 	c #DB0400",
-"/ 	c #E70004",
-"( 	c #F20010",
-"_ 	c #E30018",
-": 	c #E00010",
-"< 	c #C00202",
-"[ 	c #AB0200",
-"} 	c #AB0800",
-"| 	c #A90401",
-"1 	c #A50406",
-"2 	c #B90201",
-"3 	c #DE1800",
-"4 	c #E62300",
-"5 	c #F10900",
-"6 	c #FF0016",
-"7 	c #E60000",
-"8 	c #E40800",
-"9 	c #E10900",
-"0 	c #BB0600",
-"a 	c #BE0200",
-"b 	c #B00200",
-"c 	c #DA0400",
-"d 	c #EB2500",
-"e 	c #F33000",
-"f 	c #F80D00",
-"g 	c #FF0018",
-"h 	c #FE0F00",
-"i 	c #F11000",
-"j 	c #E40F00",
-"k 	c #DF0B00",
-"l 	c #B30200",
-"m 	c #A20200",
-"n 	c #BB0304",
-"o 	c #A00403",
-"p 	c #E40000",
-"q 	c #F90B00",
-"r 	c #FF0F00",
-"s 	c #F90006",
-"t 	c #FB0012",
-"u 	c #F40D00",
-"v 	c #EE0800",
-"w 	c #E70000",
-"x 	c #DA0000",
-"y 	c #D00004",
-"z 	c #AC0500",
-"A 	c #A40202",
-"B 	c #B40207",
-"C 	c #F40010",
-"D 	c #FD0014",
-"E 	c #FF0008",
-"F 	c #F70009",
-"G 	c #EE0010",
-"H 	c #D6000F",
-"I 	c #CF0009",
-"J 	c #A80800",
-"K 	c #BB0211",
-"L 	c #E10018",
-"M 	c #EA0000",
-"N 	c #F10B00",
-"O 	c #EE3000",
-"P 	c #EF0F00",
-"Q 	c #F5000D",
-"R 	c #DA0010",
-"S 	c #B10202",
-"T 	c #A50200",
-"U 	c #A70600",
-"V 	c #9B0403",
-"W 	c #970500",
-"X 	c #E20010",
-"Y 	c #E30800",
-"Z 	c #EF1000",
-"` 	c #F10800",
-" .	c #FF0009",
-"..	c #F01000",
-"+.	c #E10800",
-"@.	c #DE0000",
-"#.	c #DA0004",
-"$.	c #B80207",
-"%.	c #AF0207",
-"&.	c #EC0004",
-"*.	c #AB0204",
-"=.	c #B30207",
-"-.	c #E20800",
-";.	c #E20F00",
-">.	c #E50002",
-",.	c #EB000F",
-"'.	c #EF000D",
-").	c #E00000",
-"!.	c #D70F00",
-"~.	c #B90500",
-"{.	c #B10200",
-"].	c #AF020C",
-"^.	c #A90201",
-"/.	c #A70200",
-"(.	c #DA0B00",
-"_.	c #E20D00",
-":.	c #D90000",
-"<.	c #D5000F",
-"[.	c #DD0010",
-"}.	c #DC0004",
-"|.	c #D30400",
-"1.	c #AD0200",
-"2.	c #AE0204",
-"3.	c #B3020A",
-"4.	c #9A0600",
-"5.	c #AC0800",
-"6.	c #AF0200",
-"7.	c #C90000",
-"8.	c #CD0004",
-"9.	c #D10009",
-"0.	c #CA0004",
-"a.	c #B50207",
-"b.	c #B40200",
-"c.	c #9C0400",
-"d.	c #A90400",
-"e.	c #A30200",
-"f.	c #AA0200",
-"g.	c #B6020E",
-"h.	c #A90402",
-"i.	c #A50800",
-"j.	c #AB0600",
-"k.	c #B50302",
-"                              ",
-"        . + @ # $ % &         ",
-"      * = - ; > , - ' ) !     ",
-"    ~ { ] ^ / ( _ : < [ }     ",
-"  | 1 2 3 4 5 6 7 8 9 0 - a   ",
-"  > b c d e f g h i j k l m n ",
-"  o - p q r s t u v w x y [ z ",
-"  A B C 6 g D t E F G H I [ J ",
-"  o K L M r N E O P Q R S T U ",
-"  V W X Y Z `  ...+.@.#.$.%.&.",
-"  *.=.< -.;.>.,.'.).!.~.{.].  ",
-"    ^./.(._.:.<.[.}.|.1.2.3.  ",
-"    4.5.6.7.8.9.0.a.b.c.}     ",
-"        d.e.6.b e.f.g.3.      ",
-"          h.z i.j.k.          "};
+"13 13 72 1",
+" 	c None",
+".	c #FF0000",
+"+	c #FE0000",
+"@	c #FC0101",
+"#	c #F80202",
+"$	c #EA0707",
+"%	c #F70303",
+"&	c #F30505",
+"*	c #E20A0A",
+"=	c #E00A0A",
+"-	c #EE0506",
+";	c #FB0101",
+">	c #E90707",
+",	c #DB0C0C",
+"'	c #D60E0E",
+")	c #E30909",
+"!	c #EF0505",
+"~	c #F90202",
+"{	c #FD0000",
+"]	c #F60303",
+"^	c #EB0707",
+"/	c #DF0A0A",
+"(	c #D10F0F",
+"_	c #CA1111",
+":	c #D70E0D",
+"<	c #E10A0A",
+"[	c #F00505",
+"}	c #F40404",
+"|	c #F60403",
+"1	c #F30404",
+"2	c #E70808",
+"3	c #DE0B0B",
+"4	c #D30E0E",
+"5	c #C71313",
+"6	c #C01515",
+"7	c #CA1212",
+"8	c #D30F0F",
+"9	c #DA0D0D",
+"0	c #E00B0B",
+"a	c #E40909",
+"b	c #E30A0A",
+"c	c #D80D0D",
+"d	c #D01010",
+"e	c #BA1717",
+"f	c #BB1717",
+"g	c #C41414",
+"h	c #CB1212",
+"i	c #D40F0F",
+"j	c #D30F10",
+"k	c #CE1010",
+"l	c #C91212",
+"m	c #C21515",
+"n	c #B91818",
+"o	c #AE1B1B",
+"p	c #B51A1A",
+"q	c #BF1616",
+"r	c #C31515",
+"s	c #C11515",
+"t	c #BE1616",
+"u	c #B81818",
+"v	c #B31A1A",
+"w	c #AA1D1D",
+"x	c #A51F1E",
+"y	c #AF1B1B",
+"z	c #B21A1A",
+"A	c #B11A1B",
+"B	c #A91D1D",
+"C	c #A31F1F",
+"D	c #9D2121",
+"E	c #A02020",
+"F	c #9F2121",
+"G	c #9C2121",
+"    .+++.    ",
+"  ..++.++++  ",
+" .++.......@ ",
+" @+......+.# ",
+"$%.+......+&*",
+"=-;.......%>,",
+"')!~{..+@]^/(",
+"_:<$[}|1!2345",
+"67890)ab3cd5e",
+" fghd8ijklmn ",
+" opeqmrstuvw ",
+"  xwyzzAoBC  ",
+"    DEEFG    "};