Fixup icons

4 files changed, 521 insertions, 706 deletions

diff --git a/images/epg-qed.png b/images/epg-qed.png
index 2dc182e6..8bd70da6 100644
--- a/images/epg-qed.png
+++ b/images/epg-qed.png
diff --git a/images/epg-qed.xpm b/images/epg-qed.xpm
index 431c3aa3..e7079d93 100644
--- a/images/epg-qed.xpm
+++ b/images/epg-qed.xpm
@@ -1,572 +1,387 @@
 /* XPM */
 static char * epg_qed_xpm[] = {
-"32 32 537 2",
-"  	c #BCBCBC",
-". 	c #B09696",
-"+ 	c #AA8282",
-"@ 	c #994747",
+"24 24 360 2",
+"  	c #FFFFFF",
+". 	c #E5CACA",
+"+ 	c #D7AEAE",
+"@ 	c #AF5E5E",
 "# 	c #870D0D",
-"$ 	c #994848",
-"% 	c #8D2121",
-"& 	c #140B0D",
-"* 	c #1A0F10",
-"= 	c #1E1112",
-"- 	c #231414",
-"; 	c #241514",
-"> 	c #241513",
-", 	c #2B1916",
-"' 	c #321D18",
-") 	c #36201A",
-"! 	c #422922",
-"~ 	c #432B24",
-"{ 	c #38251F",
-"] 	c #2A1A16",
-"^ 	c #2A1D17",
-"/ 	c #281D18",
-"( 	c #221916",
-"_ 	c #1F1815",
-": 	c #1A1512",
-"< 	c #191513",
-"[ 	c #1C1A14",
-"} 	c #1C1B16",
-"| 	c #1B1B15",
-"1 	c #1F2219",
-"2 	c #1B1F15",
-"3 	c #161A12",
-"4 	c #12140F",
-"5 	c #090A07",
-"6 	c #040503",
-"7 	c #010101",
-"8 	c #1B1112",
-"9 	c #221515",
-"0 	c #2B1A19",
-"a 	c #2F1C1B",
-"b 	c #321E1B",
-"c 	c #331E1C",
-"d 	c #351F1C",
-"e 	c #3E231D",
-"f 	c #502E25",
-"g 	c #663F33",
-"h 	c #653F34",
-"i 	c #462A21",
-"j 	c #3E2821",
-"k 	c #37251F",
-"l 	c #30231E",
-"m 	c #2D221F",
-"n 	c #29211D",
-"o 	c #201B17",
-"p 	c #1E1A15",
-"q 	c #1D1A15",
-"r 	c #1C1C15",
-"s 	c #212219",
-"t 	c #2B3223",
-"u 	c #394932",
-"v 	c #2B3826",
-"w 	c #171D13",
-"x 	c #0E100B",
-"y 	c #080907",
-"z 	c #050604",
-"A 	c #1F1315",
-"B 	c #301F1E",
-"C 	c #422926",
-"D 	c #50302C",
-"E 	c #4A2C28",
-"F 	c #412723",
-"G 	c #3D2420",
-"H 	c #462923",
-"I 	c #502C22",
-"J 	c #784333",
-"K 	c #B36A50",
-"L 	c #A15E47",
-"M 	c #6D4030",
-"N 	c #57372D",
-"O 	c #442F27",
-"P 	c #3A2B25",
-"Q 	c #352A25",
-"R 	c #2F2622",
-"S 	c #2A241F",
-"T 	c #2A241E",
-"U 	c #24211A",
-"V 	c #22211A",
-"W 	c #25281D",
-"X 	c #394831",
-"Y 	c #A4C096",
-"Z 	c #6D8D64",
-"` 	c #263221",
-" .	c #171B13",
-"..	c #0D0F0A",
-"+.	c #231617",
-"@.	c #362221",
-"#.	c #704540",
-"$.	c #CF988B",
-"%.	c #945D53",
-"&.	c #512F2B",
-"*.	c #452823",
-"=.	c #4B2A23",
-"-.	c #693A2D",
-";.	c #B86547",
-">.	c #FDD0A5",
-",.	c #F2B385",
-"'.	c #AD6248",
-").	c #6A4334",
-"!.	c #50382F",
-"~.	c #473731",
-"{.	c #4B3F39",
-"].	c #413833",
-"^.	c #3F3731",
-"/.	c #363029",
-"(.	c #302C24",
-"_.	c #2C2B22",
-":.	c #303225",
-"<.	c #49573C",
-"[.	c #9FB990",
-"}.	c #7C9B71",
-"|.	c #384330",
-"1.	c #23271D",
-"2.	c #161712",
-"3.	c #0E0F0B",
-"4.	c #27191A",
-"5.	c #402929",
-"6.	c #80504A",
-"7.	c #F0BEB2",
-"8.	c #BC8175",
-"9.	c #5D3934",
-"0.	c #50302B",
-"a.	c #56312A",
-"b.	c #7A4536",
-"c.	c #DB8059",
-"d.	c #FEFBED",
-"e.	c #FEE8CA",
-"f.	c #D27D5B",
-"g.	c #835544",
-"h.	c #6A4F44",
-"i.	c #685852",
-"j.	c #7A7472",
-"k.	c #635C57",
-"l.	c #474039",
-"m.	c #3A332C",
-"n.	c #322D26",
-"o.	c #2E2C23",
-"p.	c #414635",
-"q.	c #59654C",
-"r.	c #546349",
-"s.	c #3F4934",
-"t.	c #2B3023",
-"u.	c #1C1E16",
-"v.	c #181812",
-"w.	c #141410",
-"x.	c #27191B",
-"y.	c #392526",
-"z.	c #523433",
-"A.	c #774C48",
-"B.	c #7F534D",
-"C.	c #613E39",
-"D.	c #50312D",
-"E.	c #56332D",
-"F.	c #7A493D",
-"G.	c #CD7E60",
-"H.	c #F2AE81",
-"I.	c #E79064",
-"J.	c #9A5942",
-"K.	c #6D4639",
-"L.	c #634A41",
-"M.	c #867E7A",
-"N.	c #F0E4CB",
-"O.	c #7E7D78",
-"P.	c #4C453D",
-"Q.	c #3E3730",
-"R.	c #38322A",
-"S.	c #4D5140",
-"T.	c #555C48",
-"U.	c #333326",
-"V.	c #38392A",
-"W.	c #36372A",
-"X.	c #2A2B20",
-"Y.	c #201F18",
-"Z.	c #191813",
-"`.	c #100E0B",
-" +	c #27191D",
-".+	c #312023",
-"++	c #402A2C",
-"@+	c #493031",
-"#+	c #533635",
-"$+	c #6A4642",
-"%+	c #5C3B38",
-"&+	c #623F3B",
-"*+	c #784D44",
-"=+	c #8C5547",
-"-+	c #945643",
-";+	c #9D5E47",
-">+	c #764A3A",
-",+	c #604035",
-"'+	c #594239",
-")+	c #655751",
-"!+	c #8B8680",
-"~+	c #645E57",
-"{+	c #4E453C",
-"]+	c #413A30",
-"^+	c #555845",
-"/+	c #4E503F",
-"(+	c #342F26",
-"_+	c #353025",
-":+	c #3E392C",
-"<+	c #3F392E",
-"[+	c #312D23",
-"}+	c #27241D",
-"|+	c #181611",
-"1+	c #0F0E0A",
-"2+	c #26191F",
-"3+	c #2F1F24",
-"4+	c #3A272B",
-"5+	c #3D292D",
-"6+	c #3F292C",
-"7+	c #503536",
-"8+	c #6A4845",
-"9+	c #6B4946",
-"0+	c #67433E",
-"a+	c #6D463E",
-"b+	c #7B4D41",
-"c+	c #915C47",
-"d+	c #5D3B32",
-"e+	c #573C34",
-"f+	c #533D35",
-"g+	c #56453D",
-"h+	c #5C4F46",
-"i+	c #4C4138",
-"j+	c #4B4136",
-"k+	c #5A5846",
-"l+	c #51513F",
-"m+	c #342D23",
-"n+	c #342E24",
-"o+	c #40382B",
-"p+	c #534638",
-"q+	c #665544",
-"r+	c #4D4034",
-"s+	c #2B251D",
-"t+	c #191611",
-"u+	c #11100C",
-"v+	c #2B1D23",
-"w+	c #322229",
-"x+	c #3C2A31",
-"y+	c #3E2A31",
-"z+	c #402B30",
-"A+	c #472F33",
-"B+	c #654748",
-"C+	c #5F4040",
-"D+	c #614140",
-"E+	c #62403E",
-"F+	c #6C453F",
-"G+	c #825344",
-"H+	c #583931",
-"I+	c #523A33",
-"J+	c #533E36",
-"K+	c #544238",
-"L+	c #544539",
-"M+	c #504637",
-"N+	c #595342",
-"O+	c #575340",
-"P+	c #3D3427",
-"Q+	c #3B3227",
-"R+	c #3F3529",
-"S+	c #483C2F",
-"T+	c #886F5B",
-"U+	c #E1CFB9",
-"V+	c #7C6250",
-"W+	c #332A22",
-"X+	c #1F1A14",
-"Y+	c #15110E",
-"Z+	c #31222A",
-"`+	c #3B2A33",
-" @	c #46323C",
-".@	c #48333C",
-"+@	c #483139",
-"@@	c #50393F",
-"#@	c #523A3F",
-"$@	c #5A3E41",
-"%@	c #614144",
-"&@	c #5F3D3F",
-"*@	c #674341",
-"=@	c #8A5847",
-"-@	c #774F41",
-";@	c #503A34",
-">@	c #513C35",
-",@	c #544237",
-"'@	c #594B3B",
-")@	c #5E533F",
-"!@	c #686047",
-"~@	c #514430",
-"{@	c #423727",
-"]@	c #403627",
-"^@	c #3B3125",
-"/@	c #473B2D",
-"(@	c #7B6452",
-"_@	c #C6AC95",
-":@	c #7B6352",
-"<@	c #3B3128",
-"[@	c #231E18",
-"}@	c #17130F",
-"|@	c #33222C",
-"1@	c #493441",
-"2@	c #58414E",
-"3@	c #5B4250",
-"4@	c #573F4A",
-"5@	c #5D444E",
-"6@	c #573E46",
-"7@	c #5B3E44",
-"8@	c #67434A",
-"9@	c #905C67",
-"0@	c #8D5C64",
-"a@	c #87594F",
-"b@	c #724C41",
-"c@	c #4A3531",
-"d@	c #4C3931",
-"e@	c #544236",
-"f@	c #696048",
-"g@	c #796D4E",
-"h@	c #958154",
-"i@	c #77653F",
-"j@	c #5C4E34",
-"k@	c #463B2A",
-"l@	c #473C2D",
-"m@	c #4F4335",
-"n@	c #56483A",
-"o@	c #635244",
-"p@	c #493C31",
-"q@	c #302821",
-"r@	c #1E1914",
-"s@	c #110D0B",
-"t@	c #463340",
-"u@	c #543C4C",
-"v@	c #7A5C71",
-"w@	c #805F76",
-"x@	c #795C6E",
-"y@	c #634956",
-"z@	c #583E48",
-"A@	c #5F4249",
-"B@	c #845963",
-"C@	c #ECBCC1",
-"D@	c #DAA5AC",
-"E@	c #7B504F",
-"F@	c #734C41",
-"G@	c #48332E",
-"H@	c #43322B",
-"I@	c #544839",
-"J@	c #6B6247",
-"K@	c #A28C59",
-"L@	c #F8EBCB",
-"M@	c #E9DAAC",
-"N@	c #99885E",
-"O@	c #665940",
-"P@	c #493F2F",
-"Q@	c #372E23",
-"R@	c #342B22",
-"S@	c #312720",
-"T@	c #272019",
-"U@	c #1B1511",
-"V@	c #13100C",
-"W@	c #0E0A08",
-"X@	c #43303E",
-"Y@	c #6D5168",
-"Z@	c #BF98B9",
-"`@	c #E5C7E1",
-" #	c #9B7693",
-".#	c #624758",
-"+#	c #543B47",
-"@#	c #553B44",
-"##	c #67454E",
-"$#	c #895665",
-"%#	c #90606C",
-"&#	c #5F3E3F",
-"*#	c #744C3F",
-"=#	c #4B352E",
-"-#	c #45372F",
-";#	c #5B5341",
-">#	c #66553E",
-",#	c #AB9561",
-"'#	c #FDF1DB",
-")#	c #F8EAC7",
-"!#	c #938155",
-"~#	c #4D412D",
-"{#	c #362D20",
-"]#	c #2C241B",
-"^#	c #29221B",
-"/#	c #251E18",
-"(#	c #1E1813",
-"_#	c #0F0C09",
-":#	c #0A0707",
-"<#	c #4A3746",
-"[#	c #73566E",
-"}#	c #D9B5D5",
-"|#	c #FDF3FC",
-"1#	c #B48BAC",
-"2#	c #705567",
-"3#	c #59424E",
-"4#	c #4E3841",
-"5#	c #4C353D",
-"6#	c #4D333A",
-"7#	c #563C40",
-"8#	c #4C3536",
-"9#	c #7B5140",
-"0#	c #4A362F",
-"a#	c #504B3E",
-"b#	c #473B2F",
-"c#	c #514231",
-"d#	c #A28D5B",
-"e#	c #9C895B",
-"f#	c #615338",
-"g#	c #4A402E",
-"h#	c #332B1F",
-"i#	c #272018",
-"j#	c #211B15",
-"k#	c #1C1814",
-"l#	c #181411",
-"m#	c #100F0B",
-"n#	c #0C0A08",
-"o#	c #080605",
-"p#	c #3D2C3A",
-"q#	c #5A4255",
-"r#	c #886682",
-"s#	c #A881A1",
-"t#	c #806279",
-"u#	c #5D4655",
-"v#	c #493540",
-"w#	c #402E36",
-"x#	c #3E2B32",
-"y#	c #3D2A30",
-"z#	c #433034",
-"A#	c #453232",
-"B#	c #764E3E",
-"C#	c #51453A",
-"D#	c #443B32",
-"E#	c #3D332A",
-"F#	c #43382C",
-"G#	c #5C4F3A",
-"H#	c #534632",
-"I#	c #3F3526",
-"J#	c #2E271C",
-"K#	c #29231A",
-"L#	c #28221B",
-"M#	c #201B15",
-"N#	c #191512",
-"O#	c #12100D",
-"P#	c #080706",
-"Q#	c #050404",
-"R#	c #332430",
-"S#	c #3E2C3A",
-"T#	c #553F50",
-"U#	c #5C4557",
-"V#	c #3C2C36",
-"W#	c #37272F",
-"X#	c #302228",
-"Y#	c #2D1F24",
-"Z#	c #322427",
-"`#	c #3E2F2E",
-" $	c #825A47",
-".$	c #615443",
-"+$	c #594638",
-"@$	c #423B30",
-"#$	c #F5E8C5",
-"$$	c #4A4034",
-"%$	c #332A20",
-"&$	c #2F271D",
-"*$	c #352C22",
-"=$	c #221C15",
-"-$	c #1D1713",
-";$	c #1B1612",
-">$	c #191511",
-",$	c #181412",
-"'$	c #12110E",
-")$	c #0C0B09",
-"!$	c #070605",
-"~$	c #040303",
-"{$	c #251923",
-"]$	c #31232E",
-"^$	c #382935",
-"/$	c #3F2F3B",
-"($	c #3C2D38",
-"_$	c #2C1F26",
-":$	c #291E23",
-"<$	c #281D22",
-"[$	c #291D20",
-"}$	c #332B29",
-"|$	c #7D6A52",
-"1$	c #645442",
-"2$	c #755540",
-"3$	c #F3D9B5",
-"4$	c #322B23",
-"5$	c #241D17",
-"6$	c #201914",
-"7$	c #261F19",
-"8$	c #1C1713",
-"9$	c #16120F",
-"0$	c #130F0D",
-"a$	c #100D0A",
-"b$	c #100C0B",
-"c$	c #0E0C0A",
-"d$	c #070606",
-"e$	c #030302",
-"f$	c #1C131B",
-"g$	c #281D26",
-"h$	c #261A23",
-"i$	c #2E222B",
-"j$	c #2B2029",
-"k$	c #2E222A",
-"l$	c #23191F",
-"m$	c #21171C",
-"n$	c #1F161A",
-"o$	c #22181C",
-"p$	c #261E1F",
-"q$	c #573C30",
-"r$	c #50372C",
-"s$	c #3D2921",
-"t$	c #33221C",
-"u$	c #28201D",
-"v$	c #1A1412",
-"w$	c #181311",
-"x$	c #16110F",
-"y$	c #171210",
-"z$	c #0D0909",
-"A$	c #0B0807",
-"B$	c #020202",
-"C$	c #A56E6E",
-"D$	c #7D7D7D",
-"E$	c #2A2A2A",
-"F$	c #3F3F3F",
-"G$	c #151515",
-"H$	c #939393",
-"I$	c #696969",
-"J$	c #000000",
-"K$	c #A7A7A7",
-"L$	c #545454",
-"                                                                ",
-"  . + + + + + + + + + + + + + + + + + + + + + + + + + + + + +   ",
-"  @ # # # # # # # # # # # # # # # # # # # # # # # # # # # # #   ",
-"  @ # @ @ $ $ $ $ $ $ $ @ @ @ @ $ $ $ $ @ @ @ @ @ @ @ @ @ % #   ",
-"  & * = - ; ; > , ' ) ! ~ { ] ^ / ( _ : < [ } | 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 D E F G H I J K L M N O P Q R S T U V W X Y Z `  ...y   ",
-"  +.@.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.}.|.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.D.E.F.G.H.I.J.K.L.M.N.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+f+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+X+Y+  ",
-"  Z+`+ @.@+@@@#@$@%@&@*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@_@:@<@[@}@  ",
-"  |@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@D@E@F@G@H@I@J@K@L@M@N@O@P@Q@R@S@T@U@V@W@  ",
-"  X@Y@Z@`@ #.#+#@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#Y+_#:#  ",
-"  <#[#}#|#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#D#E#F#)#G#H#I#J#K#L#M#N#O#n#P#Q#  ",
-"  R#S#T#U#t#t#V#W#X#Y#Z#`# $.$+$@$#$$$%$&$*$=$-$;$>$,$'$)$!$~$  ",
-"  {$]$^$/$($t#t#_$:$<$[$}$|$1$2$3$)#4$5$6$7$8$9$0$a$b$c$n#d$e$  ",
-"  f$g$h$i$j$k$t#l$m$n$o$p$q$r$s$t$u$v$w$x$y$: s@z$A$:#P#!$~$B$  ",
-"  @ # # # # # # # # # # # # # # # # # # # # # # # # # # # # #   ",
-"  C$@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @   ",
-"                                                                ",
-"        D$E$F$G$D$      H$G$E$F$E$      I$J$F$F$E$K$            ",
-"      D$G$K$  I$J$        G$D$          H$G$    F$F$            ",
-"      G$I$    D$J$      K$J$F$E$        I$F$    F$F$            ",
-"      J$D$    E$L$      D$G$  H$        F$L$    G$D$            ",
-"      G$I$  I$E$K$D$I$  L$F$  H$H$L$H$  G$D$  F$F$  L$H$        ",
-"      H$F$E$F$    I$D$H$F$F$F$F$  F$K$I$F$F$F$I$    F$K$        ",
-"            I$L$F$K$                                            "};
+"$ 	c #952929",
+"% 	c #66100F",
+"& 	c #241513",
+"* 	c #2B1916",
+"= 	c #321D18",
+"- 	c #36201A",
+"; 	c #422922",
+"> 	c #432B24",
+", 	c #38251F",
+"' 	c #2A1A16",
+") 	c #2A1D17",
+"! 	c #281D18",
+"~ 	c #221916",
+"{ 	c #1F1815",
+"] 	c #1A1512",
+"^ 	c #191513",
+"/ 	c #1C1A14",
+"( 	c #1C1B16",
+"_ 	c #1B1B15",
+": 	c #1F2219",
+"< 	c #631310",
+"[ 	c #6B1312",
+"} 	c #351F1C",
+"| 	c #3E231D",
+"1 	c #502E25",
+"2 	c #663F33",
+"3 	c #653F34",
+"4 	c #462A21",
+"5 	c #3E2821",
+"6 	c #37251F",
+"7 	c #30231E",
+"8 	c #2D221F",
+"9 	c #29211D",
+"0 	c #201B17",
+"a 	c #1E1A15",
+"b 	c #1D1A15",
+"c 	c #1C1C15",
+"d 	c #212219",
+"e 	c #2B3223",
+"f 	c #6D2119",
+"g 	c #731716",
+"h 	c #3D2420",
+"i 	c #462923",
+"j 	c #502C22",
+"k 	c #784333",
+"l 	c #B36A50",
+"m 	c #A15E47",
+"n 	c #6D4030",
+"o 	c #57372D",
+"p 	c #442F27",
+"q 	c #3A2B25",
+"r 	c #352A25",
+"s 	c #2F2622",
+"t 	c #2A241F",
+"u 	c #2A241E",
+"v 	c #24211A",
+"w 	c #22211A",
+"x 	c #25281D",
+"y 	c #394831",
+"z 	c #91493B",
+"A 	c #8B2824",
+"B 	c #452823",
+"C 	c #4B2A23",
+"D 	c #693A2D",
+"E 	c #B86547",
+"F 	c #FDD0A5",
+"G 	c #F2B385",
+"H 	c #AD6248",
+"I 	c #6A4334",
+"J 	c #50382F",
+"K 	c #473731",
+"L 	c #4B3F39",
+"M 	c #413833",
+"N 	c #3F3731",
+"O 	c #363029",
+"P 	c #302C24",
+"Q 	c #2C2B22",
+"R 	c #303225",
+"S 	c #49573C",
+"T 	c #8F4639",
+"U 	c #993430",
+"V 	c #50302B",
+"W 	c #56312A",
+"X 	c #7A4536",
+"Y 	c #DB8059",
+"Z 	c #FEFBED",
+"` 	c #FEE8CA",
+" .	c #D27D5B",
+"..	c #835544",
+"+.	c #6A4F44",
+"@.	c #685852",
+"#.	c #7A7472",
+"$.	c #635C57",
+"%.	c #474039",
+"&.	c #3A332C",
+"*.	c #322D26",
+"=.	c #2E2C23",
+"-.	c #414635",
+";.	c #59654C",
+">.	c #762A21",
+",.	c #842422",
+"'.	c #50312D",
+").	c #56332D",
+"!.	c #7A493D",
+"~.	c #CD7E60",
+"{.	c #F2AE81",
+"].	c #E79064",
+"^.	c #9A5942",
+"/.	c #6D4639",
+"(.	c #634A41",
+"_.	c #867E7A",
+":.	c #F0E4CB",
+"<.	c #7E7D78",
+"[.	c #4C453D",
+"}.	c #3E3730",
+"|.	c #38322A",
+"1.	c #4D5140",
+"2.	c #555C48",
+"3.	c #333326",
+"4.	c #6D1C17",
+"5.	c #761B1A",
+"6.	c #5C3B38",
+"7.	c #623F3B",
+"8.	c #784D44",
+"9.	c #8C5547",
+"0.	c #945643",
+"a.	c #9D5E47",
+"b.	c #764A3A",
+"c.	c #604035",
+"d.	c #594239",
+"e.	c #655751",
+"f.	c #8B8680",
+"g.	c #645E57",
+"h.	c #4E453C",
+"i.	c #413A30",
+"j.	c #555845",
+"k.	c #4E503F",
+"l.	c #342F26",
+"m.	c #353025",
+"n.	c #6F1C17",
+"o.	c #6F1617",
+"p.	c #6A4845",
+"q.	c #6B4946",
+"r.	c #67433E",
+"s.	c #6D463E",
+"t.	c #7B4D41",
+"u.	c #915C47",
+"v.	c #5D3B32",
+"w.	c #573C34",
+"x.	c #533D35",
+"y.	c #56453D",
+"z.	c #5C4F46",
+"A.	c #4C4138",
+"B.	c #4B4136",
+"C.	c #5A5846",
+"D.	c #51513F",
+"E.	c #342D23",
+"F.	c #342E24",
+"G.	c #40382B",
+"H.	c #76201B",
+"I.	c #6F1719",
+"J.	c #654748",
+"K.	c #5F4040",
+"L.	c #614140",
+"M.	c #62403E",
+"N.	c #6C453F",
+"O.	c #825344",
+"P.	c #583931",
+"Q.	c #523A33",
+"R.	c #533E36",
+"S.	c #544238",
+"T.	c #544539",
+"U.	c #504637",
+"V.	c #595342",
+"W.	c #575340",
+"X.	c #3D3427",
+"Y.	c #3B3227",
+"Z.	c #3F3529",
+"`.	c #483C2F",
+" +	c #872E27",
+".+	c #72191C",
+"++	c #523A3F",
+"@+	c #5A3E41",
+"#+	c #614144",
+"$+	c #5F3D3F",
+"%+	c #674341",
+"&+	c #8A5847",
+"*+	c #774F41",
+"=+	c #503A34",
+"-+	c #513C35",
+";+	c #544237",
+">+	c #594B3B",
+",+	c #5E533F",
+"'+	c #686047",
+")+	c #514430",
+"!+	c #423727",
+"~+	c #403627",
+"{+	c #3B3125",
+"]+	c #473B2D",
+"^+	c #832A24",
+"/+	c #771E21",
+"(+	c #573E46",
+"_+	c #5B3E44",
+":+	c #67434A",
+"<+	c #905C67",
+"[+	c #8D5C64",
+"}+	c #87594F",
+"|+	c #724C41",
+"1+	c #4A3531",
+"2+	c #4C3931",
+"3+	c #544236",
+"4+	c #696048",
+"5+	c #796D4E",
+"6+	c #958154",
+"7+	c #77653F",
+"8+	c #5C4E34",
+"9+	c #463B2A",
+"0+	c #473C2D",
+"a+	c #4F4335",
+"b+	c #77211C",
+"c+	c #82272D",
+"d+	c #583E48",
+"e+	c #5F4249",
+"f+	c #845963",
+"g+	c #ECBCC1",
+"h+	c #DAA5AC",
+"i+	c #7B504F",
+"j+	c #734C41",
+"k+	c #48332E",
+"l+	c #43322B",
+"m+	c #544839",
+"n+	c #6B6247",
+"o+	c #A28C59",
+"p+	c #F8EBCB",
+"q+	c #E9DAAC",
+"r+	c #99885E",
+"s+	c #665940",
+"t+	c #493F2F",
+"u+	c #372E23",
+"v+	c #6B1714",
+"w+	c #8E303A",
+"x+	c #543B47",
+"y+	c #553B44",
+"z+	c #67454E",
+"A+	c #895665",
+"B+	c #90606C",
+"C+	c #5F3E3F",
+"D+	c #744C3F",
+"E+	c #4B352E",
+"F+	c #45372F",
+"G+	c #5B5341",
+"H+	c #66553E",
+"I+	c #AB9561",
+"J+	c #FDF1DB",
+"K+	c #F8EAC7",
+"L+	c #938155",
+"M+	c #4D412D",
+"N+	c #362D20",
+"O+	c #2C241B",
+"P+	c #681412",
+"Q+	c #963742",
+"R+	c #59424E",
+"S+	c #4E3841",
+"T+	c #4C353D",
+"U+	c #4D333A",
+"V+	c #563C40",
+"W+	c #4C3536",
+"X+	c #7B5140",
+"Y+	c #4A362F",
+"Z+	c #504B3E",
+"`+	c #473B2F",
+" @	c #514231",
+".@	c #A28D5B",
+"+@	c #9C895B",
+"@@	c #615338",
+"#@	c #4A402E",
+"$@	c #332B1F",
+"%@	c #272018",
+"&@	c #651210",
+"*@	c #852931",
+"=@	c #493540",
+"-@	c #402E36",
+";@	c #3E2B32",
+">@	c #3D2A30",
+",@	c #433034",
+"'@	c #453232",
+")@	c #764E3E",
+"!@	c #51453A",
+"~@	c #443B32",
+"{@	c #3D332A",
+"]@	c #43382C",
+"^@	c #5C4F3A",
+"/@	c #534632",
+"(@	c #3F3526",
+"_@	c #2E271C",
+":@	c #29231A",
+"<@	c #28221B",
+"[@	c #3C2C36",
+"}@	c #37272F",
+"|@	c #302228",
+"1@	c #2D1F24",
+"2@	c #322427",
+"3@	c #3E2F2E",
+"4@	c #825A47",
+"5@	c #615443",
+"6@	c #594638",
+"7@	c #423B30",
+"8@	c #F5E8C5",
+"9@	c #4A4034",
+"0@	c #332A20",
+"a@	c #2F271D",
+"b@	c #352C22",
+"c@	c #221C15",
+"d@	c #1D1713",
+"e@	c #1B1612",
+"f@	c #62100E",
+"g@	c #6E181B",
+"h@	c #806279",
+"i@	c #2C1F26",
+"j@	c #291E23",
+"k@	c #281D22",
+"l@	c #291D20",
+"m@	c #332B29",
+"n@	c #7D6A52",
+"o@	c #645442",
+"p@	c #755540",
+"q@	c #F3D9B5",
+"r@	c #322B23",
+"s@	c #241D17",
+"t@	c #201914",
+"u@	c #261F19",
+"v@	c #1C1713",
+"w@	c #16120F",
+"x@	c #130F0D",
+"y@	c #5F0D0C",
+"z@	c #681316",
+"A@	c #824655",
+"B@	c #441519",
+"C@	c #431417",
+"D@	c #421316",
+"E@	c #441417",
+"F@	c #461819",
+"G@	c #672C24",
+"H@	c #622922",
+"I@	c #56201A",
+"J@	c #4F1B17",
+"K@	c #481A18",
+"L@	c #3E1210",
+"M@	c #3D1110",
+"N@	c #3C100E",
+"O@	c #3C100F",
+"P@	c #380D0C",
+"Q@	c #360A0A",
+"R@	c #6B0C0C",
+"S@	c #CA9494",
+"  . + + + + + + + + + + + + + + + + + + + + +   ",
+"  @ # # # # # # # # # # # # # # # # # # # # #   ",
+"  @ # @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ $ #   ",
+"  % # & * = - ; > , ' ) ! ~ { ] ^ / ( _ : < #   ",
+"  [ # } = | 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 D E F G H I J K L M N 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.f.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.X.Y.Z.`. +#   ",
+"  .+# ++@+#+$+%+&+*+=+-+;+>+,+'+)+!+~+{+]+^+#   ",
+"  /+# (+_+:+<+[+}+|+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+D+E+F+G+H+I+J+K+L+M+N+O+P+#   ",
+"  Q+# R+S+T+U+V+W+X+Y+Z+`+ @K+.@+@@@#@$@%@&@#   ",
+"  *@# =@-@;@>@,@'@)@!@~@{@]@K+^@/@(@_@:@<@&@#   ",
+"  *@# [@}@|@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@K+r@s@t@u@v@w@x@y@#   ",
+"  z@# A@B@C@D@E@F@G@H@I@J@K@L@M@N@O@L@P@Q@R@#   ",
+"  @ # # # # # # # # # # # # # # # # # # # # #   ",
+"  S@@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @   ",
+"                                                "};
diff --git a/images/epg-state.png b/images/epg-state.png
index ccd58dd3..fcb3a586 100644
--- a/images/epg-state.png
+++ b/images/epg-state.png
diff --git a/images/epg-state.xpm b/images/epg-state.xpm
index b572b86f..7f83a195 100644
--- a/images/epg-state.xpm
+++ b/images/epg-state.xpm
@@ -1,72 +1,72 @@
 /* XPM */
 static char * epg_state_xpm[] = {
 "24 24 150 2",
-"  	c #FFFFFF",
-". 	c #E5CACA",
-"+ 	c #D7AEAE",
-"@ 	c #AF5E5E",
-"# 	c #870D0D",
-"$ 	c #952929",
+"  	c #E5CACA",
+". 	c #D7AEAE",
+"+ 	c #AF5E5E",
+"@ 	c #870D0D",
+"# 	c #952929",
+"$ 	c #FFFFFF",
 "% 	c #D7D7D7",
 "& 	c #B7B7B7",
 "* 	c #BBBBBB",
 "= 	c #F2F2F2",
-"- 	c #6E6E6E",
-"; 	c #2C2C2C",
-"> 	c #000000",
-", 	c #CFCFCF",
-"' 	c #656565",
-") 	c #070707",
-"! 	c #010101",
-"~ 	c #525252",
-"{ 	c #A8A8A8",
-"] 	c #870F0F",
-"^ 	c #545454",
-"/ 	c #353535",
-"( 	c #8F8F8F",
-"_ 	c #D9D9D9",
-": 	c #ECECEC",
-"< 	c #C0C0C0",
-"[ 	c #1D1D1D",
-"} 	c #373737",
-"| 	c #CBCBCB",
-"1 	c #E2E2E2",
-"2 	c #E8E8E8",
-"3 	c #D5D5D5",
-"4 	c #555555",
-"5 	c #252525",
-"6 	c #989898",
-"7 	c #AF5F5F",
-"8 	c #891313",
-"9 	c #D3D3D3",
-"0 	c #F8F8F8",
-"a 	c #444444",
-"b 	c #FEFEFE",
-"c 	c #F0F0F0",
-"d 	c #7C7C7C",
-"e 	c #101010",
-"f 	c #B06060",
-"g 	c #8A1818",
-"h 	c #7B7B7B",
-"i 	c #7A7A7A",
-"j 	c #FDFDFD",
-"k 	c #E3E3E3",
-"l 	c #333333",
-"m 	c #636363",
-"n 	c #AA5858",
-"o 	c #B06262",
-"p 	c #8B1C1C",
-"q 	c #959595",
-"r 	c #F3F3F3",
-"s 	c #F7F7F7",
-"t 	c #3C3C3C",
-"u 	c #303030",
-"v 	c #994747",
-"w 	c #B16464",
-"x 	c #9F9F9F",
-"y 	c #404040",
-"z 	c #853434",
-"A 	c #8C1E1E",
+"- 	c #870F0F",
+"; 	c #6E6E6E",
+"> 	c #2C2C2C",
+", 	c #000000",
+"' 	c #CFCFCF",
+") 	c #656565",
+"! 	c #070707",
+"~ 	c #010101",
+"{ 	c #525252",
+"] 	c #A8A8A8",
+"^ 	c #AF5F5F",
+"/ 	c #891313",
+"( 	c #545454",
+"_ 	c #353535",
+": 	c #8F8F8F",
+"< 	c #D9D9D9",
+"[ 	c #ECECEC",
+"} 	c #C0C0C0",
+"| 	c #1D1D1D",
+"1 	c #373737",
+"2 	c #CBCBCB",
+"3 	c #E2E2E2",
+"4 	c #E8E8E8",
+"5 	c #D5D5D5",
+"6 	c #555555",
+"7 	c #252525",
+"8 	c #989898",
+"9 	c #B06060",
+"0 	c #8A1818",
+"a 	c #D3D3D3",
+"b 	c #F8F8F8",
+"c 	c #444444",
+"d 	c #FEFEFE",
+"e 	c #F0F0F0",
+"f 	c #7C7C7C",
+"g 	c #101010",
+"h 	c #B06262",
+"i 	c #8B1C1C",
+"j 	c #7B7B7B",
+"k 	c #7A7A7A",
+"l 	c #FDFDFD",
+"m 	c #E3E3E3",
+"n 	c #333333",
+"o 	c #636363",
+"p 	c #AA5858",
+"q 	c #B16464",
+"r 	c #959595",
+"s 	c #F3F3F3",
+"t 	c #F7F7F7",
+"u 	c #3C3C3C",
+"v 	c #303030",
+"w 	c #994747",
+"x 	c #8C1E1E",
+"y 	c #9F9F9F",
+"z 	c #404040",
+"A 	c #853434",
 "B 	c #FAFAFA",
 "C 	c #AFAFAF",
 "D 	c #949494",
@@ -76,46 +76,46 @@ static char * epg_state_xpm[] = {
 "H 	c #BDBDBD",
 "I 	c #FCFCFC",
 "J 	c #853333",
-"K 	c #8D8D8D",
-"L 	c #C7C7C7",
-"M 	c #121212",
-"N 	c #939393",
-"O 	c #EBEBEB",
-"P 	c #797979",
-"Q 	c #030303",
-"R 	c #171717",
-"S 	c #E4E4E4",
-"T 	c #393939",
-"U 	c #B06161",
-"V 	c #8B1B1B",
-"W 	c #4A4A4A",
-"X 	c #C5C5C5",
-"Y 	c #2D2D2D",
-"Z 	c #131313",
-"` 	c #B2B2B2",
-" .	c #494949",
-"..	c #9B9B9B",
-"+.	c #999999",
-"@.	c #3A3A3A",
-"#.	c #B9B9B9",
-"$.	c #222222",
-"%.	c #565656",
-"&.	c #AF6060",
-"*.	c #891414",
-"=.	c #0B0B0B",
-"-.	c #B8B8B8",
-";.	c #C4C4C4",
-">.	c #CECECE",
-",.	c #FBFBFB",
-"'.	c #E6E6E6",
-").	c #BABABA",
-"!.	c #050505",
-"~.	c #0D0D0D",
-"{.	c #3D3D3D",
-"].	c #E1E1E1",
-"^.	c #6F6F6F",
-"/.	c #808080",
-"(.	c #881010",
+"K 	c #B06161",
+"L 	c #8B1B1B",
+"M 	c #8D8D8D",
+"N 	c #C7C7C7",
+"O 	c #121212",
+"P 	c #939393",
+"Q 	c #EBEBEB",
+"R 	c #797979",
+"S 	c #030303",
+"T 	c #171717",
+"U 	c #E4E4E4",
+"V 	c #393939",
+"W 	c #AF6060",
+"X 	c #891414",
+"Y 	c #4A4A4A",
+"Z 	c #C5C5C5",
+"` 	c #2D2D2D",
+" .	c #131313",
+"..	c #B2B2B2",
+"+.	c #494949",
+"@.	c #9B9B9B",
+"#.	c #999999",
+"$.	c #3A3A3A",
+"%.	c #B9B9B9",
+"&.	c #222222",
+"*.	c #565656",
+"=.	c #881010",
+"-.	c #0B0B0B",
+";.	c #B8B8B8",
+">.	c #C4C4C4",
+",.	c #CECECE",
+"'.	c #FBFBFB",
+").	c #E6E6E6",
+"!.	c #BABABA",
+"~.	c #050505",
+"{.	c #0D0D0D",
+"].	c #3D3D3D",
+"^.	c #E1E1E1",
+"/.	c #6F6F6F",
+"(.	c #808080",
 "_.	c #A4A4A4",
 ":.	c #474747",
 "<.	c #818181",
@@ -126,17 +126,17 @@ static char * epg_state_xpm[] = {
 "2.	c #888888",
 "3.	c #7E7E7E",
 "4.	c #181818",
-"5.	c #5E5E5E",
-"6.	c #0A0A0A",
-"7.	c #090909",
-"8.	c #2F2F2F",
-"9.	c #616161",
-"0.	c #A5A5A5",
-"a.	c #1B1B1B",
-"b.	c #505050",
-"c.	c #8E8E8E",
-"d.	c #A95858",
-"e.	c #870E0E",
+"5.	c #870E0E",
+"6.	c #5E5E5E",
+"7.	c #0A0A0A",
+"8.	c #090909",
+"9.	c #2F2F2F",
+"0.	c #616161",
+"a.	c #A5A5A5",
+"b.	c #1B1B1B",
+"c.	c #505050",
+"d.	c #8E8E8E",
+"e.	c #A95858",
 "f.	c #8B8B8B",
 "g.	c #B1B1B1",
 "h.	c #DCDCDC",
@@ -151,27 +151,27 @@ static char * epg_state_xpm[] = {
 "q.	c #D7AFAF",
 "r.	c #A24343",
 "s.	c #CA9494",
-"                                                ",
-". + + + + + + + + + + + + + + + + + + + + + + + ",
-"@ # # # # # # # # # # # # # # # # # # # # # # # ",
-"@ # @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ $ # ",
-"@ #                                         @ # ",
-"@ #     % & & & %           * & & & =       @ # ",
-"@ #   - ; > > > ; -     , ' ) ! ! ! ~ {     @ # ",
-"@ ] ^ / ( _ : _ ( / ^ < [ } | 1 2 3 4 5 6   @ # ",
-"7 8 ! 9 0       0 9 > > a 2 b b b b c d e   @ # ",
-"f g h 0 b         0 i > 3 j b b b b b k l m n # ",
-"o p q j b         j q > r b b b b b b s t u v # ",
-"w p x b b           x >   b b b b b b b y u z # ",
-"w A x B C D E       x >   F G H I b b b y u J # ",
-"o A K L M ) N     j K > O P Q R S b b = T u J # ",
-"U V W X Y Z `     O  .> ..+.) @.O b I #.$.%.J # ",
-"&.*.=.-.;.>.,.,.'.).!.~.{.;.;.].j ,.9 ^.M /.J # ",
-"7 (._.) :.<.[.<.}.Q ~ /.|.! 1.2.K 3.4.4.- /.v # ",
-"@ ]   ;.5.6.7.7.8.9./.0.: < a.6.6.6.b.- /.c.d.# ",
-"@ e.      D /././.f.g.      h.D /././.i.j.  @ # ",
-"@ #       = k.k.k.l.            m.k.k.n.    @ # ",
-"@ #                                         @ # ",
-"@ # o.p.p.p.q.q.+ o.o.p.p.p.q.q.+ + + + + + r.# ",
-"@ # # # # # # # # # # # # # # # # # # # # # # # ",
-"s.@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ "};
+"  . . . . . . . . . . . . . . . . . . . . . . . ",
+"+ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"+ @ + + + + + + + + + + + + + + + + + + + + # @ ",
+"+ @ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ + @ ",
+"+ @ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ + @ ",
+"+ @ $ $ % & & & % $ $ $ $ $ * & & & = $ $ $ + @ ",
+"+ - $ ; > , , , > ; $ $ ' ) ! ~ ~ ~ { ] $ $ + @ ",
+"^ / ( _ : < [ < : _ ( } | 1 2 3 4 5 6 7 8 $ + @ ",
+"9 0 ~ a b $ $ $ b a , , c 4 d d d d e f g $ + @ ",
+"h i j b d $ $ $ $ b k , 5 l d d d d d m n o p @ ",
+"q i r l d $ $ $ $ l r , s d d d d d d t u v w @ ",
+"q x y d d $ $ $ $ $ y , $ d d d d d d d z v A @ ",
+"h x y B C D E $ $ $ y , $ F G H I d d d z v J @ ",
+"K L M N O ! P $ $ l M , Q R S T U d d = V v J @ ",
+"W X Y Z `  ...$ $ Q +., @.#.! $.Q d I %.&.*.J @ ",
+"^ =.-.;.>.,.'.'.).!.~.{.].>.>.^.l '.a /.O (.J @ ",
+"+ - _.! :.<.[.<.}.S { (.|.~ 1.2.M 3.4.4.; (.w @ ",
+"+ 5.$ >.6.7.8.8.9.0.(.a.[ } b.7.7.7.c.; (.d.e.@ ",
+"+ @ $ $ $ D (.(.(.f.g.$ $ $ h.D (.(.(.i.j.$ + @ ",
+"+ @ $ $ $ = k.k.k.l.$ $ $ $ $ $ m.k.k.n.$ $ + @ ",
+"+ @ o.p.p.p.q.q.. o.o.p.p.p.q.q.. . . . . . r.@ ",
+"+ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"s.+ + + + + + + + + + + + + + + + + + + + + + + ",
+"$ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ "};