FR10850 V1: Refresh button in the gramplet bar.

Fixes #10850 This is the first method to avoid reloading gramplet automaticaly.
2018-10-31 20:30:44 +01:00
1412 changed files with 626664 additions and 970514 deletions
@@ -1,78 +0,0 @@
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright (C) 2021       Nick Hall
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-name: Gramps CI
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-20.04
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Install dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install gir1.2-pango-1.0
-        sudo apt-get install gir1.2-gtk-3.0
-        sudo apt-get install xdg-utils
-        sudo apt-get install librsvg2-common
-        sudo apt-get install libglib2.0-dev
-        sudo apt-get install intltool
-        sudo apt-get install python3-gi
-        sudo apt-get install python3-cairo
-        sudo apt-get install python3-gi-cairo
-        sudo apt-get install python3-bsddb3
-        sudo apt-get install python3-dev
-        sudo apt-get install python3-nose
-        sudo apt-get install python3-mock
-        sudo apt-get install python3-icu
-        sudo apt-get install python3-coverage
-        sudo apt-get install python3-jsonschema
-        sudo apt-get install libxml2-utils
-        sudo apt-get install python3-lxml
-        sudo apt-get install python-libxml2
-        sudo apt-get install zlib1g-dev
-        sudo apt-get install python3-setuptools
-    - name: Install addons
-      run: |
-        mkdir -p ~/.gramps/gramps52/plugins/
-        wget https://github.com/gramps-project/addons/raw/master/gramps52/download/CliMerge.addon.tgz
-        tar -C ~/.gramps/gramps52/plugins -xzf CliMerge.addon.tgz
-        wget https://github.com/gramps-project/addons/raw/master/gramps52/download/ExportRaw.addon.tgz
-        tar -C ~/.gramps/gramps52/plugins -xzf ExportRaw.addon.tgz
-    - name: Build
-      run: |
-        python3 setup.py build
-    - name: Run unit test suite
-      run: |
-        export GDK_BACKEND=-
-        python3 setup.py test
-    - name: Trailing whitespace check
-      run: |
-        if git --no-pager grep --color -n --full-name '[    ]$' -- \*.py; then
-          echo "ERROR - Trailing whitespace found in source file(s)";
-          exit 1;
-        fi
@@ -7,6 +7,9 @@ build/
 dist/

 # Gramps
+data/tips.xml
+data/holidays.xml
+po/.intltool-merge-cache
 docs/_build/

 # Editing
@@ -25,7 +28,3 @@ ehthumbs.db

 # Glade temp files
 *~
-
-# Python metadata
-.venv*/
-
@@ -30,6 +30,15 @@ unsafe-load-any-extension=no
 # run arbitrary code
 extension-pkg-whitelist=

+# Allow optimization of some AST trees. This will activate a peephole AST
+# optimizer, which will apply various small optimizations. For instance, it can
+# be used to obtain the result of joining multiple strings with the addition
+# operator. Joining a lot of strings can lead to a maximum recursion error in
+# Pylint and this flag can prevent that. It has one side effect, the resulting
+# AST will be different than the one from reality.
+optimize-ast=no
+
+
 [MESSAGES CONTROL]

 # Only show warnings with the listed confidence levels. Leave empty to show
@@ -50,7 +59,7 @@ confidence=
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use"--disable=all --enable=classes
 # --disable=W"
-disable=suppressed-message,useless-suppression
+disable=suppressed-message,intern-builtin,round-builtin,unicode-builtin,range-builtin-not-iterating,long-builtin,basestring-builtin,setslice-method,print-statement,reload-builtin,metaclass-assignment,raising-string,next-method-called,import-star-module-level,xrange-builtin,getslice-method,zip-builtin-not-iterating,reduce-builtin,dict-iter-method,delslice-method,using-cmp-argument,hex-method,buffer-builtin,old-ne-operator,nonzero-method,backtick,parameter-unpacking,indexing-exception,file-builtin,filter-builtin-not-iterating,raw_input-builtin,execfile-builtin,oct-method,cmp-method,coerce-builtin,long-suffix,cmp-builtin,input-builtin,dict-view-method,standarderror-builtin,apply-builtin,old-raise-syntax,unichr-builtin,old-division,coerce-method,unpacking-in-except,useless-suppression,no-absolute-import,map-builtin-not-iterating,old-octal-literal


 [REPORTS]
@@ -60,6 +69,11 @@ disable=suppressed-message,useless-suppression
 # mypackage.mymodule.MyReporterClass.
 output-format=text

+# Put messages in a separate file for each module / package specified on the
+# command line instead of printing them on stdout. Reports (if any) will be
+# written in a file name "pylint_global.[txt|html]".
+files-output=no
+
 # Tells whether to display a full report or only the messages
 reports=yes

@@ -77,6 +91,9 @@ evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / stateme

 [BASIC]

+# List of builtins function names that should not be used, separated by a comma
+bad-functions=map,filter
+
 # Good variable names which should always be accepted, separated by a comma
 good-names=i,j,k,ex,Run,_,db

@@ -93,33 +110,63 @@ include-naming-hint=no
 # Regular expression matching correct argument names
 argument-rgx=[a-z_][a-z0-9_]{2,30}$

+# Naming hint for argument names
+argument-name-hint=[a-z_][a-z0-9_]{2,30}$
+
 # Regular expression matching correct module names
 module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$

+# Naming hint for module names
+module-name-hint=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
+
 # Regular expression matching correct class attribute names
 class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$

+# Naming hint for class attribute names
+class-attribute-name-hint=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
+
 # Regular expression matching correct function names
-function-rgx=(([a-z_][a-z0-9_]{2,30})|(_T_))$
+function-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Naming hint for function names
+function-name-hint=[a-z_][a-z0-9_]{2,30}$

 # Regular expression matching correct inline iteration names
 inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$

+# Naming hint for inline iteration names
+inlinevar-name-hint=[A-Za-z_][A-Za-z0-9_]*$
+
 # Regular expression matching correct constant names
 const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$

+# Naming hint for constant names
+const-name-hint=(([A-Z_][A-Z0-9_]*)|(__.*__))$
+
 # Regular expression matching correct method names
 method-rgx=[a-z_][a-z0-9_]{2,30}$

+# Naming hint for method names
+method-name-hint=[a-z_][a-z0-9_]{2,30}$
+
 # Regular expression matching correct class names
 class-rgx=[A-Z_][a-zA-Z0-9]+$

+# Naming hint for class names
+class-name-hint=[A-Z_][a-zA-Z0-9]+$
+
 # Regular expression matching correct variable names
 variable-rgx=[a-z_][a-z0-9_]{2,30}$

+# Naming hint for variable names
+variable-name-hint=[a-z_][a-z0-9_]{2,30}$
+
 # Regular expression matching correct attribute names
 attr-rgx=[a-z_][a-z0-9_]{2,30}$

+# Naming hint for attribute names
+attr-name-hint=[a-z_][a-z0-9_]{2,30}$
+
 # Regular expression which should only match function or class names that do
 # not require a docstring.
 no-docstring-rgx=^_
@@ -215,6 +262,12 @@ ignore-long-lines=^\s*(# )?<?https?://\S+>?$
 # else.
 single-line-if-stmt=no

+# List of optional constructs for which whitespace checking is disabled. `dict-
+# separator` is used to allow tabulation in dicts, etc.: {1  : 1,\n222: 2}.
+# `trailing-comma` allows a space between comma and closing bracket: (a, ).
+# `empty-line` allows space-only lines.
+no-space-check=trailing-comma,dict-separator
+
 # Maximum number of lines in a module
 max-module-lines=1000

@@ -0,0 +1,129 @@
+#
+# Gramps - a GTK+/GNOME based genealogy program
+#
+# Copyright (C) 2015-2015  Doug Blank
+# Copyright (C) 2016       DaAwesomeP
+# Copyright (C) 2016       QuLogic
+# Copyright (C) 2016       Tim G L Lyons
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+# After changing this file, check it on:
+#   http://lint.travis-ci.org/
+
+sudo: required
+dist: trusty
+language: python
+python:
+ - 3.3 # This is irrelevant, because the virtualenv is not used at all
+
+# FIXME: The minimum requirement for Gramps is Python 3.2, so a test environment
+# for Python 3.2 should be added to this environment which is Python 3.3. It
+# will not be possible to run coverage under Python 3.2, because coverage is
+# Python 3.3 (or above) only.
+
+addons:
+  apt:
+    packages:
+    - gir1.2-pango-1.0
+    - gir1.2-gtk-3.0
+    - xdg-utils
+    - librsvg2-common
+    - libglib2.0-dev
+    - intltool
+    # - python3-gobject Provided by python3-gi
+    - python3-gi
+    - python3-cairo
+    - python3-gi-cairo
+    - python3-bsddb3
+    - python3-dev
+    - python3-nose
+    - python3-mock
+    - python3-pyicu
+    - python3-coverage
+    - python3-jsonschema
+    # lxml dependencies.  for merge_ref_test to work
+    # - libxml2-dev
+    # - libxslt1-dev
+    - libxml2-utils
+    - python3-lxml
+    - python-libxml2
+# ubuntu 14.04 requires this in addition to libxml2-dev and
+# libxslt1-dev for compiling lxml.
+# https://github.com/deanmalmgren/textract/issues/19
+    - zlib1g-dev
+
+before_install:
+
+install:
+# The working directory is set to /home/travis/build/gramps-project/gramps
+# by the automatic git checkout.
+
+# Download Sean Ross-Ross's Pure Python module containing a framework to
+# manipulate and analyze python ast�s and bytecode. This is loaded to
+# /home/travis/build/gramps-project/gramps/meta
+# FIXME: This should be loaded from the release directory at
+# https://pypi.python.org/pypi/meta
+ - git clone -b master https://github.com/srossross/meta
+
+# Build Gramps package. This seems to copy everything to
+# /home/travis/build/scripts-3.3
+ - python setup.py build
+
+before_script:
+# Create the Gramps database directory.
+ - mkdir -p ~/.gramps/grampsdb/
+# set PYTHONPATH so the directly installed module (meta) is picked up from
+# /home/travis/build/gramps-project/gramps/meta
+ - export PYTHONPATH=meta
+# set module exclusions. --exclude=TestUser because of older version of mock
+# without configure_mock
+ - export EXCLUDE="--exclude=TestcaseGenerator"
+#   --exclude=merge_ref_test"
+# set GRAMPS_RESOURCES for locale, data,image and documentation
+ - export GRAMPS_RESOURCES=.
+# Install addons
+ - mkdir -p ~/.gramps/gramps51/plugins/
+ - wget https://github.com/gramps-project/addons/raw/master/gramps51/download/CliMerge.addon.tgz
+ - tar -C ~/.gramps/gramps51/plugins -xzf CliMerge.addon.tgz
+ - wget https://github.com/gramps-project/addons/raw/master/gramps51/download/ExportRaw.addon.tgz
+ - tar -C ~/.gramps/gramps51/plugins -xzf ExportRaw.addon.tgz
+
+script:
+# Ignore the virtualenv entirely. Use nosetests3, python3 (3.4.0) and coverage
+# from /usr/bin. Use libraries from /usr/lib/python3.4,
+# /usr/local/lib/python3.4/dist-packages and /usr/lib/python3/dist-packages
+ - nosetests3 --nologcapture --with-coverage --cover-package=gramps $EXCLUDE
+   gramps
+# FIXME: This should have run from the current directory, rather than from
+# gramps, because there is some test code in that directory.
+
+# give an error for any trailing whitespace
+ - if git --no-pager grep --color -n --full-name '[ 	]$' -- \*.py; then
+     echo "ERROR - Trailing whitespace found in source file(s)";
+     exit 1;
+   fi
+
+after_success:
+# apt-get installs python3-coverage, but codecov only invokes coverage, so make
+# a link
+ - sudo ln /usr/bin/python3-coverage /usr/bin/coverage
+
+# We have to use the bash script because the apt-get coverage does not install
+# codecov. If we used pip to install codecov, it would run inside the
+# virtualenv, and that doesn't work. Change the path to ensure that codecov
+# picks up coverage from /usr/bin, rather than from
+# /home/travis/virtualenv/python3.3.6/bin/
+ - PATH=/usr/bin:$PATH bash <(curl -s https://codecov.io/bash)
@@ -64,8 +64,6 @@ Martin Hawlisch martin.hawlisch@gmx.de

 Nick Hall nick__hall@hotmail.com

-Paul Culley paulr2787@gmail.com
-
 Peter Landgren peter.talken@telia.com

 Raphael Ackermann raphael.ackermann@gmail.com
@@ -1,7 +1,7 @@
 **** This is Gramps Frequently Asked Questions ****

 The questions below frequently come up in mailing list discussions and forums.
-This list is by no means complete. If you would like to add questions/answers
+This list is by no means complete. If you would like to add questions/answers 
 to this list, please email your suggestions to gramps-devel@lists.sf.net


@@ -65,13 +65,13 @@ to this list, please email your suggestions to gramps-devel@lists.sf.net

 24. What is the maximum database size (bytes) Gramps can handle?

- 25. How many people can Gramps database handle?
+ 25. How many people can Gramps database handle? 

 26. My database is really big. Is there a way around loading all the data into memory?

 27. Can I run Gramps from a database on a NFS share?

- 28. Is the database format portable?
+ 28. Why is the database format not portable?

 ==Bugs and requests==

@@ -90,41 +90,37 @@ to this list, please email your suggestions to gramps-devel@lists.sf.net

 1. What is Gramps?

-Gramps is the Genealogical Research and Analysis Management Program System.
-In other words, it is a personal genealogy program letting you store, edit,
-and research genealogical data using the powers of your computer.
+Gramps is the Genealogical Research and Analysis Management Program System. 
+In other words, it is a personal genealogy program letting you store, edit, 
+and research genealogical data using the powers of your computer. 


 2. Where do I get it and how much does it cost?

-Gramps can be downloaded from http://sf.net/projects/gramps at no charge.
-Gramps is an Open Source project covered by the GNU General Public License.
-You have full access to the source code and are allowed to distribute the
-program and source code freely.
+Gramps can be downloaded from http://sf.net/projects/gramps at no charge. 
+Gramps is an Open Source project covered by the GNU General Public License. 
+You have full access to the source code and are allowed to distribute the 
+program and source code freely. 


 3. Does Gramps exist in other languages?

-Yes. Although developed in English, Gramps is actively translated into dozens
-of languages including:  Catalan, Chinese, Croatian, Czech, Danish, Dutch,
-Esperanto, Finnish, French, German, Greek, Hebrew, Hungarian, Icelandic,
-Italian, Japanese, Lithuanian, Norwegian, Portuguese, Russian, Serbian,
-Slovak, Slovenian, Spanish, Swedish, Ukrainian and Vietnamese.
-Note: See https://www.gramps-project.org/wiki/index.php/Template:Gramps_translations for more information.
+Yes, at the moment Gramps is translated in 15 languages
+

 4. How do I keep backups?

-Use a recent version of Gramps! From 5.0.0 onwards there is an automatic backup utility.
-It is extremely important to keep backups of your data, and keep them in a safe place. Gramps has a specific portable file format which is small, and human readable, denoted by .gramps. If you have allowed this in the preferences (In Edit->Preferences->Family Tree menu), Gramps will keep a backup of your database on exit or on shedule (every 15 minutes, 30 minutes, 1 hour, 12 hours, or 1 day). You can copy this backup file from time to time to a save location (e.g. a USB stick).
-Note: The .gramps files are compressed. Clicking them will open Gramps. To see the XML select them and open them with a decompressing utility (like ark, gunzip), after which you can extract the XML file which is human readable.
+Use a recent version of Gramps! From 2.2.5 onwards there is an automatic backup utility.
+It is extremely important to keep backups of your data, and keep them in a safe place. Gramps has a specific portable file format which is small, and human readable, denoted by .gramps. If you have allowed this in the preferences (In Edit menu->Preferences->General), Gramps will keep a backup of your database on exit. You can copy this backup file from time to time to a save location (eg a usb stick). 

+Note: The .gramps files are compressed. Clicking them will open Gramps. To see the XML select them and open them with a decompressing utility (like ark, gunzip), after which you can extract the XML file which is human readable.
 Do not keep backups in GEDCOM. Not all information Gramps stores can be written in the GEDCOM. Hence, an export/import operation Gramps --> GEDCOM --> Gramps, will mean you lose data. Use the .gramps file format for backups!
+Do not keep backups in GRDB format. GRDB is a database, which might be computer dependent (read, not working on a different PC). Small damage to a GRDB file can also not be repaired. Use the .gramps file format for backups!


 5. Does Gramps support Unicode fonts? In particular, does it support non-Roman Unicode fonts?

-Yes. Gramps works internally with Unicode (UTF-8), so all alphabets can be used on all entry fields. All reports fully support this, although for PDF/PS you need to work with gnome-print or OpenOffice.
-Note: To use genealogical symbols you must install a font that provides the miscellaneous symbols in the unicode range 2600-26FF.
+Yes. Gramps works internally with Unicode (UTF-8), so all alphabets can be used on all entry fields. All reports fully support this, although for PDF/PS you need to work with gnome-print or openoffice.

 ==Installation==

@@ -137,26 +133,26 @@ Gramps is a [http://en.wikipedia.org/wiki/Gtk GTK] application. Gramps needs to

 The Linux Genealogy CD can function as a live CD that you boot directly from. You can then run Linux and Gramps off the CD, even if your computer is entirely Windows.

-An Windows installer is available for 32 and 64 bit versions of windows from Windows versions 7 through 10. As with all other support, we do do our best to solve windows related problems.
+An experimental Windows installer is available, however we do not have the manpower to offer support for Windows. A windows mailing list is available however and we do do our best to solve windows related problems.


 8. Does it work with the Mac?

 The Fink project has ported some older versions of Gramps to OS X (tm). The Mac OS X port is not directly supported by the Gramps project, primarily because none of the Gramps developers have access to Mac OS X and because OS X is not Free Software.

-This present version of Gramps (2.2.x) does not appear to have been ported by the Fink project. Please contact the Fink project for more information. However, some users had success in installing 2.2.x on Mac OSX either running in native mode or running on X11 using some of the fink packages.
+This present version of Gramps (2.2.x) does not appear to have been ported by the Fink project. Please contact the Fink project for more information. However, some users had success in installing 2.2.x on Mac OSX either running in native mode or running on X11 using some of the fink packages. 


 9. What are the Minimum Specs to run Gramps?

-We would recommend at least an 800x600 video display. For Gramps 5.x, Gramps can run quite efficiently on a 3GB memory system. A system with that much RAM should be able to hold more than 200,000 people. Disk space requirements for databases are however considerably larger, with a typical database being several megabytes in size. For 120.000 people you must consider already 530Mb for the database. Pictures are stored on disk separately, so a large harddisk is necessary.
+We would recommend at least an 800x600 video display. For Gramps 2.0, the memory requirements have been reduced, and Gramps can run quite efficiently on a 256MB system, holding considerably more people. A system with 512MB should be able to hold around 200,000 people. Disk space requirements for databases are however considerably larger, with a typical database being several megabytes in size. For 120.000 people you must consider already 530Mb for the database. Pictures are stored on disk separately, so a large harddisk is necessary.


 ==Preferences==

 10. Can I change the dates in reports to 'day month year'

-Yes, change in the preferences ("Edit->Preferences") the date for Gramps to the required format (e.g. 'YYYY-MM-DD' or 'day month year'), and make the report. Your global date preferences will be used.
+Yes, change in the preferences ("Edit->Preferences") the date for Gramps to the required format (eg YYYY-MM-DD or day mont year), and make the report. Your global date preferences will be used.


 ==Collaboration-Portability==
@@ -185,7 +181,7 @@ The nice thing about standards is that there never is a shortage of them. Gramps

 15. How do I import data from another genealogy program into Gramps?

-The best way is to create a new Gramps database file, and select the import option in the file menu. Here you select the GEDCOM you generated with the other program, and import it.
+The best way is to create a new gramps database file (.grdb), and select the import option in the file menu. Here you select the GEDCOM you generated with the other program, and import it. 


 16. Can I install Gramps on a Linux Web Server and use it via a web browser? This would enable my relations worldwide to access and update it.
@@ -203,15 +199,15 @@ You may also want to consider the effects of possible downtime of your site if y

 17. Can Gramps print a genealogical tree for my family?

-Yes. Different people have different ideas of what a genealogical tree is.
-Some think of it as a chart going from the distant ancestor and listing
-all his/her descendants and their families. Others think it should be a
-chart going from the person back in time, listing the ancestors and their
-families. Yet other people think of a table, text report, etc.
+Yes. Different people have different ideas of what a genealogical tree is. 
+Some think of it as a chart going from the distant ancestor and listing 
+all his/her descendants and their families. Others think it should be a 
+chart going from the person back in time, listing the ancestors and their 
+families. Yet other people think of a table, text report, etc. 

-Gramps can produce any of the above, and many more different charts and
-reports. Moreover, the plugin architechture enables users (you) to create
-their own plugins which could be new reports, charts, or research tools.
+Gramps can produce any of the above, and many more different charts and 
+reports. Moreover, the plugin architechture enables users (you) to create 
+their own plugins which could be new reports, charts, or research tools. 


 18. In what formats can Gramps output its reports?
@@ -219,33 +215,33 @@ their own plugins which could be new reports, charts, or research tools.
 Text reports are available in HTML, PDF, ODT, LaTeX, and RTF formats. Graphical reports (charts and diagrams) are available in PostScript, PDF, SVG, ODS, and Graphviz formats.


-19. How can I change the default language in reports?
+19. How can I change the default language in reports? 

-The reports are in the language of your Linux installation. You can change it by installing extra language packs, see [Howto: Change the language of reports] on wiki.
+The reports are in the language of your linux installation. You can change it by installing extra language packs, see [Howto: Change the language of reports] on wiki.


 20. Is Gramps compatible with the Internet?

 Gramps can store web addresses and direct your browser to them. It can import
-data that you download from the Internet. It can export data that you could
-send over the Internet. Gramps is familiar with the standard file formats
-widely used on the Internet (e.g. JPEG, PNG, and GIF images, MP3, OGG, and
-WAV sound files, QuickTime, MPEG, and AVI movie files, etc). Other than that,
-there is little that a genealogical program can do with the Internet :-)
+data that you download from the Internet. It can export data that you could 
+send over the Internet. Gramps is familiar with the standard file formats 
+widely used on the Internet (e.g. JPEG, PNG, and GIF images, MP3, OGG, and 
+WAV sound files, QuickTime, MPEG, and AVI movie files, etc). Other than that, 
+there is little that a genealogical program can do with the Internet :-) 


 21. Can I create custom reports/filters/whatever?

-Yes. There are many levels of customization. One is creating or modifying
-the templates used for the reports. This gives you some control over
-the fonts, colors, and some layout of the reports. You can also use Gramps
-controls in the report dialogs to tell what contents should be used for a
-particular report. In addition to this, you have an ability to create your
-own filters -- this is useful in selecting people based on criteria set
-by you. You can combine these filters to create new, more complex filters.
-Finally, you have an option to create your own plugins. These may be new
-reports, research tools, import/export filters, etc. This assumes some
-knowledge of programming in Python.
+Yes. There are many levels of customization. One is creating or modifying 
+the templates used for the reports. This gives you some control over 
+the fonts, colors, and some layout of the reports. You can also use Gramps 
+controls in the report dialogs to tell what contents should be used for a 
+particular report. In addition to this, you have an ability to create your 
+own filters -- this is useful in selecting people based on criteria set 
+by you. You can combine these filters to create new, more complex filters. 
+Finally, you have an option to create your own plugins. These may be new 
+reports, research tools, import/export filters, etc. This assumes some 
+knowledge of programming in Python. 


 22. Why are non-latin characters displayed as garbage in PDF/PS reports?
@@ -269,17 +265,17 @@ If you are happy with your plugin and would like to contribute your code back to

 24. What is the maximum database size (bytes) Gramps can handle?

-Gramps has no hard limits on the size of a database that it can handle. Starting with 2.0.0 release, Gramps no longer loads all data into memory, which allows it to work with a much larger database than before. In reality, however, there are practical limits. The main limiting factors are the available memory on the system. With common memory sizes these days, Gramps should have no problem using databases with tens of thousands of people.
+Gramps has no hard limits on the size of a database that it can handle. Starting with 2.0.0 release, Gramps no longer loads all data into memory, which allows it to work with a much larger database than before. In reality, however, there are practical limits. The main limiting factors are the available memory on the system and the cache size used for BSDDB database access. With common memory sizes these days, Gramps should have no problem using databases with tens of thousands of people.


-25. How many people can Gramps database handle?
+25. How many people can Gramps database handle? 

 See above. Again, this is dependent on how much memory you have, see [Gramps Performance] on wiki.


 26. My database is really big. Is there a way around loading all the data into memory?

-Starting with 2.0.0 release, Gramps no longer loads all data into memory, which allows it to work with a much larger database than before.
+Starting with 2.0.0 release, Gramps no longer loads all data into memory, which allows it to work with a much larger database than before. The fileformat used is .grdb which means gramps database.


 27. Can I run Gramps from a database on a NFS share?
@@ -287,45 +283,55 @@ Starting with 2.0.0 release, Gramps no longer loads all data into memory, which
 Yes you can.


-28. Is the database format portable?
+28. Why is the database format not portable?

-Prior to 5.0, Gramps used BSDDB as its database backend. The BSDDB database
-format is not portable.
+The biggest issue with Gramps portability lies with 'transactions'. With
+Gramps 2.2, we added support for atomic transactions to protect data.
+With atomic transactions, multiple changes are committed as a single
+unit. Either all the changes make it, or none of the changes make it.
+You are never left in a situation with a partial set of changes. A side
+benefit of using transactions is that database access (reads and writes)
+are faster.

-Starting with 5.0, Gramps allowed the user to choose from other datbase
-backends, including SqLite. The SqLite database format is portable.
+The problem with transactions (at least using BSDDB) is that it does not
+allow all the data to be stored in a single file. Logging files are
+needed to keep track of things. These logging files are kept in a DB
+Environment directory. We need a separate directory for each file,
+otherwise the log files can interfere with each other.
+
+In 2.2, we keep the log files under the ~/.gramps/ path directory,
+creating a unique directory for each database. The problem is that your
+GRDB file needs the log files, which are in a different directory.
+Copying the GRDB file is only copying a portion of the database.

-As of 5.2, the BSDDB backend is no longer available. SqLite is used by default.

 ==Bugs and requests==

 29. I found a bug and I want it fixed right now! What do I do?

-The best thing you can do is to fix the bug and submit a pull request on
-GitHub :-)
+The best thing you can do is to fix the bug and send the patch to
+gramps-devel@lists.sf.net :-)

-The next best thing would be to submit a good bug report. This can be done by
-filing your report with the bug tracker system at
-https://gramps-project.org/bugs/ (this function is also
-available by selecting "Help->Report a bug" from Gramps main menu).
+The next best thing would be to submit a good bug report. This can be done in
+one of the two ways: (1) send your report to gramps-bugs@lists.sf.net
+or (2) file your report with the bug tracker system at 
+http://bugs.gramps-project.org (this function is also 
+available by selecting "Help->Report a bug" from gramps main menu). 

-You may also discuss the problem first on our mailing list or Discourse forum.
-https://gramps-project.org/blog/contact
-
-A good bug report would include:
-   (1) Version of Gramps you were using when you encountered the bug
+A good bug report would include: 
+   (1) Version of gramps you were using when you encountered the bug 
       (available through Help->About menu item)
-   (2) Language under which Gramps was run
-       (also available through Help->About menu item)
+   (2) Language under which gramps was run
+       (available by executing "echo $LANG" in your terminal)
   (3) Symptoms indicating that this is indeed a bug
   (4) Any Traceback messages, error messages, warnings, etc, that showed up
       in your terminal or a in separate traceback window

-Most problems can be fixed quickly provided there is enough information.
-To ensure this, please follow up on your bug reports.
+Most problems can be fixed quickly provided there is enough information. 
+To ensure this, please follow up on your bug reports. 

 If the above explanations seem vague, please follow this link:
-https://www.chiark.greenend.org.uk/~sgtatham/bugs.html
+http://www.chiark.greenend.org.uk/~sgtatham/bugs.html


 30. Gramps should be a .... type of application
@@ -333,7 +339,7 @@ https://www.chiark.greenend.org.uk/~sgtatham/bugs.html
 The surest way to see it happen is to get it done by yourself. Since Gramps is free/open source, nobody prevents you from taking all of the code and continuing its development in whatever direction you see fit. In doing so, you may consider giving your new project another name to avoid confusion with the continuing Gramps development. If you would like the Gramps project to provide advice, expertise, filters, etc., we will gladly cooperate with your new project, to ensure compatibility or import/export options to your new format of a project.

 If, however, you would like the Gramps project to adopt your strategy, you would need to convince Gramps developers that your strategy is good for Gramps and superior to the present development strategy.
-
+                                                                                
 HINT: if Gramps developers are still not convinced after about three
 messages sent to gramps-devel, maybe you are better off on your own
 rather than with a company of retards who can't fully realize the
@@ -26,5 +26,4 @@ able to run gramps from the source directory without setting PYTHONPATH
 From this position, import gramps works great
 """
 import gramps.grampsapp as app
-
 app.main()
@@ -9,32 +9,29 @@ you need to remove the old version first. You can delete the old
 version by deleting the installed directories. For example, if your installation prefix is /usr/local, remove the following:
        /usr/local/share/gramps
        /usr/local/lib/pythonx.x/site-packages/gramps
-        
 If you installed with a package manager you might instead need to remove
        /usr/local/lib/pythonx.x/dist-packages/gramps

-replacing pythonx.x with the Python version you used, e.g. python3.5.
-Also remove any gramps .egg files that are installed along with the Gramps
+replacing pythonx.x with the python version you used, e.g. python3.4.
+Also remove any gramps .egg files that are installed along with the gramps
 directory and the file /usr/local/bin/gramps.

+
 If you don't know the list of all files that Gramps installed, you can
 reinstall it with the --record option, and take a look at the list this
 produces (so python setup.py install --record grampsfiles.txt

-Gramps is a Python application, so loading happens on reading the
+Gramps is a python application, so loading happens on reading the
 files, meaning that files of a previous version that are no longer
 present in the new version can still be loaded, making the new install
 unstable!

-Distutils install
+distutils install
 -----------------
 We do not check all dependencies of Gramps, see README for a list of
 all required and optional dependencies. Missing dependencies will
 result in runtime errors.

-To install all needed dependencies you can use (in Ubuntu):
-   sudo apt-get build-dep gramps
-
 To build and install, whether from a tarball or git repo:
   python3 setup.py build
   sudo python3 setup.py install
@@ -42,7 +39,7 @@ To build and install, whether from a tarball or git repo:
 You can avoid using sudo for the install step by specifying a prefix to which you have write priviledge. The default is /usr/local, which is usually owned by root. You can learn of more options with
   python3 setup.py --help

-One can use Gramps from the command line without installing it by
+One can use gramps from the command line without installing it by
 setting the following environment variables, but that won't provide
 things like MIME type and desktop entries.

@@ -51,19 +48,20 @@ things like MIME type and desktop entries.

 See below for ways to invoke Gramps.

-Typical install directories in linux (Ubuntu) are:
-  * /usr/local/bin                                  : the Gramps executable
-  * /usr/local/lib/python3.5/dist-packages/gramps/  : the Gramps python module
-  * /usr/local/share/doc/gramps                     : documentation, also example .gramps and .gedcom
-  * /usr/local/share/icons/gnome                    : our icons
-  * /usr/local/share/locale/xx/LC_MESSAGES          : xx language code, translation
-  * /usr/local/share/man/xx/man1                    : xx language code, man file
+Typical install directories in linux (ubuntu) are:
+  * /usr/local/lib/python3.4/dist-packages/gramps/  : the gramps python module
+  * /usr/local/share/mime-info    : mime info so gramps opens files automatically
+  * /usr/local/share/icons/gnome  : our icons
+  * /usr/local/share/doc/gramps   : documentation, also example .gramps and .gedcom
+  * /usr/local/bin                : the gramps executable
+  * /usr/local/share/locale/xx/LC_MESSAGES  : xx language code, translation
+  * /usr/local/share/man/man1/xx/man1       : xx language code, man file
  * /usr/local/share/mime
-  * /usr/local/share/mime-info                      : mime info so Gramps opens files automatically
+  * /usr/local/share/mime-info

 Running Gramps
 --------------
-Gramps is Python only, so no compilation is needed, you can even run Gramps
+Gramps is python only, so no compilation is needed, you can even run gramps
 from the source directory.

 a) You installed Gramps, then you can run it with the command
@@ -78,7 +76,7 @@ from the source directory.
   The executable 'gramps' in /usr/local/bin or /usr/bin from a) does
   this for you.

- c) You downloaded the Gramps source code to a directory, and want to run it.
+ b) You downloaded the Gramps source code to a directory, and want to run it.
    You can start Gramps from the source code directory with

     python3 Gramps.py
@@ -89,7 +87,7 @@ from the source directory.
 Custom directory installation
 -------------------------------------
 If you would like to install Gramps without being root, or in an
-alternative location on Windows, supply the --root argument to setup.py
+alternative location on windows, supply the --root argument to setup.py

 For example:
   python3 setup.py install --root ~/test
@@ -10,7 +10,6 @@ include RELEASE_NOTES
 include TODO
 include CONTRIBUTING
 include TestPlan.txt
-recursive-include aio *
 recursive-include data *
 recursive-include debian *
 recursive-include docs *
@@ -20,8 +19,12 @@ recursive-include images *
 recursive-include mac *
 recursive-include po *
 recursive-include test *
+recursive-include windows *

 # Remove files created in the build
+exclude data/tips.xml
+exclude data/holidays.xml
+exclude po/.intltool-merge-cache
 global-exclude *.pyc
 global-exclude *.pyo

@@ -1,9 +1,5 @@
-The Gramps Project ( https://gramps-project.org )
+The Gramps Project ( https://gramps-project.org ) [![Build Status](https://travis-ci.org/gramps-project/gramps.svg?branch=master)](https://travis-ci.org/gramps-project/gramps)[![codecov.io](https://codecov.io/github/gramps-project/gramps/coverage.svg?branch=master)](https://codecov.io/github/gramps-project/gramps?branch=master)
 ===================
-[![GitHub CI](https://github.com/gramps-project/gramps/actions/workflows/gramps-ci.yml/badge.svg?event=push&branch=master)](https://github.com/gramps-project/gramps/actions/workflows/gramps-ci.yml?query=branch%3Amaster)
-[![codecov.io](https://codecov.io/github/gramps-project/gramps/coverage.svg?branch=master)](https://app.codecov.io/gh/gramps-project/gramps/branch/master)
-[![Translation status](https://hosted.weblate.org/widgets/gramps-project/-/gramps/svg-badge.svg)](https://hosted.weblate.org/engage/gramps-project)
-
 We strive to produce a genealogy program that is both intuitive for hobbyists and feature-complete for professional genealogists.

 Please read the **COPYING** file first.
@@ -14,18 +10,19 @@ Requirements
 ============
 The following packages **MUST** be installed in order for Gramps to work:

-* **Python** 3.8 or greater - The programming language used by Gramps. https://www.python.org/
-* **GTK** 3.24 or greater - A cross-platform widget toolkit for creating graphical user interfaces. http://www.gtk.org/
+* **Python** 3.2 or greater - The programming language used by Gramps. https://www.python.org/
+* **GTK** 3.12 or greater - A cross-platform widget toolkit for creating graphical user interfaces. http://www.gtk.org/
 * **pygobject** 3.12 or greater - Python Bindings for GLib/GObject/GIO/GTK+ https://wiki.gnome.org/Projects/PyGObject

 The following three packages with GObject Introspection bindings (the gi packages)

-* **cairo** 1.14.0 or greater - a 2D graphics library with support for multiple output devices. http://cairographics.org/
+* **cairo** 1.13.1 or greater - a 2D graphics library with support for multiple output devices. http://cairographics.org/
 * **Pycairo** 1.13.3 or greater - GObject Introspection bindings for cairo. https://github.com/pygobject/pycairo
 * **pango** - a library for laying out and rendering of text, with an emphasis on internationalization. http://www.pango.org/
 * **pangocairo** - Allows you to use Pango with Cairo http://www.pango.org/

 * **librsvg2** - (SVG icon view) a library to render SVG files using cairo. http://live.gnome.org/LibRsvg
+* **xdg-utils** - Desktop integration utilities from freedesktop.org
 * **bsddb3** - Python bindings for Oracle Berkeley DB https://pypi.python.org/pypi/bsddb3/
 * **sqlite3** - Python bindings for SQLite Database library

@@ -37,7 +34,7 @@ to your language:
 Translation of GTK elements to your language, with
 xx your language code; e.g. for Dutch you need
 language-pack-gnome-nl. The translation of the
- Gramps strings is included with the Gramps source.
+ Gramps strings is included with the gramps source.


 The following packages are **STRONGLY RECOMMENDED** to be installed:
@@ -48,7 +45,7 @@ The following packages are **STRONGLY RECOMMENDED** to be installed:
 It may be osmgpsmap, osm-gps-map, or python-osmgpsmap,
 but the Python bindings for this must also be present, so gir1.2-osmgpsmap-1.0.
 Without this the GeoView will not be active, see
- https://gramps-project.org/wiki/index.php?title=Gramps_5.1_Wiki_Manual_-_Categories#Geography_Category
+ https://gramps-project.org/wiki/index.php?title=Gramps_5.0_Wiki_Manual_-_Categories#Geography_Category

 * **Graphviz**

@@ -66,25 +63,27 @@ The following packages are **STRONGLY RECOMMENDED** to be installed:
 sorting is done through built-in libraries. PyICU is
 fairly widely available through the package managers of
 distributions. See http://pyicu.osafoundation.org/
- (These are Python bindings for the ICU package
- https://pypi.python.org/pypi/PyICU/).
+ (These are Python bindings for the ICU package. 
+ https://pypi.python.org/pypi/PyICU/)

 * **Ghostscript**

-  Used by Graphviz reports to help create PDF files.
+  Used by Graphviz reports to help create PDF's

 The following packages are optional:
 ------------------------------------
-* **gspell**
+* **gtkspell** 

- Enable spell checking in the notes.
+ Enable spell checking in the notes. Gtkspell depends on
+ enchant. A version of gtkspell with gobject introspection
+ is needed, so minimally version 3.0.0

 * **rcs**

 The GNU Revision Control System (RCS) can be used to manage
 multiple revisions of your family trees. See info at
- https://gramps-project.org/wiki/index.php?title=Gramps_5.1_Wiki_Manual_-_Manage_Family_Trees#Archiving_a_Family_Tree
- Only rcs is needed, NO python bindings are required.
+ https://gramps-project.org/wiki/index.php?title=Gramps_5.0_Wiki_Manual_-_Manage_Family_Trees#Archiving_a_Family_Tree
+ Only rcs is needed, NO python bindings are required

 * **PIL**

@@ -92,7 +91,7 @@ The following packages are optional:
 images and also to convert non-JPG images to
 JPG so as to include them in LaTeX output.
 (For Python3 a different source may be needed,
- python-imaging or python-pillow or python3-pillow).
+ python-imaging or python-pillow or python3-pillow)

 * **GExiv2**

@@ -102,7 +101,7 @@ The following packages are optional:

 * **ttf-freefont**

- Provides genealogical symbols and more fonts for reports
+ More font support in the reports

 * **geocodeglib**

@@ -116,29 +115,6 @@ The following packages are optional:
 ArchLinux           : geocode-glib
 ...

-* **fontconfig**
-
- Python bindings of fontconfig are required for displaying
- genealogical symbols
-
-* **magic**
-
- Python magic bindings required to have better performances with image
- processing.
- If this module is not available, we continue to use Gdk.
- This avoid to load the image in memory. This is a real improvement
- when we have many big images.
- Used in odfdoc, rtfdoc and webreport and tested with png, gif, jpeg, bmp, tiff
- #
- #            file size     with magic  without (Gdk)   ratio
- # example 1 :     256k        0.00080        0.00575       7
- # example 2 :      21M        0.00171        0.55860     326
-
- Debian, Ubuntu, ... : python3-magic
- Fedora, Redhat, ... : python3-magic
- openSUSE            : python-magic
- ArchLinux           : python-magic
-
 Optional packages required by Third-party Addons
 ------------------------------------------------

@@ -161,9 +137,6 @@ Prerequistes required for the following Addons to work:

 No longer needed:
 -----------------
-* Since Gramps 5.2:
-   **xdg-utils**
-
 * Since Gramps 4.2:
   **gir-webkit**

@@ -185,12 +158,3 @@ The User Manual is maintained on the Gramps website:

 * https://www.gramps-project.org/wiki/index.php?title=User_manual

-Issue Tracker
-------------
-Gramps bug and issue tracker can be found [here](https://gramps-project.org/bugs/my_view_page.php).
-
-Translation
-------------
-Gramps uses Hosted Weblate for its translations:
-
-* https://hosted.weblate.org/engage/gramps-project
@@ -1,25 +0,0 @@
-The files in this directory are used to build the Windows AIO (All In One) installer.
-
-To build AIO for the master branch :
-
-1. install msys2
-* download msys2 from <https://www.msys2.org/> .
-* install with default options. 
-* run "MSYS2 MINGW64"
-* upgrade system : ` pacman -Syuu --noconfirm `  (twice if first run close msys2).
-
-2. download sources from github :
-
-```
-pacman -S git --noconfirm
-git clone https://github.com/gramps-project/gramps.git
-```
-
-3. build AIO :
-
-```
-cd gramps/aio
-./build.sh
-```
-
-result is in gramps/aio/mingw64/src
@@ -1,44 +0,0 @@
-# install prerequisites :
-## prerequisites in msys packages :
-pacman -S --needed --noconfirm mingw-w64-x86_64-python-pip mingw-w64-x86_64-python3-bsddb3 mingw-w64-x86_64-gexiv2 mingw-w64-x86_64-ghostscript mingw-w64-x86_64-python3-cairo mingw-w64-x86_64-python3-gobject mingw-w64-x86_64-python3-icu mingw-w64-x86_64-iso-codes mingw-w64-x86_64-hunspell mingw-w64-x86_64-hunspell-en mingw-w64-x86_64-enchant perl-XML-Parser intltool mingw-w64-x86_64-python3-lxml mingw-w64-x86_64-python3-jsonschema mingw-w64-x86_64-gtkspell3 mingw-w64-x86_64-geocode-glib mingw-w64-x86_64-python3-pillow git mingw-w64-x86_64-graphviz mingw-w64-x86_64-goocanvas mingw-w64-x86_64-osm-gps-map base-devel mingw-w64-x86_64-toolchain subversion mingw-w64-x86_64-db mingw-w64-x86_64-python-bsddb3 mingw-w64-x86_64-graphviz mingw-w64-x86_64-python-graphviz mingw-w64-x86_64-osm-gps-map mingw-w64-x86_64-nsis mingw-w64-x86_64-python-cx-freeze  mingw-w64-x86_64-python3-requests mingw-w64-x86_64-enchant mingw-w64-x86_64-adwaita-icon-theme mingw-w64-x86_64-python-networkx mingw-w64-x86_64-python-psycopg2 upx mingw-w64-x86_64-python-packaging unzip mingw-w64-x86_64-python3-nose mingw-w64-x86_64-python-wheel
-python3  -m pip install --upgrade pip
-## prerequisites in pip packages
-pip3 install --upgrade pydot pydotplus requests asyncio
-## berkeley db, from sources (6.0.30 wanted, msys2 provides actually 6.0.19)
-mkdir  ../build
-cd ../build
-if [ ! -f mingw-w64-x86_64-db-6.0.30-1-any.pkg.tar.xz ] ; then
-  wget https://github.com/bpisoj/MINGW-packages/releases/download/v5.0/mingw-w64-x86_64-db-6.0.30-1-any.pkg.tar.xz
-fi
-pacman -U --noconfirm mingw-w64-x86_64-db-6.0.30-1-any.pkg.tar.xz
-pacman -S --noconfirm mingw-w64-x86_64-python3-bsddb3
-## pygraphviz, from sources
-if [ ! -f Pygraphviz-1.4rc1.zip ] ; then
-  wget  https://gramps-project.org/wiki/images/2/2b/Pygraphviz-1.4rc1.zip
-fi
-mkdir pygraphviz-1.4rc1
-cd pygraphviz-1.4rc1
-unzip -u ../Pygraphviz-1.4rc1.zip
-MINGW_INSTALLS=mingw64 makepkg-mingw -sLf
-pacman -U --noconfirm mingw-w64-x86_64-python3-pygraphviz-1.4rc1-0.0-any.pkg.tar.zst
-## add some icons and dictionaries not easy to install 
-cd ../../aio
-tar --directory /mingw64/share/ -zxf share.tgz
-
-# build gramps
-cd ..
-rm -rf dist aio/dist
-python3 setup.py bdist_wheel
-appbuild="r$(git rev-list --count HEAD)-$(git rev-parse --short HEAD)"
-appversion=$(grep "^VERSION_TUPLE" gramps/version.py|sed 's/.*(//;s/, */\./g;s/).*//')
-unzip -d aio/dist dist/*.whl
-cd aio
-
-# create nsis script
-cat grampsaio64.nsi.template|sed "s/yourVersion/$appversion/;s/yourBuild/$appbuild/">grampsaio64.nsi
-# build cx_freeze executables
-python3 setup.py build_exe --no-compress
-# build installer
-makensis mingw64/src/grampsaio64.nsi
-# result is in mingw64/src
-
@@ -1,659 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Gramps - a GTK+/GNOME based genealogy program
-;
-; This program is free software; you can redistribute it and/or modify
-; it under the terms of the GNU General Public License as published by
-; the Free Software Foundation; either version 2 of the License, or
-; (at your option) any later version.
-;
-; This program is distributed in the hope that it will be useful,
-; but WITHOUT ANY WARRANTY; without even the implied warranty of
-; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-; GNU General Public License for more details.
-;
-; You should have received a copy of the GNU General Public License
-; along with this program; if not, write to the Free Software
-; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-;
-;Copyright (C) 2013-2021      Josip (pisoj), Paul Culley
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-!define APPNAME "GrampsAIO64"
-!define APPVERSION "yourVersion"
-!define APPBUILD "yourBuild"
-!define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}"
-!define APP_PUBLISHER "The Gramps project"
-!define APP_WEB_SITE "https://gramps-project.org"
-BrandingText "Version ${APPVERSION}-${APPBUILD} -- a new maintenance release"
-
-; Main Install settings
-Name "${APPNAME}-${APPVERSION}-${APPBUILD}"
-OutFile "GrampsAIO-${APPVERSION}-${APPBUILD}_win64.exe"
-
-CRCCheck on
-SetCompressor /SOLID /FINAL LZMA
-SetCompressorDictSize 32
-SetDatablockOptimize on
-SetOverwrite try
-XPStyle on
-;RequestExecutionLevel admin
-;AllowRootDirInstall false
-
-!define MULTIUSER_EXECUTIONLEVEL Highest
-!define MULTIUSER_MUI
-!define MULTIUSER_INSTALLMODE_COMMANDLINE
-!define MULTIUSER_USE_PROGRAMFILES64
-!define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY "Software\${APPNAME}\${APPVERSION}"
-!define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME ""
-!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY "Software\${APPNAME}\${APPVERSION}"
-!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME ""
-!define MULTIUSER_INSTALLMODE_INSTDIR "${APPNAME}-${APPVERSION}"
-!define UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAMEANDVERSION}"
-
-!include MultiUser.nsh
-!include MUI2.nsh
-!include x64.nsh
-!include WinVer.nsh
-!include 'LogicLib.nsh'
-!include StrFunc.nsh
-
-!define MUI_ICON ".\gramps.ico"
-!define MUI_HEADERIMAGE
-;!define MUI_HEADERIMAGE_BITMAP ".\grampshd.bmp"
-;!define MUI_WELCOMEFINISHPAGE_BITMAP ".\grampsbg.bmp"
-;!define MUI_BGCOLOR
-;!define MUI_LICENSEPAGE_BGCOLOR
-;!define MUI_DIRECTORYPAGE_BGCOLOR
-!define MUI_ABORTWARNING
-!define MUI_FINISHPAGE_NOAUTOCLOSE
-!define MUI_FINISHPAGE_RUN "$INSTDIR\gramps.exe"
-;!define MUI_FINISHPAGE_RUN_PARAMETERS "-EO gramps"
-
-
-;--------- Pages---------------------------------------------------------------
-!insertmacro MUI_PAGE_WELCOME	
-!insertmacro MUI_PAGE_LICENSE "..\share\doc\gramps\COPYING"
-!insertmacro MULTIUSER_PAGE_INSTALLMODE
-!insertmacro MUI_PAGE_COMPONENTS
-!insertmacro MUI_PAGE_DIRECTORY
-;!insertmacro MUI_PAGE_STARTMENU
-!insertmacro MUI_PAGE_INSTFILES 
-!insertmacro MUI_PAGE_FINISH
-
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-
-;--------- Languages ----------------------------------------------------------
-!insertmacro MUI_LANGUAGE English
-!insertmacro MUI_LANGUAGE Albanian
-!insertmacro MUI_LANGUAGE Arabic
-!insertmacro MUI_LANGUAGE Bulgarian
-!insertmacro MUI_LANGUAGE Catalan
-!insertmacro MUI_LANGUAGE Croatian
-!insertmacro MUI_LANGUAGE Czech
-!insertmacro MUI_LANGUAGE Danish
-!insertmacro MUI_LANGUAGE Dutch
-!insertmacro MUI_LANGUAGE Esperanto
-!insertmacro MUI_LANGUAGE Finnish
-!insertmacro MUI_LANGUAGE French
-!insertmacro MUI_LANGUAGE German
-!insertmacro MUI_LANGUAGE Greek
-!insertmacro MUI_LANGUAGE Hebrew
-!insertmacro MUI_LANGUAGE Hungarian
-!insertmacro MUI_LANGUAGE Icelandic
-!insertmacro MUI_LANGUAGE Italian
-!insertmacro MUI_LANGUAGE Japanese
-!insertmacro MUI_LANGUAGE Lithuanian
-!insertmacro MUI_LANGUAGE Norwegian
-!insertmacro MUI_LANGUAGE NorwegianNynorsk
-!insertmacro MUI_LANGUAGE Polish
-!insertmacro MUI_LANGUAGE Portuguese
-!insertmacro MUI_LANGUAGE PortugueseBR
-!insertmacro MUI_LANGUAGE Russian
-!insertmacro MUI_LANGUAGE Serbian
-!insertmacro MUI_LANGUAGE SerbianLatin
-!insertmacro MUI_LANGUAGE SimpChinese
-!insertmacro MUI_LANGUAGE Slovak
-!insertmacro MUI_LANGUAGE Slovenian
-!insertmacro MUI_LANGUAGE Spanish
-!insertmacro MUI_LANGUAGE SpanishInternational
-!insertmacro MUI_LANGUAGE Swedish
-!insertmacro MUI_LANGUAGE TradChinese
-!insertmacro MUI_LANGUAGE Turkish
-!insertmacro MUI_LANGUAGE Ukrainian
-!insertmacro MUI_LANGUAGE Vietnamese
-
-;--------- Reserve Files ------------------------------------------------------
-!insertmacro MUI_RESERVEFILE_LANGDLL
-;ReserveFile "${NSISDIR}\Plugins\x86-ansi\*.dll"
-ReserveFile "${NSISDIR}\Plugins\unicode\*.dll"
-
-ShowInstDetails show
-
-Section "Gramps" Section1
-	SectionIn RO
-	SetOverwrite on
-
-	;;; Set Section Files and Shortcuts
-	SetOutPath "$INSTDIR\"
-	File "..\"
-
-	SetOutPath "$INSTDIR\lib\"
-	File /r  "..\lib\"
-	
-	SetOutPath "$INSTDIR\etc\"
-	File /r "..\etc\"
-	
-	SetOutPath "$INSTDIR\share\"
-		File /r  "..\share\doc"
-		File /r  "..\share\glib-2.0"
-		File /r  "..\share\gramps"
-		File /r  "..\share\icons"
-		File /r  "..\share\xml"
-		
-	SetOutPath "$INSTDIR\gramps\"
-	File /r  "..\gramps\"
-	
-	SetOutPath "$INSTDIR\ssl\"
-	File /r  "..\etc\ssl\"
-	
-	SetOutPath "$INSTDIR\src\"
-	File /r  ".\"
-	
-	CreateDirectory "$INSTDIR\var\cache\fontconfig"
-
-	SetOutPath "$INSTDIR\"
-	CreateShortCut "$DESKTOP\${APPNAMEANDVERSION}.lnk" "$INSTDIR\grampsw.exe"  "" "" "" "" "" "Gramps"
-	CreateDirectory "$SMPROGRAMS\${APPNAMEANDVERSION}"
-	CreateShortCut "$SMPROGRAMS\${APPNAMEANDVERSION}\${APPNAMEANDVERSION}.lnk" "$INSTDIR\grampsw.exe" "" "" "" "" "" "Gramps"
-	CreateShortCut "$SMPROGRAMS\${APPNAMEANDVERSION}\${APPNAMEANDVERSION}-console.lnk" "$INSTDIR\gramps.exe" "" "" "" "" "" "Gramps (console)"
-	
-	DetailPrint "Writing resource-path ..."
-	FileOpen $4 "$INSTDIR\gramps\gen\utils\resource-path" w
-	FileWrite $4 "share"
-	FileClose $4
-
-	DetailPrint "Writing branding ..."
-	FileOpen $4 "$INSTDIR\gramps\version.py" a
-	FileSeek $4 0 END
-	FileWrite $4 "$\r$\n" ; we write a new line
-	FileWrite $4 "VERSION = 'AIO64-${APPVERSION}-${APPBUILD}'"
-	FileWrite $4 "$\r$\n" ; we write an extra line
-	FileClose $4 ; and close the file
-
-	DetailPrint "Compiling GLib schemas ..."
-	nsExec::ExecToStack '"$INSTDIR\glib-compile-schemas.exe" $INSTDIR\share\glib-2.0\schemas'	
-	
-	DetailPrint "Caching gdk-pixbuf-query-loaders ..."
-	nsExec::ExecToStack '"$INSTDIR\gdk-pixbuf-query-loaders.exe" --update-cache'	
-SectionEnd
-
-SectionGroup "Dictionaries" sec_d
-Section /o "ca" d_ca
-	SetOutPath "$INSTDIR\share\enchant\myspell\"
-		File "..\share\enchant\myspell\ca_ES.*"
-SectionEnd
-Section /o "cs" d_cs
-	SetOutPath "$INSTDIR\share\enchant\myspell\"
-		File "..\share\enchant\myspell\cs_CZ.*"
-SectionEnd
-Section /o "da" d_da
-	SetOutPath "$INSTDIR\share\enchant\myspell\"
-		File "..\share\enchant\myspell\da_DK.*"
-SectionEnd
-Section /o "de" d_de
-	SetOutPath "$INSTDIR\share\enchant\myspell\"
-		File "..\share\enchant\myspell\de_DE.*"
-SectionEnd
-Section /o "en_AU" d_enau
-	SetOutPath "$INSTDIR\share\enchant\myspell\"
-		File "..\share\enchant\myspell\en_AU.*"
-SectionEnd
-Section "en_GB" d_engb
-	SectionIn RO
-	SetOutPath "$INSTDIR\share\enchant\"
-		File "..\share\enchant\enchant.ordering"
-	SetOutPath "$INSTDIR\share\enchant\myspell\"
-		File "..\share\enchant\myspell\en_GB.*"
-SectionEnd
-Section /o "en_US" d_enus
-	SetOutPath "$INSTDIR\share\enchant\myspell\"
-		File "..\share\enchant\myspell\en_US.*"
-SectionEnd
-Section /o "es_ES" d_es
-	SetOutPath "$INSTDIR\share\enchant\myspell\"
-		File "..\share\enchant\myspell\es_ES.*"
-SectionEnd
-Section /o "fr_FR" d_fr
-	SetOutPath "$INSTDIR\share\enchant\myspell\"
-		File "..\share\enchant\myspell\fr_FR.*"
-SectionEnd
-Section /o "hr_HR" d_hr
-	SetOutPath "$INSTDIR\share\enchant\myspell\"
-		File "..\share\enchant\myspell\hr_HR.*"
-SectionEnd
-Section /o "it_IT" d_it
-	SetOutPath "$INSTDIR\share\enchant\myspell\"
-		File "..\share\enchant\myspell\it_IT.*"
-SectionEnd
-Section /o "nb_NO" d_nb
-	SetOutPath "$INSTDIR\share\enchant\myspell\"
-		File "..\share\enchant\myspell\nb_no.*"
-SectionEnd
-Section /o "nl_NL" d_nl
-	SetOutPath "$INSTDIR\share\enchant\myspell\"
-		File "..\share\enchant\myspell\nl_NL.*"
-SectionEnd
-Section /o "nn_NO" d_nn
-	SetOutPath "$INSTDIR\share\enchant\myspell\"
-		File "..\share\enchant\myspell\nn_NO.*"
-SectionEnd
-Section /o "pl_PL" d_pl
-	SetOutPath "$INSTDIR\share\enchant\myspell\"
-		File "..\share\enchant\myspell\pl_PL.*"
-SectionEnd
-Section /o "ru_RU" d_ru
-	SetOutPath "$INSTDIR\share\enchant\myspell\"
-		File "..\share\enchant\myspell\ru_RU.*"
-SectionEnd
-Section /o "sk_SK" d_sk
-	SetOutPath "$INSTDIR\share\enchant\myspell\"
-		File "..\share\enchant\myspell\sk_SK.*"
-SectionEnd
-Section /o "sl_SI" d_sl
-	SetOutPath "$INSTDIR\share\enchant\myspell\"
-		File "..\share\enchant\myspell\sl_SI.*"
-SectionEnd
-Section /o "sv_SE" d_sv
-	SetOutPath "$INSTDIR\share\enchant\myspell\"
-		File "..\share\enchant\myspell\sv_SE.*"
-SectionEnd
-SectionGroupEnd
-
-SectionGroup "Translations" sec_t
-Section /o "ar" ar
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\ar"
-SectionEnd
-Section /o "bg" bg
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\bg"
-SectionEnd
-Section /o "ca" ca
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\ca"
-SectionEnd
-Section /o "cs" cs
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\cs"
-SectionEnd
-Section /o "da" da
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\da"
-SectionEnd
-Section /o "de" de
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\de"
-SectionEnd
-Section /o "el" el
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\el"
-SectionEnd
-Section "en_GB" en_GB
-	SectionIn RO
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\en_GB"
-SectionEnd
-Section /o "eo" eo
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\eo"
-SectionEnd
-Section /o "es" es
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\es"
-SectionEnd
-Section /o "fi" fi
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\fi"
-SectionEnd
-Section /o "fr" fr
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\fr"
-SectionEnd
-Section /o "he" he
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\he"
-SectionEnd
-Section /o "hr" hr
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\hr"
-SectionEnd
-Section /o "hu" hu
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\hu"
-SectionEnd
-Section /o "is" is
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\is"
-SectionEnd
-Section /o "it" it
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\it"
-SectionEnd
-Section /o "ja" ja
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\ja"
-SectionEnd
-Section /o "lt" lt
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\lt"
-SectionEnd
-Section /o "nb" nb
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\nb"
-SectionEnd
-Section /o "nl" nl
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\nl"
-SectionEnd
-Section /o "nn" nn
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\nn"
-SectionEnd
-Section /o "pl" pl
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\pl"
-SectionEnd
-Section /o "pt_BR" pt_BR
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\pt_BR"
-SectionEnd
-Section /o "pt_PT" pt_PT
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\pt_PT"
-SectionEnd
-Section /o "ru" ru
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\ru"
-SectionEnd
-Section /o "sk" sk
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\sk"
-SectionEnd
-Section /o "sl" sl
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\sl"
-SectionEnd
-Section /o "sq" sq
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\sq"
-SectionEnd
-Section /o "sr" sr
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\sr"
-SectionEnd
-Section /o "sv" sv
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\sv"
-SectionEnd
-Section /o "tr" tr
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\tr"
-SectionEnd
-Section /o "uk" uk
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\uk"
-SectionEnd
-Section /o "vi" vi
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\vi"
-SectionEnd
-Section /o "zh_CN" zh_CN
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\zh_CN"
-SectionEnd
-Section /o "zh_HK" zh_HK
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\zh_HK"
-SectionEnd
-Section /o "zh_TW" zh_TW
-	SetOutPath "$INSTDIR\share\locale\"
-		File /r "..\share\locale\zh_TW"
-SectionEnd
-SectionGroupEnd
-
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-	!insertmacro MUI_DESCRIPTION_TEXT ${Section1} "Gramps application with all dependencies"
-	
-	;; Description of dictionaries
-	!insertmacro MUI_DESCRIPTION_TEXT ${sec_d} "Dictionaries for various languages"
-	!insertmacro MUI_DESCRIPTION_TEXT ${d_ca} "Catalan"
-	!insertmacro MUI_DESCRIPTION_TEXT ${d_cs} "Czech"
-	!insertmacro MUI_DESCRIPTION_TEXT ${d_da} "Danish"
-	!insertmacro MUI_DESCRIPTION_TEXT ${d_de} "German"
-	!insertmacro MUI_DESCRIPTION_TEXT ${d_enau} "English (Australia)"
-	!insertmacro MUI_DESCRIPTION_TEXT ${d_engb} "English (United Kingdom)"
-	!insertmacro MUI_DESCRIPTION_TEXT ${d_enus} "English (USA)"
-	!insertmacro MUI_DESCRIPTION_TEXT ${d_es} "Spanish"
-	!insertmacro MUI_DESCRIPTION_TEXT ${d_fr} "French"
-	!insertmacro MUI_DESCRIPTION_TEXT ${d_hr} "Croatian"
-	!insertmacro MUI_DESCRIPTION_TEXT ${d_it} "Italian"
-	!insertmacro MUI_DESCRIPTION_TEXT ${d_nb} "Norwegian Bokmal"
-	!insertmacro MUI_DESCRIPTION_TEXT ${d_nl} "Dutch"
-	!insertmacro MUI_DESCRIPTION_TEXT ${d_nn} "Norwegian Nynorsk"
-	!insertmacro MUI_DESCRIPTION_TEXT ${d_pl} "Polish"
-	!insertmacro MUI_DESCRIPTION_TEXT ${d_ru} "Russian"
-	!insertmacro MUI_DESCRIPTION_TEXT ${d_sk} "Slovak"
-	!insertmacro MUI_DESCRIPTION_TEXT ${d_sl} "Slovenian"
-	!insertmacro MUI_DESCRIPTION_TEXT ${d_sv} "Swedish"
-
-	;; Description of translations
-  !insertmacro MUI_DESCRIPTION_TEXT ${sec_t} "Translation of Gramps in various languages"
-	!insertmacro MUI_DESCRIPTION_TEXT ${ar} "Arabic"
-	!insertmacro MUI_DESCRIPTION_TEXT ${bg} "Bulgarian"
-	!insertmacro MUI_DESCRIPTION_TEXT ${ca} "Catalan"
-	!insertmacro MUI_DESCRIPTION_TEXT ${cs} "Czech"
-	!insertmacro MUI_DESCRIPTION_TEXT ${da} "Danish"
-	!insertmacro MUI_DESCRIPTION_TEXT ${de} "German"
-	!insertmacro MUI_DESCRIPTION_TEXT ${el} "Greek"
-	!insertmacro MUI_DESCRIPTION_TEXT ${en_GB} "English (United Kingdom)"
-	!insertmacro MUI_DESCRIPTION_TEXT ${eo} "Esperanto"
-	!insertmacro MUI_DESCRIPTION_TEXT ${es} "Spanish"
-	!insertmacro MUI_DESCRIPTION_TEXT ${fi} "Finnish"
-	!insertmacro MUI_DESCRIPTION_TEXT ${fr} "French"
-	!insertmacro MUI_DESCRIPTION_TEXT ${he} "Hebrew"
-	!insertmacro MUI_DESCRIPTION_TEXT ${hr} "Croatian"
-	!insertmacro MUI_DESCRIPTION_TEXT ${hu} "Hungarian"
-	!insertmacro MUI_DESCRIPTION_TEXT ${is} "Icelandic"
-	!insertmacro MUI_DESCRIPTION_TEXT ${it} "Italian"
-	!insertmacro MUI_DESCRIPTION_TEXT ${ja} "Japanese"
-	!insertmacro MUI_DESCRIPTION_TEXT ${lt} "Lithuanian"
-	;!insertmacro MUI_DESCRIPTION_TEXT ${mk} "Macedonian"
-	!insertmacro MUI_DESCRIPTION_TEXT ${nb} "Norwegian Bokmal"
-	!insertmacro MUI_DESCRIPTION_TEXT ${nl} "Dutch"
-	!insertmacro MUI_DESCRIPTION_TEXT ${nn} "Norwegian Nynorsk"
-	!insertmacro MUI_DESCRIPTION_TEXT ${pl} "Polish"
-	!insertmacro MUI_DESCRIPTION_TEXT ${pt_BR} "Portuguese (Brazil)"
-	!insertmacro MUI_DESCRIPTION_TEXT ${pt_PT} "Portuguese (Portugal)"
-	!insertmacro MUI_DESCRIPTION_TEXT ${ru} "Russian"
-	!insertmacro MUI_DESCRIPTION_TEXT ${sk} "Slovak"
-	!insertmacro MUI_DESCRIPTION_TEXT ${sl} "Slovenian"
-	!insertmacro MUI_DESCRIPTION_TEXT ${sq} "Albanian"
-	!insertmacro MUI_DESCRIPTION_TEXT ${sr} "Serbian"
-	!insertmacro MUI_DESCRIPTION_TEXT ${sv} "Swedish"
-	!insertmacro MUI_DESCRIPTION_TEXT ${tr} "Turkish"
-	!insertmacro MUI_DESCRIPTION_TEXT ${uk} "Ukrainian"
-	!insertmacro MUI_DESCRIPTION_TEXT ${vi} "Vietnamese"
-	!insertmacro MUI_DESCRIPTION_TEXT ${zh_CN} "Chinese (Simplified)"
-	!insertmacro MUI_DESCRIPTION_TEXT ${zh_HK} "Chinese (Hong Kong)"
-	!insertmacro MUI_DESCRIPTION_TEXT ${zh_TW} "Chinese (Traditional)"
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
-
-Function sel_langs
-    StrCmp $LANGUAGE ${LANG_ARABIC} 0 +2
-        SectionSetFlags ${ar} 1
-    StrCmp $LANGUAGE ${LANG_BULGARIAN} 0 +2
-        SectionSetFlags ${bg} 1
-    StrCmp $LANGUAGE ${LANG_CATALAN} 0 +3
-        SectionSetFlags ${ca} 1
-        SectionSetFlags ${d_ca} 1
-    StrCmp $LANGUAGE ${LANG_CZECH} 0 +3
-        SectionSetFlags ${cs} 1
-        SectionSetFlags ${d_cs} 1
-    StrCmp $LANGUAGE ${LANG_DANISH} 0 +3
-        SectionSetFlags ${da} 1
-        SectionSetFlags ${d_da} 1
-    StrCmp $LANGUAGE ${LANG_GERMAN} 0 +3
-        SectionSetFlags ${de} 1
-        SectionSetFlags ${d_de} 1
-    StrCmp $LANGUAGE ${LANG_GREEK} 0 +2
-        SectionSetFlags ${el} 1
-    StrCmp $LANGUAGE ${LANG_ESPERANTO} 0 +2
-        SectionSetFlags ${eo} 1
-    StrCmp $LANGUAGE ${LANG_SPANISH} 0 +3
-        SectionSetFlags ${es} 1
-        SectionSetFlags ${d_es} 1
-    StrCmp $LANGUAGE ${LANG_FINNISH} 0 +2
-        SectionSetFlags ${fi} 1
-    StrCmp $LANGUAGE ${LANG_FRENCH} 0 +3
-        SectionSetFlags ${fr} 1
-        SectionSetFlags ${d_fr} 1
-    StrCmp $LANGUAGE ${LANG_HEBREW} 0 +2
-        SectionSetFlags ${he} 1
-    StrCmp $LANGUAGE ${LANG_CROATIAN} 0 +3
-        SectionSetFlags ${hr} 1
-        SectionSetFlags ${d_hr} 1
-    StrCmp $LANGUAGE ${LANG_HUNGARIAN} 0 +2
-        SectionSetFlags ${hu} 1
-    StrCmp $LANGUAGE ${LANG_ICELANDIC} 0 +2
-        SectionSetFlags ${is} 1
-    StrCmp $LANGUAGE ${LANG_ITALIAN} 0 +3
-        SectionSetFlags ${it} 1
-        SectionSetFlags ${d_it} 1
-    StrCmp $LANGUAGE ${LANG_JAPANESE} 0 +2
-        SectionSetFlags ${ja} 1
-    StrCmp $LANGUAGE ${LANG_LITHUANIAN} 0 +2
-        SectionSetFlags ${lt} 1
-    StrCmp $LANGUAGE ${LANG_NORWEGIAN} 0 +5
-        SectionSetFlags ${nb} 1
-        SectionSetFlags ${d_nb} 1
-        SectionSetFlags ${nn} 1
-        SectionSetFlags ${d_nn} 1
-    StrCmp $LANGUAGE ${LANG_DUTCH} 0 +3
-        SectionSetFlags ${nl} 1
-        SectionSetFlags ${d_nl} 1
-    StrCmp $LANGUAGE ${LANG_POLISH} 0 +3
-        SectionSetFlags ${pl} 1
-        SectionSetFlags ${d_pl} 1
-    StrCmp $LANGUAGE ${LANG_PORTUGUESEBR} 0 +2
-        SectionSetFlags ${pt_BR} 1
-    StrCmp $LANGUAGE ${LANG_PORTUGUESE} 0 +2
-        SectionSetFlags ${pt_PT} 1
-    StrCmp $LANGUAGE ${LANG_RUSSIAN} 0 +3
-        SectionSetFlags ${ru} 1
-        SectionSetFlags ${d_ru} 1
-    StrCmp $LANGUAGE ${LANG_SLOVAK} 0 +3
-        SectionSetFlags ${sk} 1
-        SectionSetFlags ${d_sk} 1
-    StrCmp $LANGUAGE ${LANG_SLOVENIAN} 0 +3
-        SectionSetFlags ${sl} 1
-        SectionSetFlags ${d_sl} 1
-    StrCmp $LANGUAGE ${LANG_ALBANIAN} 0 +2
-        SectionSetFlags ${sq} 1
-    StrCmp $LANGUAGE ${LANG_SERBIAN} 0 +2
-        SectionSetFlags ${sr} 1
-    StrCmp $LANGUAGE ${LANG_SWEDISH} 0 +3
-        SectionSetFlags ${sv} 1
-        SectionSetFlags ${d_sv} 1
-    StrCmp $LANGUAGE ${LANG_TURKISH} 0 +2
-        SectionSetFlags ${tr} 1
-    StrCmp $LANGUAGE ${LANG_UKRAINIAN} 0 +2
-        SectionSetFlags ${uk} 1
-    StrCmp $LANGUAGE ${LANG_VIETNAMESE} 0 +2
-        SectionSetFlags ${vi} 1
-    StrCmp $LANGUAGE ${LANG_SIMPCHINESE} 0 +3
-        SectionSetFlags ${zh_CN} 1
-        SectionSetFlags ${zh_HK} 1
-    StrCmp $LANGUAGE ${LANG_TRADCHINESE} 0 +3
-        SectionSetFlags ${zh_TW} 1
-        SectionSetFlags ${zh_HK} 1
-
-FunctionEnd
-
-Section -FinishSection
-	DetailPrint "Configuring GraphViz Dot..."
-	ReadEnvStr $R0 "PATH"
-	StrCpy $R0 "$R0;$INSTDIR\lib"
-	System::Call 'Kernel32::SetEnvironmentVariable(t, t) i("PATH", R0).r0'
-	SetOutPath $INSTDIR
-	nsExec::ExecToLog '"$INSTDIR\lib\dot.exe" -c'
-    System::Call 'Kernel32::SetEnvironmentVariable(t, t)i ("FC_DEBUG", "128").r0'
-	DetailPrint "Creating fontconfig cache (might take a while)..."
-	nsExec::ExecToLog '"$INSTDIR\lib\fc-cache.exe" -fv'
-    System::Call 'Kernel32::SetEnvironmentVariable(t, n)i ("FC_DEBUG", "").r0'
-
-	WriteRegStr SHCTX "${UNINST_KEY}" "DisplayName" "${APPNAME}"
-	WriteRegStr SHCTX "${UNINST_KEY}" "DisplayVersion" "${APPVERSION}"
-	WriteRegStr SHCTX "${UNINST_KEY}" "Publisher" "${APP_PUBLISHER}"
-	WriteRegStr SHCTX "${UNINST_KEY}" "URLInfoAbout" "${APP_WEB_SITE}"
-	WriteRegStr SHCTX "${UNINST_KEY}" "UninstallString" \
-		"$\"$INSTDIR\uninstall.exe$\" /$MultiUser.InstallMode"
-	WriteRegStr SHCTX "${UNINST_KEY}" "QuietUninstallString" \
-		"$\"$INSTDIR\uninstall.exe$\" /$MultiUser.InstallMode /S"
-	WriteUninstaller "$INSTDIR\uninstall.exe"
-SectionEnd
-
-Section Uninstall
-	DeleteRegKey SHCTX "${UNINST_KEY}"
-	Delete "$DESKTOP\${APPNAMEANDVERSION}.lnk"
-	Delete "$SMPROGRAMS\${APPNAMEANDVERSION}\${APPNAMEANDVERSION}.lnk"
-	Delete "$SMPROGRAMS\${APPNAMEANDVERSION}\${APPNAMEANDVERSION}-console.lnk"
-	RMDir "$SMPROGRAMS\${APPNAMEANDVERSION}\"
-	Delete "$INSTDIR\uninstall.exe"
-	Delete "$INSTDIR\uninstall.exe"
-	RMDir /r "$INSTDIR\etc"
-	RMDir /r "$INSTDIR\lib"
-	RMDir /r "$INSTDIR\share"
-	RMDir /r "$INSTDIR\src"
-	RMDir /r "$INSTDIR\ssl"
-	RMDir /r "$INSTDIR\gramps"
-	RMDir /r "$INSTDIR\var"
-	RMDir /r "$INSTDIR"
-SectionEnd
-
-Function .onInit
-  !insertmacro MULTIUSER_INIT
-  
-   ;; Prevent multiple instances.
-   System::Call 'kernel32::CreateMutexA(i 0, i 0, t "GrampsInstaller") i .r1 ?e'
-   Pop $R0
-   StrCmp $R0 0 +3
-      MessageBox MB_OK|MB_ICONEXCLAMATION "The GrampsAIO installer is already running."
-			Abort
-  
-  ${IfNot} ${RunningX64}
-    MessageBox MB_OK "64bit Windows version required"
-    Quit
-  ${EndIf}
-
-  ${If} ${AtMostWinXP}
-    MessageBox MB_OK "Windows Vista and above required"
-    Quit
-  ${EndIf}
-  ;StrCpy $LANGUAGE ${LANG_FRENCH}
-  Call sel_langs
-FunctionEnd
-
-Function un.onInit
-  !insertmacro MULTIUSER_UNINIT
-   ;; MessageBox MB_OK|MB_ICONEXCLAMATION "Gramps will uninstall now"
-  ;; Prevent uninstallation if Gramps is running.
-   System::Call 'kernel32::CreateMutex(i 0, b 0, t "org.gramps-project.gramps") i .R0 ?e'
-   Pop $0
-   ;; MessageBox MB_OK|MB_ICONEXCLAMATION "Gramps Mutex Error $0, return $R0"
-   IntCmpU $0 183 0 notRunning notRunning
-    System::Call 'kernel32::CloseHandle(i $R0)'
-    MessageBox MB_OK|MB_ICONEXCLAMATION "Gramps is running. Please close it first"
-    Abort
-notRunning:
-FunctionEnd
@@ -1,44 +0,0 @@
-#!/usr/bin/env python3
-import os
-from os import environ
-from os.path import join
-import sys
-import site
-
-if getattr(sys, "frozen", False):
-    aio = os.path.dirname(sys.executable)
-    sys.path.insert(1, aio)
-    sys.path.insert(1, os.path.join(aio, "lib"))
-    sys.path.insert(1, site.getusersitepackages())
-    environ["PANGOCAIRO_BACKEND"] = "fontconfig"
-    environ["SSL_CERT_FILE"] = join(aio, "ssl/certs/ca-bundle.trust.crt")
-    environ["GI_TYPELIB_PATH"] = join(aio, "lib/girepository-1.0")
-    environ["G_ENABLE_DIAGNOSTIC"] = "0"
-    environ["G_PARAM_DEPRECATED"] = "0"
-    environ["GRAMPS_RESOURCES"] = join(aio, "share")
-    environ["PATH"] = aio + ";" + aio + "\lib;" + environ["PATH"]
-
-
-def close():
-    sys.exit()
-
-
-import atexit
-import ctypes
-
-HANDLE = ctypes.windll.kernel32.CreateMutexW(None, 1, "org.gramps-project.gramps")
-ERROR = ctypes.GetLastError()
-if ERROR == 183:  # ERROR_ALREADY_EXISTS:
-    print("Gramps is already running!", file=sys.stderr)
-    close()
-
-atexit.register(ctypes.windll.kernel32.CloseHandle, HANDLE)
-atexit.register(ctypes.windll.kernel32.ReleaseMutex, HANDLE)
-
-import warnings
-
-warnings.simplefilter("ignore")
-
-import gramps.grampsapp as app
-
-app.run()
@@ -1,24 +0,0 @@
-#!/usr/bin/env python3
-import os
-from os import environ
-from os.path import join
-import sys
-import site
-
-if getattr(sys, "frozen", False):
-    aio = os.path.dirname(sys.executable)
-    sys.path.insert(1, aio)
-    sys.path.insert(1, os.path.join(aio, "lib"))
-    sys.path.insert(1, site.getusersitepackages())
-    environ["LANG"] = "en"
-    environ["PANGOCAIRO_BACKEND"] = "fontconfig"
-    environ["SSL_CERT_FILE"] = join(aio, "ssl/certs/ca-bundle.trust.crt")
-    environ["GI_TYPELIB_PATH"] = join(aio, "lib/girepository-1.0")
-    environ["G_ENABLE_DIAGNOSTIC"] = "0"
-    environ["G_PARAM_DEPRECATED"] = "0"
-    environ["GRAMPS_RESOURCES"] = join(aio, "share")
-    environ["PATH"] = aio + ";" + aio + "\lib;" + environ["PATH"]
-
-import gramps.grampsapp as app
-
-app.run()
@@ -1,42 +0,0 @@
-#!/usr/bin/env python3
-"""
-    grampsw.exe
-"""
-import os
-from os import environ
-from os.path import join
-import sys
-import site
-
-if getattr(sys, "frozen", False):
-    aio = os.path.dirname(sys.executable)
-    sys.path.insert(1, aio)
-    sys.path.insert(1, os.path.join(aio, "lib"))
-    sys.path.insert(1, site.getusersitepackages())
-    environ["SSL_CERT_FILE"] = join(aio, "ssl/certs/ca-bundle.trust.crt")
-    environ["GI_TYPELIB_PATH"] = join(aio, "lib/girepository-1.0")
-    environ["G_ENABLE_DIAGNOSTIC"] = "0"
-    environ["G_PARAM_DEPRECATED"] = "0"
-    environ["GRAMPS_RESOURCES"] = join(aio, "share")
-    environ["PATH"] = aio + ";" + aio + "\lib;" + environ["PATH"]
-
-import atexit
-import ctypes
-
-
-def close():
-    """Show warning dialog if Gramps is already running"""
-    sys.exit("Gramps is already running!")
-
-
-HANDLE = ctypes.windll.kernel32.CreateMutexW(None, 1, "org.gramps-project.gramps")
-ERROR = ctypes.GetLastError()
-if ERROR == 183:  # ERROR_ALREADY_EXISTS:
-    close()
-
-atexit.register(ctypes.windll.kernel32.CloseHandle, HANDLE)
-atexit.register(ctypes.windll.kernel32.ReleaseMutex, HANDLE)
-
-import gramps.grampsapp as app
-
-app.main()
@@ -1,283 +0,0 @@
-"""
- Use with:
- python3 setup.py build_exe --no-compress -O1
-"""
-import sys
-import os
-import site
-import subprocess
-import tempfile
-import atexit
-import shutil
-import zipfile
-import cx_Freeze
-
-sys.path.insert(0, "dist")
-import gramps
-from gramps.version import VERSION_TUPLE
-
-try:
-    from gramps.version import VERSION_QUALIFIER
-except:
-    VERSION_QUALIFIER = ""
-UPX_ALT_PATH = r"UPX"
-
-# import logging
-# logging.basicConfig(level=logging.DEBUG)
-VQ = {
-    "-alpha1": 10,
-    "-alpha2": 11,
-    "-alpha3": 12,
-    "-beta1": 21,
-    "-beta2": 22,
-    "-beta3": 23,
-    "-rc1": 22,
-    "": 0,
-}
-
-VERSION = ".".join(map(str, VERSION_TUPLE)) + "." + str(VQ.get(VERSION_QUALIFIER, 99))
-COPYRIGHT = "Copyright 2020, Gramps developers.  GNU General Public License"
-# Prepare a temporay directory
-TEMP_DIR = tempfile.TemporaryDirectory()
-atexit.register(TEMP_DIR.cleanup)
-BASE_DIR = os.path.split(sys.prefix)[1]
-SETUP_DIR = os.path.dirname(os.path.realpath(__file__))
-SETUP_FILES = [
-    "setup.py",
-    "gramps.ico",
-    "grampsc.ico",
-    "grampsd.ico",
-    "grampsaioc.py",
-    "grampsaiocd.py",
-    "grampsaiow.py",
-]
-if "32" in BASE_DIR:
-    SETUP_FILES.append("".join(("grampsaio", "32", ".nsi")))
-else:
-    SETUP_FILES.append("".join(("grampsaio", "64", ".nsi")))
-
-INCLUDE_DLL_PATH = os.path.join(sys.exec_prefix, "bin")
-INCLUDE_FILES = []
-INCLUDES = ["gi", "cgi", "colorsys", "site"]
-PACKAGES = [
-    "gi",
-    "cairo",
-    "xml",
-    "bsddb3",
-    "lxml",
-    "PIL",
-    "json",
-    "csv",
-    "sqlite3",
-    "cProfile",
-    "networkx",
-    "psycopg2",
-    "requests",
-    "logging",
-    "html",
-    "compileall",
-    "graphviz",
-    "pydotplus",
-    "pygraphviz",
-    "pydot",
-]
-EXCLUDES = [
-    "tkinter",
-    "PyQt5",
-    "PyQt5.QtCore",
-    "PyQt5.QtGui",
-    "pyside" "PyQt5.QtWidgets",
-    "sip",
-    "lib2to3",
-    "PIL.ImageQt",
-    "pip",
-    "distlib",
-]
-
-REPLACE_PATHS = [
-    ("*", "AIO/"),
-    (
-        site.getsitepackages()[0] + "cx_freeze-5.0-py3.6-mingw.egg/cx_Freeze",
-        "cx_Freeze/",
-    ),
-]
-MISSING_DLL = [
-    "libgtk-3-0.dll",
-    "libgtkspell3-3-0.dll",
-    "libgexiv2-2.dll",
-    "libgoocanvas-3.0-9.dll",
-    "libosmgpsmap-1.0-1.dll",
-    "gswin32c.exe",
-    "dot.exe",
-    "libgvplugin_core-6.dll",
-    "libgvplugin_dot_layout-6.dll",
-    "libgvplugin_gd-6.dll",
-    "libgvplugin_pango-6.dll",
-    "libgvplugin_rsvg-6.dll",
-    "glib-compile-schemas.exe",
-    "gdk-pixbuf-query-loaders.exe",
-    "gtk-update-icon-cache-3.0.exe",
-    "fc-cache.exe",
-    "fc-match.exe",
-    "gspawn-win64-helper-console.exe",
-    "gspawn-win64-helper.exe",
-    "libgeocode-glib-0.dll",
-]
-BIN_EXCLUDES = ["Qt5Core.dll", "gdiplus.dll", "gdiplus"]
-
-from os.path import dirname, basename
-import lib2to3
-
-lib23_path = dirname(lib2to3.__file__)
-INCLUDE_FILES.append((lib23_path, "lib/lib2to3"))
-import pip
-
-libpip_path = dirname(pip.__file__)
-INCLUDE_FILES.append((libpip_path, "lib/pip"))
-import distlib
-
-libdistlib_path = dirname(distlib.__file__)
-INCLUDE_FILES.append((libdistlib_path, "lib/distlib"))
-
-os.makedirs(os.path.join(BASE_DIR, "var/cache/fontconfig"), exist_ok=True)
-for file in SETUP_FILES:
-    INCLUDE_FILES.append((os.path.join(SETUP_DIR, file), os.path.join("src", file)))
-for dll in MISSING_DLL:
-    INCLUDE_FILES.append(
-        (os.path.join(INCLUDE_DLL_PATH, dll), os.path.join("lib", dll))
-    )
-MISSING_LIBS = [
-    "lib/enchant-2",
-    "lib/gdk-pixbuf-2.0",
-    "lib/girepository-1.0",
-    "share/enchant",
-    "share/glib-2.0/schemas",
-    "share/xml/iso-codes",
-    "etc/gtk-3.0",
-    "etc/ssl/certs",
-    "etc/ssl/cert.pem",
-    "etc/fonts",
-    "lib/gio",
-    "share/icons/gnome",
-    "share/icons/hicolor",
-    "share/icons/gramps.png",
-    "share/icons/Adwaita/icon-theme.cache",
-    "share/icons/Adwaita/index.theme",
-    "share/hunspell",
-]
-ADWAITA = [
-    "8x8",
-    "16x16",
-    "22x22",
-    "24x24",
-    "32x32",
-    "48x48",
-    "64x64",
-    "96x96",
-    "cursors",
-]
-for adw in ADWAITA:
-    INCLUDE_FILES.append(
-        (
-            os.path.join(sys.prefix, "share/icons/Adwaita", adw),
-            os.path.join("share/icons/Adwaita", adw),
-        )
-    )
-for lib in MISSING_LIBS:
-    INCLUDE_FILES.append((os.path.join(sys.prefix, lib), lib))
-
-INCLUDE_FILES.append("dist/gramps")
-INCLUDE_FILES.append(
-    ("dist/gramps-" + ".".join(map(str, VERSION_TUPLE)) + ".data/data/share", "share")
-)
-EXECUTABLES = [
-    cx_Freeze.Executable(
-        "grampsaioc.py",
-        base="Console",
-        target_name="gramps.exe",
-        icon="gramps.ico",
-        copyright=COPYRIGHT,
-    ),
-    cx_Freeze.Executable(
-        "grampsaiow.py",
-        base="Win32GUI",
-        target_name="grampsw.exe",
-        icon="gramps.ico",
-        copyright=COPYRIGHT,
-    ),
-    cx_Freeze.Executable(
-        "grampsaiocd.py",
-        base="Console",
-        target_name="grampsd.exe",
-        icon="grampsd.ico",
-        copyright=COPYRIGHT,
-    ),
-]
-BUILD_EXE_OPTIONS = {
-    "packages": PACKAGES,
-    "includes": INCLUDES,
-    "excludes": EXCLUDES,
-    "include_files": INCLUDE_FILES,
-    "bin_includes": MISSING_DLL,
-    "zip_include_packages": "*",  # ZIP_INCLUDE_PACKAGES,
-    "zip_exclude_packages": EXCLUDES,
-    "bin_excludes": BIN_EXCLUDES,
-    "replace_paths": REPLACE_PATHS,
-    "build_exe": BASE_DIR,
-}
-BDIST_MSI_OPTIONS = {  # uuid.uuid5(uuid.NAMESPACE_DNS, 'GrampsAIO64-5-trunk')
-    "upgrade_code": "{fbccc04b-7b2e-56d3-8bb7-94d5f68de822}",
-    # uuid.uuid5(uuid.NAMESPACE_DNS, 'v5.0.0-alpha1-476-g473d3aa')
-    "product_code": "{48304362-2945-5a10-ad60-241f233be4d2}",
-    "add_to_path": False,
-    #'initial_target_dir': r'[ProgramFilesFolder]\%s\%s' %
-    # (company_name, product_name),
-}
-cx_Freeze.setup(
-    name="GrampsAIO32" if "32" in BASE_DIR else "GrampsAIO64",
-    options={"build_exe": BUILD_EXE_OPTIONS, "bdist_msi": BDIST_MSI_OPTIONS},
-    version=VERSION,
-    description="Gramps Genealogy software",
-    long_description=VERSION_QUALIFIER,
-    executables=EXECUTABLES,
-)
-
-ZIN = zipfile.ZipFile(os.path.join(BASE_DIR, "lib/library.zip"), "r")
-ZOUT = zipfile.ZipFile(os.path.join(BASE_DIR, "lib/pythonx.zip"), "w")
-for item in ZIN.infolist():
-    if not os.path.dirname(item.filename).startswith("gramps"):
-        # if '/test' in item.filename or 'test/' in item.filename:
-        #    print("Zip Excluded:", item.filename)
-        # else:
-        print("Zip Included:", item.filename)
-        buffer = ZIN.read(item.filename)
-        ZOUT.writestr(item, buffer)
-ZOUT.close()
-ZIN.close()
-shutil.move(
-    os.path.join(BASE_DIR, "lib/pythonx.zip"), os.path.join(BASE_DIR, "lib/library.zip")
-)
-
-if os.path.isfile(UPX_ALT_PATH):
-    UPX = UPX_ALT_PATH
-else:
-    WHICH = "where" if os.name == "nt" else "which"
-    try:
-        subprocess.check_call([WHICH, "UPX"])
-    except subprocess.CalledProcessError:
-        UPX = None
-    else:
-        UPX = "upx"
-if UPX is not None:
-    ARGS = [UPX, "-7", "--no-progress"]
-    ARGS.extend(
-        os.path.join(BASE_DIR, filename)
-        for filename in os.listdir(BASE_DIR)
-        if filename == "name"
-        or os.path.splitext(filename)[1].lower() in (".exe", ".dll", ".pyd", ".so")
-        and os.path.splitext(filename)[0].lower()
-        not in ("libgcc_s_dw2-1", "gramps", "grampsw", "grampsd", "libwinpthread-1")
-    )
-    subprocess.call(ARGS)
-else:
-    print("\nUPX not found")
@@ -1,14 +1,14 @@
 /*
-*******************************************************************************
+**************************************************************************************************
 Copyright Holder and License
-*******************************************************************************
+**************************************************************************************************
 GRAMPS Cascading Style Sheet
 Style Name: Basic-Ash Stylesheet
 Style Author: Jason M. Simanek (2008)
 Note: Adapted from GRAMPS original Modern Style stylesheet
-*******************************************************************************
+**************************************************************************************************
 This website was created with GRAMPS <http://www.gramps-project.org/>
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
 GRAMPS is a Free Software Project for Genealogy, offering a professional

 genealogy program, and a wiki open to all. It is a community project, created,
@@ -16,13 +16,11 @@ developed and governed by genealogists.

 Go to <http://gramps-project.org/> to learn more!

-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
 Copyright 2008 Jason M. Simanek
 Copyright 2009 Stephane Charette
 Copyright (C) 2008-2011 Rob G. Healey <robhealey1@gmail.com>
 Copyright 2011 Michiel D. Nauta
-Copyright 2018 Theo van Rijn
-Copyright (C) 2019      Serge Noiraud

 This file is part of the GRAMPS program.

@@ -36,10 +34,10 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.

 You should have received a copy of the GNU General Public License along with
 GRAMPS. If not, see <http://www.gnu.org/licenses/>.
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------

 Color Palette
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------

 black                   #000
 gray dark               #555
@@ -47,21 +45,21 @@ gray                    #999
 gray light              #CCC
 gray very light         #EEE
 white                   #FFF
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
 Characteristic of this style is that it uses the full width of the browser
 window and that horizontal highlighting bars extend over the full width of
 the page.
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------

 NarrativeWeb Styles
-------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------ 

 General Elements
 ----------------------------------------------------- */

 body {
    font-family: sans-serif;
-    font-size: 100%;
+    font-size: 90%;
    color: black;
    margin: 0px;
    background-color: #EEE;
@@ -69,13 +67,6 @@ body {
 body > div {
    clear: both;
 }
-#outerwrapper {
-    margin: 5px auto;
-    width: 98%;
-}
-#outerwrapper > div {
-    clear: both;
-}
 .content {
    background-color: white;
    border-top: solid 1px #999;
@@ -84,29 +75,9 @@ body > div {
    float: right;
    margin: 2em;
 }
-#ThumbnailPreview div.snapshot {
-    float: right;
-    margin: 0;
-}
 .fullclear {
    clear: both;
 }
-/* Less whitespace on smaller real estate. */
-@media only screen and (max-width: 1080px) {
-    .content {
-        padding: 0em 0.5em;
-    }
-    body#fullyearlinked table.calendar {
-        float: none;
-        width: 100%;
-    }
-}
-@media only screen and (width > 1080px) {
-    body#fullyearlinked table.calendar {
-        float: left;
-        width: 33.3%;
-    }
-}

 /* General Text
 ----------------------------------------------------- */
@@ -138,7 +109,6 @@ p#description {
 a {
    color: black;
    text-decoration: none;
-    word-wrap: break-word;
 }
 a[href]:hover, a[href]:active {
    text-decoration: underline;
@@ -162,7 +132,6 @@ a[href]:hover, a[href]:active {
 ----------------------------------------------------- */
 div#nav, #subnavigation {
    border: solid 1px #EEE; /* needed by IE7 */
-    position: relative;
 }
 #subnavigation ul {
    overflow: hidden;
@@ -200,35 +169,6 @@ div#nav ul li.CurrentSection a {
 #subnavigation ul li.CurrentSection a {
    background-color: white;
 }
-div#nav li.lang {
-    font-size: smaller;
-    font-family: sans-serif;
-    padding-top: .4em;
-    padding-bottom: .2em;
-    font-weight: bold;
-}
-div#nav li.lang:hover > ul {
-    visibility: visible;
-    opacity: 1;
-}
-div#nav ul.lang {
-    position: absolute;
-    visibility: hidden;
-    opacity: 0;
-    z-index: 999;
-    background-color: #EEE;
-    top: -1em;
-    font-size: larger;
-    font-family: sans-serif;
-}
-div#nav ul.lang:hover {
-    float: initial;
-    padding-left: 0px;
-}
-div#nav ul.lang li {
-    float: none;
-    padding: 2px;
-}
 /* Alphabet Navigation
 ----------------------------------------------------- */
 div#alphanav {
@@ -264,105 +204,6 @@ div#alphanav ul li a:hover {
    color: white;
 }

-/* Responsive navigation */
-button.navIcon {
-    display: none;
-}
-
-div#header::after {
-    content: "";
-    clear: both;
-    display: table;
-}
-
-div#nav::after {
-    content: "";
-    clear: both;
-    display: table;
-}
-
-@media only screen and (max-width: 1080px) {
-
-    /* Use less & all realestate on mobiles. */
-    div#outerwrapper {
-        margin: 5px auto;
-        width: 100%;
-    }
-
-    .nav {
-        background: none; /* Works in IE too. */
-    }
-
-    /* Undo some of the #nav styles  - to enable the class .nav */
-    .nav ul, #subnavigation ul {
-        list-style: none;
-        min-width: unset;
-        width: 200px;
-        height: 32px;
-        margin: 0;
-        padding: 0;
-    }
-    .nav ul li, #subnavigation ul li {
-        float: unset;
-        display: unset
-    }
-
-    /* Start with hidden menu options */
-    /* .nav li:not(:first-child) {display: none;} */
-    .nav li {display: none;}
-    .nav ul {display: none;}
-
-    button.navIcon {
-        display: block;
-        float: left;
-        font-size:2.9em;
-        line-height: 35px;
-        border: 0px;
-        color: #555;
-        background-color: #EEE;
-    }
-
-    .nav.responsive {position: absolute; display: block; z-index: 100;}
-    .nav.responsive a.icon {
-        position: absolute;
-        right: 0;
-        top: 0;
-        margin-right: 10px;
-    }
-    .nav.responsive li {
-        display: block;
-        text-align: left;
-        background-color: #EEE;
-        /* required by IE */
-        float: left;
-        clear: both;
-        width: 200px;
-    }
-
-    div#nav ul, #subnavigation ul {
-        padding-left: 0px;
-    }
-
-    .content {
-        padding: 0em 0.5em;
-    }
-    .lang {
-        position: relative;
-    }
-    .lang > .lang {
-        top: 0;
-        left: 100%;
-        margin-top: -6px;
-        margin-left: -1px;
-        -webkit-border-radius: 0 6px 6px 6px;
-        -moz-border-radius: 0 6px 6px 6px;
-        border-radius: 0 6px 6px 6px;
-    }
-    .lang:hover > .lang {
-        display: block;
-    }
-}
-
 /* Main Table
 ----------------------------------------------------- */
 table {
@@ -441,41 +282,18 @@ table#SortByCount thead th.ColumnQuantity a:after {
 table.surname td.ColumnName {
    background-color: #EEE;
 }
-table#SortByName tr:hover td.ColumnSurname,
-table#SortByCount tr:hover td.ColumnQuantity {
-    background-color: #DDE;
-}
-table#SortByName tr:hover,
-table#SortByCount tr:hover,
-table#SortByName tr:hover td.ColumnQuantity,
-table#SortByCount tr:hover td.ColumnSurname {
-    background-color: #DDE;
-}
-table.surname tr:hover,
-table.surname tr:hover td.ColumnName {
-    background-color: #DDE;
-}

 /* Individuals
 ----------------------------------------------------- */
 table.IndividualList td.ColumnSurname {
    background-color: #EEE;
 }
-#parents table.infolist tr:hover,
-table.IndividualList tr:hover,
-table.IndividualList tr:hover td.ColumnSurname {
-    background-color: #DDE;
-}

 /* Places
 ----------------------------------------------------- */
 #Places table.infolist td.ColumnName {
    background-color: #EEE;
 }
-#Places table.infolist tr:hover,
-#Places table.infolist tr:hover td.ColumnName {
-    background-color: #DDE;
-}

 /* Events
 ----------------------------------------------------- */
@@ -491,10 +309,6 @@ table.IndividualList tr:hover td.ColumnSurname {
 #EventList td.ColumnPerson a {
    display: inline;
 }
-#EventList table.infolist tr:hover,
-#EventList table.infolist tr:hover td.ColumnType {
-    background-color: #DDE;
-}
 #EventList td.ColumnPerson span.person:after,
 #EventList td.ColumnPerson span.father:after,
 #EventList td.ColumnPerson span.mother:after,
@@ -515,33 +329,10 @@ table.IndividualList tr:hover td.ColumnSurname {
 #EventDetail td.ColumnPerson span.mother:last-child:after {
    content: "";
 }
-table.eventlist tbody tr td:first-child,
-table.eventlist thead tr th:first-child {
-    padding-left: 10px;
-}
+
 table.eventlist tbody tr td.ColumnSources {
    width: 5%;
 }
-table.eventlist tbody tr td.ColumnDate {
-    width: 15%;
-}
-table.eventlist td.ColumnEvent,
-table.eventlist td.ColumnDate,
-table.eventlist td.ColumnPlace {
-    font-weight: bold;
-}
-#attributes table.infolist td.ColumnType {
-    width: 10%;
-    padding-left: 15px;
-}
-#attributes table.infolist td.ColumnSources {
-    width: 5%;
-    padding-left: 5px;
-}
-#WebLinks table.infolist td.ColumnType {
-    width: 10%;
-    padding-left: 15px;
-}

 /* Gallery
 ----------------------------------------------------- */
@@ -575,15 +366,7 @@ table.eventlist td.ColumnPlace {
    margin: 0px auto;
    display: block;
    border: solid 1px #999;
-    height: auto;
 }
-
-@media only screen and (max-width: 1600px) {
-    #GalleryDisplay img {
-        max-width: 100%;
-    }
-}
-
 #GalleryDetail h3 {
    text-align: center;
 }
@@ -593,10 +376,6 @@ table.eventlist td.ColumnPlace {
 div#SourceDetail {
    margin: 0 auto;
 }
-#Sources table.infolist tr:hover,
-#Sources table.infolist tr:hover td.ColumnType {
-    background-color: #DDE;
-}

 /* Contact
 ----------------------------------------------------- */
@@ -604,10 +383,13 @@ div#SourceDetail {
    overflow: hidden;
 }
 #Contact #summaryarea {
+    width: 50em;
+    margin: 2em auto;
+    padding: 3em;
    background-color: #EEE;
    border: solid 1px #999;
 }
-#Contact #GalleryDisplay img {
+#Contact img {
    float: right;
    border: solid 1px #999;
 }
@@ -621,12 +403,6 @@ div#SourceDetail {
 #Contact #city:after {
    content: ",";
 }
-@media only screen and (max-width: 1080px) {
-    #Contact,
-    #Contact #GalleryDisplay img {
-        max-width: 100%;
-    }
-}

 /* Download
 ----------------------------------------------------- */
@@ -636,31 +412,20 @@ div#SourceDetail {

 /* Subsection
 ----------------------------------------------------- */
-#Home #GalleryDisplay, #Introduction #GalleryDisplay,
-                       #Contact #GalleryDisplay {
+#Home, #Introduction {
+    overflow: hidden;
+}
+#Home img, #Introduction img {
    float: right;
    margin: 1em;
-}
-#Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
-                       #Contact #GalleryDisplay img {
-    display: block;
    max-width: 950px;
-    height: auto;
-    float: right;
-}
-@media only screen and (max-width: 1080px) {
-    #Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
-          #Contact #GalleryDisplay img {
-        margin: 0 auto;
-        max-width: 100%;
-    }
 }
 #Home p, #Introduction p {
    padding-left: 15px;
 }
 .subsection {
    clear: both;
-    overflow-x: auto;
+    overflow: visible;
 }
 .subsection p {
    margin: 0px;
@@ -668,73 +433,28 @@ div#SourceDetail {

 /* Subsection : Families
 ----------------------------------------------------- */
-#families table.infolist td.ColumnValue.Child table.infolist tr:hover,
-table.relationships tr:hover {
-    background-color: #DDE;
-}
-div.content table.tags {
-    text-align: left;
-    width: auto;
-}
-
 div#families table.fixed_subtables table.eventlist {
    table-layout: fixed;
 }
 div#families table.fixed_subtables table.eventlist th:first-child {
    width: 9em;
 }
-div#families table.fixed_subtables table.eventlist th.ColumnDate {
-    width: 12%;
-}
-div#families table.fixed_subtables table.eventlist th.ColumnSources {
+div#families table.fixed_subtables table.eventlist th:last-child {
    width: 5em;
 }
 div#families table.attrlist td.ColumnType {
    color: black;
 }
-div#families table.fixed_subtables .Child table.eventlist .ColumnName {
-    width: 60%;
-}
-div#families table.fixed_subtables .Child table.eventlist .ColumnDate {
-    width: 20%;
-}

 /* Subsection : Gallery
 ----------------------------------------------------- */
-#gallery {
-    background-color: green;
-}
-#indivgallery {
-    background-color: white;
-}
-#indivgallery a {
-    color: black;
-    text-decoration: none;
-    word-wrap: break-word;
-    display: block;
-}
-#gallery .gallerycell {
-    float: left;
-    width: 130px;
-    height: 150px;
-    text-align: center;
-    margin: 0;
-    background-color: white;
-    border-top: solid 1px #999;
-    border-right: solid 1px #999;
-}
-#gallery .thumbnail {
-    font-size: smaller;
-    margin: 3em auto;
-}
 #indivgallery .thumbnail {
    float: left;
-    width: 160px;
-    height: 220px;
+    max-width: 130px;
+    max-height: 150px;
    font-size: smaller;
    text-align: center;
    margin: 0.8em 0.5em;
-    background-color: white;
 }
 #indivgallery h4 + .thumbnail {
    margin-left: 15px;
@@ -742,39 +462,6 @@ div#families table.fixed_subtables .Child table.eventlist .ColumnDate {
     *          first thumnail on each next row should also have a margin-left
     *          of 15 px. */
 }
-#gallery div.indexno {
-    float: right;
-    font-size: large;
-    text-align: center;
-    background-color: #CCC;
-    color: #555;
-    margin: 0;
-}
-#indivgallery div.date {
-    float: right;
-    width: 1.8em;
-    font-size: large;
-    text-align: center;
-    background-color: #CCC;
-    color: #555;
-}
-#indivgallery .thumbnail ul {
-    font-size: smaller;
-    list-style: none;
-    padding: 0px;
-}
-#indivgallery .thumbnail ul li:first-child {
-    border-style: none;
-}
-#indivgallery .thumbnail ul li {
-    border-top: dashed 1px #CCC;
-    border-top-style: dashed;
-    padding-top: 0.5em;
-    padding-bottom: 0.5em;
-}
-#gallery img {
-    border: solid 1px #999;
-}
 #indivgallery img {
    border: solid 1px #999;
 }
@@ -782,32 +469,17 @@ div#families table.fixed_subtables .Child table.eventlist .ColumnDate {
 /* ## remove this line and the comment markers from the line below to hide description in Indivifual Gallery
    display: none; */
 }
-div.snapshot div.thumbnail {
-    text-align: center;
-}

 /* Subsection : Narrative
 ----------------------------------------------------- */
 h4 + div.grampsstylednote, a.familymap {
    margin: 1em 15px;
 }
-i.NoteType {
-    font-weight: bold;
-    font-size: .8em;
-}
 i + div.grampsstylednote p {
    margin: 0 0 0.3em 0;
 }
 div.grampsstylednote p {
-    padding-bottom: 0.6em;
-}
-div.grampsstylednote a {
-    text-decoration: underline;
-    font-weight: bold;
-    color: #555;
-}
-div.grampsstylednote a:visited {
-    color: red;
+    margin-bottom: 0.5em;
 }

 /* Subsection : Family Map
@@ -815,46 +487,11 @@ div.grampsstylednote a:visited {
 a.familymap {
    display: block;
 }
-a.family_map {
-    margin-left: 15px;
-}
-
-/* Subsection : References
----------------------------------------------------- */
-#references ol {
-    margin-left: 2em;
-}

 /* Subsection : Source References
 ----------------------------------------------------- */
-#sourcerefs ol#srcr {
-    counter-reset: itema;
-    list-style-type: none;
-    display: block;
-    margin-top: .1em;
-}
-#sourcerefs ol#citr {
-    counter-reset: itemb;
-    list-style-type: none;
-}
-#sourcerefs ol#srcr > li::before {
-    content: counter(itema);
-}
-#sourcerefs ol#citr > li::before {
-    content: counter(itema)counter(itemb, lower-alpha);
-}
-#sourcerefs ol#srcr > li {
-    counter-increment: itema;
-    margin-top: .1em;
-}
-#sourcerefs ol#citr > li {
-    counter-increment: itemb;
-    margin-top: .1em;
-}
-#sourcerefs ol#citr ul {
-    list-style: none;
-    display: inline-block;
-    vertical-align: top;
+#sourcerefs ol li ol {
+    list-style-type: lower-alpha;
 }

 /* Subsection : Pedigree
@@ -895,7 +532,6 @@ a.family_map {
 }
 #footer > * {
    background-color: #EEE;
-    font-size: 80%;
 }
 #footer p#createdate {
    float: left;
@@ -911,16 +547,10 @@ a.family_map {
    padding-right: 15px;
 }

-/* Updates
----------------------------------------------------- */
-#Updates table.list td.date {
-    width: 20%;
-}
-
 /* Overwritten
 ----------------------------------------------------- */
 body#FamilyMap {
-    background-color: #EEE !important;
+    background-color: #EEE ! important;
 }

 /* Calendar Styles
@@ -939,12 +569,16 @@ table.calendar {
    background-color: white;
    border-bottom-style: none;
    padding-top: 1em;
-    vertical-align: top;
-    height: 2em;
 }
 .calendar thead th abbr {
    border-bottom-style: none;
 }
+#CreatorInfo {
+    float: right;
+    margin: -1em 15px 0px 0px;
+    font-weight: bold;
+    color: #999;
+}
 .calendar tfoot tr td {
    border-top: solid 4px #999;
    vertical-align: middle;
@@ -953,6 +587,7 @@ table.calendar {
 /* Calendar : Date Numeral */
 .calendar div.date {
    float: right;
+    width: 1.8em;
    font-size: large;
    text-align: center;
    background-color: #CCC;
@@ -961,7 +596,7 @@ table.calendar {

 /* Calendar : Date Container */
 .calendar td {
-    padding: 0px 5px 0px 1ex;
+    padding: 0px 0px 0px 1ex;
    border-width: 1px 0px 0px 1px;
    border-style: solid;
    border-color: #CCC;
@@ -969,7 +604,7 @@ table.calendar {
 }
 .calendar td:first-child {
    border-left-style: none;
-    padding: 0px 5px 0px 1ex;
+    padding: 0px 0px 0px 1ex;
 }
 .calendar tbody tr:first-child td {
    border-top-style: none;
@@ -1013,6 +648,8 @@ body#fullyearlinked div.content {
    overflow: hidden;
 }
 body#fullyearlinked table.calendar {
+    float: left;
+    width: 33.3%;
    height: 18em;
    border: solid 1px black;
 }
@@ -1029,88 +666,3 @@ body#fullyearlinked table.calendar tbody td {
 body#OneDay div.content {
    overflow: hidden;
 }
-body#OneDay h3 {
-    font-size: xx-large;
-    vertical-align: top;
-    height: 2em;
-}
-#WebCal table.calendar tfoot {
-    display: none;
-}
-#WebCal table.calendar tr td {
-    word-wrap: break-word;
-    padding: 2px;
-}
-#WebCal .calendar tr td .empty {
-    border: 5px solid rgba(255,255,255,.0);
-}
-#WebCal .calendar tr td .clickable {
-    border: 5px solid rgba(255,255,255,.0);
-}
-#WebCal .calendar tr td .clickable:hover {
-    display: block;
-    overflow:auto;
-    word-wrap: break-word;
-    cursor: text;
-    border-radius: 10px 0px 10px 10px;
-    border: 5px solid #555;
-    padding: 0px;
-}
-body#fullyearlinked #YearGlance tbody td {
-    height:48px;
-    vertical-align: middle;
-    text-align: center;
-    padding-left: 6px;
-}
-body#fullyearlinked #YearGlance tbody td .date {
-    font-size: 30px;
-    vertical-align: middle;
-    text-align: center;
-    border-radius: 45px;
-    float: none;
-    border: 5px solid rgba(0,0,0,.0);
-}
-body#fullyearlinked #YearGlance tbody td:hover .date {
-    border-radius: 45px;
-    border: 5px solid;
-}
-h4 button.icon {
-    width: 0.9em;
-    border: 0px solid;
-    padding: 0;
-    opacity: 1;
-    transform: rotate(90deg);
-    transition: transform 200ms ease-out 0s;
-    background: transparent;
-}
-h4 button.icon-close {
-    transform: rotate(90deg);
-    transition: transform 0.2s linear;
-}
-h4 button.icon-open {
-    transform: rotate(180deg);
-    transition: transform 0.2s linear;
-}
-svg {
-  fill: black;
-}
-/* Go to the top of the page */
-#gototop {
-  display: none;
-  position: fixed;
-  bottom: 10px;
-  right: 20px;
-  z-index: 999;
-  border: none;
-  background-color: transparent;
-  color: black;
-  cursor: pointer;
-  border-radius: 4px;
-  width: 40px;
-  height: 40px;
-  padding: 0px;
-}
-
-#gototop:hover {
-  background-color: #CCC;
-}
@@ -1,15 +1,14 @@
 /*
-*******************************************************************************
+**************************************************************************************************
 Copyright Holder and License
-*******************************************************************************
+**************************************************************************************************
 GRAMPS Cascading Style Sheet
 Style Name: Basic - Cypress
 Style Author: Jason Simanek (2008)
-Note: Adapted from GRAMPS original Modern Style stylesheet with colors from the
-      original 'Tranquil' stylesheet
-*******************************************************************************
+Note: Adapted from GRAMPS original Modern Style stylesheet with colors from the original 'Tranquil' stylesheet
+**************************************************************************************************
 This website was created with GRAMPS <http://www.gramps-project.org/>
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
 GRAMPS is a Free Software Project for Genealogy, offering a professional

 genealogy program, and a wiki open to all. It is a community project, created,
@@ -17,13 +16,11 @@ developed and governed by genealogists.

 Go to <http://gramps-project.org/> to learn more!

-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
 Copyright 2008 Jason M. Simanek
 Copyright 2009 Stephane Charette
 Copyright (C) 2008-2011 Rob G. Healey <robhealey1@gmail.com>
 Copyright 2011 Michiel D. Nauta
-Copyright 2018 Theo van Rijn
-Copyright (C) 2019      Serge Noiraud

 This file is part of the GRAMPS program.

@@ -37,10 +34,10 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.

 You should have received a copy of the GNU General Public License along with
 GRAMPS. If not, see <http://www.gnu.org/licenses/>.
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------

 Color Palette
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------

 black                   #000
 slate dark              #454
@@ -48,21 +45,21 @@ slate                   #7C8F7C
 slate light             #9DBF9D
 slate very light        #E0E6E0
 white                   #FFF
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
 Characteristic of this style is that it uses the full width of the browser
 window and that horizontal highlighting bars extend over the full width of
 the page.
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------

 NarrativeWeb Styles
-------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------ 

 General Elements
 ----------------------------------------------------- */

 body {
    font-family: sans-serif;
-    font-size: 100%;
+    font-size: 90%;
    color: black;
    margin: 0px;
    background-color: #454;
@@ -70,13 +67,6 @@ body {
 body > div {
    clear: both;
 }
-#outerwrapper {
-    margin: 5px auto;
-    width: 98%;
-}
-#outerwrapper > div {
-    clear: both;
-}
 .content {
    background-color: white;
    border-top: solid 1px #7C8F7C;
@@ -85,29 +75,9 @@ body > div {
    float: right;
    margin: 2em;
 }
-#ThumbnailPreview div.snapshot {
-    float: right;
-    margin: 0;
-}
 .fullclear {
    clear: both;
 }
-/* Less whitespace on smaller real estate. */
-@media only screen and (max-width: 1080px) {
-    .content {
-        padding: 0em 0.5em;
-    }
-    body#fullyearlinked table.calendar {
-        float: none;
-        width: 100%;
-    }
-}
-@media only screen and (width > 1080px) {
-    body#fullyearlinked table.calendar {
-        float: left;
-        width: 33.3%;
-    }
-}

 /* General Text
 ----------------------------------------------------- */
@@ -139,7 +109,6 @@ p#description {
 a {
    color: black;
    text-decoration: none;
-    word-wrap: break-word;
 }
 a[href]:hover, a[href]:active {
    background-color: #9DBF9D;
@@ -163,7 +132,6 @@ a[href]:hover, a[href]:active {
 ----------------------------------------------------- */
 div#nav, #subnavigation {
    border: solid 1px #454; /* needed by IE7 */
-    position: relative;
 }
 #subnavigation ul {
    overflow: hidden;
@@ -204,36 +172,6 @@ div#nav ul li.CurrentSection a {
    color: #454;
    background-color: white;
 }
-div#nav li.lang {
-    color: #E0E6E0;
-    font-size: smaller;
-    font-family: sans-serif;
-    padding-top: .3em;
-    padding-bottom: .3em;
-    font-weight: bold;
-}
-div#nav li.lang:hover > ul {
-    visibility: visible;
-    opacity: 1;
-}
-div#nav ul.lang {
-    position: absolute;
-    visibility: hidden;
-    opacity: 0;
-    z-index: 999;
-    padding: 0px;
-    background-color: #454;
-    top: -1em;
-    font-size: larger;
-    font-family: sans-serif;
-}
-div#nav ul.lang:hover {
-    float: initial;
-}
-div#nav ul.lang li {
-    float: none;
-    padding: 1px 2px;
-}
 /* Alphabet Navigation
 ----------------------------------------------------- */
 div#alphanav {
@@ -270,110 +208,6 @@ div#alphanav ul li a:hover {
    color: white;
 }

-/* Responsive navigation */
-button.navIcon {
-    display: none;
-}
-
-div#header::after {
-    content: "";
-    clear: both;
-    display: table;
-}
-
-div#nav::after {
-    content: "";
-    clear: both;
-    display: table;
-}
-
-@media only screen and (max-width: 1080px) {
-
-    /* Use less & all realestate on mobiles. */
-    div#outerwrapper {
-        margin: 5px auto;
-        width: 100%;
-    }
-
-    .nav {
-        background: none; /* Works in IE too. */
-    }
-
-    /* Undo some of the #nav styles  - to enable the class .nav */
-    .nav ul, #subnavigation ul {
-        list-style: none;
-        min-width: unset;
-        width: 200px;
-        height: 32px;
-        margin: 0;
-        padding: 0;
-    }
-    .nav ul li, #subnavigation ul li {
-        float: unset;
-        display: unset
-    }
-
-    /* Start with hidden menu options */
-    /* .nav li:not(:first-child) {display: none;} */
-    .nav li {display: none;}
-    .nav ul {display: none;}
-
-    button.navIcon {
-        display: block;
-        float: left;
-        font-size:2.9em;
-        line-height: 35px;
-        border: 0px;
-        color: #E0E6E0;
-        background-color: #454;
-    }
-
-    .nav.responsive {position: absolute; display: block; z-index: 100;}
-    .nav.responsive a.icon {
-        position: absolute;
-        right: 0;
-        top: 0;
-        margin-right: 10px;
-    }
-    .nav.responsive li {
-        display: block;
-        text-align: left;
-        color: #454;
-        background-color: #454;
-        /* required by IE */
-        float: left;
-        clear: both;
-        width: 200px;
-    }
-    .nav.responsive li#CurrentSection a {
-        color: #454;
-        background-color: white;
-    }
-
-    div#nav ul, #subnavigation ul {
-        padding-left: 0px;
-    }
-
-    .content {
-        padding: 0em 0.5em;
-    }
-    .lang {
-        position: relative;
-    }
-    .lang > .lang {
-        top: 0;
-        left: 100%;
-        margin-top: -6px;
-        margin-left: -1px;
-        -webkit-border-radius: 0 6px 6px 6px;
-        -moz-border-radius: 0 6px 6px 6px;
-        border-radius: 0 6px 6px 6px;
-    }
-    .lang:hover > .lang {
-        display: block;
-    }
-}
-
 /* Main Table
 ----------------------------------------------------- */
 table {
@@ -423,6 +257,9 @@ td.ColumnLetter, td.ColumnRowLabel {
 td.ColumnEvent, td.ColumnDate {
    white-space: nowrap;
 }
+td.ColumnPlace, td.ColumnDescription {
+    width: 20%
+}
 /* end of customizations by Stephane */
 td.ColumnBirth, td.ColumnDeath, td.ColumnPartner, td.ColumnParents {
    font-size: 90%;
@@ -481,31 +318,12 @@ table.surname td.ColumnName {
 table.surname td.ColumnName > a {
    padding-left: 15px;
 }
-table#SortByName tr:hover td.ColumnSurname,
-table#SortByCount tr:hover td.ColumnQuantity {
-    background-color: #9DBF9D;
-}
-table#SortByName tr:hover,
-table#SortByCount tr:hover,
-table#SortByName tr:hover td.ColumnQuantity,
-table#SortByCount tr:hover td.ColumnSurname {
-    background-color: #9DBF9D;
-}
-table.surname tr:hover,
-table.surname tr:hover td.ColumnName {
-    background-color: #9DBF9D;
-}

 /* Individuals
 ----------------------------------------------------- */
 table.IndividualList td.ColumnSurname {
    background-color: #E0E6E0;
 }
-#parents table.infolist tr:hover,
-table.IndividualList tr:hover,
-table.IndividualList tr:hover td.ColumnSurname {
-    background-color: #9DBF9D;
-}

 /* Places
 ----------------------------------------------------- */
@@ -519,10 +337,6 @@ table.IndividualList tr:hover td.ColumnSurname {
 #Places table.infolist td.ColumnName > a {
    padding-left: 1ex;
 }
-#Places table.infolist tr:hover,
-#Places table.infolist tr:hover td.ColumnName {
-    background-color: #9DBF9D;
-}

 /* Events
 ----------------------------------------------------- */
@@ -538,10 +352,6 @@ table.IndividualList tr:hover td.ColumnSurname {
 #EventList td.ColumnPerson a {
    display: inline;
 }
-#EventList table.infolist tr:hover,
-#EventList table.infolist tr:hover td.ColumnType {
-    background-color: #9DBF9D;
-}
 #EventList td.ColumnPerson span.person:after,
 #EventList td.ColumnPerson span.father:after,
 #EventList td.ColumnPerson span.mother:after,
@@ -562,49 +372,10 @@ table.IndividualList tr:hover td.ColumnSurname {
 #EventDetail td.ColumnPerson span.mother:last-child:after {
    content: "";
 }
-table.eventlist tbody tr td:first-child,
-table.eventlist thead tr th:first-child {
-    padding-left: 15px;
-}
-#attributes table.infolist td.ColumnType {
-    width: 10%;
-    padding-left: 15px;
-}
-#attributes table.infolist td.ColumnValue {
-    width: 15%;
-}
-#attributes table.infolist td.ColumnSources {
-    width: 5%;
-    padding-left: 5px;
-}
-#WebLinks table.infolist td.ColumnType {
-    width: 10%;
-    padding-left: 15px;
-}
-#events table.eventlist td.ColumnDate {
-    padding-left: 15px;
-}
-#families table.eventlist tbody tr td:first-child,
-#families table.eventlist thead tr th:first-child {
-    width: 10%;
-    padding-left: 0px;
-}
-#families table.eventlist tbody tr td.ColumnDate,
-#families table.eventlist tbody tr td.ColumnNotes {
-    padding-left: 15px;
-}
+
 table.eventlist tbody tr td.ColumnSources {
    width: 5%;
 }
-table.eventlist th.ColumnDate {
-    padding-left: 15px;
-    width: 15%;
-}
-table.eventlist td.ColumnEvent,
-table.eventlist td.ColumnDate,
-table.eventlist td.ColumnPlace {
-    font-weight: bold;
-}

 /* Gallery
 ----------------------------------------------------- */
@@ -641,15 +412,7 @@ table.eventlist td.ColumnPlace {
    margin: 0px auto;
    display: block;
    border: solid 1px #7C8F7C;
-    height: auto;
 }
-
-@media only screen and (max-width: 1600px) {
-    #GalleryDisplay img {
-        max-width: 100%;
-    }
-}
-
 #GalleryDetail h3 {
    text-align: center;
 }
@@ -659,10 +422,6 @@ table.eventlist td.ColumnPlace {
 div#SourceDetail {
    margin: 0 auto;
 }
-#Sources table.infolist tr:hover,
-#Sources table.infolist tr:hover td.ColumnType {
-    background-color: #9DBF9D;
-}

 /* Contact
 ----------------------------------------------------- */
@@ -670,10 +429,13 @@ div#SourceDetail {
    overflow: hidden;
 }
 #Contact #summaryarea {
+    width: 40em;
+    margin: 2em auto;
+    padding: 3em;
    background-color: #E0E6E0;
    border: solid 1px #7C8F7C;
 }
-#Contact #summaryarea #GalleryDisplay img {
+#Contact img {
    float: right;
    border: solid 1px #7C8F7C;
 }
@@ -700,31 +462,20 @@ div#SourceDetail {

 /* Subsection
 ----------------------------------------------------- */
-#Home #GalleryDisplay, #Introduction #GalleryDisplay, #Contact #GalleryDisplay {
-    float: right;
-    margin: 0;
-    border: 0px;
+#Home, #Introduction {
+    overflow: hidden;
 }
-#Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
-      #Contact #GalleryDisplay img {
-    display: block;
+#Home img, #Introduction img {
+    float: right;
+    margin: 1em;
    max-width: 950px;
-    height: auto;
-    float: right;
-}
-@media only screen and (max-width: 1080px) {
-    #Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
-          #Contact #GalleryDisplay img {
-        margin: 0 auto;
-        max-width: 100%;
-    }
 }
 #Home p, #Introduction p {
    padding-left: 15px;
 }
 .subsection {
    clear: both;
-    overflow-x: auto;
+    overflow: visible;
 }
 .subsection p {
    margin: 0px;
@@ -732,14 +483,6 @@ div#SourceDetail {

 /* Subsection : Families
 ----------------------------------------------------- */
-#families table.infolist td.ColumnValue.Child table.infolist tr:hover,
-table.relationships tr:hover {
-    background-color: #9DBF9D;
-}
-div.content table.tags {
-    text-align: left;
-    width: auto;
-}
 div#families table.fixed_subtables table.eventlist {
    table-layout: fixed;
 }
@@ -755,40 +498,13 @@ div#families table.attrlist td.ColumnType {

 /* Subsection : Gallery
 ----------------------------------------------------- */
-#gallery {
-    background-color: green;
-}
-#indivgallery {
-    background-color: white;
-}
-#indivgallery a {
-    color: black;
-    text-decoration: none;
-    word-wrap: break-word;
-    display: block;
-}
-#gallery .gallerycell {
-    float: left;
-    width: 130px;
-    height: 150px;
-    text-align: center;
-    margin: 0;
-    background-color: white;
-    border-top: solid 1px #999;
-    border-right: solid 1px #999;
-}
-#gallery .thumbnail {
-    font-size: smaller;
-    margin: 3em auto;
-}
 #indivgallery .thumbnail {
    float: left;
-    width: 160px;
-    height: 220px;
+    max-width: 130px;
+    max-height: 150px;
    font-size: smaller;
    text-align: center;
    margin: 0.8em 0.5em;
-    background-color: white;
 }
 #indivgallery h4 + .thumbnail {
    margin-left: 15px;
@@ -796,39 +512,6 @@ div#families table.attrlist td.ColumnType {
     *          first thumnail on each next row should also have a margin-left
     *          of 15 px. */
 }
-#gallery div.indexno {
-    float: right;
-    font-size: large;
-    text-align: center;
-    background-color: #CCC;
-    color: #555;
-    margin: 0;
-}
-#indivgallery div.date {
-    float: right;
-    width: 1.8em;
-    font-size: large;
-    text-align: center;
-    background-color: #CCC;
-    color: #555;
-}
-#indivgallery .thumbnail ul {
-    font-size: smaller;
-    list-style: none;
-    padding: 0px;
-}
-#indivgallery .thumbnail ul li:first-child {
-    border-style: none;
-}
-#indivgallery .thumbnail ul li {
-    border-top: dashed 1px #CCC;
-    border-top-style: dashed;
-    padding-top: 0.5em;
-    padding-bottom: 0.5em;
-}
-#gallery img {
-    border: solid 1px #999;
-}
 #indivgallery img {
    border: solid 1px #7C8F7C;
 }
@@ -836,38 +519,17 @@ div#families table.attrlist td.ColumnType {
 /* ## remove this line and the comment markers from the line below to hide description in Indivifual Gallery
    display: none; */
 }
-div.snapshot div.thumbnail {
-    text-align: center;
-}

 /* Subsection : Narrative
 ----------------------------------------------------- */
 h4 + div.grampsstylednote, a.familymap {
    margin: 1em 15px;
 }
-i.NoteType {
-    font-weight: bold;
-    font-size: .8em;
-}
 i + div.grampsstylednote p {
    margin: 0 0 0.3em 0;
 }
 div.grampsstylednote p {
-    padding-bottom: 0.6em;
-}
-div.grampsstylednote a {
-    text-decoration: underline;
-    font-weight: bold;
-    color: #9DBF9D;
-}
-div.grampsstylednote a:visited {
-    color: red;
-}
-
-/* Subsection : References
----------------------------------------------------- */
-#references ol {
-    margin-left: 2em;
+    margin-bottom: 0.5em;
 }

 /* Subsection : Family Map
@@ -875,40 +537,11 @@ div.grampsstylednote a:visited {
 a.familymap {
    display: block;
 }
-a.family_map {
-    margin-left: 15px;
-}

 /* Subsection : Source References
 ----------------------------------------------------- */
-#sourcerefs ol#srcr {
-    counter-reset: itema;
-    list-style-type: none;
-    display: block;
-    margin-top: .1em;
-}
-#sourcerefs ol#citr {
-    counter-reset: itemb;
-    list-style-type: none;
-}
-#sourcerefs ol#srcr > li::before {
-    content: counter(itema);
-}
-#sourcerefs ol#citr > li::before {
-    content: counter(itema)counter(itemb, lower-alpha);
-}
-#sourcerefs ol#srcr > li {
-    counter-increment: itema;
-    margin-top: .1em;
-}
-#sourcerefs ol#citr > li {
-    counter-increment: itemb;
-    margin-top: .1em;
-}
-#sourcerefs ol#citr ul {
-    list-style: none;
-    display: inline-block;
-    vertical-align: top;
+#sourcerefs ol li ol {
+    list-style-type: lower-alpha;
 }

 /* Subsection : Pedigree
@@ -944,7 +577,6 @@ a.family_map {
 #footer {
    clear: both;
    color: #E0E6E0;
-    font-size: 80%;
    padding-top: 1em;
    background-color: #9DBF9D;
    border-top: solid 1px #454;
@@ -969,16 +601,10 @@ a.family_map {
    padding-right: 15px;
 }

-/* Updates
----------------------------------------------------- */
-#Updates table.list td.date {
-    width: 20%;
-}
-
 /* Overwritten
 ----------------------------------------------------- */
 body#FamilyMap {
-    background-color: #454 !important;
+    background-color: #E0E6E0 ! important;
 }

 /* Calendar Styles
@@ -997,12 +623,16 @@ table.calendar {
    background-color: white;
    border-bottom-style: none;
    padding-top: 1em;
-    vertical-align: top;
-    height: 2em;
 }
 .calendar thead th abbr {
    border-bottom-style: none;
 }
+#CreatorInfo {
+    float: right;
+    margin: -1em 15px 0px 0px;
+    font-weight: bold;
+    color: #7C8F7C;
+}
 .calendar tfoot tr td {
    border-top: solid 4px #7C8F7C;
    vertical-align: middle;
@@ -1020,7 +650,7 @@ table.calendar {

 /* Calendar : Date Container */
 .calendar td {
-    padding: 0px 5px 0px 1ex;
+    padding: 0px 0px 0px 1ex;
    border-width: 1px 0px 0px 1px;
    border-style: solid;
    border-color: #9DBF9D;
@@ -1028,7 +658,7 @@ table.calendar {
 }
 .calendar td:first-child {
    border-left-style: none;
-    padding: 0px 5px 0px 1ex;
+    padding: 0px 0px 0px 1ex;
 }
 .calendar tbody tr:first-child td {
    border-top-style: none;
@@ -1076,6 +706,8 @@ body#fullyearlinked div.content {
    overflow: hidden;
 }
 body#fullyearlinked table.calendar {
+    float: left;
+    width: 33.3%;
    height: 18em;
    border: solid 1px black;
 }
@@ -1092,87 +724,3 @@ body#fullyearlinked table.calendar tbody td {
 body#OneDay div.content {
    overflow: hidden;
 }
-body#OneDay h3 {
-    font-size: xx-large;
-    vertical-align: top;
-    height: 2em;
-}
-#WebCal table.calendar tfoot {
-    display: none;
-}
-#WebCal table.calendar tr td {
-    word-wrap: break-word;
-    padding: 2px;
-}
-#WebCal .calendar tr td .empty {
-    border: 5px solid rgba(255,255,255,.0);
-}
-#WebCal .calendar tr td .clickable {
-    border: 5px solid rgba(255,255,255,.0);
-}
-#WebCal .calendar tr td .clickable:hover {
-    display: block;
-    overflow:auto;
-    word-wrap: break-word;
-    cursor: text;
-    border-radius: 10px 0px 10px 10px;
-    border: 5px solid #454;
-}
-body#fullyearlinked #YearGlance tbody td {
-    height:48px;
-    vertical-align: middle;
-    text-align: center;
-    padding-left: 6px;
-}
-body#fullyearlinked #YearGlance tbody td .date {
-    font-size: 30px;
-    vertical-align: middle;
-    text-align: center;
-    border-radius: 45px;
-    float: none;
-    border: 5px solid rgba(0,0,0,.0);
-}
-body#fullyearlinked #YearGlance tbody td:hover .date {
-    border-radius: 45px;
-    border: 5px solid;
-}
-h4 button.icon {
-    width: 0.9em;
-    border: 0px solid;
-    padding: 0;
-    opacity: 1;
-    transform: rotate(90deg);
-    transition: transform 200ms ease-out 0s;
-    background: transparent;
-}
-h4 button.icon-close {
-    transform: rotate(90deg);
-    transition: transform 0.2s linear;
-}
-h4 button.icon-open {
-    transform: rotate(180deg);
-    transition: transform 0.2s linear;
-}
-svg {
-  fill: #9DBF9D;
-}
-/* Go to the top of the page */
-#gototop {
-  display: none;
-  position: fixed;
-  bottom: 10px;
-  right: 20px;
-  z-index: 999;
-  border: none;
-  background-color: white;
-  color: black;
-  cursor: pointer;
-  border-radius: 4px;
-  width: 40px;
-  height: 40px;
-  padding: 0px;
-}
-
-#gototop:hover {
-  background-color: #E0E6E0;
-}
@@ -1,15 +1,14 @@
 /*
-*******************************************************************************
+**************************************************************************************************
 Copyright Holder and License
-*******************************************************************************
+**************************************************************************************************
 GRAMPS Cascading Style Sheet
 Style Name: Basic - Lilac
 Style Author: Jason M. Simanek (2008)
-Note: Adapted from GRAMPS original Modern Style stylesheet with colors from the
-      original 'Business' stylesheet
-*******************************************************************************
+Note: Adapted from GRAMPS original Modern Style stylesheet with colors from the original 'Business' stylesheet
+**************************************************************************************************
 This website was created with GRAMPS <http://www.gramps-project.org/>
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
 GRAMPS is a Free Software Project for Genealogy, offering a professional

 genealogy program, and a wiki open to all. It is a community project, created,
@@ -17,13 +16,11 @@ developed and governed by genealogists.

 Go to <http://gramps-project.org/> to learn more!

-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
 Copyright 2008 Jason M. Simanek
 Copyright 2009 Stephane Charette
 Copyright (C) 2008-2011 Rob G. Healey <robhealey1@gmail.com>
 Copyright 2011 Michiel D. Nauta
-Copyright 2018 Theo van Rijn
-Copyright (C) 2019      Serge Noiraud

 This file is part of the GRAMPS program.

@@ -37,10 +34,10 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.

 You should have received a copy of the GNU General Public License along with
 GRAMPS. If not, see <http://www.gnu.org/licenses/>.
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------

 Color Palette
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------

 black                   #000
 lilac dark              #2E2E61
@@ -48,14 +45,14 @@ lilac                   #669
 lilac light             #B4B4CB
 lilac very light        #E0E0E9
 white                   #FAFAFF
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
 Characteristic of this style is that it uses the full width of the browser
 window and that horizontal highlighting bars extend over the full width of
 the page.
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------

 NarrativeWeb Styles
-------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------ 

 General Elements
 ----------------------------------------------------- */
@@ -70,13 +67,6 @@ body {
 body > div {
    clear: both;
 }
-#outerwrapper {
-    margin: 5px auto;
-    width: 98%;
-}
-#outerwrapper > div {
-    clear: both;
-}
 .content {
    background-color: #FAFAFF;
    border-top: solid 1px #669;
@@ -85,29 +75,9 @@ body > div {
    float: right;
    margin: 2em;
 }
-#ThumbnailPreview div.snapshot {
-    float: right;
-    margin: 0;
-}
 .fullclear {
    clear: both;
 }
-/* Less whitespace on smaller real estate. */
-@media only screen and (max-width: 1080px) {
-    .content {
-        padding: 0em 0.5em;
-    }
-    body#fullyearlinked table.calendar {
-        float: none;
-        width: 100%;
-    }
-}
-@media only screen and (width > 1080px) {
-    body#fullyearlinked table.calendar {
-        float: left;
-        width: 33.3%;
-    }
-}

 /* General Text
 ----------------------------------------------------- */
@@ -140,7 +110,6 @@ p#description {
 a {
    color: black;
    text-decoration: none;
-    word-wrap: break-word;
 }
 a[href]:hover, a[href]:active {
    background-color: #E0E0E9
@@ -164,7 +133,6 @@ a[href]:hover, a[href]:active {
 ----------------------------------------------------- */
 div#nav, #subnavigation {
    border: solid 1px #E0E0E9; /* needed by IE7 */
-    position: relative;
 }
 #subnavigation ul {
    overflow: hidden;
@@ -202,35 +170,6 @@ div#nav ul li.CurrentSection a {
 #subnavigation ul li.CurrentSection a {
    background-color: #FAFAFF;
 }
-div#nav li.lang {
-    font-size: smaller;
-    font-family: sans-serif;
-    padding-top: .3em;
-    padding-bottom: .3em;
-    font-weight: bold;
-}
-div#nav li.lang:hover > ul {
-    visibility: visible;
-    opacity: 1;
-}
-div#nav ul.lang {
-    position: absolute;
-    visibility: hidden;
-    opacity: 0;
-    z-index: 999;
-    padding: 2px;
-    background-color: #E0E0E9;
-    top: -1em;
-    font-size: larger;
-    font-family: sans-serif;
-}
-div#nav ul.lang:hover {
-    float: initial;
-}
-div#nav ul.lang li {
-    float: none;
-    padding: 1px 2px;
-}

 /* Alphabet Navigation
 ----------------------------------------------------- */
@@ -267,105 +206,6 @@ div#alphanav ul li a:hover {
    color: #FAFAFF;
 }

-/* Responsive navigation */
-button.navIcon {
-    display: none;
-}
-
-div#header::after {
-    content: "";
-    clear: both;
-    display: table;
-}
-
-div#nav::after {
-    content: "";
-    clear: both;
-    display: table;
-}
-
-@media only screen and (max-width: 1080px) {
-
-    /* Use less & all realestate on mobiles. */
-    div#outerwrapper {
-        margin: 5px auto;
-        width: 100%;
-    }
-
-    .nav {
-        background: none; /* Works in IE too. */
-    }
-
-    /* Undo some of the #nav styles  - to enable the class .nav */
-    .nav ul, #subnavigation ul {
-        list-style: none;
-        min-width: unset;
-        width: 200px;
-        height: 32px;
-        margin: 0;
-        padding: 0;
-    }
-    .nav ul li, #subnavigation ul li {
-        float: unset;
-        display: unset
-    }
-
-    /* Start with hidden menu options */
-    /* .nav li:not(:first-child) {display: none;} */
-    .nav li {display: none;}
-    .nav ul {display: none;}
-
-    button.navIcon {
-        display: block;
-        float: left;
-        font-size:2.9em;
-        line-height: 35px;
-        border: 0px;
-        color: #2E2E61;
-        background-color: #E0E0E9;
-    }
-
-    .nav.responsive {position: absolute; display: block; z-index: 100;}
-    .nav.responsive a.icon {
-        position: absolute;
-        right: 0;
-        top: 0;
-        margin-right: 10px;
-    }
-    .nav.responsive li {
-        display: block;
-        text-align: left;
-        background-color: #669;
-        /* required by IE */
-        float: left;
-        clear: both;
-        width: 200px;
-    }
-
-    div#nav ul, #subnavigation ul {
-        padding-left: 0px;
-    }
-
-    .content {
-        padding: 0em 0.5em;
-    }
-    .lang {
-        position: relative;
-    }
-    .lang > .lang {
-        top: 0;
-        left: 100%;
-        margin-top: -6px;
-        margin-left: -1px;
-        -webkit-border-radius: 0 6px 6px 6px;
-        -moz-border-radius: 0 6px 6px 6px;
-        border-radius: 0 6px 6px 6px;
-    }
-    .lang:hover > .lang {
-        display: block;
-    }
-}
-
 /* Main Table
 ----------------------------------------------------- */
 table {
@@ -468,31 +308,12 @@ table.surname td.ColumnName {
 table.surname td.ColumnName > a {
    padding-left: 15px;
 }
-table#SortByName tr:hover td.ColumnSurname,
-table#SortByCount tr:hover td.ColumnQuantity {
-    background-color: #B4B4CB;
-}
-table#SortByName tr:hover,
-table#SortByCount tr:hover,
-table#SortByName tr:hover td.ColumnQuantity,
-table#SortByCount tr:hover td.ColumnSurname {
-    background-color: #B4B4CB;
-}
-table.surname tr:hover,
-table.surname tr:hover td.ColumnName {
-    background-color: #B4B4CB;
-}

 /* Individuals
 ----------------------------------------------------- */
 table.IndividualList td.ColumnSurname {
    background-color: #E0E0E9;
 }
-#parents table.infolist tr:hover,
-table.IndividualList tr:hover,
-table.IndividualList tr:hover td.ColumnSurname {
-    background-color: #B4B4CB;
-}

 /* Places
 ----------------------------------------------------- */
@@ -509,10 +330,6 @@ table.IndividualList tr:hover td.ColumnSurname {
 #Places table.infolist td.ColumnName > a {
    padding-left: 1ex;
 }
-#Places table.infolist tr:hover,
-#Places table.infolist tr:hover td.ColumnName {
-    background-color: #B4B4CB;
-}

 /* Events
 ----------------------------------------------------- */
@@ -528,10 +345,6 @@ table.IndividualList tr:hover td.ColumnSurname {
 #EventList td.ColumnPerson a {
    display: inline;
 }
-#EventList table.infolist tr:hover,
-#EventList table.infolist tr:hover td.ColumnType {
-    background-color: #B4B4CB;
-}
 #EventList td.ColumnPerson span.person:after,
 #EventList td.ColumnPerson span.father:after,
 #EventList td.ColumnPerson span.mother:after,
@@ -552,55 +365,10 @@ table.IndividualList tr:hover td.ColumnSurname {
 #EventDetail td.ColumnPerson span.mother:last-child:after {
    content: "";
 }
-#attributes table.infolist td.ColumnType {
-    width: 10%;
-    padding-left: 15px;
-}
-#attributes table.infolist td.ColumnValue {
-    width: 15%;
-}
-#attributes table.infolist td.ColumnSources {
-    width: 5%;
-    padding-left: 5px;
-}
-#WebLinks table.infolist td.ColumnType {
-    width: 10%;
-    padding-left: 15px;
-}
-#events table.eventlist td.ColumnDate {
-    width: 15%;
-    padding-left: 10px;
-}
-#families table.eventlist td.ColumnDate {
-    width: 15%;
-    padding-left: 10px;
-}
-#families table.eventlist tbody tr td:first-child,
-#families table.eventlist thead tr th:first-child {
-    width: 10%;
-    padding-left: 0px;
-}
-#families table.eventlist tbody tr td.ColumnDate,
-#families table.eventlist tbody tr td.ColumnNotes {
-    padding-left: 20px;
-}
-table.eventlist tbody tr td:first-child,
-table.eventlist thead tr th:first-child {
-    padding-left: 10px;
-}
+
 table.eventlist tbody tr td.ColumnSources {
-    padding-left: 20px;
    width: 5%;
 }
-#families table.eventlist th.ColumnDate {
-    padding-left: 20px;
-    width: 15%;
-}
-table.eventlist td.ColumnEvent,
-table.eventlist td.ColumnDate,
-table.eventlist td.ColumnPlace {
-    font-weight: bold;
-}

 /* Gallery
 ----------------------------------------------------- */
@@ -637,15 +405,7 @@ table.eventlist td.ColumnPlace {
    margin: 0px auto;
    display: block;
    border: solid 1px #669;
-    height: auto;
 }
-
-@media only screen and (max-width: 1600px) {
-    #GalleryDisplay img {
-        max-width: 100%;
-    }
-}
-
 #GalleryDetail h3 {
    text-align: center;
 }
@@ -655,10 +415,6 @@ table.eventlist td.ColumnPlace {
 div#SourceDetail {
    margin: 0 auto;
 }
-#Sources table.infolist tr:hover,
-#Sources table.infolist tr:hover td.ColumnType {
-    background-color: #B4B4CB;
-}

 /* Contact
 ----------------------------------------------------- */
@@ -666,10 +422,13 @@ div#SourceDetail {
    overflow: hidden;
 }
 #Contact #summaryarea {
+    width: 40em;
+    margin: 2em auto;
+    padding: 3em;
    background-color: #E0E0E9;
    border: solid 1px #669;
 }
-#Contact #summaryarea #GalleryDisplay img {
+#Contact img {
    float: right;
    border: solid 1px #669;
 }
@@ -696,31 +455,20 @@ div#SourceDetail {

 /* Subsection
 ----------------------------------------------------- */
-#Home #GalleryDisplay, #Introduction #GalleryDisplay, #Contact #GalleryDisplay {
-    float: right;
-    margin: 0;
-    border: 0px;
+#Home, #Introduction {
+    overflow: hidden;
 }
-#Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
-      #Contact #GalleryDisplay img {
-    display: block;
+#Home img, #Introduction img {
+    float: right;
+    margin: 1em;
    max-width: 950px;
-    height: auto;
-    float: right;
-}
-@media only screen and (max-width: 1080px) {
-    #Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
-          #Contact #GalleryDisplay img {
-        margin: 0 auto;
-        max-width: 100%;
-    }
 }
 #Home p, #Introduction p {
    padding-left: 15px;
 }
 .subsection {
    clear: both;
-    overflow-x: auto;
+    overflow: visible;
 }
 .subsection p {
    margin: 0px;
@@ -728,14 +476,6 @@ div#SourceDetail {

 /* Subsection : Families
 ----------------------------------------------------- */
-#families table.infolist td.ColumnValue.Child table.infolist tr:hover,
-table.relationships tr:hover {
-    background-color: #B4B4CB;
-}
-div.content table.tags {
-    text-align: left;
-    width: auto;
-}
 div#families table.fixed_subtables table.eventlist {
    table-layout: fixed;
 }
@@ -751,40 +491,13 @@ div#families table.attrlist td.ColumnType {

 /* Subsection : Gallery
 ----------------------------------------------------- */
-#gallery {
-    background-color: green;
-}
-#indivgallery {
-    background-color: white;
-}
-#indivgallery a {
-    color: black;
-    text-decoration: none;
-    word-wrap: break-word;
-    display: block;
-}
-#gallery .gallerycell {
-    float: left;
-    width: 130px;
-    height: 150px;
-    text-align: center;
-    margin: 0;
-    background-color: white;
-    border-top: solid 1px #999;
-    border-right: solid 1px #999;
-}
-#gallery .thumbnail {
-    font-size: smaller;
-    margin: 3em auto;
-}
 #indivgallery .thumbnail {
    float: left;
-    width: 160px;
-    height: 220px;
+    max-width: 130px;
+    max-height: 150px;
    font-size: smaller;
    text-align: center;
    margin: 0.8em 0.5em;
-    background-color: white;
 }
 #indivgallery h4 + .thumbnail {
    margin-left: 15px;
@@ -792,39 +505,6 @@ div#families table.attrlist td.ColumnType {
     *          first thumnail on each next row should also have a margin-left
     *          of 15 px. */
 }
-#gallery div.indexno {
-    float: right;
-    font-size: large;
-    text-align: center;
-    background-color: #CCC;
-    color: #555;
-    margin: 0;
-}
-#indivgallery div.date {
-    float: right;
-    width: 1.8em;
-    font-size: large;
-    text-align: center;
-    background-color: #CCC;
-    color: #555;
-}
-#indivgallery .thumbnail ul {
-    font-size: smaller;
-    list-style: none;
-    padding: 0px;
-}
-#indivgallery .thumbnail ul li:first-child {
-    border-style: none;
-}
-#indivgallery .thumbnail ul li {
-    border-top: dashed 1px #CCC;
-    border-top-style: dashed;
-    padding-top: 0.5em;
-    padding-bottom: 0.5em;
-}
-#gallery img {
-    border: solid 1px #999;
-}
 #indivgallery img {
    border: solid 1px #669;
 }
@@ -832,38 +512,17 @@ div#families table.attrlist td.ColumnType {
 /* ## remove this line and the comment markers from the line below to hide description in Indivifual Gallery
    display: none; */
 }
-div.snapshot div.thumbnail {
-    text-align: center;
-}

 /* Subsection : Narrative
 ----------------------------------------------------- */
 h4 + div.grampsstylednote, a.familymap {
    margin: 1em 15px;
 }
-i.NoteType {
-    font-weight: bold;
-    font-size: .8em;
-}
 i + div.grampsstylednote p {
    margin: 0 0 0.3em 0;
 }
 div.grampsstylednote p {
-    padding-bottom: 0.6em;
-}
-div.grampsstylednote a {
-    text-decoration: underline;
-    font-weight: bold;
-    color: #2E2E61;
-}
-div.grampsstylednote a:visited {
-    color: red;
-}
-
-/* Subsection : References
----------------------------------------------------- */
-#references ol {
-    margin-left: 2em;
+    margin-bottom: 0.5em;
 }

 /* Subsection : Family Map
@@ -871,40 +530,11 @@ div.grampsstylednote a:visited {
 a.familymap {
    display: block;
 }
-a.family_map {
-    margin-left: 15px;
-}

 /* Subsection : Source References
 ----------------------------------------------------- */
-#sourcerefs ol#srcr {
-    counter-reset: itema;
-    list-style-type: none;
-    display: block;
-    margin-top: .1em;
-}
-#sourcerefs ol#citr {
-    counter-reset: itemb;
-    list-style-type: none;
-}
-#sourcerefs ol#srcr > li::before {
-    content: counter(itema);
-}
-#sourcerefs ol#citr > li::before {
-    content: counter(itema)counter(itemb, lower-alpha);
-}
-#sourcerefs ol#srcr > li {
-    counter-increment: itema;
-    margin-top: .1em;
-}
-#sourcerefs ol#citr > li {
-    counter-increment: itemb;
-    margin-top: .1em;
-}
-#sourcerefs ol#citr ul {
-    list-style: none;
-    display: inline-block;
-    vertical-align: top;
+#sourcerefs ol li ol {
+    list-style-type: lower-alpha;
 }

 /* Subsection : Pedigree
@@ -945,7 +575,6 @@ a.family_map {
 }
 #footer > * {
    background-color: #E0E0E9;
-    font-size: 80%;
 }
 #footer p#createdate {
    float: left;
@@ -964,16 +593,10 @@ a.family_map {
    background-color: #B4B4CB;
 }

-/* Updates
----------------------------------------------------- */
-#Updates table.list td.date {
-    width: 20%;
-}
-
 /* Overwritten
 ----------------------------------------------------- */
 body#FamilyMap {
-    background-color: #E0E0E9 !important;
+    background-color: #E0E0E9 ! important;
 }

 /* Calendar Styles
@@ -992,12 +615,19 @@ table.calendar {
    background-color: #FAFAFF;
    border-bottom-style: none;
    padding-top: 1em;
-    vertical-align: top;
-    height: 2em;
 }
 .calendar thead th abbr {
    border-bottom-style: none;
 }
+#CreatorInfo {
+    float: right;
+    margin: -1em 15px 0px 0px;
+    font-weight: bold;
+    color: #669;
+}
+#CreatorInfo a[href]:hover {
+    background-color: #B4B4CB;
+}
 .calendar tfoot tr td {
    border-top: solid 4px #669;
    vertical-align: middle;
@@ -1015,7 +645,7 @@ table.calendar {

 /* Calendar : Date Container */
 .calendar td {
-    padding: 0px 5px 0px 1ex;
+    padding: 0px 0px 0px 1ex;
    border-width: 1px 0px 0px 1px;
    border-style: solid;
    border-color: #B4B4CB;
@@ -1023,7 +653,7 @@ table.calendar {
 }
 .calendar td:first-child {
    border-left-style: none;
-    padding: 0px 5px 0px 1ex;
+    padding: 0px 0px 0px 1ex;
 }
 .calendar tbody tr:first-child td {
    border-top-style: none;
@@ -1074,6 +704,8 @@ body#fullyearlinked div.content {
    overflow: hidden;
 }
 body#fullyearlinked table.calendar {
+    float: left;
+    width: 33.3%;
    height: 18em;
    border: solid 1px black;
 }
@@ -1090,88 +722,3 @@ body#fullyearlinked table.calendar tbody td {
 body#OneDay div.content {
    overflow: hidden;
 }
-body#OneDay h3 {
-    font-size: xx-large;
-    vertical-align: top;
-    height: 2em;
-}
-#WebCal table.calendar tfoot {
-    display: none;
-}
-#WebCal table.calendar tr td {
-    word-wrap: break-word;
-    padding: 2px;
-}
-#WebCal .calendar tr td .empty {
-    border: 5px solid rgba(255,255,255,.0);
-}
-#WebCal .calendar tr td .clickable {
-    border: 5px solid rgba(255,255,255,.0);
-}
-#WebCal .calendar tr td .clickable:hover {
-    display: block;
-    overflow:auto;
-    word-wrap: break-word;
-    cursor: text;
-    border-radius: 10px 0px 10px 10px;
-    border: 5px solid #2E2E61;
-    padding: 0px;
-}
-body#fullyearlinked #YearGlance tbody td {
-    height:48px;
-    vertical-align: middle;
-    text-align: center;
-    padding-left: 6px;
-}
-body#fullyearlinked #YearGlance tbody td .date {
-    font-size: 30px;
-    vertical-align: middle;
-    text-align: center;
-    border-radius: 45px;
-    float: none;
-    border: 5px solid rgba(0,0,0,.0);
-}
-body#fullyearlinked #YearGlance tbody td:hover .date {
-    border-radius: 45px;
-    border: 5px solid;
-}
-h4 button.icon {
-    width: 0.9em;
-    border: 0px solid;
-    padding: 0;
-    opacity: 1;
-    transform: rotate(90deg);
-    transition: transform 200ms ease-out 0s;
-    background: transparent;
-}
-h4 button.icon-close {
-    transform: rotate(90deg);
-    transition: transform 0.2s linear;
-}
-h4 button.icon-open {
-    transform: rotate(180deg);
-    transition: transform 0.2s linear;
-}
-svg {
-  fill: #2E2E61;
-}
-/* Go to the top of the page */
-#gototop {
-  display: none;
-  position: fixed;
-  bottom: 10px;
-  right: 20px;
-  z-index: 999;
-  border: none;
-  background-color: transparent;
-  color: black;
-  cursor: pointer;
-  border-radius: 4px;
-  width: 40px;
-  height: 40px;
-  padding: 0px;
-}
-
-#gototop:hover {
-  background-color: #E0E0E9;
-}
@@ -1,15 +1,14 @@
 /*
-*******************************************************************************
+**************************************************************************************************
 Copyright Holder and License
-*******************************************************************************
+**************************************************************************************************
 GRAMPS Cascading Style Sheet
 Style Name: Basic-Peach Stylesheet
 Style Author: Jason M. Simanek (2008)
-Note: Adapted from GRAMPS original Modern Style stylesheet with a new orange
-      color scheme.
-*******************************************************************************
+Note: Adapted from GRAMPS original Modern Style stylesheet with a new orange color scheme.
+**************************************************************************************************
 This website was created with GRAMPS <http://www.gramps-project.org/>
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
 GRAMPS is a Free Software Project for Genealogy, offering a professional

 genealogy program, and a wiki open to all. It is a community project, created,
@@ -17,13 +16,11 @@ developed and governed by genealogists.

 Go to <http://gramps-project.org/> to learn more!

-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
 Copyright 2008 Jason M. Simanek
 Copyright 2009 Stephane Charette
 Copyright (C) 2008-2011 Rob G. Healey <robhealey1@gmail.com>
 Copyright 2011 Michiel D. Nauta
-Copyright 2018 Theo van Rijn
-Copyright (C) 2019      Serge Noiraud

 This file is part of the GRAMPS program.

@@ -37,10 +34,10 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.

 You should have received a copy of the GNU General Public License along with
 GRAMPS. If not, see <http://www.gnu.org/licenses/>.
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------

 Color Palette
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------

 black                   #36220B
 brown                   #8C581C
@@ -48,21 +45,21 @@ orange dark             #EA8414
 orange                  #FFC35E
 orange light            #FFE09F
 yellow light            #FFFBE7
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
 Characteristic of this style is that it uses the full width of the browser
 window and that horizontal highlighting bars extend over the full width of
 the page.
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------

 NarrativeWeb Styles
-------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------ 

 General Elements
 ----------------------------------------------------- */

 body {
    font-family: sans-serif;
-    font-size: 100%;
+    font-size: 90%;
    color: #36220B;
    margin: 0px;
    background-color: #FFE09F;
@@ -70,13 +67,6 @@ body {
 body > div {
    clear: both;
 }
-#outerwrapper {
-    margin: 5px auto;
-    width: 98%;
-}
-#outerwrapper > div {
-    clear: both;
-}
 .content {
    background-color: #FFFBE7;
    border-top: solid 1px #8C581C;
@@ -85,29 +75,9 @@ body > div {
    float: right;
    margin: 2em;
 }
-#ThumbnailPreview div.snapshot {
-    float: right;
-    margin: 0;
-}
 .fullclear {
    clear: both;
 }
-/* Less whitespace on smaller real estate. */
-@media only screen and (max-width: 1080px) {
-    .content {
-        padding: 0em 0.5em;
-    }
-    body#fullyearlinked table.calendar {
-        float: none;
-        width: 100%;
-    }
-}
-@media only screen and (width > 1080px) {
-    body#fullyearlinked table.calendar {
-        float: left;
-        width: 33.3%;
-    }
-}

 /* General Text
 ----------------------------------------------------- */
@@ -140,7 +110,6 @@ p#description {
 a {
    color: #36220B;
    text-decoration: none;
-    word-wrap: break-word;
 }
 a[href]:hover, a[href]:active {
    background-color: #FFE09F
@@ -164,7 +133,6 @@ a[href]:hover, a[href]:active {
 ----------------------------------------------------- */
 div#nav, #subnavigation {
    border: solid 1px #FFE09F; /* needed by IE7 */
-    position: relative;
 }
 #subnavigation ul {
    overflow: hidden;
@@ -202,35 +170,6 @@ div#nav ul li.CurrentSection a {
 #subnavigation ul li.CurrentSection a {
    background-color: #FFFBE7;
 }
-div#nav li.lang {
-    font-size: smaller;
-    font-family: sans-serif;
-    padding-top: .3em;
-    padding-bottom: .3em;
-    font-weight: bold;
-}
-div#nav li.lang:hover > ul {
-    visibility: visible;
-    opacity: 1;
-}
-div#nav ul.lang {
-    position: absolute;
-    visibility: hidden;
-    opacity: 0;
-    z-index: 999;
-    padding: 5px 2px;
-    background-color: #FFE09F;
-    top: -1em;
-    font-size: larger;
-    font-family: sans-serif;
-}
-div#nav ul.lang:hover {
-    float: initial;
-}
-div#nav ul.lang li {
-    float: none;
-    padding: 1px 2px;
-}

 /* Alphabet Navigation
 ----------------------------------------------------- */
@@ -267,105 +206,6 @@ div#alphanav ul li a:hover {
    color: #FFFBE7;
 }

-/* Responsive navigation */
-button.navIcon {
-    display: none;
-}
-
-div#header::after {
-    content: "";
-    clear: both;
-    display: table;
-}
-
-div#nav::after {
-    content: "";
-    clear: both;
-    display: table;
-}
-
-@media only screen and (max-width: 1080px) {
-
-    /* Use less & all realestate on mobiles. */
-    div#outerwrapper {
-        margin: 5px auto;
-        width: 100%;
-    }
-
-    .nav {
-        background: none; /* Works in IE too. */
-    }
-
-    /* Undo some of the #nav styles  - to enable the class .nav */
-    .nav ul, #subnavigation ul {
-        list-style: none;
-        min-width: unset;
-        width: 200px;
-        height: 32px;
-        margin: 0;
-        padding: 0;
-    }
-    .nav ul li, #subnavigation ul li {
-        float: unset;
-        display: unset
-    }
-
-    /* Start with hidden menu options */
-    /* .nav li:not(:first-child) {display: none;} */
-    .nav li {display: none;}
-    .nav ul {display: none;}
-
-    button.navIcon {
-        display: block;
-        float: left;
-        font-size:2.9em;
-        line-height: 35px;
-        border: 0px;
-        color: #EA8414;
-        background-color: #FFE09F;
-    }
-
-    .nav.responsive {position: absolute; display: block; z-index: 100;}
-    .nav.responsive a.icon {
-        position: absolute;
-        right: 0;
-        top: 0;
-        margin-right: 10px;
-    }
-    .nav.responsive li {
-        display: block;
-        text-align: left;
-        background-color: #FFC35E;
-        /* required by IE */
-        float: left;
-        clear: both;
-        width: 200px;
-    }
-
-    div#nav ul, #subnavigation ul {
-        padding-left: 0px;
-    }
-
-    .content {
-        padding: 0em 0.5em;
-    }
-    .lang {
-        position: relative;
-    }
-    .lang > .lang {
-        top: 0;
-        left: 100%;
-        margin-top: -6px;
-        margin-left: -1px;
-        -webkit-border-radius: 0 6px 6px 6px;
-        -moz-border-radius: 0 6px 6px 6px;
-        border-radius: 0 6px 6px 6px;
-    }
-    .lang:hover > .lang {
-        display: block;
-    }
-}
-
 /* Main Table
 ----------------------------------------------------- */
 table {
@@ -468,31 +308,12 @@ table.surname td.ColumnName {
 table.surname td.ColumnName > a {
    padding-left: 15px;
 }
-table#SortByName tr:hover td.ColumnSurname,
-table#SortByCount tr:hover td.ColumnQuantity {
-    background-color: #FFC35E;
-}
-table#SortByName tr:hover,
-table#SortByCount tr:hover,
-table#SortByName tr:hover td.ColumnQuantity,
-table#SortByCount tr:hover td.ColumnSurname {
-    background-color: #FFC35E;
-}
-table.surname tr:hover,
-table.surname tr:hover td.ColumnName {
-    background-color: #FFC35E;
-}

 /* Individuals
 ----------------------------------------------------- */
 table.IndividualList td.ColumnSurname {
    background-color: #FFE09F;
 }
-#parents table.infolist tr:hover,
-table.IndividualList tr:hover,
-table.IndividualList tr:hover td.ColumnSurname {
-    background-color: #FFC35E;
-}

 /* Places
 ----------------------------------------------------- */
@@ -509,10 +330,6 @@ table.IndividualList tr:hover td.ColumnSurname {
 #Places table.infolist td.ColumnName > a {
    padding-left: 1ex;
 }
-#Places table.infolist tr:hover,
-#Places table.infolist tr:hover td.ColumnName {
-    background-color: #FFC35E;
-}

 /* Events
 ----------------------------------------------------- */
@@ -528,10 +345,6 @@ table.IndividualList tr:hover td.ColumnSurname {
 #EventList td.ColumnPerson a {
    display: inline;
 }
-#EventList table.infolist tr:hover,
-#EventList table.infolist tr:hover td.ColumnType {
-    background-color: #FFC35E;
-}
 #EventList td.ColumnPerson span.person:after,
 #EventList td.ColumnPerson span.father:after,
 #EventList td.ColumnPerson span.mother:after,
@@ -552,57 +365,10 @@ table.IndividualList tr:hover td.ColumnSurname {
 #EventDetail td.ColumnPerson span.mother:last-child:after {
    content: "";
 }
-#attributes table.infolist td.ColumnType {
-    width: 10%;
-    padding-left: 15px;
-}
-#attributes table.infolist td.ColumnValue {
-    width: 15%;
-}
-#attributes table.infolist td.ColumnSources {
-    width: 5%;
-    padding-left: 5px;
-}
-#WebLinks table.infolist td.ColumnType {
-    width: 10%;
-    padding-left: 15px;
-}
-#events table.eventlist td.ColumnDate {
-    width: 15%;
-    padding-left: 10px;
-}
-#families table.eventlist th.ColumnDate {
-    width: 15%;
-    padding-left: 20px;
-}
-#families table.eventlist td.ColumnDate {
-    width: 15%;
-    padding-left: 10px;
-}
-#families table.eventlist tbody tr td:first-child,
-#families table.eventlist thead tr th:first-child {
-    width: 10%;
-    padding-left: 0px;
-}
-#families table.eventlist tbody tr td.ColumnDate,
-#families table.eventlist tbody tr td.ColumnNotes {
-    padding-left: 20px;
-}
-table.eventlist tbody tr td:first-child,
-table.eventlist thead tr th:first-child {
-    padding-left: 10px;
-}
+
 table.eventlist tbody tr td.ColumnSources {
    width: 5%;
 }
-table.eventlist th.ColumnDate {
-    width: 15%;
-}
-table.eventlist td.ColumnEvent,
-table.eventlist td.ColumnDate,
-table.eventlist td.ColumnPlace {
-    font-weight: bold;
-}

 /* Gallery
 ----------------------------------------------------- */
@@ -639,13 +405,6 @@ table.eventlist td.ColumnPlace {
    margin: 0px auto;
    display: block;
    border: solid 1px #EA8414;
-    height: auto;
-}
-
-@media only screen and (max-width: 1600px) {
-    #GalleryDisplay img {
-        max-width: 100%;
-    }
 }
 #GalleryDetail h3 {
    text-align: center;
@@ -656,10 +415,6 @@ table.eventlist td.ColumnPlace {
 div#SourceDetail {
    margin: 0 auto;
 }
-#Sources table.infolist tr:hover,
-#Sources table.infolist tr:hover td.ColumnType {
-    background-color: #FFC35E;
-}

 /* Contact
 ----------------------------------------------------- */
@@ -667,10 +422,13 @@ div#SourceDetail {
    overflow: hidden;
 }
 #Contact #summaryarea {
+    width: 40em;
+    margin: 2em auto;
+    padding: 3em;
    background-color: #FFE09F;
    border: solid 1px #EA8414;
 }
-#Contact #summaryarea #GalleryDisplay img {
+#Contact img {
    float: right;
    border: solid 1px #EA8414;
 }
@@ -697,31 +455,20 @@ div#SourceDetail {

 /* Subsection
 ----------------------------------------------------- */
-#Home #GalleryDisplay, #Introduction #GalleryDisplay, #Contact #GalleryDisplay {
-    float: right;
-    margin: 0;
-    border: 0px;
+#Home, #Introduction {
+    overflow: hidden;
 }
-#Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
-      #Contact #GalleryDisplay img {
-    display: block;
+#Home img, #Introduction img {
+    float: right;
+    margin: 1em;
    max-width: 950px;
-    height: auto;
-    float: right;
-}
-@media only screen and (max-width: 1080px) {
-    #Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
-          #Contact #GalleryDisplay img {
-        margin: 0 auto;
-        max-width: 100%;
-    }
 }
 #Home p, #Introduction p {
    padding-left: 15px;
 }
 .subsection {
    clear: both;
-    overflow-x: auto;
+    overflow: visible;
 }
 .subsection p {
    margin: 0px;
@@ -729,14 +476,6 @@ div#SourceDetail {

 /* Subsection : Families
 ----------------------------------------------------- */
-#families table.infolist td.ColumnValue.Child table.infolist tr:hover,
-table.relationships tr:hover {
-    background-color: #FFC35E;
-}
-div.content table.tags {
-    text-align: left;
-    width: auto;
-}
 div#families table.fixed_subtables table.eventlist {
    table-layout: fixed;
 }
@@ -752,40 +491,13 @@ div#families table.attrlist td.ColumnType {

 /* Subsection : Gallery
 ----------------------------------------------------- */
-#gallery {
-    background-color: green;
-}
-#indivgallery {
-    background-color: white;
-}
-#indivgallery a {
-    color: #36220B;
-    text-decoration: none;
-    word-wrap: break-word;
-    display: block;
-}
-#gallery .gallerycell {
-    float: left;
-    width: 130px;
-    height: 150px;
-    text-align: center;
-    margin: 0;
-    background-color: white;
-    border-top: solid 1px #999;
-    border-right: solid 1px #999;
-}
-#gallery .thumbnail {
-    font-size: smaller;
-    margin: 3em auto;
-}
 #indivgallery .thumbnail {
    float: left;
-    width: 160px;
-    height: 220px;
+    max-width: 130px;
+    max-height: 150px;
    font-size: smaller;
    text-align: center;
    margin: 0.8em 0.5em;
-    background-color: white;
 }
 #indivgallery h4 + .thumbnail {
    margin-left: 15px;
@@ -793,39 +505,6 @@ div#families table.attrlist td.ColumnType {
     *          first thumnail on each next row should also have a margin-left
     *          of 15 px. */
 }
-#gallery div.indexno {
-    float: right;
-    font-size: large;
-    text-align: center;
-    background-color: #CCC;
-    color: #555;
-    margin: 0;
-}
-#indivgallery div.date {
-    float: right;
-    width: 1.8em;
-    font-size: large;
-    text-align: center;
-    background-color: #CCC;
-    color: #555;
-}
-#indivgallery .thumbnail ul {
-    font-size: smaller;
-    list-style: none;
-    padding: 0px;
-}
-#indivgallery .thumbnail ul li:first-child {
-    border-style: none;
-}
-#indivgallery .thumbnail ul li {
-    border-top: dashed 1px #CCC;
-    border-top-style: dashed;
-    padding-top: 0.5em;
-    padding-bottom: 0.5em;
-}
-#gallery img {
-    border: solid 1px #999;
-}
 #indivgallery img {
    border: solid 1px #8C581C;
 }
@@ -833,38 +512,17 @@ div#families table.attrlist td.ColumnType {
 /* ## remove this line and the comment markers from the line below to hide description in Indivifual Gallery
    display: none; */
 }
-div.snapshot div.thumbnail {
-    text-align: center;
-}

 /* Subsection : Narrative
 ----------------------------------------------------- */
 h4 + div.grampsstylednote, a.familymap {
    margin: 1em 15px;
 }
-i.NoteType {
-    font-weight: bold;
-    font-size: .8em;
-}
 i + div.grampsstylednote p {
    margin: 0 0 0.3em 0;
 }
 div.grampsstylednote p {
-    padding-bottom: 0.6em;
-}
-div.grampsstylednote a {
-    text-decoration: underline;
-    font-weight: bold;
-    color: #EA8414;
-}
-div.grampsstylednote a:visited {
-    color: red;
-}
-
-/* Subsection : References
----------------------------------------------------- */
-#references ol {
-    margin-left: 2em;
+    margin-bottom: 0.5em;
 }

 /* Subsection : Family Map
@@ -872,40 +530,11 @@ div.grampsstylednote a:visited {
 a.familymap {
    display: block;
 }
-a.family_map {
-    margin-left: 15px;
-}

 /* Subsection : Source References
 ----------------------------------------------------- */
-#sourcerefs ol#srcr {
-    counter-reset: itema;
-    list-style-type: none;
-    display: block;
-    margin-top: .1em;
-}
-#sourcerefs ol#citr {
-    counter-reset: itemb;
-    list-style-type: none;
-}
-#sourcerefs ol#srcr > li::before {
-    content: counter(itema);
-}
-#sourcerefs ol#citr > li::before {
-    content: counter(itema)counter(itemb, lower-alpha);
-}
-#sourcerefs ol#srcr > li {
-    counter-increment: itema;
-    margin-top: .1em;
-}
-#sourcerefs ol#citr > li {
-    counter-increment: itemb;
-    margin-top: .1em;
-}
-#sourcerefs ol#citr ul {
-    list-style: none;
-    display: inline-block;
-    vertical-align: top;
+#sourcerefs ol li ol {
+    list-style-type: lower-alpha;
 }

 /* Subsection : Pedigree
@@ -946,7 +575,6 @@ a.family_map {
 }
 #footer > * {
    background-color: #FFE09F;
-    font-size: 80%;
 }
 #footer p#createdate {
    float: left;
@@ -965,17 +593,11 @@ a.family_map {
    background-color: #FFC35E;
 }

-/* Updates
----------------------------------------------------- */
-#Updates table.list td.date {
-    width: 20%;
-}
-
 /* Overwritten
 ----------------------------------------------------- */
 button#drop {
    background-color: #FFE09F;
-    border: solid 1px #EA8414 !important;
+    border: solid 1px #EA8414 ! important;
 }
 button#drop:hover {
    background-color: #FFC35E;
@@ -1003,12 +625,19 @@ table.calendar {
    background-color: #FFFBE7;
    border-bottom-style: none;
    padding-top: 1em;
-    vertical-align: top;
-    height: 2em;
 }
 .calendar thead th abbr {
    border-bottom-style: none;
 }
+#CreatorInfo {
+    float: right;
+    margin: -1em 15px 0px 0px;
+    font-weight: bold;
+    color: #8C581C;
+}
+#CreatorInfo a[href]:hover {
+    background-color: #FFC35E;
+}
 .calendar tfoot tr td {
    border-top: solid 4px #8C581C;
    vertical-align: middle;
@@ -1017,6 +646,7 @@ table.calendar {
 /* Calendar : Date Numeral */
 .calendar div.date {
    float: right;
+    width: 1.8em;
    font-size: large;
    text-align: center;
    background-color: #FFC35E;
@@ -1025,7 +655,7 @@ table.calendar {

 /* Calendar : Date Container */
 .calendar td {
-    padding: 0px 5px 0px 1ex;
+    padding: 0px 0px 0px 1ex;
    border-width: 1px 0px 0px 1px;
    border-style: solid;
    border-color: #FFC35E;
@@ -1033,7 +663,7 @@ table.calendar {
 }
 .calendar td:first-child {
    border-left-style: none;
-    padding: 0px 5px 0px 1ex;
+    padding: 0px 0px 0px 1ex;
 }
 .calendar tbody tr:first-child td {
    border-top-style: none;
@@ -1084,6 +714,8 @@ body#fullyearlinked div.content {
    overflow: hidden;
 }
 body#fullyearlinked table.calendar {
+    float: left;
+    width: 33.3%;
    height: 18em;
    border: solid 1px #36220B;
 }
@@ -1100,88 +732,3 @@ body#fullyearlinked table.calendar tbody td {
 body#OneDay div.content {
    overflow: hidden;
 }
-body#OneDay h3 {
-    font-size: xx-large;
-    vertical-align: top;
-    height: 2em;
-}
-#WebCal table.calendar tfoot {
-    display: none;
-}
-#WebCal table.calendar tr td {
-    word-wrap: break-word;
-    padding: 2px;
-}
-#WebCal .calendar tr td .empty {
-    border: 5px solid rgba(255,255,255,.0);
-}
-#WebCal .calendar tr td .clickable {
-    border: 5px solid rgba(255,255,255,.0);
-}
-#WebCal .calendar tr td .clickable:hover {
-    display: block;
-    overflow:auto;
-    word-wrap: break-word;
-    cursor: text;
-    border-radius: 10px 0px 10px 10px;
-    border: 5px solid #EA8414;
-    padding: 0px;
-}
-body#fullyearlinked #YearGlance tbody td {
-    height:48px;
-    vertical-align: middle;
-    text-align: center;
-    padding-left: 6px;
-}
-body#fullyearlinked #YearGlance tbody td .date {
-    font-size: 30px;
-    vertical-align: middle;
-    text-align: center;
-    border-radius: 45px;
-    float: none;
-    border: 5px solid rgba(0,0,0,.0);
-}
-body#fullyearlinked #YearGlance tbody td:hover .date {
-    border-radius: 45px;
-    border: 5px solid;
-}
-h4 button.icon {
-    width: 0.9em;
-    border: 0px solid;
-    padding: 0;
-    opacity: 1;
-    transform: rotate(90deg);
-    transition: transform 200ms ease-out 0s;
-    background: transparent;
-}
-h4 button.icon-close {
-    transform: rotate(90deg);
-    transition: transform 0.2s linear;
-}
-h4 button.icon-open {
-    transform: rotate(180deg);
-    transition: transform 0.2s linear;
-}
-svg {
-  fill: #EA8414;
-}
-/* Go to the top of the page */
-#gototop {
-  display: none;
-  position: fixed;
-  bottom: 10px;
-  right: 20px;
-  z-index: 999;
-  border: none;
-  background-color: transparent;
-  color: black;
-  cursor: pointer;
-  border-radius: 4px;
-  width: 40px;
-  height: 40px;
-  padding: 0px;
-}
-
-#gototop:hover {
-  background-color: #FFE09F;
-}
@@ -1,15 +1,14 @@
 /*
-*******************************************************************************
+**************************************************************************************************
 Copyright Holder and License
-*******************************************************************************
+**************************************************************************************************
 GRAMPS Cascading Style Sheet
 Style Name: Basic-Spruce Stylesheet
 Style Author: Jason M. Simanek (2008)
-Note: Adapted from GRAMPS original Modern Style stylesheet with a new blue
-      color scheme.
-*******************************************************************************
+Note: Adapted from GRAMPS original Modern Style stylesheet with a new blue color scheme.
+**************************************************************************************************
 This website was created with GRAMPS <http://www.gramps-project.org/>
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
 GRAMPS is a Free Software Project for Genealogy, offering a professional

 genealogy program, and a wiki open to all. It is a community project, created,
@@ -17,14 +16,11 @@ developed and governed by genealogists.

 Go to <http://gramps-project.org/> to learn more!

-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
 Copyright 2008 Jason M. Simanek
 Copyright 2009 Stephane Charette
 Copyright (C) 2008-2011 Rob G. Healey <robhealey1@gmail.com>
 Copyright 2011 Michiel D. Nauta
-Copyright 2018 Theo van Rijn
-Copyright (C) 2019      Serge Noiraud
-

 This file is part of the GRAMPS program.

@@ -38,10 +34,10 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.

 You should have received a copy of the GNU General Public License along with
 GRAMPS. If not, see <http://www.gnu.org/licenses/>.
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------

 Color Palette
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------

 black                   #000
 blue dark               #204D91
@@ -49,21 +45,21 @@ blue                    #7CA3DD
 blue light              #BFD0EA
 blue very light         #EAEEF4
 white                   #FFF
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
 Characteristic of this style is that it uses the full width of the browser
 window and that horizontal highlighting bars extend over the full width of
 the page.
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------

 NarrativeWeb Styles
-------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------ 

 General Elements
 ----------------------------------------------------- */

 body {
    font-family: sans-serif;
-    font-size: 100%;
+    font-size: 90%;
    color: black;
    margin: 0px;
    background-color: #EAEEF4;
@@ -71,13 +67,6 @@ body {
 body > div {
    clear: both;
 }
-#outerwrapper {
-    margin: 5px auto;
-    width: 98%;
-}
-#outerwrapper > div {
-    clear: both;
-}
 .content {
    background-color: #FFF;
    border-top: solid 1px #7CA3DD;
@@ -86,29 +75,9 @@ body > div {
    float: right;
    margin: 2em;
 }
-#ThumbnailPreview div.snapshot {
-    float: right;
-    margin: 0;
-}
 .fullclear {
    clear: both;
 }
-/* Less whitespace on smaller real estate. */
-@media only screen and (max-width: 1080px) {
-    .content {
-        padding: 0em 0.5em;
-    }
-    body#fullyearlinked table.calendar {
-        float: none;
-        width: 100%;
-    }
-}
-@media only screen and (width > 1080px) {
-    body#fullyearlinked table.calendar {
-        float: left;
-        width: 33.3%;
-    }
-}

 /* General Text
 ----------------------------------------------------- */
@@ -141,7 +110,6 @@ p#description {
 a {
    color: black;
    text-decoration: none;
-    word-wrap: break-word;
 }
 a[href]:hover, a[href]:active {
    background-color: #EAEEF4
@@ -165,7 +133,6 @@ a[href]:hover, a[href]:active {
 ----------------------------------------------------- */
 div#nav, #subnavigation {
    border: solid 1px #EAEEF4; /* needed by IE7 */
-    position: relative;
 }
 #subnavigation ul {
    overflow: hidden;
@@ -203,35 +170,6 @@ div#nav ul li.CurrentSection a {
 #subnavigation ul li.CurrentSection a {
    background-color: #FFF;
 }
-div#nav li.lang {
-    font-size: smaller;
-    font-family: sans-serif;
-    padding-top: .3em;
-    padding-bottom: .3em;
-    font-weight: bold;
-}
-div#nav li.lang:hover > ul {
-    visibility: visible;
-    opacity: 1;
-}
-div#nav ul.lang {
-    position: absolute;
-    visibility: hidden;
-    padding: 0px;
-    opacity: 0;
-    z-index: 999;
-    background-color: #EAEEF4;
-    top: -1em;
-    font-size: larger;
-    font-family: sans-serif;
-}
-div#nav ul.lang:hover {
-    float: initial;
-}
-div#nav ul.lang li {
-    float: none;
-    padding: 1px 2px;
-}

 /* Alphabet Navigation
 ----------------------------------------------------- */
@@ -268,105 +206,6 @@ div#alphanav ul li a:hover {
    color: #FFF;
 }

-/* Responsive navigation */
-button.navIcon {
-    display: none;
-}
-
-div#header::after {
-    content: "";
-    clear: both;
-    display: table;
-}
-
-div#nav::after {
-    content: "";
-    clear: both;
-    display: table;
-}
-
-@media only screen and (max-width: 1080px) {
-
-    /* Use less & all realestate on mobiles. */
-    div#outerwrapper {
-        margin: 5px auto;
-        width: 100%;
-    }
-
-    .nav {
-        background: none; /* Works in IE too. */
-    }
-
-    /* Undo some of the #nav styles  - to enable the class .nav */
-    .nav ul, #subnavigation ul {
-        list-style: none;
-        min-width: unset;
-        width: 200px;
-        height: 32px;
-        margin: 0;
-        padding: 0;
-    }
-    .nav ul li, #subnavigation ul li {
-        float: unset;
-        display: unset
-    }
-
-    /* Start with hidden menu options */
-    /* .nav li:not(:first-child) {display: none;} */
-    .nav li {display: none;}
-    .nav ul {display: none;}
-
-    button.navIcon {
-        display: block;
-        float: left;
-        font-size:2.9em;
-        line-height: 35px;
-        border: 0px;
-        color: #204D91;
-        background-color: #EAEEF4;
-    }
-
-    .nav.responsive {position: absolute; display: block; z-index: 100;}
-    .nav.responsive a.icon {
-        position: absolute;
-        right: 0;
-        top: 0;
-        margin-right: 10px;
-    }
-    .nav.responsive li {
-        display: block;
-        text-align: left;
-        background-color: #EEE;
-        /* required by IE */
-        float: left;
-        clear: both;
-        width: 200px;
-    }
-
-    div#nav ul, #subnavigation ul {
-        padding-left: 0px;
-    }
-
-    .content {
-        padding: 0em 0.5em;
-    }
-    .lang {
-        position: relative;
-    }
-    .lang > .lang {
-        top: 0;
-        left: 100%;
-        margin-top: -6px;
-        margin-left: -1px;
-        -webkit-border-radius: 0 6px 6px 6px;
-        -moz-border-radius: 0 6px 6px 6px;
-        border-radius: 0 6px 6px 6px;
-    }
-    .lang:hover > .lang {
-        display: block;
-    }
-}
-
 /* Main Table
 ----------------------------------------------------- */
 table {
@@ -469,31 +308,12 @@ table.surname td.ColumnName {
 table.surname td.ColumnName > a {
    padding-left: 15px;
 }
-table#SortByName tr:hover td.ColumnSurname,
-table#SortByCount tr:hover td.ColumnQuantity {
-    background-color: #BFD0EA;
-}
-table#SortByName tr:hover,
-table#SortByCount tr:hover,
-table#SortByName tr:hover td.ColumnQuantity,
-table#SortByCount tr:hover td.ColumnSurname {
-    background-color: #BFD0EA;
-}
-table.surname tr:hover,
-table.surname tr:hover td.ColumnName {
-    background-color: #BFD0EA;
-}

 /* Individuals
 ----------------------------------------------------- */
 table.IndividualList td.ColumnSurname {
    background-color: #EAEEF4;
 }
-#parents table.infolist tr:hover,
-table.IndividualList tr:hover,
-table.IndividualList tr:hover td.ColumnSurname {
-    background-color: #EAEEF4;
-}

 /* Places
 ----------------------------------------------------- */
@@ -510,10 +330,6 @@ table.IndividualList tr:hover td.ColumnSurname {
 #Places table.infolist td.ColumnName > a {
    padding-left: 1ex;
 }
-#Places table.infolist tr:hover,
-#Places table.infolist tr:hover td.ColumnName {
-    background-color: #BFD0EA;
-}

 /* Events
 ----------------------------------------------------- */
@@ -529,10 +345,6 @@ table.IndividualList tr:hover td.ColumnSurname {
 #EventList td.ColumnPerson a {
    display: inline;
 }
-#EventList table.infolist tr:hover,
-#EventList table.infolist tr:hover td.ColumnType {
-    background-color: #BFD0EA;
-}
 #EventList td.ColumnPerson span.person:after,
 #EventList td.ColumnPerson span.father:after,
 #EventList td.ColumnPerson span.mother:after,
@@ -553,57 +365,10 @@ table.IndividualList tr:hover td.ColumnSurname {
 #EventDetail td.ColumnPerson span.mother:last-child:after {
    content: "";
 }
-#attributes table.infolist td.ColumnType {
-    width: 10%;
-    padding-left: 15px;
-}
-#attributes table.infolist td.ColumnValue {
-    width: 15%;
-}
-#attributes table.infolist td.ColumnSources {
-    width: 5%;
-    padding-left: 5px;
-}
-#WebLinks table.infolist td.ColumnType {
-    width: 10%;
-    padding-left: 15px;
-}
-#events table.eventlist td.ColumnDate {
-    width: 15%;
-    padding-left: 10px;
-}
-#families table.eventlist th.ColumnDate {
-    width: 15%;
-    padding-left: 20px;
-}
-#families table.eventlist td.ColumnDate {
-    width: 15%;
-    padding-left: 10px;
-}
-#families table.eventlist tbody tr td:first-child,
-#families table.eventlist thead tr th:first-child {
-    width: 10%;
-    padding-left: 0px;
-}
-#families table.eventlist tbody tr td.ColumnDate,
-#families table.eventlist tbody tr td.ColumnNotes {
-    padding-left: 20px;
-}
-table.eventlist tbody tr td:first-child,
-table.eventlist thead tr th:first-child {
-    padding-left: 10px;
-}
+
 table.eventlist tbody tr td.ColumnSources {
    width: 5%;
 }
-table.eventlist th.ColumnDate {
-    width: 15%;
-}
-table.eventlist td.ColumnEvent,
-table.eventlist td.ColumnDate,
-table.eventlist td.ColumnPlace {
-    font-weight: bold;
-}

 /* Gallery
 ----------------------------------------------------- */
@@ -633,20 +398,13 @@ table.eventlist td.ColumnPlace {
    font-weight: normal;
 }
 #GalleryDisplay {
-    margin: 10px auto;
+    margin: 0px auto;
    position: relative;
 }
 #GalleryDisplay img {
    margin: 0px auto;
    display: block;
    border: solid 1px #7CA3DD;
-    height: auto;
-}
-
-@media only screen and (max-width: 1600px) {
-    #GalleryDisplay img {
-        max-width: 100%;
-    }
 }
 #GalleryDetail h3 {
    text-align: center;
@@ -657,10 +415,6 @@ table.eventlist td.ColumnPlace {
 div#SourceDetail {
    margin: 0 auto;
 }
-#Sources table.infolist tr:hover,
-#Sources table.infolist tr:hover td.ColumnType {
-    background-color: #BFD0EA;
-}

 /* Contact
 ----------------------------------------------------- */
@@ -668,10 +422,13 @@ div#SourceDetail {
    overflow: hidden;
 }
 #Contact #summaryarea {
+    width: 40em;
+    margin: 2em auto;
+    padding: 3em;
    background-color: #EAEEF4;
    border: solid 1px #7CA3DD;
 }
-#Contact #summaryarea #GalleryDisplay img {
+#Contact img {
    float: right;
    border: solid 1px #7CA3DD;
 }
@@ -698,32 +455,20 @@ div#SourceDetail {

 /* Subsection
 ----------------------------------------------------- */
-#Home #GalleryDisplay, #Introduction #GalleryDisplay, #Contact #GalleryDisplay {
-    float: right;
-    margin: 0;
-    border: 0px;
+#Home, #Introduction {
+    overflow: hidden;
 }
-#Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
-      #Contact #GalleryDisplay img {
-    display: block;
+#Home img, #Introduction img {
+    float: right;
+    margin: 1em;
    max-width: 950px;
-    width: 100%;
-    height: auto;
-    float: right;
 }
-@media only screen and (max-width: 1080px) {
-    #Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
-          #Contact #GalleryDisplay img {
-        margin: 0 auto;
-        max-width: 100%;
-    }
-}
-#Home p, #Introduction p, #Contact p {
+#Home p, #Introduction p {
    padding-left: 15px;
 }
 .subsection {
    clear: both;
-    overflow-x: auto;
+    overflow: visible;
 }
 .subsection p {
    margin: 0px;
@@ -731,14 +476,6 @@ div#SourceDetail {

 /* Subsection : Families
 ----------------------------------------------------- */
-#families table.infolist td.ColumnValue.Child table.infolist tr:hover,
-table.relationships tr:hover {
-    background-color: #BFD0EA;
-}
-div.content table.tags {
-    text-align: left;
-    width: auto;
-}
 div#families table.fixed_subtables table.eventlist {
    table-layout: fixed;
 }
@@ -754,40 +491,13 @@ div#families table.attrlist td.ColumnType {

 /* Subsection : Gallery
 ----------------------------------------------------- */
-#gallery {
-    background-color: green;
-}
-#indivgallery {
-    background-color: white;
-}
-#indivgallery a {
-    color: black;
-    text-decoration: none;
-    word-wrap: break-word;
-    display: block;
-}
-#gallery .gallerycell {
-    float: left;
-    width: 130px;
-    height: 160px;
-    text-align: center;
-    margin: 0;
-    background-color: white;
-    border-top: solid 1px #999;
-    border-right: solid 1px #999;
-}
-#gallery .thumbnail {
-    font-size: smaller;
-    margin: 3em auto;
-}
 #indivgallery .thumbnail {
    float: left;
-    width: 160px;
-    height: 220px;
+    max-width: 130px;
+    max-height: 150px;
    font-size: smaller;
    text-align: center;
    margin: 0.8em 0.5em;
-    background-color: white;
 }
 #indivgallery h4 + .thumbnail {
    margin-left: 15px;
@@ -795,39 +505,6 @@ div#families table.attrlist td.ColumnType {
     *          first thumnail on each next row should also have a margin-left
     *          of 15 px. */
 }
-#gallery div.indexno {
-    float: right;
-    font-size: large;
-    text-align: center;
-    background-color: #CCC;
-    color: #555;
-    margin: 0;
-}
-#indivgallery div.date {
-    float: right;
-    width: 1.8em;
-    font-size: large;
-    text-align: center;
-    background-color: #CCC;
-    color: #555;
-}
-#indivgallery .thumbnail ul {
-    font-size: smaller;
-    list-style: none;
-    padding: 0px;
-}
-#indivgallery .thumbnail ul li:first-child {
-    border-style: none;
-}
-#indivgallery .thumbnail ul li {
-    border-top: dashed 1px #CCC;
-    border-top-style: dashed;
-    padding-top: 0.5em;
-    padding-bottom: 0.5em;
-}
-#gallery img {
-    border: solid 1px #999;
-}
 #indivgallery img {
    border: solid 1px #7CA3DD;
 }
@@ -835,38 +512,17 @@ div#families table.attrlist td.ColumnType {
 /* ## remove this line and the comment markers from the line below to hide description in Indivifual Gallery
    display: none; */
 }
-div.snapshot div.thumbnail {
-    text-align: center;
-}

 /* Subsection : Narrative
 ----------------------------------------------------- */
 h4 + div.grampsstylednote, a.familymap {
    margin: 1em 15px;
 }
-i.NoteType {
-    font-weight: bold;
-    font-size: .8em;
-}
 i + div.grampsstylednote p {
    margin: 0 0 0.3em 0;
 }
 div.grampsstylednote p {
-    padding-bottom: 0.6em;
-}
-div.grampsstylednote a {
-    text-decoration: underline;
-    font-weight: bold;
-    color: #204D91;
-}
-div.grampsstylednote a:visited {
-    color: red;
-}
-
-/* Subsection : References
----------------------------------------------------- */
-#references ol {
-    margin-left: 2em;
+    margin-bottom: 0.5em;
 }

 /* Subsection : Family Map
@@ -874,40 +530,11 @@ div.grampsstylednote a:visited {
 a.familymap {
    display: block;
 }
-a.family_map {
-    margin-left: 15px;
-}

 /* Subsection : Source References
 ----------------------------------------------------- */
-#sourcerefs ol#srcr {
-    counter-reset: itema;
-    list-style-type: none;
-    display: block;
-    margin-top: .1em;
-}
-#sourcerefs ol#citr {
-    counter-reset: itemb;
-    list-style-type: none;
-}
-#sourcerefs ol#srcr > li::before {
-    content: counter(itema);
-}
-#sourcerefs ol#citr > li::before {
-    content: counter(itema)counter(itemb, lower-alpha);
-}
-#sourcerefs ol#srcr > li {
-    counter-increment: itema;
-    margin-top: .1em;
-}
-#sourcerefs ol#citr > li {
-    counter-increment: itemb;
-    margin-top: .1em;
-}
-#sourcerefs ol#citr ul {
-    list-style: none;
-    display: inline-block;
-    vertical-align: top;
+#sourcerefs ol li ol {
+    list-style-type: lower-alpha;
 }

 /* Subsection : Pedigree
@@ -948,7 +575,6 @@ a.family_map {
 }
 #footer > * {
    background-color: #EAEEF4;
-    font-size: 80%;
 }
 #footer p#createdate {
    float: left;
@@ -967,16 +593,10 @@ a.family_map {
    background-color: #BFD0EA;
 }

-/* Updates
----------------------------------------------------- */
-#Updates table.list td.date {
-    width: 20%;
-}
-
 /* Overwritten
 ----------------------------------------------------- */
 body#FamilyMap {
-    background-color: #EAEEF4 !important;
+    background-color: #EAEEF4 ! important;
 }

 /* Calendar Styles
@@ -995,12 +615,19 @@ table.calendar {
    background-color: #FFF;
    border-bottom-style: none;
    padding-top: 1em;
-    vertical-align: top;
-    height: 2em;
 }
 .calendar thead th abbr {
    border-bottom-style: none;
 }
+#CreatorInfo {
+    float: right;
+    margin: -1em 15px 0px 0px;
+    font-weight: bold;
+    color: #7CA3DD;
+}
+#CreatorInfo a[href]:hover {
+    background-color: #BFD0EA;
+}
 .calendar tfoot tr td {
    border-top: solid 4px #7CA3DD;
    vertical-align: middle;
@@ -1018,7 +645,7 @@ table.calendar {

 /* Calendar : Date Container */
 .calendar td {
-    padding: 0px 5px 0px 1ex;
+    padding: 0px 0px 0px 1ex;
    border-width: 1px 0px 0px 1px;
    border-style: solid;
    border-color: #BFD0EA;
@@ -1026,7 +653,7 @@ table.calendar {
 }
 .calendar td:first-child {
    border-left-style: none;
-    padding: 0px 5px 0px 1ex;
+    padding: 0px 0px 0px 1ex;
 }
 .calendar tbody tr:first-child td {
    border-top-style: none;
@@ -1077,6 +704,8 @@ body#fullyearlinked div.content {
    overflow: hidden;
 }
 body#fullyearlinked table.calendar {
+    float: left;
+    width: 33.3%;
    height: 18em;
    border: solid 1px black;
 }
@@ -1093,88 +722,3 @@ body#fullyearlinked table.calendar tbody td {
 body#OneDay div.content {
    overflow: hidden;
 }
-body#OneDay h3 {
-    font-size: xx-large;
-    vertical-align: top;
-    height: 2em;
-}
-#WebCal table.calendar tfoot {
-    display: none;
-}
-#WebCal table.calendar tr td {
-    word-wrap: break-word;
-    padding: 2px;
-}
-#WebCal .calendar tr td .empty {
-    border: 5px solid rgba(255,255,255,.0);
-}
-#WebCal .calendar tr td .clickable {
-    border: 5px solid rgba(255,255,255,.0);
-}
-#WebCal .calendar tr td .clickable:hover {
-    display: block;
-    overflow:auto;
-    word-wrap: break-word;
-    cursor: text;
-    border-radius: 10px 0px 10px 10px;
-    border: 5px solid #204D91;
-    padding: 0px;
-}
-body#fullyearlinked #YearGlance tbody td {
-    height:48px;
-    vertical-align: middle;
-    text-align: center;
-    padding-left: 6px;
-}
-body#fullyearlinked #YearGlance tbody td .date {
-    font-size: 30px;
-    vertical-align: middle;
-    text-align: center;
-    border-radius: 45px;
-    float: none;
-    border: 5px solid rgba(0,0,0,.0);
-}
-body#fullyearlinked #YearGlance tbody td:hover .date {
-    border-radius: 45px;
-    border: 5px solid;
-}
-h4 button.icon {
-    width: 0.9em;
-    border: 0px solid;
-    padding: 0;
-    opacity: 1;
-    transform: rotate(90deg);
-    transition: transform 200ms ease-out 0s;
-    background: transparent;
-}
-h4 button.icon-close {
-    transform: rotate(90deg);
-    transition: transform 0.2s linear;
-}
-h4 button.icon-open {
-    transform: rotate(180deg);
-    transition: transform 0.2s linear;
-}
-svg {
-  fill: #204D91;
-}
-/* Go to the top of the page */
-#gototop {
-  display: none;
-  position: fixed;
-  bottom: 10px;
-  right: 20px;
-  z-index: 999;
-  border: none;
-  background-color: transparent;
-  color: black;
-  cursor: pointer;
-  border-radius: 4px;
-  width: 40px;
-  height: 40px;
-  padding: 0px;
-}
-
-#gototop:hover {
-  background-color: #EAEEF4;
-}
@@ -10,7 +10,7 @@
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful, 
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
@@ -9,7 +9,7 @@
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful, 
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
@@ -77,7 +77,8 @@ ul#dropmenu li:hover > a {
    color: #fafafa
 }

-*html ul#dropmenu li a:hover /* IE6 */ {
+*html ul#dropmenu li a:hover /* IE6 */
+{
    color: #fafafa
 }
 ul#dropmenu li:hover > ul {
@@ -128,11 +129,13 @@ ul#dropmenu ul a {
    float: none;
    text-transform: none;
 }
-*html ul#dropmenu ul a /* IE6 */ {
+*html ul#dropmenu ul a /* IE6 */
+{
    height: 10px;
    width: 150px;
 }
-*:first-child+html ul#dropmenu ul a /* IE7 */ {
+*:first-child+html ul#dropmenu ul a /* IE7 */
+{
    height: 10px;
    width: 150px;
 }
@@ -9,7 +9,7 @@
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful, 
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
@@ -10,7 +10,7 @@
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful, 
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
@@ -19,8 +19,6 @@ Copyright 2008 Jason M. Simanek
 Copyright 2009 Stephane Charette
 Copyright (C) 2008-2011 Rob G. Healey <robhealey1@gmail.com>
 Copyright 2011 Michiel D. Nauta
-Copyright 2018 Theo van Rijn
-Copyright (C) 2019      Serge Noiraud

 This file is part of the GRAMPS program.

@@ -58,35 +56,25 @@ Middle Light            images/Web_Mainz_MidLight.png


 NarrativeWeb Styles
----------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------- 

 General Elements
 -----------------------------------------------------------------*/
 body {
    font-family: Georgia, serif;
-    font-size: 100%;
+    font-size: 90%;
    color: #7D5925;
    background: url(../images/Web_Mainz_Bkgd.png) black repeat;
 }
 body > div {
+    width: 85%;
    margin: 0px auto;
+    background: url(../images/Web_Mainz_Mid.png) #FFF2C6 repeat;
    overflow: hidden;
-}
-#outerwrapper {
-    margin: 5px auto;
-    width: 98%;
-}
-#outerwrapper > div {
-    clear: both;
+    padding: 0px 1.5em;
 }
 .content {
    padding: 1.5em 1.5em;
-    overflow: auto;
-    background: url(../images/Web_Mainz_Mid.png) #FFF2C6 repeat;
-}
-#ThumbnailPreview div.snapshot {
-    float: right;
-    margin: 0;
 }
 div.snapshot div.thumbnail {
    text-align: center;
@@ -94,22 +82,6 @@ div.snapshot div.thumbnail {
 div.snapshot a {
    display: inline;
 }
-/* Less whitespace on smaller real estate. */
-@media only screen and (max-width: 1080px) {
-    .content {
-        padding: 0em 0.5em;
-    }
-    body#fullyearlinked table.calendar {
-        float: none;
-        width: 100%;
-    }
-}
-@media only screen and (width > 1080px) {
-    body#fullyearlinked table.calendar {
-        float: left;
-        width: 33.3%;
-    }
-}

 /* General Text
 -----------------------------------------------------------------*/
@@ -147,11 +119,9 @@ h4 {
 a {
    color: #7D5925;
    text-decoration: none;
-    word-wrap: break-word;
 }
 a[href]:hover, a[href]:active {
-    background-color: #D8C19F;
-    font-style: italic;
+    background-color: #FFFFE7;
 }
 .grampsid {
    font-family: monospace;
@@ -168,8 +138,7 @@ a[href]:hover, a[href]:active {
 /* Navigation
 -----------------------------------------------------------------*/
 div#nav, #subnavigation {
-    background: url(../images/Web_Mainz_Mid.png) repeat-x top left;
-    position: relative;
+    background: url(../images/Web_Mainz_MidLight.png) #FFF2C6 repeat;
 }
 div#nav ul, #subnavigation ul {
    list-style-type: none;
@@ -200,31 +169,6 @@ div#nav ul li.CurrentSection a, #subnavigation ul li.CurrentSection a {
 #subnavigation ul li.CurrentSection a {
    border-width: 0px 1px 1px 1px;
 }
-div#nav li.lang {
-    font-size: smaller;
-    padding-top: 2px;
-    padding-bottom: 1px;
-}
-div#nav li.lang:hover > ul {
-    visibility: visible;
-    opacity: 1;
-}
-div#nav ul.lang {
-    position: absolute;
-    visibility: hidden;
-    opacity: 0;
-    z-index: 999;
-    background-color: #D8C19F;
-    top: -1em;
-    font-family: sans-serif;
-}
-div#nav ul.lang:hover {
-    float: initial;
-}
-div#nav ul.lang li {
-    float: none;
-    font-size: larger;
-}

 /* Alphabet Navigation
 -----------------------------------------------------------------*/
@@ -259,107 +203,6 @@ div#alphanav ul li a:hover {
    color: white;
 }

-/* Responsive navigation */
-button.navIcon {
-    display: none;
-}
-
-div#header::after {
-    content: "";
-    clear: both;
-    display: table;
-}
-
-div#nav::after {
-    content: "";
-    clear: both;
-    display: table;
-}
-
-@media only screen and (max-width: 1080px) {
-
-    /* Use less & all realestate on mobiles. */
-    div#outerwrapper {
-        margin: 5px auto;
-        width: 100%;
-    }
-
-    .nav {
-        background: none; /* Works in IE too. */
-    }
-
-    /* Undo some of the #nav styles  - to enable the class .nav */
-    .nav ul, #subnavigation ul {
-        list-style: none;
-        min-width: unset;
-        width: 200px;
-        height: 32px;
-        margin: 0;
-        padding: 0;
-    }
-    .nav ul li, #subnavigation ul li {
-        float: unset;
-        display: unset
-    }
-
-    /* Start with hidden menu options */
-    /* .nav li:not(:first-child) {display: none;} */
-    .nav li {display: none;}
-    .nav ul {display: none;}
-
-    button.navIcon {
-        display: block;
-        float: left;
-        font-size:2.9em;
-        line-height: 80px;
-        border: 0px;
-        color: #7D5925;
-        background: url(../images/Web_Mainz_Mid.png) #FFF2C6 repeat;
-    }
-
-    .nav.responsive {position: relative; display: block; z-index: 100;}
-    .nav.responsive a.icon {
-        position: absolute;
-        right: 0;
-        top: 0;
-        margin-right: 10px;
-    }
-    .nav.responsive li {
-        display: block;
-        height:1.4em;
-        text-align: left;
-        background-color: #D8C19F;
-        /* required by IE */
-        float: left;
-        clear: both;
-        width: 200px;
-    }
-
-    div#nav ul, #subnavigation ul {
-        padding-left: 0px;
-        position: absolute;
-    }
-
-    .content {
-        padding: 0em 0.5em;
-    }
-    .lang {
-        position: relative;
-    }
-    .lang > .lang {
-        top: 0;
-        left: 100%;
-        margin-top: -6px;
-        margin-left: -1px;
-        -webkit-border-radius: 0 6px 6px 6px;
-        -moz-border-radius: 0 6px 6px 6px;
-        border-radius: 0 6px 6px 6px;
-    }
-    .lang:hover > .lang {
-        display: block;
-    }
-}
-
 /* Main Table
 -----------------------------------------------------------------*/
 table {
@@ -426,40 +269,12 @@ table#SortByName thead th.ColumnSurname a:after,
 table#SortByCount thead th.ColumnQuantity a:after {
    content: " \2193";
 }
-table#SortByName tr:hover td.ColumnSurname,
-table#SortByCount tr:hover td.ColumnQuantity {
-    background-color: #D8C19F;
-}
-table#SortByName tbody tr:hover,
-table#SortByCount tbody tr:hover,
-table#SortByName tr:hover td.ColumnQuantity,
-table#SortByCount tr:hover td.ColumnSurname {
-    background-color: #D8C19F;
-}
-table.surname tbody tr:hover,
-table.surname tr:hover td.ColumnName {
-    background-color: #D8C19F;
-}
 #SurnameDetail h3 {
    border-bottom-width: 0px;
    padding-bottom: 0px;
    margin: 0px;
 }

-/* Individuals
----------------------------------------------------- */
-#parents table.infolist tbody tr:hover,
-table.IndividualList tbody tr:hover,
-table.IndividualList tr:hover td.ColumnSurname {
-    background-color: #D8C19F;
-}
-
-/* Places
----------------------------------------------------- */
-#Places table.infolist tbody tr:hover,
-#Places table.infolist tr:hover td.ColumnName {
-    background-color: #D8C19F;
-}
 /* Events
 -----------------------------------------------------------------*/
 #EventList tr.BeginType td {
@@ -473,10 +288,6 @@ table.IndividualList tr:hover td.ColumnSurname {
 #EventList td.ColumnPerson a {
    display: inline;
 }
-#EventList table.infolist tbody tr:hover,
-#EventList table.infolist tr:hover td.ColumnType {
-    background-color: #D8C19F;
-}
 /* Family events, put mother on next line */
 #EventList td.ColumnPerson span.father,
 #EventList td.ColumnPerson span.mother,
@@ -500,57 +311,9 @@ table.IndividualList tr:hover td.ColumnSurname {
 #EventDetail td.ColumnPerson span.mother:last-child:after {
    content: "";
 }
-#attributes table.infolist td.ColumnType {
-    width: 10%;
-    padding-left: 15px;
-}
-#attributes table.infolist td.ColumnValue {
-    width: 15%;
-}
-#attributes table.infolist td.ColumnSources {
+
+table.eventlist tbody tr td.ColumnSources {
    width: 5%;
-    padding-left: 5px;
-}
-#WebLinks table.infolist td.ColumnType {
-    width: 10%;
-    padding-left: 15px;
-}
-#events table.eventlist td.ColumnDate {
-    width: 15%;
-    padding-left: 10px;
-}
-#families table.eventlist th.ColumnDate {
-    width: 15%;
-    padding-left: 25px;
-}
-#families table.eventlist td.ColumnDate {
-    width: 15%;
-    padding-left: 20px;
-}
-#families table.eventlist tbody tr td:first-child,
-#families table.eventlist thead tr th:first-child {
-    width: 10%;
-    padding-left: 0px;
-}
-#families table.eventlist tbody tr td.ColumnDate,
-#families table.eventlist tbody tr td.ColumnNotes {
-    padding-left: 25px;
-}
-#IndividualDetail div table.eventlist td.ColumnEvent {
-    padding-right: 0px;
-    width: 8%;
-}
-#IndividualDetail div table.eventlist td.ColumnSources {
-    width: 5%;
-}
-#IndividualDetail div table.eventlist td.ColumnDate {
-    padding-right: 0px;
-    width: 15%;
-}
-#IndividualDetail div table.eventlist td.ColumnEvent,
-#IndividualDetail div table.eventlist td.ColumnDate,
-#IndividualDetail div table.eventlist td.ColumnPlace {
-    font-weight: bold;
 }

 /* Gallery
@@ -594,16 +357,9 @@ table.IndividualList tr:hover td.ColumnSurname {
    position: relative;
 }
 #GalleryDisplay img {
-    margin: 10px auto;
+    margin: 0px auto;
    display:block;
    border: solid 1px #7D5925;
-    height: auto;
-}
-
-@media only screen and (max-width: 1600px) {
-    #GalleryDisplay img {
-        max-width: 100%;
-    }
 }

 /*    Sources
@@ -611,10 +367,6 @@ table.IndividualList tr:hover td.ColumnSurname {
 div#SourceDetail {
    margin: 0 auto;
 }
-#Sources table.infolist tbody tr:hover,
-#Sources table.infolist tr:hover td.ColumnType {
-    background-color: #D8C19F;
-}

 /* Contact
 -----------------------------------------------------------------*/
@@ -623,6 +375,11 @@ div#SourceDetail {
    padding-bottom: 0px;
    margin: 0px;
 }
+#Contact img {
+    display: block;
+    margin: 0px auto 1em auto;
+    border: solid 1px #7D5925;
+}
 #Contact #researcher {
    text-align: center;
 }
@@ -644,33 +401,16 @@ div#SourceDetail {

 /* SubSection
 -----------------------------------------------------------------*/
-#Home #GalleryDisplay, #Introduction #GalleryDisplay, #Contact #GalleryDisplay {
-    float: right;
-    margin-left: 10px;
-    margin-right: 10px;
-    margin: 10px auto;
-}
-#Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
-      #Contact #GalleryDisplay img {
+#Home img, #Introduction img {
    display: block;
+    margin: 1em auto;
    max-width: 950px;
-    width: 100%;
-    height: auto;
-    float: right;
-}
-@media only screen and (max-width: 1080px) {
-    #Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
-          #Contact #GalleryDisplay img {
-        margin: 0 auto;
-        max-width: 100%;
-    }
 }
 #Home a, #Introduction a, #Contact a {
    color: black;
 }
 .subsection {
    clear: both;
-    overflow-x: auto;
 }
 .subsection p {
    margin: 0px;
@@ -678,14 +418,6 @@ div#SourceDetail {

 /* SubSection : Families
 -----------------------------------------------------------------*/
-#families table.infolist td.ColumnValue.Child table.infolist tbody tr:hover,
-table.relationships tr:hover td {
-    background-color: #D8C19F;
-}
-div.content table.tags {
-    text-align: left;
-    width: auto;
-}
 div#families table.fixed_subtables table.eventlist {
    table-layout: fixed;
 }
@@ -695,44 +427,17 @@ div#families table.fixed_subtables table.eventlist th:first-child {
 div#families table.fixed_subtables table.eventlist th:last-child {
    width: 5em;
 }
-div#families .infolist h4 {
-    text-align: left;
-}

 /* SubSection : Gallery
 -----------------------------------------------------------------*/
-#gallery {
-    background-color: green;
-}
-#gallery .gallerycell {
-    float: left;
-    width: 130px;
-    height: 150px;
-    text-align: center;
-    margin: 0;
-    border-top: solid 1px #999;
-    border-right: solid 1px #999;
-}
-#gallery .thumbnail {
-    font-size: smaller;
-    margin: 3em auto;
-}
 #indivgallery {
    /* float container stretch, see www.quirksmode.org/css/clearing.html */
    overflow: hidden;
 }
-div#indivgallery div.thumbnail a,
-div#gallerycell div.thumbnail a {
-    color: #7D5925;
-    text-decoration: none;
-    word-wrap: break-word;
-    width: 160px;
-    display: block;
-}
 #indivgallery .thumbnail {
    float: left;
-    width: 160px;
-    height: 220px;
+    max-width: 130px;
+    max-height: 150px;
    font-size: smaller;
    text-align: center;
    margin: 0.5em;
@@ -744,42 +449,6 @@ div#gallerycell div.thumbnail a {
 /* ## remove this line and the comment markers from the line below to hide the description in Individual Gallery
    display: none; */
 }
-#gallery div.indexno {
-    float: right;
-    font-size: large;
-    text-align: center;
-    background-color: #CCC;
-    color: #555;
-    margin: 0;
-}
-#indivgallery div.date {
-    float: right;
-    width: 1.8em;
-    font-size: large;
-    text-align: center;
-    background-color: #CCC;
-    color: #555;
-}
-#indivgallery .thumbnail ul {
-    font-size: smaller;
-    list-style: none;
-    padding: 0px;
-}
-#indivgallery .thumbnail ul li:first-child {
-    border-style: none;
-}
-#indivgallery .thumbnail ul li {
-    border-top: dashed 1px #CCC;
-    border-top-style: dashed;
-    padding-top: 0.5em;
-    padding-bottom: 0.5em;
-}
-#gallery img {
-    border: solid 1px #999;
-}
-div.snapshot div.thumbnail {
-    text-align: center;
-}

 /* SubSection : Narrative
 -----------------------------------------------------------------*/
@@ -787,73 +456,18 @@ h4 + div.grampsstylednote, a.familymap {
    margin-left: 10px;
    margin-right: 10px;
 }
-a.family_map {
-    margin-left: 10px;
-}
-i.NoteType {
-    font-weight: bold;
-    font-size: .8em;
-}
 i + div.grampsstylednote p {
    margin: 0 0 0.3em 0;
 }
 div.grampsstylednote p {
-    padding-bottom: 0.6em;
-}
-div.grampsstylednote a {
-    text-decoration: underline;
-    font-weight: bold;
-    color: #7D5925;
-}
-div.grampsstylednote a:visited {
-    color: red;
-}
-
-/* Subsection : References
----------------------------------------------------- */
-#references ol {
-    margin-left: 2em;
+    margin-bottom: 0.5em;
 }

 /* SubSection : Source References
 -----------------------------------------------------------------*/
-#sourcerefs ol#srcr {
-    counter-reset: itema;
-    list-style-type: none;
-    display: block;
-    margin-top: .1em;
+#sourcerefs ol li ol {
+    list-style-type: lower-alpha;
 }
-#sourcerefs ol#citr {
-    counter-reset: itemb;
-    list-style-type: none;
-}
-#sourcerefs ol#srcr > li::before {
-    content: counter(itema);
-}
-#sourcerefs ol#citr > li::before {
-    content: counter(itema)counter(itemb, lower-alpha);
-}
-#sourcerefs ol#srcr > li {
-    counter-increment: itema;
-    margin-top: .1em;
-}
-#sourcerefs ol#citr > li {
-    counter-increment: itemb;
-    margin-top: .1em;
-}
-#sourcerefs ol#citr ul {
-    list-style: none;
-    display: inline-block;
-    vertical-align: top;
-}
-/*
-#sourcerefs a {
-    color: #767D25;
-}
-#sourcerefs a:visited {
-    color: red;
-}
-*/

 /* SubSection : Pedigree
 -----------------------------------------------------------------*/
@@ -887,38 +501,20 @@ div.grampsstylednote a:visited {
 -----------------------------------------------------------------*/
 #footer {
    clear: both;
-    overflow: hidden;
-    width: 100%;
    background: url(../images/Web_Mainz_MidLight.png) #FFF2C6;
+    border-top: dashed 1px #7D5925;
    font-family: sans-serif;
 }
 #footer p#createdate {
    float: left;
    width: 50%;
    text-align: left;
-    margin-left: 10px;
 }
 #footer p#copyright {
    float: right;
    width: 40%;
    text-align: right;
 }
-#footer p#copyright img {
-    float: right;
-    margin-right: 10px;
-    margin-bottom: 10px;
-    vertical-align: middle;
-}
-#footer > * {
-    font-size: 80%;
-    background: url(../images/Web_Mainz_MidLight.png) #FFF2C6;
-}
-
-/* Updates
----------------------------------------------------- */
-#Updates table.list td.date {
-    width: 20%;
-}

 /* Overwritten
 -----------------------------------------------------------------*/
@@ -926,10 +522,10 @@ button#drop {
    font-style: italic;
    color: #FFF2C6;
    background: url(../images/Web_Mainz_Bkgd.png) #7D5925 repeat;
-    border: outset 3px black !important;
+    border: outset 3px black ! important;
 }
 div#map_canvas {
-    border-color: #7D5925 !important;
+    border-color: #7D5925 ! important;
 }

 /* Calendar Styles
@@ -937,6 +533,7 @@ div#map_canvas {
 table.calendar {
    table-layout: fixed;
    empty-cells: show;
+    width: 950px;
    margin: 0px auto;
    background: url(../images/Web_Mainz_Mid.png) #FFF2C6 repeat;
 }
@@ -949,24 +546,28 @@ table.calendar {
 .calendar thead th.monthName {
    font-size: xx-large;
    color: #767D25;
-    vertical-align: top;
-    height: 2em;
-    border-bottom-style: none;
+    border-bottom-color: #7D5925;
 }
 .calendar thead th abbr {
    border-bottom-style: none;
 }
+#CreatorInfo {
+    float: right;
+    margin: -1em 0px 0px 0px;
+    font-weight: bold;
+    font-style: italic;
+}
 .calendar tfoot td {
    border-top: double 4px #7D5925;
 }

 /* Calendar : Date Numeral */
 .calendar div.date {
-    width: 1.5em;
+    float: right;
+    width: 1.8em;
    font-size: large;
    font-style: italic;
    text-align: center;
-    margin-top: 1px;
    background: url(../images/Web_Mainz_MidLight.png) #FFF2C6 repeat;
 }

@@ -1010,11 +611,10 @@ table.calendar {
    color: #767D25;
 }
 .calendar td ul li span.yearsmarried em {
-    color: #767D25;
+    color: black;
 }
 .calendar td.highlight div.date {
    color: #767D25;
-    margin-top: 1px;
    background-image: none;
    background-color: #FFFFE7;
 }
@@ -1027,6 +627,8 @@ table.calendar {

 /* Calendar : Full Year */
 body#fullyearlinked table.calendar {
+    float: left;
+    width: 315px;
    height: 18em;
    border: solid 1px #7D5925;
 }
@@ -1039,98 +641,3 @@ body#fullyearlinked table.calendar thead th.monthName {
 body#fullyearlinked table.calendar tbody td {
    height: 3em;
 }
-body#OneDay h3 {
-    font-size: xx-large;
-    vertical-align: top;
-    height: 2em;
-    text-align: center;
-}
-#WebCal table.calendar tfoot {
-    display: none;
-}
-#WebCal table.calendar tr td {
-    word-wrap: break-word;
-    padding: 2px;
-}
-#WebCal .calendar tr td .empty {
-    border: 5px solid rgba(255,255,255,.0);
-}
-#WebCal .calendar tr td .clickable {
-    border: 5px solid rgba(255,255,255,.0);
-}
-#WebCal .calendar tr td .clickable:hover {
-    display: block;
-    overflow:auto;
-    word-wrap: break-word;
-    cursor: text;
-    border-radius: 10px 0px 10px 10px;
-    border: 5px solid #7D5925;
-    padding: 0px;
-}
-body#fullyearlinked #YearGlance tbody td {
-    vertical-align: middle;
-    text-align: center;
-    padding-left: 8px;
-}
-body#fullyearlinked #YearGlance tbody td .date {
-    font-size: 30px;
-    vertical-align: middle;
-    text-align: center;
-    border-radius: 45px;
-    float: none;
-    border: 5px solid rgba(0,0,0,.0);
-}
-body#fullyearlinked #YearGlance tbody td.previous .date:hover,
-body#fullyearlinked #YearGlance tbody td.next .date:hover {
-    border-radius: 10px;
-    border: 5px solid;
-}
-body#fullyearlinked #YearGlance tbody td div.empty .date:hover {
-    border-radius: 10px;
-    border: 5px solid;
-}
-body#fullyearlinked #YearGlance tbody td.highlight .date:hover {
-    border-radius: 45px;
-    border: 5px solid;
-    background: url(../images/Web_Mainz_Bkgd.png) black repeat;
-}
-h4 button.icon {
-    width: 0.9em;
-    border: 0px solid;
-    padding: 0;
-    opacity: 1;
-    transform: rotate(90deg);
-    transition: transform 200ms ease-out 0s;
-    background: transparent;
-}
-h4 button.icon-close {
-    transform: rotate(90deg);
-    transition: transform 0.2s linear;
-}
-h4 button.icon-open {
-    transform: rotate(180deg);
-    transition: transform 0.2s linear;
-}
-svg {
-  fill: #7D5925;
-}
-/* Go to the top of the page */
-#gototop {
-  display: none;
-  position: fixed;
-  bottom: 10px;
-  right: 20px;
-  z-index: 999;
-  border: none;
-  background-color: transparent;
-  color: black;
-  cursor: pointer;
-  border-radius: 4px;
-  width: 40px;
-  height: 40px;
-  padding: 0px;
-}
-
-#gototop:hover {
-  background-color: #FFF2C6;
-}
@@ -1,26 +1,24 @@
 /*
-*******************************************************************************
+**************************************************************************************************
 Copyright Holder and License
-*******************************************************************************
+**************************************************************************************************
 GRAMPS Cascading Style Sheet
 Style Name: Nebraska Default Stylesheet
 Style Author: Jason M. Simanek (2008)

-*******************************************************************************
+**************************************************************************************************
 This website was created with GRAMPS <http://www.gramps-project.org/>
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
 GRAMPS is a Free Software Project for Genealogy, offering a professional
 genealogy program, and a wiki open to all. It is a community project, created,
 developed and governed by genealogists.

 Go to <http://gramps-project.org/> to learn more!

-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
 Copyright 2008 Jason M. Simanek
 Copyright 2009 Stephane Charette
 Copyright (C) 2008-2011 Rob G. Healey <robhealey1@gmail.com>
-Copyright 2018 Theo van Rijn
-Copyright (C) 2019      Serge Noiraud

 This file is part of the GRAMPS program.

@@ -34,10 +32,10 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.

 You should have received a copy of the GNU General Public License along with
 GRAMPS. If not, see <http://www.gnu.org/licenses/>.
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------

 Color Palette
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
 brown darkest       #453619
 brown dark          #542
 brown               #A97
@@ -45,14 +43,14 @@ brown light         #C1B398
 brown lightest      #F6F2EE
 gray                #696969
 green               #5D835F
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------


 NarrativeWeb Styles
-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------- 

 General Elements
---------------------------------------------------------------------------- */
+----------------------------------------------------- */

 body {
    color:#000;
@@ -84,21 +82,10 @@ img {
 .thumbnail a:hover {
    background:none;
 }
-#outerwrapper {
-    margin: 5px auto;
-    width: 98%;
-}
-#outerwrapper > div {
-    clear: both;
-}
 .content {
    padding-top: 1cm;
    background-color:#FFF;
 }
-#ThumbnailPreview div.snapshot {
-    float: right;
-    margin: 0;
-}
 .content div.snapshot {
    float:right;
    margin:1.6em;
@@ -113,22 +100,6 @@ img {
 .content div.snapshot div.thumbnail span {
    display:none;
 }
-/* Less whitespace on smaller real estate. */
-@media only screen and (max-width: 1080px) {
-    .content {
-        padding: 0em 0.5em;
-    }
-    body#fullyearlinked table.calendar {
-        float: none;
-        width: 100%;
-    }
-}
-@media only screen and (width > 1080px) {
-    body#fullyearlinked table.calendar {
-        float: left;
-        width: 33.3%;
-    }
-}
 .fullclear {
    width:100%;
    height:1px;
@@ -172,7 +143,7 @@ p#description {
    background-color:#FFF;
 }
 p a {
-    color:#542;
+    color:#FFF;
    text-decoration:underline;
 }
 sup {
@@ -238,10 +209,10 @@ div#alphanav, div#nav, div#subnavigation {
    width: 100%;
    margin: 0;
    background-color: #A97;
-    position: relative;
 }
 div#alphanav ul, div#nav ul, div#subnavigation ul {
    list-style: none;
+    min-width: 770px;
    height: 24px;
    margin: 0;
    padding: 0px 0px 0px 16px;
@@ -282,154 +253,6 @@ div#nav ul li.CurrentSection a:hover {
 div#subnavigation ul li.CurrentSection a {
    border-width: 0 0 1px 0;
 }
-div#nav li.lang {
-    position: relative;
-    padding-top: 3px;
-    padding-left: 8px;
-    font: bold .7em sans;
-}
-div#nav li.lang:hover > ul {
-    visibility: visible;
-    opacity: 1;
-}
-div#nav ul.lang {
-    position: absolute;
-    visibility: hidden;
-    opacity: 0;
-    height: auto;
-    width: auto;
-    z-index: 999;
-    overflow: visible;
-    background-color: #A97;
-    top: -1em;
-    border-width: 2px 0px 1px 0px;
-    padding: 0px;
-}
-div#nav ul.lang li:after {
-    content: "";
-}
-div#nav li.lang ul.lang li {
-    float: none;
-    background-color: #A97;
-    margin-left: 10px;
-    padding: 0px 0px;
-}
-div#nav li.lang ul.lang li a {
-    float: none;
-    width: auto;
-    font: bold .9em sans;
-}
-
-/* Responsive navigation */
-button.navIcon {
-    display: none;
-    color: #FFF;
-}
-
-div#header::after {
-    content: "";
-    clear: both;
-    display: table;
-}
-
-div#nav::after {
-    content: "";
-    clear: both;
-    display: table;
-}
-
-@media only screen and (max-width: 1080px) {
-
-    /* Use less & all realestate on mobiles. */
-    div#outerwrapper {
-        margin: 5px auto;
-        width: 100%;
-    }
-
-    .nav {
-        background: none; /* Works in IE too. */
-    }
-
-    /* Undo some of the #nav styles  - to enable the class .nav */
-    .nav ul, #subnavigation ul {
-        list-style: none;
-        min-width: unset;
-        width: 200px;
-        height: 32px;
-        margin: 0;
-        padding: 0;
-    }
-    .nav ul li, #subnavigation ul li {
-        float: unset;
-        display: unset
-    }
-
-    /* Start with hidden menu options */
-    /* .nav li:not(:first-child) {display: none;} */
-    .nav li {display: none;}
-    .nav ul {display: none;}
-
-    button.navIcon {
-        display: block;
-        float: left;
-        font-size:2.9em;
-        line-height: 70px;
-        border: 0px;
-        background-color: #542;
-        color: #FFF;
-    }
-
-    .nav.responsive {position: absolute; display: block; z-index: 100;}
-    .nav.responsive a.icon {
-        position: absolute;
-        right: 0;
-        top: 0;
-    }
-    .nav.responsive ::after {
-        /* need to remove the "|" when we are in the dropdown menu. */
-        color: #A97;
-        background-color: #A97;
-    }
-    .nav.responsive li {
-        display: block;
-        text-align: left;
-        background-color: #A97;
-        /* required by IE */
-        float: left;
-        clear: both;
-        width: 200px;
-    }
-
-    div#nav ul, #subnavigation ul {
-        padding-left: 0px;
-    }
-
-    .content {
-        padding: 0em 0.5em;
-    }
-    div#nav ul li.lang {
-        padding-top: 3px;
-        padding-bottom: 6px;
-        padding-left: 0px;
-    }
-    .lang {
-        position: relative;
-        padding-top: 3px;
-        padding-left: 8px;
-    }
-    .lang > .lang {
-        top: 0;
-        left: 100%;
-        margin-top: -6px;
-        margin-left: -1px;
-        -webkit-border-radius: 0 6px 6px 6px;
-        -moz-border-radius: 0 6px 6px 6px;
-        border-radius: 0 6px 6px 6px;
-    }
-    .lang:hover > .lang {
-        display: block;
-    }
-}

 /* Main Table
 ----------------------------------------------------- */
@@ -516,20 +339,6 @@ table.surnamelist tr th a, table.surnamelist tr th a:visited {
 table.surnamelist tr th:hover {
    background-color:#C1B398;
 }
-table#SortByName tr:hover td.ColumnSurname,
-table#SortByCount tr:hover td.ColumnQuantity {
-    background-color:#C1B398;
-}
-table#SortByName tr:hover,
-table#SortByCount tr:hover,
-table#SortByName tr:hover td.ColumnQuantity,
-table#SortByCount tr:hover td.ColumnSurname {
-    background-color:#C1B398;
-}
-table.surname tr:hover,
-table.surname tr:hover td.ColumnName {
-    background-color:#C1B398;
-}
 table.surnamelist thead tr th.ColumnLetter {
    padding-left:20px;
    padding-right:10px;
@@ -585,11 +394,6 @@ table.surname thead tr th.ColumnParents, table.surname tbody tr td.ColumnParents

 /* Individuals
 ----------------------------------------------------- */
-#parents table.infolist tr:hover,
-table.IndividualList tr:hover,
-table.IndividualList tr:hover td.ColumnSurname {
-    background-color:#C1B398;
-}
 #Individuals {  }
 #Individuals table.IndividualList {
    border-bottom:solid 1px #A97;
@@ -633,7 +437,6 @@ table.IndividualList tbody tr td.ColumnName a:hover {
 #IndividualDetail div table.infolist tr td {
    font:normal .9em/1.2em sans-serif;
    vertical-align:top;
-    padding-left: 5px;
 }
 #IndividualDetail div table.infolist tr td a {
    display:inline;
@@ -646,15 +449,11 @@ table.IndividualList tbody tr td.ColumnName a:hover {
    color:#696969;
 }
 #IndividualDetail div.subsection table tr td:first-child {
-    color:#696969;
    padding-left:20px;
 }
 #familymap a.familymap {
    margin-left:20px;
 }
-a.family_map {
-    margin-left: 20px;
-}

 /* Subsections : Attributes
 ----------------------------------------------------- */
@@ -687,10 +486,6 @@ table.attrlist tbody tr td.ColumnSources {

 /* Sources
 ----------------------------------------------------- */
-#Sources table.infolist tr:hover,
-#Sources table.infolist tr:hover td.ColumnType {
-    background-color:#C1B398;
-}
 #Sources {  }
 #Sources table.infolist tbody tr td.ColumnRowLabel {
    padding-bottom:0;
@@ -739,10 +534,6 @@ table.relationships tbody tr td.ColumnPartner a:hover {
 #Places table.infolist tbody tr td.ColumnName {
    padding:0;
 }
-#Places table.infolist tr:hover,
-#Places table.infolist tr:hover td.ColumnName {
-    background-color:#C1B398;
-}
 #Places table.infolist tbody tr td.ColumnName a {
    padding:.1em 10px .3em 10px;
 }
@@ -762,11 +553,7 @@ table.relationships tbody tr td.ColumnPartner a:hover {
 #EventDetail table.infolist tr td a {
    display: inline;
 }
-#EventList table.infolist tr:hover,
-#EventList table.infolist tr:hover td.ColumnType {
-    background-color:#C1B398;
-}
-#EventList table.infolist tr td span.father,
+#EventList table.infolist tr td span.father, 
 #EventList table.infolist tr td span.mother,
 #EventDetail table.infolist tr td span.father,
 #EventDetail table.infolist tr td span.mother {
@@ -788,27 +575,10 @@ table.relationships tbody tr td.ColumnPartner a:hover {
 #EventDetail table.infolist tr td span.mother:last-child:after {
    content: "";
 }
-#IndividualDetail div table.eventlist tbody tr td:first-child,
-#IndividualDetail div table.eventlist thead tr th:first-child {
-    padding-left: 10px;
-}
-#IndividualDetail div table.eventlist tbody tr td.ColumnSources {
-    padding-left: 5px;
+
+table.eventlist tbody tr td.ColumnSources {
    width: 5%;
 }
-#IndividualDetail div table.eventlist tbody tr td.ColumnEvent {
-    padding-right: 0px;
-    width: 8%;
-}
-#IndividualDetail div table.eventlist tbody tr td.ColumnDate {
-    padding-left: 10px;
-    width: 15%;
-}
-#IndividualDetail div table.eventlist td.ColumnEvent,
-#IndividualDetail div table.eventlist td.ColumnDate,
-#IndividualDetail div table.eventlist td.ColumnPlace {
-    font-weight: bold;
-}

 /* Gallery
 ----------------------------------------------------- */
@@ -864,13 +634,6 @@ table.relationships tbody tr td.ColumnPartner a:hover {
 }
 #GalleryDisplay img {
    margin:0 auto;
-    height: auto;
-}
-
-@media only screen and (max-width: 1600px) {
-    #GalleryDisplay img {
-        max-width: 100%;
-    }
 }
 #GalleryDetail div#summaryarea{
    margin:0;
@@ -916,6 +679,7 @@ body#ThumbnailPreview div#references table.infolist tbody tr td.ColumnName {
 /* Contact
 ----------------------------------------------------- */
 #Contact #summaryarea {
+    width:500px;
    margin:0 auto;
    padding:3em;
    background-color:#F1ECE2;
@@ -933,6 +697,7 @@ body#ThumbnailPreview div#references table.infolist tbody tr td.ColumnName {
    padding:0;
 }
 #researcher span {
+    float:left;
    display:block;
    font:normal .9em/1.4em serif;
    margin-right:.4em;
@@ -960,9 +725,9 @@ body#ThumbnailPreview div#references table.infolist tbody tr td.ColumnName {
    text-decoration:underline;
 }

-/* Download
+/* Download 
 ----------------------------------------------------- */
-#Download {
+#Download { 
    padding:1cm;
    height:396px;
 }
@@ -971,7 +736,7 @@ table.download {
    width:100%;
 }
 table.download img {
-    float:none;
+    float:center;
 }
 table.download thead tr th {
    text-align:center;
@@ -982,7 +747,7 @@ table.download thead tr th {
 table.download tbody tr#Row02 {
    border-bottom:solid 2px #000;
 }
-table.download thead tr th, table.download tbody tr td {
+table.download thead tr th, table.download tbody tr td { 
    padding-left:10px;
    padding-top:20px;
    border-style:solid;
@@ -1014,32 +779,20 @@ table.download td.Modified {

 /* Subsections
 ----------------------------------------------------- */
-#Home #GalleryDisplay, #Introduction #GalleryDisplay, #Contact #GalleryDisplay {
-    float: right;
-    margin-left: 10px;
-    margin-right: 10px;
+#Home, #Introduction, #Contact {
+    padding:2em 0 3em 0;
 }
-#Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
-      #Contact #GalleryDisplay img {
-    display: block;
-    max-width: 950px;
-    height: auto;
-    float: right;
-}
-@media only screen and (max-width: 1080px) {
-    #Home #GalleryDisplay img, #Introduction #GalleryDisplay img,
-          #Contact #GalleryDisplay img {
-        max-width: 100%;
-    }
-}
-
 #Home p, #Introduction p {
    margin:0 20px 1em 20px;
 }
+#Home img, #Introduction img {
+    float:right;
+    margin:0;
+    padding:0 20px 3em 2em;
+}
 #Home a, #Introduction a, #Contact a {
    color: #000;
    text-decoration: none;
-    overflow: hidden;
 }
 div.subsection{
    padding-bottom:.5em;
@@ -1085,6 +838,9 @@ div#events h4 {
    padding-bottom:4px;
    background-color:#A97;
 }
+#IndividualDetail div#events table.infolist thead tr th:first-child {
+    padding-left:20px;
+}
 #IndividualDetail div#events table.infolist tbody tr td {
    padding-top:.4em;
    padding-bottom:.8em;
@@ -1100,51 +856,6 @@ table.infolist tbody tr td.ColumnValue p {
    color:#696969;
    margin:.2em 0 0 2em;
 }
-#attributes table.infolist td.ColumnType {
-    width: 10%;
-    padding-left: 15px;
-}
-#attributes table.infolist td.ColumnValue {
-    width: 15%;
-}
-#attributes table.infolist td.ColumnSources {
-    width: 5%;
-    padding-left: 5px;
-}
-#WebLinks table.weblinks tbody tr td:first-child {
-    vertical-align:middle;
-}
-#WebLinks table.weblinks td.ColumnType,
-#WebLinks table.weblinks td.ColumnDescription {
-}
-#events table.eventlist td.ColumnDate {
-    width: 15%;
-    padding-left: 10px;
-}
-#families table.eventlist th.ColumnDate {
-    width: 15%;
-    padding-left: 10px;
-}
-#families table.eventlist td.ColumnEvent,
-#families table.eventlist td.ColumnDate,
-#families table.eventlist td.ColumnPlace,
-#families table.eventlist td.ColumnDescription,
-#families table.eventlist td.ColumnSources {
-    padding-top:.4em;
-    padding-bottom:.8em;
-}
-#families table.eventlist td.ColumnDate {
-    width: 15%;
-    padding-left: 20px;
-}
-#families table.eventlist td.ColumnNotes {
-    font:normal 1.1em/1.4em sans-serif;
-}
-#families table.eventlist tbody tr td:first-child,
-#families table.eventlist thead tr th:first-child {
-    width: 10%;
-    padding-left: 0px;
-}

 /* Subsections : Attributes
 ----------------------------------------------------- */
@@ -1167,19 +878,10 @@ div#parents table.infolist tbody tr td.ColumnValue ol li {

 /* Subsections : Families
 ----------------------------------------------------- */
-#families table.infolist td.ColumnValue.Child table.infolist tr:hover,
-table.relationships tr:hover {
-    background-color:#C1B398;
-}
-div.content table.tags {
-    text-align: left;
-    width: auto;
-}
 div#families table.infolist {
    margin-top:.5em;
 }
 div#families table.infolist tbody tr td.ColumnValue p {
-    margin-left:0;
    margin-top:0;
 }
 div#families table.infolist tbody tr td.ColumnValue ol {
@@ -1224,73 +926,21 @@ div#Addresses table.infolist tr td a, div#Addresses table.infolist tr td p a {

 /* Subsections : Gallery
 ----------------------------------------------------- */
-#gallery {
-    background-color: green;
-}
-#gallery .gallerycell {
-    float: left;
-    width: 130px;
-    height: 150px;
-    text-align: center;
-    margin: 0;
-    background-color: white;
-    border-top: solid 1px #999;
-    border-right: solid 1px #999;
-}
-#gallery .thumbnail {
-    font-size: smaller;
-    margin: 3em auto;
-}
 #indivgallery h4 {
    margin-bottom:1em;
 }
 #indivgallery .thumbnail {
    margin:0;
    float:left;
-    width:160px;
-    height:220px;
+    width:130px;
+    height:150px;
    text-align:center;
-    background-color: #F6F2EE;
-}
-#gallery div.indexno {
-    float: right;
-    font-size: large;
-    text-align: center;
-    background-color: #CCC;
-    color: #555;
-    margin: 0;
-}
-#indivgallery div.date {
-    float: right;
-    width: 1.8em;
-    font-size: large;
-    text-align: center;
-    background-color: #CCC;
-    color: #555;
-}
-#indivgallery .thumbnail ul {
-    font-size: smaller;
-    list-style: none;
-    padding: 0px;
-}
-#indivgallery .thumbnail ul li:first-child {
-    border-style: none;
-}
-#indivgallery .thumbnail ul li {
-    border-top: dashed 1px #CCC;
-    border-top-style: dashed;
-    padding-top: 0.5em;
-    padding-bottom: 0.5em;
-}
-#gallery img {
-    border: solid 1px #999;
 }
 #indivgallery .thumbnail a {
    display:block;
    margin:0;
    padding:0;
    background:none;
-    word-wrap: break-word;
 }
 #indivgallery .thumbnail a img {
    margin:0;
@@ -1307,74 +957,30 @@ div#Addresses table.infolist tr td a, div#Addresses table.infolist tr td p a {
    margin:0 auto;
    padding:0;
 }
-div.snapshot div.thumbnail {
-    text-align: center;
-}

 /* Subsections : Narrative
 ----------------------------------------------------- */
 div.narrative {
    padding-bottom:0;
 }
-i.NoteType {
-    font-weight: bold;
-    font-size: .8em;
-}
 i + div.grampsstylednote p {
    margin: 0.1em 0 0.2em 0;
 }
-div.grampsstylednote p {
-    padding-bottom: 0.6em;
-}
-div.grampsstylednote a {
-    text-decoration: underline;
-    font-weight: bold;
-    color: #542;
-}
-div.grampsstylednote a:visited {
-    color: red;
-}
 .narrative p {
    margin: 0.1em 0 0.2em 0;
    font:normal .9em/1.4em sans-serif;
 }

-/* Subsection : References
+/* Subsections : References
 ----------------------------------------------------- */
-#references ol {
-    margin-left: 3em;
-}

 /* Subsections : Source References
 ----------------------------------------------------- */
-#sourcerefs ol#srcr {
-    counter-reset: itema;
-    list-style-type: none;
-    display: block;
-    margin-top: .1em;
+div#sourcerefs ol {
+    list-style-type:decimal;
 }
-#sourcerefs ol#citr {
-    counter-reset: itemb;
-    list-style-type: none;
-}
-#sourcerefs ol#srcr > li::before {
-    content: counter(itema);
-}
-#sourcerefs ol#citr > li::before {
-    content: counter(itema)counter(itemb, lower-alpha);
-}
-#sourcerefs ol#srcr > li {
-    counter-increment: itema;
-    margin-top: .1em;
-}
-#sourcerefs ol#citr > li {
-    counter-increment: itemb;
-    margin-top: .1em;
-}
-#sourcerefs ol#citr ul {
-    list-style: none;
-    display: inline-block;
-    vertical-align: top;
+div#sourcerefs ol li ol {
+    list-style-type:lower-alpha;
 }

 /* Subsections : Summary Area
@@ -1464,9 +1070,6 @@ div#pedigree {
    background-color: #542;
    border-top: solid 8px #A97;
 }
-#footer > * {
-    font-size: 80%;
-}
 #footer a, #footer a:visited {
    text-decoration: none;
    color: #C1B398;
@@ -1494,7 +1097,7 @@ div#pedigree {
    margin-right: 10px;
 }
 #footer p#copyright img {
-    margin-right: 10px;
+    margin-right: 10px[
 }
 #user_footer {
    width: 70%;
@@ -1508,12 +1111,6 @@ div#pedigree {
    padding: 0;
 }

-/* Updates
----------------------------------------------------- */
-#Updates table.list td.date {
-    width: 20%;
-}
-
 /* Calendar Styles
 -------------------------------------------------------------------------------------------- */
 /* Calendar : General */
@@ -1548,15 +1145,18 @@ body#WebCal {
    color:#542;
    padding:.3em 0 .2em 0;
    background-color:#FFF;
-    vertical-align: top;
-    height: 2em;
 }
-.calendar thead tr th.weekend,
+#CreatorInfo {
+    float:right;
+    color:#FFF;
+    margin:-24px 10px 0 0;
+}
+.calendar thead tr th.weekend, 
 .calendar thead tr th.weekday {
    color:#542;
    background-color:#A97;
 }
-.calendar thead tr th.saturday,
+.calendar thead tr th.saturday, 
 .calendar thead tr th.sunday { }
 .calendar tfoot tr td {
    padding:.7em 5% 1em 5%;
@@ -1570,12 +1170,14 @@ body#WebCal {

 /* Calendar : Date Numeral */
 .calendar tbody tr td div.date {
-    float:none;
+    float:right;
    display:block;
+    width:1.8em;
    font-size:1.2em;
    line-height:100%;
    text-align:center;
    color:#542;
+    margin:0 0 0 .5em;
    padding:.2em 0;
    background-color:#F6F2EE;
 }
@@ -1638,25 +1240,26 @@ body#WebCal {
 .calendar tbody tr td.highlight div.date {
    color:#0A65B5;
    background-color:#C2E1FE;
-    border: 5px solid rgba(255,255,255,.0);
 }

 /* Calendar : Previous-Next Month */
-.calendar tbody tr td.previous,
-.calendar tbody tr td.next,
-.calendar tbody tr td.previous div.date,
+.calendar tbody tr td.previous, 
+.calendar tbody tr td.next, 
+.calendar tbody tr td.previous div.date, 
 .calendar tbody tr td.next div.date {
    color:#A97;
    background-color:#F6F2EE;
-    border: 5px solid rgba(255,255,255,.0);
 }

 /* Calendar : Full Year */
 body#fullyearlinked div.content {
+    width:963px;
    margin:0 auto;
-    padding:5px 0 2px 2px;
+    padding:15px 0 2px 2px;
 }
 body#fullyearlinked table.calendar {
+    float:left;
+    width:320px;
    height:18em;
    border:solid 1px #7D5925;
 }
@@ -1670,99 +1273,3 @@ body#fullyearlinked table.calendar thead tr th.monthName {
 body#fullyearlinked table.calendar tbody tr td {
    height:3em;
 }
-body#OneDay h3 {
-    font-size: xx-large;
-    vertical-align: top;
-    height: 2em;
-}
-#WebCal table.calendar tfoot {
-    display: none;
-}
-#WebCal table.calendar tr td {
-    word-wrap: break-word;
-    border-bottom:solid 1px #7D5925;
-    border-right:solid 1px #7D5925;
-    padding-left: 0px;
-}
-#WebCal .calendar tr td .empty {
-    border: 5px solid rgba(255,255,255,.0);
-}
-#WebCal .calendar tr td .clickable {
-    border: 5px solid rgba(255,255,255,.0);
-}
-#WebCal .calendar tr td .clickable:hover {
-    display: block;
-    overflow:auto;
-    word-wrap: break-word;
-    cursor: text;
-    border-radius: 10px 0px 10px 10px;
-    border: 5px solid #453619;
-    padding: 0px;
-}
-body#fullyearlinked #YearGlance tbody td {
-    height:48px;
-    vertical-align: middle;
-    text-align: center;
-}
-body#fullyearlinked #YearGlance tbody td.previous {
-    border-width:0px 1px 1px 0px;
-    border-color:#C1B398;
-}
-body#fullyearlinked #YearGlance tbody td.next {
-    border-width:1px 0px 0px 1px;
-    border-color:#C1B398;
-}
-body#fullyearlinked #YearGlance tbody td .date {
-    font-size: 30px;
-    vertical-align: middle;
-    text-align: center;
-    border-radius: 45px;
-    margin-left: 5px;
-    margin-right: 5px;
-    float: none;
-    border: 5px solid rgba(0,0,0,.0);
-}
-body#fullyearlinked #YearGlance tbody td:hover .date {
-    border-radius: 45px;
-    border: 5px solid;
-}
-h4 button.icon {
-    width: 0.9em;
-    border: 0px solid;
-    padding: 0;
-    opacity: 1;
-    transform: rotate(90deg);
-    transition: transform 200ms ease-out 0s;
-    background: transparent;
-}
-h4 button.icon-close {
-    transform: rotate(90deg);
-    transition: transform 0.2s linear;
-}
-h4 button.icon-open {
-    transform: rotate(180deg);
-    transition: transform 0.2s linear;
-}
-svg {
-  fill: #542;
-}
-/* Go to the top of the page */
-#gototop {
-  display: none;
-  position: fixed;
-  bottom: 10px;
-  right: 20px;
-  z-index: 999;
-  border: none;
-  background-color: transparent;
-  color: black;
-  cursor: pointer;
-  border-radius: 4px;
-  width: 40px;
-  height: 40px;
-  padding: 0px;
-}
-
-#gototop:hover {
-  background-color: #696969;
-}
@@ -1,22 +1,22 @@
 /*
-*******************************************************************************
+**************************************************************************************************
 Copyright Holder and License
-*******************************************************************************
+**************************************************************************************************
 GRAMPS Cascading Style Sheet
 Style Name: Print Style Sheet
 Style Author: Jason M. Simanek (2008)
 Modified by Rob G. Healey, July 2008

-*******************************************************************************
+**************************************************************************************************
 This website was created with GRAMPS <http://www.gramps-project.org/>
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
 GRAMPS is a Free Software Project for Genealogy, offering a professional
 genealogy program, and a wiki open to all. It is a community project, created,
 developed and governed by genealogists.

 'Go to <http://gramps-project.org/> to learn more!

-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
 Copyright (C) 2008-2011 Rob G. Healey <robhealey1@gmail.com>

 This file is part of the GRAMPS program.
@@ -31,21 +31,21 @@ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.

 You should have received a copy of the GNU General Public License along with
 GRAMPS. If not, see <http://www.gnu.org/licenses/>.
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------

 Color Palette
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
 gray            #A7A7A7
 red             #520
 black           #000
 white           #FFF
-------------------------------------------------------------------------------
+---------------------------------------------------------------------------------------------------


 NarrativeWeb Styles
-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------- 

- General Elements
+ General Elements 
 ----------------------------------------------------- */

 body {
@@ -419,7 +419,7 @@ body#ThumbnailPreview div#references table.infolist tbody tr td.ColumnName {
    width: 90%;
 }

-/* Contact
+/* Contact 
 ----------------------------------------------------- */
 #researcher {
    margin:16pt 0 0 0;
@@ -456,13 +456,13 @@ body#ThumbnailPreview div#references table.infolist tbody tr td.ColumnName {
    clear:left;
 }

-/* Subsections
+/* Subsections 
 ----------------------------------------------------- */
 #Home, #Introduction, #Download, #Contact {
    padding:3em 20px;
 }

-/* Subsections : Events
+/* Subsections : Events 
 ----------------------------------------------------- */
 #IndividualDetail .ColumnValue {
    padding:4pt 0;
@@ -472,7 +472,7 @@ body#ThumbnailPreview div#references table.infolist tbody tr td.ColumnName {
    margin:1pt 0 0 18pt;
 }

-/* Subsections : Gallery
+/* Subsections : Gallery 
 ----------------------------------------------------- */
 #indivgallery h4 {
    margin-bottom:1em;
@@ -532,7 +532,7 @@ table.attrlist tbody tr td.ColumnSources {
    width: 10%;
 }

-/* Subsections : Pedigree
+/* Subsections : Pedigree 
 ----------------------------------------------------- */
 #pedigree a {
    text-decoration:none;
@@ -574,7 +574,7 @@ table.attrlist tbody tr td.ColumnSources {
    font-weight:bold;
 }

-/* Subsections : Ancestors Tree
+/* Subsections : Ancestors Tree 
 ----------------------------------------------------- */
 #tree {
    page-break-before:always;
@@ -674,7 +674,7 @@ p#createdate {
    display: none;
 }

-/* Calendar Styles
+/* Calendar Styles 
 -------------------------------------------------------------------------------------------- */
 /* Calendar : General */
 body#WebCal h1#SiteTitle {
@@ -719,6 +719,10 @@ body#WebCal h1#SiteTitle {
    padding:5pt;
    border-width:0;
 }
+#CreatorInfo {
+    float:right;
+    margin:0 10px 0 0;
+}
 body#WebCal a {
    text-decoration:none;
    color:#000;
@@ -791,9 +795,9 @@ body#WebCal a {
 }

 /* Calendar : Previous-Next Month */
-.calendar tbody tr td.previous,
-.calendar tbody tr td.next,
-.calendar tbody tr td.previous div.date,
+.calendar tbody tr td.previous, 
+.calendar tbody tr td.next, 
+.calendar tbody tr td.previous div.date, 
 .calendar tbody tr td.next div.date {
    font-weight:normal;
    font-size:12pt;
@@ -10,7 +10,7 @@
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful, 
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
@@ -20,18 +20,17 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

-*******************************************************************************
+**************************************************************************************************
 GRAMPS Cascading Style Sheet
 Style Name: Web_Navigation-Vertical.css Stylesheet
-*******************************************************************************
+***************************************************************************************************

 # $Id: Web_Navigation-Vertical.css 15241 2010-04-19 11:07:00Z robhealey1 $

 Body Element
 ----------------------------------------------------- */
-body {
-    background: -webkit-gradient (linear, left top, left bottom,
-                                  from(#ccc), to(#fff));
+body { background: -webkit-gradient
+           (linear, left top, left bottom, from(#ccc), to(#fff));
    color: #000;
    padding: 60px 0px 0px 146px;
 }
@@ -10,7 +10,7 @@
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful, 
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
@@ -20,15 +20,15 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

-*******************************************************************************
+**************************************************************************************************
 GRAMPS Cascading Style Sheet
 Style Name: Visually Impaired Stylesheet
 Style Author: Jason M. Simanek (2008)
-*******************************************************************************
+***************************************************************************************************

-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
 Color Palette
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
 brown dark      #453619, #542
 brown light     #C1B398
 gray            #696969
@@ -47,7 +47,7 @@ Females     Web_Gender_Female.png


 NarrativeWeb Styles
---------------------------------------------------------------------------- */
+--------------------------------------------------------------------------------------------  */
 div#alphabet ul li {
    background-color: #6AF364;
 }
@@ -96,6 +96,8 @@ img {
    background:none;
 }
 .content {
+    overflow: auto;
+    width:965px;
    margin:0 auto;
    padding-bottom: .2em;
 }
@@ -347,7 +349,7 @@ table.infolist tbody tr td.ColumnPartner a {
 table.infolist tbody tr td.ColumnParents {
    font-size:.9em;
 }
-table.infolist tbody tr td.ColumnParents span.father,
+table.infolist tbody tr td.ColumnParents span.father, 
 table.infolist tbody tr td.ColumnParents span.mother {
    display:block;
 }
@@ -364,7 +366,7 @@ table.infolist tbody tr td.ColumnParents span.mother:before {
 #SurnameDetail p#description {
    padding-top:0;
 }
-table.surnamelist thead tr th.ColumnSurname,
+table.surnamelist thead tr th.ColumnSurname, 
 #Surnames table.surnamelist tbody tr td.ColumnSurname {
    width:50%;
 }
@@ -389,11 +391,11 @@ table.surnamelist tbody tr td.ColumnLetter a {
 table.surnamelist tbody tr td.ColumnSurname {
    background-color: #FFF;
 }
-table#SortByName thead tr th.ColumnSurname,
+table#SortByName thead tr th.ColumnSurname, 
 table#SortByCount thead tr th.ColumnQuantity {
    background-color: #C1B398;
 }
-table#SortByName thead tr th.ColumnSurname a:after,
+table#SortByName thead tr th.ColumnSurname a:after, 
 table#SortByCount thead tr th.ColumnQuantity a:after {
    content:" ↓";
 }
@@ -441,7 +443,7 @@ table.surname tbody tr td.ColumnPartner a {
    display:block;
    padding:.6em 10px .6em 0px;
 }
-table.surname thead tr th.ColumnParents,
+table.surname thead tr th.ColumnParents, 
 table.surname tbody tr td.ColumnParents {
    width:25%;
 }
@@ -463,7 +465,7 @@ div#Individuals table.IndividualList tbody tr td a {
    display: block;
    padding: .6em 10px;
 }
-div#Individuals table.IndividualList tbody tr td.ColumnSurname a:hover,
+div#Individuals table.IndividualList tbody tr td.ColumnSurname a:hover, 
 div#Individuals table.IndividualList tbody tr td.ColumnSurname a:active {
    cursor:default;
    color: #000;
@@ -664,7 +666,7 @@ div#EventList table.alphaevent tbody tr td.ColumnDate {
 div#EventList table.alphaevent tbody tr td.ColumnPerson {
    width: 60%;
 }
-div#EventList table.alphaevent tbody tr td.ColumnPerson span.father,
+div#EventList table.alphaevent tbody tr td.ColumnPerson span.father, 
 div#EventList table.alphaevent tbody tr td.ColumnPerson span.mother {
    display:block;
 }
@@ -694,7 +696,7 @@ div#EventDetail table.eventlist tbody tr td.ColumnDate {
 div#EventDetail table.eventlist tbody tr td.ColumnPerson {
    background-color: #D8F3D6;
 }
-
+    
 /* Events
 ----------------------------------------------------- */
 #EventList table.infolist tr.BeginType td {
@@ -707,7 +709,7 @@ div#EventDetail table.eventlist tbody tr td.ColumnPerson {
 #EventDetail table.infolist tr td a {
    display: inline;
 }
-#EventList table.infolist tr td span.father,
+#EventList table.infolist tr td span.father, 
 #EventList table.infolist tr td span.mother,
 #EventDetail table.infolist tr td span.father,
 #EventDetail table.infolist tr td span.mother {
@@ -729,20 +731,6 @@ div#EventDetail table.eventlist tbody tr td.ColumnPerson {
 #EventDetail table.infolist tr td span.mother:last-child:after {
    content: "";
 }
-#IndividualDetail div table.eventlist td.ColumnSources {
-    width: 5%;
-}
-#IndividualDetail div table.eventlist td.ColumnDate {
-    width: 15%;
-}
-#IndividualDetail div table.eventlist td.ColumnEvent {
-    width: 8%;
-}
-#IndividualDetail div table.eventlist td.ColumnEvent,
-#IndividualDetail div table.eventlist td.ColumnDate,
-#IndividualDetail div table.eventlist td.ColumnPlace {
-    font-weight: bold;
-}

 /* Gallery
 ----------------------------------------------------- */
@@ -911,7 +899,7 @@ body#ThumbnailPreview div#references table.infolist tbody tr td.ColumnName {
    text-decoration:none;
 }

-/* Download
+/* Download 
 ----------------------------------------------------- */
 div#Download {
    margin: 0;
@@ -924,7 +912,7 @@ div#Download table.download {
 div#Download table.download tbody tr#Row02 {
    border-bottom: solid 1px #000;
 }
-div#Download table.download tbody tr td {
+div#Download table.download tbody tr td { 
    border: solid 1px #000;
    text-align: left;
    padding: 5px 0px 5px 0px;
@@ -1209,7 +1197,6 @@ div#families table.infolist tbody tr td.ColumnValue {
 }
 div#families table.infolist tbody tr td.ColumnValue p {
    margin-top:0;
-    margin-left:0;
 }
 div#families table.infolist tbody tr td.ColumnValue ol {
    margin:0;
@@ -1499,10 +1486,19 @@ body#WebCal {
    color: #542;
    padding:.3em 0 .2em 0;
    background-color: #FFF;
-    vertical-align: top;
-    height: 2em;
 }
-.calendar thead tr th.weekend,
+#CreatorInfo {
+    float:right;
+    color: #FFF;
+    margin:-24px 10px 0 0;
+}
+#CreatorInfo a {
+    color: #FFF;
+}
+#CreatorInfo a:hover {
+    color: #FFF;
+}
+.calendar thead tr th.weekend, 
 .calendar thead tr th.weekday {
    font-style:italic;
    color: #000;
@@ -1594,9 +1590,9 @@ body#WebCal {
 }

 /* Calendar : Previous-Next Month */
-.calendar tbody tr td.previous,
-.calendar tbody tr td.next,
-.calendar tbody tr td.previous div.date,
+.calendar tbody tr td.previous, 
+.calendar tbody tr td.next, 
+.calendar tbody tr td.previous div.date, 
 .calendar tbody tr td.next div.date {
    color: #333;
    background-color: #D8F3D6;
@@ -1662,7 +1658,7 @@ table.oneday tbody tr td.ColumnText {
    width: 85%;
 }
 table.oneday tbody tr td.ColumnEvent {
-    width: 10%;
+    width; 10%;
 }

 /* PlaceMaps
@@ -9,7 +9,7 @@
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful, 
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
@@ -20,10 +20,10 @@
 #
 # $Id: $
 #
-*******************************************************************************
+**************************************************************************************************
 GRAMPS Cascading Style Sheet
 Style Name: Combined Ancestor Tree Style Sheet
-*******************************************************************************
+***************************************************************************************************
 #
 ===== Ancestor Graph Color Scheme =====
 Males       #BCEAF6
@@ -33,30 +33,27 @@ Unknown     #000
 ===== Web Graphics =====
 Males       Web_Gender_Male.png
 Females     Web_Gender_Female.png
-# -------------------------------------------------------------------------- */
-/* Subsections : Ancestors Tree -------------------------------------------- */
+# ------------------------------------------------------------------------------------------------- */
+
+/* Subsections : Ancestors Tree
+----------------------------------------------------- */
 #tree {
+    page-break-before:always;
    margin:0;
    padding:0;
    background:none;
-    overflow-x:auto;
-}
-#toggle_anc {
-    margin:0;
-    padding:0;
-    background:none;
-    overflow-x:auto;
 }
 #treeContainer {
    position:relative;
    display: table-cell;
    vertical-align: middle;
+    overflow: visible;
    z-index:1;
 }
 #treeContainer div.boxbg {
    position:absolute;
-    margin:0px;
-    padding:0px;
+    margin:0;
+    padding:0;
    background:none;
 }
 #treeContainer div.boxbg a,
@@ -64,43 +61,41 @@ Females     Web_Gender_Female.png
    position:relative;
    z-index:10;
    display:block;
-    font:normal 1.1em/1.4em sans-serif;
+    font:normal .7em/1.4em sans-serif;
    text-align:center;
-    word-break:break-word;
-    word-wrap:break-word;
    text-decoration:none;
    color: #00029D;
-    width:280px;
-    min-height: 70px;
+    width:118px;
+    padding:5px 20px 7px 20px;
    margin-left:16px;
-    border: solid 2px #000;
-    border-radius: 10px;
+    background-color: #FFF;
+    border: solid 1px #000;
 }
 #treeContainer div.boxbg a.noThumb,
-#treeContainer div.AncCol4 a,
+#treeContainer div.AncCol3 a, 
+#treeContainer div.AncCol4 a, 
+#treeContainer div.AncCol3 span.unlinked, 
 #treeContainer div.AncCol4 span.unlinked {
    margin-top:10px;
-    float: right;
 }
 #treeContainer div.boxbg a:hover {
    position:relative;
    z-index:999;
-    font-size:1.3em;
-    word-break:break-word;
-    word-wrap:break-word;
+    font-size:1em;
    text-decoration:none;
    color: #00029D;
-    width:400px;
+    width:190px;
    margin-left:-20px;
-    padding: 0px 0px 0px 40px;
+    padding:10px 25px 12px 25px;
+    border: solid 2px #000;
 }
-#treeContainer div.boxbg a:hover,
+#treeContainer div.boxbg a:hover, 
+#treeContainer div.AncCol3 a:hover, 
 #treeContainer div.AncCol4 a:hover {
    margin-top:-44px;
 }
 #treeContainer div.boxbg a.noThumb:hover {
    margin-top:0;
-    padding-left: 10px;
 }
 #treeContainer div.AncCol0 a:hover {
    margin-left:12px;
@@ -110,80 +105,51 @@ Females     Web_Gender_Female.png
 }
 #treeContainer div.boxbg span.thumbnail {
    display:block;
-    position: absolute;
-    max-width:85px;
-    max-height:75px;
-    left: 3px;
-    top: 3px;
+    max-width:80px;
+    max-height:65px;
+    margin:0 auto;
+    padding:4px 0;
 }
-#treeContainer div.boxbg a.thumbnail table td.img {
-    padding-right: 5px;
+#treeContainer div.boxbg span.thumbnail img {
+    max-width:80px;
+    max-height:65px;
+    margin:0 auto;
 }
-#treeContainer div.boxbg a.thumbnail:hover table td.img {
-    padding-right: 9px;
+#treeContainer div.boxbg a:hover span.thumbnail, #treeContainer div.boxbg a:hover span.thumbnail img {
+    height:80px;
 }
-#treeContainer div.boxbg a.thumbnail table td.name {
-    padding-top:3px;
-    padding-left: 2px;
-    padding-right: 23px;
-    width: 90%;
-}
-#treeContainer div.boxbg a.thumbnail img {
-    margin-left:0px;
-    padding-left: 0px;
-    border-radius: 5px;
-}
-#treeContainer div.boxbg a.thumbnail:hover img {
-    max-height:90%;
-    margin-left:5px;
-    position: absolute;
-    left: 0px;
-    top: 4px;
-    border-radius: 5px;
-}
-#treeContainer div.boxbg table td:first-child, table th:first-child {
-    padding-left: 5px;
-    padding-top: 5px;
-}
-#IndividualDetail div.subsection table tr td:first-child {
-    padding-left: 5px;
-    padding-top: 5px;
-}
-#treeContainer #treeContainer div.AncCol4 span.thumbnail {
+#treeContainer div.AncCol3 span.thumbnail, #treeContainer div.AncCol4 span.thumbnail {
    display:none;
 }
 #treeContainer div.boxbg a:hover span.thumbnail {
    display:block;
 }
+
 #treeContainer div.boxbg span.fullname {
    display: none;
 }
+
 #treeContainer div.boxbg span.shortname {
    display: inline;
 }
+
 #treeContainer div.boxbg a:hover span.fullname {
    display: inline;
 }
+
 #treeContainer div.boxbg a:hover span.shortname {
    display: none;
 }
-#treeContainer div.boxbg a:hover {
-    float: right;
-    margin-top: 10px;
-    border: solid 4px #000;
-}
+
+
 #treeContainer div.male a,
 #treeContainer div.male span.unlinked {
    background:url(../images/Web_Gender_Male.png) #BCEAF6 no-repeat top right;
 }
-#treeContainer div.female a,
+#treeContainer div.female a, 
 #treeContainer div.female span.unlinked {
    background:url(../images/Web_Gender_Female.png) #FFC0CB no-repeat top right;
 }
-#treeContainer div.other a,
-#treeContainer div.other span.unlinked {
-    background:url(../images/Web_Gender_Other.png) #94EF9E no-repeat top right;
-}
 #treeContainer div.unknown a,
 #treeContainer div.unknown span.unlinked {
    background-color: #000;
@@ -1,158 +0,0 @@
-/*
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright 2023-     Serge Noiraud
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, 
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-**************************************************************************************************
-GRAMPS cascading style sheet for common lightbox
-Style Name: n/a (used by many different styles)
-Style Author: Serge Noiraud based on W3C: https://www.w3schools.com/howto/howto_js_lightbox.asp
-**************************************************************************************************/
-
-.MediaRow {
-  z-index: 999;
-}
-
-.MediaRow > .MediaColumn {
-  padding: 0 8px;
-}
-
-.MediaRow:after {
-  content: "";
-  display: table;
-  clear: both;
-}
-
-.MediaColumn {
-  float: left;
-  width: 15%;
-  height: 100px;
-}
-
-/* The Modal (background) */
-.ModalClass {
-  display: none;
-  position: fixed;
-  z-index: 900;
-  padding-top: 5px;
-  left: 0px;
-  top: 0px;
-  width: 100%;
-  height: 100%;
-  overflow: auto;
-}
-
-/* Modal Content */
-.ModalContent {
-  position: relative;
-  background-color: #fefefe;
-  margin: auto;
-  padding: 0;
-  width: 95%;
-}
-
-/* The Close Button */
-.MediaClose {
-  color: black;
-  position: absolute;
-  z-index: 960;
-  top: 10px;
-  right: 1%;
-  font-size: 48px;
-  font-weight: bold;
-}
-
-.MediaClose:hover,
-.MediaClose:focus {
-  color: #999;
-  text-decoration: none;
-  cursor: pointer;
-}
-
-.MediaSlide {
-  display: none;
-}
-
-.MediaCursor {
-  cursor: pointer;
-}
-
-/* Next & previous buttons */
-.MediaPrev,
-.MediaNext {
-  cursor: pointer;
-  position: fixed;
-  width: auto;
-  top: 300px;
-  padding: 16px;
-  margin-top: -50px;
-  color: black;
-  font-weight: bold;
-  font-size: 48px;
-  transition: 0.6s ease;
-  border-radius: 0 3px 3px 0;
-  user-select: none;
-  -webkit-user-select: none;
-  background-color: rgba(255, 255, 255, 0.3);
-}
-
-/* Position the "next button" to the right */
-.MediaNext {
-  right: 2%;
-  border-radius: 3px 0 0 3px;
-}
-
-/* On hover, add a black background color with a little bit see-through */
-.MediaPrev:hover,
-.MediaNext:hover {
-  background-color: rgba(0, 0, 0, 0.1);
-}
-
-/* Number text (1/3 etc) */
-.MediaNumber {
-  font-size: 36px;
-  font-weight: bold;
-  padding: 8px 12px;
-  position: absolute;
-  color: black;
-  background-color: rgba(255, 255, 255, 0.4);
-}
-
-/* Less whitespace on smaller real estate. */
-@media only screen and (max-width: 1080px) {
-  .MediaNumber {
-    font-size: 12px;
-    }
-  .MediaPrev,
-  .MediaNext {
-    top: 100px;
-    font-size: 24px;
-    }
-  .MediaClose {
-    font-size: 36px;
-    }
-}
-
-img.hover-shadow {
-  transition: 0.3s;
-}
-
-.hover-shadow:hover {
-  box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
-}
@@ -1,60 +0,0 @@
-/*
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright 2023-     Serge Noiraud
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, 
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-**************************************************************************************************
-GRAMPS javascript for lightbox feature
-Style Name: n/a (used by many different styles)
-Javascript Author: Serge Noiraud based on W3C: https://www.w3schools.com/howto/howto_js_lightbox.asp
-**************************************************************************************************/
-
-// Open the Modal
-function openModal() {
-  document.getElementById("MediaModal").style.display = "block";
-}
-
-// Close the Modal
-function closeModal() {
-  document.getElementById("MediaModal").style.display = "none";
-}
-
-var slideIndex = 1;
-showSlides(slideIndex);
-
-// Next/previous controls
-function plusSlides(n) {
-  showSlides(slideIndex += n);
-}
-
-// Thumbnail image controls
-function currentSlide(n) {
-  showSlides(slideIndex = n);
-}
-
-function showSlides(n) {
-  var i;
-  var slides = document.getElementsByClassName("MediaSlide");
-  if (n > slides.length) {slideIndex = 1}
-  if (n < 1) {slideIndex = slides.length}
-  for (i = 0; i < slides.length; i++) {
-    slides[i].style.display = "none";
-  }
-  slides[slideIndex-1].style.display = "block";
-}
@@ -31,7 +31,7 @@ body#FamilyMap {
    margin-left: 10px;
    margin-right: 10px;
    border: solid 4px #000;
-    margin: 20px auto;
+    margin: 0px auto;
    width: 800px;
    height: 400px;
    max-width: 90%;
@@ -64,114 +64,5 @@ div#FamilyMapDetail div#references table.infolist {
    width: 100%;
 }
 div#FamilyMapDetail div#references table.infolist tbody tr td.ColumnPlace {
-    width: 70%;
-}
-
-
-/*    Subsection: popup
------------------------------------------------------ */
-#map_canvas .ol-popup {
-  position: absolute;
-  background-color: white;
-  -webkit-filter: drop-shadow(0 1px 4px rgba(0,0,0,0.2));
-  filter: drop-shadow(0 1px 4px rgba(0,0,0,0.2));
-  padding: 5px;
-  border-radius: 8px;
-  border: 2px solid #111111;
-  bottom: 8px;
-  left: -10px;
-  min-width: 500px;
-}
-#map_canvas .ol-popup:after, #map_canvas .ol-popup:before {
-  top: 100%;
-  border: solid transparent;
-  height: 0;
-  width: 0;
-  position: absolute;
-  pointer-events: none;
-}
-#map_canvas .ol-popup:after {
-  border-top-color: white;
-  border-width: 10px;
-  left: 48px;
-  margin-left: -10px;
-}
-#map_canvas .ol-popup:before {
-  border-top-color: #cccccc;
-  border-width: 11px;
-  left: 48px;
-  margin-left: -11px;
-}
-#map_canvas .ol-popup-closer {
-  text-decoration: none;
-  position: absolute;
-  top: 2px;
-  right: 8px;
-}
-#map_canvas .ol-popup-title {
-  background-color: #ededed;
-  padding: 0 0.5em;
-}
-#map_canvas .ol-popup-content {
-  color: #111;
-  font: bold 0.9em sans-serif;
-  max-height: 200px;
-  overflow-y: auto;
-  padding: 5px 0.5em 5px 0.5em;
-}
-#map_canvas .thumbnail {
-  padding: 5px 5px;
-  text-align: center;
-}
-#map_canvas img {
-  max-height: 300px;
-  max-width: 400px;
-}
-#map_canvas .ol-popup-content a {
-  color: #111;
-}
-#map_canvas .ol-popup-content a:visited {
-  color: green;
-}
-#map_canvas .ol-popup-content a:hover {
-  color: red;
-}
-#map_canvas .ol-popup-closer:after {
-  content: "✖";
-}
-#map_canvas .ol-control {
-  position: absolute;
-  background-color: rgba(255,255,255,0.1);
-  bottom: .1em;
-  left: .1em;
-  height: 4%;
-  width: 100%;
-  margin-top: 1px;
-  margin-bottom: 1px;
-  padding-left: 1px;
-}
-#map_canvas .ol-rotate {
-  display: none;
-}
-#map_canvas .ol-zoom, #map_canvas .ol-zoom-in, #map_canvas .ol-zoom-out {
-  top: .5em;
-  left: .5em;
-  border-left-width: 1px;
-  padding-left: 1px;
-  padding-right: 1px;
-}
-#map_canvas .ol-attribution ul {
-  list-style-type: none;
-  font-size:0.8em;
-  float: left;
-  margin-top: 1px;
-  margin-bottom: 1px;
-  padding-left: 5px;
-}
-#map_canvas .ol-attribution li {
-  float: left;
-  padding-left: 5px;
-}
-#map_canvas .ol-attribution button {
-    display: none;
+    width: 40%;
 }
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+  <id>gramps.desktop</id>
+  <metadata_license>CC0</metadata_license>
+  <name>Gramps</name>
+  <summary>Genealogical research program</summary>
+
+  <description>
+    <_p>Gramps is a genealogy program that is both intuitive for hobbyists and feature-complete for professional genealogists.</_p>
+    <_p>It gives you the ability to record the many details of the life of an individual as well as the complex relationships between various people, places and events.</_p>
+    <_p>All of your research is kept organized, searchable and as precise as you need it to be.</_p>
+  </description>
+
+  <url type="homepage">https://gramps-project.org/</url>
+  <url type="bugtracker">https://gramps-project.org/bugs/</url>
+  <url type="help">https://gramps-project.org/wiki/index.php?title=Main_page</url>
+  <project_license>GPL-2.0+</project_license>
+  <developer_name>Gramps Development Team</developer_name>
+
+  <screenshots>
+    <screenshot width="1226" height="740">http://www.gramps-project.org/wiki/images/5/5f/AppData1.png</screenshot>
+    <screenshot width="1226" height="740">http://www.gramps-project.org/wiki/images/6/68/AppData2.png</screenshot>
+    <screenshot type="default" width="1226" height="740">http://www.gramps-project.org/wiki/images/e/e9/AppData3.png</screenshot>
+    <screenshot width="1226" height="740">http://www.gramps-project.org/wiki/images/6/68/AppData4.png</screenshot>
+    <screenshot width="1226" height="740">http://www.gramps-project.org/wiki/images/5/50/AppData5.png</screenshot>
+  </screenshots>
+
+  <provides>
+    <binary>gramps</binary>
+  </provides>
+
+</component>
@@ -0,0 +1,7 @@
+gramps
+	command=gramps
+	name=GRAMPS
+	can_open_multiple_files=false
+	expects_uris=false
+	requires_terminal=false
+	mime_types=application/x-gramps,application/x-gedcom,application/x-gramps-package,application/x-gramps-xml,application/x-geneweb
@@ -1,21 +0,0 @@
-.lozenge {
-  font-size: small;
-  color: #ffffff;
-  background-color: #0d6efd;
-  padding: 3px;
-  border-radius: 6px;
-  box-shadow: 0px 0px 6px black;
-}
-
-.addon-row {
-  border-width: 1px;
-  border-style: solid;
-  border-color: alpha(currentColor, .2);
-  border-radius: 10px;
-  margin: 1px;
-}
-
-paned>separator {
-  margin: 0px;
-  padding: 1px;
-}
@@ -0,0 +1,13 @@
+[Desktop Entry]
+_Name=Gramps
+_GenericName=Genealogy System
+_X-GNOME-FullName=Gramps Genealogy System
+_Comment=Manage genealogical information, perform genealogical research and analysis
+Icon=gramps
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=GTK;Office;
+_Keywords=Genealogy;Family History;Research;Family Tree;GEDCOM;
+MimeType=application/x-gramps;application/x-gedcom;application/x-gramps-package;application/x-gramps-xml;
+Exec=gramps %F
@@ -0,0 +1,54 @@
+application/x-gramps:
+	_description=Gramps database
+	default_action_type=application
+	short_list_application_ids=gramps
+	short_list_application_ids_for_novice_user_level=gramps
+	short_list_application_ids_for_intermediate_user_level=gramps
+	short_list_application_ids_for_advanced_user_level=gramps
+	category=Documents/Genealogy
+	icon-filename=/usr/share/gramps/gramps.png
+	open=gramps %f
+
+application/x-gramps-package:
+	_description=Gramps package
+	default_action_type=application
+	short_list_application_ids=gramps
+	short_list_application_ids_for_novice_user_level=gramps
+	short_list_application_ids_for_intermediate_user_level=gramps
+	short_list_application_ids_for_advanced_user_level=gramps
+	category=Documents/Genealogy
+	icon-filename=/usr/share/gramps/gramps.png
+	open=gramps %f
+
+application/x-gramps-xml:
+	_description=Gramps XML database
+	default_action_type=application
+	short_list_application_ids=gramps
+	short_list_application_ids_for_novice_user_level=gramps
+	short_list_application_ids_for_intermediate_user_level=gramps
+	short_list_application_ids_for_advanced_user_level=gramps
+	category=Documents/Genealogy
+	icon-filename=/usr/share/gramps/gramps.png
+	open=gramps %f
+
+application/x-gedcom:
+	_description=GEDCOM
+	default_action_type=application
+	short_list_application_ids=gramps
+	short_list_application_ids_for_novice_user_level=gramps
+	short_list_application_ids_for_intermediate_user_level=gramps
+	short_list_application_ids_for_advanced_user_level=gramps
+	category=Documents/Genealogy
+	icon-filename=/usr/share/gramps/gramps.png
+	open=gramps %f
+
+application/x-geneweb:
+	_description=GeneWeb
+	default_action_type=application
+	short_list_application_ids=gramps
+	short_list_application_ids_for_novice_user_level=gramps
+	short_list_application_ids_for_intermediate_user_level=gramps
+	short_list_application_ids_for_advanced_user_level=gramps
+	category=Documents/Genealogy
+	icon-filename=/usr/share/gramps/gramps.png
+	open=gramps %f
@@ -0,0 +1,14 @@
+application/x-gramps
+	ext: grdb
+
+application/x-gramps-xml
+	ext: gramps
+
+application/x-gramps-package
+	ext: gpkg
+
+application/x-gedcom
+	ext: ged gedcom GED GEDCOM
+
+application/x-geneweb
+	ext: gw GW
@@ -3,15 +3,25 @@

 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
  <mime-type type="application/x-gramps">
-    <comment>Gramps database</comment>
+    <_comment>Gramps database</_comment>
    <glob pattern="*.grdb"/>
  </mime-type>
+  <mime-type type="application/x-gedcom">
+    <_comment>GEDCOM</_comment>
+    <glob pattern="*.ged"/>
+    <glob pattern="*.gedcom"/>
+    <glob pattern="*.GED"/>
+    <glob pattern="*.GEDCOM"/>
+    <magic priority="80">
+      <match type="string" value="0 HEAD" offset="0:1"/>
+    </magic>
+  </mime-type>
  <mime-type type="application/x-gramps-package">
-    <comment>Gramps package</comment>
+    <_comment>Gramps package</_comment>
    <glob pattern="*.gpkg"/>
  </mime-type>
  <mime-type type="application/x-gramps-xml">
-    <comment>Gramps XML database</comment>
+    <_comment>Gramps XML database</_comment>
    <glob pattern="*.gramps"/>
    <magic priority="80">
      <match type="string" value="&lt;!DOCTYPE database" offset="0:256"/>
@@ -19,8 +29,9 @@
    </magic>
  </mime-type>
  <mime-type type="application/x-geneweb">
-    <comment>GeneWeb source file</comment>
+    <_comment>GeneWeb source file</_comment>
    <glob pattern="*.gw"/>
+    <glob pattern="*.GW"/>
    <magic priority="80">
      <match type="string" value="fam " offset="0:64"/>
    </magic>
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<!--
+<!-- 
 # Gramps - a GTK+/GNOME based genealogy program
 #
 # Copyright (C) 2001       Graham J. Williams
@@ -24,15 +24,15 @@
 -->

 <!--
-    This is the Document Type Definition file for v1.7.2
+    This is the Document Type Definition file for v1.7.1
    of the GRAMPS XML genealogy data format.
    Please use the following formal public identifier to identify it:

-    "-//GRAMPS//DTD GRAMPS XML V1.7.2//EN"
+    "-//GRAMPS//DTD GRAMPS XML V1.7.1//EN"

    For example:
-        <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.7.2//EN"
-                "http://gramps-project.org/xml/1.7.2/grampsxml.dtd"
+        <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.7.1//EN"
+                "http://gramps-project.org/xml/1.7.1/grampsxml.dtd"
                [...]>
 -->

@@ -61,7 +61,7 @@ DATABASE
 <!ELEMENT database (header, name-formats?, tags?, events?, people?, families?,
                    citations?, sources?, places?, objects?, repositories?,
                    notes?, bookmarks?, namemaps?)>
-<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.7.2/">
+<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.7.1/">


 <!--    ************************************************************
@@ -99,7 +99,7 @@ PEOPLE
 -->

 <!ELEMENT people (person)*>
-<!ATTLIST people
+<!ATTLIST people 
        default CDATA #IMPLIED
        home    IDREF #IMPLIED
 >
@@ -122,7 +122,7 @@ GENDER has values of M, F, or U.
 <!ELEMENT name    (first?, call?, surname*, suffix?, title?, nick?, familynick?, group?,
                  (daterange|datespan|dateval|datestr)?, noteref*, citationref*)>
 <!-- (Unknown|Also Know As|Birth Name|Married Name|Other Name) -->
-<!ATTLIST name
+<!ATTLIST name    
        alt       (0|1) #IMPLIED
        type      CDATA #IMPLIED
        priv      (0|1) #IMPLIED
@@ -155,15 +155,15 @@ Pseudonym|Patrilineal|Matrilineal|Occupation|Location) -->
 <!ATTLIST parentin hlink IDREF #REQUIRED>

 <!ELEMENT personref (citationref*, noteref*)>
-<!ATTLIST personref
+<!ATTLIST personref 
        hlink IDREF #REQUIRED
        priv  (0|1) #IMPLIED
        rel   CDATA #REQUIRED
 >

-<!ELEMENT address ((daterange|datespan|dateval|datestr)?, street?,
-                   locality?, city?, county?, state?, country?, postal?,
-                   phone?, noteref*, citationref*)>
+<!ELEMENT address ((daterange|datespan|dateval|datestr)?, street?, 
+				   locality?, city?, county?, state?, country?, postal?, 
+				   phone?, noteref*,citationref*)>
 <!ATTLIST address priv (0|1) #IMPLIED>

 <!ELEMENT street   (#PCDATA)>
@@ -220,7 +220,7 @@ EVENT
 <!ELEMENT event (type?, (daterange|datespan|dateval|datestr)?, place?, cause?,
                 description?, attribute*, noteref*, citationref*, objref*,
                 tagref*)>
-<!ATTLIST event
+<!ATTLIST event 
        id        CDATA #IMPLIED
        handle    ID    #REQUIRED
        priv      (0|1) #IMPLIED
@@ -251,7 +251,7 @@ PLACES

 <!ELEMENT places (placeobj)*>

-<!ELEMENT placeobj (ptitle?, code?, pname+, coord?, placeref*, location*,
+<!ELEMENT placeobj (ptitle?, pname+, code?, coord?, placeref*, location*,
                    objref*, url*, noteref*, citationref*, tagref*)>
 <!ATTLIST placeobj
        id        CDATA #IMPLIED
@@ -396,7 +396,7 @@ BOOKMARKS

 <!ELEMENT bookmarks (bookmark)*>
 <!ELEMENT bookmark EMPTY>
-<!ATTLIST bookmark
+<!ATTLIST bookmark 
        target (person|family|event|source|citation|place|media|repository|
                note) #REQUIRED
        hlink  IDREF #REQUIRED
@@ -407,7 +407,7 @@ NAME MAPS
 -->
 <!ELEMENT namemaps (map)*>
 <!ELEMENT map EMPTY>
-<!ATTLIST map
+<!ATTLIST map 
        type  CDATA #REQUIRED
        key   CDATA #REQUIRED
        value CDATA #REQUIRED
@@ -436,7 +436,7 @@ SHARED ELEMENTS
        quality   (estimated|calculated) #IMPLIED
        cformat   CDATA                  #IMPLIED
        dualdated (0|1)                  #IMPLIED
-        newyear   CDATA                  #IMPLIED
+        newyear   CDATA                  #IMPLIED 
 >

 <!ELEMENT datespan EMPTY>
@@ -446,7 +446,7 @@ SHARED ELEMENTS
        quality   (estimated|calculated) #IMPLIED
        cformat   CDATA                  #IMPLIED
        dualdated (0|1)                  #IMPLIED
-        newyear   CDATA                  #IMPLIED
+        newyear   CDATA                  #IMPLIED 
 >

 <!ELEMENT dateval EMPTY>
@@ -456,7 +456,7 @@ SHARED ELEMENTS
        quality   (estimated|calculated) #IMPLIED
        cformat   CDATA                  #IMPLIED
        dualdated (0|1)                  #IMPLIED
-        newyear   CDATA                  #IMPLIED
+        newyear   CDATA                  #IMPLIED 
 >

 <!ELEMENT datestr EMPTY>
@@ -472,7 +472,7 @@ SHARED ELEMENTS
        hlink IDREF #REQUIRED
 >

-<!ELEMENT eventref (attribute*, noteref*, citationref*)>
+<!ELEMENT eventref (attribute*, noteref*)>
 <!ATTLIST eventref
        hlink IDREF #REQUIRED
        priv  (0|1) #IMPLIED
@@ -529,7 +529,7 @@ SHARED ELEMENTS
 >

 <!ELEMENT objref (region?, attribute*, citationref*, noteref*)>
-<!ATTLIST objref
+<!ATTLIST objref 
        hlink IDREF #REQUIRED
        priv (0|1)  #IMPLIED
 >
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<!--
+<!-- 
 # Gramps - a GTK+/GNOME based genealogy program
 #
 # Copyright (C) 2005-2007  Donald N. Allingham
@@ -30,12 +30,12 @@


 <grammar
-  datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-  ns="http://gramps-project.org/xml/1.7.2/"
+  datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"  
+  ns="http://gramps-project.org/xml/1.7.1/"
  xmlns="http://relaxng.org/ns/structure/1.0">

  <start><element name="database">
-
+    
      <element name="header">
        <element name="created">
            <attribute name="date"><data type="date"/></attribute>
@@ -453,10 +453,10 @@
    <ref name="primary-object"/>
    <attribute name="type"><text/></attribute>
    <optional><element name="ptitle"><text/></element></optional>
-    <optional><element name="code"><text/></element></optional>
    <oneOrMore><element name="pname">
        <ref name="placename-content"/>
    </element></oneOrMore>
+    <optional><element name="code"><text/></element></optional>
    <optional><element name="coord">
        <attribute name="long"><text/></attribute>
        <attribute name="lat"><text/></attribute>
@@ -547,7 +547,7 @@
    </choice></attribute>
    <attribute name="hlink"><data type="IDREF"/></attribute>
  </define>
-
+  
  <define name="map-content">
    <attribute name="type"><choice>
        <value>group_as</value>
@@ -604,7 +604,7 @@
  <define name="citationref-content">
    <attribute name="hlink"><data type="IDREF"/></attribute>
  </define>
-
+  
  <define name="personref-content">
    <attribute name="hlink"><data type="IDREF"/></attribute>
        <optional><attribute name="priv">
@@ -618,11 +618,11 @@
        <ref name="noteref-content"/>
    </element></zeroOrMore></optional>
  </define>
-
+    
  <define name="sourceref-content">
    <attribute name="hlink"><data type="IDREF"/></attribute>
  </define>
-
+    
  <define name="eventref-content">
    <attribute name="hlink"><data type="IDREF"/></attribute>
    <optional><attribute name="priv">
@@ -635,9 +635,6 @@
    <zeroOrMore><element name="noteref">
        <ref name="noteref-content"/>
    </element></zeroOrMore>
-    <optional><zeroOrMore><element name="citationref">
-        <ref name="citationref-content"/>
-    </element></zeroOrMore></optional>
  </define>

  <define name="reporef-content">
@@ -662,7 +659,7 @@
          <value>1</value>
      </choice>
  </define>
-
+  
  <define name="attribute-content">
    <optional><attribute name="priv">
        <ref name="priv-content"/>
@@ -676,7 +673,7 @@
        <ref name="noteref-content"/>
    </element></zeroOrMore>
  </define>
-
+  
  <define name="srcattribute-content">
    <optional><attribute name="priv">
        <ref name="priv-content"/>
@@ -701,7 +698,7 @@
    </attribute></optional>
    <optional><element name="region">
        <ref name="region-content"/>
-    </element></optional>
+    </element></optional>    
    <zeroOrMore><element name="attribute">
        <ref name="attribute-content"/>
    </element></zeroOrMore>
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <calendar>
-  <country name="Bulgaria">
+  <country _name="Bulgaria">
    <date name="Нова Година" value="*/1/1" type="national" />
    <date name="Освобождение на България от Османско иго" value="*/3/3" type="national" />
    <date name="Ден на труда" value="*/5/1" type="national" />
@@ -49,7 +49,7 @@
    <date name="Възнесение господне" value="2011/6/2" type="religious" />
    <date name="Възнесение господне" value="2012/5/24" type="religious" />
  </country>
-  <country name="Canada">
+  <country _name="Canada">
    <date name="New Year's Day" value="*/1/1" type="national" />
    <date name="Groundhog Day" value="*/2/2" type="secular" />
    <date name="Valentine's Day" value="*/2/14" type="secular" />
@@ -81,24 +81,22 @@
    <date name="Christmas" value="*/12/25" type="national" />
    <date name="Boxing Day" value="*/12/26" type="national" />
  </country>
-  <country name="Catalonia">
-    <date name="Any Nou (estatal)" value="*/1/1" type="religious" />
-     <date name="Reis (estatal)" value="*/1/6" type="religious" />
-     <date name="Festa del Treball (estatal)" value="*/5/1" type="secular" />
-     <date name="Sant Joan (a Catalunya)" value="*/6/24" type="religious" />
-     <date name="Mare de Déu d'Agost (estatal)" value="*/8/15" type="religious" />
-     <date name="Diada Nacional de Catalunya" value="*/9/11" type="national" />
-     <date name="Festa Nacional d'Espanya (estatal)" value="*/10/12" type="religious" />
-     <date name="Tots Sants" value="*/11/1" type="religious" />
-     <date name="Dia de la Constitució (estatal)" value="*/12/6" type="secular" />
-     <date name="La Immaculada (estatal)" value="*/12/8" type="religious" />
-     <date name="Nadal (estatal)" value="*/12/25" type="religious" />
-     <date name="Sant Esteve" value="*/12/26" type="religious" />
-     <date name="Easter" value="> easter(y)" type="religious" />
-     <date name="Divendres Sant (estatal)" value="> easter(y)" offset="-2" type="religious" />
-     <date name="Dilluns de Pasqua Florida" value="> easter(y)" offset="1" type="religious" />
+  <country _name="Czech Republic">
+    <date name="Nový rok" value="*/1/1" type="national" />
+    <date name="Den obnovy samostatného českého státu" value="*/1/1" type="national" />
+    <date name="Velikonoce" type="religious" value="> easter(y)"  />
+    <date name="Svátek práce" value="*/5/1" type="national" />
+    <date name="Den osvobození od fašismu" value="*/5/8" type="national" />
+    <date name="Den slovanských věrozvěstů Cyrila a Metoděje" value="*/7/5" type="national" />
+    <date name="Den upálení mistra Jana Husa" value="*/7/6" type="national" />
+    <date name="Den české státnosti" value="*/9/28" type="national" />
+    <date name="Den vzniku samostatného československého státu" value="*/10/28" type="national" />
+    <date name="Den boje za svobodu a demokracii" value="*/11/17" type="national" />
+    <date name="Štědrý den" value="*/12/24" type="religious" />
+    <date name="1. svátek vánoční" value="*/12/25" type="national" />
+    <date name="2. svátek vánoční" value="*/12/26" type="national" />
  </country>
-  <country name="Chile">
+  <country _name="Chile">
    <date name="Año nuevo" value="*/1/1" type="national" />
    <date name="Viernes Santo" value="2007/4/6" type="religious" />
    <date name="Viernes Santo" value="2008/3/21" type="religious" />
@@ -121,10 +119,10 @@
    <date name="Inmaculada Concepción" value="*/12/8" type="religious" />
    <date name="Navidad" value="*/12/25" type="national" />
  </country>
-  <country name="China">
+  <country _name="China">
    <date name="Chinese New Year" value="2006/1/29" type="national" />
  </country>
-  <country name="Croatia">
+  <country _name="Croatia">
    <date name="Nova godina" value="*/1/1" type="national" />
    <date name="Sveta tri kralja" value="*/1/6" type="national" />
    <date name="Uskrs" value="> easter(y)" type="national" />
@@ -140,22 +138,7 @@
    <date name="Božić" value="*/12/25" type="national" />
    <date name="Sveti Stjepan" value="*/12/26" type="national" />
  </country>
-  <country name="Czech Republic">
-    <date name="Nový rok" value="*/1/1" type="national" />
-    <date name="Den obnovy samostatného českého státu" value="*/1/1" type="national" />
-    <date name="Velikonoce" type="religious" value="> easter(y)"  />
-    <date name="Svátek práce" value="*/5/1" type="national" />
-    <date name="Den osvobození od fašismu" value="*/5/8" type="national" />
-    <date name="Den slovanských věrozvěstů Cyrila a Metoděje" value="*/7/5" type="national" />
-    <date name="Den upálení mistra Jana Husa" value="*/7/6" type="national" />
-    <date name="Den české státnosti" value="*/9/28" type="national" />
-    <date name="Den vzniku samostatného československého státu" value="*/10/28" type="national" />
-    <date name="Den boje za svobodu a demokracii" value="*/11/17" type="national" />
-    <date name="Štědrý den" value="*/12/24" type="religious" />
-    <date name="1. svátek vánoční" value="*/12/25" type="national" />
-    <date name="2. svátek vánoční" value="*/12/26" type="national" />
-  </country>
-  <country name="England">
+  <country _name="England">
    <date name="New Year's Day" value="*/1/1" type="national" />
    <date name="Bank Holiday" value="*/1/1" offset="+1" if="dow(y, m, d) == 7" type="national" />
    <date name="Bank Holiday" value="*/1/1" offset="+2" if="dow(y, m, d) == 6" type="national" />
@@ -185,7 +168,7 @@
    <date name="Armistice Day" value="*/11/11" type="secular" />
    <date name="Remembrance Sunday" value="*/2/sun/nov" type="secular" />
  </country>
-  <country name="Finland">
+  <country _name="Finland">
    <date name="Loppiainen" value="*/1/6" type="religious" if="not(y>=1973)" />
    <date name="Loppiainen" value="*/1/6" offset="sat" type="religious" if="(y>=1973) and not(y>=1992)" />
    <date name="Loppiainen" value="*/1/6" type="religious" if="(y>=1992)" />
@@ -279,7 +262,7 @@
    <date name="Jean Sibeliuksen päivä" value="*/12/8" type="national" if="(y>=2011)" />
    <date name="Uudenvuodenaatto" value="*/12/31" type="national" if="(y>=1846)" />
  </country>
-  <country name="France">
+  <country _name="France">
    <date name="Jour de l'an" value="*/1/1" type="national" />
    <date name="Fête du travail" value="*/5/1" type="national" />
    <date name="Victoire 1945" value="*/5/8" type="national" />
@@ -315,7 +298,7 @@
    <date name="début Ramadan" value="2016/06/08" type="religious" />
    <date name="Saint Étienne (Alsace/Moselle)" value="*/12/26" type="religious" />
  </country>
-  <country name="Germany">
+  <country _name="Germany">
    <date name="Neujahr" type="national" value="*/1/1" />
    <date name="Hl. Drei Könige BW,BY,ST" type="religious" value="*/1/6" />
    <date name="Karfreitag" type="religious" value="> easter(y)" offset="-2" />
@@ -332,7 +315,7 @@
    <date name="1. Weihnachtsfeiertag" type="religious" value="*/12/25" />
    <date name="2. Weihnachtsfeiertag" type="religious" value="*/12/26" />
  </country>
-  <country name="Japan">
+  <country _name="Japan">
    <date name="元日" value="*/1/1" />
    <date name="成人の日" value="*/2/mon/jan" />
    <date name="建国記念の日" value="*/2/11" />
@@ -355,113 +338,7 @@
    <date name="天皇(明仁)即位記念" value="1990/11/12" />
    <date name="皇太子徳仁親王の結婚" value="1993/6/9" />
  </country>
-  <country name="Jewish Holidays">
-    <date name="Purim" value="> passover(y)" offset="-30"/>
-    <date name="Passover" value="> passover(y)" offset="0"/>
-    <date name="2 of Passover" value="> passover(y)" offset="1"/>
-    <date name="3 of Passover" value="> passover(y)" offset="2"/>
-    <date name="4 of Passover" value="> passover(y)" offset="3"/>
-    <date name="5 of Passover" value="> passover(y)" offset="4"/>
-    <date name="6 of Passover" value="> passover(y)" offset="5"/>
-    <date name="7 of Passover" value="> passover(y)" offset="6"/>
-    <date name="Shavuot" value="> passover(y)" offset="50"/>
-    <date name="Rosh Ha'Shana" value="> passover(y)" offset="163"/>
-    <date name="Rosh Ha'Shana 2" value="> passover(y)" offset="164"/>
-    <date name="Yom Kippur" value="> passover(y)" offset="172"/>
-    <date name="Sukot" value="> passover(y)" offset="177"/>
-    <date name="2 of Sukot" value="> passover(y)" offset="178"/>
-    <date name="3 of Sukot" value="> passover(y)" offset="179"/>
-    <date name="4 of Sukot" value="> passover(y)" offset="180"/>
-    <date name="5 of Sukot" value="> passover(y)" offset="181"/>
-    <date name="6 of Sukot" value="> passover(y)" offset="182"/>
-    <date name="7 of Sukot" value="> passover(y)" offset="183"/>
-    <date name="Simhat Tora" value="> passover(y)" offset="184"/>
-    <date name="Hanuka" value="> hanuka(y)" offset="0"/>
-    <date name="2 of Hanuka" value="> hanuka(y)" offset="1"/>
-    <date name="3 of Hanuka" value="> hanuka(y)" offset="2"/>
-    <date name="4 of Hanuka" value="> hanuka(y)" offset="3"/>
-    <date name="5 of Hanuka" value="> hanuka(y)" offset="4"/>
-    <date name="6 of Hanuka" value="> hanuka(y)" offset="5"/>
-    <date name="7 of Hanuka" value="> hanuka(y)" offset="6"/>
-    <date name="8 of Hanuka" value="> hanuka(y)" offset="7"/>
-  </country>
-  <country name="Italy">
-    <date name="Capodanno" value="*/1/1" type="national" />
-    <date name="Epifania" value="*/1/6" type="religious" />
-    <date name="Pasqua" type="religious" value="> easter(y)"  />
-    <date name="Pasquetta" type="religious" value="> easter(y)" offset="1" />
-    <date name="Festa della Liberazione" value="*/4/25" type="national" />
-    <date name="Festa dei lavoratori" value="*/5/1" type="national" />
-    <date name="Festa della Repubblica" value="*/6/2" type="national" />
-    <date name="Ferragosto" value="*/8/15" type="national" />
-    <date name="Tutti i santi" value="*/11/1" type="religious" />
-    <date name="Immacolata Concezione" value="*/12/8" type="religious" />
-    <date name="Natale" value="*/12/25" type="religious" />
-    <date name="Santo Stefano" value="*/12/26" type="religious" />
-  </country>
-  <country name="New Zealand">
-    <date value="*/1/1" type="national" name="New Year's Day"/>
-    <date value="*/1/2" type="national" name="Day After New Year's Day"/>
-    <date value="*/1/1" type="national" offset="+1" name="New Years Day Holiday" if="dow(y, m, d) == 7"/>
-    <date value="*/1/1" type="national" offset="+2" name="Day After New Years Day Holiday" if="dow(y, m, d) == 6"/>
-    <date value="*/feb/6" type="national" name="Waitangi Day"/>
-    <date value="> easter(y)" type="national" offset="-2" name="Good Friday"/>
-    <date value="> easter(y)" type="national" offset="+1" name="Easter Monday"/>
-    <date value="*/apr/25" type="national" name="ANZAC Day"/>
-    <date value="*/-1/mon/jun" type="national" name="Queen's Birthday Holiday"/>
-    <date value="*/-4/mon/oct" type="national" name="Labour Day"/>
-    <date value="*/dec/25" type="national" name="Christmas Day"/>
-    <date value="*/dec/26" type="national" name="Boxing Day"/>
-    <date value="*/dec/25" type="national" offset="+2" name="Christmas Day Holiday" if="dow(y, m, d) > 5"/>
-    <date value="*/dec/26" type="national" offset="+2" name="Boxing Day Holiday" if="dow(y, m, d) > 5"/>
-  </country>
-  <country name="Russia">
-    <date value="*/1/7" type="religious" name="Рождество Христово" />
-    <date value="*/1/19" type="religious" name="Крещение Господне" />
-    <date value="*/2/23" type="national" name="День Защитника Отечества" />
-    <date value="*/3/8" type="national" name="Международный женский день" />
-    <date value="*/4/12" type="national" name="День Космонавтики" />
-    <date value="*/5/1" type="national" name="Праздник Весны и Труда" />
-    <date value="*/5/9" type="national" name="День Победы" />
-    <date value="*/6/1" type="national" name="День защиты детей" />
-    <date value="*/6/12" type="national" name="День России" />
-    <date value="*/6/22" type="national" name="День памяти и скорби" />
-    <date value="*/-4/sun/jul" type="national" name="День ВМФ" />
-    <date value="*/9/1" type="national" name="День знаний" />
-    <date value="*/11/4" type="national" name="День народного единства" />
-    <date value="*/12/31" offset="+2" type="national" name="Новый год" />
-  </country>
-  <country name="Serbia">
-    <date value="*/1/1" type="national" name="Нова Година" />
-    <date value="*/1/7" type="religious" name="Божић" />
-    <date value="*/2/15" type="national" name="Дан државности Србије" />
-    <date value="> julian_easter(y)" type="religious" offset="-2" name="Велики петак" />
-    <date value="> julian_easter(y)" type="religious" name="Васкрс" />
-    <date value="> julian_easter(y)" type="religious" offset="1" name="Васкрсни понедељак" />
-    <date value="*/5/1" type="national" name="Празник рада" />
-    <date value="*/11/11" type="national" name="Дан примирја" />
-    <date value="*/1/27" type="religious" name="Свети Сава" />
-    <date value="*/4/22" type="national" name="Дан сећања на жртве холокауста" />
-    <date value="*/5/9" type="national" name="Дан победе" />
-    <date value="*/6/28" type="religious" name="Видовдан" />
-    <date value="*/10/21" type="national" name="Дан сећања на српске жртве у Другом светском рату" />
-  </country>
-  <country name="Serbia (Latin)">
-    <date value="*/1/1" type="national" name="Nova godina" />
-    <date value="*/1/7" type="religious" name="Božić" />
-    <date value="*/2/15" type="national" name="Dan državnosti Srbije" />
-    <date value="> julian_easter(y)" type="religious" offset="-2" name="Veliki petak" />
-    <date value="> julian_easter(y)" type="religious" name="Vaskrs" />
-    <date value="> julian_easter(y)" type="religious" offset="1" name="Vaskrsni ponedeljak" />
-    <date value="*/5/1" type="national" name="Praznik rada" />
-    <date value="*/11/11" type="national" name="Dan primirja" />
-    <date value="*/1/27" type="religious" name="Sveti Sava" />
-    <date value="*/4/22" type="national" name="Dan sećanja na žrtve holokausta" />
-    <date value="*/5/9" type="national" name="Dan pobede" />
-    <date value="*/6/28" type="religious" name="Vidovdan" />
-    <date value="*/10/21" type="national" name="Dan sećanja na srpske žrtve u Drugom svetskom ratu" />
-  </country>
-  <country name="Slovakia">
+  <country _name="Slovakia">
    <date name="Deň vzniku Slovenskej republiky" value="*/1/1" type="national" />
    <date name="Zjavenie Pána (Traja králi)" value="*/1/6" type="religious" />
    <date name="Veľký piatok" value="> easter(y)" offset="-2" type="religious" />
@@ -478,7 +355,7 @@
    <date name="Prvý sviatok vianočný" value="*/12/25" type="national" />
    <date name="Druhý sviatok vianočný" value="*/12/26" type="national" />
  </country>
-  <country name="Sweden">
+  <country _name="Sweden">
    <date name="Nyårsafton" value="*/12/31" type="national" />
    <date name="Trettondedag jul" value="*/1/6" type="religious" />
    <date name="Alla helgons dag" value="*/oct/31" offset="sat" type="religious" if="(y>=1953)" />
@@ -505,62 +382,7 @@
    <date name="Midsommardagen" value="*/jun/24" type="religious" if="not(y>=1953)"  />
    <date name="Fars dag" value="*/2/sun/nov" type="national" />
  </country>
-  <country name="Turkey">
-    <date value="*/1/1" type="national" name="Yılbaşı" />
-    <date value="*/3/8" type="secular" name="Dünya Kadınlar Günü" />
-    <date value="*/3/21" type="secular" name="Nevruz" />
-    <date value="*/4/22" type="secular" name="Dünya Günü" />
-    <date value="*/4/23" type="national" name="Ulusal Egemenlik ve Çocuk Bayramı" />
-    <date value="*/5/1" type="national" name="Emek ve Dayanışma Günü" />
-    <date value="*/5/5" type="secular" name="Hıdrellez" />
-    <date value="*/5/13" type="secular" name="Türk Dil Bayramı" />
-    <date value="*/5/19" type="national" name="Atatürk'ü Anma, Gençlik ve Spor Bayramı" />
-    <date value="*/5/28" type="secular" name="Tarihî Türk Evlerini Koruma Haftası" />
-    <date value="*/7/15" type="national" name="Demokrasi ve Millî Birlik Günü" />
-    <date value="*/8/30" type="national" name="Zafer Bayramı" />
-    <date value="*/10/29" type="national" name="Cumhuriyet Bayramı" />
-    <date value="*/11/10" type="secular" name="Atatürk’ü Anma Günü" />
-    <date value="*/11/24" type="secular" name="Öğretmenler Günü" />
-    <date value="*/12/5" type="secular" name="Kadın Hakları Günü" />
-    <date value="2021/05/13" type="religious" name="Ramazan Bayramı" />
-    <date value="2021/07/20" type="religious" name="Kurban Bayramı" />
-    <date value="2022/05/02" type="religious" name="Ramazan Bayramı" />
-    <date value="2022/07/09" type="religious" name="Kurban Bayramı" />
-    <date value="2023/04/21" type="religious" name="Ramazan Bayramı" />
-    <date value="2023/06/28" type="religious" name="Kurban Bayramı" />
-    <date value="2024/04/10" type="religious" name="Ramazan Bayramı" />
-    <date value="2024/06/16" type="religious" name="Kurban Bayramı" />
-    <date value="2025/03/30" type="religious" name="Ramazan Bayramı" />
-    <date value="2025/06/06" type="religious" name="Kurban Bayramı" />
-  </country>
-  <country name="Ukraine">
-    <date value="*/1/1" type="national" name="Новий Рік"/>
-    <date value="*/1/6" type="religious" name="Святий Вечір"/>
-    <date value="*/1/7" type="religious" name="Різдво"/>
-    <date value="*/1/13" type="religious" name="Маланка"/>
-    <date value="*/1/14" type="religious" name="Старий Новий рік, Щедрий вечір"/>
-    <date value="*/1/19" type="religious" name="Водохреща"/>
-    <date value="*/1/22" type="national" name="День Соборності України"/>
-    <date value="*/2/14" type="secular" name="День закоханих"/>
-    <date value="*/2/15" type="religious" name="Стрітення"/>
-    <date value="*/3/8" type="secular" name="Міжнародний жіночий день"/>
-    <date value="*/3/20" type="secular" name="Весняне Рівнодення"/>
-    <date value="*/4/1" type="secular" name="День сміху"/>
-    <date value="*/4/7" type="religious" name="Благовіщення"/>
-    <date value="> julian_easter(y)" type="religious" name="Великдень"/>
-    <date value="*/5/1" type="national" name="День Праці"/>
-    <date value="*/6/21" type="secular" name="Весняне Сонцестояння"/>
-    <date value="*/6/28" type="national" name="День Конституції України"/>
-    <date value="*/7/7" type="religious" name="Івана Купала"/>
-    <date value="*/8/19" type="religious" name="Спаса"/>
-    <date value="*/8/24" type="national" name="День Незалежності України"/>
-    <date value="*/9/22" type="secular" name="Осіннє Рівнодення"/>
-    <date value="*/10/14" type="religious" name="Покрова, День Українського козацтва"/>
-    <date value="*/12/13" type="religious" name="Андрія"/>
-    <date value="*/12/19" type="religious" name="Миколая"/>
-    <date value="*/12/21" type="secular" name="Осіннє Сонцестояння"/>
-  </country>
-  <country name="United States of America">
+  <country _name="United States of America">
    <date name="New Year's Eve" value="*/12/31" type="national" />
    <date name="New Year's Day" value="*/1/1" type="national" />
    <date name="ML Kings's Birthday" value="*/3/mon/jan" type="secular" />
@@ -610,4 +432,107 @@
    <date name="Christmas" value="*/12/25" type="religious" />
    <date name="Kwanzaa begins" value="*/12/26" type="religious" />
  </country>
+  <country _name="Jewish Holidays">
+    <date _name="Purim" value="> passover(y)" offset="-30"/>
+    <date _name="Passover" value="> passover(y)" offset="0"/>
+    <date _name="2 of Passover" value="> passover(y)" offset="1"/>
+    <date _name="3 of Passover" value="> passover(y)" offset="2"/>
+    <date _name="4 of Passover" value="> passover(y)" offset="3"/>
+    <date _name="5 of Passover" value="> passover(y)" offset="4"/>
+    <date _name="6 of Passover" value="> passover(y)" offset="5"/>
+    <date _name="7 of Passover" value="> passover(y)" offset="6"/>
+    <date _name="Shavuot" value="> passover(y)" offset="50"/>
+    <date _name="Rosh Ha'Shana" value="> passover(y)" offset="163"/>
+    <date _name="Rosh Ha'Shana 2" value="> passover(y)" offset="164"/>
+    <date _name="Yom Kippur" value="> passover(y)" offset="172"/>
+    <date _name="Sukot" value="> passover(y)" offset="177"/>
+    <date _name="2 of Sukot" value="> passover(y)" offset="178"/>
+    <date _name="3 of Sukot" value="> passover(y)" offset="179"/>
+    <date _name="4 of Sukot" value="> passover(y)" offset="180"/>
+    <date _name="5 of Sukot" value="> passover(y)" offset="181"/>
+    <date _name="6 of Sukot" value="> passover(y)" offset="182"/>
+    <date _name="7 of Sukot" value="> passover(y)" offset="183"/>
+    <date _name="Simhat Tora" value="> passover(y)" offset="184"/>
+    <date _name="Hanuka" value="> hanuka(y)" offset="0"/>
+    <date _name="2 of Hanuka" value="> hanuka(y)" offset="1"/>
+    <date _name="3 of Hanuka" value="> hanuka(y)" offset="2"/>
+    <date _name="4 of Hanuka" value="> hanuka(y)" offset="3"/>
+    <date _name="5 of Hanuka" value="> hanuka(y)" offset="4"/>
+    <date _name="6 of Hanuka" value="> hanuka(y)" offset="5"/>
+    <date _name="7 of Hanuka" value="> hanuka(y)" offset="6"/>
+    <date _name="8 of Hanuka" value="> hanuka(y)" offset="7"/>
+  </country>
+  <country _name="New Zealand">
+    <date value="*/1/1" type="national" name="New Year's Day"/>
+    <date value="*/1/2" type="national" name="Day After New Year's Day"/>
+    <date value="*/1/1" type="national" offset="+1" name="New Years Day Holiday" if="dow(y, m, d) == 7"/>
+    <date value="*/1/1" type="national" offset="+2" name="Day After New Years Day Holiday" if="dow(y, m, d) == 6"/>
+    <date value="*/feb/6" type="national" name="Waitangi Day"/>
+    <date value="> easter(y)" type="national" offset="-2" name="Good Friday"/>
+    <date value="> easter(y)" type="national" offset="+1" name="Easter Monday"/>
+    <date value="*/apr/25" type="national" name="ANZAC Day"/>
+    <date value="*/-1/mon/jun" type="national" name="Queen's Birthday Holiday"/>
+    <date value="*/-4/mon/oct" type="national" name="Labour Day"/>
+    <date value="*/dec/25" type="national" name="Christmas Day"/>
+    <date value="*/dec/26" type="national" name="Boxing Day"/>
+    <date value="*/dec/25" type="national" offset="+2" name="Christmas Day Holiday" if="dow(y, m, d) > 5"/>
+    <date value="*/dec/26" type="national" offset="+2" name="Boxing Day Holiday" if="dow(y, m, d) > 5"/>
+  </country>
+  <country _name="Ukraine">
+    <date value="*/1/1" type="national" name="Новий Рік"/>
+    <date value="*/1/6" type="religious" name="Святий Вечір"/>
+    <date value="*/1/7" type="religious" name="Різдво"/>
+    <date value="*/1/13" type="religious" name="Маланка"/>
+    <date value="*/1/14" type="religious" name="Старий Новий рік, Щедрий вечір"/>
+    <date value="*/1/19" type="religious" name="Водохреща"/>
+    <date value="*/1/22" type="national" name="День Соборності України"/>
+    <date value="*/2/14" type="secular" name="День закоханих"/>
+    <date value="*/2/15" type="religious" name="Стрітення"/>
+    <date value="*/3/8" type="secular" name="Міжнародний жіночий день"/>
+    <date value="*/3/20" type="secular" name="Весняне Рівнодення"/>
+    <date value="*/4/1" type="secular" name="День сміху"/>
+    <date value="*/4/7" type="religious" name="Благовіщення"/>
+    <date value="> julian_easter(y)" type="religious" name="Великдень"/>
+    <date value="*/5/1" type="national" name="День Праці"/>
+    <date value="*/6/21" type="secular" name="Весняне Сонцестояння"/>
+    <date value="*/6/28" type="national" name="День Конституції України"/>
+    <date value="*/7/7" type="religious" name="Івана Купала"/>
+    <date value="*/8/19" type="religious" name="Спаса"/>
+    <date value="*/8/24" type="national" name="День Незалежності України"/>
+    <date value="*/9/22" type="secular" name="Осіннє Рівнодення"/>
+    <date value="*/10/14" type="religious" name="Покрова, День Українського козацтва"/>
+    <date value="*/12/13" type="religious" name="Андрія"/>
+    <date value="*/12/19" type="religious" name="Миколая"/>
+    <date value="*/12/21" type="secular" name="Осіннє Сонцестояння"/>
+  </country>
+  <country _name="Serbia">
+    <date value="*/1/1" type="national" name="Нова Година" />
+    <date value="*/1/7" type="religious" name="Божић" />
+    <date value="*/2/15" type="national" name="Дан државности Србије" />
+    <date value="> julian_easter(y)" type="religious" offset="-2" name="Велики петак" />
+    <date value="> julian_easter(y)" type="religious" name="Васкрс" />
+    <date value="> julian_easter(y)" type="religious" offset="1" name="Васкрсни понедељак" />
+    <date value="*/5/1" type="national" name="Празник рада" />
+    <date value="*/11/11" type="national" name="Дан примирја" />
+    <date value="*/1/27" type="religious" name="Свети Сава" />
+    <date value="*/4/22" type="national" name="Дан сећања на жртве холокауста" />
+    <date value="*/5/9" type="national" name="Дан победе" />
+    <date value="*/6/28" type="religious" name="Видовдан" />
+    <date value="*/10/21" type="national" name="Дан сећања на српске жртве у Другом светском рату" />
+  </country>
+  <country _name="Serbia (Latin)">
+    <date value="*/1/1" type="national" name="Nova godina" />
+    <date value="*/1/7" type="religious" name="Božić" />
+    <date value="*/2/15" type="national" name="Dan državnosti Srbije" />
+    <date value="> julian_easter(y)" type="religious" offset="-2" name="Veliki petak" />
+    <date value="> julian_easter(y)" type="religious" name="Vaskrs" />
+    <date value="> julian_easter(y)" type="religious" offset="1" name="Vaskrsni ponedeljak" />
+    <date value="*/5/1" type="national" name="Praznik rada" />
+    <date value="*/11/11" type="national" name="Dan primirja" />
+    <date value="*/1/27" type="religious" name="Sveti Sava" />
+    <date value="*/4/22" type="national" name="Dan sećanja na žrtve holokausta" />
+    <date value="*/5/9" type="national" name="Dan pobede" />
+    <date value="*/6/28" type="religious" name="Vidovdan" />
+    <date value="*/10/21" type="national" name="Dan sećanja na srpske žrtve u Drugom svetskom ratu" />
+  </country>
 </calendar>
@@ -20,9 +20,6 @@
    <code>SAMOA</code>
    <code>AP</code>
  </temple>
-  <temple name="Arequipa Peru Temple">
-    <code>AREQU</code>
-  </temple>
  <temple name="Asuncion, Paraguay">
    <code>ASUNC</code>
  </temple>
@@ -30,9 +27,6 @@
    <code>ATLAN</code>
    <code>AT</code>
  </temple>
-  <temple name="Barranquilla Colombia Temple">
-    <code>BARRA</code>
-  </temple>
  <temple name="Baton Rouge, Louisiana">
    <code>BROUG</code>
  </temple>
@@ -63,9 +57,6 @@
  <temple name="Bountiful, Utah">
    <code>BOUNT</code>
  </temple>
-  <temple name="Brigham City Utah Temple">
-    <code>BRIGH</code>
-  </temple>
  <temple name="Brisbane, Australia">
    <code>BRISB</code>
  </temple>
@@ -88,12 +79,8 @@
    <code>ALBR</code>
  </temple>
  <temple name="Cebu, Philippines">
-    <code>CEBUP</code>
    <code>CEBU</code>
  </temple>
-  <temple name="Cedar City Utah">
-    <code>CEDAR</code>
-  </temple>
  <temple name="Chicago, Illinois">
    <code>CHICA</code>
    <code>CH</code>
@@ -107,18 +94,15 @@
  <temple name="Colonia Juarez, Chihuahua, Mexico">
    <code>COLJU</code>
  </temple>
-  <temple name="Columbia River, Washington">
-    <code>CRIVE</code>
-  </temple>
  <temple name="Columbia, South Carolina">
    <code>COLSC</code>
  </temple>
+  <temple name="Columbia River, Washington">
+    <code>CRIVE</code>
+  </temple>
  <temple name="Columbus, Ohio">
    <code>COLUM</code>
  </temple>
-  <temple name="Concepción Chile">
-    <code>CONCE</code>
-  </temple>
  <temple name="Copenhagen, Denmark">
    <code>COPEN</code>
  </temple>
@@ -145,19 +129,6 @@
  <temple name="Edmonton, Alberta">
    <code>EDMON</code>
  </temple>
-  <temple name="Endowment House">
-    <code>EHOUS</code>
-    <code>EH</code>
-  </temple>
-  <temple name="Fort Collins Colorado">
-    <code>FORTC</code>
-  </temple>
-  <temple name="Fort Lauderdale Florida">
-    <code>FORTL</code>
-  </temple>
-  <temple name="Fortaleza Brazil">
-    <code>FORTA</code>
-  </temple>
  <temple name="Frankfurt, Germany">
    <code>FRANK</code>
    <code>FR</code>
@@ -220,9 +191,6 @@
    <code>IFALL</code>
    <code>IF</code>
  </temple>
-  <temple name="Indianapolis Indiana">
-    <code>INDIA</code>
-  </temple>
  <temple name="Johannesburg, South Africa">
    <code>JOHAN</code>
    <code>JO</code>
@@ -234,14 +202,10 @@
  <temple name="Kansas City, Missouri">
    <code>KANSA</code>
  </temple>
-  <temple name="Kinshasa Democratic Republic of the Congo">
-    <code>KINSH</code>
-  </temple>
  <temple name="Kona, Hawaii">
    <code>KONA</code>
  </temple>
  <temple name="Kiev, Ukraine">
-    <code>KYIV</code>
    <code>KIEV</code>
  </temple>
  <temple name="Kirtland, Ohio">
@@ -259,9 +223,6 @@
    <code>LIMA</code>
    <code>LI</code>
  </temple>
-  <temple name="Lisbon Portugal">
-    <code>LISBO</code>
-  </temple>
  <temple name="Logan, Utah">
    <code>LOGAN</code>
    <code>LG</code>
@@ -309,9 +270,6 @@
  <temple name="Merida, Mexico">
    <code>MERID</code>
  </temple>
-  <temple name="Meridian Idaho">
-    <code>MIDAH</code>
-  </temple>
  <temple name="Mesa, Arizona">
    <code>ARIZO</code>
    <code>AZ</code>
@@ -367,7 +325,6 @@
    <code>OKLAH</code>
  </temple>
  <temple name="Oquirrh Mountain, Utah">
-    <code>OQUIR</code>
    <code>OMOUN</code>
  </temple>
  <temple name="Orlando, Florida">
@@ -383,12 +340,6 @@
    <code>PAPEE</code>
    <code>TA</code>
  </temple>
-  <temple name="Paris France">
-    <code>PARIS</code>
-  </temple>
-  <temple name="Payson Utah">
-    <code>PAYSO</code>
-  </temple>
  <temple name="Perth, Australia">
    <code>PERTH</code>
  </temple>
@@ -398,9 +349,6 @@
  <temple name="Phoenix, Arizona">
    <code>PHOEN</code>
  </temple>
-  <temple name="Port-au-Prince Haiti">
-    <code>PORTA</code>
-  </temple>
  <temple name="Portland, Oregon">
    <code>PORTL</code>
    <code>PT</code>
@@ -411,9 +359,6 @@
  <temple name="Preston, England">
    <code>PREST</code>
  </temple>
-  <temple name="Provo City Center, Utah">
-    <code>PROCC</code>
-  </temple>
  <temple name="Provo, Utah">
    <code>PROVO</code>
    <code>PV</code>
@@ -440,7 +385,6 @@
    <code>REXBU</code>
  </temple>
  <temple name="Rome, Italy">
-    <code>ROMEI</code>
    <code>ROME</code>
  </temple>
  <temple name="Sacramento, California">
@@ -450,6 +394,12 @@
    <code>SGEOR</code>
    <code>SG</code>
  </temple>
+  <temple name="St. Louis, Missouri">
+    <code>SLOUI</code>
+  </temple>
+  <temple name="St. Paul, Minnesota">
+    <code>SPMIN</code>
+  </temple>
  <temple name="Salt Lake City, Utah">
    <code>SLAKE</code>
    <code>SL</code>
@@ -465,7 +415,6 @@
    <code>SJOSE</code>
  </temple>
  <temple name="San Salvador, El Salvador">
-    <code>SANSA</code>
    <code>SSALV</code>
  </temple>
  <temple name="Santiago, Chile">
@@ -479,9 +428,6 @@
    <code>SPAUL</code>
    <code>SP</code>
  </temple>
-  <temple name="Sapporo Japan">
-    <code>SAPPO</code>
-  </temple>
  <temple name="Seattle, Washington">
    <code>SEATT</code>
    <code>SE</code>
@@ -496,15 +442,6 @@
  <temple name="Spokane, Washington">
    <code>SPOKA</code>
  </temple>
-  <temple name="St. Louis, Missouri">
-    <code>SLOUI</code>
-  </temple>
-  <temple name="St. Paul, Minnesota">
-    <code>SPMIN</code>
-  </temple>
-  <temple name="Star Valley Wyoming">
-    <code>STARV</code>
-  </temple>
  <temple name="Stockholm, Sweden">
    <code>STOCK</code>
    <code>ST</code>
@@ -526,15 +463,9 @@
  <temple name="Tegucigalpa, Honduras">
    <code>TEGUC</code>
  </temple>
-  <temple name="The Gila Valley Arizona">
-    <code>GILAV</code>
-  </temple>
  <temple name="The Hague, Netherlands">
    <code>HAGUE</code>
  </temple>
-  <temple name="Tijuana Mexico">
-    <code>TIJUA</code>
-  </temple>
  <temple name="Tokyo, Japan">
    <code>TOKYO</code>
    <code>TK</code>
@@ -543,19 +474,16 @@
    <code>TORON</code>
    <code>TORNO</code>
    <code>TR</code>
-  </temple>
  <temple name="Trujillo, Peru">
    <code>TRUJI</code>
  </temple>
-  <temple name="Tucson Arizona">
-    <code>TUCSO</code>
  </temple>
  <temple name="Tuxtla Gutierrez, Mexico">
    <code>TGUTI</code>
  </temple>
  <temple name="Twin Falls, Idaho">
-    <code>TWINF</code>
    <code>TFALL</code>
+    <code>TWINF</code>
  </temple>
  <temple name="Vancouver, British Columbia">
    <code>VANCO</code>
@@ -577,6 +505,10 @@
    <code>WINTE</code>
    <code>WQUAR</code>
  </temple>
+  <temple name="Endowment House">
+    <code>EHOUS</code>
+    <code>EH</code>
+  </temple>
  <temple name="President's Office">
    <code>POFFI</code>
    <code>PO</code>
@@ -16,204 +16,210 @@ import sys, os
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-# sys.path.insert(0, os.path.abspath('.'))
+#sys.path.insert(0, os.path.abspath('.'))

 # -- General configuration -----------------------------------------------------

 # If your documentation needs a minimal Sphinx version, state it here.
-# needs_sphinx = '1.0'
+#needs_sphinx = '1.0'

 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = []

 # Add any paths that contain templates here, relative to this directory.
-templates_path = ["_templates"]
+templates_path = ['_templates']

 # The suffix of source filenames.
-source_suffix = ".rst"
+source_suffix = '.rst'

 # The encoding of source files.
-# source_encoding = 'utf-8-sig'
+#source_encoding = 'utf-8-sig'

 # The master toctree document.
-master_doc = "index"
+master_doc = 'index'

 # General information about the project.
-project = "Gramps"
-copyright = "2015, Gramps project"
+project = u'Gramps'
+copyright = u'2015, Gramps project'

 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = "4.2"
+version = '4.2'
 # The full version, including alpha/beta/rc tags.
-release = "4.2.0"
+release = '4.2.0'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
-# locale_dirs = './locale'
-# gettext_compact = True
+#locale_dirs = './locale'
+#gettext_compact = True

 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
-# today = ''
+#today = ''
 # Else, today_fmt is used as the format for a strftime call.
-today_fmt = "%B %d, %Y"
+today_fmt = '%B %d, %Y'

 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ["_build"]
+exclude_patterns = ['_build']

 # The reST default role (used for this markup: `text`) to use for all documents.
-# default_role = None
+#default_role = None

 # If true, '()' will be appended to :func: etc. cross-reference text.
-# add_function_parentheses = True
+#add_function_parentheses = True

 # If true, the current module name will be prepended to all description
 # unit titles (such as .. function::).
-# add_module_names = True
+#add_module_names = True

 # If true, sectionauthor and moduleauthor directives will be shown in the
 # output. They are ignored by default.
-# show_authors = False
+#show_authors = False

 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = "sphinx"
+pygments_style = 'sphinx'

 # A list of ignored prefixes for module index sorting.
-# modindex_common_prefix = []
+#modindex_common_prefix = []


 # -- Options for HTML output ---------------------------------------------------

 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = "default"
+html_theme = 'default'

 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-# html_theme_options = {}
+#html_theme_options = {}

 # Add any paths that contain custom themes here, relative to this directory.
-# html_theme_path = []
+#html_theme_path = []

 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-# html_title = None
+#html_title = None

 # A shorter title for the navigation bar.  Default is the same as html_title.
-# html_short_title = None
+#html_short_title = None

 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-# html_logo = None
+#html_logo = None

 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-# html_favicon = None
+#html_favicon = None

 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-# html_static_path = ['_static']
+#html_static_path = ['_static']

 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-# html_last_updated_fmt = '%b %d, %Y'
+#html_last_updated_fmt = '%b %d, %Y'

 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-# html_use_smartypants = True
+#html_use_smartypants = True

 # Custom sidebar templates, maps document names to template names.
-# html_sidebars = {}
+#html_sidebars = {}

 # Additional templates that should be rendered to pages, maps page names to
 # template names.
-# html_additional_pages = {}
+#html_additional_pages = {}

 # If false, no module index is generated.
-# html_domain_indices = True
+#html_domain_indices = True

 # If false, no index is generated.
-# html_use_index = True
+#html_use_index = True

 # If true, the index is split into individual pages for each letter.
-# html_split_index = False
+#html_split_index = False

 # If true, links to the reST sources are added to the pages.
-# html_show_sourcelink = True
+#html_show_sourcelink = True

 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-# html_show_sphinx = True
+#html_show_sphinx = True

 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-# html_show_copyright = True
+#html_show_copyright = True

 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
-# html_use_opensearch = ''
+#html_use_opensearch = ''

 # This is the file name suffix for HTML files (e.g. ".xhtml").
-# html_file_suffix = None
+#html_file_suffix = None

 # Output file base name for HTML help builder.
-htmlhelp_basename = "Grampsdoc"
+htmlhelp_basename = 'Grampsdoc'


 # -- Options for LaTeX output --------------------------------------------------

 latex_elements = {
-    # The paper size ('letterpaper' or 'a4paper').
-    #'papersize': 'letterpaper',
-    # The font size ('10pt', '11pt' or '12pt').
-    #'pointsize': '10pt',
-    # Additional stuff for the LaTeX preamble.
-    #'preamble': '',
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
 }

 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-    ("index", "Gramps.tex", "Gramps Documentation", ".", "manual"),
+  ('index', 'Gramps.tex', u'Gramps Documentation',
+   u'.', 'manual'),
 ]

 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-# latex_logo = None
+#latex_logo = None

 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.
-# latex_use_parts = False
+#latex_use_parts = False

 # If true, show page references after internal links.
-# latex_show_pagerefs = False
+#latex_show_pagerefs = False

 # If true, show URL addresses after external links.
-# latex_show_urls = False
+#latex_show_urls = False

 # Documents to append as an appendix to all manuals.
-# latex_appendices = []
+#latex_appendices = []

 # If false, no module index is generated.
-# latex_domain_indices = True
+#latex_domain_indices = True


 # -- Options for manual page output --------------------------------------------

 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [("en", "gramps", "Gramps Documentation", ["Gramps project"], 1)]
+man_pages = [
+    ('en', 'gramps', u'Gramps Documentation',
+     ['Gramps project'], 1)
+]

 # If true, show URL addresses after external links.
-# man_show_urls = False
+#man_show_urls = False


 # -- Options for Texinfo output ------------------------------------------------
@@ -222,22 +228,16 @@ man_pages = [("en", "gramps", "Gramps Documentation", ["Gramps project"], 1)]
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (
-        "index",
-        "Gramps",
-        "Gramps Documentation",
-        ".",
-        "Gramps",
-        "One line description of project.",
-        "Miscellaneous",
-    ),
+  ('index', 'Gramps', u'Gramps Documentation',
+   u'.', 'Gramps', 'One line description of project.',
+   'Miscellaneous'),
 ]

 # Documents to append as an appendix to all manuals.
-# texinfo_appendices = []
+#texinfo_appendices = []

 # If false, no module index is generated.
-# texinfo_domain_indices = True
+#texinfo_domain_indices = True

 # How to display URL addresses: 'footnote', 'no', or 'inline'.
-# texinfo_show_urls = 'footnote'
+#texinfo_show_urls = 'footnote'
@@ -16,204 +16,210 @@ import sys, os
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-# sys.path.insert(0, os.path.abspath('.'))
+#sys.path.insert(0, os.path.abspath('.'))

 # -- General configuration -----------------------------------------------------

 # If your documentation needs a minimal Sphinx version, state it here.
-# needs_sphinx = '1.0'
+#needs_sphinx = '1.0'

 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = []

 # Add any paths that contain templates here, relative to this directory.
-templates_path = ["_templates"]
+templates_path = ['_templates']

 # The suffix of source filenames.
-source_suffix = ".rst"
+source_suffix = '.rst'

 # The encoding of source files.
-# source_encoding = 'utf-8-sig'
+#source_encoding = 'utf-8-sig'

 # The master toctree document.
-master_doc = "cs"
+master_doc = 'cs'

 # General information about the project.
-project = "Gramps"
-copyright = "2015, Gramps project"
+project = u'Gramps'
+copyright = u'2015, Gramps project'

 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = "4.2"
+version = '4.2'
 # The full version, including alpha/beta/rc tags.
-release = "4.2.0"
+release = '4.2.0'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
-locale_dirs = "./locale"
+locale_dirs = './locale'
 gettext_compact = True

 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
-# today = ''
+#today = ''
 # Else, today_fmt is used as the format for a strftime call.
-today_fmt = "%B %d, %Y"
+today_fmt = '%B %d, %Y'

 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ["_build"]
+exclude_patterns = ['_build']

 # The reST default role (used for this markup: `text`) to use for all documents.
-# default_role = None
+#default_role = None

 # If true, '()' will be appended to :func: etc. cross-reference text.
-# add_function_parentheses = True
+#add_function_parentheses = True

 # If true, the current module name will be prepended to all description
 # unit titles (such as .. function::).
-# add_module_names = True
+#add_module_names = True

 # If true, sectionauthor and moduleauthor directives will be shown in the
 # output. They are ignored by default.
-# show_authors = False
+#show_authors = False

 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = "sphinx"
+pygments_style = 'sphinx'

 # A list of ignored prefixes for module index sorting.
-# modindex_common_prefix = []
+#modindex_common_prefix = []


 # -- Options for HTML output ---------------------------------------------------

 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = "default"
+html_theme = 'default'

 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-# html_theme_options = {}
+#html_theme_options = {}

 # Add any paths that contain custom themes here, relative to this directory.
-# html_theme_path = []
+#html_theme_path = []

 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-# html_title = None
+#html_title = None

 # A shorter title for the navigation bar.  Default is the same as html_title.
-# html_short_title = None
+#html_short_title = None

 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-# html_logo = None
+#html_logo = None

 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-# html_favicon = None
+#html_favicon = None

 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-# html_static_path = ['_static']
+#html_static_path = ['_static']

 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-# html_last_updated_fmt = '%b %d, %Y'
+#html_last_updated_fmt = '%b %d, %Y'

 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-# html_use_smartypants = True
+#html_use_smartypants = True

 # Custom sidebar templates, maps document names to template names.
-# html_sidebars = {}
+#html_sidebars = {}

 # Additional templates that should be rendered to pages, maps page names to
 # template names.
-# html_additional_pages = {}
+#html_additional_pages = {}

 # If false, no module index is generated.
-# html_domain_indices = True
+#html_domain_indices = True

 # If false, no index is generated.
-# html_use_index = True
+#html_use_index = True

 # If true, the index is split into individual pages for each letter.
-# html_split_index = False
+#html_split_index = False

 # If true, links to the reST sources are added to the pages.
-# html_show_sourcelink = True
+#html_show_sourcelink = True

 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-# html_show_sphinx = True
+#html_show_sphinx = True

 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-# html_show_copyright = True
+#html_show_copyright = True

 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
-# html_use_opensearch = ''
+#html_use_opensearch = ''

 # This is the file name suffix for HTML files (e.g. ".xhtml").
-# html_file_suffix = None
+#html_file_suffix = None

 # Output file base name for HTML help builder.
-htmlhelp_basename = "Grampsdoc"
+htmlhelp_basename = 'Grampsdoc'


 # -- Options for LaTeX output --------------------------------------------------

 latex_elements = {
-    # The paper size ('letterpaper' or 'a4paper').
-    #'papersize': 'letterpaper',
-    # The font size ('10pt', '11pt' or '12pt').
-    #'pointsize': '10pt',
-    # Additional stuff for the LaTeX preamble.
-    #'preamble': '',
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
 }

 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-    ("index", "Gramps.tex", "Gramps Documentation", ".", "manual"),
+  ('index', 'Gramps.tex', u'Gramps Documentation',
+   u'.', 'manual'),
 ]

 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-# latex_logo = None
+#latex_logo = None

 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.
-# latex_use_parts = False
+#latex_use_parts = False

 # If true, show page references after internal links.
-# latex_show_pagerefs = False
+#latex_show_pagerefs = False

 # If true, show URL addresses after external links.
-# latex_show_urls = False
+#latex_show_urls = False

 # Documents to append as an appendix to all manuals.
-# latex_appendices = []
+#latex_appendices = []

 # If false, no module index is generated.
-# latex_domain_indices = True
+#latex_domain_indices = True


 # -- Options for manual page output --------------------------------------------

 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [("cs", "gramps", "Gramps Documentation", ["."], 1)]
+man_pages = [
+    ('cs', 'gramps', u'Gramps Documentation',
+     [u'.'], 1)
+]

 # If true, show URL addresses after external links.
-# man_show_urls = False
+#man_show_urls = False


 # -- Options for Texinfo output ------------------------------------------------
@@ -222,22 +228,16 @@ man_pages = [("cs", "gramps", "Gramps Documentation", ["."], 1)]
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (
-        "index",
-        "Gramps",
-        "Gramps Documentation",
-        ".",
-        "Gramps",
-        "One line description of project.",
-        "Miscellaneous",
-    ),
+  ('index', 'Gramps', u'Gramps Documentation',
+   u'.', 'Gramps', 'One line description of project.',
+   'Miscellaneous'),
 ]

 # Documents to append as an appendix to all manuals.
-# texinfo_appendices = []
+#texinfo_appendices = []

 # If false, no module index is generated.
-# texinfo_domain_indices = True
+#texinfo_domain_indices = True

 # How to display URL addresses: 'footnote', 'no', or 'inline'.
-# texinfo_show_urls = 'footnote'
+#texinfo_show_urls = 'footnote'
@@ -1,307 +1,299 @@
-gramps
-======
-
-----------------------------------------------------------------
-Genealogical Research and Analysis Management Programming System.
-----------------------------------------------------------------
-
-:Manual section: 1
-:Manual group: @VERSION@
-
-########
-SYNOPSIS
-########
-
-**gramps**
-\ [\ **-?** | **--help**]
-\ [\ **--usage**]
-\ [\ **--version**]
-\ [\ **-l**]
-\ [\ **-L**]
-\ [\ **-u** | **--force-unlock**]
-\ [\ **-O** | **--open**\ =\ *DATABASE* [\ **-f** | **--format**\ =\ *FORMAT*]]
-\ [\ **-i** | **--import**\ =\ *FILE* [\ **-f** | **--format**\ =\ *FORMAT*]]
-\ [\ **--remove**\ =\ *FAMILY_TREE_PATTERN*]
-\ [\ **-e** | **--export**\ =\ *FILE* [**-f** | **--format**\ =\ *FORMAT*]]
-\ [\ **-a** | **--action**\ =\ *ACTION*]
-\ [\ **-p** | **--options**\ =\ *OPTION-STRING*]]
-\ [\ *FILE*]
-\ [\ **--version**]
-
-###########
-DESCRIPTION
-###########
-
-Gramps is a Free, Open Source genealogy program.
-It is written in Python, using the GTK+/GNOME interface.
-Gramps should seem familiar to anyone who has used other genealogy programs
-before such as Family Tree Maker™, Personal Ancestral Files™,
-or the GNU Geneweb.
-It supports importing of the ever-popular GEDCOM format which is used worldwide
-by almost all other genealogy software.
-
-#######
-OPTIONS
-#######
-
-**gramps** *FILE*
-    When *FILE* is given (without any flags) as a family tree name or as a
-    family tree database directory, then it is opened and an interactive
-    session is started.
-    If *FILE* is a file format understood by Gramps, an empty family tree is
-    created whose name is based on the *FILE* name, and the data is imported
-    into it.
-    Any other options are ignored.
-    This way of launching is suitable for using gramps as a handler for
-    genealogical data in e.g. web browsers.
-    This invocation can accept any data format native to gramps; see below.
-
-**-f**, **--format**\ =\ *FORMAT*
-    Explicitly specify format of *FILE* given by preceding **-i** or **-e**
-    option.
-    If the **-f** option is not given for any *FILE*, the format of that file
-    is guessed according to its extension or MIME type.
-
-    Formats available for export are **gramps-xml** (guessed if *FILE* ends
-    with `.gramps`), **gedcom** (guessed if *FILE* ends with `.ged`), or any
-    file export available through the Gramps plugin system.
-
-    Formats available for import are **gramps-xml**, **gedcom**, **gramps-pkg**
-    (guessed if *FILE* ends with `.gpkg`), and **geneweb** (guessed if *FILE*
-    ends with `.gw`).
-
-    Formats available for export are **gramps-xml**, **gedcom**,
-    **gramps-pkg**, **wft** (guessed if *FILE* ends with `.wft`),
-    **geneweb**.
-
-**-l**
-    Print a list of known family trees.
-
-**-L**
-    Print a detailed list of known family trees.
-
-**-u**, **--force-unlock**
-    Unlock a locked database.
-
-**-O**, **--open**\ =\ *DATABASE*
-    Open *DATABASE* which must be an existing database directory or existing
-    family tree name.
-    If no action, import, or export options are given on the command line, then
-    an interactive session is started using that database.
-
-**-i**, **--import**\ =\ *FILE*
-    Import data from *FILE*.
-    If no database was specified, then an empty database is created
-    called Family Tree *x* (where *x* is an incrementing number).
-
-    When more than one input file is given,
-    each has to be preceded by a **-i** flag.
-    The files are imported in the specified order, e.g.,
-    **-i** *FILE1* **-i** *FILE2*
-    and
-    **-i** *FILE2* **-i** *FILE1*
-    might produce different gramps IDs in the resulting database.
-
-**-e**, **--export**\ =\ *FILE*
-    Export data into *FILE*.
-    For **gramps-xml**, **gedcom**, **wft**, **gramps-pkg**, and **geneweb**,
-    the *FILE* is the name of the resulting file.
-
-    When more than one output file is given,
-    each has to be preceded by a **-e** flag.
-    The files are written one by one, in the specified order.
-
-**-a**, **--action**\ =\ *ACTION*
-    Perform *ACTION* on the imported data.
-    This is done after all imports are successfully completed.
-    Currently available actions are **summary** (same as
-    Reports→View→Summary), **check** (same as Tools→Database
-    Processing→Check and Repair), **report** (generates report), and tool
-    (runs a plugin tool).
-    Both **report** and **tool** need the *OPTION-STRING* supplied by the
-    **-p** flag).
-
-    The *OPTION-STRING* should satisfy the following conditions:
-
-    - It should not contain any spaces.
-    - If some arguments need to include spaces, the string should be enclosed
-      with quotation marks, following shell syntax.
-    - The option string is a list of pairs with name and value (separated by an
-      equals sign).
-    - The name and value pairs must be separated by commas.
-
-    Most of the report or tools options are specific for each report or tool.
-    However, there are some common options.
-
-    **name**\ =\ *name*
-        This mandatory option determines which report or tool will be run.
-        If the supplied *name* does not correspond to any available report or
-        tool, an error message will be printed followed by the list of
-        available reports or tools (depending on the *ACTION*).
-
-    **show**\ =\ **all**
-        This will produce the list of names for all options available for a
-        given report or tool.
+English
+=======

-    **show**\ =\ *optionname*
-        This will print the description of the functionality supplied by
-        *optionname*, as well as what are the acceptable types and values for
-        this option.
+gramps(1)                @VERSION@               gramps(1)

-    Use the above options to find out everything about a given report.

-    When more than one output action is given, each has to be preceded by a
-    **-a** flag.
-    The actions are performed one by one, in the specified order.

-**-d**, **--debug**\ =\ *LOGGER_NAME*
-    Enable debug logs for development and testing.
-    Look at the source code for details.
+**NAME**
+       gramps - Genealogical Research and Analysis Management Programming Sys‐
+       tem.

-**--version**
-    Print the version number of gramps and then exits.

-#########
-OPERATION
-#########
+**SYNOPSIS**
+       **gramps** [**-?** | **--help**] [**--usage**] [**--version**]
+       [**-l**] [**-L**] [**-u** | **--force-unlock**] [**-O** | **--open=** *DATABASE*
+       [**-f** | **--format=** *FORMAT*] [**-i** | **--import=** *FILE*
+       [**-f** | **--format=** *FORMAT*]] [**--remove=** *FAMILY_TREE_PATTERN*]
+       [**-e** | **--export=** *FILE* [**-f** | **--format=** *FORMAT*]]
+       [**-a** | **--action=** *ACTION*] [*-p* | **--options=** *OPTION‐
+       STRING*]] [*FILE*] [**--version**]

-If the first argument on the command line does not start with dash (i.e., no
-flag), gramps will attempt to open the file with the name given by the first
-argument and start an interactive session, ignoring the rest of the command line
-arguments.

-If the **-O** flag is given, then gramps will try opening the supplied database
-and then work with that data, as instructed by the further command line
-parameters.
+**DESCRIPTION**
+       Gramps is a Free/OpenSource genealogy program. It is written in Python,
+       using  the GTK+/GNOME interface.  Gramps should seem familiar to anyone
+       who has used other genealogy programs before such as Family Tree  Maker
+       (TM),   Personal Ancestral Files (TM), or the GNU Geneweb.  It supports
+       importing of the ever popular GEDCOM format which is used world wide by
+       almost all other genealogy software.

-With or without the **-O** flag, further imports, exports, and actions may be
-specified on the command line by using **-i**, **-e**, and
-**-a** flags.

-The order of **-i**, **-e**, or **-a** options does not matter.
-The actual order they are processed always is:
-all imports (if any) → all actions (if any) → all exports (if any).
-But opening must always be first!
+**OPTIONS**
+       **gramps** *FILE*
+          When *FILE* is given (without any flags) as a family tree name or
+          as a family tree database directory, then it is opened and an
+          interactive  session is started. If *FILE* is a file format under‐
+          stood by Gramps, an empty family tree is created  whose name is
+          based  on  the *FILE* name and the data is imported into it. The
+          rest of the options is ignored. This way of launching is suit‐
+          able for using gramps as a handler for genealogical data in e.g.
+          web browsers. This invocation can accept any data format  native
+          to gramps, see below.

-If no **-O** or **-i** option is given,
-gramps will launch its main window and start the usual interactive session with
-an empty database, since there is no data to process anyway.

-If no **-e** or **-a** options are given,
-gramps will launch its main window and start the usual interactive session with
-the database resulting from all imports.
-This database resides in the *import_db.grdb* under the *~/.gramps/import*
-directory.
+       **-f** , **--format=** *FORMAT*
+          Explicitly specify format of *FILE* given by preceding **-i** ,
+          or **-e** option. If the **-f** option is not given for any
+          *FILE* , the format of that file is guessed according to its extension
+          or MIME-type.

-Any errors encountered during import, export, or action
-will be dumped either to *stdout* (if these are exceptions handled by gramps)
-or to *stderr* (if these are not handled).
-Use usual shell redirections of *stdout* and *stderr* to save messages and
-errors to files.
+          Formats  available for export are **gramps-xml** (guessed if *FILE*
+          ends with **.gramps** ), **gedcom** (guessed if *FILE* ends with
+          **.ged** ), or any file export available through the Gramps plugin
+          system.

-########
-EXAMPLES
-########
+          Formats available for import are **gramps-xml** , **gedcom** ,
+          **gramps-pkg** (guessed if *FILE* ends with **.gpkg** ),
+          and **geneweb** (guessed if *FILE* ends with **.gw** ).

-To open an existing family tree and import an xml file into it, one may type::
+          Formats available for export are **gramps-xml** , **gedcom** ,
+          **gramps-pkg** , **wft** (guessed if *FILE* ends with **.wft** ),
+          **geneweb**.

-    gramps -O 'My Family Tree' -i ~/db3.gramps

-The above changes the opened family tree. To do the same, but import both in a
-temporary family tree and start an interactive session, one may type::
+       **-l**
+          Print a list of known family trees.

-    gramps -i 'My Family Tree' -i ~/db3.gramps

-To import four databases (whose formats can be determined from their names) and
-then check the resulting database for errors, one may type::
+       **-L**
+          Print a detailed list of known family trees.

-    gramps -i file1.ged -i file2.tgz -i ~/db3.gramps -i file4.wft -a check

-To explicitly specify the formats in the above example, append filenames with
-appropriate **-f** options::
+       **-u** , **--force-unlock**
+          Unlock a locked database.

-    gramps -i file1.ged -f gedcom -i file2.tgz -f gramps-pkg \
-    -i ~/db3.gramps -f gramps-xml -i file4.wft -f wft -a check

-To record the database resulting from all imports, supply a **-e** flag (use
-**-f** if the filename does not allow gramps to guess the format)::
+       **-O** , **--open=** *DATABASE*
+          Open *DATABASE* which  must be an existing database directory or
+          existing family tree name. If no action, import or export
+          options are given on the command line then an interactive ses‐
+          sion is started using that database.

-    gramps -i file1.ged -i file2.tgz -e ~/new-package -f gramps-pkg

-To import three databases and start an interactive gramps session with the
-result::
+       **-i** , **--import=** *FILE*
+          Import data from *FILE* . If you haven't specified a database, then
+          an empty database is created for you called Family Tree x
+          (where x is an incrementing number).

-    gramps -i file1.ged -i file2.tgz -i ~/db3.gramps
+          When more than one input file is given, each has to be preceded
+          by **-i** flag. The files are imported in the specified order, i.e.
+          **-i** *FILE1* **-i** *FILE2* and **-i** *FILE2* **-i** *FILE1*
+          might produce different gramps IDs in the resulting database.

-To run the Verify tool from the commandline and output the result to
-*stdout*::

-    gramps -O 'My Family Tree' -a tool -p name= verify
+       **-e** , **--export=** *FILE*
+          Export data into *FILE* . For **gramps-xml** , **gedcom**
+          , **wft** , **gramps-pkg** , and **geneweb** , the *FILE* is the
+          name of the resulting file.

-Finally, to start a normal interactive session type::
+          When more than one output file is given, each has to be preceded
+          by **-e** flag. The files are written one by one, in the specified order.

-    gramps

-#####################
-ENVIRONMENT VARIABLES
-#####################
+       **-a** , **--action=** *ACTION*
+          Perform *ACTION* on the imported data. This is done after all
+          imports are successfully completed. Currently available  actions
+          are **summary** (same  as  Reports->View->Summary), **check** (same as
+          Tools->Database Processing->Check and Repair), **report** (generates
+          report),  and  tool  (runs a plugin tool).  Both **report** and **tool**
+          need the *OPTIONSTRING* supplied by the **-p** flag).

-The program checks whether these environment variables are set:
+          The *OPTIONSTRING* should satisfy the following conditions:
+          It must not contain any  spaces. If some arguments need to
+          include spaces, the string should be enclosed with quotation
+          marks, i.e., follow the shell syntax. Option string is a list
+          of  pairs  with name and value (separated by the equality sign).
+          The name and value pairs must be separated by commas.

-``LANG``
-    Describe which language to use.
-    E.g., for the Polish language this variable has to be set to `pl_PL.UTF-8`.
+          Most of the report or tools options are specific for each report
+          or tool. However, there are some common options.

-``GRAMPSHOME``
-    Force Gramps to use the specified directory to keep program
-    settings and databases in.
-    By default, this variable is not set and gramps assumes that the folder
-    with all databases and profile settings should be created within the user
-    profile folder (described by environment variable *HOME* for Linux or
-    *USERPROFILE* for Windows 2000/XP).
+          **name=name**
+          This mandatory option determines which report or tool will be
+          run. If the supplied name does not correspond to any  available
+          report or tool, an error message will be printed followed by the
+          list of available reports or tools (depending on the *ACTION* ).

-``CONCEPTS``
-    Supports a python-based plugin system, allowing import and export writers,
-    report generators, tools, and display filters to be added without
-    modification of the main program.
+          **show=all**
+          This will produce the list of names for all options available
+          for a given report or tool.

-    In addition to generating direct printer output, report generators also
-    target other output formats, such as *LibreOffice*, *AbiWord*, *HTML*, or
-    *LaTeX* to allow the users to modify the format to suit their needs.
+          **show=optionname**
+          This will print the description of the functionality supplied by
+          *optionname*, as well as what are the acceptable types and  values
+          for this option.

-#####
-FILES
-#####
+          Use the above options to find out everything about a given
+          report.

-    *${PREFIX}/bin/gramps*

-    *${PREFIX}/lib/python3/dist-packages/gramps/*
+       When more than one output action is given, each has to be preceded  by
+       **-a** flag. The actions are performed one by one, in the specified order.

-    *${PREFIX}/share/*

-    *${HOME}/.gramps*
+       **-d** , **--debug=** *LOGGER_NAME*
+          Enables debug logs for development and testing. Look at the
+          source code for details

-#######
-AUTHORS
-#######
+       **--version**
+          Prints the version number of gramps and then exits

-Donald Allingham <don@gramps-project.org>
-https://www.gramps-project.org/

-This man page was originally written by:
-Brandon L. Griffith <brandon@debian.org>
-for inclusion in the Debian GNU/Linux system.

-This man page is currently maintained by:
-Gramps project <xxx@gramps-project.org>

-#############
-DOCUMENTATION
-#############
+**Operation**
+       If the first argument on the command line does not start with dash
+       (i.e. no flag), gramps will attempt to open the file with the name
+       given by the first argument and start interactive session, ignoring the
+       rest of the command line arguments.

-The user documentation is available through a web browser in the form of the
-Gramps Manual.

-The developer documentation can be found on the
-https://www.gramps-project.org/wiki/index.php/Portal:Developers
-portal.
+       If the  **-O** flag is given, then gramps will try opening the supplied
+       database and then work with that data, as instructed by the further
+       command line parameters.
+
+
+       With or without the **-O** flag, there could be multiple imports, exports,
+       and actions specified further on the command line by using **-i** ,
+       **-e** , and **-a** flags.
+
+
+       The order of **-i** , **-e** , or **-a** options does not matter. The actual order
+       always is: all imports (if any) -> all actions (if any) -> all  exports
+       (if any). But opening must always be first!
+
+
+       If no **-O** or **-i** option is given, gramps will launch its main window and
+       start the usual interactive session with the empty database, since
+       there is no data to process, anyway.
+
+
+       If no **-e**  or **-a** options are given, gramps will launch its main window
+       and start the usual interactive session with the database resulted from
+       all imports. This database resides in the **import_db.grdb** under
+       **~/.gramps/import** directory.
+
+
+       The error encountered during import, export, or action, will be  either
+       dumped to stdout (if  these  are exceptions handled by gramps) or to
+       *stderr* (if these are not handled). Use usual shell redirections of
+       *stdout* and *stderr* to save messages and errors in files.
+
+
+**EXAMPLES**
+       To open an existing family tree and import an xml file into it, one
+       may type:
+
+          **gramps -O** *'My Family Tree'* **-i** *~/db3.gramps*
+
+       The above changes the opened family tree, to do the  same, but import
+       both in a temporary family tree and start an interactive session, one
+       may type:
+
+          **gramps -i** *'My Family Tree'* **-i** *~/db3.gramps*
+
+       To import four databases (whose formats can be  determined from their
+       names) and then check the resulting database for errors, one may type:
+
+          **gramps -i** *file1.ged* **-i** *file2.tgz* **-i** *~/db3.gramps*
+          **-i** *file4.wft* **-a** *check*
+
+       To explicitly specify the formats in the above  example,  append  file‐
+       names with appropriate **-f** options:
+
+          **gramps -i** *file1.ged* **-f** *gedcom* **-i** *file2.tgz* **-f**
+          *gramps-pkg* **-i** *~/db3.gramps* **-f** *gramps-xml* **-i** *file4.wft*
+          **-f** *wft* **-a** *check*
+
+       To record the database resulting from all imports, supply **-e** flag  (use
+       **-f** if the filename does not allow gramps to guess the format):
+
+          **gramps -i** *file1.ged* **-i** *file2.tgz* **-e** *~/new-package*
+          **-f** *gramps-pkg*
+
+       To import three databases and start interactive gramps session with the
+       result:
+
+          **gramps -i** *file1.ged* **-i** *file2.tgz* **-i** *~/db3.gramps*
+
+       To run the Verify tool from the commandline and output the result to
+       stdout:
+
+          **gramps -O** *'My Family Tree'* **-a** *tool* **-p name=** *verify*
+
+       Finally, to start normal interactive session type:
+
+          **gramps**
+
+
+**ENVIRONMENT VARIABLES**
+       The program checks whether these environment variables are set:
+
+       **LANG**  -  describe, which language to use: Ex.: for polish language this
+       variable has to be set to pl_PL.UTF-8.
+
+       **GRAMPSHOME** - if set, force Gramps to use  the  specified  directory  to
+       keep program settings and databases there. By default, this variable is
+       not set and gramps assumes that the folder with all databases and  pro‐
+       file  settings  should  be  created  within  the  user  profile  folder
+       (described by environment variable HOME for Linux  or  USERPROFILE  for
+       Windows 2000/XP).
+
+
+**CONCEPTS**
+       Supports a python-based plugin system, allowing import and export writ‐
+       ers, report generators, tools, and display filters to be added  without
+       modification of the main program.
+
+       In addition to generating direct printer output, report generators also
+       target other systems, such as *LibreOffice.org* , *AbiWord* , *HTML*,
+       or *LaTeX* to allow the users to modify the format to suit their needs.
+
+
+**KNOWN BUGS AND LIMITATIONS**
+
+**FILES**
+
+       *${PREFIX}/bin/gramps*
+
+       *${PREFIX}/lib/python3/dist-packages/gramps/*
+
+       *${PREFIX}/share/*
+
+       *${HOME}/.gramps*
+
+
+**AUTHORS**
+       Donald Allingham <don@gramps-project.org>
+       http://gramps-project.org/
+
+       This man page was originally written by:
+       Brandon L. Griffith <brandon@debian.org>
+       for inclusion in the Debian GNU/Linux system.
+
+       This man page is currently maintained by:
+       Gramps project <xxx@gramps-project.org>
+
+
+**DOCUMENTATION**
+       The user documentation is available through standard web browser
+       in the form of Gramps Manual.
+
+       The developer documentation can be found on the
+       http://www.gramps-project.org/wiki/index.php?title=Portal:Developers
+       portal.
+
+
+
+gramps(1)                 @VERSION@               gramps(1)
@@ -16,204 +16,210 @@ import sys, os
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-# sys.path.insert(0, os.path.abspath('.'))
+#sys.path.insert(0, os.path.abspath('.'))

 # -- General configuration -----------------------------------------------------

 # If your documentation needs a minimal Sphinx version, state it here.
-# needs_sphinx = '1.0'
+#needs_sphinx = '1.0'

 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = []

 # Add any paths that contain templates here, relative to this directory.
-templates_path = ["_templates"]
+templates_path = ['_templates']

 # The suffix of source filenames.
-source_suffix = ".rst"
+source_suffix = '.rst'

 # The encoding of source files.
-# source_encoding = 'utf-8-sig'
+#source_encoding = 'utf-8-sig'

 # The master toctree document.
-master_doc = "fr"
+master_doc = 'fr'

 # General information about the project.
-project = "Gramps"
-copyright = "2015, Gramps project"
+project = u'Gramps'
+copyright = u'2015, Gramps project'

 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = "4.2"
+version = '4.2'
 # The full version, including alpha/beta/rc tags.
-release = "4.2.0"
+release = '4.2.0'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
-locale_dirs = "./locale"
+locale_dirs = './locale'
 gettext_compact = True

 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
-# today = ''
+#today = ''
 # Else, today_fmt is used as the format for a strftime call.
-today_fmt = "%d %B %Y"
+today_fmt = '%d %B %Y'

 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ["_build"]
+exclude_patterns = ['_build']

 # The reST default role (used for this markup: `text`) to use for all documents.
-# default_role = None
+#default_role = None

 # If true, '()' will be appended to :func: etc. cross-reference text.
-# add_function_parentheses = True
+#add_function_parentheses = True

 # If true, the current module name will be prepended to all description
 # unit titles (such as .. function::).
-# add_module_names = True
+#add_module_names = True

 # If true, sectionauthor and moduleauthor directives will be shown in the
 # output. They are ignored by default.
-# show_authors = False
+#show_authors = False

 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = "sphinx"
+pygments_style = 'sphinx'

 # A list of ignored prefixes for module index sorting.
-# modindex_common_prefix = []
+#modindex_common_prefix = []


 # -- Options for HTML output ---------------------------------------------------

 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = "default"
+html_theme = 'default'

 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-# html_theme_options = {}
+#html_theme_options = {}

 # Add any paths that contain custom themes here, relative to this directory.
-# html_theme_path = []
+#html_theme_path = []

 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-# html_title = None
+#html_title = None

 # A shorter title for the navigation bar.  Default is the same as html_title.
-# html_short_title = None
+#html_short_title = None

 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-# html_logo = None
+#html_logo = None

 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-# html_favicon = None
+#html_favicon = None

 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-# html_static_path = ['_static']
+#html_static_path = ['_static']

 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-# html_last_updated_fmt = '%b %d, %Y'
+#html_last_updated_fmt = '%b %d, %Y'

 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-# html_use_smartypants = True
+#html_use_smartypants = True

 # Custom sidebar templates, maps document names to template names.
-# html_sidebars = {}
+#html_sidebars = {}

 # Additional templates that should be rendered to pages, maps page names to
 # template names.
-# html_additional_pages = {}
+#html_additional_pages = {}

 # If false, no module index is generated.
-# html_domain_indices = True
+#html_domain_indices = True

 # If false, no index is generated.
-# html_use_index = True
+#html_use_index = True

 # If true, the index is split into individual pages for each letter.
-# html_split_index = False
+#html_split_index = False

 # If true, links to the reST sources are added to the pages.
-# html_show_sourcelink = True
+#html_show_sourcelink = True

 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-# html_show_sphinx = True
+#html_show_sphinx = True

 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-# html_show_copyright = True
+#html_show_copyright = True

 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
-# html_use_opensearch = ''
+#html_use_opensearch = ''

 # This is the file name suffix for HTML files (e.g. ".xhtml").
-# html_file_suffix = None
+#html_file_suffix = None

 # Output file base name for HTML help builder.
-htmlhelp_basename = "Grampsdoc"
+htmlhelp_basename = 'Grampsdoc'


 # -- Options for LaTeX output --------------------------------------------------

 latex_elements = {
-    # The paper size ('letterpaper' or 'a4paper').
-    #'papersize': 'letterpaper',
-    # The font size ('10pt', '11pt' or '12pt').
-    #'pointsize': '10pt',
-    # Additional stuff for the LaTeX preamble.
-    #'preamble': '',
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
 }

 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-    ("index", "Gramps.tex", "Gramps Documentation", ".", "manual"),
+  ('index', 'Gramps.tex', u'Gramps Documentation',
+   u'.', 'manual'),
 ]

 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-# latex_logo = None
+#latex_logo = None

 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.
-# latex_use_parts = False
+#latex_use_parts = False

 # If true, show page references after internal links.
-# latex_show_pagerefs = False
+#latex_show_pagerefs = False

 # If true, show URL addresses after external links.
-# latex_show_urls = False
+#latex_show_urls = False

 # Documents to append as an appendix to all manuals.
-# latex_appendices = []
+#latex_appendices = []

 # If false, no module index is generated.
-# latex_domain_indices = True
+#latex_domain_indices = True


 # -- Options for manual page output --------------------------------------------

 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [("fr", "gramps", "Gramps Documentation", ["Jerome Rapinat"], 1)]
+man_pages = [
+    ('fr', 'gramps', u'Gramps Documentation',
+     ['Jerome Rapinat'], 1)
+]

 # If true, show URL addresses after external links.
-# man_show_urls = False
+#man_show_urls = False


 # -- Options for Texinfo output ------------------------------------------------
@@ -222,22 +228,16 @@ man_pages = [("fr", "gramps", "Gramps Documentation", ["Jerome Rapinat"], 1)]
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (
-        "index",
-        "Gramps",
-        "Gramps Documentation",
-        ".",
-        "Gramps",
-        "One line description of project.",
-        "Miscellaneous",
-    ),
+  ('index', 'Gramps', u'Gramps Documentation',
+   u'.', 'Gramps', 'One line description of project.',
+   'Miscellaneous'),
 ]

 # Documents to append as an appendix to all manuals.
-# texinfo_appendices = []
+#texinfo_appendices = []

 # If false, no module index is generated.
-# texinfo_domain_indices = True
+#texinfo_domain_indices = True

 # How to display URL addresses: 'footnote', 'no', or 'inline'.
-# texinfo_show_urls = 'footnote'
+#texinfo_show_urls = 'footnote'
@@ -1,8 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
-.TH GRAMPS 1 "" "" "@VERSION@"
+.TH ENGLISH  "" "" ""
 .SH NAME
-gramps \- Genealogical Research and Analysis Management Programming System.
+English \- 
 .
 .nr rst2man-indent-level 0
 .
@@ -30,63 +30,62 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.SH SYNOPSIS
 .sp
-\fBgramps\fP
-[\fB\-?\fP | \fB\-\-help\fP]
-[\fB\-\-usage\fP]
-[\fB\-\-version\fP]
-[\fB\-l\fP]
-[\fB\-L\fP]
-[\fB\-u\fP | \fB\-\-force\-unlock\fP]
-[\fB\-O\fP | \fB\-\-open\fP=\fIDATABASE\fP [\fB\-f\fP | \fB\-\-format\fP=\fIFORMAT\fP]]
-[\fB\-i\fP | \fB\-\-import\fP=\fIFILE\fP [\fB\-f\fP | \fB\-\-format\fP=\fIFORMAT\fP]]
-[\fB\-\-remove\fP=\fIFAMILY_TREE_PATTERN\fP]
-[\fB\-e\fP | \fB\-\-export\fP=\fIFILE\fP [\fB\-f\fP | \fB\-\-format\fP=\fIFORMAT\fP]]
-[\fB\-a\fP | \fB\-\-action\fP=\fIACTION\fP]
-[\fB\-p\fP | \fB\-\-options\fP=\fIOPTION\-STRING\fP]]
-[\fIFILE\fP]
-[\fB\-\-version\fP]
-.SH DESCRIPTION
-.sp
-Gramps is a Free, Open Source genealogy program.
-It is written in Python, using the GTK+/GNOME interface.
-Gramps should seem familiar to anyone who has used other genealogy programs
-before such as Family Tree Maker™, Personal Ancestral Files™,
-or the GNU Geneweb.
-It supports importing of the ever\-popular GEDCOM format which is used worldwide
-by almost all other genealogy software.
-.SH OPTIONS
+gramps(1)                @VERSION@               gramps(1)
 .INDENT 0.0
 .TP
-.B \fBgramps\fP \fIFILE\fP
-When \fIFILE\fP is given (without any flags) as a family tree name or as a
-family tree database directory, then it is opened and an interactive
-session is started.
-If \fIFILE\fP is a file format understood by Gramps, an empty family tree is
-created whose name is based on the \fIFILE\fP name, and the data is imported
-into it.
-Any other options are ignored.
-This way of launching is suitable for using gramps as a handler for
-genealogical data in e.g. web browsers.
-This invocation can accept any data format native to gramps; see below.
+.B \fBNAME\fP
+gramps \- Genealogical Research and Analysis Management Programming Sys‐
+tem.
 .TP
-.B \fB\-f\fP, \fB\-\-format\fP=\fIFORMAT\fP
-Explicitly specify format of \fIFILE\fP given by preceding \fB\-i\fP or \fB\-e\fP
-option.
-If the \fB\-f\fP option is not given for any \fIFILE\fP, the format of that file
-is guessed according to its extension or MIME type.
+.B \fBSYNOPSIS\fP
+\fBgramps\fP [\fB\-?\fP | \fB\-\-help\fP] [\fB\-\-usage\fP] [\fB\-\-version\fP]
+[\fB\-l\fP] [\fB\-L\fP] [\fB\-u\fP | \fB\-\-force\-unlock\fP] [\fB\-O\fP | \fB\-\-open=\fP \fIDATABASE\fP
+[\fB\-f\fP | \fB\-\-format=\fP \fIFORMAT\fP] [\fB\-i\fP | \fB\-\-import=\fP \fIFILE\fP
+[\fB\-f\fP | \fB\-\-format=\fP \fIFORMAT\fP]] [\fB\-\-remove=\fP \fIFAMILY_TREE_PATTERN\fP]
+[\fB\-e\fP | \fB\-\-export=\fP \fIFILE\fP [\fB\-f\fP | \fB\-\-format=\fP \fIFORMAT\fP]]
+[\fB\-a\fP | \fB\-\-action=\fP \fIACTION\fP] [\fI\-p\fP | \fB\-\-options=\fP \fIOPTION‐
+STRING\fP]] [\fIFILE\fP] [\fB\-\-version\fP]
+.TP
+.B \fBDESCRIPTION\fP
+Gramps is a Free/OpenSource genealogy program. It is written in Python,
+using  the GTK+/GNOME interface.  Gramps should seem familiar to anyone
+who has used other genealogy programs before such as Family Tree  Maker
+(TM),   Personal Ancestral Files (TM), or the GNU Geneweb.  It supports
+importing of the ever popular GEDCOM format which is used world wide by
+almost all other genealogy software.
+.TP
+.B \fBOPTIONS\fP
+.INDENT 7.0
+.TP
+.B \fBgramps\fP \fIFILE\fP
+When \fIFILE\fP is given (without any flags) as a family tree name or
+as a family tree database directory, then it is opened and an
+interactive  session is started. If \fIFILE\fP is a file format under‐
+stood by Gramps, an empty family tree is created  whose name is
+based  on  the \fIFILE\fP name and the data is imported into it. The
+rest of the options is ignored. This way of launching is suit‐
+able for using gramps as a handler for genealogical data in e.g.
+web browsers. This invocation can accept any data format  native
+to gramps, see below.
+.TP
+.B \fB\-f\fP , \fB\-\-format=\fP \fIFORMAT\fP
+Explicitly specify format of \fIFILE\fP given by preceding \fB\-i\fP ,
+or \fB\-e\fP option. If the \fB\-f\fP option is not given for any
+\fIFILE\fP , the format of that file is guessed according to its extension
+or MIME\-type.
 .sp
-Formats available for export are \fBgramps\-xml\fP (guessed if \fIFILE\fP ends
-with \fI\&.gramps\fP), \fBgedcom\fP (guessed if \fIFILE\fP ends with \fI\&.ged\fP), or any
-file export available through the Gramps plugin system.
+Formats  available for export are \fBgramps\-xml\fP (guessed if \fIFILE\fP
+ends with \fB\&.gramps\fP ), \fBgedcom\fP (guessed if \fIFILE\fP ends with
+\fB\&.ged\fP ), or any file export available through the Gramps plugin
+system.
 .sp
-Formats available for import are \fBgramps\-xml\fP, \fBgedcom\fP, \fBgramps\-pkg\fP
-(guessed if \fIFILE\fP ends with \fI\&.gpkg\fP), and \fBgeneweb\fP (guessed if \fIFILE\fP
-ends with \fI\&.gw\fP).
+Formats available for import are \fBgramps\-xml\fP , \fBgedcom\fP ,
+\fBgramps\-pkg\fP (guessed if \fIFILE\fP ends with \fB\&.gpkg\fP ),
+and \fBgeneweb\fP (guessed if \fIFILE\fP ends with \fB\&.gw\fP ).
 .sp
-Formats available for export are \fBgramps\-xml\fP, \fBgedcom\fP,
-\fBgramps\-pkg\fP, \fBwft\fP (guessed if \fIFILE\fP ends with \fI\&.wft\fP),
+Formats available for export are \fBgramps\-xml\fP , \fBgedcom\fP ,
+\fBgramps\-pkg\fP , \fBwft\fP (guessed if \fIFILE\fP ends with \fB\&.wft\fP ),
 \fBgeneweb\fP\&.
 .TP
 .B \fB\-l\fP
@@ -95,260 +94,209 @@ Print a list of known family trees.
 .B \fB\-L\fP
 Print a detailed list of known family trees.
 .TP
-.B \fB\-u\fP, \fB\-\-force\-unlock\fP
+.B \fB\-u\fP , \fB\-\-force\-unlock\fP
 Unlock a locked database.
 .TP
-.B \fB\-O\fP, \fB\-\-open\fP=\fIDATABASE\fP
-Open \fIDATABASE\fP which must be an existing database directory or existing
-family tree name.
-If no action, import, or export options are given on the command line, then
-an interactive session is started using that database.
+.B \fB\-O\fP , \fB\-\-open=\fP \fIDATABASE\fP
+Open \fIDATABASE\fP which  must be an existing database directory or
+existing family tree name. If no action, import or export
+options are given on the command line then an interactive ses‐
+sion is started using that database.
 .TP
-.B \fB\-i\fP, \fB\-\-import\fP=\fIFILE\fP
-Import data from \fIFILE\fP\&.
-If no database was specified, then an empty database is created
-called Family Tree \fIx\fP (where \fIx\fP is an incrementing number).
+.B \fB\-i\fP , \fB\-\-import=\fP \fIFILE\fP
+Import data from \fIFILE\fP . If you haven\(aqt specified a database, then
+an empty database is created for you called Family Tree x
+(where x is an incrementing number).
 .sp
-When more than one input file is given,
-each has to be preceded by a \fB\-i\fP flag.
-The files are imported in the specified order, e.g.,
-\fB\-i\fP \fIFILE1\fP \fB\-i\fP \fIFILE2\fP
-and
-\fB\-i\fP \fIFILE2\fP \fB\-i\fP \fIFILE1\fP
+When more than one input file is given, each has to be preceded
+by \fB\-i\fP flag. The files are imported in the specified order, i.e.
+\fB\-i\fP \fIFILE1\fP \fB\-i\fP \fIFILE2\fP and \fB\-i\fP \fIFILE2\fP \fB\-i\fP \fIFILE1\fP
 might produce different gramps IDs in the resulting database.
 .TP
-.B \fB\-e\fP, \fB\-\-export\fP=\fIFILE\fP
-Export data into \fIFILE\fP\&.
-For \fBgramps\-xml\fP, \fBgedcom\fP, \fBwft\fP, \fBgramps\-pkg\fP, and \fBgeneweb\fP,
-the \fIFILE\fP is the name of the resulting file.
+.B \fB\-e\fP , \fB\-\-export=\fP \fIFILE\fP
+Export data into \fIFILE\fP . For \fBgramps\-xml\fP , \fBgedcom\fP
+, \fBwft\fP , \fBgramps\-pkg\fP , and \fBgeneweb\fP , the \fIFILE\fP is the
+name of the resulting file.
 .sp
-When more than one output file is given,
-each has to be preceded by a \fB\-e\fP flag.
-The files are written one by one, in the specified order.
+When more than one output file is given, each has to be preceded
+by \fB\-e\fP flag. The files are written one by one, in the specified order.
 .TP
-.B \fB\-a\fP, \fB\-\-action\fP=\fIACTION\fP
-Perform \fIACTION\fP on the imported data.
-This is done after all imports are successfully completed.
-Currently available actions are \fBsummary\fP (same as
-Reports→View→Summary), \fBcheck\fP (same as Tools→Database
-Processing→Check and Repair), \fBreport\fP (generates report), and tool
-(runs a plugin tool).
-Both \fBreport\fP and \fBtool\fP need the \fIOPTION\-STRING\fP supplied by the
-\fB\-p\fP flag).
+.B \fB\-a\fP , \fB\-\-action=\fP \fIACTION\fP
+Perform \fIACTION\fP on the imported data. This is done after all
+imports are successfully completed. Currently available  actions
+are \fBsummary\fP (same  as  Reports\->View\->Summary), \fBcheck\fP (same as
+Tools\->Database Processing\->Check and Repair), \fBreport\fP (generates
+report),  and  tool  (runs a plugin tool).  Both \fBreport\fP and \fBtool\fP
+need the \fIOPTIONSTRING\fP supplied by the \fB\-p\fP flag).
 .sp
-The \fIOPTION\-STRING\fP should satisfy the following conditions:
-.INDENT 7.0
-.IP \(bu 2
-It should not contain any spaces.
-.IP \(bu 2
-If some arguments need to include spaces, the string should be enclosed
-with quotation marks, following shell syntax.
-.IP \(bu 2
-The option string is a list of pairs with name and value (separated by an
-equals sign).
-.IP \(bu 2
+The \fIOPTIONSTRING\fP should satisfy the following conditions:
+It must not contain any  spaces. If some arguments need to
+include spaces, the string should be enclosed with quotation
+marks, i.e., follow the shell syntax. Option string is a list
+of  pairs  with name and value (separated by the equality sign).
 The name and value pairs must be separated by commas.
+.sp
+Most of the report or tools options are specific for each report
+or tool. However, there are some common options.
+.sp
+\fBname=name\fP
+This mandatory option determines which report or tool will be
+run. If the supplied name does not correspond to any  available
+report or tool, an error message will be printed followed by the
+list of available reports or tools (depending on the \fIACTION\fP ).
+.sp
+\fBshow=all\fP
+This will produce the list of names for all options available
+for a given report or tool.
+.sp
+\fBshow=optionname\fP
+This will print the description of the functionality supplied by
+\fIoptionname\fP, as well as what are the acceptable types and  values
+for this option.
+.sp
+Use the above options to find out everything about a given
+report.
 .UNINDENT
 .sp
-Most of the report or tools options are specific for each report or tool.
-However, there are some common options.
+When more than one output action is given, each has to be preceded  by
+\fB\-a\fP flag. The actions are performed one by one, in the specified order.
 .INDENT 7.0
 .TP
-.B \fBname\fP=\fIname\fP
-This mandatory option determines which report or tool will be run.
-If the supplied \fIname\fP does not correspond to any available report or
-tool, an error message will be printed followed by the list of
-available reports or tools (depending on the \fIACTION\fP).
-.TP
-.B \fBshow\fP=\fBall\fP
-This will produce the list of names for all options available for a
-given report or tool.
-.TP
-.B \fBshow\fP=\fIoptionname\fP
-This will print the description of the functionality supplied by
-\fIoptionname\fP, as well as what are the acceptable types and values for
-this option.
-.UNINDENT
-.sp
-Use the above options to find out everything about a given report.
-.sp
-When more than one output action is given, each has to be preceded by a
-\fB\-a\fP flag.
-The actions are performed one by one, in the specified order.
-.TP
-.B \fB\-d\fP, \fB\-\-debug\fP=\fILOGGER_NAME\fP
-Enable debug logs for development and testing.
-Look at the source code for details.
+.B \fB\-d\fP , \fB\-\-debug=\fP \fILOGGER_NAME\fP
+Enables debug logs for development and testing. Look at the
+source code for details
 .TP
 .B \fB\-\-version\fP
-Print the version number of gramps and then exits.
+Prints the version number of gramps and then exits
 .UNINDENT
-.SH OPERATION
+.TP
+.B \fBOperation\fP
+If the first argument on the command line does not start with dash
+(i.e. no flag), gramps will attempt to open the file with the name
+given by the first argument and start interactive session, ignoring the
+rest of the command line arguments.
 .sp
-If the first argument on the command line does not start with dash (i.e., no
-flag), gramps will attempt to open the file with the name given by the first
-argument and start an interactive session, ignoring the rest of the command line
-arguments.
+If the  \fB\-O\fP flag is given, then gramps will try opening the supplied
+database and then work with that data, as instructed by the further
+command line parameters.
 .sp
-If the \fB\-O\fP flag is given, then gramps will try opening the supplied database
-and then work with that data, as instructed by the further command line
-parameters.
+With or without the \fB\-O\fP flag, there could be multiple imports, exports,
+and actions specified further on the command line by using \fB\-i\fP ,
+\fB\-e\fP , and \fB\-a\fP flags.
 .sp
-With or without the \fB\-O\fP flag, further imports, exports, and actions may be
-specified on the command line by using \fB\-i\fP, \fB\-e\fP, and
-\fB\-a\fP flags.
+The order of \fB\-i\fP , \fB\-e\fP , or \fB\-a\fP options does not matter. The actual order
+always is: all imports (if any) \-> all actions (if any) \-> all  exports
+(if any). But opening must always be first!
 .sp
-The order of \fB\-i\fP, \fB\-e\fP, or \fB\-a\fP options does not matter.
-The actual order they are processed always is:
-all imports (if any) → all actions (if any) → all exports (if any).
-But opening must always be first!
+If no \fB\-O\fP or \fB\-i\fP option is given, gramps will launch its main window and
+start the usual interactive session with the empty database, since
+there is no data to process, anyway.
 .sp
-If no \fB\-O\fP or \fB\-i\fP option is given,
-gramps will launch its main window and start the usual interactive session with
-an empty database, since there is no data to process anyway.
+If no \fB\-e\fP  or \fB\-a\fP options are given, gramps will launch its main window
+and start the usual interactive session with the database resulted from
+all imports. This database resides in the \fBimport_db.grdb\fP under
+\fB~/.gramps/import\fP directory.
 .sp
-If no \fB\-e\fP or \fB\-a\fP options are given,
-gramps will launch its main window and start the usual interactive session with
-the database resulting from all imports.
-This database resides in the \fIimport_db.grdb\fP under the \fI~/.gramps/import\fP
-directory.
-.sp
-Any errors encountered during import, export, or action
-will be dumped either to \fIstdout\fP (if these are exceptions handled by gramps)
-or to \fIstderr\fP (if these are not handled).
-Use usual shell redirections of \fIstdout\fP and \fIstderr\fP to save messages and
-errors to files.
-.SH EXAMPLES
-.sp
-To open an existing family tree and import an xml file into it, one may type:
-.INDENT 0.0
+The error encountered during import, export, or action, will be  either
+dumped to stdout (if  these  are exceptions handled by gramps) or to
+\fIstderr\fP (if these are not handled). Use usual shell redirections of
+\fIstdout\fP and \fIstderr\fP to save messages and errors in files.
+.TP
+.B \fBEXAMPLES\fP
+To open an existing family tree and import an xml file into it, one
+may type:
+.INDENT 7.0
 .INDENT 3.5
-.sp
-.nf
-.ft C
-gramps \-O \(aqMy Family Tree\(aq \-i ~/db3.gramps
-.ft P
-.fi
+\fBgramps \-O\fP \fI\(aqMy Family Tree\(aq\fP \fB\-i\fP \fI~/db3.gramps\fP
 .UNINDENT
 .UNINDENT
 .sp
-The above changes the opened family tree. To do the same, but import both in a
-temporary family tree and start an interactive session, one may type:
-.INDENT 0.0
+The above changes the opened family tree, to do the  same, but import
+both in a temporary family tree and start an interactive session, one
+may type:
+.INDENT 7.0
 .INDENT 3.5
-.sp
-.nf
-.ft C
-gramps \-i \(aqMy Family Tree\(aq \-i ~/db3.gramps
-.ft P
-.fi
+\fBgramps \-i\fP \fI\(aqMy Family Tree\(aq\fP \fB\-i\fP \fI~/db3.gramps\fP
 .UNINDENT
 .UNINDENT
 .sp
-To import four databases (whose formats can be determined from their names) and
-then check the resulting database for errors, one may type:
-.INDENT 0.0
+To import four databases (whose formats can be  determined from their
+names) and then check the resulting database for errors, one may type:
+.INDENT 7.0
 .INDENT 3.5
-.sp
-.nf
-.ft C
-gramps \-i file1.ged \-i file2.tgz \-i ~/db3.gramps \-i file4.wft \-a check
-.ft P
-.fi
+\fBgramps \-i\fP \fIfile1.ged\fP \fB\-i\fP \fIfile2.tgz\fP \fB\-i\fP \fI~/db3.gramps\fP
+\fB\-i\fP \fIfile4.wft\fP \fB\-a\fP \fIcheck\fP
 .UNINDENT
 .UNINDENT
 .sp
-To explicitly specify the formats in the above example, append filenames with
-appropriate \fB\-f\fP options:
-.INDENT 0.0
+To explicitly specify the formats in the above  example,  append  file‐
+names with appropriate \fB\-f\fP options:
+.INDENT 7.0
 .INDENT 3.5
-.sp
-.nf
-.ft C
-gramps \-i file1.ged \-f gedcom \-i file2.tgz \-f gramps\-pkg \e
-\-i ~/db3.gramps \-f gramps\-xml \-i file4.wft \-f wft \-a check
-.ft P
-.fi
+\fBgramps \-i\fP \fIfile1.ged\fP \fB\-f\fP \fIgedcom\fP \fB\-i\fP \fIfile2.tgz\fP \fB\-f\fP
+\fIgramps\-pkg\fP \fB\-i\fP \fI~/db3.gramps\fP \fB\-f\fP \fIgramps\-xml\fP \fB\-i\fP \fIfile4.wft\fP
+\fB\-f\fP \fIwft\fP \fB\-a\fP \fIcheck\fP
 .UNINDENT
 .UNINDENT
 .sp
-To record the database resulting from all imports, supply a \fB\-e\fP flag (use
+To record the database resulting from all imports, supply \fB\-e\fP flag  (use
 \fB\-f\fP if the filename does not allow gramps to guess the format):
-.INDENT 0.0
+.INDENT 7.0
 .INDENT 3.5
-.sp
-.nf
-.ft C
-gramps \-i file1.ged \-i file2.tgz \-e ~/new\-package \-f gramps\-pkg
-.ft P
-.fi
+\fBgramps \-i\fP \fIfile1.ged\fP \fB\-i\fP \fIfile2.tgz\fP \fB\-e\fP \fI~/new\-package\fP
+\fB\-f\fP \fIgramps\-pkg\fP
 .UNINDENT
 .UNINDENT
 .sp
-To import three databases and start an interactive gramps session with the
+To import three databases and start interactive gramps session with the
 result:
-.INDENT 0.0
+.INDENT 7.0
 .INDENT 3.5
-.sp
-.nf
-.ft C
-gramps \-i file1.ged \-i file2.tgz \-i ~/db3.gramps
-.ft P
-.fi
+\fBgramps \-i\fP \fIfile1.ged\fP \fB\-i\fP \fIfile2.tgz\fP \fB\-i\fP \fI~/db3.gramps\fP
 .UNINDENT
 .UNINDENT
 .sp
 To run the Verify tool from the commandline and output the result to
-\fIstdout\fP:
-.INDENT 0.0
+stdout:
+.INDENT 7.0
 .INDENT 3.5
-.sp
-.nf
-.ft C
-gramps \-O \(aqMy Family Tree\(aq \-a tool \-p name= verify
-.ft P
-.fi
+\fBgramps \-O\fP \fI\(aqMy Family Tree\(aq\fP \fB\-a\fP \fItool\fP \fB\-p name=\fP \fIverify\fP
 .UNINDENT
 .UNINDENT
 .sp
-Finally, to start a normal interactive session type:
-.INDENT 0.0
+Finally, to start normal interactive session type:
+.INDENT 7.0
 .INDENT 3.5
-.sp
-.nf
-.ft C
-gramps
-.ft P
-.fi
+\fBgramps\fP
 .UNINDENT
 .UNINDENT
-.SH ENVIRONMENT VARIABLES
-.sp
+.TP
+.B \fBENVIRONMENT VARIABLES\fP
 The program checks whether these environment variables are set:
-.INDENT 0.0
-.TP
-.B \fBLANG\fP
-Describe which language to use.
-E.g., for the Polish language this variable has to be set to \fIpl_PL.UTF\-8\fP\&.
-.TP
-.B \fBGRAMPSHOME\fP
-Force Gramps to use the specified directory to keep program
-settings and databases in.
-By default, this variable is not set and gramps assumes that the folder
-with all databases and profile settings should be created within the user
-profile folder (described by environment variable \fIHOME\fP for Linux or
-\fIUSERPROFILE\fP for Windows 2000/XP).
+.sp
+\fBLANG\fP  \-  describe, which language to use: Ex.: for polish language this
+variable has to be set to pl_PL.UTF\-8.
+.sp
+\fBGRAMPSHOME\fP \- if set, force Gramps to use  the  specified  directory  to
+keep program settings and databases there. By default, this variable is
+not set and gramps assumes that the folder with all databases and  pro‐
+file  settings  should  be  created  within  the  user  profile  folder
+(described by environment variable HOME for Linux  or  USERPROFILE  for
+Windows 2000/XP).
 .TP
 .B \fBCONCEPTS\fP
-Supports a python\-based plugin system, allowing import and export writers,
-report generators, tools, and display filters to be added without
+Supports a python\-based plugin system, allowing import and export writ‐
+ers, report generators, tools, and display filters to be added  without
 modification of the main program.
 .sp
 In addition to generating direct printer output, report generators also
-target other output formats, such as \fILibreOffice\fP, \fIAbiWord\fP, \fIHTML\fP, or
-\fILaTeX\fP to allow the users to modify the format to suit their needs.
+target other systems, such as \fILibreOffice.org\fP , \fIAbiWord\fP , \fIHTML\fP,
+or \fILaTeX\fP to allow the users to modify the format to suit their needs.
 .UNINDENT
-.SH FILES
+.sp
+\fBKNOWN BUGS AND LIMITATIONS\fP
+.sp
+\fBFILES\fP
 .INDENT 0.0
 .INDENT 3.5
 \fI${PREFIX}/bin/gramps\fP
@@ -360,10 +308,11 @@ target other output formats, such as \fILibreOffice\fP, \fIAbiWord\fP, \fIHTML\f
 \fI${HOME}/.gramps\fP
 .UNINDENT
 .UNINDENT
-.SH AUTHORS
-.sp
+.INDENT 0.0
+.TP
+.B \fBAUTHORS\fP
 Donald Allingham <\fI\%don@gramps\-project.org\fP>
-\fI\%https://www.gramps\-project.org/\fP
+\fI\%http://gramps\-project.org/\fP
 .sp
 This man page was originally written by:
 Brandon L. Griffith <\fI\%brandon@debian.org\fP>
@@ -371,13 +320,16 @@ for inclusion in the Debian GNU/Linux system.
 .sp
 This man page is currently maintained by:
 Gramps project <\fI\%xxx@gramps\-project.org\fP>
-.SH DOCUMENTATION
-.sp
-The user documentation is available through a web browser in the form of the
-Gramps Manual.
+.TP
+.B \fBDOCUMENTATION\fP
+The user documentation is available through standard web browser
+in the form of Gramps Manual.
 .sp
 The developer documentation can be found on the
-\fI\%https://www.gramps\-project.org/wiki/index.php/Portal:Developers\fP
+\fI\%http://www.gramps\-project.org/wiki/index.php?title=Portal:Developers\fP
 portal.
+.UNINDENT
+.sp
+gramps(1)                 @VERSION@               gramps(1)
 .\" Generated by docutils manpage writer.
 .
@@ -16,204 +16,210 @@ import sys, os
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-# sys.path.insert(0, os.path.abspath('.'))
+#sys.path.insert(0, os.path.abspath('.'))

 # -- General configuration -----------------------------------------------------

 # If your documentation needs a minimal Sphinx version, state it here.
-# needs_sphinx = '1.0'
+#needs_sphinx = '1.0'

 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = []

 # Add any paths that contain templates here, relative to this directory.
-templates_path = ["_templates"]
+templates_path = ['_templates']

 # The suffix of source filenames.
-source_suffix = ".rst"
+source_suffix = '.rst'

 # The encoding of source files.
-# source_encoding = 'utf-8-sig'
+#source_encoding = 'utf-8-sig'

 # The master toctree document.
-master_doc = "nl"
+master_doc = 'nl'

 # General information about the project.
-project = "Gramps"
-copyright = "2015, Gramps project"
+project = u'Gramps'
+copyright = u'2015, Gramps project'

 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = "4.2"
+version = '4.2'
 # The full version, including alpha/beta/rc tags.
-release = "4.2.0"
+release = '4.2.0'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
-locale_dirs = "./locale"
+locale_dirs = './locale'
 gettext_compact = True

 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
-# today = ''
+#today = ''
 # Else, today_fmt is used as the format for a strftime call.
-today_fmt = "%B %d, %Y"
+today_fmt = '%B %d, %Y'

 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ["_build"]
+exclude_patterns = ['_build']

 # The reST default role (used for this markup: `text`) to use for all documents.
-# default_role = None
+#default_role = None

 # If true, '()' will be appended to :func: etc. cross-reference text.
-# add_function_parentheses = True
+#add_function_parentheses = True

 # If true, the current module name will be prepended to all description
 # unit titles (such as .. function::).
-# add_module_names = True
+#add_module_names = True

 # If true, sectionauthor and moduleauthor directives will be shown in the
 # output. They are ignored by default.
-# show_authors = False
+#show_authors = False

 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = "sphinx"
+pygments_style = 'sphinx'

 # A list of ignored prefixes for module index sorting.
-# modindex_common_prefix = []
+#modindex_common_prefix = []


 # -- Options for HTML output ---------------------------------------------------

 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = "default"
+html_theme = 'default'

 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-# html_theme_options = {}
+#html_theme_options = {}

 # Add any paths that contain custom themes here, relative to this directory.
-# html_theme_path = []
+#html_theme_path = []

 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-# html_title = None
+#html_title = None

 # A shorter title for the navigation bar.  Default is the same as html_title.
-# html_short_title = None
+#html_short_title = None

 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-# html_logo = None
+#html_logo = None

 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-# html_favicon = None
+#html_favicon = None

 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-# html_static_path = ['_static']
+#html_static_path = ['_static']

 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-# html_last_updated_fmt = '%b %d, %Y'
+#html_last_updated_fmt = '%b %d, %Y'

 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-# html_use_smartypants = True
+#html_use_smartypants = True

 # Custom sidebar templates, maps document names to template names.
-# html_sidebars = {}
+#html_sidebars = {}

 # Additional templates that should be rendered to pages, maps page names to
 # template names.
-# html_additional_pages = {}
+#html_additional_pages = {}

 # If false, no module index is generated.
-# html_domain_indices = True
+#html_domain_indices = True

 # If false, no index is generated.
-# html_use_index = True
+#html_use_index = True

 # If true, the index is split into individual pages for each letter.
-# html_split_index = False
+#html_split_index = False

 # If true, links to the reST sources are added to the pages.
-# html_show_sourcelink = True
+#html_show_sourcelink = True

 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-# html_show_sphinx = True
+#html_show_sphinx = True

 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-# html_show_copyright = True
+#html_show_copyright = True

 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
-# html_use_opensearch = ''
+#html_use_opensearch = ''

 # This is the file name suffix for HTML files (e.g. ".xhtml").
-# html_file_suffix = None
+#html_file_suffix = None

 # Output file base name for HTML help builder.
-htmlhelp_basename = "Grampsdoc"
+htmlhelp_basename = 'Grampsdoc'


 # -- Options for LaTeX output --------------------------------------------------

 latex_elements = {
-    # The paper size ('letterpaper' or 'a4paper').
-    #'papersize': 'letterpaper',
-    # The font size ('10pt', '11pt' or '12pt').
-    #'pointsize': '10pt',
-    # Additional stuff for the LaTeX preamble.
-    #'preamble': '',
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
 }

 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-    ("index", "Gramps.tex", "Gramps Documentation", ".", "manual"),
+  ('index', 'Gramps.tex', u'Gramps Documentation',
+   u'.', 'manual'),
 ]

 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-# latex_logo = None
+#latex_logo = None

 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.
-# latex_use_parts = False
+#latex_use_parts = False

 # If true, show page references after internal links.
-# latex_show_pagerefs = False
+#latex_show_pagerefs = False

 # If true, show URL addresses after external links.
-# latex_show_urls = False
+#latex_show_urls = False

 # Documents to append as an appendix to all manuals.
-# latex_appendices = []
+#latex_appendices = []

 # If false, no module index is generated.
-# latex_domain_indices = True
+#latex_domain_indices = True


 # -- Options for manual page output --------------------------------------------

 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [("nl", "gramps", "Gramps Documentation", ["."], 1)]
+man_pages = [
+    ('nl', 'gramps', u'Gramps Documentation',
+     [u'.'], 1)
+]

 # If true, show URL addresses after external links.
-# man_show_urls = False
+#man_show_urls = False


 # -- Options for Texinfo output ------------------------------------------------
@@ -222,22 +228,16 @@ man_pages = [("nl", "gramps", "Gramps Documentation", ["."], 1)]
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (
-        "index",
-        "Gramps",
-        "Gramps Documentation",
-        ".",
-        "Gramps",
-        "One line description of project.",
-        "Miscellaneous",
-    ),
+  ('index', 'Gramps', u'Gramps Documentation',
+   u'.', 'Gramps', 'One line description of project.',
+   'Miscellaneous'),
 ]

 # Documents to append as an appendix to all manuals.
-# texinfo_appendices = []
+#texinfo_appendices = []

 # If false, no module index is generated.
-# texinfo_domain_indices = True
+#texinfo_domain_indices = True

 # How to display URL addresses: 'footnote', 'no', or 'inline'.
-# texinfo_show_urls = 'footnote'
+#texinfo_show_urls = 'footnote'
@@ -16,204 +16,210 @@ import sys, os
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-# sys.path.insert(0, os.path.abspath('.'))
+#sys.path.insert(0, os.path.abspath('.'))

 # -- General configuration -----------------------------------------------------

 # If your documentation needs a minimal Sphinx version, state it here.
-# needs_sphinx = '1.0'
+#needs_sphinx = '1.0'

 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = []

 # Add any paths that contain templates here, relative to this directory.
-templates_path = ["_templates"]
+templates_path = ['_templates']

 # The suffix of source filenames.
-source_suffix = ".rst"
+source_suffix = '.rst'

 # The encoding of source files.
-# source_encoding = 'utf-8-sig'
+#source_encoding = 'utf-8-sig'

 # The master toctree document.
-master_doc = "pl"
+master_doc = 'pl'

 # General information about the project.
-project = "Gramps"
-copyright = "2015, Gramps project"
+project = u'Gramps'
+copyright = u'2015, Gramps project'

 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = "4.2"
+version = '4.2'
 # The full version, including alpha/beta/rc tags.
-release = "4.2.0"
+release = '4.2.0'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
-locale_dirs = "./locale"
+locale_dirs = './locale'
 gettext_compact = True

 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
-# today = ''
+#today = ''
 # Else, today_fmt is used as the format for a strftime call.
-today_fmt = "%B %d, %Y"
+today_fmt = '%B %d, %Y'

 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ["_build"]
+exclude_patterns = ['_build']

 # The reST default role (used for this markup: `text`) to use for all documents.
-# default_role = None
+#default_role = None

 # If true, '()' will be appended to :func: etc. cross-reference text.
-# add_function_parentheses = True
+#add_function_parentheses = True

 # If true, the current module name will be prepended to all description
 # unit titles (such as .. function::).
-# add_module_names = True
+#add_module_names = True

 # If true, sectionauthor and moduleauthor directives will be shown in the
 # output. They are ignored by default.
-# show_authors = False
+#show_authors = False

 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = "sphinx"
+pygments_style = 'sphinx'

 # A list of ignored prefixes for module index sorting.
-# modindex_common_prefix = []
+#modindex_common_prefix = []


 # -- Options for HTML output ---------------------------------------------------

 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = "default"
+html_theme = 'default'

 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-# html_theme_options = {}
+#html_theme_options = {}

 # Add any paths that contain custom themes here, relative to this directory.
-# html_theme_path = []
+#html_theme_path = []

 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-# html_title = None
+#html_title = None

 # A shorter title for the navigation bar.  Default is the same as html_title.
-# html_short_title = None
+#html_short_title = None

 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-# html_logo = None
+#html_logo = None

 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-# html_favicon = None
+#html_favicon = None

 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-# html_static_path = ['_static']
+#html_static_path = ['_static']

 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-# html_last_updated_fmt = '%b %d, %Y'
+#html_last_updated_fmt = '%b %d, %Y'

 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-# html_use_smartypants = True
+#html_use_smartypants = True

 # Custom sidebar templates, maps document names to template names.
-# html_sidebars = {}
+#html_sidebars = {}

 # Additional templates that should be rendered to pages, maps page names to
 # template names.
-# html_additional_pages = {}
+#html_additional_pages = {}

 # If false, no module index is generated.
-# html_domain_indices = True
+#html_domain_indices = True

 # If false, no index is generated.
-# html_use_index = True
+#html_use_index = True

 # If true, the index is split into individual pages for each letter.
-# html_split_index = False
+#html_split_index = False

 # If true, links to the reST sources are added to the pages.
-# html_show_sourcelink = True
+#html_show_sourcelink = True

 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-# html_show_sphinx = True
+#html_show_sphinx = True

 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-# html_show_copyright = True
+#html_show_copyright = True

 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
-# html_use_opensearch = ''
+#html_use_opensearch = ''

 # This is the file name suffix for HTML files (e.g. ".xhtml").
-# html_file_suffix = None
+#html_file_suffix = None

 # Output file base name for HTML help builder.
-htmlhelp_basename = "Grampsdoc"
+htmlhelp_basename = 'Grampsdoc'


 # -- Options for LaTeX output --------------------------------------------------

 latex_elements = {
-    # The paper size ('letterpaper' or 'a4paper').
-    #'papersize': 'letterpaper',
-    # The font size ('10pt', '11pt' or '12pt').
-    #'pointsize': '10pt',
-    # Additional stuff for the LaTeX preamble.
-    #'preamble': '',
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
 }

 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-    ("index", "Gramps.tex", "Gramps Documentation", ".", "manual"),
+  ('index', 'Gramps.tex', u'Gramps Documentation',
+   u'.', 'manual'),
 ]

 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-# latex_logo = None
+#latex_logo = None

 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.
-# latex_use_parts = False
+#latex_use_parts = False

 # If true, show page references after internal links.
-# latex_show_pagerefs = False
+#latex_show_pagerefs = False

 # If true, show URL addresses after external links.
-# latex_show_urls = False
+#latex_show_urls = False

 # Documents to append as an appendix to all manuals.
-# latex_appendices = []
+#latex_appendices = []

 # If false, no module index is generated.
-# latex_domain_indices = True
+#latex_domain_indices = True


 # -- Options for manual page output --------------------------------------------

 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [("pl", "gramps", "Gramps Documentation", ["."], 1)]
+man_pages = [
+    ('pl', 'gramps', u'Gramps Documentation',
+     [u'.'], 1)
+]

 # If true, show URL addresses after external links.
-# man_show_urls = False
+#man_show_urls = False


 # -- Options for Texinfo output ------------------------------------------------
@@ -222,22 +228,16 @@ man_pages = [("pl", "gramps", "Gramps Documentation", ["."], 1)]
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (
-        "index",
-        "Gramps",
-        "Gramps Documentation",
-        ".",
-        "Gramps",
-        "One line description of project.",
-        "Miscellaneous",
-    ),
+  ('index', 'Gramps', u'Gramps Documentation',
+   u'.', 'Gramps', 'One line description of project.',
+   'Miscellaneous'),
 ]

 # Documents to append as an appendix to all manuals.
-# texinfo_appendices = []
+#texinfo_appendices = []

 # If false, no module index is generated.
-# texinfo_domain_indices = True
+#texinfo_domain_indices = True

 # How to display URL addresses: 'footnote', 'no', or 'inline'.
-# texinfo_show_urls = 'footnote'
+#texinfo_show_urls = 'footnote'
@@ -16,204 +16,210 @@ import sys, os
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-# sys.path.insert(0, os.path.abspath('.'))
+#sys.path.insert(0, os.path.abspath('.'))

 # -- General configuration -----------------------------------------------------

 # If your documentation needs a minimal Sphinx version, state it here.
-# needs_sphinx = '1.0'
+#needs_sphinx = '1.0'

 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = []

 # Add any paths that contain templates here, relative to this directory.
-templates_path = ["_templates"]
+templates_path = ['_templates']

 # The suffix of source filenames.
-source_suffix = ".rst"
+source_suffix = '.rst'

 # The encoding of source files.
-# source_encoding = 'utf-8-sig'
+#source_encoding = 'utf-8-sig'

 # The master toctree document.
-master_doc = "pt_BR"
+master_doc = 'pt_BR'

 # General information about the project.
-project = "Gramps"
-copyright = "2015, Gramps project"
+project = u'Gramps'
+copyright = u'2015, Gramps project'

 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = "4.2"
+version = '4.2'
 # The full version, including alpha/beta/rc tags.
-release = "4.2.0"
+release = '4.2.0'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
-locale_dirs = "./locale"
+locale_dirs = './locale'
 gettext_compact = True

 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
-# today = ''
+#today = ''
 # Else, today_fmt is used as the format for a strftime call.
-today_fmt = "%B %d, %Y"
+today_fmt = '%B %d, %Y'

 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ["_build"]
+exclude_patterns = ['_build']

 # The reST default role (used for this markup: `text`) to use for all documents.
-# default_role = None
+#default_role = None

 # If true, '()' will be appended to :func: etc. cross-reference text.
-# add_function_parentheses = True
+#add_function_parentheses = True

 # If true, the current module name will be prepended to all description
 # unit titles (such as .. function::).
-# add_module_names = True
+#add_module_names = True

 # If true, sectionauthor and moduleauthor directives will be shown in the
 # output. They are ignored by default.
-# show_authors = False
+#show_authors = False

 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = "sphinx"
+pygments_style = 'sphinx'

 # A list of ignored prefixes for module index sorting.
-# modindex_common_prefix = []
+#modindex_common_prefix = []


 # -- Options for HTML output ---------------------------------------------------

 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = "default"
+html_theme = 'default'

 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-# html_theme_options = {}
+#html_theme_options = {}

 # Add any paths that contain custom themes here, relative to this directory.
-# html_theme_path = []
+#html_theme_path = []

 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-# html_title = None
+#html_title = None

 # A shorter title for the navigation bar.  Default is the same as html_title.
-# html_short_title = None
+#html_short_title = None

 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-# html_logo = None
+#html_logo = None

 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-# html_favicon = None
+#html_favicon = None

 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-# html_static_path = ['_static']
+#html_static_path = ['_static']

 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-# html_last_updated_fmt = '%b %d, %Y'
+#html_last_updated_fmt = '%b %d, %Y'

 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-# html_use_smartypants = True
+#html_use_smartypants = True

 # Custom sidebar templates, maps document names to template names.
-# html_sidebars = {}
+#html_sidebars = {}

 # Additional templates that should be rendered to pages, maps page names to
 # template names.
-# html_additional_pages = {}
+#html_additional_pages = {}

 # If false, no module index is generated.
-# html_domain_indices = True
+#html_domain_indices = True

 # If false, no index is generated.
-# html_use_index = True
+#html_use_index = True

 # If true, the index is split into individual pages for each letter.
-# html_split_index = False
+#html_split_index = False

 # If true, links to the reST sources are added to the pages.
-# html_show_sourcelink = True
+#html_show_sourcelink = True

 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-# html_show_sphinx = True
+#html_show_sphinx = True

 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-# html_show_copyright = True
+#html_show_copyright = True

 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
-# html_use_opensearch = ''
+#html_use_opensearch = ''

 # This is the file name suffix for HTML files (e.g. ".xhtml").
-# html_file_suffix = None
+#html_file_suffix = None

 # Output file base name for HTML help builder.
-htmlhelp_basename = "Grampsdoc"
+htmlhelp_basename = 'Grampsdoc'


 # -- Options for LaTeX output --------------------------------------------------

 latex_elements = {
-    # The paper size ('letterpaper' or 'a4paper').
-    #'papersize': 'letterpaper',
-    # The font size ('10pt', '11pt' or '12pt').
-    #'pointsize': '10pt',
-    # Additional stuff for the LaTeX preamble.
-    #'preamble': '',
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
 }

 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-    ("index", "Gramps.tex", "Gramps Documentation", ".", "manual"),
+  ('index', 'Gramps.tex', u'Gramps Documentation',
+   u'.', 'manual'),
 ]

 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-# latex_logo = None
+#latex_logo = None

 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.
-# latex_use_parts = False
+#latex_use_parts = False

 # If true, show page references after internal links.
-# latex_show_pagerefs = False
+#latex_show_pagerefs = False

 # If true, show URL addresses after external links.
-# latex_show_urls = False
+#latex_show_urls = False

 # Documents to append as an appendix to all manuals.
-# latex_appendices = []
+#latex_appendices = []

 # If false, no module index is generated.
-# latex_domain_indices = True
+#latex_domain_indices = True


 # -- Options for manual page output --------------------------------------------

 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [("pt_BR", "gramps", "Gramps Documentation", ["."], 1)]
+man_pages = [
+    ('pt_BR', 'gramps', u'Gramps Documentation',
+     [u'.'], 1)
+]

 # If true, show URL addresses after external links.
-# man_show_urls = False
+#man_show_urls = False


 # -- Options for Texinfo output ------------------------------------------------
@@ -222,22 +228,16 @@ man_pages = [("pt_BR", "gramps", "Gramps Documentation", ["."], 1)]
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (
-        "index",
-        "Gramps",
-        "Gramps Documentation",
-        ".",
-        "Gramps",
-        "One line description of project.",
-        "Miscellaneous",
-    ),
+  ('index', 'Gramps', u'Gramps Documentation',
+   u'.', 'Gramps', 'One line description of project.',
+   'Miscellaneous'),
 ]

 # Documents to append as an appendix to all manuals.
-# texinfo_appendices = []
+#texinfo_appendices = []

 # If false, no module index is generated.
-# texinfo_domain_indices = True
+#texinfo_domain_indices = True

 # How to display URL addresses: 'footnote', 'no', or 'inline'.
-# texinfo_show_urls = 'footnote'
+#texinfo_show_urls = 'footnote'
@@ -16,204 +16,210 @@ import sys, os
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-# sys.path.insert(0, os.path.abspath('.'))
+#sys.path.insert(0, os.path.abspath('.'))

 # -- General configuration -----------------------------------------------------

 # If your documentation needs a minimal Sphinx version, state it here.
-# needs_sphinx = '1.0'
+#needs_sphinx = '1.0'

 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = []

 # Add any paths that contain templates here, relative to this directory.
-templates_path = ["_templates"]
+templates_path = ['_templates']

 # The suffix of source filenames.
-source_suffix = ".rst"
+source_suffix = '.rst'

 # The encoding of source files.
-# source_encoding = 'utf-8-sig'
+#source_encoding = 'utf-8-sig'

 # The master toctree document.
-master_doc = "sv"
+master_doc = 'sv'

 # General information about the project.
-project = "Gramps"
-copyright = "2015, Gramps project"
+project = u'Gramps'
+copyright = u'2015, Gramps project'

 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = "4.2"
+version = '4.2'
 # The full version, including alpha/beta/rc tags.
-release = "4.2.0"
+release = '4.2.0'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
-locale_dirs = "./locale"
+locale_dirs = './locale'
 gettext_compact = True

 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
-# today = ''
+#today = ''
 # Else, today_fmt is used as the format for a strftime call.
-today_fmt = "%B %d, %Y"
+today_fmt = '%B %d, %Y'

 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ["_build"]
+exclude_patterns = ['_build']

 # The reST default role (used for this markup: `text`) to use for all documents.
-# default_role = None
+#default_role = None

 # If true, '()' will be appended to :func: etc. cross-reference text.
-# add_function_parentheses = True
+#add_function_parentheses = True

 # If true, the current module name will be prepended to all description
 # unit titles (such as .. function::).
-# add_module_names = True
+#add_module_names = True

 # If true, sectionauthor and moduleauthor directives will be shown in the
 # output. They are ignored by default.
-# show_authors = False
+#show_authors = False

 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = "sphinx"
+pygments_style = 'sphinx'

 # A list of ignored prefixes for module index sorting.
-# modindex_common_prefix = []
+#modindex_common_prefix = []


 # -- Options for HTML output ---------------------------------------------------

 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = "default"
+html_theme = 'default'

 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-# html_theme_options = {}
+#html_theme_options = {}

 # Add any paths that contain custom themes here, relative to this directory.
-# html_theme_path = []
+#html_theme_path = []

 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-# html_title = None
+#html_title = None

 # A shorter title for the navigation bar.  Default is the same as html_title.
-# html_short_title = None
+#html_short_title = None

 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-# html_logo = None
+#html_logo = None

 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-# html_favicon = None
+#html_favicon = None

 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-# html_static_path = ['_static']
+#html_static_path = ['_static']

 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-# html_last_updated_fmt = '%b %d, %Y'
+#html_last_updated_fmt = '%b %d, %Y'

 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-# html_use_smartypants = True
+#html_use_smartypants = True

 # Custom sidebar templates, maps document names to template names.
-# html_sidebars = {}
+#html_sidebars = {}

 # Additional templates that should be rendered to pages, maps page names to
 # template names.
-# html_additional_pages = {}
+#html_additional_pages = {}

 # If false, no module index is generated.
-# html_domain_indices = True
+#html_domain_indices = True

 # If false, no index is generated.
-# html_use_index = True
+#html_use_index = True

 # If true, the index is split into individual pages for each letter.
-# html_split_index = False
+#html_split_index = False

 # If true, links to the reST sources are added to the pages.
-# html_show_sourcelink = True
+#html_show_sourcelink = True

 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-# html_show_sphinx = True
+#html_show_sphinx = True

 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-# html_show_copyright = True
+#html_show_copyright = True

 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
-# html_use_opensearch = ''
+#html_use_opensearch = ''

 # This is the file name suffix for HTML files (e.g. ".xhtml").
-# html_file_suffix = None
+#html_file_suffix = None

 # Output file base name for HTML help builder.
-htmlhelp_basename = "Grampsdoc"
+htmlhelp_basename = 'Grampsdoc'


 # -- Options for LaTeX output --------------------------------------------------

 latex_elements = {
-    # The paper size ('letterpaper' or 'a4paper').
-    #'papersize': 'letterpaper',
-    # The font size ('10pt', '11pt' or '12pt').
-    #'pointsize': '10pt',
-    # Additional stuff for the LaTeX preamble.
-    #'preamble': '',
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
 }

 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-    ("index", "Gramps.tex", "Gramps Documentation", ".", "manual"),
+  ('index', 'Gramps.tex', u'Gramps Documentation',
+   u'.', 'manual'),
 ]

 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-# latex_logo = None
+#latex_logo = None

 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.
-# latex_use_parts = False
+#latex_use_parts = False

 # If true, show page references after internal links.
-# latex_show_pagerefs = False
+#latex_show_pagerefs = False

 # If true, show URL addresses after external links.
-# latex_show_urls = False
+#latex_show_urls = False

 # Documents to append as an appendix to all manuals.
-# latex_appendices = []
+#latex_appendices = []

 # If false, no module index is generated.
-# latex_domain_indices = True
+#latex_domain_indices = True


 # -- Options for manual page output --------------------------------------------

 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [("sv", "gramps", "Gramps Documentation", ["."], 1)]
+man_pages = [
+    ('sv', 'gramps', u'Gramps Documentation',
+     [u'.'], 1)
+]

 # If true, show URL addresses after external links.
-# man_show_urls = False
+#man_show_urls = False


 # -- Options for Texinfo output ------------------------------------------------
@@ -222,22 +228,16 @@ man_pages = [("sv", "gramps", "Gramps Documentation", ["."], 1)]
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (
-        "index",
-        "Gramps",
-        "Gramps Documentation",
-        ".",
-        "Gramps",
-        "One line description of project.",
-        "Miscellaneous",
-    ),
+  ('index', 'Gramps', u'Gramps Documentation',
+   u'.', 'Gramps', 'One line description of project.',
+   'Miscellaneous'),
 ]

 # Documents to append as an appendix to all manuals.
-# texinfo_appendices = []
+#texinfo_appendices = []

 # If false, no module index is generated.
-# texinfo_domain_indices = True
+#texinfo_domain_indices = True

 # How to display URL addresses: 'footnote', 'no', or 'inline'.
-# texinfo_show_urls = 'footnote'
+#texinfo_show_urls = 'footnote'
@@ -42,24 +42,23 @@ try:
 except:
    DOCUTILS = False

-LANGUAGES = ["sv", "nl", "pl", "cs", "pt_BR", "fr"]
-VERSION = "5.0.0"
-DATE = ""
+LANGUAGES = ['sv', 'nl', 'pl', 'cs', 'pt_BR', 'fr']
+VERSION = '5.0.0'
+DATE = ''

 # You can set these variables from the command line.
-SPHINXBUILD = "sphinx-build"
+SPHINXBUILD   = 'sphinx-build'

-if sys.platform == "win32":
-    pythonCmd = os.path.join(sys.prefix, "bin", "python.exe")
-    sphinxCmd = os.path.join(sys.prefix, "bin", "sphinx-build.exe")
-elif sys.platform in ["linux2", "darwin", "cygwin"]:
-    pythonCmd = os.path.join(sys.prefix, "bin", "python")
+if sys.platform == 'win32':
+    pythonCmd = os.path.join(sys.prefix, 'bin', 'python.exe')
+    sphinxCmd = os.path.join(sys.prefix, 'bin', 'sphinx-build.exe')
+elif sys.platform in ['linux2', 'darwin', 'cygwin']:
+    pythonCmd = os.path.join(sys.prefix, 'bin', 'python')
    sphinxCmd = SPHINXBUILD
 else:
-    print("Update Man ERROR: unknown system, don't know sphinx, ... commands")
+    print ("Update Man ERROR: unknown system, don't know sphinx, ... commands")
    sys.exit(0)

-
 def tests():
    """
    Testing installed programs.
@@ -68,19 +67,18 @@ def tests():
    """
    try:
        print("\n=================='python'=============================\n")
-        os.system("""%(program)s -V""" % {"program": pythonCmd})
+        os.system('''%(program)s -V''' % {'program': pythonCmd})
    except:
-        print("Please, install python")
+        print ('Please, install python')

    try:
        print("\n=================='Sphinx-build'=============================\n")
-        os.system("""%(program)s""" % {"program": sphinxCmd})
+        os.system('''%(program)s''' % {'program': sphinxCmd})
    except:
-        print("Please, install sphinx")
+        print ('Please, install sphinx')

    if not DOCUTILS:
-        print("\nNo docutils support, cannot use -m/--man and -o/--odt arguments.")
-
+        print('\nNo docutils support, cannot use -m/--man and -o/--odt arguments.')

 def main():
    """
@@ -89,45 +87,25 @@ def main():
    """

    parser = ArgumentParser(
-        description="This program aims to handle documentation"
-        " and related translated versions.",
-    )
+                         description='This program aims to handle documentation'
+                                      ' and related translated versions.',
+                         )

-    parser.add_argument(
-        "-t",
-        "--test",
-        action="store_true",
-        dest="test",
-        default=True,
-        help="test if 'python' and 'sphinx' are properly installed",
-    )
+    parser.add_argument("-t", "--test",
+            action="store_true", dest="test",  default=True,
+            help="test if 'python' and 'sphinx' are properly installed")

-    parser.add_argument(
-        "-b",
-        "--build",
-        action="store_true",
-        dest="build",
-        default=False,
-        help="build man documentation (via sphinx-build)",
-    )
+    parser.add_argument("-b", "--build",
+            action="store_true", dest="build",  default=False,
+            help="build man documentation (via sphinx-build)")

-    parser.add_argument(
-        "-m",
-        "--man",
-        action="store_true",
-        dest="man",
-        default=False,
-        help="build man documentation (via docutils)",
-    )
+    parser.add_argument("-m", "--man",
+            action="store_true", dest="man",  default=False,
+            help="build man documentation (via docutils)")

-    parser.add_argument(
-        "-o",
-        "--odt",
-        action="store_true",
-        dest="odt",
-        default=False,
-        help="build odt documentation (via docutils)",
-    )
+    parser.add_argument("-o", "--odt",
+            action="store_true", dest="odt",  default=False,
+            help="build odt documentation (via docutils)")

    args = parser.parse_args()

@@ -143,7 +121,6 @@ def main():
    if args.odt and DOCUTILS:
        odt()

-
 def build():
    """
    Build documentation.
@@ -151,39 +128,28 @@ def build():

    # testing stage

-    os.system("""%(program)s -b html . _build/html""" % {"program": sphinxCmd})
-    os.system("""%(program)s -b htmlhelp . _build/htmlhelp""" % {"program": sphinxCmd})
+    os.system('''%(program)s -b html . _build/html''' % {'program': sphinxCmd})
+    os.system('''%(program)s -b htmlhelp . _build/htmlhelp''' % {'program': sphinxCmd})
    if DOCUTILS:
-        os.system("""%(program)s -b man . .""" % {"program": sphinxCmd})
-    os.system("""%(program)s -b text . _build/text""" % {"program": sphinxCmd})
-    os.system("""%(program)s -b changes . _build/changes""" % {"program": sphinxCmd})
-    # os.system('''%(program)s -b linkcheck . _build/linkcheck''' % {'program': sphinxCmd})
-    os.system("""%(program)s -b gettext . _build/gettext""" % {"program": sphinxCmd})
+        os.system('''%(program)s -b man . .''' % {'program': sphinxCmd})
+    os.system('''%(program)s -b text . _build/text''' % {'program': sphinxCmd})
+    os.system('''%(program)s -b changes . _build/changes''' % {'program': sphinxCmd})
+    #os.system('''%(program)s -b linkcheck . _build/linkcheck''' % {'program': sphinxCmd})
+    os.system('''%(program)s -b gettext . _build/gettext''' % {'program': sphinxCmd})

    for lang in LANGUAGES:
-        os.system(
-            """%(program)s -b html -D language="%(lang)s" master_doc="%(lang)s" %(lang)s %(lang)s"""
-            % {"lang": lang, "program": sphinxCmd}
-        )
-        os.system(
-            """%(program)s -b htmlhelp -D language="%(lang)s" master_doc="%(lang)s" %(lang)s %(lang)s"""
-            % {"lang": lang, "program": sphinxCmd}
-        )
+        os.system('''%(program)s -b html -D language="%(lang)s" master_doc="%(lang)s" %(lang)s %(lang)s'''
+                   % {'lang': lang, 'program': sphinxCmd})
+        os.system('''%(program)s -b htmlhelp -D language="%(lang)s" master_doc="%(lang)s" %(lang)s %(lang)s'''
+                   % {'lang': lang, 'program': sphinxCmd})
        if DOCUTILS:
-            os.system(
-                """%(program)s -b man %(lang)s %(lang)s"""
-                % {"lang": lang, "program": sphinxCmd}
-            )
-        os.system(
-            """%(program)s -b text -D language="%(lang)s" master_doc="%(lang)s" %(lang)s %(lang)s"""
-            % {"lang": lang, "program": sphinxCmd}
-        )
+            os.system('''%(program)s -b man %(lang)s %(lang)s'''
+                       % {'lang': lang, 'program': sphinxCmd})
+        os.system('''%(program)s -b text -D language="%(lang)s" master_doc="%(lang)s" %(lang)s %(lang)s'''
+                   % {'lang': lang, 'program': sphinxCmd})
        # for update/migration
-        os.system(
-            """%(program)s -b gettext -D language="%(lang)s" master_doc="%(lang)s" . _build/gettext/%(lang)s"""
-            % {"lang": lang, "program": sphinxCmd}
-        )
-
+        os.system('''%(program)s -b gettext -D language="%(lang)s" master_doc="%(lang)s" . _build/gettext/%(lang)s'''
+                   % {'lang': lang, 'program': sphinxCmd})

 def man():
    """
@@ -193,14 +159,11 @@ def man():
    from docutils.writers import manpage
    """

-    os.system("""rst2man en.rst gramps.1""")
+    os.system('''rst2man en.rst gramps.1''')

    for lang in LANGUAGES:
-        os.system(
-            """rst2man %(lang)s/%(lang)s.rst -l %(lang)s %(lang)s/gramps.1"""
-            % {"lang": lang}
-        )
-
+        os.system('''rst2man %(lang)s/%(lang)s.rst -l %(lang)s %(lang)s/gramps.1'''
+                   % {'lang': lang})

 def odt():
    """
@@ -210,14 +173,11 @@ def odt():
    from docutils.writers.odf_odt import Writer, Reader
    """

-    os.system("""rst2odt en.rst gramps.odt""")
+    os.system('''rst2odt en.rst gramps.odt''')

    for lang in LANGUAGES:
-        os.system(
-            """rst2odt %(lang)s/%(lang)s.rst -l %(lang)s %(lang)s/gramps.odt"""
-            % {"lang": lang}
-        )
-
+        os.system('''rst2odt %(lang)s/%(lang)s.rst -l %(lang)s %(lang)s/gramps.odt'''
+                   % {'lang': lang})

 if __name__ == "__main__":
    main()
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
-  <id>org.gramps_project.Gramps</id>
-  <name>Gramps</name>
-  <summary>Manage genealogical information, perform genealogical research and analysis</summary>
-  <description>
-    <p>Gramps is a genealogy program that is both intuitive for hobbyists and feature-complete for professional genealogists.</p>
-    <p>It gives you the ability to record the many details of the life of an individual as well as the complex relationships between various people, places and events.</p>
-    <p>All of your research is kept organized, searchable and as precise as you need it to be.</p>
-  </description>
-
-  <developer_name>Gramps Development Team</developer_name>
-  <project_license>GPL-2.0-or-later</project_license>
-  <metadata_license>CC0-1.0</metadata_license>
-
-  <url type="homepage">https://gramps-project.org/</url>
-  <url type="bugtracker">https://gramps-project.org/bugs/</url>
-  <url type="help">https://gramps-project.org/wiki/index.php?title=Main_page</url>
-  <url type="translate">https://www.gramps-project.org/wiki/index.php?title=Translating_Gramps</url>
-
-  <screenshots>
-    <screenshot>
-      <image width="1226" height="740">https://www.gramps-project.org/wiki/images/5/5f/AppData1.png</image>
-    </screenshot>
-    <screenshot>
-      <image width="1226" height="740">https://www.gramps-project.org/wiki/images/6/68/AppData2.png</image>
-    </screenshot>
-    <screenshot type="default">
-      <image width="1226" height="740">https://www.gramps-project.org/wiki/images/e/e9/AppData3.png</image>
-    </screenshot>
-    <screenshot>
-      <image width="1226" height="740">https://www.gramps-project.org/wiki/images/6/68/AppData4.png</image>
-    </screenshot>
-    <screenshot>
-      <image width="1226" height="740">https://www.gramps-project.org/wiki/images/5/50/AppData5.png</image>
-    </screenshot>
-  </screenshots>
-
-  <launchable type="desktop-id">org.gramps_project.Gramps.desktop</launchable>
-  <provides>
-    <binary>gramps</binary>
-  </provides>
-
-  <translation type="gettext">gramps</translation>
-
-  <content_rating type="oars-1.1" />
-
-  <releases>
-    <release date="2020-08-12" version="5.1.3" />
-    <release date="2020-01-10" version="5.1.2" />
-    <release date="2019-09-15" version="5.1.1" />
-    <release date="2019-08-21" version="5.1.0" />
-    <release date="2019-08-18" version="5.0.2" />
-    <release date="2018-12-20" version="5.0.1" />
-    <release date="2018-07-24" version="5.0.0" />
-  </releases>
-
-</component>
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Name=Gramps
-GenericName=Genealogy System
-X-GNOME-FullName=Gramps Genealogy System
-Comment=Manage genealogical information, perform genealogical research and analysis
-Icon=org.gramps_project.Gramps
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=GTK;Office;
-Keywords=Genealogy;Family History;Research;Family Tree;GEDCOM;
-MimeType=application/x-gramps;application/x-gedcom;application/x-gramps-package;application/x-gramps-xml;
-Exec=gramps %F
@@ -774,7 +774,6 @@
      <name type="Birth Name">
        <first>Amber Marie</first>
        <surname>Smith</surname>
-        <call>Marie</call>
      </name>
      <eventref hlink="_0000003100000031" role="Primary"/>
      <eventref hlink="_0000003300000033" role="Primary"/>
@@ -1279,7 +1278,7 @@
      <rel type="Unknown"/>
      <father hlink="_0000000b0000000b"/>
      <mother hlink="_0000002600000026"/>
-      <childref hlink="_0000006f0000006f" frel="Adopted" mrel="Foster"/>
+      <childref hlink="_0000006f0000006f"/>
    </family>
    <family handle="_0000001000000010" change="1198222526" id="F0014">
      <rel type="Unknown"/>
@@ -9,12 +9,6 @@ beg
 - h Hans_Peter.8 17/4/1904 #bp Rønne,_Bornholm,_Denmark 29/1/1977 #dp San_Francisco,_San_Francisco_Co.,_CA 
 end

-notes Hansdotter Anna.1
-beg
-******************************************************************890123456789
-******************************************************************89 123456789 
-end notes
-
 notes Smith Hjalmar.5
 beg
 BIOGRAPHY
@@ -67,7 +61,7 @@ Some Bold Unicode Characters: &#2294;&#508;&#1024;&#1580;&#12228;&#13405;&#15691
 Some Italic Unicode Characters: &#2294;&#508;&#1024;&#1580;&#12228;&#13405;&#15691;&#22299;&#22665;&#24181;&#32863;&#32870;&#65865;&#128694;&#128712; 
 end notes

-fam Smith Gus.6 +~1920 Michaels Evelyn.25 ~1897 0 
+fam Smith Gus.6 +~1920 Michaels Evelyn.25 ~1897  

 fam Smith Hjalmar.5 +31/10/1927 #mp Reno,_Washoe_Co.,_NV Ohman Marjorie.26 3/6/1903 #bp Denver,_Denver_Co.,_CO,_Denver_Co.,_Colorado,_USA 22/6/1980 #dp Reno,_Washoe_Co.,_NV 
 beg
@@ -104,18 +98,13 @@ beg
 - h Martin.17 1794..1796 #bp Tommarp,_Kristianstad_Län,_Sweden  #dp Sweden 
 end

-fam Willard Edwin.42 ~1886 0 +~1910 Smith Kirsti_Marie.2 
+fam Willard Edwin.42 ~1886  +~1910 Smith Kirsti_Marie.2 

 fam Smith Magnes.38 +24/8/1884 #mp Rønne,_Bornholm,_Denmark Streiffert Anna.43 23/9/1860 #bp Hoya/Jona/Hoia,_Sweden 2/2/1927 #dp Rønne,_Bornholm,_Denmark 

 fam Tester The.14 + Tester Mrs.44 0  
 beg
- h Tom.45 Von_Tester_y_tested 0  
-  Fake.46 von_Person 1954 #bp Fremont,_Alameda_Co.,_CA  
- f Mary.47 0  
- f Martha.48 0  
- h John.49 0  
- h Mark.50 0  
+- h Tom.45 0  
 end

 notes Tester Mrs.44
@@ -122,7 +122,7 @@ BEGIN:VCARD
 VERSION:3.0
 PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
 FN:Amber Marie Smith
-N:Smith;Marie;Amber;;
+N:Smith;Amber;Marie;;
 SORT-STRING:Smith                    Amber Marie                   
 X-GENDER:Female
 BDAY:1998-04-12
@@ -1,52 +1,47 @@
-Anna Hansdotter;;;;;2/10/1864-29/9/1945
-Keith Lloyd Smith;Lloyd Smith;Janis Green;;;11/8/1966
-Hans Peter Smith;Gustaf Smith;Anna Hansdotter;;;17/4/1904-29/1/1977
-Hanna Smith;Martin Smith0;Elna Jefferson;;;29/1/1821
-Herman Julius Nielsen;;;;;31/8/1889-1945
-Evelyn Michaels;;;;;1897
-Marjorie Lee Smith;Hjalmar Smith0;Marjorie Ohman;;;4/11/1934
-Gus Smith;Gustaf Smith;Anna Hansdotter;;;11/9/1897-21/10/1963
-Jennifer Anderson;;;;;5/11/1907-29/5/1985
-Lillie Harriet Jones;;;;;2/5/1910-26/6/1990
-John Hjalmar Smith;Hjalmar Smith0;Marjorie Ohman;;;30/1/1932
-Eric Lloyd Smith;Lloyd Smith;Janis Green;;;28/8/1963
-Amber Marie Smith;Edwin Smith;Janice Adams;;;12/4/1998
-Carl Emil Smith;Gustaf Smith;Anna Hansdotter;;;20/12/1899-28/1/1959
-Hjalmar Smith;Gustaf Smith;Anna Hansdotter;;;31/1/1893-25/9/1894
-Martin Smith;Martin Smith0;Elna Jefferson;;;19/11/1830-1899
-Astrid Shermanna Augusta Smith;Gustaf Smith;Anna Hansdotter;;;31/1/1889-21/12/1963
-Gustaf Smith, Sr.;Martin Smith;Kerstina Hansdotter;;;28/11/1862-23/7/1930
-Marta Ericsdotter;;;;;1775
-Kirsti Marie Smith;Gustaf Smith;Anna Hansdotter;;;15/12/1886-18/7/1966
-Ingeman Smith;;;;;1770
-Anna Streiffert;;;;;23/9/1860-2/2/1927
-Craig Peter Smith;Lloyd Smith;Janis Green;;;1966
-Magnes Smith;Martin Smith;Kerstina Hansdotter;;;6/10/1858-20/2/1910
-Janice Ann Adams;;;;;26/8/1965
-Marjorie Ohman;;;;;3/6/1903-22/6/1980
-Darcy Horne;;;;;2/7/1966
-Lloyd Smith;Hans Smith;Lillie Jones;;;13/3/1935
-Alice Paula Perkins;;;;;22/11/1933
-Lars Peter Smith;Eric Smith;Darcy Horne;;;16/9/1991
-Elna Jefferson;;;;;14/9/1800-
-Edwin Michael Smith;John Smith;Alice Perkins;;;24/5/1961
-Kerstina Hansdotter;;;;;29/11/1832-1908
-Martin Smith0;Ingeman Smith;Marta Ericsdotter;;;1794-
-Ingeman Smith0;Martin Smith0;Elna Jefferson;;;29/1/1826
-Marjorie Alice Smith0;John Smith;Alice Perkins;;;5/2/1960
-Janis Elaine Green;;;;;2/12/1935
-Mason Michael Smith;Edwin Smith;Janice Adams;;;26/6/1996
-Edwin Willard;;;;;1886
-Ingar Smith;Martin Smith0;Elna Jefferson;;;1823
-Hjalmar Smith0;Gustaf Smith;Anna Hansdotter;;;7/4/1895-26/6/1975
-Emil Smith;Martin Smith;Kerstina Hansdotter;;;27/9/1860
-雪 Ke 柯;Herman Nielsen;Astrid Smith;;;
-ピーター リチミシキスイミ;;;;;
-The Tester;Lloyd Smith;Janis Green;;;29/12/1954
-Mrs Tester;;;;;
-Tom Von Tester y tested;The Tester;Mrs Tester;;;
-Fake von Person, I;The Tester;Mrs Tester;;;1954-
-Mary Tester;The Tester;Mrs Tester;;;
-Martha Tester;The Tester;Mrs Tester;;;
-John Tester;The Tester;Mrs Tester;;;
-Mark Tester;The Tester;Mrs Tester;;;
+Anna Hansdotter;;;;;2/10/1864-29/9/1945
+Keith Lloyd Smith;Lloyd Smith;Janis Green;;;11/8/1966
+Hans Peter Smith;Gustaf Smith;Anna Hansdotter;;;17/4/1904-29/1/1977
+Hanna Smith;Martin Smith0;Elna Jefferson;;;29/1/1821
+Herman Julius Nielsen;;;;;31/8/1889-1945
+Evelyn Michaels;;;;;1897
+Marjorie Lee Smith;Hjalmar Smith0;Marjorie Ohman;;;4/11/1934
+Gus Smith;Gustaf Smith;Anna Hansdotter;;;11/9/1897-21/10/1963
+Jennifer Anderson;;;;;5/11/1907-29/5/1985
+Lillie Harriet Jones;;;;;2/5/1910-26/6/1990
+John Hjalmar Smith;Hjalmar Smith0;Marjorie Ohman;;;30/1/1932
+Eric Lloyd Smith;Lloyd Smith;Janis Green;;;28/8/1963
+Amber Marie Smith;Edwin Smith;Janice Adams;;;12/4/1998
+Carl Emil Smith;Gustaf Smith;Anna Hansdotter;;;20/12/1899-28/1/1959
+Hjalmar Smith;Gustaf Smith;Anna Hansdotter;;;31/1/1893-25/9/1894
+Martin Smith;Martin Smith0;Elna Jefferson;;;19/11/1830-1899
+Astrid Shermanna Augusta Smith;Gustaf Smith;Anna Hansdotter;;;31/1/1889-21/12/1963
+Gustaf Smith, Sr.;Martin Smith;Kerstina Hansdotter;;;28/11/1862-23/7/1930
+Marta Ericsdotter;;;;;1775
+Kirsti Marie Smith;Gustaf Smith;Anna Hansdotter;;;15/12/1886-18/7/1966
+Ingeman Smith;;;;;1770
+Anna Streiffert;;;;;23/9/1860-2/2/1927
+Craig Peter Smith;Lloyd Smith;Janis Green;;;1966
+Magnes Smith;Martin Smith;Kerstina Hansdotter;;;6/10/1858-20/2/1910
+Janice Ann Adams;;;;;26/8/1965
+Marjorie Ohman;;;;;3/6/1903-22/6/1980
+Darcy Horne;;;;;2/7/1966
+Alice Paula Perkins;;;;;22/11/1933
+Lars Peter Smith;Eric Smith;Darcy Horne;;;16/9/1991
+Ingeman Smith0;Martin Smith0;Elna Jefferson;;;29/1/1826
+Lloyd Smith;Hans Smith;Lillie Jones;;;13/3/1935
+Elna Jefferson;;;;;14/9/1800-
+Edwin Michael Smith;John Smith;Alice Perkins;;;24/5/1961
+Kerstina Hansdotter;;;;;29/11/1832-1908
+Martin Smith0;Ingeman Smith;Marta Ericsdotter;;;1794-
+Marjorie Alice Smith0;John Smith;Alice Perkins;;;5/2/1960
+Janis Elaine Green;;;;;2/12/1935
+Mason Michael Smith;Edwin Smith;Janice Adams;;;26/6/1996
+Edwin Willard;;;;;1886
+Ingar Smith;Martin Smith0;Elna Jefferson;;;1823
+Hjalmar Smith0;Gustaf Smith;Anna Hansdotter;;;7/4/1895-26/6/1975
+Emil Smith;Martin Smith;Kerstina Hansdotter;;;27/9/1860
+雪 Ke 柯;Herman Nielsen;Astrid Smith;;;
+The Tester;Lloyd Smith;Janis Green;;;29/12/1954
+Mrs Tester;;;;;
+ピーター リチミシキスイミ;;;;;
+Tom Tester;The Tester;Mrs Tester;;;
@@ -30,65 +30,66 @@
 [P0014],"Denver, Denver Co., CO","Denver, Denver Co., CO",City,39.7392,104.9903 W,,[P0024],

 Person,Surname,Given,Call,Suffix,Prefix,Title,Gender,Birth date,Birth place,Birth source,Baptism date,Baptism place,Baptism source,Death date,Death place,Death source,Burial date,Burial place,Burial source,Note
-[I0030],Adams,Janice Ann,,,,,female,1965-08-26,[P0013],,,,,,,,,,,
-[I0016],Anderson,Jennifer,,,,,female,1907-11-05,[P0003],,,,,1985-05-29,[P0002],,,,,
-[I0025],Ericsdotter,Marta,,,,,female,about 1775,[P0008],,,,,,,,,,,
-[I0041],Green,Janis Elaine,,,,,female,1935-12-02,,,,,,,,,,,,
-[I0000],Hansdotter,Anna,,,,,female,1864-10-02,[P0000],,,,,1945-09-29,[P0001],,,,,
-[I0038],Hansdotter,Kerstina,,,,,female,1832-11-29,[P0019],,,,,before 1908,[P0008],,,,,
-[I0032],Horne,Darcy,,,,,female,1966-07-02,[P0015],,,,,,,,,,,
-[I0036],Jefferson,Elna,,,,,female,1800-09-14,[P0004],,,,,,[P0008],,,,,
-[I0017],Jones,Lillie Harriet,,,,,female,1910-05-02,[P0003],,,,,1990-06-26,,,,,,
+[I0030],Adams,Janice Ann,,,,,female,26 Aug 1965,"Fremont, Alameda Co., CA",,,,,,,,,,,
+[I0016],Anderson,Jennifer,,,,,female,5 Nov 1907,"Rønne, Bornholm, Denmark",,,,,29 May 1985,"San Francisco, San Francisco Co., CA",,,,,
+[I0025],Ericsdotter,Marta,,,,,female,about 1775,Sweden,,,,,,,,,,,
+[I0041],Green,Janis Elaine,,,,,female,2 Dec 1935,,,,,,,,,,,,
+[I0000],Hansdotter,Anna,,,,,female,2 Oct 1864,"Löderup, Malmöhus Län, Sweden",,,,,29 Sep 1945,"Sparks, Washoe Co., NV",,,,,
+[I0038],Hansdotter,Kerstina,,,,,female,29 Nov 1832,"Smestorp, Kristianstad Län, Sweden",,,,,before 1908,Sweden,,,,,
+[I0032],Horne,Darcy,,,,,female,2 Jul 1966,"Sacramento, Sacramento Co., CA",,,,,,,,,,,
+[I0036],Jefferson,Elna,,,,,female,14 Sep 1800,"Gladsax, Kristianstad Län, Sweden",,,,,,Sweden,,,,,
+[I0017],Jones,Lillie Harriet,,,,,female,2 May 1910,"Rønne, Bornholm, Denmark",,,,,26 Jun 1990,,,,,,
 [I0042],Ke 柯,雪,,,,,male,,,,,,,,,,,,,
 [I0013],Michaels,Evelyn,,,,,female,about 1897,,,,,,,,,,,,
-[I0012],Nielsen,Herman Julius,,,,,male,1889-08-31,[P0003],,,,,1945,,,,,,
-[I0031],Ohman,Marjorie,,,,,female,1903-06-03,[P0014],,,,,1980-06-22,[P0005],,,,,
-[I0034],Perkins,Alice Paula,,,,,female,1933-11-22,[P0001],,,,,,,,,,,
-[I0002],Smith,Amber Marie,,,,,female,1998-04-12,[P0006],,,,,,,,,,,
-[I0023],Smith,Astrid Shermanna Augusta,,,,,female,1889-01-31,[P0003],,,,,1963-12-21,[P0002],,,,,
-[I0020],Smith,Carl Emil,,,,,male,1899-12-20,[P0003],,,,,1959-01-28,[P0005],,,,,
-[I0029],Smith,Craig Peter,,,,,male,after 1966,[P0002],,,,,,,,,,,
-[I0037],Smith,Edwin Michael,,,,,male,1961-05-24,[P0017],"Birth, Death and Marriage Records",,,,,,,,,,
-[I0009],Smith,Emil,,,,,male,1860-09-27,[P0012],,,,,,,,,,,
-[I0019],Smith,Eric Lloyd,,,,Dr.,male,1963-08-28,[P0002],,,,,,,,,,,
-[I0015],Smith,Gus,,,,,male,1897-09-11,[P0003],,,,,1963-10-21,[P0002],,,,,
-[I0024],Smith,Gustaf,,Sr.,,,male,1862-11-28,[P0009],,,,,before 1930-07-23,[P0001],,,,,
-[I0011],Smith,Hanna,,,,,female,1821-01-29,[P0004],,,,,,,,,,,
-[I0010],Smith,Hans Peter,,,,,male,1904-04-17,[P0003],Birth Records,,,,1977-01-29,[P0002],,1977-02-05,[P0002],findagrave.com,
-[I0021],Smith,Hjalmar,,,,,male,1893-01-31,[P0003],,,,,1894-09-25,[P0003],,,,,
-[I0008],Smith,Hjalmar,,,,,male,1895-04-07,[P0003],,1895-06-03,[P0021],,1975-06-26,[P0005],,,,,
-[I0007],Smith,Ingar,,,,,female,after 1823,[P0004],,,,,,,,,,,
-[I0027],Smith,Ingeman,,,,,male,about 1770,[P0008],,,,,,,,,,,
-[I0004],Smith,Ingeman,,,,,male,1826-01-29,[P0004],,,,,,,,,,,
-[I0018],Smith,John Hjalmar,,,,,male,1932-01-30,[P0002],,,,,,,,,,,
-[I0001],Smith,Keith Lloyd,,,,,male,1966-08-11,[P0002],,,,,,,,,,,
-[I0026],Smith,Kirsti Marie,,,,,female,1886-12-15,[P0003],,,,,1966-07-18,[P0002],,,,,
-[I0035],Smith,Lars Peter,,,,,male,1991-09-16,[P0016],,,,,,,,,,,
-[I0033],Smith,Lloyd,,,,,male,1935-03-13,[P0002],,,,,,,,,,,
-[I0003],Smith,Magnes,,,,,male,1858-10-06,[P0012],,,,,1910-02-20,[P0003],,,,,
-[I0040],Smith,Marjorie Alice,,,,,female,1960-02-05,[P0017],,,,,,,,,,,
-[I0014],Smith,Marjorie Lee,,,,,female,1934-11-04,[P0005],,,,,,,,,,,
-[I0022],Smith,Martin,,,,,male,1830-11-19,[P0004],,1830-11-23,[P0004],,between 1899 and 1905,[P0008],,,,,
-[I0039],Smith,Martin,,,,,male,between 1794 and 1796,[P0020],,,,,,[P0008],,,,,
-[I0005],Smith,Mason Michael,,,,,male,1996-06-26,[P0006],,,,,,,,,,,
-[I0028],Streiffert,Anna,,,,,female,1860-09-23,[P0011],,,,,1927-02-02,[P0003],,,,,
+[I0012],Nielsen,Herman Julius,,,,,male,31 Aug 1889,"Rønne, Bornholm, Denmark",,,,,1945,,,,,,
+[I0031],Ohman,Marjorie,,,,,female,3 Jun 1903,"Denver, Denver Co., CO, Denver Co., Colorado, USA",,,,,22 Jun 1980,"Reno, Washoe Co., NV",,,,,
+[I0034],Perkins,Alice Paula,,,,,female,22 Nov 1933,"Sparks, Washoe Co., NV",,,,,,,,,,,
+[I0002],Smith,Amber Marie,,,,,female,12 Apr 1998,"Hayward, Alameda Co., CA",,,,,,,,,,,
+[I0023],Smith,Astrid Shermanna Augusta,,,,,female,31 Jan 1889,"Rønne, Bornholm, Denmark",,,,,21 Dec 1963,"San Francisco, San Francisco Co., CA",,,,,
+[I0020],Smith,Carl Emil,,,,,male,20 Dec 1899,"Rønne, Bornholm, Denmark",,,,,28 Jan 1959,"Reno, Washoe Co., NV",,,,,
+[I0029],Smith,Craig Peter,,,,,male,after 1966,"San Francisco, San Francisco Co., CA",,,,,,,,,,,
+[I0037],Smith,Edwin Michael,,,,,male,24 May 1961,"San Jose, Santa Clara Co., CA","Birth, Death and Marriage Records",,,,,,,,,,
+[I0009],Smith,Emil,,,,,male,27 Sep 1860,"Simrishamn, Kristianstad Län, Sweden",,,,,,,,,,,
+[I0019],Smith,Eric Lloyd,,,,Dr.,male,28 Aug 1963,"San Francisco, San Francisco Co., CA",,,,,,,,,,,
+[I0015],Smith,Gus,,,,,male,11 Sep 1897,"Rønne, Bornholm, Denmark",,,,,21 Oct 1963,"San Francisco, San Francisco Co., CA",,,,,
+[I0024],Smith,Gustaf,,Sr.,,,male,28 Nov 1862,"Grostorp, Kristianstad Län, Sweden",,,,,before 23 Jul 1930,"Sparks, Washoe Co., NV",,,,,
+[I0011],Smith,Hanna,,,,,female,29 Jan 1821,"Gladsax, Kristianstad Län, Sweden",,,,,,,,,,,
+[I0010],Smith,Hans Peter,,,,,male,17 Apr 1904,"Rønne, Bornholm, Denmark",Birth Records,,,,29 Jan 1977,"San Francisco, San Francisco Co., CA",,5 Feb 1977,"San Francisco, San Francisco Co., CA",findagrave.com,
+[I0021],Smith,Hjalmar,,,,,male,31 Jan 1893,"Rønne, Bornholm, Denmark",,,,,25 Sep 1894,"Rønne, Bornholm, Denmark",,,,,
+[I0008],Smith,Hjalmar,,,,,male,7 Apr 1895,"Rønne, Bornholm, Denmark",,3 Jun 1895,"Rønne Bornholm, Denmark",,26 Jun 1975,"Reno, Washoe Co., NV",,,,,
+[I0007],Smith,Ingar,,,,,female,after 1823,"Gladsax, Kristianstad Län, Sweden",,,,,,,,,,,
+[I0027],Smith,Ingeman,,,,,male,about 1770,Sweden,,,,,,,,,,,
+[I0004],Smith,Ingeman,,,,,male,29 Jan 1826,"Gladsax, Kristianstad Län, Sweden",,,,,,,,,,,
+[I0018],Smith,John Hjalmar,,,,,male,30 Jan 1932,"San Francisco, San Francisco Co., CA",,,,,,,,,,,
+[I0001],Smith,Keith Lloyd,,,,,male,11 Aug 1966,"San Francisco, San Francisco Co., CA",,,,,,,,,,,
+[I0026],Smith,Kirsti Marie,,,,,female,15 Dec 1886,"Rønne, Bornholm, Denmark",,,,,18 Jul 1966,"San Francisco, San Francisco Co., CA",,,,,
+[I0035],Smith,Lars Peter,,,,,male,16 Sep 1991,"Santa Rosa, Sonoma Co., CA",,,,,,,,,,,
+[I0033],Smith,Lloyd,,,,,male,13 Mar 1935,"San Francisco, San Francisco Co., CA",,,,,,,,,,,
+[I0003],Smith,Magnes,,,,,male,6 Oct 1858,"Simrishamn, Kristianstad Län, Sweden",,,,,20 Feb 1910,"Rønne, Bornholm, Denmark",,,,,
+[I0040],Smith,Marjorie Alice,,,,,female,5 Feb 1960,"San Jose, Santa Clara Co., CA",,,,,,,,,,,
+[I0014],Smith,Marjorie Lee,,,,,female,4 Nov 1934,"Reno, Washoe Co., NV",,,,,,,,,,,
+[I0022],Smith,Martin,,,,,male,19 Nov 1830,"Gladsax, Kristianstad Län, Sweden",,23 Nov 1830,"Gladsax, Kristianstad Län, Sweden",,between 1899 and 1905,Sweden,,,,,
+[I0039],Smith,Martin,,,,,male,between 1794 and 1796,"Tommarp, Kristianstad Län, Sweden",,,,,,Sweden,,,,,
+[I0005],Smith,Mason Michael,,,,,male,26 Jun 1996,"Hayward, Alameda Co., CA",,,,,,,,,,,
+[I0028],Streiffert,Anna,,,,,female,23 Sep 1860,"Hoya/Jona/Hoia, Sweden",,,,,2 Feb 1927,"Rønne, Bornholm, Denmark",,,,,
 [I0006],Willard,Edwin,,,,,male,about 1886,,,,,,,,,,,,
+[I0043],リチミシキスイミ,ピーター,,,,,male,,,,,,,,,,,,,

 Marriage,Husband,Wife,Date,Place,Source,Note
-[F0000],[I0039],[I0036],about 1816,[P0004],,
-[F0001],[I0027],[I0025],about 1790,[P0008],,
+[F0000],[I0039],[I0036],about 1816,"Gladsax, Kristianstad Län, Sweden",,
+[F0001],[I0027],[I0025],about 1790,Sweden,,
 [F0002],[I0022],[I0038],about 1856,,,
-[F0003],[I0024],[I0000],1885-11-27,[P0003],,
+[F0003],[I0024],[I0000],27 Nov 1885,"Rønne, Bornholm, Denmark",,
 [F0004],[I0006],[I0026],about 1910,,,
-[F0005],[I0012],[I0023],1912-11-30,[P0003],,
-[F0006],[I0008],[I0031],1927-10-31,[P0005],,
+[F0005],[I0012],[I0023],30 Nov 1912,"Rønne, Bornholm, Denmark",,
+[F0006],[I0008],[I0031],31 Oct 1927,"Reno, Washoe Co., NV",,
 [F0007],[I0015],[I0013],about 1920,,,
-[F0008],[I0033],[I0041],1958-08-10,[P0002],,
+[F0008],[I0033],[I0041],10 Aug 1958,"San Francisco, San Francisco Co., CA",,
 [F0009],[I0010],[I0017],,,,
-[F0010],[I0019],[I0032],1986-07-12,[P0022],,
-[F0011],[I0003],[I0028],1884-08-24,[P0003],,
-[F0012],[I0018],[I0034],1954-06-04,[P0001],Marriage Certificae,
-[F0013],[I0037],[I0030],1995-05-27,[P0023],,
+[F0010],[I0019],[I0032],12 Jul 1986,"Woodland, Yolo Co., CA",,
+[F0011],[I0003],[I0028],24 Aug 1884,"Rønne, Bornholm, Denmark",,
+[F0012],[I0018],[I0034],4 Jun 1954,"Sparks, Washoe Co., NV",Marriage Certificae,
+[F0013],[I0037],[I0030],27 May 1995,"San Ramon, Conta Costa Co., CA",,
 [F0014],[I0010],[I0016],,,,

 Family,Child
@@ -1,12 +1,12 @@
 0 HEAD
 1 SOUR Gramps
-2 VERS 5.1.2
+2 VERS 5.0.0-alpha2
 2 NAME Gramps
-1 DATE 7 JAN 2020
-2 TIME 13:39:43
+1 DATE 1 SEP 2017
+2 TIME 12:10:38
 1 SUBM @SUBM@
 1 FILE C:\Users\prc\AppData\Roaming\gramps\temp\exp_sample_ged.ged
-1 COPR Copyright (c) 2020 Alex Roitman,,,.
+1 COPR Copyright (c) 2017 Alex Roitman,,,.
 1 GEDC
 2 VERS 5.5.1
 2 FORM LINEAGE-LINKED
@@ -20,7 +20,6 @@
 1 EMAIL an_email@@gmail.com
 0 @I0000@ INDI
 1 NAME Anna /Hansdotter/
-2 TYPE birth
 2 GIVN Anna
 2 SURN Hansdotter
 2 NICK Annanana
@@ -47,7 +46,6 @@
 3 TIME 15:14:42
 0 @I0001@ INDI
 1 NAME Keith Lloyd /Smith/
-2 TYPE birth
 2 GIVN Keith Lloyd
 2 SURN Smith
 1 SEX M
@@ -62,10 +60,8 @@
 3 TIME 07:35:26
 0 @I0002@ INDI
 1 NAME Amber Marie /Smith/
-2 TYPE birth
 2 GIVN Amber Marie
 2 SURN Smith
-2 _RUFNAME Marie
 1 SEX F
 1 BIRT
 2 TYPE Birth of Amber Marie Smith
@@ -84,7 +80,6 @@
 3 TIME 07:35:26
 0 @I0003@ INDI
 1 NAME Magnes /Smith/
-2 TYPE birth
 2 GIVN Magnes
 2 SURN Smith
 1 SEX M
@@ -104,7 +99,6 @@
 3 TIME 07:35:26
 0 @I0004@ INDI
 1 NAME Ingeman /Smith/
-2 TYPE birth
 2 GIVN Ingeman
 2 SURN Smith
 1 SEX M
@@ -119,7 +113,6 @@
 3 TIME 07:35:26
 0 @I0005@ INDI
 1 NAME Mason Michael /Smith/
-2 TYPE birth
 2 GIVN Mason Michael
 2 SURN Smith
 1 SEX M
@@ -140,7 +133,6 @@
 3 TIME 07:35:26
 0 @I0006@ INDI
 1 NAME Edwin /Willard/
-2 TYPE birth
 2 GIVN Edwin
 2 SURN Willard
 1 SEX M
@@ -153,7 +145,6 @@
 3 TIME 07:35:26
 0 @I0007@ INDI
 1 NAME Ingar /Smith/
-2 TYPE birth
 2 GIVN Ingar
 2 SURN Smith
 1 SEX F
@@ -168,7 +159,6 @@
 3 TIME 07:35:26
 0 @I0008@ INDI
 1 NAME Hjalmar /Smith/
-2 TYPE birth
 2 GIVN Hjalmar
 2 SURN Smith
 1 SEX M
@@ -197,7 +187,6 @@
 3 TIME 07:35:26
 0 @I0009@ INDI
 1 NAME Emil /Smith/
-2 TYPE birth
 2 GIVN Emil
 2 SURN Smith
 1 SEX M
@@ -212,7 +201,6 @@
 3 TIME 07:35:26
 0 @I0010@ INDI
 1 NAME Hans Peter /Smith/
-2 TYPE birth
 2 GIVN Hans Peter
 2 SURN Smith
 1 SEX M
@@ -249,7 +237,6 @@
 3 TIME 21:32:08
 0 @I0011@ INDI
 1 NAME Hanna /Smith/
-2 TYPE birth
 2 GIVN Hanna
 2 SURN Smith
 1 SEX F
@@ -264,7 +251,6 @@
 3 TIME 07:35:26
 0 @I0012@ INDI
 1 NAME Herman Julius /Nielsen/
-2 TYPE birth
 2 GIVN Herman Julius
 2 SURN Nielsen
 1 SEX M
@@ -281,7 +267,6 @@
 3 TIME 07:35:26
 0 @I0013@ INDI
 1 NAME Evelyn /Michaels/
-2 TYPE birth
 2 GIVN Evelyn
 2 SURN Michaels
 1 SEX F
@@ -294,7 +279,6 @@
 3 TIME 07:35:26
 0 @I0014@ INDI
 1 NAME Marjorie Lee /Smith/
-2 TYPE birth
 2 GIVN Marjorie Lee
 2 SURN Smith
 1 SEX F
@@ -309,7 +293,6 @@
 3 TIME 07:35:26
 0 @I0015@ INDI
 1 NAME Gus /Smith/
-2 TYPE birth
 2 GIVN Gus
 2 SURN Smith
 1 SEX M
@@ -329,7 +312,6 @@
 3 TIME 07:35:26
 0 @I0016@ INDI
 1 NAME Jennifer /Anderson/
-2 TYPE birth
 2 GIVN Jennifer
 2 SURN Anderson
 1 SEX F
@@ -347,7 +329,6 @@
 3 TIME 07:35:26
 0 @I0017@ INDI
 1 NAME Lillie Harriet /Jones/
-2 TYPE birth
 2 GIVN Lillie Harriet
 2 SURN Jones
 1 SEX F
@@ -364,7 +345,6 @@
 3 TIME 07:35:26
 0 @I0018@ INDI
 1 NAME John Hjalmar /Smith/
-2 TYPE birth
 2 GIVN John Hjalmar
 2 SURN Smith
 1 SEX M
@@ -380,7 +360,6 @@
 3 TIME 07:35:26
 0 @I0019@ INDI
 1 NAME Eric Lloyd /Smith/
-2 TYPE birth
 2 GIVN Eric Lloyd
 2 SURN Smith
 2 NPFX Dr.
@@ -400,7 +379,6 @@
 3 TIME 21:25:13
 0 @I0020@ INDI
 1 NAME Carl Emil /Smith/
-2 TYPE birth
 2 GIVN Carl Emil
 2 SURN Smith
 1 SEX M
@@ -420,7 +398,6 @@
 3 TIME 07:35:26
 0 @I0021@ INDI
 1 NAME Hjalmar /Smith/
-2 TYPE birth
 2 GIVN Hjalmar
 2 SURN Smith
 1 SEX M
@@ -439,7 +416,6 @@
 3 TIME 07:35:26
 0 @I0022@ INDI
 1 NAME Martin /Smith/
-2 TYPE birth
 2 GIVN Martin
 2 SURN Smith
 1 SEX M
@@ -464,7 +440,6 @@
 3 TIME 07:35:26
 0 @I0023@ INDI
 1 NAME Astrid Shermanna Augusta /Smith/
-2 TYPE birth
 2 GIVN Astrid Shermanna Augusta
 2 SURN Smith
 1 SEX F
@@ -484,7 +459,6 @@
 3 TIME 07:35:26
 0 @I0024@ INDI
 1 NAME Gustaf /Smith/ Sr.
-2 TYPE birth
 2 GIVN Gustaf
 2 SURN Smith
 2 NSFX Sr.
@@ -513,7 +487,6 @@
 3 TIME 07:35:26
 0 @I0025@ INDI
 1 NAME Marta /Ericsdotter/
-2 TYPE birth
 2 GIVN Marta
 2 SURN Ericsdotter
 1 SEX F
@@ -527,7 +500,6 @@
 3 TIME 07:35:26
 0 @I0026@ INDI
 1 NAME Kirsti Marie /Smith/
-2 TYPE birth
 2 GIVN Kirsti Marie
 2 SURN Smith
 1 SEX F
@@ -547,7 +519,6 @@
 3 TIME 07:35:26
 0 @I0027@ INDI
 1 NAME Ingeman /Smith/
-2 TYPE birth
 2 GIVN Ingeman
 2 SURN Smith
 1 SEX M
@@ -561,7 +532,6 @@
 3 TIME 07:35:26
 0 @I0028@ INDI
 1 NAME Anna /Streiffert/
-2 TYPE birth
 2 GIVN Anna
 2 SURN Streiffert
 1 SEX F
@@ -579,7 +549,6 @@
 3 TIME 07:35:26
 0 @I0029@ INDI
 1 NAME Craig Peter /Smith/
-2 TYPE birth
 2 GIVN Craig Peter
 2 SURN Smith
 1 SEX M
@@ -597,7 +566,6 @@
 3 TIME 07:35:26
 0 @I0030@ INDI
 1 NAME Janice Ann /Adams/
-2 TYPE birth
 2 GIVN Janice Ann
 2 SURN Adams
 1 SEX F
@@ -615,7 +583,6 @@
 3 TIME 07:35:26
 0 @I0031@ INDI
 1 NAME Marjorie /Ohman/
-2 TYPE birth
 2 GIVN Marjorie
 2 SURN Ohman
 1 SEX F
@@ -640,7 +607,6 @@
 3 TIME 07:35:26
 0 @I0032@ INDI
 1 NAME Darcy /Horne/
-2 TYPE birth
 2 GIVN Darcy
 2 SURN Horne
 1 SEX F
@@ -656,7 +622,6 @@
 3 TIME 07:35:26
 0 @I0033@ INDI
 1 NAME Lloyd /Smith/
-2 TYPE birth
 2 GIVN Lloyd
 2 SURN Smith
 1 SEX M
@@ -664,19 +629,14 @@
 2 TYPE Birth of Lloyd Smith
 2 DATE 13 MAR 1935
 2 PLAC San Francisco, San Francisco Co., CA
-1 ADOP Y
-2 FAMC @F0009@
-3 ADOP HUSB
 1 FAMC @F0009@
-2 _FREL Adopted
-2 _MREL Foster
+2 PEDI birth
 1 FAMS @F0008@
 1 CHAN
 2 DATE 4 SEP 2016
 3 TIME 20:17:13
 0 @I0034@ INDI
 1 NAME Alice Paula /Perkins/
-2 TYPE birth
 2 GIVN Alice Paula
 2 SURN Perkins
 1 SEX F
@@ -690,7 +650,6 @@
 3 TIME 07:35:26
 0 @I0035@ INDI
 1 NAME Lars Peter /Smith/
-2 TYPE birth
 2 GIVN Lars Peter
 2 SURN Smith
 1 SEX M
@@ -708,7 +667,6 @@
 3 TIME 07:35:26
 0 @I0036@ INDI
 1 NAME Elna /Jefferson/
-2 TYPE birth
 2 GIVN Elna
 2 SURN Jefferson
 1 SEX F
@@ -729,7 +687,6 @@
 3 TIME 07:35:26
 0 @I0037@ INDI
 1 NAME Edwin Michael /Smith/
-2 TYPE birth
 2 GIVN Edwin Michael
 2 SURN Smith
 2 SOUR @S0001@
@@ -756,7 +713,6 @@
 3 TIME 07:35:26
 0 @I0038@ INDI
 1 NAME Kerstina /Hansdotter/
-2 TYPE birth
 2 GIVN Kerstina
 2 SURN Hansdotter
 1 SEX F
@@ -774,7 +730,6 @@
 3 TIME 07:35:26
 0 @I0039@ INDI
 1 NAME Martin /Smith/
-2 TYPE birth
 2 GIVN Martin
 2 SURN Smith
 1 SEX M
@@ -793,7 +748,6 @@
 3 TIME 07:35:26
 0 @I0040@ INDI
 1 NAME Marjorie Alice /Smith/
-2 TYPE birth
 2 GIVN Marjorie Alice
 2 SURN Smith
 1 SEX F
@@ -808,7 +762,6 @@
 3 TIME 07:35:26
 0 @I0041@ INDI
 1 NAME Janis Elaine /Green/
-2 TYPE birth
 2 GIVN Janis Elaine
 2 SURN Green
 1 SEX F
@@ -821,7 +774,6 @@
 3 TIME 07:35:26
 0 @I0042@ INDI
 1 NAME 雪 /Ke 柯/
-2 TYPE birth
 2 GIVN 雪
 2 SURN Ke 柯
 1 NAME Frank /Neilsen/
@@ -834,14 +786,17 @@
 3 ADOP BOTH
 1 FAMC @F0005@
 2 PEDI adopted
-1 OBJE @O0000@
+1 OBJE
+2 FORM jpeg
+2 TITL Michael O'Toole 2015-11
+2 FILE c:\grampsaio64-5.0.0\share\gramps\tests\O0.jpg
+2 NOTE @N0019@
 1 NOTE @N0007@
 1 CHAN
 2 DATE 18 JUN 2016
 3 TIME 17:04:25
 0 @I0043@ INDI
 1 NAME ピーター /リチミシキスイミ/
-2 TYPE birth
 2 GIVN ピーター
 2 SURN リチミシキスイミ
 1 SEX M
@@ -850,7 +805,6 @@
 3 TIME 16:42:08
 0 @I0044@ INDI
 1 NAME The /Tester/
-2 TYPE birth
 2 GIVN The
 2 SURN Tester
 2 NICK Testy
@@ -934,9 +888,8 @@
 3 TIME 14:22:58
 0 @I0046@ INDI
 1 NAME Tom /Von Tester y tested/
-2 TYPE birth
 2 GIVN Tom
-2 SPFX Von
+2 SPFX Von, 
 2 SURN Tester y, tested
 2 NICK TesterNickname
 1 SEX M
@@ -958,7 +911,7 @@
 2 DATE I think 1970 to 1971
 2 PLAC San Francisco, San Francisco Co., CA
 1 SLGC
-2 DATE ABT 1999
+2 DATE EST ABT 1999
 2 FAMC @F0016@
 2 TEMP DENVE
 2 PLAC Denver, Denver Co., CO, Denver Co., Colorado, USA
@@ -981,11 +934,9 @@
 3 TIME 16:27:59
 0 @I0047@ INDI
 1 NAME Fake /von Person/ I
-2 TYPE birth
 2 GIVN Fake
 2 SPFX von
 2 SURN Person
-2 _RUFNAME Person
 2 NSFX I
 2 NPFX Fake person
 2 NICK Fake
@@ -1053,7 +1004,6 @@
 3 TIME 16:27:59
 0 @I0048@ INDI
 1 NAME Mary /Tester/
-2 TYPE birth
 2 GIVN Mary
 2 SURN Tester
 1 SEX F
@@ -1090,12 +1040,11 @@
 3 TIME 16:27:59
 0 @I0051@ INDI
 1 NAME Mark /Tester/
-2 TYPE birth
 2 GIVN Mark
 2 SURN Tester
 1 SEX M
 1 FAMC @F0016@
-2 PEDI Sponsored
+2 PEDI Unknown
 1 CHAN
 2 DATE 29 OCT 2016
 3 TIME 16:27:59
@@ -1474,12 +1423,4 @@
 0 @N0017@ NOTE A citation Note Source text
 0 @N0018@ NOTE Another Citation Note
 0 @N0019@ NOTE A bad photo for sure
-0 @O0000@ OBJE
-1 FILE d:\users\prc\documents\gramps\data\tests\O0.jpg
-2 FORM jpg
-2 TITL Michael O'Toole 2015-11
-1 NOTE @N0019@
-1 CHAN
-2 DATE 29 OCT 2016
-3 TIME 15:23:37
 0 TRLR
@@ -3,41 +3,41 @@
 "http://gramps-project.org/xml/1.7.1/grampsxml.dtd">
 <database xmlns="http://gramps-project.org/xml/1.7.1/">
  <header>
-    <created date="2019-03-13" version="5.0.2"/>
+    <created date="2016-08-29" version="5.0.0-alpha1"/>
    <researcher>
    </researcher>
  </header>
  <events>
-    <event handle="_0000000500000005" change="1" id="E0000">
+    <event handle="_0000000500000005" change="1472500305" id="E0000">
      <type>Birth</type>
      <dateval val="1816"/>
      <place hlink="_0000000700000007"/>
      <citationref hlink="_0000000600000006"/>
    </event>
-    <event handle="_0000000800000008" change="1" id="E0001">
+    <event handle="_0000000800000008" change="1472500305" id="E0001">
      <type>Residence</type>
      <dateval val="1850"/>
      <place hlink="_0000000a0000000a"/>
      <citationref hlink="_0000000900000009"/>
    </event>
-    <event handle="_0000000b0000000b" change="1" id="E0002">
+    <event handle="_0000000b0000000b" change="1472500305" id="E0002">
      <type>Death</type>
      <datestr val="1850/1860"/>
      <place hlink="_0000000c0000000c"/>
    </event>
-    <event handle="_0000000f0000000f" change="1" id="E0003">
+    <event handle="_0000000f0000000f" change="1472500305" id="E0003">
      <type>Marriage</type>
      <dateval val="1841" type="about"/>
      <place hlink="_0000001000000010"/>
    </event>
-    <event handle="_0000001100000011" change="1" id="E0004">
+    <event handle="_0000001100000011" change="1472500305" id="E0004">
      <type>Marriage</type>
      <dateval val="1847-08"/>
      <place hlink="_0000001200000012"/>
    </event>
  </events>
  <people>
-    <person handle="_0000000100000001" change="1" id="I0278">
+    <person handle="_0000000100000001" change="1472500305" id="I0278">
      <gender>M</gender>
      <name type="Birth Name">
        <first>Andrew</first>
@@ -54,13 +54,13 @@
    </person>
  </people>
  <families>
-    <family handle="_0000000d0000000d" change="1" id="F0073">
+    <family handle="_0000000d0000000d" change="1472500305" id="F0073">
      <rel type="Married"/>
      <father hlink="_0000000100000001"/>
      <eventref hlink="_0000000f0000000f" role="Family"/>
      <childref hlink="_0000000100000001"/>
    </family>
-    <family handle="_0000000e0000000e" change="1" id="F0074">
+    <family handle="_0000000e0000000e" change="1472500305" id="F0074">
      <rel type="Married"/>
      <father hlink="_0000000100000001"/>
      <eventref hlink="_0000001100000011" role="Family"/>
@@ -68,19 +68,19 @@
    </family>
  </families>
  <citations>
-    <citation handle="_0000000400000004" change="1" id="C0000">
+    <citation handle="_0000000400000004" change="1472500305" id="C0000">
      <page>Year: 1850; Census Place: District 14, Cape Girardeau, Missouri; Roll: M432_394; Page: 435B; Image: 248</page>
      <confidence>2</confidence>
      <objref hlink="_0000000300000003"/>
      <sourceref hlink="_0000000200000002"/>
    </citation>
-    <citation handle="_0000000600000006" change="1" id="C0001">
+    <citation handle="_0000000600000006" change="1472500305" id="C0001">
      <page>Year: 1850; Census Place: District 14, Cape Girardeau, Missouri; Roll: M432_394; Page: 435B; Image: 248</page>
      <confidence>2</confidence>
      <objref hlink="_0000000300000003"/>
      <sourceref hlink="_0000000200000002"/>
    </citation>
-    <citation handle="_0000000900000009" change="1" id="C0002">
+    <citation handle="_0000000900000009" change="1472500305" id="C0002">
      <page>Year: 1850; Census Place: District 14, Cape Girardeau, Missouri; Roll: M432_394; Page: 435B; Image: 248</page>
      <confidence>2</confidence>
      <objref hlink="_0000000300000003"/>
@@ -88,7 +88,7 @@
    </citation>
  </citations>
  <sources>
-    <source handle="_0000000200000002" change="1" id="S0029">
+    <source handle="_0000000200000002" change="1472500305" id="S0029">
      <stitle>1850 United States Federal Census</stitle>
      <sauthor>Ancestry.com</sauthor>
      <spubinfo>Name: Ancestry.com Operations, Inc.; Location: Provo, UT, USA; Date: 2009;</spubinfo>
@@ -96,43 +96,42 @@
    </source>
  </sources>
  <places>
-    <placeobj handle="_0000000700000007" change="1" id="P0000" type="Unknown">
+    <placeobj handle="_0000000700000007" change="1472500305" id="P0000" type="Unknown">
      <ptitle>Tennessee, USA</ptitle>
      <pname value="Tennessee, USA"/>
    </placeobj>
-    <placeobj handle="_0000000a0000000a" change="1" id="P0001" type="Unknown">
+    <placeobj handle="_0000000a0000000a" change="1472500305" id="P0001" type="Unknown">
      <ptitle>District 14, Cape Girardeau, Missouri, USA</ptitle>
      <pname value="District 14, Cape Girardeau, Missouri, USA"/>
    </placeobj>
-    <placeobj handle="_0000000c0000000c" change="1" id="P0002" type="Unknown">
+    <placeobj handle="_0000000c0000000c" change="1472500305" id="P0002" type="Unknown">
      <ptitle>Bollinger Co. MO</ptitle>
      <pname value="Bollinger Co. MO"/>
    </placeobj>
-    <placeobj handle="_0000001000000010" change="1" id="P0003" type="Unknown">
+    <placeobj handle="_0000001000000010" change="1472500305" id="P0003" type="Unknown">
      <ptitle>Union Co.?, IL</ptitle>
      <pname value="Union Co.?, IL"/>
    </placeobj>
-    <placeobj handle="_0000001200000012" change="1" id="P0004" type="Unknown">
+    <placeobj handle="_0000001200000012" change="1472500305" id="P0004" type="Unknown">
      <ptitle>Wayne, Missouri, United States</ptitle>
      <pname value="Wayne, Missouri, United States"/>
    </placeobj>
  </places>
  <objects>
-    <object handle="_0000000300000003" change="1" id="M159">
+    <object handle="_0000000300000003" change="1472500305" id="M159">
      <file src="1850 United States Federal Census(11)-1.jpg" mime="image/jpeg" description="1850 United States Federal Census"/>
      <noteref hlink="_0000001400000014"/>
      <noteref hlink="_0000001500000015"/>
    </object>
-    <object handle="_0000001600000016" change="1" id="M158">
-      <file src="/Users/PRC/Downloads/1850 United States Federal Census(11)-1.jpg" mime="image/jpeg" description="/Users/PRC/Downloads/1850 United States Federal Census(11)-1.jpg"/>
-      <noteref hlink="_0000001700000017"/>
+    <object handle="_0000001600000016" change="1472500305" id="M158">
+      <file src="D:/Users/PRC/Downloads/1850 United States Federal Census(11)-1.jpg" mime="image/jpeg" description="D:\Users\PRC\Downloads\1850 United States Federal Census(11)-1.jpg"/>
    </object>
-    <object handle="_0000001800000018" change="1" id="M157">
+    <object handle="_0000001700000017" change="1472500305" id="M157">
      <file src="http://1.gravatar.com/avatar/77e02a3c8c665155ad1acaac8c2742e0?s=120&amp;d=mm&amp;r=pg" mime="unknown" description="http://1.gravatar.com/avatar/77e02a3c8c665155ad1acaac8c2742e0?s=120&amp;d=mm&amp;r=pg"/>
    </object>
  </objects>
  <repositories>
-    <repository handle="_0000001300000013" change="1" id="R0001">
+    <repository handle="_0000001300000013" change="1472500305" id="R0001">
      <rname>Ancestry.com</rname>
      <type>Library</type>
      <address>
@@ -141,26 +140,16 @@
    </repository>
  </repositories>
  <notes>
-    <note handle="_0000001400000014" change="1" id="N0000" type="Media Note">
-      <text>Year: 1850; Census Place: District 14, Cape Girardeau, Missouri; Roll: M432_394; Page: 435B; Image: 248 </text>
+    <note handle="_0000001400000014" change="1472500305" id="N0000" type="Media Note">
+      <text>Year: 1850; Census Place: District 14, Cape Girardeau, Missouri; Roll: M432_394; Page: 435B; Image: 248</text>
    </note>
-    <note handle="_0000001500000015" change="1" id="N0001" type="GEDCOM import">
+    <note handle="_0000001500000015" change="1472500305" id="N0001" type="GEDCOM import">
      <text>Records not imported into OBJE (multi-media object) Gramps ID M159:

-Could not import 1850 United States Federal Census(11)-1.jpg        Line    70: 1 FILE 1850 United States Federal Census(11)-1.jpg
-</text>
+Could not import 1850 United States Federal Census(11)-1.jpg        Line    70: 1 FILE 1850 United States Federal Census(11)-1.jpg</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="200"/>
      </style>
    </note>
-    <note handle="_0000001700000017" change="1" id="N0002" type="GEDCOM import">
-      <text>Records not imported into OBJE (multi-media object) Gramps ID M158:
-
-Could not import D:\Users\PRC\Downloads\1850 United States Federa   Line    75: 1 FILE D:\Users\PRC\Downloads\1850 United States Federal Census(11)-1.jpg
-</text>
-      <style name="fontface" value="Monospace">
-        <range start="0" end="223"/>
-      </style>
-    </note>
  </notes>
 </database>
@@ -3,7 +3,7 @@
 "http://gramps-project.org/xml/1.7.1/grampsxml.dtd">
 <database xmlns="http://gramps-project.org/xml/1.7.1/">
  <header>
-    <created date="2019-03-05" version="5.0.2"/>
+    <created date="2017-05-30" version="5.0.0-alpha1"/>
    <researcher>
    </researcher>
  </header>
@@ -66,10 +66,9 @@
    <object handle="_0000000300000003" change="1" id="O0000">
      <file src="test_emb_55.jpg" mime="image/jpeg" description="Multimedia link embedded form v5.5"/>
      <noteref hlink="_0000000200000002"/>
-      <noteref hlink="_0000000b0000000b"/>
    </object>
    <object handle="_0000000400000004" change="548708291" id="M1">
-      <file src="" mime="image/jpeg" description="Multimedia link to linked form v5.5 blob"/>
+      <file src="" mime="" description="Multimedia link to linked form v5.5 blob"/>
      <attribute type="REFN" value="Ref12345M1">
        <noteref hlink="_0000001200000012"/>
      </attribute>
@@ -118,7 +117,7 @@
      <citationref hlink="_0000002700000027"/>
    </object>
    <object handle="_0000000c0000000c" change="1" id="O0002">
-      <file src="http://www.geni.com/photo/view?photo_id=6000000001341319061" mime="text/html" description="Multimedia link embedded form v5.5 URL"/>
+      <file src="http://www.geni.com/photo/view?photo_id=6000000001341319061" mime="unknown" description="Multimedia link embedded form v5.5 URL"/>
      <noteref hlink="_0000000b0000000b"/>
    </object>
    <object handle="_0000000d0000000d" change="1" id="M7">
@@ -130,7 +129,7 @@
      <noteref hlink="_0000002900000029"/>
    </object>
    <object handle="_0000001500000015" change="1" id="M2">
-      <file src="" mime="image/jpeg" description="2nd blob Multimedia link to linked form v5.5 blob"/>
+      <file src="" mime="" description="2nd blob Multimedia link to linked form v5.5 blob"/>
      <noteref hlink="_0000001600000016"/>
    </object>
  </objects>
@@ -3,7 +3,7 @@
 "http://gramps-project.org/xml/1.7.1/grampsxml.dtd">
 <database xmlns="http://gramps-project.org/xml/1.7.1/">
  <header>
-    <created date="2019-07-30" version="5.0.2"/>
+    <created date="2016-10-23" version="5.0.0-alpha1"/>
    <researcher>
      <resname>John A. Tester</resname>
    </researcher>
@@ -26,23 +26,27 @@
      <type>Death</type>
      <noteref hlink="_0000001600000016"/>
    </event>
-    <event handle="_0000002700000027" change="1" id="E0003">
+    <event handle="_0000001e0000001e" change="1" id="E0003">
+      <type>Who knows OBJE REFN TYPE</type>
+      <description>REFN</description>
+    </event>
+    <event handle="_0000002700000027" change="1" id="E0004">
      <type>Birth</type>
      <dateval val="1901-06-15"/>
    </event>
-    <event handle="_0000002800000028" change="1" id="E0004">
+    <event handle="_0000002800000028" change="1" id="E0005">
      <type>Death</type>
      <dateval val="1975-07-05"/>
    </event>
-    <event handle="_0000002e0000002e" change="1" id="E0005">
+    <event handle="_0000002e0000002e" change="1" id="E0006">
      <type>Birth</type>
      <dateval val="1922-06-15"/>
    </event>
-    <event handle="_0000002f0000002f" change="1" id="E0006">
+    <event handle="_0000002f0000002f" change="1" id="E0007">
      <type>Death</type>
      <dateval val="1994-07-05"/>
    </event>
-    <event handle="_0000003b0000003b" change="1" id="E0007">
+    <event handle="_0000003b0000003b" change="1" id="E0008">
      <type>TEST</type>
      <description>family</description>
    </event>
@@ -57,11 +61,10 @@
      <eventref hlink="_0000000f0000000f" role="Primary"/>
      <eventref hlink="_0000001000000010" role="Primary"/>
      <eventref hlink="_0000001500000015" role="Primary"/>
+      <eventref hlink="_0000001e0000001e" role="Primary"/>
      <objref hlink="_0000001f0000001f"/>
      <attribute type="RIN" value="123456 Person"/>
-      <attribute type="REFN" value="98765 for PERSON">
-        <noteref hlink="_0000001e0000001e"/>
-      </attribute>
+      <attribute type="REFN" value="98765 for PERSON"/>
      <url  href="http://homepages.rootsweb.com/~pmcbride/gedcom/55gctoc.htm" type="Web Home" description="GEDCOM 5.5 documentation web site"/>
      <parentin hlink="_0000001700000017"/>
      <noteref hlink="_0000001800000018"/>
@@ -267,8 +270,7 @@

 Line ignored as not understood                                      Line    18: 2 TEST Header Note
 Empty note ignored                                                  Line    19: 1 NOTE 
-Skipped subordinate line                                            Line    20: 2 TEST Empty Note
-</text>
+Skipped subordinate line                                            Line    20: 2 TEST Empty Note</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="327"/>
      </style>
@@ -286,8 +288,7 @@ Skipped subordinate line                                            Line    20:
 Line ignored as not understood                                      Line    26: 2 TEST Submission Note
 Empty note ignored                                                  Line    27: 1 NOTE 
 Skipped subordinate line                                            Line    28: 2 TEST Empty Note
-Line ignored as not understood                                      Line    29: 1 TEST submission
-</text>
+Line ignored as not understood                                      Line    29: 1 TEST submission</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="425"/>
      </style>
@@ -299,8 +300,7 @@ Tag recognized but not supported                                    Line    32:
 Tag recognized but not supported                                    Line    33: 1 REFN Submission Note REFN
 Skipped subordinate line                                            Line    34: 2 TYPE Submission Note REFN TYPE
 Tag recognized but not supported                                    Line    35: 1 SOUR Submission note source
-Line ignored as not understood                                      Line    39: 1 TEST on XREF Note
-</text>
+Line ignored as not understood                                      Line    39: 1 TEST on XREF Note</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="586"/>
      </style>
@@ -318,8 +318,7 @@ Line ignored as not understood                                      Line    39:
 Line ignored as not understood                                      Line    43: 2 TEST Submitter Note
 Empty note ignored                                                  Line    44: 1 NOTE 
 Skipped subordinate line                                            Line    45: 2 TEST Empty Note
-Line ignored as not understood                                      Line    46: 1 TEST Submitter
-</text>
+Line ignored as not understood                                      Line    46: 1 TEST Submitter</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="460"/>
      </style>
@@ -361,10 +360,7 @@ Line ignored as not understood                                      Line    46:
    <note handle="_0000001d0000001d" change="979250406" id="N0018" type="Media Note">
      <text>Media xref note</text>
    </note>
-    <note handle="_0000001e0000001e" change="1" id="N0019" type="REFN-TYPE">
-      <text>Who knows OBJE REFN TYPE</text>
-    </note>
-    <note handle="_0000002100000021" change="1" id="N0020" type="GEDCOM import">
+    <note handle="_0000002100000021" change="1" id="N0019" type="GEDCOM import">
      <text>Records not imported into INDI (individual) Gramps ID I0001:

 Empty note ignored                                                  Line    54: 2 NOTE 
@@ -386,14 +382,12 @@ Empty note ignored                                                  Line    85:
 Skipped subordinate line                                            Line    86: 3 TEST Empty Note
 Line ignored as not understood                                      Line    88: 3 TEST 123456 Note
 Empty note ignored                                                  Line    90: 2 NOTE 
-Skipped subordinate line                                            Line    91: 3 TEST Empty Note
-Line ignored as not understood                                      Line    94: 2 TEST REFN
-</text>
+Skipped subordinate line                                            Line    91: 3 TEST Empty Note</text>
      <style name="fontface" value="Monospace">
-        <range start="0" end="2101"/>
+        <range start="0" end="2009"/>
      </style>
    </note>
-    <note handle="_0000002200000022" change="1" id="N0021" type="GEDCOM import">
+    <note handle="_0000002200000022" change="1" id="N0020" type="GEDCOM import">
      <text>Records not imported into NOTE Gramps ID N0018:

 Tag recognized but not supported                                    Line   103: 1 RIN 123456
@@ -402,89 +396,85 @@ Skipped subordinate line                                            Line   105:
 Tag recognized but not supported                                    Line   109: 2 NOTE Note on a change on a note!!!
 Skipped subordinate line                                            Line   110: 3 CHAN 
 Skipped subordinate line                                            Line   111: 4 DATE 2001-01-11
-Skipped subordinate line                                            Line   112: 5 TIME 16:00:06
-</text>
+Skipped subordinate line                                            Line   112: 5 TIME 16:00:06</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="741"/>
      </style>
    </note>
-    <note handle="_0000002300000023" change="1" id="N0022" type="REFN-TYPE">
+    <note handle="_0000002300000023" change="1" id="N0021" type="REFN-TYPE">
      <text>Who knows REFN TYPE</text>
    </note>
-    <note handle="_0000002500000025" change="1" id="N0023" type="GEDCOM import">
+    <note handle="_0000002500000025" change="1" id="N0022" type="GEDCOM import">
      <text>Records not imported into OBJE (multi-media object) Gramps ID M1:

-Could not import photo.jpg                                          Line   114: 1 FILE photo.jpg
-</text>
+Could not import photo.jpg                                          Line   114: 1 FILE photo.jpg</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="164"/>
      </style>
    </note>
-    <note handle="_0000002900000029" change="979250406" id="N0024" type="Person Note">
+    <note handle="_0000002900000029" change="979250406" id="N0023" type="Person Note">
      <text>Family Spouse reference Note</text>
      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000002b0000002b" change="1" id="N0025" type="GEDCOM import">
+    <note handle="_0000002b0000002b" change="1" id="N0024" type="GEDCOM import">
      <text>Records not imported into INDI (individual) Gramps ID I0002:

 Empty note ignored                                                  Line   132: 2 NOTE 
-Skipped subordinate line                                            Line   133: 3 TEST Empty Note
-</text>
+Skipped subordinate line                                            Line   133: 3 TEST Empty Note</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="248"/>
      </style>
    </note>
-    <note handle="_0000002d0000002d" change="979250406" id="N0026" type="General">
+    <note handle="_0000002d0000002d" change="979250406" id="N0025" type="General">
      <text>Name note</text>
      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000003100000031" change="1" id="N0027" type="LDS Note">
+    <note handle="_0000003100000031" change="1" id="N0026" type="LDS Note">
      <text>Place note</text>
      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000003400000034" change="1" id="N0028" type="LDS Note">
+    <note handle="_0000003400000034" change="1" id="N0027" type="LDS Note">
      <text>LDS xref note</text>
    </note>
-    <note handle="_0000003600000036" change="979250406" id="N0029" type="Association Note">
+    <note handle="_0000003600000036" change="979250406" id="N0028" type="Association Note">
      <text>Association link note</text>
      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000003800000038" change="1" id="N0030" type="GEDCOM import">
+    <note handle="_0000003800000038" change="1" id="N0029" type="GEDCOM import">
      <text>Records not imported into INDI (individual) Gramps ID I0003:

 Empty note ignored                                                  Line   141: 2 NOTE 
 Skipped subordinate line                                            Line   142: 3 TEST Empty Note
 Line ignored as not understood                                      Line   163: 3 TEST Accociation note
 Empty note ignored                                                  Line   167: 2 NOTE 
-Skipped subordinate line                                            Line   168: 3 TEST Empty Note
-</text>
+Skipped subordinate line                                            Line   168: 3 TEST Empty Note</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="538"/>
      </style>
    </note>
-    <note handle="_0000003900000039" change="979250406" id="N0031" type="General">
+    <note handle="_0000003900000039" change="979250406" id="N0030" type="General">
      <text>Just for association</text>
      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000003e0000003e" change="1" id="N0032" type="Family Note">
+    <note handle="_0000003e0000003e" change="1" id="N0031" type="Family Note">
      <text>Family xref note</text>
    </note>
-    <note handle="_0000003f0000003f" change="979250406" id="N0033" type="Family Note">
+    <note handle="_0000003f0000003f" change="979250406" id="N0032" type="Family Note">
      <text>Family note</text>
      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000004000000040" change="1" id="N0034" type="Citation">
+    <note handle="_0000004000000040" change="1" id="N0033" type="Citation">
      <text>Citation Data Note</text>
      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000004100000041" change="1" id="N0035" type="Source text">
+    <note handle="_0000004100000041" change="1" id="N0034" type="Source text">
      <text>A sample text from a source of this family</text>
    </note>
-    <note handle="_0000004200000042" change="979250406" id="N0036" type="Citation">
+    <note handle="_0000004200000042" change="979250406" id="N0035" type="Citation">
      <text>A note this citation is on the FAMILY record.</text>
      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000004400000044" change="1" id="N0037" type="GEDCOM import">
+    <note handle="_0000004400000044" change="1" id="N0036" type="GEDCOM import">
      <text>Records not imported into FAM (family) Gramps ID F0001:

 Line ignored as not understood                                      Line   183: 2 TEST Family Note
@@ -492,44 +482,41 @@ Empty note ignored                                                  Line   187:
 Skipped subordinate line                                            Line   188: 2 TEST Empty Note
 Line ignored as not understood                                      Line   190: 2 TEST citation
 Line ignored as not understood                                      Line   194: 3 TEST Citation Data
-Line ignored as not understood                                      Line   196: 4 TEST Citation Data Note
-</text>
+Line ignored as not understood                                      Line   196: 4 TEST Citation Data Note</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="645"/>
      </style>
    </note>
-    <note handle="_0000004600000046" change="979250406" id="N0038" type="Repository Reference Note">
+    <note handle="_0000004600000046" change="979250406" id="N0037" type="Repository Reference Note">
      <text>A short note about the repository link.</text>
      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000004700000047" change="979250406" id="N0039" type="Source Note">
+    <note handle="_0000004700000047" change="979250406" id="N0038" type="Source Note">
      <text>note embedded in the SOURCE Record</text>
      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000004800000048" change="1" id="N0040" type="GEDCOM import">
+    <note handle="_0000004800000048" change="1" id="N0039" type="GEDCOM import">
      <text>Records not imported into SOUR (source) Gramps ID S0001:

 Line ignored as not understood                                      Line   206: 1 TEST source
 Empty note ignored                                                  Line   208: 2 NOTE 
 Skipped subordinate line                                            Line   209: 3 TEST Empty Note
 Empty note ignored                                                  Line   214: 1 NOTE 
-Skipped subordinate line                                            Line   215: 2 TEST Empty Note
-</text>
+Skipped subordinate line                                            Line   215: 2 TEST Empty Note</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="524"/>
      </style>
    </note>
-    <note handle="_0000004900000049" change="1" id="N0041" type="Repository Note">
+    <note handle="_0000004900000049" change="1" id="N0040" type="Repository Note">
      <text>Repository Note</text>
      <tagref hlink="_0000000500000005"/>
    </note>
-    <note handle="_0000004a0000004a" change="1" id="N0042" type="GEDCOM import">
+    <note handle="_0000004a0000004a" change="1" id="N0041" type="GEDCOM import">
      <text>Records not imported into REPO (repository) Gramps ID R0002:

 Line ignored as not understood                                      Line   223: 1 TEST Repo
 Empty note ignored                                                  Line   224: 1 NOTE 
-Skipped subordinate line                                            Line   225: 2 TEST Empty Note
-</text>
+Skipped subordinate line                                            Line   225: 2 TEST Empty Note</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="340"/>
      </style>
@@ -50,9 +50,9 @@
 0 @I0@ INDI
 1 NAME Anna /Hansdotter/
 2 GIVN Anna
-2 SURN Hansdotter, Smith
-2 SPFX Vrow, huh
 2 SURN Hansdotter
+2 SPFX Vrow
+2 SURN Smith
 2 _AKA Anna Smith
 2 _AKA Hanna
 2 NOTE Hans daughter? N0000
@@ -83,8 +83,6 @@
 2 DATE 11 AUG 1966
 2 PLAC San Francisco, San Francisco Co., CA
 1 FAMC @F8@
-2 _FREL Adopted
-2 _MREL Foster
 1 CHAN
 2 DATE 21 DEC 2007
 3 TIME 01:35:26
@@ -3,7 +3,7 @@
 "http://gramps-project.org/xml/1.7.1/grampsxml.dtd">
 <database xmlns="http://gramps-project.org/xml/1.7.1/">
  <header>
-    <created date="1999-12-25" version="5.1.3"/>
+    <created date="2016-10-24" version="5.0.0-alpha1"/>
    <researcher>
      <resname>Alex Roitman,,,</resname>
      <resaddr>Not Provided</resaddr>
@@ -163,7 +163,6 @@
    </event>
    <event handle="_0000005500000055" change="1" id="E0026">
      <type>Birth</type>
-      <description>No Date Information</description>
    </event>
    <event handle="_0000005600000056" change="1" id="E0027">
      <type>Death</type>
@@ -617,8 +616,7 @@
      <gender>F</gender>
      <name type="Birth Name">
        <first>Anna</first>
-        <surname prefix="Vrow">Hansdotter</surname>
-        <surname prim="0">Smith</surname>
+        <surname prefix="Vrow">Smith</surname>
        <noteref hlink="_0000001100000011"/>
      </name>
      <name alt="1" type="Also Known As">
@@ -919,7 +917,7 @@
      <childof hlink="_0000001d0000001d"/>
    </person>
    <person handle="_0000007f0000007f" change="1198222526" id="I0003">
-      <gender>X</gender>
+      <gender>U</gender>
      <name type="Birth Name">
        <first>Magnes</first>
        <surname>Smith</surname>
@@ -1134,7 +1132,7 @@
      <mother hlink="_000000b6000000b6"/>
      <eventref hlink="_000000e3000000e3" role="Family"/>
      <childref hlink="_0000004800000048" mrel="Adopted" frel="Adopted"/>
-      <childref hlink="_0000001900000019" mrel="Foster" frel="Adopted"/>
+      <childref hlink="_0000001900000019"/>
      <childref hlink="_0000007b0000007b" mrel="Adopted" frel="Adopted"/>
      <noteref hlink="_000000e4000000e4"/>
    </family>
@@ -1302,7 +1300,7 @@
      </reporef>
    </source>
    <source handle="_0000008500000085" change="1" id="S0000">
-      <stitle>Marriage Certificae</stitle>
+      <stitle>@S0@</stitle>
      <noteref hlink="_000000e7000000e7"/>
      <reporef hlink="_000000e6000000e6" callno="what-321-ever" medium="Photo"/>
    </source>
@@ -1458,13 +1456,13 @@
      <noteref hlink="_000000f9000000f9"/>
    </object>
    <object handle="_000000d1000000d1" change="1" id="O0001">
-      <file src="Magnes&amp;Anna_smiths_marr_cert.jpg" mime="image/jpeg" description="Magnes&amp;Anna_smiths_marr_cert.jpg"/>
+      <file src="Magnes&amp;Anna_smiths_marr_cert.jpg" mime="unknown" description="Magnes&amp;Anna_smiths_marr_cert.jpg"/>
    </object>
    <object handle="_000000d8000000d8" change="1" id="O0002">
-      <file src="John&amp;Alice_smiths_marr_cert.jpg" mime="image/jpeg" description="John&amp;Alice_smiths_marr_cert.jpg"/>
+      <file src="John&amp;Alice_smiths_marr_cert.jpg" mime="unknown" description="John&amp;Alice_smiths_marr_cert.jpg"/>
    </object>
    <object handle="_000000f1000000f1" change="1" id="O0003">
-      <file src="Attic_photo.jpg" mime="image/jpeg" description="Attic_photo.jpg"/>
+      <file src="Attic_photo.jpg" mime="unknown" description="Attic_photo.jpg"/>
    </object>
  </objects>
  <repositories>
@@ -1508,8 +1506,7 @@
    <note handle="_0000000100000001" change="1" id="N0000" type="GEDCOM import">
      <text>Records not imported into HEAD (header):

-GEDCOM FORM not supported                                           Line    14: 2 FORM NOT LINEAGE-LINKED
-</text>
+GEDCOM FORM not supported                                           Line    14: 2 FORM NOT LINEAGE-LINKED</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="148"/>
      </style>
@@ -1517,8 +1514,7 @@ GEDCOM FORM not supported                                           Line    14:
    <note handle="_0000000200000002" change="1" id="N0001" type="GEDCOM import">
      <text>Records not imported into SUBM (Submitter): (@SUBM@) Alex Roitman,,,:

-Line ignored as not understood                                      Line    23: 2 NOTE No address provided (note not supported)
-</text>
+Line ignored as not understood                                      Line    23: 2 NOTE No address provided (note not supported)</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="199"/>
      </style>
@@ -1527,8 +1523,7 @@ Line ignored as not understood                                      Line    23:
      <text>Records not imported into FAM (family) Gramps ID F0003:

 Line ignored as not understood                                      Line    46: 2 SOUR Not really allowed here
-Filename omitted                                                    Line    48: 1 OBJE 
-</text>
+Filename omitted                                                    Line    48: 1 OBJE</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="256"/>
      </style>
@@ -1566,9 +1561,8 @@ Filename omitted                                                    Line    48:
    <note handle="_0000003d0000003d" change="1" id="N0012" type="GEDCOM import">
      <text>Records not imported into INDI (individual) Gramps ID I0016:

-Warn: ADDR overwritten                                              Line   206: 3 ADR1 456 Main St again
-ADDR element ignored '459 Main St.'                                 Line   204: 2 ADDR 459 Main St., The Village, San Francisco, CA, USA
-</text>
+Warn: ADDR overwritten                                              Line   204: 3 ADR1 456 Main St again
+ADDR element ignored '459 Main St.'                                 Line   202: 2 ADDR 459 Main St., The Village, San Francisco, CA, USA</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="304"/>
      </style>
@@ -1579,8 +1573,7 @@ ADDR element ignored '459 Main St.'                                 Line   204:
    <note handle="_0000004700000047" change="1" id="N0014" type="GEDCOM import">
      <text>Records not imported into INDI (individual) Gramps ID I0018:

-Tag recognized but not supported                                    Line   247: 2 TYPE first generaton
-</text>
+Tag recognized but not supported                                    Line   245: 2 TYPE first generaton</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="165"/>
      </style>
@@ -1611,8 +1604,7 @@ Company. He enlisted in the army at Sparks 7 December 1917 and served as a Corpo
    <note handle="_000000cf000000cf" change="1" id="N0021" type="GEDCOM import">
      <text>Records not imported into FAM (family) Gramps ID F0010:

-Tag recognized but not supported                                    Line   865: 2 _STAT 
-</text>
+Tag recognized but not supported                                    Line   863: 2 _STAT</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="146"/>
      </style>
@@ -1620,9 +1612,8 @@ Tag recognized but not supported                                    Line   865:
    <note handle="_000000d4000000d4" change="1" id="N0022" type="GEDCOM import">
      <text>Records not imported into FAM (family) Gramps ID F0011:

-Could not import Magnes&amp;Anna_smiths_marr_cert.jpg                   Line   880: 3 OBJE 
-Could not import Magnes&amp;Anna_smiths_marr_cert.jpg                   Line   883: 2 OBJE 
-</text>
+Could not import Magnes&amp;Anna_smiths_marr_cert.jpg                   Line   878: 3 OBJE 
+Could not import Magnes&amp;Anna_smiths_marr_cert.jpg                   Line   881: 2 OBJE</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="233"/>
      </style>
@@ -1630,8 +1621,7 @@ Could not import Magnes&amp;Anna_smiths_marr_cert.jpg                   Line   8
    <note handle="_000000d9000000d9" change="1" id="N0023" type="GEDCOM import">
      <text>Records not imported into FAM (family) Gramps ID F0012:

-Could not import John&amp;Alice_smiths_marr_cert.jpg                    Line   907: 1 OBJE 
-</text>
+Could not import John&amp;Alice_smiths_marr_cert.jpg                    Line   905: 1 OBJE</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="145"/>
      </style>
@@ -1639,8 +1629,7 @@ Could not import John&amp;Alice_smiths_marr_cert.jpg                    Line   9
    <note handle="_000000e4000000e4" change="1" id="N0024" type="GEDCOM import">
      <text>Records not imported into FAM (family) Gramps ID F0008:

-Tag recognized but not supported                                    Line  1007: 1 ADDR 123 Main st, Grantville, Virginia, USA
-</text>
+Tag recognized but not supported                                    Line  1005: 1 ADDR 123 Main st, Grantville, Virginia, USA</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="183"/>
      </style>
@@ -1663,9 +1652,8 @@ Tag recognized but not supported                                    Line  1007:
    <note handle="_000000ee000000ee" change="1" id="N0030" type="GEDCOM import">
      <text>Records not imported into SOUR (source) Gramps ID S0003:

-Tag recognized but not supported                                    Line  1047: 1 DATA 
-Skipped subordinate line                                            Line  1048: 2 AGNC NYC Public Library
-</text>
+Tag recognized but not supported                                    Line  1045: 1 DATA 
+Skipped subordinate line                                            Line  1046: 2 AGNC NYC Public Library</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="252"/>
      </style>
@@ -1679,10 +1667,9 @@ Skipped subordinate line                                            Line  1048:
    <note handle="_000000f5000000f5" change="1" id="N0033" type="GEDCOM import">
      <text>Records not imported into REPO (repository) Gramps ID R0003:

-REFN ignored                                                        Line  1077: 3 REFN blah blah
-Skipped subordinate line                                            Line  1078: 4 TYPE who knows
-Could not import Attic_photo.jpg                                    Line  1081: 3 OBJE 
-</text>
+REFN ignored                                                        Line  1075: 3 REFN blah blah
+Skipped subordinate line                                            Line  1076: 4 TYPE who knows
+Could not import Attic_photo.jpg                                    Line  1079: 3 OBJE</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="344"/>
      </style>
@@ -1690,8 +1677,7 @@ Could not import Attic_photo.jpg                                    Line  1081:
    <note handle="_000000f6000000f6" change="1" id="N0034" type="GEDCOM import">
      <text>Records not imported into Top Level:

-Unknown tag                                                         Line  1108: 0 XXX an unknown token at level 0
-</text>
+Unknown tag                                                         Line  1106: 0 XXX an unknown token at level 0</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="152"/>
      </style>
@@ -1699,13 +1685,12 @@ Unknown tag                                                         Line  1108:
    <note handle="_000000f8000000f8" change="1" id="N0035" type="GEDCOM import">
      <text>Records not imported into Top Level:

-Unknown tag                                                         Line  1111: 1 @X1@ XXX and unknown token xref definition
-</text>
+Unknown tag                                                         Line  1109: 1 @X1@ XXX and unknown token xref definition</text>
      <style name="fontface" value="Monospace">
        <range start="0" end="163"/>
      </style>
    </note>
-    <note handle="_000000f9000000f9" change="1591544255" id="N0036" type="General">
+    <note handle="_000000f9000000f9" change="1477325896" id="N0036" type="General">
      <text>Objects referenced by this note were missing in a file imported on 12/25/1999 12:00:00 AM.</text>
    </note>
  </notes>
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tips>
-
-<tip number="1"><b>Working with Dates</b><br/>A range of dates can be given by using the format &quot;between January 4, 2000 and March 20, 2003&quot;. You can also indicate the level of confidence in a date and even choose between seven different calendars. Try the button next to the date field in the Events Editor.</tip>
-
-<tip number="2"><b>Editing Objects</b><br/>In most cases double clicking on a name, source, place or media entry will bring up a window to allow you to edit the object. Note that the result can be dependent on context. For example, in the Family View clicking on a parent or child will bring up the Relationship Editor.</tip>
-
-<tip number="3"><b>Adding Images</b><br/>An image can be added to any gallery or the Media View by dragging and dropping it from a file manager or a web browser. Actually you can add any type of file like this, useful for scans of documents and other digital sources.</tip>
-
-<tip number="4"><b>Ordering Children in a Family</b><br/>The birth order of children in a family can be set by using drag and drop. This order is preserved even when they do not have birth dates.</tip>
-
-<tip number="5"><b>Talk to Relatives Before It Is Too Late</b><br/>Your oldest relatives can be your most important source of information. They usually know things about the family that haven't been written down. They might tell you nuggets about people that may one day lead to a new avenue of research. At the very least, you will get to hear some great stories. Don't forget to record the conversations!</tip>
-
-<tip number="7"><b>Filtering People</b><br/>In the People View, you can 'filter' individuals based on many criteria. To define a new filter go to &quot;Edit &gt; Person Filter Editor&quot;. There you can name your filter and add and combine rules using the many preset rules. For example, you can define a filter to find all adopted people in the family tree. People without a birth date mentioned can also be filtered. To get the results save your filter. Then select this filter in the Filter field on Sidebar, then click Find button. If the Sidebar is not visible, select View &gt; Sidebar.</tip>
-
-<tip number="8"><b>Inverted Filtering</b><br/>Filters can easily be reversed by using the 'invert' option &quot;Return values that do not match the filter rules&quot;. For instance, by inverting the 'People with children' filter you can select all people without children.</tip>
-
-<tip number="9"><b>Locating People</b><br/>By default, each surname in the People View is listed only once. By clicking on the arrow to the left of a name, the list will expand to show all individuals with that last name. To locate any Family Name from a long list, select a Family Name (not a person) and start typing. The view will jump to the first Family Name matching the letters you enter.</tip>
-
-<tip number="10"><b>The Family View</b><br/>The Family View is used to display a typical family unit as two parents and their children.</tip>
-
-<tip number="11"><b>Changing the Active Person</b><br/>Changing the Active Person in views is easy. In the Relationship view just click on anyone. In the Ancestry View doubleclick on the person or right click to select any of their spouses, siblings, children or parents.</tip>
-
-<tip number="12"><b>Who Was Born When?</b><br/>Under &quot;Tools &gt; Analysis and exploration &gt; Compare Individual Events...&quot; you can compare the data of individuals in your database. This is useful, say, if you wish to list the birth dates of everyone in your database. You can use a custom filter to narrow the results.</tip>
-
-<tip number="13"><b>Gramps Tools</b><br/>Gramps comes with a rich set of tools. These allow you to undertake operations such as checking the database for errors and consistency. There are research and analysis tools such as event comparison, finding duplicate people, interactive descendant browser, and many others. All tools can be accessed through the &quot;Tools&quot; menu.</tip>
-
-<tip number="14"><b>Calculating Relationships</b><br/>To check if two people in the database are related (by blood, not marriage) try the tool under &quot;Tools &gt; Utilities &gt; Relationship Calculator...&quot;. The exact relationship as well as all common ancestors are reported.</tip>
-
-<tip number="15"><b>SoundEx can help with family research</b><br/>SoundEx solves a long standing problem in genealogy, how to handle spelling variations. The SoundEx Gramplet takes a surname and generates a simplified form that is equivalent for similar sounding names. Knowing the SoundEx Code for a surname is very helpful for researching Census Data files (microfiche) at a library or other research facility. To view the SoundEx codes for surnames in your database, add the SoundEx Gramplet.</tip>
-
-<tip number="16"><b>Setting Your Preferences</b><br/>&quot;Edit &gt; Preferences...&quot; lets you modify a number of settings, such as the path to your media files, and allows you to adjust many aspects of the Gramps presentation to your needs. Each separate view can also be configured under &quot;View &gt; Configure View...&quot;.</tip>
-
-<tip number="17"><b>Gramps Reports</b><br/>Gramps offers a wide variety of reports. The Graphical Reports and Graphs can present complex relationships easily and the Text Reports are particularly useful if you want to send the results of your family tree to members of the family via email. If you're ready to make a website for your family tree then there's a report for that as well.</tip>
-
-<tip number="18"><b>Starting a New Family Tree</b><br/>A good way to start a new family tree is to enter all the members of the family into the database using the Person View (use &quot;Edit &gt; Add...&quot; or click on the Add a new person button from the People View). Then go to the Relationship View and create relationships between people.</tip>
-
-<tip number="19"><b>What's That For?</b><br/>Unsure what a button does? Simply hold the mouse over a button and a tooltip will appear.</tip>
-
-<tip number="20"><b>Unsure of a Date?</b><br/>If you're unsure about the date an event occurred, Gramps allows you to enter a wide range of date formats based on a guess or an estimate. For instance, &quot;about 1908&quot; is a valid entry for a birth date in Gramps. Click the &quot;Invoke date editor&quot; button next to the date field. See the Gramps Manual to learn more.</tip>
-
-<tip number="21"><b>Duplicate Entries</b><br/>The tool &quot;Tools &gt; Family Tree Processing &gt; Find Possible Duplicate People...&quot; allows you to locate (and merge) entries of the same person entered more than once in the database.</tip>
-
-<tip number="22"><b>Merging Entries</b><br/>The function &quot;Edit &gt; Merge...&quot; allows you to combine separately listed people into one. Select the second entry by holding the Control key as you click. This is very useful for combining two databases with overlapping people, or combining erroneously entered differing names for one individual. Merging is available in all list views for all primary object types.</tip>
-
-<tip number="23"><b>Organising the Views</b><br/>Many of the views can present your data as either a hierarchical tree or as a simple list. Each view can also be configured to the way you like it. Have a look to the right of the top toolbar or under the &quot;View&quot; menu.</tip>
-
-<tip number="24"><b>Navigating Back and Forward</b><br/>Gramps maintains a list of previous active objects such as People and Events. You can move forward and backward through the list using &quot;Go &gt; Forward&quot; and &quot;Go &gt; Back&quot; or the arrow buttons.</tip>
-
-<tip number="25"><b>Keyboard Shortcuts</b><br/>Tired of having to take your hand off the keyboard to use the mouse? Many functions in Gramps have keyboard shortcuts. If one exists for a function it is displayed on the right side of the menu.</tip>
-
-<tip number="26"><b>Read the Manual</b><br/>Don't forget to read the Gramps manual, &quot;Help &gt; User Manual&quot;. The developers have worked hard to make most operations intuitive but the manual is full of information that will make your time spent on genealogy more productive.</tip>
-
-<tip number="27"><b>Adding Children</b><br/>To add children in Gramps there are two options. You can find one of their parents in the Families View and open the family. Then choose to create a new person or add an existing person. You can also add children (or siblings) from inside the Family Editor.</tip>
-
-<tip number="28"><b>Editing the Parent-Child Relationship</b><br/> You can edit the relationship of a child to its parents by double clicking the child in the Family Editor. Relationships can be any of Adopted, Birth, Foster, None, Sponsored, Stepchild and Unknown.</tip>
-
-<tip number="29"><b>Show All Checkbutton</b><br/>When adding an existing person as a spouse, the list of people shown is filtered to display only people who could realistically fit the role (based on dates in the database). In case Gramps is wrong in making this choice, you can override the filter by checking the Show All checkbutton.</tip>
-
-<tip number="31"><b>Improving Gramps</b><br/>Users are encouraged to request enhancements to Gramps. Requesting an enhancement can be done either through the gramps-users or gramps-devel mailing lists, or by going to https://gramps-project.org/bugs/ and creating a Feature Request. Filing a Feature Request is preferred but it can be good to discuss your ideas on the email lists.</tip>
-
-<tip number="32"><b>Gramps Mailing Lists</b><br/>Want answers to your questions about Gramps? Check out the gramps-users email list. Many helpful people are on the list, so you're likely to get an answer quickly. If you have questions related to the development of Gramps, try the gramps-devel list. You can see the lists by selecting &quot;Help &gt; Gramps Mailing Lists&quot;.</tip>
-
-<tip number="33"><b>Contributing to Gramps</b><br/>Want to help with Gramps but can't write programs? Not a problem! A project as large as Gramps requires people with a wide variety of skills. Contributions can be anything from writing documentation to testing development versions and helping with the web site. Start by subscribing to the Gramps developers mailing list, gramps-devel, and introducing yourself. Subscription information can be found at &quot;Help &gt; Gramps Mailing Lists&quot;.</tip>
-
-<tip number="34"><b>So What's in a Name?</b><br/>The name Gramps was suggested to the original developer, Don Allingham, by his father. It stands for <i>Genealogical Research and Analysis Management Program System</i>. It is a full-featured genealogy program letting you store, edit, and research genealogical data. The Gramps database back end is so robust that some users are managing genealogies containing hundreds of thousands of people.</tip>
-
-<tip number="36"><b>Bookmarking Individuals</b><br/>The Bookmarks menu is a convenient place to store the names of frequently used individuals. Selecting a bookmark will make that person the Active Person. To bookmark someone make them the Active Person then go to &quot;Bookmarks &gt; Add Bookmark&quot; or press Ctrl+D. You can also bookmark most of the other objects.</tip>
-
-<tip number="37"><b>Incorrect Dates</b><br/>Everyone occasionally enters dates with an invalid format. Incorrect date formats will show up in Gramps with a either a reddish background or a red dot on the right edge of the field. You can fix the date using the Date Selection dialog which can be opened by clicking on the date button. The format of the date is set under &quot;Edit &gt; Preferences &gt; Display&quot;.</tip>
-
-<tip number="38"><b>Listing Events</b><br/>Events are added using the editor opened with &quot;Person &gt; Edit Person &gt; Events&quot;. There is a long list of preset event types. You can add your own event types by typing in the text field, they will be added to the available events, but not translated.</tip>
-
-<tip number="39"><b>Managing Names</b><br/>It is easy to manage people with several names in Gramps. In the Person Editor select the Names tab. You can add names of different types and set the preferred name by dragging it to the Preferred Name section.</tip>
-
-<tip number="40"><b>Ancestor View</b><br/>The Ancestry View displays a traditional pedigree chart. Hold the mouse over an individual to see more information about them or right click on an individual to access other family members and settings. Play with the settings to see the different options.</tip>
-
-<tip number="41"><b>Managing Sources</b><br/>The Sources View shows a list of all sources in a single window. From here you can edit your sources, merge duplicates and see which individuals reference each source. You can use filters to group your sources.</tip>
-
-<tip number="42"><b>Managing Places</b><br/>The Places View shows a list of all places in the database. The list can be sorted by a number of different criteria, such as City, County or State.</tip>
-
-<tip number="43"><b>Media View</b><br/>The Media View shows a list of all media entered in the database. These can be graphic images, videos, sound clips, spreadsheets, documents, and more.</tip>
-
-<tip number="44"><b>Filters</b><br/>Filters allow you to limit the people seen in the People View. In addition to the many preset filters, Custom Filters can be created limited only by your imagination. Custom filters are created from &quot;Edit &gt; Person Filter Editor&quot;.</tip>
-
-<tip number="45"><b>The GEDCOM File Format</b><br/>Gramps allows you to import from, and export to, the GEDCOM format. There is extensive support for the industry standard GEDCOM version 5.5, so you can exchange Gramps information to and from users of most other genealogy programs. Filters exist that make importing and exporting GEDCOM files trivial.</tip>
-
-<tip number="46"><b>The Gramps XML Package</b><br/>You can export your Family Tree as a Gramps XML Package. This is a compressed file containing your family tree data and all the media files connected to the database (images for example). This file is completely portable so is useful for backups or sharing with other Gramps users. This format has the key advantage over GEDCOM that no information is ever lost when exporting and importing.</tip>
-
-<tip number="48"><b>Web Family Tree Format</b><br/>Gramps can export data to the Web Family Tree (WFT) format. This format allows a family tree to be displayed online using a single file, instead of many html files.</tip>
-
-<tip number="49"><b>Making a Genealogy Website</b><br/>You can easily export your family tree to a web page. Select the entire database, family lines or selected individuals to a collection of web pages ready for upload to the World Wide Web.</tip>
-
-<tip number="50"><b>Reporting Bugs in Gramps</b><br/>The best way to report a bug in Gramps is to use the Gramps bug tracking system at https://gramps-project.org/bugs/.</tip>
-
-<tip number="51"><b>The Gramps Homepage</b><br/>The Gramps homepage is at http://gramps-project.org/.</tip>
-
-<tip number="53"><b>Privacy in Gramps</b><br/>Gramps helps you to keep personal information secure by allowing you to mark information as private. Data marked as private can be excluded from reports and data exports. Look for the padlock which toggles records between private and public.</tip>
-
-<tip number="54"><b>Keeping Good Records</b><br/>Be accurate when recording genealogical information. Don't make assumptions while recording primary information; write it exactly as you see it. Use bracketed comments to indicate your additions, deletions or comments. Use of the Latin 'sic' is recommended to confirm the accurate transcription of what appears to be an error in a source.</tip>
-
-<tip number="57"><b>Extra Reports and Tools</b><br/>Extra reports and tools can be added to Gramps with the &quot;Addon&quot; system. See them under &quot;Help &gt; Extra Reports/Tools&quot;. This is the best way for advanced users to experiment and create new functionality.</tip>
-
-<tip number="58"><b>Book Reports</b><br/>The Book report under &quot;Reports &gt; Books...&quot; allows you to collect a variety of reports into a single document. This single report is easier to distribute than multiple reports, especially when printed.</tip>
-
-<tip number="59"><b>Gramps Announcements</b><br/>Interested in getting notified when a new version of Gramps is released? Join the Gramps-announce mailing list at &quot;Help &gt; Gramps Mailing Lists&quot;.</tip>
-
-<tip number="60"><b>Record Your Sources</b><br/>Information collected about your family is only as good as the source it came from. Take the time and trouble to record all the details of where the information came from. Whenever possible get a copy of original documents.</tip>
-
-<tip number="61"><b>Directing Your Research</b><br/>Go from what you know to what you do not. Always record everything that is known before making conjectures. Often the facts at hand suggest plenty of direction for more research. Don't waste time looking through thousands of records hoping for a trail when you have other unexplored leads.</tip>
-
-<tip number="62"><b>The 'How and Why' of Your Genealogy</b><br/> Genealogy isn't only about dates and names. It is about people. Be descriptive. Include why things happened, and how descendants might have been shaped by the events they went through. Narratives go a long way in making your family history come alive.</tip>
-
-<tip number="63"><b>Don't speak English?</b><br/>Volunteers have translated Gramps into more than 40 languages. If Gramps supports your language and it is not being displayed, set the default language in your operating system and restart Gramps.</tip>
-
-<tip number="64"><b>Gramps Translators</b><br/>Gramps has been designed so that new translations can easily be added with little development effort. If you are interested in participating please email gramps-devel@lists.sf.net.</tip>
-
-<tip number="66"><b>Hello, привет or 喂</b><br/>Whatever script you use Gramps offers full Unicode support. Characters for all languages are properly displayed.</tip>
-
-<tip number="67"><b>The Home Person</b><br/>Anyone can be chosen as the Home Person in Gramps. Use &quot;Edit &gt; Set Home Person&quot; in the Person View. The home person is the person who is selected when the database is opened or when the home button is pressed.</tip>
-
-<tip number="70"><b>The Gramps Code</b><br/>Gramps is written in a computer language called Python using the GTK and GNOME libraries for the graphical interface. Gramps is supported on any computer system where these programs have been ported. Gramps is known to be run on Linux, BSD, Solaris, Windows and Mac OS X.</tip>
-
-<tip number="71"><b>Open Source Software</b><br/>The Free/Libre and Open Source Software (FLOSS) development model means Gramps can be extended by any programmer since all of the source code is freely available under its license. So it's not just about free beer, it's also about freedom to study and change the tool. For more about Open Source software lookup the Free Software Foundation and the Open Source Initiative.</tip>
-
-<tip number="72"><b>The Gramps Software License</b><br/>You are free to use and share Gramps with others. Gramps is freely distributable under the GNU General Public License, see http://www.gnu.org/licenses/licenses.html#GPL to read about the rights and restrictions of this license.</tip>
-
-<tip number="73"><b>Gramps for Gnome or KDE?</b><br/>For Linux users Gramps works with whichever desktop environment you prefer. As long as the required GTK libraries are installed it will run fine.</tip>
-
-</tips>
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tips>
+
+<_tip number="1"><b>Working with Dates</b><br/>A range of dates can be given by using the format &quot;between January 4, 2000 and March 20, 2003&quot;. You can also indicate the level of confidence in a date and even choose between seven different calendars. Try the button next to the date field in the Events Editor.</_tip>
+
+<_tip number="2"><b>Editing Objects</b><br/>In most cases double clicking on a name, source, place or media entry will bring up a window to allow you to edit the object. Note that the result can be dependent on context. For example, in the Family View clicking on a parent or child will bring up the Relationship Editor.</_tip>
+
+<_tip number="3"><b>Adding Images</b><br/>An image can be added to any gallery or the Media View by dragging and dropping it from a file manager or a web browser. Actually you can add any type of file like this, useful for scans of documents and other digital sources.</_tip>
+
+<_tip number="4"><b>Ordering Children in a Family</b><br/>The birth order of children in a family can be set by using drag and drop. This order is preserved even when they do not have birth dates.</_tip>
+
+<_tip number="5"><b>Talk to Relatives Before It Is Too Late</b><br/>Your oldest relatives can be your most important source of information. They usually know things about the family that haven't been written down. They might tell you nuggets about people that may one day lead to a new avenue of research. At the very least, you will get to hear some great stories. Don't forget to record the conversations!</_tip>
+
+<_tip number="7"><b>Filtering People</b><br/>In the People View, you can 'filter' individuals based on many criteria. To define a new filter go to &quot;Edit &gt; Person Filter Editor&quot;. There you can name your filter and add and combine rules using the many preset rules. For example, you can define a filter to find all adopted people in the family tree. People without a birth date mentioned can also be filtered. To get the results save your filter and select it at the bottom of the Filter Sidebar, then click Apply. If the Filter Sidebar is not visible, select View &gt; Filter.</_tip>
+
+<_tip number="8"><b>Inverted Filtering</b><br/>Filters can easily be reversed by using the 'invert' option. For instance, by inverting the 'People with children' filter you can select all people without children.</_tip>
+
+<_tip number="9"><b>Locating People</b><br/>By default, each surname in the People View is listed only once. By clicking on the arrow to the left of a name, the list will expand to show all individuals with that last name. To locate any Family Name from a long list, select a Family Name (not a person) and start typing. The view will jump to the first Family Name matching the letters you enter.</_tip>
+
+<_tip number="10"><b>The Family View</b><br/>The Family View is used to display a typical family unit as two parents and their children.</_tip>
+
+<_tip number="11"><b>Changing the Active Person</b><br/>Changing the Active Person in views is easy. In the Relationship view just click on anyone. In the Ancestry View doubleclick on the person or right click to select any of their spouses, siblings, children or parents.</_tip>
+
+<_tip number="12"><b>Who Was Born When?</b><br/>Under &quot;Tools &gt; Analysis and exploration &gt; Compare Individual Events...&quot; you can compare the data of individuals in your database. This is useful, say, if you wish to list the birth dates of everyone in your database. You can use a custom filter to narrow the results.</_tip>
+
+<_tip number="13"><b>Gramps Tools</b><br/>Gramps comes with a rich set of tools. These allow you to undertake operations such as checking the database for errors and consistency. There are research and analysis tools such as event comparison, finding duplicate people, interactive descendant browser, and many others. All tools can be accessed through the &quot;Tools&quot; menu.</_tip>
+
+<_tip number="14"><b>Calculating Relationships</b><br/>To check if two people in the database are related (by blood, not marriage) try the tool under &quot;Tools &gt; Utilities &gt; Relationship Calculator...&quot;. The exact relationship as well as all common ancestors are reported.</_tip>
+
+<_tip number="15"><b>SoundEx can help with family research</b><br/>SoundEx solves a long standing problem in genealogy, how to handle spelling variations. The SoundEx Gramplet takes a surname and generates a simplified form that is equivalent for similar sounding names. Knowing the SoundEx Code for a surname is very helpful for researching Census Data files (microfiche) at a library or other research facility. To view the SoundEx codes for surnames in your database, add the SoundEx Gramplet.</_tip>
+
+<_tip number="16"><b>Setting Your Preferences</b><br/>&quot;Edit &gt; Preferences...&quot; lets you modify a number of settings, such as the path to your media files, and allows you to adjust many aspects of the Gramps presentation to your needs. Each separate view can also be configured under &quot;View &gt; Configure View...&quot;</_tip>
+
+<_tip number="17"><b>Gramps Reports</b><br/>Gramps offers a wide variety of reports. The Graphical Reports and Graphs can present complex relationships easily and the Text Reports are particularly useful if you want to send the results of your family tree to members of the family via email. If you're ready to make a website for your family tree then there's a report for that as well.</_tip>
+
+<_tip number="18"><b>Starting a New Family Tree</b><br/>A good way to start a new family tree is to enter all the members of the family into the database using the Person View (use &quot;Edit &gt; Add...&quot; or click on the Add a new person button from the People View). Then go to the Relationship View and create relationships between people.</_tip>
+
+<_tip number="19"><b>What's That For?</b><br/>Unsure what a button does? Simply hold the mouse over a button and a tooltip will appear.</_tip>
+
+<_tip number="20"><b>Unsure of a Date?</b><br/>If you're unsure about the date an event occurred, Gramps allows you to enter a wide range of date formats based on a guess or an estimate. For instance, &quot;about 1908&quot; is a valid entry for a birth date in Gramps. Click the Date button next to the date field and see the Gramps Manual to learn more.</_tip>
+
+<_tip number="21"><b>Duplicate Entries</b><br/>&quot;Tools &gt; Database Processing &gt; Find Possible Duplicate People...&quot; allows you to locate (and merge) entries of the same person entered more than once in the database.</_tip>
+
+<_tip number="22"><b>Merging Entries</b><br/>The function &quot;Edit &gt; Compare and Merge...&quot; allows you to combine separately listed people into one. Select the second entry by holding the Control key as you click. This is very useful for combining two databases with overlapping people, or combining erroneously entered differing names for one individual. This also works for the Places, Sources and Repositories views.</_tip>
+
+<_tip number="23"><b>Organising the Views</b><br/>Many of the views can present your data as either a hierarchical tree or as a simple list. Each view can also be configured to the way you like it. Have a look to the right of the top toolbar or under the &quot;View&quot; menu.</_tip>
+
+<_tip number="24"><b>Navigating Back and Forward</b><br/>Gramps maintains a list of previous active objects such as People and Events. You can move forward and backward through the list using &quot;Go &gt; Forward&quot; and &quot;Go &gt; Back&quot; or the arrow buttons.</_tip>
+
+<_tip number="25"><b>Keyboard Shortcuts</b><br/>Tired of having to take your hand off the keyboard to use the mouse? Many functions in Gramps have keyboard shortcuts. If one exists for a function it is displayed on the right side of the menu.</_tip>
+
+<_tip number="26"><b>Read the Manual</b><br/>Don't forget to read the Gramps manual, &quot;Help &gt; User Manual&quot;. The developers have worked hard to make most operations intuitive but the manual is full of information that will make your time spent on genealogy more productive.</_tip>
+
+<_tip number="27"><b>Adding Children</b><br/>To add children in Gramps there are two options. You can find one of their parents in the Families View and open the family. Then choose to create a new person or add an existing person. You can also add children (or siblings) from inside the Family Editor.</_tip>
+
+<_tip number="28"><b>Editing the Parent-Child Relationship</b><br/> You can edit the relationship of a child to its parents by double clicking the child in the Family Editor. Relationships can be any of Adopted, Birth, Foster, None, Sponsored, Stepchild and Unknown.</_tip>
+
+<_tip number="29"><b>Show All Checkbutton</b><br/>When adding an existing person as a spouse, the list of people shown is filtered to display only people who could realistically fit the role (based on dates in the database). In case Gramps is wrong in making this choice, you can override the filter by checking the Show All checkbutton.</_tip>
+
+<_tip number="31"><b>Improving Gramps</b><br/>Users are encouraged to request enhancements to Gramps. Requesting an enhancement can be done either through the gramps-users or gramps-devel mailing lists, or by going to http://bugs.gramps-project.org and creating a Feature Request. Filing a Feature Request is preferred but it can be good to discuss your ideas on the email lists.</_tip>
+
+<_tip number="32"><b>Gramps Mailing Lists</b><br/>Want answers to your questions about Gramps? Check out the gramps-users email list. Many helpful people are on the list, so you're likely to get an answer quickly. If you have questions related to the development of Gramps, try the gramps-devel list. You can see the lists by selecting &quot;Help &gt; Gramps Mailing Lists&quot;.</_tip>
+
+<_tip number="33"><b>Contributing to Gramps</b><br/>Want to help with Gramps but can't write programs? Not a problem! A project as large as Gramps requires people with a wide variety of skills. Contributions can be anything from writing documentation to testing development versions and helping with the web site. Start by subscribing to the Gramps developers mailing list, gramps-devel, and introducing yourself. Subscription information can be found at &quot;Help &gt; Gramps Mailing Lists&quot;</_tip>
+
+<_tip number="34"><b>So What's in a Name?</b><br/>The name Gramps was suggested to the original developer, Don Allingham, by his father. It stands for <i>Genealogical Research and Analysis Management Program System</i>. It is a full-featured genealogy program letting you store, edit, and research genealogical data. The Gramps database back end is so robust that some users are managing genealogies containing hundreds of thousands of people.</_tip>
+
+<_tip number="36"><b>Bookmarking Individuals</b><br/>The Bookmarks menu is a convenient place to store the names of frequently used individuals. Selecting a bookmark will make that person the Active Person. To bookmark someone make them the Active Person then go to &quot;Bookmarks &gt; Add Bookmark&quot; or press Ctrl+D. You can also bookmark most of the other objects.</_tip>
+
+<_tip number="37"><b>Incorrect Dates</b><br/>Everyone occasionally enters dates with an invalid format. Incorrect date formats will show up in Gramps with a either a reddish background or a red dot on the right edge of the field. You can fix the date using the Date Selection dialog which can be opened by clicking on the date button. The format of the date is set under &quot;Edit &gt; Preferences &gt; Display&quot;.</_tip>
+
+<_tip number="38"><b>Listing Events</b><br/>Events are added using the editor opened with &quot;Person &gt; Edit Person &gt; Events&quot;. There is a long list of preset event types. You can add your own event types by typing in the text field, they will be added to the available events, but not translated.</_tip>
+
+<_tip number="39"><b>Managing Names</b><br/>It is easy to manage people with several names in Gramps. In the Person Editor select the Names tab. You can add names of different types and set the preferred name by dragging it to the Preferred Name section.</_tip>
+
+<_tip number="40"><b>Ancestor View</b><br/>The Ancestry View displays a traditional pedigree chart. Hold the mouse over an individual to see more information about them or right click on an individual to access other family members and settings. Play with the settings to see the different options.</_tip>
+
+<_tip number="41"><b>Managing Sources</b><br/>The Sources View shows a list of all sources in a single window. From here you can edit your sources, merge duplicates and see which individuals reference each source. You can use filters to group your sources.</_tip>
+
+<_tip number="42"><b>Managing Places</b><br/>The Places View shows a list of all places in the database. The list can be sorted by a number of different criteria, such as City, County or State.</_tip>
+
+<_tip number="43"><b>Media View</b><br/>The Media View shows a list of all media entered in the database. These can be graphic images, videos, sound clips, spreadsheets, documents, and more.</_tip>
+
+<_tip number="44"><b>Filters</b><br/>Filters allow you to limit the people seen in the People View. In addition to the many preset filters, Custom Filters can be created limited only by your imagination. Custom filters are created from &quot;Edit &gt; Person Filter Editor&quot;.</_tip>
+
+<_tip number="45"><b>The GEDCOM File Format</b><br/>Gramps allows you to import from, and export to, the GEDCOM format. There is extensive support for the industry standard GEDCOM version 5.5, so you can exchange Gramps information to and from users of most other genealogy programs. Filters exist that make importing and exporting GEDCOM files trivial.</_tip>
+
+<_tip number="46"><b>The Gramps XML Package</b><br/>You can export your Family Tree as a Gramps XML Package. This is a compressed file containing your family tree data and all the media files connected to the database (images for example). This file is completely portable so is useful for backups or sharing with other Gramps users. This format has the key advantage over GEDCOM that no information is ever lost when exporting and importing.</_tip>
+
+<_tip number="48"><b>Web Family Tree Format</b><br/>Gramps can export data to the Web Family Tree (WFT) format. This format allows a family tree to be displayed online using a single file, instead of many html files.</_tip>
+
+<_tip number="49"><b>Making a Genealogy Website</b><br/>You can easily export your family tree to a web page. Select the entire database, family lines or selected individuals to a collection of web pages ready for upload to the World Wide Web.</_tip>
+
+<_tip number="50"><b>Reporting Bugs in Gramps</b><br/>The best way to report a bug in Gramps is to use the Gramps bug tracking system at http://bugs.gramps-project.org</_tip>
+
+<_tip number="51"><b>The Gramps Homepage</b><br/>The Gramps homepage is at http://gramps-project.org/</_tip>
+
+<_tip number="53"><b>Privacy in Gramps</b><br/>Gramps helps you to keep personal information secure by allowing you to mark information as private. Data marked as private can be excluded from reports and data exports. Look for the padlock which toggles records between private and public.</_tip>
+
+<_tip number="54"><b>Keeping Good Records</b><br/>Be accurate when recording genealogical information. Don't make assumptions while recording primary information; write it exactly as you see it. Use bracketed comments to indicate your additions, deletions or comments. Use of the Latin 'sic' is recommended to confirm the accurate transcription of what appears to be an error in a source.</_tip>
+
+<_tip number="57"><b>Extra Reports and Tools</b><br/>Extra tools and reports can be added to Gramps with the &quot;Addon&quot; system. See them under &quot;Help &gt; Extra Reports/Tools&quot;. This is the best way for advanced users to experiment and create new functionality.</_tip>
+
+<_tip number="58"><b>Book Reports</b><br/>The Book report under &quot;Reports &gt; Books &gt; Book Report...&quot;, allows you to collect a variety of reports into a single document. This single report is easier to distribute than multiple reports, especially when printed.</_tip>
+
+<_tip number="59"><b>Gramps Announcements</b><br/>Interested in getting notified when a new version of Gramps is released? Join the Gramps-announce mailing list at &quot;Help &gt; Gramps Mailing Lists&quot;</_tip>
+
+<_tip number="60"><b>Record Your Sources</b><br/>Information collected about your family is only as good as the source it came from. Take the time and trouble to record all the details of where the information came from. Whenever possible get a copy of original documents.</_tip>
+
+<_tip number="61"><b>Directing Your Research</b><br/>Go from what you know to what you do not. Always record everything that is known before making conjectures. Often the facts at hand suggest plenty of direction for more research. Don't waste time looking through thousands of records hoping for a trail when you have other unexplored leads.</_tip>
+
+<_tip number="62"><b>The 'How and Why' of Your Genealogy</b><br/> Genealogy isn't only about dates and names. It is about people. Be descriptive. Include why things happened, and how descendants might have been shaped by the events they went through. Narratives go a long way in making your family history come alive.</_tip>
+
+<_tip number="63"><b>Don't speak English?</b><br/>Volunteers have translated Gramps into more than 40 languages. If Gramps supports your language and it is not being displayed, set the default language in your operating system and restart Gramps.</_tip>
+
+<_tip number="64"><b>Gramps Translators</b><br/>Gramps has been designed so that new translations can easily be added with little development effort. If you are interested in participating please email gramps-devel@lists.sf.net</_tip>
+
+<_tip number="66"><b>Hello, привет or 喂</b><br/>Whatever script you use Gramps offers full Unicode support. Characters for all languages are properly displayed.</_tip>
+
+<_tip number="67"><b>The Home Person</b><br/>Anyone can be chosen as the Home Person in Gramps. Use &quot;Edit &gt; Set Home Person&quot; in the Person View. The home person is the person who is selected when the database is opened or when the home button is pressed.</_tip>
+
+<_tip number="70"><b>The Gramps Code</b><br/>Gramps is written in a computer language called Python using the GTK and GNOME libraries for the graphical interface. Gramps is supported on any computer system where these programs have been ported. Gramps is known to be run on Linux, BSD, Solaris, Windows and Mac OS X.</_tip>
+
+<_tip number="71"><b>Open Source Software</b><br/>The Free/Libre and Open Source Software (FLOSS) development model means Gramps can be extended by any programmer since all of the source code is freely available under its license. So it's not just about free beer, it's also about freedom to study and change the tool. For more about Open Source software lookup the Free Software Foundation and the Open Source Initiative.</_tip>
+
+<_tip number="72"><b>The Gramps Software License</b><br/>You are free to use and share Gramps with others. Gramps is freely distributable under the GNU General Public License, see http://www.gnu.org/licenses/licenses.html#GPL to read about the rights and restrictions of this license.</_tip>
+
+<_tip number="73"><b>Gramps for Gnome or KDE?</b><br/>For Linux users Gramps works with whichever desktop environment you prefer. As long as the required GTK libraries are installed it will run fine.</_tip>
+
+</tips>
@@ -1,64 +1,3 @@
-gramps (5.1.5-1) unstable; urgency=medium
-
-  * New release
-  * Update copyright file
-  * Drop patch, incorporated upstream
-
- -- Ross Gammon <rossgammon@debian.org>  Sat, 12 Feb 2022 17:01:21 +0100
-
-gramps (5.1.4-1) unstable; urgency=medium
-
-  * New release
-  * Add new copyrights
-  * Update watch file
-  * Patch probably alive test to fix FTBFS
-
- -- Ross Gammon <rossgammon@debian.org>  Sun, 15 Aug 2021 18:31:56 +0200
-
-gramps (5.1.3-1) focal; urgency=medium
-
-  * New release
-  * Update debian/copyright for Alex Roitman
-
- -- Ross Gammon <rosco2@ubuntu.com>  Sun, 16 Aug 2020 20:23:34 +0200
-
-gramps (5.1.2-1) unstable; urgency=medium
-
-  * New release
-
- -- Ross Gammon <rossgammon@debian.org>  Sat, 11 Jan 2020 19:07:08 +0100
-
-gramps (5.1.1-1) unstable; urgency=medium
-
-  * New release
-  * Add python3-fontconfig to recommends
-
- -- Ross Gammon <rossgammon@debian.org>  Tue, 17 Sep 2019 15:21:43 +0200
-
-gramps (5.1.0-1) unstable; urgency=medium
-
-  * New release
-  * Update copyrights
-  * Bump gtk+ version to 3.12
-  * Add new geocode-glib dependency
-
- -- Ross Gammon <rossgammon@debian.org>  Sat, 24 Aug 2019 19:49:27 +0200
-
-gramps (5.0.2-1) unstable; urgency=medium
-
-  * New release
-  * Remove ancient python version field from debian/control
-  * Bump standards version, no changes required
-
- -- Ross Gammon <rossgammon@debian.org>  Sun, 11 Aug 2019 14:11:35 +0200
-
-gramps (5.0.1-1) unstable; urgency=medium
-
-  * New release
-  * Update copyright file
-
- -- Ross Gammon <rossgammon@debian.org>  Thu, 20 Dec 2018 20:41:23 +0100
-
 gramps (5.0.0-1) unstable; urgency=medium

  * New Gramps release
@@ -10,7 +10,7 @@ Build-Depends-Indep:
 python3-all,
 python3-setuptools,
 python3-nose,
- gir1.2-gtk-3.0 (>= 3.12.0),
+ gir1.2-gtk-3.0 (>= 3.10.0),
 python3-gi (>= 3.12.0),
 python3-gi-cairo,
 python3-bsddb3,
@@ -21,10 +21,11 @@ Build-Depends-Indep:
 python3-nose-exclude
 Build-Depends:
 debhelper (>= 11)
-Standards-Version: 4.4.0
+Standards-Version: 4.1.3
 Vcs-Git: https://github.com/gramps-project/gramps.git
 Vcs-browser: https://github.com/gramps-project/gramps/tree/maintenance/gramps50
 Homepage: https://www.gramps-project.org/
+X-Python3-Version: >= 3.2

 Package: gramps
 Architecture: all
@@ -34,15 +35,14 @@ Depends:
 python3-gi (>= 3.12.0),
 python3-gi-cairo,
 python3-bsddb3,
+ xdg-utils,
 ${misc:Depends},
 ${python3:Depends}
 Recommends:
 graphviz,
 gir1.2-gexiv2-0.10,
 gir1.2-osmgpsmap-1.0,
- python3-icu,
- gir1.2-geocodeglib-1.0,
- python3-fontconfig
+ python3-icu
 Suggests:
 fonts-freefont-ttf,
 gir1.2-goocanvas-2.0,
@@ -12,12 +12,12 @@ Copyright: 2000-2007, Alex Roitman
           2001-2017, Free Software Foundation, Inc.
           2001, Graham J. Williams
           2001, Jesper Zedlitz
-           2001-2019, The Gramps Project
+           2001-2018, The Gramps Project
           2002, Gary Shao
           2003-2006, Josiah Carlson
           2004-2006, Eero Tamminen
           2004-2013, Julio SÃ¡nchez
-           2005-2019, Serge Noiraud
+           2005-2017, Serge Noiraud
           2006-2012, Brian G. Matherly
           2006, 2008-2011, Kees Bakker           
           2006-2008, Steve Hall
@@ -46,7 +46,7 @@ Copyright: 2000-2007, Alex Roitman
           2009, Florian Heinle
           2009, Gerald W. Britton
           2009, Igal Shapira
-           2009-2022, Nick Hall
+           2009-2018, Nick Hall
           2009, Pander Musubi
           2009, Robert Ham
           2009, Swoon on bug tracker
@@ -64,7 +64,7 @@ Copyright: 2000-2007, Alex Roitman
           2011, Helge Herz
           2011, 2013 John Ralls
           2011, 2016 Matt Keenan
-           2011-2018, Paul Franklin
+           2011-2017, Paul Franklin
           2012, lcc
           2012, 2014, Mathieu MD
           2012, Nicolas Adenis-Lamarre
@@ -81,19 +81,11 @@ Copyright: 2000-2007, Alex Roitman
           2015, Detlef Wolz
           2016, Allen Crider
           2016, DaAwesomeP
-           2016-2018, Paul Culley
+           2016-2017, Paul Culley
           2016, QuLogic
           2016, Tom Samstag
-           2017, Jonathan Biegert
           2017, Mindaugas Baranauskas
           2017, Robert Carnell
-           2018, Christophe aka khrys63
-           2018, Paul D.Smith
-           2018, Robin van der Vliet
-           2018, Theo van Rijn
-           2019, Matthias Kemmer
-           2020, Jan Sparreboom
-           2021, Mirko Leonhaeuser
 License: GPL-2+

 Files: debian/*
@@ -1,6 +1,8 @@
-version=4
+version=3
+
 opts=\
-filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/gramps-project-$1\.tar\.gz/,\
+dversionmangle=s/(\~|\+)(debian|dfsg|ds|deb)(\.\d+)?$//,\
+filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/$1\.tar\.gz/,\
 repacksuffix=~dfsg \
 https://github.com/gramps-project/gramps/tags \
-.*/v?(\d\S+)\.tar\.gz
+.*/archive/v?([\d\.]+).tar.gz
@@ -20,54 +20,54 @@ import shlex
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-# sys.path.insert(0, os.path.abspath('.'))
+#sys.path.insert(0, os.path.abspath('.'))

-# documentation in root/docs, allow import from root
+#documentation in root/docs, allow import from root
 sys.path.append(os.path.abspath(os.pardir))

 # -- General configuration ------------------------------------------------

 # If your documentation needs a minimal Sphinx version, state it here.
-# needs_sphinx = '1.0'
+#needs_sphinx = '1.0'

 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    "sphinx.ext.autodoc",
-    "sphinx.ext.doctest",
-    "sphinx.ext.todo",
-    "sphinx.ext.coverage",
-    "sphinx.ext.viewcode",
+    'sphinx.ext.autodoc',
+    'sphinx.ext.doctest',
+    'sphinx.ext.todo',
+    'sphinx.ext.coverage',
+    'sphinx.ext.viewcode',
 ]

 # Add any paths that contain templates here, relative to this directory.
-templates_path = ["_templates"]
+templates_path = ['_templates']

 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
 # source_suffix = ['.rst', '.md']
-source_suffix = ".rst"
+source_suffix = '.rst'

 # The encoding of source files.
-# source_encoding = 'utf-8-sig'
+#source_encoding = 'utf-8-sig'

 # The master toctree document.
-master_doc = "index"
+master_doc = 'index'

 # General information about the project.
-project = "Gramps"
-copyright = "2001-2023, The Gramps Project"
-author = "Donald N. Allingham"
+project = 'Gramps'
+copyright = '2001-2018, The Gramps Project'
+author = 'Donald N. Allingham'

 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = "5.2"
+version = '5.0.0'
 # The full version, including alpha/beta/rc tags.
-release = "5.2.0-beta1"
+release = '5.0.0-master'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -78,37 +78,37 @@ language = None

 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
-# today = ''
+#today = ''
 # Else, today_fmt is used as the format for a strftime call.
-# today_fmt = '%B %d, %Y'
+#today_fmt = '%B %d, %Y'

 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ["_build"]
+exclude_patterns = ['_build']

 # The reST default role (used for this markup: `text`) to use for all
 # documents.
-# default_role = None
+#default_role = None

 # If true, '()' will be appended to :func: etc. cross-reference text.
-# add_function_parentheses = True
+#add_function_parentheses = True

 # If true, the current module name will be prepended to all description
 # unit titles (such as .. function::).
-# add_module_names = True
+#add_module_names = True

 # If true, sectionauthor and moduleauthor directives will be shown in the
 # output. They are ignored by default.
-# show_authors = False
+#show_authors = False

 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = "sphinx"
+pygments_style = 'sphinx'

 # A list of ignored prefixes for module index sorting.
-# modindex_common_prefix = []
+#modindex_common_prefix = []

 # If true, keep warnings as "system message" paragraphs in the built documents.
-# keep_warnings = False
+#keep_warnings = False

 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = True
@@ -118,156 +118,157 @@ todo_include_todos = True

 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes. default: alabaster
-html_theme = "classic"
+html_theme = 'classic'

 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-# html_theme_options = {}
+#html_theme_options = {}

 # Add any paths that contain custom themes here, relative to this directory.
-# html_theme_path = []
+#html_theme_path = []

 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-# html_title = None
+#html_title = None

 # A shorter title for the navigation bar.  Default is the same as html_title.
-# html_short_title = None
+#html_short_title = None

 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-# html_logo = None
+#html_logo = None

 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-# html_favicon = None
+#html_favicon = None

 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-# html_static_path = ['_static']
+#html_static_path = ['_static']
 html_static_path = []

 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
 # directly to the root of the documentation.
-# html_extra_path = []
+#html_extra_path = []

 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-# html_last_updated_fmt = '%b %d, %Y'
+#html_last_updated_fmt = '%b %d, %Y'

 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-# html_use_smartypants = True
+#html_use_smartypants = True

 # Custom sidebar templates, maps document names to template names.
-# html_sidebars = {}
+#html_sidebars = {}

 # Additional templates that should be rendered to pages, maps page names to
 # template names.
-# html_additional_pages = {}
+#html_additional_pages = {}

 # If false, no module index is generated.
-# html_domain_indices = True
+#html_domain_indices = True

 # If false, no index is generated.
-# html_use_index = True
+#html_use_index = True

 # If true, the index is split into individual pages for each letter.
-# html_split_index = False
+#html_split_index = False

 # If true, links to the reST sources are added to the pages.
-# html_show_sourcelink = True
+#html_show_sourcelink = True

 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-# html_show_sphinx = True
+#html_show_sphinx = True

 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-# html_show_copyright = True
+#html_show_copyright = True

 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
-# html_use_opensearch = ''
+#html_use_opensearch = ''

 # This is the file name suffix for HTML files (e.g. ".xhtml").
-# html_file_suffix = None
+#html_file_suffix = None

 # Language to be used for generating the HTML full-text search index.
 # Sphinx supports the following languages:
 #   'da', 'de', 'en', 'es', 'fi', 'fr', 'h', 'it', 'ja'
 #   'nl', 'no', 'pt', 'ro', 'r', 'sv', 'tr'
-# html_search_language = 'en'
+#html_search_language = 'en'

 # A dictionary with options for the search language support, empty by default.
 # Now only 'ja' uses this config value
-# html_search_options = {'type': 'default'}
+#html_search_options = {'type': 'default'}

 # The name of a javascript file (relative to the configuration directory) that
 # implements a search results scorer. If empty, the default will be used.
-# html_search_scorer = 'scorer.js'
+#html_search_scorer = 'scorer.js'

 # Output file base name for HTML help builder.
-htmlhelp_basename = "Grampsdoc"
+htmlhelp_basename = 'Grampsdoc'

 # -- Options for LaTeX output ---------------------------------------------

 latex_elements = {
-    # The paper size ('letterpaper' or 'a4paper').
-    #'papersize': 'letterpaper',
-    # The font size ('10pt', '11pt' or '12pt').
-    #'pointsize': '10pt',
-    # Additional stuff for the LaTeX preamble.
-    #'preamble': '',
-    # Latex figure (float) alignment
-    #'figure_align': 'htbp',
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
+
+# Latex figure (float) alignment
+#'figure_align': 'htbp',
 }

 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (
-        "master_doc",
-        "Gramps.tex",
-        "Gramps Documentation",
-        "The Gramps Project",
-        "manual",
-    ),
+  ('master_doc', 'Gramps.tex', 'Gramps Documentation',
+   'The Gramps Project', 'manual'),
 ]

 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-# latex_logo = None
+#latex_logo = None

 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.
-# latex_use_parts = False
+#latex_use_parts = False

 # If true, show page references after internal links.
-# latex_show_pagerefs = False
+#latex_show_pagerefs = False

 # If true, show URL addresses after external links.
-# latex_show_urls = False
+#latex_show_urls = False

 # Documents to append as an appendix to all manuals.
-# latex_appendices = []
+#latex_appendices = []

 # If false, no module index is generated.
-# latex_domain_indices = True
+#latex_domain_indices = True


 # -- Options for manual page output ---------------------------------------

 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [(master_doc, "gramps", "Gramps Documentation", [author], 1)]
+man_pages = [
+    (master_doc, 'gramps', 'Gramps Documentation',
+     [author], 1)
+]

 # If true, show URL addresses after external links.
-# man_show_urls = False
+#man_show_urls = False


 # -- Options for Texinfo output -------------------------------------------
@@ -276,25 +277,19 @@ man_pages = [(master_doc, "gramps", "Gramps Documentation", [author], 1)]
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (
-        master_doc,
-        "Gramps",
-        "Gramps Documentation",
-        author,
-        "Gramps",
-        "One line description of project.",
-        "Miscellaneous",
-    ),
+  (master_doc, 'Gramps', 'Gramps Documentation',
+   author, 'Gramps', 'One line description of project.',
+   'Miscellaneous'),
 ]

 # Documents to append as an appendix to all manuals.
-# texinfo_appendices = []
+#texinfo_appendices = []

 # If false, no module index is generated.
-# texinfo_domain_indices = True
+#texinfo_domain_indices = True

 # How to display URL addresses: 'footnote', 'no', or 'inline'.
-# texinfo_show_urls = 'footnote'
+#texinfo_show_urls = 'footnote'

 # If true, do not generate a @detailmenu in the "Top" node's menu.
-# texinfo_no_detailmenu = False
+#texinfo_no_detailmenu = False
@@ -302,7 +302,7 @@ Styled Text Buffer
   :members:
   :undoc-members:
   :show-inheritance:
-.. autoclass:: GspellState
+.. autoclass:: GtkSpellState
   :members:
   :undoc-members:
   :show-inheritance:
@@ -37,19 +37,18 @@ import sys
 from argparse import ArgumentParser

 # You can set these variables from the command line.
-SPHINXBUILD = "sphinx-build"
+SPHINXBUILD   = 'sphinx-build'

-if sys.platform == "win32":
-    pythonCmd = os.path.join(sys.prefix, "bin", "python.exe")
-    sphinxCmd = os.path.join(sys.prefix, "bin", "sphinx-build.exe")
-elif sys.platform in ["linux", "linux2", "darwin", "cygwin"]:
-    pythonCmd = os.path.join(sys.prefix, "bin", "python")
+if sys.platform == 'win32':
+    pythonCmd = os.path.join(sys.prefix, 'bin', 'python.exe')
+    sphinxCmd = os.path.join(sys.prefix, 'bin', 'sphinx-build.exe')
+elif sys.platform in ['linux', 'linux2', 'darwin', 'cygwin']:
+    pythonCmd = os.path.join(sys.prefix, 'bin', 'python')
    sphinxCmd = SPHINXBUILD
 else:
-    print("Update Docs ERROR: unknown system, don't know sphinx, ... commands")
+    print ("Update Docs ERROR: unknown system, don't know sphinx, ... commands")
    sys.exit(0)

-
 def tests():
    """
    Testing installed programs.
@@ -58,16 +57,15 @@ def tests():
    """
    try:
        print("\n=================='python'=============================\n")
-        os.system("""%(program)s -V""" % {"program": pythonCmd})
+        os.system('''%(program)s -V''' % {'program': pythonCmd})
    except:
-        print("Please, install python")
+        print ('Please, install python')

    try:
        print("\n=================='sphinx-build'=============================\n")
-        os.system("""%(program)s""" % {"program": sphinxCmd})
+        os.system('''%(program)s''' % {'program': sphinxCmd})
    except:
-        print("Please, install sphinx")
-
+        print ('Please, install sphinx')

 def main():
    """
@@ -76,26 +74,17 @@ def main():
    """

    parser = ArgumentParser(
-        description="This program aims to handle manual" " and translated version.",
-    )
+                         description='This program aims to handle manual'
+                                      ' and translated version.',
+                         )

-    parser.add_argument(
-        "-t",
-        "--test",
-        action="store_true",
-        dest="test",
-        default=True,
-        help="test if 'python' and 'sphinx' are properly installed",
-    )
+    parser.add_argument("-t", "--test",
+            action="store_true", dest="test",  default=True,
+            help="test if 'python' and 'sphinx' are properly installed")

-    parser.add_argument(
-        "-b",
-        "--build",
-        action="store_true",
-        dest="build",
-        default=True,
-        help="build documentation",
-    )
+    parser.add_argument("-b", "--build",
+            action="store_true", dest="build",  default=True,
+            help="build documentation")

    args = parser.parse_args()

@@ -105,7 +94,6 @@ def main():
    if args.build:
        build()

-
 def build():
    """
    Build documentation.
@@ -113,11 +101,10 @@ def build():

    # testing stage

-    os.system("""%(program)s -b html . _build/html""" % {"program": sphinxCmd})
-    # os.system('''%(program)s -b changes . _build/changes''' % {'program': sphinxCmd})
-    # os.system('''%(program)s -b linkcheck . _build/linkcheck''' % {'program': sphinxCmd})
-    # os.system('''%(program)s -b devhelp . _build/devhelp''' % {'program': sphinxCmd})
-
+    os.system('''%(program)s -b html . _build/html''' % {'program': sphinxCmd})
+    #os.system('''%(program)s -b changes . _build/changes''' % {'program': sphinxCmd})
+    #os.system('''%(program)s -b linkcheck . _build/linkcheck''' % {'program': sphinxCmd})
+    #os.system('''%(program)s -b devhelp . _build/devhelp''' % {'program': sphinxCmd})

 if __name__ == "__main__":
    main()
--- a/Show More
+++ b/Show More