Updated buttons.

9 files changed, 483 insertions, 794 deletions

diff --git a/images/command.8bit.xpm b/images/command.8bit.xpm
index 438bb0fa..1bd93cc5 100644
--- a/images/command.8bit.xpm
+++ b/images/command.8bit.xpm
@@ -2,43 +2,43 @@
 static char * command_8bit_xpm[] = {
 "32 32 9 1",
 " 	c None",
-".	c #020204",
-"+	c #860E0C",
-"@	c #463433",
-"#	c #9A4644",
-"$	c #776C6C",
-"%	c #AA8284",
-"&	c #AE8A8C",
-"*	c #BDBDBB",
-"********************************",
-"*****#####################%*****",
-"*****+++++++++++++++++++++#*****",
-"*****+#%%%%%%%%%%%%%%%%%%+#*****",
-"*****+#******************+#*****",
-"*****+#******************+#*****",
-"*****+#**&++++++++++++%**+#*****",
-"*****+#***&+++++++++++***+#*****",
-"*****+#****++++++++++$***+#*****",
-"*****+#****#+++++++++****+#*****",
-"*****+#*****+++++++++****+#*****",
-"*****+#*****++++++++&****+#*****",
-"*****+#******+++++++*****+#*****",
-"*****+#******++++++#*****+#*****",
-"*****+#*******+++++******+#*****",
-"*****+#*******+++++******+#*****",
-"*****+#********+++*******+#*****",
-"*****+#**%+++++++++++++**+#*****",
-"*****+#**%+++++++++++++**+#*****",
-"*****+#******************+#*****",
-"*****+#******************+#*****",
-"*****++##################+#*****",
-"*****+++++++++++++++++++++#*****",
-"*****%%%%%%%%%%%%%%%%%%%%%&*****",
-"********************************",
-"*********@.$*.@*****************",
-"*********$.**@&&@@&*$@%*********",
-"*********@@**.*.$&*@$@@*********",
-"*********.%**@*$.$&.@$**********",
-"*********.$*$$&*$.&.&*$*********",
-"*********&@@$*&@@&*$@$&*********",
-"********************************"};
+".	c #1F1F1F",
+"+	c #3F3F3E",
+"@	c #635D5C",
+"#	c #9C8082",
+"$	c #9B8786",
+"%	c #BCBCBA",
+"&	c #7D1413",
+"*	c #914746",
+"%$$############################%",
+"%*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&%",
+"%*&**************************&&%",
+"%*&%%%%%%%%%%%%%%%%%%%%%%%%%%*&%",
+"%*&%%%%%%%%%%%%%%%%%%%%%%%%%%*&%",
+"%*&%%%%%%%%%%%%%%%%%%%%%%%%%%*&%",
+"%*&%%%%%%%%%%%%%%%%%%%%%%%%%%*&%",
+"%*&%%%%%%%%%%%%%%%%%%%%%%%%%%*&%",
+"%*&%%%%%%%%%%%%%%%%%%%%%%%%%%*&%",
+"%*&%%%%%%%%%%%%%%%%%%%%%%%%%%*&%",
+"%*&%%%%%%%%%%%%%%%%%%%%%%%%%%*&%",
+"%*&%%%%%%%%%%%%%%%%%%%%%%%%%%*&%",
+"%**%%%%%%%%%%%%%%%%%%%%%%%%%%*&%",
+"%*&%%%%%%%%%%%%%%%%%%%%%%%%%%*&%",
+"%*&%%%%%%%%%%%%%%%%%%%%%%%%%%*&%",
+"%*&%%%%%%%%%%%%%%%%%%%%%%%%%%*&%",
+"%*&%%%%%%%%%%%%%%%%%%%%%%%%%%*&%",
+"%*&%%%%%%%%%%%%%%%%%%%%%%%%%%*&%",
+"%*&%%%%%%%%%%%%%%%%%%%%%%%%%%*&%",
+"%*&%%%%%%%%%%%%%%%%%%%%%%%%%%*&%",
+"%*&##########################*&%",
+"%*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&%",
+"%#*****************************%",
+"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%#",
+"%$&+*%%%%%%%%%%%%%%%%%%%%%%%%%$+",
+"%+$%%$*@$*#*$@$*#*$*%$+*$*$*%$++",
+"%.%%%+%+$.@.@+$.@.@+%+#+%+@.$.$@",
+"#+%%$+%@$.@.%+%.@.$+@@@+$+%+@$@@",
+"$.%%#.$+#+$+%+#+$@$@+++#$@#+@++$",
+"%@+@%@+$$@$$$+$@$$$@#@@@$$$@@@@#",
+"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"};
diff --git a/images/command.xbm b/images/command.xbm
index 473399c1..922df7c9 100644
--- a/images/command.xbm
+++ b/images/command.xbm
@@ -4,14 +4,14 @@
 #define _x_hot 0
 #define _y_hot 0
 static char _bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0xea, 0xff, 0xff, 0x57, 0xf0, 0xff, 0xff, 0x07,
-   0xa2, 0x24, 0x49, 0x56, 0x64, 0x92, 0x24, 0x03, 0x64, 0x00, 0x00, 0x56,
-   0x70, 0xff, 0x7f, 0x06, 0x62, 0xf8, 0x7f, 0x56, 0x64, 0xfa, 0x1f, 0x03,
-   0xe0, 0xf0, 0x3f, 0x56, 0x2a, 0xfa, 0x9f, 0x06, 0xe0, 0xb0, 0x1d, 0x56,
-   0x6a, 0xe2, 0x4f, 0x06, 0x60, 0xe4, 0x4f, 0x56, 0x6a, 0xd1, 0x27, 0x03,
-   0x60, 0xc2, 0x07, 0x56, 0x6a, 0xa4, 0x53, 0x06, 0xe0, 0xfc, 0x7f, 0x56,
-   0x2a, 0xfd, 0x7f, 0x03, 0x60, 0x00, 0x00, 0x56, 0x6a, 0x25, 0xa9, 0x06,
-   0xe0, 0x6d, 0x6f, 0x57, 0xea, 0xff, 0xff, 0x07, 0x80, 0x94, 0x90, 0x54,
-   0x2a, 0x22, 0x45, 0x00, 0x40, 0x6e, 0x10, 0x55, 0x8a, 0xa6, 0x77, 0x00,
-   0x10, 0xa6, 0x69, 0x55, 0x4a, 0xaa, 0x1b, 0x00, 0x88, 0x36, 0x5a, 0x55,
-   0x22, 0xca, 0x35, 0x00, 0x44, 0x08, 0x41, 0x55 };
+   0xaa, 0xaa, 0xaa, 0x2a, 0xfe, 0xff, 0xff, 0x7f, 0x56, 0x55, 0x55, 0x75,
+   0x46, 0x44, 0x44, 0x62, 0x16, 0x29, 0x11, 0x69, 0x26, 0x41, 0x24, 0x61,
+   0x46, 0x14, 0x11, 0x64, 0x16, 0x41, 0xa2, 0x64, 0x46, 0x14, 0x09, 0x61,
+   0x16, 0x21, 0x21, 0x64, 0x46, 0x04, 0x4a, 0x51, 0x96, 0x54, 0x08, 0x62,
+   0x42, 0x82, 0xa2, 0x64, 0x4e, 0x28, 0x08, 0x64, 0x06, 0x85, 0xa2, 0x68,
+   0x56, 0x28, 0x08, 0x61, 0x06, 0x41, 0xa5, 0x64, 0x56, 0x0a, 0x08, 0x64,
+   0x06, 0x51, 0xa1, 0x60, 0x2c, 0x02, 0x0a, 0x65, 0xd6, 0xba, 0x6a, 0x55,
+   0xfe, 0xff, 0xff, 0x7f, 0x54, 0xb5, 0xd5, 0xb6, 0x11, 0x01, 0x11, 0x00,
+   0x5e, 0x54, 0x44, 0xd5, 0xc2, 0xab, 0xdb, 0xca, 0xaa, 0xbe, 0xae, 0xae,
+   0xa3, 0xaa, 0xea, 0xba, 0xba, 0xaa, 0x5d, 0x6d, 0x66, 0x6b, 0x69, 0x55,
+   0x10, 0x10, 0x02, 0x20, 0xa2, 0x42, 0x54, 0x45 };
diff --git a/images/command.xpm b/images/command.xpm
index b3951137..dd70c8f2 100644
--- a/images/command.xpm
+++ b/images/command.xpm
@@ -1,62 +1,157 @@
 /* XPM */
 static char * command_xpm[] = {
-"32 32 27 1",
-" 	c None",
-".	c #BCBCBC s backgroundToolBarColor",
-"+	c #994747",
-"@	c #A56E6E",
-"#	c #870D0D",
-"$	c #933434",
-"%	c #AA8282",
-"&	c #B29A9A",
-"*	c #AC8888",
-"=	c #8A1616",
-"-	c #A06262",
-";	c #A16363",
-">	c #902D2D",
-",	c #B09595",
-"'	c #9E5959",
-")	c #860C0C",
-"!	c #8D2121",
-"~	c #B09696",
-"{	c #3F3F3F",
-"]	c #000000",
-"^	c #696969",
-"/	c #151515",
-"(	c #2A2A2A",
-"_	c #7D7D7D",
-":	c #A7A7A7",
-"<	c #939393",
-"[	c #545454",
-"................................",
-".....+++++++++++++++++++++@.....",
-".....#####################+.....",
-".....#$%%%%%%%%%%%%%%%%%%#+.....",
-".....#+..................#+.....",
-".....#+..................#+.....",
-".....#+..&############*..#+.....",
-".....#+...&##########=...#+.....",
-".....#+....##########-...#+.....",
-".....#+....;#########....#+.....",
-".....#+.....########>....#+.....",
-".....#+.....########,....#+.....",
-".....#+......#######.....#+.....",
-".....#+......######'.....#+.....",
-".....#+.......#####......#+.....",
-".....#+.......#####......#+.....",
-".....#+........###.......#+.....",
-".....#+..%#############..#+.....",
-".....#+..%#######)#####..#+.....",
-".....#+..................#+.....",
-".....#+..................#+.....",
-".....#!++++++++++++++++++#+.....",
-".....#####################+.....",
-".....%%%%%%%%%%%%%%%%%%%%%~.....",
-"................................",
-".........{]^./(.................",
-"........._/..{:<{{:.^{<.........",
-".........{{..].]^<.{_{[.........",
-".........]_.:{._]_<]{[:.........",
-"........./^.^^<<^]_]::_.........",
-".........<{{^.<{{<.[{^:.........",
-"................................"};
+"32 32 122 2",
+"  	c None",
+". 	c #BCBCBC s backgroundToolBarColor",
+"+ 	c #B09696",
+"@ 	c #AA8282",
+"# 	c #994747",
+"$ 	c #870D0D",
+"% 	c #994848",
+"& 	c #8D2121",
+"* 	c #870F0F",
+"= 	c #994949",
+"- 	c #891313",
+"; 	c #994A4A",
+"> 	c #8A1818",
+", 	c #9A4C4C",
+"' 	c #8B1C1C",
+") 	c #9B4E4E",
+"! 	c #8C1E1E",
+"~ 	c #994B4B",
+"{ 	c #8B1B1B",
+"] 	c #891414",
+"^ 	c #881010",
+"/ 	c #870E0E",
+"( 	c #AB8383",
+"_ 	c #AB8484",
+": 	c #933434",
+"< 	c #A56E6E",
+"[ 	c #AFAFAF",
+"} 	c #858585",
+"| 	c #999999",
+"1 	c #292929",
+"2 	c #3E3E3E",
+"3 	c #494949",
+"4 	c #AAAAAA",
+"5 	c #A2A2A2",
+"6 	c #323232",
+"7 	c #373737",
+"8 	c #8E8E8E",
+"9 	c #BBBBBB",
+"0 	c #A7A7A7",
+"a 	c #535353",
+"b 	c #616161",
+"c 	c #939393",
+"d 	c #474747",
+"e 	c #808080",
+"f 	c #585858",
+"g 	c #9D9D9D",
+"h 	c #676767",
+"i 	c #8F8F8F",
+"j 	c #4C4C4C",
+"k 	c #7E7E7E",
+"l 	c #575757",
+"m 	c #989898",
+"n 	c #6A6A6A",
+"o 	c #B4B4B4",
+"p 	c #959595",
+"q 	c #484848",
+"r 	c #3F3F3F",
+"s 	c #909090",
+"t 	c #5C5C5C",
+"u 	c #B5B5B5",
+"v 	c #949494",
+"w 	c #383838",
+"x 	c #A4A4A4",
+"y 	c #8D8D8D",
+"z 	c #1D1D1D",
+"A 	c #606060",
+"B 	c #121212",
+"C 	c #4F4F4F",
+"D 	c #343434",
+"E 	c #232323",
+"F 	c #5E5E5E",
+"G 	c #0D0D0D",
+"H 	c #353535",
+"I 	c #ADADAD",
+"J 	c #454545",
+"K 	c #666666",
+"L 	c #8B8B8B",
+"M 	c #2D2D2D",
+"N 	c #686868",
+"O 	c #7D7D7D",
+"P 	c #414141",
+"Q 	c #B8B8B8",
+"R 	c #0C0C0C",
+"S 	c #747474",
+"T 	c #282828",
+"U 	c #464646",
+"V 	c #B0B0B0",
+"W 	c #141414",
+"X 	c #737373",
+"Y 	c #4D4D4D",
+"Z 	c #6B6B6B",
+"` 	c #5A5A5A",
+" .	c #4E4E4E",
+"..	c #979797",
+"+.	c #A1A1A1",
+"@.	c #6E6E6E",
+"#.	c #7B7B7B",
+"$.	c #656565",
+"%.	c #2B2B2B",
+"&.	c #A8A8A8",
+"*.	c #303030",
+"=.	c #9F9F9F",
+"-.	c #505050",
+";.	c #818181",
+">.	c #333333",
+",.	c #3C3C3C",
+"'.	c #757575",
+").	c #646464",
+"!.	c #515151",
+"~.	c #3A3A3A",
+"{.	c #767676",
+"].	c #444444",
+"^.	c #717171",
+"/.	c #888888",
+"(.	c #7A7A7A",
+"_.	c #898989",
+":.	c #838383",
+"<.	c #555555",
+"[.	c #565656",
+"}.	c #6C6C6C",
+"|.	c #545454",
+"1.	c #787878",
+". + @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ . ",
+". # $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ . ",
+". # $ # # % % % % % % % # # # # % % % % # # # # # # # # # & $ . ",
+". # $ . . . . . . . . . . . . . . . . . . . . . . . . . . # $ . ",
+". # $ . . . . . . . . . . . . . . . . . . . . . . . . . . # $ . ",
+". % $ . . . . . . . . . . . . . . . . . . . . . . . . . . # $ . ",
+". % * . . . . . . . . . . . . . . . . . . . . . . . . . . # $ . ",
+". = - . . . . . . . . . . . . . . . . . . . . . . . . . . # $ . ",
+". ; > . . . . . . . . . . . . . . . . . . . . . . . . . . # $ . ",
+". , ' . . . . . . . . . . . . . . . . . . . . . . . . . . # $ . ",
+". ) ' . . . . . . . . . . . . . . . . . . . . . . . . . . # $ . ",
+". ) ! . . . . . . . . . . . . . . . . . . . . . . . . . . # $ . ",
+". ~ ! . . . . . . . . . . . . . . . . . . . . . . . . . . # $ . ",
+". ~ { . . . . . . . . . . . . . . . . . . . . . . . . . . # $ . ",
+". = ] . . . . . . . . . . . . . . . . . . . . . . . . . . # $ . ",
+". = ^ . . . . . . . . . . . . . . . . . . . . . . . . . . # $ . ",
+". % * . . . . . . . . . . . . . . . . . . . . . . . . . . # $ . ",
+". % / . . . . . . . . . . . . . . . . . . . . . . . . . . # $ . ",
+". # $ . . . . . . . . . . . . . . . . . . . . . . . . . . # $ . ",
+". # $ . . . . . . . . . . . . . . . . . . . . . . . . . . # $ . ",
+". # $ @ @ @ @ ( _ _ _ _ _ @ @ @ _ _ _ _ _ @ @ @ @ @ @ @ @ : $ . ",
+". # $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ . ",
+". < # # # # # # # # # # # # # # # # # # # # # # # # # # # # # . ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . [ } ",
+". | 1 2 3 4 . . . . . . . . . . . . . . . . . . . . . . . . 5 6 ",
+". 7 8 9 0 0 a b c d e f g h i j k l m n o p q r g f s t u v w 7 ",
+"0 6 [ . o r x 2 y z A B C D x E F G j H I H s J g r K E L M p N ",
+"O P . . p J Q a c R S T 0 U V W X E g Y Z ` F  ...7 +.H @.#.$.b ",
+"0 %.&.9 e *.=.r O w } -.x J ;.P O -.|  .3 >.,.'.y ).e J d !.~.#.",
+". {.r Z 0 t ].x y ^.8 } /.a (.{./._.:.<.#.[.}.$.y _.;.[.}.|.1.{.",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . "};
diff --git a/images/context.8bit.xpm b/images/context.8bit.xpm
index ff54bb84..5f4b5703 100644
--- a/images/context.8bit.xpm
+++ b/images/context.8bit.xpm
@@ -2,43 +2,43 @@
 static char * context_8bit_xpm[] = {
 "32 32 9 1",
 " 	c None",
-".	c #10170F",
-"+	c #656545",
-"@	c #8A9176",
-"#	c #79CE62",
-"$	c #BCC5B6",
-"%	c #E1ECDD",
-"&	c #383C34",
-"*	c #8B2824",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
-"$@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@$",
-"$******************************$",
-"$******************************$",
-"$$%%%%%$$%#%%#%#%#%##%##%######$",
-"$#%##@@++@&@###########+###@###$",
-"$%%@@++@@&+.+&+&+@&&+&&&&++#&##$",
-"$%@@@$$+#+@@++++++&&&&+@#@&@&##$",
-"$%@$@$%+%@#@@###+##+##@##@&+&+#$",
-"$%+$@#%@##&++#@#@##++#&#+#+++&#$",
-"$%@$$@#@.@+#&#@++&@###+@&#+#+&#$",
-"$%@$@&@%#$@%#&%@#@##@#@#@#+#&&@$",
-"$%+$%@%$&++$@+++@@#%#@@###+++++#",
-"$%*$%++$@$&@#%%#%#+@+##+@@+&&.+$",
-"$%+$%&%%$+$%%%%%%#%%#%#%##++++#$",
-"$%+%$+%@@%%%%%%%%%%%%%#%%#+@+#%$",
-"$%+%%$&$%%%%%%%%%%%%#%%%%%+++#%$",
-"$%+%@+$%%%%%%%%%%%%%%%%%#%+##%#$",
-"$$+$$%%%%%%%%%%%%%%%%%%%%%@$%%%$",
-"$%+%%%%%%%%%%%%%%%%%%%%%%%$$#%%$",
-"$%$%%%%%%%%%%%%%%%%%%%%%%%%%%%%$",
-"$%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%$",
-"$***************************.**$",
-"$+*****************************$",
-"$$$$$$$$$$$$$$$$$$$$$$$$+$$$$$$$",
-"$$$$$$$$+.&&@$$$$$$$$$$@.@$$$$$$",
-"$$$$$$$*&$$@$$+&+$$+&&@$.$$$$$$$",
-"$$$$$$@.@$$$$&+@.@&+$.@+&$$$$@$$",
-"$@$$@$@.$$..+.$$.+.$&.$+&$$@$$$$",
-"$$$$$$@.+$&++.@&&+.+&&$*+$$$$$$$",
-"$$@$$$$@*&&$$&&+$$&@+&$&+$$$@$$$",
-"$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$"};
+".	c #09090A",
+"+	c #856F70",
+"@	c #958987",
+"#	c #2E2E2F",
+"$	c #FEFEFC",
+"%	c #860E0C",
+"&	c #BCBCBA",
+"*	c #7B403E",
+"&@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@&",
+"&*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%&",
+"&*%**************************%%&",
+"&*%&&&&&&&&&&&&&&&&&&&&&&&&&&*%&",
+"&*%&&&&&&&@@@@&&&&&&@@@&&&&&&*%&",
+"&*%&&&&&+*....*&&&*#...#*&&&&*%&",
+"&*%&&&&+#*&$&&*.@*#@&$&@#*&&&*%&",
+"&+%&&&&.+$$$$$$#..&$$$$$&.@&&*%&",
+"&*%&&&*#$$$$$$$&.+$$$$$$$+.&&*%&",
+"&+%&&@##$$$$$$$$.@$$$$$$$@.&&*%&",
+"&*%&&@##$$$$$$$$.@$$$$$$$&.&&*%&",
+"&+%&&@##$$$$&@$$.@$$$$@&$@.&&*%&",
+"&*%&&@##$$$$..+$.@$$$@..&@.&&*%&",
+"&+%&&@*#&$$$#.@@.#$$$&.#&**&&*%&",
+"&*%&&+@.+&$$&&&##.&$$$&&&.@&&*%&",
+"&+%&&@@+..@@@@.#@#.#@@@*.@&&&*%&",
+"&*%&&&+@+##...@&@@+#...#@&&&&+%&",
+"&*%&&&&@+@+@+&&&&++@@@@&&&&&&*%&",
+"&*%&&&&&@@@@&&&&&&&@@@&&&&&&&*%&",
+"&*%&&&&&&&&&&&&&&&&&&&&&&&&&&*%&",
+"&*%@@@@@@@@@@@@@@@@@@@@@@@@@@*%&",
+"&*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%&",
+"&@*****************************&",
+"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&",
+"&&*#*#@&&&&&&&&&&&@&&&&&&&&&&&@&",
+"&##&&@&&+*@@*@+*&#.+&@*+&*@+++.#",
+"&.@&&&&.@+.&.+*.&**&@*+#&+##++.&",
+"+.&&&&+#&@.&.++#&#@&.##@&@.+&+#&",
+"&.+&&@##&.++#&#+&.+&.+&+@#++&#*&",
+"&@##+&&##@&++&##&+#&@#+@++&#@@#@",
+"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&",
+"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&"};
diff --git a/images/context.xbm b/images/context.xbm
index 858a5111..cc5b8643 100644
--- a/images/context.xbm
+++ b/images/context.xbm
@@ -4,14 +4,14 @@
 #define _x_hot 0
 #define _y_hot 0
 static char _bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0xed, 0xee, 0xee, 0x6e, 0xbe, 0xbb, 0xbb, 0x3b,
-   0xf6, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0xa1, 0x0d, 0x00, 0x51,
-   0xa8, 0xfa, 0xff, 0x17, 0x94, 0x52, 0x75, 0x54, 0x90, 0x0a, 0x09, 0x1d,
-   0x15, 0x5c, 0x59, 0x75, 0xa0, 0x95, 0x42, 0x15, 0x24, 0xa0, 0x52, 0x74,
-   0x24, 0x57, 0x41, 0x54, 0x64, 0x0c, 0x9c, 0x7a, 0x24, 0x01, 0x00, 0x14,
-   0x24, 0x41, 0x40, 0x34, 0x44, 0x00, 0x10, 0x14, 0x54, 0x80, 0x00, 0x44,
-   0x04, 0x02, 0x00, 0x04, 0x04, 0x04, 0x40, 0x08, 0x00, 0x80, 0x08, 0x80,
-   0x11, 0x08, 0x00, 0x00, 0xfe, 0xff, 0xff, 0x7f, 0xec, 0xb6, 0xf7, 0x7f,
-   0x02, 0x00, 0x00, 0x00, 0x50, 0xaf, 0x94, 0x23, 0x82, 0xc9, 0x6a, 0x89,
-   0x94, 0x49, 0xad, 0x21, 0xa2, 0x3c, 0xb7, 0x15, 0x84, 0xb5, 0x35, 0x41,
-   0x54, 0x67, 0xac, 0x15, 0x10, 0x40, 0x01, 0x20 };
+   0xaa, 0xaa, 0xaa, 0x2a, 0xfe, 0xff, 0xff, 0x7f, 0xd6, 0x6a, 0xb5, 0x76,
+   0x0e, 0x04, 0x42, 0x60, 0xa6, 0x5a, 0x29, 0x65, 0x0c, 0x7e, 0xfc, 0x65,
+   0xa6, 0xc3, 0x07, 0x53, 0x8c, 0x80, 0x03, 0x66, 0xe6, 0x00, 0x01, 0x66,
+   0xc4, 0x00, 0x03, 0x64, 0xd6, 0x00, 0x01, 0x54, 0xc6, 0x20, 0x43, 0x66,
+   0xd6, 0x30, 0xe1, 0x54, 0xc4, 0xb0, 0xc3, 0x66, 0xb6, 0x81, 0x03, 0x6b,
+   0x46, 0xeb, 0x5e, 0x63, 0xa6, 0x3e, 0xfd, 0x68, 0x0e, 0x55, 0x48, 0x61,
+   0xa6, 0x0a, 0x15, 0x62, 0x0c, 0x50, 0x50, 0x64, 0x76, 0x4b, 0xab, 0x55,
+   0xfe, 0xff, 0xff, 0x7f, 0xd4, 0xb6, 0xad, 0x5d, 0x04, 0x04, 0x10, 0x20,
+   0x7a, 0x51, 0x45, 0x45, 0x26, 0xb6, 0xde, 0xec, 0x8a, 0xd5, 0xa2, 0x6e,
+   0xa3, 0xd5, 0xf6, 0x4c, 0xd6, 0x56, 0x9b, 0x6a, 0x9c, 0xdb, 0x64, 0x5b,
+   0x02, 0x00, 0x09, 0x40, 0x24, 0x29, 0xa9, 0x0a };
diff --git a/images/context.xpm b/images/context.xpm
index 31ceed35..89fa2fc9 100644
--- a/images/context.xpm
+++ b/images/context.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * context_xpm[] = {
-"32 32 551 2",
+"32 32 145 2",
 "  	c None",
 ". 	c #BCBCBC s backgroundToolBarColor",
 "+ 	c #B09696",
@@ -9,578 +9,172 @@ static char * context_xpm[] = {
 "$ 	c #870D0D",
 "% 	c #994848",
 "& 	c #8D2121",
-"* 	c #A8E1A3",
-"= 	c #A8E29F",
-"- 	c #A8E498",
-"; 	c #A1DF96",
-"> 	c #A3E098",
-", 	c #A2DB8D",
-"' 	c #A1CD74",
-") 	c #96CA6C",
-"! 	c #92D674",
-"~ 	c #8FDF77",
-"{ 	c #8FE176",
-"] 	c #8ADE73",
-"^ 	c #8BD974",
-"/ 	c #83DB71",
-"( 	c #7EDE68",
-"_ 	c #85DD67",
-": 	c #7BDF62",
-"< 	c #7CDD5C",
-"[ 	c #76DF60",
-"} 	c #6FDA52",
-"| 	c #75D857",
-"1 	c #74DF59",
-"2 	c #6DD552",
-"3 	c #6EDD53",
-"4 	c #6DDF53",
-"5 	c #6ADA5B",
-"6 	c #72D751",
-"7 	c #6FDA4E",
-"8 	c #6DE152",
-"9 	c #72DA51",
-"0 	c #B7E7A6",
-"a 	c #B3E9A6",
-"b 	c #B4E6A2",
-"c 	c #A4D694",
-"d 	c #6F8958",
-"e 	c #8C7F31",
-"f 	c #6E6D2E",
-"g 	c #6E7636",
-"h 	c #65793F",
-"i 	c #344A2D",
-"j 	c #6CA65C",
-"k 	c #7ABD6A",
-"l 	c #92DF7C",
-"m 	c #88D976",
-"n 	c #72B759",
-"o 	c #72BC5D",
-"p 	c #6EB656",
-"q 	c #69B94F",
-"r 	c #6FCC5B",
-"s 	c #71D15F",
-"t 	c #71D759",
-"u 	c #68CC4D",
-"v 	c #417C31",
-"w 	c #58B145",
-"x 	c #60CC4D",
-"y 	c #60A33A",
-"z 	c #579833",
-"A 	c #5DBA45",
-"B 	c #6EDD54",
-"C 	c #72DC58",
-"D 	c #BFECB1",
-"E 	c #BBE7AE",
-"F 	c #899C70",
-"G 	c #957829",
-"H 	c #A5781B",
-"I 	c #806720",
-"J 	c #958F43",
-"K 	c #807F38",
-"L 	c #4A4A20",
-"M 	c #41512F",
-"N 	c #1D2819",
-"O 	c #395533",
-"P 	c #243620",
-"Q 	c #406239",
-"R 	c #263A20",
-"S 	c #548246",
-"T 	c #5B8E4C",
-"U 	c #2F4F28",
-"V 	c #284024",
-"W 	c #375E2F",
-"X 	c #2A4922",
-"Y 	c #142610",
-"Z 	c #243E16",
-"` 	c #2F3D11",
-" .	c #516318",
-"..	c #5A862F",
-"+.	c #69A938",
-"@.	c #326026",
-"#.	c #70DC57",
-"$.	c #6BD953",
-"%.	c #C9E9BD",
-"&.	c #9AAE83",
-"*.	c #9D7E2F",
-"=.	c #9D975C",
-"-.	c #AECA8E",
-";.	c #AFD592",
-">.	c #65764D",
-",.	c #9AB173",
-"'.	c #6B6833",
-").	c #A1A14E",
-"!.	c #958D3B",
-"~.	c #71631D",
-"{.	c #72621E",
-"].	c #74621E",
-"^.	c #70621E",
-"/.	c #685817",
-"(.	c #645717",
-"_.	c #4F430F",
-":.	c #42390D",
-"<.	c #3F390D",
-"[.	c #433D0E",
-"}.	c #6D7020",
-"|.	c #799D39",
-"1.	c #7BBA48",
-"2.	c #718A2A",
-"3.	c #284519",
-"4.	c #4A933D",
-"5.	c #285022",
-"6.	c #4E9C38",
-"7.	c #6DDE50",
-"8.	c #CCE6CA",
-"9.	c #8E9972",
-"0.	c #ACA260",
-"a.	c #8EA98A",
-"b.	c #A6C69E",
-"c.	c #BEE2B1",
-"d.	c #63795A",
-"e.	c #B8E6AC",
-"f.	c #81A174",
-"g.	c #81A47A",
-"h.	c #7BA172",
-"i.	c #66895D",
-"j.	c #A2E895",
-"k.	c #7AB078",
-"l.	c #90C77B",
-"m.	c #537848",
-"n.	c #A3E086",
-"o.	c #94D278",
-"p.	c #57763E",
-"q.	c #90D16F",
-"r.	c #88C96A",
-"s.	c #558E4F",
-"t.	c #86DF70",
-"u.	c #5EA450",
-"v.	c #80B247",
-"w.	c #3D5220",
-"x.	c #36622E",
-"y.	c #1F3916",
-"z.	c #39722D",
-"A.	c #6CDF54",
-"B.	c #D5EAD2",
-"C.	c #7A7B66",
-"D.	c #BDAE6C",
-"E.	c #98A690",
-"F.	c #A9C2A4",
-"G.	c #C8E3BD",
-"H.	c #7C9174",
-"I.	c #9DB48A",
-"J.	c #A6C79A",
-"K.	c #354031",
-"L.	c #455841",
-"M.	c #4D6645",
-"N.	c #AFE2A3",
-"O.	c #87B177",
-"P.	c #87B377",
-"Q.	c #6D8F60",
-"R.	c #97D084",
-"S.	c #9AD283",
-"T.	c #334E31",
-"U.	c #5C8A4F",
-"V.	c #5E9153",
-"W.	c #345130",
-"X.	c #93E176",
-"Y.	c #538447",
-"Z.	c #8FD26F",
-"`.	c #595E1D",
-" +	c #385D2C",
-".+	c #467B39",
-"++	c #1D3618",
-"@+	c #7DDB5C",
-"#+	c #DCE6D1",
-"$+	c #7F7E67",
-"%+	c #BEAE6D",
-"&+	c #C7DEBD",
-"*+	c #809580",
-"=+	c #9EB797",
-"-+	c #768A70",
-";+	c #222721",
-">+	c #839A82",
-",+	c #6D816B",
-"'+	c #ACD1A2",
-")+	c #2A3529",
-"!+	c #92B48B",
-"~+	c #819E75",
-"{+	c #495B42",
-"]+	c #627955",
-"^+	c #2B3A27",
-"/+	c #5E8050",
-"(+	c #71A567",
-"_+	c #7FB370",
-":+	c #95D77F",
-"<+	c #4A6841",
-"[+	c #537D4A",
-"}+	c #2F4B2C",
-"|+	c #8ED77B",
-"1+	c #5D5D1C",
-"2+	c #72B861",
-"3+	c #4A8042",
-"4+	c #0F1A0E",
-"5+	c #76C967",
-"6+	c #E4EAE2",
-"7+	c #908A71",
-"8+	c #C4B87F",
-"9+	c #9AA290",
-"0+	c #3F443E",
-"a+	c #A1AD9B",
-"b+	c #CFE4C4",
-"c+	c #95A58E",
-"d+	c #B3CCAE",
-"e+	c #788570",
-"f+	c #C4E9BA",
-"g+	c #96BA95",
-"h+	c #3E4B3B",
-"i+	c #BCE4B5",
-"j+	c #708A69",
-"k+	c #BBE4AE",
-"l+	c #6C8864",
-"m+	c #B3E2A3",
-"n+	c #8EBC85",
-"o+	c #719B66",
-"p+	c #A3E591",
-"q+	c #62845A",
-"r+	c #98DE87",
-"s+	c #5C8658",
-"t+	c #8FD478",
-"u+	c #747023",
-"v+	c #88D078",
-"w+	c #233920",
-"x+	c #3C6636",
-"y+	c #598F47",
-"z+	c #E5EBE7",
-"A+	c #7B7258",
-"B+	c #CBBE92",
-"C+	c #D0D4C5",
-"D+	c #878E83",
-"E+	c #DDE9D8",
-"F+	c #A5B39F",
-"G+	c #545B54",
-"H+	c #6A736A",
-"I+	c #4A5448",
-"J+	c #C7DFC4",
-"K+	c #829781",
-"L+	c #4E604C",
-"M+	c #5C715A",
-"N+	c #5B6D55",
-"O+	c #748C6D",
-"P+	c #7B9873",
-"Q+	c #B9E6AA",
-"R+	c #ADE5A6",
-"S+	c #87AE83",
-"T+	c #779669",
-"U+	c #6C9062",
-"V+	c #96CF86",
-"W+	c #6F9D67",
-"X+	c #96D080",
-"Y+	c #786720",
-"Z+	c #557A4B",
-"`+	c #4C6F42",
-" @	c #486F3B",
-".@	c #528047",
-"+@	c #EAE7E9",
-"@@	c #564525",
-"#@	c #CFC1A1",
-"$@	c #E7E9DE",
-"%@	c #787D74",
-"&@	c #6C716C",
-"*@	c #A1A89B",
-"=@	c #A1AA9B",
-"-@	c #9CA698",
-";@	c #4E544C",
-">@	c #6F7A6D",
-",@	c #B4CCB1",
-"'@	c #C9ECCA",
-")@	c #CFEDC2",
-"!@	c #CBEABC",
-"~@	c #C2E8B6",
-"{@	c #7E987B",
-"]@	c #73886F",
-"^@	c #718C6C",
-"/@	c #6D8366",
-"(@	c #A1C594",
-"_@	c #8FBE88",
-":@	c #698D5F",
-"<@	c #688E62",
-"[@	c #688B5B",
-"}@	c #6F5A19",
-"|@	c #3B5135",
-"1@	c #10160E",
-"2@	c #131C10",
-"3@	c #4A6E40",
-"4@	c #ECEBED",
-"5@	c #654D1E",
-"6@	c #DFD5C4",
-"7@	c #CFCDC7",
-"8@	c #464745",
-"9@	c #DFDFDA",
-"0@	c #E8EDE3",
-"a@	c #B8C4B8",
-"b@	c #63685F",
-"c@	c #CAD2C9",
-"d@	c #D9EAD7",
-"e@	c #D7E9D6",
-"f@	c #D7ECD2",
-"g@	c #D2EBCE",
-"h@	c #D3E8C7",
-"i@	c #CCEBC0",
-"j@	c #C7E8C5",
-"k@	c #C6E7C1",
-"l@	c #CBEBBA",
-"m@	c #C4E8B9",
-"n@	c #BDE9AD",
-"o@	c #B4E4B2",
-"p@	c #B5E8AA",
-"q@	c #B1E7A6",
-"r@	c #B1E0A2",
-"s@	c #79601E",
-"t@	c #3B5036",
-"u@	c #425D3C",
-"v@	c #4E6946",
-"w@	c #9EE390",
-"x@	c #EDECEE",
-"y@	c #7D5E22",
-"z@	c #E7E4E2",
-"A@	c #D2D3D3",
-"B@	c #6B6A68",
-"C@	c #E7E5E5",
-"D@	c #909290",
-"E@	c #848685",
-"F@	c #E0E5DF",
-"G@	c #E5EEE7",
-"H@	c #E3ECD9",
-"I@	c #DDECDB",
-"J@	c #DDE9D6",
-"K@	c #D9EAD5",
-"L@	c #D6E6D2",
-"M@	c #D3E9CC",
-"N@	c #CEE5CA",
-"O@	c #D3E7CD",
-"P@	c #D0EDC4",
-"Q@	c #CAE9B7",
-"R@	c #C9E7B9",
-"S@	c #C1E5B4",
-"T@	c #C0E6B4",
-"U@	c #B9E6A8",
-"V@	c #B8E4A8",
-"W@	c #7A5F1E",
-"X@	c #80A47B",
-"Y@	c #384833",
-"Z@	c #A4E496",
-"`@	c #A8E69B",
-" #	c #EEEAEA",
-".#	c #826222",
-"+#	c #EBEDEC",
-"@#	c #EFEAEA",
-"##	c #BFB9BE",
-"$#	c #484746",
-"%#	c #A7A9A8",
-"&#	c #E7EFE9",
-"*#	c #EDEEED",
-"=#	c #EDEFEB",
-"-#	c #EBEDE8",
-";#	c #E3EBE6",
-">#	c #DFECDD",
-",#	c #DBEDDD",
-"'#	c #D9EBDD",
-")#	c #DCEAD9",
-"!#	c #D9E9D2",
-"~#	c #D9E9D1",
-"{#	c #D7EDCE",
-"]#	c #C8ECC4",
-"^#	c #D4E6C9",
-"/#	c #C5E6BB",
-"(#	c #C8EAC5",
-"_#	c #C5E9B9",
-":#	c #BFE8B4",
-"<#	c #7C601F",
-"[#	c #4F6148",
-"}#	c #4B6044",
-"|#	c #B1EAA0",
-"1#	c #ADE7A0",
-"2#	c #E1DFDF",
-"3#	c #896A2B",
-"4#	c #EBEFEA",
-"5#	c #A4A2A4",
-"6#	c #747575",
-"7#	c #D2D0D2",
-"8#	c #F0E6ED",
-"9#	c #EDEEEB",
-"0#	c #EDEAF0",
-"a#	c #EBEEE7",
-"b#	c #EBF1EB",
-"c#	c #E9EDE5",
-"d#	c #E8EDE7",
-"e#	c #E6ECE8",
-"f#	c #E0EBE1",
-"g#	c #E5EAE4",
-"h#	c #E0EDDA",
-"i#	c #DCECD9",
-"j#	c #DBEBD4",
-"k#	c #D4E8D0",
-"l#	c #D3EAD0",
-"m#	c #D0E9CB",
-"n#	c #CFE9C9",
-"o#	c #C9E6C5",
-"p#	c #C5E8BD",
-"q#	c #866924",
-"r#	c #A6C79E",
-"s#	c #B3D6A4",
-"t#	c #B6E5B3",
-"u#	c #B3E9AD",
-"v#	c #DEE1E4",
-"w#	c #856627",
-"x#	c #C5C7C6",
-"y#	c #9B9A9C",
-"z#	c #ECEBF0",
-"A#	c #EEEAEB",
-"B#	c #F0ECEA",
-"C#	c #E8EEEE",
-"D#	c #EFEBEE",
-"E#	c #EEEEEC",
-"F#	c #F0F1ED",
-"G#	c #F2F0EF",
-"H#	c #EBEBED",
-"I#	c #EFEAEC",
-"J#	c #E7ECE5",
-"K#	c #E6EDE4",
-"L#	c #E2EEE3",
-"M#	c #DFEAE2",
-"N#	c #DDE6E0",
-"O#	c #DCEDD5",
-"P#	c #DCEFD4",
-"Q#	c #DCEBD5",
-"R#	c #D4E9D0",
-"S#	c #D4EBC8",
-"T#	c #D4EBCB",
-"U#	c #A68B45",
-"V#	c #A9B297",
-"W#	c #C5E5BB",
-"X#	c #C5E2B8",
-"Y#	c #BDE9B2",
-"Z#	c #EAEBED",
-"`#	c #846425",
-" $	c #EAECF0",
-".$	c #EBEBF1",
-"+$	c #EDEDED",
-"@$	c #ECEDEC",
-"#$	c #EBEAEE",
-"$$	c #EAEEEF",
-"%$	c #F1EDEE",
-"&$	c #EAECED",
-"*$	c #EDEEF1",
-"=$	c #EFECEC",
-"-$	c #EBEBEE",
-";$	c #EDEEE6",
-">$	c #E7ECE7",
-",$	c #E5EDE1",
-"'$	c #E6E9E2",
-")$	c #E3EDE2",
-"!$	c #E6EADC",
-"~$	c #DBEADE",
-"{$	c #E0EBD8",
-"]$	c #D9F1D3",
-"^$	c #D8E9D0",
-"/$	c #BAB985",
-"($	c #C5C89A",
-"_$	c #CCE5C0",
-":$	c #CDEBC6",
-"<$	c #C5EAC4",
-"[$	c #EEEDEB",
-"}$	c #D9CCB1",
-"|$	c #EDEAEC",
-"1$	c #EEEEED",
-"2$	c #E7ECEB",
-"3$	c #EEECEC",
-"4$	c #EEECEF",
-"5$	c #EEEFF0",
-"6$	c #F0ECED",
-"7$	c #EBEEEC",
-"8$	c #ECEBEC",
-"9$	c #ECEDE9",
-"0$	c #F0EEEB",
-"a$	c #EBECEE",
-"b$	c #EDEDEB",
-"c$	c #EBEFE8",
-"d$	c #EBEEE8",
-"e$	c #EAEDE5",
-"f$	c #EDEBE1",
-"g$	c #E4E8E5",
-"h$	c #E6EDE0",
-"i$	c #DDEFDE",
-"j$	c #DEE7D8",
-"k$	c #DCEAD2",
-"l$	c #D8EAD0",
-"m$	c #DAE9CD",
-"n$	c #D0EDC8",
-"o$	c #D3E8C8",
-"p$	c #EEE9ED",
-"q$	c #ECE9EC",
-"r$	c #EDEBE8",
-"s$	c #EFEFEE",
-"t$	c #F0F1EC",
-"u$	c #EAECEC",
-"v$	c #EEEEEA",
-"w$	c #ECECEF",
-"x$	c #EEEEEE",
-"y$	c #EDEDEA",
-"z$	c #ECECEC",
-"A$	c #EFF0EC",
-"B$	c #EBEDEF",
-"C$	c #F0EDED",
-"D$	c #EAEBEE",
-"E$	c #EDF0EA",
-"F$	c #E9EDEB",
-"G$	c #EFECEB",
-"H$	c #EBECEB",
-"I$	c #EBE9E8",
-"J$	c #EAEAE2",
-"K$	c #E3EDE6",
-"L$	c #E6ECE5",
-"M$	c #DFECDA",
-"N$	c #DBEBDA",
-"O$	c #DCEADA",
-"P$	c #E5F0E0",
-"Q$	c #A56E6E",
-"R$	c #A7A7A7",
-"S$	c #7D7D7D",
-"T$	c #545454",
-"U$	c #151515",
-"V$	c #3F3F3F",
-"W$	c #2A2A2A",
-"X$	c #939393",
-"Y$	c #000000",
-"Z$	c #696969",
-". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+"* 	c #B2B2B2",
+"= 	c #878787",
+"- 	c #8A8A8A",
+"; 	c #9F9F9F",
+"> 	c #7C7C7C",
+", 	c #3C3C3C",
+"' 	c #010101",
+") 	c #050505",
+"! 	c #4A4A4A",
+"~ 	c #999999",
+"{ 	c #515151",
+"] 	c #202020",
+"^ 	c #000000",
+"/ 	c #870F0F",
+"( 	c #707070",
+"_ 	c #232323",
+": 	c #545454",
+"< 	c #D5D5D5",
+"[ 	c #E8E8E8",
+"} 	c #E2E2E2",
+"| 	c #CBCBCB",
+"1 	c #373737",
+"2 	c #1A1A1A",
+"3 	c #8E8E8E",
+"4 	c #3E3E3E",
+"5 	c #343434",
+"6 	c #8F8F8F",
+"7 	c #D9D9D9",
+"8 	c #ECECEC",
+"9 	c #AEAEAE",
+"0 	c #994949",
+"a 	c #891313",
+"b 	c #0C0C0C",
+"c 	c #7B7B7B",
+"d 	c #F0F0F0",
+"e 	c #FEFEFE",
+"f 	c #444444",
+"g 	c #D3D3D3",
+"h 	c #F8F8F8",
+"i 	c #FFFFFF",
+"j 	c #828282",
+"k 	c #994A4A",
+"l 	c #8A1818",
+"m 	c #B0B0B0",
+"n 	c #4B4B4B",
+"o 	c #323232",
+"p 	c #E3E3E3",
+"q 	c #FDFDFD",
+"r 	c #7A7A7A",
+"s 	c #0E0E0E",
+"t 	c #9A4C4C",
+"u 	c #8B1C1C",
+"v 	c #303030",
+"w 	c #F7F7F7",
+"x 	c #F3F3F3",
+"y 	c #959595",
+"z 	c #9B4E4E",
+"A 	c #3F3F3F",
+"B 	c #8C1E1E",
+"C 	c #7F7F7F",
+"D 	c #FCFCFC",
+"E 	c #BDBDBD",
+"F 	c #868686",
+"G 	c #F4F4F4",
+"H 	c #F6F6F6",
+"I 	c #949494",
+"J 	c #AFAFAF",
+"K 	c #FAFAFA",
+"L 	c #994B4B",
+"M 	c #393939",
+"N 	c #F2F2F2",
+"O 	c #E4E4E4",
+"P 	c #171717",
+"Q 	c #030303",
+"R 	c #787878",
+"S 	c #EBEBEB",
+"T 	c #8D8D8D",
+"U 	c #939393",
+"V 	c #070707",
+"W 	c #121212",
+"X 	c #C7C7C7",
+"Y 	c #8B1B1B",
+"Z 	c #555555",
+"` 	c #222222",
+" .	c #B9B9B9",
+"..	c #3A3A3A",
+"+.	c #9B9B9B",
+"@.	c #494949",
+"#.	c #131313",
+"$.	c #2D2D2D",
+"%.	c #C5C5C5",
+"&.	c #891414",
+"*.	c #6E6E6E",
+"=.	c #FBFBFB",
+"-.	c #E1E1E1",
+";.	c #C4C4C4",
+">.	c #3D3D3D",
+",.	c #0D0D0D",
+"'.	c #BABABA",
+").	c #E6E6E6",
+"!.	c #CECECE",
+"~.	c #B8B8B8",
+"{.	c #080808",
+"].	c #888888",
+"^.	c #881010",
+"/.	c #6D6D6D",
+"(.	c #181818",
+"_.	c #7D7D7D",
+":.	c #757575",
+"<.	c #383838",
+"[.	c #808080",
+"}.	c #525252",
+"|.	c #464646",
+"1.	c #818181",
+"2.	c #919191",
+"3.	c #797979",
+"4.	c #4F4F4F",
+"5.	c #0A0A0A",
+"6.	c #141414",
+"7.	c #7E7E7E",
+"8.	c #616161",
+"9.	c #2F2F2F",
+"0.	c #090909",
+"a.	c #454545",
+"b.	c #870E0E",
+"c.	c #A3A3A3",
+"d.	c #777777",
+"e.	c #A2A2A2",
+"f.	c #B3B3B3",
+"g.	c #AB8383",
+"h.	c #AB8484",
+"i.	c #933434",
+"j.	c #A56E6E",
+"k.	c #151515",
+"l.	c #2A2A2A",
+"m.	c #A7A7A7",
+"n.	c #696969",
 ". + @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ . ",
 ". # $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ . ",
 ". # $ # # % % % % % % % # # # # % % % % # # # # # # # # # & $ . ",
-". * = - ; > , ' ) ! ~ { ] ^ / ( _ : < [ } | 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+`+ @.@. ",
-". +@@@#@$@%@&@*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@_@:@<@[@}@|@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#`# $.$+$@$#$$$%$&$*$x@=$-$;$*#>$,$'$)$!$~${$]$^$/$($_$:$<$. ",
-". [$}$|$1$4@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$E#H#y$z$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O$Q#P$. ",
+". # $ . . . . . . . . . . . . . . . . . . . . . . . . . . # $ . ",
+". # $ . . . . . . * = = = - . . . . . ; = = = ; . . . . . # $ . ",
+". % $ . . . . . > , ' ' ' ) ! ~ . . { ] ^ ^ ^ ] { . . . . # $ . ",
+". % / . . . . ( _ : < [ } | 1 2 3 4 5 6 7 8 7 6 5 4 9 . . # $ . ",
+". 0 a . . . . b c d e e e e [ f ^ ^ g h i i i h g ' j . . # $ . ",
+". k l . . m n o p e e e e e q < ^ r h i i i i e h r s . . # $ . ",
+". t u . . 3 v , w e e e e e e x ^ y q i i i i e q y ' . . # $ . ",
+". z u . . r v A e e e e e e e i ^ ; i i i i i e e ; ^ . . # $ . ",
+". z B . . C v A e e e D E F G i ^ ; i i i H I J K ; ' . . # $ . ",
+". L B . . C v M N e e O P Q R S ^ T q i i U V W X T ^ . . # $ . ",
+". L Y . . C Z `  .D e S ..V ~ +.^ @.S i i * #.$.%.@., . . # $ . ",
+". 0 &.. . c C W *.g =.q -.;.;.>.,.) '.).=.=.!.;.~.{.].. . # $ . ",
+". 0 ^.. . 3 C /.(.(._.T ].:.' <.[.}.Q |.1.2.1.|.) 3.. . . # $ . ",
+". % / . . J R C /.4.5.5.5.6.3 9 1.7.8.9.0.0.0.a.2.. . . . # $ . ",
+". % b.. . . . r R C C > 3.c.. . . = d.[.[.[.3.. . . . . . # $ . ",
+". # $ . . . . . e.2.2.y . . . . . . J 2.2.2.f.. . . . . . # $ . ",
+". # $ . . . . . . . . . . . . . . . . . . . . . . . . . . # $ . ",
+". # $ @ @ @ @ g.h.h.h.h.h.@ @ @ h.h.h.h.h.@ @ @ @ @ @ @ @ i.$ . ",
 ". # $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ . ",
-". Q$# # # # # # # # # # # # # # # # # # # # # # # # # # # # # . ",
-". . . . . . . . . . . . . . . . . . . . . . . R$S$R$. . . . . . ",
-". . . . . . . . T$U$V$W$X$. . . . . . . . . . R$Y$R$. . . . . . ",
-". . . . . . . V$W$. . R$R$. Z$V$Z$. . Z$V$V$X$R$Y$. . . . . . . ",
-". . . . . . R$Y$X$. . . . V$Z$R$Y$S$T$Z$. Y$R$S$V$. . . . . . . ",
-". . . . . . S$Y$. . U$U$Z$Y$. . Y$S$Y$. T$U$. T$T$. . . . . . . ",
-". . . . . . R$Y$S$. V$T$S$Y$R$V$V$S$Y$Z$V$V$. W$S$. . . . . . . ",
-". . . . . . . X$V$V$T$R$. T$V$Z$. R$V$S$Z$V$. V$Z$. . . . . . . ",
+". j.# # # # # # # # # # # # # # # # # # # # # # # # # # # # # . ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . : k.A l._.. . . . . . . . . . m._.. . . . . . . . . . . _.m.",
+". A l.. . m.m.m.: A U U A U n.: . l.k.n.. U A n.. : _.n.n.n.^ A ",
+"m.^ U . . . m.k.m.n.^ . ^ : : ^ . A : . _.A _.k.. n.l.l._._.k.. ",
+"_.^ . . . . : A . _.k.m.^ _.n.A . l._.. k.l.A U . m.^ n.. n.A . ",
+"m.^ _.. . m.A l.m.k._._.l.. A : . ^ _.. ^ n.. n.U A n.n.. A A . ",
+". U A A n.m.m.A A U . _.n.. : A . : A . _.A : U n.n.. A U _.A U ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
 ". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . "};
diff --git a/images/state.8bit.xpm b/images/state.8bit.xpm
index f7c5609e..40fbc6f7 100644
--- a/images/state.8bit.xpm
+++ b/images/state.8bit.xpm
@@ -1,44 +1,44 @@
 /* XPM */
-static char * show_8bit_xpm[] = {
+static char * state_8bit_xpm[] = {
 "32 32 9 1",
 " 	c None",
 ".	c #050507",
-"+	c #3E3E3C",
-"@	c #8B7B7B",
-"#	c #959494",
+"+	c #7F4644",
+"@	c #8D7D7D",
+"#	c #BABAB9",
 "$	c #FEFEFC",
-"%	c #711514",
-"&	c #C1C1BF",
-"*	c #914847",
-"&#@#@@#@@#@@#@@#@@#@@#@@#@@#@@#&",
-"&*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%&",
-"&*%**************************%%&",
-"&*%&&&&&&&&&&&&&&&&&&&&&&&&&&*%&",
-"&*%&&&&&#@@@#&&&&&@@@@&&&&&&&*%&",
-"&*%&#&&*%...%*&&#*....%@#&&&&*%&",
-"&*%&&#++@&$&#+%@.+&$$&*+*&&&&*%&",
-"&*%&&@.&$$$$$&..+$$$$$$@.&#&&*%&",
-"&*%&&.@$$$$$$$@.&$$$$$$&+*&&&*%&",
-"&*%&&.#$$$$$$$#.$$$$$$$$+%@&&*%&",
-"&*%&&.#$$$$$$$#.$$$$$$$$++@&#*%&",
-"&*%&&.#$&#$$$$#.$$@&$$$$++@&&*%&",
-"&*%&&.#&..#$$$#.$@..$$$$+.@&&*%&",
-"&*%&&++&+.&$$$+.##.+&$$#+*@&&*%&",
-"&*%&&@.&&&$$&&..+&&$$$&@.@@&&*%&",
-"&*%&&&@.+@##+.+@+.@@##..@@@&&*%&",
-"&*%&&&&#+...+@@@&@....+@@@#&&*%&",
-"&*%&&&&&&@@@@@@&&&#@@#@@@&&&&*%&",
-"&*%&#&&&&&####&&&&&&####&&&#&*%&",
-"&*%&&&&#&&&&&&&&&&&&&&&&&&&&&*%&",
-"&*%@@@#@#@@@@@@@@@@@@@@@@@@@@*%&",
-"&*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%&",
-"&******************************&",
-"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&",
-"&&&&&&&&&&@@&&&&&&&&&&&&&&&&&&&&",
-"&&&&&@%+%&+%&&&&&&&#&&&&&#&&#&&&",
-"&&#&&++#&&+@*+&&*+*&%##@&%#&&&&&",
-"&&&&&#.+&&.++.&+*&.@+@*+&.#&&&&&",
-"&&&&#&#.+&.@@+#.&&.#@++.@@&&#&&&",
-"#&&&#@&+@@.&++@.#++&@.#.+&&&&&&&",
-"&&&&#++@&@@&@+&++@&&#@&+&&&&&#&&",
-"&&&&&&&#&&&&&&&&&&&&&&&&&&&&&&&&"};
+"%	c #1A1A1A",
+"&	c #EFEFF0",
+"*	c #781514",
+"#@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@#",
+"#+*****************************#",
+"#+*++++++++++++++++++++++++++**#",
+"#+*##########################+*#",
+"#+*######@@@######@@@@#######+*#",
+"#+*####+*...%+###+%%..+@#####+*#",
+"#+*###+%@&&&@++@%%&&&#+%@####+*#",
+"#+*##@.&$&$$$#..+&&$$$$@%####+*#",
+"#+*##%@&$$$$$$@.#$$$$$$&%+###+*#",
+"#+*##.@$$$$$$$@.&$$$$$$&++@##+*#",
+"#++##.#&$$$$$$#.$$$$$$$$%%@##+*#",
+"#+*##.#$#@&$$$@.$&@#$$$$++@##+*#",
+"#+*##.@#%.@$$$@.&@.%&$$&%%@##+*#",
+"&+*##++#%%#$$&+.#@.%&$$#%@@##+*#",
+"#+*##@%##&&$&#..%&#&$$#@%@@##+*#",
+"#+*###@.+@@@+.+@%.@@@@%%@@@##+*#",
+"#+*####@+%.%%@@@#@%%.%+@@@###+*#",
+"#+*######@@@@@@####@@@@@@####+*#",
+"#+*#######@@@#######@@@@#####+*#",
+"#+*##########################+*#",
+"#+*@#@@@@#@@@@@@@@@@#@@@@@@@@+*#",
+"#+*****************************#",
+"#@+++++++++++++++++++++++++++++#",
+"#############&##################",
+"#######*+%&@@#######@###########",
+"######+%##@%%##@++@@.+##++######",
+"######@%+##%@#+@#.#@%##%#.@#####",
+"########%+#.##.#+%#++#+.+@######",
+"#####@@#%@@.#@.@%+#%+#%%#@######",
+"######+%+##%+#%@@+#@%##%+@######",
+"################################",
+"################################"};
diff --git a/images/state.xbm b/images/state.xbm
index 908868bb..845da90a 100644
--- a/images/state.xbm
+++ b/images/state.xbm
@@ -4,14 +4,14 @@
 #define _x_hot 0
 #define _y_hot 0
 static char _bits[] = {
-   0xaa, 0xaa, 0xaa, 0x2a, 0xfc, 0xff, 0xff, 0x7f, 0x56, 0x55, 0x55, 0x75,
-   0x46, 0x10, 0x04, 0x61, 0x16, 0x57, 0x39, 0x64, 0xa6, 0x3f, 0xfe, 0x65,
-   0xa6, 0xe0, 0x43, 0x61, 0x66, 0xc0, 0x01, 0x65, 0x26, 0x80, 0x80, 0x63,
-   0x6c, 0x80, 0x00, 0x67, 0x26, 0xc0, 0x00, 0x55, 0x66, 0x82, 0x04, 0x67,
-   0x36, 0xc3, 0x0c, 0x63, 0x66, 0xc3, 0x0d, 0x66, 0x66, 0xc0, 0x81, 0x65,
-   0xc6, 0x7b, 0xeb, 0x65, 0x06, 0x5f, 0x7e, 0x65, 0x56, 0x54, 0x48, 0x61,
-   0x06, 0x29, 0x51, 0x64, 0x2c, 0x01, 0x85, 0x64, 0x56, 0x7d, 0xb5, 0x6a,
-   0xfe, 0xef, 0xff, 0x7f, 0x6a, 0x5d, 0x6d, 0x5b, 0x02, 0x40, 0x00, 0x00,
-   0xa8, 0x8a, 0xaa, 0xaa, 0xc2, 0x1d, 0x08, 0x12, 0x74, 0xb4, 0xb7, 0x42,
-   0xc0, 0x3c, 0xd5, 0x0a, 0xaa, 0xa5, 0xec, 0x52, 0xa1, 0xf6, 0xa6, 0x03,
-   0x74, 0x92, 0xa9, 0xa8, 0x80, 0x12, 0x01, 0x01 };
+   0xaa, 0xaa, 0xaa, 0x2a, 0xfe, 0xff, 0xff, 0x7f, 0x56, 0x55, 0x55, 0x7b,
+   0x46, 0x92, 0x24, 0x60, 0x16, 0x25, 0xaa, 0x62, 0xa6, 0x7f, 0xbe, 0x64,
+   0xc6, 0xa0, 0xc3, 0x52, 0x56, 0xc0, 0x01, 0x63, 0x66, 0xc0, 0x00, 0x55,
+   0x66, 0x80, 0x00, 0x65, 0x2a, 0x80, 0x00, 0x6b, 0x26, 0xc2, 0x04, 0x67,
+   0x76, 0x83, 0x0e, 0x63, 0x66, 0xc3, 0x0c, 0x67, 0x46, 0xc0, 0x81, 0x69,
+   0xd6, 0xbb, 0xd7, 0x65, 0x86, 0x5e, 0x7e, 0x62, 0x96, 0x54, 0x50, 0x65,
+   0x46, 0x4a, 0xa5, 0x50, 0x16, 0x10, 0x08, 0x65, 0xe6, 0x6d, 0x6b, 0x75,
+   0xbe, 0xff, 0xff, 0x7f, 0xec, 0xaa, 0x56, 0x55, 0x01, 0x82, 0x40, 0x22,
+   0xd4, 0x1b, 0x1a, 0x89, 0xc1, 0x58, 0x37, 0x23, 0x94, 0xad, 0x9a, 0x96,
+   0x21, 0x4b, 0xdb, 0x02, 0xa4, 0x6d, 0xeb, 0xaa, 0x89, 0x59, 0x95, 0x02,
+   0x24, 0x44, 0x90, 0x54, 0xa0, 0x88, 0x92, 0x00 };
diff --git a/images/state.xpm b/images/state.xpm
index 4c615919..2a3102fa 100644
--- a/images/state.xpm
+++ b/images/state.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * show_xpm[] = {
+static char * state_xpm[] = {
 "32 32 145 2",
 "  	c None",
 ". 	c #BCBCBC s backgroundToolBarColor",
@@ -143,9 +143,9 @@ static char * show_xpm[] = {
 "i.	c #933434",
 "j.	c #A56E6E",
 "k.	c #2A2A2A",
-"l.	c #696969",
-"m.	c #A7A7A7",
-"n.	c #151515",
+"l.	c #A7A7A7",
+"m.	c #151515",
+"n.	c #696969",
 ". + @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ . ",
 ". # $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ . ",
 ". # $ # # % % % % % % % # # # # % % % % # # # # # # # # # & $ . ",
@@ -170,11 +170,11 @@ static char * show_xpm[] = {
 ". # $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ . ",
 ". j.# # # # # # # # # # # # # # # # # # # # # # # # # # # # # . ",
 ". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . 1.1.. . . . . . . . . . . . . . . . . . . . ",
-". . . . . Q k.A k.. A A . . . . . . . . . . . . . . . . . . . . ",
-". . . . . A k.. . . A l.l.7 . . l.A l.. A Q m.1.. A Q . . . . . ",
-". . . . . Q ' A . . n.A A ' . A l.m.' 1.A l.l.A . ' m.. . . . . ",
-". . . . . . m.n.7 . ' 1.1.A Q ' . . ' Q 1.A A ' l.1.. . . . . . ",
-". . . . Q 1.. k.l.1.n.. A 7 1.' m.A A . 1.' m.' 7 . . . . . . . ",
-". . . . m.A A l.. 1.l.. l.A . 7 A l.. . Q 1.. 7 . . . . . . . . ",
+". . . . . . Q k.A k.. Q Q . . . . . . . 1.l.. . . . . . . . . . ",
+". . . . . . A k.. . Q m.k.Q . n.A A Q n.' A . l.7 7 l.. . . . . ",
+". . . . . . Q ' A . . ' Q . 7 n.. ' . 1.m.. l.k.l.' Q . . . . . ",
+". . . . . . . l.m.7 l.' . l.' . 7 m.. n.A . 7 m.A n.. . . . . . ",
+". . . . . Q 1.. k.n.1.' . 1.' n.A A . A A . A k.. Q Q . . . . . ",
+". . . . . l.A A n.. l.A n.l.A 1.n.A . 1.A Q l.A A 1.. . . . . . ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
 ". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . "};