diff --git a/BorMakefile b/BorMakefile
index e6bffad47..a53da65ab 100644
--- a/BorMakefile
+++ b/BorMakefile
@@ -37,12 +37,12 @@ clean:
 	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\numberentry.obj
-	del /f /q src\widget\viewport.obj
 	del /f /q src\backend\gdi.obj
 	del /f /q oosrc\base.obj
 	del /f /q oosrc\widget\button.obj
@@ -61,8 +61,8 @@ clean:
 	del /f /q src\Mw.dll
 	del /f /q oosrc\MwOO.dll
 
-src\Mw.dll:  src\core.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\font.obj src\color.obj src\messagebox.obj src\boldfont.obj src\external\ds.obj src\external\image.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\question.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.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\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\numberentry.obj src\widget\viewport.obj src\backend\gdi.obj
-	$(LD) $(LDFLAGS)  -e$@  src\core.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\font.obj src\color.obj src\messagebox.obj src\boldfont.obj src\external\ds.obj src\external\image.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\question.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.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\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\numberentry.obj src\widget\viewport.obj src\backend\gdi.obj  -lopengl32.lib -lgdi32.lib -luser32.lib
+src\Mw.dll:  src\core.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\font.obj src\color.obj src\messagebox.obj src\boldfont.obj src\external\ds.obj src\external\image.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\question.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.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\numberentry.obj src\backend\gdi.obj
+	$(LD) $(LDFLAGS)  -e$@  src\core.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\font.obj src\color.obj src\messagebox.obj src\boldfont.obj src\external\ds.obj src\external\image.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\question.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.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\numberentry.obj src\backend\gdi.obj  -lopengl32.lib -lgdi32.lib -luser32.lib
 	implib src\Mw.lib src\Mw.dll
 
 oosrc\MwOO.dll:  oosrc\base.obj oosrc\widget\button.obj oosrc\widget\frame.obj oosrc\widget\image.obj oosrc\widget\menu.obj oosrc\widget\opengl.obj oosrc\widget\scrollbar.obj oosrc\widget\submenu.obj oosrc\widget\window.obj oosrc\widget\checkbox.obj oosrc\widget\viewport.obj oosrc\widget\label.obj oosrc\widget\entry.obj oosrc\widget\numberentry.obj
diff --git a/NTMakefile b/NTMakefile
index d65573ec1..e1d4cc34d 100644
--- a/NTMakefile
+++ b/NTMakefile
@@ -37,12 +37,12 @@ clean:
 	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\numberentry.obj
-	del /f /q src\widget\viewport.obj
 	del /f /q src\backend\gdi.obj
 	del /f /q oosrc\base.obj
 	del /f /q oosrc\widget\button.obj
@@ -61,8 +61,8 @@ clean:
 	del /f /q src\Mw.dll
 	del /f /q oosrc\MwOO.dll
 
-src\Mw.dll:  src\core.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\font.obj src\color.obj src\messagebox.obj src\boldfont.obj src\external\ds.obj src\external\image.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\question.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.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\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\numberentry.obj src\widget\viewport.obj src\backend\gdi.obj
-	$(LD) $(LDFLAGS)  /OUT:$@  src\core.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\font.obj src\color.obj src\messagebox.obj src\boldfont.obj src\external\ds.obj src\external\image.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\question.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.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\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\numberentry.obj src\widget\viewport.obj src\backend\gdi.obj  opengl32.lib gdi32.lib user32.lib
+src\Mw.dll:  src\core.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\font.obj src\color.obj src\messagebox.obj src\boldfont.obj src\external\ds.obj src\external\image.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\question.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.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\numberentry.obj src\backend\gdi.obj
+	$(LD) $(LDFLAGS)  /OUT:$@  src\core.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\font.obj src\color.obj src\messagebox.obj src\boldfont.obj src\external\ds.obj src\external\image.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\question.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.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\numberentry.obj src\backend\gdi.obj  opengl32.lib gdi32.lib user32.lib
 	
 
 oosrc\MwOO.dll:  oosrc\base.obj oosrc\widget\button.obj oosrc\widget\frame.obj oosrc\widget\image.obj oosrc\widget\menu.obj oosrc\widget\opengl.obj oosrc\widget\scrollbar.obj oosrc\widget\submenu.obj oosrc\widget\window.obj oosrc\widget\checkbox.obj oosrc\widget\viewport.obj oosrc\widget\label.obj oosrc\widget\entry.obj oosrc\widget\numberentry.obj
diff --git a/WatMakefile b/WatMakefile
index c93cd7984..eb43d397d 100644
--- a/WatMakefile
+++ b/WatMakefile
@@ -36,12 +36,12 @@ clean: .SYMBOLIC
 	%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/numberentry.obj
-	%erase src/widget/viewport.obj
 	%erase src/backend/gdi.obj
 	%erase oosrc/base.obj
 	%erase oosrc/widget/button.obj
@@ -60,8 +60,8 @@ clean: .SYMBOLIC
 	%erase src/Mw.dll
 	%erase oosrc/MwOO.dll
 
-src/Mw.dll:  src/core.obj src/draw.obj src/default.obj src/lowlevel.obj src/error.obj src/unicode.obj src/font.obj src/color.obj src/messagebox.obj src/boldfont.obj src/external/ds.obj src/external/image.obj src/icon/info.obj src/icon/note.obj src/icon/warning.obj src/icon/error.obj src/icon/news.obj src/icon/question.obj src/cursor/default.obj src/cursor/cross.obj src/cursor/text.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/image.obj src/widget/scrollbar.obj src/widget/checkbox.obj src/widget/label.obj src/widget/numberentry.obj src/widget/viewport.obj src/backend/gdi.obj
-	$(LD) $(LDFLAGS) option implib=src/Mw.lib name $@  file src/core.obj file src/draw.obj file src/default.obj file src/lowlevel.obj file src/error.obj file src/unicode.obj file src/font.obj file src/color.obj file src/messagebox.obj file src/boldfont.obj file src/external/ds.obj file src/external/image.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/question.obj file src/cursor/default.obj file src/cursor/cross.obj file src/cursor/text.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/image.obj file src/widget/scrollbar.obj file src/widget/checkbox.obj file src/widget/label.obj file src/widget/numberentry.obj file src/widget/viewport.obj file src/backend/gdi.obj library clib3r.lib library opengl32.lib library gdi32.lib library user32.lib
+src/Mw.dll:  src/core.obj src/draw.obj src/default.obj src/lowlevel.obj src/error.obj src/unicode.obj src/font.obj src/color.obj src/messagebox.obj src/boldfont.obj src/external/ds.obj src/external/image.obj src/icon/info.obj src/icon/note.obj src/icon/warning.obj src/icon/error.obj src/icon/news.obj src/icon/question.obj src/cursor/default.obj src/cursor/cross.obj src/cursor/text.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/numberentry.obj src/backend/gdi.obj
+	$(LD) $(LDFLAGS) option implib=src/Mw.lib name $@  file src/core.obj file src/draw.obj file src/default.obj file src/lowlevel.obj file src/error.obj file src/unicode.obj file src/font.obj file src/color.obj file src/messagebox.obj file src/boldfont.obj file src/external/ds.obj file src/external/image.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/question.obj file src/cursor/default.obj file src/cursor/cross.obj file src/cursor/text.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/numberentry.obj file src/backend/gdi.obj library clib3r.lib library opengl32.lib library gdi32.lib library user32.lib
 	
 
 oosrc/MwOO.dll:  oosrc/base.obj oosrc/widget/button.obj oosrc/widget/frame.obj oosrc/widget/image.obj oosrc/widget/menu.obj oosrc/widget/opengl.obj oosrc/widget/scrollbar.obj oosrc/widget/submenu.obj oosrc/widget/window.obj oosrc/widget/checkbox.obj oosrc/widget/viewport.obj oosrc/widget/label.obj oosrc/widget/entry.obj oosrc/widget/numberentry.obj
@@ -125,6 +125,8 @@ 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
+	$(CC) $(CFLAGS) -fo=$@ $<
 src/widget/image.obj: src/widget/image.c
 	$(CC) $(CFLAGS) -fo=$@ $<
 src/widget/scrollbar.obj: src/widget/scrollbar.c
@@ -135,8 +137,6 @@ src/widget/label.obj: src/widget/label.c
 	$(CC) $(CFLAGS) -fo=$@ $<
 src/widget/numberentry.obj: src/widget/numberentry.c
 	$(CC) $(CFLAGS) -fo=$@ $<
-src/widget/viewport.obj: src/widget/viewport.c
-	$(CC) $(CFLAGS) -fo=$@ $<
 src/backend/gdi.obj: src/backend/gdi.c
 	$(CC) $(CFLAGS) -fo=$@ $<
 oosrc/base.obj: oosrc/base.cc
diff --git a/doc/index.html b/doc/index.html
index da03af44b..e80e85f32 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -21,25 +21,25 @@
 	<a href="#Mw_Constants_h__MwALIGNMENT">MwALIGNMENT</a>
 </dd>
 <dd>
-	<a href="#Mw_Constants_h___define_MwDEFAULT_0x0fffffff">#define MwDEFAULT 0x0fffffff</a>
+	<a href="#Mw_Constants_h__MwDEFAULT">MwDEFAULT</a>
 </dd>
 <dd>
-	<a href="#Mw_Constants_h___define_MwMB_ICONMASK_0xf">#define MwMB_ICONMASK 0xf</a>
+	<a href="#Mw_Constants_h__MwMB_ICONMASK">MwMB_ICONMASK</a>
 </dd>
 <dd>
-	<a href="#Mw_Constants_h___define_MwMB_BUTTONMASK_0xf0">#define MwMB_BUTTONMASK 0xf0</a>
+	<a href="#Mw_Constants_h__MwMB_BUTTONMASK">MwMB_BUTTONMASK</a>
 </dd>
 <dd>
-	<a href="#Mw_Constants_h___define_MwMB_BUTTONOK_0x10">#define MwMB_BUTTONOK 0x10</a>
+	<a href="#Mw_Constants_h__MwMB_BUTTONOK">MwMB_BUTTONOK</a>
 </dd>
 <dd>
-	<a href="#Mw_Constants_h___define_MwMB_BUTTONCANCEL_0x20">#define MwMB_BUTTONCANCEL 0x20</a>
+	<a href="#Mw_Constants_h__MwMB_BUTTONCANCEL">MwMB_BUTTONCANCEL</a>
 </dd>
 <dd>
-	<a href="#Mw_Constants_h___define_MwMB_BUTTONYES_0x40">#define MwMB_BUTTONYES 0x40</a>
+	<a href="#Mw_Constants_h__MwMB_BUTTONYES">MwMB_BUTTONYES</a>
 </dd>
 <dd>
-	<a href="#Mw_Constants_h___define_MwMB_BUTTONNO_0x80">#define MwMB_BUTTONNO 0x80</a>
+	<a href="#Mw_Constants_h__MwMB_BUTTONNO">MwMB_BUTTONNO</a>
 </dd>
 <dd>
 	<a href="#Mw_Constants_h__MwMB_BUTTONOKCANCEL">MwMB_BUTTONOKCANCEL</a>
@@ -482,49 +482,49 @@
 </dd>
 </dl>
 <hr>
-<pre id="Mw_Constants_h___define_MwDEFAULT_0x0fffffff">#<B><FONT COLOR="#5F9EA0">define</FONT></B> <FONT COLOR="#B8860B">MwDEFAULT</FONT> 0x0fffffff</pre>
+<pre id="Mw_Constants_h__MwDEFAULT">#<B><FONT COLOR="#5F9EA0">define</FONT></B> <FONT COLOR="#B8860B">MwDEFAULT</FONT> 0x0fffffff</pre>
 <dl>
 <dd>
 	Default.
 </dd>
 </dl>
 <hr>
-<pre id="Mw_Constants_h___define_MwMB_ICONMASK_0xf">#<B><FONT COLOR="#5F9EA0">define</FONT></B> <FONT COLOR="#B8860B">MwMB_ICONMASK</FONT> 0xf</pre>
+<pre id="Mw_Constants_h__MwMB_ICONMASK">#<B><FONT COLOR="#5F9EA0">define</FONT></B> <FONT COLOR="#B8860B">MwMB_ICONMASK</FONT> 0xf</pre>
 <dl>
 <dd>
 	Icon mask.
 </dd>
 </dl>
 <hr>
-<pre id="Mw_Constants_h___define_MwMB_BUTTONMASK_0xf0">#<B><FONT COLOR="#5F9EA0">define</FONT></B> <FONT COLOR="#B8860B">MwMB_BUTTONMASK</FONT> 0xf0</pre>
+<pre id="Mw_Constants_h__MwMB_BUTTONMASK">#<B><FONT COLOR="#5F9EA0">define</FONT></B> <FONT COLOR="#B8860B">MwMB_BUTTONMASK</FONT> 0xf0</pre>
 <dl>
 <dd>
 	Button mask.
 </dd>
 </dl>
 <hr>
-<pre id="Mw_Constants_h___define_MwMB_BUTTONOK_0x10">#<B><FONT COLOR="#5F9EA0">define</FONT></B> <FONT COLOR="#B8860B">MwMB_BUTTONOK</FONT> 0x10</pre>
+<pre id="Mw_Constants_h__MwMB_BUTTONOK">#<B><FONT COLOR="#5F9EA0">define</FONT></B> <FONT COLOR="#B8860B">MwMB_BUTTONOK</FONT> 0x10</pre>
 <dl>
 <dd>
 	OK button.
 </dd>
 </dl>
 <hr>
-<pre id="Mw_Constants_h___define_MwMB_BUTTONCANCEL_0x20">#<B><FONT COLOR="#5F9EA0">define</FONT></B> <FONT COLOR="#B8860B">MwMB_BUTTONCANCEL</FONT> 0x20</pre>
+<pre id="Mw_Constants_h__MwMB_BUTTONCANCEL">#<B><FONT COLOR="#5F9EA0">define</FONT></B> <FONT COLOR="#B8860B">MwMB_BUTTONCANCEL</FONT> 0x20</pre>
 <dl>
 <dd>
 	Cancel button.
 </dd>
 </dl>
 <hr>
-<pre id="Mw_Constants_h___define_MwMB_BUTTONYES_0x40">#<B><FONT COLOR="#5F9EA0">define</FONT></B> <FONT COLOR="#B8860B">MwMB_BUTTONYES</FONT> 0x40</pre>
+<pre id="Mw_Constants_h__MwMB_BUTTONYES">#<B><FONT COLOR="#5F9EA0">define</FONT></B> <FONT COLOR="#B8860B">MwMB_BUTTONYES</FONT> 0x40</pre>
 <dl>
 <dd>
 	Yes button.
 </dd>
 </dl>
 <hr>
-<pre id="Mw_Constants_h___define_MwMB_BUTTONNO_0x80">#<B><FONT COLOR="#5F9EA0">define</FONT></B> <FONT COLOR="#B8860B">MwMB_BUTTONNO</FONT> 0x80</pre>
+<pre id="Mw_Constants_h__MwMB_BUTTONNO">#<B><FONT COLOR="#5F9EA0">define</FONT></B> <FONT COLOR="#B8860B">MwMB_BUTTONNO</FONT> 0x80</pre>
 <dl>
 <dd>
 	No button.
diff --git a/resource/icon/error.png b/resource/icon/error.png
index a8e22cfc6..fd3691150 100644
Binary files a/resource/icon/error.png and b/resource/icon/error.png differ
diff --git a/resource/icon/info.png b/resource/icon/info.png
index 5e5a7d38d..5c8a50c53 100644
Binary files a/resource/icon/info.png and b/resource/icon/info.png differ
diff --git a/resource/icon/news.png b/resource/icon/news.png
index 190d024af..f95f73c5a 100644
Binary files a/resource/icon/news.png and b/resource/icon/news.png differ
diff --git a/resource/icon/note.png b/resource/icon/note.png
index 2cc533c51..79c0b469c 100644
Binary files a/resource/icon/note.png and b/resource/icon/note.png differ
diff --git a/resource/icon/question.png b/resource/icon/question.png
index 926680e94..575a4e42b 100644
Binary files a/resource/icon/question.png and b/resource/icon/question.png differ
diff --git a/resource/icon/warning.png b/resource/icon/warning.png
index b323e22dd..5cab4ab1d 100644
Binary files a/resource/icon/warning.png and b/resource/icon/warning.png differ
diff --git a/tools/doc.pl b/tools/doc.pl
index d8cf0e7fe..ceef83773 100755
--- a/tools/doc.pl
+++ b/tools/doc.pl
@@ -151,6 +151,7 @@ sub scan_dir {
                     $sl = $l;
                     $sl =~ s/\n//g;
                     $sl =~ s/=.+$//g;
+                    $sl =~ s/^#[^ ]+(?:[ \t]+([^ \(]+)(?:.+$))?/\1/;
                     $sl =~ s/^.+[ \t]+([^ ]+)[ \t]*\(.+\);?$/\1/g;
                     $sl =~ s/^.+[ \t]+([^ ]+);$/\1/g;