diff --git a/Common/Options.cpp b/Common/Options.cpp
index 3f9ffa83e1d1b7cb849a72d57908e709d427c4ba..49be68dbe04eb014e343ee19919040b17ac27970 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -1,4 +1,4 @@
-// $Id: Options.cpp,v 1.324 2006-12-18 20:12:49 geuzaine Exp $
+// $Id: Options.cpp,v 1.325 2007-01-12 13:49:38 remacle Exp $
 //
 // Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 //
@@ -4633,17 +4633,15 @@ double opt_mesh_algo2d(OPT_ARGS_NUM)
 {
   if(action & GMSH_SET){
     int algo = (int)val;
-    // at the moment the only 2d algo available is ours!
-    // CTX.mesh.algo2d = algo;
-    CTX.mesh.algo2d = DELAUNAY_ISO;
+    CTX.mesh.algo2d = algo;
   }
 #if defined(HAVE_FLTK)
   if(WID && (action & GMSH_GUI)) {
     switch (CTX.mesh.algo2d) {
-    case DELAUNAY_TRIANGLE:
+    case DELAUNAY_ISO:
       WID->mesh_choice[2]->value(1);
       break;
-    case DELAUNAY_ISO:
+    case MESHADAPT:
     default:
       WID->mesh_choice[2]->value(0);
       break;
@@ -4696,9 +4694,6 @@ double opt_mesh_algo3d(OPT_ARGS_NUM)
     case FRONTAL_NETGEN:
       WID->mesh_choice[3]->value(1);
       break;
-    case DELAUNAY_TETGEN:
-      WID->mesh_choice[3]->value(2);
-      break;
     case DELAUNAY_ISO:
     default:
       WID->mesh_choice[3]->value(0);
diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index 922c46c399863a96ef053b008916d489bbaaded1..ef89031baf166d16270a245dcf54015f513d74b0 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.500 2007-01-12 13:16:59 remacle Exp $
+// $Id: Callbacks.cpp,v 1.501 2007-01-12 13:49:38 remacle Exp $
 //
 // Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 //
@@ -1092,15 +1092,11 @@ void mesh_options_ok_cb(CALLBACK_ARGS)
 
   opt_mesh_point_type(0, GMSH_SET, WID->mesh_choice[0]->value());
   opt_mesh_algo2d(0, GMSH_SET,
-		  (WID->mesh_choice[2]->value() == 0) ? MESHADAPT :
-		  (WID->mesh_choice[2]->value() == 1) ? DELAUNAY2D :
-		  DELAUNAY_TRIANGLE);
+		  (WID->mesh_choice[2]->value() == 0) ? MESHADAPT : DELAUNAY2D );
   opt_mesh_recombine_algo(0, GMSH_SET,
 		  (WID->mesh_choice[5]->value() == 0) ? 1 : 2);
   opt_mesh_algo3d(0, GMSH_SET,
-		  (WID->mesh_choice[3]->value() == 0) ? DELAUNAY_ISO :
-		  (WID->mesh_choice[3]->value() == 1) ? FRONTAL_NETGEN :
-		  DELAUNAY_TETGEN);
+		  (WID->mesh_choice[3]->value() == 0) ? DELAUNAY_ISO : FRONTAL_NETGEN );
   opt_mesh_color_carousel(0, GMSH_SET, WID->mesh_choice[4]->value());
   opt_mesh_quality_type(0, GMSH_SET, WID->mesh_choice[6]->value());
   opt_mesh_label_type(0, GMSH_SET, WID->mesh_choice[7]->value());
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 80bce128b52f37e6044ea90eb64e568ecbeb2e44..46c45cdd8ebb34e42214b0f4c8608fd7bc4f4da5 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.589 2007-01-12 13:16:59 remacle Exp $
+// $Id: GUI.cpp,v 1.590 2007-01-12 13:49:38 remacle Exp $
 //
 // Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 //
@@ -2231,13 +2231,11 @@ void GUI::create_option_window()
       static Fl_Menu_Item menu_2d_algo[] = {
         {"MeshAdapt", 0, 0, 0},
         {"Delaunay", 0, 0, 0},
-        {"Triangle", 0, 0, 0},
         {0}
       };
       static Fl_Menu_Item menu_3d_algo[] = {
-        {"Isotropic", 0, 0, 0},
+        {"Delaunay", 0, 0, 0},
         {"Netgen", 0, 0, 0},
-        {"Tetgen", 0, 0, 0},
         {0}
       };
       static Fl_Menu_Item menu_recombine_algo[] = {