diff --git a/BorMakefile b/BorMakefile
index 22e91288a..7fcb1dd5e 100644
--- a/BorMakefile
+++ b/BorMakefile
@@ -64,13 +64,14 @@ clean:
 	del /f /q src\math\mmx_guard.obj
 	del /f /q src\math\mmx.obj
 	del /f /q src\math\default.obj
-	del /f /q src\math\math.obj
 	del /f /q src\math\nbsd_pow.obj
+	del /f /q src\math\math.obj
+	del /f /q src\color_picker\color_picker.obj
 	del /f /q src\backend\gdi.obj
 	del /f /q src\Mw.dll
 
-src\Mw.dll:  src\default.obj src\lowlevel.obj src\color.obj src\directory.obj src\text.obj src\error.obj src\unicode.obj src\messagebox.obj src\string.obj src\filechooser.obj src\core.obj src\draw.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\error.obj src\icon\info.obj src\icon\news.obj src\icon\note.obj src\icon\warning.obj src\icon\file.obj src\icon\directory.obj src\icon\back.obj src\icon\forward.obj src\icon\computer.obj src\icon\up.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\cross.obj src\cursor\default.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\window.obj src\widget\entry.obj src\widget\label.obj src\widget\opengl.obj src\widget\radiobox.obj src\widget\submenu.obj src\widget\menu.obj src\widget\image.obj src\widget\viewport.obj src\widget\listbox.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\font\boldfont.obj src\font\boldttf.obj src\font\font.obj src\font\ttf.obj src\math\mmx_guard.obj src\math\mmx.obj src\math\default.obj src\math\math.obj src\math\nbsd_pow.obj src\backend\gdi.obj
-	$(LD) $(LDFLAGS)  -e$@  src\default.obj src\lowlevel.obj src\color.obj src\directory.obj src\text.obj src\error.obj src\unicode.obj src\messagebox.obj src\string.obj src\filechooser.obj src\core.obj src\draw.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\error.obj src\icon\info.obj src\icon\news.obj src\icon\note.obj src\icon\warning.obj src\icon\file.obj src\icon\directory.obj src\icon\back.obj src\icon\forward.obj src\icon\computer.obj src\icon\up.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\cross.obj src\cursor\default.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\window.obj src\widget\entry.obj src\widget\label.obj src\widget\opengl.obj src\widget\radiobox.obj src\widget\submenu.obj src\widget\menu.obj src\widget\image.obj src\widget\viewport.obj src\widget\listbox.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\font\boldfont.obj src\font\boldttf.obj src\font\font.obj src\font\ttf.obj src\math\mmx_guard.obj src\math\mmx.obj src\math\default.obj src\math\math.obj src\math\nbsd_pow.obj src\backend\gdi.obj  -lopengl32.lib -lgdi32.lib -luser32.lib
+src\Mw.dll:  src\default.obj src\lowlevel.obj src\color.obj src\directory.obj src\text.obj src\error.obj src\unicode.obj src\messagebox.obj src\string.obj src\filechooser.obj src\core.obj src\draw.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\error.obj src\icon\info.obj src\icon\news.obj src\icon\note.obj src\icon\warning.obj src\icon\file.obj src\icon\directory.obj src\icon\back.obj src\icon\forward.obj src\icon\computer.obj src\icon\up.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\cross.obj src\cursor\default.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\window.obj src\widget\entry.obj src\widget\label.obj src\widget\opengl.obj src\widget\radiobox.obj src\widget\submenu.obj src\widget\menu.obj src\widget\image.obj src\widget\viewport.obj src\widget\listbox.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\font\boldfont.obj src\font\boldttf.obj src\font\font.obj src\font\ttf.obj src\math\mmx_guard.obj src\math\mmx.obj src\math\default.obj src\math\nbsd_pow.obj src\math\math.obj src\color_picker\color_picker.obj src\backend\gdi.obj
+	$(LD) $(LDFLAGS)  -e$@  src\default.obj src\lowlevel.obj src\color.obj src\directory.obj src\text.obj src\error.obj src\unicode.obj src\messagebox.obj src\string.obj src\filechooser.obj src\core.obj src\draw.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\error.obj src\icon\info.obj src\icon\news.obj src\icon\note.obj src\icon\warning.obj src\icon\file.obj src\icon\directory.obj src\icon\back.obj src\icon\forward.obj src\icon\computer.obj src\icon\up.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\cross.obj src\cursor\default.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\window.obj src\widget\entry.obj src\widget\label.obj src\widget\opengl.obj src\widget\radiobox.obj src\widget\submenu.obj src\widget\menu.obj src\widget\image.obj src\widget\viewport.obj src\widget\listbox.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\font\boldfont.obj src\font\boldttf.obj src\font\font.obj src\font\ttf.obj src\math\mmx_guard.obj src\math\mmx.obj src\math\default.obj src\math\nbsd_pow.obj src\math\math.obj src\color_picker\color_picker.obj src\backend\gdi.obj  -lopengl32.lib -lgdi32.lib -luser32.lib
 	implib src\Mw.lib src\Mw.dll
 
 .c.obj:
diff --git a/NTMakefile b/NTMakefile
index 78cb5d8a6..512ae18b5 100644
--- a/NTMakefile
+++ b/NTMakefile
@@ -64,13 +64,14 @@ clean:
 	del /f /q src\math\mmx_guard.obj
 	del /f /q src\math\mmx.obj
 	del /f /q src\math\default.obj
-	del /f /q src\math\math.obj
 	del /f /q src\math\nbsd_pow.obj
+	del /f /q src\math\math.obj
+	del /f /q src\color_picker\color_picker.obj
 	del /f /q src\backend\gdi.obj
 	del /f /q src\Mw.dll
 
-src\Mw.dll:  src\default.obj src\lowlevel.obj src\color.obj src\directory.obj src\text.obj src\error.obj src\unicode.obj src\messagebox.obj src\string.obj src\filechooser.obj src\core.obj src\draw.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\error.obj src\icon\info.obj src\icon\news.obj src\icon\note.obj src\icon\warning.obj src\icon\file.obj src\icon\directory.obj src\icon\back.obj src\icon\forward.obj src\icon\computer.obj src\icon\up.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\cross.obj src\cursor\default.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\window.obj src\widget\entry.obj src\widget\label.obj src\widget\opengl.obj src\widget\radiobox.obj src\widget\submenu.obj src\widget\menu.obj src\widget\image.obj src\widget\viewport.obj src\widget\listbox.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\font\boldfont.obj src\font\boldttf.obj src\font\font.obj src\font\ttf.obj src\math\mmx_guard.obj src\math\mmx.obj src\math\default.obj src\math\math.obj src\math\nbsd_pow.obj src\backend\gdi.obj
-	$(LD) $(LDFLAGS)  /OUT:$@  src\default.obj src\lowlevel.obj src\color.obj src\directory.obj src\text.obj src\error.obj src\unicode.obj src\messagebox.obj src\string.obj src\filechooser.obj src\core.obj src\draw.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\error.obj src\icon\info.obj src\icon\news.obj src\icon\note.obj src\icon\warning.obj src\icon\file.obj src\icon\directory.obj src\icon\back.obj src\icon\forward.obj src\icon\computer.obj src\icon\up.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\cross.obj src\cursor\default.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\window.obj src\widget\entry.obj src\widget\label.obj src\widget\opengl.obj src\widget\radiobox.obj src\widget\submenu.obj src\widget\menu.obj src\widget\image.obj src\widget\viewport.obj src\widget\listbox.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\font\boldfont.obj src\font\boldttf.obj src\font\font.obj src\font\ttf.obj src\math\mmx_guard.obj src\math\mmx.obj src\math\default.obj src\math\math.obj src\math\nbsd_pow.obj src\backend\gdi.obj  opengl32.lib gdi32.lib user32.lib
+src\Mw.dll:  src\default.obj src\lowlevel.obj src\color.obj src\directory.obj src\text.obj src\error.obj src\unicode.obj src\messagebox.obj src\string.obj src\filechooser.obj src\core.obj src\draw.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\error.obj src\icon\info.obj src\icon\news.obj src\icon\note.obj src\icon\warning.obj src\icon\file.obj src\icon\directory.obj src\icon\back.obj src\icon\forward.obj src\icon\computer.obj src\icon\up.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\cross.obj src\cursor\default.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\window.obj src\widget\entry.obj src\widget\label.obj src\widget\opengl.obj src\widget\radiobox.obj src\widget\submenu.obj src\widget\menu.obj src\widget\image.obj src\widget\viewport.obj src\widget\listbox.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\font\boldfont.obj src\font\boldttf.obj src\font\font.obj src\font\ttf.obj src\math\mmx_guard.obj src\math\mmx.obj src\math\default.obj src\math\nbsd_pow.obj src\math\math.obj src\color_picker\color_picker.obj src\backend\gdi.obj
+	$(LD) $(LDFLAGS)  /OUT:$@  src\default.obj src\lowlevel.obj src\color.obj src\directory.obj src\text.obj src\error.obj src\unicode.obj src\messagebox.obj src\string.obj src\filechooser.obj src\core.obj src\draw.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\error.obj src\icon\info.obj src\icon\news.obj src\icon\note.obj src\icon\warning.obj src\icon\file.obj src\icon\directory.obj src\icon\back.obj src\icon\forward.obj src\icon\computer.obj src\icon\up.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\cross.obj src\cursor\default.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\window.obj src\widget\entry.obj src\widget\label.obj src\widget\opengl.obj src\widget\radiobox.obj src\widget\submenu.obj src\widget\menu.obj src\widget\image.obj src\widget\viewport.obj src\widget\listbox.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\font\boldfont.obj src\font\boldttf.obj src\font\font.obj src\font\ttf.obj src\math\mmx_guard.obj src\math\mmx.obj src\math\default.obj src\math\nbsd_pow.obj src\math\math.obj src\color_picker\color_picker.obj src\backend\gdi.obj  opengl32.lib gdi32.lib user32.lib
 	
 
 .c.obj:
diff --git a/WatMakefile b/WatMakefile
index 20f58bab6..95bcbeb27 100644
--- a/WatMakefile
+++ b/WatMakefile
@@ -63,13 +63,14 @@ clean: .SYMBOLIC
 	%erase src/math/mmx_guard.obj
 	%erase src/math/mmx.obj
 	%erase src/math/default.obj
-	%erase src/math/math.obj
 	%erase src/math/nbsd_pow.obj
+	%erase src/math/math.obj
+	%erase src/color_picker/color_picker.obj
 	%erase src/backend/gdi.obj
 	%erase src/Mw.dll
 
-src/Mw.dll:  src/default.obj src/lowlevel.obj src/color.obj src/directory.obj src/text.obj src/error.obj src/unicode.obj src/messagebox.obj src/string.obj src/filechooser.obj src/core.obj src/draw.obj external/stb_ds.obj external/stb_image.obj external/stb_truetype.obj src/icon/error.obj src/icon/info.obj src/icon/news.obj src/icon/note.obj src/icon/warning.obj src/icon/file.obj src/icon/directory.obj src/icon/back.obj src/icon/forward.obj src/icon/computer.obj src/icon/up.obj src/icon/search.obj src/icon/down.obj src/icon/left.obj src/icon/right.obj src/cursor/cross.obj src/cursor/default.obj src/cursor/text.obj src/cursor/hidden.obj src/widget/button.obj src/widget/frame.obj src/widget/window.obj src/widget/entry.obj src/widget/label.obj src/widget/opengl.obj src/widget/radiobox.obj src/widget/submenu.obj src/widget/menu.obj src/widget/image.obj src/widget/viewport.obj src/widget/listbox.obj src/widget/scrollbar.obj src/widget/checkbox.obj src/widget/numberentry.obj src/widget/progressbar.obj src/font/boldfont.obj src/font/boldttf.obj src/font/font.obj src/font/ttf.obj src/math/mmx_guard.obj src/math/mmx.obj src/math/default.obj src/math/math.obj src/math/nbsd_pow.obj src/backend/gdi.obj
-	$(LD) $(LDFLAGS) option implib=src/Mw.lib name $@  file src/default.obj file src/lowlevel.obj file src/color.obj file src/directory.obj file src/text.obj file src/error.obj file src/unicode.obj file src/messagebox.obj file src/string.obj file src/filechooser.obj file src/core.obj file src/draw.obj file external/stb_ds.obj file external/stb_image.obj file external/stb_truetype.obj file src/icon/error.obj file src/icon/info.obj file src/icon/news.obj file src/icon/note.obj file src/icon/warning.obj file src/icon/file.obj file src/icon/directory.obj file src/icon/back.obj file src/icon/forward.obj file src/icon/computer.obj file src/icon/up.obj file src/icon/search.obj file src/icon/down.obj file src/icon/left.obj file src/icon/right.obj file src/cursor/cross.obj file src/cursor/default.obj file src/cursor/text.obj file src/cursor/hidden.obj file src/widget/button.obj file src/widget/frame.obj file src/widget/window.obj file src/widget/entry.obj file src/widget/label.obj file src/widget/opengl.obj file src/widget/radiobox.obj file src/widget/submenu.obj file src/widget/menu.obj file src/widget/image.obj file src/widget/viewport.obj file src/widget/listbox.obj file src/widget/scrollbar.obj file src/widget/checkbox.obj file src/widget/numberentry.obj file src/widget/progressbar.obj file src/font/boldfont.obj file src/font/boldttf.obj file src/font/font.obj file src/font/ttf.obj file src/math/mmx_guard.obj file src/math/mmx.obj file src/math/default.obj file src/math/math.obj file src/math/nbsd_pow.obj file src/backend/gdi.obj library clib3r.lib library opengl32.lib library gdi32.lib library user32.lib
+src/Mw.dll:  src/default.obj src/lowlevel.obj src/color.obj src/directory.obj src/text.obj src/error.obj src/unicode.obj src/messagebox.obj src/string.obj src/filechooser.obj src/core.obj src/draw.obj external/stb_ds.obj external/stb_image.obj external/stb_truetype.obj src/icon/error.obj src/icon/info.obj src/icon/news.obj src/icon/note.obj src/icon/warning.obj src/icon/file.obj src/icon/directory.obj src/icon/back.obj src/icon/forward.obj src/icon/computer.obj src/icon/up.obj src/icon/search.obj src/icon/down.obj src/icon/left.obj src/icon/right.obj src/cursor/cross.obj src/cursor/default.obj src/cursor/text.obj src/cursor/hidden.obj src/widget/button.obj src/widget/frame.obj src/widget/window.obj src/widget/entry.obj src/widget/label.obj src/widget/opengl.obj src/widget/radiobox.obj src/widget/submenu.obj src/widget/menu.obj src/widget/image.obj src/widget/viewport.obj src/widget/listbox.obj src/widget/scrollbar.obj src/widget/checkbox.obj src/widget/numberentry.obj src/widget/progressbar.obj src/font/boldfont.obj src/font/boldttf.obj src/font/font.obj src/font/ttf.obj src/math/mmx_guard.obj src/math/mmx.obj src/math/default.obj src/math/nbsd_pow.obj src/math/math.obj src/color_picker/color_picker.obj src/backend/gdi.obj
+	$(LD) $(LDFLAGS) option implib=src/Mw.lib name $@  file src/default.obj file src/lowlevel.obj file src/color.obj file src/directory.obj file src/text.obj file src/error.obj file src/unicode.obj file src/messagebox.obj file src/string.obj file src/filechooser.obj file src/core.obj file src/draw.obj file external/stb_ds.obj file external/stb_image.obj file external/stb_truetype.obj file src/icon/error.obj file src/icon/info.obj file src/icon/news.obj file src/icon/note.obj file src/icon/warning.obj file src/icon/file.obj file src/icon/directory.obj file src/icon/back.obj file src/icon/forward.obj file src/icon/computer.obj file src/icon/up.obj file src/icon/search.obj file src/icon/down.obj file src/icon/left.obj file src/icon/right.obj file src/cursor/cross.obj file src/cursor/default.obj file src/cursor/text.obj file src/cursor/hidden.obj file src/widget/button.obj file src/widget/frame.obj file src/widget/window.obj file src/widget/entry.obj file src/widget/label.obj file src/widget/opengl.obj file src/widget/radiobox.obj file src/widget/submenu.obj file src/widget/menu.obj file src/widget/image.obj file src/widget/viewport.obj file src/widget/listbox.obj file src/widget/scrollbar.obj file src/widget/checkbox.obj file src/widget/numberentry.obj file src/widget/progressbar.obj file src/font/boldfont.obj file src/font/boldttf.obj file src/font/font.obj file src/font/ttf.obj file src/math/mmx_guard.obj file src/math/mmx.obj file src/math/default.obj file src/math/nbsd_pow.obj file src/math/math.obj file src/color_picker/color_picker.obj file src/backend/gdi.obj library clib3r.lib library opengl32.lib library gdi32.lib library user32.lib
 	
 
 
@@ -187,9 +188,11 @@ src/math/mmx.obj: src/math/mmx.c
 	$(CC) $(CFLAGS) -fo=$@ $<
 src/math/default.obj: src/math/default.c
 	$(CC) $(CFLAGS) -fo=$@ $<
+src/math/nbsd_pow.obj: src/math/nbsd_pow.c
+	$(CC) $(CFLAGS) -fo=$@ $<
 src/math/math.obj: src/math/math.c
 	$(CC) $(CFLAGS) -fo=$@ $<
-src/math/nbsd_pow.obj: src/math/nbsd_pow.c
+src/color_picker/color_picker.obj: src/color_picker/color_picker.c
 	$(CC) $(CFLAGS) -fo=$@ $<
 src/backend/gdi.obj: src/backend/gdi.c
 	$(CC) $(CFLAGS) -fo=$@ $<
diff --git a/examples/basic/color_picker.c b/examples/basic/color_picker.c
index 92842ad71..920a0a79f 100644
--- a/examples/basic/color_picker.c
+++ b/examples/basic/color_picker.c
@@ -1,8 +1,6 @@
 /* $Id$ */
 
-#include "Mw/Core.h"
 #include <Mw/Milsko.h>
-#include <Mw/LowLevelMath.h>
 
 int main() {
 	MwWidget w = MwVaCreateWidget(MwWindowClass, "main", NULL, MwDEFAULT,
@@ -10,6 +8,8 @@ int main() {
 
 	MwWidget cpicker = MwColorPicker(w, "cpicker");
 
+	printf("!\n");
+
 	(void)cpicker;
 
 	MwLoop(w);
diff --git a/src/color_picker/color_picker.c b/src/color_picker/color_picker.c
index 55c8f9835..788cf0a6b 100644
--- a/src/color_picker/color_picker.c
+++ b/src/color_picker/color_picker.c
@@ -1,10 +1,7 @@
 /* $Id$ */
+#include <Mw/Milsko.h>
 
 #include "color_picker.h"
-#include "Mw/Core.h"
-#include <stdlib.h>
-#include <string.h>
-
 #include <Mw/LowLevelMath.h>
 
 static MwRGB hsv2rgb(MwHSV in) {
@@ -94,6 +91,8 @@ static void color_picker_click(MwWidget handle, void* user, void* call) {
 	MwLLMouse*    mouse  = (MwLLMouse*)call;
 	char*	      hexColor;
 	int	      i, r, g, b, a;
+	char* fgColor;
+	int fr, fg, fb;
 
 	(void)handle;
 	(void)user;
@@ -111,12 +110,12 @@ static void color_picker_click(MwWidget handle, void* user, void* call) {
 	(void)a;
 
 	hexColor      = malloc(8);
-	char* fgColor = malloc(8);
+	fgColor = malloc(8);
 	snprintf(hexColor, 8, "#%02X%02X%02X", r, g, b);
 
-	int fr = r > 128 ? 0 : 255;
-	int fg = g > 128 ? 0 : 255;
-	int fb = b > 128 ? 0 : 255;
+	fr = r > 128 ? 0 : 255;
+	fg = g > 128 ? 0 : 255;
+	fb = b > 128 ? 0 : 255;
 
 	snprintf(fgColor, 8, "#%02X%02X%02X", fr, fg, fb);
 	MwSetText(picker->inner.color_display, MwNbackground, hexColor);
@@ -202,6 +201,7 @@ MwWidget MwColorPicker(MwWidget handle, const char* title) {
 	MwPoint	      p;
 	color_picker* wheel;
 	MwWidget      window;
+	int ww, wh;
 
 	// remove later
 	MwLLVec test_1	 = MwLLVecU32x2(2, 5);
@@ -214,8 +214,8 @@ MwWidget MwColorPicker(MwWidget handle, const char* title) {
 	printf("%d + %d = %d\n", test_1.un.u32.a, test_2.un.u32.a, test_out.un.u32.a);
 	printf("%d + %d = %d\n", test_1.un.u32.b, test_2.un.u32.b, test_out.un.u32.b);
 
-	int ww = MwGetInteger(handle, MwNwidth);
-	int wh = MwGetInteger(handle, MwNheight);
+	ww = MwGetInteger(handle, MwNwidth);
+	wh = MwGetInteger(handle, MwNheight);
 	p.x = p.y = 0;
 
 	window = MwVaCreateWidget(MwWindowClass, "main", handle, MwDEFAULT, MwDEFAULT,
diff --git a/src/color_picker/color_picker.h b/src/color_picker/color_picker.h
index 065dbb218..fc46714c2 100644
--- a/src/color_picker/color_picker.h
+++ b/src/color_picker/color_picker.h
@@ -32,6 +32,7 @@ struct _color_picker_inner {
 };
 
 struct _color_picker_vtable {
+	void* reserved;
 };
 
 struct _color_picker {
diff --git a/src/math/math.c b/src/math/math.c
index 1dc49be58..9131a3fb0 100644
--- a/src/math/math.c
+++ b/src/math/math.c
@@ -47,7 +47,7 @@ static cpuFeatures getCPUFeatures(void) {
 	__asm {
 		cpuid
 		mov _eax, eax
-		mov _edx, edx
+//		mov _edx, edx
 	}
 #else
 	__asm__ __volatile__(
diff --git a/src/math/math_internal.h b/src/math/math_internal.h
index 2aef78b71..025a33d9d 100644
--- a/src/math/math_internal.h
+++ b/src/math/math_internal.h
@@ -29,6 +29,7 @@ struct _cpuFeatures {
 	MwBool pse36 : 1;   /* 36-Bit Page Size Extension */
 	MwBool psn : 1;	    /* Processor Serial Number */
 	MwBool clflush : 1; /* CLFLUSH instr */
+	MwBool pad1 : 1;
 	MwBool ds : 1;	    /* Debug Store */
 	MwBool acpi : 1;    /* Thermal Monitor and Software Controlled Clock Facilities */
 	MwBool mmx : 1;	    /* Intel MMX Technology */
@@ -38,6 +39,7 @@ struct _cpuFeatures {
 	MwBool ss : 1;	    /* Self Snoop */
 	MwBool hit : 1;	    /* Max APIC IDs */
 	MwBool tm : 1;	    /* Thermal Monitor */
+	MwBool pad2 : 1;
 	MwBool pbe : 1;	    /* Pending Break Enable */
 };
 #endif
diff --git a/tools/genmk.pl b/tools/genmk.pl
index 02fb8baa5..b7f186c5c 100755
--- a/tools/genmk.pl
+++ b/tools/genmk.pl
@@ -151,6 +151,7 @@ scan("src/widget");
 scan("src/text");
 scan("src/font");
 scan("src/math");
+scan("src/color_picker");
 push(@cfiles, "src/backend/gdi.c");
 
 generate("BorMakefile", "Borland");