diff --git a/code-templates/create_change_trigger.template b/code-templates/create_change_trigger.template
index 7f74c827e..ce5bd517e 100644
--- a/code-templates/create_change_trigger.template
+++ b/code-templates/create_change_trigger.template
@@ -1,5 +1,4 @@
 {%--:Uncomment to edit template info visually.%}{%--:{%edit_info%}{%abort%}%}{%edit_conf%}{%kw:set term !! ;
-
 create trigger%} CT_{%object_name%} {%kw:for%} {%object_quoted_name%}
 {%kw:active after update position {%getconf:{%object_path%}/triggerPosition:99%}
 as
diff --git a/code-templates/create_selectable_execute_block.template b/code-templates/create_selectable_execute_block.template
index 57498b820..c73c8b47f 100644
--- a/code-templates/create_selectable_execute_block.template
+++ b/code-templates/create_selectable_execute_block.template
@@ -2,7 +2,7 @@
 
 execute block
 returns%} ( {%foreach:column:, :{%ifcontains:{%getconf:{%object_path%}/columnNames%}:{%object_name%}:
-{%tab%}{%object_quoted_name%} {%columninfo:datatype%}%}%}
+{%tab%}{%object_quoted_name%} {%columninfo:source%}%}%}
 )
 {%kw:as
 begin
diff --git a/code-templates/create_selectable_procedure.template b/code-templates/create_selectable_procedure.template
index 33c948a2c..072fee060 100644
--- a/code-templates/create_selectable_procedure.template
+++ b/code-templates/create_selectable_procedure.template
@@ -2,7 +2,7 @@
 
 create procedure%} SP_{%object_name%}
 {%kw:returns%} ( {%foreach:column:, :{%ifcontains:{%getconf:{%object_path%}/columnNames%}:{%object_name%}:
-{%tab%}{%object_quoted_name%} {%columninfo:datatype%}%}%}
+{%tab%}{%object_quoted_name%} {%columninfo:typeof%}%}%}
 )
 {%kw:as
 begin
diff --git a/res/UDF.xpm b/res/UDF.xpm
new file mode 100644
index 000000000..19efbb32e
--- /dev/null
+++ b/res/UDF.xpm
@@ -0,0 +1,158 @@
+/* XPM */
+static const char * UDF_xpm[] = {
+"16 16 139 2",
+"  	c None",
+". 	c #3D3D3D",
+"+ 	c #3F3F3F",
+"@ 	c #414141",
+"# 	c #424242",
+"$ 	c #434343",
+"% 	c #313131",
+"& 	c #373737",
+"* 	c #3A3A3A",
+"= 	c #3C3C3C",
+"- 	c #3E3E3E",
+"; 	c #454545",
+"> 	c #484848",
+", 	c #474747",
+"' 	c #444444",
+") 	c #343434",
+"! 	c #323232",
+"~ 	c #393939",
+"{ 	c #464646",
+"] 	c #494949",
+"^ 	c #4E4E4E",
+"/ 	c #565656",
+"( 	c #545454",
+"_ 	c #525252",
+": 	c #4D4D4D",
+"< 	c #303030",
+"[ 	c #363636",
+"} 	c #404040",
+"| 	c #505050",
+"1 	c #4C4C4C",
+"2 	c #2D2D2D",
+"3 	c #383838",
+"4 	c #4A4A4A",
+"5 	c #4B4B4B",
+"6 	c #3C4040",
+"7 	c #2B2B2B",
+"8 	c #3A3F40",
+"9 	c #A9442E",
+"0 	c #6D382F",
+"a 	c #282828",
+"b 	c #2E2E2E",
+"c 	c #333333",
+"d 	c #343636",
+"e 	c #363839",
+"f 	c #3B3B3B",
+"g 	c #383D3F",
+"h 	c #B45137",
+"i 	c #DE4C2B",
+"j 	c #DB3E21",
+"k 	c #C0341A",
+"l 	c #262626",
+"m 	c #292F30",
+"n 	c #914B37",
+"o 	c #98523D",
+"p 	c #313637",
+"q 	c #363A3C",
+"r 	c #B55A3F",
+"s 	c #E45C38",
+"t 	c #DD4D2B",
+"u 	c #CF3E21",
+"v 	c #480F06",
+"w 	c #242424",
+"x 	c #232829",
+"y 	c #AE462D",
+"z 	c #E55C38",
+"A 	c #ED6B42",
+"B 	c #96553F",
+"C 	c #2F3335",
+"D 	c #353535",
+"E 	c #2E3234",
+"F 	c #B55F41",
+"G 	c #E96740",
+"H 	c #E15936",
+"I 	c #D84B2A",
+"J 	c #4D170D",
+"K 	c #141414",
+"L 	c #212121",
+"M 	c #242727",
+"N 	c #762313",
+"O 	c #E35A36",
+"P 	c #E5623D",
+"Q 	c #EE6E44",
+"R 	c #94543E",
+"S 	c #262E30",
+"T 	c #B35E40",
+"U 	c #EA6B43",
+"V 	c #E5603B",
+"W 	c #DE5532",
+"X 	c #5B1A0D",
+"Y 	c #141617",
+"Z 	c #161616",
+"` 	c #101010",
+" .	c #1E1E1E",
+"..	c #0F0D0D",
+"+.	c #852917",
+"@.	c #E55C39",
+"#.	c #E5613C",
+"$.	c #EC6940",
+"%.	c #CE603E",
+"&.	c #E9673F",
+"*.	c #E4603B",
+"=.	c #E15937",
+"-.	c #681E0F",
+";.	c #0D0F0F",
+">.	c #131313",
+",.	c #0D0D0D",
+"'.	c #1C1C1C",
+").	c #202020",
+"!.	c #1E1D1D",
+"~.	c #0A0505",
+"{.	c #922F1C",
+"].	c #E45835",
+"^.	c #E25B37",
+"/.	c #E15935",
+"(.	c #E15735",
+"_.	c #722112",
+":.	c #060707",
+"<.	c #070707",
+"[.	c #151515",
+"}.	c #090100",
+"|.	c #9B3420",
+"1.	c #E04D2C",
+"2.	c #DC4C2B",
+"3.	c #DF4F2F",
+"4.	c #782415",
+"5.	c #010000",
+"6.	c #111111",
+"7.	c #080808",
+"8.	c #000000",
+"9.	c #020202",
+"0.	c #050505",
+"a.	c #160401",
+"b.	c #A03523",
+"c.	c #DF4527",
+"d.	c #822818",
+"e.	c #030000",
+"f.	c #040404",
+"g.	c #010101",
+"h.	c #742215",
+"    . + @ # # $ @               ",
+"  % & * = - @ # ; > , ' # - )   ",
+"  ! ~ + # { > ] ^ / ( _ : ] '   ",
+"  < [ = } # ; { , _ | 1 ] ' +   ",
+"  2 ) 3 . } @ $ # 4 5 > ' 6 *   ",
+"  7 % [ * . + } } $ { $ 8 9 0   ",
+"  a b c d e f = = = @ g h i j k ",
+"  l 7 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 ",
+"`  .w ..+.@.#.$.%.&.*.=.-.;.L >.",
+",.'.).!.~.{.].H ^./.(._.:.). .` ",
+"<.` >.[.` }.|.1.2.3.4.5.>.K 6.7.",
+"  8.8.9.0.9.a.b.c.d.e.f.f.g.8.  ",
+"                h.              ",
+"                                "};
diff --git a/res/UDFs.xpm b/res/UDFs.xpm
new file mode 100644
index 000000000..409ac9029
--- /dev/null
+++ b/res/UDFs.xpm
@@ -0,0 +1,158 @@
+/* XPM */
+static const char * UDFs_xpm[] = {
+"16 16 139 2",
+"  	c None",
+". 	c #3D3D3D",
+"+ 	c #3F3F3F",
+"@ 	c #414141",
+"# 	c #424242",
+"$ 	c #434343",
+"% 	c #313131",
+"& 	c #373737",
+"* 	c #3A3A3A",
+"= 	c #3C3C3C",
+"- 	c #3E3E3E",
+"; 	c #454545",
+"> 	c #484848",
+", 	c #474747",
+"' 	c #444444",
+") 	c #343434",
+"! 	c #323232",
+"~ 	c #393939",
+"{ 	c #464646",
+"] 	c #494949",
+"^ 	c #4E4E4E",
+"/ 	c #565656",
+"( 	c #545454",
+"_ 	c #525252",
+": 	c #4D4D4D",
+"< 	c #303030",
+"[ 	c #363636",
+"} 	c #404040",
+"| 	c #505050",
+"1 	c #4C4C4C",
+"2 	c #2D2D2D",
+"3 	c #383838",
+"4 	c #4A4A4A",
+"5 	c #4B4B4B",
+"6 	c #3C4040",
+"7 	c #2B2B2B",
+"8 	c #3A3F40",
+"9 	c #A9442E",
+"0 	c #6D382F",
+"a 	c #282828",
+"b 	c #2E2E2E",
+"c 	c #333333",
+"d 	c #343636",
+"e 	c #363839",
+"f 	c #3B3B3B",
+"g 	c #383D3F",
+"h 	c #B45137",
+"i 	c #DE4C2B",
+"j 	c #DB3E21",
+"k 	c #C0341A",
+"l 	c #262626",
+"m 	c #292F30",
+"n 	c #914B37",
+"o 	c #98523D",
+"p 	c #313637",
+"q 	c #363A3C",
+"r 	c #B55A3F",
+"s 	c #E45C38",
+"t 	c #DD4D2B",
+"u 	c #CF3E21",
+"v 	c #480F06",
+"w 	c #242424",
+"x 	c #232829",
+"y 	c #AE462D",
+"z 	c #E55C38",
+"A 	c #ED6B42",
+"B 	c #96553F",
+"C 	c #2F3335",
+"D 	c #353535",
+"E 	c #2E3234",
+"F 	c #B55F41",
+"G 	c #E96740",
+"H 	c #E15936",
+"I 	c #D84B2A",
+"J 	c #4D170D",
+"K 	c #141414",
+"L 	c #212121",
+"M 	c #242727",
+"N 	c #762313",
+"O 	c #E35A36",
+"P 	c #E5623D",
+"Q 	c #EE6E44",
+"R 	c #94543E",
+"S 	c #262E30",
+"T 	c #B35E40",
+"U 	c #EA6B43",
+"V 	c #E5603B",
+"W 	c #DE5532",
+"X 	c #5B1A0D",
+"Y 	c #141617",
+"Z 	c #161616",
+"` 	c #101010",
+" .	c #1E1E1E",
+"..	c #0F0D0D",
+"+.	c #852917",
+"@.	c #E55C39",
+"#.	c #E5613C",
+"$.	c #EC6940",
+"%.	c #CE603E",
+"&.	c #E9673F",
+"*.	c #E4603B",
+"=.	c #E15937",
+"-.	c #681E0F",
+";.	c #0D0F0F",
+">.	c #131313",
+",.	c #0D0D0D",
+"'.	c #1C1C1C",
+").	c #202020",
+"!.	c #1E1D1D",
+"~.	c #0A0505",
+"{.	c #922F1C",
+"].	c #E45835",
+"^.	c #E25B37",
+"/.	c #E15935",
+"(.	c #E15735",
+"_.	c #722112",
+":.	c #060707",
+"<.	c #070707",
+"[.	c #151515",
+"}.	c #090100",
+"|.	c #9B3420",
+"1.	c #E04D2C",
+"2.	c #DC4C2B",
+"3.	c #DF4F2F",
+"4.	c #782415",
+"5.	c #010000",
+"6.	c #111111",
+"7.	c #080808",
+"8.	c #000000",
+"9.	c #020202",
+"0.	c #050505",
+"a.	c #160401",
+"b.	c #A03523",
+"c.	c #DF4527",
+"d.	c #822818",
+"e.	c #030000",
+"f.	c #040404",
+"g.	c #010101",
+"h.	c #742215",
+"    . + @ # # $ @               ",
+"  % & * = - @ # ; > , ' # - )   ",
+"  ! ~ + # { > ] ^ / ( _ : ] '   ",
+"  < [ = } # ; { , _ | 1 ] ' +   ",
+"  2 ) 3 . } @ $ # 4 5 > ' 6 *   ",
+"  7 % [ * . + } } $ { $ 8 9 0   ",
+"  a b c d e f = = = @ g h i j k ",
+"  l 7 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 ",
+"`  .w ..+.@.#.$.%.&.*.=.-.;.L >.",
+",.'.).!.~.{.].H ^./.(._.:.). .` ",
+"<.` >.[.` }.|.1.2.3.4.5.>.K 6.7.",
+"  8.8.9.0.9.a.b.c.d.e.f.f.g.8.  ",
+"                h.              ",
+"                                "};
diff --git a/res/dbtrigger.xpm b/res/dbtrigger.xpm
new file mode 100644
index 000000000..25df53492
--- /dev/null
+++ b/res/dbtrigger.xpm
@@ -0,0 +1,106 @@
+/* XPM */
+static const char * DBTrigger_xpm[] = {
+"16 16 87 1",
+" 	c None",
+".	c #F3F3F3",
+"+	c #EDEDED",
+"@	c #B7B7B7",
+"#	c #DCDCDC",
+"$	c #F5F5F5",
+"%	c #F6F6F6",
+"&	c #C2C2C2",
+"*	c #F1F1F1",
+"=	c #DADADA",
+"-	c #EEEEEE",
+";	c #EFEFEF",
+">	c #F4F4F4",
+",	c #E5E5E5",
+"'	c #F2F2F2",
+")	c #E9E9E9",
+"!	c #BABABA",
+"~	c #E4E4E4",
+"{	c #EBEBEB",
+"]	c #E8E8E8",
+"^	c #D0D0D0",
+"/	c #D9D9D9",
+"(	c #CECECE",
+"_	c #E3E3E3",
+":	c #E7E7E7",
+"<	c #DDDDDD",
+"[	c #B5B5B5",
+"}	c #DEDEDE",
+"|	c #DBDBDB",
+"1	c #E2E2E2",
+"2	c #E1E1E1",
+"3	c #D5D5D5",
+"4	c #C3C3C3",
+"5	c #D1D1D1",
+"6	c #CDCDCD",
+"7	c #D8D8D8",
+"8	c #C8C8C8",
+"9	c #C1C1C1",
+"0	c #CBCBCB",
+"a	c #D3D3D3",
+"b	c #CFCFCF",
+"c	c #D6D6D6",
+"d	c #BFBFBF",
+"e	c #CCCCCC",
+"f	c #C4C4C4",
+"g	c #D7D7D7",
+"h	c #C5C5C5",
+"i	c #D4D4D4",
+"j	c #B4B2D4",
+"k	c #8B82DE",
+"l	c #5845E5",
+"m	c #9188DD",
+"n	c #988FE3",
+"o	c #9A94DB",
+"p	c #BBBBBB",
+"q	c #C6C6C6",
+"r	c #8F86DC",
+"s	c #6454E5",
+"t	c #8E85DB",
+"u	c #4F39EC",
+"v	c #C4C2D8",
+"w	c #300BF0",
+"x	c #938CE0",
+"y	c #6656E6",
+"z	c #6657DA",
+"A	c #A7A7A7",
+"B	c #948DE1",
+"C	c #9B94E6",
+"D	c #6D5EEA",
+"E	c #4F38EC",
+"F	c #7E76CD",
+"G	c #958EE2",
+"H	c #9188E8",
+"I	c #9A91E4",
+"J	c #B4B0DD",
+"K	c #7366E5",
+"L	c #B6B6B6",
+"M	c #6A5CDF",
+"N	c #4E38EC",
+"O	c #6C5DE9",
+"P	c #5F4EEC",
+"Q	c #C2C2CE",
+"R	c #523EE7",
+"S	c #5D4BEA",
+"T	c #5744E3",
+"U	c #B3AFDD",
+"V	c #CDCBD7",
+"                ",
+"       ..       ",
+"   +@ #$%# &*   ",
+"  =+-;>,,'-+)#  ",
+"  !~{]^=/(_:<[  ",
+"   }<|112}3=^   ",
+"  4<5/^  67869  ",
+" 0a/bc    6d3ae ",
+" f6g6a    &876h ",
+"  !eijkl fmnop  ",
+"   q6rstuvwxyz  ",
+"  AdfmB0BCwDEF  ",
+"  e0^Gn|HIwJxK  ",
+"   (LMNOPQwRST  ",
+"       UV       ",
+"                "};
diff --git a/res/dbtriggers.xpm b/res/dbtriggers.xpm
new file mode 100644
index 000000000..e2d635657
--- /dev/null
+++ b/res/dbtriggers.xpm
@@ -0,0 +1,106 @@
+/* XPM */
+static const char * DBTriggers_xpm[] = {
+"16 16 87 1",
+" 	c None",
+".	c #F3F3F3",
+"+	c #EDEDED",
+"@	c #B7B7B7",
+"#	c #DCDCDC",
+"$	c #F5F5F5",
+"%	c #F6F6F6",
+"&	c #C2C2C2",
+"*	c #F1F1F1",
+"=	c #DADADA",
+"-	c #EEEEEE",
+";	c #EFEFEF",
+">	c #F4F4F4",
+",	c #E5E5E5",
+"'	c #F2F2F2",
+")	c #E9E9E9",
+"!	c #BABABA",
+"~	c #E4E4E4",
+"{	c #EBEBEB",
+"]	c #E8E8E8",
+"^	c #D0D0D0",
+"/	c #D9D9D9",
+"(	c #CECECE",
+"_	c #E3E3E3",
+":	c #E7E7E7",
+"<	c #DDDDDD",
+"[	c #B5B5B5",
+"}	c #DEDEDE",
+"|	c #DBDBDB",
+"1	c #E2E2E2",
+"2	c #E1E1E1",
+"3	c #D5D5D5",
+"4	c #C3C3C3",
+"5	c #D1D1D1",
+"6	c #CDCDCD",
+"7	c #D8D8D8",
+"8	c #C8C8C8",
+"9	c #C1C1C1",
+"0	c #CBCBCB",
+"a	c #D3D3D3",
+"b	c #CFCFCF",
+"c	c #D6D6D6",
+"d	c #BFBFBF",
+"e	c #CCCCCC",
+"f	c #C4C4C4",
+"g	c #D7D7D7",
+"h	c #C5C5C5",
+"i	c #D4D4D4",
+"j	c #B4B2D4",
+"k	c #8B82DE",
+"l	c #5845E5",
+"m	c #9188DD",
+"n	c #988FE3",
+"o	c #9A94DB",
+"p	c #BBBBBB",
+"q	c #C6C6C6",
+"r	c #8F86DC",
+"s	c #6454E5",
+"t	c #8E85DB",
+"u	c #4F39EC",
+"v	c #C4C2D8",
+"w	c #300BF0",
+"x	c #938CE0",
+"y	c #6656E6",
+"z	c #6657DA",
+"A	c #A7A7A7",
+"B	c #948DE1",
+"C	c #9B94E6",
+"D	c #6D5EEA",
+"E	c #4F38EC",
+"F	c #7E76CD",
+"G	c #958EE2",
+"H	c #9188E8",
+"I	c #9A91E4",
+"J	c #B4B0DD",
+"K	c #7366E5",
+"L	c #B6B6B6",
+"M	c #6A5CDF",
+"N	c #4E38EC",
+"O	c #6C5DE9",
+"P	c #5F4EEC",
+"Q	c #C2C2CE",
+"R	c #523EE7",
+"S	c #5D4BEA",
+"T	c #5744E3",
+"U	c #B3AFDD",
+"V	c #CDCBD7",
+"                ",
+"       ..       ",
+"   +@ #$%# &*   ",
+"  =+-;>,,'-+)#  ",
+"  !~{]^=/(_:<[  ",
+"   }<|112}3=^   ",
+"  4<5/^  67869  ",
+" 0a/bc    6d3ae ",
+" f6g6a    &876h ",
+"  !eijkl fmnop  ",
+"   q6rstuvwxyz  ",
+"  AdfmB0BCwDEF  ",
+"  e0^Gn|HIwJxK  ",
+"   (LMNOPQwRST  ",
+"       UV       ",
+"                "};
diff --git a/res/ddltrigger.xpm b/res/ddltrigger.xpm
new file mode 100644
index 000000000..23905f197
--- /dev/null
+++ b/res/ddltrigger.xpm
@@ -0,0 +1,117 @@
+/* XPM */
+static const char * DDLTrigger_xpm[] = {
+"16 16 98 2",
+"  	c None",
+". 	c #F3F3F3",
+"+ 	c #EDEDED",
+"@ 	c #B7B7B7",
+"# 	c #DCDCDC",
+"$ 	c #F5F5F5",
+"% 	c #F6F6F6",
+"& 	c #C2C2C2",
+"* 	c #F1F1F1",
+"= 	c #DADADA",
+"- 	c #EEEEEE",
+"; 	c #EFEFEF",
+"> 	c #F4F4F4",
+", 	c #E5E5E5",
+"' 	c #F2F2F2",
+") 	c #E9E9E9",
+"! 	c #BABABA",
+"~ 	c #E4E4E4",
+"{ 	c #EBEBEB",
+"] 	c #E8E8E8",
+"^ 	c #D0D0D0",
+"/ 	c #D9D9D9",
+"( 	c #CECECE",
+"_ 	c #E3E3E3",
+": 	c #E7E7E7",
+"< 	c #DDDDDD",
+"[ 	c #B5B5B5",
+"} 	c #DEDEDE",
+"| 	c #DBDBDB",
+"1 	c #E2E2E2",
+"2 	c #E1E1E1",
+"3 	c #D5D5D5",
+"4 	c #C3C3C3",
+"5 	c #D1D1D1",
+"6 	c #CDCDCD",
+"7 	c #D8D8D8",
+"8 	c #C8C8C8",
+"9 	c #C1C1C1",
+"0 	c #CBCBCB",
+"a 	c #D3D3D3",
+"b 	c #CFCFCF",
+"c 	c #D6D6D6",
+"d 	c #BFBFBF",
+"e 	c #CCCCCC",
+"f 	c #C4C4C4",
+"g 	c #D7D7D7",
+"h 	c #C5C5C5",
+"i 	c #C5C3CF",
+"j 	c #978EE2",
+"k 	c #9289DE",
+"l 	c #9D97D8",
+"m 	c #877FDC",
+"n 	c #9188DD",
+"o 	c #CCCCD8",
+"p 	c #B4B2D4",
+"q 	c #A5A2C7",
+"r 	c #A8A3D2",
+"s 	c #4F39EC",
+"t 	c #8F86DC",
+"u 	c #5946E8",
+"v 	c #9F99D5",
+"w 	c #685AE8",
+"x 	c #8277E6",
+"y 	c #8D84E4",
+"z 	c #5D4CEB",
+"A 	c #6657DA",
+"B 	c #A7A7A7",
+"C 	c #A29DCE",
+"D 	c #6555E6",
+"E 	c #CACACA",
+"F 	c #AFADDA",
+"G 	c #6859E7",
+"H 	c #6A5BE9",
+"I 	c #B8B5E1",
+"J 	c #6D5EEA",
+"K 	c #6D62D6",
+"L 	c #ACA8D6",
+"M 	c #695BE9",
+"N 	c #AAA6DF",
+"O 	c #7A6DE9",
+"P 	c #6E60EB",
+"Q 	c #B6B2DF",
+"R 	c #5F4DEB",
+"S 	c #938CE0",
+"T 	c #AEAAD8",
+"U 	c #381AEE",
+"V 	c #4B35E9",
+"W 	c #4E38EC",
+"X 	c #BDBADB",
+"Y 	c #6C5DE9",
+"Z 	c #5A47EA",
+"` 	c #442BEB",
+" .	c #6353E2",
+"..	c #948BE0",
+"+.	c #3718EE",
+"@.	c #300BF0",
+"#.	c #D4D4D4",
+"$.	c #C4C2D8",
+"                                ",
+"              . .               ",
+"      + @   # $ % #   & *       ",
+"    = + - ; > , , ' - + ) #     ",
+"    ! ~ { ] ^ = / ( _ : < [     ",
+"      } < | 1 1 2 } 3 = ^       ",
+"    4 < 5 / ^     6 7 8 6 9     ",
+"  0 a / b c         6 d 3 a e   ",
+"  f 6 g 6 a         & 8 7 6 h   ",
+"    ! i j k l     m n o p q     ",
+"      r s t u v w x y z t A     ",
+"    B C D E F G H I # J n K     ",
+"    e L M a N O P Q g R S k     ",
+"      T U V W X Y Z `  ...+.@.  ",
+"              #.$.              ",
+"                                "};
diff --git a/res/ddltriggers.xpm b/res/ddltriggers.xpm
new file mode 100644
index 000000000..6755d769b
--- /dev/null
+++ b/res/ddltriggers.xpm
@@ -0,0 +1,117 @@
+/* XPM */
+static const char * DDLTriggers_xpm[] = {
+"16 16 98 2",
+"  	c None",
+". 	c #F3F3F3",
+"+ 	c #EDEDED",
+"@ 	c #B7B7B7",
+"# 	c #DCDCDC",
+"$ 	c #F5F5F5",
+"% 	c #F6F6F6",
+"& 	c #C2C2C2",
+"* 	c #F1F1F1",
+"= 	c #DADADA",
+"- 	c #EEEEEE",
+"; 	c #EFEFEF",
+"> 	c #F4F4F4",
+", 	c #E5E5E5",
+"' 	c #F2F2F2",
+") 	c #E9E9E9",
+"! 	c #BABABA",
+"~ 	c #E4E4E4",
+"{ 	c #EBEBEB",
+"] 	c #E8E8E8",
+"^ 	c #D0D0D0",
+"/ 	c #D9D9D9",
+"( 	c #CECECE",
+"_ 	c #E3E3E3",
+": 	c #E7E7E7",
+"< 	c #DDDDDD",
+"[ 	c #B5B5B5",
+"} 	c #DEDEDE",
+"| 	c #DBDBDB",
+"1 	c #E2E2E2",
+"2 	c #E1E1E1",
+"3 	c #D5D5D5",
+"4 	c #C3C3C3",
+"5 	c #D1D1D1",
+"6 	c #CDCDCD",
+"7 	c #D8D8D8",
+"8 	c #C8C8C8",
+"9 	c #C1C1C1",
+"0 	c #CBCBCB",
+"a 	c #D3D3D3",
+"b 	c #CFCFCF",
+"c 	c #D6D6D6",
+"d 	c #BFBFBF",
+"e 	c #CCCCCC",
+"f 	c #C4C4C4",
+"g 	c #D7D7D7",
+"h 	c #C5C5C5",
+"i 	c #C5C3CF",
+"j 	c #978EE2",
+"k 	c #9289DE",
+"l 	c #9D97D8",
+"m 	c #877FDC",
+"n 	c #9188DD",
+"o 	c #CCCCD8",
+"p 	c #B4B2D4",
+"q 	c #A5A2C7",
+"r 	c #A8A3D2",
+"s 	c #4F39EC",
+"t 	c #8F86DC",
+"u 	c #5946E8",
+"v 	c #9F99D5",
+"w 	c #685AE8",
+"x 	c #8277E6",
+"y 	c #8D84E4",
+"z 	c #5D4CEB",
+"A 	c #6657DA",
+"B 	c #A7A7A7",
+"C 	c #A29DCE",
+"D 	c #6555E6",
+"E 	c #CACACA",
+"F 	c #AFADDA",
+"G 	c #6859E7",
+"H 	c #6A5BE9",
+"I 	c #B8B5E1",
+"J 	c #6D5EEA",
+"K 	c #6D62D6",
+"L 	c #ACA8D6",
+"M 	c #695BE9",
+"N 	c #AAA6DF",
+"O 	c #7A6DE9",
+"P 	c #6E60EB",
+"Q 	c #B6B2DF",
+"R 	c #5F4DEB",
+"S 	c #938CE0",
+"T 	c #AEAAD8",
+"U 	c #381AEE",
+"V 	c #4B35E9",
+"W 	c #4E38EC",
+"X 	c #BDBADB",
+"Y 	c #6C5DE9",
+"Z 	c #5A47EA",
+"` 	c #442BEB",
+" .	c #6353E2",
+"..	c #948BE0",
+"+.	c #3718EE",
+"@.	c #300BF0",
+"#.	c #D4D4D4",
+"$.	c #C4C2D8",
+"                                ",
+"              . .               ",
+"      + @   # $ % #   & *       ",
+"    = + - ; > , , ' - + ) #     ",
+"    ! ~ { ] ^ = / ( _ : < [     ",
+"      } < | 1 1 2 } 3 = ^       ",
+"    4 < 5 / ^     6 7 8 6 9     ",
+"  0 a / b c         6 d 3 a e   ",
+"  f 6 g 6 a         & 8 7 6 h   ",
+"    ! i j k l     m n o p q     ",
+"      r s t u v w x y z t A     ",
+"    B C D E F G H I # J n K     ",
+"    e L M a N O P Q g R S k     ",
+"      T U V W X Y Z `  ...+.@.  ",
+"              #.$.              ",
+"                                "};
diff --git a/res/dmltrigger.xpm b/res/dmltrigger.xpm
new file mode 100644
index 000000000..7fee49972
--- /dev/null
+++ b/res/dmltrigger.xpm
@@ -0,0 +1,75 @@
+/* XPM */
+static const char * DMLTrigger_xpm[] = {
+"16 16 56 1",
+" 	c None",
+".	c #F3F3F3",
+"+	c #ECECEC",
+"@	c #B6B6B6",
+"#	c #DBDBDB",
+"$	c #F5F5F5",
+"%	c #F6F6F6",
+"&	c #C1C1C1",
+"*	c #F1F1F1",
+"=	c #D9D9D9",
+"-	c #EDEDED",
+";	c #EEEEEE",
+">	c #F4F4F4",
+",	c #E4E4E4",
+"'	c #F2F2F2",
+")	c #E8E8E8",
+"!	c #B9B9B9",
+"~	c #E3E3E3",
+"{	c #EAEAEA",
+"]	c #E7E7E7",
+"^	c #CFCFCF",
+"/	c #D8D8D8",
+"(	c #CDCDCD",
+"_	c #E2E2E2",
+":	c #E6E6E6",
+"<	c #DCDCDC",
+"[	c #B4B4B4",
+"}	c #DDDDDD",
+"|	c #DADADA",
+"1	c #E1E1E1",
+"2	c #E0E0E0",
+"3	c #D4D4D4",
+"4	c #C2C2C2",
+"5	c #D0D0D0",
+"6	c #CCCCCC",
+"7	c #D7D7D7",
+"8	c #C7C7C7",
+"9	c #C0C0C0",
+"0	c #CACACA",
+"a	c #D2D2D2",
+"b	c #CECECE",
+"c	c #D5D5D5",
+"d	c #BEBEBE",
+"e	c #CBCBCB",
+"f	c #C3C3C3",
+"g	c #D6D6D6",
+"h	c #C4C4C4",
+"i	c #D3D3D3",
+"j	c #C8C8C8",
+"k	c #C9C9C9",
+"l	c #BABABA",
+"m	c #C5C5C5",
+"n	c #C6C6C6",
+"o	c #A5A5A5",
+"p	c #ABABAB",
+"q	c #B5B5B5",
+"                ",
+"       ..       ",
+"   +@ #$%# &*   ",
+"  =+-;>,,'-+)#  ",
+"  !~{]^=/(_:<[  ",
+"   }<|112}3=^   ",
+"  4<5/^  67869  ",
+" 0a/bc    6d3ae ",
+" f6g6a    &876h ",
+"  !eiej  fk3el  ",
+"   m6n&m6i3^n   ",
+"  odfk505##7kp  ",
+"  e0^a3|#7g3^e  ",
+"   (q 0cc0 @b   ",
+"       ii       ",
+"                "};
diff --git a/res/dmltriggers.xpm b/res/dmltriggers.xpm
new file mode 100644
index 000000000..c456eb07a
--- /dev/null
+++ b/res/dmltriggers.xpm
@@ -0,0 +1,75 @@
+/* XPM */
+static const char * DMLTriggers_xpm[] = {
+"16 16 56 1",
+" 	c None",
+".	c #F3F3F3",
+"+	c #ECECEC",
+"@	c #B6B6B6",
+"#	c #DBDBDB",
+"$	c #F5F5F5",
+"%	c #F6F6F6",
+"&	c #C1C1C1",
+"*	c #F1F1F1",
+"=	c #D9D9D9",
+"-	c #EDEDED",
+";	c #EEEEEE",
+">	c #F4F4F4",
+",	c #E4E4E4",
+"'	c #F2F2F2",
+")	c #E8E8E8",
+"!	c #B9B9B9",
+"~	c #E3E3E3",
+"{	c #EAEAEA",
+"]	c #E7E7E7",
+"^	c #CFCFCF",
+"/	c #D8D8D8",
+"(	c #CDCDCD",
+"_	c #E2E2E2",
+":	c #E6E6E6",
+"<	c #DCDCDC",
+"[	c #B4B4B4",
+"}	c #DDDDDD",
+"|	c #DADADA",
+"1	c #E1E1E1",
+"2	c #E0E0E0",
+"3	c #D4D4D4",
+"4	c #C2C2C2",
+"5	c #D0D0D0",
+"6	c #CCCCCC",
+"7	c #D7D7D7",
+"8	c #C7C7C7",
+"9	c #C0C0C0",
+"0	c #CACACA",
+"a	c #D2D2D2",
+"b	c #CECECE",
+"c	c #D5D5D5",
+"d	c #BEBEBE",
+"e	c #CBCBCB",
+"f	c #C3C3C3",
+"g	c #D6D6D6",
+"h	c #C4C4C4",
+"i	c #D3D3D3",
+"j	c #C8C8C8",
+"k	c #C9C9C9",
+"l	c #BABABA",
+"m	c #C5C5C5",
+"n	c #C6C6C6",
+"o	c #A5A5A5",
+"p	c #ABABAB",
+"q	c #B5B5B5",
+"                ",
+"       ..       ",
+"   +@ #$%# &*   ",
+"  =+-;>,,'-+)#  ",
+"  !~{]^=/(_:<[  ",
+"   }<|112}3=^   ",
+"  4<5/^  67869  ",
+" 0a/bc    6d3ae ",
+" f6g6a    &876h ",
+"  !eiej  fk3el  ",
+"   m6n&m6i3^n   ",
+"  odfk505##7kp  ",
+"  e0^a3|#7g3^e  ",
+"   (q 0cc0 @b   ",
+"       ii       ",
+"                "};
diff --git a/res/function.xpm b/res/function.xpm
index 53dbef3b2..dda068a36 100644
--- a/res/function.xpm
+++ b/res/function.xpm
@@ -1,56 +1,92 @@
 /* XPM */
 static const char * function_xpm[] = {
-"16 16 37 1",
+"16 16 73 1",
 " 	c None",
-".	c #000686",
-"+	c #A5AEBD",
-"@	c #6B8294",
-"#	c #425163",
-"$	c #737D8C",
-"%	c #7B8EA5",
-"&	c #314D6B",
-"*	c #183042",
-"=	c #21344A",
-"-	c #889CC1",
-";	c #6B696B",
-">	c #CECBCE",
-",	c #CECFCE",
-"'	c #D6D3D6",
-")	c #D6D7D6",
-"!	c #DEDBDE",
-"~	c #E7E3E7",
-"{	c #E7E7E7",
-"]	c #EFEBEF",
-"^	c #EFEFEF",
-"/	c #ADAAAD",
-"(	c #DEDFDE",
-"_	c #6B6D6B",
-":	c #949294",
-"<	c #000000",
-"[	c #F7F3F7",
-"}	c #ADAEAD",
-"|	c #F7F7F7",
-"1	c #737173",
-"2	c #BDBEBD",
-"3	c #FFFBFF",
-"4	c #B5B2B5",
-"5	c #FFFFFF",
-"6	c #525552",
-"7	c #A5A2A5",
-"8	c #A5A6A5",
-"                ",
-"................",
-".+@@#@@@@@@@@@$.",
-".%&&*&&&&&&&&&=.",
-".---;>,')!~{]^/.",
-".---;,')!(~{]^/.",
-".---_'):<~{]^[}.",
-".---_')<(~]^[|}.",
-".---_)!<<{<<}|}.",
-".---1!(<{]<2<34.",
-".---1!(<{]<|<54.",
-".---1(~{]^[|354.",
-".---6788//}}444.",
-"................",
+".	c #A2C1EF",
+"+	c #9FC0ED",
+"@	c #9DBEEB",
+"#	c #9ABCEB",
+"$	c #96BAE9",
+"%	c #93B7E7",
+"&	c #7EA6DC",
+"*	c #A1C1EE",
+"=	c #F4F7FB",
+"-	c #77A2D7",
+";	c #1E1E1E",
+">	c #9EBFEC",
+",	c #A5D59C",
+"'	c #A1D398",
+")	c #9DD094",
+"!	c #98CE90",
+"~	c #6F9BD4",
+"{	c #9BBDEB",
+"]	c #FFFFFF",
+"^	c #6A97D1",
+"/	c #98BAE9",
+"(	c #A6C3E9",
+"_	c #6493CE",
+":	c #94B7E7",
+"<	c #EBF1F7",
+"[	c #5F8FCB",
+"}	c #8FB4E5",
+"|	c #F2F6FA",
+"1	c #AAC6E9",
+"2	c #ACC6E9",
+"3	c #ACC7EA",
+"4	c #ADC7E9",
+"5	c #DEE7F2",
+"6	c #598AC8",
+"7	c #8CB1E3",
+"8	c #F1F6FA",
+"9	c #AEC9EA",
+"0	c #DBE5F1",
+"a	c #5586C6",
+"b	c #87AEE1",
+"c	c #F0F4FA",
+"d	c #B2CBEA",
+"e	c #B3CCEA",
+"f	c #D8E2F0",
+"g	c #5486C4",
+"h	c #82AADF",
+"i	c #EFF3F9",
+"j	c #B7CEEA",
+"k	c #5F8DC8",
+"l	c #7EA8DD",
+"m	c #BAD0EB",
+"n	c #BBD0EB",
+"o	c #5C8AC6",
+"p	c #7AA4D9",
+"q	c #EEF3F9",
+"r	c #BED2EB",
+"s	c #5F8CC6",
+"t	c #75A1D7",
+"u	c #EDF2F8",
+"v	c #EAF0F7",
+"w	c #E6EDF6",
+"x	c #E2EAF4",
+"y	c #DEE7F3",
+"z	c #5D8AC5",
+"A	c #729ED6",
+"B	c #6E99D3",
+"C	c #6896D1",
+"D	c #6392CE",
+"E	c #5E8ECB",
+"F	c #5B8AC9",
+"G	c #5687C7",
+"H	c #467BBD",
 "                ",
+"  .+@#$%&       ",
+" *======- ;   ; ",
+" >=,')!=~  ; ;  ",
+" {=]]]]=^   ;   ",
+" /=((((=_  ; ;  ",
+" :=(]]]<[ ;   ; ",
+" }|123456       ",
+" 789]]]0a ;   ; ",
+" bcdeeefg ;   ; ",
+" hij]]]fk  ; ;  ",
+" limnnnfo  ; ;  ",
+" pqr]]]fs   ;   ",
+" tuvwxyfz   ;   ",
+" ABCDEFGH ;;    ",
 "                "};
diff --git a/res/functions.xpm b/res/functions.xpm
new file mode 100644
index 000000000..e13632f07
--- /dev/null
+++ b/res/functions.xpm
@@ -0,0 +1,92 @@
+/* XPM */
+static const char * functions_xpm[] = {
+"16 16 73 1",
+" 	c None",
+".	c #A2C1EF",
+"+	c #9FC0ED",
+"@	c #9DBEEB",
+"#	c #9ABCEB",
+"$	c #96BAE9",
+"%	c #93B7E7",
+"&	c #7EA6DC",
+"*	c #A1C1EE",
+"=	c #F4F7FB",
+"-	c #77A2D7",
+";	c #1E1E1E",
+">	c #9EBFEC",
+",	c #A5D59C",
+"'	c #A1D398",
+")	c #9DD094",
+"!	c #98CE90",
+"~	c #6F9BD4",
+"{	c #9BBDEB",
+"]	c #FFFFFF",
+"^	c #6A97D1",
+"/	c #98BAE9",
+"(	c #A6C3E9",
+"_	c #6493CE",
+":	c #94B7E7",
+"<	c #EBF1F7",
+"[	c #5F8FCB",
+"}	c #8FB4E5",
+"|	c #F2F6FA",
+"1	c #AAC6E9",
+"2	c #ACC6E9",
+"3	c #ACC7EA",
+"4	c #ADC7E9",
+"5	c #DEE7F2",
+"6	c #598AC8",
+"7	c #8CB1E3",
+"8	c #F1F6FA",
+"9	c #AEC9EA",
+"0	c #DBE5F1",
+"a	c #5586C6",
+"b	c #87AEE1",
+"c	c #F0F4FA",
+"d	c #B2CBEA",
+"e	c #B3CCEA",
+"f	c #D8E2F0",
+"g	c #5486C4",
+"h	c #82AADF",
+"i	c #EFF3F9",
+"j	c #B7CEEA",
+"k	c #5F8DC8",
+"l	c #7EA8DD",
+"m	c #BAD0EB",
+"n	c #BBD0EB",
+"o	c #5C8AC6",
+"p	c #7AA4D9",
+"q	c #EEF3F9",
+"r	c #BED2EB",
+"s	c #5F8CC6",
+"t	c #75A1D7",
+"u	c #EDF2F8",
+"v	c #EAF0F7",
+"w	c #E6EDF6",
+"x	c #E2EAF4",
+"y	c #DEE7F3",
+"z	c #5D8AC5",
+"A	c #729ED6",
+"B	c #6E99D3",
+"C	c #6896D1",
+"D	c #6392CE",
+"E	c #5E8ECB",
+"F	c #5B8AC9",
+"G	c #5687C7",
+"H	c #467BBD",
+"                ",
+"  .+@#$%&       ",
+" *======- ;   ; ",
+" >=,')!=~  ; ;  ",
+" {=]]]]=^   ;   ",
+" /=((((=_  ; ;  ",
+" :=(]]]<[ ;   ; ",
+" }|123456       ",
+" 789]]]0a ;   ; ",
+" bcdeeefg ;   ; ",
+" hij]]]fk  ; ;  ",
+" limnnnfo  ; ;  ",
+" pqr]]]fs   ;   ",
+" tuvwxyfz   ;   ",
+" ABCDEFGH ;;    ",
+"                "};
diff --git a/res/generator.xpm b/res/generator.xpm
index feeb5c948..7b629d618 100644
--- a/res/generator.xpm
+++ b/res/generator.xpm
@@ -1,34 +1,60 @@
 /* XPM */
 static const char * generator_xpm[] = {
-"16 16 15 1",
+"16 16 41 1",
 " 	c None",
-".	c #000686",
-"+	c #FFFFFF",
-"@	c #889CC1",
-"#	c #F7F3F7",
-"$	c #E7E3E7",
-"%	c #EFEFEF",
-"&	c #6B83B1",
-"*	c #DEDBDE",
-"=	c #EFEBEF",
-"-	c #E7E7E7",
-";	c #C6C3C6",
-">	c #BDBEBD",
-",	c #BDBABD",
-"'	c #A5A2A5",
-"  .........     ",
-" .++++++++@.    ",
-" .+######+@+.   ",
-" .+######+....  ",
-" .+######$+@@.  ",
-" .+#%%&*&@%%+.  ",
-" .+%%%.%.$%%+.  ",
-" .+%%.....%=+.  ",
-" .+%%&++&===+.  ",
-" .+=.....===+.  ",
-" .+=*.=.==--+.  ",
-" .+=@&+&----+.  ",
-" .+---+-----+.  ",
-" .+++++++++++.  ",
-" .;>>>>>,,,,'.  ",
-"  ...........   "};
+".	c #509C4A",
+"+	c #4E9948",
+"@	c #4F9B4A",
+"#	c #64A75F",
+"$	c #67A862",
+"%	c #4A9545",
+"&	c #A2C3EE",
+"*	c #4D9948",
+"=	c #61A55D",
+"-	c #79B375",
+";	c #63A45F",
+">	c #4C9447",
+",	c #479143",
+"'	c #499445",
+")	c #5EA05A",
+"!	c #64A65E",
+"~	c #70AD6C",
+"{	c #458F41",
+"]	c #469042",
+"^	c #71AD6D",
+"/	c #73AE6E",
+"(	c #448D40",
+"_	c #A2C1EE",
+":	c #57A150",
+"<	c #428C3F",
+"[	c #9DBFED",
+"}	c #9ABCEB",
+"|	c #458E41",
+"1	c #438D40",
+"2	c #428B3F",
+"3	c #418A3E",
+"4	c #8DB4E9",
+"5	c #89B2E7",
+"6	c #86AFE7",
+"7	c #81ACE5",
+"8	c #7CAAE5",
+"9	c #77A6E3",
+"0	c #75A5E3",
+"a	c #73A3E3",
+"b	c #3E72D4",
+"         .+     ",
+"        @#$%    ",
+"   &    *=-;>  ,",
+"  &&     ')!~>>{",
+"   &      ]^/~~(",
+"  &&_      ]^:/<",
+"           ]^//<",
+"      [}  ]|1223",
+"        4       ",
+"       5        ",
+"      678       ",
+"                ",
+"          90a   ",
+"           a    ",
+"            a   ",
+"          aab   "};
diff --git a/res/generators.xpm b/res/generators.xpm
index ad2e18c2c..ca3d377a4 100644
--- a/res/generators.xpm
+++ b/res/generators.xpm
@@ -1,32 +1,60 @@
 /* XPM */
 static const char * generators_xpm[] = {
-"16 16 13 1",
+"16 16 41 1",
 " 	c None",
-".	c #000686",
-"+	c #FFFFFF",
-"@	c #889CC1",
-"#	c #F7F3F7",
-"$	c #E7E3E7",
-"%	c #EFEFEF",
-"&	c #EFEBEF",
-"*	c #E7E7E7",
-"=	c #C6C3C6",
-"-	c #BDBEBD",
-";	c #BDBABD",
-">	c #A5A2A5",
-"  .........     ",
-" .++++++++@.    ",
-" .+######+@+.   ",
-" .+######+....  ",
-" .+###.#.$+@@.  ",
-" .+#......%%+.  ",
-" .+%%.%.%%%%+.  ",
-" .+......%%&+.  ",
-" .+%.%.&.&.&+.  ",
-" .+&&&......+.  ",
-" .+&&&&.&.**+.  ",
-" .+&*......*+.  ",
-" .+***.*.***+.  ",
-" .+++++++++++.  ",
-" .=-----;;;;>.  ",
-"  ...........   "};
+".	c #509C4A",
+"+	c #4E9948",
+"@	c #4F9B4A",
+"#	c #64A75F",
+"$	c #67A862",
+"%	c #4A9545",
+"&	c #A2C3EE",
+"*	c #4D9948",
+"=	c #61A55D",
+"-	c #79B375",
+";	c #63A45F",
+">	c #4C9447",
+",	c #479143",
+"'	c #499445",
+")	c #5EA05A",
+"!	c #64A65E",
+"~	c #70AD6C",
+"{	c #458F41",
+"]	c #469042",
+"^	c #71AD6D",
+"/	c #73AE6E",
+"(	c #448D40",
+"_	c #A2C1EE",
+":	c #57A150",
+"<	c #428C3F",
+"[	c #9DBFED",
+"}	c #9ABCEB",
+"|	c #458E41",
+"1	c #438D40",
+"2	c #428B3F",
+"3	c #418A3E",
+"4	c #8DB4E9",
+"5	c #89B2E7",
+"6	c #86AFE7",
+"7	c #81ACE5",
+"8	c #7CAAE5",
+"9	c #77A6E3",
+"0	c #75A5E3",
+"a	c #73A3E3",
+"b	c #3E72D4",
+"         .+     ",
+"        @#$%    ",
+"   &    *=-;>  ,",
+"  &&     ')!~>>{",
+"   &      ]^/~~(",
+"  &&_      ]^:/<",
+"           ]^//<",
+"      [}  ]|1223",
+"        4       ",
+"       5        ",
+"      678       ",
+"                ",
+"          90a   ",
+"           a    ",
+"            a   ",
+"          aab   "};
diff --git a/res/globaltemporaries.xpm b/res/globaltemporaries.xpm
new file mode 100644
index 000000000..ac66fba44
--- /dev/null
+++ b/res/globaltemporaries.xpm
@@ -0,0 +1,135 @@
+/* XPM */
+static const char * globaltemporaries_xpm[] = {
+"16 16 116 2",
+"  	c None",
+". 	c #A2C1EF",
+"+ 	c #9FC0ED",
+"@ 	c #9DBEEB",
+"# 	c #9ABCEB",
+"$ 	c #96BAE9",
+"% 	c #93B7E7",
+"& 	c #90B5E6",
+"* 	c #8CB2E4",
+"= 	c #88AFE2",
+"- 	c #84ACE0",
+"; 	c #80A9DD",
+"> 	c #7DA5DC",
+", 	c #7AA3DA",
+"' 	c #A1C1EE",
+") 	c #F4F7FB",
+"! 	c #74A0D7",
+"~ 	c #9EBFEC",
+"{ 	c #A5D59C",
+"] 	c #A1D398",
+"^ 	c #9DD094",
+"/ 	c #98CE90",
+"( 	c #93CB8B",
+"_ 	c #8EC987",
+": 	c #89C682",
+"< 	c #84C37E",
+"[ 	c #80C17A",
+"} 	c #7CBE76",
+"| 	c #6F9BD4",
+"1 	c #9BBDEB",
+"2 	c #FFFFFF",
+"3 	c #6A97D1",
+"4 	c #98BAE9",
+"5 	c #A6C3E9",
+"6 	c #6493CE",
+"7 	c #94B7E7",
+"8 	c #A9C4E8",
+"9 	c #EBA8A8",
+"0 	c #C73C42",
+"a 	c #CE2626",
+"b 	c #D03030",
+"c 	c #D95A5A",
+"d 	c #EBF1F7",
+"e 	c #5F8FCB",
+"f 	c #8FB4E5",
+"g 	c #F2F6FA",
+"h 	c #AAC6E9",
+"i 	c #ACC6E9",
+"j 	c #ACC7EA",
+"k 	c #ADC7E9",
+"l 	c #BA8497",
+"m 	c #CD1F1F",
+"n 	c #C2515A",
+"o 	c #B1B8D5",
+"p 	c #B2B6D3",
+"q 	c #C2636E",
+"r 	c #DEE7F2",
+"s 	c #598AC8",
+"t 	c #8CB1E3",
+"u 	c #F1F6FA",
+"v 	c #AEC9EA",
+"w 	c #B0C9EA",
+"x 	c #D44343",
+"y 	c #B0AECA",
+"z 	c #DBE5F1",
+"A 	c #5586C6",
+"B 	c #87AEE1",
+"C 	c #F0F4FA",
+"D 	c #B2CBEA",
+"E 	c #B3CCEA",
+"F 	c #CB2526",
+"G 	c #ACC3E3",
+"H 	c #D8E2F0",
+"I 	c #5486C4",
+"J 	c #82AADF",
+"K 	c #EFF3F9",
+"L 	c #B7CEEA",
+"M 	c #BBD0EB",
+"N 	c #D44141",
+"O 	c #BBBBD4",
+"P 	c #F2F6FB",
+"Q 	c #5F8DC8",
+"R 	c #7EA8DD",
+"S 	c #BAD0EB",
+"T 	c #C28291",
+"U 	c #C16F7C",
+"V 	c #B5C2DE",
+"W 	c #5C8AC6",
+"X 	c #7AA4D9",
+"Y 	c #EEF3F9",
+"Z 	c #BED2EB",
+"` 	c #BFD3EB",
+" .	c #FEFDFD",
+"..	c #E89A9A",
+"+.	c #C7373C",
+"@.	c #CD2424",
+"#.	c #D13737",
+"$.	c #DD6C6C",
+"%.	c #5F8CC6",
+"&.	c #75A1D7",
+"*.	c #EDF2F8",
+"=.	c #EAF0F7",
+"-.	c #E6EDF6",
+";.	c #E2EAF4",
+">.	c #DEE7F3",
+",.	c #DBE4F1",
+"'.	c #5D8AC5",
+").	c #729ED6",
+"!.	c #6E99D3",
+"~.	c #6896D1",
+"{.	c #6392CE",
+"].	c #5E8ECB",
+"^.	c #5B8AC9",
+"/.	c #5687C7",
+"(.	c #5284C3",
+"_.	c #4277BB",
+"                                ",
+"    . + @ # $ % & * = - ; > ,   ",
+"  ' ) ) ) ) ) ) ) ) ) ) ) ) !   ",
+"  ~ ) { ] ^ / ( _ : < [ } ) |   ",
+"  1 ) 2 2 2 2 2 2 2 2 2 2 ) 3   ",
+"  4 ) 5 5 5 5 5 5 5 5 5 5 ) 6   ",
+"  7 ) 5 2 8 2 2 9 0 a b c d e   ",
+"  f g h i j k l m n o p q r s   ",
+"  t u v 2 w 2 x m y 2 2 2 z A   ",
+"  B C D E E E F m G m m m H I   ",
+"  J K L 2 M 2 N m O P m m H Q   ",
+"  R K S M M M T m U V m m H W   ",
+"  X Y Z 2 ` 2  ...+.@.#.$.H %.  ",
+"  &.*.=.-.;.>.,.H H H H H H '.  ",
+"  ).!.~.{.].^./.(.(.(.(.(.(._.  ",
+"                                "};
diff --git a/res/globaltemporary.xpm b/res/globaltemporary.xpm
new file mode 100644
index 000000000..a4b3d2eae
--- /dev/null
+++ b/res/globaltemporary.xpm
@@ -0,0 +1,135 @@
+/* XPM */
+static const char * globaltemporary_xpm[] = {
+"16 16 116 2",
+"  	c None",
+". 	c #A2C1EF",
+"+ 	c #9FC0ED",
+"@ 	c #9DBEEB",
+"# 	c #9ABCEB",
+"$ 	c #96BAE9",
+"% 	c #93B7E7",
+"& 	c #90B5E6",
+"* 	c #8CB2E4",
+"= 	c #88AFE2",
+"- 	c #84ACE0",
+"; 	c #80A9DD",
+"> 	c #7DA5DC",
+", 	c #7AA3DA",
+"' 	c #A1C1EE",
+") 	c #F4F7FB",
+"! 	c #74A0D7",
+"~ 	c #9EBFEC",
+"{ 	c #A5D59C",
+"] 	c #A1D398",
+"^ 	c #9DD094",
+"/ 	c #98CE90",
+"( 	c #93CB8B",
+"_ 	c #8EC987",
+": 	c #89C682",
+"< 	c #84C37E",
+"[ 	c #80C17A",
+"} 	c #7CBE76",
+"| 	c #6F9BD4",
+"1 	c #9BBDEB",
+"2 	c #FFFFFF",
+"3 	c #6A97D1",
+"4 	c #98BAE9",
+"5 	c #A6C3E9",
+"6 	c #6493CE",
+"7 	c #94B7E7",
+"8 	c #A9C4E8",
+"9 	c #EBA8A8",
+"0 	c #C73C42",
+"a 	c #CE2626",
+"b 	c #D03030",
+"c 	c #D95A5A",
+"d 	c #EBF1F7",
+"e 	c #5F8FCB",
+"f 	c #8FB4E5",
+"g 	c #F2F6FA",
+"h 	c #AAC6E9",
+"i 	c #ACC6E9",
+"j 	c #ACC7EA",
+"k 	c #ADC7E9",
+"l 	c #BA8497",
+"m 	c #CD1F1F",
+"n 	c #C2515A",
+"o 	c #B1B8D5",
+"p 	c #B2B6D3",
+"q 	c #C2636E",
+"r 	c #DEE7F2",
+"s 	c #598AC8",
+"t 	c #8CB1E3",
+"u 	c #F1F6FA",
+"v 	c #AEC9EA",
+"w 	c #B0C9EA",
+"x 	c #D44343",
+"y 	c #B0AECA",
+"z 	c #DBE5F1",
+"A 	c #5586C6",
+"B 	c #87AEE1",
+"C 	c #F0F4FA",
+"D 	c #B2CBEA",
+"E 	c #B3CCEA",
+"F 	c #CB2526",
+"G 	c #ACC3E3",
+"H 	c #D8E2F0",
+"I 	c #5486C4",
+"J 	c #82AADF",
+"K 	c #EFF3F9",
+"L 	c #B7CEEA",
+"M 	c #BBD0EB",
+"N 	c #D44141",
+"O 	c #BBBBD4",
+"P 	c #F2F6FB",
+"Q 	c #5F8DC8",
+"R 	c #7EA8DD",
+"S 	c #BAD0EB",
+"T 	c #C28291",
+"U 	c #C16F7C",
+"V 	c #B5C2DE",
+"W 	c #5C8AC6",
+"X 	c #7AA4D9",
+"Y 	c #EEF3F9",
+"Z 	c #BED2EB",
+"` 	c #BFD3EB",
+" .	c #FEFDFD",
+"..	c #E89A9A",
+"+.	c #C7373C",
+"@.	c #CD2424",
+"#.	c #D13737",
+"$.	c #DD6C6C",
+"%.	c #5F8CC6",
+"&.	c #75A1D7",
+"*.	c #EDF2F8",
+"=.	c #EAF0F7",
+"-.	c #E6EDF6",
+";.	c #E2EAF4",
+">.	c #DEE7F3",
+",.	c #DBE4F1",
+"'.	c #5D8AC5",
+").	c #729ED6",
+"!.	c #6E99D3",
+"~.	c #6896D1",
+"{.	c #6392CE",
+"].	c #5E8ECB",
+"^.	c #5B8AC9",
+"/.	c #5687C7",
+"(.	c #5284C3",
+"_.	c #4277BB",
+"                                ",
+"    . + @ # $ % & * = - ; > ,   ",
+"  ' ) ) ) ) ) ) ) ) ) ) ) ) !   ",
+"  ~ ) { ] ^ / ( _ : < [ } ) |   ",
+"  1 ) 2 2 2 2 2 2 2 2 2 2 ) 3   ",
+"  4 ) 5 5 5 5 5 5 5 5 5 5 ) 6   ",
+"  7 ) 5 2 8 2 2 9 0 a b c d e   ",
+"  f g h i j k l m n o p q r s   ",
+"  t u v 2 w 2 x m y 2 2 2 z A   ",
+"  B C D E E E F m G m m m H I   ",
+"  J K L 2 M 2 N m O P m m H Q   ",
+"  R K S M M M T m U V m m H W   ",
+"  X Y Z 2 ` 2  ...+.@.#.$.H %.  ",
+"  &.*.=.-.;.>.,.H H H H H H '.  ",
+"  ).!.~.{.].^./.(.(.(.(.(.(._.  ",
+"                                "};
diff --git a/res/index.xpm b/res/index.xpm
index 96d49527d..e031f9cf9 100644
--- a/res/index.xpm
+++ b/res/index.xpm
@@ -1,31 +1,102 @@
 /* XPM */
 static const char * index_xpm[] = {
-"16 16 12 1",
+"16 16 83 1",
 " 	c None",
-".	c #000686",
-"+	c #FFFFFF",
-"@	c #DEDFDE",
-"#	c #E7E3E7",
-"$	c #E7E7E7",
-"%	c #EFEBEF",
-"&	c #EFEFEF",
-"*	c #889CC1",
-"=	c #F7F3F7",
-"-	c #F7F7F7",
-";	c #FFFBFF",
-"                ",
-"                ",
-"  ...........   ",
-"  ...........   ",
-"  .+@#$$%%%&.   ",
-"  .+***%***&.   ",
-"  .+$$%%&&&=.   ",
-"  .+***&***=.   ",
-"  .+%%&&===-.   ",
-"  .+***&***-.   ",
-"  .+%&&===-;.   ",
-"  .+***=***;.   ",
-"  .+&==-;;;+.   ",
-"  ...........   ",
-"                ",
-"                "};
+".	c #FA4225",
+"+	c #A2C1EF",
+"@	c #9DBEEB",
+"#	c #9ABCEB",
+"$	c #93B7E7",
+"%	c #90B5E6",
+"&	c #8CB2E4",
+"*	c #88AFE2",
+"=	c #84ACE0",
+"-	c #80A9DD",
+";	c #7DA5DC",
+">	c #7AA3DA",
+",	c #A1C1EE",
+"'	c #F4F7FB",
+")	c #74A0D7",
+"!	c #9EBFEC",
+"~	c #A1D398",
+"{	c #9DD094",
+"]	c #93CB8B",
+"^	c #8EC987",
+"/	c #89C682",
+"(	c #84C37E",
+"_	c #80C17A",
+":	c #7CBE76",
+"<	c #6F9BD4",
+"[	c #9BBDEB",
+"}	c #FFFFFF",
+"|	c #6A97D1",
+"1	c #98BAE9",
+"2	c #A6C3E9",
+"3	c #6493CE",
+"4	c #94B7E7",
+"5	c #A9C4E8",
+"6	c #ACC7E8",
+"7	c #EBF1F7",
+"8	c #5F8FCB",
+"9	c #8FB4E5",
+"0	c #F2F6FA",
+"a	c #ACC6E9",
+"b	c #ACC7EA",
+"c	c #AEC9E9",
+"d	c #B0C9E9",
+"e	c #B0C8E8",
+"f	c #B5CCE8",
+"g	c #DEE7F2",
+"h	c #598AC8",
+"i	c #B0C9EA",
+"j	c #DBE5F1",
+"k	c #5586C6",
+"l	c #B3CCEA",
+"m	c #B7CEEA",
+"n	c #AEC8E8",
+"o	c #D8E2F0",
+"p	c #5486C4",
+"q	c #82AADF",
+"r	c #EFF3F9",
+"s	c #BBD0EB",
+"t	c #BACFEA",
+"u	c #F2F6FB",
+"v	c #5F8DC8",
+"w	c #7EA8DD",
+"x	c #BDD1EB",
+"y	c #B5CDEA",
+"z	c #5C8AC6",
+"A	c #7AA4D9",
+"B	c #EEF3F9",
+"C	c #BFD3EB",
+"D	c #ADC7EA",
+"E	c #5F8CC6",
+"F	c #75A1D7",
+"G	c #EDF2F8",
+"H	c #E6EDF6",
+"I	c #E2EAF4",
+"J	c #DBE4F1",
+"K	c #5D8AC5",
+"L	c #729ED6",
+"M	c #6E99D3",
+"N	c #6392CE",
+"O	c #5E8ECB",
+"P	c #5687C7",
+"Q	c #5284C3",
+"R	c #4277BB",
+"   ....         ",
+"  +.@#.$%&*=-;> ",
+" ,'.''.''''''') ",
+" !'.~{.]^/(_:'< ",
+" ['.}}.}}}}}}'| ",
+" 1'.22.222222'3 ",
+" 4'.}5.}}6}}}78 ",
+" 90.ab.cd6defgh ",
+" ...}i.}}6}}}jk ",
+" ...ll.lm66enop ",
+" qr.}s.}}tu}}ov ",
+" wr.ss.sxyyyyoz ",
+" AB.}C.}}D}}}oE ",
+" FG.HI.JooooooK ",
+" LM.NO.PQQQQQQR ",
+"   ....         "};
diff --git a/res/indices.xpm b/res/indices.xpm
index 02f0eda21..aa34fd721 100644
--- a/res/indices.xpm
+++ b/res/indices.xpm
@@ -1,31 +1,102 @@
 /* XPM */
 static const char * indices_xpm[] = {
-"16 16 12 1",
+"16 16 83 1",
 " 	c None",
-".	c #000686",
-"+	c #FFFFFF",
-"@	c #DEDFDE",
-"#	c #E7E3E7",
-"$	c #E7E7E7",
-"%	c #EFEBEF",
-"&	c #EFEFEF",
-"*	c #889CC1",
-"=	c #F7F3F7",
-"-	c #F7F7F7",
-";	c #FFFBFF",
-"...........     ",
-"...........     ",
-".+@#$$%%%&.     ",
-".+***%***&.     ",
-".+$$%%&&&=......",
-".+***&***=......",
-".+%%&&===-.%%%&.",
-".+***&***-.***&.",
-".+%&&===-;.&&&=.",
-".+***=***;.***=.",
-".+&==-;;;+.===-.",
-"...........***-.",
-"     .+%&&===-;.",
-"     .+***=***;.",
-"     .+&==-;;;+.",
-"     ..........."};
+".	c #FA4225",
+"+	c #A2C1EF",
+"@	c #9DBEEB",
+"#	c #9ABCEB",
+"$	c #93B7E7",
+"%	c #90B5E6",
+"&	c #8CB2E4",
+"*	c #88AFE2",
+"=	c #84ACE0",
+"-	c #80A9DD",
+";	c #7DA5DC",
+">	c #7AA3DA",
+",	c #A1C1EE",
+"'	c #F4F7FB",
+")	c #74A0D7",
+"!	c #9EBFEC",
+"~	c #A1D398",
+"{	c #9DD094",
+"]	c #93CB8B",
+"^	c #8EC987",
+"/	c #89C682",
+"(	c #84C37E",
+"_	c #80C17A",
+":	c #7CBE76",
+"<	c #6F9BD4",
+"[	c #9BBDEB",
+"}	c #FFFFFF",
+"|	c #6A97D1",
+"1	c #98BAE9",
+"2	c #A6C3E9",
+"3	c #6493CE",
+"4	c #94B7E7",
+"5	c #A9C4E8",
+"6	c #ACC7E8",
+"7	c #EBF1F7",
+"8	c #5F8FCB",
+"9	c #8FB4E5",
+"0	c #F2F6FA",
+"a	c #ACC6E9",
+"b	c #ACC7EA",
+"c	c #AEC9E9",
+"d	c #B0C9E9",
+"e	c #B0C8E8",
+"f	c #B5CCE8",
+"g	c #DEE7F2",
+"h	c #598AC8",
+"i	c #B0C9EA",
+"j	c #DBE5F1",
+"k	c #5586C6",
+"l	c #B3CCEA",
+"m	c #B7CEEA",
+"n	c #AEC8E8",
+"o	c #D8E2F0",
+"p	c #5486C4",
+"q	c #82AADF",
+"r	c #EFF3F9",
+"s	c #BBD0EB",
+"t	c #BACFEA",
+"u	c #F2F6FB",
+"v	c #5F8DC8",
+"w	c #7EA8DD",
+"x	c #BDD1EB",
+"y	c #B5CDEA",
+"z	c #5C8AC6",
+"A	c #7AA4D9",
+"B	c #EEF3F9",
+"C	c #BFD3EB",
+"D	c #ADC7EA",
+"E	c #5F8CC6",
+"F	c #75A1D7",
+"G	c #EDF2F8",
+"H	c #E6EDF6",
+"I	c #E2EAF4",
+"J	c #DBE4F1",
+"K	c #5D8AC5",
+"L	c #729ED6",
+"M	c #6E99D3",
+"N	c #6392CE",
+"O	c #5E8ECB",
+"P	c #5687C7",
+"Q	c #5284C3",
+"R	c #4277BB",
+"   ....         ",
+"  +.@#.$%&*=-;> ",
+" ,'.''.''''''') ",
+" !'.~{.]^/(_:'< ",
+" ['.}}.}}}}}}'| ",
+" 1'.22.222222'3 ",
+" 4'.}5.}}6}}}78 ",
+" 90.ab.cd6defgh ",
+" ...}i.}}6}}}jk ",
+" ...ll.lm66enop ",
+" qr.}s.}}tu}}ov ",
+" wr.ss.sxyyyyoz ",
+" AB.}C.}}D}}}oE ",
+" FG.HI.JooooooK ",
+" LM.NO.PQQQQQQR ",
+"   ....         "};
diff --git a/res/package.xpm b/res/package.xpm
index 607d407d1..4b52866bb 100644
--- a/res/package.xpm
+++ b/res/package.xpm
@@ -1,31 +1,165 @@
 /* XPM */
 static const char * package_xpm[] = {
-"16 16 12 1",
-" 	c None",
-".	c #000686",
-"+	c #FFFFFF",
-"@	c #889CC1",
-"#	c #F7F3F7",
-"$	c #4E0D00",
-"%	c #BB3E25",
-"&	c #6F1200",
-"*	c #C6C3C6",
-"=	c #BDBEBD",
-"-	c #BDBABD",
-";	c #A5A2A5",
-"  .........     ",
-" .++++++++@.    ",
-" .+######+@+.   ",
-" .+######+....  ",
-" .++++$$$++@@.  ",
-" .++$$$%$$$++.  ",
-" .++$%%%%%$++.  ",
-" .+$$%%&%%$$+.  ",
-" .+$%%%$%%%$+.  ",
-" .+$$%%%%%$$+.  ",
-" .++$%%%%%$++.  ",
-" .++$$$%$$$++.  ",
-" .++++$$$++++.  ",
-" .+++++++++++.  ",
-" .*=====----;.  ",
-"  ...........   "};
+"16 16 146 2",
+"  	c None",
+". 	c #FEBF14",
+"+ 	c #F19502",
+"@ 	c #FEB61B",
+"# 	c #FEE451",
+"$ 	c #FEFE66",
+"% 	c #DEB21D",
+"& 	c #FECF39",
+"* 	c #FCE85D",
+"= 	c #E49109",
+"- 	c #FEAF19",
+"; 	c #FEDD65",
+"> 	c #FEFE90",
+", 	c #FEFE7D",
+"' 	c #FEF551",
+") 	c #FEC41A",
+"! 	c #FEA810",
+"~ 	c #FDF575",
+"{ 	c #FEFE6A",
+"] 	c #FDE83E",
+"^ 	c #E08709",
+"/ 	c #FDA60C",
+"( 	c #FEF6AC",
+"_ 	c #FEFEBD",
+": 	c #FEFB81",
+"< 	c #FED638",
+"[ 	c #FEBC16",
+"} 	c #FDD027",
+"| 	c #FDB512",
+"1 	c #F3A917",
+"2 	c #FBE642",
+"3 	c #FEF040",
+"4 	c #FDCF26",
+"5 	c #E08006",
+"6 	c #FDCB4B",
+"7 	c #FEE069",
+"8 	c #FEB716",
+"9 	c #FEB811",
+"0 	c #FED72D",
+"a 	c #FEEC41",
+"b 	c #FECE24",
+"c 	c #FBBB17",
+"d 	c #ED9F12",
+"e 	c #F6BC22",
+"f 	c #FECF1F",
+"g 	c #FEAF0B",
+"h 	c #A74900",
+"i 	c #F89A00",
+"j 	c #FDB729",
+"k 	c #FEC02D",
+"l 	c #FEA201",
+"m 	c #FEBB13",
+"n 	c #FED229",
+"o 	c #FEE439",
+"p 	c #FEF64B",
+"q 	c #FEDB33",
+"r 	c #FEDB2F",
+"s 	c #FCD832",
+"t 	c #E9A31A",
+"u 	c #F0960A",
+"v 	c #BF5A01",
+"w 	c #FCDB4D",
+"x 	c #FDD02B",
+"y 	c #FBB613",
+"z 	c #FEE034",
+"A 	c #FEF246",
+"B 	c #FEFE67",
+"C 	c #FEEE4B",
+"D 	c #FEF142",
+"E 	c #FDF045",
+"F 	c #EBB62A",
+"G 	c #DA790A",
+"H 	c #CE6D07",
+"I 	c #B14300",
+"J 	c #E68D00",
+"K 	c #FCC924",
+"L 	c #F8B91A",
+"M 	c #F6BE21",
+"N 	c #FEF64F",
+"O 	c #F7CC3E",
+"P 	c #F3BB22",
+"Q 	c #F0C831",
+"R 	c #E4A725",
+"S 	c #EDBE2B",
+"T 	c #F3B922",
+"U 	c #CC6B07",
+"V 	c #5E2000",
+"W 	c #F9A207",
+"X 	c #F3A30D",
+"Y 	c #ED9006",
+"Z 	c #E48506",
+"` 	c #E07000",
+" .	c #DD7D11",
+"..	c #ECBF4C",
+"+.	c #F1D84B",
+"@.	c #E9A41D",
+"#.	c #C35602",
+"$.	c #F59906",
+"%.	c #FEC31C",
+"&.	c #FBBC19",
+"*.	c #F5AC13",
+"=.	c #E9930D",
+"-.	c #E1840D",
+";.	c #E39927",
+">.	c #E4A634",
+",.	c #E08B12",
+"'.	c #F7AB0D",
+").	c #C86C06",
+"!.	c #ED9108",
+"~.	c #FED830",
+"{.	c #FEE033",
+"].	c #FEDE32",
+"^.	c #FEE339",
+"/.	c #FEDB3A",
+"(.	c #FDC91F",
+"_.	c #F9BF1D",
+":.	c #FECB22",
+"<.	c #FEE027",
+"[.	c #CA770F",
+"}.	c #DE9216",
+"|.	c #FEED46",
+"1.	c #FEF74A",
+"2.	c #FEF34B",
+"3.	c #FEEB4B",
+"4.	c #FEE338",
+"5.	c #FEE639",
+"6.	c #FEEC3B",
+"7.	c #FEED3A",
+"8.	c #C96E12",
+"9.	c #E18713",
+"0.	c #FDED59",
+"a.	c #FEFE6F",
+"b.	c #FEFC61",
+"c.	c #FEFE52",
+"d.	c #FEFC4F",
+"e.	c #F8BE32",
+"f.	c #B3590F",
+"g.	c #C56411",
+"h.	c #F8DD76",
+"i.	c #FEFE86",
+"j.	c #FCCA44",
+"k.	c #C06816",
+"l.	c #541600",
+"m.	c #B74E0D",
+"n.	c #CF6D24",
+"o.	c #641D00",
+"            .       +           ",
+"        @ # $ %   & * =         ",
+"    - ; > , ' ) ! ~ { ] ^       ",
+"  / ( _ : < [ } | 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.              ",
+"                                "};
diff --git a/res/packages.xpm b/res/packages.xpm
index b7515195e..35d2ab256 100644
--- a/res/packages.xpm
+++ b/res/packages.xpm
@@ -1,25 +1,165 @@
 /* XPM */
 static const char * packages_xpm[] = {
-"16 16 6 1",
-" 	c None",
-".	c #424C00",
-"+	c #D6DCB0",
-"@	c #4E0D00",
-"#	c #BB3E25",
-"$	c #6F1200",
-"  ....          ",
-" .++++.         ",
-".++++++.....    ",
-".+++++++++++.   ",
-".+++..........  ",
-".+++.+++++++++. ",
-".++.++++++++++. ",
-".++.++++++@@@.  ",
-".+.+++++@@@#@@@ ",
-".+.+++++@#####@ ",
-".++++++@@##$##@@",
-" ......@###@###@",
-"       @@#####@@",
-"        @#####@ ",
-"        @@@#@@@ ",
-"          @@@   "};
+"16 16 146 2",
+"  	c None",
+". 	c #FEBF14",
+"+ 	c #F19502",
+"@ 	c #FEB61B",
+"# 	c #FEE451",
+"$ 	c #FEFE66",
+"% 	c #DEB21D",
+"& 	c #FECF39",
+"* 	c #FCE85D",
+"= 	c #E49109",
+"- 	c #FEAF19",
+"; 	c #FEDD65",
+"> 	c #FEFE90",
+", 	c #FEFE7D",
+"' 	c #FEF551",
+") 	c #FEC41A",
+"! 	c #FEA810",
+"~ 	c #FDF575",
+"{ 	c #FEFE6A",
+"] 	c #FDE83E",
+"^ 	c #E08709",
+"/ 	c #FDA60C",
+"( 	c #FEF6AC",
+"_ 	c #FEFEBD",
+": 	c #FEFB81",
+"< 	c #FED638",
+"[ 	c #FEBC16",
+"} 	c #FDD027",
+"| 	c #FDB512",
+"1 	c #F3A917",
+"2 	c #FBE642",
+"3 	c #FEF040",
+"4 	c #FDCF26",
+"5 	c #E08006",
+"6 	c #FDCB4B",
+"7 	c #FEE069",
+"8 	c #FEB716",
+"9 	c #FEB811",
+"0 	c #FED72D",
+"a 	c #FEEC41",
+"b 	c #FECE24",
+"c 	c #FBBB17",
+"d 	c #ED9F12",
+"e 	c #F6BC22",
+"f 	c #FECF1F",
+"g 	c #FEAF0B",
+"h 	c #A74900",
+"i 	c #F89A00",
+"j 	c #FDB729",
+"k 	c #FEC02D",
+"l 	c #FEA201",
+"m 	c #FEBB13",
+"n 	c #FED229",
+"o 	c #FEE439",
+"p 	c #FEF64B",
+"q 	c #FEDB33",
+"r 	c #FEDB2F",
+"s 	c #FCD832",
+"t 	c #E9A31A",
+"u 	c #F0960A",
+"v 	c #BF5A01",
+"w 	c #FCDB4D",
+"x 	c #FDD02B",
+"y 	c #FBB613",
+"z 	c #FEE034",
+"A 	c #FEF246",
+"B 	c #FEFE67",
+"C 	c #FEEE4B",
+"D 	c #FEF142",
+"E 	c #FDF045",
+"F 	c #EBB62A",
+"G 	c #DA790A",
+"H 	c #CE6D07",
+"I 	c #B14300",
+"J 	c #E68D00",
+"K 	c #FCC924",
+"L 	c #F8B91A",
+"M 	c #F6BE21",
+"N 	c #FEF64F",
+"O 	c #F7CC3E",
+"P 	c #F3BB22",
+"Q 	c #F0C831",
+"R 	c #E4A725",
+"S 	c #EDBE2B",
+"T 	c #F3B922",
+"U 	c #CC6B07",
+"V 	c #5E2000",
+"W 	c #F9A207",
+"X 	c #F3A30D",
+"Y 	c #ED9006",
+"Z 	c #E48506",
+"` 	c #E07000",
+" .	c #DD7D11",
+"..	c #ECBF4C",
+"+.	c #F1D84B",
+"@.	c #E9A41D",
+"#.	c #C35602",
+"$.	c #F59906",
+"%.	c #FEC31C",
+"&.	c #FBBC19",
+"*.	c #F5AC13",
+"=.	c #E9930D",
+"-.	c #E1840D",
+";.	c #E39927",
+">.	c #E4A634",
+",.	c #E08B12",
+"'.	c #F7AB0D",
+").	c #C86C06",
+"!.	c #ED9108",
+"~.	c #FED830",
+"{.	c #FEE033",
+"].	c #FEDE32",
+"^.	c #FEE339",
+"/.	c #FEDB3A",
+"(.	c #FDC91F",
+"_.	c #F9BF1D",
+":.	c #FECB22",
+"<.	c #FEE027",
+"[.	c #CA770F",
+"}.	c #DE9216",
+"|.	c #FEED46",
+"1.	c #FEF74A",
+"2.	c #FEF34B",
+"3.	c #FEEB4B",
+"4.	c #FEE338",
+"5.	c #FEE639",
+"6.	c #FEEC3B",
+"7.	c #FEED3A",
+"8.	c #C96E12",
+"9.	c #E18713",
+"0.	c #FDED59",
+"a.	c #FEFE6F",
+"b.	c #FEFC61",
+"c.	c #FEFE52",
+"d.	c #FEFC4F",
+"e.	c #F8BE32",
+"f.	c #B3590F",
+"g.	c #C56411",
+"h.	c #F8DD76",
+"i.	c #FEFE86",
+"j.	c #FCCA44",
+"k.	c #C06816",
+"l.	c #541600",
+"m.	c #B74E0D",
+"n.	c #CF6D24",
+"o.	c #641D00",
+"            .       +           ",
+"        @ # $ %   & * =         ",
+"    - ; > , ' ) ! ~ { ] ^       ",
+"  / ( _ : < [ } | 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.              ",
+"                                "};
diff --git a/res/procedure.xpm b/res/procedure.xpm
index 7725163a8..5a07929db 100644
--- a/res/procedure.xpm
+++ b/res/procedure.xpm
@@ -1,31 +1,91 @@
 /* XPM */
 static const char * procedure_xpm[] = {
-"16 16 12 1",
-" 	c None",
-".	c #000686",
-"+	c #FFFFFF",
-"@	c #889CC1",
-"#	c #F7F3F7",
-"$	c #4E0D00",
-"%	c #BB3E25",
-"&	c #6F1200",
-"*	c #C6C3C6",
-"=	c #BDBEBD",
-"-	c #BDBABD",
-";	c #A5A2A5",
-"  .........     ",
-" .++++++++@.    ",
-" .+######+@+.   ",
-" .+######+....  ",
-" .++++$$$++@@.  ",
-" .++$$$%$$$++.  ",
-" .++$%%%%%$++.  ",
-" .+$$%%&%%$$+.  ",
-" .+$%%%$%%%$+.  ",
-" .+$$%%%%%$$+.  ",
-" .++$%%%%%$++.  ",
-" .++$$$%$$$++.  ",
-" .++++$$$++++.  ",
-" .+++++++++++.  ",
-" .*=====----;.  ",
-"  ...........   "};
+"16 16 72 1",
+" 	g None",
+".	g #C2C2C2",
+"+	g #B3B3B3",
+"@	g #A2A2A2",
+"#	g #A9A9A9",
+"$	g #FFFFFF",
+"%	g #B1B1B1",
+"&	g #D6D6D6",
+"*	g #FDFDFD",
+"=	g #FCFCFC",
+"-	g #D3D3D3",
+";	g #E0E0E0",
+">	g #ACACAC",
+",	g #D1D1D1",
+"'	g #ABABAB",
+")	g #AEAEAE",
+"!	g #D5D5D5",
+"~	g #C7C7C7",
+"{	g #B5B5B5",
+"]	g #A3A3A3",
+"^	g #FBFBFB",
+"/	g #D2D2D2",
+"(	g #9D9D9D",
+"_	g #D8D8D8",
+":	g #CDCDCD",
+"<	g #CECECE",
+"[	g #CCCCCC",
+"}	g #C1C1C1",
+"|	g #BEBEBE",
+"1	g #9B9B9B",
+"2	g #F3F3F3",
+"3	g #E9E9E9",
+"4	g #DDDDDD",
+"5	g #DEDEDE",
+"6	g #DADADA",
+"7	g #C3C3C3",
+"8	g #D7D7D7",
+"9	g #BBBBBB",
+"0	g #CFCFCF",
+"a	g #9A9A9A",
+"b	g #AAAAAA",
+"c	g #F1F1F1",
+"d	g #EEEEEE",
+"e	g #E1E1E1",
+"f	g #CBCBCB",
+"g	g #C0C0C0",
+"h	g #999999",
+"i	g #F0F0F0",
+"j	g #ECECEC",
+"k	g #EAEAEA",
+"l	g #E4E4E4",
+"m	g #C4C4C4",
+"n	g #989898",
+"o	g #A6A6A6",
+"p	g #F5F5F5",
+"q	g #F2F2F2",
+"r	g #E7E7E7",
+"s	g #DFDFDF",
+"t	g #DBDBDB",
+"u	g #BDBDBD",
+"v	g #C9C9C9",
+"w	g #959595",
+"x	g #A5A5A5",
+"y	g #E3E3E3",
+"z	g #949494",
+"A	g #A1A1A1",
+"B	g #E8E8E8",
+"C	g #EBEBEB",
+"D	g #9E9E9E",
+"E	g #C5C5C5",
+"F	g #979797",
+"G	g #969696",
+"     .+@@+.     ",
+"     #$$$$#     ",
+" .+@@%&*=-%@@+. ",
+" #$$$;>,,';$$$# ",
+"))!**~{]]{~=^/)(",
+">_:<,>$$$$>,[}|1",
+"'2345.6**678990a",
+"b2cde~f,,[%9gg<h",
+"#2ijkl6_m9|.7gfn",
+"opqrlst&g...u|vw",
+"x|ycr46&|}}9fgoz",
+"  A}BC5&99f~'z  ",
+"   D(ECB[:+wz   ",
+"     1a:uAw     ",
+"       FG       ",
+"                "};
diff --git a/res/procedures.xpm b/res/procedures.xpm
index b52e84ce6..a4d90e11b 100644
--- a/res/procedures.xpm
+++ b/res/procedures.xpm
@@ -1,25 +1,91 @@
 /* XPM */
 static const char * procedures_xpm[] = {
-"16 16 6 1",
-" 	c None",
-".	c #424C00",
-"+	c #D6DCB0",
-"@	c #4E0D00",
-"#	c #BB3E25",
-"$	c #6F1200",
-"  ....          ",
-" .++++.         ",
-".++++++.....    ",
-".+++++++++++.   ",
-".+++..........  ",
-".+++.+++++++++. ",
-".++.++++++++++. ",
-".++.++++++@@@.  ",
-".+.+++++@@@#@@@ ",
-".+.+++++@#####@ ",
-".++++++@@##$##@@",
-" ......@###@###@",
-"       @@#####@@",
-"        @#####@ ",
-"        @@@#@@@ ",
-"          @@@   "};
+"16 16 72 1",
+" 	g None",
+".	g #C2C2C2",
+"+	g #B3B3B3",
+"@	g #A2A2A2",
+"#	g #A9A9A9",
+"$	g #FFFFFF",
+"%	g #B1B1B1",
+"&	g #D6D6D6",
+"*	g #FDFDFD",
+"=	g #FCFCFC",
+"-	g #D3D3D3",
+";	g #E0E0E0",
+">	g #ACACAC",
+",	g #D1D1D1",
+"'	g #ABABAB",
+")	g #AEAEAE",
+"!	g #D5D5D5",
+"~	g #C7C7C7",
+"{	g #B5B5B5",
+"]	g #A3A3A3",
+"^	g #FBFBFB",
+"/	g #D2D2D2",
+"(	g #9D9D9D",
+"_	g #D8D8D8",
+":	g #CDCDCD",
+"<	g #CECECE",
+"[	g #CCCCCC",
+"}	g #C1C1C1",
+"|	g #BEBEBE",
+"1	g #9B9B9B",
+"2	g #F3F3F3",
+"3	g #E9E9E9",
+"4	g #DDDDDD",
+"5	g #DEDEDE",
+"6	g #DADADA",
+"7	g #C3C3C3",
+"8	g #D7D7D7",
+"9	g #BBBBBB",
+"0	g #CFCFCF",
+"a	g #9A9A9A",
+"b	g #AAAAAA",
+"c	g #F1F1F1",
+"d	g #EEEEEE",
+"e	g #E1E1E1",
+"f	g #CBCBCB",
+"g	g #C0C0C0",
+"h	g #999999",
+"i	g #F0F0F0",
+"j	g #ECECEC",
+"k	g #EAEAEA",
+"l	g #E4E4E4",
+"m	g #C4C4C4",
+"n	g #989898",
+"o	g #A6A6A6",
+"p	g #F5F5F5",
+"q	g #F2F2F2",
+"r	g #E7E7E7",
+"s	g #DFDFDF",
+"t	g #DBDBDB",
+"u	g #BDBDBD",
+"v	g #C9C9C9",
+"w	g #959595",
+"x	g #A5A5A5",
+"y	g #E3E3E3",
+"z	g #949494",
+"A	g #A1A1A1",
+"B	g #E8E8E8",
+"C	g #EBEBEB",
+"D	g #9E9E9E",
+"E	g #C5C5C5",
+"F	g #979797",
+"G	g #969696",
+"     .+@@+.     ",
+"     #$$$$#     ",
+" .+@@%&*=-%@@+. ",
+" #$$$;>,,';$$$# ",
+"))!**~{]]{~=^/)(",
+">_:<,>$$$$>,[}|1",
+"'2345.6**678990a",
+"b2cde~f,,[%9gg<h",
+"#2ijkl6_m9|.7gfn",
+"opqrlst&g...u|vw",
+"x|ycr46&|}}9fgoz",
+"  A}BC5&99f~'z  ",
+"   D(ECB[:+wz   ",
+"     1a:uAw     ",
+"       FG       ",
+"                "};
diff --git a/res/systempackage.xpm b/res/systempackage.xpm
index f76d3f046..5d239206e 100644
--- a/res/systempackage.xpm
+++ b/res/systempackage.xpm
@@ -1,31 +1,166 @@
 /* XPM */
 static const char * systempackage_xpm[] = {
-"16 16 12 1",
-" 	c None",
-".	c #000686",
-"+	c #FFFFFF",
-"@	c #889CC1",
-"#	c #F7F3F7",
-"$	c #4E0D00",
-"%	c #BB3E25",
-"&	c #6F1200",
-"*	c #C6C3C6",
-"=	c #BDBEBD",
-"-	c #BDBABD",
-";	c #A5A2A5",
-"  .........     ",
-" .++++++++@.    ",
-" .+######+@+.   ",
-" .+######+....  ",
-" .++++$$$++@@.  ",
-" .++$$$%$$$++.  ",
-" .++$%%%%%$++.  ",
-" .+$$%%&%%$$+.  ",
-" .+$%%%$%%%$+.  ",
-" .+$$%%%%%$$+.  ",
-" .++$%%%%%$++.  ",
-" .++$$$%$$$++.  ",
-" .++++$$$++++.  ",
-" .+++++++++++.  ",
-" .*=====----;.  ",
-"  ...........   "};
+"16 16 147 2",
+"  	c None",
+". 	c #FEBF14",
+"+ 	c #F19502",
+"@ 	c #FEB61B",
+"# 	c #FEE451",
+"$ 	c #FEFE66",
+"% 	c #DEB21D",
+"& 	c #FECF39",
+"* 	c #FCE85D",
+"= 	c #E49109",
+"- 	c #FEAF19",
+"; 	c #FEDD65",
+"> 	c #FEFE90",
+", 	c #FEFE7D",
+"' 	c #FEF551",
+") 	c #FEC41A",
+"! 	c #FEA810",
+"~ 	c #FDF575",
+"{ 	c #FEFE6A",
+"] 	c #FDE83E",
+"^ 	c #E08709",
+"/ 	c #FDA60C",
+"( 	c #FEF6AC",
+"_ 	c #FEFEBD",
+": 	c #FEFB81",
+"< 	c #FED638",
+"[ 	c #FEBC16",
+"} 	c #FDD027",
+"| 	c #FDB512",
+"1 	c #F3A917",
+"2 	c #FBE642",
+"3 	c #FEF040",
+"4 	c #FDCF26",
+"5 	c #E08006",
+"6 	c #FDCB4B",
+"7 	c #FEE069",
+"8 	c #FEB716",
+"9 	c #FEB811",
+"0 	c #FED72D",
+"a 	c #FEEC41",
+"b 	c #FECE24",
+"c 	c #FBBB17",
+"d 	c #ED9F12",
+"e 	c #F6BC22",
+"f 	c #FECF1F",
+"g 	c #FEAF0B",
+"h 	c #A74900",
+"i 	c #F89A00",
+"j 	c #FDB729",
+"k 	c #FEC02D",
+"l 	c #FEA201",
+"m 	c #FEBB13",
+"n 	c #FED229",
+"o 	c #FEE439",
+"p 	c #FEF64B",
+"q 	c #FEDB33",
+"r 	c #FEDB2F",
+"s 	c #FCD832",
+"t 	c #E9A31A",
+"u 	c #F0960A",
+"v 	c #BF5A01",
+"w 	c #FCDB4D",
+"x 	c #FDD02B",
+"y 	c #FBB613",
+"z 	c #FEE034",
+"A 	c #FEF246",
+"B 	c #FEFE67",
+"C 	c #FEEE4B",
+"D 	c #FEF142",
+"E 	c #FDF045",
+"F 	c #EBB62A",
+"G 	c #DA790A",
+"H 	c #CE6D07",
+"I 	c #B14300",
+"J 	c #E68D00",
+"K 	c #FCC924",
+"L 	c #F8B91A",
+"M 	c #F6BE21",
+"N 	c #FEF64F",
+"O 	c #F7CC3E",
+"P 	c #F3BB22",
+"Q 	c #F0C831",
+"R 	c #E4A725",
+"S 	c #EDBE2B",
+"T 	c #F3B922",
+"U 	c #CC6B07",
+"V 	c #5E2000",
+"W 	c #F9A207",
+"X 	c #F3A30D",
+"Y 	c #ED9006",
+"Z 	c #E48506",
+"` 	c #E07000",
+" .	c #DD7D11",
+"..	c #ECBF4C",
+"+.	c #F1D84B",
+"@.	c #E9A41D",
+"#.	c #C35602",
+"$.	c #F59906",
+"%.	c #FEC31C",
+"&.	c #FBBC19",
+"*.	c #F5AC13",
+"=.	c #E9930D",
+"-.	c #E1840D",
+";.	c #E39927",
+">.	c #E4A634",
+",.	c #E08B12",
+"'.	c #F7AB0D",
+").	c #C86C06",
+"!.	c #ED9108",
+"~.	c #FED830",
+"{.	c #FEE033",
+"].	c #FEDE32",
+"^.	c #FEE339",
+"/.	c #FEDB3A",
+"(.	c #FDC91F",
+"_.	c #F9BF1D",
+":.	c #FECB22",
+"<.	c #FEE027",
+"[.	c #CA770F",
+"}.	c #DE9216",
+"|.	c #FEED46",
+"1.	c #FEF74A",
+"2.	c #FEF34B",
+"3.	c #FEEB4B",
+"4.	c #FEE338",
+"5.	c #FEE639",
+"6.	c #FEEC3B",
+"7.	c #FEED3A",
+"8.	c #C96E12",
+"9.	c #E18713",
+"0.	c #FDED59",
+"a.	c #FEFE6F",
+"b.	c #FEFC61",
+"c.	c #FEFE52",
+"d.	c #FEFC4F",
+"e.	c #F8BE32",
+"f.	c #B3590F",
+"g.	c #C56411",
+"h.	c #F8DD76",
+"i.	c #FEFE86",
+"j.	c #FCCA44",
+"k.	c #C06816",
+"l.	c #541600",
+"m.	c #B74E0D",
+"n.	c #CF6D24",
+"o.	c #641D00",
+"p.	c #FF0000",
+"            .       +           ",
+"        @ # $ %   & * =         ",
+"    - ; > , ' ) ! ~ { ] ^       ",
+"  / ( _ : < [ } | 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.          ",
+"p.p.p.p.p.p.m.n.o.p.p.p.p.p.p.p.",
+"p.p.p.p.p.p.p.p.p.p.p.p.p.p.p.p."};
diff --git a/res/systempackages.xpm b/res/systempackages.xpm
index 1570c23ac..bceeb2d6f 100644
--- a/res/systempackages.xpm
+++ b/res/systempackages.xpm
@@ -1,25 +1,166 @@
 /* XPM */
 static const char * systempackages_xpm[] = {
-"16 16 6 1",
-" 	c None",
-".	c #424C00",
-"+	c #D6DCB0",
-"@	c #4E0D00",
-"#	c #BB3E25",
-"$	c #6F1200",
-"  ....          ",
-" .++++.         ",
-".++++++.....    ",
-".+++++++++++.   ",
-".+++..........  ",
-".+++.+++++++++. ",
-".++.++++++++++. ",
-".++.++++++@@@.  ",
-".+.+++++@@@#@@@ ",
-".+.+++++@#####@ ",
-".++++++@@##$##@@",
-" ......@###@###@",
-"       @@#####@@",
-"        @#####@ ",
-"        @@@#@@@ ",
-"          @@@   "};
+"16 16 147 2",
+"  	c None",
+". 	c #FEBF14",
+"+ 	c #F19502",
+"@ 	c #FEB61B",
+"# 	c #FEE451",
+"$ 	c #FEFE66",
+"% 	c #DEB21D",
+"& 	c #FECF39",
+"* 	c #FCE85D",
+"= 	c #E49109",
+"- 	c #FEAF19",
+"; 	c #FEDD65",
+"> 	c #FEFE90",
+", 	c #FEFE7D",
+"' 	c #FEF551",
+") 	c #FEC41A",
+"! 	c #FEA810",
+"~ 	c #FDF575",
+"{ 	c #FEFE6A",
+"] 	c #FDE83E",
+"^ 	c #E08709",
+"/ 	c #FDA60C",
+"( 	c #FEF6AC",
+"_ 	c #FEFEBD",
+": 	c #FEFB81",
+"< 	c #FED638",
+"[ 	c #FEBC16",
+"} 	c #FDD027",
+"| 	c #FDB512",
+"1 	c #F3A917",
+"2 	c #FBE642",
+"3 	c #FEF040",
+"4 	c #FDCF26",
+"5 	c #E08006",
+"6 	c #FDCB4B",
+"7 	c #FEE069",
+"8 	c #FEB716",
+"9 	c #FEB811",
+"0 	c #FED72D",
+"a 	c #FEEC41",
+"b 	c #FECE24",
+"c 	c #FBBB17",
+"d 	c #ED9F12",
+"e 	c #F6BC22",
+"f 	c #FECF1F",
+"g 	c #FEAF0B",
+"h 	c #A74900",
+"i 	c #F89A00",
+"j 	c #FDB729",
+"k 	c #FEC02D",
+"l 	c #FEA201",
+"m 	c #FEBB13",
+"n 	c #FED229",
+"o 	c #FEE439",
+"p 	c #FEF64B",
+"q 	c #FEDB33",
+"r 	c #FEDB2F",
+"s 	c #FCD832",
+"t 	c #E9A31A",
+"u 	c #F0960A",
+"v 	c #BF5A01",
+"w 	c #FCDB4D",
+"x 	c #FDD02B",
+"y 	c #FBB613",
+"z 	c #FEE034",
+"A 	c #FEF246",
+"B 	c #FEFE67",
+"C 	c #FEEE4B",
+"D 	c #FEF142",
+"E 	c #FDF045",
+"F 	c #EBB62A",
+"G 	c #DA790A",
+"H 	c #CE6D07",
+"I 	c #B14300",
+"J 	c #E68D00",
+"K 	c #FCC924",
+"L 	c #F8B91A",
+"M 	c #F6BE21",
+"N 	c #FEF64F",
+"O 	c #F7CC3E",
+"P 	c #F3BB22",
+"Q 	c #F0C831",
+"R 	c #E4A725",
+"S 	c #EDBE2B",
+"T 	c #F3B922",
+"U 	c #CC6B07",
+"V 	c #5E2000",
+"W 	c #F9A207",
+"X 	c #F3A30D",
+"Y 	c #ED9006",
+"Z 	c #E48506",
+"` 	c #E07000",
+" .	c #DD7D11",
+"..	c #ECBF4C",
+"+.	c #F1D84B",
+"@.	c #E9A41D",
+"#.	c #C35602",
+"$.	c #F59906",
+"%.	c #FEC31C",
+"&.	c #FBBC19",
+"*.	c #F5AC13",
+"=.	c #E9930D",
+"-.	c #E1840D",
+";.	c #E39927",
+">.	c #E4A634",
+",.	c #E08B12",
+"'.	c #F7AB0D",
+").	c #C86C06",
+"!.	c #ED9108",
+"~.	c #FED830",
+"{.	c #FEE033",
+"].	c #FEDE32",
+"^.	c #FEE339",
+"/.	c #FEDB3A",
+"(.	c #FDC91F",
+"_.	c #F9BF1D",
+":.	c #FECB22",
+"<.	c #FEE027",
+"[.	c #CA770F",
+"}.	c #DE9216",
+"|.	c #FEED46",
+"1.	c #FEF74A",
+"2.	c #FEF34B",
+"3.	c #FEEB4B",
+"4.	c #FEE338",
+"5.	c #FEE639",
+"6.	c #FEEC3B",
+"7.	c #FEED3A",
+"8.	c #C96E12",
+"9.	c #E18713",
+"0.	c #FDED59",
+"a.	c #FEFE6F",
+"b.	c #FEFC61",
+"c.	c #FEFE52",
+"d.	c #FEFC4F",
+"e.	c #F8BE32",
+"f.	c #B3590F",
+"g.	c #C56411",
+"h.	c #F8DD76",
+"i.	c #FEFE86",
+"j.	c #FCCA44",
+"k.	c #C06816",
+"l.	c #541600",
+"m.	c #B74E0D",
+"n.	c #CF6D24",
+"o.	c #641D00",
+"p.	c #FF0000",
+"            .       +           ",
+"        @ # $ %   & * =         ",
+"    - ; > , ' ) ! ~ { ] ^       ",
+"  / ( _ : < [ } | 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.          ",
+"p.p.p.p.p.p.m.n.o.p.p.p.p.p.p.p.",
+"p.p.p.p.p.p.p.p.p.p.p.p.p.p.p.p."};
diff --git a/res/systemtable.xpm b/res/systemtable.xpm
index f6be4bb48..c5eb7bfbd 100644
--- a/res/systemtable.xpm
+++ b/res/systemtable.xpm
@@ -1,31 +1,108 @@
 /* XPM */
 static const char * systemtable_xpm[] = {
-"16 16 12 1",
+"16 16 89 1",
 " 	c None",
-".	c #FF0000",
-"+	c #FFFFFF",
-"@	c #DEDFDE",
-"#	c #E7E3E7",
-"$	c #E7E7E7",
-"%	c #EFEBEF",
-"&	c #EFEFEF",
-"*	c #889CC1",
-"=	c #F7F3F7",
-"-	c #F7F7F7",
-";	c #FFFBFF",
+".	c #A2C1EF",
+"+	c #9FC0ED",
+"@	c #9DBEEB",
+"#	c #9ABCEB",
+"$	c #96BAE9",
+"%	c #93B7E7",
+"&	c #90B5E6",
+"*	c #8CB2E4",
+"=	c #88AFE2",
+"-	c #84ACE0",
+";	c #80A9DD",
+">	c #7DA5DC",
+",	c #7AA3DA",
+"'	c #A1C1EE",
+")	c #F4F7FB",
+"!	c #74A0D7",
+"~	c #9EBFEC",
+"{	c #A5D59C",
+"]	c #A1D398",
+"^	c #9DD094",
+"/	c #98CE90",
+"(	c #93CB8B",
+"_	c #8EC987",
+":	c #89C682",
+"<	c #84C37E",
+"[	c #80C17A",
+"}	c #7CBE76",
+"|	c #6F9BD4",
+"1	c #9BBDEB",
+"2	c #FFFFFF",
+"3	c #6A97D1",
+"4	c #98BAE9",
+"5	c #A6C3E9",
+"6	c #6493CE",
+"7	c #94B7E7",
+"8	c #A9C4E8",
+"9	c #ACC7E8",
+"0	c #EBF1F7",
+"a	c #5F8FCB",
+"b	c #8FB4E5",
+"c	c #F2F6FA",
+"d	c #AAC6E9",
+"e	c #ACC6E9",
+"f	c #ACC7EA",
+"g	c #ADC7E9",
+"h	c #AEC9E9",
+"i	c #B0C9E9",
+"j	c #B0C8E8",
+"k	c #B5CCE8",
+"l	c #DEE7F2",
+"m	c #598AC8",
+"n	c #82AADF",
+"o	c #EFF3F9",
+"p	c #B7CEEA",
+"q	c #BBD0EB",
+"r	c #BACFEA",
+"s	c #F2F6FB",
+"t	c #D8E2F0",
+"u	c #5F8DC8",
+"v	c #7EA8DD",
+"w	c #BAD0EB",
+"x	c #BDD1EB",
+"y	c #B5CDEA",
+"z	c #5C8AC6",
+"A	c #7AA4D9",
+"B	c #EEF3F9",
+"C	c #BED2EB",
+"D	c #BFD3EB",
+"E	c #ADC7EA",
+"F	c #5F8CC6",
+"G	c #75A1D7",
+"H	c #EDF2F8",
+"I	c #EAF0F7",
+"J	c #E6EDF6",
+"K	c #E2EAF4",
+"L	c #DEE7F3",
+"M	c #DBE4F1",
+"N	c #5D8AC5",
+"O	c #729ED6",
+"P	c #6E99D3",
+"Q	c #6896D1",
+"R	c #6392CE",
+"S	c #5E8ECB",
+"T	c #5B8AC9",
+"U	c #5687C7",
+"V	c #5284C3",
+"W	c #4277BB",
+"X	c #FA4225",
 "                ",
+"  .+@#$%&*=-;>, ",
+" '))))))))))))! ",
+" ~){]^/(_:<[})| ",
+" 1)2222222222)3 ",
+" 4)5555555555)6 ",
+" 7)52822292220a ",
+" bcdefghi9ijklm ",
+" nop2q222rs22tu ",
+" vowqqqqxyyyytz ",
+" ABC2D222E222tF ",
+" GHIJKLMttttttN ",
+" OPQRSTUVVVVVVW ",
 "                ",
-"  ...........   ",
-"  ...........   ",
-"  .+@#$$%%%&.   ",
-"  .+***%***&.   ",
-"  .+$$%%&&&=.   ",
-"  .+***&***=.   ",
-"  .+%%&&===-.   ",
-"  .+***&***-.   ",
-"  .+%&&===-;.   ",
-"  .+***=***;.   ",
-"  .+&==-;;;+.   ",
-"  ...........   ",
-"                ",
+" XXXXXXXXXXXXXX ",
 "                "};
diff --git a/res/systemtables.xpm b/res/systemtables.xpm
index e72ef23a7..44e1861d5 100644
--- a/res/systemtables.xpm
+++ b/res/systemtables.xpm
@@ -1,31 +1,108 @@
 /* XPM */
 static const char * systemtables_xpm[] = {
-"16 16 12 1",
+"16 16 89 1",
 " 	c None",
-".	c #FF0000",
-"+	c #FFFFFF",
-"@	c #DEDFDE",
-"#	c #E7E3E7",
-"$	c #E7E7E7",
-"%	c #EFEBEF",
-"&	c #EFEFEF",
-"*	c #889CC1",
-"=	c #F7F3F7",
-"-	c #F7F7F7",
-";	c #FFFBFF",
-"...........     ",
-"...........     ",
-".+@#$$%%%&.     ",
-".+***%***&.     ",
-".+$$%%&&&=......",
-".+***&***=......",
-".+%%&&===-.%%%&.",
-".+***&***-.***&.",
-".+%&&===-;.&&&=.",
-".+***=***;.***=.",
-".+&==-;;;+.===-.",
-"...........***-.",
-"     .+%&&===-;.",
-"     .+***=***;.",
-"     .+&==-;;;+.",
-"     ..........."};
+".	c #A2C1EF",
+"+	c #9FC0ED",
+"@	c #9DBEEB",
+"#	c #9ABCEB",
+"$	c #96BAE9",
+"%	c #93B7E7",
+"&	c #90B5E6",
+"*	c #8CB2E4",
+"=	c #88AFE2",
+"-	c #84ACE0",
+";	c #80A9DD",
+">	c #7DA5DC",
+",	c #7AA3DA",
+"'	c #A1C1EE",
+")	c #F4F7FB",
+"!	c #74A0D7",
+"~	c #9EBFEC",
+"{	c #A5D59C",
+"]	c #A1D398",
+"^	c #9DD094",
+"/	c #98CE90",
+"(	c #93CB8B",
+"_	c #8EC987",
+":	c #89C682",
+"<	c #84C37E",
+"[	c #80C17A",
+"}	c #7CBE76",
+"|	c #6F9BD4",
+"1	c #9BBDEB",
+"2	c #FFFFFF",
+"3	c #6A97D1",
+"4	c #98BAE9",
+"5	c #A6C3E9",
+"6	c #6493CE",
+"7	c #94B7E7",
+"8	c #A9C4E8",
+"9	c #ACC7E8",
+"0	c #EBF1F7",
+"a	c #5F8FCB",
+"b	c #8FB4E5",
+"c	c #F2F6FA",
+"d	c #AAC6E9",
+"e	c #ACC6E9",
+"f	c #ACC7EA",
+"g	c #ADC7E9",
+"h	c #AEC9E9",
+"i	c #B0C9E9",
+"j	c #B0C8E8",
+"k	c #B5CCE8",
+"l	c #DEE7F2",
+"m	c #598AC8",
+"n	c #82AADF",
+"o	c #EFF3F9",
+"p	c #B7CEEA",
+"q	c #BBD0EB",
+"r	c #BACFEA",
+"s	c #F2F6FB",
+"t	c #D8E2F0",
+"u	c #5F8DC8",
+"v	c #7EA8DD",
+"w	c #BAD0EB",
+"x	c #BDD1EB",
+"y	c #B5CDEA",
+"z	c #5C8AC6",
+"A	c #7AA4D9",
+"B	c #EEF3F9",
+"C	c #BED2EB",
+"D	c #BFD3EB",
+"E	c #ADC7EA",
+"F	c #5F8CC6",
+"G	c #75A1D7",
+"H	c #EDF2F8",
+"I	c #EAF0F7",
+"J	c #E6EDF6",
+"K	c #E2EAF4",
+"L	c #DEE7F3",
+"M	c #DBE4F1",
+"N	c #5D8AC5",
+"O	c #729ED6",
+"P	c #6E99D3",
+"Q	c #6896D1",
+"R	c #6392CE",
+"S	c #5E8ECB",
+"T	c #5B8AC9",
+"U	c #5687C7",
+"V	c #5284C3",
+"W	c #4277BB",
+"X	c #FA4225",
+"                ",
+"  .+@#$%&*=-;>, ",
+" '))))))))))))! ",
+" ~){]^/(_:<[})| ",
+" 1)2222222222)3 ",
+" 4)5555555555)6 ",
+" 7)52822292220a ",
+" bcdefghi9ijklm ",
+" nop2q222rs22tu ",
+" vowqqqqxyyyytz ",
+" ABC2D222E222tF ",
+" GHIJKLMttttttN ",
+" OPQRSTUVVVVVVW ",
+"                ",
+" XXXXXXXXXXXXXX ",
+"                "};
diff --git a/res/table.xpm b/res/table.xpm
index 21957e2e5..659751577 100644
--- a/res/table.xpm
+++ b/res/table.xpm
@@ -1,31 +1,119 @@
 /* XPM */
 static const char * table_xpm[] = {
-"16 16 12 1",
-" 	c None",
-".	c #000686",
-"+	c #FFFFFF",
-"@	c #DEDFDE",
-"#	c #E7E3E7",
-"$	c #E7E7E7",
-"%	c #EFEBEF",
-"&	c #EFEFEF",
-"*	c #889CC1",
-"=	c #F7F3F7",
-"-	c #F7F7F7",
-";	c #FFFBFF",
-"                ",
-"                ",
-"  ...........   ",
-"  ...........   ",
-"  .+@#$$%%%&.   ",
-"  .+***%***&.   ",
-"  .+$$%%&&&=.   ",
-"  .+***&***=.   ",
-"  .+%%&&===-.   ",
-"  .+***&***-.   ",
-"  .+%&&===-;.   ",
-"  .+***=***;.   ",
-"  .+&==-;;;+.   ",
-"  ...........   ",
-"                ",
-"                "};
+"16 16 100 2",
+"  	c None",
+". 	c #A2C1EF",
+"+ 	c #9FC0ED",
+"@ 	c #9DBEEB",
+"# 	c #9ABCEB",
+"$ 	c #96BAE9",
+"% 	c #93B7E7",
+"& 	c #90B5E6",
+"* 	c #8CB2E4",
+"= 	c #88AFE2",
+"- 	c #84ACE0",
+"; 	c #80A9DD",
+"> 	c #7DA5DC",
+", 	c #7AA3DA",
+"' 	c #A1C1EE",
+") 	c #F4F7FB",
+"! 	c #74A0D7",
+"~ 	c #9EBFEC",
+"{ 	c #A5D59C",
+"] 	c #A1D398",
+"^ 	c #9DD094",
+"/ 	c #98CE90",
+"( 	c #93CB8B",
+"_ 	c #8EC987",
+": 	c #89C682",
+"< 	c #84C37E",
+"[ 	c #80C17A",
+"} 	c #7CBE76",
+"| 	c #6F9BD4",
+"1 	c #9BBDEB",
+"2 	c #FFFFFF",
+"3 	c #6A97D1",
+"4 	c #98BAE9",
+"5 	c #A6C3E9",
+"6 	c #6493CE",
+"7 	c #94B7E7",
+"8 	c #A9C4E8",
+"9 	c #ACC7E8",
+"0 	c #EBF1F7",
+"a 	c #5F8FCB",
+"b 	c #8FB4E5",
+"c 	c #F2F6FA",
+"d 	c #AAC6E9",
+"e 	c #ACC6E9",
+"f 	c #ACC7EA",
+"g 	c #ADC7E9",
+"h 	c #AEC9E9",
+"i 	c #B0C9E9",
+"j 	c #B0C8E8",
+"k 	c #B5CCE8",
+"l 	c #DEE7F2",
+"m 	c #598AC8",
+"n 	c #8CB1E3",
+"o 	c #F1F6FA",
+"p 	c #AEC9EA",
+"q 	c #B0C9EA",
+"r 	c #DBE5F1",
+"s 	c #5586C6",
+"t 	c #87AEE1",
+"u 	c #F0F4FA",
+"v 	c #B2CBEA",
+"w 	c #B3CCEA",
+"x 	c #B7CEEA",
+"y 	c #AEC8E8",
+"z 	c #D8E2F0",
+"A 	c #5486C4",
+"B 	c #82AADF",
+"C 	c #EFF3F9",
+"D 	c #BBD0EB",
+"E 	c #BACFEA",
+"F 	c #F2F6FB",
+"G 	c #5F8DC8",
+"H 	c #7EA8DD",
+"I 	c #BAD0EB",
+"J 	c #BDD1EB",
+"K 	c #B5CDEA",
+"L 	c #5C8AC6",
+"M 	c #7AA4D9",
+"N 	c #EEF3F9",
+"O 	c #BED2EB",
+"P 	c #BFD3EB",
+"Q 	c #ADC7EA",
+"R 	c #5F8CC6",
+"S 	c #75A1D7",
+"T 	c #EDF2F8",
+"U 	c #EAF0F7",
+"V 	c #E6EDF6",
+"W 	c #E2EAF4",
+"X 	c #DEE7F3",
+"Y 	c #DBE4F1",
+"Z 	c #5D8AC5",
+"` 	c #729ED6",
+" .	c #6E99D3",
+"..	c #6896D1",
+"+.	c #6392CE",
+"@.	c #5E8ECB",
+"#.	c #5B8AC9",
+"$.	c #5687C7",
+"%.	c #5284C3",
+"&.	c #4277BB",
+"                                ",
+"    . + @ # $ % & * = - ; > ,   ",
+"  ' ) ) ) ) ) ) ) ) ) ) ) ) !   ",
+"  ~ ) { ] ^ / ( _ : < [ } ) |   ",
+"  1 ) 2 2 2 2 2 2 2 2 2 2 ) 3   ",
+"  4 ) 5 5 5 5 5 5 5 5 5 5 ) 6   ",
+"  7 ) 5 2 8 2 2 2 9 2 2 2 0 a   ",
+"  b c d e f g h i 9 i j k l m   ",
+"  n o p 2 q 2 2 2 9 2 2 2 r s   ",
+"  t u v w w w w x 9 9 j y z A   ",
+"  B C x 2 D 2 2 2 E F 2 2 z G   ",
+"  H C I D D D D J K K K K z L   ",
+"  M N O 2 P 2 2 2 Q 2 2 2 z R   ",
+"  S T U V W X Y z z z z z z Z   ",
+"  `  ...+.@.#.$.%.%.%.%.%.%.&.  ",
+"                                "};
diff --git a/res/tables.xpm b/res/tables.xpm
index b6abc9c34..fd9a86e83 100644
--- a/res/tables.xpm
+++ b/res/tables.xpm
@@ -1,31 +1,119 @@
 /* XPM */
 static const char * tables_xpm[] = {
-"16 16 12 1",
-" 	c None",
-".	c #000686",
-"+	c #FFFFFF",
-"@	c #DEDFDE",
-"#	c #E7E3E7",
-"$	c #E7E7E7",
-"%	c #EFEBEF",
-"&	c #EFEFEF",
-"*	c #889CC1",
-"=	c #F7F3F7",
-"-	c #F7F7F7",
-";	c #FFFBFF",
-"...........     ",
-"...........     ",
-".+@#$$%%%&.     ",
-".+***%***&.     ",
-".+$$%%&&&=......",
-".+***&***=......",
-".+%%&&===-.%%%&.",
-".+***&***-.***&.",
-".+%&&===-;.&&&=.",
-".+***=***;.***=.",
-".+&==-;;;+.===-.",
-"...........***-.",
-"     .+%&&===-;.",
-"     .+***=***;.",
-"     .+&==-;;;+.",
-"     ..........."};
+"16 16 100 2",
+"  	c None",
+". 	c #A2C1EF",
+"+ 	c #9FC0ED",
+"@ 	c #9DBEEB",
+"# 	c #9ABCEB",
+"$ 	c #96BAE9",
+"% 	c #93B7E7",
+"& 	c #90B5E6",
+"* 	c #8CB2E4",
+"= 	c #88AFE2",
+"- 	c #84ACE0",
+"; 	c #80A9DD",
+"> 	c #7DA5DC",
+", 	c #7AA3DA",
+"' 	c #A1C1EE",
+") 	c #F4F7FB",
+"! 	c #74A0D7",
+"~ 	c #9EBFEC",
+"{ 	c #A5D59C",
+"] 	c #A1D398",
+"^ 	c #9DD094",
+"/ 	c #98CE90",
+"( 	c #93CB8B",
+"_ 	c #8EC987",
+": 	c #89C682",
+"< 	c #84C37E",
+"[ 	c #80C17A",
+"} 	c #7CBE76",
+"| 	c #6F9BD4",
+"1 	c #9BBDEB",
+"2 	c #FFFFFF",
+"3 	c #6A97D1",
+"4 	c #98BAE9",
+"5 	c #A6C3E9",
+"6 	c #6493CE",
+"7 	c #94B7E7",
+"8 	c #A9C4E8",
+"9 	c #ACC7E8",
+"0 	c #EBF1F7",
+"a 	c #5F8FCB",
+"b 	c #8FB4E5",
+"c 	c #F2F6FA",
+"d 	c #AAC6E9",
+"e 	c #ACC6E9",
+"f 	c #ACC7EA",
+"g 	c #ADC7E9",
+"h 	c #AEC9E9",
+"i 	c #B0C9E9",
+"j 	c #B0C8E8",
+"k 	c #B5CCE8",
+"l 	c #DEE7F2",
+"m 	c #598AC8",
+"n 	c #8CB1E3",
+"o 	c #F1F6FA",
+"p 	c #AEC9EA",
+"q 	c #B0C9EA",
+"r 	c #DBE5F1",
+"s 	c #5586C6",
+"t 	c #87AEE1",
+"u 	c #F0F4FA",
+"v 	c #B2CBEA",
+"w 	c #B3CCEA",
+"x 	c #B7CEEA",
+"y 	c #AEC8E8",
+"z 	c #D8E2F0",
+"A 	c #5486C4",
+"B 	c #82AADF",
+"C 	c #EFF3F9",
+"D 	c #BBD0EB",
+"E 	c #BACFEA",
+"F 	c #F2F6FB",
+"G 	c #5F8DC8",
+"H 	c #7EA8DD",
+"I 	c #BAD0EB",
+"J 	c #BDD1EB",
+"K 	c #B5CDEA",
+"L 	c #5C8AC6",
+"M 	c #7AA4D9",
+"N 	c #EEF3F9",
+"O 	c #BED2EB",
+"P 	c #BFD3EB",
+"Q 	c #ADC7EA",
+"R 	c #5F8CC6",
+"S 	c #75A1D7",
+"T 	c #EDF2F8",
+"U 	c #EAF0F7",
+"V 	c #E6EDF6",
+"W 	c #E2EAF4",
+"X 	c #DEE7F3",
+"Y 	c #DBE4F1",
+"Z 	c #5D8AC5",
+"` 	c #729ED6",
+" .	c #6E99D3",
+"..	c #6896D1",
+"+.	c #6392CE",
+"@.	c #5E8ECB",
+"#.	c #5B8AC9",
+"$.	c #5687C7",
+"%.	c #5284C3",
+"&.	c #4277BB",
+"                                ",
+"    . + @ # $ % & * = - ; > ,   ",
+"  ' ) ) ) ) ) ) ) ) ) ) ) ) !   ",
+"  ~ ) { ] ^ / ( _ : < [ } ) |   ",
+"  1 ) 2 2 2 2 2 2 2 2 2 2 ) 3   ",
+"  4 ) 5 5 5 5 5 5 5 5 5 5 ) 6   ",
+"  7 ) 5 2 8 2 2 2 9 2 2 2 0 a   ",
+"  b c d e f g h i 9 i j k l m   ",
+"  n o p 2 q 2 2 2 9 2 2 2 r s   ",
+"  t u v w w w w x 9 9 j y z A   ",
+"  B C x 2 D 2 2 2 E F 2 2 z G   ",
+"  H C I D D D D J K K K K z L   ",
+"  M N O 2 P 2 2 2 Q 2 2 2 z R   ",
+"  S T U V W X Y z z z z z z Z   ",
+"  `  ...+.@.#.$.%.%.%.%.%.%.&.  ",
+"                                "};
diff --git a/res/user.xpm b/res/user.xpm
new file mode 100644
index 000000000..60608ea61
--- /dev/null
+++ b/res/user.xpm
@@ -0,0 +1,159 @@
+/* XPM */
+static const char * user_xpm[] = {
+"16 16 140 2",
+"  	c None",
+". 	c #75A1E1",
+"+ 	c #8DB1EB",
+"@ 	c #87ADE9",
+"# 	c #5B8DD1",
+"$ 	c #8DB3EB",
+"% 	c #CCDDF6",
+"& 	c #D6E2F9",
+"* 	c #D3E1F8",
+"= 	c #C2D6F4",
+"- 	c #6795DB",
+"; 	c #73A1E1",
+"> 	c #DBE7F9",
+", 	c #CDDDF7",
+"' 	c #C9DBF6",
+") 	c #D0E0F7",
+"! 	c #B9D0F3",
+"~ 	c #3369B9",
+"{ 	c #89AFE9",
+"] 	c #D4E2F9",
+"^ 	c #C8DAF7",
+"/ 	c #C4D7F5",
+"( 	c #BFD4F4",
+"_ 	c #C5D8F4",
+": 	c #5189D5",
+"< 	c #81A9E9",
+"[ 	c #D1DFF8",
+"} 	c #C8D9F6",
+"| 	c #C3D7F5",
+"1 	c #BFD4F5",
+"2 	c #BBD1F4",
+"3 	c #C1D6F4",
+"4 	c #4981D1",
+"5 	c #5183CF",
+"6 	c #BFD5F3",
+"7 	c #CFDFF7",
+"8 	c #BCD2F4",
+"9 	c #B7CFF4",
+"0 	c #C5D8F5",
+"a 	c #AAC7F0",
+"b 	c #0947A5",
+"c 	c #5B8DD5",
+"d 	c #C1D6F5",
+"e 	c #B3CCF2",
+"f 	c #AEC9F1",
+"g 	c #B9D1F3",
+"h 	c #336DC1",
+"i 	c #00116D",
+"j 	c #6D9BDD",
+"k 	c #A3B8DE",
+"l 	c #A1BAE0",
+"m 	c #88ACE4",
+"n 	c #84A8E2",
+"o 	c #94AFD8",
+"p 	c #98ADD2",
+"q 	c #3F75C3",
+"r 	c #6B99DB",
+"s 	c #C4D8F4",
+"t 	c #D7E4F8",
+"u 	c #CCDEF7",
+"v 	c #CBDCF6",
+"w 	c #C6D8F5",
+"x 	c #BBD0F1",
+"y 	c #C1D5EF",
+"z 	c #ADC6E8",
+"A 	c #235DB7",
+"B 	c #3D75C7",
+"C 	c #B6CEF1",
+"D 	c #D5E2F7",
+"E 	c #C2D6F5",
+"F 	c #CCDDF7",
+"G 	c #CBDCF7",
+"H 	c #B5CCF0",
+"I 	c #9EBBE8",
+"J 	c #B4CBEB",
+"K 	c #88A9DB",
+"L 	c #00298F",
+"M 	c #618FD9",
+"N 	c #C5D9F3",
+"O 	c #BFD2F2",
+"P 	c #C2D5F4",
+"Q 	c #CADCF6",
+"R 	c #C9DAF6",
+"S 	c #C0D5F4",
+"T 	c #B3CBEF",
+"U 	c #9DBAE9",
+"V 	c #8FADE1",
+"W 	c #A2BCE3",
+"X 	c #053FA7",
+"Y 	c #6D9BE1",
+"Z 	c #CBDAF5",
+"` 	c #A3BBE9",
+" .	c #C0D4F4",
+"..	c #C7D9F6",
+"+.	c #BBD1F3",
+"@.	c #AFC7EF",
+"#.	c #9BB8E9",
+"$.	c #81A0DD",
+"%.	c #A8BFE6",
+"&.	c #0B47B1",
+"*.	c #6795DD",
+"=.	c #C6D9F5",
+"-.	c #A5BDEA",
+";.	c #BDD2F3",
+">.	c #BFD3F4",
+",.	c #B4CCF1",
+"'.	c #AAC5ED",
+").	c #99B8EA",
+"!.	c #7FA0DE",
+"~.	c #A6C0E8",
+"{.	c #0945B1",
+"].	c #4579CF",
+"^.	c #A3BFEB",
+"/.	c #B1C6EB",
+"(.	c #C0D5F3",
+"_.	c #B9D0F2",
+":.	c #ADC7EF",
+"<.	c #A6C2ED",
+"[.	c #9EBBEA",
+"}.	c #9DB5E3",
+"|.	c #759FDD",
+"1.	c #0033A1",
+"2.	c #0B57C9",
+"3.	c #6991D9",
+"4.	c #BCD0F2",
+"5.	c #C5D7F4",
+"6.	c #C2D6F2",
+"7.	c #B8CEF0",
+"8.	c #ACC6ED",
+"9.	c #9CBAE9",
+"0.	c #4874CC",
+"a.	c #054BC1",
+"b.	c #1B57BB",
+"c.	c #336DCB",
+"d.	c #477BD1",
+"e.	c #3F77D1",
+"f.	c #2565C7",
+"g.	c #0B51C1",
+"h.	c #0035B3",
+"i.	c #0029A9",
+"            . + @ #             ",
+"          $ % & * = -           ",
+"        ; % > , ' ) ! ~         ",
+"        { ] , ^ / ( _ :         ",
+"        < [ } | 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 `  ...0 +.@.#.$.%.&.    ",
+"    *.=.-.;.| >.,.'.).!.~.{.    ",
+"    ].^./.;.(._.:.<.[.}.|.1.    ",
+"      2.3.4.5.6.7.8.9.0.a.      ",
+"        b.c.d.e.f.g.h.i.        "};
diff --git a/res/users.xpm b/res/users.xpm
new file mode 100644
index 000000000..64bb354da
--- /dev/null
+++ b/res/users.xpm
@@ -0,0 +1,159 @@
+/* XPM */
+static const char * users_xpm[] = {
+"16 16 140 2",
+"  	c None",
+". 	c #75A1E1",
+"+ 	c #8DB1EB",
+"@ 	c #87ADE9",
+"# 	c #5B8DD1",
+"$ 	c #8DB3EB",
+"% 	c #CCDDF6",
+"& 	c #D6E2F9",
+"* 	c #D3E1F8",
+"= 	c #C2D6F4",
+"- 	c #6795DB",
+"; 	c #73A1E1",
+"> 	c #DBE7F9",
+", 	c #CDDDF7",
+"' 	c #C9DBF6",
+") 	c #D0E0F7",
+"! 	c #B9D0F3",
+"~ 	c #3369B9",
+"{ 	c #89AFE9",
+"] 	c #D4E2F9",
+"^ 	c #C8DAF7",
+"/ 	c #C4D7F5",
+"( 	c #BFD4F4",
+"_ 	c #C5D8F4",
+": 	c #5189D5",
+"< 	c #81A9E9",
+"[ 	c #D1DFF8",
+"} 	c #C8D9F6",
+"| 	c #C3D7F5",
+"1 	c #BFD4F5",
+"2 	c #BBD1F4",
+"3 	c #C1D6F4",
+"4 	c #4981D1",
+"5 	c #5183CF",
+"6 	c #BFD5F3",
+"7 	c #CFDFF7",
+"8 	c #BCD2F4",
+"9 	c #B7CFF4",
+"0 	c #C5D8F5",
+"a 	c #AAC7F0",
+"b 	c #0947A5",
+"c 	c #5B8DD5",
+"d 	c #C1D6F5",
+"e 	c #B3CCF2",
+"f 	c #AEC9F1",
+"g 	c #B9D1F3",
+"h 	c #336DC1",
+"i 	c #00116D",
+"j 	c #6D9BDD",
+"k 	c #A3B8DE",
+"l 	c #A1BAE0",
+"m 	c #88ACE4",
+"n 	c #84A8E2",
+"o 	c #94AFD8",
+"p 	c #98ADD2",
+"q 	c #3F75C3",
+"r 	c #6B99DB",
+"s 	c #C4D8F4",
+"t 	c #D7E4F8",
+"u 	c #CCDEF7",
+"v 	c #CBDCF6",
+"w 	c #C6D8F5",
+"x 	c #BBD0F1",
+"y 	c #C1D5EF",
+"z 	c #ADC6E8",
+"A 	c #235DB7",
+"B 	c #3D75C7",
+"C 	c #B6CEF1",
+"D 	c #D5E2F7",
+"E 	c #C2D6F5",
+"F 	c #CCDDF7",
+"G 	c #CBDCF7",
+"H 	c #B5CCF0",
+"I 	c #9EBBE8",
+"J 	c #B4CBEB",
+"K 	c #88A9DB",
+"L 	c #00298F",
+"M 	c #618FD9",
+"N 	c #C5D9F3",
+"O 	c #BFD2F2",
+"P 	c #C2D5F4",
+"Q 	c #CADCF6",
+"R 	c #C9DAF6",
+"S 	c #C0D5F4",
+"T 	c #B3CBEF",
+"U 	c #9DBAE9",
+"V 	c #8FADE1",
+"W 	c #A2BCE3",
+"X 	c #053FA7",
+"Y 	c #6D9BE1",
+"Z 	c #CBDAF5",
+"` 	c #A3BBE9",
+" .	c #C0D4F4",
+"..	c #C7D9F6",
+"+.	c #BBD1F3",
+"@.	c #AFC7EF",
+"#.	c #9BB8E9",
+"$.	c #81A0DD",
+"%.	c #A8BFE6",
+"&.	c #0B47B1",
+"*.	c #6795DD",
+"=.	c #C6D9F5",
+"-.	c #A5BDEA",
+";.	c #BDD2F3",
+">.	c #BFD3F4",
+",.	c #B4CCF1",
+"'.	c #AAC5ED",
+").	c #99B8EA",
+"!.	c #7FA0DE",
+"~.	c #A6C0E8",
+"{.	c #0945B1",
+"].	c #4579CF",
+"^.	c #A3BFEB",
+"/.	c #B1C6EB",
+"(.	c #C0D5F3",
+"_.	c #B9D0F2",
+":.	c #ADC7EF",
+"<.	c #A6C2ED",
+"[.	c #9EBBEA",
+"}.	c #9DB5E3",
+"|.	c #759FDD",
+"1.	c #0033A1",
+"2.	c #0B57C9",
+"3.	c #6991D9",
+"4.	c #BCD0F2",
+"5.	c #C5D7F4",
+"6.	c #C2D6F2",
+"7.	c #B8CEF0",
+"8.	c #ACC6ED",
+"9.	c #9CBAE9",
+"0.	c #4874CC",
+"a.	c #054BC1",
+"b.	c #1B57BB",
+"c.	c #336DCB",
+"d.	c #477BD1",
+"e.	c #3F77D1",
+"f.	c #2565C7",
+"g.	c #0B51C1",
+"h.	c #0035B3",
+"i.	c #0029A9",
+"            . + @ #             ",
+"          $ % & * = -           ",
+"        ; % > , ' ) ! ~         ",
+"        { ] , ^ / ( _ :         ",
+"        < [ } | 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 `  ...0 +.@.#.$.%.&.    ",
+"    *.=.-.;.| >.,.'.).!.~.{.    ",
+"    ].^./.;.(._.:.<.[.}.|.1.    ",
+"      2.3.4.5.6.7.8.9.0.a.      ",
+"        b.c.d.e.f.g.h.i.        "};
diff --git a/res/view.xpm b/res/view.xpm
index 5032bb190..f3fc820df 100644
--- a/res/view.xpm
+++ b/res/view.xpm
@@ -1,84 +1,171 @@
 /* XPM */
 static const char * view_xpm[] = {
-"16 16 65 1",
-" 	c None",
-".	c #000686",
-"+	c #FEFEFE",
-"@	c #FDFDFD",
-"#	c #E0E0E0",
-"$	c #889CC1",
-"%	c #F1F1F1",
-"&	c #C3C3C3",
-"*	c #ECECEC",
-"=	c #ADADAD",
-"-	c #CECECE",
-";	c #B5B5B5",
-">	c #BABABA",
-",	c #B9B9B9",
-"'	c #E2E2E2",
-")	c #A3A3A3",
-"!	c #C2C2C2",
-"~	c #EEEEEE",
-"{	c #BBBBBB",
-"]	c #B6B6B6",
-"^	c #264057",
-"/	c #233B51",
-"(	c #253F56",
-"_	c #374E63",
-":	c #606B76",
-"<	c #C1C1C1",
-"[	c #CACACA",
-"}	c #334F68",
-"|	c #E7E7E7",
-"1	c #FFFFFF",
-"2	c #000000",
-"3	c #314E6C",
-"4	c #597187",
-"5	c #BEBEBE",
-"6	c #DFDFDF",
-"7	c #F5F5F5",
-"8	c #3B5673",
-"9	c #506881",
-"0	c #E1E1E1",
-"a	c #A0A0A0",
-"b	c #F0F0F0",
-"c	c #8091A3",
-"d	c #4D657D",
-"e	c #708296",
-"f	c #DCDCDC",
-"g	c #DDDDDD",
-"h	c #757575",
-"i	c #EBEBEB",
-"j	c #7D8EA0",
-"k	c #3A5572",
-"l	c #62748A",
-"m	c #C1C4C9",
-"n	c #CDCED1",
-"o	c #575757",
-"p	c #E3E3E3",
-"q	c #C7C7C7",
-"r	c #EAEAEA",
-"s	c #E5E5E5",
-"t	c #F6F6F6",
-"u	c #F4F4F4",
-"v	c #F2F2F2",
-"w	c #E4E4E4",
-"x	c #E6E6E6",
-"y	c #BDBDBD",
-"z	c #BCBCBC",
-"   .........    ",
-"  .++++++@#$.   ",
-"  .+%%%%%%&$*.  ",
-"  .+%%%%%%=.... ",
-"  .-;>>>>,'*$$. ",
-"  .)......!~~{. ",
-"  ..]^/(_:.<*{. ",
-"  .[}|1234].5{. ",
-" .678112390a.{. ",
-"  .bc333def.g{. ",
-"  h.ijkklm.ni{. ",
-"  op......qrs{. ",
-"  .@tuu7uv|ww{. ",
-"  .@xssswwppp{. ",
-"  .!yyyzz{{{{a. ",
-"   ...........  "};
+"16 16 152 2",
+"  	c None",
+". 	c #A2C1EF",
+"+ 	c #9FC0ED",
+"@ 	c #9DBEEB",
+"# 	c #9ABCEB",
+"$ 	c #96BAE9",
+"% 	c #93B7E7",
+"& 	c #90B5E6",
+"* 	c #8CB2E4",
+"= 	c #88AFE2",
+"- 	c #84ACE0",
+"; 	c #80A9DD",
+"> 	c #7DA5DC",
+", 	c #7AA3DA",
+"' 	c #A1C1EE",
+") 	c #F4F7FB",
+"! 	c #74A0D7",
+"~ 	c #9EBFEC",
+"{ 	c #A5D59C",
+"] 	c #A1D398",
+"^ 	c #9DD094",
+"/ 	c #98CE90",
+"( 	c #93CB8B",
+"_ 	c #8EC987",
+": 	c #89C682",
+"< 	c #84C37E",
+"[ 	c #80C17A",
+"} 	c #7CBE76",
+"| 	c #6F9BD4",
+"1 	c #9BBDEB",
+"2 	c #FFFFFF",
+"3 	c #6A97D1",
+"4 	c #98BAE9",
+"5 	c #A6C3E9",
+"6 	c #6493CE",
+"7 	c #94B7E7",
+"8 	c #A9C4E8",
+"9 	c #ACC7E8",
+"0 	c #EBF1F7",
+"a 	c #5F8FCB",
+"b 	c #8FB4E5",
+"c 	c #F2F6FA",
+"d 	c #AAC6E9",
+"e 	c #ACC6E9",
+"f 	c #ACC7EA",
+"g 	c #ADC7E9",
+"h 	c #AEC9E9",
+"i 	c #ABC3E1",
+"j 	c #646E77",
+"k 	c #666D75",
+"l 	c #D1D5D9",
+"m 	c #5F676F",
+"n 	c #62666B",
+"o 	c #598AC8",
+"p 	c #8CB1E3",
+"q 	c #F1F6FA",
+"r 	c #AEC9EA",
+"s 	c #B0C9EA",
+"t 	c #F5F6F6",
+"u 	c #B7BEC5",
+"v 	c #838F9C",
+"w 	c #484C52",
+"x 	c #C4C6C9",
+"y 	c #474D54",
+"z 	c #7B8690",
+"A 	c #939698",
+"B 	c #87AEE1",
+"C 	c #F0F4FA",
+"D 	c #B2CBEA",
+"E 	c #B3CCEA",
+"F 	c #ACC4E0",
+"G 	c #5A636C",
+"H 	c #6F7885",
+"I 	c #3B414A",
+"J 	c #7D8895",
+"K 	c #404A56",
+"L 	c #748392",
+"M 	c #40474F",
+"N 	c #82AADF",
+"O 	c #EFF3F9",
+"P 	c #B7CEEA",
+"Q 	c #BBD0EB",
+"R 	c #95979A",
+"S 	c #4D545B",
+"T 	c #90A0B0",
+"U 	c #515D69",
+"V 	c #657486",
+"W 	c #4E5863",
+"X 	c #8898AA",
+"Y 	c #4A515A",
+"Z 	c #828384",
+"` 	c #7EA8DD",
+" .	c #BAD0EB",
+"..	c #5C656E",
+"+.	c #586169",
+"@.	c #484F56",
+"#.	c #484A4D",
+"$.	c #8A8A8B",
+"%.	c #393C40",
+"&.	c #3C4246",
+"*.	c #33383D",
+"=.	c #2A2B2C",
+"-.	c #7AA4D9",
+";.	c #EEF3F9",
+">.	c #BED2EB",
+",.	c #BFD3EB",
+"'.	c #677078",
+").	c #AFB9C4",
+"!.	c #8D9AA7",
+"~.	c #787C80",
+"{.	c #D3D4D4",
+"].	c #5E646C",
+"^.	c #A4AFBB",
+"/.	c #8B98A6",
+"(.	c #4F5153",
+"_.	c #75A1D7",
+":.	c #EDF2F8",
+"<.	c #EAF0F7",
+"[.	c #E6EDF6",
+"}.	c #E2EAF4",
+"|.	c #DEE7F3",
+"1.	c #5F6871",
+"2.	c #ABB6C1",
+"3.	c #667079",
+"4.	c #595D62",
+"5.	c #B7B8B8",
+"6.	c #5D666E",
+"7.	c #A5B1BD",
+"8.	c #6A747E",
+"9.	c #2E3033",
+"0.	c #729ED6",
+"a.	c #6E99D3",
+"b.	c #6896D1",
+"c.	c #6392CE",
+"d.	c #5E8ECB",
+"e.	c #5B8AC9",
+"f.	c #545B63",
+"g.	c #5E6770",
+"h.	c #3B4045",
+"i.	c #ABABAC",
+"j.	c #4E555C",
+"k.	c #7F8A96",
+"l.	c #565E66",
+"m.	c #18191B",
+"n.	c #383D42",
+"o.	c #3C4248",
+"p.	c #2C3135",
+"q.	c #555759",
+"r.	c #393B3D",
+"s.	c #3D3F42",
+"t.	c #343637",
+"u.	c #3B3C3C",
+"                                ",
+"    . + @ # $ % & * = - ; > ,   ",
+"  ' ) ) ) ) ) ) ) ) ) ) ) ) !   ",
+"  ~ ) { ] ^ / ( _ : < [ } ) |   ",
+"  1 ) 2 2 2 2 2 2 2 2 2 2 ) 3   ",
+"  4 ) 5 5 5 5 5 5 5 5 5 5 ) 6   ",
+"  7 ) 5 2 8 2 2 2 9 2 2 2 0 a   ",
+"  b c d e f g h i j k l m n o   ",
+"  p q r 2 s 2 t u v w x y z A   ",
+"  B C D E E E F G H I J K L M   ",
+"  N O P 2 Q 2 R S T U V W X Y Z ",
+"  ` O  .Q Q Q ..+.@.#.$.%.&.*.=.",
+"  -.;.>.2 ,.2 '.).!.~.{.].^./.(.",
+"  _.:.<.[.}.|.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."};
diff --git a/res/views.xpm b/res/views.xpm
new file mode 100644
index 000000000..367c73c4c
--- /dev/null
+++ b/res/views.xpm
@@ -0,0 +1,171 @@
+/* XPM */
+static const char * views_xpm[] = {
+"16 16 152 2",
+"  	c None",
+". 	c #A2C1EF",
+"+ 	c #9FC0ED",
+"@ 	c #9DBEEB",
+"# 	c #9ABCEB",
+"$ 	c #96BAE9",
+"% 	c #93B7E7",
+"& 	c #90B5E6",
+"* 	c #8CB2E4",
+"= 	c #88AFE2",
+"- 	c #84ACE0",
+"; 	c #80A9DD",
+"> 	c #7DA5DC",
+", 	c #7AA3DA",
+"' 	c #A1C1EE",
+") 	c #F4F7FB",
+"! 	c #74A0D7",
+"~ 	c #9EBFEC",
+"{ 	c #A5D59C",
+"] 	c #A1D398",
+"^ 	c #9DD094",
+"/ 	c #98CE90",
+"( 	c #93CB8B",
+"_ 	c #8EC987",
+": 	c #89C682",
+"< 	c #84C37E",
+"[ 	c #80C17A",
+"} 	c #7CBE76",
+"| 	c #6F9BD4",
+"1 	c #9BBDEB",
+"2 	c #FFFFFF",
+"3 	c #6A97D1",
+"4 	c #98BAE9",
+"5 	c #A6C3E9",
+"6 	c #6493CE",
+"7 	c #94B7E7",
+"8 	c #A9C4E8",
+"9 	c #ACC7E8",
+"0 	c #EBF1F7",
+"a 	c #5F8FCB",
+"b 	c #8FB4E5",
+"c 	c #F2F6FA",
+"d 	c #AAC6E9",
+"e 	c #ACC6E9",
+"f 	c #ACC7EA",
+"g 	c #ADC7E9",
+"h 	c #AEC9E9",
+"i 	c #ABC3E1",
+"j 	c #646E77",
+"k 	c #666D75",
+"l 	c #D1D5D9",
+"m 	c #5F676F",
+"n 	c #62666B",
+"o 	c #598AC8",
+"p 	c #8CB1E3",
+"q 	c #F1F6FA",
+"r 	c #AEC9EA",
+"s 	c #B0C9EA",
+"t 	c #F5F6F6",
+"u 	c #B7BEC5",
+"v 	c #838F9C",
+"w 	c #484C52",
+"x 	c #C4C6C9",
+"y 	c #474D54",
+"z 	c #7B8690",
+"A 	c #939698",
+"B 	c #87AEE1",
+"C 	c #F0F4FA",
+"D 	c #B2CBEA",
+"E 	c #B3CCEA",
+"F 	c #ACC4E0",
+"G 	c #5A636C",
+"H 	c #6F7885",
+"I 	c #3B414A",
+"J 	c #7D8895",
+"K 	c #404A56",
+"L 	c #748392",
+"M 	c #40474F",
+"N 	c #82AADF",
+"O 	c #EFF3F9",
+"P 	c #B7CEEA",
+"Q 	c #BBD0EB",
+"R 	c #95979A",
+"S 	c #4D545B",
+"T 	c #90A0B0",
+"U 	c #515D69",
+"V 	c #657486",
+"W 	c #4E5863",
+"X 	c #8898AA",
+"Y 	c #4A515A",
+"Z 	c #828384",
+"` 	c #7EA8DD",
+" .	c #BAD0EB",
+"..	c #5C656E",
+"+.	c #586169",
+"@.	c #484F56",
+"#.	c #484A4D",
+"$.	c #8A8A8B",
+"%.	c #393C40",
+"&.	c #3C4246",
+"*.	c #33383D",
+"=.	c #2A2B2C",
+"-.	c #7AA4D9",
+";.	c #EEF3F9",
+">.	c #BED2EB",
+",.	c #BFD3EB",
+"'.	c #677078",
+").	c #AFB9C4",
+"!.	c #8D9AA7",
+"~.	c #787C80",
+"{.	c #D3D4D4",
+"].	c #5E646C",
+"^.	c #A4AFBB",
+"/.	c #8B98A6",
+"(.	c #4F5153",
+"_.	c #75A1D7",
+":.	c #EDF2F8",
+"<.	c #EAF0F7",
+"[.	c #E6EDF6",
+"}.	c #E2EAF4",
+"|.	c #DEE7F3",
+"1.	c #5F6871",
+"2.	c #ABB6C1",
+"3.	c #667079",
+"4.	c #595D62",
+"5.	c #B7B8B8",
+"6.	c #5D666E",
+"7.	c #A5B1BD",
+"8.	c #6A747E",
+"9.	c #2E3033",
+"0.	c #729ED6",
+"a.	c #6E99D3",
+"b.	c #6896D1",
+"c.	c #6392CE",
+"d.	c #5E8ECB",
+"e.	c #5B8AC9",
+"f.	c #545B63",
+"g.	c #5E6770",
+"h.	c #3B4045",
+"i.	c #ABABAC",
+"j.	c #4E555C",
+"k.	c #7F8A96",
+"l.	c #565E66",
+"m.	c #18191B",
+"n.	c #383D42",
+"o.	c #3C4248",
+"p.	c #2C3135",
+"q.	c #555759",
+"r.	c #393B3D",
+"s.	c #3D3F42",
+"t.	c #343637",
+"u.	c #3B3C3C",
+"                                ",
+"    . + @ # $ % & * = - ; > ,   ",
+"  ' ) ) ) ) ) ) ) ) ) ) ) ) !   ",
+"  ~ ) { ] ^ / ( _ : < [ } ) |   ",
+"  1 ) 2 2 2 2 2 2 2 2 2 2 ) 3   ",
+"  4 ) 5 5 5 5 5 5 5 5 5 5 ) 6   ",
+"  7 ) 5 2 8 2 2 2 9 2 2 2 0 a   ",
+"  b c d e f g h i j k l m n o   ",
+"  p q r 2 s 2 t u v w x y z A   ",
+"  B C D E E E F G H I J K L M   ",
+"  N O P 2 Q 2 R S T U V W X Y Z ",
+"  ` O  .Q Q Q ..+.@.#.$.%.&.*.=.",
+"  -.;.>.2 ,.2 '.).!.~.{.].^./.(.",
+"  _.:.<.[.}.|.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."};
diff --git a/src/core/ArtProvider.cpp b/src/core/ArtProvider.cpp
index 5dccf91fe..90bb6453b 100644
--- a/src/core/ArtProvider.cpp
+++ b/src/core/ArtProvider.cpp
@@ -72,14 +72,23 @@
 // these have size 16x16
 #include "column.xpm"
 #include "database.xpm"
+#include "dbtrigger.xpm"
+#include "dbtriggers.xpm"
+#include "ddltrigger.xpm"
+#include "ddltriggers.xpm"
 #include "delete16.xpm"
+#include "dmltrigger.xpm"
+#include "dmltriggers.xpm"
 #include "domain.xpm"
 #include "exception16_png.cpp"
 #include "execute16.xpm"
 #include "fk16_png.cpp"
 #include "function.xpm"
+#include "functions.xpm"
 #include "generator.xpm"
 #include "generators.xpm"
+#include "globaltemporary.xpm"
+#include "globaltemporaries.xpm"
 #include "history.xpm"
 #include "index.xpm"
 #include "indices.xpm"
@@ -107,6 +116,10 @@
 #include "tables.xpm"
 #include "toggle16.xpm"
 #include "trigger.xpm"
+#include "UDF.xpm"
+#include "UDFs.xpm"
+#include "user.xpm"
+#include "users.xpm"
 #include "view.xpm"
 
 wxBitmap bitmapFromEmbeddedPNG(const unsigned char* data, size_t len)
@@ -201,6 +214,18 @@ wxBitmap ArtProvider::CreateBitmap(const wxArtID& id,
             return wxBitmap(database_xpm);
         if (id == ART_DatabaseDisconnected)
             return wxBitmap(database_xpm);
+        if (id == ART_DBTrigger)
+            return wxBitmap(DBTrigger_xpm);
+        if (id == ART_DBTriggers)
+            return wxBitmap(DBTriggers_xpm);
+        if (id == ART_DMLTrigger)
+            return wxBitmap(DMLTrigger_xpm);
+        if (id == ART_DMLTriggers)
+            return wxBitmap(DMLTriggers_xpm);
+        if (id == ART_DDLTrigger)
+            return wxBitmap(DDLTrigger_xpm);
+        if (id == ART_DDLTriggers)
+            return wxBitmap(DDLTriggers_xpm);
         if (id == ART_Domain)
             return wxBitmap(domain_xpm);
         if (id == ART_Domains)
@@ -216,11 +241,15 @@ wxBitmap ArtProvider::CreateBitmap(const wxArtID& id,
         if (id == ART_Function)
             return wxBitmap(function_xpm);
         if (id == ART_Functions)
-            return wxBitmap(function_xpm);
+            return wxBitmap(functions_xpm);
         if (id == ART_Generator)
             return wxBitmap(generator_xpm);
         if (id == ART_Generators)
             return wxBitmap(generators_xpm);
+        if (id == ART_GlobalTemporary)
+            return wxBitmap(globaltemporary_xpm);
+        if (id == ART_GlobalTemporaries)
+            return wxBitmap(globaltemporaries_xpm);
         if (id == ART_History)
             return wxBitmap(history_xpm);
         if (id == ART_Object)
@@ -277,6 +306,14 @@ wxBitmap ArtProvider::CreateBitmap(const wxArtID& id,
             return wxBitmap(trigger_xpm);
         if (id == ART_Triggers)
             return wxBitmap(trigger_xpm);
+        if (id == ART_UDF)
+            return wxBitmap(UDF_xpm);
+        if (id == ART_UDFs)
+            return wxBitmap(UDFs_xpm);
+        if (id == ART_User)
+            return wxBitmap(user_xpm);
+        if (id == ART_Users)
+            return wxBitmap(users_xpm);
         if (id == ART_View)
             return wxBitmap(view_xpm);
         if (id == ART_Views)
@@ -285,7 +322,6 @@ wxBitmap ArtProvider::CreateBitmap(const wxArtID& id,
             return wxBitmap(index_xpm);
         if (id == ART_Indices)
             return wxBitmap(indices_xpm);
-
         if (id == ART_DeleteRow)
             return wxBitmap(delete16_xpm);
         if (id == ART_InsertRow)
diff --git a/src/core/ArtProvider.h b/src/core/ArtProvider.h
index 8964acbd6..ebc8cd6bf 100644
--- a/src/core/ArtProvider.h
+++ b/src/core/ArtProvider.h
@@ -34,6 +34,12 @@
 #define ART_Computed                wxART_MAKE_ART_ID(ART_Computed)
 #define ART_DatabaseConnected       wxART_MAKE_ART_ID(ART_DatabaseConnected)
 #define ART_DatabaseDisconnected    wxART_MAKE_ART_ID(ART_DatabaseDisconnected)
+#define ART_DBTrigger               wxART_MAKE_ART_ID(ART_DBTrigger)
+#define ART_DBTriggers              wxART_MAKE_ART_ID(ART_DBTriggers)
+#define ART_DMLTrigger              wxART_MAKE_ART_ID(ART_DMLTrigger)
+#define ART_DMLTriggers             wxART_MAKE_ART_ID(ART_DMLTriggers)
+#define ART_DDLTrigger              wxART_MAKE_ART_ID(ART_DDLTrigger)
+#define ART_DDLTriggers             wxART_MAKE_ART_ID(ART_DDLTriggers)
 #define ART_Domain                  wxART_MAKE_ART_ID(ART_Domain)
 #define ART_Domains                 wxART_MAKE_ART_ID(ART_Domains)
 #define ART_Exception               wxART_MAKE_ART_ID(ART_Exception)
@@ -43,6 +49,8 @@
 #define ART_Functions               wxART_MAKE_ART_ID(ART_Functions)
 #define ART_Generator               wxART_MAKE_ART_ID(ART_Generator)
 #define ART_Generators              wxART_MAKE_ART_ID(ART_Generators)
+#define ART_GlobalTemporary         wxART_MAKE_ART_ID(ART_GlobalTemporary)
+#define ART_GlobalTemporaries       wxART_MAKE_ART_ID(ART_GlobalTemporaries)
 #define ART_Index                   wxART_MAKE_ART_ID(ART_Index)
 #define ART_Indices                 wxART_MAKE_ART_ID(ART_Indices)
 #define ART_Object                  wxART_MAKE_ART_ID(ART_Object)
@@ -70,6 +78,10 @@
 #define ART_Tables                  wxART_MAKE_ART_ID(ART_Tables)
 #define ART_Trigger                 wxART_MAKE_ART_ID(ART_Trigger)
 #define ART_Triggers                wxART_MAKE_ART_ID(ART_Triggers)
+#define ART_UDF                     wxART_MAKE_ART_ID(ART_UDF)
+#define ART_UDFs                    wxART_MAKE_ART_ID(ART_UDFs)
+#define ART_User                    wxART_MAKE_ART_ID(ART_User)
+#define ART_Users                   wxART_MAKE_ART_ID(ART_Users)
 #define ART_View                    wxART_MAKE_ART_ID(ART_View)
 #define ART_Views                   wxART_MAKE_ART_ID(ART_Views)
 
diff --git a/src/gui/CommandIds.h b/src/gui/CommandIds.h
index 7dea831bc..d8a0d8f10 100644
--- a/src/gui/CommandIds.h
+++ b/src/gui/CommandIds.h
@@ -117,6 +117,10 @@ namespace Cmds
         Menu_GenerateData, 
         Menu_CloneDatabase,
         Menu_ExecuteFunction,
+        Menu_ShowStatisticsValue,
+        Menu_SetStatisticsValue,
+        Menu_ShowAllStatisticsValue,
+        Menu_RebuildObject,
 
         // view menu
         Menu_ToggleStatusBar, 
@@ -124,19 +128,21 @@ namespace Cmds
         Menu_ToggleDisconnected,
 
         // create new ... (stuff)
-        Menu_CreateDomain, 
+        Menu_CreateDBTrigger,
+        Menu_CreateDDLTrigger,
+        Menu_CreateDMLTrigger,
+        Menu_CreateDomain,
         Menu_CreateException, 
         Menu_CreateFunction,
+        Menu_CreateGTTTable,
         Menu_CreateGenerator, 
+        Menu_CreateIndex,
         Menu_CreatePackage,
         Menu_CreateProcedure,
         Menu_CreateRole,
-        Menu_CreateTable, 
-        Menu_CreateGTTTable,
-        Menu_CreateTrigger,
-        Menu_CreateDBTrigger,
-        Menu_CreateDDLTrigger,
+        Menu_CreateTable,         
         Menu_CreateUDF,
+        Menu_CreateUser,
         Menu_CreateView,
 
         // blob editor
diff --git a/src/gui/ContextMenuMetadataItemVisitor.cpp b/src/gui/ContextMenuMetadataItemVisitor.cpp
index e673811ef..1aa452d27 100644
--- a/src/gui/ContextMenuMetadataItemVisitor.cpp
+++ b/src/gui/ContextMenuMetadataItemVisitor.cpp
@@ -156,13 +156,13 @@ void MainObjectMenuMetadataItemVisitor::visitFunctionSQL(FunctionSQL& function)
     addSeparator();
     addGenerateCodeMenu(function);
     addSeparator();
-    // TODO: addRefreshItem();
+    addRefreshItem();
     addPropertiesItem();
 }
 
 void MainObjectMenuMetadataItemVisitor::visitFunctionSQLs(FunctionSQLs& functions)
 {
-    addDeclareItem();
+    addCreateItem();
     addSeparator();
     addGenerateCodeMenu(functions);
     addSeparator();
@@ -188,6 +188,26 @@ void MainObjectMenuMetadataItemVisitor::visitUDFs(UDFs& functions)
     addRefreshItem();
 }
 
+void MainObjectMenuMetadataItemVisitor::visitUser(User& user)
+{
+    addAlterItem(user);
+    addDropItem(user);
+    addSeparator();
+    addGenerateCodeMenu(user);
+    addSeparator();
+    addRefreshItem();
+    addPropertiesItem();
+}
+
+void MainObjectMenuMetadataItemVisitor::visitUsers(Users& users)
+{
+    addCreateItem();
+    addSeparator();
+    //addGenerateCodeMenu(users);
+    addSeparator();
+    addRefreshItem();
+}
+
 void MainObjectMenuMetadataItemVisitor::visitGenerator(Generator& generator)
 {
     menuM->Append(Cmds::Menu_ShowGeneratorValue, _("Show &value"));
@@ -247,7 +267,7 @@ void MainObjectMenuMetadataItemVisitor::visitProcedure(Procedure& procedure)
     addSeparator();
     addGenerateCodeMenu(procedure);
     addSeparator();
-    // TODO: addRefreshItem();
+    addRefreshItem();
     addPropertiesItem();
 }
 
@@ -266,7 +286,7 @@ void MainObjectMenuMetadataItemVisitor::visitRole(Role& role)
     addSeparator();
     addGenerateCodeMenu(role);
     addSeparator();
-    // TODO: addRefreshItem();
+    addRefreshItem();
     addPropertiesItem();
 }
 
@@ -325,7 +345,7 @@ void MainObjectMenuMetadataItemVisitor::visitTable(Table& table)
         menuM->Append(Cmds::Menu_AddColumn, _("&Add column"));
     addDropItem(table);
     addSeparator();
-    // TODO: addRefreshItem();
+    addRefreshItem();
     addPropertiesItem();
 }
 
@@ -346,8 +366,10 @@ void MainObjectMenuMetadataItemVisitor::visitSysTables(SysTables& sysTables)
     addRefreshItem();
 }
 
-void MainObjectMenuMetadataItemVisitor::visitGTTTables(GTTs& gtts)
+void MainObjectMenuMetadataItemVisitor::visitGTTs(GTTs& gtts)
 {
+    addCreateItem();
+    addSeparator();
     addGenerateCodeMenu(gtts);
     addSeparator();
     addRefreshItem();
@@ -355,8 +377,6 @@ void MainObjectMenuMetadataItemVisitor::visitGTTTables(GTTs& gtts)
 
 void MainObjectMenuMetadataItemVisitor::visitDMLTrigger(DMLTrigger& trigger)
 {
-    addGenerateCodeMenu(trigger);
-    addSeparator();
     addAlterItem(trigger);
     addDropItem(trigger);
     addSeparator();
@@ -367,8 +387,6 @@ void MainObjectMenuMetadataItemVisitor::visitDMLTrigger(DMLTrigger& trigger)
 }
 void MainObjectMenuMetadataItemVisitor::visitDBTrigger(DBTrigger& trigger)
 {
-    addGenerateCodeMenu(trigger);
-    addSeparator();
     addAlterItem(trigger);
     addDropItem(trigger);
     addSeparator();
@@ -379,8 +397,6 @@ void MainObjectMenuMetadataItemVisitor::visitDBTrigger(DBTrigger& trigger)
 }
 void MainObjectMenuMetadataItemVisitor::visitDDLTrigger(DDLTrigger& trigger)
 {
-    addGenerateCodeMenu(trigger);
-    addSeparator();
     addAlterItem(trigger);
     addDropItem(trigger);
     addSeparator();
@@ -423,9 +439,10 @@ void MainObjectMenuMetadataItemVisitor::visitView(View& view)
     addGenerateCodeMenu(view);
     addSeparator();
     addAlterItem(view);
+    menuM->Append(Cmds::Menu_RebuildObject, _("&Rebuild"));
     addDropItem(view);
     addSeparator();
-    // TODO: addRefreshItem();
+    addRefreshItem();
     addPropertiesItem();
 }
 
@@ -438,6 +455,31 @@ void MainObjectMenuMetadataItemVisitor::visitViews(Views& views)
     addRefreshItem();
 }
 
+void MainObjectMenuMetadataItemVisitor::visitIndex(Index& index)
+{
+    menuM->Append(Cmds::Menu_ShowStatisticsValue, _("Show &statistics"));
+    menuM->Append(Cmds::Menu_SetStatisticsValue, _("&Recompute statistics"));
+    addSeparator();
+    addAlterItem(index);
+    addDropItem(index);
+    addSeparator();
+    addGenerateCodeMenu(index);
+    addSeparator();
+    addRefreshItem();
+    addPropertiesItem();
+}
+
+void MainObjectMenuMetadataItemVisitor::visitIndices(Indices& indices)
+{
+    menuM->Append(Cmds::Menu_ShowAllStatisticsValue, _("Show &all statistics"));
+    addSeparator();
+    addCreateItem();
+    addSeparator();
+    addGenerateCodeMenu(indices);
+    addSeparator();
+    addRefreshItem();
+}
+
 void MainObjectMenuMetadataItemVisitor::addAlterItem(MetadataItem& metadataItem)
 {
     if (!metadataItem.isSystem())
diff --git a/src/gui/ContextMenuMetadataItemVisitor.h b/src/gui/ContextMenuMetadataItemVisitor.h
index 80ceaa534..55bbdb433 100644
--- a/src/gui/ContextMenuMetadataItemVisitor.h
+++ b/src/gui/ContextMenuMetadataItemVisitor.h
@@ -37,36 +37,40 @@ class MainObjectMenuMetadataItemVisitor : public MetadataItemVisitor
 
     virtual void visitColumn(Column& column);
     virtual void visitDatabase(Database& database);
+    virtual void visitDBTrigger(DBTrigger& trigger);
+    virtual void visitDBTriggers(DBTriggers& triggers);
+    virtual void visitDDLTrigger(DDLTrigger& trigger);
+    virtual void visitDDLTriggers(DDLTriggers& triggers);
+    virtual void visitDMLTrigger(DMLTrigger& trigger);
+    virtual void visitDMLTriggers(DMLTriggers& triggers);
     virtual void visitDomain(Domain& domain);
     virtual void visitDomains(Domains& domains);
     virtual void visitException(Exception& exception);
     virtual void visitExceptions(Exceptions& exceptions);
     virtual void visitFunctionSQL(FunctionSQL& function);
     virtual void visitFunctionSQLs(FunctionSQLs& functions);
-    virtual void visitUDF(UDF& function);
-    virtual void visitUDFs(UDFs& functions);
     virtual void visitGenerator(Generator& generator);
     virtual void visitGenerators(Generators& generators);
+    virtual void visitGTTs(GTTs& tables);
+    virtual void visitIndex(Index& index);
+    virtual void visitIndices(Indices& indices);
     virtual void visitPackage(Package& package);
     virtual void visitPackages(Packages& packages);
-    virtual void visitSysPackages(SysPackages& packages);
     virtual void visitProcedure(Procedure& procedure);
     virtual void visitProcedures(Procedures& procedures);
     virtual void visitRole(Role& role);
     virtual void visitRoles(Roles& roles);
-    virtual void visitSysRoles(SysRoles& roles);
     virtual void visitRoot(Root& root);
+    virtual void visitSysPackages(SysPackages& packages);
+    virtual void visitSysRoles(SysRoles& roles);
+    virtual void visitSysTables(SysTables& tables);
     virtual void visitServer(Server& server);
     virtual void visitTable(Table& table);
     virtual void visitTables(Tables& tables);
-    virtual void visitSysTables(SysTables& tables);
-    virtual void visitGTTTables(GTTs& tables);
-    virtual void visitDDLTrigger(DDLTrigger& trigger);
-    virtual void visitDBTrigger(DBTrigger& trigger);
-    virtual void visitDMLTrigger(DMLTrigger& trigger);
-    virtual void visitDMLTriggers(DMLTriggers& triggers);
-    virtual void visitDBTriggers(DBTriggers& triggers);
-    virtual void visitDDLTriggers(DDLTriggers& triggers);
+    virtual void visitUDF(UDF& function);
+    virtual void visitUDFs(UDFs& functions);
+    virtual void visitUser(User& user);
+    virtual void visitUsers(Users& users);
     virtual void visitView(View& view);
     virtual void visitViews(Views& views);
 protected:
diff --git a/src/gui/DatabaseRegistrationDialog.cpp b/src/gui/DatabaseRegistrationDialog.cpp
index 86e67a39a..7486bf313 100644
--- a/src/gui/DatabaseRegistrationDialog.cpp
+++ b/src/gui/DatabaseRegistrationDialog.cpp
@@ -355,6 +355,7 @@ void DatabaseRegistrationDialog::setDatabase(DatabasePtr db)
         choice_authentication->SetSelection(
             databaseM->getAuthenticationMode().getMode());
     }
+
     updateAuthenticationMode();
     updateButtons();
     updateColors();
diff --git a/src/gui/MainFrame.cpp b/src/gui/MainFrame.cpp
index 7fc6f37e7..64355b04f 100644
--- a/src/gui/MainFrame.cpp
+++ b/src/gui/MainFrame.cpp
@@ -65,8 +65,10 @@
 #include "metadata/column.h"
 #include "metadata/domain.h"
 #include "metadata/generator.h"
+#include "metadata/function.h"
 #include "metadata/MetadataItemCreateStatementVisitor.h"
 #include "metadata/MetadataTemplateManager.h"
+#include "metadata/package.h"
 #include "metadata/procedure.h"
 #include "metadata/root.h"
 #include "metadata/server.h"
@@ -219,22 +221,25 @@ void MainFrame::buildMainMenu()
     serverMenu->Append(Cmds::Menu_ManageUsers, _("&Manage users"));
     menuBarM->Append(serverMenu, _("&Server"));
 
+
     objectMenuM = new wxMenu();
     wxMenu* newMenu = new wxMenu();
-    newMenu->Append(Cmds::Menu_CreateDomain,      _("&Domain"));
-    newMenu->Append(Cmds::Menu_CreateException,   _("&Exception"));
-    newMenu->Append(Cmds::Menu_CreateFunction,    _("&Function"));
-    newMenu->Append(Cmds::Menu_CreateGenerator,   _("&Generator"));
-    newMenu->Append(Cmds::Menu_CreatePackage,     _("P&ackage"));
-    newMenu->Append(Cmds::Menu_CreateProcedure,   _("&Procedure"));
-    newMenu->Append(Cmds::Menu_CreateRole,        _("&Role"));
-    newMenu->Append(Cmds::Menu_CreateTable,       _("&Table"));
-    newMenu->Append(Cmds::Menu_CreateGTTTable,    _("GTT Table"));
-    newMenu->Append(Cmds::Menu_CreateTrigger,     _("Tr&igger"));
-    newMenu->Append(Cmds::Menu_CreateDBTrigger,   _("D&B Trigger"));
-    newMenu->Append(Cmds::Menu_CreateDDLTrigger,  _("DD&L Trigger"));
-    newMenu->Append(Cmds::Menu_CreateUDF,         _("&UDF"));
-    newMenu->Append(Cmds::Menu_CreateView,        _("&View"));
+    newMenu->Append(Cmds::Menu_CreateDBTrigger, _("D&B Trigger"));
+    newMenu->Append(Cmds::Menu_CreateDDLTrigger, _("DD&L Trigger"));
+    newMenu->Append(Cmds::Menu_CreateDMLTrigger, _("DML Tr&igger"));
+    newMenu->Append(Cmds::Menu_CreateDomain, _("&Domain"));
+    newMenu->Append(Cmds::Menu_CreateException, _("&Exception"));
+    newMenu->Append(Cmds::Menu_CreateFunction, _("&Function"));
+    newMenu->Append(Cmds::Menu_CreateGenerator, _("&Generator"));
+    newMenu->Append(Cmds::Menu_CreateGTTTable, _("Global Temporary"));
+    newMenu->Append(Cmds::Menu_CreateIndex, _("&Index"));
+    newMenu->Append(Cmds::Menu_CreatePackage, _("P&ackage"));
+    newMenu->Append(Cmds::Menu_CreateProcedure, _("&Procedure"));
+    newMenu->Append(Cmds::Menu_CreateRole, _("&Role"));
+    newMenu->Append(Cmds::Menu_CreateTable, _("&Table"));
+    newMenu->Append(Cmds::Menu_CreateUDF, _("&UDF"));
+    newMenu->Append(Cmds::Menu_CreateUser, _("U&ser"));
+    newMenu->Append(Cmds::Menu_CreateView, _("&View"));
     // removed accelerator from "New", any of them potentially conflicts
     // with one of the commands in the object menu
     objectMenuM->Append(Cmds::Menu_NewObject, _("New"), newMenu);
@@ -432,6 +437,7 @@ BEGIN_EVENT_TABLE(MainFrame, wxFrame)
     EVT_UPDATE_UI(Cmds::Menu_ObjectProperties, MainFrame::OnMenuUpdateIfDatabaseConnectedOrAutoConnect)
     EVT_MENU(Cmds::Menu_ObjectRefresh, MainFrame::OnMenuObjectRefresh)
     EVT_UPDATE_UI(Cmds::Menu_ObjectRefresh, MainFrame::OnMenuUpdateIfDatabaseConnected)
+    EVT_MENU(Cmds::Menu_RebuildObject, MainFrame::OnMenRebuildObject)
 
     EVT_MENU(Cmds::Menu_ToggleStatusBar, MainFrame::OnMenuToggleStatusBar)
     EVT_MENU(Cmds::Menu_ToggleSearchBar, MainFrame::OnMenuToggleSearchBar)
@@ -443,19 +449,21 @@ BEGIN_EVENT_TABLE(MainFrame, wxFrame)
     EVT_BUTTON(MainFrame::ID_button_prev, MainFrame::OnButtonPrevClick)
     EVT_BUTTON(MainFrame::ID_button_next, MainFrame::OnButtonNextClick)
 
+    EVT_MENU(Cmds::Menu_CreateDBTrigger,  MainFrame::OnMenuCreateDBTrigger)
+    EVT_MENU(Cmds::Menu_CreateDDLTrigger, MainFrame::OnMenuCreateDDLTrigger)
+    EVT_MENU(Cmds::Menu_CreateDMLTrigger, MainFrame::OnMenuCreateDMLTrigger)
     EVT_MENU(Cmds::Menu_CreateDomain,     MainFrame::OnMenuCreateDomain)
     EVT_MENU(Cmds::Menu_CreateException,  MainFrame::OnMenuCreateException)
     EVT_MENU(Cmds::Menu_CreateFunction,   MainFrame::OnMenuCreateFunction)
     EVT_MENU(Cmds::Menu_CreateGenerator,  MainFrame::OnMenuCreateGenerator)
+    EVT_MENU(Cmds::Menu_CreateGTTTable,   MainFrame::OnMenuCreateGTTTable)
+    EVT_MENU(Cmds::Menu_CreateIndex,      MainFrame::OnMenuCreateIndex)
     EVT_MENU(Cmds::Menu_CreatePackage,    MainFrame::OnMenuCreatePackage)
     EVT_MENU(Cmds::Menu_CreateProcedure,  MainFrame::OnMenuCreateProcedure)
     EVT_MENU(Cmds::Menu_CreateRole,       MainFrame::OnMenuCreateRole)
     EVT_MENU(Cmds::Menu_CreateTable,      MainFrame::OnMenuCreateTable)
-    EVT_MENU(Cmds::Menu_CreateGTTTable,   MainFrame::OnMenuCreateGTTTable)
-    EVT_MENU(Cmds::Menu_CreateTrigger,    MainFrame::OnMenuDMLCreateTrigger)
-    EVT_MENU(Cmds::Menu_CreateDBTrigger,  MainFrame::OnMenuCreateDBTrigger)
-    EVT_MENU(Cmds::Menu_CreateDDLTrigger, MainFrame::OnMenuCreateDDLTrigger)
     EVT_MENU(Cmds::Menu_CreateUDF,        MainFrame::OnMenuCreateUDF)
+    EVT_MENU(Cmds::Menu_CreateUser,       MainFrame::OnMenuCreateUser)
     EVT_MENU(Cmds::Menu_CreateView,       MainFrame::OnMenuCreateView)
 
     EVT_MENU_RANGE(Cmds::Menu_TemplateFirst, Cmds::Menu_TemplateLast,
@@ -1287,6 +1295,12 @@ void MainFrame::OnMenuCreateFunction(wxCommandEvent& WXUNUSED(event))
         MetadataItemCreateStatementVisitor::getCreateFunctionSQLStatement());
 }
 
+void MainFrame::OnMenuCreateIndex(wxCommandEvent& WXUNUSED(event))
+{
+    showCreateTemplate(
+        MetadataItemCreateStatementVisitor::getCreateIndexStatement());
+}
+
 void MainFrame::OnMenuCreateGenerator(wxCommandEvent& WXUNUSED(event))
 {
     showCreateTemplate(
@@ -1323,7 +1337,7 @@ void MainFrame::OnMenuCreateGTTTable(wxCommandEvent& WXUNUSED(event))
         MetadataItemCreateStatementVisitor::getCreateGTTTableStatement());
 }
 
-void MainFrame::OnMenuDMLCreateTrigger(wxCommandEvent& WXUNUSED(event))
+void MainFrame::OnMenuCreateDMLTrigger(wxCommandEvent& WXUNUSED(event))
 {
     showCreateTemplate(
         MetadataItemCreateStatementVisitor::getCreateDMLTriggerStatement());
@@ -1347,6 +1361,12 @@ void MainFrame::OnMenuCreateUDF(wxCommandEvent& WXUNUSED(event))
         MetadataItemCreateStatementVisitor::getCreateUDFStatement());
 }
 
+void MainFrame::OnMenuCreateUser(wxCommandEvent& WXUNUSED(event))
+{
+    showCreateTemplate(
+        MetadataItemCreateStatementVisitor::getCreateUserStatement());
+}
+
 void MainFrame::OnMenuCreateView(wxCommandEvent& WXUNUSED(event))
 {
     showCreateTemplate(
@@ -1559,16 +1579,35 @@ void MainFrame::OnMenuAlterObject(wxCommandEvent& WXUNUSED(event))
 
     wxString sql;
     if (View* v = dynamic_cast<View*>(mi))
-        sql = v->getRebuildSql();
+        sql = v->getAlterSql();
+        //        sql = v->getRebuildSql();
     else if (Trigger* t = dynamic_cast<Trigger*>(mi))
         sql = t->getAlterSql();
     else if (Domain* dm = dynamic_cast<Domain*>(mi))
         sql = dm->getAlterSqlTemplate();
+    else if (Package* pk = dynamic_cast<Package*>(mi))
+        sql = pk->getAlterSql();
+    else if (FunctionSQL* fn = dynamic_cast<FunctionSQL*>(mi))
+        sql = fn->getAlterSql();
 
     if (!sql.empty())
         showSql(this, wxString(_("Alter object")), db, sql);
 }
 
+void MainFrame::OnMenRebuildObject(wxCommandEvent& event)
+{
+    MetadataItem* mi = treeMainM->getSelectedMetadataItem();
+    DatabasePtr db = getDatabase(mi);
+    if (!db)
+        return;
+
+    wxString sql;
+    if (View* v = dynamic_cast<View*>(mi))
+        sql = v->getRebuildSql();
+    if (!sql.empty())
+        showSql(this, wxString(_("Rebuild object")), db, sql);
+}
+
 void MainFrame::OnMenuRecreateDatabase(wxCommandEvent& WXUNUSED(event))
 {
     DatabasePtr db = getDatabase(treeMainM->getSelectedMetadataItem());
diff --git a/src/gui/MainFrame.h b/src/gui/MainFrame.h
index 258c0f269..81c314a5b 100644
--- a/src/gui/MainFrame.h
+++ b/src/gui/MainFrame.h
@@ -88,6 +88,7 @@ class MainFrame: public BaseFrame, private URIHandler,
     void OnMenuObjectRefresh(wxCommandEvent& event);
     void OnMenuDropObject(wxCommandEvent& event);
     void OnMenuAlterObject(wxCommandEvent& event);
+    void OnMenRebuildObject(wxCommandEvent& event);
     void OnMenuCreateTriggerForTable(wxCommandEvent& event);
     void OnMenuGenerateCode(wxCommandEvent& event);
     void OnMenuExecuteProcedure(wxCommandEvent& event);
@@ -101,19 +102,21 @@ class MainFrame: public BaseFrame, private URIHandler,
 
     // create new object
     void showCreateTemplate(const wxString& statement);
+    void OnMenuCreateDBTrigger(wxCommandEvent& event);
+    void OnMenuCreateDDLTrigger(wxCommandEvent& event);
+    void OnMenuCreateDMLTrigger(wxCommandEvent& event);
     void OnMenuCreateDomain(wxCommandEvent& event);
     void OnMenuCreateException(wxCommandEvent& event);
     void OnMenuCreateFunction(wxCommandEvent& event);
+    void OnMenuCreateIndex(wxCommandEvent& event);
     void OnMenuCreateGenerator(wxCommandEvent& event);
+    void OnMenuCreateGTTTable(wxCommandEvent& event);
     void OnMenuCreatePackage(wxCommandEvent& event);
     void OnMenuCreateProcedure(wxCommandEvent& event);
     void OnMenuCreateRole(wxCommandEvent& event);
     void OnMenuCreateTable(wxCommandEvent& event);
-    void OnMenuCreateGTTTable(wxCommandEvent& event);
-    void OnMenuDMLCreateTrigger(wxCommandEvent& event);
-    void OnMenuCreateDBTrigger(wxCommandEvent& event);
-    void OnMenuCreateDDLTrigger(wxCommandEvent& event);
     void OnMenuCreateUDF(wxCommandEvent& event);
+    void OnMenuCreateUser(wxCommandEvent& event);
     void OnMenuCreateView(wxCommandEvent& event);
 
     // enabled menu items
diff --git a/src/gui/controls/DBHTreeControl.cpp b/src/gui/controls/DBHTreeControl.cpp
index 9d1286de0..ec954855e 100644
--- a/src/gui/controls/DBHTreeControl.cpp
+++ b/src/gui/controls/DBHTreeControl.cpp
@@ -180,6 +180,12 @@ DBHTreeImageList::DBHTreeImageList()
     addImage(ART_Computed);
     addImage(ART_DatabaseConnected);
     addImage(ART_DatabaseDisconnected);
+    addImage(ART_DBTrigger);
+    addImage(ART_DBTriggers);
+    addImage(ART_DDLTrigger);
+    addImage(ART_DDLTriggers);
+    addImage(ART_DMLTrigger);
+    addImage(ART_DMLTriggers);
     addImage(ART_Domain);
     addImage(ART_Domains);
     addImage(ART_Exception);
@@ -189,6 +195,8 @@ DBHTreeImageList::DBHTreeImageList()
     addImage(ART_Functions);
     addImage(ART_Generator);
     addImage(ART_Generators);
+    addImage(ART_GlobalTemporary);
+    addImage(ART_GlobalTemporaries);
     addImage(ART_Index);
     addImage(ART_Indices);
     addImage(ART_Package);
@@ -215,6 +223,10 @@ DBHTreeImageList::DBHTreeImageList()
     addImage(ART_Tables);
     addImage(ART_Trigger);
     addImage(ART_Triggers);
+    addImage(ART_UDF);
+    addImage(ART_UDFs);
+    addImage(ART_User);
+    addImage(ART_Users);
     addImage(ART_View);
     addImage(ART_Views);
 }
@@ -308,6 +320,8 @@ class DBHTreeItemVisitor: public MetadataItemVisitor
     virtual void visitDDLTriggers(DDLTriggers& triggers);
     virtual void visitUDF(UDF& function);
     virtual void visitUDFs(UDFs& functions);
+    virtual void visitUDF(User& user);
+    virtual void visitUDFs(Users& users);
     virtual void visitView(View& view);
     virtual void visitViews(Views& views);
     virtual void visitIndex(Index& index);
@@ -481,7 +495,7 @@ void DBHTreeItemVisitor::visitFunctionSQLs(FunctionSQLs& functions)
 
 void DBHTreeItemVisitor::visitUDF(UDF& function)
 {
-    setNodeProperties(&function, ART_Function);
+    setNodeProperties(&function, ART_UDF);
     if (function.childrenLoaded())
     {
         // make node caption bold when parameter data is loaded
@@ -512,7 +526,17 @@ void DBHTreeItemVisitor::visitUDF(UDF& function)
 
 void DBHTreeItemVisitor::visitUDFs(UDFs& functions)
 {
-    setNodeProperties(&functions, ART_Functions);
+    setNodeProperties(&functions, ART_UDFs);
+}
+
+void DBHTreeItemVisitor::visitUDF(User& user)
+{
+    //setNodeProperties(&user, ART_User);
+}
+
+void DBHTreeItemVisitor::visitUDFs(Users& users)
+{
+    //setNodeProperties(&users, ART_Users);
 }
 
 void DBHTreeItemVisitor::visitGenerator(Generator& generator)
@@ -682,13 +706,14 @@ void DBHTreeItemVisitor::visitSysTables(SysTables& tables)
 
 void DBHTreeItemVisitor::visitGTTs(GTTs& tables)
 {
-    setNodeProperties(&tables, ART_Tables);
+    setNodeProperties(&tables, ART_GlobalTemporaries);
 }
 
 void DBHTreeItemVisitor::visitTable(Table& table)
 {
     setNodeProperties(&table,
-        table.isSystem() ? ART_SystemTable : ART_Table);
+        table.isSystem() ? ART_SystemTable : 
+        table.getRelationType() == 4 || table.getRelationType() == 5 ? ART_GlobalTemporary : ART_Table);
 
     if (table.childrenLoaded())
     {
@@ -715,32 +740,32 @@ void DBHTreeItemVisitor::visitTables(Tables& tables)
 
 void DBHTreeItemVisitor::visitDMLTrigger(DMLTrigger& trigger)
 {
-    setNodeProperties(&trigger, ART_Trigger);
+    setNodeProperties(&trigger, ART_DMLTrigger);
 }
 
 void DBHTreeItemVisitor::visitDMLTriggers(DMLTriggers& triggers)
 {
-    setNodeProperties(&triggers, ART_Triggers);
+    setNodeProperties(&triggers, ART_DMLTriggers);
 }
 
 void DBHTreeItemVisitor::visitDBTrigger(DBTrigger& trigger)
 {
-    setNodeProperties(&trigger, ART_Trigger);
+    setNodeProperties(&trigger, ART_DBTrigger);
 }
 
 void DBHTreeItemVisitor::visitDBTriggers(DBTriggers& triggers)
 {
-    setNodeProperties(&triggers, ART_Triggers); 
+    setNodeProperties(&triggers, ART_DBTriggers); 
 }
 
 void DBHTreeItemVisitor::visitDDLTrigger(DDLTrigger& trigger)
 {
-    setNodeProperties(&trigger, ART_Trigger);
+    setNodeProperties(&trigger, ART_DDLTrigger);
 }
 
 void DBHTreeItemVisitor::visitDDLTriggers(DDLTriggers& triggers)
 {
-    setNodeProperties(&triggers, ART_Triggers); 
+    setNodeProperties(&triggers, ART_DDLTriggers); 
 }
 
 void DBHTreeItemVisitor::visitView(View& view)
diff --git a/src/metadata/MetadataClasses.h b/src/metadata/MetadataClasses.h
index a2ddcc791..393a14026 100644
--- a/src/metadata/MetadataClasses.h
+++ b/src/metadata/MetadataClasses.h
@@ -38,6 +38,10 @@ typedef std::weak_ptr<Database> DatabaseWeakPtr;
 typedef std::vector<DatabasePtr> DatabasePtrs;
 
 class Trigger;
+typedef std::shared_ptr<Trigger> TriggerPtr;
+typedef std::vector<TriggerPtr> TriggerPtrs;
+class Triggers;
+typedef std::shared_ptr<Triggers> TriggersPtr;
 
 class DBTrigger;
 typedef std::shared_ptr<DBTrigger> DBTriggerPtr;
@@ -166,6 +170,9 @@ class UniqueConstraint;
 class User;
 typedef std::shared_ptr<User> UserPtr;
 typedef std::vector<UserPtr> UserPtrs;
+class Users;
+typedef std::shared_ptr<Users> UsersPtr;
+
 
 class View;
 typedef std::shared_ptr<View> ViewPtr;
diff --git a/src/metadata/MetadataItemCreateStatementVisitor.cpp b/src/metadata/MetadataItemCreateStatementVisitor.cpp
index 013cbf917..f02c2674a 100644
--- a/src/metadata/MetadataItemCreateStatementVisitor.cpp
+++ b/src/metadata/MetadataItemCreateStatementVisitor.cpp
@@ -49,7 +49,7 @@ wxString MetadataItemCreateStatementVisitor::getCreateDomainStatement()
 wxString MetadataItemCreateStatementVisitor::getCreateExceptionStatement()
 {
     StatementBuilder sb;
-    sb << kwCREATE << ' ' << kwEXCEPTION << " name 'exception message';"
+    sb << kwCREATE << ' ' << kwEXCEPTION << " exception_name 'exception message';"
         << StatementBuilder::NewLine;
     return sb;
 }
@@ -57,29 +57,68 @@ wxString MetadataItemCreateStatementVisitor::getCreateExceptionStatement()
 /*static*/
 wxString MetadataItemCreateStatementVisitor::getCreateFunctionSQLStatement()
 {
+    StatementBuilder sb;
+    sb << kwSET << ' ' << kwTERMINATOR << "^ ;"
+        << StatementBuilder::NewLine
+        << StatementBuilder::NewLine
+        << kwCREATE << ' ' << kwFUNCTION << " function_name "
+        << StatementBuilder::NewLine
+        << " ( input_parameter_name < datatype>, ... )"
+        << StatementBuilder::NewLine
+        << kwRETURNS << "<datatype>"
+        << StatementBuilder::NewLine
+        << kwAS
+        << StatementBuilder::NewLine
+        << "DECLARE VARIABLE variable_name < datatype>; "
+        << StatementBuilder::NewLine
+        << kwBEGIN
+        << StatementBuilder::NewLine
+        << "  /* write your code here */ "
+        << StatementBuilder::NewLine
+        << kwEND << "^"
+        << StatementBuilder::NewLine
+        << StatementBuilder::NewLine
+        << kwSET << ' ' << kwTERMINATOR << "; ^ ";
+        
+        
     wxString s("SET TERM ^ ;\n\n"
-        "CREATE FUNCTION name \n"
+        "CREATE FUNCTION function_name \n"
         " ( input_parameter_name < datatype>, ... ) \n"
-        "RETURNS  < datatype>)\n"
+        "RETURNS  < datatype>\n"
         "AS \n"
         "DECLARE VARIABLE variable_name < datatype>; \n"
         "BEGIN\n"
         "  /* write your code here */ \n"
         "END^\n\n"
         "SET TERM ; ^\n");
-    return s;
+    return sb;
 }
 
 /*static*/
 wxString MetadataItemCreateStatementVisitor::getCreateUDFStatement()
 {
-    return "DECLARE EXTERNAL FUNCTION name [datatype | CSTRING (int) "
+    return "DECLARE EXTERNAL FUNCTION function_name [datatype | CSTRING (int) "
            "[, datatype | CSTRING (int) ...]]\n"
            "RETURNS {datatype [BY VALUE] | CSTRING (int)} [FREE_IT]\n"
            "ENTRY_POINT 'entryname'\n"
            "MODULE_NAME 'modulename';\n";
 }
 
+wxString MetadataItemCreateStatementVisitor::getCreateUserStatement()
+{
+    StatementBuilder sb;
+    sb << kwCREATE << ' ' << kwUSER << " username " << kwPASSWORD << " 'password' "
+        << StatementBuilder::NewLine
+        << "[" << kwFIRSTNAME << "'firstname']"
+        << StatementBuilder::NewLine
+        << "[" << kwMIDDLENAME << "'middlename']"
+        << StatementBuilder::NewLine
+        << "[" << kwLASTNAME << "'lastname']"
+        << StatementBuilder::NewLine
+        << "[" << kwGRANT << " " << kwADMIN << " " << kwROLE << "]";
+    return sb;
+}
+
 /*static*/
 wxString MetadataItemCreateStatementVisitor::getCreateGeneratorStatement()
 {
@@ -95,7 +134,7 @@ wxString MetadataItemCreateStatementVisitor::getCreateGeneratorStatement()
 wxString MetadataItemCreateStatementVisitor::getCreatePackageStatement()
 {
     wxString s("SET TERM ^ ;\n\n"
-        "CREATE PACKAGE name \n"
+        "CREATE PACKAGE package_name \n"
         "AS \n"
         "BEGIN\n"
         "  /* write your code here */ \n"
@@ -108,7 +147,7 @@ wxString MetadataItemCreateStatementVisitor::getCreatePackageStatement()
 wxString MetadataItemCreateStatementVisitor::getCreateProcedureStatement()
 {
     wxString s("SET TERM ^ ;\n\n"
-            "CREATE PROCEDURE name \n"
+            "CREATE PROCEDURE procedure_name \n"
             " ( input_parameter_name < datatype>, ... ) \n"
             "RETURNS \n"
             " ( output_parameter_name < datatype>, ... )\n"
@@ -146,14 +185,25 @@ wxString MetadataItemCreateStatementVisitor::getCreateTableStatement()
 
 wxString MetadataItemCreateStatementVisitor::getCreateGTTTableStatement()
 {
-    return wxString();
+    return "CREATE TABLE table_name\n"
+        "(\n"
+        "    column_name {< datatype> | COMPUTED BY (< expr>) | domain}\n"
+        "        [DEFAULT { literal | NULL | USER}] [NOT NULL]\n"
+        "    ...\n"
+        "    CONSTRAINT constraint_name\n"
+        "        PRIMARY KEY (column_list),\n"
+        "        UNIQUE      (column_list),\n"
+        "        FOREIGN KEY (column_list) REFERENCES other_table (column_list),\n"
+        "        CHECK       (condition),\n"
+        "    ...\n"
+        ");\n";
 }
 
 /*static*/
 wxString MetadataItemCreateStatementVisitor::getCreateDMLTriggerStatement()
 {
     return "SET TERM ^ ;\n\n"
-        "CREATE TRIGGER name \n"
+        "CREATE TRIGGER trigger_name \n"
 //        "[FOR table/view] \n"
         " [IN]ACTIVE \n"
         " [{BEFORE | AFTER} INSERT OR UPDATE OR DELETE] \n"
@@ -169,7 +219,7 @@ wxString MetadataItemCreateStatementVisitor::getCreateDMLTriggerStatement()
 wxString MetadataItemCreateStatementVisitor::getCreateDBTriggerStatement()
 {
     return "SET TERM ^ ;\n\n"
-        "CREATE TRIGGER name  \n"
+        "CREATE TRIGGER trigger_name  \n"
         " [IN]ACTIVE \n"
         " [ON {[DIS]CONNECT | TRANSACTION {START | COMMIT | ROLLBACK}} ] \n"
         " POSITION number \n"
@@ -183,9 +233,10 @@ wxString MetadataItemCreateStatementVisitor::getCreateDBTriggerStatement()
 wxString MetadataItemCreateStatementVisitor::getCreateDDLTriggerStatement()
 {
     return "SET TERM ^ ;\n\n"
-        "CREATE TRIGGER name  \n"
+        "CREATE TRIGGER trigger_name  \n"
         " [IN]ACTIVE \n"
-        " {BEFORE | AFTER}  CREATE TABLE | ALTER TABLE | DROP TABLE | \n"
+        " {BEFORE | AFTER}  ANY | "
+        "                   CREATE TABLE | ALTER TABLE | DROP TABLE | \n"
         "                   CREATE PROCEDURE | ALTER PROCEDURE | DROP PROCEDURE | \n"
         "                   CREATE FUNCTION | ALTER FUNCTION | DROP FUNCTION | \n"
         "                   CREATE TRIGGER  | ALTER TRIGGER  | DROP TRIGGER  | \n"
@@ -211,7 +262,7 @@ wxString MetadataItemCreateStatementVisitor::getCreateDDLTriggerStatement()
 wxString MetadataItemCreateStatementVisitor::getCreateViewStatement()
 {
     StatementBuilder sb;
-    sb << kwCREATE << ' ' << kwVIEW << " name ( view_column, ...)"
+    sb << kwCREATE << ' ' << kwVIEW << " view_name ( view_column, ...)"
         << StatementBuilder::NewLine << kwAS << StatementBuilder::NewLine
         << "/* write select statement here */"
         << StatementBuilder::NewLine
@@ -220,6 +271,15 @@ wxString MetadataItemCreateStatementVisitor::getCreateViewStatement()
     return sb;
 }
 
+wxString MetadataItemCreateStatementVisitor::getCreateIndexStatement()
+{
+    StatementBuilder sb;
+    sb << kwCREATE << " [" << kwUNIQUE << "] [" << kwASCENDING << "[ENDING]] | [" << kwDESCENDING << "[ENDING]]"
+        << kwINDEX << " index_name " << kwON << " table_name "
+        << "{ (<col> [, <col> ...]) | " << kwCOMPUTED << " " << kwBY << "(expression) }";
+    return sb;
+}
+
 void MetadataItemCreateStatementVisitor::visitDomains(Domains& /*domains*/)
 {
     statementM = getCreateDomainStatement();
@@ -243,12 +303,27 @@ void MetadataItemCreateStatementVisitor::visitUDFs(
     statementM = getCreateUDFStatement();
 }
 
+void MetadataItemCreateStatementVisitor::visitUsers(Users& Users)
+{
+    statementM = getCreateUserStatement();
+}
+
 void MetadataItemCreateStatementVisitor::visitGenerators(
     Generators& /*generators*/)
 {
     statementM = getCreateGeneratorStatement();
 }
 
+void MetadataItemCreateStatementVisitor::visitGTTs(GTTs& /*tables*/)
+{
+    statementM = getCreateGTTTableStatement();
+}
+
+void MetadataItemCreateStatementVisitor::visitIndices(Indices& /*indices*/)
+{
+    statementM = getCreateIndexStatement();
+}
+
 void MetadataItemCreateStatementVisitor::visitPackages(
     Packages& /*packages*/)
 {
diff --git a/src/metadata/MetadataItemCreateStatementVisitor.h b/src/metadata/MetadataItemCreateStatementVisitor.h
index 7e00b16e5..7de47bbb4 100644
--- a/src/metadata/MetadataItemCreateStatementVisitor.h
+++ b/src/metadata/MetadataItemCreateStatementVisitor.h
@@ -31,33 +31,39 @@ class MetadataItemCreateStatementVisitor : public MetadataItemVisitor
 private:
     wxString statementM;
 public:
+    static wxString getCreateDBTriggerStatement();
+    static wxString getCreateDDLTriggerStatement();
+    static wxString getCreateDMLTriggerStatement();
     static wxString getCreateDomainStatement();
     static wxString getCreateExceptionStatement();
     static wxString getCreateFunctionSQLStatement();
     static wxString getCreateGeneratorStatement();
+    static wxString getCreateGTTTableStatement();
+    static wxString getCreateIndexStatement();
     static wxString getCreatePackageStatement();
     static wxString getCreateProcedureStatement();
     static wxString getCreateRoleStatement();
     static wxString getCreateTableStatement();
-    static wxString getCreateGTTTableStatement();
-    static wxString getCreateDMLTriggerStatement();
-    static wxString getCreateDBTriggerStatement();
-    static wxString getCreateDDLTriggerStatement();
     static wxString getCreateUDFStatement();
+    static wxString getCreateUserStatement();
     static wxString getCreateViewStatement();
 
+
+    virtual void visitDBTriggers(DBTriggers& triggers);
+    virtual void visitDDLTriggers(DDLTriggers& triggers);
+    virtual void visitDMLTriggers(DMLTriggers& triggers);
     virtual void visitDomains(Domains& domains);
     virtual void visitExceptions(Exceptions& exceptions);
     virtual void visitFunctionSQLs(FunctionSQLs& functions);
     virtual void visitGenerators(Generators& generators);
+    virtual void visitGTTs(GTTs& tables);
+    virtual void visitIndices(Indices& indices);
     virtual void visitPackages(Packages& packages);
     virtual void visitProcedures(Procedures& procedures);
     virtual void visitRoles(Roles& roles);
     virtual void visitTables(Tables& tables);
-    virtual void visitDBTriggers(DBTriggers& triggers);
-    virtual void visitDDLTriggers(DDLTriggers& triggers);
-    virtual void visitDMLTriggers(DMLTriggers& triggers);
     virtual void visitUDFs(UDFs& functions);
+    virtual void visitUsers(Users& Users);
     virtual void visitViews(Views& views);
 
     wxString getStatement() const;
diff --git a/src/metadata/MetadataItemVisitor.cpp b/src/metadata/MetadataItemVisitor.cpp
index 53cac4d56..4074d89b7 100644
--- a/src/metadata/MetadataItemVisitor.cpp
+++ b/src/metadata/MetadataItemVisitor.cpp
@@ -96,6 +96,16 @@ void MetadataItemVisitor::visitUDFs(UDFs&)
     defaultAction();
 }
 
+void MetadataItemVisitor::visitUser(User& )
+{
+	defaultAction();
+}
+
+void MetadataItemVisitor::visitUsers(Users& )
+{
+    defaultAction();
+}
+
 void MetadataItemVisitor::visitGenerator(Generator&)
 {
     defaultAction();
@@ -111,7 +121,7 @@ void MetadataItemVisitor::visitIndex(Index&)
     defaultAction();
 }
 
-void MetadataItemVisitor::visitIndices(Indices& indices)
+void MetadataItemVisitor::visitIndices(Indices&)
 {
 	defaultAction();
 }
@@ -136,7 +146,7 @@ void MetadataItemVisitor::visitPackages(Packages&)
     defaultAction();
 }
 
-void MetadataItemVisitor::visitSysPackages(SysPackages& packages)
+void MetadataItemVisitor::visitSysPackages(SysPackages&)
 {
     defaultAction();
 }
@@ -212,6 +222,11 @@ void MetadataItemVisitor::visitTrigger(Trigger&)
     defaultAction();
 }
 
+void MetadataItemVisitor::visitTriggers(Triggers&)
+{
+    defaultAction();
+}
+
 void MetadataItemVisitor::visitDBTrigger(DBTrigger&)
 {
     defaultAction();
diff --git a/src/metadata/MetadataItemVisitor.h b/src/metadata/MetadataItemVisitor.h
index fd04360ed..287469482 100644
--- a/src/metadata/MetadataItemVisitor.h
+++ b/src/metadata/MetadataItemVisitor.h
@@ -38,49 +38,52 @@ class MetadataItemVisitor: public Visitor
 
     virtual void visitColumn(Column& column);
     virtual void visitDatabase(Database& database);
+    virtual void visitDBTrigger(DBTrigger& trigger);
+    virtual void visitDBTriggers(DBTriggers& triggers);
+    virtual void visitDDLTrigger(DDLTrigger& trigger);
+    virtual void visitDDLTriggers(DDLTriggers& triggers);
+    virtual void visitDMLTrigger(DMLTrigger& trigger);
+    virtual void visitDMLTriggers(DMLTriggers& triggers);
     virtual void visitDomain(Domain& domain);
     virtual void visitDomains(Domains& domains);
-    virtual void visitSysDomains(SysDomains& domains);
     virtual void visitException(Exception& exception);
     virtual void visitExceptions(Exceptions& exceptions);
     virtual void visitForeignKey(ForeignKey& fk);
     virtual void visitFunctionSQL(FunctionSQL& function);
     virtual void visitFunctionSQLs(FunctionSQLs& functions);
-    virtual void visitUDF(UDF& function);
-    virtual void visitUDFs(UDFs& functions);
     virtual void visitGenerator(Generator& generator);
     virtual void visitGenerators(Generators& generators);
+    virtual void visitGTTs(GTTs& tables);
     virtual void visitIndex(Index& index);
     virtual void visitIndices(Indices& indices);
+    virtual void visitMetadataItem(MetadataItem& metadataItem);
+    virtual void visitMethod(Method& method);
     virtual void visitParameter(Parameter& parameter);
     virtual void visitPrimaryKeyConstraint(PrimaryKeyConstraint& pk);
     virtual void visitPackage(Package& package);
     virtual void visitPackages(Packages& packages);
-    virtual void visitSysPackages(SysPackages& packages);
     virtual void visitProcedure(Procedure& procedure);
     virtual void visitProcedures(Procedures& procedures);
     virtual void visitRelation(Relation& relation);
     virtual void visitRole(Role& role);
     virtual void visitRoles(Roles& roles);
-    virtual void visitSysRoles(SysRoles& sysRoles);
     virtual void visitRoot(Root& root);
     virtual void visitServer(Server& server);
+    virtual void visitSysDomains(SysDomains& domains);
+    virtual void visitSysPackages(SysPackages& packages);
+    virtual void visitSysRoles(SysRoles& sysRoles);
+    virtual void visitSysTables(SysTables& sysTables);
     virtual void visitTable(Table& table);
     virtual void visitTables(Tables& tables);
-    virtual void visitSysTables(SysTables& sysTables);
-    virtual void visitGTTs(GTTs& tables);
     virtual void visitTrigger(Trigger& trigger);
-    virtual void visitDBTrigger(DBTrigger& trigger);
-    virtual void visitDDLTrigger(DDLTrigger& trigger);
-    virtual void visitDMLTrigger(DMLTrigger& trigger);
-    virtual void visitDMLTriggers(DMLTriggers& triggers);
-    virtual void visitDBTriggers(DBTriggers& triggers);
-    virtual void visitDDLTriggers(DDLTriggers& triggers);
+    virtual void visitTriggers(Triggers& triggers);
+    virtual void visitUDF(UDF& function);
+    virtual void visitUDFs(UDFs& functions);
+    virtual void visitUser(User& user);
+    virtual void visitUsers(Users& users);
     virtual void visitUniqueConstraint(UniqueConstraint& unq);
     virtual void visitView(View& view);
     virtual void visitViews(Views& views);
-    virtual void visitMetadataItem(MetadataItem& metadataItem);
-    virtual void visitMethod(Method& method);
 };
 
 #endif //FR_METADATAITEMVISITOR_H
diff --git a/src/metadata/MetadataTemplateCmdHandler.cpp b/src/metadata/MetadataTemplateCmdHandler.cpp
index d3cd658a9..bc3cd5ea1 100644
--- a/src/metadata/MetadataTemplateCmdHandler.cpp
+++ b/src/metadata/MetadataTemplateCmdHandler.cpp
@@ -622,6 +622,12 @@ void MetadataTemplateCmdHandler::handleTemplateCmd(TemplateProcessor *tp,
 
         if (cmdParams[0] == "datatype")
             processedText += tp->escapeChars(cb->getDatatype());
+        else if(cmdParams[0] == "typeof") {
+            processedText += "TYPE OF COLUMN " + cb->getParent()->getQuotedName() + "." + cb->getQuotedName();
+        }
+        else if (cmdParams[0] == "source") {
+            processedText += tp->escapeChars(cb->getSource());
+        }
         else if (cmdParams[0] == "is_nullable")
         {
             processedText += tp->escapeChars(getBooleanAsString(
diff --git a/src/metadata/User.cpp b/src/metadata/User.cpp
index d0c256c43..43a64f623 100644
--- a/src/metadata/User.cpp
+++ b/src/metadata/User.cpp
@@ -31,6 +31,7 @@
 #endif
 
 #include "core/StringUtils.h"
+#include "metadata/MetadataItemVisitor.h"
 #include "metadata/server.h"
 #include "metadata/User.h"
 
@@ -169,3 +170,32 @@ bool User::isSystem() const
     return usernameM == "SYSDBA";
 }
 
+/*
+void Users::loadChildren()
+{
+    load(0);
+}
+
+Users::Users(DatabasePtr database)
+    : MetadataCollection<User>(ntUsers, database, _("Users"))
+{
+}
+
+void Users::acceptVisitor(MetadataItemVisitor* visitor)
+{
+    visitor->visitUsers(*this);
+}
+
+void Users::load(ProgressIndicator* progressIndicator)
+{
+    DatabasePtr db = getDatabase();
+    wxString stmt = "select sec$user_name from sec$users a order by 1 ";
+    setItems(db->loadIdentifiers(stmt, progressIndicator));
+}
+
+const wxString Users::getTypeName() const
+{
+    return "USERS_COLLECTION";
+}
+
+*/
\ No newline at end of file
diff --git a/src/metadata/User.h b/src/metadata/User.h
index 6bc69fe5d..b238c94a4 100644
--- a/src/metadata/User.h
+++ b/src/metadata/User.h
@@ -67,5 +67,19 @@ class User: public MetadataItem,
 
     void assignTo(IBPP::User& dest) const;
 };
+/*
+class Users : public MetadataCollection<User>
+{
+protected:
+    virtual void loadChildren();
+public:
+    Users(DatabasePtr database);
+
+    virtual void acceptVisitor(MetadataItemVisitor* visitor);
+    void load(ProgressIndicator* progressIndicator);
+    virtual const wxString getTypeName() const;
+
+};
+*/
 
 #endif
diff --git a/src/metadata/column.cpp b/src/metadata/column.cpp
index 78144c47d..094b7a1b1 100644
--- a/src/metadata/column.cpp
+++ b/src/metadata/column.cpp
@@ -285,7 +285,11 @@ wxString Column::getSource(bool identity)
         }
         return sql;
     }
-    else
-        return ColumnBase::getSource(identity);
+    else {
+        if ((isIdentity() && !identity) || !getComputedSource().IsEmpty())
+            return  getDatatype(false);
+        else
+            return ColumnBase::getSource(identity);
+    }
 }
 
diff --git a/src/metadata/database.cpp b/src/metadata/database.cpp
index 577d227dd..8122729e2 100644
--- a/src/metadata/database.cpp
+++ b/src/metadata/database.cpp
@@ -1424,6 +1424,13 @@ UDFsPtr Database::getUDFs()
     return UDFsM;
 }
 
+UsersPtr Database::getUsers()
+{
+    wxASSERT(usersM);
+//    usersM->ensureChildrenLoaded();
+    return usersM;
+}
+
 FunctionSQLsPtr Database::getFunctionSQLs()
 {
     wxASSERT(functionSQLsM);
diff --git a/src/metadata/database.h b/src/metadata/database.h
index 92261ad9c..a3141dc63 100644
--- a/src/metadata/database.h
+++ b/src/metadata/database.h
@@ -169,24 +169,25 @@ class Database: public MetadataItem,
 
     DatabaseInfo databaseInfoM;
 
+    DBTriggersPtr DBTriggersM;
+    DDLTriggersPtr DDLTriggersM;
+    DMLTriggersPtr DMLtriggersM;
     DomainsPtr userDomainsM;
-    SysDomainsPtr sysDomainsM;
     ExceptionsPtr exceptionsM;
     FunctionSQLsPtr functionSQLsM;
     GeneratorsPtr generatorsM;
+    GTTsPtr GTTsM;
     IndicesPtr indicesM;
     PackagesPtr packagesM;
-    SysPackagesPtr sysPackagesM;
     ProceduresPtr proceduresM;
     RolesPtr rolesM;
+    SysDomainsPtr sysDomainsM;
+    SysPackagesPtr sysPackagesM;
     SysRolesPtr sysRolesM;
-    TablesPtr tablesM;
     SysTablesPtr sysTablesM;
-    GTTsPtr GTTsM;
-    DMLTriggersPtr DMLtriggersM;
-    DBTriggersPtr DBTriggersM;
-    DDLTriggersPtr DDLTriggersM;
+    TablesPtr tablesM;
     UDFsPtr UDFsM;
+    UsersPtr usersM;
     ViewsPtr viewsM;
 
     // copy constructor implementation removed since it's no longer needed
@@ -241,6 +242,7 @@ class Database: public MetadataItem,
     SysTablesPtr getSysTables();
     TablesPtr getTables();
     UDFsPtr getUDFs();
+    UsersPtr getUsers();
     ViewsPtr getViews();
 
     bool isConnected() const;
diff --git a/src/metadata/function.cpp b/src/metadata/function.cpp
index da5049265..84130bac7 100644
--- a/src/metadata/function.cpp
+++ b/src/metadata/function.cpp
@@ -79,9 +79,9 @@ void Function::loadChildren()
         "f.rdb$return_argument, a.rdb$argument_position, " //9..10
     );
     if (db->getInfo().getODSVersionIsHigherOrEqualTo(11, 1))
-        sql += "rdb$default_source, rdb$null_flag, rdb$argument_mechanism, "; //11..13
+        sql += "rdb$default_source, rdb$null_flag, rdb$argument_mechanism, rdb$FIELD_NAME, rdb$RELATION_NAME, "; //11..13
     else
-        sql += "null, null, -1, ";
+        sql += "null, null, -1, null, null, ";
     sql += "a.rdb$description from rdb$function_arguments a "
         " join rdb$functions f on f.rdb$function_name = a.rdb$function_name "
         "where a.rdb$function_name = ? ";
@@ -149,7 +149,18 @@ void Function::loadChildren()
             if (!st1->IsNull(3))
                 st1->Get(3, mechanism);
         }
-        bool hasDescription = !st1->IsNull(14);
+        wxString field;
+        if (!st1->IsNull(14)) {
+            st1->Get(14, s);
+            field = std2wxIdentifier(s, converter);
+        }
+        wxString relation;
+        if (!st1->IsNull(15)) {
+            st1->Get(15, s);
+            relation = std2wxIdentifier(s, converter);
+        }
+
+        bool hasDescription = !st1->IsNull(16);
 
         ParameterPtr par = findParameter(param_name);
         if (!par)
@@ -159,7 +170,7 @@ void Function::loadChildren()
         }
         parameters.push_back(par);
         par->initialize(source, partype, mechanism, !notNull, defaultSrc,
-            hasDefault, hasDescription);
+            hasDefault, hasDescription, relation, field);
     }
 
     setChildrenLoaded(true);
@@ -539,9 +550,10 @@ wxString FunctionSQL::getAlterSql(bool full)
 				}
 				else
 				{
-					if ((*it)->getMechanism() == 1)
-						param += "TYPE OF ";
-					param += dm->getQuotedName();
+                    if ((*it)->getMechanism() == 1)
+                        param += param += (*it)->getTypeOf();
+                    else
+                        param += dm->getQuotedName();
 				}
 			}
 			else
diff --git a/src/metadata/parameter.cpp b/src/metadata/parameter.cpp
index 4bc45ccdb..8594a794b 100644
--- a/src/metadata/parameter.cpp
+++ b/src/metadata/parameter.cpp
@@ -46,7 +46,7 @@ Parameter::Parameter(MetadataItem* metadataitem, const wxString& name)
 
 void Parameter::initialize(const wxString& source, int parameterType,
     int mechanism, bool nullable, const wxString& defaultValue,
-    bool hasDefault, bool hasDescription)
+    bool hasDefault, bool hasDescription, wxString& relation, wxString& field)
 {
     SubjectLocker lock(this);
 
@@ -65,6 +65,8 @@ void Parameter::initialize(const wxString& source, int parameterType,
         outputParameterM = outputParam;
         changed= true;
     }
+    relationM = relation;
+    fieldM = field;
     if (changed)
         notifyObservers();
 }
@@ -89,3 +91,8 @@ void Parameter::acceptVisitor(MetadataItemVisitor* visitor)
     visitor->visitParameter(*this);
 }
 
+wxString Parameter::getTypeOf()
+{
+    return "TYPE OF COLUMN " + relationM + "." + fieldM;
+}
+
diff --git a/src/metadata/parameter.h b/src/metadata/parameter.h
index 021812729..33cf27ad1 100644
--- a/src/metadata/parameter.h
+++ b/src/metadata/parameter.h
@@ -34,18 +34,22 @@ class Parameter: public ColumnBase
 private:
     bool outputParameterM;
     int parameterMechanismM;    // -1 none, 0 domain, 1 type_of
+    wxString relationM;
+    wxString fieldM;
 public:
     Parameter(MetadataItem* metadataitem, const wxString& name);
 
     void initialize(const wxString& source, int parameterType, int mechanism,
         bool nullable, const wxString& defaultValue, bool hasDefault,
-        bool hasDescription);
+        bool hasDescription, wxString& relation, wxString& field);
 
     int getMechanism() const;
     bool isOutputParameter() const;
 
     virtual const wxString getTypeName() const;
     virtual void acceptVisitor(MetadataItemVisitor* visitor);
+    wxString getTypeOf();
+
 };
 
 #endif
diff --git a/src/metadata/procedure.cpp b/src/metadata/procedure.cpp
index 68d001a30..5e1842eb2 100644
--- a/src/metadata/procedure.cpp
+++ b/src/metadata/procedure.cpp
@@ -75,7 +75,7 @@ void Procedure::loadChildren()
         "select rdb$parameter_name, rdb$field_source, "
         "rdb$parameter_type, "
     );
-    sql += db->getInfo().getODSVersionIsHigherOrEqualTo(11, 1)? "rdb$default_source, rdb$null_flag, rdb$parameter_mechanism, ": "null, null, -1, ";
+    sql += db->getInfo().getODSVersionIsHigherOrEqualTo(11, 1)? "rdb$default_source, rdb$null_flag, rdb$parameter_mechanism, rdb$FIELD_NAME, rdb$RELATION_NAME, ": "null, null, -1, null, null ";
 	sql += "rdb$description from rdb$procedure_parameters "
 		"where rdb$procedure_name = ? ";
     sql += db->getInfo().getODSVersionIsHigherOrEqualTo(12, 0) ? " and rdb$package_name is null " : "";
@@ -108,7 +108,18 @@ void Procedure::loadChildren()
             st1->Get(5, &notNull);
         if (!st1->IsNull(6))
             st1->Get(6, mechanism);
-        bool hasDescription = !st1->IsNull(7);
+        wxString field;
+        if (!st1->IsNull(7)){
+            st1->Get(7, s);
+            field = std2wxIdentifier(s, converter);
+        }
+        wxString relation;
+        if (!st1->IsNull(8)) {
+            st1->Get(8, s);
+            relation = std2wxIdentifier(s, converter);
+        }
+
+        bool hasDescription = !st1->IsNull(9);
 
         ParameterPtr par = findParameter(param_name);
         if (!par)
@@ -118,7 +129,7 @@ void Procedure::loadChildren()
         }
         parameters.push_back(par);
         par->initialize(source, partype, mechanism, !notNull, defaultSrc,
-            hasDefault, hasDescription);
+            hasDefault, hasDescription, relation, field);
     }
 
     setChildrenLoaded(true);
@@ -357,8 +368,9 @@ wxString Procedure::getAlterSql(bool full)
                 else
                 {
                     if ((*it)->getMechanism() == 1)
-                        param += "TYPE OF ";
-                    param += dm->getQuotedName();
+                        param += (*it)->getTypeOf();
+                    else
+                        param += dm->getQuotedName();
                 }
             }
             else
@@ -545,8 +557,9 @@ void Procedures::acceptVisitor(MetadataItemVisitor* visitor)
 void Procedures::load(ProgressIndicator* progressIndicator)
 {
     wxString stmt = "select rdb$procedure_name from rdb$procedures"
-        " where (rdb$system_flag = 0 or rdb$system_flag is null)"
-        " order by 1";
+        " where (rdb$system_flag = 0 or rdb$system_flag is null)";
+    stmt += getDatabase()->getInfo().getODSVersionIsHigherOrEqualTo(12, 0) ? " and rdb$package_name is null " : " ";
+    stmt += " order by 1";
     setItems(getDatabase()->loadIdentifiers(stmt, progressIndicator));
 }
 
diff --git a/src/metadata/relation.h b/src/metadata/relation.h
index 75cfce720..76b1e9fd0 100644
--- a/src/metadata/relation.h
+++ b/src/metadata/relation.h
@@ -39,7 +39,6 @@ class Relation: public MetadataItem
     int relationTypeM;
     wxString ownerM;
     wxString sqlSecurityM;
-    bool identityM;
 protected:
     void getDependentChecks(std::vector<CheckConstraint>& checks);
     void getDependentViews(std::vector<Relation*>& views,
diff --git a/src/metadata/view.cpp b/src/metadata/view.cpp
index 9831b7a16..a6a3ade1d 100644
--- a/src/metadata/view.cpp
+++ b/src/metadata/view.cpp
@@ -75,6 +75,30 @@ wxString View::getCreateSql()
     return sb;
 }
 
+wxString View::getAlterSql()
+{
+    ensureChildrenLoaded();
+
+    StatementBuilder sb;
+    sb << kwALTER << ' ' << kwVIEW << ' ' << getQuotedName() << " ("
+        << StatementBuilder::IncIndent;
+
+    // make sure that line breaking occurs after comma, not before
+    ColumnPtrs::const_iterator it = columnsM.begin();
+    wxString colName = (*it)->getQuotedName();
+    for (++it; it != columnsM.end(); ++it)
+    {
+        sb << colName + ", ";
+        colName = (*it)->getQuotedName();
+    }
+    sb << colName;
+
+    sb << ')' << StatementBuilder::DecIndent << StatementBuilder::NewLine
+        << kwAS << ' ' << StatementBuilder::DisableLineWrapping
+        << getSource() << ';' << StatementBuilder::NewLine;
+    return sb;
+}
+
 const wxString View::getTypeName() const
 {
     return "VIEW";
diff --git a/src/metadata/view.h b/src/metadata/view.h
index 2cda81789..a6a266556 100644
--- a/src/metadata/view.h
+++ b/src/metadata/view.h
@@ -41,6 +41,7 @@ class View: public Relation
 
     wxString getSource();
     wxString getCreateSql();
+    wxString getAlterSql();
     virtual const wxString getTypeName() const;
     virtual void acceptVisitor(MetadataItemVisitor* visitor);
 };