diff --git a/vms/build.com b/vms/build.com
index 06467b3..944918f 100644
--- a/vms/build.com
+++ b/vms/build.com
@@ -3,26 +3,6 @@ $ then
 $	write sys$output "CC [.src]color.obj"
 $	cc /include_directory=("./include","./src") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src]color.obj [.src]color.c
 $ endif
-$ if f$search("[.src]draw.obj;*") .eqs. ""
-$ then
-$	write sys$output "CC [.src]draw.obj"
-$	cc /include_directory=("./include","./src") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src]draw.obj [.src]draw.c
-$ endif
-$ if f$search("[.src]lowlevel.obj;*") .eqs. ""
-$ then
-$	write sys$output "CC [.src]lowlevel.obj"
-$	cc /include_directory=("./include","./src") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src]lowlevel.obj [.src]lowlevel.c
-$ endif
-$ if f$search("[.src]string.obj;*") .eqs. ""
-$ then
-$	write sys$output "CC [.src]string.obj"
-$	cc /include_directory=("./include","./src") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src]string.obj [.src]string.c
-$ endif
-$ if f$search("[.src]unicode.obj;*") .eqs. ""
-$ then
-$	write sys$output "CC [.src]unicode.obj"
-$	cc /include_directory=("./include","./src") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src]unicode.obj [.src]unicode.c
-$ endif
 $ if f$search("[.src]core.obj;*") .eqs. ""
 $ then
 $	write sys$output "CC [.src]core.obj"
@@ -33,10 +13,25 @@ $ then
 $	write sys$output "CC [.src]default.obj"
 $	cc /include_directory=("./include","./src") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src]default.obj [.src]default.c
 $ endif
-$ if f$search("[.src.cursor]hidden.obj;*") .eqs. ""
+$ if f$search("[.src]draw.obj;*") .eqs. ""
 $ then
-$	write sys$output "CC [.src.cursor]hidden.obj"
-$	cc /include_directory=("./include","./src/cursor") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.cursor]hidden.obj [.src.cursor]hidden.c
+$	write sys$output "CC [.src]draw.obj"
+$	cc /include_directory=("./include","./src") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src]draw.obj [.src]draw.c
+$ endif
+$ if f$search("[.src]string.obj;*") .eqs. ""
+$ then
+$	write sys$output "CC [.src]string.obj"
+$	cc /include_directory=("./include","./src") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src]string.obj [.src]string.c
+$ endif
+$ if f$search("[.src]lowlevel.obj;*") .eqs. ""
+$ then
+$	write sys$output "CC [.src]lowlevel.obj"
+$	cc /include_directory=("./include","./src") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src]lowlevel.obj [.src]lowlevel.c
+$ endif
+$ if f$search("[.src]unicode.obj;*") .eqs. ""
+$ then
+$	write sys$output "CC [.src]unicode.obj"
+$	cc /include_directory=("./include","./src") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src]unicode.obj [.src]unicode.c
 $ endif
 $ if f$search("[.src.cursor]arrow.obj;*") .eqs. ""
 $ then
@@ -48,40 +43,80 @@ $ then
 $	write sys$output "CC [.src.cursor]cross.obj"
 $	cc /include_directory=("./include","./src/cursor") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.cursor]cross.obj [.src.cursor]cross.c
 $ endif
-$ if f$search("[.src.cursor]text.obj;*") .eqs. ""
-$ then
-$	write sys$output "CC [.src.cursor]text.obj"
-$	cc /include_directory=("./include","./src/cursor") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.cursor]text.obj [.src.cursor]text.c
-$ endif
 $ if f$search("[.src.cursor]default.obj;*") .eqs. ""
 $ then
 $	write sys$output "CC [.src.cursor]default.obj"
 $	cc /include_directory=("./include","./src/cursor") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.cursor]default.obj [.src.cursor]default.c
 $ endif
-$ if f$search("[.src.widget]menu.obj;*") .eqs. ""
+$ if f$search("[.src.cursor]hidden.obj;*") .eqs. ""
 $ then
-$	write sys$output "CC [.src.widget]menu.obj"
-$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]menu.obj [.src.widget]menu.c
+$	write sys$output "CC [.src.cursor]hidden.obj"
+$	cc /include_directory=("./include","./src/cursor") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.cursor]hidden.obj [.src.cursor]hidden.c
+$ endif
+$ if f$search("[.src.cursor]text.obj;*") .eqs. ""
+$ then
+$	write sys$output "CC [.src.cursor]text.obj"
+$	cc /include_directory=("./include","./src/cursor") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.cursor]text.obj [.src.cursor]text.c
+$ endif
+$ if f$search("[.src.widget]box.obj;*") .eqs. ""
+$ then
+$	write sys$output "CC [.src.widget]box.obj"
+$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]box.obj [.src.widget]box.c
+$ endif
+$ if f$search("[.src.widget]button.obj;*") .eqs. ""
+$ then
+$	write sys$output "CC [.src.widget]button.obj"
+$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]button.obj [.src.widget]button.c
+$ endif
+$ if f$search("[.src.widget]checkbox.obj;*") .eqs. ""
+$ then
+$	write sys$output "CC [.src.widget]checkbox.obj"
+$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]checkbox.obj [.src.widget]checkbox.c
+$ endif
+$ if f$search("[.src.widget]combobox.obj;*") .eqs. ""
+$ then
+$	write sys$output "CC [.src.widget]combobox.obj"
+$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]combobox.obj [.src.widget]combobox.c
+$ endif
+$ if f$search("[.src.widget]entry.obj;*") .eqs. ""
+$ then
+$	write sys$output "CC [.src.widget]entry.obj"
+$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]entry.obj [.src.widget]entry.c
+$ endif
+$ if f$search("[.src.widget]frame.obj;*") .eqs. ""
+$ then
+$	write sys$output "CC [.src.widget]frame.obj"
+$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]frame.obj [.src.widget]frame.c
 $ endif
 $ if f$search("[.src.widget]image.obj;*") .eqs. ""
 $ then
 $	write sys$output "CC [.src.widget]image.obj"
 $	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]image.obj [.src.widget]image.c
 $ endif
-$ if f$search("[.src.widget]viewport.obj;*") .eqs. ""
+$ if f$search("[.src.widget]label.obj;*") .eqs. ""
 $ then
-$	write sys$output "CC [.src.widget]viewport.obj"
-$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]viewport.obj [.src.widget]viewport.c
+$	write sys$output "CC [.src.widget]label.obj"
+$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]label.obj [.src.widget]label.c
 $ endif
-$ if f$search("[.src.widget]treeview.obj;*") .eqs. ""
+$ if f$search("[.src.widget]listbox.obj;*") .eqs. ""
 $ then
-$	write sys$output "CC [.src.widget]treeview.obj"
-$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]treeview.obj [.src.widget]treeview.c
+$	write sys$output "CC [.src.widget]listbox.obj"
+$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]listbox.obj [.src.widget]listbox.c
 $ endif
-$ if f$search("[.src.widget]button.obj;*") .eqs. ""
+$ if f$search("[.src.widget]menu.obj;*") .eqs. ""
 $ then
-$	write sys$output "CC [.src.widget]button.obj"
-$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]button.obj [.src.widget]button.c
+$	write sys$output "CC [.src.widget]menu.obj"
+$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]menu.obj [.src.widget]menu.c
+$ endif
+$ if f$search("[.src.widget]numberentry.obj;*") .eqs. ""
+$ then
+$	write sys$output "CC [.src.widget]numberentry.obj"
+$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]numberentry.obj [.src.widget]numberentry.c
+$ endif
+$ if f$search("[.src.widget]progressbar.obj;*") .eqs. ""
+$ then
+$	write sys$output "CC [.src.widget]progressbar.obj"
+$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]progressbar.obj [.src.widget]progressbar.c
 $ endif
 $ if f$search("[.src.widget]radiobox.obj;*") .eqs. ""
 $ then
@@ -93,65 +128,45 @@ $ then
 $	write sys$output "CC [.src.widget]scrollbar.obj"
 $	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]scrollbar.obj [.src.widget]scrollbar.c
 $ endif
-$ if f$search("[.src.widget]progressbar.obj;*") .eqs. ""
+$ if f$search("[.src.widget]separator.obj;*") .eqs. ""
 $ then
-$	write sys$output "CC [.src.widget]progressbar.obj"
-$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]progressbar.obj [.src.widget]progressbar.c
+$	write sys$output "CC [.src.widget]separator.obj"
+$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]separator.obj [.src.widget]separator.c
 $ endif
 $ if f$search("[.src.widget]submenu.obj;*") .eqs. ""
 $ then
 $	write sys$output "CC [.src.widget]submenu.obj"
 $	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]submenu.obj [.src.widget]submenu.c
 $ endif
-$ if f$search("[.src.widget]checkbox.obj;*") .eqs. ""
+$ if f$search("[.src.widget]treeview.obj;*") .eqs. ""
 $ then
-$	write sys$output "CC [.src.widget]checkbox.obj"
-$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]checkbox.obj [.src.widget]checkbox.c
+$	write sys$output "CC [.src.widget]treeview.obj"
+$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]treeview.obj [.src.widget]treeview.c
 $ endif
-$ if f$search("[.src.widget]entry.obj;*") .eqs. ""
+$ if f$search("[.src.widget]viewport.obj;*") .eqs. ""
 $ then
-$	write sys$output "CC [.src.widget]entry.obj"
-$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]entry.obj [.src.widget]entry.c
+$	write sys$output "CC [.src.widget]viewport.obj"
+$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]viewport.obj [.src.widget]viewport.c
 $ endif
 $ if f$search("[.src.widget]window.obj;*") .eqs. ""
 $ then
 $	write sys$output "CC [.src.widget]window.obj"
 $	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]window.obj [.src.widget]window.c
 $ endif
-$ if f$search("[.src.widget]label.obj;*") .eqs. ""
+$ if f$search("[.src.widget]subwindow.obj;*") .eqs. ""
 $ then
-$	write sys$output "CC [.src.widget]label.obj"
-$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]label.obj [.src.widget]label.c
+$	write sys$output "CC [.src.widget]subwindow.obj"
+$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]subwindow.obj [.src.widget]subwindow.c
 $ endif
-$ if f$search("[.src.widget]separator.obj;*") .eqs. ""
+$ if f$search("[.src.widget]calendar.obj;*") .eqs. ""
 $ then
-$	write sys$output "CC [.src.widget]separator.obj"
-$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]separator.obj [.src.widget]separator.c
+$	write sys$output "CC [.src.widget]calendar.obj"
+$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]calendar.obj [.src.widget]calendar.c
 $ endif
-$ if f$search("[.src.widget]combobox.obj;*") .eqs. ""
+$ if f$search("[.src.dialog]colorpicker.obj;*") .eqs. ""
 $ then
-$	write sys$output "CC [.src.widget]combobox.obj"
-$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]combobox.obj [.src.widget]combobox.c
-$ endif
-$ if f$search("[.src.widget]numberentry.obj;*") .eqs. ""
-$ then
-$	write sys$output "CC [.src.widget]numberentry.obj"
-$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]numberentry.obj [.src.widget]numberentry.c
-$ endif
-$ if f$search("[.src.widget]frame.obj;*") .eqs. ""
-$ then
-$	write sys$output "CC [.src.widget]frame.obj"
-$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]frame.obj [.src.widget]frame.c
-$ endif
-$ if f$search("[.src.widget]listbox.obj;*") .eqs. ""
-$ then
-$	write sys$output "CC [.src.widget]listbox.obj"
-$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]listbox.obj [.src.widget]listbox.c
-$ endif
-$ if f$search("[.src.widget]box.obj;*") .eqs. ""
-$ then
-$	write sys$output "CC [.src.widget]box.obj"
-$	cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]box.obj [.src.widget]box.c
+$	write sys$output "CC [.src.dialog]colorpicker.obj"
+$	cc /include_directory=("./include","./src/dialog") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.dialog]colorpicker.obj [.src.dialog]colorpicker.c
 $ endif
 $ if f$search("[.src.dialog]directorychooser.obj;*") .eqs. ""
 $ then
@@ -168,81 +183,71 @@ $ then
 $	write sys$output "CC [.src.dialog]messagebox.obj"
 $	cc /include_directory=("./include","./src/dialog") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.dialog]messagebox.obj [.src.dialog]messagebox.c
 $ endif
-$ if f$search("[.src.dialog]colorpicker.obj;*") .eqs. ""
+$ if f$search("[.src.icon]back.obj;*") .eqs. ""
 $ then
-$	write sys$output "CC [.src.dialog]colorpicker.obj"
-$	cc /include_directory=("./include","./src/dialog") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.dialog]colorpicker.obj [.src.dialog]colorpicker.c
-$ endif
-$ if f$search("[.src.icon]right.obj;*") .eqs. ""
-$ then
-$	write sys$output "CC [.src.icon]right.obj"
-$	cc /include_directory=("./include","./src/icon") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.icon]right.obj [.src.icon]right.c
-$ endif
-$ if f$search("[.src.icon]info.obj;*") .eqs. ""
-$ then
-$	write sys$output "CC [.src.icon]info.obj"
-$	cc /include_directory=("./include","./src/icon") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.icon]info.obj [.src.icon]info.c
-$ endif
-$ if f$search("[.src.icon]computer.obj;*") .eqs. ""
-$ then
-$	write sys$output "CC [.src.icon]computer.obj"
-$	cc /include_directory=("./include","./src/icon") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.icon]computer.obj [.src.icon]computer.c
-$ endif
-$ if f$search("[.src.icon]forward.obj;*") .eqs. ""
-$ then
-$	write sys$output "CC [.src.icon]forward.obj"
-$	cc /include_directory=("./include","./src/icon") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.icon]forward.obj [.src.icon]forward.c
-$ endif
-$ if f$search("[.src.icon]left.obj;*") .eqs. ""
-$ then
-$	write sys$output "CC [.src.icon]left.obj"
-$	cc /include_directory=("./include","./src/icon") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.icon]left.obj [.src.icon]left.c
+$	write sys$output "CC [.src.icon]back.obj"
+$	cc /include_directory=("./include","./src/icon") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.icon]back.obj [.src.icon]back.c
 $ endif
 $ if f$search("[.src.icon]clock.obj;*") .eqs. ""
 $ then
 $	write sys$output "CC [.src.icon]clock.obj"
 $	cc /include_directory=("./include","./src/icon") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.icon]clock.obj [.src.icon]clock.c
 $ endif
-$ if f$search("[.src.icon]warning.obj;*") .eqs. ""
+$ if f$search("[.src.icon]computer.obj;*") .eqs. ""
 $ then
-$	write sys$output "CC [.src.icon]warning.obj"
-$	cc /include_directory=("./include","./src/icon") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.icon]warning.obj [.src.icon]warning.c
+$	write sys$output "CC [.src.icon]computer.obj"
+$	cc /include_directory=("./include","./src/icon") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.icon]computer.obj [.src.icon]computer.c
 $ endif
 $ if f$search("[.src.icon]directory.obj;*") .eqs. ""
 $ then
 $	write sys$output "CC [.src.icon]directory.obj"
 $	cc /include_directory=("./include","./src/icon") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.icon]directory.obj [.src.icon]directory.c
 $ endif
-$ if f$search("[.src.icon]file.obj;*") .eqs. ""
-$ then
-$	write sys$output "CC [.src.icon]file.obj"
-$	cc /include_directory=("./include","./src/icon") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.icon]file.obj [.src.icon]file.c
-$ endif
-$ if f$search("[.src.icon]back.obj;*") .eqs. ""
-$ then
-$	write sys$output "CC [.src.icon]back.obj"
-$	cc /include_directory=("./include","./src/icon") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.icon]back.obj [.src.icon]back.c
-$ endif
 $ if f$search("[.src.icon]down.obj;*") .eqs. ""
 $ then
 $	write sys$output "CC [.src.icon]down.obj"
 $	cc /include_directory=("./include","./src/icon") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.icon]down.obj [.src.icon]down.c
 $ endif
-$ if f$search("[.src.icon]news.obj;*") .eqs. ""
-$ then
-$	write sys$output "CC [.src.icon]news.obj"
-$	cc /include_directory=("./include","./src/icon") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.icon]news.obj [.src.icon]news.c
-$ endif
 $ if f$search("[.src.icon]error.obj;*") .eqs. ""
 $ then
 $	write sys$output "CC [.src.icon]error.obj"
 $	cc /include_directory=("./include","./src/icon") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.icon]error.obj [.src.icon]error.c
 $ endif
+$ if f$search("[.src.icon]file.obj;*") .eqs. ""
+$ then
+$	write sys$output "CC [.src.icon]file.obj"
+$	cc /include_directory=("./include","./src/icon") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.icon]file.obj [.src.icon]file.c
+$ endif
+$ if f$search("[.src.icon]forward.obj;*") .eqs. ""
+$ then
+$	write sys$output "CC [.src.icon]forward.obj"
+$	cc /include_directory=("./include","./src/icon") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.icon]forward.obj [.src.icon]forward.c
+$ endif
+$ if f$search("[.src.icon]info.obj;*") .eqs. ""
+$ then
+$	write sys$output "CC [.src.icon]info.obj"
+$	cc /include_directory=("./include","./src/icon") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.icon]info.obj [.src.icon]info.c
+$ endif
+$ if f$search("[.src.icon]left.obj;*") .eqs. ""
+$ then
+$	write sys$output "CC [.src.icon]left.obj"
+$	cc /include_directory=("./include","./src/icon") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.icon]left.obj [.src.icon]left.c
+$ endif
+$ if f$search("[.src.icon]news.obj;*") .eqs. ""
+$ then
+$	write sys$output "CC [.src.icon]news.obj"
+$	cc /include_directory=("./include","./src/icon") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.icon]news.obj [.src.icon]news.c
+$ endif
 $ if f$search("[.src.icon]note.obj;*") .eqs. ""
 $ then
 $	write sys$output "CC [.src.icon]note.obj"
 $	cc /include_directory=("./include","./src/icon") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.icon]note.obj [.src.icon]note.c
 $ endif
+$ if f$search("[.src.icon]right.obj;*") .eqs. ""
+$ then
+$	write sys$output "CC [.src.icon]right.obj"
+$	cc /include_directory=("./include","./src/icon") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.icon]right.obj [.src.icon]right.c
+$ endif
 $ if f$search("[.src.icon]search.obj;*") .eqs. ""
 $ then
 $	write sys$output "CC [.src.icon]search.obj"
@@ -253,10 +258,10 @@ $ then
 $	write sys$output "CC [.src.icon]up.obj"
 $	cc /include_directory=("./include","./src/icon") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.icon]up.obj [.src.icon]up.c
 $ endif
-$ if f$search("[.src.abstract]time.obj;*") .eqs. ""
+$ if f$search("[.src.icon]warning.obj;*") .eqs. ""
 $ then
-$	write sys$output "CC [.src.abstract]time.obj"
-$	cc /include_directory=("./include","./src/abstract") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.abstract]time.obj [.src.abstract]time.c
+$	write sys$output "CC [.src.icon]warning.obj"
+$	cc /include_directory=("./include","./src/icon") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.icon]warning.obj [.src.icon]warning.c
 $ endif
 $ if f$search("[.src.abstract]directory.obj;*") .eqs. ""
 $ then
@@ -268,6 +273,16 @@ $ then
 $	write sys$output "CC [.src.abstract]dynamic.obj"
 $	cc /include_directory=("./include","./src/abstract") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.abstract]dynamic.obj [.src.abstract]dynamic.c
 $ endif
+$ if f$search("[.src.abstract]time.obj;*") .eqs. ""
+$ then
+$	write sys$output "CC [.src.abstract]time.obj"
+$	cc /include_directory=("./include","./src/abstract") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.abstract]time.obj [.src.abstract]time.c
+$ endif
+$ if f$search("[.src.abstract]charset.obj;*") .eqs. ""
+$ then
+$	write sys$output "CC [.src.abstract]charset.obj"
+$	cc /include_directory=("./include","./src/abstract") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.abstract]charset.obj [.src.abstract]charset.c
+$ endif
 $ if f$search("[.external]stb_ds.obj;*") .eqs. ""
 $ then
 $	write sys$output "CC [.external]stb_ds.obj"
@@ -283,59 +298,62 @@ $ then
 $	write sys$output "LINK [.src]MwSHR.exe"
 $	OPEN /WRITE LINK_OPT LINK.OPT
 $	WRITE LINK_OPT "[.src]color.obj"
-$	WRITE LINK_OPT "[.src]draw.obj"
-$	WRITE LINK_OPT "[.src]lowlevel.obj"
-$	WRITE LINK_OPT "[.src]string.obj"
-$	WRITE LINK_OPT "[.src]unicode.obj"
 $	WRITE LINK_OPT "[.src]core.obj"
 $	WRITE LINK_OPT "[.src]default.obj"
-$	WRITE LINK_OPT "[.src.cursor]hidden.obj"
+$	WRITE LINK_OPT "[.src]draw.obj"
+$	WRITE LINK_OPT "[.src]string.obj"
+$	WRITE LINK_OPT "[.src]lowlevel.obj"
+$	WRITE LINK_OPT "[.src]unicode.obj"
 $	WRITE LINK_OPT "[.src.cursor]arrow.obj"
 $	WRITE LINK_OPT "[.src.cursor]cross.obj"
-$	WRITE LINK_OPT "[.src.cursor]text.obj"
 $	WRITE LINK_OPT "[.src.cursor]default.obj"
-$	WRITE LINK_OPT "[.src.widget]menu.obj"
-$	WRITE LINK_OPT "[.src.widget]image.obj"
-$	WRITE LINK_OPT "[.src.widget]viewport.obj"
-$	WRITE LINK_OPT "[.src.widget]treeview.obj"
+$	WRITE LINK_OPT "[.src.cursor]hidden.obj"
+$	WRITE LINK_OPT "[.src.cursor]text.obj"
+$	WRITE LINK_OPT "[.src.widget]box.obj"
 $	WRITE LINK_OPT "[.src.widget]button.obj"
+$	WRITE LINK_OPT "[.src.widget]checkbox.obj"
+$	WRITE LINK_OPT "[.src.widget]combobox.obj"
+$	WRITE LINK_OPT "[.src.widget]entry.obj"
+$	WRITE LINK_OPT "[.src.widget]frame.obj"
+$	WRITE LINK_OPT "[.src.widget]image.obj"
+$	WRITE LINK_OPT "[.src.widget]label.obj"
+$	WRITE LINK_OPT "[.src.widget]listbox.obj"
+$	WRITE LINK_OPT "[.src.widget]menu.obj"
+$	WRITE LINK_OPT "[.src.widget]numberentry.obj"
+$	WRITE LINK_OPT "[.src.widget]progressbar.obj"
 $	WRITE LINK_OPT "[.src.widget]radiobox.obj"
 $	WRITE LINK_OPT "[.src.widget]scrollbar.obj"
-$	WRITE LINK_OPT "[.src.widget]progressbar.obj"
-$	WRITE LINK_OPT "[.src.widget]submenu.obj"
-$	WRITE LINK_OPT "[.src.widget]checkbox.obj"
-$	WRITE LINK_OPT "[.src.widget]entry.obj"
-$	WRITE LINK_OPT "[.src.widget]window.obj"
-$	WRITE LINK_OPT "[.src.widget]label.obj"
 $	WRITE LINK_OPT "[.src.widget]separator.obj"
-$	WRITE LINK_OPT "[.src.widget]combobox.obj"
-$	WRITE LINK_OPT "[.src.widget]numberentry.obj"
-$	WRITE LINK_OPT "[.src.widget]frame.obj"
-$	WRITE LINK_OPT "[.src.widget]listbox.obj"
-$	WRITE LINK_OPT "[.src.widget]box.obj"
+$	WRITE LINK_OPT "[.src.widget]submenu.obj"
+$	WRITE LINK_OPT "[.src.widget]treeview.obj"
+$	WRITE LINK_OPT "[.src.widget]viewport.obj"
+$	WRITE LINK_OPT "[.src.widget]window.obj"
+$	WRITE LINK_OPT "[.src.widget]subwindow.obj"
+$	WRITE LINK_OPT "[.src.widget]calendar.obj"
+$	WRITE LINK_OPT "[.src.dialog]colorpicker.obj"
 $	WRITE LINK_OPT "[.src.dialog]directorychooser.obj"
 $	WRITE LINK_OPT "[.src.dialog]filechooser.obj"
 $	WRITE LINK_OPT "[.src.dialog]messagebox.obj"
-$	WRITE LINK_OPT "[.src.dialog]colorpicker.obj"
-$	WRITE LINK_OPT "[.src.icon]right.obj"
-$	WRITE LINK_OPT "[.src.icon]info.obj"
-$	WRITE LINK_OPT "[.src.icon]computer.obj"
-$	WRITE LINK_OPT "[.src.icon]forward.obj"
-$	WRITE LINK_OPT "[.src.icon]left.obj"
-$	WRITE LINK_OPT "[.src.icon]clock.obj"
-$	WRITE LINK_OPT "[.src.icon]warning.obj"
-$	WRITE LINK_OPT "[.src.icon]directory.obj"
-$	WRITE LINK_OPT "[.src.icon]file.obj"
 $	WRITE LINK_OPT "[.src.icon]back.obj"
+$	WRITE LINK_OPT "[.src.icon]clock.obj"
+$	WRITE LINK_OPT "[.src.icon]computer.obj"
+$	WRITE LINK_OPT "[.src.icon]directory.obj"
 $	WRITE LINK_OPT "[.src.icon]down.obj"
-$	WRITE LINK_OPT "[.src.icon]news.obj"
 $	WRITE LINK_OPT "[.src.icon]error.obj"
+$	WRITE LINK_OPT "[.src.icon]file.obj"
+$	WRITE LINK_OPT "[.src.icon]forward.obj"
+$	WRITE LINK_OPT "[.src.icon]info.obj"
+$	WRITE LINK_OPT "[.src.icon]left.obj"
+$	WRITE LINK_OPT "[.src.icon]news.obj"
 $	WRITE LINK_OPT "[.src.icon]note.obj"
+$	WRITE LINK_OPT "[.src.icon]right.obj"
 $	WRITE LINK_OPT "[.src.icon]search.obj"
 $	WRITE LINK_OPT "[.src.icon]up.obj"
-$	WRITE LINK_OPT "[.src.abstract]time.obj"
+$	WRITE LINK_OPT "[.src.icon]warning.obj"
 $	WRITE LINK_OPT "[.src.abstract]directory.obj"
 $	WRITE LINK_OPT "[.src.abstract]dynamic.obj"
+$	WRITE LINK_OPT "[.src.abstract]time.obj"
+$	WRITE LINK_OPT "[.src.abstract]charset.obj"
 $	WRITE LINK_OPT "[.external]stb_ds.obj"
 $	WRITE LINK_OPT "[.src.backend]x11.obj"
 $	WRITE LINK_OPT "SYS$LIBRARY:DECW$XLIBSHR/SHARE"
diff --git a/vms/clean.com b/vms/clean.com
index 45b54d4..da1ffb3 100644
--- a/vms/clean.com
+++ b/vms/clean.com
@@ -1,57 +1,60 @@
 $ if f$search("[.src]color.obj") .nes. "" then delete [.src]color.obj;*
-$ if f$search("[.src]draw.obj") .nes. "" then delete [.src]draw.obj;*
-$ if f$search("[.src]lowlevel.obj") .nes. "" then delete [.src]lowlevel.obj;*
-$ if f$search("[.src]string.obj") .nes. "" then delete [.src]string.obj;*
-$ if f$search("[.src]unicode.obj") .nes. "" then delete [.src]unicode.obj;*
 $ if f$search("[.src]core.obj") .nes. "" then delete [.src]core.obj;*
 $ if f$search("[.src]default.obj") .nes. "" then delete [.src]default.obj;*
-$ if f$search("[.src.cursor]hidden.obj") .nes. "" then delete [.src.cursor]hidden.obj;*
+$ if f$search("[.src]draw.obj") .nes. "" then delete [.src]draw.obj;*
+$ if f$search("[.src]string.obj") .nes. "" then delete [.src]string.obj;*
+$ if f$search("[.src]lowlevel.obj") .nes. "" then delete [.src]lowlevel.obj;*
+$ if f$search("[.src]unicode.obj") .nes. "" then delete [.src]unicode.obj;*
 $ if f$search("[.src.cursor]arrow.obj") .nes. "" then delete [.src.cursor]arrow.obj;*
 $ if f$search("[.src.cursor]cross.obj") .nes. "" then delete [.src.cursor]cross.obj;*
-$ if f$search("[.src.cursor]text.obj") .nes. "" then delete [.src.cursor]text.obj;*
 $ if f$search("[.src.cursor]default.obj") .nes. "" then delete [.src.cursor]default.obj;*
-$ if f$search("[.src.widget]menu.obj") .nes. "" then delete [.src.widget]menu.obj;*
-$ if f$search("[.src.widget]image.obj") .nes. "" then delete [.src.widget]image.obj;*
-$ if f$search("[.src.widget]viewport.obj") .nes. "" then delete [.src.widget]viewport.obj;*
-$ if f$search("[.src.widget]treeview.obj") .nes. "" then delete [.src.widget]treeview.obj;*
+$ if f$search("[.src.cursor]hidden.obj") .nes. "" then delete [.src.cursor]hidden.obj;*
+$ if f$search("[.src.cursor]text.obj") .nes. "" then delete [.src.cursor]text.obj;*
+$ if f$search("[.src.widget]box.obj") .nes. "" then delete [.src.widget]box.obj;*
 $ if f$search("[.src.widget]button.obj") .nes. "" then delete [.src.widget]button.obj;*
+$ if f$search("[.src.widget]checkbox.obj") .nes. "" then delete [.src.widget]checkbox.obj;*
+$ if f$search("[.src.widget]combobox.obj") .nes. "" then delete [.src.widget]combobox.obj;*
+$ if f$search("[.src.widget]entry.obj") .nes. "" then delete [.src.widget]entry.obj;*
+$ if f$search("[.src.widget]frame.obj") .nes. "" then delete [.src.widget]frame.obj;*
+$ if f$search("[.src.widget]image.obj") .nes. "" then delete [.src.widget]image.obj;*
+$ if f$search("[.src.widget]label.obj") .nes. "" then delete [.src.widget]label.obj;*
+$ if f$search("[.src.widget]listbox.obj") .nes. "" then delete [.src.widget]listbox.obj;*
+$ if f$search("[.src.widget]menu.obj") .nes. "" then delete [.src.widget]menu.obj;*
+$ if f$search("[.src.widget]numberentry.obj") .nes. "" then delete [.src.widget]numberentry.obj;*
+$ if f$search("[.src.widget]progressbar.obj") .nes. "" then delete [.src.widget]progressbar.obj;*
 $ if f$search("[.src.widget]radiobox.obj") .nes. "" then delete [.src.widget]radiobox.obj;*
 $ if f$search("[.src.widget]scrollbar.obj") .nes. "" then delete [.src.widget]scrollbar.obj;*
-$ if f$search("[.src.widget]progressbar.obj") .nes. "" then delete [.src.widget]progressbar.obj;*
-$ if f$search("[.src.widget]submenu.obj") .nes. "" then delete [.src.widget]submenu.obj;*
-$ if f$search("[.src.widget]checkbox.obj") .nes. "" then delete [.src.widget]checkbox.obj;*
-$ if f$search("[.src.widget]entry.obj") .nes. "" then delete [.src.widget]entry.obj;*
-$ if f$search("[.src.widget]window.obj") .nes. "" then delete [.src.widget]window.obj;*
-$ if f$search("[.src.widget]label.obj") .nes. "" then delete [.src.widget]label.obj;*
 $ if f$search("[.src.widget]separator.obj") .nes. "" then delete [.src.widget]separator.obj;*
-$ if f$search("[.src.widget]combobox.obj") .nes. "" then delete [.src.widget]combobox.obj;*
-$ if f$search("[.src.widget]numberentry.obj") .nes. "" then delete [.src.widget]numberentry.obj;*
-$ if f$search("[.src.widget]frame.obj") .nes. "" then delete [.src.widget]frame.obj;*
-$ if f$search("[.src.widget]listbox.obj") .nes. "" then delete [.src.widget]listbox.obj;*
-$ if f$search("[.src.widget]box.obj") .nes. "" then delete [.src.widget]box.obj;*
+$ if f$search("[.src.widget]submenu.obj") .nes. "" then delete [.src.widget]submenu.obj;*
+$ if f$search("[.src.widget]treeview.obj") .nes. "" then delete [.src.widget]treeview.obj;*
+$ if f$search("[.src.widget]viewport.obj") .nes. "" then delete [.src.widget]viewport.obj;*
+$ if f$search("[.src.widget]window.obj") .nes. "" then delete [.src.widget]window.obj;*
+$ if f$search("[.src.widget]subwindow.obj") .nes. "" then delete [.src.widget]subwindow.obj;*
+$ if f$search("[.src.widget]calendar.obj") .nes. "" then delete [.src.widget]calendar.obj;*
+$ if f$search("[.src.dialog]colorpicker.obj") .nes. "" then delete [.src.dialog]colorpicker.obj;*
 $ if f$search("[.src.dialog]directorychooser.obj") .nes. "" then delete [.src.dialog]directorychooser.obj;*
 $ if f$search("[.src.dialog]filechooser.obj") .nes. "" then delete [.src.dialog]filechooser.obj;*
 $ if f$search("[.src.dialog]messagebox.obj") .nes. "" then delete [.src.dialog]messagebox.obj;*
-$ if f$search("[.src.dialog]colorpicker.obj") .nes. "" then delete [.src.dialog]colorpicker.obj;*
-$ if f$search("[.src.icon]right.obj") .nes. "" then delete [.src.icon]right.obj;*
-$ if f$search("[.src.icon]info.obj") .nes. "" then delete [.src.icon]info.obj;*
-$ if f$search("[.src.icon]computer.obj") .nes. "" then delete [.src.icon]computer.obj;*
-$ if f$search("[.src.icon]forward.obj") .nes. "" then delete [.src.icon]forward.obj;*
-$ if f$search("[.src.icon]left.obj") .nes. "" then delete [.src.icon]left.obj;*
-$ if f$search("[.src.icon]clock.obj") .nes. "" then delete [.src.icon]clock.obj;*
-$ if f$search("[.src.icon]warning.obj") .nes. "" then delete [.src.icon]warning.obj;*
-$ if f$search("[.src.icon]directory.obj") .nes. "" then delete [.src.icon]directory.obj;*
-$ if f$search("[.src.icon]file.obj") .nes. "" then delete [.src.icon]file.obj;*
 $ if f$search("[.src.icon]back.obj") .nes. "" then delete [.src.icon]back.obj;*
+$ if f$search("[.src.icon]clock.obj") .nes. "" then delete [.src.icon]clock.obj;*
+$ if f$search("[.src.icon]computer.obj") .nes. "" then delete [.src.icon]computer.obj;*
+$ if f$search("[.src.icon]directory.obj") .nes. "" then delete [.src.icon]directory.obj;*
 $ if f$search("[.src.icon]down.obj") .nes. "" then delete [.src.icon]down.obj;*
-$ if f$search("[.src.icon]news.obj") .nes. "" then delete [.src.icon]news.obj;*
 $ if f$search("[.src.icon]error.obj") .nes. "" then delete [.src.icon]error.obj;*
+$ if f$search("[.src.icon]file.obj") .nes. "" then delete [.src.icon]file.obj;*
+$ if f$search("[.src.icon]forward.obj") .nes. "" then delete [.src.icon]forward.obj;*
+$ if f$search("[.src.icon]info.obj") .nes. "" then delete [.src.icon]info.obj;*
+$ if f$search("[.src.icon]left.obj") .nes. "" then delete [.src.icon]left.obj;*
+$ if f$search("[.src.icon]news.obj") .nes. "" then delete [.src.icon]news.obj;*
 $ if f$search("[.src.icon]note.obj") .nes. "" then delete [.src.icon]note.obj;*
+$ if f$search("[.src.icon]right.obj") .nes. "" then delete [.src.icon]right.obj;*
 $ if f$search("[.src.icon]search.obj") .nes. "" then delete [.src.icon]search.obj;*
 $ if f$search("[.src.icon]up.obj") .nes. "" then delete [.src.icon]up.obj;*
-$ if f$search("[.src.abstract]time.obj") .nes. "" then delete [.src.abstract]time.obj;*
+$ if f$search("[.src.icon]warning.obj") .nes. "" then delete [.src.icon]warning.obj;*
 $ if f$search("[.src.abstract]directory.obj") .nes. "" then delete [.src.abstract]directory.obj;*
 $ if f$search("[.src.abstract]dynamic.obj") .nes. "" then delete [.src.abstract]dynamic.obj;*
+$ if f$search("[.src.abstract]time.obj") .nes. "" then delete [.src.abstract]time.obj;*
+$ if f$search("[.src.abstract]charset.obj") .nes. "" then delete [.src.abstract]charset.obj;*
 $ if f$search("[.external]stb_ds.obj") .nes. "" then delete [.external]stb_ds.obj;*
 $ if f$search("[.src.backend]x11.obj") .nes. "" then delete [.src.backend]x11.obj;*
 $ if f$search("[.src]MwSHR.exe") .nes. "" then delete [.src]MwSHR.exe;*