diff --git a/Contrib/UIs/SConscript b/Contrib/UIs/SConscript
index 02c75534..d85df40a 100644
--- a/Contrib/UIs/SConscript
+++ b/Contrib/UIs/SConscript
@@ -1,13 +1,25 @@
+code = 'ui.c'
+
 uis = Split("""
-	default.exe
-	modern.exe
-	modern_headerbmp.exe
-	modern_headerbmpr.exe
-	modern_nodesc.exe
-	modern_smalldesc.exe
-	sdbarker_tiny.exe
+	default
+	modern
+	modern_headerbmp
+	modern_headerbmpr
+	modern_nodesc
+	modern_smalldesc
+	sdbarker_tiny
 """)
 
-Import('defenv')
+libs = Split("""
+	kernel32
+	comctl32
+	user32
+	gdi32
+""")
 
-defenv.DistributeContribs('UIs', uis)
+Import('BuildUtil env')
+
+code = env.Object(code)
+
+for ui in uis:
+	BuildUtil(ui, code, libs, entry = 'WinMain', res = ui + '.rc', install = 'Contrib/UIs')
diff --git a/Contrib/UIs/UI Holder/ui.dsp b/Contrib/UIs/UI Holder/ui.dsp
deleted file mode 100644
index 7918f006..00000000
--- a/Contrib/UIs/UI Holder/ui.dsp	
+++ /dev/null
@@ -1,83 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ui" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=ui - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ui.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ui.mak" CFG="ui - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ui - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
-# SUBTRACT CPP /YX /Yc /Yu
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x40d /d "NDEBUG"
-# ADD RSC /l 0x40d /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib /nologo /entry:"WinMain" /subsystem:windows /machine:I386 /nodefaultlib /out:"../default.exe" /opt:nowin98
-# SUBTRACT LINK32 /pdb:none
-# Begin Target
-
-# Name "ui - Win32 Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\ui.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\resource.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=.\resource.rc
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/Contrib/UIs/UI Holder/ui.dsw b/Contrib/UIs/UI Holder/ui.dsw
deleted file mode 100644
index 10f9172a..00000000
--- a/Contrib/UIs/UI Holder/ui.dsw	
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "ui"=.\ui.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/Contrib/UIs/default.exe b/Contrib/UIs/default.exe
deleted file mode 100755
index 9d627995..00000000
Binary files a/Contrib/UIs/default.exe and /dev/null differ
diff --git a/Contrib/UIs/UI Holder/resource.rc b/Contrib/UIs/default.rc
similarity index 69%
rename from Contrib/UIs/UI Holder/resource.rc
rename to Contrib/UIs/default.rc
index c5a6fd75..37cf5a25 100644
--- a/Contrib/UIs/UI Holder/resource.rc	
+++ b/Contrib/UIs/default.rc
@@ -1,29 +1,6 @@
-//Microsoft Developer Studio generated resource script.
-//
 #include "resource.h"
 
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
 
 IDD_LICENSE DIALOGEX 0, 0, 266, 130
 STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
@@ -36,10 +13,10 @@ BEGIN
 END
 
 IDD_LICENSE_FSRB DIALOG DISCARDABLE  0, 0, 266, 130
-STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CAPTION
+STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON            IDI_ICON2,1031,0,0,22,20
+    ICON            IDI_ICON2,IDC_ULICON,0,0,22,20
     LTEXT           "",IDC_INTROTEXT,25,0,241,23
     CONTROL         "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL | 
                     WS_TABSTOP | 0x804,0,24,266,85
@@ -50,10 +27,10 @@ BEGIN
 END
 
 IDD_LICENSE_FSCB DIALOG DISCARDABLE  0, 0, 266, 130
-STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CAPTION
+STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON            IDI_ICON2,1031,0,0,22,20
+    ICON            IDI_ICON2,IDC_ULICON,0,0,22,20
     LTEXT           "",IDC_INTROTEXT,25,0,241,23
     CONTROL         "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL |
                     WS_TABSTOP | 0x804,0,24,266,95
@@ -141,66 +118,3 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     CTEXT           "",IDC_STR,7,7,148,8
 END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    "IDD_INST$(NSIS_CONFIG_VISIBLE_SUPPORT)", DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 273
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 156
-    END
-
-    "IDD_INSTFILES$(NSIS_CONFIG_VISIBLE_SUPPORT)", DIALOG
-    BEGIN
-        RIGHTMARGIN, 246
-        BOTTOMMARGIN, 125
-    END
-
-    "IDD_VERIFY$(_NSIS_CONFIG_VERIFYDIALOG)", DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 155
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 15
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "#include ""config.h""\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/Contrib/UIs/modern.exe b/Contrib/UIs/modern.exe
deleted file mode 100644
index 3e308407..00000000
Binary files a/Contrib/UIs/modern.exe and /dev/null differ
diff --git a/Contrib/UIs/modern.rc b/Contrib/UIs/modern.rc
new file mode 100644
index 00000000..07c1cb20
--- /dev/null
+++ b/Contrib/UIs/modern.rc
@@ -0,0 +1,118 @@
+#include "resource.h"
+
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+IDD_LICENSE DIALOGEX 0, 0, 300, 140
+STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CAPTION
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+FONT 8, "MS Shell Dlg"
+BEGIN
+   CONTROL "", 1040, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 0, 300, 15 
+   CONTROL "", IDC_EDIT1, "RichEdit20A", ES_LEFT | ES_MULTILINE | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 0, 15, 300, 93 
+   CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 113, 300, 26 
+END
+
+IDD_DIR DIALOGEX 0, 0, 300, 140
+STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+FONT 8, "MS Shell Dlg"
+BEGIN
+   CONTROL "", IDC_DIR, EDIT, ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 10, 85, 215, 12 
+   CONTROL "", IDC_BROWSE, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 233, 83, 55, 15 
+   CONTROL "", IDC_SPACEAVAILABLE, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD | WS_VISIBLE, 0, 125, 150, 8 
+   CONTROL "", IDC_CHECK1, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_TABSTOP, 180, IDB_BITMAP1, 118, 10 
+   CONTROL "", IDC_SPACEREQUIRED, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD | WS_VISIBLE, 0, 115, 150, 8 
+   CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 0, 300, 60 
+   CONTROL "", IDC_SELDIRTEXT, BUTTON, BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 0, 70, 300, 35 
+END
+
+IDD_SELCOM DIALOGEX 0, 0, 300, 140
+STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+FONT 8, "MS Shell Dlg"
+BEGIN
+   CONTROL "", IDC_COMBO1, COMBOBOX, CBS_DROPDOWNLIST | WS_CHILD | WS_VSCROLL | WS_TABSTOP, 102, 25, 98, 107 
+   CONTROL "", IDC_TEXT2, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 40, 95, 65 
+   CONTROL "", IDC_TEXT1, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD | WS_VISIBLE, 0, 25, 95, 8 
+   CONTROL "", IDC_SPACEREQUIRED, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 115, 100, 18 
+   CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 0, 300, 20 
+   CONTROL "", IDC_TREE1, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 102, 40, 98, 95 
+   CONTROL "", 1042, BUTTON, BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 210, 36, 89, 99 
+   CONTROL "", 1043, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 215, 46, 78, 84 
+END
+
+IDD_INST DIALOGEX 0, 0, 331, 222
+STYLE DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+FONT 8, "MS Shell Dlg"
+BEGIN
+   CONTROL "", 3, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 166, 201, 50, 14 
+   CONTROL "", 1, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 216, 201, 50, 14 
+   CONTROL "", 2, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 273, 201, 50, 14 
+   CONTROL "", IDC_CHILDRECT, STATIC, SS_BLACKRECT | WS_CHILD | WS_GROUP, 15, 45, 300, 140 
+   CONTROL "", 1044, STATIC, SS_BLACKRECT | WS_CHILD | WS_GROUP, 0, 0, 331, 193 
+   CONTROL "", IDC_LICENSEDISAGREE, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 193, 321, 1 
+   CONTROL "", 1036, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE | WS_GROUP, 0, 35, 340, 1 
+   CONTROL "", 1045, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_GROUP, 0, 193, 340, 1 
+   CONTROL "", 1256, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 188, 322, 8 
+   CONTROL "", IDC_VERSTR, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_GROUP, 5, 188, 322, 8 
+   CONTROL "", IDC_LICENSEAGREE, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 0, 0, 332, 35 
+   CONTROL "", 1037, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 10, 5, 280, 10 
+   CONTROL "", 1038, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 15, 16, 275, 16 
+   CONTROL IDI_ICON2, 1039, STATIC, SS_ICON | WS_CHILD | WS_VISIBLE | WS_GROUP, 300, 8, 21, 20 
+END
+
+IDD_INSTFILES DIALOGEX 0, 0, 300, 140
+STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+FONT 8, "MS Shell Dlg"
+BEGIN
+   CONTROL "", IDC_SHOWDETAILS, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE, 1, 26, 60, 14 
+   CONTROL "", IDC_PROGRESS, "msctls_progress32", WS_CHILD | WS_VISIBLE | WS_BORDER, 0, 10, 300, 11 
+   CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFTNOWORDWRAP | SS_NOPREFIX | WS_CHILD | WS_VISIBLE, 0, 0, 300, 10 
+   CONTROL "", IDC_LIST1, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | WS_CHILD | WS_BORDER | WS_TABSTOP, 0, 25, 300, 110 
+END
+
+IDD_UNINST DIALOGEX 0, 0, 300, 140
+STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+FONT 8, "MS Shell Dlg"
+BEGIN
+   CONTROL "", IDC_UNINSTFROM, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 42, 60, 8 
+   CONTROL "", IDC_EDIT1, EDIT, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 65, 40, 234, 12 
+   CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 0, 300, 30 
+END
+
+IDD_LICENSE_FSRB DIALOGEX 0, 0, 300, 140
+STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CAPTION
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+FONT 8, "MS Shell Dlg"
+BEGIN
+   CONTROL "", 1040, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 0, 300, 15 
+   CONTROL "", IDC_EDIT1, "RichEdit20A", ES_LEFT | ES_MULTILINE | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 0, 15, 300, 73 
+   CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 93, 300, 26 
+   CONTROL "", IDC_LICENSEAGREE, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 120, 300, 9 
+   CONTROL "", IDC_LICENSEDISAGREE, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 130, 300, 9 
+END
+
+IDD_LICENSE_FSCB DIALOGEX 0, 0, 300, 140
+STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CAPTION
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+FONT 8, "MS Shell Dlg"
+BEGIN
+   CONTROL "", 1040, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 0, 300, 15 
+   CONTROL "", IDC_EDIT1, "RichEdit20A", ES_LEFT | ES_MULTILINE | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 0, 15, 300, 83 
+   CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 103, 300, 26 
+   CONTROL "", IDC_LICENSEAGREE, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 130, 300, 9 
+END
+
+IDD_VERIFY DIALOGEX 0, 0, 167, 42
+STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CENTER | WS_POPUP
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+FONT 8, "MS Shell Dlg"
+BEGIN
+   CONTROL "", IDC_STR, STATIC, SS_CENTER | WS_CHILD | WS_VISIBLE, 40, 25, 120, 10 
+   CONTROL IDI_ICON2, -1, STATIC, SS_ICON | WS_CHILD | WS_VISIBLE, 10, 10, 21, 20 
+   CONTROL "Please wait while Setup is loading...", 76, STATIC, SS_CENTER | WS_CHILD | WS_VISIBLE, 40, 10, 120, 10 
+END
+
diff --git a/Contrib/UIs/modern_headerbmp.exe b/Contrib/UIs/modern_headerbmp.exe
deleted file mode 100644
index edf2d75d..00000000
Binary files a/Contrib/UIs/modern_headerbmp.exe and /dev/null differ
diff --git a/Contrib/UIs/modern_headerbmp.rc b/Contrib/UIs/modern_headerbmp.rc
new file mode 100644
index 00000000..8b146390
--- /dev/null
+++ b/Contrib/UIs/modern_headerbmp.rc
@@ -0,0 +1,25 @@
+#include "resource.h"
+
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+IDD_INST DIALOGEX 0, 0, 331, 222
+STYLE DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+FONT 8, "MS Shell Dlg"
+BEGIN
+   CONTROL "", 3, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 166, 201, 50, 14 
+   CONTROL "", 1, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 216, 201, 50, 14 
+   CONTROL "", 2, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 273, 201, 50, 14 
+   CONTROL "", IDC_CHILDRECT, STATIC, SS_BLACKRECT | WS_CHILD | WS_GROUP, 15, 45, 300, 140 
+   CONTROL "", 1044, STATIC, SS_BLACKRECT | WS_CHILD | WS_GROUP, 0, 0, 331, 193 
+   CONTROL "", IDC_LICENSEDISAGREE, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 193, 321, 1 
+   CONTROL "", 1036, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE | WS_GROUP, 0, 35, 340, 1 
+   CONTROL "", 1045, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_GROUP, 0, 193, 340, 1 
+   CONTROL "", 1256, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 188, 322, 8 
+   CONTROL "", IDC_VERSTR, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_GROUP, 5, 188, 322, 8 
+   CONTROL "", IDC_LICENSEAGREE, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 0, 0, 332, 35 
+   CONTROL "", 1037, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 105, 5, 215, 10 
+   CONTROL "", 1038, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 110, 16, 210, 16 
+   CONTROL "", 1046, STATIC, SS_BITMAP | WS_CHILD | WS_VISIBLE, 0, 0, 100, 35 
+END
+
diff --git a/Contrib/UIs/modern_headerbmpr.exe b/Contrib/UIs/modern_headerbmpr.exe
deleted file mode 100644
index 7c60ebaf..00000000
Binary files a/Contrib/UIs/modern_headerbmpr.exe and /dev/null differ
diff --git a/Contrib/UIs/modern_headerbmpr.rc b/Contrib/UIs/modern_headerbmpr.rc
new file mode 100644
index 00000000..4f6bf2a1
--- /dev/null
+++ b/Contrib/UIs/modern_headerbmpr.rc
@@ -0,0 +1,25 @@
+#include "resource.h"
+
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+IDD_INST DIALOGEX 0, 0, 331, 222
+STYLE DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+FONT 8, "MS Shell Dlg"
+BEGIN
+   CONTROL "", 3, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 166, 201, 50, 14 
+   CONTROL "", 1, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 216, 201, 50, 14 
+   CONTROL "", 2, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 273, 201, 50, 14 
+   CONTROL "", IDC_CHILDRECT, STATIC, SS_BLACKRECT | WS_CHILD | WS_GROUP, 15, 45, 300, 140 
+   CONTROL "", 1044, STATIC, SS_BLACKRECT | WS_CHILD | WS_GROUP, 0, 0, 331, 193 
+   CONTROL "", IDC_LICENSEDISAGREE, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 193, 321, 1 
+   CONTROL "", 1036, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE | WS_GROUP, 0, 35, 340, 1 
+   CONTROL "", 1045, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_GROUP, 0, 193, 340, 1 
+   CONTROL "", 1256, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 188, 322, 8 
+   CONTROL "", IDC_VERSTR, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_GROUP, 5, 188, 322, 8 
+   CONTROL "", IDC_LICENSEAGREE, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 0, 0, 332, 35 
+   CONTROL "", 1037, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 10, 5, 215, 10 
+   CONTROL "", 1038, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 15, 16, 210, 16 
+   CONTROL "", 1046, STATIC, SS_BITMAP | WS_CHILD | WS_VISIBLE, 231, 0, 100, 35 
+END
+
diff --git a/Contrib/UIs/modern_nodesc.exe b/Contrib/UIs/modern_nodesc.exe
deleted file mode 100644
index d9d99ab9..00000000
Binary files a/Contrib/UIs/modern_nodesc.exe and /dev/null differ
diff --git a/Contrib/UIs/modern_nodesc.rc b/Contrib/UIs/modern_nodesc.rc
new file mode 100644
index 00000000..c9881e12
--- /dev/null
+++ b/Contrib/UIs/modern_nodesc.rc
@@ -0,0 +1,17 @@
+#include "resource.h"
+
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+IDD_SELCOM DIALOGEX 0, 0, 300, 140
+STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+FONT 8, "MS Shell Dlg"
+BEGIN
+   CONTROL "", IDC_COMBO1, COMBOBOX, CBS_DROPDOWNLIST | WS_CHILD | WS_VSCROLL | WS_TABSTOP, 102, 25, 195, 104 
+   CONTROL "", IDC_TEXT2, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 40, 95, 65 
+   CONTROL "", IDC_TEXT1, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD | WS_VISIBLE, 0, 25, 95, 8 
+   CONTROL "", IDC_SPACEREQUIRED, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 115, 100, 18 
+   CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 0, 300, 20 
+   CONTROL "", IDC_TREE1, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 102, 40, 195, 95 
+END
+
diff --git a/Contrib/UIs/modern_smalldesc.exe b/Contrib/UIs/modern_smalldesc.exe
deleted file mode 100644
index 9b20bce9..00000000
Binary files a/Contrib/UIs/modern_smalldesc.exe and /dev/null differ
diff --git a/Contrib/UIs/modern_smalldesc.rc b/Contrib/UIs/modern_smalldesc.rc
new file mode 100644
index 00000000..3e76cd1c
--- /dev/null
+++ b/Contrib/UIs/modern_smalldesc.rc
@@ -0,0 +1,19 @@
+#include "resource.h"
+
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+IDD_SELCOM DIALOGEX 0, 0, 300, 140
+STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+FONT 8, "MS Shell Dlg"
+BEGIN
+   CONTROL "", IDC_COMBO1, COMBOBOX, CBS_DROPDOWNLIST | WS_CHILD | WS_VSCROLL | WS_TABSTOP, 102, 25, 195, 74 
+   CONTROL "", IDC_TEXT2, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 40, 95, 65 
+   CONTROL "", IDC_TEXT1, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD | WS_VISIBLE, 0, 25, 95, 8 
+   CONTROL "", IDC_SPACEREQUIRED, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 115, 100, 18 
+   CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 0, 300, 20 
+   CONTROL "", IDC_TREE1, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 102, 40, 195, 65 
+   CONTROL "", 1042, BUTTON, BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 102, 105, 195, 35 
+   CONTROL "", 1043, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 108, 117, 183, 18 
+END
+
diff --git a/Contrib/UIs/UI Holder/resource.h b/Contrib/UIs/resource.h
similarity index 78%
rename from Contrib/UIs/UI Holder/resource.h
rename to Contrib/UIs/resource.h
index df080c82..baeee936 100644
--- a/Contrib/UIs/UI Holder/resource.h	
+++ b/Contrib/UIs/resource.h
@@ -1,9 +1,11 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by resource.rc
-//
+#include <windows.h>
+
+#ifndef IDC_STATIC
+#define IDC_STATIC (-1)
+#endif
+
 #ifndef DS_SHELLFONT
-#define DS_SHELLFONT        (DS_SETFONT | DS_FIXEDSYS)
+#define DS_SHELLFONT (DS_SETFONT | DS_FIXEDSYS)
 #endif
 
 #define IDC_BACK                        3
@@ -41,16 +43,3 @@
 #define IDC_BRANDIMAGE                  1033
 #define IDC_LICENSEAGREE                1034
 #define IDC_LICENSEDISAGREE             1035
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        112
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1036
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
-
-
diff --git a/Contrib/UIs/sdbarker_tiny.exe b/Contrib/UIs/sdbarker_tiny.exe
deleted file mode 100644
index deb495f5..00000000
Binary files a/Contrib/UIs/sdbarker_tiny.exe and /dev/null differ
diff --git a/Contrib/UIs/sdbarker_tiny.rc b/Contrib/UIs/sdbarker_tiny.rc
new file mode 100644
index 00000000..af7d6eb4
--- /dev/null
+++ b/Contrib/UIs/sdbarker_tiny.rc
@@ -0,0 +1,109 @@
+#include "resource.h"
+
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+IDD_LICENSE DIALOGEX 0, 0, 266, 70
+STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+FONT 8, "MS Shell Dlg"
+BEGIN
+   CONTROL IDI_ICON2, IDC_ULICON, STATIC, SS_ICON | WS_CHILD | WS_VISIBLE, 0, 0, 20, 20 
+   CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 25, 0, 241, 23 
+   CONTROL "", IDC_EDIT1, "RichEdit20A", ES_LEFT | ES_MULTILINE | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 0, 24, 266, 47 
+END
+
+IDD_DIR DIALOGEX 0, 0, 266, 70
+STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+FONT 8, "MS Shell Dlg"
+BEGIN
+   CONTROL "", IDC_DIR, EDIT, ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 8, 35, 187, 12 
+   CONTROL "", IDC_BROWSE, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 202, 34, 55, 14 
+   CONTROL IDI_ICON2, IDC_ULICON, STATIC, SS_ICON | WS_CHILD | WS_VISIBLE, 0, 0, 20, 20 
+   CONTROL "", IDC_SELDIRTEXT, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD | WS_VISIBLE, 0, 22, 265, 8 
+   CONTROL "", IDC_SPACEAVAILABLE, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD | WS_VISIBLE, 1, 63, 265, 8 
+   CONTROL "", IDC_SPACEREQUIRED, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD | WS_VISIBLE, 1, 54, 265, 8 
+   CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 25, 0, 241, 18 
+END
+
+IDD_SELCOM DIALOGEX 0, 0, 266, 70
+STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+FONT 8, "MS Shell Dlg"
+BEGIN
+   CONTROL "", IDC_COMBO1, COMBOBOX, CBS_DROPDOWNLIST | WS_CHILD | WS_VSCROLL | WS_TABSTOP, 114, 15, 152, 94 
+   CONTROL IDI_ICON2, IDC_ULICON, STATIC, SS_ICON | WS_CHILD | WS_VISIBLE, 0, 0, 21, 20 
+   CONTROL "", IDC_TEXT2, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 33, 108, 29 
+   CONTROL "", IDC_TEXT1, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD | WS_VISIBLE, 0, 20, 108, 8 
+   CONTROL "", IDC_SPACEREQUIRED, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD | WS_VISIBLE, 0, 60, 111, 8 
+   CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 25, 0, 241, 15 
+   CONTROL "", IDC_TREE1, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 114, 28, 151, 42 
+END
+
+IDD_INST DIALOGEX 0, 0, 280, 105
+STYLE DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+FONT 8, "MS Shell Dlg"
+BEGIN
+   CONTROL "", 3, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_GROUP | WS_TABSTOP, 171, 84, 50, 14 
+   CONTROL "", 1, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 223, 84, 50, 14 
+   CONTROL "", 2, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 84, 50, 14 
+   CONTROL "", -1, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE | WS_GROUP, 7, 79, 265, 1 
+   CONTROL "", IDC_CHILDRECT, STATIC, SS_BLACKRECT | WS_CHILD | WS_GROUP, 7, 6, 266, 70 
+   CONTROL "", IDC_VERSTR, STATIC, SS_CENTER | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_GROUP, 59, 86, 108, 8 
+END
+
+IDD_INSTFILES DIALOGEX 0, 0, 266, 70
+STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+FONT 8, "MS Shell Dlg"
+BEGIN
+   CONTROL "", IDC_PROGRESS, "msctls_progress32", WS_CHILD | WS_VISIBLE | WS_BORDER, 24, 10, 241, 11 
+   CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFTNOWORDWRAP | SS_NOPREFIX | WS_CHILD | WS_VISIBLE, 24, 0, 241, 8 
+   CONTROL "", IDC_LIST1, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | WS_CHILD | WS_BORDER | WS_TABSTOP, 0, 22, 265, 48 
+   CONTROL IDI_ICON2, IDC_ULICON, STATIC, SS_ICON | WS_CHILD | WS_VISIBLE, 0, 0, 20, 20 
+   CONTROL "", IDC_SHOWDETAILS, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE, 0, 28, 60, 14 
+END
+
+IDD_UNINST DIALOGEX 0, 0, 266, 70
+STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+FONT 8, "MS Shell Dlg"
+BEGIN
+   CONTROL IDI_ICON2, IDC_ULICON, STATIC, SS_ICON | WS_CHILD | WS_VISIBLE, 0, 1, 20, 20 
+   CONTROL "", IDC_UNINSTFROM, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 47, 55, 8 
+   CONTROL "", IDC_EDIT1, EDIT, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 56, 45, 209, 12 
+   CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 25, 0, 241, 34 
+END
+
+IDD_LICENSE_FSRB DIALOGEX 0, 0, 266, 70
+STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+FONT 8, "MS Shell Dlg"
+BEGIN
+   CONTROL IDI_ICON2, IDC_ULICON, STATIC, SS_ICON | WS_CHILD | WS_VISIBLE, 0, 0, 20, 20 
+   CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 25, 0, 241, 23 
+   CONTROL "", IDC_EDIT1, "RichEdit20A", ES_LEFT | ES_MULTILINE | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 0, 24, 266, 27 
+   CONTROL "", IDC_LICENSEAGREE, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 50, 266, 9 
+   CONTROL "", IDC_LICENSEDISAGREE, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 60, 266, 9 
+END
+
+IDD_LICENSE_FSCB DIALOGEX 0, 0, 266, 70
+STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+FONT 8, "MS Shell Dlg"
+BEGIN
+   CONTROL IDI_ICON2, IDC_ULICON, STATIC, SS_ICON | WS_CHILD | WS_VISIBLE, 0, 0, 20, 20 
+   CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 25, 0, 241, 23 
+   CONTROL "", IDC_EDIT1, "RichEdit20A", ES_LEFT | ES_MULTILINE | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 0, 24, 266, 37 
+   CONTROL "", IDC_LICENSEAGREE, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 60, 266, 9 
+END
+
+IDD_VERIFY DIALOGEX 0, 0, 162, 22
+STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CENTER | WS_POPUP
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+FONT 8, "MS Shell Dlg"
+BEGIN
+   CONTROL "", IDC_STR, STATIC, SS_CENTER | WS_CHILD | WS_VISIBLE, 7, 7, 148, 8 
+END
+
diff --git a/Contrib/UIs/UI Holder/ui.cpp b/Contrib/UIs/ui.c
similarity index 97%
rename from Contrib/UIs/UI Holder/ui.cpp
rename to Contrib/UIs/ui.c
index a7e4d916..91a7c7ba 100644
--- a/Contrib/UIs/UI Holder/ui.cpp	
+++ b/Contrib/UIs/ui.c
@@ -18,7 +18,11 @@ char* windows[] = {
 
 BOOL CALLBACK GenericProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) {
   static LOGBRUSH b = {BS_SOLID, RGB(255,0,0), 0};
-  static HBRUSH red = CreateBrushIndirect(&b);
+  static HBRUSH red;
+
+  if (!red)
+    red = CreateBrushIndirect(&b);
+
   switch (uMsg) {
     case WM_CTLCOLORSTATIC:
       return (int)red;
diff --git a/SConstruct b/SConstruct
index 42af04e5..110e684d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -33,19 +33,19 @@ plugins = [
 ]
 
 utils = [
-	'Library/RegTool',
 	'Library/LibraryLocal',
+	'Library/RegTool',
 	'MakeLangId',
 	'Makensisw',
 	'NSIS Menu',
+	'UIs',
 	'zip2exe'
 ]
 
 misc = [
 	'Graphics',
 	'Language files',
-	'Modern UI',
-	'UIs'
+	'Modern UI'
 ]
 
 defenv = Environment()
@@ -316,7 +316,8 @@ for plugin in plugins:
 
 def BuildUtil(target, source, libs, entry = None, res = None, 
               resources = None, defines = None, flags = None,
-              install = None, examples = None, docs = None):
+							nodeflib = 0, install = None, install_as = None,
+							examples = None, docs = None):
 	env = util_env.Copy()
 
 	if defines:
@@ -327,6 +328,9 @@ def BuildUtil(target, source, libs, entry = None, res = None,
 	if entry:
 		env.Append(LINKFLAGS = '${ENTRY_FLAG("%s")}' % entry)
 
+	if nodeflib:
+		env.Append(LINKFLAGS = '$NODEFLIBS_FLAG') # no default libraries
+
 	env.Append(LINKFLAGS = '$MAP_FLAG')
 
 	if res:
@@ -345,6 +349,10 @@ def BuildUtil(target, source, libs, entry = None, res = None,
 		ins = env.Distribute(install, util)
 		defenv.Alias('install-utils', ins)
 
+	if install_as is not None:
+		ins = env.DistributeAs(install_as, util)
+		defenv.Alias('install-utils', ins)
+
 	if examples:
 		env.DistributeExamples(target, examples)
 	if docs: