diff --git a/unicorn/src/CgtMain.cpp b/unicorn/src/CgtMain.cpp
index 624afd0e..fc3c70f0 100644
--- a/unicorn/src/CgtMain.cpp
+++ b/unicorn/src/CgtMain.cpp
@@ -15,67 +15,67 @@
 // +-----------------------------------------------------------------+
 
 
-#include  <Python.h>
-#include  <csignal>
-#include  <memory>
+#include <Python.h>
+#include <csignal>
+#include <memory>
 using namespace std;
 
-#include  <boost/program_options.hpp>
+#include <boost/program_options.hpp>
 namespace bopts = boost::program_options;
 
-#include  "vlsisapd/utilities/Path.h"
-#include  "vlsisapd/bookshelf/Exception.h"
-#include  "vlsisapd/configuration/Configuration.h"
-#include  "hurricane/DebugSession.h"
-#include  "hurricane/DataBase.h"
-#include  "hurricane/Cell.h"
-#include  "hurricane/Warning.h"
-#include  "hurricane/UpdateSession.h"
-#include  "hurricane/viewer/Script.h"
+#include "vlsisapd/utilities/Path.h"
+#include "vlsisapd/bookshelf/Exception.h"
+#include "vlsisapd/configuration/Configuration.h"
+#include "hurricane/DebugSession.h"
+#include "hurricane/DataBase.h"
+#include "hurricane/Cell.h"
+#include "hurricane/Warning.h"
+#include "hurricane/UpdateSession.h"
+#include "hurricane/viewer/Script.h"
 
-#include  <QtGui>
+#include <QtGui>
 #if (QT_VERSION >= QT_VERSION_CHECK(4,5,0)) and not defined (__APPLE__)
 #  include  <QGtkStyle>
 #endif
 
-#include  "hurricane/viewer/HApplication.h"
-#include  "hurricane/viewer/Graphics.h"
-#include  "hurricane/viewer/StratusScript.h"
-#include  "hurricane/viewer/SelectCommand.h"
+#include "hurricane/viewer/HApplication.h"
+#include "hurricane/viewer/Graphics.h"
+#include "hurricane/viewer/StratusScript.h"
+#include "hurricane/viewer/SelectCommand.h"
 using namespace Hurricane;
 
-#include  "crlcore/Utilities.h"
-#include  "crlcore/AllianceFramework.h"
-#include  "crlcore/Hierarchy.h"
-#include  "crlcore/ToolBox.h"
-#include  "crlcore/Ispd04Bookshelf.h"
-#include  "crlcore/Iccad04Lefdef.h"
-#include  "crlcore/DefImport.h"
-#include  "crlcore/DefExport.h"
+#include "crlcore/Utilities.h"
+#include "crlcore/AllianceFramework.h"
+#include "crlcore/Hierarchy.h"
+#include "crlcore/ToolBox.h"
+#include "crlcore/Ispd04Bookshelf.h"
+#include "crlcore/Iccad04Lefdef.h"
+#include "crlcore/DefImport.h"
+#include "crlcore/DefExport.h"
 using namespace CRL;
 
-#include  "nimbus/NimbusEngine.h"
+#include "nimbus/NimbusEngine.h"
 using namespace Nimbus;
 
-#include  "metis/MetisEngine.h"
+#include "metis/MetisEngine.h"
 using namespace Metis;
 
-#include  "mauka/GraphicMaukaEngine.h"
+#include "mauka/GraphicMaukaEngine.h"
 using namespace Mauka;
 
-#include  "knik/GraphicKnikEngine.h"
+#include "knik/GraphicKnikEngine.h"
 using namespace Knik;
 
-#include  "kite/GraphicKiteEngine.h"
+#include "kite/GraphicKiteEngine.h"
 using namespace Kite;
 
-#include  "equinox/GraphicEquinoxEngine.h"
+#include "equinox/GraphicEquinoxEngine.h"
 using namespace Equinox;
 
 #include  "solstice/GraphicSolsticeEngine.h"
 using namespace Solstice;
 
-#include  "unicorn/UnicornGui.h"
+#include "unicorn/UnicornGui.h"
 using namespace Unicorn;
 
 
@@ -389,8 +389,8 @@ int main ( int argc, char *argv[] )
       if ( runKiteTool ) {
       //cell->flattenNets ( not arguments.count("global") );
 
-        unsigned int globalFlags = (loadGlobal) ? Kite::LoadGlobalSolution
-                                                : Kite::BuildGlobalSolution;
+        unsigned int globalFlags = (loadGlobal) ? Kite::KtLoadGlobalRouting
+                                                : Kite::KtBuildGlobalRouting;
 
         static KatabaticEngine::NetSet routingNets;
         KiteEngine* kite = KiteEngine::create ( cell );
@@ -400,8 +400,8 @@ int main ( int argc, char *argv[] )
         if ( saveGlobal ) kite->saveGlobalSolution ();
 
         if ( detailedRoute ) {
-          kite->loadGlobalRouting ( Katabatic::LoadGrByNet, routingNets );
-          kite->layerAssign       ( Katabatic::NoNetLayerAssign );
+          kite->loadGlobalRouting ( Katabatic::EngineLoadGrByNet, routingNets );
+          kite->layerAssign       ( Katabatic::EngineNoNetLayerAssign );
           kite->runNegociate      ();
           kiteSuccess = kite->getToolSuccess ();
           kite->finalizeLayout ();
diff --git a/unicorn/src/cgt.py b/unicorn/src/cgt.py
index e073d9bd..453f0007 100755
--- a/unicorn/src/cgt.py
+++ b/unicorn/src/cgt.py
@@ -89,6 +89,7 @@ if __name__ == '__main__':
       parser.add_option( '-v', '--verbose'       , action='store_true', dest='verbose'       , help='First level of verbosity.')
       parser.add_option( '-V', '--very-verbose'  , action='store_true', dest='veryVerbose'   , help='Second level of verbosity.')
       parser.add_option( '-i', '--info'          , action='store_true', dest='info'          , help='Display lots of informational messages.')
+      parser.add_option(       '--paranoid'      , action='store_true', dest='paranoid'      , help='Display everything that *may be* suspicious...')
       parser.add_option( '-b', '--bug'           , action='store_true', dest='bug'           , help='Display bug related messages.')
       parser.add_option(       '--show-conf'     , action='store_true', dest='showConf'      , help='Display Kite configuration.')
       parser.add_option( '-D', '--core-dump'     , action='store_true', dest='coreDump'      , help='Enable core-dump when a crash occurs.')
@@ -109,6 +110,7 @@ if __name__ == '__main__':
       (options, args) = parser.parse_args()
       args.insert(0, 'cgt')
 
+      af = CRL.AllianceFramework.get()
 
      #Hurricane.trace(True)
       Cfg.Configuration.pushDefaultPriority(Cfg.Parameter.Priority.CommandLine)
@@ -117,6 +119,7 @@ if __name__ == '__main__':
       if options.verbose:      Cfg.getParamBool      ('misc.verboseLevel1').setBool(True)
       if options.veryVerbose:  Cfg.getParamBool      ('misc.verboseLevel2').setBool(True)
       if options.info:         Cfg.getParamBool      ('misc.info'         ).setBool(True)
+      if options.paranoid:     Cfg.getParamBool      ('misc.paranoid'     ).setBool(True)
       if options.bug:          Cfg.getParamBool      ('misc.bug'          ).setBool(True)
       if options.logMode:      Cfg.getParamBool      ('misc.logMode'      ).setBool(True)
       if options.showConf:     Cfg.getParamBool      ('misc.showConf'     ).setBool(True)
@@ -134,8 +137,6 @@ if __name__ == '__main__':
 
       Cfg.Configuration.popDefaultPriority()
 
-      af = CRL.AllianceFramework.get()
-
       cell = None
       if options.acmSigdaName:
           cell = CRL.AcmSigda.load(options.acmSigdaName)
@@ -208,8 +209,8 @@ if __name__ == '__main__':
           runKiteTool = loadGlobal or globalRoute or detailRoute
 
           if runKiteTool:
-              if loadGlobal: globalFlags = Kite.LoadGlobalSolution
-              else:          globalFlags = Kite.BuildGlobalSolution
+              if loadGlobal: globalFlags = Kite.KtLoadGlobalRouting
+              else:          globalFlags = Kite.KtBuildGlobalRouting
 
               routingNets = []
               kite = Kite.KiteEngine.create(cell)
@@ -219,8 +220,8 @@ if __name__ == '__main__':
               if saveGlobal: kite.saveGlobalSolution()
     
               if detailRoute:
-                  kite.loadGlobalRouting( Katabatic.LoadGrByNet, routingNets )
-                  kite.layerAssign      ( Katabatic.NoNetLayerAssign )
+                  kite.loadGlobalRouting( Katabatic.EngineLoadGrByNet, routingNets )
+                  kite.layerAssign      ( Katabatic.EngineNoNetLayerAssign )
                   kite.runNegociate     ()
                   kiteSuccess = kite.getToolSuccess()
                   kite.finalizeLayout()