From dcc134dc466e5c1e34dcbe69dd7f8881eae57c69 Mon Sep 17 00:00:00 2001
From: "Sergey V. Zhdanovskih" <serg.zhdanovskih@yandex.ru>
Date: Mon, 17 Jun 2024 22:24:17 +0300
Subject: [PATCH] Added custom event types, the feature to turn off events and
 add custom ones (fix #566)

---
 locales/Afrikaans.lng                         |  14 +-
 locales/Belarusian.lng                        |  14 +-
 locales/Chinese Simplified.lng                |  14 +-
 locales/Dutch.lng                             |  14 +-
 locales/English.lng                           |  14 +-
 locales/Hungarian.lng                         |  14 +-
 locales/Icelandic.lng                         |  14 +-
 locales/Japanese.lng                          |  14 +-
 locales/Kazakh (Cyrillic).lng                 |  14 +-
 locales/Portuguese.lng                        |  14 +-
 locales/Serbian (Latin).lng                   |  14 +-
 locales/Spanish.lng                           |  14 +-
 locales/czech.lng                             |  14 +-
 locales/french.lng                            |  14 +-
 locales/german.lng                            |  14 +-
 locales/help_enu/gkhHistory.html              |   1 +
 locales/help_rus/gkhHistory.html              |   1 +
 locales/italian.lng                           |  14 +-
 locales/polish.lng                            |  14 +-
 locales/russian.lng                           |  14 +-
 locales/ukrainian.lng                         |  14 +-
 projects/GKCore/GDModel/GDMFamilyRecord.cs    |   4 +-
 projects/GKCore/GDModel/GDMGroupRecord.cs     |   4 +-
 .../GKCore/GDModel/GDMIndividualRecord.cs     |   4 +-
 projects/GKCore/GDModel/GDMInterfaces.cs      |  21 ++
 projects/GKCore/GDModel/GDMList.cs            |  25 +-
 projects/GKCore/GDModel/GDMResearchRecord.cs  |   6 +-
 projects/GKCore/GDModel/GDMSourceRecord.cs    |   2 +-
 projects/GKCore/GDModel/GDMTag.cs             |   2 +-
 projects/GKCore/GDModel/GDMTree.cs            |  18 +-
 .../GDModel/Providers/GEDCOM/GEDCOMChecker.cs |  21 +-
 .../GDModel/Providers/GEDCOM/GEDCOMUtils.cs   |   2 +-
 projects/GKCore/GKCore.csproj                 |   6 +-
 projects/GKCore/GKCore/AppHost.cs             |  39 ++-
 projects/GKCore/GKCore/BaseContext.cs         |  10 +-
 .../GKCore/GKCore/Charts/TreeChartModel.cs    |   4 +-
 .../Controllers/AddressEditDlgController.cs   |   6 +-
 .../GKCore/Controllers/BaseController.cs      |  31 +++
 .../Controllers/EventDefEditDlgController.cs  | 115 ++++++++
 .../Controllers/EventEditDlgController.cs     |  92 +++----
 .../FilePropertiesDlgController.cs            |   5 +-
 .../Controllers/NameEditDlgController.cs      |   3 +-
 .../Controllers/OptionsDlgController.cs       |  27 +-
 .../Views/IEventDefEditDlg.cs}                |  18 +-
 .../GKCore/Design/Views/IEventEditDlg.cs      |   3 +-
 .../GKCore/GKCore/Design/Views/IOptionsDlg.cs |   5 +-
 projects/GKCore/GKCore/EventDefinitions.cs    | 251 ++++++++++++++++++
 projects/GKCore/GKCore/GKData.cs              | 152 +++++------
 projects/GKCore/GKCore/GKUtils.cs             |  59 +---
 projects/GKCore/GKCore/LangMan.cs             |  28 +-
 .../GKCore/GKCore/Lists/EventDefsListModel.cs | 138 ++++++++++
 projects/GKCore/GKCore/Lists/ListSource.cs    |   6 +-
 projects/GKCore/GKCore/Lists/SheetModel.cs    |  11 +-
 .../GKCore/Operations/OrdinaryOperation.cs    |   4 +-
 projects/GKCore/GKCore/ScriptEngine.cs        |   4 +-
 projects/GKCore/GKCore/Tools/TreeInspector.cs |  18 +-
 .../GKCore/GKCore/Types/PredefinedEvent.cs    |  55 ++++
 projects/GKTests/GDModel/GDMListTests.cs      |   4 +-
 .../GKTests/GDModel/GDMPersonalNameTests.cs   |   2 +-
 projects/GKTests/GKCore/ControllerTests.cs    |   2 +-
 projects/GKTests/GKCore/GKUtilsTests.cs       |   7 -
 .../GKTests/GKCore/ValuesCollectionTests.cs   |   2 +-
 projects/GKv2/GEDKeeper2/GEDKeeper2.csproj    |   6 +
 .../GKUI/Forms/EventDefEditDlg.Designer.cs    | 161 +++++++++++
 .../GEDKeeper2/GKUI/Forms/EventDefEditDlg.cs  |  84 ++++++
 .../GKUI/Forms/EventEditDlg.Designer.cs       |  10 -
 .../GEDKeeper2/GKUI/Forms/EventEditDlg.cs     |   5 -
 .../GKUI/Forms/OptionsDlg.Designer.cs         |  30 ++-
 .../GKv2/GEDKeeper2/GKUI/Forms/OptionsDlg.cs  |  30 ++-
 .../GEDKeeper2/GKUI/Platform/WFAppHost.cs     |   1 +
 .../GKComponents/TreeChartBoxTests.cs         |   4 +-
 projects/GKv2/GKTestsUI2/TestUtilsUI.cs       |   3 +-
 .../GKv2/GKTestsUI2/UITests/MainSDITests.cs   |   2 +-
 .../GEDKeeper3/GKUI/Forms/EventDefEditDlg.cs  |  99 +++++++
 .../GKUI/Forms/EventDefEditDlg.xeto           |  49 ++++
 .../GEDKeeper3/GKUI/Forms/EventEditDlg.cs     |   6 -
 .../GEDKeeper3/GKUI/Forms/EventEditDlg.xeto   |   1 -
 .../GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.cs  |  26 ++
 .../GEDKeeper3/GKUI/Forms/OptionsDlg.xeto     |   4 +
 .../GEDKeeper3/GKUI/Platform/EtoAppHost.cs    |   1 +
 .../GKUI/Forms/EventDefEditDlg.xaml           |  54 ++++
 .../GKUI/Forms/EventDefEditDlg.xaml.cs        |  72 +++++
 .../GEDKeeperX/GKUI/Forms/EventEditDlg.xaml   |   1 -
 .../GKUI/Forms/EventEditDlg.xaml.cs           |   5 -
 .../GEDKeeperX/GKUI/Forms/OptionsDlg.xaml     |   4 +
 .../GEDKeeperX/GKUI/Forms/OptionsDlg.xaml.cs  |  11 +
 .../GEDKeeperX/GKUI/Platform/XFAppHost.cs     |   1 +
 87 files changed, 1684 insertions(+), 470 deletions(-)
 create mode 100644 projects/GKCore/GKCore/Controllers/EventDefEditDlgController.cs
 rename projects/GKCore/GKCore/{Types/PersonEventKind.cs => Design/Views/IEventDefEditDlg.cs} (63%)
 create mode 100644 projects/GKCore/GKCore/EventDefinitions.cs
 create mode 100644 projects/GKCore/GKCore/Lists/EventDefsListModel.cs
 create mode 100644 projects/GKCore/GKCore/Types/PredefinedEvent.cs
 create mode 100644 projects/GKv2/GEDKeeper2/GKUI/Forms/EventDefEditDlg.Designer.cs
 create mode 100644 projects/GKv2/GEDKeeper2/GKUI/Forms/EventDefEditDlg.cs
 create mode 100644 projects/GKv3/GEDKeeper3/GKUI/Forms/EventDefEditDlg.cs
 create mode 100644 projects/GKv3/GEDKeeper3/GKUI/Forms/EventDefEditDlg.xeto
 create mode 100644 projects/GKvX/GEDKeeperX/GKUI/Forms/EventDefEditDlg.xaml
 create mode 100644 projects/GKvX/GEDKeeperX/GKUI/Forms/EventDefEditDlg.xaml.cs

diff --git a/locales/Afrikaans.lng b/locales/Afrikaans.lng
index a2ad27fd0..ba74576d5 100644
--- a/locales/Afrikaans.lng
+++ b/locales/Afrikaans.lng
@@ -970,13 +970,13 @@
 960=Source without links
 961=Check links
 
-962=<?>
-963=<?>
-964=<?>
-965=<?>
-966=<?>
-967=<?>
-968=<?>
+962=Event types
+963=Count
+964=Enabled
+965=Tag
+966=Description
+967=For custom events and facts, the type must be entered
+968=Event Definition
 969=<?>
 970=<?>
 
diff --git a/locales/Belarusian.lng b/locales/Belarusian.lng
index adc3403a4..a007ff9a9 100644
--- a/locales/Belarusian.lng
+++ b/locales/Belarusian.lng
@@ -970,13 +970,13 @@
 960=Source without links
 961=Check links
 
-962=<?>
-963=<?>
-964=<?>
-965=<?>
-966=<?>
-967=<?>
-968=<?>
+962=Event types
+963=Count
+964=Enabled
+965=Tag
+966=Description
+967=For custom events and facts, the type must be entered
+968=Event Definition
 969=<?>
 970=<?>
 
diff --git a/locales/Chinese Simplified.lng b/locales/Chinese Simplified.lng
index 826a007d7..2cbafb923 100644
--- a/locales/Chinese Simplified.lng	
+++ b/locales/Chinese Simplified.lng	
@@ -970,13 +970,13 @@
 960=Source without links
 961=Check links
 
-962=<?>
-963=<?>
-964=<?>
-965=<?>
-966=<?>
-967=<?>
-968=<?>
+962=Event types
+963=Count
+964=Enabled
+965=Tag
+966=Description
+967=For custom events and facts, the type must be entered
+968=Event Definition
 969=<?>
 970=<?>
 
diff --git a/locales/Dutch.lng b/locales/Dutch.lng
index 6ab834973..1acbd5782 100644
--- a/locales/Dutch.lng
+++ b/locales/Dutch.lng
@@ -970,13 +970,13 @@
 960=Source without links
 961=Check links
 
-962=<?>
-963=<?>
-964=<?>
-965=<?>
-966=<?>
-967=<?>
-968=<?>
+962=Event types
+963=Count
+964=Enabled
+965=Tag
+966=Description
+967=For custom events and facts, the type must be entered
+968=Event Definition
 969=<?>
 970=<?>
 
diff --git a/locales/English.lng b/locales/English.lng
index 302e0861d..ab9660a18 100644
--- a/locales/English.lng
+++ b/locales/English.lng
@@ -970,13 +970,13 @@
 960=Source without links
 961=Check links
 
-962=<?>
-963=<?>
-964=<?>
-965=<?>
-966=<?>
-967=<?>
-968=<?>
+962=Event types
+963=Count
+964=Enabled
+965=Tag
+966=Description
+967=For custom events and facts, the type must be entered
+968=Event Definition
 969=<?>
 970=<?>
 
diff --git a/locales/Hungarian.lng b/locales/Hungarian.lng
index 41f7b20e0..96d01d133 100644
--- a/locales/Hungarian.lng
+++ b/locales/Hungarian.lng
@@ -970,13 +970,13 @@
 960=Source without links
 961=Check links
 
-962=<?>
-963=<?>
-964=<?>
-965=<?>
-966=<?>
-967=<?>
-968=<?>
+962=Event types
+963=Count
+964=Enabled
+965=Tag
+966=Description
+967=For custom events and facts, the type must be entered
+968=Event Definition
 969=<?>
 970=<?>
 
diff --git a/locales/Icelandic.lng b/locales/Icelandic.lng
index f2e594905..734d6f2cd 100644
--- a/locales/Icelandic.lng
+++ b/locales/Icelandic.lng
@@ -970,13 +970,13 @@
 960=Source without links
 961=Check links
 
-962=<?>
-963=<?>
-964=<?>
-965=<?>
-966=<?>
-967=<?>
-968=<?>
+962=Event types
+963=Count
+964=Enabled
+965=Tag
+966=Description
+967=For custom events and facts, the type must be entered
+968=Event Definition
 969=<?>
 970=<?>
 
diff --git a/locales/Japanese.lng b/locales/Japanese.lng
index 7242b9eb5..b2749d9fe 100644
--- a/locales/Japanese.lng
+++ b/locales/Japanese.lng
@@ -970,13 +970,13 @@
 960=Source without links
 961=Check links
 
-962=<?>
-963=<?>
-964=<?>
-965=<?>
-966=<?>
-967=<?>
-968=<?>
+962=Event types
+963=Count
+964=Enabled
+965=Tag
+966=Description
+967=For custom events and facts, the type must be entered
+968=Event Definition
 969=<?>
 970=<?>
 
diff --git a/locales/Kazakh (Cyrillic).lng b/locales/Kazakh (Cyrillic).lng
index a47a760d3..8077194bf 100644
--- a/locales/Kazakh (Cyrillic).lng	
+++ b/locales/Kazakh (Cyrillic).lng	
@@ -970,13 +970,13 @@
 960=Source without links
 961=Check links
 
-962=<?>
-963=<?>
-964=<?>
-965=<?>
-966=<?>
-967=<?>
-968=<?>
+962=Event types
+963=Count
+964=Enabled
+965=Tag
+966=Description
+967=For custom events and facts, the type must be entered
+968=Event Definition
 969=<?>
 970=<?>
 
diff --git a/locales/Portuguese.lng b/locales/Portuguese.lng
index 4465c3b9d..af4cff212 100644
--- a/locales/Portuguese.lng
+++ b/locales/Portuguese.lng
@@ -970,13 +970,13 @@
 960=Source without links
 961=Check links
 
-962=<?>
-963=<?>
-964=<?>
-965=<?>
-966=<?>
-967=<?>
-968=<?>
+962=Event types
+963=Count
+964=Enabled
+965=Tag
+966=Description
+967=For custom events and facts, the type must be entered
+968=Event Definition
 969=<?>
 970=<?>
 
diff --git a/locales/Serbian (Latin).lng b/locales/Serbian (Latin).lng
index 9318e6668..f3832b770 100644
--- a/locales/Serbian (Latin).lng	
+++ b/locales/Serbian (Latin).lng	
@@ -970,13 +970,13 @@
 960=Source without links
 961=Check links
 
-962=<?>
-963=<?>
-964=<?>
-965=<?>
-966=<?>
-967=<?>
-968=<?>
+962=Event types
+963=Count
+964=Enabled
+965=Tag
+966=Description
+967=For custom events and facts, the type must be entered
+968=Event Definition
 969=<?>
 970=<?>
 
diff --git a/locales/Spanish.lng b/locales/Spanish.lng
index 2238a2a69..0ec4ec695 100644
--- a/locales/Spanish.lng
+++ b/locales/Spanish.lng
@@ -970,13 +970,13 @@
 960=Source without links
 961=Check links
 
-962=<?>
-963=<?>
-964=<?>
-965=<?>
-966=<?>
-967=<?>
-968=<?>
+962=Event types
+963=Count
+964=Enabled
+965=Tag
+966=Description
+967=For custom events and facts, the type must be entered
+968=Event Definition
 969=<?>
 970=<?>
 
diff --git a/locales/czech.lng b/locales/czech.lng
index 16f007af5..1fb9a82ed 100644
--- a/locales/czech.lng
+++ b/locales/czech.lng
@@ -970,13 +970,13 @@
 960=Source without links
 961=Check links
 
-962=<?>
-963=<?>
-964=<?>
-965=<?>
-966=<?>
-967=<?>
-968=<?>
+962=Event types
+963=Count
+964=Enabled
+965=Tag
+966=Description
+967=For custom events and facts, the type must be entered
+968=Event Definition
 969=<?>
 970=<?>
 
diff --git a/locales/french.lng b/locales/french.lng
index 711b5041d..19d5970db 100644
--- a/locales/french.lng
+++ b/locales/french.lng
@@ -970,13 +970,13 @@
 960=Source without links
 961=Check links
 
-962=<?>
-963=<?>
-964=<?>
-965=<?>
-966=<?>
-967=<?>
-968=<?>
+962=Event types
+963=Count
+964=Enabled
+965=Tag
+966=Description
+967=For custom events and facts, the type must be entered
+968=Event Definition
 969=<?>
 970=<?>
 
diff --git a/locales/german.lng b/locales/german.lng
index 453682db1..b7ec5cd29 100644
--- a/locales/german.lng
+++ b/locales/german.lng
@@ -970,13 +970,13 @@
 960=Source without links
 961=Check links
 
-962=<?>
-963=<?>
-964=<?>
-965=<?>
-966=<?>
-967=<?>
-968=<?>
+962=Event types
+963=Count
+964=Enabled
+965=Tag
+966=Description
+967=For custom events and facts, the type must be entered
+968=Event Definition
 969=<?>
 970=<?>
 
diff --git a/locales/help_enu/gkhHistory.html b/locales/help_enu/gkhHistory.html
index 3065d7563..a9b9eb7ff 100644
--- a/locales/help_enu/gkhHistory.html
+++ b/locales/help_enu/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>Change log</h1>
 
     <p>
         <b>14.06.2024 [v2.30.1 &amp; v3.6.1]</b><ul>
+            <li>Added custom event types, the feature to turn off events and add custom ones.
             <li>Added localizable names for tree borders.
             <li>Fixed an issue where blood group fact values would get stuck after use and when a different fact type was subsequently selected.
             <li>Added data checking option: search for notes and sources without links.
diff --git a/locales/help_rus/gkhHistory.html b/locales/help_rus/gkhHistory.html
index 7e5810bd1..2e16f5516 100644
--- a/locales/help_rus/gkhHistory.html
+++ b/locales/help_rus/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>История версий</h1>
 
     <p>
         <b>14.06.2024 [v2.30.1 &amp; v3.6.1]</b><ul>
+            <li>Добавлены настраиваемые типы событий, возможность выключения событий и добавления пользовательских.
             <li>Добавлены локализуемые названия границ деревьев.
             <li>Исправлена ошибка застревания значений факта групп крови после использования и при последующем выборе другого типа факта.
             <li>Добавлена опция проверки данных: поиск записей заметок и источников без ссылок.
diff --git a/locales/italian.lng b/locales/italian.lng
index d89f86781..a76e04367 100644
--- a/locales/italian.lng
+++ b/locales/italian.lng
@@ -970,13 +970,13 @@
 960=Source without links
 961=Check links
 
-962=<?>
-963=<?>
-964=<?>
-965=<?>
-966=<?>
-967=<?>
-968=<?>
+962=Event types
+963=Count
+964=Enabled
+965=Tag
+966=Description
+967=For custom events and facts, the type must be entered
+968=Event Definition
 969=<?>
 970=<?>
 
diff --git a/locales/polish.lng b/locales/polish.lng
index 63c40152c..1576f45a5 100644
--- a/locales/polish.lng
+++ b/locales/polish.lng
@@ -970,13 +970,13 @@
 960=Source without links
 961=Check links
 
-962=<?>
-963=<?>
-964=<?>
-965=<?>
-966=<?>
-967=<?>
-968=<?>
+962=Event types
+963=Count
+964=Enabled
+965=Tag
+966=Description
+967=For custom events and facts, the type must be entered
+968=Event Definition
 969=<?>
 970=<?>
 
diff --git a/locales/russian.lng b/locales/russian.lng
index 6f6f803e6..28c3c8ce4 100644
--- a/locales/russian.lng
+++ b/locales/russian.lng
@@ -970,13 +970,13 @@
 960=Источник без ссылок
 961=Проверить связи
 
-962=<?>
-963=<?>
-964=<?>
-965=<?>
-966=<?>
-967=<?>
-968=<?>
+962=Типы событий
+963=Количество
+964=Включено
+965=Тег
+966=Описание
+967=Для пользовательских событий и фактов необходимо ввести тип
+968=Определение события
 969=<?>
 970=<?>
 
diff --git a/locales/ukrainian.lng b/locales/ukrainian.lng
index 9bbb39a5d..e0312fcf3 100644
--- a/locales/ukrainian.lng
+++ b/locales/ukrainian.lng
@@ -970,13 +970,13 @@
 960=Source without links
 961=Check links
 
-962=<?>
-963=<?>
-964=<?>
-965=<?>
-966=<?>
-967=<?>
-968=<?>
+962=Event types
+963=Count
+964=Enabled
+965=Tag
+966=Description
+967=For custom events and facts, the type must be entered
+968=Event Definition
 969=<?>
 970=<?>
 
diff --git a/projects/GKCore/GDModel/GDMFamilyRecord.cs b/projects/GKCore/GDModel/GDMFamilyRecord.cs
index 1cdaf7c3a..754ff0e79 100644
--- a/projects/GKCore/GDModel/GDMFamilyRecord.cs
+++ b/projects/GKCore/GDModel/GDMFamilyRecord.cs
@@ -133,7 +133,7 @@ public void DeleteChild(GDMRecord childRec)
 
             for (int i = fChildren.Count - 1; i >= 0; i--) {
                 if (fChildren[i].XRef == childRec.XRef) {
-                    fChildren.DeleteAt(i);
+                    fChildren.RemoveAt(i);
                     break;
                 }
             }
@@ -145,7 +145,7 @@ public void DeleteChild(GDMPointer childPtr)
 
             for (int i = fChildren.Count - 1; i >= 0; i--) {
                 if (fChildren[i].XRef == childPtr.XRef) {
-                    fChildren.DeleteAt(i);
+                    fChildren.RemoveAt(i);
                     break;
                 }
             }
diff --git a/projects/GKCore/GDModel/GDMGroupRecord.cs b/projects/GKCore/GDModel/GDMGroupRecord.cs
index b2885e823..5f457b9cd 100644
--- a/projects/GKCore/GDModel/GDMGroupRecord.cs
+++ b/projects/GKCore/GDModel/GDMGroupRecord.cs
@@ -141,8 +141,8 @@ public bool RemoveMember(GDMIndividualRecord member)
         {
             if (member == null) return false;
 
-            fMembers.DeleteAt(IndexOfMember(member));
-            member.Groups.DeleteAt(member.IndexOfGroup(this));
+            fMembers.RemoveAt(IndexOfMember(member));
+            member.Groups.RemoveAt(member.IndexOfGroup(this));
 
             return true;
         }
diff --git a/projects/GKCore/GDModel/GDMIndividualRecord.cs b/projects/GKCore/GDModel/GDMIndividualRecord.cs
index bcf3b9ba6..97a5daa7c 100644
--- a/projects/GKCore/GDModel/GDMIndividualRecord.cs
+++ b/projects/GKCore/GDModel/GDMIndividualRecord.cs
@@ -260,7 +260,7 @@ public void DeleteSpouseToFamilyLink(GDMFamilyRecord familyRec)
             int num = fSpouseToFamilyLinks.Count;
             for (int i = 0; i < num; i++) {
                 if (fSpouseToFamilyLinks[i].XRef == familyRec.XRef) {
-                    fSpouseToFamilyLinks.DeleteAt(i);
+                    fSpouseToFamilyLinks.RemoveAt(i);
                     break;
                 }
             }
@@ -273,7 +273,7 @@ public void DeleteChildToFamilyLink(GDMFamilyRecord familyRec)
             int num = fChildToFamilyLinks.Count;
             for (int i = 0; i < num; i++) {
                 if (fChildToFamilyLinks[i].XRef == familyRec.XRef) {
-                    fChildToFamilyLinks.DeleteAt(i);
+                    fChildToFamilyLinks.RemoveAt(i);
                     break;
                 }
             }
diff --git a/projects/GKCore/GDModel/GDMInterfaces.cs b/projects/GKCore/GDModel/GDMInterfaces.cs
index 57c4d7360..d7ff76a38 100644
--- a/projects/GKCore/GDModel/GDMInterfaces.cs
+++ b/projects/GKCore/GDModel/GDMInterfaces.cs
@@ -18,6 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+using System;
 using System.Collections.Generic;
 using GDModel.Providers.GEDCOM;
 
@@ -38,6 +39,26 @@ public interface IGDMTag : IGDMObject
     }
 
 
+    public interface IGDMList<T> : IDisposable, IEnumerable<T>
+        where T : class, IGDMObject
+    {
+        int Count { get; }
+
+        T this[int index] { get; }
+
+
+        T Add(T item);
+
+        void Clear();
+
+        void Remove(T item);
+
+        void RemoveAt(int index);
+
+        int IndexOf(T item);
+    }
+
+
     public interface IGDMLines
     {
         string this[int index] { get; set; }
diff --git a/projects/GKCore/GDModel/GDMList.cs b/projects/GKCore/GDModel/GDMList.cs
index e1aae84a2..46bd4e358 100644
--- a/projects/GKCore/GDModel/GDMList.cs
+++ b/projects/GKCore/GDModel/GDMList.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2021 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -25,7 +25,8 @@
 
 namespace GDModel
 {
-    public sealed class GDMList<T> : IDisposable, IEnumerable<T> where T : GDMTag
+    public sealed class GDMList<T> : IGDMList<T>
+        where T : GDMTag
     {
         #region ListEnumerator
 
@@ -171,7 +172,7 @@ public int IndexOf(T item)
             return (fDataList == null) ? -1 : fDataList.IndexOf(item);
         }
 
-        public void DeleteAt(int index)
+        public void RemoveAt(int index)
         {
             if (fDataList == null) return;
             
@@ -179,7 +180,7 @@ public void DeleteAt(int index)
             fDataList.RemoveAt(index);
         }
 
-        public void Delete(T item)
+        public void Remove(T item)
         {
             if (fDataList == null) return;
 
@@ -227,8 +228,7 @@ public void ReplaceXRefs(GDMXRefReplacer map)
         {
             if (fDataList == null) return;
 
-            int num = fDataList.Count;
-            for (int i = 0; i < num; i++) {
+            for (int i = 0, num = fDataList.Count; i < num; i++) {
                 var item = fDataList[i];
                 if (item != null) {
                     item.ReplaceXRefs(map);
@@ -245,14 +245,13 @@ public void Sort(Comparison<T> comparer)
 
         internal void TrimExcess()
         {
-            if (fDataList != null) {
-                fDataList.TrimExcess();
+            if (fDataList == null) return;
 
-                for (int i = 0, num = fDataList.Count; i < num; i++) {
-                    var item = fDataList[i];
-                    if (item != null) {
-                        item.TrimExcess();
-                    }
+            fDataList.TrimExcess();
+            for (int i = 0, num = fDataList.Count; i < num; i++) {
+                var item = fDataList[i];
+                if (item != null) {
+                    item.TrimExcess();
                 }
             }
         }
diff --git a/projects/GKCore/GDModel/GDMResearchRecord.cs b/projects/GKCore/GDModel/GDMResearchRecord.cs
index acab89042..c0f0bdf8d 100644
--- a/projects/GKCore/GDModel/GDMResearchRecord.cs
+++ b/projects/GKCore/GDModel/GDMResearchRecord.cs
@@ -216,7 +216,7 @@ public void RemoveTask(GDMTaskRecord taskRecord)
         {
             if (taskRecord == null) return;
 
-            fTasks.DeleteAt(IndexOfTask(taskRecord));
+            fTasks.RemoveAt(IndexOfTask(taskRecord));
         }
 
         public int IndexOfTask(GDMTaskRecord taskRec)
@@ -254,7 +254,7 @@ public void RemoveGroup(GDMGroupRecord groupRecord)
         {
             if (groupRecord == null) return;
 
-            fGroups.DeleteAt(IndexOfGroup(groupRecord));
+            fGroups.RemoveAt(IndexOfGroup(groupRecord));
         }
 
         public int IndexOfGroup(GDMGroupRecord groupRec)
@@ -292,7 +292,7 @@ public void RemoveCommunication(GDMCommunicationRecord commRecord)
         {
             if (commRecord == null) return;
 
-            fCommunications.DeleteAt(IndexOfCommunication(commRecord));
+            fCommunications.RemoveAt(IndexOfCommunication(commRecord));
         }
 
         public int IndexOfCommunication(GDMCommunicationRecord commRec)
diff --git a/projects/GKCore/GDModel/GDMSourceRecord.cs b/projects/GKCore/GDModel/GDMSourceRecord.cs
index f5feb2ebf..a688654f1 100644
--- a/projects/GKCore/GDModel/GDMSourceRecord.cs
+++ b/projects/GKCore/GDModel/GDMSourceRecord.cs
@@ -259,7 +259,7 @@ public void RemoveRepository(GDMRepositoryRecord repRec)
 
             foreach (GDMRepositoryCitation repCit in fRepositoryCitations) {
                 if (repCit.XRef == repRec.XRef) {
-                    fRepositoryCitations.Delete(repCit);
+                    fRepositoryCitations.Remove(repCit);
                     break;
                 }
             }
diff --git a/projects/GKCore/GDModel/GDMTag.cs b/projects/GKCore/GDModel/GDMTag.cs
index 791e152e8..bc9a4dba5 100644
--- a/projects/GKCore/GDModel/GDMTag.cs
+++ b/projects/GKCore/GDModel/GDMTag.cs
@@ -185,7 +185,7 @@ public void DeleteTag(string tagName)
             GDMTag tag = FindTag(tagName, 0);
             while (tag != null) {
                 int idx = fTags.IndexOf(tag);
-                fTags.DeleteAt(idx);
+                fTags.RemoveAt(idx);
 
                 tag = FindTag(tagName, idx);
             }
diff --git a/projects/GKCore/GDModel/GDMTree.cs b/projects/GKCore/GDModel/GDMTree.cs
index d769fb1d7..fc2334318 100644
--- a/projects/GKCore/GDModel/GDMTree.cs
+++ b/projects/GKCore/GDModel/GDMTree.cs
@@ -330,13 +330,13 @@ public GDMRecord AddRecord(GDMRecord record)
         public void Delete(int index)
         {
             XRefIndex_DeleteRecord(fRecords[index]);
-            fRecords.DeleteAt(index);
+            fRecords.RemoveAt(index);
         }
 
         public void DeleteRecord(GDMRecord record)
         {
             XRefIndex_DeleteRecord(record);
-            fRecords.Delete(record);
+            fRecords.Remove(record);
         }
 
         public GDMRecord Extract(int index)
@@ -574,7 +574,7 @@ public bool DeleteMediaRecord(GDMMultimediaRecord mRec)
 
                 for (int j = rec.MultimediaLinks.Count - 1; j >= 0; j--) {
                     if (rec.MultimediaLinks[j].XRef == mRec.XRef) {
-                        rec.MultimediaLinks.DeleteAt(j);
+                        rec.MultimediaLinks.RemoveAt(j);
                     }
                 }
             }
@@ -592,7 +592,7 @@ public bool DeleteNoteRecord(GDMNoteRecord nRec)
                 GDMRecord rec = fRecords[i];
                 for (int j = rec.Notes.Count - 1; j >= 0; j--) {
                     if (rec.Notes[j].XRef == nRec.XRef)
-                        rec.Notes.DeleteAt(j);
+                        rec.Notes.RemoveAt(j);
                 }
             }
 
@@ -611,7 +611,7 @@ public bool DeleteRepositoryRecord(GDMRepositoryRecord repRec)
                     GDMSourceRecord srcRec = (GDMSourceRecord)rec;
                     for (int j = srcRec.RepositoryCitations.Count - 1; j >= 0; j--) {
                         if (srcRec.RepositoryCitations[j].XRef == repRec.XRef) {
-                            srcRec.RepositoryCitations.DeleteAt(j);
+                            srcRec.RepositoryCitations.RemoveAt(j);
                         }
                     }
                 }
@@ -640,7 +640,7 @@ public bool DeleteSourceRecord(GDMSourceRecord srcRec)
 
                 for (int j = rec.SourceCitations.Count - 1; j >= 0; j--) {
                     if (rec.SourceCitations[j].XRef == srcRec.XRef) {
-                        rec.SourceCitations.DeleteAt(j);
+                        rec.SourceCitations.RemoveAt(j);
                     }
                 }
             }
@@ -660,7 +660,7 @@ public bool DeleteTaskRecord(GDMTaskRecord taskRec)
                     GDMResearchRecord resRec = (GDMResearchRecord)rec;
                     for (int j = resRec.Tasks.Count - 1; j >= 0; j--) {
                         if (resRec.Tasks[j].XRef == taskRec.XRef) {
-                            resRec.Tasks.DeleteAt(j);
+                            resRec.Tasks.RemoveAt(j);
                         }
                     }
                 }
@@ -681,7 +681,7 @@ public bool DeleteCommunicationRecord(GDMCommunicationRecord commRec)
                     GDMResearchRecord resRec = (GDMResearchRecord)rec;
                     for (int j = resRec.Communications.Count - 1; j >= 0; j--) {
                         if (resRec.Communications[j].XRef == commRec.XRef) {
-                            resRec.Communications.DeleteAt(j);
+                            resRec.Communications.RemoveAt(j);
                         }
                     }
                 }
@@ -724,7 +724,7 @@ public bool DeleteLocationRecord(GDMLocationRecord locRec)
                             for (int j = lRec.TopLevels.Count - 1; j >= 0; j--) {
                                 var topLev = lRec.TopLevels[j];
                                 if (topLev.XRef == locRec.XRef) {
-                                    lRec.TopLevels.DeleteAt(j);
+                                    lRec.TopLevels.RemoveAt(j);
                                 }
                             }
                         }
diff --git a/projects/GKCore/GDModel/Providers/GEDCOM/GEDCOMChecker.cs b/projects/GKCore/GDModel/Providers/GEDCOM/GEDCOMChecker.cs
index e59231086..689271eba 100644
--- a/projects/GKCore/GDModel/Providers/GEDCOM/GEDCOMChecker.cs
+++ b/projects/GKCore/GDModel/Providers/GEDCOM/GEDCOMChecker.cs
@@ -120,7 +120,7 @@ private void CheckTagWithNotes(IGDMStructWithNotes tag)
                     TransformNote(note);
                 } else {
                     var noteRec = fTree.GetPtrValue<GDMNoteRecord>(note);
-                    if (noteRec == null) tag.Notes.DeleteAt(i);
+                    if (noteRec == null) tag.Notes.RemoveAt(i);
                 }
             }
         }
@@ -135,7 +135,7 @@ private void CheckTagWithSourceCitations(IGDMStructWithSourceCitations tag)
                     TransformSourceCitation(sourCit);
                 } else {
                     var sourRec = fTree.GetPtrValue<GDMSourceRecord>(sourCit);
-                    if (sourRec == null) tag.SourceCitations.DeleteAt(i);
+                    if (sourRec == null) tag.SourceCitations.RemoveAt(i);
                 }
             }
         }
@@ -150,7 +150,7 @@ private void CheckTagWithMultimediaLinks(IGDMStructWithMultimediaLinks tag)
                     TransformMultimediaLink(mmLink);
                 } else {
                     var mmRec = fTree.GetPtrValue<GDMMultimediaRecord>(mmLink);
-                    if (mmRec == null) tag.MultimediaLinks.DeleteAt(i);
+                    if (mmRec == null) tag.MultimediaLinks.RemoveAt(i);
                 }
             }
         }
@@ -222,7 +222,8 @@ private void CheckEvent(GDMCustomEvent evt)
                 CheckEventPlace(evt.Place, evt);
             }
 
-            fBaseContext.EventStats.Increment(evt.GetTagName());
+            string key = evt.GetTagName() + ":" + evt.Classification;
+            fBaseContext.EventStats.Increment(key);
         }
 
         private void CheckUserRef(GDMRecord rec, GDMUserReference userRef)
@@ -256,7 +257,7 @@ private void CheckIndividualRecord(GDMIndividualRecord iRec)
             for (int i = iRec.ChildToFamilyLinks.Count - 1; i >= 0; i--) {
                 var cfl = iRec.ChildToFamilyLinks[i];
                 if (fTree.GetPtrValue(cfl) == null) {
-                    iRec.ChildToFamilyLinks.DeleteAt(i);
+                    iRec.ChildToFamilyLinks.RemoveAt(i);
                 } else {
                     CheckPointerWithNotes(cfl);
                 }
@@ -265,7 +266,7 @@ private void CheckIndividualRecord(GDMIndividualRecord iRec)
             for (int i = iRec.SpouseToFamilyLinks.Count - 1; i >= 0; i--) {
                 var sfl = iRec.SpouseToFamilyLinks[i];
                 if (fTree.GetPtrValue(sfl) == null) {
-                    iRec.SpouseToFamilyLinks.DeleteAt(i);
+                    iRec.SpouseToFamilyLinks.RemoveAt(i);
                 } else {
                     CheckPointerWithNotes(sfl);
                 }
@@ -296,7 +297,7 @@ private void CheckChildLink(GDMFamilyRecord fam, int index)
             GDMIndividualLink childLink = fam.Children[index];
             var childRec = fTree.GetPtrValue<GDMIndividualRecord>(childLink);
             if (childRec == null) {
-                fam.Children.DeleteAt(index);
+                fam.Children.RemoveAt(index);
                 return;
             }
 
@@ -350,10 +351,10 @@ private void CheckGroupRecord(GDMGroupRecord group)
             for (int i = group.Members.Count - 1; i >= 0; i--) {
                 GDMIndividualRecord mbr = fTree.GetPtrValue(group.Members[i]);
                 if (mbr == null) {
-                    group.Members.DeleteAt(i);
+                    group.Members.RemoveAt(i);
                 } else {
                     if (mbr.IndexOfGroup(group) < 0) {
-                        group.Members.DeleteAt(i);
+                        group.Members.RemoveAt(i);
                     }
                 }
             }
@@ -364,7 +365,7 @@ private void CheckSourceRecord(GDMSourceRecord src)
             for (int i = src.RepositoryCitations.Count - 1; i >= 0; i--) {
                 GDMRecord val = fTree.GetPtrValue<GDMRecord>(src.RepositoryCitations[i]);
                 if (val == null) {
-                    src.RepositoryCitations.DeleteAt(i);
+                    src.RepositoryCitations.RemoveAt(i);
                 }
             }
         }
diff --git a/projects/GKCore/GDModel/Providers/GEDCOM/GEDCOMUtils.cs b/projects/GKCore/GDModel/Providers/GEDCOM/GEDCOMUtils.cs
index b2e4238fe..b572be025 100644
--- a/projects/GKCore/GDModel/Providers/GEDCOM/GEDCOMUtils.cs
+++ b/projects/GKCore/GDModel/Providers/GEDCOM/GEDCOMUtils.cs
@@ -1653,7 +1653,7 @@ public static void SetTagStrings(GDMTag tag, GDMLines strings)
                 var tagType = subtag.GetTagType();
 
                 if (tagType == GEDCOMTagType.CONT || tagType == GEDCOMTagType.CONC) {
-                    subTags.DeleteAt(i);
+                    subTags.RemoveAt(i);
                 }
             }
 
diff --git a/projects/GKCore/GKCore.csproj b/projects/GKCore/GKCore.csproj
index e541106e7..0fb391b18 100644
--- a/projects/GKCore/GKCore.csproj
+++ b/projects/GKCore/GKCore.csproj
@@ -65,6 +65,9 @@
       <Link>GlobalSuppressions.cs</Link>
     </Compile>
     <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="GKCore\Controllers\EventDefEditDlgController.cs" />
+    <Compile Include="GKCore\Design\Views\IEventDefEditDlg.cs" />
+    <Compile Include="GKCore\Lists\EventDefsListModel.cs" />
     <Compile Include="GKCore\Design\Views\ILocationLinkEditDlg.cs" />
     <Compile Include="GKCore\Controllers\LocationLinkEditDlgController.cs" />
     <Compile Include="GKCore\Controllers\LocationNameEditDlgController.cs" />
@@ -411,7 +414,7 @@
     <Compile Include="GKCore\Types\NamePartsRet.cs" />
     <Compile Include="GKCore\Types\PatriarchObj.cs" />
     <Compile Include="GKCore\Types\PedigreeFormat.cs" />
-    <Compile Include="GKCore\Types\PersonEventKind.cs" />
+    <Compile Include="GKCore\Types\PredefinedEvent.cs" />
     <Compile Include="GKCore\Types\PGNode.cs" />
     <Compile Include="GKCore\Types\PGNodeType.cs" />
     <Compile Include="GKCore\Types\RecordAction.cs" />
@@ -534,6 +537,7 @@
     <Compile Include="GKCore\Lists\LocationNamesListModel.cs" />
     <Compile Include="GKCore\Lists\LocationLinksListModel.cs" />
     <Compile Include="GKCore\Interfaces\IScrollableContainer.cs" />
+    <Compile Include="GKCore\EventDefinitions.cs" />
   </ItemGroup>
   <Import Project="GKCore.props" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/projects/GKCore/GKCore/AppHost.cs b/projects/GKCore/GKCore/AppHost.cs
index b6283a036..95572e719 100644
--- a/projects/GKCore/GKCore/AppHost.cs
+++ b/projects/GKCore/GKCore/AppHost.cs
@@ -142,7 +142,7 @@ public static void LogSysInfo()
         public virtual async Task Init(string[] args, bool isMDI)
         {
             GKUtils.InitGEDCOM();
-            await LoadLanguage(AppHost.Options.InterfaceLang);
+            await LoadLanguage(AppHost.Options.InterfaceLang, true);
             SetArgs(args);
             StartupWork();
         }
@@ -980,14 +980,19 @@ public static async Task<ushort> RequestLanguage()
             return LangMan.LS_DEF_CODE;
         }
 
-        public async Task LoadLanguage(int langCode)
+        public async Task LoadLanguage(int langCode, bool startup)
         {
             try {
                 if (langCode <= 0) {
                     langCode = await RequestLanguage();
                 }
 
+                if (!startup) DoneEventDefs();
+
                 AppHost.Options.LoadLanguage(langCode);
+
+                InitEventDefs();
+
                 AppHost.Plugins.OnLanguageChange();
 
                 UpdateLang();
@@ -1194,6 +1199,7 @@ void ISingleInstanceEnforcer.OnMessageReceived(MessageEventArgs e)
 
         private static readonly IocContainer fIocContainer;
 
+        private static EventDefinitions fEventDefinitions;
         private static ExtResources fExtResources;
         private static IGraphicsProvider fGfxProvider;
         private static INamesTable fNamesTable;
@@ -1208,6 +1214,16 @@ public static IocContainer Container
             get { return fIocContainer; }
         }
 
+        public static EventDefinitions EventDefinitions
+        {
+            get {
+                if (fEventDefinitions == null) {
+                    fEventDefinitions = new EventDefinitions();
+                }
+                return fEventDefinitions;
+            }
+        }
+
         public static ExtResources ExtResources
         {
             get {
@@ -1346,6 +1362,8 @@ public static void DoneSettings()
         {
             NamesTable.SaveToFile(GetAppDataPathStatic() + "GEDKeeper2.nms");
 
+            DoneEventDefs();
+
             var options = GlobalOptions.Instance;
             options.SaveToFile(GetAppDataPathStatic() + "GEDKeeper2.ini");
 
@@ -1356,6 +1374,23 @@ public static void DoneSettings()
             }
         }
 
+        private static string GetEventDefsFileName()
+        {
+            string lang_sign = GlobalOptions.Instance.GetLanguageSign();
+            string result = string.Format(GetAppDataPathStatic() + "event_defs_{0}.yaml", lang_sign);
+            return result;
+        }
+
+        private static void InitEventDefs()
+        {
+            EventDefinitions.Load(GetEventDefsFileName());
+        }
+
+        private static void DoneEventDefs()
+        {
+            EventDefinitions.Save(GetEventDefsFileName());
+        }
+
         public static void ForceGC()
         {
             GC.Collect(2, GCCollectionMode.Forced);
diff --git a/projects/GKCore/GKCore/BaseContext.cs b/projects/GKCore/GKCore/BaseContext.cs
index dd4c270c7..cd1408a30 100644
--- a/projects/GKCore/GKCore/BaseContext.cs
+++ b/projects/GKCore/GKCore/BaseContext.cs
@@ -214,19 +214,19 @@ public void ImportNames(GDMIndividualRecord iRec)
             AppHost.NamesTable.ImportNames(this, iRec);
         }
 
-        public GDMCustomEvent CreateEventEx(GDMRecordWithEvents aRec, string evSign, GDMCustomDate evDate, string evPlace)
+        public GDMCustomEvent CreateEventEx(GDMRecordWithEvents aRec, string evTag, GDMCustomDate evDate, string evPlace)
         {
-            return CreateEventEx(aRec, evSign, evDate.StringValue, evPlace);
+            return CreateEventEx(aRec, evTag, evDate.StringValue, evPlace);
         }
 
-        public GDMCustomEvent CreateEventEx(GDMRecordWithEvents aRec, string evSign, string evDate, string evPlace)
+        public GDMCustomEvent CreateEventEx(GDMRecordWithEvents aRec, string evTag, string evDate, string evPlace)
         {
             if (aRec == null) return null;
 
             GDMCustomEvent result;
 
             if (aRec is GDMIndividualRecord) {
-                if (GKUtils.GetPersonEventKindBySign(evSign) == PersonEventKind.ekEvent) {
+                if (GKUtils.GetPredefinedEventKind(evTag) == EventKind.ekEvent) {
                     result = new GDMIndividualEvent();
                 } else {
                     result = new GDMIndividualAttribute();
@@ -239,7 +239,7 @@ public GDMCustomEvent CreateEventEx(GDMRecordWithEvents aRec, string evSign, str
 
             aRec.AddEvent(result);
 
-            result.SetName(evSign);
+            result.SetName(evTag);
 
             if (evDate != "") {
                 result.Date.ParseString(evDate);
diff --git a/projects/GKCore/GKCore/Charts/TreeChartModel.cs b/projects/GKCore/GKCore/Charts/TreeChartModel.cs
index e8845ac92..66cc3390d 100644
--- a/projects/GKCore/GKCore/Charts/TreeChartModel.cs
+++ b/projects/GKCore/GKCore/Charts/TreeChartModel.cs
@@ -1021,8 +1021,8 @@ private void RecalcTreeBounds()
                 }
             }
 
-            fImageHeight = fTreeBounds.GetHeight() + fMargins * 2;
-            fImageWidth = fTreeBounds.GetWidth() + fMargins * 2;
+            fImageHeight = Math.Max(fTreeBounds.GetHeight(), 0) + fMargins * 2;
+            fImageWidth = Math.Max(fTreeBounds.GetWidth(), 0) + fMargins * 2;
         }
 
         public void RecalcChart()
diff --git a/projects/GKCore/GKCore/Controllers/AddressEditDlgController.cs b/projects/GKCore/GKCore/Controllers/AddressEditDlgController.cs
index e94ecdd2a..d63050b67 100644
--- a/projects/GKCore/GKCore/Controllers/AddressEditDlgController.cs
+++ b/projects/GKCore/GKCore/Controllers/AddressEditDlgController.cs
@@ -121,7 +121,7 @@ public async Task DoPhonesAction(RecordAction action, GDMTag itemTag)
                     break;
 
                 case RecordAction.raDelete:
-                    fAddress.PhoneNumbers.Delete(itemTag);
+                    fAddress.PhoneNumbers.Remove(itemTag);
                     break;
             }
             UpdateLists();
@@ -146,7 +146,7 @@ public async Task DoMailsAction(RecordAction action, GDMTag itemTag)
                     break;
 
                 case RecordAction.raDelete:
-                    fAddress.EmailAddresses.Delete(itemTag);
+                    fAddress.EmailAddresses.Remove(itemTag);
                     break;
             }
             UpdateLists();
@@ -171,7 +171,7 @@ public async Task DoWebsAction(RecordAction action, GDMTag itemTag)
                     break;
 
                 case RecordAction.raDelete:
-                    fAddress.WebPages.Delete(itemTag);
+                    fAddress.WebPages.Remove(itemTag);
                     break;
             }
             UpdateLists();
diff --git a/projects/GKCore/GKCore/Controllers/BaseController.cs b/projects/GKCore/GKCore/Controllers/BaseController.cs
index 4215ce33b..0472bfb95 100644
--- a/projects/GKCore/GKCore/Controllers/BaseController.cs
+++ b/projects/GKCore/GKCore/Controllers/BaseController.cs
@@ -559,6 +559,37 @@ public static async Task<ModificationResult<GDMLocationLink>> ModifyLocationLink
             return result;
         }
 
+        public static async Task<ModificationResult<EventDef>> ModifyEventDef(IView owner, EventDefList list, EventDef eventDef)
+        {
+            var result = new ModificationResult<EventDef>();
+
+            try {
+                bool exists = eventDef != null;
+                if (!exists) {
+                    eventDef = new EventDef();
+                }
+
+                using (var dlg = AppHost.ResolveDialog<IEventDefEditDlg>()) {
+                    dlg.EventDef = eventDef;
+                    result.Result = await AppHost.Instance.ShowModalAsync(dlg, owner, false);
+                }
+
+                if (!exists) {
+                    if (result.Result) {
+                        list.Add(eventDef);
+                        result.Result = true;
+                    } else {
+                        eventDef = null;
+                    }
+                }
+
+                result.Record = eventDef;
+            } finally {
+            }
+
+            return result;
+        }
+
         private static async Task PostProcessPerson(IBaseWindow baseWin, GDMIndividualRecord indivRec)
         {
             baseWin.Context.ImportNames(indivRec);
diff --git a/projects/GKCore/GKCore/Controllers/EventDefEditDlgController.cs b/projects/GKCore/GKCore/Controllers/EventDefEditDlgController.cs
new file mode 100644
index 000000000..41c09fa5b
--- /dev/null
+++ b/projects/GKCore/GKCore/Controllers/EventDefEditDlgController.cs
@@ -0,0 +1,115 @@
+/*
+ *  "GEDKeeper", the personal genealogical database editor.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
+ *
+ *  This file is part of "GEDKeeper".
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+using System;
+using GDModel.Providers.GEDCOM;
+using GKCore.Design;
+using GKCore.Design.Controls;
+using GKCore.Design.Views;
+
+namespace GKCore.Controllers
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public sealed class EventDefEditDlgController : DialogController<IEventDefEditDlg>
+    {
+        private EventDef fEventDef;
+
+        public EventDef EventDef
+        {
+            get { return fEventDef; }
+            set {
+                if (fEventDef != value) {
+                    fEventDef = value;
+                    UpdateView();
+                }
+            }
+        }
+
+
+        public EventDefEditDlgController(IEventDefEditDlg view) : base(view)
+        {
+        }
+
+        public override bool Accept()
+        {
+            try {
+                if (!fEventDef.Protected) {
+                    fEventDef.DisplayName = fView.NameText.Text;
+                    fEventDef.Tag = fView.TagCombo.Text;
+                    fEventDef.Type = fView.TypeText.Text;
+                    fEventDef.Description = fView.DescText.Text;
+                }
+                fEventDef.Enabled = fView.EnabledCheck.Checked;
+
+                bool isCustom = (fEventDef.Tag == GEDCOMTagName.EVEN) || (fEventDef.Tag == GEDCOMTagName.FACT);
+                if (isCustom && string.IsNullOrEmpty(fEventDef.Type)) {
+                    AppHost.StdDialogs.ShowError(LangMan.LS(LSID.TagTypeWarning));
+                    return false;
+                }
+
+                return true;
+            } catch (Exception ex) {
+                Logger.WriteError("EventDefEditDlgController.Accept()", ex);
+                return false;
+            }
+        }
+
+        public override void UpdateView()
+        {
+            fView.NameText.Text = fEventDef.DisplayName;
+            fView.TypeText.Text = fEventDef.Type;
+            fView.EnabledCheck.Checked = fEventDef.Enabled;
+            fView.DescText.Text = fEventDef.Description;
+
+            string tag = fEventDef.Tag;
+            bool isCustom = string.IsNullOrEmpty(tag) || (tag == GEDCOMTagName.EVEN) || (tag == GEDCOMTagName.FACT);
+
+            if (isCustom) {
+                // new event/fact tag
+                fView.TagCombo.AddRange(new string[] { GEDCOMTagName.EVEN, GEDCOMTagName.FACT });
+                fView.TagCombo.Text = string.IsNullOrEmpty(tag) ? GEDCOMTagName.FACT : tag;
+            } else {
+                // exists event/fact tag
+                fView.TagCombo.AddRange(new string[] { fEventDef.Tag });
+                fView.TagCombo.Text = fEventDef.Tag;
+            }
+
+            fView.NameText.Enabled = !fEventDef.Protected;
+            fView.TagCombo.Enabled = !fEventDef.Protected;
+            fView.TypeText.Enabled = !fEventDef.Protected;
+            fView.DescText.Enabled = !fEventDef.Protected;
+        }
+
+        public override void SetLocale()
+        {
+            fView.Title = LangMan.LS(LSID.EventDefinition);
+
+            GetControl<IButton>("btnAccept").Text = LangMan.LS(LSID.DlgAccept);
+            GetControl<IButton>("btnCancel").Text = LangMan.LS(LSID.DlgCancel);
+            GetControl<ILabel>("lblName").Text = LangMan.LS(LSID.Name);
+            GetControl<ILabel>("lblTag").Text = LangMan.LS(LSID.Tag);
+            GetControl<ILabel>("lblType").Text = LangMan.LS(LSID.Type);
+            GetControl<ICheckBox>("chkEnabled").Text = LangMan.LS(LSID.Enabled);
+            GetControl<ILabel>("lblDesc").Text = LangMan.LS(LSID.Description);
+        }
+    }
+}
diff --git a/projects/GKCore/GKCore/Controllers/EventEditDlgController.cs b/projects/GKCore/GKCore/Controllers/EventEditDlgController.cs
index 6b7c0b3f3..c2eed9175 100644
--- a/projects/GKCore/GKCore/Controllers/EventEditDlgController.cs
+++ b/projects/GKCore/GKCore/Controllers/EventEditDlgController.cs
@@ -27,7 +27,6 @@
 using GKCore.Design.Views;
 using GKCore.Interfaces;
 using GKCore.Lists;
-using GKCore.Options;
 using GKCore.Types;
 
 namespace GKCore.Controllers
@@ -47,6 +46,7 @@ public GDMCustomEvent Event
             set {
                 if (fEvent != value) {
                     fEvent = value;
+                    AppHost.EventDefinitions.Collect(fEvent);
                     UpdateView();
                 }
             }
@@ -82,13 +82,11 @@ public override bool Accept()
                     throw ex;
                 }
 
-                int eventType = fView.EventType.GetSelectedTag<int>();
-                var eventProps = (fEvent is GDMFamilyEvent) ? GKData.FamilyEvents[eventType] : GKData.PersonEvents[eventType];
-
-                if (eventProps.Kind == PersonEventKind.ekFact) {
+                var eventDef = fView.EventType.GetSelectedTag<EventDef>();
+                if (eventDef.Kind == EventKind.ekFact) {
                     var attrValue = fView.Attribute.Text;
 
-                    if (string.IsNullOrEmpty(attrValue) && !eventProps.AcceptableEmpty) {
+                    if (string.IsNullOrEmpty(attrValue) && !eventDef.AcceptableEmpty) {
                         AppHost.StdDialogs.ShowError(LangMan.LS(LSID.FactValueIsInvalid));
                         throw new Exception();
                     }
@@ -98,17 +96,18 @@ public override bool Accept()
                     fEvent.StringValue = string.Empty;
                 }
 
+                fEvent.SetName(eventDef.Tag);
+                fEvent.Classification = eventDef.Type;
+
+                string key = eventDef.Tag + ":" + eventDef.Type;
+                fBase.Context.EventStats.Increment(key);
+
                 fEvent.Place.StringValue = fView.Place.Text;
                 fBase.Context.Tree.SetPtrValue(fEvent.Place.Location, fTempLocation);
-                fEvent.Classification = fView.EventName.Text;
                 fEvent.Cause = fView.Cause.Text;
                 fEvent.Agency = fView.Agency.Text;
 
-                string tagName = eventProps.Sign;
-                fEvent.SetName(tagName);
-                fBase.Context.EventStats.Increment(tagName);
-
-                if (fEvent is GDMIndividualEvent && eventProps.Kind == PersonEventKind.ekFact) {
+                if (fEvent is GDMIndividualEvent && eventDef.Kind == EventKind.ekFact) {
                     var attr = new GDMIndividualAttribute();
                     attr.Assign(fEvent);
                     fEvent = attr;
@@ -123,17 +122,24 @@ public override bool Accept()
             }
         }
 
-        private void SetEventTypes(GKData.EventStruct[] eventTypes)
+        private void SetEventTypes(EventTarget target)
         {
-            var freqList = new List<FreqItem<int>>();
-
+            var freqList = new List<FreqItem<EventDef>>();
             var eventStats = fBase.Context.EventStats;
-            for (int i = 0; i < eventTypes.Length; i++) {
-                int stat = eventStats.GetValue(eventTypes[i].Sign);
-                freqList.Add(new FreqItem<int>(i, LangMan.LS(eventTypes[i].Name), stat));
+
+            var eventDefs = AppHost.EventDefinitions.List;
+            for (int i = 0; i < eventDefs.Count; i++) {
+                var evDef = eventDefs[i];
+
+                if ((evDef.Target == target || evDef.Target == EventTarget.etAny) && evDef.Enabled) {
+                    string key = evDef.Tag + ":" + evDef.Type;
+                    int stat = eventStats.GetValue(key);
+
+                    freqList.Add(new FreqItem<EventDef>(evDef, evDef.DisplayName, stat));
+                }
             }
 
-            FreqCollection<string>.PopulateCombo(fView.EventType, freqList, -1);
+            FreqCollection<string>.PopulateCombo(fView.EventType, freqList, null);
         }
 
         public override void UpdateView()
@@ -142,27 +148,18 @@ public override void UpdateView()
             fView.MediaList.ListModel.DataOwner = fEvent;
             fView.SourcesList.ListModel.DataOwner = fEvent;
 
-            var evtName = fEvent.GetTagName();
-            if (fEvent is GDMFamilyEvent) {
-                SetEventTypes(GKData.FamilyEvents);
-                int idx = GKUtils.GetFamilyEventIndex(evtName);
-                if (idx < 0) idx = 0;
-                fView.EventType.SetSelectedTag(idx);
-            } else {
-                SetEventTypes(GKData.PersonEvents);
-                int idx = GKUtils.GetPersonEventIndex(evtName);
-                if (idx < 0) idx = 0;
-                fView.EventType.SetSelectedTag(idx);
+            EventTarget evtTarget = fEvent is GDMFamilyEvent ? EventTarget.etFamily : EventTarget.etIndividual;
+            SetEventTypes(evtTarget);
 
-                if (idx >= 0 && GKData.PersonEvents[idx].Kind == PersonEventKind.ekFact) {
-                    fView.Attribute.Text = fEvent.StringValue;
-                }
+            var evDef = AppHost.EventDefinitions.Find(fEvent);
+            fView.EventType.SetSelectedTag(evDef);
+            if (evDef != null && evDef.Kind == EventKind.ekFact) {
+                fView.Attribute.Text = fEvent.StringValue;
             }
 
             ChangeEventType();
 
             fView.Date.Date = fEvent.Date.Value;
-            fView.EventName.Text = fEvent.Classification;
             fView.Cause.Text = fEvent.Cause;
             fView.Agency.Text = fEvent.Agency;
 
@@ -231,35 +228,26 @@ private void SetAttributeMode(bool active)
 
         public void ChangeEventType()
         {
-            int idx = fView.EventType.GetSelectedTag<int>();
-            if (idx < 0) {
-                idx = 0;
-                fView.EventType.SetSelectedTag(idx);
+            var evDef = fView.EventType.GetSelectedTag<EventDef>();
+            if (evDef == null) {
+                evDef = AppHost.EventDefinitions.Find(GEDCOMTagName.EVEN, "");
+                fView.EventType.SetSelectedTag(evDef);
             }
 
-            string evName;
-
-            if (fEvent is GDMFamilyEvent) {
-                evName = GKData.FamilyEvents[idx].Sign;
-
-                SetAttributeMode(false);
-            } else {
-                evName = GKData.PersonEvents[idx].Sign;
-
-                bool isFact = (GKData.PersonEvents[idx].Kind == PersonEventKind.ekFact);
-                SetAttributeMode(isFact);
-            }
+            string evTag = evDef.Tag;
+            bool isFact = (evDef.Kind == EventKind.ekFact);
+            SetAttributeMode(isFact);
 
             // TODO: It is necessary to provide the registrable list of values for different tag types.
             string[] vals;
             bool canbeSorted, fixedList;
 
-            if (evName == GEDCOMTagName._BGRO) {
+            if (evTag == GEDCOMTagName._BGRO) {
                 vals = GKData.BloodGroups.Split('|');
                 canbeSorted = false;
                 fixedList = true;
             } else {
-                vals = fBase.Context.ValuesCollection.GetValues(evName);
+                vals = fBase.Context.ValuesCollection.GetValues(evTag);
                 canbeSorted = true;
                 fixedList = false;
             }
diff --git a/projects/GKCore/GKCore/Controllers/FilePropertiesDlgController.cs b/projects/GKCore/GKCore/Controllers/FilePropertiesDlgController.cs
index 060e592df..245fb591c 100644
--- a/projects/GKCore/GKCore/Controllers/FilePropertiesDlgController.cs
+++ b/projects/GKCore/GKCore/Controllers/FilePropertiesDlgController.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".
  *
@@ -126,8 +126,9 @@ public override void SetLocale()
             GetControl<ITabPage>("pageOther").Text = LangMan.LS(LSID.Other);
             GetControl<ILabel>("lblLanguage").Text = LangMan.LS(LSID.Language);
 
+            fView.RecordStats.ClearColumns();
             fView.RecordStats.AddColumn(LangMan.LS(LSID.RM_Records), 300, false);
-            fView.RecordStats.AddColumn("Count", 100, false /*, HorizontalAlignment.Right*/);
+            fView.RecordStats.AddColumn(LangMan.LS(LSID.Count), 100, false, BSDTypes.HorizontalAlignment.Right);
         }
     }
 }
diff --git a/projects/GKCore/GKCore/Controllers/NameEditDlgController.cs b/projects/GKCore/GKCore/Controllers/NameEditDlgController.cs
index c2d58aa79..5f82397b6 100644
--- a/projects/GKCore/GKCore/Controllers/NameEditDlgController.cs
+++ b/projects/GKCore/GKCore/Controllers/NameEditDlgController.cs
@@ -20,11 +20,10 @@
 
 using System;
 using GDModel;
-using GKCore.Design.Controls;
 using GKCore.Design;
+using GKCore.Design.Controls;
 using GKCore.Design.Views;
 using GKCore.Names;
-using GKCore.Types;
 
 namespace GKCore.Controllers
 {
diff --git a/projects/GKCore/GKCore/Controllers/OptionsDlgController.cs b/projects/GKCore/GKCore/Controllers/OptionsDlgController.cs
index cdaeeaf8f..678364f62 100644
--- a/projects/GKCore/GKCore/Controllers/OptionsDlgController.cs
+++ b/projects/GKCore/GKCore/Controllers/OptionsDlgController.cs
@@ -18,6 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+using System.Threading.Tasks;
 using GKCore.Design;
 using GKCore.Design.Controls;
 using GKCore.Design.Views;
@@ -52,6 +53,8 @@ public OptionsDlgController(IOptionsDlg view) : base(view)
             fTempColumns = IndividualListModel.CreateIndividualListColumns();
 
             FillGeoSearchCountries();
+
+            fView.EventTypesList.ListModel = new EventDefsListModel(fView, null, null);
         }
 
         private void FillGeoSearchCountries()
@@ -180,6 +183,14 @@ public void UpdateOtherOptions()
             GetControl<IComboBox>("cmbCertaintyAlgorithm").SetSelectedTag(fOptions.CertaintyAlgorithm);
         }
 
+        public async Task AcceptLanguage()
+        {
+            var item = GetControl<IComboBox>("cmbLanguages").SelectedItem as ComboItem<int>;
+            if (item != null) {
+                await AppHost.Instance.LoadLanguage(item.Tag, false);
+            }
+        }
+
         public async void AcceptOtherOptions()
         {
             fOptions.ShowTips = GetControl<ICheckBox>("chkShowOnStart").Checked;
@@ -191,10 +202,7 @@ public async void AcceptOtherOptions()
             fOptions.Geocoder = GetControl<IComboBox>("cmbGeocoder").Text;
             fOptions.GeoSearchCountry = GetControl<IComboBox>("cmbGeoSearchCountry").Text;
 
-            var item = GetControl<IComboBox>("cmbLanguages").SelectedItem as ComboItem<int>;
-            if (item != null) {
-                await AppHost.Instance.LoadLanguage(item.Tag);
-            }
+            await AcceptLanguage();
 
             fOptions.CertaintyAlgorithm = GetControl<IComboBox>("cmbCertaintyAlgorithm").GetSelectedTag<CertaintyAlgorithm>();
         }
@@ -480,6 +488,11 @@ public void AcceptSpecials()
             fOptions.ShowNumberOfSubstructures = GetControl<ICheckBox>("chkShowNumberOfSubstructures").Checked;
         }
 
+        private void UpdateEventTypes()
+        {
+            fView.EventTypesList.ListModel.DataOwner = AppHost.EventDefinitions;
+        }
+
         public void UpdatePlugins()
         {
             var listView = GetControl<IListView>("lvPlugins");
@@ -753,6 +766,9 @@ public override void UpdateView()
             // specials
             UpdateSpecials();
 
+            // event types
+            UpdateEventTypes();
+
             // plugins
             if (!AppHost.Instance.HasFeatureSupport(Feature.Mobile)) {
                 UpdatePlugins();
@@ -995,6 +1011,9 @@ public override void SetLocale()
             GetControl<ICheckBox>("chkReversePlacesOrder").Text = LangMan.LS(LSID.ReversePlacesOrder);
             GetControl<ICheckBox>("chkShowNumberOfSubstructures").Text = LangMan.LS(LSID.ShowNumberOfSubstructures);
 
+            // event types
+            GetControl<ITabPage>("pageEventTypes").Text = LangMan.LS(LSID.EventTypes);
+
             // Plugins
             if (!AppHost.Instance.HasFeatureSupport(Feature.Mobile)) {
                 GetControl<ITabPage>("pagePlugins").Text = LangMan.LS(LSID.Plugins);
diff --git a/projects/GKCore/GKCore/Types/PersonEventKind.cs b/projects/GKCore/GKCore/Design/Views/IEventDefEditDlg.cs
similarity index 63%
rename from projects/GKCore/GKCore/Types/PersonEventKind.cs
rename to projects/GKCore/GKCore/Design/Views/IEventDefEditDlg.cs
index b6ef98641..26b035a5a 100644
--- a/projects/GKCore/GKCore/Types/PersonEventKind.cs
+++ b/projects/GKCore/GKCore/Design/Views/IEventDefEditDlg.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2017 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -18,11 +18,19 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace GKCore.Types
+using GKCore.Design.Controls;
+using GKCore.Interfaces;
+
+namespace GKCore.Design.Views
 {
-    public enum PersonEventKind
+    public interface IEventDefEditDlg : ICommonDialog
     {
-        ekEvent,
-        ekFact
+        EventDef EventDef { get; set; }
+
+        ITextBox NameText { get; }
+        IComboBox TagCombo { get; }
+        ITextBox TypeText { get; }
+        ICheckBox EnabledCheck { get; }
+        ITextBox DescText { get; }
     }
 }
diff --git a/projects/GKCore/GKCore/Design/Views/IEventEditDlg.cs b/projects/GKCore/GKCore/Design/Views/IEventEditDlg.cs
index 32cc07c21..4911c5d29 100644
--- a/projects/GKCore/GKCore/Design/Views/IEventEditDlg.cs
+++ b/projects/GKCore/GKCore/Design/Views/IEventEditDlg.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".
  *
@@ -35,7 +35,6 @@ public interface IEventEditDlg : ICommonDialog, IBaseEditor, IDataReceiver
 
         IComboBox Attribute { get; }
         ITextBox Place { get; }
-        ITextBox EventName { get; }
         ITextBox Cause { get; }
         ITextBox Agency { get; }
 
diff --git a/projects/GKCore/GKCore/Design/Views/IOptionsDlg.cs b/projects/GKCore/GKCore/Design/Views/IOptionsDlg.cs
index 32d8a970a..484a43330 100644
--- a/projects/GKCore/GKCore/Design/Views/IOptionsDlg.cs
+++ b/projects/GKCore/GKCore/Design/Views/IOptionsDlg.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".
  *
@@ -19,12 +19,15 @@
  */
 
 using GKCore.Interfaces;
+using GKCore.Lists;
 using GKCore.Options;
 
 namespace GKCore.Design.Views
 {
     public interface IOptionsDlg : ICommonDialog
     {
+        ISheetList EventTypesList { get; }
+
         void AcceptCircleChartsOptions();
         void UpdateCircleChartsOptions();
         void SetPage(OptionsPage page);
diff --git a/projects/GKCore/GKCore/EventDefinitions.cs b/projects/GKCore/GKCore/EventDefinitions.cs
new file mode 100644
index 000000000..c4854e485
--- /dev/null
+++ b/projects/GKCore/GKCore/EventDefinitions.cs
@@ -0,0 +1,251 @@
+/*
+ *  "GEDKeeper", the personal genealogical database editor.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
+ *
+ *  This file is part of "GEDKeeper".
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using GDModel;
+using GDModel.Providers.GEDCOM;
+using GKCore.Types;
+
+namespace GKCore
+{
+    /// <summary>
+    /// Event Definition.
+    /// </summary>
+    public class EventDef : IGDMObject
+    {
+        public string DisplayName { get; set; }
+
+        public string Tag { get; set; }
+
+        public string Type { get; set; }
+
+        public bool Enabled { get; set; }
+
+        public string Description { get; set; }
+
+
+        internal EventTarget Target { get; set; }
+
+        internal EventKind Kind { get; set; }
+
+        internal bool Protected { get; set; }
+
+        internal bool AcceptableEmpty { get; set; }
+
+
+        public EventDef()
+        {
+        }
+
+        internal EventDef(PredefinedEvent predefEvent)
+        {
+            string tagOrigin = predefEvent.Tag.StartsWith("_") ? "GEDKeeper" : "GEDCOM";
+            string typeOrigin = predefEvent.Kind == EventKind.ekEvent ? "event" : "fact";
+            string desc = string.Format("predefined {0} {1} tag", tagOrigin, typeOrigin);
+
+            DisplayName = LangMan.LS(predefEvent.Name);
+            Description = desc;
+            Tag = predefEvent.Tag;
+            Type = "";
+            Enabled = true;
+            Target = predefEvent.Target;
+            Kind = predefEvent.Kind;
+            Protected = true;
+            AcceptableEmpty = predefEvent.AcceptableEmpty;
+        }
+
+        public EventDef(string displayName, string description, string tag, string type, bool enabled, EventTarget target)
+        {
+            DisplayName = displayName;
+            Description = description;
+            Tag = tag;
+            Type = type;
+            Enabled = enabled;
+            Target = target;
+            Kind = (tag == GEDCOMTagName.EVEN) ? EventKind.ekEvent : EventKind.ekFact;
+            Protected = false;
+            AcceptableEmpty = false;
+        }
+    }
+
+
+    public class EventDefList : List<EventDef>, IGDMList<EventDef>
+    {
+        public void Dispose()
+        {
+        }
+
+        public new EventDef Add(EventDef item)
+        {
+            base.Add(item);
+            return item;
+        }
+
+        public new void Remove(EventDef item)
+        {
+            base.Remove(item);
+        }
+    }
+
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public sealed class EventDefinitions : IGDMObject
+    {
+        private EventDefList fEventDefs;
+        private Dictionary<string, EventDef> fIndex;
+
+        internal EventDefList List
+        {
+            get { return fEventDefs; }
+        }
+
+        public EventDefinitions()
+        {
+            fEventDefs = new EventDefList();
+            fIndex = new Dictionary<string, EventDef>();
+        }
+
+        private void Add(EventDef eventDef)
+        {
+            fEventDefs.Add(eventDef);
+
+            string key = eventDef.Tag + ":" + eventDef.Type;
+            fIndex.Add(key, eventDef);
+        }
+
+        public EventDef Find(string tag, string type)
+        {
+            string key = tag + ":" + type;
+            EventDef result;
+            return fIndex.TryGetValue(key, out result) ? result : null;
+        }
+
+        public EventDef Find(GDMCustomEvent evt)
+        {
+            if (evt == null)
+                return null;
+
+            string tag = evt.GetTagName();
+            string type = evt.Classification;
+            return Find(tag, type);
+        }
+
+        public void Collect(GDMCustomEvent evt)
+        {
+            if (evt == null)
+                throw new ArgumentNullException("evt");
+
+            try {
+                string tag = evt.GetTagName();
+                string type = evt.Classification;
+
+                if (!string.IsNullOrEmpty(type)) {
+                    var eventDef = Find(tag, type);
+                    if (eventDef == null) {
+                        EventTarget target = (evt is GDMFamilyEvent) ? EventTarget.etFamily : EventTarget.etIndividual;
+                        eventDef = new EventDef(type, "custom event/fact tag", tag, type, true, target);
+                        Add(eventDef);
+                    } else {
+                        eventDef.Enabled = true;
+                    }
+                }
+            } catch (Exception ex) {
+                Logger.WriteError("EventDefinitions.Collect()", ex);
+            }
+        }
+
+        public void InitPredefined()
+        {
+            // clear all data
+            fEventDefs.Clear();
+            fIndex.Clear();
+
+            // load predefined event types (constant properties)
+            var predefList = GKData.PredefinedEvents;
+            for (int i = 0; i < predefList.Length; i++) {
+                var predefEvent = predefList[i];
+
+                var eventDef = new EventDef(predefEvent);
+                Add(eventDef);
+            }
+        }
+
+        public void Load(string fileName)
+        {
+            InitPredefined();
+
+            if (!File.Exists(fileName)) return;
+
+            // load variable customizable event types
+            try {
+                EventDef[] loadedDefs;
+                using (var reader = new StreamReader(fileName)) {
+                    string content = reader.ReadToEnd();
+                    loadedDefs = YamlHelper.Deserialize<EventDef[]>(content);
+                }
+
+                if (loadedDefs != null && loadedDefs.Length > 0) {
+                    for (int i = 0; i < loadedDefs.Length; i++) {
+                        var loadedDef = loadedDefs[i];
+
+                        var eventDef = Find(loadedDef.Tag, loadedDef.Type);
+                        if (eventDef != null) {
+                            eventDef.Enabled = loadedDef.Enabled;
+                            eventDef.DisplayName = loadedDef.DisplayName;
+                            // other properties don't change
+                        } else {
+                            eventDef = new EventDef(loadedDef.DisplayName, loadedDef.Description, loadedDef.Tag, loadedDef.Type, loadedDef.Enabled, EventTarget.etIndividual);
+                            Add(eventDef);
+                        }
+                    }
+                }
+            } catch (Exception ex) {
+                Logger.WriteError("EventDefinitions.Load()", ex);
+            }
+        }
+
+        public void Save(string fileName)
+        {
+            try {
+                using (var writer = new StreamWriter(fileName)) {
+                    string content = YamlHelper.Serialize(fEventDefs);
+                    writer.Write(content);
+                    writer.Flush();
+                }
+            } catch (Exception ex) {
+                Logger.WriteError("EventDefinitions.Save()", ex);
+            }
+        }
+
+        /*private static int DefsCompare(EventDef e1, EventDef e2)
+        {
+            return e1.DisplayName.CompareTo(e2.DisplayName);
+        }
+
+        public void Sort()
+        {
+            fEventDefs.Sort(DefsCompare);
+        }*/
+    }
+}
diff --git a/projects/GKCore/GKCore/GKData.cs b/projects/GKCore/GKCore/GKData.cs
index f7f7d6de4..3507eb0ed 100644
--- a/projects/GKCore/GKCore/GKData.cs
+++ b/projects/GKCore/GKCore/GKData.cs
@@ -88,6 +88,7 @@ public static class GKData
         #endif
 
         public const string CHECK_MARK = " ✔ ";
+        public const string CROSS_MARK = " ❌ ";
 
         public sealed class SexStruct
         {
@@ -117,22 +118,6 @@ public MarStatusStruct(LSID name, string sign)
             }
         }
 
-        public sealed class EventStruct
-        {
-            public LSID Name;
-            public string Sign;
-            public PersonEventKind Kind;
-            public bool AcceptableEmpty;
-
-            public EventStruct(LSID name, string sign, PersonEventKind kind, bool acceptableEmpty = false)
-            {
-                Name = name;
-                Sign = sign;
-                Kind = kind;
-                AcceptableEmpty = acceptableEmpty;
-            }
-        }
-
         public sealed class DateKindStruct
         {
             public LSID Name;
@@ -223,10 +208,9 @@ public FARPropertyStruct(LSID name, bool enabled)
         public static readonly RecordTypeStruct[] RecordTypes;
         public static readonly SexStruct[] SexData;
         public static readonly MarStatusStruct[] MarriageStatus;
-        public static readonly EventStruct[] PersonEvents;
+        public static readonly PredefinedEvent[] PredefinedEvents;
         public static readonly DateKindStruct[] DateKinds;
         public static readonly CalendarStruct[] DateCalendars;
-        public static readonly EventStruct[] FamilyEvents;
         public static readonly StoreTypeRec[] GKStoreTypes;
         public static readonly LSID[] MediaTypes;
         public static readonly LSID[] PriorityNames;
@@ -373,73 +357,71 @@ static GKData()
                 new DateKindStruct(LSID.DK_9, 1)  // Estimated; 1
             };
 
-            PersonEvents = new EventStruct[] {
-                new EventStruct(LSID.Event, GEDCOMTagName.EVEN, PersonEventKind.ekEvent),
-                new EventStruct(LSID.Birth, GEDCOMTagName.BIRT, PersonEventKind.ekEvent),
-                new EventStruct(LSID.Adoption, GEDCOMTagName.ADOP, PersonEventKind.ekEvent),
-                new EventStruct(LSID.Christening, GEDCOMTagName.CHR, PersonEventKind.ekEvent),
-                new EventStruct(LSID.Graduation, GEDCOMTagName.GRAD, PersonEventKind.ekEvent),
-                new EventStruct(LSID.Retirement, GEDCOMTagName.RETI, PersonEventKind.ekEvent),
-                new EventStruct(LSID.Naturalization, GEDCOMTagName.NATU, PersonEventKind.ekEvent),
-                new EventStruct(LSID.Emigration, GEDCOMTagName.EMIG, PersonEventKind.ekEvent),
-                new EventStruct(LSID.Immigration, GEDCOMTagName.IMMI, PersonEventKind.ekEvent),
-                new EventStruct(LSID.Census, GEDCOMTagName.CENS, PersonEventKind.ekEvent),
-                new EventStruct(LSID.LastWill, GEDCOMTagName.WILL, PersonEventKind.ekEvent),
-                new EventStruct(LSID.ProbateOfWill, GEDCOMTagName.PROB, PersonEventKind.ekEvent),
-                new EventStruct(LSID.Death, GEDCOMTagName.DEAT, PersonEventKind.ekEvent),
-                new EventStruct(LSID.Burial, GEDCOMTagName.BURI, PersonEventKind.ekEvent),
-                new EventStruct(LSID.Cremation, GEDCOMTagName.CREM, PersonEventKind.ekEvent),
-
-                new EventStruct(LSID.Fact, GEDCOMTagName.FACT, PersonEventKind.ekFact),
-                new EventStruct(LSID.Religion, GEDCOMTagName.RELI, PersonEventKind.ekFact),
-                new EventStruct(LSID.Nationality, GEDCOMTagName.NATI, PersonEventKind.ekFact),
-                new EventStruct(LSID.Residence, GEDCOMTagName.RESI, PersonEventKind.ekFact, true),
-                new EventStruct(LSID.PhysicalDesc, GEDCOMTagName.DSCR, PersonEventKind.ekFact),
-                new EventStruct(LSID.NationalIDNumber, GEDCOMTagName.IDNO, PersonEventKind.ekFact),
-                new EventStruct(LSID.SocialSecurityNumber, GEDCOMTagName.SSN, PersonEventKind.ekFact),
-                new EventStruct(LSID.ChildsCount, GEDCOMTagName.NCHI, PersonEventKind.ekFact),
-                new EventStruct(LSID.MarriagesCount, GEDCOMTagName.NMR, PersonEventKind.ekFact),
-                new EventStruct(LSID.Education, GEDCOMTagName.EDUC, PersonEventKind.ekFact),
-                new EventStruct(LSID.Occupation, GEDCOMTagName.OCCU, PersonEventKind.ekFact),
-                new EventStruct(LSID.Caste, GEDCOMTagName.CAST, PersonEventKind.ekFact),
-                new EventStruct(LSID.PersonalProperty, GEDCOMTagName.PROP, PersonEventKind.ekFact),
-                new EventStruct(LSID.NobilityTitle, GEDCOMTagName.TITL, PersonEventKind.ekFact),
-
-                new EventStruct(LSID.Travel, GEDCOMTagName._TRAVEL, PersonEventKind.ekFact),
-                new EventStruct(LSID.Hobby, GEDCOMTagName._HOBBY, PersonEventKind.ekFact),
-                new EventStruct(LSID.Award, GEDCOMTagName._AWARD, PersonEventKind.ekFact),
-                new EventStruct(LSID.Mili, GEDCOMTagName._MILI, PersonEventKind.ekFact),
-                new EventStruct(LSID.MiliInd, GEDCOMTagName._MILI_IND, PersonEventKind.ekFact),
-                new EventStruct(LSID.MiliDis, GEDCOMTagName._MILI_DIS, PersonEventKind.ekFact),
-                new EventStruct(LSID.MiliRank, GEDCOMTagName._MILI_RANK, PersonEventKind.ekFact),
-
-                new EventStruct(LSID.BloodGroup, GEDCOMTagName._BGRO, PersonEventKind.ekFact),
-                new EventStruct(LSID.HairColor, GEDCOMTagName._HAIR, PersonEventKind.ekFact),
-                new EventStruct(LSID.EyesColor, GEDCOMTagName._EYES, PersonEventKind.ekFact),
-                new EventStruct(LSID.MDNAHaplogroup, GEDCOMTagName._MDNA, PersonEventKind.ekFact),
-                new EventStruct(LSID.YDNAHaplogroup, GEDCOMTagName._YDNA, PersonEventKind.ekFact),
-
-                new EventStruct(LSID.Baptism, GEDCOMTagName.BAPM, PersonEventKind.ekEvent),
-                new EventStruct(LSID.BarMitzvah, GEDCOMTagName.BARM, PersonEventKind.ekEvent),
-                new EventStruct(LSID.BatMitzvah, GEDCOMTagName.BASM, PersonEventKind.ekEvent),
-                new EventStruct(LSID.Blessing, GEDCOMTagName.BLES, PersonEventKind.ekEvent),
-                new EventStruct(LSID.AdultChristening, GEDCOMTagName.CHRA, PersonEventKind.ekEvent),
-                new EventStruct(LSID.Confirmation, GEDCOMTagName.CONF, PersonEventKind.ekEvent),
-                new EventStruct(LSID.FirstCommunion, GEDCOMTagName.FCOM, PersonEventKind.ekEvent),
-                new EventStruct(LSID.Ordination, GEDCOMTagName.ORDN, PersonEventKind.ekEvent),
-            };
-
-            FamilyEvents = new EventStruct[] {
-                new EventStruct(LSID.Event, GEDCOMTagName.EVEN, PersonEventKind.ekEvent),
-                new EventStruct(LSID.FEvt_1, GEDCOMTagName.ENGA, PersonEventKind.ekEvent),
-                new EventStruct(LSID.FEvt_2, GEDCOMTagName.MARR, PersonEventKind.ekEvent),
-                new EventStruct(LSID.FEvt_3, GEDCOMTagName.MARB, PersonEventKind.ekEvent),
-                new EventStruct(LSID.FEvt_4, GEDCOMTagName.MARC, PersonEventKind.ekEvent),
-                new EventStruct(LSID.FEvt_5, GEDCOMTagName.MARL, PersonEventKind.ekEvent),
-                new EventStruct(LSID.FEvt_6, GEDCOMTagName.MARS, PersonEventKind.ekEvent),
-                new EventStruct(LSID.FEvt_7, GEDCOMTagName.ANUL, PersonEventKind.ekEvent),
-                new EventStruct(LSID.FEvt_8, GEDCOMTagName.DIVF, PersonEventKind.ekEvent),
-                new EventStruct(LSID.FEvt_9, GEDCOMTagName.DIV, PersonEventKind.ekEvent),
+            PredefinedEvents = new PredefinedEvent[] {
+                new PredefinedEvent(LSID.Event, GEDCOMTagName.EVEN, EventKind.ekEvent, EventTarget.etAny),
+
+                new PredefinedEvent(LSID.Birth, GEDCOMTagName.BIRT, EventKind.ekEvent, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.Adoption, GEDCOMTagName.ADOP, EventKind.ekEvent, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.Christening, GEDCOMTagName.CHR, EventKind.ekEvent, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.Graduation, GEDCOMTagName.GRAD, EventKind.ekEvent, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.Retirement, GEDCOMTagName.RETI, EventKind.ekEvent, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.Naturalization, GEDCOMTagName.NATU, EventKind.ekEvent, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.Emigration, GEDCOMTagName.EMIG, EventKind.ekEvent, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.Immigration, GEDCOMTagName.IMMI, EventKind.ekEvent, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.Census, GEDCOMTagName.CENS, EventKind.ekEvent, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.LastWill, GEDCOMTagName.WILL, EventKind.ekEvent, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.ProbateOfWill, GEDCOMTagName.PROB, EventKind.ekEvent, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.Death, GEDCOMTagName.DEAT, EventKind.ekEvent, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.Burial, GEDCOMTagName.BURI, EventKind.ekEvent, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.Cremation, GEDCOMTagName.CREM, EventKind.ekEvent, EventTarget.etIndividual),
+
+                new PredefinedEvent(LSID.Fact, GEDCOMTagName.FACT, EventKind.ekFact, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.Religion, GEDCOMTagName.RELI, EventKind.ekFact, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.Nationality, GEDCOMTagName.NATI, EventKind.ekFact, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.Residence, GEDCOMTagName.RESI, EventKind.ekFact, EventTarget.etIndividual, true),
+                new PredefinedEvent(LSID.PhysicalDesc, GEDCOMTagName.DSCR, EventKind.ekFact, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.NationalIDNumber, GEDCOMTagName.IDNO, EventKind.ekFact, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.SocialSecurityNumber, GEDCOMTagName.SSN, EventKind.ekFact, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.ChildsCount, GEDCOMTagName.NCHI, EventKind.ekFact, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.MarriagesCount, GEDCOMTagName.NMR, EventKind.ekFact, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.Education, GEDCOMTagName.EDUC, EventKind.ekFact, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.Occupation, GEDCOMTagName.OCCU, EventKind.ekFact, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.Caste, GEDCOMTagName.CAST, EventKind.ekFact, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.PersonalProperty, GEDCOMTagName.PROP, EventKind.ekFact, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.NobilityTitle, GEDCOMTagName.TITL, EventKind.ekFact, EventTarget.etIndividual),
+
+                new PredefinedEvent(LSID.Travel, GEDCOMTagName._TRAVEL, EventKind.ekFact, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.Hobby, GEDCOMTagName._HOBBY, EventKind.ekFact, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.Award, GEDCOMTagName._AWARD, EventKind.ekFact, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.Mili, GEDCOMTagName._MILI, EventKind.ekFact, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.MiliInd, GEDCOMTagName._MILI_IND, EventKind.ekFact, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.MiliDis, GEDCOMTagName._MILI_DIS, EventKind.ekFact, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.MiliRank, GEDCOMTagName._MILI_RANK, EventKind.ekFact, EventTarget.etIndividual),
+
+                new PredefinedEvent(LSID.BloodGroup, GEDCOMTagName._BGRO, EventKind.ekFact, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.HairColor, GEDCOMTagName._HAIR, EventKind.ekFact, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.EyesColor, GEDCOMTagName._EYES, EventKind.ekFact, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.MDNAHaplogroup, GEDCOMTagName._MDNA, EventKind.ekFact, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.YDNAHaplogroup, GEDCOMTagName._YDNA, EventKind.ekFact, EventTarget.etIndividual),
+
+                new PredefinedEvent(LSID.Baptism, GEDCOMTagName.BAPM, EventKind.ekEvent, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.BarMitzvah, GEDCOMTagName.BARM, EventKind.ekEvent, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.BatMitzvah, GEDCOMTagName.BASM, EventKind.ekEvent, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.Blessing, GEDCOMTagName.BLES, EventKind.ekEvent, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.AdultChristening, GEDCOMTagName.CHRA, EventKind.ekEvent, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.Confirmation, GEDCOMTagName.CONF, EventKind.ekEvent, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.FirstCommunion, GEDCOMTagName.FCOM, EventKind.ekEvent, EventTarget.etIndividual),
+                new PredefinedEvent(LSID.Ordination, GEDCOMTagName.ORDN, EventKind.ekEvent, EventTarget.etIndividual),
+
+                new PredefinedEvent(LSID.FEvt_1, GEDCOMTagName.ENGA, EventKind.ekEvent, EventTarget.etFamily),
+                new PredefinedEvent(LSID.FEvt_2, GEDCOMTagName.MARR, EventKind.ekEvent, EventTarget.etFamily),
+                new PredefinedEvent(LSID.FEvt_3, GEDCOMTagName.MARB, EventKind.ekEvent, EventTarget.etFamily),
+                new PredefinedEvent(LSID.FEvt_4, GEDCOMTagName.MARC, EventKind.ekEvent, EventTarget.etFamily),
+                new PredefinedEvent(LSID.FEvt_5, GEDCOMTagName.MARL, EventKind.ekEvent, EventTarget.etFamily),
+                new PredefinedEvent(LSID.FEvt_6, GEDCOMTagName.MARS, EventKind.ekEvent, EventTarget.etFamily),
+                new PredefinedEvent(LSID.FEvt_7, GEDCOMTagName.ANUL, EventKind.ekEvent, EventTarget.etFamily),
+                new PredefinedEvent(LSID.FEvt_8, GEDCOMTagName.DIVF, EventKind.ekEvent, EventTarget.etFamily),
+                new PredefinedEvent(LSID.FEvt_9, GEDCOMTagName.DIV, EventKind.ekEvent, EventTarget.etFamily),
             };
 
             MarriageStatus = new MarStatusStruct[] {
diff --git a/projects/GKCore/GKCore/GKUtils.cs b/projects/GKCore/GKCore/GKUtils.cs
index 88eb50a00..7de6f798d 100644
--- a/projects/GKCore/GKCore/GKUtils.cs
+++ b/projects/GKCore/GKCore/GKUtils.cs
@@ -638,41 +638,21 @@ public static string GetAttributeValue(GDMIndividualRecord iRec, string attrName
 
         public static bool IsAttribute(GDMCustomEvent evt)
         {
-            return (evt != null && GetPersonEventKindBySign(evt.GetTagName()) == PersonEventKind.ekFact);
+            var eventDef = AppHost.EventDefinitions.Find(evt);
+            return (eventDef != null && eventDef.Kind == EventKind.ekFact);
         }
 
-        public static PersonEventKind GetPersonEventKindBySign(string sign)
+        public static EventKind GetPredefinedEventKind(string tag)
         {
-            int idx = GetPersonEventIndex(sign);
-            return (idx < 0) ? PersonEventKind.ekFact : GKData.PersonEvents[idx].Kind;
-        }
-
-        public static int GetPersonEventIndex(string sign)
-        {
-            int res = -1;
-
-            for (int i = 0; i < GKData.PersonEvents.Length; i++) {
-                if (GKData.PersonEvents[i].Sign == sign) {
-                    res = i;
-                    break;
+            var predefEvents = GKData.PredefinedEvents;
+            for (int i = 0; i < predefEvents.Length; i++) {
+                var predefEvt = predefEvents[i];
+                if (predefEvt.Tag == tag) {
+                    return predefEvt.Kind;
                 }
             }
 
-            return res;
-        }
-
-        public static int GetFamilyEventIndex(string sign)
-        {
-            int res = -1;
-
-            for (int i = 0; i < GKData.FamilyEvents.Length; i++) {
-                if (GKData.FamilyEvents[i].Sign == sign) {
-                    res = i;
-                    break;
-                }
-            }
-
-            return res;
+            return EventKind.ekFact;
         }
 
         /// <summary>
@@ -691,25 +671,8 @@ public static string GetEventName(GDMCustomEvent evt)
             if (evt == null)
                 throw new ArgumentNullException("evt");
 
-            string result = "";
-
-            var evtName = evt.GetTagName();
-            if (evt is GDMIndividualEvent || evt is GDMIndividualAttribute) {
-                int ev = GetPersonEventIndex(evtName);
-                if (evtName == GEDCOMTagName.EVEN || evtName == GEDCOMTagName.FACT) {
-                    result = !string.IsNullOrEmpty(evt.Classification) ? evt.Classification : LangMan.LS(GKData.PersonEvents[ev].Name);
-                } else {
-                    result = (ev > 0) ? LangMan.LS(GKData.PersonEvents[ev].Name) : evtName;
-                }
-            } else if (evt is GDMFamilyEvent) {
-                int ev = GetFamilyEventIndex(evtName);
-                if (ev == 0) {
-                    result = !string.IsNullOrEmpty(evt.Classification) ? evt.Classification : LangMan.LS(GKData.FamilyEvents[ev].Name);
-                } else {
-                    result = (ev > 0) ? LangMan.LS(GKData.FamilyEvents[ev].Name) : evtName;
-                }
-            }
-
+            var eventDef = AppHost.EventDefinitions.Find(evt);
+            string result = (eventDef != null) ? eventDef.DisplayName : evt.GetTagName();
             return result;
         }
 
diff --git a/projects/GKCore/GKCore/LangMan.cs b/projects/GKCore/GKCore/LangMan.cs
index b5db95f38..3eeb0183b 100644
--- a/projects/GKCore/GKCore/LangMan.cs
+++ b/projects/GKCore/GKCore/LangMan.cs
@@ -1034,13 +1034,13 @@ public enum LSID
         /* 960 */ SourceWithoutLinks,
         /* 961 */ CheckLinks,
 
-        /* 962 */ Reserved_962,
-        /* 963 */ Reserved_963,
-        /* 964 */ Reserved_964,
-        /* 965 */ Reserved_965,
-        /* 966 */ Reserved_966,
-        /* 967 */ Reserved_967,
-        /* 968 */ Reserved_968,
+        /* 962 */ EventTypes,
+        /* 963 */ Count,
+        /* 964 */ Enabled,
+        /* 965 */ Tag,
+        /* 966 */ Description,
+        /* 967 */ TagTypeWarning,
+        /* 968 */ EventDefinition,
         /* 969 */ Reserved_969,
         /* 970 */ Reserved_970,
 
@@ -2045,13 +2045,13 @@ public static class LangMan
             /* 960 */ "Source without links",
             /* 961 */ "Check links",
 
-            /* 962 */ "<?>",
-            /* 963 */ "<?>",
-            /* 964 */ "<?>",
-            /* 965 */ "<?>",
-            /* 966 */ "<?>",
-            /* 967 */ "<?>",
-            /* 968 */ "<?>",
+            /* 962 */ "Event types",
+            /* 963 */ "Count",
+            /* 964 */ "Enabled",
+            /* 965 */ "Tag",
+            /* 966 */ "Description",
+            /* 967 */ "For custom events and facts, the type must be entered",
+            /* 968 */ "Event Definition",
             /* 969 */ "<?>",
             /* 970 */ "<?>",
 
diff --git a/projects/GKCore/GKCore/Lists/EventDefsListModel.cs b/projects/GKCore/GKCore/Lists/EventDefsListModel.cs
new file mode 100644
index 000000000..a325f6009
--- /dev/null
+++ b/projects/GKCore/GKCore/Lists/EventDefsListModel.cs
@@ -0,0 +1,138 @@
+/*
+ *  "GEDKeeper", the personal genealogical database editor.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
+ *
+ *  This file is part of "GEDKeeper".
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+using System;
+using System.Threading.Tasks;
+using BSLib;
+using GKCore.Controllers;
+using GKCore.Design;
+using GKCore.Interfaces;
+using GKCore.Operations;
+using GKCore.Types;
+
+namespace GKCore.Lists
+{
+    public sealed class EventDefsListModel : SheetModel<EventDef>
+    {
+        public EventDefsListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman)
+        {
+            AllowedActions = EnumSet<RecordAction>.Create(RecordAction.raAdd, RecordAction.raEdit, RecordAction.raDelete);
+
+            fListColumns.AddColumn(LSID.Name, 300, false);
+            fListColumns.AddColumn(LSID.Enabled, 100, false);
+            fListColumns.AddColumn(LSID.Record, 300, false);
+            fListColumns.ResetDefaults();
+        }
+
+        private static string GetTargetStr(EventTarget target)
+        {
+            switch (target) {
+                case EventTarget.etIndividual:
+                    return LangMan.LS(LSID.Person);
+
+                case EventTarget.etFamily:
+                    return LangMan.LS(LSID.Family);
+
+                case EventTarget.etAny:
+                    return LangMan.LS(LSID.Person) + ", " + LangMan.LS(LSID.Family);
+            }
+
+            return string.Empty;
+        }
+
+        protected override object GetColumnValueEx(int colType, int colSubtype, bool isVisible)
+        {
+            object result = null;
+            switch (colType) {
+                case 0:
+                    result = fFetchedRec.DisplayName;
+                    break;
+                case 1:
+                    result = fFetchedRec.Enabled ? GKData.CHECK_MARK : GKData.CROSS_MARK;
+                    break;
+                case 2:
+                    result = GetTargetStr(fFetchedRec.Target);
+                    break;
+            }
+            return result;
+        }
+
+        public override void UpdateContents()
+        {
+            var dataOwner = fDataOwner as EventDefinitions;
+            if (dataOwner == null) return;
+
+            try {
+                UpdateStructList(dataOwner.List);
+            } catch (Exception ex) {
+                Logger.WriteError("EventDefsListModel.UpdateContents()", ex);
+            }
+        }
+
+        public override void OnItemSelected(int itemIndex, object rowData)
+        {
+            var eventDef = rowData as EventDef;
+
+            var actions = AllowedActions;
+
+            if (eventDef.Protected) {
+                actions.Exclude(RecordAction.raDelete);
+            } else {
+                actions.Include(RecordAction.raDelete);
+            }
+
+            AllowedActions = actions;
+        }
+
+        public override async Task Modify(object sender, ModifyEventArgs eArgs)
+        {
+            var dataOwner = fDataOwner as EventDefinitions;
+            if (dataOwner == null) return;
+
+            var eventDef = eArgs.ItemData as EventDef;
+
+            bool result = false;
+
+            switch (eArgs.Action) {
+                case RecordAction.raAdd:
+                case RecordAction.raEdit: {
+                        var defRes = await BaseController.ModifyEventDef(fOwner, dataOwner.List, eventDef);
+                        eventDef = defRes.Record;
+                        result = defRes.Result;
+                    }
+                    break;
+
+                case RecordAction.raDelete:
+                    if (await AppHost.StdDialogs.ShowQuestion(LangMan.LS(LSID.RemoveEventQuery))) {
+                        dataOwner.List.Remove(eventDef);
+                        result = true;
+                    }
+                    break;
+            }
+
+            if (result) {
+                if (eArgs.Action == RecordAction.raAdd) {
+                    eArgs.ItemData = eventDef;
+                }
+                eArgs.IsChanged = true;
+            }
+        }
+    }
+}
diff --git a/projects/GKCore/GKCore/Lists/ListSource.cs b/projects/GKCore/GKCore/Lists/ListSource.cs
index fb244f9a1..7c0956e4f 100644
--- a/projects/GKCore/GKCore/Lists/ListSource.cs
+++ b/projects/GKCore/GKCore/Lists/ListSource.cs
@@ -40,7 +40,7 @@ namespace GKCore.Lists
     ///
     /// </summary>
     public abstract class ListSource<T> : IListSource
-        where T : GDMTag
+        where T : class, IGDMObject
     {
         private readonly ExtObservableList<ContentItem> fContentList;
         private SGCulture fSysCulture;
@@ -130,7 +130,7 @@ public void Clear()
             fExternalFilter = null;
             fFilter.Clear();
 
-            fFetchedRec = null;
+            fFetchedRec = default(T);
 
             fColumnsMap.Clear();
             fListColumns.Clear();
@@ -744,7 +744,7 @@ private int CompareItems(ContentItem item1, ContentItem item2)
         public void SortContents(int sortColumn, bool sortAscending)
         {
             try {
-                fSysCulture = CulturesPool.GetSystemCulture(fBaseContext.Culture);
+                fSysCulture = (fBaseContext != null) ? CulturesPool.GetSystemCulture(fBaseContext.Culture) : SGCulture.CurrentCulture;
 
                 fContentList.BeginUpdate();
 
diff --git a/projects/GKCore/GKCore/Lists/SheetModel.cs b/projects/GKCore/GKCore/Lists/SheetModel.cs
index 0b13c4402..6186da59a 100644
--- a/projects/GKCore/GKCore/Lists/SheetModel.cs
+++ b/projects/GKCore/GKCore/Lists/SheetModel.cs
@@ -123,7 +123,7 @@ public interface ISheetModel : IListSource
     /// 
     /// </summary>
     public abstract class SheetModel<T> : ListSource<T>, ISheetModel
-        where T : GDMTag
+        where T : class, IGDMObject
     {
         private EnumSet<RecordAction> fAllowedActions;
         protected ISheetList fSheetList;
@@ -131,7 +131,7 @@ public abstract class SheetModel<T> : ListSource<T>, ISheetModel
         protected readonly ChangeTracker fUndoman;
         protected IGDMObject fDataOwner;
         protected IView fOwner;
-        protected GDMList<T> fStructList;
+        protected IGDMList<T> fStructList;
 
 
         public EnumSet<RecordAction> AllowedActions
@@ -166,7 +166,7 @@ public ISheetList SheetList
 
 
         protected SheetModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) :
-            base(baseWin.Context, new ListColumns<T>())
+            base((baseWin != null ? baseWin.Context : null), new ListColumns<T>())
         {
             fAllowedActions = new EnumSet<RecordAction>();
             fBaseWin = baseWin;
@@ -174,7 +174,7 @@ protected SheetModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) :
             fUndoman = undoman;
         }
 
-        protected void UpdateStructList(GDMList<T> structList)
+        protected void UpdateStructList(IGDMList<T> structList)
         {
             fStructList = structList;
 
@@ -200,7 +200,8 @@ protected virtual GDMRecord GetReferenceRecord(object itemData)
 
         public void ShowDetails(object itemData)
         {
-            BaseController.ViewRecordInfo(fOwner, fBaseWin, GetReferenceRecord(itemData));
+            if (fBaseWin != null)
+                BaseController.ViewRecordInfo(fOwner, fBaseWin, GetReferenceRecord(itemData));
         }
     }
 }
diff --git a/projects/GKCore/GKCore/Operations/OrdinaryOperation.cs b/projects/GKCore/GKCore/Operations/OrdinaryOperation.cs
index c78b11832..ff0e0e8c9 100644
--- a/projects/GKCore/GKCore/Operations/OrdinaryOperation.cs
+++ b/projects/GKCore/GKCore/Operations/OrdinaryOperation.cs
@@ -381,7 +381,7 @@ private bool ProcessRecordNoteAdd(bool redo)
                     fOldVal = notes;
                 } else {
                     GDMNotes notes = fOldVal as GDMNotes;
-                    swl.Notes.Delete(notes);
+                    swl.Notes.Remove(notes);
                 }
             }
             return result;
@@ -415,7 +415,7 @@ private bool ProcessRecordMediaAdd(bool redo)
                     fOldVal = mmLink;
                 } else {
                     GDMMultimediaLink mmLink = fOldVal as GDMMultimediaLink;
-                    swl.MultimediaLinks.Delete(mmLink);
+                    swl.MultimediaLinks.Remove(mmLink);
                 }
             }
             return result;
diff --git a/projects/GKCore/GKCore/ScriptEngine.cs b/projects/GKCore/GKCore/ScriptEngine.cs
index d1dc82c25..42f46afcc 100644
--- a/projects/GKCore/GKCore/ScriptEngine.cs
+++ b/projects/GKCore/GKCore/ScriptEngine.cs
@@ -369,7 +369,7 @@ public void delete_individual_association(object recPtr, int idx)
             GDMIndividualRecord iRec = recPtr as GDMIndividualRecord;
             if (iRec == null || !iRec.HasAssociations) return;
 
-            iRec.Associations.DeleteAt(idx);
+            iRec.Associations.RemoveAt(idx);
         }
 
         public int get_individual_events_count(object recPtr)
@@ -397,7 +397,7 @@ public void delete_individual_event(object recPtr, int idx)
             GDMIndividualRecord iRec = recPtr as GDMIndividualRecord;
             if (iRec == null) return;
 
-            iRec.Events.DeleteAt(idx);
+            iRec.Events.RemoveAt(idx);
         }
 
         public string get_event_date(object evPtr)
diff --git a/projects/GKCore/GKCore/Tools/TreeInspector.cs b/projects/GKCore/GKCore/Tools/TreeInspector.cs
index b2279ff73..8e45c9a25 100644
--- a/projects/GKCore/GKCore/Tools/TreeInspector.cs
+++ b/projects/GKCore/GKCore/Tools/TreeInspector.cs
@@ -166,13 +166,13 @@ private static void CheckIndividualLinks(GDMTree tree, GDMIndividualRecord iRec,
             for (int i = iRec.ChildToFamilyLinks.Count - 1; i >= 0; i--) {
                 var cfl = iRec.ChildToFamilyLinks[i];
                 if (cfl == null) {
-                    iRec.ChildToFamilyLinks.DeleteAt(i);
+                    iRec.ChildToFamilyLinks.RemoveAt(i);
                     continue;
                 }
 
                 GDMFamilyRecord family = tree.GetPtrValue(cfl);
                 if (family == null) {
-                    iRec.ChildToFamilyLinks.DeleteAt(i);
+                    iRec.ChildToFamilyLinks.RemoveAt(i);
                     continue;
                 }
 
@@ -192,13 +192,13 @@ private static void CheckIndividualLinks(GDMTree tree, GDMIndividualRecord iRec,
             for (int i = iRec.SpouseToFamilyLinks.Count - 1; i >= 0; i--) {
                 var sfl = iRec.SpouseToFamilyLinks[i];
                 if (sfl == null) {
-                    iRec.SpouseToFamilyLinks.DeleteAt(i);
+                    iRec.SpouseToFamilyLinks.RemoveAt(i);
                     continue;
                 }
 
                 GDMFamilyRecord family = tree.GetPtrValue(sfl);
                 if (family == null) {
-                    iRec.SpouseToFamilyLinks.DeleteAt(i);
+                    iRec.SpouseToFamilyLinks.RemoveAt(i);
                     continue;
                 }
 
@@ -235,13 +235,13 @@ private static void CheckFamilyLinks(GDMTree tree, GDMFamilyRecord fRec, List<Ch
             for (int j = fRec.Children.Count - 1; j >= 0; j--) {
                 var cl = fRec.Children[j];
                 if (cl == null) {
-                    fRec.Children.DeleteAt(j);
+                    fRec.Children.RemoveAt(j);
                     continue;
                 }
 
                 GDMIndividualRecord child = tree.GetPtrValue(cl);
                 if (child == null) {
-                    fRec.Children.DeleteAt(j);
+                    fRec.Children.RemoveAt(j);
                     continue;
                 }
 
@@ -570,6 +570,8 @@ public static void CheckBase(IBaseWindow baseWin, List<CheckObj> checksList, IPr
 
             Censuses.Instance.Load(GKUtils.GetExternalsPath() + "censuses\\Russia.yaml");
 
+            bool checkLinks = (options != null && options.CheckLinks);
+
             try {
                 GDMTree tree = baseWin.Context.Tree;
                 progress.Begin(LangMan.LS(LSID.TreeCheck), tree.RecordsCount);
@@ -593,11 +595,11 @@ public static void CheckBase(IBaseWindow baseWin, List<CheckObj> checksList, IPr
                             break;
 
                         case GDMRecordType.rtNote:
-                            if (options.CheckLinks) CheckNoteRecord(baseWin.Context, rec as GDMNoteRecord, checksList);
+                            if (checkLinks) CheckNoteRecord(baseWin.Context, rec as GDMNoteRecord, checksList);
                             break;
 
                         case GDMRecordType.rtSource:
-                            if (options.CheckLinks) CheckSourceRecord(baseWin.Context, rec as GDMSourceRecord, checksList);
+                            if (checkLinks) CheckSourceRecord(baseWin.Context, rec as GDMSourceRecord, checksList);
                             break;
                     }
                 }
diff --git a/projects/GKCore/GKCore/Types/PredefinedEvent.cs b/projects/GKCore/GKCore/Types/PredefinedEvent.cs
new file mode 100644
index 000000000..cbdbcbe5f
--- /dev/null
+++ b/projects/GKCore/GKCore/Types/PredefinedEvent.cs
@@ -0,0 +1,55 @@
+/*
+ *  "GEDKeeper", the personal genealogical database editor.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
+ *
+ *  This file is part of "GEDKeeper".
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace GKCore.Types
+{
+    public enum EventKind
+    {
+        ekEvent,
+        ekFact
+    }
+
+
+    public enum EventTarget
+    {
+        etIndividual,
+        etFamily,
+        etAny
+    }
+
+
+    public sealed class PredefinedEvent
+    {
+        public LSID Name;
+        public string Tag;
+        public EventKind Kind;
+        public EventTarget Target;
+        public bool AcceptableEmpty;
+
+        public PredefinedEvent(LSID name, string tag, EventKind kind, EventTarget target, bool acceptableEmpty = false)
+        {
+            Name = name;
+            Tag = tag;
+            Kind = kind;
+            Target = target;
+            AcceptableEmpty = acceptableEmpty;
+        }
+    }
+}
diff --git a/projects/GKTests/GDModel/GDMListTests.cs b/projects/GKTests/GDModel/GDMListTests.cs
index e2a33c07c..72733b268 100644
--- a/projects/GKTests/GDModel/GDMListTests.cs
+++ b/projects/GKTests/GDModel/GDMListTests.cs
@@ -44,7 +44,7 @@ public void Test_Common()
 
             using (var list = new GDMList<GDMTag>()) {
                 // internal list is null (all routines instant returned)
-                list.Delete(null);
+                list.Remove(null);
                 list.Exchange(0, 1);
                 Assert.IsNull(list.Extract(0));
                 Assert.IsNull(list.Extract(null));
@@ -60,7 +60,7 @@ public void Test_Common()
                     Assert.AreEqual(2, list2.Count);
                 }
 
-                list.Delete(obj1);
+                list.Remove(obj1);
                 Assert.AreEqual(-1, list.IndexOf(obj1));
                 Assert.AreEqual(0, list.IndexOf(obj2));
 
diff --git a/projects/GKTests/GDModel/GDMPersonalNameTests.cs b/projects/GKTests/GDModel/GDMPersonalNameTests.cs
index 9cb1ed019..8482fd5e9 100644
--- a/projects/GKTests/GDModel/GDMPersonalNameTests.cs
+++ b/projects/GKTests/GDModel/GDMPersonalNameTests.cs
@@ -207,7 +207,7 @@ public void Test_Common()
                                 "2 _RELN ReligiousName\r\n"+
                                 "2 _CENN CensusName\r\n", buf2);
 
-                iRec.PersonalNames.Delete(nameCopy);
+                iRec.PersonalNames.Remove(nameCopy);
             }
 
             using (GDMPersonalName name1 = new GDMPersonalName()) {
diff --git a/projects/GKTests/GKCore/ControllerTests.cs b/projects/GKTests/GKCore/ControllerTests.cs
index c7443d202..f93062891 100644
--- a/projects/GKTests/GKCore/ControllerTests.cs
+++ b/projects/GKTests/GKCore/ControllerTests.cs
@@ -253,7 +253,6 @@ public void Test_EventEditDlgController()
             view.Date.Returns(Substitute.For<IDateControl>());
             view.Attribute.Returns(Substitute.For<IComboBox>());
             view.Place.Returns(Substitute.For<ITextBox>());
-            view.EventName.Returns(Substitute.For<ITextBox>());
             view.Cause.Returns(Substitute.For<ITextBox>());
             view.Agency.Returns(Substitute.For<ITextBox>());
             view.NotesList.Returns(Substitute.For<ISheetList>());
@@ -755,6 +754,7 @@ public void Test_TreeCheckController()
             SubstituteControl<ITabPage>(view, "pageOptions");
             SubstituteControl<ICheckBox>(view, "chkCheckPersonPlaces");
             SubstituteControl<ICheckBox>(view, "chkCheckCensuses");
+            SubstituteControl<ICheckBox>(view, "chkCheckLinks");
 
             view.ChecksList.Returns(Substitute.For<IListView>());
 
diff --git a/projects/GKTests/GKCore/GKUtilsTests.cs b/projects/GKTests/GKCore/GKUtilsTests.cs
index 944c25f26..026befbec 100644
--- a/projects/GKTests/GKCore/GKUtilsTests.cs
+++ b/projects/GKTests/GKCore/GKUtilsTests.cs
@@ -56,13 +56,6 @@ public void Test_GetXPath()
             Assert.AreEqual(appPath + "plugins" + Path.DirectorySeparatorChar, GKUtils.GetPluginsPath());
         }
 
-        [Test]
-        public void Test_GetXIndex()
-        {
-            Assert.AreEqual(1, GKUtils.GetPersonEventIndex(GEDCOMTagName.BIRT));
-            Assert.AreEqual(2, GKUtils.GetFamilyEventIndex(GEDCOMTagName.MARR));
-        }
-
         [Test]
         public void Test_GetAttributeValue()
         {
diff --git a/projects/GKTests/GKCore/ValuesCollectionTests.cs b/projects/GKTests/GKCore/ValuesCollectionTests.cs
index 335e3f71a..4fd492191 100644
--- a/projects/GKTests/GKCore/ValuesCollectionTests.cs
+++ b/projects/GKTests/GKCore/ValuesCollectionTests.cs
@@ -43,7 +43,7 @@ public void Test_Common()
             Assert.AreEqual(2, valsCol.Count);
 
             string[] values = valsCol.GetValues("xxxxx");
-            Assert.AreEqual(null, values);
+            Assert.AreEqual(0, values.Length);
 
             values = valsCol.GetValues("red");
             Assert.AreEqual("rojo", values[0]);
diff --git a/projects/GKv2/GEDKeeper2/GEDKeeper2.csproj b/projects/GKv2/GEDKeeper2/GEDKeeper2.csproj
index 77d6806ba..4b4c1b089 100644
--- a/projects/GKv2/GEDKeeper2/GEDKeeper2.csproj
+++ b/projects/GKv2/GEDKeeper2/GEDKeeper2.csproj
@@ -107,6 +107,12 @@
     <Compile Include="GKUI\Forms\CommunicationEditDlg.Designer.cs">
       <DependentUpon>CommunicationEditDlg.cs</DependentUpon>
     </Compile>
+    <Compile Include="GKUI\Forms\EventDefEditDlg.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="GKUI\Forms\EventDefEditDlg.Designer.cs">
+      <DependentUpon>EventDefEditDlg.cs</DependentUpon>
+    </Compile>
     <Compile Include="GKUI\Forms\EventEditDlg.cs">
       <SubType>Form</SubType>
     </Compile>
diff --git a/projects/GKv2/GEDKeeper2/GKUI/Forms/EventDefEditDlg.Designer.cs b/projects/GKv2/GEDKeeper2/GKUI/Forms/EventDefEditDlg.Designer.cs
new file mode 100644
index 000000000..f32bebda2
--- /dev/null
+++ b/projects/GKv2/GEDKeeper2/GKUI/Forms/EventDefEditDlg.Designer.cs
@@ -0,0 +1,161 @@
+namespace GKUI.Forms
+{
+    partial class EventDefEditDlg
+    {
+        private System.Windows.Forms.Label lblName;
+        private System.Windows.Forms.TextBox txtName;
+        private System.Windows.Forms.Label lblTag;
+        private System.Windows.Forms.ComboBox cmbTag;
+        private System.Windows.Forms.Button btnAccept;
+        private System.Windows.Forms.Button btnCancel;
+        private System.Windows.Forms.Label lblType;
+        private System.Windows.Forms.TextBox txtType;
+        private System.Windows.Forms.CheckBox chkEnabled;
+        private System.Windows.Forms.Label lblDesc;
+        private System.Windows.Forms.TextBox txtDesc;
+
+        private void InitializeComponent()
+        {
+            this.lblName = new System.Windows.Forms.Label();
+            this.txtName = new System.Windows.Forms.TextBox();
+            this.lblTag = new System.Windows.Forms.Label();
+            this.cmbTag = new System.Windows.Forms.ComboBox();
+            this.btnAccept = new System.Windows.Forms.Button();
+            this.btnCancel = new System.Windows.Forms.Button();
+            this.lblType = new System.Windows.Forms.Label();
+            this.txtType = new System.Windows.Forms.TextBox();
+            this.chkEnabled = new System.Windows.Forms.CheckBox();
+            this.lblDesc = new System.Windows.Forms.Label();
+            this.txtDesc = new System.Windows.Forms.TextBox();
+            this.SuspendLayout();
+            // 
+            // lblName
+            // 
+            this.lblName.AutoSize = true;
+            this.lblName.Location = new System.Drawing.Point(12, 13);
+            this.lblName.Name = "lblName";
+            this.lblName.Size = new System.Drawing.Size(55, 17);
+            this.lblName.TabIndex = 0;
+            this.lblName.Text = "lblName";
+            // 
+            // txtName
+            // 
+            this.txtName.Location = new System.Drawing.Point(131, 10);
+            this.txtName.Name = "txtName";
+            this.txtName.Size = new System.Drawing.Size(270, 24);
+            this.txtName.TabIndex = 1;
+            this.txtName.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.edName_KeyPress);
+            // 
+            // lblTag
+            // 
+            this.lblTag.AutoSize = true;
+            this.lblTag.Location = new System.Drawing.Point(12, 43);
+            this.lblTag.Name = "lblTag";
+            this.lblTag.Size = new System.Drawing.Size(43, 17);
+            this.lblTag.TabIndex = 2;
+            this.lblTag.Text = "lblTag";
+            // 
+            // cmbTag
+            // 
+            this.cmbTag.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbTag.Location = new System.Drawing.Point(131, 40);
+            this.cmbTag.Name = "cmbTag";
+            this.cmbTag.Size = new System.Drawing.Size(169, 25);
+            this.cmbTag.TabIndex = 3;
+            // 
+            // btnAccept
+            // 
+            this.btnAccept.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.btnAccept.Location = new System.Drawing.Point(164, 171);
+            this.btnAccept.Name = "btnAccept";
+            this.btnAccept.Size = new System.Drawing.Size(114, 30);
+            this.btnAccept.TabIndex = 5;
+            this.btnAccept.Text = "btnAccept";
+            this.btnAccept.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.btnAccept.Click += new System.EventHandler(this.AcceptClickHandler);
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnCancel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.btnCancel.Location = new System.Drawing.Point(288, 171);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Size = new System.Drawing.Size(113, 30);
+            this.btnCancel.TabIndex = 6;
+            this.btnCancel.Text = "btnCancel";
+            this.btnCancel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.btnCancel.Click += new System.EventHandler(this.CancelClickHandler);
+            // 
+            // lblType
+            // 
+            this.lblType.AutoSize = true;
+            this.lblType.Location = new System.Drawing.Point(12, 74);
+            this.lblType.Name = "lblType";
+            this.lblType.Size = new System.Drawing.Size(51, 17);
+            this.lblType.TabIndex = 7;
+            this.lblType.Text = "lblType";
+            // 
+            // txtType
+            // 
+            this.txtType.Location = new System.Drawing.Point(131, 71);
+            this.txtType.Name = "txtType";
+            this.txtType.Size = new System.Drawing.Size(270, 24);
+            this.txtType.TabIndex = 8;
+            // 
+            // chkEnabled
+            // 
+            this.chkEnabled.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.chkEnabled.Location = new System.Drawing.Point(12, 101);
+            this.chkEnabled.Name = "chkEnabled";
+            this.chkEnabled.Size = new System.Drawing.Size(288, 24);
+            this.chkEnabled.TabIndex = 9;
+            this.chkEnabled.Text = "chkEnabled";
+            this.chkEnabled.UseVisualStyleBackColor = true;
+            // 
+            // lblDesc
+            // 
+            this.lblDesc.AutoSize = true;
+            this.lblDesc.Location = new System.Drawing.Point(12, 134);
+            this.lblDesc.Name = "lblDesc";
+            this.lblDesc.Size = new System.Drawing.Size(50, 17);
+            this.lblDesc.TabIndex = 10;
+            this.lblDesc.Text = "lblDesc";
+            // 
+            // txtDesc
+            // 
+            this.txtDesc.Location = new System.Drawing.Point(131, 131);
+            this.txtDesc.Name = "txtDesc";
+            this.txtDesc.Size = new System.Drawing.Size(270, 24);
+            this.txtDesc.TabIndex = 11;
+            // 
+            // EventDefEditDlg
+            // 
+            this.AcceptButton = this.btnAccept;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(120F, 120F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.CancelButton = this.btnCancel;
+            this.ClientSize = new System.Drawing.Size(416, 215);
+            this.Controls.Add(this.lblDesc);
+            this.Controls.Add(this.txtDesc);
+            this.Controls.Add(this.chkEnabled);
+            this.Controls.Add(this.lblType);
+            this.Controls.Add(this.txtType);
+            this.Controls.Add(this.lblName);
+            this.Controls.Add(this.txtName);
+            this.Controls.Add(this.lblTag);
+            this.Controls.Add(this.cmbTag);
+            this.Controls.Add(this.btnAccept);
+            this.Controls.Add(this.btnCancel);
+            this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "EventDefEditDlg";
+            this.ShowInTaskbar = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "EventDefEditDlg";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+        }
+    }
+}
diff --git a/projects/GKv2/GEDKeeper2/GKUI/Forms/EventDefEditDlg.cs b/projects/GKv2/GEDKeeper2/GKUI/Forms/EventDefEditDlg.cs
new file mode 100644
index 000000000..b996dfb4c
--- /dev/null
+++ b/projects/GKv2/GEDKeeper2/GKUI/Forms/EventDefEditDlg.cs
@@ -0,0 +1,84 @@
+/*
+ *  "GEDKeeper", the personal genealogical database editor.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
+ *
+ *  This file is part of "GEDKeeper".
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+using System.Windows.Forms;
+using GKCore;
+using GKCore.Controllers;
+using GKCore.Design.Controls;
+using GKCore.Design.Views;
+using GKUI.Components;
+
+namespace GKUI.Forms
+{
+    public sealed partial class EventDefEditDlg : CommonDialog<IEventDefEditDlg, EventDefEditDlgController>, IEventDefEditDlg
+    {
+        public EventDef EventDef
+        {
+            get { return fController.EventDef; }
+            set { fController.EventDef = value; }
+        }
+
+        #region View Interface
+
+        ITextBox IEventDefEditDlg.NameText
+        {
+            get { return GetControlHandler<ITextBox>(txtName); }
+        }
+
+        IComboBox IEventDefEditDlg.TagCombo
+        {
+            get { return GetControlHandler<IComboBox>(cmbTag); }
+        }
+
+        ITextBox IEventDefEditDlg.TypeText
+        {
+            get { return GetControlHandler<ITextBox>(txtType); }
+        }
+
+        ICheckBox IEventDefEditDlg.EnabledCheck
+        {
+            get { return GetControlHandler<ICheckBox>(chkEnabled); }
+        }
+
+        ITextBox IEventDefEditDlg.DescText
+        {
+            get { return GetControlHandler<ITextBox>(txtDesc); }
+        }
+
+        #endregion
+
+        public EventDefEditDlg()
+        {
+            InitializeComponent();
+
+            btnAccept.Image = UIHelper.LoadResourceImage("Resources.btn_accept.gif");
+            btnCancel.Image = UIHelper.LoadResourceImage("Resources.btn_cancel.gif");
+
+            fController = new EventDefEditDlgController(this);
+        }
+
+        private void edName_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            if (e.KeyChar == '/') {
+                e.Handled = true;
+            }
+        }
+    }
+}
diff --git a/projects/GKv2/GEDKeeper2/GKUI/Forms/EventEditDlg.Designer.cs b/projects/GKv2/GEDKeeper2/GKUI/Forms/EventEditDlg.Designer.cs
index 40529fb83..e5fed42a0 100644
--- a/projects/GKv2/GEDKeeper2/GKUI/Forms/EventEditDlg.Designer.cs
+++ b/projects/GKv2/GEDKeeper2/GKUI/Forms/EventEditDlg.Designer.cs
@@ -17,7 +17,6 @@ partial class EventEditDlg
 		private System.Windows.Forms.Label lblOrg;
 		private System.Windows.Forms.Label lblAttrValue;
 		private System.Windows.Forms.ComboBox cmbEventType;
-		private System.Windows.Forms.TextBox txtEventName;
 		private System.Windows.Forms.TextBox txtEventPlace;
 		private System.Windows.Forms.TextBox txtEventCause;
 		private System.Windows.Forms.TextBox txtEventOrg;
@@ -42,7 +41,6 @@ private void InitializeComponent()
 		    this.btnPlaceAdd = new System.Windows.Forms.Button();
 		    this.btnPlaceDelete = new System.Windows.Forms.Button();
 		    this.cmbEventType = new System.Windows.Forms.ComboBox();
-		    this.txtEventName = new System.Windows.Forms.TextBox();
 		    this.txtEventPlace = new System.Windows.Forms.TextBox();
 		    this.txtEventCause = new System.Windows.Forms.TextBox();
 		    this.txtEventOrg = new System.Windows.Forms.TextBox();
@@ -103,7 +101,6 @@ private void InitializeComponent()
 		    this.pageCommon.Controls.Add(this.btnPlaceAdd);
 		    this.pageCommon.Controls.Add(this.btnPlaceDelete);
 		    this.pageCommon.Controls.Add(this.cmbEventType);
-		    this.pageCommon.Controls.Add(this.txtEventName);
 		    this.pageCommon.Controls.Add(this.txtEventPlace);
 		    this.pageCommon.Controls.Add(this.txtEventCause);
 		    this.pageCommon.Controls.Add(this.txtEventOrg);
@@ -203,13 +200,6 @@ private void InitializeComponent()
 		    this.cmbEventType.TabIndex = 1;
 		    this.cmbEventType.SelectedIndexChanged += new System.EventHandler(this.EditEventType_SelectedIndexChanged);
 		    // 
-		    // txtEventName
-		    // 
-		    this.txtEventName.Location = new System.Drawing.Point(280, 29);
-		    this.txtEventName.Name = "txtEventName";
-		    this.txtEventName.Size = new System.Drawing.Size(316, 24);
-		    this.txtEventName.TabIndex = 2;
-		    // 
 		    // txtEventPlace
 		    // 
 		    this.txtEventPlace.Location = new System.Drawing.Point(11, 146);
diff --git a/projects/GKv2/GEDKeeper2/GKUI/Forms/EventEditDlg.cs b/projects/GKv2/GEDKeeper2/GKUI/Forms/EventEditDlg.cs
index b5b8a8f67..cbfb712d1 100644
--- a/projects/GKv2/GEDKeeper2/GKUI/Forms/EventEditDlg.cs
+++ b/projects/GKv2/GEDKeeper2/GKUI/Forms/EventEditDlg.cs
@@ -80,11 +80,6 @@ ITextBox IEventEditDlg.Place
             get { return GetControlHandler<ITextBox>(txtEventPlace); }
         }
 
-        ITextBox IEventEditDlg.EventName
-        {
-            get { return  GetControlHandler<ITextBox>(txtEventName); }
-        }
-
         ITextBox IEventEditDlg.Cause
         {
             get { return  GetControlHandler<ITextBox>(txtEventCause); }
diff --git a/projects/GKv2/GEDKeeper2/GKUI/Forms/OptionsDlg.Designer.cs b/projects/GKv2/GEDKeeper2/GKUI/Forms/OptionsDlg.Designer.cs
index e3e0e3443..e43f67dee 100644
--- a/projects/GKv2/GEDKeeper2/GKUI/Forms/OptionsDlg.Designer.cs
+++ b/projects/GKv2/GEDKeeper2/GKUI/Forms/OptionsDlg.Designer.cs
@@ -188,6 +188,8 @@ partial class OptionsDlg
         private System.Windows.Forms.CheckBox chkELAbbreviatedNames;
         private System.Windows.Forms.CheckBox chkReversePlacesOrder;
         private System.Windows.Forms.CheckBox chkShowNumberOfSubstructures;
+        private System.Windows.Forms.TabPage pageEventTypes;
+        private GKUI.Components.GKSheetList slEventTypes;
 
         private void InitializeComponent()
         {
@@ -377,6 +379,8 @@ private void InitializeComponent()
             this.chkELAbbreviatedNames = new System.Windows.Forms.CheckBox();
             this.chkReversePlacesOrder = new System.Windows.Forms.CheckBox();
             this.chkShowNumberOfSubstructures = new System.Windows.Forms.CheckBox();
+            this.pageEventTypes = new System.Windows.Forms.TabPage();
+            this.slEventTypes = new GKUI.Components.GKSheetList();
             this.PageControl1.SuspendLayout();
             this.pageCommon.SuspendLayout();
             this.groupBox1.SuspendLayout();
@@ -420,6 +424,7 @@ private void InitializeComponent()
             this.grpPedigreeFormat.SuspendLayout();
             this.pagePlugins.SuspendLayout();
             this.pageSpecials.SuspendLayout();
+            this.pageEventTypes.SuspendLayout();
             this.SuspendLayout();
             // 
             // PageControl1
@@ -430,6 +435,7 @@ private void InitializeComponent()
             this.PageControl1.Controls.Add(this.pageUIView);
             this.PageControl1.Controls.Add(this.pagePedigree);
             this.PageControl1.Controls.Add(this.pageSpecials);
+            this.PageControl1.Controls.Add(this.pageEventTypes);
             this.PageControl1.Controls.Add(this.pagePlugins);
             this.PageControl1.Dock = System.Windows.Forms.DockStyle.Top;
             this.PageControl1.Location = new System.Drawing.Point(0, 0);
@@ -2184,7 +2190,7 @@ private void InitializeComponent()
             this.btnResetDefaults.Location = new System.Drawing.Point(14, 702);
             this.btnResetDefaults.Margin = new System.Windows.Forms.Padding(10);
             this.btnResetDefaults.Name = "btnResetDefaults";
-            this.btnResetDefaults.Size = new System.Drawing.Size(192, 30);
+            this.btnResetDefaults.Size = new System.Drawing.Size(212, 30);
             this.btnResetDefaults.TabIndex = 1;
             this.btnResetDefaults.Text = "btnResetDefaults";
             this.btnResetDefaults.Click += new System.EventHandler(this.btnResetDefaults_Click);
@@ -2459,6 +2465,27 @@ private void InitializeComponent()
             this.chkShowNumberOfSubstructures.TabIndex = 20;
             this.chkShowNumberOfSubstructures.Text = "chkShowNumberOfSubstructures";
             // 
+            // pageEventTypes
+            // 
+            this.pageEventTypes.BackColor = System.Drawing.SystemColors.Control;
+            this.pageEventTypes.Controls.Add(this.slEventTypes);
+            this.pageEventTypes.Location = new System.Drawing.Point(4, 26);
+            this.pageEventTypes.Margin = new System.Windows.Forms.Padding(0);
+            this.pageEventTypes.Name = "pageEventTypes";
+            this.pageEventTypes.Padding = new System.Windows.Forms.Padding(10);
+            this.pageEventTypes.Size = new System.Drawing.Size(741, 762);
+            this.pageEventTypes.TabIndex = 6;
+            this.pageEventTypes.Text = "pageEventTypes";
+            // 
+            // slEventTypes
+            // 
+            this.slEventTypes.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.slEventTypes.Location = new System.Drawing.Point(10, 10);
+            this.slEventTypes.Margin = new System.Windows.Forms.Padding(2);
+            this.slEventTypes.Name = "slEventTypes";
+            this.slEventTypes.Size = new System.Drawing.Size(721, 742);
+            this.slEventTypes.TabIndex = 0;
+            // 
             // pagePlugins
             // 
             this.pagePlugins.BackColor = System.Drawing.SystemColors.Control;
@@ -2647,6 +2674,7 @@ private void InitializeComponent()
             this.grpPedigree.ResumeLayout(false);
             this.grpPedigreeFormat.ResumeLayout(false);
             this.pageSpecials.ResumeLayout(false);
+            this.pageEventTypes.ResumeLayout(false);
             this.pagePlugins.ResumeLayout(false);
             this.ResumeLayout(false);
         }
diff --git a/projects/GKv2/GEDKeeper2/GKUI/Forms/OptionsDlg.cs b/projects/GKv2/GEDKeeper2/GKUI/Forms/OptionsDlg.cs
index e420552be..42e581222 100644
--- a/projects/GKv2/GEDKeeper2/GKUI/Forms/OptionsDlg.cs
+++ b/projects/GKv2/GEDKeeper2/GKUI/Forms/OptionsDlg.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".
  *
@@ -26,6 +26,7 @@
 using GKCore.Design.Graphics;
 using GKCore.Design.Views;
 using GKCore.Interfaces;
+using GKCore.Lists;
 using GKCore.Options;
 using GKUI.Components;
 using GKUI.Platform.Handlers;
@@ -34,10 +35,22 @@ namespace GKUI.Forms
 {
     public sealed partial class OptionsDlg : CommonDialog<IOptionsDlg, OptionsDlgController>, ILocalizable, IOptionsDlg
     {
+        #region View Interface
+
+        ISheetList IOptionsDlg.EventTypesList
+        {
+            get { return slEventTypes; }
+        }
+
+        #endregion
+
+
         public OptionsDlg(IHost host)
         {
             InitializeComponent();
 
+            PageControl1.SelectedIndexChanged += PageControl_SelectedIndexChanged;
+
             btnAccept.Image = UIHelper.LoadResourceImage("Resources.btn_accept.gif");
             btnCancel.Image = UIHelper.LoadResourceImage("Resources.btn_cancel.gif");
             btnColumnUp.Image = UIHelper.LoadResourceImage("Resources.btn_up.gif");
@@ -56,6 +69,17 @@ public OptionsDlg(IHost host)
             chkSeparateDepth_CheckedChanged(null, null);
         }
 
+        private void PageControl_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (PageControl1.SelectedTab == pageEventTypes) {
+                fController.AcceptLanguage();
+                fController.SetLocale();
+                fController.UpdateView();
+            }
+
+            btnResetDefaults.Enabled = PageControl1.SelectedIndex < 6;
+        }
+
         void IOptionsDlg.UpdateCircleChartsOptions()
         {
             ancOptionsControl1.Options = fController.Options.CircleChartOptions;
@@ -154,6 +178,10 @@ private void btnResetDefaults_Click(object sender, EventArgs e)
                     break;
 
                 case 6:
+                    // event types
+                    break;
+
+                case 7:
                     // plugins
                     break;
             }
diff --git a/projects/GKv2/GEDKeeper2/GKUI/Platform/WFAppHost.cs b/projects/GKv2/GEDKeeper2/GKUI/Platform/WFAppHost.cs
index 17532a815..cfec1ab1b 100644
--- a/projects/GKv2/GEDKeeper2/GKUI/Platform/WFAppHost.cs
+++ b/projects/GKv2/GEDKeeper2/GKUI/Platform/WFAppHost.cs
@@ -515,6 +515,7 @@ public static void ConfigureBootstrap()
             container.Register<IUserRefEditDlg, UserRefEditDlg>(LifeCycle.Transient);
             container.Register<IRecordInfoDlg, RecordInfoDlg>(LifeCycle.Transient);
             container.Register<IFARDlg, FindAndReplaceDlg>(LifeCycle.Transient);
+            container.Register<IEventDefEditDlg, EventDefEditDlg>(LifeCycle.Transient);
 
             container.Register<IProgressDialog, ProgressDlg>(LifeCycle.Transient);
 
diff --git a/projects/GKv2/GKTestsUI2/GKComponents/TreeChartBoxTests.cs b/projects/GKv2/GKTestsUI2/GKComponents/TreeChartBoxTests.cs
index a27db2f68..9c845815f 100644
--- a/projects/GKv2/GKTestsUI2/GKComponents/TreeChartBoxTests.cs
+++ b/projects/GKv2/GKTestsUI2/GKComponents/TreeChartBoxTests.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".
  *
@@ -28,6 +28,7 @@
 using GKCore.Options;
 using GKTests;
 using GKTests.Stubs;
+using GKUI.Platform;
 using GKUI.Platform.Handlers;
 using NUnit.Framework;
 
@@ -52,6 +53,7 @@ public override void Setup()
 
             fTreeChartBox = new TreeChartBox();
             fTreeChartBox.Dock = DockStyle.Fill;
+            fTreeChartBox.SetRenderer(new WFGfxRenderer());
 
             fForm.SuspendLayout();
             fForm.Controls.Add(fTreeChartBox);
diff --git a/projects/GKv2/GKTestsUI2/TestUtilsUI.cs b/projects/GKv2/GKTestsUI2/TestUtilsUI.cs
index 54ab585ed..89248bf94 100644
--- a/projects/GKv2/GKTestsUI2/TestUtilsUI.cs
+++ b/projects/GKv2/GKTestsUI2/TestUtilsUI.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".
  *
@@ -36,6 +36,7 @@ public static void InitUITest()
             WFAppHost.ConfigureBootstrap();
 
             LangMan.DefInit();
+            AppHost.EventDefinitions.InitPredefined();
 
             AppHost.Container.Register<IProgressDialog, ProgressStub>(GKCore.IoC.LifeCycle.Singleton, true);
         }
diff --git a/projects/GKv2/GKTestsUI2/UITests/MainSDITests.cs b/projects/GKv2/GKTestsUI2/UITests/MainSDITests.cs
index 43f2c68e8..316e6907c 100644
--- a/projects/GKv2/GKTestsUI2/UITests/MainSDITests.cs
+++ b/projects/GKv2/GKTestsUI2/UITests/MainSDITests.cs
@@ -451,7 +451,7 @@ public void Test_ShowMapsViewerWin()
         public async Task Test_ShowLanguageSelectDlg()
         {
             ModalFormHandler = LanguageSelectDlgTests.LanguageSelectDlg_Accept_Handler;
-            await AppHost.Instance.LoadLanguage(0);
+            await AppHost.Instance.LoadLanguage(0, false);
         }
 
         [Test]
diff --git a/projects/GKv3/GEDKeeper3/GKUI/Forms/EventDefEditDlg.cs b/projects/GKv3/GEDKeeper3/GKUI/Forms/EventDefEditDlg.cs
new file mode 100644
index 000000000..240733380
--- /dev/null
+++ b/projects/GKv3/GEDKeeper3/GKUI/Forms/EventDefEditDlg.cs
@@ -0,0 +1,99 @@
+/*
+ *  "GEDKeeper", the personal genealogical database editor.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
+ *
+ *  This file is part of "GEDKeeper".
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+using Eto.Forms;
+using Eto.Serialization.Xaml;
+using GKCore;
+using GKCore.Controllers;
+using GKCore.Design.Controls;
+using GKCore.Design.Views;
+
+namespace GKUI.Forms
+{
+    public sealed partial class EventDefEditDlg : CommonDialog<IEventDefEditDlg, EventDefEditDlgController>, IEventDefEditDlg
+    {
+        #region Design components
+#pragma warning disable CS0169, CS0649, IDE0044, IDE0051
+
+        private Button btnAccept;
+        private Button btnCancel;
+        private Label lblName;
+        private TextBox txtName;
+        private Label lblTag;
+        private ComboBox cmbTag;
+        private Label lblType;
+        private TextBox txtType;
+        private CheckBox chkEnabled;
+        private Label lblDesc;
+        private TextBox txtDesc;
+
+#pragma warning restore CS0169, CS0649, IDE0044, IDE0051
+        #endregion
+
+        public EventDef EventDef
+        {
+            get { return fController.EventDef; }
+            set { fController.EventDef = value; }
+        }
+
+        #region View Interface
+
+        ITextBox IEventDefEditDlg.NameText
+        {
+            get { return GetControlHandler<ITextBox>(txtName); }
+        }
+
+        IComboBox IEventDefEditDlg.TagCombo
+        {
+            get { return GetControlHandler<IComboBox>(cmbTag); }
+        }
+
+        ITextBox IEventDefEditDlg.TypeText
+        {
+            get { return GetControlHandler<ITextBox>(txtType); }
+        }
+
+        ICheckBox IEventDefEditDlg.EnabledCheck
+        {
+            get { return GetControlHandler<ICheckBox>(chkEnabled); }
+        }
+
+        ITextBox IEventDefEditDlg.DescText
+        {
+            get { return GetControlHandler<ITextBox>(txtDesc); }
+        }
+
+        #endregion
+
+        public EventDefEditDlg()
+        {
+            XamlReader.Load(this);
+
+            fController = new EventDefEditDlgController(this);
+        }
+
+        private void edName_KeyPress(object sender, KeyEventArgs e)
+        {
+            if (e.KeyChar == '/') {
+                e.Handled = true;
+            }
+        }
+    }
+}
diff --git a/projects/GKv3/GEDKeeper3/GKUI/Forms/EventDefEditDlg.xeto b/projects/GKv3/GEDKeeper3/GKUI/Forms/EventDefEditDlg.xeto
new file mode 100644
index 000000000..f666d15da
--- /dev/null
+++ b/projects/GKv3/GEDKeeper3/GKUI/Forms/EventDefEditDlg.xeto
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Dialog xmlns="http://schema.picoe.ca/eto.forms" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:forms="clr-namespace:GKUI.Forms" xmlns:comcom="clr-namespace:GKUI.Components;assembly=GKComponents"
+  x:Class="GKUI.Forms.NameEditDlg"
+  DefaultButton="{x:Reference btnAccept}" AbortButton="{x:Reference btnCancel}">
+
+  <TableLayout Style="paddedTable8">
+
+    <TableRow>
+      <TableLayout Spacing="4, 4">
+
+        <TableRow>
+          <Label x:Name="lblName" />
+          <TextBox x:Name="txtName" Width="260" />
+        </TableRow>
+
+        <TableRow>
+          <Label x:Name="lblTag" />
+          <ComboBox x:Name="cmbTag" ReadOnly="True" />
+        </TableRow>
+
+        <TableRow>
+          <Label x:Name="lblType" />
+          <TextBox x:Name="txtType" Width="260" />
+        </TableRow>
+
+        <TableRow>
+          <CheckBox x:Name="chkEnabled" />
+        </TableRow>
+
+        <TableRow>
+          <Label x:Name="lblDesc" />
+          <TextBox x:Name="txtDesc" Width="260" />
+        </TableRow>
+
+      </TableLayout>
+    </TableRow>
+
+    <TableRow>
+      <StackLayout Spacing="8" Orientation="Horizontal">
+        <StackLayoutItem Expand="True" />
+        <Button x:Name="btnAccept" Style="dlgBtn" Image="{Resource Resources.btn_accept.gif, GKCore}" Click="AcceptClickHandler" />
+        <Button x:Name="btnCancel" Style="dlgBtn" Image="{Resource Resources.btn_cancel.gif, GKCore}" Click="CancelClickHandler" />
+      </StackLayout>
+    </TableRow>
+
+  </TableLayout>
+
+</Dialog>
diff --git a/projects/GKv3/GEDKeeper3/GKUI/Forms/EventEditDlg.cs b/projects/GKv3/GEDKeeper3/GKUI/Forms/EventEditDlg.cs
index faa3be082..8be9c859d 100644
--- a/projects/GKv3/GEDKeeper3/GKUI/Forms/EventEditDlg.cs
+++ b/projects/GKv3/GEDKeeper3/GKUI/Forms/EventEditDlg.cs
@@ -52,7 +52,6 @@ public sealed partial class EventEditDlg : CommonDialog<IEventEditDlg, EventEdit
         private Label lblOrg;
         private Label lblAttrValue;
         private ComboBox cmbEventType;
-        private TextBox txtEventName;
         private TextBox txtEventPlace;
         private TextBox txtEventCause;
         private TextBox txtEventOrg;
@@ -110,11 +109,6 @@ ITextBox IEventEditDlg.Place
             get { return GetControlHandler<ITextBox>(txtEventPlace); }
         }
 
-        ITextBox IEventEditDlg.EventName
-        {
-            get { return  GetControlHandler<ITextBox>(txtEventName); }
-        }
-
         ITextBox IEventEditDlg.Cause
         {
             get { return  GetControlHandler<ITextBox>(txtEventCause); }
diff --git a/projects/GKv3/GEDKeeper3/GKUI/Forms/EventEditDlg.xeto b/projects/GKv3/GEDKeeper3/GKUI/Forms/EventEditDlg.xeto
index 9e55613a9..d85544234 100644
--- a/projects/GKv3/GEDKeeper3/GKUI/Forms/EventEditDlg.xeto
+++ b/projects/GKv3/GEDKeeper3/GKUI/Forms/EventEditDlg.xeto
@@ -14,7 +14,6 @@
               <Label x:Name="lblEvent" />
               <StackLayout Orientation="Horizontal" Spacing="4">
                 <ComboBox x:Name="cmbEventType" Width="180" ReadOnly="True" SelectedIndexChanged="EditEventType_SelectedIndexChanged" />
-                <TextBox x:Name="txtEventName" Width="200" />
               </StackLayout>
             </TableRow>
 
diff --git a/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.cs b/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.cs
index 6e252ff7e..07829821a 100644
--- a/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.cs
+++ b/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.cs
@@ -28,6 +28,7 @@
 using GKCore.Design.Graphics;
 using GKCore.Design.Views;
 using GKCore.Interfaces;
+using GKCore.Lists;
 using GKCore.Options;
 using GKUI.Components;
 using GKUI.Platform.Handlers;
@@ -204,15 +205,29 @@ public sealed partial class OptionsDlg : CommonDialog<IOptionsDlg, OptionsDlgCon
         private CheckBox chkExtendedLocations;
         private CheckBox chkELAbbreviatedNames;
         private CheckBox chkReversePlacesOrder;
+        private TabPage pageEventTypes;
+        private GKSheetList slEventTypes;
 
 #pragma warning restore CS0169, CS0649, IDE0044, IDE0051
         #endregion
 
 
+        #region View Interface
+
+        ISheetList IOptionsDlg.EventTypesList
+        {
+            get { return slEventTypes; }
+        }
+
+        #endregion
+
+
         public OptionsDlg(IHost host)
         {
             XamlReader.Load(this);
 
+            PageControl1.SelectedIndexChanged += PageControl_SelectedIndexChanged;
+
             UIHelper.FixRadioButtons(this, grpFileBackup);
             UIHelper.FixRadioButtons(this, rgFNPFormat);
             UIHelper.FixRadioButtons(this, grpDateFormat);
@@ -235,6 +250,17 @@ public OptionsDlg(IHost host)
             chkSeparateDepth_CheckedChanged(null, null);
         }
 
+        private void PageControl_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (PageControl1.SelectedPage == pageEventTypes) {
+                fController.AcceptLanguage();
+                fController.SetLocale();
+                fController.UpdateView();
+            }
+
+            btnResetDefaults.Enabled = PageControl1.SelectedIndex < 6;
+        }
+
         void IOptionsDlg.UpdateCircleChartsOptions()
         {
             ancOptionsControl1.Options = fController.Options.CircleChartOptions;
diff --git a/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.xeto b/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.xeto
index 28ef5bfc7..e0cdabe70 100644
--- a/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.xeto
+++ b/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.xeto
@@ -488,6 +488,10 @@
           </StackLayout>
         </TabPage>
 
+        <TabPage x:Name="pageEventTypes" Padding="8">
+          <comcom:GKSheetList x:Name="slEventTypes" Height="300" />
+        </TabPage>
+
         <TabPage x:Name="pagePlugins" Padding="8">
           <comcom:GKListView x:Name="lvPlugins" />
         </TabPage>
diff --git a/projects/GKv3/GEDKeeper3/GKUI/Platform/EtoAppHost.cs b/projects/GKv3/GEDKeeper3/GKUI/Platform/EtoAppHost.cs
index bf42f52a6..df7448f94 100644
--- a/projects/GKv3/GEDKeeper3/GKUI/Platform/EtoAppHost.cs
+++ b/projects/GKv3/GEDKeeper3/GKUI/Platform/EtoAppHost.cs
@@ -559,6 +559,7 @@ public static void ConfigureBootstrap()
             container.Register<IUserRefEditDlg, UserRefEditDlg>(LifeCycle.Transient);
             container.Register<IRecordInfoDlg, RecordInfoDlg>(LifeCycle.Transient);
             container.Register<IFARDlg, FindAndReplaceDlg>(LifeCycle.Transient);
+            container.Register<IEventDefEditDlg, EventDefEditDlg>(LifeCycle.Transient);
 
             container.Register<IProgressDialog, ProgressDlg>(LifeCycle.Transient);
 
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/EventDefEditDlg.xaml b/projects/GKvX/GEDKeeperX/GKUI/Forms/EventDefEditDlg.xaml
new file mode 100644
index 000000000..f8cbab2d9
--- /dev/null
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/EventDefEditDlg.xaml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<forms:CommonDialog
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:comcom="clr-namespace:GKUI.Components"
+    xmlns:forms="clr-namespace:GKUI.Forms"
+    xmlns:contr="clr-namespace:GKCore.Controllers;assembly=GKCore"
+    xmlns:mvp="clr-namespace:GKCore.Design.Views;assembly=GKCore"
+    xmlns:plat="clr-namespace:GKUI.Platform"
+    xmlns:input="clr-namespace:Plugin.InputKit.Shared.Controls;assembly=Plugin.InputKit"
+    x:Class="GKUI.Forms.EventDefEditDlg"
+    x:TypeArguments="mvp:IEventDefEditDlg, contr:EventDefEditDlgController">
+
+    <StackLayout Style="{StaticResource paddedDlg88}">
+
+        <Grid ColumnSpacing="4" RowSpacing="4" VerticalOptions="Start" HorizontalOptions="FillAndExpand">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+
+            <Label x:Name="lblName" Grid.Column="0" Grid.Row="0" />
+            <Entry x:Name="txtName" WidthRequest="260" Grid.Column="1" Grid.Row="0" />
+
+            <Label x:Name="lblTag" Grid.Column="0" Grid.Row="1" />
+            <comcom:GKComboBox x:Name="cmbTag" ReadOnly="True" Grid.Column="1" Grid.Row="1" />
+
+            <Label x:Name="lblType" Grid.Column="0" Grid.Row="2" />
+            <Entry x:Name="txtType" WidthRequest="260" Grid.Column="1" Grid.Row="2" />
+
+            <input:CheckBox x:Name="chkEnabled" Grid.Column="0" Grid.Row="3" />
+
+            <Label x:Name="lblDesc" Grid.Column="0" Grid.Row="4" />
+            <Entry x:Name="txtDesc" WidthRequest="260" Grid.Column="1" Grid.Row="4" />
+
+        </Grid>
+
+        <StackLayout Style="{StaticResource dlgFooter}">
+            <Label HorizontalOptions="FillAndExpand" />
+            <Button x:Name="btnAccept" Style="{StaticResource dlgBtn}" ImageSource="{plat:ImageResourceExt Resources.btn_accept.gif}" Clicked="AcceptClickHandler" />
+            <Button x:Name="btnCancel" Style="{StaticResource dlgBtn}" ImageSource="{plat:ImageResourceExt Resources.btn_cancel.gif}" Clicked="CancelClickHandler" />
+        </StackLayout>
+
+    </StackLayout>
+
+</forms:CommonDialog>
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/EventDefEditDlg.xaml.cs b/projects/GKvX/GEDKeeperX/GKUI/Forms/EventDefEditDlg.xaml.cs
new file mode 100644
index 000000000..3d3fd5d7a
--- /dev/null
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/EventDefEditDlg.xaml.cs
@@ -0,0 +1,72 @@
+/*
+ *  "GEDKeeper", the personal genealogical database editor.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
+ *
+ *  This file is part of "GEDKeeper".
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+using GKCore;
+using GKCore.Controllers;
+using GKCore.Design.Controls;
+using GKCore.Design.Views;
+
+namespace GKUI.Forms
+{
+    public sealed partial class EventDefEditDlg : CommonDialog<IEventDefEditDlg, EventDefEditDlgController>, IEventDefEditDlg
+    {
+        public EventDef EventDef
+        {
+            get { return fController.EventDef; }
+            set { fController.EventDef = value; }
+        }
+
+        #region View Interface
+
+        ITextBox IEventDefEditDlg.NameText
+        {
+            get { return GetControlHandler<ITextBox>(txtName); }
+        }
+
+        IComboBox IEventDefEditDlg.TagCombo
+        {
+            get { return GetControlHandler<IComboBox>(cmbTag); }
+        }
+
+        ITextBox IEventDefEditDlg.TypeText
+        {
+            get { return GetControlHandler<ITextBox>(txtType); }
+        }
+
+        ICheckBox IEventDefEditDlg.EnabledCheck
+        {
+            get { return GetControlHandler<ICheckBox>(chkEnabled); }
+        }
+
+        ITextBox IEventDefEditDlg.DescText
+        {
+            get { return GetControlHandler<ITextBox>(txtDesc); }
+        }
+
+        #endregion
+
+        public EventDefEditDlg()
+        {
+            InitializeComponent();
+
+            fController = new EventDefEditDlgController(this);
+        }
+    }
+}
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/EventEditDlg.xaml b/projects/GKvX/GEDKeeperX/GKUI/Forms/EventEditDlg.xaml
index bee3c9ead..10ad0ef8c 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/EventEditDlg.xaml
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/EventEditDlg.xaml
@@ -35,7 +35,6 @@
                             <Label x:Name="lblEvent" Grid.Column="0" Grid.Row="0" />
                             <StackLayout Orientation="Horizontal" Spacing="4" Grid.Column="1" Grid.Row="0">
                                 <comcom:GKComboBox x:Name="cmbEventType" SelectedIndexChanged="EditEventType_SelectedIndexChanged" WidthRequest="260" />
-                                <Entry x:Name="txtEventName" HorizontalOptions="FillAndExpand" />
                             </StackLayout>
 
                             <Label x:Name="lblAttrValue" Grid.Column="0" Grid.Row="1" />
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/EventEditDlg.xaml.cs b/projects/GKvX/GEDKeeperX/GKUI/Forms/EventEditDlg.xaml.cs
index 2c6f81f82..5ed380af8 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/EventEditDlg.xaml.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/EventEditDlg.xaml.cs
@@ -74,11 +74,6 @@ ITextBox IEventEditDlg.Place
             get { return GetControlHandler<ITextBox>(txtEventPlace); }
         }
 
-        ITextBox IEventEditDlg.EventName
-        {
-            get { return  GetControlHandler<ITextBox>(txtEventName); }
-        }
-
         ITextBox IEventEditDlg.Cause
         {
             get { return  GetControlHandler<ITextBox>(txtEventCause); }
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/OptionsDlg.xaml b/projects/GKvX/GEDKeeperX/GKUI/Forms/OptionsDlg.xaml
index 01f3eca2a..aef3faa1f 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/OptionsDlg.xaml
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/OptionsDlg.xaml
@@ -410,6 +410,10 @@
                     </StackLayout>
                 </xp:TabItem>
 
+                <xp:TabItem x:Name="pageEventTypes">
+                    <comcom:GKSheetList x:Name="slEventTypes" />
+                </xp:TabItem>
+
             </xp:TabViewControl.ItemSource>
         </xp:TabViewControl>
 
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/OptionsDlg.xaml.cs b/projects/GKvX/GEDKeeperX/GKUI/Forms/OptionsDlg.xaml.cs
index 91edfd297..140b4f173 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/OptionsDlg.xaml.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/OptionsDlg.xaml.cs
@@ -22,6 +22,7 @@
 using GKCore.Controllers;
 using GKCore.Design.Views;
 using GKCore.Interfaces;
+using GKCore.Lists;
 using GKCore.Options;
 using GKUI.Components;
 using Xamarin.Forms;
@@ -30,6 +31,16 @@ namespace GKUI.Forms
 {
     public sealed partial class OptionsDlg : CommonDialog<IOptionsDlg, OptionsDlgController>, ILocalizable, IOptionsDlg
     {
+        #region View Interface
+
+        ISheetList IOptionsDlg.EventTypesList
+        {
+            get { return slEventTypes; }
+        }
+
+        #endregion
+
+
         public OptionsDlg(IHost host)
         {
             InitializeComponent();
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Platform/XFAppHost.cs b/projects/GKvX/GEDKeeperX/GKUI/Platform/XFAppHost.cs
index 3bd014c09..7830cec12 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Platform/XFAppHost.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Platform/XFAppHost.cs
@@ -317,6 +317,7 @@ public static void ConfigureBootstrap()
             container.Register<ITreeMergeDlg, TTTreeMergeDlg>(LifeCycle.Transient);
             container.Register<ITreeSplitDlg, TTTreeSplitDlg>(LifeCycle.Transient);
             container.Register<IUserRefEditDlg, UserRefEditDlg>(LifeCycle.Transient);
+            container.Register<IEventDefEditDlg, EventDefEditDlg>(LifeCycle.Transient);
 
             ControlsManager.RegisterHandlerType(typeof(Button), typeof(ButtonHandler));
             ControlsManager.RegisterHandlerType(typeof(Editor), typeof(TextAreaHandler));