diff --git a/BorMakefile b/BorMakefile
index caa66cf37..d1b1cd5f6 100644
--- a/BorMakefile
+++ b/BorMakefile
@@ -7,71 +7,73 @@ LDFLAGS = -tWD
 .SUFFIXES: .obj .c
 all: src\Mw.dll
 clean: 
-	del /f /q src\core.obj
-	del /f /q src\draw.obj
-	del /f /q src\string.obj
-	del /f /q src\text.obj
-	del /f /q src\default.obj
-	del /f /q src\lowlevel.obj
-	del /f /q src\error.obj
-	del /f /q src\unicode.obj
-	del /f /q src\color.obj
 	del /f /q external\stb_ds.obj
 	del /f /q external\stb_image.obj
 	del /f /q external\stb_truetype.obj
-	del /f /q src\icon\info.obj
-	del /f /q src\icon\note.obj
-	del /f /q src\icon\warning.obj
-	del /f /q src\icon\error.obj
-	del /f /q src\icon\news.obj
-	del /f /q src\icon\directory.obj
-	del /f /q src\icon\file.obj
-	del /f /q src\icon\back.obj
-	del /f /q src\icon\forward.obj
-	del /f /q src\icon\up.obj
-	del /f /q src\icon\computer.obj
-	del /f /q src\icon\search.obj
-	del /f /q src\icon\down.obj
-	del /f /q src\icon\left.obj
-	del /f /q src\icon\right.obj
-	del /f /q src\icon\clock.obj
-	del /f /q src\cursor\default.obj
-	del /f /q src\cursor\cross.obj
-	del /f /q src\cursor\text.obj
-	del /f /q src\cursor\hidden.obj
-	del /f /q src\cursor\arrow.obj
-	del /f /q src\widget\button.obj
-	del /f /q src\widget\frame.obj
-	del /f /q src\widget\opengl.obj
-	del /f /q src\widget\window.obj
-	del /f /q src\widget\menu.obj
-	del /f /q src\widget\entry.obj
-	del /f /q src\widget\submenu.obj
-	del /f /q src\widget\viewport.obj
-	del /f /q src\widget\image.obj
-	del /f /q src\widget\scrollbar.obj
-	del /f /q src\widget\checkbox.obj
-	del /f /q src\widget\label.obj
-	del /f /q src\widget\listbox.obj
-	del /f /q src\widget\numberentry.obj
-	del /f /q src\widget\progressbar.obj
-	del /f /q src\widget\radiobox.obj
-	del /f /q src\widget\combobox.obj
-	del /f /q src\font\boldttf.obj
-	del /f /q src\font\ttf.obj
-	del /f /q src\font\boldfont.obj
-	del /f /q src\font\font.obj
-	del /f /q src\dialog\filechooser.obj
-	del /f /q src\dialog\colorpicker.obj
-	del /f /q src\dialog\messagebox.obj
-	del /f /q src\abstract\time.obj
 	del /f /q src\abstract\directory.obj
 	del /f /q src\abstract\dynamic.obj
+	del /f /q src\abstract\time.obj
 	del /f /q src\backend\gdi.obj
+	del /f /q src\color.obj
+	del /f /q src\core.obj
+	del /f /q src\cursor\arrow.obj
+	del /f /q src\cursor\cross.obj
+	del /f /q src\cursor\default.obj
+	del /f /q src\cursor\hidden.obj
+	del /f /q src\cursor\text.obj
+	del /f /q src\default.obj
+	del /f /q src\dialog\colorpicker.obj
+	del /f /q src\dialog\filechooser.obj
+	del /f /q src\dialog\messagebox.obj
+	del /f /q src\draw.obj
+	del /f /q src\error.obj
+	del /f /q src\font\boldfont.obj
+	del /f /q src\font\boldttf.obj
+	del /f /q src\font\font.obj
+	del /f /q src\font\ttf.obj
+	del /f /q src\icon\back.obj
+	del /f /q src\icon\clock.obj
+	del /f /q src\icon\computer.obj
+	del /f /q src\icon\directory.obj
+	del /f /q src\icon\down.obj
+	del /f /q src\icon\error.obj
+	del /f /q src\icon\file.obj
+	del /f /q src\icon\forward.obj
+	del /f /q src\icon\info.obj
+	del /f /q src\icon\left.obj
+	del /f /q src\icon\news.obj
+	del /f /q src\icon\note.obj
+	del /f /q src\icon\right.obj
+	del /f /q src\icon\search.obj
+	del /f /q src\icon\up.obj
+	del /f /q src\icon\warning.obj
+	del /f /q src\lowlevel.obj
+	del /f /q src\string.obj
+	del /f /q src\text.obj
+	del /f /q src\unicode.obj
+	del /f /q src\widget\button.obj
+	del /f /q src\widget\checkbox.obj
+	del /f /q src\widget\combobox.obj
+	del /f /q src\widget\entry.obj
+	del /f /q src\widget\frame.obj
+	del /f /q src\widget\image.obj
+	del /f /q src\widget\label.obj
+	del /f /q src\widget\listbox.obj
+	del /f /q src\widget\menu.obj
+	del /f /q src\widget\numberentry.obj
+	del /f /q src\widget\opengl.obj
+	del /f /q src\widget\progressbar.obj
+	del /f /q src\widget\radiobox.obj
+	del /f /q src\widget\scrollbar.obj
+	del /f /q src\widget\separator.obj
+	del /f /q src\widget\submenu.obj
+	del /f /q src\widget\treeview.obj
+	del /f /q src\widget\viewport.obj
+	del /f /q src\widget\window.obj
 	del /f /q src\Mw.dll
 
-src\Mw.dll:  src\core.obj src\draw.obj src\string.obj src\text.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\icon\clock.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\cursor\arrow.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\widget\radiobox.obj src\widget\combobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\dialog\filechooser.obj src\dialog\colorpicker.obj src\dialog\messagebox.obj src\abstract\time.obj src\abstract\directory.obj src\abstract\dynamic.obj src\backend\gdi.obj
-	$(LD) $(LDFLAGS)  -e$@  src\core.obj src\draw.obj src\string.obj src\text.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\icon\clock.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\cursor\arrow.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\widget\radiobox.obj src\widget\combobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\dialog\filechooser.obj src\dialog\colorpicker.obj src\dialog\messagebox.obj src\abstract\time.obj src\abstract\directory.obj src\abstract\dynamic.obj src\backend\gdi.obj  -lopengl32.lib -lgdi32.lib -luser32.lib
+src\Mw.dll:  external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\abstract\directory.obj src\abstract\dynamic.obj src\abstract\time.obj src\backend\gdi.obj src\color.obj src\core.obj src\cursor\arrow.obj src\cursor\cross.obj src\cursor\default.obj src\cursor\hidden.obj src\cursor\text.obj src\default.obj src\dialog\colorpicker.obj src\dialog\filechooser.obj src\dialog\messagebox.obj src\draw.obj src\error.obj src\font\boldfont.obj src\font\boldttf.obj src\font\font.obj src\font\ttf.obj src\icon\back.obj src\icon\clock.obj src\icon\computer.obj src\icon\directory.obj src\icon\down.obj src\icon\error.obj src\icon\file.obj src\icon\forward.obj src\icon\info.obj src\icon\left.obj src\icon\news.obj src\icon\note.obj src\icon\right.obj src\icon\search.obj src\icon\up.obj src\icon\warning.obj src\lowlevel.obj src\string.obj src\text.obj src\unicode.obj src\widget\button.obj src\widget\checkbox.obj src\widget\combobox.obj src\widget\entry.obj src\widget\frame.obj src\widget\image.obj src\widget\label.obj src\widget\listbox.obj src\widget\menu.obj src\widget\numberentry.obj src\widget\opengl.obj src\widget\progressbar.obj src\widget\radiobox.obj src\widget\scrollbar.obj src\widget\separator.obj src\widget\submenu.obj src\widget\treeview.obj src\widget\viewport.obj src\widget\window.obj
+	$(LD) $(LDFLAGS)  -e$@  external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\abstract\directory.obj src\abstract\dynamic.obj src\abstract\time.obj src\backend\gdi.obj src\color.obj src\core.obj src\cursor\arrow.obj src\cursor\cross.obj src\cursor\default.obj src\cursor\hidden.obj src\cursor\text.obj src\default.obj src\dialog\colorpicker.obj src\dialog\filechooser.obj src\dialog\messagebox.obj src\draw.obj src\error.obj src\font\boldfont.obj src\font\boldttf.obj src\font\font.obj src\font\ttf.obj src\icon\back.obj src\icon\clock.obj src\icon\computer.obj src\icon\directory.obj src\icon\down.obj src\icon\error.obj src\icon\file.obj src\icon\forward.obj src\icon\info.obj src\icon\left.obj src\icon\news.obj src\icon\note.obj src\icon\right.obj src\icon\search.obj src\icon\up.obj src\icon\warning.obj src\lowlevel.obj src\string.obj src\text.obj src\unicode.obj src\widget\button.obj src\widget\checkbox.obj src\widget\combobox.obj src\widget\entry.obj src\widget\frame.obj src\widget\image.obj src\widget\label.obj src\widget\listbox.obj src\widget\menu.obj src\widget\numberentry.obj src\widget\opengl.obj src\widget\progressbar.obj src\widget\radiobox.obj src\widget\scrollbar.obj src\widget\separator.obj src\widget\submenu.obj src\widget\treeview.obj src\widget\viewport.obj src\widget\window.obj  -lopengl32.lib -lgdi32.lib -luser32.lib
 	implib src\Mw.lib src\Mw.dll
 
 .c.obj:
diff --git a/NTMakefile b/NTMakefile
index 573034c1a..629f38d0a 100644
--- a/NTMakefile
+++ b/NTMakefile
@@ -7,71 +7,73 @@ LDFLAGS = /DLL
 .SUFFIXES: .obj .c
 all: src\Mw.dll
 clean: 
-	del /f /q src\core.obj
-	del /f /q src\draw.obj
-	del /f /q src\string.obj
-	del /f /q src\text.obj
-	del /f /q src\default.obj
-	del /f /q src\lowlevel.obj
-	del /f /q src\error.obj
-	del /f /q src\unicode.obj
-	del /f /q src\color.obj
 	del /f /q external\stb_ds.obj
 	del /f /q external\stb_image.obj
 	del /f /q external\stb_truetype.obj
-	del /f /q src\icon\info.obj
-	del /f /q src\icon\note.obj
-	del /f /q src\icon\warning.obj
-	del /f /q src\icon\error.obj
-	del /f /q src\icon\news.obj
-	del /f /q src\icon\directory.obj
-	del /f /q src\icon\file.obj
-	del /f /q src\icon\back.obj
-	del /f /q src\icon\forward.obj
-	del /f /q src\icon\up.obj
-	del /f /q src\icon\computer.obj
-	del /f /q src\icon\search.obj
-	del /f /q src\icon\down.obj
-	del /f /q src\icon\left.obj
-	del /f /q src\icon\right.obj
-	del /f /q src\icon\clock.obj
-	del /f /q src\cursor\default.obj
-	del /f /q src\cursor\cross.obj
-	del /f /q src\cursor\text.obj
-	del /f /q src\cursor\hidden.obj
-	del /f /q src\cursor\arrow.obj
-	del /f /q src\widget\button.obj
-	del /f /q src\widget\frame.obj
-	del /f /q src\widget\opengl.obj
-	del /f /q src\widget\window.obj
-	del /f /q src\widget\menu.obj
-	del /f /q src\widget\entry.obj
-	del /f /q src\widget\submenu.obj
-	del /f /q src\widget\viewport.obj
-	del /f /q src\widget\image.obj
-	del /f /q src\widget\scrollbar.obj
-	del /f /q src\widget\checkbox.obj
-	del /f /q src\widget\label.obj
-	del /f /q src\widget\listbox.obj
-	del /f /q src\widget\numberentry.obj
-	del /f /q src\widget\progressbar.obj
-	del /f /q src\widget\radiobox.obj
-	del /f /q src\widget\combobox.obj
-	del /f /q src\font\boldttf.obj
-	del /f /q src\font\ttf.obj
-	del /f /q src\font\boldfont.obj
-	del /f /q src\font\font.obj
-	del /f /q src\dialog\filechooser.obj
-	del /f /q src\dialog\colorpicker.obj
-	del /f /q src\dialog\messagebox.obj
-	del /f /q src\abstract\time.obj
 	del /f /q src\abstract\directory.obj
 	del /f /q src\abstract\dynamic.obj
+	del /f /q src\abstract\time.obj
 	del /f /q src\backend\gdi.obj
+	del /f /q src\color.obj
+	del /f /q src\core.obj
+	del /f /q src\cursor\arrow.obj
+	del /f /q src\cursor\cross.obj
+	del /f /q src\cursor\default.obj
+	del /f /q src\cursor\hidden.obj
+	del /f /q src\cursor\text.obj
+	del /f /q src\default.obj
+	del /f /q src\dialog\colorpicker.obj
+	del /f /q src\dialog\filechooser.obj
+	del /f /q src\dialog\messagebox.obj
+	del /f /q src\draw.obj
+	del /f /q src\error.obj
+	del /f /q src\font\boldfont.obj
+	del /f /q src\font\boldttf.obj
+	del /f /q src\font\font.obj
+	del /f /q src\font\ttf.obj
+	del /f /q src\icon\back.obj
+	del /f /q src\icon\clock.obj
+	del /f /q src\icon\computer.obj
+	del /f /q src\icon\directory.obj
+	del /f /q src\icon\down.obj
+	del /f /q src\icon\error.obj
+	del /f /q src\icon\file.obj
+	del /f /q src\icon\forward.obj
+	del /f /q src\icon\info.obj
+	del /f /q src\icon\left.obj
+	del /f /q src\icon\news.obj
+	del /f /q src\icon\note.obj
+	del /f /q src\icon\right.obj
+	del /f /q src\icon\search.obj
+	del /f /q src\icon\up.obj
+	del /f /q src\icon\warning.obj
+	del /f /q src\lowlevel.obj
+	del /f /q src\string.obj
+	del /f /q src\text.obj
+	del /f /q src\unicode.obj
+	del /f /q src\widget\button.obj
+	del /f /q src\widget\checkbox.obj
+	del /f /q src\widget\combobox.obj
+	del /f /q src\widget\entry.obj
+	del /f /q src\widget\frame.obj
+	del /f /q src\widget\image.obj
+	del /f /q src\widget\label.obj
+	del /f /q src\widget\listbox.obj
+	del /f /q src\widget\menu.obj
+	del /f /q src\widget\numberentry.obj
+	del /f /q src\widget\opengl.obj
+	del /f /q src\widget\progressbar.obj
+	del /f /q src\widget\radiobox.obj
+	del /f /q src\widget\scrollbar.obj
+	del /f /q src\widget\separator.obj
+	del /f /q src\widget\submenu.obj
+	del /f /q src\widget\treeview.obj
+	del /f /q src\widget\viewport.obj
+	del /f /q src\widget\window.obj
 	del /f /q src\Mw.dll
 
-src\Mw.dll:  src\core.obj src\draw.obj src\string.obj src\text.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\icon\clock.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\cursor\arrow.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\widget\radiobox.obj src\widget\combobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\dialog\filechooser.obj src\dialog\colorpicker.obj src\dialog\messagebox.obj src\abstract\time.obj src\abstract\directory.obj src\abstract\dynamic.obj src\backend\gdi.obj
-	$(LD) $(LDFLAGS)  /OUT:$@  src\core.obj src\draw.obj src\string.obj src\text.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\icon\clock.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\cursor\arrow.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\widget\radiobox.obj src\widget\combobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\dialog\filechooser.obj src\dialog\colorpicker.obj src\dialog\messagebox.obj src\abstract\time.obj src\abstract\directory.obj src\abstract\dynamic.obj src\backend\gdi.obj  opengl32.lib gdi32.lib user32.lib
+src\Mw.dll:  external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\abstract\directory.obj src\abstract\dynamic.obj src\abstract\time.obj src\backend\gdi.obj src\color.obj src\core.obj src\cursor\arrow.obj src\cursor\cross.obj src\cursor\default.obj src\cursor\hidden.obj src\cursor\text.obj src\default.obj src\dialog\colorpicker.obj src\dialog\filechooser.obj src\dialog\messagebox.obj src\draw.obj src\error.obj src\font\boldfont.obj src\font\boldttf.obj src\font\font.obj src\font\ttf.obj src\icon\back.obj src\icon\clock.obj src\icon\computer.obj src\icon\directory.obj src\icon\down.obj src\icon\error.obj src\icon\file.obj src\icon\forward.obj src\icon\info.obj src\icon\left.obj src\icon\news.obj src\icon\note.obj src\icon\right.obj src\icon\search.obj src\icon\up.obj src\icon\warning.obj src\lowlevel.obj src\string.obj src\text.obj src\unicode.obj src\widget\button.obj src\widget\checkbox.obj src\widget\combobox.obj src\widget\entry.obj src\widget\frame.obj src\widget\image.obj src\widget\label.obj src\widget\listbox.obj src\widget\menu.obj src\widget\numberentry.obj src\widget\opengl.obj src\widget\progressbar.obj src\widget\radiobox.obj src\widget\scrollbar.obj src\widget\separator.obj src\widget\submenu.obj src\widget\treeview.obj src\widget\viewport.obj src\widget\window.obj
+	$(LD) $(LDFLAGS)  /OUT:$@  external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\abstract\directory.obj src\abstract\dynamic.obj src\abstract\time.obj src\backend\gdi.obj src\color.obj src\core.obj src\cursor\arrow.obj src\cursor\cross.obj src\cursor\default.obj src\cursor\hidden.obj src\cursor\text.obj src\default.obj src\dialog\colorpicker.obj src\dialog\filechooser.obj src\dialog\messagebox.obj src\draw.obj src\error.obj src\font\boldfont.obj src\font\boldttf.obj src\font\font.obj src\font\ttf.obj src\icon\back.obj src\icon\clock.obj src\icon\computer.obj src\icon\directory.obj src\icon\down.obj src\icon\error.obj src\icon\file.obj src\icon\forward.obj src\icon\info.obj src\icon\left.obj src\icon\news.obj src\icon\note.obj src\icon\right.obj src\icon\search.obj src\icon\up.obj src\icon\warning.obj src\lowlevel.obj src\string.obj src\text.obj src\unicode.obj src\widget\button.obj src\widget\checkbox.obj src\widget\combobox.obj src\widget\entry.obj src\widget\frame.obj src\widget\image.obj src\widget\label.obj src\widget\listbox.obj src\widget\menu.obj src\widget\numberentry.obj src\widget\opengl.obj src\widget\progressbar.obj src\widget\radiobox.obj src\widget\scrollbar.obj src\widget\separator.obj src\widget\submenu.obj src\widget\treeview.obj src\widget\viewport.obj src\widget\window.obj  opengl32.lib gdi32.lib user32.lib
 	
 
 .c.obj:
diff --git a/WatMakefile b/WatMakefile
index 95b389bdc..3c816a3bc 100644
--- a/WatMakefile
+++ b/WatMakefile
@@ -6,193 +6,199 @@ CFLAGS = -i=include -d_MILSKO -dUSE_GDI -dUSE_STB_TRUETYPE -dUSE_STB_IMAGE -dSTB
 LDFLAGS = system nt_dll
 all: src/Mw.dll
 clean: .SYMBOLIC
-	%erase src/core.obj
-	%erase src/draw.obj
-	%erase src/string.obj
-	%erase src/text.obj
-	%erase src/default.obj
-	%erase src/lowlevel.obj
-	%erase src/error.obj
-	%erase src/unicode.obj
-	%erase src/color.obj
 	%erase external/stb_ds.obj
 	%erase external/stb_image.obj
 	%erase external/stb_truetype.obj
-	%erase src/icon/info.obj
-	%erase src/icon/note.obj
-	%erase src/icon/warning.obj
-	%erase src/icon/error.obj
-	%erase src/icon/news.obj
-	%erase src/icon/directory.obj
-	%erase src/icon/file.obj
-	%erase src/icon/back.obj
-	%erase src/icon/forward.obj
-	%erase src/icon/up.obj
-	%erase src/icon/computer.obj
-	%erase src/icon/search.obj
-	%erase src/icon/down.obj
-	%erase src/icon/left.obj
-	%erase src/icon/right.obj
-	%erase src/icon/clock.obj
-	%erase src/cursor/default.obj
-	%erase src/cursor/cross.obj
-	%erase src/cursor/text.obj
-	%erase src/cursor/hidden.obj
-	%erase src/cursor/arrow.obj
-	%erase src/widget/button.obj
-	%erase src/widget/frame.obj
-	%erase src/widget/opengl.obj
-	%erase src/widget/window.obj
-	%erase src/widget/menu.obj
-	%erase src/widget/entry.obj
-	%erase src/widget/submenu.obj
-	%erase src/widget/viewport.obj
-	%erase src/widget/image.obj
-	%erase src/widget/scrollbar.obj
-	%erase src/widget/checkbox.obj
-	%erase src/widget/label.obj
-	%erase src/widget/listbox.obj
-	%erase src/widget/numberentry.obj
-	%erase src/widget/progressbar.obj
-	%erase src/widget/radiobox.obj
-	%erase src/widget/combobox.obj
-	%erase src/font/boldttf.obj
-	%erase src/font/ttf.obj
-	%erase src/font/boldfont.obj
-	%erase src/font/font.obj
-	%erase src/dialog/filechooser.obj
-	%erase src/dialog/colorpicker.obj
-	%erase src/dialog/messagebox.obj
-	%erase src/abstract/time.obj
 	%erase src/abstract/directory.obj
 	%erase src/abstract/dynamic.obj
+	%erase src/abstract/time.obj
 	%erase src/backend/gdi.obj
+	%erase src/color.obj
+	%erase src/core.obj
+	%erase src/cursor/arrow.obj
+	%erase src/cursor/cross.obj
+	%erase src/cursor/default.obj
+	%erase src/cursor/hidden.obj
+	%erase src/cursor/text.obj
+	%erase src/default.obj
+	%erase src/dialog/colorpicker.obj
+	%erase src/dialog/filechooser.obj
+	%erase src/dialog/messagebox.obj
+	%erase src/draw.obj
+	%erase src/error.obj
+	%erase src/font/boldfont.obj
+	%erase src/font/boldttf.obj
+	%erase src/font/font.obj
+	%erase src/font/ttf.obj
+	%erase src/icon/back.obj
+	%erase src/icon/clock.obj
+	%erase src/icon/computer.obj
+	%erase src/icon/directory.obj
+	%erase src/icon/down.obj
+	%erase src/icon/error.obj
+	%erase src/icon/file.obj
+	%erase src/icon/forward.obj
+	%erase src/icon/info.obj
+	%erase src/icon/left.obj
+	%erase src/icon/news.obj
+	%erase src/icon/note.obj
+	%erase src/icon/right.obj
+	%erase src/icon/search.obj
+	%erase src/icon/up.obj
+	%erase src/icon/warning.obj
+	%erase src/lowlevel.obj
+	%erase src/string.obj
+	%erase src/text.obj
+	%erase src/unicode.obj
+	%erase src/widget/button.obj
+	%erase src/widget/checkbox.obj
+	%erase src/widget/combobox.obj
+	%erase src/widget/entry.obj
+	%erase src/widget/frame.obj
+	%erase src/widget/image.obj
+	%erase src/widget/label.obj
+	%erase src/widget/listbox.obj
+	%erase src/widget/menu.obj
+	%erase src/widget/numberentry.obj
+	%erase src/widget/opengl.obj
+	%erase src/widget/progressbar.obj
+	%erase src/widget/radiobox.obj
+	%erase src/widget/scrollbar.obj
+	%erase src/widget/separator.obj
+	%erase src/widget/submenu.obj
+	%erase src/widget/treeview.obj
+	%erase src/widget/viewport.obj
+	%erase src/widget/window.obj
 	%erase src/Mw.dll
 
-src/Mw.dll:  src/core.obj src/draw.obj src/string.obj src/text.obj src/default.obj src/lowlevel.obj src/error.obj src/unicode.obj src/color.obj external/stb_ds.obj external/stb_image.obj external/stb_truetype.obj src/icon/info.obj src/icon/note.obj src/icon/warning.obj src/icon/error.obj src/icon/news.obj src/icon/directory.obj src/icon/file.obj src/icon/back.obj src/icon/forward.obj src/icon/up.obj src/icon/computer.obj src/icon/search.obj src/icon/down.obj src/icon/left.obj src/icon/right.obj src/icon/clock.obj src/cursor/default.obj src/cursor/cross.obj src/cursor/text.obj src/cursor/hidden.obj src/cursor/arrow.obj src/widget/button.obj src/widget/frame.obj src/widget/opengl.obj src/widget/window.obj src/widget/menu.obj src/widget/entry.obj src/widget/submenu.obj src/widget/viewport.obj src/widget/image.obj src/widget/scrollbar.obj src/widget/checkbox.obj src/widget/label.obj src/widget/listbox.obj src/widget/numberentry.obj src/widget/progressbar.obj src/widget/radiobox.obj src/widget/combobox.obj src/font/boldttf.obj src/font/ttf.obj src/font/boldfont.obj src/font/font.obj src/dialog/filechooser.obj src/dialog/colorpicker.obj src/dialog/messagebox.obj src/abstract/time.obj src/abstract/directory.obj src/abstract/dynamic.obj src/backend/gdi.obj
-	$(LD) $(LDFLAGS) option implib=src/Mw.lib name $@  file src/core.obj file src/draw.obj file src/string.obj file src/text.obj file src/default.obj file src/lowlevel.obj file src/error.obj file src/unicode.obj file src/color.obj file external/stb_ds.obj file external/stb_image.obj file external/stb_truetype.obj file src/icon/info.obj file src/icon/note.obj file src/icon/warning.obj file src/icon/error.obj file src/icon/news.obj file src/icon/directory.obj file src/icon/file.obj file src/icon/back.obj file src/icon/forward.obj file src/icon/up.obj file src/icon/computer.obj file src/icon/search.obj file src/icon/down.obj file src/icon/left.obj file src/icon/right.obj file src/icon/clock.obj file src/cursor/default.obj file src/cursor/cross.obj file src/cursor/text.obj file src/cursor/hidden.obj file src/cursor/arrow.obj file src/widget/button.obj file src/widget/frame.obj file src/widget/opengl.obj file src/widget/window.obj file src/widget/menu.obj file src/widget/entry.obj file src/widget/submenu.obj file src/widget/viewport.obj file src/widget/image.obj file src/widget/scrollbar.obj file src/widget/checkbox.obj file src/widget/label.obj file src/widget/listbox.obj file src/widget/numberentry.obj file src/widget/progressbar.obj file src/widget/radiobox.obj file src/widget/combobox.obj file src/font/boldttf.obj file src/font/ttf.obj file src/font/boldfont.obj file src/font/font.obj file src/dialog/filechooser.obj file src/dialog/colorpicker.obj file src/dialog/messagebox.obj file src/abstract/time.obj file src/abstract/directory.obj file src/abstract/dynamic.obj file src/backend/gdi.obj library clib3r.lib library opengl32.lib library gdi32.lib library user32.lib
+src/Mw.dll:  external/stb_ds.obj external/stb_image.obj external/stb_truetype.obj src/abstract/directory.obj src/abstract/dynamic.obj src/abstract/time.obj src/backend/gdi.obj src/color.obj src/core.obj src/cursor/arrow.obj src/cursor/cross.obj src/cursor/default.obj src/cursor/hidden.obj src/cursor/text.obj src/default.obj src/dialog/colorpicker.obj src/dialog/filechooser.obj src/dialog/messagebox.obj src/draw.obj src/error.obj src/font/boldfont.obj src/font/boldttf.obj src/font/font.obj src/font/ttf.obj src/icon/back.obj src/icon/clock.obj src/icon/computer.obj src/icon/directory.obj src/icon/down.obj src/icon/error.obj src/icon/file.obj src/icon/forward.obj src/icon/info.obj src/icon/left.obj src/icon/news.obj src/icon/note.obj src/icon/right.obj src/icon/search.obj src/icon/up.obj src/icon/warning.obj src/lowlevel.obj src/string.obj src/text.obj src/unicode.obj src/widget/button.obj src/widget/checkbox.obj src/widget/combobox.obj src/widget/entry.obj src/widget/frame.obj src/widget/image.obj src/widget/label.obj src/widget/listbox.obj src/widget/menu.obj src/widget/numberentry.obj src/widget/opengl.obj src/widget/progressbar.obj src/widget/radiobox.obj src/widget/scrollbar.obj src/widget/separator.obj src/widget/submenu.obj src/widget/treeview.obj src/widget/viewport.obj src/widget/window.obj
+	$(LD) $(LDFLAGS) option implib=src/Mw.lib name $@  file external/stb_ds.obj file external/stb_image.obj file external/stb_truetype.obj file src/abstract/directory.obj file src/abstract/dynamic.obj file src/abstract/time.obj file src/backend/gdi.obj file src/color.obj file src/core.obj file src/cursor/arrow.obj file src/cursor/cross.obj file src/cursor/default.obj file src/cursor/hidden.obj file src/cursor/text.obj file src/default.obj file src/dialog/colorpicker.obj file src/dialog/filechooser.obj file src/dialog/messagebox.obj file src/draw.obj file src/error.obj file src/font/boldfont.obj file src/font/boldttf.obj file src/font/font.obj file src/font/ttf.obj file src/icon/back.obj file src/icon/clock.obj file src/icon/computer.obj file src/icon/directory.obj file src/icon/down.obj file src/icon/error.obj file src/icon/file.obj file src/icon/forward.obj file src/icon/info.obj file src/icon/left.obj file src/icon/news.obj file src/icon/note.obj file src/icon/right.obj file src/icon/search.obj file src/icon/up.obj file src/icon/warning.obj file src/lowlevel.obj file src/string.obj file src/text.obj file src/unicode.obj file src/widget/button.obj file src/widget/checkbox.obj file src/widget/combobox.obj file src/widget/entry.obj file src/widget/frame.obj file src/widget/image.obj file src/widget/label.obj file src/widget/listbox.obj file src/widget/menu.obj file src/widget/numberentry.obj file src/widget/opengl.obj file src/widget/progressbar.obj file src/widget/radiobox.obj file src/widget/scrollbar.obj file src/widget/separator.obj file src/widget/submenu.obj file src/widget/treeview.obj file src/widget/viewport.obj file src/widget/window.obj library clib3r.lib library opengl32.lib library gdi32.lib library user32.lib
 	
 
 
-src/core.obj: src/core.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/draw.obj: src/draw.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/string.obj: src/string.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/text.obj: src/text.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/default.obj: src/default.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/lowlevel.obj: src/lowlevel.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/error.obj: src/error.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/unicode.obj: src/unicode.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/color.obj: src/color.c
-	$(CC) $(CFLAGS) -fo=$@ $<
 external/stb_ds.obj: external/stb_ds.c
 	$(CC) $(CFLAGS) -fo=$@ $<
 external/stb_image.obj: external/stb_image.c
 	$(CC) $(CFLAGS) -fo=$@ $<
 external/stb_truetype.obj: external/stb_truetype.c
 	$(CC) $(CFLAGS) -fo=$@ $<
-src/icon/info.obj: src/icon/info.c
+src/abstract/directory.obj: src/abstract/directory.c
 	$(CC) $(CFLAGS) -fo=$@ $<
-src/icon/note.obj: src/icon/note.c
+src/abstract/dynamic.obj: src/abstract/dynamic.c
 	$(CC) $(CFLAGS) -fo=$@ $<
-src/icon/warning.obj: src/icon/warning.c
+src/abstract/time.obj: src/abstract/time.c
 	$(CC) $(CFLAGS) -fo=$@ $<
-src/icon/error.obj: src/icon/error.c
+src/backend/gdi.obj: src/backend/gdi.c
 	$(CC) $(CFLAGS) -fo=$@ $<
-src/icon/news.obj: src/icon/news.c
+src/color.obj: src/color.c
 	$(CC) $(CFLAGS) -fo=$@ $<
-src/icon/directory.obj: src/icon/directory.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/icon/file.obj: src/icon/file.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/icon/back.obj: src/icon/back.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/icon/forward.obj: src/icon/forward.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/icon/up.obj: src/icon/up.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/icon/computer.obj: src/icon/computer.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/icon/search.obj: src/icon/search.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/icon/down.obj: src/icon/down.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/icon/left.obj: src/icon/left.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/icon/right.obj: src/icon/right.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/icon/clock.obj: src/icon/clock.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/cursor/default.obj: src/cursor/default.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/cursor/cross.obj: src/cursor/cross.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/cursor/text.obj: src/cursor/text.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/cursor/hidden.obj: src/cursor/hidden.c
+src/core.obj: src/core.c
 	$(CC) $(CFLAGS) -fo=$@ $<
 src/cursor/arrow.obj: src/cursor/arrow.c
 	$(CC) $(CFLAGS) -fo=$@ $<
+src/cursor/cross.obj: src/cursor/cross.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/cursor/default.obj: src/cursor/default.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/cursor/hidden.obj: src/cursor/hidden.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/cursor/text.obj: src/cursor/text.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/default.obj: src/default.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/dialog/colorpicker.obj: src/dialog/colorpicker.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/dialog/filechooser.obj: src/dialog/filechooser.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/dialog/messagebox.obj: src/dialog/messagebox.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/draw.obj: src/draw.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/error.obj: src/error.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/font/boldfont.obj: src/font/boldfont.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/font/boldttf.obj: src/font/boldttf.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/font/font.obj: src/font/font.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/font/ttf.obj: src/font/ttf.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/icon/back.obj: src/icon/back.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/icon/clock.obj: src/icon/clock.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/icon/computer.obj: src/icon/computer.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/icon/directory.obj: src/icon/directory.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/icon/down.obj: src/icon/down.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/icon/error.obj: src/icon/error.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/icon/file.obj: src/icon/file.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/icon/forward.obj: src/icon/forward.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/icon/info.obj: src/icon/info.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/icon/left.obj: src/icon/left.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/icon/news.obj: src/icon/news.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/icon/note.obj: src/icon/note.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/icon/right.obj: src/icon/right.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/icon/search.obj: src/icon/search.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/icon/up.obj: src/icon/up.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/icon/warning.obj: src/icon/warning.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/lowlevel.obj: src/lowlevel.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/string.obj: src/string.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/text.obj: src/text.c
+	$(CC) $(CFLAGS) -fo=$@ $<
+src/unicode.obj: src/unicode.c
+	$(CC) $(CFLAGS) -fo=$@ $<
 src/widget/button.obj: src/widget/button.c
 	$(CC) $(CFLAGS) -fo=$@ $<
-src/widget/frame.obj: src/widget/frame.c
+src/widget/checkbox.obj: src/widget/checkbox.c
 	$(CC) $(CFLAGS) -fo=$@ $<
-src/widget/opengl.obj: src/widget/opengl.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/widget/window.obj: src/widget/window.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/widget/menu.obj: src/widget/menu.c
+src/widget/combobox.obj: src/widget/combobox.c
 	$(CC) $(CFLAGS) -fo=$@ $<
 src/widget/entry.obj: src/widget/entry.c
 	$(CC) $(CFLAGS) -fo=$@ $<
-src/widget/submenu.obj: src/widget/submenu.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/widget/viewport.obj: src/widget/viewport.c
+src/widget/frame.obj: src/widget/frame.c
 	$(CC) $(CFLAGS) -fo=$@ $<
 src/widget/image.obj: src/widget/image.c
 	$(CC) $(CFLAGS) -fo=$@ $<
-src/widget/scrollbar.obj: src/widget/scrollbar.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/widget/checkbox.obj: src/widget/checkbox.c
-	$(CC) $(CFLAGS) -fo=$@ $<
 src/widget/label.obj: src/widget/label.c
 	$(CC) $(CFLAGS) -fo=$@ $<
 src/widget/listbox.obj: src/widget/listbox.c
 	$(CC) $(CFLAGS) -fo=$@ $<
+src/widget/menu.obj: src/widget/menu.c
+	$(CC) $(CFLAGS) -fo=$@ $<
 src/widget/numberentry.obj: src/widget/numberentry.c
 	$(CC) $(CFLAGS) -fo=$@ $<
+src/widget/opengl.obj: src/widget/opengl.c
+	$(CC) $(CFLAGS) -fo=$@ $<
 src/widget/progressbar.obj: src/widget/progressbar.c
 	$(CC) $(CFLAGS) -fo=$@ $<
 src/widget/radiobox.obj: src/widget/radiobox.c
 	$(CC) $(CFLAGS) -fo=$@ $<
-src/widget/combobox.obj: src/widget/combobox.c
+src/widget/scrollbar.obj: src/widget/scrollbar.c
 	$(CC) $(CFLAGS) -fo=$@ $<
-src/font/boldttf.obj: src/font/boldttf.c
+src/widget/separator.obj: src/widget/separator.c
 	$(CC) $(CFLAGS) -fo=$@ $<
-src/font/ttf.obj: src/font/ttf.c
+src/widget/submenu.obj: src/widget/submenu.c
 	$(CC) $(CFLAGS) -fo=$@ $<
-src/font/boldfont.obj: src/font/boldfont.c
+src/widget/treeview.obj: src/widget/treeview.c
 	$(CC) $(CFLAGS) -fo=$@ $<
-src/font/font.obj: src/font/font.c
+src/widget/viewport.obj: src/widget/viewport.c
 	$(CC) $(CFLAGS) -fo=$@ $<
-src/dialog/filechooser.obj: src/dialog/filechooser.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/dialog/colorpicker.obj: src/dialog/colorpicker.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/dialog/messagebox.obj: src/dialog/messagebox.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/abstract/time.obj: src/abstract/time.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/abstract/directory.obj: src/abstract/directory.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/abstract/dynamic.obj: src/abstract/dynamic.c
-	$(CC) $(CFLAGS) -fo=$@ $<
-src/backend/gdi.obj: src/backend/gdi.c
+src/widget/window.obj: src/widget/window.c
 	$(CC) $(CFLAGS) -fo=$@ $<
diff --git a/tools/genmk.pl b/tools/genmk.pl
index d1587903f..c0c0f94b3 100755
--- a/tools/genmk.pl
+++ b/tools/genmk.pl
@@ -154,6 +154,8 @@ scan("src/dialog");
 scan("src/abstract");
 push(@cfiles, "src/backend/gdi.c");
 
+@cfiles = sort(@cfiles);
+
 generate("BorMakefile", "Borland");
 generate("NTMakefile",  "MSVC");
 generate("WatMakefile", "Watcom");