From c54f77836797bcb1bb56f3169573d3138358abd2 Mon Sep 17 00:00:00 2001
From: "Sergey V. Zhdanovskih" <serg.zhdanovskih@yandex.ru>
Date: Thu, 27 Jun 2024 23:41:33 +0300
Subject: [PATCH] Added saving of column width settings for all lists (fix
 #573)

---
 locales/help_enu/gkhHistory.html              |   1 +
 locales/help_rus/gkhHistory.html              |   1 +
 .../GKCore/Controllers/BaseWinController.cs   |  14 +-
 .../CommunicationEditDlgController.cs         |   8 +-
 .../Controllers/EventEditDlgController.cs     |   7 +
 .../Controllers/FamilyEditDlgController.cs    |  13 +-
 .../Controllers/GroupEditDlgController.cs     |   9 +-
 .../Controllers/LocationEditDlgController.cs  |   8 +
 .../Controllers/MediaEditDlgController.cs     |   8 +-
 .../Controllers/OptionsDlgController.cs       |   7 +-
 .../Controllers/PersonEditDlgController.cs    |  16 +-
 .../RepositoryEditDlgController.cs            |   7 +-
 .../Controllers/ResearchEditDlgController.cs  |  10 +-
 .../Controllers/SourceEditDlgController.cs    |   7 +
 .../Controllers/StdPersonEditDlgController.cs |   9 +-
 .../Controllers/TaskEditDlgController.cs      |   7 +-
 .../GKCore/GKCore/Design/DialogController.cs  |  13 +-
 .../GKCore/GKCore/Design/FormController.cs    |   6 +-
 projects/GKCore/GKCore/GKUtils.cs             |  11 +
 .../GKCore/GKCore/Interfaces/IListFilter.cs   |   2 +-
 .../GKCore/GKCore/Interfaces/IListSource.cs   |   2 +
 .../GKCore/Lists/AssociationsListModel.cs     |  16 +-
 .../GKCore/GKCore/Lists/ChildrenListModel.cs  |  18 +-
 .../GKCore/Lists/CommunicationListModel.cs    |   9 +-
 .../GKCore/GKCore/Lists/EventDefsListModel.cs |  18 +-
 .../GKCore/GKCore/Lists/EventsListModel.cs    |  45 ++-
 .../GKCore/GKCore/Lists/FamilyListModel.cs    |   9 +-
 .../GKCore/GKCore/Lists/GroupListModel.cs     |  22 +-
 .../GKCore/Lists/IndividualListModel.cs       |  93 ++++--
 projects/GKCore/GKCore/Lists/ListColumns.cs   |  15 +-
 projects/GKCore/GKCore/Lists/ListSource.cs    |  22 +-
 .../GKCore/Lists/LocationLinksListModel.cs    |  18 +-
 .../GKCore/GKCore/Lists/LocationListModel.cs  |   7 +-
 .../GKCore/Lists/LocationNamesListModel.cs    |  20 +-
 .../GKCore/Lists/MediaLinksListModel.cs       |  20 +-
 .../GKCore/Lists/MultimediaListModel.cs       |   8 +-
 .../GKCore/GKCore/Lists/NoteLinksListModel.cs |  18 +-
 projects/GKCore/GKCore/Lists/NoteListModel.cs |   9 +-
 .../GKCore/GKCore/Lists/RecordsListModel.cs   |   2 +-
 .../GKCore/Lists/RepositoryListModel.cs       |   9 +-
 .../GKCore/GKCore/Lists/ResearchListModel.cs  |  60 ++--
 projects/GKCore/GKCore/Lists/SheetModel.cs    |   8 +-
 .../GKCore/Lists/SourceCitationsListModel.cs  |  22 +-
 .../GKCore/GKCore/Lists/SourceListModel.cs    |  20 +-
 projects/GKCore/GKCore/Lists/TaskListModel.cs |   9 +-
 .../GKCore/GKCore/Options/GlobalOptions.cs    |  21 +-
 projects/GKCore/GKCore/Options/ListOptions.cs | 283 ++++++++++++++++--
 projects/GKTests/GKCore/ListsTests.cs         |   2 +-
 projects/GKTests/GKCore/OptionsTests.cs       |   2 +-
 .../GKTestsUI2/UITests/EventEditDlgTests.cs   |   4 +-
 .../GKv2/GKTestsUI2/UITests/MainSDITests.cs   |   2 +-
 51 files changed, 739 insertions(+), 238 deletions(-)

diff --git a/locales/help_enu/gkhHistory.html b/locales/help_enu/gkhHistory.html
index 331ac88b7..5171e074e 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 saving of column width settings for all lists.
             <li>Completed Spanish localization [Miguel Á. Pérez Valdenebro].
             <li>Added remembering and the feature to select from a list of causes and agencies of events.
             <li>Added an option to select list filtering methods (differences in speed).
diff --git a/locales/help_rus/gkhHistory.html b/locales/help_rus/gkhHistory.html
index 8d8fcb2ae..bea9afc03 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>Завершена локализация на испанский язык [Miguel Á. Pérez Valdenebro].
             <li>Добавлено запоминание и возможность выбора из списка причин и удостоверяющих организаций событий.
             <li>Добавлена опция выбора методов фильтрации списков (различия по скорости).
diff --git a/projects/GKCore/GKCore/Controllers/BaseWinController.cs b/projects/GKCore/GKCore/Controllers/BaseWinController.cs
index a2f7a6e31..c29ed3f3c 100644
--- a/projects/GKCore/GKCore/Controllers/BaseWinController.cs
+++ b/projects/GKCore/GKCore/Controllers/BaseWinController.cs
@@ -619,10 +619,9 @@ public void RestoreListsSettings()
             for (var rt = GDMRecordType.rtIndividual; rt <= GDMRecordType.rtLocation; rt++) {
                 IListView rView = fTabParts[(int)rt].ListView;
                 if (rView != null) {
-                    rView.SetSortColumn(globOptions.ListOptions[rt].SortColumn, false);
-                    if (rt == GDMRecordType.rtIndividual) {
-                        globOptions.IndividualListColumns.CopyTo(rView.ListMan.ListColumns);
-                    }
+                    var columnOpts = globOptions.ListOptions[rt];
+                    rView.SetSortColumn(columnOpts.SortColumn, false);
+                    columnOpts.Columns.CopyTo(rView.ListMan.ListColumns);
                 }
             }
         }
@@ -633,10 +632,9 @@ public void SaveListsSettings()
             for (var rt = GDMRecordType.rtIndividual; rt <= GDMRecordType.rtLocation; rt++) {
                 IListView rView = fTabParts[(int)rt].ListView;
                 if (rView != null) {
-                    globOptions.ListOptions[rt].SortColumn = rView.SortColumn;
-                    if (rt == GDMRecordType.rtIndividual) {
-                        rView.ListMan.ListColumns.CopyTo(globOptions.IndividualListColumns);
-                    }
+                    var columnOpts = globOptions.ListOptions[rt];
+                    columnOpts.SortColumn = rView.SortColumn;
+                    rView.ListMan.ListColumns.CopyTo(columnOpts.Columns);
                 }
             }
         }
diff --git a/projects/GKCore/GKCore/Controllers/CommunicationEditDlgController.cs b/projects/GKCore/GKCore/Controllers/CommunicationEditDlgController.cs
index 84726d868..4ba561eac 100644
--- a/projects/GKCore/GKCore/Controllers/CommunicationEditDlgController.cs
+++ b/projects/GKCore/GKCore/Controllers/CommunicationEditDlgController.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".
  *
@@ -73,6 +73,12 @@ public override void Init(IBaseWindow baseWin)
             fView.MediaList.ListModel = new MediaLinksListModel(fView, baseWin, fLocalUndoman);
         }
 
+        public override void Done()
+        {
+            fView.NotesList.ListModel.SaveSettings();
+            fView.MediaList.ListModel.SaveSettings();
+        }
+
         public override bool Accept()
         {
             try {
diff --git a/projects/GKCore/GKCore/Controllers/EventEditDlgController.cs b/projects/GKCore/GKCore/Controllers/EventEditDlgController.cs
index b5678d4a4..23afe9233 100644
--- a/projects/GKCore/GKCore/Controllers/EventEditDlgController.cs
+++ b/projects/GKCore/GKCore/Controllers/EventEditDlgController.cs
@@ -69,6 +69,13 @@ public override void Init(IBaseWindow baseWin)
             fView.SourcesList.ListModel = new SourceCitationsListModel(fView, baseWin, fLocalUndoman);
         }
 
+        public override void Done()
+        {
+            fView.NotesList.ListModel.SaveSettings();
+            fView.MediaList.ListModel.SaveSettings();
+            fView.SourcesList.ListModel.SaveSettings();
+        }
+
         public override bool Accept()
         {
             try {
diff --git a/projects/GKCore/GKCore/Controllers/FamilyEditDlgController.cs b/projects/GKCore/GKCore/Controllers/FamilyEditDlgController.cs
index a15fbedb1..7f06b3327 100644
--- a/projects/GKCore/GKCore/Controllers/FamilyEditDlgController.cs
+++ b/projects/GKCore/GKCore/Controllers/FamilyEditDlgController.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".
  *
@@ -65,12 +65,21 @@ public override void Init(IBaseWindow baseWin)
             base.Init(baseWin);
 
             fView.ChildrenList.ListModel = new FamilyChildrenListModel(fView, baseWin, fLocalUndoman);
-            fView.EventsList.ListModel = new EventsListModel(fView, baseWin, fLocalUndoman, false);
+            fView.EventsList.ListModel = new EventsListModel(fView, baseWin, fLocalUndoman);
             fView.NotesList.ListModel = new NoteLinksListModel(fView, baseWin, fLocalUndoman);
             fView.MediaList.ListModel = new MediaLinksListModel(fView, baseWin, fLocalUndoman);
             fView.SourcesList.ListModel = new SourceCitationsListModel(fView, baseWin, fLocalUndoman);
         }
 
+        public override void Done()
+        {
+            fView.ChildrenList.ListModel.SaveSettings();
+            fView.EventsList.ListModel.SaveSettings();
+            fView.NotesList.ListModel.SaveSettings();
+            fView.MediaList.ListModel.SaveSettings();
+            fView.SourcesList.ListModel.SaveSettings();
+        }
+
         public void SetTarget(TargetMode targetType, GDMIndividualRecord target)
         {
             if (targetType == TargetMode.tmNone || target == null) return;
diff --git a/projects/GKCore/GKCore/Controllers/GroupEditDlgController.cs b/projects/GKCore/GKCore/Controllers/GroupEditDlgController.cs
index 6e83b9cd2..3eb91e1a1 100644
--- a/projects/GKCore/GKCore/Controllers/GroupEditDlgController.cs
+++ b/projects/GKCore/GKCore/Controllers/GroupEditDlgController.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".
  *
@@ -62,6 +62,13 @@ public override void Init(IBaseWindow baseWin)
             fView.MediaList.ListModel = new MediaLinksListModel(fView, baseWin, fLocalUndoman);
         }
 
+        public override void Done()
+        {
+            fView.MembersList.ListModel.SaveSettings();
+            fView.NotesList.ListModel.SaveSettings();
+            fView.MediaList.ListModel.SaveSettings();
+        }
+
         public override bool Accept()
         {
             try {
diff --git a/projects/GKCore/GKCore/Controllers/LocationEditDlgController.cs b/projects/GKCore/GKCore/Controllers/LocationEditDlgController.cs
index 2177bb9e3..8c3b1a378 100644
--- a/projects/GKCore/GKCore/Controllers/LocationEditDlgController.cs
+++ b/projects/GKCore/GKCore/Controllers/LocationEditDlgController.cs
@@ -70,6 +70,14 @@ public override void Init(IBaseWindow baseWin)
             fView.NamesList.OnModify += ModifyNamesSheet;
         }
 
+        public override void Done()
+        {
+            fView.NamesList.ListModel.SaveSettings();
+            fView.LinksList.ListModel.SaveSettings();
+            fView.NotesList.ListModel.SaveSettings();
+            fView.MediaList.ListModel.SaveSettings();
+        }
+
         private void ModifyNamesSheet(object sender, ModifyEventArgs eArgs)
         {
             fView.Name.Text = fLocationRecord.LocationName;
diff --git a/projects/GKCore/GKCore/Controllers/MediaEditDlgController.cs b/projects/GKCore/GKCore/Controllers/MediaEditDlgController.cs
index f26c3f1fd..c1ecc3654 100644
--- a/projects/GKCore/GKCore/Controllers/MediaEditDlgController.cs
+++ b/projects/GKCore/GKCore/Controllers/MediaEditDlgController.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".
  *
@@ -69,6 +69,12 @@ public override void Init(IBaseWindow baseWin)
             fView.SourcesList.ListModel = new SourceCitationsListModel(fView, baseWin, fLocalUndoman);
         }
 
+        public override void Done()
+        {
+            fView.NotesList.ListModel.SaveSettings();
+            fView.SourcesList.ListModel.SaveSettings();
+        }
+
         public override bool Accept()
         {
             try {
diff --git a/projects/GKCore/GKCore/Controllers/OptionsDlgController.cs b/projects/GKCore/GKCore/Controllers/OptionsDlgController.cs
index f0c30a3b4..2beaedb52 100644
--- a/projects/GKCore/GKCore/Controllers/OptionsDlgController.cs
+++ b/projects/GKCore/GKCore/Controllers/OptionsDlgController.cs
@@ -19,6 +19,7 @@
  */
 
 using System.Threading.Tasks;
+using GDModel;
 using GKCore.Design;
 using GKCore.Design.Controls;
 using GKCore.Design.Views;
@@ -50,7 +51,7 @@ public IListColumns TempColumns
         public OptionsDlgController(IOptionsDlg view) : base(view)
         {
             fOptions = GlobalOptions.Instance;
-            fTempColumns = IndividualListModel.CreateIndividualListColumns();
+            fTempColumns = IndividualListModel.CreateListColumns();
 
             FillGeoSearchCountries();
 
@@ -120,7 +121,7 @@ public void AcceptColumnsList()
                 fTempColumns.OrderedColumns[i].CurActive = listView.Items[i].Checked;
             }
 
-            fTempColumns.CopyTo(fOptions.IndividualListColumns);
+            fTempColumns.CopyTo(fOptions.ListOptions[GDMRecordType.rtIndividual].Columns);
         }
 
         public void UpdateProxyOptions()
@@ -774,7 +775,7 @@ public override void UpdateView()
             UpdateInterfaceOptions();
             UpdateWomanSurnameFormat();
 
-            fOptions.IndividualListColumns.CopyTo(fTempColumns);
+            fOptions.ListOptions[GDMRecordType.rtIndividual].Columns.CopyTo(fTempColumns);
             UpdateColumnsList();
 
             // pedigrees
diff --git a/projects/GKCore/GKCore/Controllers/PersonEditDlgController.cs b/projects/GKCore/GKCore/Controllers/PersonEditDlgController.cs
index 230564a20..763766b91 100644
--- a/projects/GKCore/GKCore/Controllers/PersonEditDlgController.cs
+++ b/projects/GKCore/GKCore/Controllers/PersonEditDlgController.cs
@@ -93,7 +93,7 @@ public override void Init(IBaseWindow baseWin)
         {
             base.Init(baseWin);
 
-            fView.EventsList.ListModel = new EventsListModel(fView, baseWin, fLocalUndoman, true);
+            fView.EventsList.ListModel = new EventsListModel(fView, baseWin, fLocalUndoman);
             fView.NotesList.ListModel = new NoteLinksListModel(fView, baseWin, fLocalUndoman);
             fView.MediaList.ListModel = new MediaLinksListModel(fView, baseWin, fLocalUndoman);
             fView.SourcesList.ListModel = new SourceCitationsListModel(fView, baseWin, fLocalUndoman);
@@ -105,6 +105,20 @@ public override void Init(IBaseWindow baseWin)
             fView.ParentsList.ListModel = new IndiParentsListModel(fView, baseWin, fLocalUndoman);
         }
 
+        public override void Done()
+        {
+            fView.EventsList.ListModel.SaveSettings();
+            fView.NotesList.ListModel.SaveSettings();
+            fView.MediaList.ListModel.SaveSettings();
+            fView.SourcesList.ListModel.SaveSettings();
+            fView.AssociationsList.ListModel.SaveSettings();
+            fView.GroupsList.ListModel.SaveSettings();
+            fView.NamesList.ListModel.SaveSettings();
+            fView.SpousesList.ListModel.SaveSettings();
+            fView.UserRefList.ListModel.SaveSettings();
+            fView.ParentsList.ListModel.SaveSettings();
+        }
+
         private bool IsExtendedWomanSurname()
         {
             var selectedSex = fView.SexCombo.GetSelectedTag<GDMSex>();
diff --git a/projects/GKCore/GKCore/Controllers/RepositoryEditDlgController.cs b/projects/GKCore/GKCore/Controllers/RepositoryEditDlgController.cs
index a0fa56bca..8867455be 100644
--- a/projects/GKCore/GKCore/Controllers/RepositoryEditDlgController.cs
+++ b/projects/GKCore/GKCore/Controllers/RepositoryEditDlgController.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".
  *
@@ -60,6 +60,11 @@ public override void Init(IBaseWindow baseWin)
             fView.NotesList.ListModel = new NoteLinksListModel(fView, baseWin, fLocalUndoman);
         }
 
+        public override void Done()
+        {
+            fView.NotesList.ListModel.SaveSettings();
+        }
+
         public override bool Accept()
         {
             try {
diff --git a/projects/GKCore/GKCore/Controllers/ResearchEditDlgController.cs b/projects/GKCore/GKCore/Controllers/ResearchEditDlgController.cs
index af2c03aa2..c802450f9 100644
--- a/projects/GKCore/GKCore/Controllers/ResearchEditDlgController.cs
+++ b/projects/GKCore/GKCore/Controllers/ResearchEditDlgController.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".
  *
@@ -69,6 +69,14 @@ public override void Init(IBaseWindow baseWin)
             fView.NotesList.ListModel = new NoteLinksListModel(fView, baseWin, fLocalUndoman);
         }
 
+        public override void Done()
+        {
+            fView.TasksList.ListModel.SaveSettings();
+            fView.CommunicationsList.ListModel.SaveSettings();
+            fView.GroupsList.ListModel.SaveSettings();
+            fView.NotesList.ListModel.SaveSettings();
+        }
+
         public override bool Accept()
         {
             try {
diff --git a/projects/GKCore/GKCore/Controllers/SourceEditDlgController.cs b/projects/GKCore/GKCore/Controllers/SourceEditDlgController.cs
index 60f8ffa52..31a21f1c1 100644
--- a/projects/GKCore/GKCore/Controllers/SourceEditDlgController.cs
+++ b/projects/GKCore/GKCore/Controllers/SourceEditDlgController.cs
@@ -62,6 +62,13 @@ public override void Init(IBaseWindow baseWin)
             fView.MediaList.ListModel = new MediaLinksListModel(fView, baseWin, fLocalUndoman);
         }
 
+        public override void Done()
+        {
+            fView.RepositoriesList.ListModel.SaveSettings();
+            fView.NotesList.ListModel.SaveSettings();
+            fView.MediaList.ListModel.SaveSettings();
+        }
+
         public override bool Accept()
         {
             try {
diff --git a/projects/GKCore/GKCore/Controllers/StdPersonEditDlgController.cs b/projects/GKCore/GKCore/Controllers/StdPersonEditDlgController.cs
index 8c414cc43..f2608b0ef 100644
--- a/projects/GKCore/GKCore/Controllers/StdPersonEditDlgController.cs
+++ b/projects/GKCore/GKCore/Controllers/StdPersonEditDlgController.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".
  *
@@ -39,6 +39,13 @@ public override void Init(IBaseWindow baseWin)
             fView.ChildrenList.ListModel = new IndividualChildrenListModel(fView, baseWin, fLocalUndoman);
         }
 
+        public override void Done()
+        {
+            base.Done();
+
+            fView.ChildrenList.ListModel.SaveSettings();
+        }
+
         protected override void UpdateListModels(GDMIndividualRecord indiRec)
         {
             base.UpdateListModels(indiRec);
diff --git a/projects/GKCore/GKCore/Controllers/TaskEditDlgController.cs b/projects/GKCore/GKCore/Controllers/TaskEditDlgController.cs
index 4580031c7..1e61dbf57 100644
--- a/projects/GKCore/GKCore/Controllers/TaskEditDlgController.cs
+++ b/projects/GKCore/GKCore/Controllers/TaskEditDlgController.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".
  *
@@ -70,6 +70,11 @@ public override void Init(IBaseWindow baseWin)
             fView.NotesList.ListModel = new NoteLinksListModel(fView, baseWin, fLocalUndoman);
         }
 
+        public override void Done()
+        {
+            fView.NotesList.ListModel.SaveSettings();
+        }
+
         public override bool Accept()
         {
             try {
diff --git a/projects/GKCore/GKCore/Design/DialogController.cs b/projects/GKCore/GKCore/Design/DialogController.cs
index a01e9509e..85d022fd4 100644
--- a/projects/GKCore/GKCore/Design/DialogController.cs
+++ b/projects/GKCore/GKCore/Design/DialogController.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".
  *
@@ -81,11 +81,18 @@ protected void RollbackChanges()
         /// <returns>if `true`, discard dialog closing events</returns>
         public async Task<bool> CheckChangesPersistence()
         {
+            bool result;
             if (GlobalOptions.Instance.DialogClosingWarn && fLocalUndoman != null && fLocalUndoman.HasChanges()) {
-                return (await AppHost.StdDialogs.ShowQuestion(LangMan.LS(LSID.WarningOfDialogUnsavedChanges)));
+                result = (await AppHost.StdDialogs.ShowQuestion(LangMan.LS(LSID.WarningOfDialogUnsavedChanges)));
             } else {
-                return false;
+                result = false;
+            }
+
+            if (!result) {
+                Done();
             }
+
+            return result;
         }
 
         public override void Init(IBaseWindow baseWin)
diff --git a/projects/GKCore/GKCore/Design/FormController.cs b/projects/GKCore/GKCore/Design/FormController.cs
index c243ef0a7..36c2ee163 100644
--- a/projects/GKCore/GKCore/Design/FormController.cs
+++ b/projects/GKCore/GKCore/Design/FormController.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".
  *
@@ -50,6 +50,10 @@ public virtual void Init(IBaseWindow baseWin)
             fBase = baseWin;
         }
 
+        public virtual void Done()
+        {
+        }
+
         protected T GetControl<T>(string controlName) where T : class, IControl
         {
             return fControlsManager.GetControl<T>(controlName);
diff --git a/projects/GKCore/GKCore/GKUtils.cs b/projects/GKCore/GKCore/GKUtils.cs
index 7de6f798d..94120deb0 100644
--- a/projects/GKCore/GKCore/GKUtils.cs
+++ b/projects/GKCore/GKCore/GKUtils.cs
@@ -676,6 +676,17 @@ public static string GetEventName(GDMCustomEvent evt)
             return result;
         }
 
+        public static string GetEventPlaceAndAttributeValues(GDMCustomEvent evt)
+        {
+            string st = evt.HasPlace ? evt.Place.StringValue : string.Empty;
+
+            if (evt.StringValue != "") {
+                st = st + " [" + evt.StringValue + "]";
+            }
+
+            return st;
+        }
+
         public static string GetAttributeStr(GDMIndividualAttribute iAttr)
         {
             if (iAttr == null)
diff --git a/projects/GKCore/GKCore/Interfaces/IListFilter.cs b/projects/GKCore/GKCore/Interfaces/IListFilter.cs
index 2fbd52392..ec5392144 100644
--- a/projects/GKCore/GKCore/Interfaces/IListFilter.cs
+++ b/projects/GKCore/GKCore/Interfaces/IListFilter.cs
@@ -88,6 +88,6 @@ public interface IListColumns
         void UpdateOrders();
 
         void LoadFromFile(IniFile iniFile, string section, int optsVersion);
-        void SaveToFile(IniFile iniFile, string section);
+        void SaveToFile(IniFile iniFile, string section, int optsVersion);
     }
 }
diff --git a/projects/GKCore/GKCore/Interfaces/IListSource.cs b/projects/GKCore/GKCore/Interfaces/IListSource.cs
index 0b3a0ea4e..beb69733b 100644
--- a/projects/GKCore/GKCore/Interfaces/IListSource.cs
+++ b/projects/GKCore/GKCore/Interfaces/IListSource.cs
@@ -139,6 +139,8 @@ public interface IListSource
         int IndexOfItem(object data);
         bool IsColumnAutosize(int colIndex);
         void OnItemSelected(int itemIndex, object rowData);
+        void RestoreSettings();
+        void SaveSettings();
         void SortContents(int sortColumn, bool sortAscending);
         void UpdateColumns(IListView listView);
         void UpdateContents();
diff --git a/projects/GKCore/GKCore/Lists/AssociationsListModel.cs b/projects/GKCore/GKCore/Lists/AssociationsListModel.cs
index 9f1e0c98b..efe3419f3 100644
--- a/projects/GKCore/GKCore/Lists/AssociationsListModel.cs
+++ b/projects/GKCore/GKCore/Lists/AssociationsListModel.cs
@@ -26,6 +26,7 @@
 using GKCore.Design.Views;
 using GKCore.Interfaces;
 using GKCore.Operations;
+using GKCore.Options;
 using GKCore.Types;
 
 namespace GKCore.Lists
@@ -37,16 +38,23 @@ public class AssociationsListModel : SheetModel<GDMAssociation>
     {
         private GDMIndividualRecord fRelIndi;
 
-        public AssociationsListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman)
+        public AssociationsListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman, CreateListColumns())
         {
             AllowedActions = EnumSet<RecordAction>.Create(
                 RecordAction.raAdd, RecordAction.raEdit, RecordAction.raDelete,
                 RecordAction.raJump,
                 RecordAction.raCopy, RecordAction.raPaste, RecordAction.raDetails);
+        }
+
+        public static ListColumns CreateListColumns()
+        {
+            var result = new ListColumns(GKListType.stIndividualAssociations);
 
-            fListColumns.AddColumn(LSID.Relation, 300, false);
-            fListColumns.AddColumn(LSID.Person, 200, false);
-            fListColumns.ResetDefaults();
+            result.AddColumn(LSID.Relation, 300, false);
+            result.AddColumn(LSID.Person, 200, false);
+
+            result.ResetDefaults();
+            return result;
         }
 
         protected override GDMRecord GetReferenceRecord(object itemData)
diff --git a/projects/GKCore/GKCore/Lists/ChildrenListModel.cs b/projects/GKCore/GKCore/Lists/ChildrenListModel.cs
index 8071018bc..8fd9f7d50 100644
--- a/projects/GKCore/GKCore/Lists/ChildrenListModel.cs
+++ b/projects/GKCore/GKCore/Lists/ChildrenListModel.cs
@@ -26,6 +26,7 @@
 using GKCore.Design;
 using GKCore.Interfaces;
 using GKCore.Operations;
+using GKCore.Options;
 using GKCore.Types;
 
 namespace GKCore.Lists
@@ -34,15 +35,22 @@ public abstract class ChildrenListModel : SheetModel<GDMChildLink>
     {
         private GDMIndividualRecord fChildRec;
 
-        protected ChildrenListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman)
+        protected ChildrenListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman, CreateListColumns())
         {
             AllowedActions = EnumSet<RecordAction>.Create(
                 RecordAction.raAdd, RecordAction.raEdit, RecordAction.raDelete, RecordAction.raJump, RecordAction.raDetails);
+        }
+
+        public static ListColumns CreateListColumns()
+        {
+            var result = new ListColumns(GKListType.stChildren);
 
-            fListColumns.AddColumn(LSID.NumberSym, 25, false);
-            fListColumns.AddColumn(LSID.Name, 300, false);
-            fListColumns.AddColumn(LSID.BirthDate, 100, false);
-            fListColumns.ResetDefaults();
+            result.AddColumn(LSID.NumberSym, 25, false);
+            result.AddColumn(LSID.Name, 300, false);
+            result.AddColumn(LSID.BirthDate, 100, false);
+
+            result.ResetDefaults();
+            return result;
         }
 
         protected override GDMRecord GetReferenceRecord(object itemData)
diff --git a/projects/GKCore/GKCore/Lists/CommunicationListModel.cs b/projects/GKCore/GKCore/Lists/CommunicationListModel.cs
index de59efdc5..7f80422e7 100644
--- a/projects/GKCore/GKCore/Lists/CommunicationListModel.cs
+++ b/projects/GKCore/GKCore/Lists/CommunicationListModel.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2022 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -20,6 +20,7 @@
 
 using GDModel;
 using GKCore.Interfaces;
+using GKCore.Options;
 
 namespace GKCore.Lists
 {
@@ -40,13 +41,13 @@ public enum ColumnType
 
 
         public CommunicationListModel(IBaseContext baseContext) :
-            base(baseContext, CreateCommunicationListColumns(), GDMRecordType.rtCommunication)
+            base(baseContext, CreateListColumns(), GDMRecordType.rtCommunication)
         {
         }
 
-        public static ListColumns<GDMCommunicationRecord> CreateCommunicationListColumns()
+        public static ListColumns CreateListColumns()
         {
-            var result = new ListColumns<GDMCommunicationRecord>();
+            var result = new ListColumns(GKListType.rtCommunication);
 
             // not to change the order of these lines in their changes
             result.AddColumn(LSID.NumberSym, DataType.dtInteger, 50, true);
diff --git a/projects/GKCore/GKCore/Lists/EventDefsListModel.cs b/projects/GKCore/GKCore/Lists/EventDefsListModel.cs
index a325f6009..55d81670d 100644
--- a/projects/GKCore/GKCore/Lists/EventDefsListModel.cs
+++ b/projects/GKCore/GKCore/Lists/EventDefsListModel.cs
@@ -25,20 +25,28 @@
 using GKCore.Design;
 using GKCore.Interfaces;
 using GKCore.Operations;
+using GKCore.Options;
 using GKCore.Types;
 
 namespace GKCore.Lists
 {
     public sealed class EventDefsListModel : SheetModel<EventDef>
     {
-        public EventDefsListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman)
+        public EventDefsListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman, CreateListColumns())
         {
             AllowedActions = EnumSet<RecordAction>.Create(RecordAction.raAdd, RecordAction.raEdit, RecordAction.raDelete);
+        }
+
+        public static ListColumns CreateListColumns()
+        {
+            var result = new ListColumns(GKListType.stEventDefs);
 
-            fListColumns.AddColumn(LSID.Name, 300, false);
-            fListColumns.AddColumn(LSID.Enabled, 100, false);
-            fListColumns.AddColumn(LSID.Record, 300, false);
-            fListColumns.ResetDefaults();
+            result.AddColumn(LSID.Name, 300, false);
+            result.AddColumn(LSID.Enabled, 100, false);
+            result.AddColumn(LSID.Record, 300, false);
+
+            result.ResetDefaults();
+            return result;
         }
 
         private static string GetTargetStr(EventTarget target)
diff --git a/projects/GKCore/GKCore/Lists/EventsListModel.cs b/projects/GKCore/GKCore/Lists/EventsListModel.cs
index bffb0125e..7b4907291 100644
--- a/projects/GKCore/GKCore/Lists/EventsListModel.cs
+++ b/projects/GKCore/GKCore/Lists/EventsListModel.cs
@@ -34,33 +34,34 @@ namespace GKCore.Lists
     public sealed class EventsListModel : SheetModel<GDMCustomEvent>
     {
         private readonly GlobalOptions fOptions;
-        private readonly bool fPersonsMode;
 
-        public EventsListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman, bool personsMode) : base(owner, baseWin, undoman)
+        public EventsListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman, CreateListColumns())
         {
-            fPersonsMode = personsMode;
             AllowedActions = EnumSet<RecordAction>.Create(
                 RecordAction.raAdd, RecordAction.raEdit, RecordAction.raDelete,
                 RecordAction.raMoveUp, RecordAction.raMoveDown,
                 RecordAction.raCopy, RecordAction.raPaste);
 
-            fListColumns.AddColumn(LSID.NumberSym, 25, false);
-            fListColumns.AddColumn(LSID.Event, 90, false);
-            fListColumns.AddColumn(LSID.Date, 90, false);
-            if (!fPersonsMode) {
-                fListColumns.AddColumn(LSID.Place, 200, false);
-            } else {
-                fListColumns.AddColumn(LSID.PlaceAndAttribute, 200, false);
-            }
-            fListColumns.AddColumn(LSID.Cause, 130, false);
-            fListColumns.AddColumn(LSID.RPSources, 32, false);
-            fListColumns.AddColumn(LSID.RPNotes, 32, false);
-            fListColumns.AddColumn(LSID.RPMultimedia, 32, false);
-            fListColumns.ResetDefaults();
-
             fOptions = GlobalOptions.Instance;
         }
 
+        public static ListColumns CreateListColumns()
+        {
+            var result = new ListColumns(GKListType.stEvents);
+
+            result.AddColumn(LSID.NumberSym, 25, false);
+            result.AddColumn(LSID.Event, 90, false);
+            result.AddColumn(LSID.Date, 90, false);
+            result.AddColumn(LSID.PlaceAndAttribute, 200, false);
+            result.AddColumn(LSID.Cause, 130, false);
+            result.AddColumn(LSID.RPSources, 32, false);
+            result.AddColumn(LSID.RPNotes, 32, false);
+            result.AddColumn(LSID.RPMultimedia, 32, false);
+
+            result.ResetDefaults();
+            return result;
+        }
+
         protected override object GetColumnValueEx(int colType, int colSubtype, bool isVisible)
         {
             object result = null;
@@ -75,15 +76,7 @@ protected override object GetColumnValueEx(int colType, int colSubtype, bool isV
                     result = new GDMDateItem(fFetchedRec.Date.Value);
                     break;
                 case 3:
-                    if (fPersonsMode) {
-                        string st = fFetchedRec.Place.StringValue;
-                        if (fFetchedRec.StringValue != "") {
-                            st = st + " [" + fFetchedRec.StringValue + "]";
-                        }
-                        result = st;
-                    } else {
-                        result = fFetchedRec.Place.StringValue;
-                    }
+                    result = GKUtils.GetEventPlaceAndAttributeValues(fFetchedRec);
                     break;
                 case 4:
                     result = GKUtils.GetEventCause(fFetchedRec);
diff --git a/projects/GKCore/GKCore/Lists/FamilyListModel.cs b/projects/GKCore/GKCore/Lists/FamilyListModel.cs
index 9262eaee5..617301907 100644
--- a/projects/GKCore/GKCore/Lists/FamilyListModel.cs
+++ b/projects/GKCore/GKCore/Lists/FamilyListModel.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2022 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -20,6 +20,7 @@
 
 using GDModel;
 using GKCore.Interfaces;
+using GKCore.Options;
 
 namespace GKCore.Lists
 {
@@ -38,13 +39,13 @@ public enum ColumnType
 
 
         public FamilyListModel(IBaseContext baseContext) :
-            base(baseContext, CreateFamilyListColumns(), GDMRecordType.rtFamily)
+            base(baseContext, CreateListColumns(), GDMRecordType.rtFamily)
         {
         }
 
-        public static ListColumns<GDMFamilyRecord> CreateFamilyListColumns()
+        public static ListColumns CreateListColumns()
         {
-            var result = new ListColumns<GDMFamilyRecord>();
+            var result = new ListColumns(GKListType.rtFamily);
 
             result.AddColumn(LSID.NumberSym, DataType.dtInteger, 50, true);
             result.AddColumn(LSID.Spouses, DataType.dtString, 300, true, true);
diff --git a/projects/GKCore/GKCore/Lists/GroupListModel.cs b/projects/GKCore/GKCore/Lists/GroupListModel.cs
index 80cb0005d..9baf93e1c 100644
--- a/projects/GKCore/GKCore/Lists/GroupListModel.cs
+++ b/projects/GKCore/GKCore/Lists/GroupListModel.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".
  *
@@ -25,6 +25,7 @@
 using GKCore.Design;
 using GKCore.Interfaces;
 using GKCore.Operations;
+using GKCore.Options;
 using GKCore.Types;
 
 namespace GKCore.Lists
@@ -43,13 +44,13 @@ public enum ColumnType
 
 
         public GroupListModel(IBaseContext baseContext) :
-            base(baseContext, CreateGroupListColumns(), GDMRecordType.rtGroup)
+            base(baseContext, CreateListColumns(), GDMRecordType.rtGroup)
         {
         }
 
-        public static ListColumns<GDMGroupRecord> CreateGroupListColumns()
+        public static ListColumns CreateListColumns()
         {
-            var result = new ListColumns<GDMGroupRecord>();
+            var result = new ListColumns(GKListType.rtGroup);
 
             result.AddColumn(LSID.NumberSym, DataType.dtInteger, 50, true);
             result.AddColumn(LSID.Group, DataType.dtString, 400, true, true);
@@ -96,13 +97,20 @@ public sealed class GroupMembersListModel : SheetModel<GDMIndividualLink>
     {
         private GDMIndividualRecord fMember;
 
-        public GroupMembersListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman)
+        public GroupMembersListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman, CreateListColumns())
         {
             AllowedActions = EnumSet<RecordAction>.Create(
                 RecordAction.raAdd, RecordAction.raDelete /*, RecordAction.raJump*/);
+        }
+
+        public static ListColumns CreateListColumns()
+        {
+            var result = new ListColumns(GKListType.stGroupMembers);
 
-            fListColumns.AddColumn(LSID.Name, 300, false);
-            fListColumns.ResetDefaults();
+            result.AddColumn(LSID.Name, 300, false);
+
+            result.ResetDefaults();
+            return result;
         }
 
         public override void Fetch(GDMIndividualLink aRec)
diff --git a/projects/GKCore/GKCore/Lists/IndividualListModel.cs b/projects/GKCore/GKCore/Lists/IndividualListModel.cs
index 1f5569988..5dbec1ca4 100644
--- a/projects/GKCore/GKCore/Lists/IndividualListModel.cs
+++ b/projects/GKCore/GKCore/Lists/IndividualListModel.cs
@@ -196,13 +196,13 @@ public enum ColumnType
 
 
         public IndividualListModel(IBaseContext baseContext) :
-            base(baseContext, CreateIndividualListColumns(), GDMRecordType.rtIndividual)
+            base(baseContext, CreateListColumns(), GDMRecordType.rtIndividual)
         {
         }
 
-        public static ListColumns<GDMIndividualRecord> CreateIndividualListColumns()
+        public static ListColumns CreateListColumns()
         {
-            var result = new ListColumns<GDMIndividualRecord>();
+            var result = new ListColumns(GKListType.rtIndividual);
 
             result.AddColumn(LSID.NumberSym, DataType.dtInteger, 50, true);
             result.AddColumn(LSID.Patriarch, DataType.dtString, 25, true);
@@ -707,13 +707,19 @@ public sealed class IndiGroupsListModel : SheetModel<GDMPointer>
     {
         private GDMGroupRecord fGroupRec;
 
-        public IndiGroupsListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman)
+        public IndiGroupsListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman, CreateListColumns())
         {
-            AllowedActions = EnumSet<RecordAction>.Create(
-                RecordAction.raAdd, RecordAction.raDelete, RecordAction.raJump);
+            AllowedActions = EnumSet<RecordAction>.Create(RecordAction.raAdd, RecordAction.raDelete, RecordAction.raJump);
+        }
+
+        public static ListColumns CreateListColumns()
+        {
+            var result = new ListColumns(GKListType.stIndividualGroups);
 
-            fListColumns.AddColumn(LSID.Group, 350, false);
-            fListColumns.ResetDefaults();
+            result.AddColumn(LSID.Group, 350, false);
+
+            result.ResetDefaults();
+            return result;
         }
 
         public override void Fetch(GDMPointer aRec)
@@ -782,17 +788,24 @@ public override async Task Modify(object sender, ModifyEventArgs eArgs)
     /// </summary>
     public sealed class IndiNamesListModel : SheetModel<GDMPersonalName>
     {
-        public IndiNamesListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman)
+        public IndiNamesListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman, CreateListColumns())
         {
             AllowedActions = EnumSet<RecordAction>.Create(
                 RecordAction.raAdd, RecordAction.raEdit, RecordAction.raDelete,
                 RecordAction.raMoveDown, RecordAction.raMoveUp);
+        }
 
-            fListColumns.AddColumn(LSID.NumberSym, 25, false);
-            fListColumns.AddColumn(LSID.Name, 350, false);
-            fListColumns.AddColumn(LSID.Type, 100, false);
-            fListColumns.AddColumn(LSID.Language, 150, false);
-            fListColumns.ResetDefaults();
+        public static ListColumns CreateListColumns()
+        {
+            var result = new ListColumns(GKListType.stIndividualNames);
+
+            result.AddColumn(LSID.NumberSym, 25, false);
+            result.AddColumn(LSID.Name, 350, false);
+            result.AddColumn(LSID.Type, 100, false);
+            result.AddColumn(LSID.Language, 150, false);
+
+            result.ResetDefaults();
+            return result;
         }
 
         protected override object GetColumnValueEx(int colType, int colSubtype, bool isVisible)
@@ -902,16 +915,23 @@ public sealed class IndiParentsListModel : SheetModel<GDMChildToFamilyLink>
     {
         private GDMFamilyRecord fFamRec;
 
-        public IndiParentsListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman)
+        public IndiParentsListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman, CreateListColumns())
         {
             AllowedActions = EnumSet<RecordAction>.Create(
                 RecordAction.raAdd, RecordAction.raEdit, RecordAction.raDelete,
                 RecordAction.raMoveDown, RecordAction.raMoveUp, RecordAction.raDetails);
+        }
+
+        public static ListColumns CreateListColumns()
+        {
+            var result = new ListColumns(GKListType.stIndividualParents);
 
-            fListColumns.AddColumn(LSID.NumberSym, 25, false);
-            fListColumns.AddColumn(LSID.Name, 350, false);
-            fListColumns.AddColumn(LSID.Type, 100, false);
-            fListColumns.ResetDefaults();
+            result.AddColumn(LSID.NumberSym, 25, false);
+            result.AddColumn(LSID.Name, 350, false);
+            result.AddColumn(LSID.Type, 100, false);
+
+            result.ResetDefaults();
+            return result;
         }
 
         protected override GDMRecord GetReferenceRecord(object itemData)
@@ -1021,16 +1041,23 @@ public sealed class IndiSpousesListModel : SheetModel<GDMSpouseToFamilyLink>
         private GDMFamilyRecord fFamilyRec;
         private string fRelName;
 
-        public IndiSpousesListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman)
+        public IndiSpousesListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman, CreateListColumns())
         {
             AllowedActions = EnumSet<RecordAction>.Create(
                 RecordAction.raAdd, RecordAction.raEdit, RecordAction.raDelete,
                 RecordAction.raJump, RecordAction.raMoveUp, RecordAction.raMoveDown, RecordAction.raDetails);
+        }
 
-            fListColumns.AddColumn(LSID.NumberSym, 25, false);
-            fListColumns.AddColumn(LSID.Spouse, 300, false);
-            fListColumns.AddColumn(LSID.MarriageDate, 100, false);
-            fListColumns.ResetDefaults();
+        public static ListColumns CreateListColumns()
+        {
+            var result = new ListColumns(GKListType.stIndividualSpouses);
+
+            result.AddColumn(LSID.NumberSym, 25, false);
+            result.AddColumn(LSID.Spouse, 300, false);
+            result.AddColumn(LSID.MarriageDate, 100, false);
+
+            result.ResetDefaults();
+            return result;
         }
 
         protected override GDMRecord GetReferenceRecord(object itemData)
@@ -1158,14 +1185,20 @@ public override async Task Modify(object sender, ModifyEventArgs eArgs)
     /// </summary>
     public sealed class URefsListModel : SheetModel<GDMUserReference>
     {
-        public URefsListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman)
+        public URefsListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman, CreateListColumns())
         {
-            AllowedActions = EnumSet<RecordAction>.Create(
-                RecordAction.raAdd, RecordAction.raEdit, RecordAction.raDelete);
+            AllowedActions = EnumSet<RecordAction>.Create(RecordAction.raAdd, RecordAction.raEdit, RecordAction.raDelete);
+        }
+
+        public static ListColumns CreateListColumns()
+        {
+            var result = new ListColumns(GKListType.stUserRefs);
+
+            result.AddColumn(LSID.Reference, 300, false);
+            result.AddColumn(LSID.Type, 200, false);
 
-            fListColumns.AddColumn(LSID.Reference, 300, false);
-            fListColumns.AddColumn(LSID.Type, 200, false);
-            fListColumns.ResetDefaults();
+            result.ResetDefaults();
+            return result;
         }
 
         protected override object GetColumnValueEx(int colType, int colSubtype, bool isVisible)
diff --git a/projects/GKCore/GKCore/Lists/ListColumns.cs b/projects/GKCore/GKCore/Lists/ListColumns.cs
index 603ea2bb6..974dc5230 100644
--- a/projects/GKCore/GKCore/Lists/ListColumns.cs
+++ b/projects/GKCore/GKCore/Lists/ListColumns.cs
@@ -63,13 +63,19 @@ public ListColumn(byte id, string colName, DataType dataType,
     /// <summary>
     /// 
     /// </summary>
-    public class ListColumns<T> : IListColumns
+    public class ListColumns : IListColumns
     {
         private readonly List<ListColumn> fColumns;
         private readonly List<ListColumn> fOrderedColumns;
         private sbyte fLastId;
+        private GKListType fListType;
 
 
+        public GKListType ListType
+        {
+            get { return fListType; }
+        }
+
         public int Count
         {
             get { return fColumns.Count; }
@@ -86,11 +92,12 @@ public IList<ListColumn> OrderedColumns
         }
 
 
-        public ListColumns()
+        public ListColumns(GKListType listType)
         {
             fLastId = -1;
             fColumns = new List<ListColumn>();
             fOrderedColumns = new List<ListColumn>();
+            fListType = listType;
 
             ResetDefaults();
         }
@@ -143,7 +150,7 @@ public void ResetDefaults()
 
         public void CopyTo(IListColumns target)
         {
-            ListColumns<T> targetColumns = target as ListColumns<T>;
+            ListColumns targetColumns = target as ListColumns;
             if (targetColumns == null)
                 throw new ArgumentNullException("target");
 
@@ -195,7 +202,7 @@ public void LoadFromFile(IniFile iniFile, string section, int optsVersion)
             }
         }
 
-        public void SaveToFile(IniFile iniFile, string section)
+        public void SaveToFile(IniFile iniFile, string section, int optsVersion)
         {
             if (iniFile == null) return;
 
diff --git a/projects/GKCore/GKCore/Lists/ListSource.cs b/projects/GKCore/GKCore/Lists/ListSource.cs
index 87ef7c29c..282ac28d9 100644
--- a/projects/GKCore/GKCore/Lists/ListSource.cs
+++ b/projects/GKCore/GKCore/Lists/ListSource.cs
@@ -63,7 +63,7 @@ public abstract class ListSource<T> : IListSource
 
         protected readonly IBaseContext fBaseContext;
         protected readonly List<MapColumnRec> fColumnsMap;
-        protected readonly ListColumns<T> fListColumns;
+        protected readonly ListColumns fListColumns;
 
 
         public IBaseContext BaseContext
@@ -113,7 +113,7 @@ public QuickFilterParams QuickFilter
         }
 
 
-        protected ListSource(IBaseContext baseContext, ListColumns<T> defaultListColumns)
+        protected ListSource(IBaseContext baseContext, ListColumns defaultListColumns)
         {
             fBaseContext = baseContext;
             fColumnsMap = new List<MapColumnRec>();
@@ -121,6 +121,8 @@ protected ListSource(IBaseContext baseContext, ListColumns<T> defaultListColumns
             fContentList = new ExtObservableList<ContentItem>();
             fQuickFilter = new QuickFilterParams();
 
+            RestoreSettings();
+
             CreateFilter();
         }
 
@@ -141,6 +143,20 @@ public void Clear()
             fListColumns.Clear();
         }
 
+        public void RestoreSettings()
+        {
+            var columnOpts = GlobalOptions.Instance.ListOptions[fListColumns.ListType];
+            //rView.SetSortColumn(columnOpts.SortColumn, false);
+            columnOpts.Columns.CopyTo(fListColumns);
+        }
+
+        public void SaveSettings()
+        {
+            var columnOpts = GlobalOptions.Instance.ListOptions[fListColumns.ListType];
+            //columnOpts.SortColumn = rView.SortColumn;
+            fListColumns.CopyTo(columnOpts.Columns);
+        }
+
         #region Columns
 
         protected virtual void UpdateColumnsMap()
@@ -461,7 +477,7 @@ protected bool CheckExternalFilter(GDMRecord rec)
 
         public string[] CreateFields()
         {
-            ListColumns<T> listColumns = (ListColumns<T>)ListColumns;
+            var listColumns = ListColumns;
             string[] fields = new string[listColumns.Count + 1]; // +empty item
             fields[0] = "";
 
diff --git a/projects/GKCore/GKCore/Lists/LocationLinksListModel.cs b/projects/GKCore/GKCore/Lists/LocationLinksListModel.cs
index d8b3043d4..2c9ca4bf8 100644
--- a/projects/GKCore/GKCore/Lists/LocationLinksListModel.cs
+++ b/projects/GKCore/GKCore/Lists/LocationLinksListModel.cs
@@ -26,6 +26,7 @@
 using GKCore.Design;
 using GKCore.Interfaces;
 using GKCore.Operations;
+using GKCore.Options;
 using GKCore.Types;
 
 namespace GKCore.Lists
@@ -34,14 +35,21 @@ public sealed class LocationLinksListModel : SheetModel<GDMLocationLink>
     {
         private GDMLocationRecord fRelLocation;
 
-        public LocationLinksListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman)
+        public LocationLinksListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman, CreateListColumns())
         {
             AllowedActions = EnumSet<RecordAction>.Create(RecordAction.raAdd, RecordAction.raEdit, RecordAction.raDelete);
+        }
+
+        public static ListColumns CreateListColumns()
+        {
+            var result = new ListColumns(GKListType.stLocationLinks);
 
-            fListColumns.AddColumn(LSID.NumberSym, 25, false);
-            fListColumns.AddColumn(LSID.Name, 300, false);
-            fListColumns.AddColumn(LSID.Date, 160, false);
-            fListColumns.ResetDefaults();
+            result.AddColumn(LSID.NumberSym, 25, false);
+            result.AddColumn(LSID.Name, 300, false);
+            result.AddColumn(LSID.Date, 160, false);
+
+            result.ResetDefaults();
+            return result;
         }
 
         public override void Fetch(GDMLocationLink aRec)
diff --git a/projects/GKCore/GKCore/Lists/LocationListModel.cs b/projects/GKCore/GKCore/Lists/LocationListModel.cs
index 141e656ae..b56d96ff6 100644
--- a/projects/GKCore/GKCore/Lists/LocationListModel.cs
+++ b/projects/GKCore/GKCore/Lists/LocationListModel.cs
@@ -22,6 +22,7 @@
 using GDModel;
 using GDModel.Providers.GEDCOM;
 using GKCore.Interfaces;
+using GKCore.Options;
 
 namespace GKCore.Lists
 {
@@ -42,13 +43,13 @@ public enum ColumnType
 
 
         public LocationListModel(IBaseContext baseContext) :
-            base(baseContext, CreateLocationListColumns(), GDMRecordType.rtLocation)
+            base(baseContext, CreateListColumns(), GDMRecordType.rtLocation)
         {
         }
 
-        public static ListColumns<GDMLocationRecord> CreateLocationListColumns()
+        public static ListColumns CreateListColumns()
         {
-            var result = new ListColumns<GDMLocationRecord>();
+            var result = new ListColumns(GKListType.rtLocation);
 
             result.AddColumn(LSID.NumberSym, DataType.dtInteger, 50, true);
             result.AddColumn(LSID.Title, DataType.dtString, 300, true, true);
diff --git a/projects/GKCore/GKCore/Lists/LocationNamesListModel.cs b/projects/GKCore/GKCore/Lists/LocationNamesListModel.cs
index abecfc184..161c04b78 100644
--- a/projects/GKCore/GKCore/Lists/LocationNamesListModel.cs
+++ b/projects/GKCore/GKCore/Lists/LocationNamesListModel.cs
@@ -26,21 +26,29 @@
 using GKCore.Design;
 using GKCore.Interfaces;
 using GKCore.Operations;
+using GKCore.Options;
 using GKCore.Types;
 
 namespace GKCore.Lists
 {
     public sealed class LocationNamesListModel : SheetModel<GDMLocationName>
     {
-        public LocationNamesListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman)
+        public LocationNamesListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman, CreateListColumns())
         {
             AllowedActions = EnumSet<RecordAction>.Create(RecordAction.raAdd, RecordAction.raEdit, RecordAction.raDelete);
+        }
+
+        public static ListColumns CreateListColumns()
+        {
+            var result = new ListColumns(GKListType.stLocationNames);
 
-            fListColumns.AddColumn(LSID.NumberSym, 25, false);
-            fListColumns.AddColumn(LSID.Name, 300, false);
-            fListColumns.AddColumn(LSID.ShortTitle, 80, false);
-            fListColumns.AddColumn(LSID.Date, 160, false);
-            fListColumns.ResetDefaults();
+            result.AddColumn(LSID.NumberSym, 25, false);
+            result.AddColumn(LSID.Name, 300, false);
+            result.AddColumn(LSID.ShortTitle, 80, false);
+            result.AddColumn(LSID.Date, 160, false);
+
+            result.ResetDefaults();
+            return result;
         }
 
         protected override object GetColumnValueEx(int colType, int colSubtype, bool isVisible)
diff --git a/projects/GKCore/GKCore/Lists/MediaLinksListModel.cs b/projects/GKCore/GKCore/Lists/MediaLinksListModel.cs
index 8d2464371..e421bff65 100644
--- a/projects/GKCore/GKCore/Lists/MediaLinksListModel.cs
+++ b/projects/GKCore/GKCore/Lists/MediaLinksListModel.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2022 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;
 using GKCore.Interfaces;
 using GKCore.Operations;
+using GKCore.Options;
 using GKCore.Types;
 
 namespace GKCore.Lists
@@ -34,16 +35,23 @@ public sealed class MediaLinksListModel : SheetModel<GDMMultimediaLink>
     {
         private GDMFileReferenceWithTitle fFileRef;
 
-        public MediaLinksListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman)
+        public MediaLinksListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman, CreateListColumns())
         {
             AllowedActions = EnumSet<RecordAction>.Create(
                 RecordAction.raAdd, RecordAction.raEdit, RecordAction.raDelete,
                 RecordAction.raMoveUp, RecordAction.raMoveDown);
+        }
+
+        public static ListColumns CreateListColumns()
+        {
+            var result = new ListColumns(GKListType.stMediaLinks);
 
-            fListColumns.AddColumn(LSID.NumberSym, 25, false);
-            fListColumns.AddColumn(LSID.RPMultimedia, 300, false);
-            fListColumns.AddColumn(LSID.Type, 300, false);
-            fListColumns.ResetDefaults();
+            result.AddColumn(LSID.NumberSym, 25, false);
+            result.AddColumn(LSID.RPMultimedia, 300, false);
+            result.AddColumn(LSID.Type, 300, false);
+
+            result.ResetDefaults();
+            return result;
         }
 
         public override void Fetch(GDMMultimediaLink aRec)
diff --git a/projects/GKCore/GKCore/Lists/MultimediaListModel.cs b/projects/GKCore/GKCore/Lists/MultimediaListModel.cs
index f920e8f95..c696e8cf9 100644
--- a/projects/GKCore/GKCore/Lists/MultimediaListModel.cs
+++ b/projects/GKCore/GKCore/Lists/MultimediaListModel.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".
  *
@@ -46,13 +46,13 @@ public enum ColumnType
 
 
         public MultimediaListModel(IBaseContext baseContext) :
-            base(baseContext, CreateMultimediaListColumns(), GDMRecordType.rtMultimedia)
+            base(baseContext, CreateListColumns(), GDMRecordType.rtMultimedia)
         {
         }
 
-        public static ListColumns<GDMMultimediaRecord> CreateMultimediaListColumns()
+        public static ListColumns CreateListColumns()
         {
-            var result = new ListColumns<GDMMultimediaRecord>();
+            var result = new ListColumns(GKListType.rtMultimedia);
 
             result.AddColumn(LSID.NumberSym, DataType.dtInteger, 50, true);
             result.AddColumn(LSID.Title, DataType.dtString, 150, true, true);
diff --git a/projects/GKCore/GKCore/Lists/NoteLinksListModel.cs b/projects/GKCore/GKCore/Lists/NoteLinksListModel.cs
index 8a009c899..9d4b63919 100644
--- a/projects/GKCore/GKCore/Lists/NoteLinksListModel.cs
+++ b/projects/GKCore/GKCore/Lists/NoteLinksListModel.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2022 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;
 using GKCore.Interfaces;
 using GKCore.Operations;
+using GKCore.Options;
 using GKCore.Types;
 
 namespace GKCore.Lists
@@ -34,15 +35,22 @@ public sealed class NoteLinksListModel : SheetModel<GDMNotes>
     {
         private GDMLines fNoteLines;
 
-        public NoteLinksListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman)
+        public NoteLinksListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman, CreateListColumns())
         {
             AllowedActions = EnumSet<RecordAction>.Create(
                 RecordAction.raAdd, RecordAction.raEdit, RecordAction.raDelete,
                 RecordAction.raMoveUp, RecordAction.raMoveDown);
+        }
+
+        public static ListColumns CreateListColumns()
+        {
+            var result = new ListColumns(GKListType.stNoteLinks);
 
-            fListColumns.AddColumn(LSID.NumberSym, 25, false);
-            fListColumns.AddColumn(LSID.Note, 500, false);
-            fListColumns.ResetDefaults();
+            result.AddColumn(LSID.NumberSym, 25, false);
+            result.AddColumn(LSID.Note, 500, false);
+
+            result.ResetDefaults();
+            return result;
         }
 
         public override void Fetch(GDMNotes aRec)
diff --git a/projects/GKCore/GKCore/Lists/NoteListModel.cs b/projects/GKCore/GKCore/Lists/NoteListModel.cs
index 5d50efe7b..0b1a70352 100644
--- a/projects/GKCore/GKCore/Lists/NoteListModel.cs
+++ b/projects/GKCore/GKCore/Lists/NoteListModel.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2022 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -20,6 +20,7 @@
 
 using GDModel;
 using GKCore.Interfaces;
+using GKCore.Options;
 
 namespace GKCore.Lists
 {
@@ -40,13 +41,13 @@ public enum ColumnType
 
 
         public NoteListModel(IBaseContext baseContext) :
-            base(baseContext, CreateNoteListColumns(), GDMRecordType.rtNote)
+            base(baseContext, CreateListColumns(), GDMRecordType.rtNote)
         {
         }
 
-        public static ListColumns<GDMNoteRecord> CreateNoteListColumns()
+        public static ListColumns CreateListColumns()
         {
-            var result = new ListColumns<GDMNoteRecord>();
+            var result = new ListColumns(GKListType.rtNote);
 
             result.AddColumn(LSID.NumberSym, DataType.dtInteger, 50, true);
             result.AddColumn(LSID.Note, DataType.dtString, 400, true);
diff --git a/projects/GKCore/GKCore/Lists/RecordsListModel.cs b/projects/GKCore/GKCore/Lists/RecordsListModel.cs
index 7511663b5..5d2eb110d 100644
--- a/projects/GKCore/GKCore/Lists/RecordsListModel.cs
+++ b/projects/GKCore/GKCore/Lists/RecordsListModel.cs
@@ -47,7 +47,7 @@ public bool SimpleList
             set { fSimpleList = value; }
         }
 
-        protected RecordsListModel(IBaseContext baseContext, ListColumns<T> defaultListColumns, GDMRecordType recordType) :
+        protected RecordsListModel(IBaseContext baseContext, ListColumns defaultListColumns, GDMRecordType recordType) :
             base(baseContext, defaultListColumns)
         {
             fRecordType = recordType;
diff --git a/projects/GKCore/GKCore/Lists/RepositoryListModel.cs b/projects/GKCore/GKCore/Lists/RepositoryListModel.cs
index aa6576cbe..286744cb1 100644
--- a/projects/GKCore/GKCore/Lists/RepositoryListModel.cs
+++ b/projects/GKCore/GKCore/Lists/RepositoryListModel.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2022 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -20,6 +20,7 @@
 
 using GDModel;
 using GKCore.Interfaces;
+using GKCore.Options;
 
 namespace GKCore.Lists
 {
@@ -37,13 +38,13 @@ public enum ColumnType
 
 
         public RepositoryListModel(IBaseContext baseContext) :
-            base(baseContext, CreateRepositoryListColumns(), GDMRecordType.rtRepository)
+            base(baseContext, CreateListColumns(), GDMRecordType.rtRepository)
         {
         }
 
-        public static ListColumns<GDMRepositoryRecord> CreateRepositoryListColumns()
+        public static ListColumns CreateListColumns()
         {
-            var result = new ListColumns<GDMRepositoryRecord>();
+            var result = new ListColumns(GKListType.rtRepository);
 
             result.AddColumn(LSID.NumberSym, DataType.dtInteger, 50, true);
             result.AddColumn(LSID.Repository, DataType.dtString, 400, true, true);
diff --git a/projects/GKCore/GKCore/Lists/ResearchListModel.cs b/projects/GKCore/GKCore/Lists/ResearchListModel.cs
index 4c68c7a33..48108c06b 100644
--- a/projects/GKCore/GKCore/Lists/ResearchListModel.cs
+++ b/projects/GKCore/GKCore/Lists/ResearchListModel.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2022 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;
 using GKCore.Interfaces;
 using GKCore.Operations;
+using GKCore.Options;
 using GKCore.Types;
 
 namespace GKCore.Lists
@@ -49,13 +50,13 @@ public enum ColumnType
 
 
         public ResearchListModel(IBaseContext baseContext) :
-            base(baseContext, CreateResearchListColumns(), GDMRecordType.rtResearch)
+            base(baseContext, CreateListColumns(), GDMRecordType.rtResearch)
         {
         }
 
-        public static ListColumns<GDMResearchRecord> CreateResearchListColumns()
+        public static ListColumns CreateListColumns()
         {
-            var result = new ListColumns<GDMResearchRecord>();
+            var result = new ListColumns(GKListType.rtResearch);
 
             result.AddColumn(LSID.NumberSym, DataType.dtInteger, 50, true);
             result.AddColumn(LSID.Title, DataType.dtString, 300, true, true);
@@ -127,16 +128,23 @@ public sealed class ResTasksListModel : SheetModel<GDMPointer>
     {
         private GDMTaskRecord fTaskRec;
 
-        public ResTasksListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman)
+        public ResTasksListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman, CreateListColumns())
         {
             AllowedActions = EnumSet<RecordAction>.Create(
                 RecordAction.raAdd, RecordAction.raEdit, RecordAction.raDelete, RecordAction.raJump);
+        }
+
+        public static ListColumns CreateListColumns()
+        {
+            var result = new ListColumns(GKListType.stResearchTasks);
 
-            fListColumns.AddColumn(LSID.Goal, 250, false);
-            fListColumns.AddColumn(LSID.Priority, 90, false);
-            fListColumns.AddColumn(LSID.StartDate, 90, false);
-            fListColumns.AddColumn(LSID.StopDate, 90, false);
-            fListColumns.ResetDefaults();
+            result.AddColumn(LSID.Goal, 250, false);
+            result.AddColumn(LSID.Priority, 90, false);
+            result.AddColumn(LSID.StartDate, 90, false);
+            result.AddColumn(LSID.StopDate, 90, false);
+
+            result.ResetDefaults();
+            return result;
         }
 
         public override void Fetch(GDMPointer aRec)
@@ -223,16 +231,23 @@ public sealed class ResCommunicationsListModel : SheetModel<GDMPointer>
     {
         private GDMCommunicationRecord fCommRec;
 
-        public ResCommunicationsListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman)
+        public ResCommunicationsListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman, CreateListColumns())
         {
             AllowedActions = EnumSet<RecordAction>.Create(
                 RecordAction.raAdd, RecordAction.raEdit, RecordAction.raDelete, RecordAction.raJump);
+        }
+
+        public static ListColumns CreateListColumns()
+        {
+            var result = new ListColumns(GKListType.stResearchCommunications);
 
-            fListColumns.AddColumn(LSID.Theme, 150, false);
-            fListColumns.AddColumn(LSID.Corresponder, 150, false);
-            fListColumns.AddColumn(LSID.Type, 90, false);
-            fListColumns.AddColumn(LSID.Date, 90, false);
-            fListColumns.ResetDefaults();
+            result.AddColumn(LSID.Theme, 150, false);
+            result.AddColumn(LSID.Corresponder, 150, false);
+            result.AddColumn(LSID.Type, 90, false);
+            result.AddColumn(LSID.Date, 90, false);
+
+            result.ResetDefaults();
+            return result;
         }
 
         public override void Fetch(GDMPointer aRec)
@@ -319,13 +334,20 @@ public sealed class ResGroupsListModel : SheetModel<GDMPointer>
     {
         private GDMGroupRecord fGroupRec;
 
-        public ResGroupsListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman)
+        public ResGroupsListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman, CreateListColumns())
         {
             AllowedActions = EnumSet<RecordAction>.Create(
                 RecordAction.raAdd, RecordAction.raEdit, RecordAction.raDelete, RecordAction.raJump);
+        }
 
-            fListColumns.AddColumn(LSID.Group, 350, false);
-            fListColumns.ResetDefaults();
+        public static ListColumns CreateListColumns()
+        {
+            var result = new ListColumns(GKListType.stResearchGroups);
+
+            result.AddColumn(LSID.Group, 350, false);
+
+            result.ResetDefaults();
+            return result;
         }
 
         public override void Fetch(GDMPointer aRec)
diff --git a/projects/GKCore/GKCore/Lists/SheetModel.cs b/projects/GKCore/GKCore/Lists/SheetModel.cs
index 6186da59a..2d468a029 100644
--- a/projects/GKCore/GKCore/Lists/SheetModel.cs
+++ b/projects/GKCore/GKCore/Lists/SheetModel.cs
@@ -27,6 +27,7 @@
 using GKCore.Design.Controls;
 using GKCore.Interfaces;
 using GKCore.Operations;
+using GKCore.Options;
 using GKCore.Types;
 
 namespace GKCore.Lists
@@ -166,7 +167,12 @@ public ISheetList SheetList
 
 
         protected SheetModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) :
-            base((baseWin != null ? baseWin.Context : null), new ListColumns<T>())
+            this(owner, baseWin, undoman, new ListColumns(GKListType.ltNone))
+        {
+        }
+
+        protected SheetModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman, ListColumns defaultListColumns) :
+            base((baseWin != null ? baseWin.Context : null), defaultListColumns)
         {
             fAllowedActions = new EnumSet<RecordAction>();
             fBaseWin = baseWin;
diff --git a/projects/GKCore/GKCore/Lists/SourceCitationsListModel.cs b/projects/GKCore/GKCore/Lists/SourceCitationsListModel.cs
index 324a50ebb..cb1b8047c 100644
--- a/projects/GKCore/GKCore/Lists/SourceCitationsListModel.cs
+++ b/projects/GKCore/GKCore/Lists/SourceCitationsListModel.cs
@@ -26,6 +26,7 @@
 using GKCore.Design;
 using GKCore.Interfaces;
 using GKCore.Operations;
+using GKCore.Options;
 using GKCore.Types;
 
 namespace GKCore.Lists
@@ -34,19 +35,26 @@ public sealed class SourceCitationsListModel : SheetModel<GDMSourceCitation>
     {
         private GDMSourceRecord fSourceRec;
 
-        public SourceCitationsListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman)
+        public SourceCitationsListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman, CreateListColumns())
         {
             AllowedActions = EnumSet<RecordAction>.Create(
                 RecordAction.raAdd, RecordAction.raEdit, RecordAction.raDelete,
                 RecordAction.raMoveUp, RecordAction.raMoveDown,
                 RecordAction.raCopy, RecordAction.raPaste, RecordAction.raDetails);
+        }
+
+        public static ListColumns CreateListColumns()
+        {
+            var result = new ListColumns(GKListType.stSourceCitations);
 
-            fListColumns.AddColumn(LSID.NumberSym, 25, false);
-            fListColumns.AddColumn(LSID.Title, 260, false);
-            fListColumns.AddColumn(LSID.Page, 90, false);
-            fListColumns.AddColumn(LSID.Certainty, 220, false);
-            fListColumns.AddColumn(LSID.Author, 70, false);
-            fListColumns.ResetDefaults();
+            result.AddColumn(LSID.NumberSym, 25, false);
+            result.AddColumn(LSID.Title, 260, false);
+            result.AddColumn(LSID.Page, 90, false);
+            result.AddColumn(LSID.Certainty, 220, false);
+            result.AddColumn(LSID.Author, 70, false);
+
+            result.ResetDefaults();
+            return result;
         }
 
         protected override GDMRecord GetReferenceRecord(object itemData)
diff --git a/projects/GKCore/GKCore/Lists/SourceListModel.cs b/projects/GKCore/GKCore/Lists/SourceListModel.cs
index 3fc698da5..6a010ec53 100644
--- a/projects/GKCore/GKCore/Lists/SourceListModel.cs
+++ b/projects/GKCore/GKCore/Lists/SourceListModel.cs
@@ -25,6 +25,7 @@
 using GKCore.Design;
 using GKCore.Interfaces;
 using GKCore.Operations;
+using GKCore.Options;
 using GKCore.Types;
 
 namespace GKCore.Lists
@@ -48,13 +49,13 @@ public enum ColumnType
 
 
         public SourceListModel(IBaseContext baseContext) :
-            base(baseContext, CreateSourceListColumns(), GDMRecordType.rtSource)
+            base(baseContext, CreateListColumns(), GDMRecordType.rtSource)
         {
         }
 
-        public static ListColumns<GDMSourceRecord> CreateSourceListColumns()
+        public static ListColumns CreateListColumns()
         {
-            var result = new ListColumns<GDMSourceRecord>();
+            var result = new ListColumns(GKListType.rtSource);
 
             result.AddColumn(LSID.NumberSym, DataType.dtInteger, 50, true);
             result.AddColumn(LSID.ShortTitle, DataType.dtString, 120, true, true);
@@ -126,14 +127,21 @@ public sealed class SourceRepositoriesListModel : SheetModel<GDMRepositoryCitati
     {
         private GDMRepositoryRecord fRepoRec;
 
-        public SourceRepositoriesListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman)
+        public SourceRepositoriesListModel(IView owner, IBaseWindow baseWin, ChangeTracker undoman) : base(owner, baseWin, undoman, CreateListColumns())
         {
             AllowedActions = EnumSet<RecordAction>.Create(
                 RecordAction.raAdd, RecordAction.raDelete, RecordAction.raJump,
                 RecordAction.raCopy, RecordAction.raPaste);
+        }
+
+        public static ListColumns CreateListColumns()
+        {
+            var result = new ListColumns(GKListType.stSourceRepositories);
 
-            fListColumns.AddColumn(LSID.Repository, 300, false);
-            fListColumns.ResetDefaults();
+            result.AddColumn(LSID.Repository, 300, false);
+
+            result.ResetDefaults();
+            return result;
         }
 
         public override void Fetch(GDMRepositoryCitation aRec)
diff --git a/projects/GKCore/GKCore/Lists/TaskListModel.cs b/projects/GKCore/GKCore/Lists/TaskListModel.cs
index e4ff97a99..8e7cdab11 100644
--- a/projects/GKCore/GKCore/Lists/TaskListModel.cs
+++ b/projects/GKCore/GKCore/Lists/TaskListModel.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2022 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -20,6 +20,7 @@
 
 using GDModel;
 using GKCore.Interfaces;
+using GKCore.Options;
 
 namespace GKCore.Lists
 {
@@ -40,13 +41,13 @@ public enum ColumnType
 
 
         public TaskListModel(IBaseContext baseContext) :
-            base(baseContext, CreateTaskListColumns(), GDMRecordType.rtTask)
+            base(baseContext, CreateListColumns(), GDMRecordType.rtTask)
         {
         }
 
-        public static ListColumns<GDMTaskRecord> CreateTaskListColumns()
+        public static ListColumns CreateListColumns()
         {
-            var result = new ListColumns<GDMTaskRecord>();
+            var result = new ListColumns(GKListType.rtTask);
 
             result.AddColumn(LSID.NumberSym, DataType.dtInteger, 50, true);
             result.AddColumn(LSID.Goal, DataType.dtString, 300, true, true);
diff --git a/projects/GKCore/GKCore/Options/GlobalOptions.cs b/projects/GKCore/GKCore/Options/GlobalOptions.cs
index 813a91421..9256f333c 100644
--- a/projects/GKCore/GKCore/Options/GlobalOptions.cs
+++ b/projects/GKCore/GKCore/Options/GlobalOptions.cs
@@ -42,7 +42,7 @@ public enum OptionsPage
     /// </summary>
     public sealed class GlobalOptions : BaseObject, IOptions
     {
-        public const int OPTS_VERSION = 2;
+        public const int OPTS_VERSION = 3;
 
         private static GlobalOptions fInstance = null;
 
@@ -50,7 +50,6 @@ public sealed class GlobalOptions : BaseObject, IOptions
         private readonly StringList fEventFilters;
         private readonly StringList fFARPatterns;
         private readonly StringList fFARReplacements;
-        private readonly IListColumns fIndividualListColumns;
         private readonly List<LangRecord> fLanguages;
         private readonly StringList fLastBases;
         private readonly ListOptionsCollection fListOptions;
@@ -152,11 +151,6 @@ public StringList FARReplacements
 
         public string GeoSearchCountry { get; set; }
 
-        public IListColumns IndividualListColumns
-        {
-            get { return fIndividualListColumns; }
-        }
-
         public int InterfaceLang { get; set; }
 
         public int InfoPansOverallSize { get; set; }
@@ -313,8 +307,6 @@ private GlobalOptions()
             fProxy = new ProxyOptions();
             fRelations = new StringList();
             fCircleChartOptions = new CircleChartOptions();
-            fIndividualListColumns = IndividualListModel.CreateIndividualListColumns();
-            fIndividualListColumns.ResetDefaults();
             fLanguages = new List<LangRecord>();
             fLastBases = new StringList();
             fListOptions = new ListOptionsCollection();
@@ -800,7 +792,9 @@ public void LoadFromFile(IniFile ini)
 
             LoadStringList(ini, fRelations, "Relations", "Relation_");
 
-            fIndividualListColumns.LoadFromFile(ini, "PersonsColumns", optsVersion);
+            if (optsVersion <= 2) {
+                fListOptions[GDMRecordType.rtIndividual].Columns.LoadFromFile(ini, "PersonsColumns", optsVersion);
+            }
 
             ListHighlightUnmarriedPersons = ini.ReadBool("ListPersons", "HighlightUnmarried", false);
             ListHighlightUnparentedPersons = ini.ReadBool("ListPersons", "HighlightUnparented", false);
@@ -815,7 +809,7 @@ public void LoadFromFile(IniFile ini)
 
             fCircleChartOptions.LoadFromFile(ini);
 
-            fListOptions.LoadFromFile(ini);
+            fListOptions.LoadFromFile(ini, optsVersion);
 
             ReversePlaceEntitiesOrder = ini.ReadBool("Common", "ReversePlaceEntitiesOrder", false);
             CertaintyAlgorithm = (CertaintyAlgorithm)ini.ReadInteger("Common", "CertaintyAlgorithm", 0);
@@ -940,7 +934,8 @@ public void SaveToFile(IniFile ini)
 
             SaveStringList(ini, fRelations, "Relations", "Relation_");
 
-            fIndividualListColumns.SaveToFile(ini, "PersonsColumns");
+            // obsolete at OPTS_VERSION = 3
+            //fIndividualListColumns.SaveToFile(ini, "PersonsColumns", OPTS_VERSION);
 
             ini.WriteBool("ListPersons", "HighlightUnmarried", ListHighlightUnmarriedPersons);
             ini.WriteBool("ListPersons", "HighlightUnparented", ListHighlightUnparentedPersons);
@@ -966,7 +961,7 @@ public void SaveToFile(IniFile ini)
 
             fCircleChartOptions.SaveToFile(ini);
 
-            fListOptions.SaveToFile(ini);
+            fListOptions.SaveToFile(ini, OPTS_VERSION);
 
             ini.WriteBool("Common", "ReversePlaceEntitiesOrder", ReversePlaceEntitiesOrder);
             ini.WriteInteger("Common", "CertaintyAlgorithm", (int)CertaintyAlgorithm);
diff --git a/projects/GKCore/GKCore/Options/ListOptions.cs b/projects/GKCore/GKCore/Options/ListOptions.cs
index 9a15e925f..dfdd48c1c 100644
--- a/projects/GKCore/GKCore/Options/ListOptions.cs
+++ b/projects/GKCore/GKCore/Options/ListOptions.cs
@@ -22,6 +22,7 @@
 using BSLib;
 using GDModel;
 using GKCore.Interfaces;
+using GKCore.Lists;
 
 namespace GKCore.Options
 {
@@ -32,37 +33,145 @@ public ListOptionsException(string message) : base(message)
         }
     }
 
+    public enum GKListType
+    {
+        ltNone,
+
+        // records
+        rtIndividual,
+        rtFamily,
+        rtNote,
+        rtMultimedia,
+        rtSource,
+        rtRepository,
+        rtGroup,
+        rtResearch,
+        rtTask,
+        rtCommunication,
+        rtLocation,
+        rtSubmission,
+        rtSubmitter,
+
+        // all record substructures
+        stMediaLinks,
+        stNoteLinks,
+        stSourceCitations,
+        stUserRefs,
+
+        // rtIndividual + rtFamily substructures
+        stEvents,
+        stChildren,
+
+        // rtIndividual substructures
+        stIndividualAssociations,
+        stIndividualGroups,
+        stIndividualNames,
+        stIndividualParents,
+        stIndividualSpouses,
+
+        // rtFamily substructures
+
+        // rtSource
+        stSourceRepositories,
+
+        // rtGroup
+        stGroupMembers,
+
+        // rtResearch
+        stResearchTasks,
+        stResearchCommunications,
+        stResearchGroups,
+
+        // rtLocation
+        stLocationLinks,
+        stLocationNames,
+
+        // services
+        stEventDefs,
+
+        ltFirst = rtIndividual,
+        ltLast = stEventDefs,
+    }
+
+
     /// <summary>
     ///
     /// </summary>
     public class ListOptions : IOptions
     {
-        public static readonly string[] RecordTypeNames = new string[] {
-            "None",
-            "Individual",
-            "Family",
-            "Note",
+        public static readonly string[] ListTypeNames = new string[] {
+            "",
+
+            // records
+            "Individuals",
+            "Families",
+            "Notes",
             "Multimedia",
-            "Source",
-            "Repository",
-            "Group",
-            "Research",
-            "Task",
-            "Communication",
-            "Location",
-            "Submission",
-            "Submitter"
+            "Sources",
+            "Repositories",
+            "Groups",
+            "Researches",
+            "Tasks",
+            "Communications",
+            "Locations",
+            "Submissions",
+            "Submitters",
+
+            // all record substructures
+            "MediaLinks",
+            "NoteLinks",
+            "SourceCitations",
+            "UserRefs",
+
+            // rtIndividual + rtFamily substructures
+            "Events",
+            "Children",
+
+            // rtIndividual substructures
+            "IndividualAssociations",
+            "IndividualGroups",
+            "IndividualNames",
+            "IndividualParents",
+            "IndividualSpouses",
+
+            // rtFamily substructures
+
+            // rtSource
+            "SourceRepositories",
+
+            // rtGroup
+            "GroupMembers",
+
+            // rtResearch
+            "ResearchTasks",
+            "ResearchCommunications",
+            "ResearchGroups",
+
+            // rtLocation
+            "LocationLinks",
+            "LocationNames",
+
+            // services
+            "EventDefs",
         };
 
+        private readonly IListColumns fColumns;
         private readonly string fName;
 
+        public IListColumns Columns
+        {
+            get { return fColumns; }
+        }
+
         public int SortColumn { get; set; }
 
         public int SplitterPosition { get; set; }
 
-        public ListOptions(GDMRecordType recType)
+        public ListOptions(GKListType listType, ListColumns listColumns)
         {
-            fName = RecordTypeNames[(int)recType] + "List";
+            fName = ListTypeNames[(int)listType] + "List";
+            fColumns = listColumns;
+
             ResetDefaults();
         }
 
@@ -70,6 +179,8 @@ public void ResetDefaults()
         {
             SortColumn = 0;
             SplitterPosition = 300;
+
+            fColumns.ResetDefaults();
         }
 
         public void Assign(IOptions source)
@@ -81,7 +192,7 @@ public void Assign(IOptions source)
             SplitterPosition = srcOptions.SplitterPosition;
         }
 
-        public void LoadFromFile(IniFile iniFile)
+        public void LoadFromFile(IniFile iniFile, int optsVersion)
         {
             if (iniFile == null)
                 throw new ArgumentNullException("iniFile");
@@ -89,18 +200,26 @@ public void LoadFromFile(IniFile iniFile)
             try {
                 SortColumn = iniFile.ReadInteger(fName, "SortColumn", 0);
                 SplitterPosition = iniFile.ReadInteger(fName, "SplitterPosition", 300);
+
+                if (optsVersion >= 3) {
+                    fColumns.LoadFromFile(iniFile, fName, optsVersion);
+                }
             } catch (Exception) {
                 throw new ListOptionsException("Error loading ListOptions");
             }
         }
 
-        public void SaveToFile(IniFile iniFile)
+        public void SaveToFile(IniFile iniFile, int optsVersion)
         {
             if (iniFile == null)
                 throw new ArgumentNullException("iniFile");
 
             iniFile.WriteInteger(fName, "SortColumn", SortColumn);
             iniFile.WriteInteger(fName, "SplitterPosition", SplitterPosition);
+
+            if (optsVersion >= 3) {
+                fColumns.SaveToFile(iniFile, fName, optsVersion);
+            }
         }
     }
 
@@ -113,31 +232,141 @@ public ListOptions this[GDMRecordType rt]
             get { return fOptions[(int)rt]; }
         }
 
+        public ListOptions this[GKListType lt]
+        {
+            get { return fOptions[(int)lt]; }
+        }
+
         public ListOptionsCollection()
         {
-            fOptions = new ListOptions[(int)GDMRecordType.rtLast + 1];
-            for (var rt = GDMRecordType.rtIndividual; rt <= GDMRecordType.rtLocation; rt++) {
-                fOptions[(int)rt] = new ListOptions(rt);
+            fOptions = new ListOptions[(int)GKListType.ltLast + 1];
+            for (var lt = GKListType.ltFirst; lt <= GKListType.ltLast; lt++) {
+                fOptions[(int)lt] = new ListOptions(lt, GetListColumns(lt));
+            }
+        }
+
+        /*private ListColumns GetListColumns(GDMRecordType recType)
+        {
+            int id = (int)recType;
+            return GetListColumns((GKListType)id);
+        }*/
+
+        private ListColumns GetListColumns(GKListType listType)
+        {
+            switch (listType) {
+                case GKListType.rtIndividual:
+                    return IndividualListModel.CreateListColumns();
+
+                case GKListType.rtFamily:
+                    return FamilyListModel.CreateListColumns();
+
+                case GKListType.rtNote:
+                    return NoteListModel.CreateListColumns();
+
+                case GKListType.rtMultimedia:
+                    return MultimediaListModel.CreateListColumns();
+
+                case GKListType.rtSource:
+                    return SourceListModel.CreateListColumns();
+
+                case GKListType.rtRepository:
+                    return RepositoryListModel.CreateListColumns();
+
+                case GKListType.rtGroup:
+                    return GroupListModel.CreateListColumns();
+
+                case GKListType.rtResearch:
+                    return ResearchListModel.CreateListColumns();
+
+                case GKListType.rtTask:
+                    return TaskListModel.CreateListColumns();
+
+                case GKListType.rtCommunication:
+                    return CommunicationListModel.CreateListColumns();
+
+                case GKListType.rtLocation:
+                    return LocationListModel.CreateListColumns();
+
+
+                case GKListType.stMediaLinks:
+                    return MediaLinksListModel.CreateListColumns();
+
+                case GKListType.stNoteLinks:
+                    return NoteLinksListModel.CreateListColumns();
+
+                case GKListType.stSourceCitations:
+                    return SourceCitationsListModel.CreateListColumns();
+
+                case GKListType.stUserRefs:
+                    return URefsListModel.CreateListColumns();
+
+                case GKListType.stEvents:
+                    return EventsListModel.CreateListColumns();
+
+                case GKListType.stChildren:
+                    return ChildrenListModel.CreateListColumns();
+
+                case GKListType.stIndividualAssociations:
+                    return AssociationsListModel.CreateListColumns();
+
+                case GKListType.stIndividualGroups:
+                    return IndiGroupsListModel.CreateListColumns();
+
+                case GKListType.stIndividualNames:
+                    return IndiNamesListModel.CreateListColumns();
+
+                case GKListType.stIndividualParents:
+                    return IndiParentsListModel.CreateListColumns();
+
+                case GKListType.stIndividualSpouses:
+                    return IndiSpousesListModel.CreateListColumns();
+
+                case GKListType.stSourceRepositories:
+                    return SourceRepositoriesListModel.CreateListColumns();
+
+                case GKListType.stGroupMembers:
+                    return GroupMembersListModel.CreateListColumns();
+
+                case GKListType.stResearchTasks:
+                    return ResTasksListModel.CreateListColumns();
+
+                case GKListType.stResearchCommunications:
+                    return ResCommunicationsListModel.CreateListColumns();
+
+                case GKListType.stResearchGroups:
+                    return ResGroupsListModel.CreateListColumns();
+
+                case GKListType.stLocationLinks:
+                    return LocationLinksListModel.CreateListColumns();
+
+                case GKListType.stLocationNames:
+                    return LocationNamesListModel.CreateListColumns();
+
+                case GKListType.stEventDefs:
+                    return EventDefsListModel.CreateListColumns();
+
+                default:
+                    return new ListColumns(GKListType.ltNone);
             }
         }
 
-        public void LoadFromFile(IniFile iniFile)
+        public void LoadFromFile(IniFile iniFile, int optsVersion)
         {
             if (iniFile == null)
                 throw new ArgumentNullException("iniFile");
 
-            for (var rt = GDMRecordType.rtIndividual; rt <= GDMRecordType.rtLocation; rt++) {
-                fOptions[(int)rt].LoadFromFile(iniFile);
+            for (var lt = GKListType.ltFirst; lt <= GKListType.ltLast; lt++) {
+                fOptions[(int)lt].LoadFromFile(iniFile, optsVersion);
             }
         }
 
-        public void SaveToFile(IniFile iniFile)
+        public void SaveToFile(IniFile iniFile, int optsVersion)
         {
             if (iniFile == null)
                 throw new ArgumentNullException("iniFile");
 
-            for (var rt = GDMRecordType.rtIndividual; rt <= GDMRecordType.rtLocation; rt++) {
-                fOptions[(int)rt].SaveToFile(iniFile);
+            for (var lt = GKListType.ltFirst; lt <= GKListType.ltLast; lt++) {
+                fOptions[(int)lt].SaveToFile(iniFile, optsVersion);
             }
         }
     }
diff --git a/projects/GKTests/GKCore/ListsTests.cs b/projects/GKTests/GKCore/ListsTests.cs
index a8a316d8f..a08e1f628 100644
--- a/projects/GKTests/GKCore/ListsTests.cs
+++ b/projects/GKTests/GKCore/ListsTests.cs
@@ -164,7 +164,7 @@ public void Test_LMGroup()
             IListFilter filter = listManager.Filter;
             IListColumns listColumns = listManager.ListColumns;
 
-            var copyColumns = GroupListModel.CreateGroupListColumns();
+            var copyColumns = GroupListModel.CreateListColumns();
             listColumns.CopyTo(copyColumns);
 
             Assert.Throws(typeof(ArgumentNullException), () => { listColumns.CopyTo(null); });
diff --git a/projects/GKTests/GKCore/OptionsTests.cs b/projects/GKTests/GKCore/OptionsTests.cs
index 125a29991..528d0fbb6 100644
--- a/projects/GKTests/GKCore/OptionsTests.cs
+++ b/projects/GKTests/GKCore/OptionsTests.cs
@@ -116,7 +116,7 @@ public void Test_Options()
                 globalOptions.ListHighlightUnparentedPersons = true;
                 Assert.AreEqual(true, globalOptions.ListHighlightUnparentedPersons);
 
-                Assert.IsNotNull(globalOptions.IndividualListColumns);
+                Assert.IsNotNull(globalOptions.ListOptions[GDMRecordType.rtIndividual].Columns);
 
                 globalOptions.ShowDatesCalendar = true;
                 Assert.AreEqual(true, globalOptions.ShowDatesCalendar);
diff --git a/projects/GKv2/GKTestsUI2/UITests/EventEditDlgTests.cs b/projects/GKv2/GKTestsUI2/UITests/EventEditDlgTests.cs
index 6c1a752a4..7ee63491a 100644
--- a/projects/GKv2/GKTestsUI2/UITests/EventEditDlgTests.cs
+++ b/projects/GKv2/GKTestsUI2/UITests/EventEditDlgTests.cs
@@ -172,8 +172,8 @@ public static void EventEditDlg_Select_Handler(string name, IntPtr ptr, Form for
             SelectCombo("cmbDate1Calendar", form, 1); // Julian
             SelectCombo("cmbDate2Calendar", form, 1); // Julian*/
 
-            EnterText("txtEventCause", form, "test cause");
-            EnterText("txtEventOrg", form, "test agency");
+            EnterCombo("txtEventCause", form, "test cause");
+            EnterCombo("txtEventOrg", form, "test agency");
 
             SetModalFormHandler(fFormTest, AddressEditDlgTests.AddressEditDlg_btnAccept_Handler);
             ClickButton("btnAddress", form);
diff --git a/projects/GKv2/GKTestsUI2/UITests/MainSDITests.cs b/projects/GKv2/GKTestsUI2/UITests/MainSDITests.cs
index 316e6907c..e78c515f2 100644
--- a/projects/GKv2/GKTestsUI2/UITests/MainSDITests.cs
+++ b/projects/GKv2/GKTestsUI2/UITests/MainSDITests.cs
@@ -69,7 +69,7 @@ public override async void Setup()
 
             await appHost.Init(null, false);
 
-            var indiCols = GlobalOptions.Instance.IndividualListColumns;
+            var indiCols = GlobalOptions.Instance.ListOptions[GDMRecordType.rtIndividual].Columns;
             for (int i = 0; i < indiCols.Count; i++) {
                 var colProps = indiCols[i];
                 colProps.CurActive = true;