diff --git a/DiffractionGratings/grating2D_conical.pro b/DiffractionGratings/grating2D_conical.pro
index 5caaa741136a93dd20416ae0063a6902b50b7178..d2881960d5c1e65698e775f1c34845f0194eebde 100644
--- a/DiffractionGratings/grating2D_conical.pro
+++ b/DiffractionGratings/grating2D_conical.pro
@@ -20,9 +20,9 @@
 
 myDir = "res2D/";
 DefineConstant[
-  lambda0   = {lambda_min , Min lambda_min, Max lambda_max, Step (lambda_max-lambda_min)/(nb_lambdas-1), Name StrCat[pp2, "0wavelength [nm]"] , Loop 1, Highlight Str[colorpp2],Graph "200000200020", ServerAction "Reset GetDP/T0, GetDP/R0, GetDP/Lambda_step, GetDP/Omegaal absorption"},
-  phi_deg = {  45 , Name StrCat[pp2, "4incident plane wave angle [deg]"] , Highlight Str[colorpp2], Closed close_menu},
-  psi_deg = {  45 , Name StrCat[pp2, "5incident plane wave angle [deg]"] , Highlight Str[colorpp2], Closed close_menu}
+  lambda0   = {lambda_min , Min lambda_min, Max lambda_max, Step (lambda_max-lambda_min)/(nb_lambdas-1), Name StrCat[pp2, "1wavelength [nm]"] , Loop 1, Highlight Str[colorpp2],Graph "200000200020", ServerAction "Reset GetDP/T0, GetDP/R0, GetDP/Lambda_step, GetDP/Omegaal absorption"},
+  phi_deg = {  45 , Name StrCat[pp2, "3incident plane wave angle (phi) [deg]"] , Highlight Str[colorpp2], Closed close_menu},
+  psi_deg = {  45 , Name StrCat[pp2, "4incident plane wave angle (psi) [deg]"] , Highlight Str[colorpp2], Closed close_menu}
 ];
 lambda0    = lambda0    * nm;
 lambda_min = lambda_min * nm;
@@ -143,14 +143,11 @@ Function{
   k1norm[] = k0*n1[];
   k2norm[] = k0*n2[];
 
-  phi_deg = 45;
-  psi_deg = 45;
-
   phi0    =  phi_deg   * deg2rad;
   theta0  =  theta_deg * deg2rad;
   psi0    =  psi_deg   * deg2rad;
-  Ae      =  1/Sqrt[ep0/mu0];
-  // Ae      = -1;
+  // Ae      =  1/Sqrt[ep0/mu0];
+  Ae      = 1;
 
   alpha[] = -k0*n1[]*Sin[theta0]*Sin[phi0];
   beta1[] = -k0*n1[]*Cos[theta0];
diff --git a/DiffractionGratings/grating2D_data_AnisotropicGrating.geo b/DiffractionGratings/grating2D_data_AnisotropicGrating.geo
index 0036f3137082e81ac976673b7206cd18a8b33142..3622e790849398f02155f41b17edf85746fff756 100644
--- a/DiffractionGratings/grating2D_data_AnisotropicGrating.geo
+++ b/DiffractionGratings/grating2D_data_AnisotropicGrating.geo
@@ -30,9 +30,9 @@ lambda_max = 633;
 nb_lambdas = 1;
 
 DefineConstant[
-  flag_Hparallel = {  1 , Name StrCat[pp2, "2polarization case"], Choices {0="E //",1="H //"} },
-	theta_deg      = { -0 , Name StrCat[pp2, "1incident plane wave angle [deg]"] , Highlight Str[colorpp2], Closed close_menu},
-  nb_orders      = {  2 , Name StrCat[pp2, "3number of post-processed diffraction orders"] , Highlight Str[colorpp2], Closed close_menu}
+  flag_polar     = {1   , Name StrCat[pp2, "0polarization case"], Choices {0="E //",1="H //",2="conical"} },
+	theta_deg      = { -0 , Name StrCat[pp2, "2incident plane wave angle (theta) [deg]"] , Highlight Str[colorpp2], Closed close_menu},
+  nb_orders      = {  2 , Name StrCat[pp2, "5number of post-processed diffraction orders"] , Highlight Str[colorpp2], Closed close_menu}
 ];
 
 DefineConstant[
diff --git a/DiffractionGratings/grating2D_data_LamellarGrating.geo b/DiffractionGratings/grating2D_data_LamellarGrating.geo
index d31b0d8a3d9cc08f044caae2971989562267cc50..568a60e77da57bd8cbe2b06105ef83616c66820e 100644
--- a/DiffractionGratings/grating2D_data_LamellarGrating.geo
+++ b/DiffractionGratings/grating2D_data_LamellarGrating.geo
@@ -30,9 +30,9 @@ lambda_max = 1200;
 nb_lambdas = 1;
 
 DefineConstant[
-  flag_Hparallel = {1   , Name StrCat[pp2, "2polarization case"], Choices {0="E //",1="H //"} },
-	theta_deg      = {30  , Name StrCat[pp2, "1incident plane wave angle [deg]"] , Highlight Str[colorpp2], Closed close_menu},
-  nb_orders      = {2   , Name StrCat[pp2, "3number of post-processed diffraction orders"] , Highlight Str[colorpp2], Closed close_menu}
+  flag_polar     = {1   , Name StrCat[pp2, "0polarization case"], Choices {0="E //",1="H //",2="conical"} },
+	theta_deg      = {30  , Name StrCat[pp2, "2incident plane wave angle (theta) [deg]"] , Highlight Str[colorpp2], Closed close_menu},
+  nb_orders      = {2   , Name StrCat[pp2, "5number of post-processed diffraction orders"] , Highlight Str[colorpp2], Closed close_menu}
 ];
 
 DefineConstant[
diff --git a/DiffractionGratings/grating2D_data_PhotonicCrystalSlab.geo b/DiffractionGratings/grating2D_data_PhotonicCrystalSlab.geo
index 9618055d7cf83fe50892ac88d02b215fd723a62e..edb40f341d690256b362ab7d2f2b0ae423568690 100644
--- a/DiffractionGratings/grating2D_data_PhotonicCrystalSlab.geo
+++ b/DiffractionGratings/grating2D_data_PhotonicCrystalSlab.geo
@@ -29,9 +29,9 @@ lambda_max = 800;
 nb_lambdas = 50;
 
 DefineConstant[
-  flag_Hparallel = {0   , Name StrCat[pp2, "2polarization case"], Choices {0="E //",1="H //"} },
-	theta_deg      = {30  , Name StrCat[pp2, "1incident plane wave angle [deg]"] , Highlight Str[colorpp2], Closed close_menu},
-  nb_orders      = {2   , Name StrCat[pp2, "3number of post-processed diffraction orders"] , Highlight Str[colorpp2], Closed close_menu}
+  flag_polar     = {0   , Name StrCat[pp2, "0polarization case"], Choices {0="E //",1="H //",2="conical"} },
+	theta_deg      = {30  , Name StrCat[pp2, "2incident plane wave angle (theta) [deg]"] , Highlight Str[colorpp2], Closed close_menu},
+  nb_orders      = {2   , Name StrCat[pp2, "5number of post-processed diffraction orders"] , Highlight Str[colorpp2], Closed close_menu}
 ];
 
 DefineConstant[
diff --git a/DiffractionGratings/grating2D_data_ResonantGrating.geo b/DiffractionGratings/grating2D_data_ResonantGrating.geo
index ce1b5129d2a12148cac6b63dbf23c93ada979463..f367f11e91e4a403bd6527a14a068a495f9e1fcf 100644
--- a/DiffractionGratings/grating2D_data_ResonantGrating.geo
+++ b/DiffractionGratings/grating2D_data_ResonantGrating.geo
@@ -31,9 +31,9 @@ nb_lambdas =   56  ;
 // 5.85 : 6.0 : 0.0025
 
 DefineConstant[
-  flag_Hparallel = {0   , Name StrCat[pp2, "2polarization case"], Choices {0="E //",1="H //"} },
-	theta_deg      = {5.93, Name StrCat[pp2, "1incident plane wave angle [deg]"] , Highlight Str[colorpp2], Closed close_menu},
-  nb_orders      = {2   , Name StrCat[pp2, "3number of post-processed diffraction orders"] , Highlight Str[colorpp2], Closed close_menu}
+  flag_polar     = {0   , Name StrCat[pp2, "0polarization case"], Choices {0="E //",1="H //",2="conical"} },
+	theta_deg      = {5.93, Name StrCat[pp2, "2incident plane wave angle (theta) [deg]"] , Highlight Str[colorpp2], Closed close_menu},
+  nb_orders      = {2   , Name StrCat[pp2, "5number of post-processed diffraction orders"] , Highlight Str[colorpp2], Closed close_menu}
 ];
 
 DefineConstant[
diff --git a/DiffractionGratings/grating2D_data_plasmonics.geo b/DiffractionGratings/grating2D_data_plasmonics.geo
index b6def6905998b05b0d66467a9b78ef0771260782..a1a4351ec425ef3d556177e0ea67ee7fe5e08400 100644
--- a/DiffractionGratings/grating2D_data_plasmonics.geo
+++ b/DiffractionGratings/grating2D_data_plasmonics.geo
@@ -29,9 +29,9 @@ lambda_max = 800;
 nb_lambdas = 15;
 
 DefineConstant[
-  flag_Hparallel = {1   , Name StrCat[pp2, "2polarization case"], Choices {0="E //",1="H //"}, ServerAction "Reset GetDP/T0, GetDP/R0, GetDP/Lambda_step, GetDP/total absorption"},
-	theta_deg      = {30  , Name StrCat[pp2, "1incident plane wave angle [deg]"] , Highlight Str[colorpp2], Closed close_menu , ServerAction "Reset GetDP/T0, GetDP/R0, GetDP/Lambda_step, GetDP/total absorption"},
-  nb_orders      = {2   , Name StrCat[pp2, "3number of post-processed diffraction orders"] , Highlight Str[colorpp2], Closed close_menu , ServerAction "Reset GetDP/T0, GetDP/R0, GetDP/Lambda_step, GetDP/total absorption"}
+  flag_polar     = {1   , Name StrCat[pp2, "0polarization case"], Choices {0="E //",1="H //",2="conical"} },
+	theta_deg      = {30  , Name StrCat[pp2, "2incident plane wave angle (theta) [deg]"] , Highlight Str[colorpp2], Closed close_menu , ServerAction "Reset GetDP/T0, GetDP/R0, GetDP/Lambda_step, GetDP/total absorption"},
+  nb_orders      = {2   , Name StrCat[pp2, "5number of post-processed diffraction orders"] , Highlight Str[colorpp2], Closed close_menu , ServerAction "Reset GetDP/T0, GetDP/R0, GetDP/Lambda_step, GetDP/total absorption"}
 ];
 
 DefineConstant[
diff --git a/DiffractionGratings/grating2D_scalar.pro b/DiffractionGratings/grating2D_scalar.pro
index c9264c38ee8531e48b5e5c6a05db8a2ffcef41f8..ece78fbcf10005edfd62007f44b0793f4e35ec7d 100644
--- a/DiffractionGratings/grating2D_scalar.pro
+++ b/DiffractionGratings/grating2D_scalar.pro
@@ -27,7 +27,7 @@
 
 myDir = "res2D/";
 DefineConstant[
-  lambda0 = {lambda_min , Min lambda_min, Max lambda_max, Step (lambda_max-lambda_min)/(nb_lambdas-1), Name StrCat[pp2, "0wavelength [nm]"] , Loop 1, Highlight Str[colorpp2],Graph "200000200020", ServerAction "Reset GetDP/T0, GetDP/R0, GetDP/Lambda_step, GetDP/total absorption"}
+  lambda0 = {lambda_min , Min lambda_min, Max lambda_max, Step (lambda_max-lambda_min)/(nb_lambdas-1), Name StrCat[pp2, "1wavelength [nm]"] , Loop 1, Highlight Str[colorpp2],Graph "200000200020", ServerAction "Reset GetDP/T0, GetDP/R0, GetDP/Lambda_step, GetDP/total absorption"}
 ];
 lambda0    = lambda0    * nm;
 lambda_min = lambda_min * nm;