diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Arrangement_on_surface_2.txt b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Arrangement_on_surface_2.txt
index 0179a49386e1..2256387b2cd3 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Arrangement_on_surface_2.txt
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Arrangement_on_surface_2.txt
@@ -3701,8 +3701,9 @@ parameter space in this case is open and unbounded.}
 
 <!-- ----------------------------------------------------------------------- -->
 \cgalFigureBegin{aos_fig-spherical_concept_hierarchy,spherical_concept_hierarchy.png}
-Bottom portion of the refinement hierarchy of the geometry-traits
-concepts for curves embedded in a sphere-like parameterized surface
+The entire spherical boundary cluster of the refinement hierarchy of the
+geometry-traits concepts for curves embedded in a sphere-like parameterized
+surface.
 \cgalFigureEnd
 <!-- ----------------------------------------------------------------------- -->
 
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig/central_concept_cluster.png b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig/central_concept_cluster.png
index 8f47fe2dde18..5cd2a04bdcfa 100644
Binary files a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig/central_concept_cluster.png and b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig/central_concept_cluster.png differ
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig/identified_clusters.png b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig/identified_clusters.png
index da89fbebdd57..e109ecba1fbf 100644
Binary files a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig/identified_clusters.png and b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig/identified_clusters.png differ
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig/landmark_concept_cluster.png b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig/landmark_concept_cluster.png
index 4230f21bd2f9..83bfc35d9974 100644
Binary files a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig/landmark_concept_cluster.png and b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig/landmark_concept_cluster.png differ
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig/left_side_cluster.png b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig/left_side_cluster.png
index aef6892be924..6b61310c8250 100644
Binary files a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig/left_side_cluster.png and b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig/left_side_cluster.png differ
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig/open_concept_hierarchy.png b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig/open_concept_hierarchy.png
index a3e45b742659..d206fa8ee045 100644
Binary files a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig/open_concept_hierarchy.png and b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig/open_concept_hierarchy.png differ
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig/side_clusters.png b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig/side_clusters.png
index d82390981b5c..84eeacc4b82c 100644
Binary files a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig/side_clusters.png and b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig/side_clusters.png differ
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig/spherical_concept_hierarchy.png b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig/spherical_concept_hierarchy.png
index 2f2fa8cfe7af..0bd2d7d089dd 100644
Binary files a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig/spherical_concept_hierarchy.png and b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig/spherical_concept_hierarchy.png differ
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig_src/identified_clusters.tex b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig_src/identified_clusters.tex
index 59b1f663b735..e3ae550fca03 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig_src/identified_clusters.tex
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig_src/identified_clusters.tex
@@ -1,22 +1,30 @@
 \documentclass[12pt]{standalone}
 \input{header}
+\usepackage[edges]{forest}
+\usetikzlibrary{shadows.blur,arrows.meta}
 \pagestyle{empty}
+\def\name#1{\textsf{\it #1}}
+\tikzset{concept/.style={rectangle split,rectangle split parts=1,draw,
+    fill=white,blur shadow,rounded corners,align=center}}
 \begin{document}
-  \psset{treevshift=0,unit=1em,xunit=2em,yunit=1em,everytree={},etcratio=.75,triratio=.5}
-     \jtree[everylabel=\sl,xunit=70pt,arrows=->]
-     \! = {}
-        <4wideleft>[scaleby=2.24 0,arrows=-,linestyle=none]{\psframebox{\concept{AosLeftSideTraits\_2}}}@lt !lt
-        ^<left>[scaleby=1.15 0,arrows=-,linestyle=none]{\psframebox{\concept{ArrangemenRightSideTraits\_2}}}@rt !rt
-        ^<right>[scaleby=1.15 0,arrows=-,linestyle=none]{\psframebox{\concept{ArrangemenBottomSideTraits\_2}}}@bt !bt
-        ^<4wideright>[scaleby=2.26 0,arrows=-,linestyle=none]{\psframebox{\concept{ArrangemenTopSideTraits\_2}}}@tt !tt
-        .
-     \!lt = <right>[scaleby=1.08 1]{\psframebox{\concept{AosIdentifiedVerticalTraits\_2}}}@ivt !ivt
-        .
-     \!bt = <right>[scaleby=1.17 1]{\psframebox{\concept{AosIdentifiedHorizontalTraits\_2}}}@iht !iht
-     .
-     \ncline{rt:b}{ivt:t}
-     \ncline{tt:b}{iht:t}
-     \endjtree
-  \psset{treevshift=0,unit=1cm,xunit=1cm,yunit=1cm,everytree={},
-         etcratio=.75,triratio=.5}
+\begin{forest}
+    [,phantom,for tree={concept,edge={-Stealth}}
+      [,phantom
+        [\name{AosLeftSideTraits\_2}
+           [,phantom]
+          [\name{AosIdentifiedVerticalTraits\_2},name=ivt]
+        ]
+        [\name{AosRightSideTraits\_2},name=rst]
+      ]
+      [,phantom
+        [\name{AosBottomSideTraits\_2}
+           [,phantom]
+           [\name{AosIdentifiedHorizontalTraits\_2},name=iht]
+        ]
+        [\name{AosTopSideTraits\_2},name=tst]
+      ]
+    ]
+    \draw[-Stealth] (rst) to (ivt);
+    \draw[-Stealth] (tst) to (iht);
+  \end{forest}
 \end{document}
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig_src/left_side_cluster.png b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig_src/left_side_cluster.png
index 6908e84c4e9b..6b61310c8250 100644
Binary files a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig_src/left_side_cluster.png and b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig_src/left_side_cluster.png differ
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig_src/left_side_cluster.tex b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig_src/left_side_cluster.tex
index f46f94e08051..82b6591f12fe 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig_src/left_side_cluster.tex
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig_src/left_side_cluster.tex
@@ -1,16 +1,19 @@
 \documentclass[12pt]{standalone}
 \input{header}
+\usepackage[edges]{forest}
+\usetikzlibrary{shadows.blur,arrows.meta}
 \pagestyle{empty}
+\def\name#1{\textsf{\it #1}}
+\tikzset{concept/.style={rectangle split,rectangle split parts=1,draw,
+    fill=white,blur shadow,rounded corners,align=center}}
 \begin{document}
-  \psset{treevshift=0,unit=1em,xunit=2em,yunit=1em,everytree={},etcratio=.75,triratio=.5}
-     \jtree[everylabel=\sl,xunit=70pt,arrows=->]
-     \! = {\psframebox{\concept{AosLeftSideTraits\_2}}}
-        <4wideleft>[scaleby=2.44 1]{\psframebox{\concept{AosOpenLeftTraits\_2}}}@ult !ult
-        ^<left>[scaleby=1.37 1]{\psframebox{\concept{AosClosedLeftTraits\_2}}}@urt !urt
-        ^<right>[scaleby=1.12 1]{\psframebox{\concept{AosContractedLeftTraits\_2}}}@ubt !ubt
-        ^<4wideright>[scaleby=2.56 1]{\psframebox{\concept{AosIdentifiedVerticalTraits\_2}}}@utt !utt
-        .
-      \endjtree
-  \psset{treevshift=0,unit=1cm,xunit=1cm,yunit=1cm,everytree={},
-         etcratio=.75,triratio=.5}
+\begin{forest}
+    [\name{AosLeftSideTraits\_2},before drawing tree={x=0pt},
+      for tree={concept,edge={-Stealth}}
+      [{\name{AosOpenLeftTraits\_2}}]
+      [{\name{AosClosedLeftTraits\_2}}]
+      [{\name{AosContractedLeftTraits\_2}}]
+      [{\name{AosIdentifiedLeftTraits\_2}}]
+    ]
+\end{forest}
 \end{document}
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig_src/open_concept_hierarchy.tex b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig_src/open_concept_hierarchy.tex
index 1cc69a6cfc3a..4107460f7232 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig_src/open_concept_hierarchy.tex
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig_src/open_concept_hierarchy.tex
@@ -1,21 +1,23 @@
 \documentclass[12pt]{standalone}
 \input{header}
+\usepackage[edges]{forest}
+\usetikzlibrary{shadows.blur,arrows.meta}
 \pagestyle{empty}
+\def\name#1{\textsf{\it #1}}
+\tikzset{concept/.style={rectangle split,rectangle split parts=1,draw,
+    fill=white,blur shadow,rounded corners,align=center}}
 \begin{document}
-  \psset{treevshift=0,unit=1em,xunit=2em,yunit=1em,everytree={},etcratio=.75,triratio=.5}
-     \jtree[everylabel=\sl,xunit=70pt,arrows=->]
-     \! = {}
-        <4wideleft>[scaleby=2.35 0,arrows=-,linestyle=none]{\psframebox{\concept{AosOpenLeftTraits\_2}}}@ult !ult
-        ^<left>[scaleby=1.21 0,arrows=-,linestyle=none]{\psframebox{\concept{AosOpenRightTraits\_2}}}@urt !urt
-        ^<right>[scaleby=1.18 0,arrows=-,linestyle=none]{\psframebox{\concept{AosOpenBottomTraits\_2}}}@ubt !ubt
-        ^<4wideright>[scaleby=2.35 0,arrows=-,linestyle=none]{\psframebox{\concept{AosOpenTopTraits\_2}}}@utt !utt
-           .
-     \!ult = <4wideright>[scaleby=2.10 1]{\psframebox{\concept{AosOpenBoundaryTraits\_2}}}@ut !ut
-       .
-     \ncline{urt:b}{ut:t}
-     \ncline{ubt:b}{ut:t}
-     \ncline{utt:b}{ut:t}
-      \endjtree
-  \psset{treevshift=0,unit=1cm,xunit=1cm,yunit=1cm,everytree={},
-         etcratio=.75,triratio=.5}
+\begin{forest}
+  [,phantom,before drawing tree={x=0pt},for tree={concept,edge={-Stealth}}
+    [{\name{AosOpenLeftTraits\_2}},name=olt
+      [\name{AosOpenBoundaryTraits\_2},name=oyt,before drawing tree={x=0pt}]
+    ]
+    [{\name{AosOpenRightTraits\_2}},name=ort]
+    [{\name{AosOpenBottomTraits\_2}},name=obt]
+    [{\name{AosOpenTopTraits\_2}},name=ott]
+  ]
+  \draw[-Stealth] (ort) to (oyt);
+  \draw[-Stealth] (obt) to (oyt);
+  \draw[-Stealth] (ott) to (oyt);
+\end{forest}
 \end{document}
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig_src/side_clusters.tex b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig_src/side_clusters.tex
index 2c54693f17f6..05ee34934765 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig_src/side_clusters.tex
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig_src/side_clusters.tex
@@ -1,20 +1,23 @@
 \documentclass[12pt]{standalone}
 \input{header}
+\usepackage[edges]{forest}
+\usetikzlibrary{shadows.blur,arrows.meta}
 \pagestyle{empty}
+\def\name#1{\textsf{\it #1}}
+\tikzset{concept/.style={rectangle split,rectangle split parts=1,draw,
+    fill=white,blur shadow,rounded corners,align=center}}
 \begin{document}
-  \psset{treevshift=0,unit=1em,xunit=2em,yunit=1em,everytree={},etcratio=.75,triratio=.5}
-     \jtree[everylabel=\sl,xunit=70pt,arrows=->]
-     \! = {}
-        <left>[scaleby=2.31 0,arrows=-,linestyle=none]{\psframebox{\concept{AosVerticalSideTraits\_2}}}@vst !vst
-        ^<right>[scaleby=2.31 0,arrows=-,linestyle=none]{\psframebox{\concept{ArrangemenHorizontalSideTraits\_2}}}@hst !hst
-        .
-     \!hst = <left>[scaleby=1.15 1]{\psframebox{\concept{AosBottomSideTraits\_2}}}@bst !bst
-        ^<right>[scaleby=1.15 1]{\psframebox{\concept{AosTopSideTraits\_2}}}@tst !tst
-        .
-     \!vst = <left>[scaleby=1.12 1]{\psframebox{\concept{AosLeftSideTraits\_2}}}@lst !lst
-        ^<right>[scaleby=1.12 1]{\psframebox{\concept{AosRightSideTraits\_2}}}@rst !rst
-        .
-      \endjtree
-  \psset{treevshift=0,unit=1cm,xunit=1cm,yunit=1cm,everytree={},
-         etcratio=.75,triratio=.5}
+\begin{forest}
+    [,phantom,before drawing tree={x=0pt},
+      for tree={concept,edge={-Stealth}}
+      [\name{AosVerticalSideTraits\_2}
+        [\name{AosLeftSideTraits\_2}]
+        [\name{AosRightSideTraits\_2}]
+      ]
+      [\name{AosHorizontalSideTraits\_2}
+        [\name{AosBottomSideTraits\_2}]
+        [\name{AosTopologyTraits\_2}]
+      ]
+    ]
+\end{forest}
 \end{document}
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig_src/spherical_concept_hierarchy.tex b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig_src/spherical_concept_hierarchy.tex
index 63bfb2e66e1a..aeafefc7a52d 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig_src/spherical_concept_hierarchy.tex
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig_src/spherical_concept_hierarchy.tex
@@ -1,19 +1,35 @@
 \documentclass[12pt]{standalone}
 \input{header}
+\usepackage[edges]{forest}
+\usetikzlibrary{shadows.blur,arrows.meta}
 \pagestyle{empty}
+\def\name#1{\textsf{\it #1}}
+\tikzset{concept/.style={rectangle split,rectangle split parts=1,draw,
+    fill=white,blur shadow,rounded corners,align=center}}
 \begin{document}
-  \psset{treevshift=0,unit=1em,xunit=2em,yunit=1em,everytree={},etcratio=.75,triratio=.5}
-     \jtree[everylabel=\sl,xunit=70pt,arrows=->]
-     \! = {}
-        <left>[scaleby=2.81 0,arrows=-,linestyle=none]{\psframebox{\concept{AosIdentifiedVerticalTraits\_2}}}@uvt !uvt
-        ^<vert>[scaleby=1 0,arrows=-,linestyle=none]{\psframebox{\concept{AosContractedBottomTraits\_2}}}@ubt !ubt
-        ^<right>[scaleby=2.73 0,arrows=-,linestyle=none]{\psframebox{\concept{AosContractedTopTraits\_2}}}@utt !utt
-           .
-     \!ubt = <vert>[scaleby=1 1]{\psframebox{\concept{AosSphericalBoundaryTraits\_2}}}@ut !ut
-       .
-     \ncline{uvt:b}{ut:t}
-     \ncline{utt:b}{ut:t}
-      \endjtree
-  \psset{treevshift=0,unit=1cm,xunit=1cm,yunit=1cm,everytree={},
-         etcratio=.75,triratio=.5}
+  \begin{forest}
+    [\name{AosBasicTraits\_2},name=abt,before drawing tree={x=0pt},for tree={concept,edge={-Stealth}}
+      [\name{AosVerticalSideTraits\_2}
+        [\name{AosLeftSideTraits\_2}
+          [,phantom]
+          [\name{AosIdentifiedVerticalTraits\_2},name=ivt
+            [,phantom]
+            [\name{AosSphericalBoundaryTraits\_2},name=sbt,before drawing tree={x=0pt}]
+          ]
+        ]
+        [\name{AosRightSideTraits\_2},name=rst]
+      ]
+      [\name{AosHorizontalSideTraits\_2},before drawing tree={x-=1.5em}
+        [\name{AosBottomSideTraits\_2}
+          [\name{AosContractedBottomTraits\_2},name=cbt,before drawing tree={x-=3em}]
+        ]
+        [\name{AosTopSideTraits\_2},before drawing tree={x-=3em}
+          [\name{AosContractedTopTraits\_2},name=ctt,before drawing tree={x-=3em}]
+        ]
+      ]
+    ]
+    \draw[-Stealth] (cbt) to (sbt);
+    \draw[-Stealth] (ctt) to (sbt);
+    \draw[-Stealth] (rst) to (ivt);
+  \end{forest}
 \end{document}