diff --git a/unicorn/CMakeLists.txt b/unicorn/CMakeLists.txt
index 1d725046..c01e62b9 100644
--- a/unicorn/CMakeLists.txt
+++ b/unicorn/CMakeLists.txt
@@ -57,6 +57,8 @@ FIND_PACKAGE(LEFDEF REQUIRED)
 FIND_PACKAGE(VLSISAPD REQUIRED)
 FIND_PACKAGE(HURRICANE REQUIRED)
 FIND_PACKAGE(CORIOLIS REQUIRED)
+FIND_PACKAGE(NIMBUS REQUIRED)
+FIND_PACKAGE(MAUKA REQUIRED)
 FIND_PACKAGE(KNIK REQUIRED)
 FIND_PACKAGE(KATABATIC REQUIRED)
 FIND_PACKAGE(KITE REQUIRED)
diff --git a/unicorn/src/CMakeLists.txt b/unicorn/src/CMakeLists.txt
index e50bb60e..b6917535 100644
--- a/unicorn/src/CMakeLists.txt
+++ b/unicorn/src/CMakeLists.txt
@@ -1,8 +1,8 @@
 
                include ( ${QT_USE_FILE} )
-   include_directories ( ${Boost_INCLUDE_DIRS}
-                         ${HURRICANE_INCLUDE_DIR}
+   include_directories ( ${HURRICANE_INCLUDE_DIR}
                          ${CORIOLIS_INCLUDE_DIR}
+                         ${Boost_INCLUDE_DIRS}
                        )
 
                    set ( mocincludes   unicorn/UnicornGui.h
@@ -29,6 +29,10 @@
                                        ${KATABATIC_LIBRARIES}
                                        ${KNIK_GRAPHICAL_LIBRARIES}
                                        ${KNIK_LIBRARIES}
+                                       ${MAUKA_GRAPHICAL_LIBRARIES}
+                                       ${MAUKA_LIBRARIES}
+                                       ${NIMBUS_GRAPHICAL_LIBRARIES}
+                                       ${NIMBUS_LIBRARIES}
                                        ${CORIOLIS_LIBRARIES}
                                        ${HURRICANE_GRAPHICAL_LIBRARIES}
                                        ${HURRICANE_LIBRARIES}
diff --git a/unicorn/src/CgtMain.cpp b/unicorn/src/CgtMain.cpp
index 39c07165..9cd8237a 100644
--- a/unicorn/src/CgtMain.cpp
+++ b/unicorn/src/CgtMain.cpp
@@ -50,6 +50,9 @@ using namespace Hurricane;
 #include  "crlcore/ToolBox.h"
 using namespace CRL;
 
+#include  "mauka/GraphicMaukaEngine.h"
+using namespace Mauka;
+
 #include  "knik/GraphicKnikEngine.h"
 using namespace Knik;
 
@@ -291,8 +294,10 @@ int main ( int argc, char *argv[] )
       cout   << "        Author ........................................ Chris C. N. CHU" << endl;
       cout   << "        Prof. Ident. ............................ Iowa State University" << endl;
       cout   << "        URL ........................ http://home.eng.iastate.edu/~cnchu" << endl;
+      cout   << endl;
       cmess2 << af->getPrint() << endl;
 
+      unicorn->registerTool ( Mauka::GraphicMaukaEngine::grab() );
     //unicorn->registerTool ( Knik::GraphicKnikEngine::grab() );
       unicorn->registerTool ( Kite::GraphicKiteEngine::grab() );
       unicorn->setEnableRedrawInterrupt ( true );