From 4c4b2a8a910b037129484bd2fbe106168106504b Mon Sep 17 00:00:00 2001
From: "Sergey V. Zhdanovskih" <serg.zhdanovskih@yandex.ru>
Date: Thu, 21 Nov 2024 00:58:26 +0300
Subject: [PATCH] Added text effect options in tree diagrams

---
 locales/Afrikaans.lng                         |   5 +
 locales/Belarusian.lng                        |   5 +
 locales/Chinese Simplified.lng                |   5 +
 locales/Czech.lng                             |   5 +
 locales/Dutch.lng                             |   5 +
 locales/English.lng                           |   5 +
 locales/French.lng                            |   5 +
 locales/German.lng                            |   5 +
 locales/Hungarian.lng                         |   5 +
 locales/Icelandic.lng                         |   5 +
 locales/Italian.lng                           |   5 +
 locales/Japanese.lng                          |   5 +
 locales/Kazakh (Cyrillic).lng                 |   5 +
 locales/Polish.lng                            |   5 +
 locales/Portuguese.lng                        |   5 +
 locales/Russian.lng                           |   5 +
 locales/Serbian (Latin).lng                   |   5 +
 locales/Spanish.lng                           |   5 +
 locales/Ukrainian.lng                         |   5 +
 locales/help_enu/gkhHistory.html              |   1 +
 locales/help_rus/gkhHistory.html              |   1 +
 .../GKCore/GKCore/Charts/ChartRenderer.cs     |  39 ++-
 .../GKCore/GKCore/Charts/TreeChartModel.cs    |  26 +-
 .../Controllers/OptionsDlgController.cs       |  23 +-
 projects/GKCore/GKCore/GKData.cs              |   8 +
 projects/GKCore/GKCore/LangMan.cs             |  12 +-
 .../GKCore/GKCore/Options/TreeChartOptions.cs |   8 +
 .../GKUI/Forms/OptionsDlg.Designer.cs         | 128 ++++++---
 .../GKUI/Platform/WFGfxRenderer.cs            |  50 ++++
 .../GEDKeeper3/GKUI/Forms/OptionsDlg.xeto     | 198 +++++++------
 .../GEDKeeperX/GKUI/Forms/OptionsDlg.xaml     | 267 ++++++++++--------
 31 files changed, 590 insertions(+), 266 deletions(-)

diff --git a/locales/Afrikaans.lng b/locales/Afrikaans.lng
index 98a5d219b..96a47afde 100644
--- a/locales/Afrikaans.lng
+++ b/locales/Afrikaans.lng
@@ -1013,3 +1013,8 @@
 1000=Map of persons
 1001=Search in geocoders for places without coordinates (maps)
 1002=Locations and Maps
+1003=Text effect
+1004=Simple
+1005=Sunken
+1006=Raised
+1007=Glow
diff --git a/locales/Belarusian.lng b/locales/Belarusian.lng
index e31db4829..5a8cb2904 100644
--- a/locales/Belarusian.lng
+++ b/locales/Belarusian.lng
@@ -1013,3 +1013,8 @@
 1000=Map of persons
 1001=Search in geocoders for places without coordinates (maps)
 1002=Locations and Maps
+1003=Text effect
+1004=Simple
+1005=Sunken
+1006=Raised
+1007=Glow
diff --git a/locales/Chinese Simplified.lng b/locales/Chinese Simplified.lng
index 21214e960..c3b2983b4 100644
--- a/locales/Chinese Simplified.lng	
+++ b/locales/Chinese Simplified.lng	
@@ -1013,3 +1013,8 @@
 1000=Map of persons
 1001=Search in geocoders for places without coordinates (maps)
 1002=Locations and Maps
+1003=Text effect
+1004=Simple
+1005=Sunken
+1006=Raised
+1007=Glow
diff --git a/locales/Czech.lng b/locales/Czech.lng
index 6796b8e8b..413a2c842 100644
--- a/locales/Czech.lng
+++ b/locales/Czech.lng
@@ -1013,3 +1013,8 @@
 1000=Map of persons
 1001=Search in geocoders for places without coordinates (maps)
 1002=Locations and Maps
+1003=Text effect
+1004=Simple
+1005=Sunken
+1006=Raised
+1007=Glow
diff --git a/locales/Dutch.lng b/locales/Dutch.lng
index 1cce7db67..263b9fb17 100644
--- a/locales/Dutch.lng
+++ b/locales/Dutch.lng
@@ -1013,3 +1013,8 @@
 1000=Map of persons
 1001=Search in geocoders for places without coordinates (maps)
 1002=Locations and Maps
+1003=Text effect
+1004=Simple
+1005=Sunken
+1006=Raised
+1007=Glow
diff --git a/locales/English.lng b/locales/English.lng
index 0f10698f5..5f32d6df4 100644
--- a/locales/English.lng
+++ b/locales/English.lng
@@ -1013,3 +1013,8 @@
 1000=Map of persons
 1001=Search in geocoders for places without coordinates (maps)
 1002=Locations and Maps
+1003=Text effect
+1004=Simple
+1005=Sunken
+1006=Raised
+1007=Glow
diff --git a/locales/French.lng b/locales/French.lng
index c325c8f06..62e5c5058 100644
--- a/locales/French.lng
+++ b/locales/French.lng
@@ -1013,3 +1013,8 @@
 1000=Map of persons
 1001=Search in geocoders for places without coordinates (maps)
 1002=Locations and Maps
+1003=Text effect
+1004=Simple
+1005=Sunken
+1006=Raised
+1007=Glow
diff --git a/locales/German.lng b/locales/German.lng
index 61c6b1dc2..a5dc70929 100644
--- a/locales/German.lng
+++ b/locales/German.lng
@@ -1013,3 +1013,8 @@
 1000=Map of persons
 1001=Search in geocoders for places without coordinates (maps)
 1002=Locations and Maps
+1003=Text effect
+1004=Simple
+1005=Sunken
+1006=Raised
+1007=Glow
diff --git a/locales/Hungarian.lng b/locales/Hungarian.lng
index 1efbf4a69..ad3f798e5 100644
--- a/locales/Hungarian.lng
+++ b/locales/Hungarian.lng
@@ -1013,3 +1013,8 @@
 1000=Map of persons
 1001=Search in geocoders for places without coordinates (maps)
 1002=Locations and Maps
+1003=Text effect
+1004=Simple
+1005=Sunken
+1006=Raised
+1007=Glow
diff --git a/locales/Icelandic.lng b/locales/Icelandic.lng
index 111f88680..31912ffc1 100644
--- a/locales/Icelandic.lng
+++ b/locales/Icelandic.lng
@@ -1013,3 +1013,8 @@
 1000=Map of persons
 1001=Search in geocoders for places without coordinates (maps)
 1002=Locations and Maps
+1003=Text effect
+1004=Simple
+1005=Sunken
+1006=Raised
+1007=Glow
diff --git a/locales/Italian.lng b/locales/Italian.lng
index d2287e3ec..61833cbaa 100644
--- a/locales/Italian.lng
+++ b/locales/Italian.lng
@@ -1013,3 +1013,8 @@
 1000=Map of persons
 1001=Search in geocoders for places without coordinates (maps)
 1002=Locations and Maps
+1003=Text effect
+1004=Simple
+1005=Sunken
+1006=Raised
+1007=Glow
diff --git a/locales/Japanese.lng b/locales/Japanese.lng
index 63d0a6c74..3e2f54764 100644
--- a/locales/Japanese.lng
+++ b/locales/Japanese.lng
@@ -1013,3 +1013,8 @@
 1000=Map of persons
 1001=Search in geocoders for places without coordinates (maps)
 1002=Locations and Maps
+1003=Text effect
+1004=Simple
+1005=Sunken
+1006=Raised
+1007=Glow
diff --git a/locales/Kazakh (Cyrillic).lng b/locales/Kazakh (Cyrillic).lng
index 1ec242fb7..37b619879 100644
--- a/locales/Kazakh (Cyrillic).lng	
+++ b/locales/Kazakh (Cyrillic).lng	
@@ -1013,3 +1013,8 @@
 1000=Map of persons
 1001=Search in geocoders for places without coordinates (maps)
 1002=Locations and Maps
+1003=Text effect
+1004=Simple
+1005=Sunken
+1006=Raised
+1007=Glow
diff --git a/locales/Polish.lng b/locales/Polish.lng
index 3ec81b7fd..6d4ffbb4d 100644
--- a/locales/Polish.lng
+++ b/locales/Polish.lng
@@ -1013,3 +1013,8 @@
 1000=Map of persons
 1001=Search in geocoders for places without coordinates (maps)
 1002=Locations and Maps
+1003=Text effect
+1004=Simple
+1005=Sunken
+1006=Raised
+1007=Glow
diff --git a/locales/Portuguese.lng b/locales/Portuguese.lng
index f3aad759b..72422597f 100644
--- a/locales/Portuguese.lng
+++ b/locales/Portuguese.lng
@@ -1013,3 +1013,8 @@
 1000=Map of persons
 1001=Search in geocoders for places without coordinates (maps)
 1002=Locations and Maps
+1003=Text effect
+1004=Simple
+1005=Sunken
+1006=Raised
+1007=Glow
diff --git a/locales/Russian.lng b/locales/Russian.lng
index c8777c5a5..bb19616f4 100644
--- a/locales/Russian.lng
+++ b/locales/Russian.lng
@@ -1013,3 +1013,8 @@
 1000=Карта персон
 1001=Поиск в геокодерах мест без координат (карты)
 1002=Места и Карты
+1003=Эффект текста
+1004=Простой
+1005=Утопленный
+1006=Приподнятый
+1007=Светящийся
diff --git a/locales/Serbian (Latin).lng b/locales/Serbian (Latin).lng
index f736f99ef..959313027 100644
--- a/locales/Serbian (Latin).lng	
+++ b/locales/Serbian (Latin).lng	
@@ -1013,3 +1013,8 @@
 1000=Map of persons
 1001=Search in geocoders for places without coordinates (maps)
 1002=Locations and Maps
+1003=Text effect
+1004=Simple
+1005=Sunken
+1006=Raised
+1007=Glow
diff --git a/locales/Spanish.lng b/locales/Spanish.lng
index 22659f73f..186496533 100644
--- a/locales/Spanish.lng
+++ b/locales/Spanish.lng
@@ -1013,3 +1013,8 @@
 1000=Map of persons
 1001=Search in geocoders for places without coordinates (maps)
 1002=Locations and Maps
+1003=Text effect
+1004=Simple
+1005=Sunken
+1006=Raised
+1007=Glow
diff --git a/locales/Ukrainian.lng b/locales/Ukrainian.lng
index 5a66d4d72..321fd8f88 100644
--- a/locales/Ukrainian.lng
+++ b/locales/Ukrainian.lng
@@ -1013,3 +1013,8 @@
 1000=Map of persons
 1001=Search in geocoders for places without coordinates (maps)
 1002=Locations and Maps
+1003=Text effect
+1004=Simple
+1005=Sunken
+1006=Raised
+1007=Glow
diff --git a/locales/help_enu/gkhHistory.html b/locales/help_enu/gkhHistory.html
index fbfbb0973..ab535ce7a 100644
--- a/locales/help_enu/gkhHistory.html
+++ b/locales/help_enu/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>Change log</h1>
 
     <p>
         <b>??.??.2024 [v2.32.0 &amp; v3.8.0]</b><ul>
+            <li>Added text effect options in tree diagrams (GKv2 only).
             <li>Added an option to disable the search for places without coordinates in geocoders (general maps).
             <li>Added the feature to display on maps all subordinate locations and persons of the selected hierarchy of locations.
             <li>Added mode for displaying parents' ages in tree diagrams.
diff --git a/locales/help_rus/gkhHistory.html b/locales/help_rus/gkhHistory.html
index 5ba114fcb..992d46450 100644
--- a/locales/help_rus/gkhHistory.html
+++ b/locales/help_rus/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>История версий</h1>
 
     <p>
         <b>??.??.2024 [v2.32.0 &amp; v3.8.0]</b><ul>
+            <li>Добавлены опции эффектов текста в диаграммах деревьев (только GKv2).
             <li>Добавлена опция выключения поиска мест без координат в геокодерах (общие карты).
             <li>Добавлена возможность выводить на карты все подчиненные места и персоны выбранной иерархии мест.
             <li>Добавлен режим отображения возрастов родителей в диаграммах деревьев.
diff --git a/projects/GKCore/GKCore/Charts/ChartRenderer.cs b/projects/GKCore/GKCore/Charts/ChartRenderer.cs
index 52050ab86..c3a5b5b9f 100644
--- a/projects/GKCore/GKCore/Charts/ChartRenderer.cs
+++ b/projects/GKCore/GKCore/Charts/ChartRenderer.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -47,6 +47,17 @@ public enum RenderTarget
         SVG
     }
 
+    public enum TextEffect
+    {
+        Simple,
+        Sunken,
+        Raised,
+        Glow,
+
+        First = Simple,
+        Last = Glow
+    }
+
     /// <summary>
     /// 
     /// </summary>
@@ -63,10 +74,15 @@ protected ChartRenderer()
 
         public virtual void SetViewport(int width, int height)
         {
-            // dummy
         }
 
-        public abstract void SetSmoothing(bool value);
+        public virtual void SetSmoothing(bool value)
+        {
+        }
+
+        public virtual void SetTranslucent(float value)
+        {
+        }
 
         public virtual void BeginDrawing()
         {
@@ -76,15 +92,14 @@ public virtual void EndDrawing()
         {
         }
 
+        public abstract void SetTarget(object target);
+
 
         public static IColor GetColor(int argb)
         {
             return AppHost.GfxProvider.CreateColor(argb);
         }
 
-
-        public abstract void SetTarget(object target);
-
         /// <summary>
         /// A separate implementation only for those cases when different classes
         /// at the UI and diagram rendering levels are responsible for the image.
@@ -138,6 +153,11 @@ public int GetTextWidth(string text, IFont font)
 
         public abstract void DrawString(string text, IFont font, IBrush brush, float x, float y);
 
+        public virtual void DrawString(string text, IFont font, IBrush brush, float x, float y, TextEffect effect = TextEffect.Simple)
+        {
+            DrawString(text, font, brush, x, y);
+        }
+
         public virtual void DrawAnchor(string text, string anchor, IFont font, IBrush brush, float x, float y)
         {
             // Not applicable for most areas except exports
@@ -161,6 +181,11 @@ public abstract void DrawRectangle(IPen pen, IColor fillColor, float x, float y,
         public abstract void DrawRoundedRectangle(IPen pen, IColor fillColor, float x, float y,
                                                   float width, float height, float radius);
 
+        public virtual void DrawCoverGlass(float x, float y, float width, float height, float radius)
+        {
+            // dummy
+        }
+
         public abstract void DrawPath(IPen pen, IBrush brush, IGfxPath path);
 
         public virtual IFont CreateFont(string fontName, float size, bool bold)
@@ -180,8 +205,6 @@ public IPen CreatePen(int argb, float width = 1.0f)
         public abstract IGfxPath CreateCirclePath(float x, float y, float width, float height);
         public abstract IGfxPath CreateCircleSegmentPath(int ctX, int ctY, float inRad, float extRad, float wedgeAngle, float ang1, float ang2);
 
-        public abstract void SetTranslucent(float value);
-
         public abstract void ScaleTransform(float sx, float sy);
         public abstract void TranslateTransform(float dx, float dy);
         public abstract void RotateTransform(float angle);
diff --git a/projects/GKCore/GKCore/Charts/TreeChartModel.cs b/projects/GKCore/GKCore/Charts/TreeChartModel.cs
index a1df0df2b..024b378cd 100644
--- a/projects/GKCore/GKCore/Charts/TreeChartModel.cs
+++ b/projects/GKCore/GKCore/Charts/TreeChartModel.cs
@@ -1696,6 +1696,11 @@ private bool IsLineVisible(int x1, int y1, int x2, int y2)
             var rangeX = new Range<int>(fVisibleArea.Left, fVisibleArea.Right);
             var rangeY = new Range<int>(fVisibleArea.Top, fVisibleArea.Bottom);
 
+            return rangeX.IsOverlapped(new Range<int>(x1, x2)) && rangeY.IsOverlapped(new Range<int>(y1, y2));
+        }
+
+        private void DrawLine(int x1, int y1, int x2, int y2, bool isDotted, bool isTracked, bool isMatched)
+        {
             if (x2 < x1) {
                 int tmp = x1;
                 x1 = x2;
@@ -1708,11 +1713,6 @@ private bool IsLineVisible(int x1, int y1, int x2, int y2)
                 y2 = tmp;
             }
 
-            return rangeX.IsOverlapped(new Range<int>(x1, x2)) && rangeY.IsOverlapped(new Range<int>(y1, y2));
-        }
-
-        private void DrawLine(int x1, int y1, int x2, int y2, bool isDotted, bool isTracked, bool isMatched)
-        {
             if (!IsLineVisible(x1, y1, x2, y2)) return;
 
             IPen linePen, decorativeLinePen;
@@ -1765,6 +1765,8 @@ private void DrawLine(int x1, int y1, int x2, int y2, bool isDotted, bool isTrac
             }
         }
 
+        private const float RoundedRectRadius = 6.0f;
+
         private void DrawBorder(IPen xpen, ExtRect rt, bool dead, TreeChartPerson person)
         {
             IColor bColor = person.GetFillColor(dead);
@@ -1773,12 +1775,18 @@ private void DrawBorder(IPen xpen, ExtRect rt, bool dead, TreeChartPerson person
             }
 
             if (person.Sex == GDMSex.svFemale) {
-                fRenderer.DrawRoundedRectangle(xpen, bColor, rt.Left, rt.Top, rt.GetWidth(), rt.GetHeight(), 6);
+                fRenderer.DrawRoundedRectangle(xpen, bColor, rt.Left, rt.Top, rt.GetWidth(), rt.GetHeight(), RoundedRectRadius);
             } else {
                 fRenderer.DrawRectangle(xpen, bColor, rt.Left, rt.Top, rt.GetWidth(), rt.GetHeight());
             }
         }
 
+        private void DrawCoverGlass(ExtRect rt, TreeChartPerson person)
+        {
+            float rad = (person.Sex == GDMSex.svFemale) ? RoundedRectRadius : 0.0f;
+            fRenderer.DrawCoverGlass(rt.Left, rt.Top, rt.GetWidth(), rt.GetHeight(), rad);
+        }
+
         private static string TruncString(string str, int threshold)
         {
             if (str.Length > threshold)
@@ -1851,11 +1859,13 @@ private void DrawPerson(TreeChartPerson person, ChartDrawMode drawMode, bool isS
 
                     int rx = prt.Left + (prtWidth - stw) / 2;
 
-                    fRenderer.DrawString(line, font, fSolidBlack, rx, ry);
+                    fRenderer.DrawString(line, font, fSolidBlack, rx, ry, fOptions.TextEffect);
 
                     ry += lh;
                 }
 
+                DrawCoverGlass(brt, person);
+
                 if (fOptions.SignsVisible && !person.Signs.IsEmpty()) {
                     int i = 0;
                     int dy = (int)(21 * fPicScale);
@@ -2051,7 +2061,7 @@ private void DrawText(string text, float x, float y, int quad, IBrush brush, boo
                     break;
             }
 
-            fRenderer.DrawString(text, fDrawFont, brush, x, y);
+            fRenderer.DrawString(text, fDrawFont, brush, x, y, fOptions.TextEffect);
         }
 
         private void DrawDescendants(TreeChartPerson person, ChartDrawMode drawMode, bool isTracked)
diff --git a/projects/GKCore/GKCore/Controllers/OptionsDlgController.cs b/projects/GKCore/GKCore/Controllers/OptionsDlgController.cs
index 19e9c2d0c..3a66d05dd 100644
--- a/projects/GKCore/GKCore/Controllers/OptionsDlgController.cs
+++ b/projects/GKCore/GKCore/Controllers/OptionsDlgController.cs
@@ -20,6 +20,7 @@
 
 using System.Threading.Tasks;
 using GDModel;
+using GKCore.Charts;
 using GKCore.Design;
 using GKCore.Design.Controls;
 using GKCore.Design.Views;
@@ -681,6 +682,19 @@ public void UpdateTreeChartsOptions()
             GetControl<ICheckBox>("chkUseExtraControls").Visible = hasExtraControls;
 
             UpdateTreeChartFont();
+
+            var cmbTextEffect = GetControl<IComboBox>("cmbTextEffect");
+            cmbTextEffect.Clear();
+            for (TextEffect itm = TextEffect.First; itm <= TextEffect.Last; itm++) {
+                cmbTextEffect.AddItem(LangMan.LS(GKData.TextEffects[(int)itm]), itm);
+            }
+            cmbTextEffect.SetSelectedTag(fOptions.TreeChartOptions.TextEffect);
+
+#if NETCORE
+            cmbTextEffect.Enabled = false;
+#else
+            cmbTextEffect.Enabled = !AppHost.Instance.HasFeatureSupport(Feature.Mobile);
+#endif
         }
 
         public void UpdateTreeChartFont()
@@ -767,6 +781,8 @@ public void AcceptTreeChartsOptions()
             fOptions.TreeChartOptions.DepthLimitDescendants = (int)GetControl<INumericBox>("numDefaultDepthDescendants").Value;
 
             fOptions.TreeChartOptions.UseExtraControls = GetControl<ICheckBox>("chkUseExtraControls").Checked;
+
+            fOptions.TreeChartOptions.TextEffect = GetControl<IComboBox>("cmbTextEffect").GetSelectedTag<TextEffect>();
         }
 
         public void ResetCircleChartsOptions()
@@ -914,7 +930,9 @@ public override void SetLocale()
             GetControl<ITabPage>("pageCharts").Text = LangMan.LS(LSID.Charts);
 
             GetControl<ITabPage>("pageTreeChart").Text = LangMan.LS(LSID.Trees);
-            GetControl<IGroupBox>("grpTreePersons").Text = LangMan.LS(LSID.ViewTree);
+
+            GetControl<ITabPage>("pageTreePersons").Text = LangMan.LS(LSID.ViewTree);
+            GetControl<ITabPage>("pageTreeDesign").Text = LangMan.LS(LSID.Decor);
 
             GetControl<ICheckBox>("chkSurname").Text = LangMan.LS(LSID.Surname);
             GetControl<ICheckBox>("chkName").Text = LangMan.LS(LSID.Name);
@@ -947,7 +965,6 @@ public override void SetLocale()
             GetControl<ICheckBox>("chkSameCardsWidth").Text = LangMan.LS(LSID.SameCardsWidth);
             GetControl<ICheckBox>("chkFullNameOnOneLine").Text = LangMan.LS(LSID.FullNameOnOneLine);
 
-            GetControl<IGroupBox>("grpTreeDecor").Text = LangMan.LS(LSID.Decor);
             GetControl<ILabel>("lblMaleColor").Text = LangMan.LS(LSID.Man);
             GetControl<ILabel>("lblFemaleColor").Text = LangMan.LS(LSID.Woman);
             GetControl<ILabel>("lblUnkSexColor").Text = LangMan.LS(LSID.UnkSex);
@@ -970,6 +987,8 @@ public override void SetLocale()
 
             GetControl<ICheckBox>("chkUseExtraControls").Text = LangMan.LS(LSID.UseExtraControls);
 
+            GetControl<ILabel>("lblTextEffect").Text = LangMan.LS(LSID.TextEffect);
+
             GetControl<ITabPage>("pageAncCircle").Text = LangMan.LS(LSID.AncestorsCircle);
 
             // UIView
diff --git a/projects/GKCore/GKCore/GKData.cs b/projects/GKCore/GKCore/GKData.cs
index c70725fe2..7820aadb1 100644
--- a/projects/GKCore/GKCore/GKData.cs
+++ b/projects/GKCore/GKCore/GKData.cs
@@ -232,6 +232,7 @@ public FARPropertyStruct(LSID name, bool enabled)
         public static readonly FARPropertyStruct[] FARPropertyTypes;
         public static readonly LSID URTreeNoteType;
         public static readonly LSID[] ChartWindowsShowModes;
+        public static readonly LSID[] TextEffects;
 
 
         /// <summary>
@@ -555,6 +556,13 @@ static GKData()
                 LSID.CWSM_LeftHalf,
                 LSID.CWSM_RightHalf,
             };
+
+            TextEffects = new LSID[] {
+                LSID.TE_Simple,
+                LSID.TE_Sunken,
+                LSID.TE_Raised,
+                LSID.TE_Glow,
+            };
         }
     }
 }
diff --git a/projects/GKCore/GKCore/LangMan.cs b/projects/GKCore/GKCore/LangMan.cs
index 093bc5cf2..6f6af239e 100644
--- a/projects/GKCore/GKCore/LangMan.cs
+++ b/projects/GKCore/GKCore/LangMan.cs
@@ -1077,8 +1077,13 @@ public enum LSID
         /* 1000 */ MapOfPersons,
         /* 1001 */ SearchPlacesWithoutCoords,
         /* 1002 */ LocationsAndMaps,
+        /* 1003 */ TextEffect,
+        /* 1004 */ TE_Simple,
+        /* 1005 */ TE_Sunken,
+        /* 1006 */ TE_Raised,
+        /* 1007 */ TE_Glow,
 
-        /* 000 */ Last = LocationsAndMaps
+        /* 000 */ Last = TE_Glow
     }
 
 
@@ -2109,6 +2114,11 @@ public static class LangMan
             /* 1000 */ "Map of persons",
             /* 1001 */ "Search in geocoders for places without coordinates (maps)",
             /* 1002 */ "Locations and Maps",
+            /* 1003 */ "Text effect",
+            /* 1004 */ "Simple",
+            /* 1005 */ "Sunken",
+            /* 1006 */ "Raised",
+            /* 1007 */ "Glow",
         };
 
         private static readonly LangManager fLangMan = new LangManager();
diff --git a/projects/GKCore/GKCore/Options/TreeChartOptions.cs b/projects/GKCore/GKCore/Options/TreeChartOptions.cs
index f2b58e3d1..c1c68b549 100644
--- a/projects/GKCore/GKCore/Options/TreeChartOptions.cs
+++ b/projects/GKCore/GKCore/Options/TreeChartOptions.cs
@@ -91,6 +91,7 @@ public sealed class TreeChartOptions : IOptions
         public int DefFontSize;
         public IColor DefFontColor;
         public BSDTypes.FontStyle DefFontStyle;
+        public TextEffect TextEffect;
 
         public int BranchDistance;
         public int LevelDistance;
@@ -164,6 +165,7 @@ public void ResetDefaults()
             DefFontSize = (int)AppHost.GfxProvider.GetDefaultFontSize();
             DefFontColor = ChartRenderer.GetColor(BSDColors.Black);
             DefFontStyle = BSDTypes.FontStyle.None;
+            TextEffect = TextEffect.Simple;
 
             BranchDistance = TreeChartModel.DEF_BRANCH_DISTANCE;
             LevelDistance = TreeChartModel.DEF_LEVEL_DISTANCE;
@@ -203,15 +205,19 @@ public void Assign(IOptions source)
             TraceSelected = srcOptions.TraceSelected;
             ChildlessExclude = srcOptions.ChildlessExclude;
             Decorative = srcOptions.Decorative;
+
             MaleColor = srcOptions.MaleColor;
             FemaleColor = srcOptions.FemaleColor;
             UnkSexColor = srcOptions.UnkSexColor;
             UnHusbandColor = srcOptions.UnHusbandColor;
             UnWifeColor = srcOptions.UnWifeColor;
+
             DefFontName = srcOptions.DefFontName;
             DefFontSize = srcOptions.DefFontSize;
             DefFontColor = srcOptions.DefFontColor;
             DefFontStyle = srcOptions.DefFontStyle;
+            TextEffect = srcOptions.TextEffect;
+
             InvertedTree = srcOptions.InvertedTree;
             MarriagesDates = srcOptions.MarriagesDates;
             ShowPlaces = srcOptions.ShowPlaces;
@@ -295,6 +301,7 @@ public void LoadFromFile(IniFile iniFile)
             DefFontSize = iniFile.ReadInteger("Chart", "FontSize", (int)AppHost.GfxProvider.GetDefaultFontSize());
             DefFontColor = ChartRenderer.GetColor(iniFile.ReadInteger("Chart", "FontColor", BSDColors.Black));
             DefFontStyle = (BSDTypes.FontStyle)iniFile.ReadInteger("Chart", "FontStyle", 0);
+            TextEffect = (TextEffect)iniFile.ReadInteger("Chart", "TextEffect", 0);
 
             BranchDistance = iniFile.ReadInteger("Chart", "BranchDistance", TreeChartModel.DEF_BRANCH_DISTANCE);
             LevelDistance = iniFile.ReadInteger("Chart", "LevelDistance", TreeChartModel.DEF_LEVEL_DISTANCE);
@@ -367,6 +374,7 @@ public void SaveToFile(IniFile iniFile)
             iniFile.WriteInteger("Chart", "FontSize", DefFontSize);
             iniFile.WriteInteger("Chart", "FontColor", DefFontColor.ToArgb());
             iniFile.WriteInteger("Chart", "FontStyle", (byte)DefFontStyle);
+            iniFile.WriteInteger("Chart", "TextEffect", (byte)TextEffect);
 
             iniFile.WriteInteger("Chart", "BranchDistance", BranchDistance);
             iniFile.WriteInteger("Chart", "LevelDistance", LevelDistance);
diff --git a/projects/GKv2/GEDKeeper2/GKUI/Forms/OptionsDlg.Designer.cs b/projects/GKv2/GEDKeeper2/GKUI/Forms/OptionsDlg.Designer.cs
index 3a23ba08e..f800eee3a 100644
--- a/projects/GKv2/GEDKeeper2/GKUI/Forms/OptionsDlg.Designer.cs
+++ b/projects/GKv2/GEDKeeper2/GKUI/Forms/OptionsDlg.Designer.cs
@@ -7,7 +7,6 @@ partial class OptionsDlg
         private System.Windows.Forms.Button btnAccept;
         private System.Windows.Forms.Button btnCancel;
         private System.Windows.Forms.TabPage pageTreeChart;
-        private System.Windows.Forms.GroupBox grpTreePersons;
         private System.Windows.Forms.Panel panTreePersons;
         private System.Windows.Forms.CheckBox chkSurname;
         private System.Windows.Forms.CheckBox chkName;
@@ -199,6 +198,11 @@ partial class OptionsDlg
         private System.Windows.Forms.CheckBox chkSimpleSingleSurnames;
         private System.Windows.Forms.CheckBox chkSearchPlacesWithoutCoords;
         private System.Windows.Forms.TabPage pageGeo;
+        private GKUI.Components.GKTabControl tabsTreeCharts;
+        private System.Windows.Forms.TabPage pageTreePersons;
+        private System.Windows.Forms.TabPage pageTreeDesign;
+        private System.Windows.Forms.Label lblTextEffect;
+        private System.Windows.Forms.ComboBox cmbTextEffect;
 
         private void InitializeComponent()
         {
@@ -267,7 +271,6 @@ private void InitializeComponent()
             this.lblGenDist = new System.Windows.Forms.Label();
             this.lblBranchDist = new System.Windows.Forms.Label();
             this.lblMargins = new System.Windows.Forms.Label();
-            this.grpTreePersons = new System.Windows.Forms.GroupBox();
             this.panTreePersons = new System.Windows.Forms.Panel();
             this.chkSurname = new System.Windows.Forms.CheckBox();
             this.chkName = new System.Windows.Forms.CheckBox();
@@ -399,6 +402,11 @@ private void InitializeComponent()
             this.chkSimpleSingleSurnames = new System.Windows.Forms.CheckBox();
             this.chkSearchPlacesWithoutCoords = new System.Windows.Forms.CheckBox();
             this.pageGeo = new System.Windows.Forms.TabPage();
+            this.tabsTreeCharts = new Components.GKTabControl();
+            this.pageTreePersons = new System.Windows.Forms.TabPage();
+            this.pageTreeDesign = new System.Windows.Forms.TabPage();
+            this.lblTextEffect = new System.Windows.Forms.Label();
+            this.cmbTextEffect = new System.Windows.Forms.ComboBox();
             this.PageControl1.SuspendLayout();
             this.pageCommon.SuspendLayout();
             this.groupBox1.SuspendLayout();
@@ -420,7 +428,6 @@ private void InitializeComponent()
             ((System.ComponentModel.ISupportInitialize)(this.numBranchDist)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numMargins)).BeginInit();
             this.panTreePersons.SuspendLayout();
-            this.grpTreePersons.SuspendLayout();
             this.grpTreeDecor.SuspendLayout();
             this.panMaleColor.SuspendLayout();
             this.panFemaleColor.SuspendLayout();
@@ -445,6 +452,9 @@ private void InitializeComponent()
             this.pageEventTypes.SuspendLayout();
             this.pageNavigation.SuspendLayout();
             this.pageGeo.SuspendLayout();
+            this.tabsTreeCharts.SuspendLayout();
+            this.pageTreePersons.SuspendLayout();
+            this.pageTreeDesign.SuspendLayout();
             this.SuspendLayout();
             // 
             // PageControl1
@@ -969,19 +979,56 @@ private void InitializeComponent()
             this.tabsCharts.Size = new System.Drawing.Size(721, 702);
             this.tabsCharts.TabIndex = 0;
             // 
+            // tabsTreeCharts
+            // 
+            this.tabsTreeCharts.Controls.Add(this.pageTreePersons);
+            this.tabsTreeCharts.Controls.Add(this.pageTreeDesign);
+            this.tabsTreeCharts.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabsTreeCharts.Location = new System.Drawing.Point(10, 10);
+            this.tabsTreeCharts.Margin = new System.Windows.Forms.Padding(2);
+            this.tabsTreeCharts.Name = "tabsTreeCharts";
+            this.tabsTreeCharts.SelectedIndex = 0;
+            this.tabsTreeCharts.Size = new System.Drawing.Size(721, 702);
+            this.tabsTreeCharts.TabIndex = 0;
+            // 
+            // pageTreePersons
+            // 
+            this.pageTreePersons.BackColor = System.Drawing.SystemColors.Control;
+            this.pageTreePersons.Controls.Add(this.panTreePersons);
+            this.pageTreePersons.Location = new System.Drawing.Point(4, 26);
+            this.pageTreePersons.Margin = new System.Windows.Forms.Padding(2);
+            this.pageTreePersons.Name = "pageTreePersons";
+            this.pageTreePersons.Padding = new System.Windows.Forms.Padding(10);
+            this.pageTreePersons.Size = new System.Drawing.Size(713, 712);
+            this.pageTreePersons.TabIndex = 3;
+            this.pageTreePersons.Text = "pageTreePersons";
+            // 
+            // pageTreeDesign
+            // 
+            this.pageTreeDesign.BackColor = System.Drawing.SystemColors.Control;
+            this.pageTreeDesign.Controls.Add(this.chkSeparateDepth);
+            this.pageTreeDesign.Controls.Add(this.numDefaultDepth);
+            this.pageTreeDesign.Controls.Add(this.lblDefaultDepth);
+            this.pageTreeDesign.Controls.Add(this.numDefaultDepthAncestors);
+            this.pageTreeDesign.Controls.Add(this.lblDefaultDepthAncestors);
+            this.pageTreeDesign.Controls.Add(this.numDefaultDepthDescendants);
+            this.pageTreeDesign.Controls.Add(this.lblDefaultDepthDescendants);
+            this.pageTreeDesign.Controls.Add(this.grpSpacings);
+            this.pageTreeDesign.Controls.Add(this.grpTreeDecor);
+            this.pageTreeDesign.Controls.Add(this.lblTextEffect);
+            this.pageTreeDesign.Controls.Add(this.cmbTextEffect);
+            this.pageTreeDesign.Location = new System.Drawing.Point(4, 26);
+            this.pageTreeDesign.Margin = new System.Windows.Forms.Padding(2);
+            this.pageTreeDesign.Name = "pageTreeDesign";
+            this.pageTreeDesign.Padding = new System.Windows.Forms.Padding(10);
+            this.pageTreeDesign.Size = new System.Drawing.Size(713, 712);
+            this.pageTreeDesign.TabIndex = 3;
+            this.pageTreeDesign.Text = "pageTreeDesign";
+            // 
             // pageTreeChart
             // 
             this.pageTreeChart.BackColor = System.Drawing.SystemColors.Control;
-            this.pageTreeChart.Controls.Add(this.chkSeparateDepth);
-            this.pageTreeChart.Controls.Add(this.numDefaultDepth);
-            this.pageTreeChart.Controls.Add(this.lblDefaultDepth);
-            this.pageTreeChart.Controls.Add(this.numDefaultDepthAncestors);
-            this.pageTreeChart.Controls.Add(this.lblDefaultDepthAncestors);
-            this.pageTreeChart.Controls.Add(this.numDefaultDepthDescendants);
-            this.pageTreeChart.Controls.Add(this.lblDefaultDepthDescendants);
-            this.pageTreeChart.Controls.Add(this.grpSpacings);
-            this.pageTreeChart.Controls.Add(this.grpTreePersons);
-            this.pageTreeChart.Controls.Add(this.grpTreeDecor);
+            this.pageTreeChart.Controls.Add(this.tabsTreeCharts);
             this.pageTreeChart.Location = new System.Drawing.Point(4, 26);
             this.pageTreeChart.Margin = new System.Windows.Forms.Padding(2);
             this.pageTreeChart.Name = "pageTreeChart";
@@ -992,7 +1039,7 @@ private void InitializeComponent()
             // 
             // chkSeparateDepth
             // 
-            this.chkSeparateDepth.Location = new System.Drawing.Point(434, 458);
+            this.chkSeparateDepth.Location = new System.Drawing.Point(334, 198);
             this.chkSeparateDepth.Margin = new System.Windows.Forms.Padding(10, 0, 0, 5);
             this.chkSeparateDepth.Name = "chkSeparateDepth";
             this.chkSeparateDepth.Size = new System.Drawing.Size(254, 22);
@@ -1002,7 +1049,7 @@ private void InitializeComponent()
             // 
             // numDefaultDepth
             // 
-            this.numDefaultDepth.Location = new System.Drawing.Point(639, 489);
+            this.numDefaultDepth.Location = new System.Drawing.Point(610, 229);
             this.numDefaultDepth.Margin = new System.Windows.Forms.Padding(4);
             this.numDefaultDepth.Maximum = new decimal(new int[] {
             9,
@@ -1016,7 +1063,7 @@ private void InitializeComponent()
             // lblDefaultDepth
             // 
             this.lblDefaultDepth.AutoSize = true;
-            this.lblDefaultDepth.Location = new System.Drawing.Point(434, 491);
+            this.lblDefaultDepth.Location = new System.Drawing.Point(334, 231);
             this.lblDefaultDepth.Margin = new System.Windows.Forms.Padding(10, 0, 0, 5);
             this.lblDefaultDepth.Name = "lblDefaultDepth";
             this.lblDefaultDepth.Size = new System.Drawing.Size(101, 17);
@@ -1025,7 +1072,7 @@ private void InitializeComponent()
             // 
             // numDefaultDepthAncestors
             // 
-            this.numDefaultDepthAncestors.Location = new System.Drawing.Point(639, 522);
+            this.numDefaultDepthAncestors.Location = new System.Drawing.Point(610, 262);
             this.numDefaultDepthAncestors.Margin = new System.Windows.Forms.Padding(4);
             this.numDefaultDepthAncestors.Maximum = new decimal(new int[] {
             9,
@@ -1039,7 +1086,7 @@ private void InitializeComponent()
             // lblDefaultDepthAncestors
             // 
             this.lblDefaultDepthAncestors.AutoSize = true;
-            this.lblDefaultDepthAncestors.Location = new System.Drawing.Point(434, 525);
+            this.lblDefaultDepthAncestors.Location = new System.Drawing.Point(334, 265);
             this.lblDefaultDepthAncestors.Margin = new System.Windows.Forms.Padding(10, 0, 0, 5);
             this.lblDefaultDepthAncestors.Name = "lblDefaultDepthAncestors";
             this.lblDefaultDepthAncestors.Size = new System.Drawing.Size(161, 17);
@@ -1048,7 +1095,7 @@ private void InitializeComponent()
             // 
             // numDefaultDepthDescendants
             // 
-            this.numDefaultDepthDescendants.Location = new System.Drawing.Point(639, 556);
+            this.numDefaultDepthDescendants.Location = new System.Drawing.Point(610, 296);
             this.numDefaultDepthDescendants.Margin = new System.Windows.Forms.Padding(4);
             this.numDefaultDepthDescendants.Maximum = new decimal(new int[] {
             9,
@@ -1062,13 +1109,32 @@ private void InitializeComponent()
             // lblDefaultDepthDescendants
             // 
             this.lblDefaultDepthDescendants.AutoSize = true;
-            this.lblDefaultDepthDescendants.Location = new System.Drawing.Point(434, 559);
+            this.lblDefaultDepthDescendants.Location = new System.Drawing.Point(334, 299);
             this.lblDefaultDepthDescendants.Margin = new System.Windows.Forms.Padding(10, 0, 0, 5);
             this.lblDefaultDepthDescendants.Name = "lblDefaultDepthDescendants";
             this.lblDefaultDepthDescendants.Size = new System.Drawing.Size(180, 17);
             this.lblDefaultDepthDescendants.TabIndex = 10;
             this.lblDefaultDepthDescendants.Text = "lblDefaultDepthDescendants";
             // 
+            // lblTextEffect
+            // 
+            this.lblTextEffect.AutoSize = true;
+            this.lblTextEffect.Location = new System.Drawing.Point(11, 316);
+            this.lblTextEffect.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.lblTextEffect.Name = "lblTextEffect";
+            this.lblTextEffect.Size = new System.Drawing.Size(80, 17);
+            this.lblTextEffect.TabIndex = 0;
+            this.lblTextEffect.Text = "lblTextEffect";
+            // 
+            // cmbTextEffect
+            // 
+            this.cmbTextEffect.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbTextEffect.Location = new System.Drawing.Point(11, 336);
+            this.cmbTextEffect.Margin = new System.Windows.Forms.Padding(2);
+            this.cmbTextEffect.Name = "cmbTextEffect";
+            this.cmbTextEffect.Size = new System.Drawing.Size(230, 25);
+            this.cmbTextEffect.TabIndex = 4;
+            // 
             // grpSpacings
             // 
             this.grpSpacings.Controls.Add(this.numSpouseDist);
@@ -1079,7 +1145,7 @@ private void InitializeComponent()
             this.grpSpacings.Controls.Add(this.lblGenDist);
             this.grpSpacings.Controls.Add(this.lblBranchDist);
             this.grpSpacings.Controls.Add(this.lblMargins);
-            this.grpSpacings.Location = new System.Drawing.Point(414, 288);
+            this.grpSpacings.Location = new System.Drawing.Point(314, 12);
             this.grpSpacings.Margin = new System.Windows.Forms.Padding(2);
             this.grpSpacings.Name = "grpSpacings";
             this.grpSpacings.Padding = new System.Windows.Forms.Padding(10);
@@ -1262,18 +1328,6 @@ private void InitializeComponent()
             this.panTreePersons.TabStop = false;
             this.panTreePersons.Text = "panTreePersons";
             // 
-            // grpTreePersons
-            //
-            this.grpTreePersons.Controls.Add(this.panTreePersons);
-            this.grpTreePersons.Location = new System.Drawing.Point(11, 10);
-            this.grpTreePersons.Margin = new System.Windows.Forms.Padding(10);
-            this.grpTreePersons.Name = "grpTreePersons";
-            this.grpTreePersons.Padding = new System.Windows.Forms.Padding(10);
-            this.grpTreePersons.Size = new System.Drawing.Size(391, 580);
-            this.grpTreePersons.TabIndex = 0;
-            this.grpTreePersons.TabStop = false;
-            this.grpTreePersons.Text = "grpTreePersons";
-            // 
             // chkSurname
             //
             this.chkSurname.AutoSize = true;
@@ -1602,14 +1656,14 @@ private void InitializeComponent()
             this.grpTreeDecor.Controls.Add(this.panUnHusbandColor);
             this.grpTreeDecor.Controls.Add(this.panUnWifeColor);
             this.grpTreeDecor.Controls.Add(this.panDefFont);
-            this.grpTreeDecor.Location = new System.Drawing.Point(414, 12);
+            this.grpTreeDecor.Location = new System.Drawing.Point(14, 12);
             this.grpTreeDecor.Margin = new System.Windows.Forms.Padding(2);
             this.grpTreeDecor.Name = "grpTreeDecor";
             this.grpTreeDecor.Padding = new System.Windows.Forms.Padding(10);
             this.grpTreeDecor.Size = new System.Drawing.Size(245, 260);
             this.grpTreeDecor.TabIndex = 1;
             this.grpTreeDecor.TabStop = false;
-            this.grpTreeDecor.Text = "grpTreeDecor";
+            this.grpTreeDecor.Text = "";
             // 
             // lblFont
             // 
@@ -2768,8 +2822,10 @@ private void InitializeComponent()
             ((System.ComponentModel.ISupportInitialize)(this.numGenDist)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.numBranchDist)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.numMargins)).EndInit();
+            this.pageTreePersons.ResumeLayout(false);
+            this.pageTreeDesign.ResumeLayout(false);
+            this.tabsTreeCharts.ResumeLayout(false);
             this.panTreePersons.ResumeLayout(false);
-            this.grpTreePersons.ResumeLayout(false);
             this.grpTreeDecor.ResumeLayout(false);
             this.panMaleColor.ResumeLayout(false);
             this.panFemaleColor.ResumeLayout(false);
diff --git a/projects/GKv2/GKComponents/GKUI/Platform/WFGfxRenderer.cs b/projects/GKv2/GKComponents/GKUI/Platform/WFGfxRenderer.cs
index 794fd0348..c81fec6b8 100644
--- a/projects/GKv2/GKComponents/GKUI/Platform/WFGfxRenderer.cs
+++ b/projects/GKv2/GKComponents/GKUI/Platform/WFGfxRenderer.cs
@@ -119,6 +119,56 @@ public override void DrawString(string text, IFont font, IBrush brush, float x,
             fCanvas.DrawString(text, sdFnt, sdBrush, x, y);
         }
 
+        private static float GetEmFontSize(Font fnt) =>
+            fnt.SizeInPoints * (fnt.FontFamily.GetCellAscent(fnt.Style) +
+            fnt.FontFamily.GetCellDescent(fnt.Style)) / fnt.FontFamily.GetEmHeight(fnt.Style);
+
+        private static void DrawGlowString(Graphics gfx, string text, Font font, Brush foreBrush, float x, float y, Color glowColor, float glowSize)
+        {
+            //gfx.SmoothingMode = SmoothingMode.AntiAlias;
+            //gfx.InterpolationMode = InterpolationMode.HighQualityBicubic;
+
+            using (var strformat = new StringFormat())
+            using (var path = new GraphicsPath()) {
+                path.AddString(text, font.FontFamily, (int)font.Style, GetEmFontSize(font), new PointF(x, y), strformat);
+
+                int r = glowColor.R;
+                int g = glowColor.G;
+                int b = glowColor.B;
+
+                for (int i = 1; i < glowSize; ++i) {
+                    using (var pen = new Pen(Color.FromArgb(32, r, g, b), i)) {
+                        pen.LineJoin = LineJoin.Round;
+                        gfx.DrawPath(pen, path);
+                    }
+                }
+
+                gfx.FillPath(foreBrush, path);
+            }
+        }
+
+        public override void DrawString(string text, IFont font, IBrush brush, float x, float y, TextEffect effect = TextEffect.Simple)
+        {
+            Brush sdBrush = ((BrushHandler)brush).Handle;
+            Font sdFnt = ((FontHandler)font).Handle;
+
+            switch (effect) {
+                case TextEffect.Sunken:
+                    fCanvas.DrawString(text, sdFnt, Brushes.White, x + 1, y + 1);
+                    break;
+
+                case TextEffect.Raised:
+                    fCanvas.DrawString(text, sdFnt, Brushes.White, x - 1, y - 1);
+                    break;
+
+                case TextEffect.Glow:
+                    DrawGlowString(fCanvas, text, sdFnt, sdBrush, x, y, Color.Gold, 5);
+                    return;
+            }
+
+            fCanvas.DrawString(text, sdFnt, sdBrush, x, y);
+        }
+
         public override void DrawLine(IPen pen, float x1, float y1, float x2, float y2)
         {
             Pen sdPen = ((PenHandler)pen).Handle;
diff --git a/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.xeto b/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.xeto
index 3288eb8d3..aba88c2d0 100644
--- a/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.xeto
+++ b/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.xeto
@@ -132,11 +132,12 @@
           <TabControl x:Name="tabsCharts">
 
             <TabPage x:Name="pageTreeChart">
-              <TableLayout Style="paddedTable">
 
-                <TableRow>
+              <TabControl x:Name="tabsTreeCharts">
 
+                <TabPage x:Name="pageTreePersons">
                   <GroupBox x:Name="grpTreePersons" Height="300">
+
                     <Scrollable>
                       <StackLayout Style="vertListStack">
 
@@ -194,121 +195,144 @@
 
                       </StackLayout>
                     </Scrollable>
+
                   </GroupBox>
+                </TabPage>
 
-                  <StackLayout Spacing="4">
+                <TabPage x:Name="pageTreeDesign">
+                  <TableLayout Style="paddedTable">
 
-                    <GroupBox x:Name="grpTreeDecor">
-                      <TableLayout Style="paddedTable">
+                    <TableRow>
 
-                        <TableRow>
-                          <StackLayout Orientation="Horizontal" Spacing="4">
-                            <StackLayoutItem HorizontalAlignment="Left">
-                              <Scrollable x:Name="panMaleColor" Border="Bezel">
-                                <Label x:Name="lblMaleColor" Size="100, 26" TextAlignment="Center" VerticalAlignment="Center" Cursor="{x:Static Cursors.Pointer}" MouseDown="PanColor_Click" />
+                      <StackLayout Spacing="4">
+
+                        <GroupBox x:Name="grpTreeDecor">
+                          <TableLayout Style="paddedTable">
+
+                            <TableRow>
+                              <StackLayout Orientation="Horizontal" Spacing="4">
+                                <StackLayoutItem HorizontalAlignment="Left">
+                                  <Scrollable x:Name="panMaleColor" Border="Bezel">
+                                    <Label x:Name="lblMaleColor" Size="100, 26" TextAlignment="Center" VerticalAlignment="Center" Cursor="{x:Static Cursors.Pointer}" MouseDown="PanColor_Click" />
+                                  </Scrollable>
+                                </StackLayoutItem>
+                                <StackLayoutItem Expand="True" />
+                                <StackLayoutItem HorizontalAlignment="Right">
+                                  <Scrollable x:Name="panFemaleColor" Border="Bezel">
+                                    <Label x:Name="lblFemaleColor" Size="100, 26" TextAlignment="Center" VerticalAlignment="Center" Cursor="{x:Static Cursors.Pointer}" MouseDown="PanColor_Click" />
+                                  </Scrollable>
+                                </StackLayoutItem>
+                              </StackLayout>
+                            </TableRow>
+
+                            <TableRow>
+                              <Scrollable x:Name="panUnkSexColor" Border="Bezel">
+                                <Label x:Name="lblUnkSexColor" Size="210, 26" TextAlignment="Center" VerticalAlignment="Center" Cursor="{x:Static Cursors.Pointer}" MouseDown="PanColor_Click" />
                               </Scrollable>
-                            </StackLayoutItem>
-                            <StackLayoutItem Expand="True" />
-                            <StackLayoutItem HorizontalAlignment="Right">
-                              <Scrollable x:Name="panFemaleColor" Border="Bezel">
-                                <Label x:Name="lblFemaleColor" Size="100, 26" TextAlignment="Center" VerticalAlignment="Center" Cursor="{x:Static Cursors.Pointer}" MouseDown="PanColor_Click" />
+                            </TableRow>
+
+                            <TableRow>
+                              <Scrollable x:Name="panUnHusbandColor" Border="Bezel">
+                                <Label x:Name="lblUnHusbandColor" Size="210, 26" TextAlignment="Center" VerticalAlignment="Center" Cursor="{x:Static Cursors.Pointer}" MouseDown="PanColor_Click" />
                               </Scrollable>
-                            </StackLayoutItem>
-                          </StackLayout>
-                        </TableRow>
+                            </TableRow>
 
-                        <TableRow>
-                          <Scrollable x:Name="panUnkSexColor" Border="Bezel">
-                            <Label x:Name="lblUnkSexColor" Size="210, 26" TextAlignment="Center" VerticalAlignment="Center" Cursor="{x:Static Cursors.Pointer}" MouseDown="PanColor_Click" />
-                          </Scrollable>
-                        </TableRow>
+                            <TableRow>
+                              <Scrollable x:Name="panUnWifeColor" Border="Bezel">
+                                <Label x:Name="lblUnWifeColor" Size="210, 26" TextAlignment="Center" VerticalAlignment="Center" Cursor="{x:Static Cursors.Pointer}" MouseDown="PanColor_Click" />
+                              </Scrollable>
+                            </TableRow>
 
-                        <TableRow>
-                          <Scrollable x:Name="panUnHusbandColor" Border="Bezel">
-                            <Label x:Name="lblUnHusbandColor" Size="210, 26" TextAlignment="Center" VerticalAlignment="Center" Cursor="{x:Static Cursors.Pointer}" MouseDown="PanColor_Click" />
-                          </Scrollable>
-                        </TableRow>
+                            <TableRow>
+                              <StackLayout Orientation="Vertical">
+                                <Label x:Name="lblFont" />
+                                <Scrollable x:Name="panDefFont" Border="Bezel">
+                                  <Label x:Name="lblChartFont" Size="210, 26" TextAlignment="Center" VerticalAlignment="Center" Cursor="{x:Static Cursors.Pointer}" MouseDown="panDefFont_Click" />
+                                </Scrollable>
+                              </StackLayout>
+                            </TableRow>
 
-                        <TableRow>
-                          <Scrollable x:Name="panUnWifeColor" Border="Bezel">
-                            <Label x:Name="lblUnWifeColor" Size="210, 26" TextAlignment="Center" VerticalAlignment="Center" Cursor="{x:Static Cursors.Pointer}" MouseDown="PanColor_Click" />
-                          </Scrollable>
-                        </TableRow>
+                            <TableRow ScaleHeight="True" />
 
-                        <TableRow>
-                          <StackLayout Orientation="Vertical">
-                            <Label x:Name="lblFont" />
-                            <Scrollable x:Name="panDefFont" Border="Bezel">
-                              <Label x:Name="lblChartFont" Size="210, 26" TextAlignment="Center" VerticalAlignment="Center" Cursor="{x:Static Cursors.Pointer}" MouseDown="panDefFont_Click" />
-                            </Scrollable>
-                          </StackLayout>
-                        </TableRow>
+                          </TableLayout>
+                        </GroupBox>
 
-                        <TableRow ScaleHeight="True" />
+                      </StackLayout>
 
-                      </TableLayout>
-                    </GroupBox>
+                      <GroupBox x:Name="grpSpacings">
+                        <TableLayout Style="paddedTable">
 
-                    <GroupBox x:Name="grpSpacings">
-                      <TableLayout Style="paddedTable">
+                          <TableRow>
+                            <Label x:Name="lblMargins" />
+                            <NumericStepper x:Name="numMargins" MaxValue="120" MinValue="1" Width="60" Value="1" />
+                          </TableRow>
 
-                        <TableRow>
-                          <Label x:Name="lblMargins" />
-                          <NumericStepper x:Name="numMargins" MaxValue="120" MinValue="1" Width="60" Value="1" />
-                        </TableRow>
+                          <TableRow>
+                            <Label x:Name="lblBranchDist" />
+                            <NumericStepper x:Name="numBranchDist" MaxValue="120" MinValue="1" Width="60" Value="1" />
+                          </TableRow>
 
-                        <TableRow>
-                          <Label x:Name="lblBranchDist" />
-                          <NumericStepper x:Name="numBranchDist" MaxValue="120" MinValue="1" Width="60" Value="1" />
-                        </TableRow>
+                          <TableRow>
+                            <Label x:Name="lblGenDist" />
+                            <NumericStepper x:Name="numGenDist" MaxValue="120" MinValue="1" Width="60" Value="1" />
+                          </TableRow>
 
-                        <TableRow>
-                          <Label x:Name="lblGenDist" />
-                          <NumericStepper x:Name="numGenDist" MaxValue="120" MinValue="1" Width="60" Value="1" />
-                        </TableRow>
+                          <TableRow>
+                            <Label x:Name="lblSpouseDist" />
+                            <NumericStepper x:Name="numSpouseDist" MaxValue="120" MinValue="1" Width="60" Value="1" />
+                          </TableRow>
 
-                        <TableRow>
-                          <Label x:Name="lblSpouseDist" />
-                          <NumericStepper x:Name="numSpouseDist" MaxValue="120" MinValue="1" Width="60" Value="1" />
-                        </TableRow>
+                          <TableRow ScaleHeight="True" />
 
-                        <TableRow ScaleHeight="True" />
+                        </TableLayout>
+                      </GroupBox>
 
-                      </TableLayout>
-                    </GroupBox>
+                    </TableRow>
 
-                    <TableLayout Style="paddedTable">
+                    <TableRow>
+                      <StackLayout Spacing="4">
+                        <CheckBox x:Name="chkUseExtraControls" />
 
-                      <TableRow>
-                        <CheckBox x:Name="chkSeparateDepth" CheckedChanged="chkSeparateDepth_CheckedChanged" />
-                      </TableRow>
+                        <StackLayout Orientation="Horizontal" Spacing="4">
+                          <Label x:Name="lblTextEffect" />
+                          <ComboBox x:Name="cmbTextEffect" Width="200" ReadOnly="True" />
+                        </StackLayout>
+                      </StackLayout>
+                      
+                      <StackLayout Spacing="4">
+                        <TableLayout Style="paddedTable">
 
-                      <TableRow>
-                        <Label x:Name="lblDefaultDepth" />
-                        <NumericStepper x:Name="numDefaultDepth" MaxValue="9" MinValue="-1" Width="60" Value="-1" />
-                      </TableRow>
+                          <TableRow>
+                            <CheckBox x:Name="chkSeparateDepth" CheckedChanged="chkSeparateDepth_CheckedChanged" />
+                          </TableRow>
 
-                      <TableRow>
-                        <Label x:Name="lblDefaultDepthAncestors" />
-                        <NumericStepper x:Name="numDefaultDepthAncestors" MaxValue="9" MinValue="-1" Width="60" Value="-1" />
-                      </TableRow>
+                          <TableRow>
+                            <Label x:Name="lblDefaultDepth" />
+                            <NumericStepper x:Name="numDefaultDepth" MaxValue="9" MinValue="-1" Width="60" Value="-1" />
+                          </TableRow>
 
-                      <TableRow>
-                        <Label x:Name="lblDefaultDepthDescendants" />
-                        <NumericStepper x:Name="numDefaultDepthDescendants" MaxValue="9" MinValue="-1" Width="60" Value="-1" />
-                      </TableRow>
+                          <TableRow>
+                            <Label x:Name="lblDefaultDepthAncestors" />
+                            <NumericStepper x:Name="numDefaultDepthAncestors" MaxValue="9" MinValue="-1" Width="60" Value="-1" />
+                          </TableRow>
 
-                      <TableRow ScaleHeight="True" />
+                          <TableRow>
+                            <Label x:Name="lblDefaultDepthDescendants" />
+                            <NumericStepper x:Name="numDefaultDepthDescendants" MaxValue="9" MinValue="-1" Width="60" Value="-1" />
+                          </TableRow>
 
-                    </TableLayout>
+                          <TableRow ScaleHeight="True" />
 
-                    <CheckBox x:Name="chkUseExtraControls" />
+                        </TableLayout>
 
-                  </StackLayout>
+                      </StackLayout>
+                    </TableRow>
 
-                </TableRow>
+                  </TableLayout>
+                </TabPage>
+
+              </TabControl>
 
-              </TableLayout>
             </TabPage>
 
             <TabPage x:Name="pageAncCircle">
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/OptionsDlg.xaml b/projects/GKvX/GEDKeeperX/GKUI/Forms/OptionsDlg.xaml
index e02bf80bd..8f88448f9 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/OptionsDlg.xaml
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/OptionsDlg.xaml
@@ -119,139 +119,158 @@
                     <xp:TabViewControl x:Name="tabsCharts">
                         <xp:TabViewControl.ItemSource>
                             <xp:TabItem x:Name="pageTreeChart">
-                                <StackLayout Orientation="Horizontal" Spacing="8">
-
-                                    <comcom:GroupBox x:Name="grpTreePersons">
-                                        <ScrollView>
-                                            <StackLayout Orientation="Vertical">
-
-                                                <input:CheckBox x:Name="chkSurname" CheckChanged="chkTreeChartOption_CheckedChanged" />
-                                                <StackLayout Orientation="Horizontal" Spacing="20">
-                                                    <Label HorizontalOptions="Start" Text="" />
-                                                    <input:CheckBox x:Name="chkTreeSurnameFirst" CheckChanged="chkTreeChartOption_CheckedChanged" />
-                                                </StackLayout>
-                                                <input:CheckBox x:Name="chkName" CheckChanged="chkTreeChartOption_CheckedChanged" />
-                                                <input:CheckBox x:Name="chkPatronymic" CheckChanged="chkTreeChartOption_CheckedChanged" />
-                                                <StackLayout Orientation="Horizontal" Spacing="20">
-                                                    <Label HorizontalOptions="Start" Text="" />
-                                                    <input:CheckBox x:Name="chkDiffLines" CheckChanged="chkTreeChartOption_CheckedChanged" />
-                                                </StackLayout>
-                                                <input:CheckBox x:Name="chkBirthDate" CheckChanged="chkTreeChartOption_CheckedChanged" />
-                                                <input:CheckBox x:Name="chkDeathDate" CheckChanged="chkTreeChartOption_CheckedChanged" />
-                                                <StackLayout Orientation="Horizontal" Spacing="20">
-                                                    <Label HorizontalOptions="Start" Text="" />
-                                                    <input:CheckBox x:Name="chkOnlyYears" CheckChanged="chkTreeChartOption_CheckedChanged" />
-                                                </StackLayout>
-                                                <StackLayout Orientation="Horizontal" Spacing="20">
-                                                    <Label HorizontalOptions="Start" Text="" />
-                                                    <input:CheckBox x:Name="chkShowAge" CheckChanged="chkTreeChartOption_CheckedChanged" />
-                                                </StackLayout>
-                                                <input:CheckBox x:Name="chkMarriagesDates" CheckChanged="chkTreeChartOption_CheckedChanged" />
-                                                <input:CheckBox x:Name="chkKinship" CheckChanged="chkTreeChartOption_CheckedChanged" />
-                                                <input:CheckBox x:Name="chkSignsVisible" CheckChanged="chkTreeChartOption_CheckedChanged" />
-                                                <input:CheckBox x:Name="chkTreeDecorative" CheckChanged="chkTreeChartOption_CheckedChanged" />
-                                                <input:CheckBox x:Name="chkPortraitsVisible" CheckChanged="chkTreeChartOption_CheckedChanged" />
-                                                <input:CheckBox x:Name="chkDefaultPortraits" CheckChanged="chkTreeChartOption_CheckedChanged" />
-                                                <input:CheckBox x:Name="chkInvertedTree" CheckChanged="chkTreeChartOption_CheckedChanged" />
-                                                <input:CheckBox x:Name="chkChildlessExclude" CheckChanged="chkTreeChartOption_CheckedChanged" />
-                                                <input:CheckBox x:Name="chkShowPlaces" CheckChanged="chkTreeChartOption_CheckedChanged" />
-                                                <StackLayout Orientation="Horizontal" Spacing="20">
-                                                    <Label HorizontalOptions="Start" Text="" />
-                                                    <input:CheckBox x:Name="chkSeparateDAPLines" CheckChanged="chkTreeChartOption_CheckedChanged" />
-                                                </StackLayout>
-                                                <StackLayout Orientation="Horizontal" Spacing="20">
-                                                    <Label HorizontalOptions="Start" Text="" />
-                                                    <input:CheckBox x:Name="chkOnlyLocality" CheckChanged="chkTreeChartOption_CheckedChanged" />
-                                                </StackLayout>
-                                                <input:CheckBox x:Name="chkHideUnknownSpouses" CheckChanged="chkTreeChartOption_CheckedChanged" />
-                                                <input:CheckBox x:Name="chkCheckTreeSize" CheckChanged="chkTreeChartOption_CheckedChanged" />
-                                                <input:CheckBox x:Name="chkDottedLinesOfAdoptedChildren" CheckChanged="chkTreeChartOption_CheckedChanged" />
-                                                <input:CheckBox x:Name="chkDottedLinesOfDivorcedSpouses" CheckChanged="chkTreeChartOption_CheckedChanged" />
-                                                <input:CheckBox x:Name="chkBoldNames" CheckChanged="chkTreeChartOption_CheckedChanged" />
-                                                <input:CheckBox x:Name="chkMinimizingWidth" CheckChanged="chkTreeChartOption_CheckedChanged" />
-                                                <input:CheckBox x:Name="chkURNotesVisible" CheckChanged="chkTreeChartOption_CheckedChanged" />
-                                                <input:CheckBox x:Name="chkSameCardsWidth" CheckChanged="chkTreeChartOption_CheckedChanged" />
-                                                <input:CheckBox x:Name="chkUseInlineImagesInSvg" />
-                                                <input:CheckBox x:Name="chkExtendedTree" />
-                                                <input:CheckBox x:Name="chkFullNameOnOneLine" CheckChanged="chkTreeChartOption_CheckedChanged" />
-
-                                                <Label VerticalOptions="FillAndExpand" />
-
-                                            </StackLayout>
-                                        </ScrollView>
-                                    </comcom:GroupBox>
-
-                                    <StackLayout Spacing="4">
-
-                                        <comcom:GroupBox x:Name="grpTreeDecor">
-                                            <Grid ColumnSpacing="4" RowSpacing="4">
-
-                                                <Frame Style="{StaticResource ColorBox}" x:Name="panMaleColor" Grid.Column="0" Grid.Row="0">
-                                                    <Label x:Name="lblMaleColor" Style="{StaticResource ColorLbl}" />
-                                                </Frame>
-                                                <Frame Style="{StaticResource ColorBox}" x:Name="panFemaleColor" Grid.Column="1" Grid.Row="0">
-                                                    <Label x:Name="lblFemaleColor" Style="{StaticResource ColorLbl}" />
-                                                </Frame>
-
-                                                <Frame Style="{StaticResource ColorBox}" x:Name="panUnkSexColor" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2">
-                                                    <Label x:Name="lblUnkSexColor" Style="{StaticResource ColorLbl}" />
-                                                </Frame>
-
-                                                <Frame Style="{StaticResource ColorBox}" x:Name="panUnHusbandColor" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2">
-                                                    <Label x:Name="lblUnHusbandColor" Style="{StaticResource ColorLbl}" />
-                                                </Frame>
-
-                                                <Frame Style="{StaticResource ColorBox}" x:Name="panUnWifeColor" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="2">
-                                                    <Label x:Name="lblUnWifeColor" Style="{StaticResource ColorLbl}" />
-                                                </Frame>
-
-                                                <Frame Style="{StaticResource ColorBox}" x:Name="panDefFont" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="2">
-                                                    <Label x:Name="lblChartFont" Style="{StaticResource ColorLbl}" />
-                                                </Frame>
-
-                                            </Grid>
-                                        </comcom:GroupBox>
-
-                                        <comcom:GroupBox x:Name="grpSpacings">
-                                            <Grid ColumnSpacing="4" RowSpacing="4">
-
-                                                <Label x:Name="lblMargins" Grid.Column="0" Grid.Row="0" />
-                                                <comcom:NumericStepper x:Name="numMargins" MaxValue="120" MinValue="1" WidthRequest="60" Value="1" Grid.Column="1" Grid.Row="0" />
-
-                                                <Label x:Name="lblBranchDist" Grid.Column="0" Grid.Row="1" />
-                                                <comcom:NumericStepper x:Name="numBranchDist" MaxValue="120" MinValue="1" WidthRequest="60" Value="1" Grid.Column="1" Grid.Row="1" />
 
-                                                <Label x:Name="lblGenDist" Grid.Column="0" Grid.Row="2" />
-                                                <comcom:NumericStepper x:Name="numGenDist" MaxValue="120" MinValue="1" WidthRequest="60" Value="1" Grid.Column="1" Grid.Row="2" />
-
-                                                <Label x:Name="lblSpouseDist" Grid.Column="0" Grid.Row="3" />
-                                                <comcom:NumericStepper x:Name="numSpouseDist" MaxValue="120" MinValue="1" WidthRequest="60" Value="1" Grid.Column="1" Grid.Row="3" />
-
-                                            </Grid>
-                                        </comcom:GroupBox>
+                                <xp:TabViewControl x:Name="tabsTreeCharts">
+                                    <xp:TabViewControl.ItemSource>
+
+                                        <xp:TabItem x:Name="pageTreePersons">
+                                            <comcom:GroupBox x:Name="grpTreePersons">
+                                                <ScrollView>
+                                                    <StackLayout Orientation="Vertical">
+
+                                                        <input:CheckBox x:Name="chkSurname" CheckChanged="chkTreeChartOption_CheckedChanged" />
+                                                        <StackLayout Orientation="Horizontal" Spacing="20">
+                                                            <Label HorizontalOptions="Start" Text="" />
+                                                            <input:CheckBox x:Name="chkTreeSurnameFirst" CheckChanged="chkTreeChartOption_CheckedChanged" />
+                                                        </StackLayout>
+                                                        <input:CheckBox x:Name="chkName" CheckChanged="chkTreeChartOption_CheckedChanged" />
+                                                        <input:CheckBox x:Name="chkPatronymic" CheckChanged="chkTreeChartOption_CheckedChanged" />
+                                                        <StackLayout Orientation="Horizontal" Spacing="20">
+                                                            <Label HorizontalOptions="Start" Text="" />
+                                                            <input:CheckBox x:Name="chkDiffLines" CheckChanged="chkTreeChartOption_CheckedChanged" />
+                                                        </StackLayout>
+                                                        <input:CheckBox x:Name="chkBirthDate" CheckChanged="chkTreeChartOption_CheckedChanged" />
+                                                        <input:CheckBox x:Name="chkDeathDate" CheckChanged="chkTreeChartOption_CheckedChanged" />
+                                                        <StackLayout Orientation="Horizontal" Spacing="20">
+                                                            <Label HorizontalOptions="Start" Text="" />
+                                                            <input:CheckBox x:Name="chkOnlyYears" CheckChanged="chkTreeChartOption_CheckedChanged" />
+                                                        </StackLayout>
+                                                        <StackLayout Orientation="Horizontal" Spacing="20">
+                                                            <Label HorizontalOptions="Start" Text="" />
+                                                            <input:CheckBox x:Name="chkShowAge" CheckChanged="chkTreeChartOption_CheckedChanged" />
+                                                        </StackLayout>
+                                                        <input:CheckBox x:Name="chkMarriagesDates" CheckChanged="chkTreeChartOption_CheckedChanged" />
+                                                        <input:CheckBox x:Name="chkKinship" CheckChanged="chkTreeChartOption_CheckedChanged" />
+                                                        <input:CheckBox x:Name="chkSignsVisible" CheckChanged="chkTreeChartOption_CheckedChanged" />
+                                                        <input:CheckBox x:Name="chkTreeDecorative" CheckChanged="chkTreeChartOption_CheckedChanged" />
+                                                        <input:CheckBox x:Name="chkPortraitsVisible" CheckChanged="chkTreeChartOption_CheckedChanged" />
+                                                        <input:CheckBox x:Name="chkDefaultPortraits" CheckChanged="chkTreeChartOption_CheckedChanged" />
+                                                        <input:CheckBox x:Name="chkInvertedTree" CheckChanged="chkTreeChartOption_CheckedChanged" />
+                                                        <input:CheckBox x:Name="chkChildlessExclude" CheckChanged="chkTreeChartOption_CheckedChanged" />
+                                                        <input:CheckBox x:Name="chkShowPlaces" CheckChanged="chkTreeChartOption_CheckedChanged" />
+                                                        <StackLayout Orientation="Horizontal" Spacing="20">
+                                                            <Label HorizontalOptions="Start" Text="" />
+                                                            <input:CheckBox x:Name="chkSeparateDAPLines" CheckChanged="chkTreeChartOption_CheckedChanged" />
+                                                        </StackLayout>
+                                                        <StackLayout Orientation="Horizontal" Spacing="20">
+                                                            <Label HorizontalOptions="Start" Text="" />
+                                                            <input:CheckBox x:Name="chkOnlyLocality" CheckChanged="chkTreeChartOption_CheckedChanged" />
+                                                        </StackLayout>
+                                                        <input:CheckBox x:Name="chkHideUnknownSpouses" CheckChanged="chkTreeChartOption_CheckedChanged" />
+                                                        <input:CheckBox x:Name="chkCheckTreeSize" CheckChanged="chkTreeChartOption_CheckedChanged" />
+                                                        <input:CheckBox x:Name="chkDottedLinesOfAdoptedChildren" CheckChanged="chkTreeChartOption_CheckedChanged" />
+                                                        <input:CheckBox x:Name="chkDottedLinesOfDivorcedSpouses" CheckChanged="chkTreeChartOption_CheckedChanged" />
+                                                        <input:CheckBox x:Name="chkBoldNames" CheckChanged="chkTreeChartOption_CheckedChanged" />
+                                                        <input:CheckBox x:Name="chkMinimizingWidth" CheckChanged="chkTreeChartOption_CheckedChanged" />
+                                                        <input:CheckBox x:Name="chkURNotesVisible" CheckChanged="chkTreeChartOption_CheckedChanged" />
+                                                        <input:CheckBox x:Name="chkSameCardsWidth" CheckChanged="chkTreeChartOption_CheckedChanged" />
+                                                        <input:CheckBox x:Name="chkUseInlineImagesInSvg" />
+                                                        <input:CheckBox x:Name="chkExtendedTree" />
+                                                        <input:CheckBox x:Name="chkFullNameOnOneLine" CheckChanged="chkTreeChartOption_CheckedChanged" />
+
+                                                        <Label VerticalOptions="FillAndExpand" />
+
+                                                    </StackLayout>
+                                                </ScrollView>
+                                            </comcom:GroupBox>
+                                        </xp:TabItem>
+
+                                        <xp:TabItem x:Name="pageTreeDesign">
+                                            <StackLayout Spacing="4">
+
+                                                <Grid ColumnSpacing="4" RowSpacing="4">
+
+                                                    <comcom:GroupBox x:Name="grpTreeDecor" Grid.Column="0" Grid.Row="0">
+                                                        <Grid ColumnSpacing="4" RowSpacing="4">
+
+                                                            <Frame Style="{StaticResource ColorBox}" x:Name="panMaleColor" Grid.Column="0" Grid.Row="0">
+                                                                <Label x:Name="lblMaleColor" Style="{StaticResource ColorLbl}" />
+                                                            </Frame>
+                                                            <Frame Style="{StaticResource ColorBox}" x:Name="panFemaleColor" Grid.Column="1" Grid.Row="0">
+                                                                <Label x:Name="lblFemaleColor" Style="{StaticResource ColorLbl}" />
+                                                            </Frame>
+
+                                                            <Frame Style="{StaticResource ColorBox}" x:Name="panUnkSexColor" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2">
+                                                                <Label x:Name="lblUnkSexColor" Style="{StaticResource ColorLbl}" />
+                                                            </Frame>
+
+                                                            <Frame Style="{StaticResource ColorBox}" x:Name="panUnHusbandColor" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2">
+                                                                <Label x:Name="lblUnHusbandColor" Style="{StaticResource ColorLbl}" />
+                                                            </Frame>
+
+                                                            <Frame Style="{StaticResource ColorBox}" x:Name="panUnWifeColor" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="2">
+                                                                <Label x:Name="lblUnWifeColor" Style="{StaticResource ColorLbl}" />
+                                                            </Frame>
+
+                                                            <Frame Style="{StaticResource ColorBox}" x:Name="panDefFont" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="2">
+                                                                <Label x:Name="lblChartFont" Style="{StaticResource ColorLbl}" />
+                                                            </Frame>
+
+                                                        </Grid>
+                                                    </comcom:GroupBox>
+
+                                                    <comcom:GroupBox x:Name="grpSpacings" Grid.Column="1" Grid.Row="0">
+                                                        <Grid ColumnSpacing="4" RowSpacing="4">
+
+                                                            <Label x:Name="lblMargins" Grid.Column="0" Grid.Row="0" />
+                                                            <comcom:NumericStepper x:Name="numMargins" MaxValue="120" MinValue="1" WidthRequest="60" Value="1" Grid.Column="1" Grid.Row="0" />
+
+                                                            <Label x:Name="lblBranchDist" Grid.Column="0" Grid.Row="1" />
+                                                            <comcom:NumericStepper x:Name="numBranchDist" MaxValue="120" MinValue="1" WidthRequest="60" Value="1" Grid.Column="1" Grid.Row="1" />
+
+                                                            <Label x:Name="lblGenDist" Grid.Column="0" Grid.Row="2" />
+                                                            <comcom:NumericStepper x:Name="numGenDist" MaxValue="120" MinValue="1" WidthRequest="60" Value="1" Grid.Column="1" Grid.Row="2" />
+
+                                                            <Label x:Name="lblSpouseDist" Grid.Column="0" Grid.Row="3" />
+                                                            <comcom:NumericStepper x:Name="numSpouseDist" MaxValue="120" MinValue="1" WidthRequest="60" Value="1" Grid.Column="1" Grid.Row="3" />
+
+                                                        </Grid>
+                                                    </comcom:GroupBox>
+
+                                                    <StackLayout Spacing="4" Grid.Column="0" Grid.Row="1">
+                                                        <input:CheckBox x:Name="chkUseExtraControls" />
+
+                                                        <StackLayout Orientation="Horizontal" Spacing="4">
+                                                            <Label x:Name="lblTextEffect" />
+                                                            <comcom:GKComboBox x:Name="cmbTextEffect" WidthRequest="200" />
+                                                        </StackLayout>
+
+                                                        <Label VerticalOptions="FillAndExpand" />
+                                                    </StackLayout>
+
+                                                    <Grid ColumnSpacing="4" RowSpacing="4" Grid.Column="1" Grid.Row="1">
+
+                                                        <input:CheckBox x:Name="chkSeparateDepth" CheckChanged="chkSeparateDepth_CheckedChanged" Grid.Column="0" Grid.Row="0" />
 
-                                        <Grid ColumnSpacing="4" RowSpacing="4">
+                                                        <Label x:Name="lblDefaultDepth" Grid.Column="0" Grid.Row="1" />
+                                                        <comcom:NumericStepper x:Name="numDefaultDepth" MaxValue="9" MinValue="-1" WidthRequest="60" Value="-1" Grid.Column="1" Grid.Row="1" />
 
-                                            <input:CheckBox x:Name="chkSeparateDepth" CheckChanged="chkSeparateDepth_CheckedChanged" Grid.Column="0" Grid.Row="0" />
+                                                        <Label x:Name="lblDefaultDepthAncestors" Grid.Column="0" Grid.Row="2" />
+                                                        <comcom:NumericStepper x:Name="numDefaultDepthAncestors" MaxValue="9" MinValue="-1" WidthRequest="60" Value="-1" Grid.Column="1" Grid.Row="2" />
 
-                                            <Label x:Name="lblDefaultDepth" Grid.Column="0" Grid.Row="1" />
-                                            <comcom:NumericStepper x:Name="numDefaultDepth" MaxValue="9" MinValue="-1" WidthRequest="60" Value="-1" Grid.Column="1" Grid.Row="1" />
+                                                        <Label x:Name="lblDefaultDepthDescendants" Grid.Column="0" Grid.Row="3" />
+                                                        <comcom:NumericStepper x:Name="numDefaultDepthDescendants" MaxValue="9" MinValue="-1" WidthRequest="60" Value="-1" Grid.Column="1" Grid.Row="3" />
 
-                                            <Label x:Name="lblDefaultDepthAncestors" Grid.Column="0" Grid.Row="2" />
-                                            <comcom:NumericStepper x:Name="numDefaultDepthAncestors" MaxValue="9" MinValue="-1" WidthRequest="60" Value="-1" Grid.Column="1" Grid.Row="2" />
+                                                    </Grid>
 
-                                            <Label x:Name="lblDefaultDepthDescendants" Grid.Column="0" Grid.Row="3" />
-                                            <comcom:NumericStepper x:Name="numDefaultDepthDescendants" MaxValue="9" MinValue="-1" WidthRequest="60" Value="-1" Grid.Column="1" Grid.Row="3" />
+                                                </Grid>
 
-                                        </Grid>
-
-                                        <input:CheckBox x:Name="chkUseExtraControls" />
-
-                                        <Label VerticalOptions="FillAndExpand" />
+                                            </StackLayout>
+                                        </xp:TabItem>
 
-                                    </StackLayout>
+                                    </xp:TabViewControl.ItemSource>
+                                </xp:TabViewControl>
 
-                                </StackLayout>
                             </xp:TabItem>
 
                             <xp:TabItem x:Name="pageAncCircle">