diff --git a/doc/texinfo/opt_fields.texi b/doc/texinfo/opt_fields.texi
index f991020068856d79d8e6b4ce22ab72f4e86ce17f..83a477527e12e208f87fd555fd17937aefbecc67 100644
--- a/doc/texinfo/opt_fields.texi
+++ b/doc/texinfo/opt_fields.texi
@@ -80,10 +80,14 @@ default value: @code{0.5}
 hwall * ratio^(dist/hwall)@*
 Options:@*
 @table @code
-@item IField
-Index of the field that contains the distance function@*
-type: integer@*
-default value: @code{0}
+@item EdgesList
+Indices of curves in the geometric model for which a boundary layer is needed@*
+type: list@*
+default value: @code{@{@}}
+@item NodesList
+Indices of nodes in the geometric model@*
+type: list@*
+default value: @code{@{@}}
 @item hfar
 Element size far from the wall@*
 type: float@*
@@ -100,6 +104,10 @@ default value: @code{0.5}
 Size Ratio Between Two Successive Layers@*
 type: float@*
 default value: @code{1.1}
+@item thickness
+Maximal thickness of the boundary layer@*
+type: float@*
+default value: @code{0.01}
 @end table
 
 @item Box
diff --git a/doc/texinfo/opt_general.texi b/doc/texinfo/opt_general.texi
index e19e7ef77dab825cd7120b9ef2075371339eddda..08e7d5b7d6b8b6988f566c4d736a3630cf18a682 100644
--- a/doc/texinfo/opt_general.texi
+++ b/doc/texinfo/opt_general.texi
@@ -79,27 +79,27 @@ Option file created with `Tools->Options->Save'; automatically read on startup@*
 Default value: @code{".gmsh-options"}@*
 Saved in: @code{General.SessionFileName}
 
-@item General.RecentFile1
+@item General.RecentFile0
 Most recent opened file@*
 Default value: @code{"untitled.geo"}@*
 Saved in: @code{General.SessionFileName}
 
-@item General.RecentFile2
+@item General.RecentFile1
 2nd most recent opened file@*
 Default value: @code{"untitled.geo"}@*
 Saved in: @code{General.SessionFileName}
 
-@item General.RecentFile3
+@item General.RecentFile2
 3rd most recent opened file@*
 Default value: @code{"untitled.geo"}@*
 Saved in: @code{General.SessionFileName}
 
-@item General.RecentFile4
+@item General.RecentFile3
 4th most recent opened file@*
 Default value: @code{"untitled.geo"}@*
 Saved in: @code{General.SessionFileName}
 
-@item General.RecentFile5
+@item General.RecentFile4
 5th most recent opened file@*
 Default value: @code{"untitled.geo"}@*
 Saved in: @code{General.SessionFileName}
@@ -704,31 +704,11 @@ Vertical position (in pixels) of the upper left corner of the menu window@*
 Default value: @code{50}@*
 Saved in: @code{General.SessionFileName}
 
-@item General.MessageAutoScroll
-Automatically scroll message window@*
-Default value: @code{1}@*
-Saved in: @code{General.OptionsFileName}
-
-@item General.MessagePositionX
-Horizontal position (in pixels) of the upper left corner of the message window@*
-Default value: @code{650}@*
-Saved in: @code{General.SessionFileName}
-
-@item General.MessagePositionY
-Vertical position (in pixels) of the upper left corner of the message window@*
-Default value: @code{490}@*
-Saved in: @code{General.SessionFileName}
-
 @item General.MessageHeight
-Height (in pixels) of the message window@*
+Height (in pixels) of the message console@*
 Default value: @code{300}@*
 Saved in: @code{General.SessionFileName}
 
-@item General.MessageWidth
-Width (in pixels) of the message window@*
-Default value: @code{400}@*
-Saved in: @code{General.SessionFileName}
-
 @item General.MinX
 Minimum model coordinate along the X-axis (read-only)@*
 Default value: @code{0}@*
diff --git a/doc/texinfo/opt_geometry.texi b/doc/texinfo/opt_geometry.texi
index 2fdabbe5f6bab4805d7e3924d4ab0837b790c108..b4e50aa7052f22aa0b9c7164476545a90872d834 100644
--- a/doc/texinfo/opt_geometry.texi
+++ b/doc/texinfo/opt_geometry.texi
@@ -89,6 +89,11 @@ Number of edge subdivisions between control points when displaying curves@*
 Default value: @code{20}@*
 Saved in: @code{General.OptionsFileName}
 
+@item Geometry.OCCFixDegenerated
+Fix degenerated edges/faces in STEP, IGES and BRep models@*
+Default value: @code{0}@*
+Saved in: @code{General.OptionsFileName}
+
 @item Geometry.OCCFixSmallEdges
 Fix small edges in STEP, IGES and BRep models@*
 Default value: @code{0}@*
diff --git a/doc/texinfo/opt_post.texi b/doc/texinfo/opt_post.texi
index c85e701acf57a3fcc129e6252a0f37a41590de87..4d6ee43a939292f900297c747818a8096671b229 100644
--- a/doc/texinfo/opt_post.texi
+++ b/doc/texinfo/opt_post.texi
@@ -14,6 +14,11 @@ Cycle through time steps (0) or views (1) for animations@*
 Default value: @code{0}@*
 Saved in: @code{General.OptionsFileName}
 
+@item PostProcessing.AnimationStep
+Step increment for animations@*
+Default value: @code{1}@*
+Saved in: @code{General.OptionsFileName}
+
 @item PostProcessing.CombineRemoveOriginal
 Remove original views after a Combine operation@*
 Default value: @code{1}@*
diff --git a/doc/texinfo/opt_solver.texi b/doc/texinfo/opt_solver.texi
index 1c7d350f0f70103202b8a660e4aa5fb383bda936..cca89c698bf814fb1c562504ec0bee528b3e4cab 100644
--- a/doc/texinfo/opt_solver.texi
+++ b/doc/texinfo/opt_solver.texi
@@ -4,661 +4,59 @@
 @c
 
 @ftable @code
-@item Solver.SocketName
-Name of socket (TCP/IP if it contains the `:' character, UNIX otherwise)@*
-Default value: @code{".gmshsock"}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.Name0
-Name of solver 0@*
-Default value: @code{"GetDP"}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.Help0
-Help string for solver 0@*
-Default value: @code{"A General environment for the treatment of Discrete Problems.
-Copyright (C) 1997-2011 Patrick Dular and Christophe Geuzaine.
-Visit http://www.geuz.org/getdp/ for more info"}@*
-Saved in: @code{General.OptionsFileName}
-
 @item Solver.Executable0
 System command to launch solver 0 (should not contain the `&' character)@*
-Default value: @code{"getdp"}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.ExtraArguments0
-Extra arguments to pass to solver 0@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.InputName0
-Default input file name for solver 0@*
-Default value: @code{""}@*
-Saved in: @code{-}
-
-@item Solver.Extension0
-Default file name extension for solver 0@*
-Default value: @code{".pro"}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.MeshName0
-Default mesh file name for solver 0@*
-Default value: @code{""}@*
-Saved in: @code{-}
-
-@item Solver.MeshCommand0
-Command used to specify the mesh file for solver 0@*
-Default value: @code{"-msh %s"}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.SocketCommand0
-Command to specify the socket to solver 0@*
-Default value: @code{"-socket %s"}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.NameCommand0
-Command to specify the problem name to solver 0@*
-Default value: @code{"%s"}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.OptionCommand0
-Command to get options from solver 0@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FirstOption0
-Label of first option for solver 0@*
-Default value: @code{"Resolution"}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.SecondOption0
-Label of second option for solver 0@*
-Default value: @code{"PostOperation"}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.ThirdOption0
-Label of third option for solver 0@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FourthOption0
-Label of fourth option for solver 0@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FifthOption0
-Label of fifth option for solver 0@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FirstButton0
-Label of first button for solver 0@*
-Default value: @code{"Pre"}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FirstButtonCommand0
-Command associated with the first button for solver 0@*
-Default value: @code{"-pre %s"}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.SecondButton0
-Label of second button for solver 0@*
-Default value: @code{"Cal"}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.SecondButtonCommand0
-Command associated with the second button for solver 0@*
-Default value: @code{"-cal"}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.ThirdButton0
-Label of third button for solver 0@*
-Default value: @code{"Pos"}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.ThirdButtonCommand0
-Command associated with the third button for solver 0@*
-Default value: @code{"-pos %s"}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FourthButton0
-Label of fourth button for solver 0@*
 Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FourthButtonCommand0
-Command associated with the fourth button for solver 0@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FifthButton0
-Label of fifth button for solver 0@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FifthButtonCommand0
-Command associated with the fifth button for solver 0@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.Name1
-Name of solver 1@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.Help1
-Help string for solver 1@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
+Saved in: @code{General.SessionFileName}
 
 @item Solver.Executable1
 System command to launch solver 1 (should not contain the `&' character)@*
 Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.ExtraArguments1
-Extra arguments to pass to solver 1@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.InputName1
-Default input file name for solver 1@*
-Default value: @code{""}@*
-Saved in: @code{-}
-
-@item Solver.Extension1
-Default file name extension for solver 1@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.MeshName1
-Default mesh file name for solver 1@*
-Default value: @code{""}@*
-Saved in: @code{-}
-
-@item Solver.MeshCommand1
-Command used to specify the mesh file for solver 1@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.SocketCommand1
-Command to specify the socket to solver 1@*
-Default value: @code{"-socket %s"}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.NameCommand1
-Command to specify the problem name to solver 1@*
-Default value: @code{"%s"}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.OptionCommand1
-Command to get options from solver 1@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FirstOption1
-Label of first option for solver 1@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.SecondOption1
-Label of second option for solver 1@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.ThirdOption1
-Label of third option for solver 1@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FourthOption1
-Label of fourth option for solver 1@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FifthOption1
-Label of fifth option for solver 1@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FirstButton1
-Label of first button for solver 1@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FirstButtonCommand1
-Command associated with the first button for solver 1@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.SecondButton1
-Label of second button for solver 1@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.SecondButtonCommand1
-Command associated with the second button for solver 1@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.ThirdButton1
-Label of third button for solver 1@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.ThirdButtonCommand1
-Command associated with the third button for solver 1@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FourthButton1
-Label of fourth button for solver 1@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FourthButtonCommand1
-Command associated with the fourth button for solver 1@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FifthButton1
-Label of fifth button for solver 1@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FifthButtonCommand1
-Command associated with the fifth button for solver 1@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.Name2
-Name of solver 2@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.Help2
-Help string for solver 2@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
+Saved in: @code{General.SessionFileName}
 
 @item Solver.Executable2
 System command to launch solver 2 (should not contain the `&' character)@*
 Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.ExtraArguments2
-Extra arguments to pass to solver 2@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.InputName2
-Default input file name for solver 2@*
-Default value: @code{""}@*
-Saved in: @code{-}
-
-@item Solver.Extension2
-Default file name extension for solver 2@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.MeshName2
-Default mesh file name for solver 2@*
-Default value: @code{""}@*
-Saved in: @code{-}
-
-@item Solver.MeshCommand2
-Command used to specify the mesh file for solver 2@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.SocketCommand2
-Command to specify the socket to solver 2@*
-Default value: @code{"-socket %s"}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.NameCommand2
-Command to specify the problem name to solver 2@*
-Default value: @code{"%s"}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.OptionCommand2
-Command to get options from solver 2@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FirstOption2
-Label of first option for solver 2@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.SecondOption2
-Label of second option for solver 2@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.ThirdOption2
-Label of third option for solver 2@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FourthOption2
-Label of fourth option for solver 2@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FifthOption2
-Label of fifth option for solver 2@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FirstButton2
-Label of first button for solver 2@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FirstButtonCommand2
-Command associated with the first button for solver 2@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.SecondButton2
-Label of second button for solver 2@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.SecondButtonCommand2
-Command associated with the second button for solver 2@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.ThirdButton2
-Label of third button for solver 2@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.ThirdButtonCommand2
-Command associated with the third button for solver 2@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FourthButton2
-Label of fourth button for solver 2@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FourthButtonCommand2
-Command associated with the fourth button for solver 2@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FifthButton2
-Label of fifth button for solver 2@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FifthButtonCommand2
-Command associated with the fifth button for solver 2@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.Name3
-Name of solver 3@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.Help3
-Help string for solver 3@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
+Saved in: @code{General.SessionFileName}
 
 @item Solver.Executable3
 System command to launch solver 3 (should not contain the `&' character)@*
 Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.ExtraArguments3
-Extra arguments to pass to solver 3@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.InputName3
-Default input file name for solver 3@*
-Default value: @code{""}@*
-Saved in: @code{-}
-
-@item Solver.Extension3
-Default file name extension for solver 3@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.MeshName3
-Default mesh file name for solver 3@*
-Default value: @code{""}@*
-Saved in: @code{-}
-
-@item Solver.MeshCommand3
-Command used to specify the mesh file for solver 3@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.SocketCommand3
-Command to specify the socket to solver 3@*
-Default value: @code{"-socket %s"}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.NameCommand3
-Command to specify the problem name to solver 3@*
-Default value: @code{"%s"}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.OptionCommand3
-Command to get options from solver 3@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FirstOption3
-Label of first option for solver 3@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.SecondOption3
-Label of second option for solver 3@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.ThirdOption3
-Label of third option for solver 3@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FourthOption3
-Label of fourth option for solver 3@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FifthOption3
-Label of fifth option for solver 3@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FirstButton3
-Label of first button for solver 3@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FirstButtonCommand3
-Command associated with the first button for solver 3@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.SecondButton3
-Label of second button for solver 3@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.SecondButtonCommand3
-Command associated with the second button for solver 3@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.ThirdButton3
-Label of third button for solver 3@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.ThirdButtonCommand3
-Command associated with the third button for solver 3@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FourthButton3
-Label of fourth button for solver 3@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FourthButtonCommand3
-Command associated with the fourth button for solver 3@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FifthButton3
-Label of fifth button for solver 3@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FifthButtonCommand3
-Command associated with the fifth button for solver 3@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.Name4
-Name of solver 4@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.Help4
-Help string for solver 4@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
+Saved in: @code{General.SessionFileName}
 
 @item Solver.Executable4
 System command to launch solver 4 (should not contain the `&' character)@*
 Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
+Saved in: @code{General.SessionFileName}
 
-@item Solver.ExtraArguments4
-Extra arguments to pass to solver 4@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.InputName4
-Default input file name for solver 4@*
-Default value: @code{""}@*
-Saved in: @code{-}
-
-@item Solver.Extension4
-Default file name extension for solver 4@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.MeshName4
-Default mesh file name for solver 4@*
-Default value: @code{""}@*
-Saved in: @code{-}
-
-@item Solver.MeshCommand4
-Command used to specify the mesh file for solver 4@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.SocketCommand4
-Command to specify the socket to solver 4@*
-Default value: @code{"-socket %s"}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.NameCommand4
-Command to specify the problem name to solver 4@*
-Default value: @code{"%s"}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.OptionCommand4
-Command to get options from solver 4@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FirstOption4
-Label of first option for solver 4@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.SecondOption4
-Label of second option for solver 4@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.ThirdOption4
-Label of third option for solver 4@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FourthOption4
-Label of fourth option for solver 4@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FifthOption4
-Label of fifth option for solver 4@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FirstButton4
-Label of first button for solver 4@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.FirstButtonCommand4
-Command associated with the first button for solver 4@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.SecondButton4
-Label of second button for solver 4@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.SecondButtonCommand4
-Command associated with the second button for solver 4@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.ThirdButton4
-Label of third button for solver 4@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
+@item Solver.Name0
+Name of solver 0@*
+Default value: @code{"GetDP"}@*
+Saved in: @code{General.SessionFileName}
 
-@item Solver.ThirdButtonCommand4
-Command associated with the third button for solver 4@*
+@item Solver.Name1
+Name of solver 1@*
 Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
+Saved in: @code{General.SessionFileName}
 
-@item Solver.FourthButton4
-Label of fourth button for solver 4@*
+@item Solver.Name2
+Name of solver 2@*
 Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
+Saved in: @code{General.SessionFileName}
 
-@item Solver.FourthButtonCommand4
-Command associated with the fourth button for solver 4@*
+@item Solver.Name3
+Name of solver 3@*
 Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
+Saved in: @code{General.SessionFileName}
 
-@item Solver.FifthButton4
-Label of fifth button for solver 4@*
+@item Solver.Name4
+Name of solver 4@*
 Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
+Saved in: @code{General.SessionFileName}
 
-@item Solver.FifthButtonCommand4
-Command associated with the fifth button for solver 4@*
-Default value: @code{""}@*
+@item Solver.SocketName
+Base name of socket (TCP/IP if it contains the `:' character, UNIX otherwise)@*
+Default value: @code{".gmshsock"}@*
 Saved in: @code{General.OptionsFileName}
 
 @item Solver.AlwaysListen
@@ -666,86 +64,11 @@ Always listen to incoming connection requests?@*
 Default value: @code{0}@*
 Saved in: @code{General.OptionsFileName}
 
-@item Solver.ClientServer0
-Connect solver 0 to the Gmsh server@*
-Default value: @code{1}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.ClientServer1
-Connect solver 1 to the Gmsh server@*
-Default value: @code{0}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.ClientServer2
-Connect solver 2 to the Gmsh server@*
-Default value: @code{0}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.ClientServer3
-Connect solver 3 to the Gmsh server@*
-Default value: @code{0}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.ClientServer4
-Connect solver 4 to the Gmsh server@*
-Default value: @code{0}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.MergeViews0
-Automatically merge any post-processing view created by solver 0@*
-Default value: @code{1}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.MergeViews1
-Automatically merge any post-processing view created by solver 1@*
-Default value: @code{1}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.MergeViews2
-Automatically merge any post-processing view created by solver 2@*
-Default value: @code{1}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.MergeViews3
-Automatically merge any post-processing view created by solver 3@*
-Default value: @code{1}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.MergeViews4
-Automatically merge any post-processing view created by solver 4@*
-Default value: @code{1}@*
-Saved in: @code{General.OptionsFileName}
-
 @item Solver.Plugins
 Enable default solver plugins?@*
 Default value: @code{0}@*
 Saved in: @code{General.OptionsFileName}
 
-@item Solver.PopupMessages0
-Automatically display messages produced by solver 0@*
-Default value: @code{1}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.PopupMessages1
-Automatically display messages produced by solver 1@*
-Default value: @code{1}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.PopupMessages2
-Automatically display messages produced by solver 2@*
-Default value: @code{1}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.PopupMessages3
-Automatically display messages produced by solver 3@*
-Default value: @code{1}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.PopupMessages4
-Automatically display messages produced by solver 4@*
-Default value: @code{1}@*
-Saved in: @code{General.OptionsFileName}
-
 @item Solver.Timeout
 Time (in seconds) before closing the socket if no connection is happening.@*
 Default value: @code{5}@*