diff --git a/src/ntk-chtheme.C b/src/ntk-chtheme.cxx
similarity index 94%
rename from src/ntk-chtheme.C
rename to src/ntk-chtheme.cxx
index 7f9e232..663ca84 100644
--- a/src/ntk-chtheme.C
+++ b/src/ntk-chtheme.cxx
@@ -17,16 +17,16 @@
 /* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /*******************************************************************************/
 
-#include "FL/themes.H"
-#include "FL/Fl_Theme_Chooser.C"
-
+#include <FL/Fl.H>
+#include <FL/themes.H>
+#include <FL/Fl_Theme_Chooser.H>
 
 int
 main ( int argc, char **argv )
 {
     fl_register_themes();
 
-    Fl_Theme::set();
-
     fl_theme_chooser();
+
+    return 0;
 }
diff --git a/wscript b/wscript
index 9dabb4b..a561502 100644
--- a/wscript
+++ b/wscript
@@ -499,6 +499,14 @@ src/Fl_Gl_Window.cxx
          CFLAGS = ' '.join( CFLAGS ),
          BUILD = os.getcwd() + '/' + out )
 
+    
+    bld.program(
+	source = 'src/ntk-chtheme.cxx',
+	target = 'ntk-chtheme',
+        use = 'ntk',
+        includes = [ '.' ], 
+	install_path = "${BINDIR}" )
+
     # bld( features = 'subst',
     #      source = 'ntk-config.in',
     #      target = '../ntk-config',