diff -Naur original/contrib/LDS/gedcom-5-5-1.xml GenJ/contrib/LDS/gedcom-5-5-1.xml
--- original/contrib/LDS/gedcom-5-5-1.xml	2008-06-21 05:25:52.000000000 +0100
+++ GenJ/contrib/LDS/gedcom-5-5-1.xml	2008-07-15 12:29:48.000000000 +0100
@@ -13,125 +13,125 @@
  *************************************
  ************ Individuals ************
  *************************************
- <INDI type="Indi" img="Indi.gif" img.male="IndiMale.gif" img.female="IndiFemale.gif">
+ <INDI type="Indi" img="Indi.png" img.male="IndiMale.png" img.female="IndiFemale.png">
   +++++++++++++ Name and Sex +++++++++++++
-  <NAME default="1" type="PropertyName" img="Name.gif">
-   <NPFX type="PropertySimpleValue" img="Name.gif"/>
-   <GIVN type="PropertySimpleValue" img="Name.gif"/>
-   <NICK type="PropertySimpleValue" img="Name.gif"/>
-   <SPFX type="PropertySimpleValue" img="Name.gif"/>
-   <SURN type="PropertySimpleValue" img="Name.gif"/>
-   <NSFX type="PropertySimpleValue" img="Name.gif"/>
-   <SOUR type="PropertySource" img="Source.gif">
-    <PAGE xref="1" type="PropertySimpleValue" img="Attribute.gif" cardinality="0:1"/>
-    <EVEN xref="1" type="PropertyChoiceValue" img="Blob.gif" cardinality="0:1">
-     <ROLE type="PropertySimpleValue" img="Blob.gif"/>
+  <NAME default="1" type="PropertyName" img="Name.png">
+   <NPFX type="PropertySimpleValue" img="Name.png"/>
+   <GIVN type="PropertySimpleValue" img="Name.png"/>
+   <NICK type="PropertySimpleValue" img="Name.png"/>
+   <SPFX type="PropertySimpleValue" img="Name.png"/>
+   <SURN type="PropertySimpleValue" img="Name.png"/>
+   <NSFX type="PropertySimpleValue" img="Name.png"/>
+   <SOUR type="PropertySource" img="Source.png">
+    <PAGE xref="1" type="PropertySimpleValue" img="Attribute.png" cardinality="0:1"/>
+    <EVEN xref="1" type="PropertyChoiceValue" img="Blob.png" cardinality="0:1">
+     <ROLE type="PropertySimpleValue" img="Blob.png"/>
     </EVEN>
-    <DATA xref="1" type="PropertySimpleReadOnly" img="Blob.gif" cardinality="0:1">
-     <DATE type="PropertyDate" img="Date.gif"/>
-     <TEXT type="PropertyMultilineValue" img="Blob.gif"/>
+    <DATA xref="1" type="PropertySimpleReadOnly" img="Blob.png" cardinality="0:1">
+     <DATE type="PropertyDate" img="Date.png"/>
+     <TEXT type="PropertyMultilineValue" img="Blob.png"/>
     </DATA>
-    <QUAY xref="1" type="PropertySimpleValue" img="Blob.gif" cardinality="0:1"/>
-    <OBJE xref="1" type="PropertyMedia" img="Media.gif">
-     <TITL xref="0" type="PropertySimpleValue" img="Attribute.gif" cardinality="0:1"/>
-     <FILE default="1" xref="0" type="PropertyFile" img="Disk.gif" cardinality="0:M">
-       <FORM default="1" xref="0" type="PropertyChoiceValue" img="Format.gif" cardinality="1:1"/>
+    <QUAY xref="1" type="PropertySimpleValue" img="Blob.png" cardinality="0:1"/>
+    <OBJE xref="1" type="PropertyMedia" img="Media.png">
+     <TITL xref="0" type="PropertySimpleValue" img="Attribute.png" cardinality="0:1"/>
+     <FILE default="1" xref="0" type="PropertyFile" img="Disk.png" cardinality="0:M">
+       <FORM default="1" xref="0" type="PropertyChoiceValue" img="Format.png" cardinality="1:1"/>
      </FILE>
-     <NOTE default="1" xref="0" type="PropertyNote" img="Note.gif" cardinality="0:1"/>
+     <NOTE default="1" xref="0" type="PropertyNote" img="Note.png" cardinality="0:1"/>
     </OBJE>
-    <TEXT xref="0" type="PropertyMultilineValue" img="Note.gif" cardinality="0:1"/>
-    <NOTE type="PropertyNote" img="Note.gif"/>
+    <TEXT xref="0" type="PropertyMultilineValue" img="Note.png" cardinality="0:1"/>
+    <NOTE type="PropertyNote" img="Note.png"/>
    </SOUR>
-   <NOTE type="PropertyNote" img="Note.gif">
+   <NOTE type="PropertyNote" img="Note.png">
     <SOUR super="INDI:NAME:SOUR"/>
    </NOTE>
   </NAME>
-  <SEX default="1" cardinality="0:1" type="PropertySex" img="Sex.gif" img.male="Male.gif" img.female="Female.gif"/>
+  <SEX default="1" cardinality="0:1" type="PropertySex" img="Sex.png" img.male="Male.png" img.female="Female.png"/>
   +++++++++++++ Events +++++++++++++
-  <BIRT default="1" type="PropertyEvent" img="Birth.gif">
-   <TYPE type="PropertyChoiceValue" img="Type.gif"/>
-   <DATE default="1" cardinality="0:1" type="PropertyDate" img="Date.gif"/>
-   <PLAC default="1" cardinality="0:1" type="PropertyPlace" img="Place.gif">
-    <FORM type="PropertySimpleValue" img="Format.gif"/>
+  <BIRT default="1" type="PropertyEvent" img="Birth.png">
+   <TYPE type="PropertyChoiceValue" img="Type.png"/>
+   <DATE default="1" cardinality="0:1" type="PropertyDate" img="Date.png"/>
+   <PLAC default="1" cardinality="0:1" type="PropertyPlace" img="Place.png">
+    <FORM type="PropertySimpleValue" img="Format.png"/>
     <SOUR super="INDI:NAME:SOUR"/>
     <NOTE super="INDI:NAME:NOTE"/>
    </PLAC>
-   <ADDR type="PropertyMultilineValue" img="Addr.gif">
-    <ADR1 hide="1" type="PropertySimpleValue" img="Addr.gif"/>
-    <ADR2 hide="1" type="PropertySimpleValue" img="Addr.gif"/>
-    <CITY default="1" cardinality="0:1" type="PropertyChoiceValue" img="Place.gif"/>
-    <POST default="1" cardinality="0:1" type="PropertyChoiceValue" img="Code.gif"/>
-    <STAE default="1" cardinality="0:1" type="PropertyChoiceValue" img="Place.gif"/>
-    <CTRY default="1" cardinality="0:1" type="PropertyChoiceValue" img="Place.gif"/>
+   <ADDR type="PropertyMultilineValue" img="Addr.png">
+    <ADR1 hide="1" type="PropertySimpleValue" img="Addr.png"/>
+    <ADR2 hide="1" type="PropertySimpleValue" img="Addr.png"/>
+    <CITY default="1" cardinality="0:1" type="PropertyChoiceValue" img="Place.png"/>
+    <POST default="1" cardinality="0:1" type="PropertyChoiceValue" img="Code.png"/>
+    <STAE default="1" cardinality="0:1" type="PropertyChoiceValue" img="Place.png"/>
+    <CTRY default="1" cardinality="0:1" type="PropertyChoiceValue" img="Place.png"/>
    </ADDR>
-   <PHON type="PropertySimpleValue" img="Phone.gif"/>
-   <EMAIL cardinality="0:3" type="PropertySimpleValue" img="Web.gif"/>
-   <FAX cardinality="0:3" type="PropertySimpleValue" img="Phone.gif" />
-   <WWW cardinality="0:3" type="PropertySimpleValue" img="Web.gif"/>
-   <AGE type="PropertyAge" img="Time.gif" cardinality="0:1"/>
-   <AGNC type="PropertySimpleValue" img="Phone.gif"/>
-   <CAUS type="PropertyChoiceValue" img="Cause.gif"/>
+   <PHON type="PropertySimpleValue" img="Phone.png"/>
+   <EMAIL cardinality="0:3" type="PropertySimpleValue" img="Web.png"/>
+   <FAX cardinality="0:3" type="PropertySimpleValue" img="Phone.png" />
+   <WWW cardinality="0:3" type="PropertySimpleValue" img="Web.png"/>
+   <AGE type="PropertyAge" img="Time.png" cardinality="0:1"/>
+   <AGNC type="PropertySimpleValue" img="Phone.png"/>
+   <CAUS type="PropertyChoiceValue" img="Cause.png"/>
    <NOTE super="INDI:NAME:NOTE"/>
    <SOUR super="INDI:NAME:SOUR"/>
    <OBJE super="INDI:NAME:SOUR:OBJE"/>
-   <FAMC inherit="0" hide="1" type="PropertyFamilyChild" img="Fam.gif"/>
+   <FAMC inherit="0" hide="1" type="PropertyFamilyChild" img="Fam.png"/>
   </BIRT>
-  <ADOP cardinality="0:M" super="INDI:BIRT" img="Adoption.gif">
-   <FAMC inherit="0" hide="1" type="PropertyFamilyChild" img="Fam.gif">
-    <ADOP type="PropertyChoiceValue" img="Fam.gif"/>
+  <ADOP cardinality="0:M" super="INDI:BIRT" img="Adoption.png">
+   <FAMC inherit="0" hide="1" type="PropertyFamilyChild" img="Fam.png">
+    <ADOP type="PropertyChoiceValue" img="Fam.png"/>
    </FAMC>
   </ADOP>
-  <DEAT img="Death.gif" super="INDI:BIRT"/>
+  <DEAT img="Death.png" super="INDI:BIRT"/>
   +++++++++++++ Attributes are not events but have event_details +++++++++++++
-  <RESI cardinality="0:M" type="PropertySimpleReadOnly" img="Residency.gif" super="INDI:BIRT">
+  <RESI cardinality="0:M" type="PropertySimpleReadOnly" img="Residency.png" super="INDI:BIRT">
    <PLAC default="0"/>
    <ADDR default="1"/>
   </RESI>
-  <OCCU type="PropertyChoiceValue" img="Occupation.gif" super="INDI:BIRT" cardinality="0:M"/>
-  <RELI type="PropertyChoiceValue" img="Religion.gif" super="INDI:BIRT" >
+  <OCCU type="PropertyChoiceValue" img="Occupation.png" super="INDI:BIRT" cardinality="0:M"/>
+  <RELI type="PropertyChoiceValue" img="Religion.png" super="INDI:BIRT" >
    <DATE default="0"/>
    <PLAC default="0"/>
   </RELI>
-  <CAST type="PropertySimpleValue" img="Caste.gif" super="INDI:RELI" />
-  <DSCR type="PropertyChoiceValue" img="Description.gif" super="INDI:RELI" />
-  <EDUC type="PropertyChoiceValue" img="Education.gif" super="INDI:RELI"/>
-  <IDNO type="PropertySimpleValue" img="IDNumber.gif" super="INDI:RELI"/>
-  <NATI type="PropertyChoiceValue" img="Nationality.gif" super="INDI:RELI" />
-  <NCHI type="PropertySimpleValue" img="NumChildren.gif" super="INDI:RELI" />
-  <PROP type="PropertyChoiceValue" img="Property.gif" super="INDI:RELI" />
-  <SSN  type="PropertySimpleValue" img="SSN.gif" super="INDI:RELI" />
-  <TITL type="PropertyChoiceValue" img="Title.gif" super="INDI:RELI"/>
-  <NMR  type="PropertySimpleValue" img="Marriage.gif" super="INDI:RELI" />
+  <CAST type="PropertySimpleValue" img="Caste.png" super="INDI:RELI" />
+  <DSCR type="PropertyChoiceValue" img="Description.png" super="INDI:RELI" />
+  <EDUC type="PropertyChoiceValue" img="Education.png" super="INDI:RELI"/>
+  <IDNO type="PropertySimpleValue" img="IDNumber.png" super="INDI:RELI"/>
+  <NATI type="PropertyChoiceValue" img="Nationality.png" super="INDI:RELI" />
+  <NCHI type="PropertySimpleValue" img="NumChildren.png" super="INDI:RELI" />
+  <PROP type="PropertyChoiceValue" img="Property.png" super="INDI:RELI" />
+  <SSN  type="PropertySimpleValue" img="SSN.png" super="INDI:RELI" />
+  <TITL type="PropertyChoiceValue" img="Title.png" super="INDI:RELI"/>
+  <NMR  type="PropertySimpleValue" img="Marriage.png" super="INDI:RELI" />
   +++++++++++++ More Events +++++++++++++
-  <GRAD cardinality="0:M" img="Graduation.gif" super="INDI:BIRT"/>
-  <CHR  hide="1" img="Baptism.gif" super="INDI:GRAD">
-   <FAMC inherit="0" hide="1" type="PropertyFamilyChild" img="Fam.gif"/>
+  <GRAD cardinality="0:M" img="Graduation.png" super="INDI:BIRT"/>
+  <CHR  hide="1" img="Baptism.png" super="INDI:GRAD">
+   <FAMC inherit="0" hide="1" type="PropertyFamilyChild" img="Fam.png"/>
   </CHR>
-  <BURI img="Burial.gif" super="INDI:BIRT"/>
-  <CREM img="Cremation.gif" super="INDI:BIRT"/>
-  <BAPM img="Baptism.gif" super="INDI:BIRT"/>
-  <BARM img="Bar.gif" super="INDI:BIRT"/>
-  <BASM img="Bas.gif" super="INDI:BIRT"/>
-  <BLES img="Blessing.gif" super="INDI:BIRT"/>
-  <CHRA hide="1" img="AdultChristening.gif" super="INDI:BIRT"/>
-  <CONF super="INDI:BIRT"/>
-  <FCOM img="FirstCommunion.gif" super="INDI:BIRT"/>
-  <ORDN img="Ordination.gif" super="INDI:BIRT"/>
-  <NATU img="Naturalisation.gif" super="INDI:GRAD"/>
-  <EMIG img="Emmigration.gif" super="INDI:GRAD"/>
-  <IMMI img="Immigration.gif" super="INDI:GRAD"/>
-  <CENS img="Census.gif" super="INDI:GRAD"/>
-  <PROB img="Probate.gif" super="INDI:GRAD"/>
-  <WILL img="Will.gif" super="INDI:GRAD"/>
-  <RETI img="Retirement.gif" super="INDI:GRAD"/>
-  <EVEN img="Event.gif" super="INDI:GRAD">
+  <BURI img="Burial.png" super="INDI:BIRT"/>
+  <CREM img="Cremation.png" super="INDI:BIRT"/>
+  <BAPM img="Baptism.png" super="INDI:BIRT"/>
+  <BARM img="Bar.png" super="INDI:BIRT"/>
+  <BASM img="Bas.png" super="INDI:BIRT"/>
+  <BLES img="Blessing.png" super="INDI:BIRT"/>
+  <CHRA hide="1" img="AdultChristening.png" super="INDI:BIRT"/>
+  <CONF img="Confirmation.png" super="INDI:BIRT"/>
+  <FCOM img="FirstCommunion.png" super="INDI:BIRT"/>
+  <ORDN img="Ordination.png" super="INDI:BIRT"/>
+  <NATU img="Naturalisation.png" super="INDI:GRAD"/>
+  <EMIG img="Emmigration.png" super="INDI:GRAD"/>
+  <IMMI img="Immigration.png" super="INDI:GRAD"/>
+  <CENS img="Census.png" super="INDI:GRAD"/>
+  <PROB img="Probate.png" super="INDI:GRAD"/>
+  <WILL img="Will.png" super="INDI:GRAD"/>
+  <RETI img="Retirement.png" super="INDI:GRAD"/>
+  <EVEN img="Event.png" super="INDI:GRAD">
    <TYPE default="1"/>
   </EVEN>
   ++++++++++++++++ LDS ++++++++++++++++++
- <BAPL hide="1" img="Baptism.gif" type="PropertySimpleReadOnly">
-   <STAT type="PropertySimpleValue" img="Baptism.gif"/>
+ <BAPL hide="1" img="Baptism.png" type="PropertySimpleReadOnly">
+   <STAT type="PropertySimpleValue" img="Baptism.png"/>
    <DATE super="INDI:BIRT:DATE"/>
-   <TEMP type="PropertySimpleValue" img="Baptism.gif"/>
+   <TEMP type="PropertySimpleValue" img="Baptism.png"/>
    <PLAC super="INDI:BIRT:PLAC"/>
    <SOUR super="INDI:BIRT:SOUR"/>
    <NOTE super="INDI:BIRT:NOTE"/>
@@ -139,38 +139,38 @@
   <CONL super="INDI:BAPL"/>
   <ENDL super="INDI:BAPL"/>
   <SLGC super="INDI:BAPL">
-   <FAMC hide="1" type="PropertyFamilyChild" img="Fam.gif"/>
+   <FAMC hide="1" type="PropertyFamilyChild" img="Fam.png"/>
   </SLGC>
   +++++++++++++ Relationships +++++++++++++
   <NOTE super="INDI:NAME:NOTE"/>
-  <FAMC hide="1" type="PropertyFamilyChild" img="Fam.gif">
-   <PEDI type="PropertyChoiceValue" img="Type.gif"/>
+  <FAMC hide="1" type="PropertyFamilyChild" img="Fam.png">
+   <PEDI type="PropertyChoiceValue" img="Type.png"/>
    <NOTE super="INDI:NAME:NOTE"/>
   </FAMC>
-  <FAMS hide="1" type="PropertyFamilySpouse" img="Fam.gif">
+  <FAMS hide="1" type="PropertyFamilySpouse" img="Fam.png">
    <NOTE super="INDI:NAME:NOTE"/>
   </FAMS>
   <OBJE super="INDI:BIRT:OBJE"/>
-  <SUBM hide="1" type="PropertySubmitter" img="Submitter.gif"/>
+  <SUBM hide="1" type="PropertySubmitter" img="Submitter.png"/>
   <ANCI super="INDI:SUBM"/>
   <DESI super="INDI:SUBM"/>
   <SOUR super="INDI:NAME:SOUR"/>
-  <ASSO hide="1" type="PropertyAssociation" img="Association.gif">
-   <RELA default="1" cardinality="0:1" type="PropertyRelationship" img="Type.gif"/>
+  <ASSO hide="1" type="PropertyAssociation" img="Association.png">
+   <RELA default="1" cardinality="0:1" type="PropertyRelationship" img="Type.png"/>
    <SOUR super="INDI:SOUR"/>
    <NOTE super="INDI:NAME:NOTE"/>
   </ASSO>
-  <ALIA hide="1" type="PropertyAlias" img="Indi.gif"/>
+  <ALIA hide="1" type="PropertyAlias" img="Indi.png"/>
   +++++++++++++ numbers / processing +++++++++++++
-  <RFN type="PropertySimpleValue" img="Code.gif" cardinality="0:1"/>
-  <AFN type="PropertyNumericValue" img="Code.gif"/>
-  <REFN type="PropertySimpleValue" img="Code.gif">
-   <TYPE type="PropertySimpleValue" img="Type.gif"/>
+  <RFN type="PropertySimpleValue" img="Code.png" cardinality="0:1"/>
+  <AFN type="PropertyNumericValue" img="Code.png"/>
+  <REFN type="PropertySimpleValue" img="Code.png">
+   <TYPE type="PropertySimpleValue" img="Type.png"/>
   </REFN>
-  <RIN type="PropertySimpleValue" img="Blob.gif" cardinality="0:1"/>
-  <RESN type="PropertySimpleReadOnly" img="Description.gif" cardinality="0:1"/>
+  <RIN type="PropertySimpleValue" img="Blob.png" cardinality="0:1"/>
+  <RESN type="PropertySimpleReadOnly" img="Description.png" cardinality="0:1"/>
   +++++++++++++ change  - it swallows subs DATE|TIME - no need to declare in grammar +++++++++++++
-  <CHAN hide="1" type="PropertyChange" img="Time.gif">
+  <CHAN hide="1" type="PropertyChange" img="Time.png">
    <NOTE super="INDI:NAME:NOTE"/>
   </CHAN>
  </INDI>
@@ -178,32 +178,32 @@
  *************************************
  ************   Families  ************
  *************************************
- <FAM type="Fam" img="Fam.gif">
-  <HUSB hide="1" type="PropertyHusband" img="IndiMale.gif"/>
-  <WIFE hide="1" type="PropertyWife" img="IndiFemale.gif"/>
-  <NCHI img="NumChildren.gif" type="PropertySimpleValue"/>
-  <ENGA img="Engagement.gif"  super="INDI:BIRT">
-   <HUSB type="PropertySimpleReadOnly" img="IndiMale.gif" cardinality="0:1">
-    <AGE default="1" type="PropertyAge" img="Time.gif" cardinality="1:1"/>
+ <FAM type="Fam" img="Fam.png">
+  <HUSB hide="1" type="PropertyHusband" img="IndiMale.png"/>
+  <WIFE hide="1" type="PropertyWife" img="IndiFemale.png"/>
+  <NCHI img="NumChildren.png" type="PropertySimpleValue"/>
+  <ENGA img="Engagement.png"  super="INDI:BIRT">
+   <HUSB type="PropertySimpleReadOnly" img="IndiMale.png" cardinality="0:1">
+    <AGE default="1" type="PropertyAge" img="Time.png" cardinality="1:1"/>
    </HUSB>
-   <WIFE type="PropertySimpleReadOnly" img="IndiFemale.gif" cardinality="0:1">
-    <AGE default="1" type="PropertyAge" img="Time.gif" cardinality="1:1"/>
+   <WIFE type="PropertySimpleReadOnly" img="IndiFemale.png" cardinality="0:1">
+    <AGE default="1" type="PropertyAge" img="Time.png" cardinality="1:1"/>
    </WIFE>
   </ENGA>
-  <MARB img="MarriageBann.gif" super="FAM:ENGA"/>
-  <MARC img="MarriageContract.gif" super="FAM:ENGA"/>
-  <MARL img="MarriageLicence.gif" super="FAM:ENGA"/>
-  <MARR img="Marriage.gif" super="FAM:ENGA"/>
-  <ANUL img="Annulment.gif" super="FAM:ENGA"/>
-  <MARS img="MarriageSettlement.gif" super="FAM:ENGA"/>
-  <CHIL hide="1" type="PropertyChild" img="Child.gif" img.male="MaleChild.gif" img.female="FemaleChild.gif"/>
-  <DIVF img="DivorceFiled.gif" super="FAM:ENGA"/>
-  <DIV  img="Divorce.gif" super="FAM:ENGA"/>
-  <CENS img="Census.gif" super="FAM:ENGA"/>
-  <EVEN super="FAM:ENGA" cardinality="0:M">
+  <MARB img="MarriageBann.png" super="FAM:ENGA"/>
+  <MARC img="MarriageContract.png" super="FAM:ENGA"/>
+  <MARL img="MarriageLicence.png" super="FAM:ENGA"/>
+  <MARR img="Marriage.png" super="FAM:ENGA"/>
+  <ANUL img="Annulment.png" super="FAM:ENGA"/>
+  <MARS img="MarriageSettlement.png" super="FAM:ENGA"/>
+  <CHIL hide="1" type="PropertyChild" img="Child.png" img.male="MaleChild.png" img.female="FemaleChild.png"/>
+  <DIVF img="DivorceFiled.png" super="FAM:ENGA"/>
+  <DIV  img="Divorce.png" super="FAM:ENGA"/>
+  <CENS img="Census.png" super="FAM:ENGA"/>
+  <EVEN img="Event.png" super="FAM:ENGA" cardinality="0:M">
    <TYPE default="1" super="INDI:EVEN:TYPE"/>
   </EVEN>
-  <SLGS hide="1" img="Marriage.gif" super="INDI:BAPL"/>
+  <SLGS hide="1" img="Marriage.png" super="INDI:BAPL"/>
   <OBJE super="INDI:OBJE"/>
   <NOTE super="INDI:NOTE"/>
   <SUBM hide="1" super="INDI:SUBM"/>
@@ -216,9 +216,9 @@
  *************************************
  ************    Notes    ************
  *************************************
- <NOTE type="Note" img="Note.gif">
+ <NOTE type="Note" img="Note.png">
   +++++++++++++ we use inline NOTE to store the entity's content (GEDCOM anomalie) +++++++++++++
-  <NOTE hide="1" type="PropertyMultilineValue" img="Note.gif"/>
+  <NOTE hide="1" type="PropertyMultilineValue" img="Note.png"/>
   +++++++++++++ References +++++++++++++
   <SOUR super="INDI:SOUR"/>
   <REFN super="INDI:REFN"/>
@@ -230,10 +230,10 @@
  *************************************
  ************    Medias   ************
  *************************************
- <OBJE type="Media" img="Media.gif">
-  <FILE default="1" xref="0" type="PropertyFile" img="Disk.gif" cardinality="0:M">
-    <FORM default="1" type="PropertyChoiceValue" img="Format.gif" cardinality="1:1"/>
-    <TITL default="1" type="PropertySimpleValue" img="Attribute.gif" cardinality="0:1"/>
+ <OBJE type="Media" img="Media.png">
+  <FILE default="1" xref="0" type="PropertyFile" img="Disk.png" cardinality="0:M">
+    <FORM default="1" type="PropertyChoiceValue" img="Format.png" cardinality="1:1"/>
+    <TITL default="1" type="PropertySimpleValue" img="Attribute.png" cardinality="0:1"/>
   </FILE>
   +++++++++++++ References +++++++++++++
   <NOTE super="INDI:NOTE"/>
@@ -247,11 +247,11 @@
  *************************************
  ************ Repositories ***********
  *************************************
- <REPO type="Repository" img="Repository.gif">
-  <NAME default="1" type="PropertySimpleValue" img="Attribute.gif"/>
+ <REPO type="Repository" img="Repository.png">
+  <NAME default="1" type="PropertySimpleValue" img="Attribute.png"/>
   <ADDR default="1" super="INDI:BIRT:ADDR"/>
-  <PHON type="PropertySimpleValue" img="Phone.gif"/>
-  <NOTE type="PropertyMultilineValue" img="Note.gif"/>
+  <PHON type="PropertySimpleValue" img="Phone.png"/>
+  <NOTE type="PropertyMultilineValue" img="Note.png"/>
   +++++++++++++ References +++++++++++++
   <REFN super="INDI:REFN"/>
   <RIN super="INDI:RIN"/>
@@ -262,27 +262,27 @@
  *************************************
  ************   Sources   ************
  *************************************
- <SOUR type="Source" img="Source.gif">
-  <DATA type="PropertySimpleReadOnly" img="Attribute.gif">
-   <EVEN default="1" type="PropertyChoiceValue" img="Event.gif">
-    <DATE type="PropertySimpleValue" img="Date.gif"/>
+ <SOUR type="Source" img="Source.png">
+  <DATA type="PropertySimpleReadOnly" img="Attribute.png">
+   <EVEN default="1" type="PropertyChoiceValue" img="Event.png">
+    <DATE type="PropertySimpleValue" img="Date.png"/>
     <PLAC super="INDI:BIRT:PLAC"/>
    </EVEN>
-   <AGNC type="PropertySimpleValue" img="Attribute.gif"/>
+   <AGNC type="PropertySimpleValue" img="Attribute.png"/>
    <NOTE super="INDI:NOTE"/>
   </DATA>
-  <AUTH default="1" type="PropertyMultilineValue" img="Note.gif" cardinality="0:1"/>
-  <TITL default="1" type="PropertyMultilineValue" img="Attribute.gif" cardinality="0:1"/>
-  <ABBR type="PropertySimpleValue" img="Note.gif" cardinality="0:1"/>
-  <PUBL type="PropertyMultilineValue" img="Note.gif" cardinality="0:1"/>
-  <TEXT default="1" type="PropertyMultilineValue" img="Note.gif" cardinality="0:1"/>
+  <AUTH default="1" type="PropertyMultilineValue" img="Note.png" cardinality="0:1"/>
+  <TITL default="1" type="PropertyMultilineValue" img="Attribute.png" cardinality="0:1"/>
+  <ABBR type="PropertySimpleValue" img="Note.png" cardinality="0:1"/>
+  <PUBL type="PropertyMultilineValue" img="Note.png" cardinality="0:1"/>
+  <TEXT default="1" type="PropertyMultilineValue" img="Note.png" cardinality="0:1"/>
   +++++++++++++ References +++++++++++++
   <OBJE super="INDI:OBJE"/>
   <NOTE super="INDI:NOTE"/>
-  <REPO hide="1" type="PropertyRepository" img="Repository.gif">
-   <NOTE xref="1" type="PropertyNote" img="Note.gif"/>
-   <CALN xref="1" type="PropertySimpleValue" img="Attribute.gif">
-    <MEDI type="PropertyChoiceValue" img="Attribute.gif"/>
+  <REPO hide="1" type="PropertyRepository" img="Repository.png">
+   <NOTE xref="1" type="PropertyNote" img="Note.png"/>
+   <CALN xref="1" type="PropertySimpleValue" img="Attribute.png">
+    <MEDI type="PropertyChoiceValue" img="Attribute.png"/>
    </CALN>
   </REPO>
   <REFN super="INDI:REFN"/>
@@ -294,11 +294,11 @@
  *************************************
  ************  Submitters ************
  *************************************
- <SUBM type="Submitter" img="Submitter.gif">
-  <NAME default="1" type="PropertySimpleValue" img="Name.gif" cardinality="1:1"/>
+ <SUBM type="Submitter" img="Submitter.png">
+  <NAME default="1" type="PropertySimpleValue" img="Name.png" cardinality="1:1"/>
   <ADDR super="INDI:BIRT:ADDR"/>
-  <PHON type="PropertySimpleValue" img="Phone.gif"/>
-  <LANG type="PropertySimpleValue" img="Place.gif"/>
+  <PHON type="PropertySimpleValue" img="Phone.png"/>
+  <LANG type="PropertySimpleValue" img="Place.png"/>
   +++++++++++++ References +++++++++++++
   <OBJE super="INDI:OBJE"/>
   <RFN super="INDI:RFN"/>
diff -Naur original/contrib/LDS/gedcom-5-5.xml GenJ/contrib/LDS/gedcom-5-5.xml
--- original/contrib/LDS/gedcom-5-5.xml	2008-06-21 05:25:55.000000000 +0100
+++ GenJ/contrib/LDS/gedcom-5-5.xml	2008-07-15 12:30:17.000000000 +0100
@@ -13,122 +13,122 @@
  *************************************
  ************ Individuals ************
  *************************************
- <INDI type="Indi" img="Indi.gif" img.male="IndiMale.gif" img.female="IndiFemale.gif">
+ <INDI type="Indi" img="Indi.png" img.male="IndiMale.png" img.female="IndiFemale.png">
   +++++++++++++ Name and Sex +++++++++++++
-  <NAME default="1" type="PropertyName" img="Name.gif">
-   <NPFX type="PropertySimpleValue" img="Name.gif"/>
-   <GIVN type="PropertySimpleValue" img="Name.gif"/>
-   <NICK type="PropertySimpleValue" img="Name.gif"/>
-   <SPFX type="PropertySimpleValue" img="Name.gif"/>
-   <SURN type="PropertySimpleValue" img="Name.gif"/>
-   <NSFX type="PropertySimpleValue" img="Name.gif"/>
-   <SOUR type="PropertySource" img="Source.gif">
-    <PAGE xref="1" type="PropertySimpleValue" img="Attribute.gif" cardinality="0:1"/>
-    <EVEN xref="1" type="PropertyChoiceValue" img="Blob.gif" cardinality="0:1">
-     <ROLE type="PropertySimpleValue" img="Blob.gif"/>
+  <NAME default="1" type="PropertyName" img="Name.png">
+   <NPFX type="PropertySimpleValue" img="Name.png"/>
+   <GIVN type="PropertySimpleValue" img="Name.png"/>
+   <NICK type="PropertySimpleValue" img="Name.png"/>
+   <SPFX type="PropertySimpleValue" img="Name.png"/>
+   <SURN type="PropertySimpleValue" img="Name.png"/>
+   <NSFX type="PropertySimpleValue" img="Name.png"/>
+   <SOUR type="PropertySource" img="Source.png">
+    <PAGE xref="1" type="PropertySimpleValue" img="Attribute.png" cardinality="0:1"/>
+    <EVEN xref="1" type="PropertyChoiceValue" img="Blob.png" cardinality="0:1">
+     <ROLE type="PropertySimpleValue" img="Blob.png"/>
     </EVEN>
-    <DATA xref="1" type="PropertySimpleReadOnly" img="Blob.gif" cardinality="0:1">
-     <DATE type="PropertyDate" img="Date.gif"/>
-     <TEXT type="PropertyMultilineValue" img="Blob.gif"/>
+    <DATA xref="1" type="PropertySimpleReadOnly" img="Blob.png" cardinality="0:1">
+     <DATE type="PropertyDate" img="Date.png"/>
+     <TEXT type="PropertyMultilineValue" img="Blob.png"/>
     </DATA>
-    <QUAY xref="1" type="PropertySimpleValue" img="Blob.gif" cardinality="0:1"/>
-    <OBJE xref="1" type="PropertyMedia" img="Media.gif">
-     <TITL xref="0" type="PropertySimpleValue" img="Attribute.gif" cardinality="0:1"/>
-     <FORM default="1" hide="1" xref="0" type="PropertyChoiceValue" img="Format.gif" cardinality="1:1"/>
-     <FILE default="1" xref="0" type="PropertyFile" img="Disk.gif" cardinality="0:M">
+    <QUAY xref="1" type="PropertySimpleValue" img="Blob.png" cardinality="0:1"/>
+    <OBJE xref="1" type="PropertyMedia" img="Media.png">
+     <TITL xref="0" type="PropertySimpleValue" img="Attribute.png" cardinality="0:1"/>
+     <FORM default="1" hide="1" xref="0" type="PropertyChoiceValue" img="Format.png" cardinality="1:1"/>
+     <FILE default="1" xref="0" type="PropertyFile" img="Disk.png" cardinality="0:M">
      </FILE>
-     <NOTE default="1" xref="0" type="PropertyNote" img="Note.gif" cardinality="0:1"/>
+     <NOTE default="1" xref="0" type="PropertyNote" img="Note.png" cardinality="0:1"/>
     </OBJE>
-    <TEXT xref="0" type="PropertyMultilineValue" img="Note.gif" cardinality="0:1"/>
-    <NOTE type="PropertyNote" img="Note.gif"/>
+    <TEXT xref="0" type="PropertyMultilineValue" img="Note.png" cardinality="0:1"/>
+    <NOTE type="PropertyNote" img="Note.png"/>
    </SOUR>
-   <NOTE type="PropertyNote" img="Note.gif">
+   <NOTE type="PropertyNote" img="Note.png">
     <SOUR super="INDI:NAME:SOUR"/>
    </NOTE>
   </NAME>
-  <SEX default="1" cardinality="0:1" type="PropertySex" img="Sex.gif" img.male="Male.gif" img.female="Female.gif"/>
+  <SEX default="1" cardinality="0:1" type="PropertySex" img="Sex.png" img.male="Male.png" img.female="Female.png"/>
   +++++++++++++ Events +++++++++++++
-  <BIRT default="1" type="PropertyEvent" img="Birth.gif">
-   <TYPE type="PropertyChoiceValue" img="Type.gif"/>
-   <DATE default="1" cardinality="0:1" type="PropertyDate" img="Date.gif"/>
-   <PLAC default="1" cardinality="0:1" type="PropertyPlace" img="Place.gif">
-    <FORM type="PropertySimpleValue" img="Format.gif"/>
+  <BIRT default="1" type="PropertyEvent" img="Birth.png">
+   <TYPE type="PropertyChoiceValue" img="Type.png"/>
+   <DATE default="1" cardinality="0:1" type="PropertyDate" img="Date.png"/>
+   <PLAC default="1" cardinality="0:1" type="PropertyPlace" img="Place.png">
+    <FORM type="PropertySimpleValue" img="Format.png"/>
     <SOUR super="INDI:NAME:SOUR"/>
     <NOTE super="INDI:NAME:NOTE"/>
    </PLAC>
-   <ADDR type="PropertyMultilineValue" img="Addr.gif">
-    <ADR1 hide="1" type="PropertySimpleValue" img="Addr.gif"/>
-    <ADR2 hide="1" type="PropertySimpleValue" img="Addr.gif"/>
-    <CITY default="1" cardinality="0:1" type="PropertyChoiceValue" img="Place.gif"/>
-    <POST default="1" cardinality="0:1" type="PropertyChoiceValue" img="Code.gif"/>
-    <STAE default="1" cardinality="0:1" type="PropertyChoiceValue" img="Place.gif"/>
-    <CTRY default="1" cardinality="0:1" type="PropertyChoiceValue" img="Place.gif"/>
+   <ADDR type="PropertyMultilineValue" img="Addr.png">
+    <ADR1 hide="1" type="PropertySimpleValue" img="Addr.png"/>
+    <ADR2 hide="1" type="PropertySimpleValue" img="Addr.png"/>
+    <CITY default="1" cardinality="0:1" type="PropertyChoiceValue" img="Place.png"/>
+    <POST default="1" cardinality="0:1" type="PropertyChoiceValue" img="Code.png"/>
+    <STAE default="1" cardinality="0:1" type="PropertyChoiceValue" img="Place.png"/>
+    <CTRY default="1" cardinality="0:1" type="PropertyChoiceValue" img="Place.png"/>
    </ADDR>
-   <PHON type="PropertySimpleValue" img="Phone.gif"/>
-   <AGE type="PropertyAge" img="Time.gif" cardinality="0:1"/>
-   <AGNC type="PropertySimpleValue" img="Phone.gif"/>
-   <CAUS type="PropertyChoiceValue" img="Cause.gif"/>
+   <PHON type="PropertySimpleValue" img="Phone.png"/>
+   <AGE type="PropertyAge" img="Time.png" cardinality="0:1"/>
+   <AGNC type="PropertySimpleValue" img="Phone.png"/>
+   <CAUS type="PropertyChoiceValue" img="Cause.png"/>
    <NOTE super="INDI:NAME:NOTE"/>
    <SOUR super="INDI:NAME:SOUR"/>
    <OBJE super="INDI:NAME:SOUR:OBJE"/>
-   <FAMC inherit="0" hide="1" type="PropertyFamilyChild" img="Fam.gif"/>
+   <FAMC inherit="0" hide="1" type="PropertyFamilyChild" img="Fam.png"/>
   </BIRT>
-  <ADOP cardinality="0:M" super="INDI:BIRT" img="Adoption.gif">
-   <FAMC inherit="0" hide="1" type="PropertyFamilyChild" img="Fam.gif">
-    <ADOP type="PropertyChoiceValue" img="Fam.gif"/>
+  <ADOP cardinality="0:M" super="INDI:BIRT" img="Adoption.png">
+   <FAMC inherit="0" hide="1" type="PropertyFamilyChild" img="Fam.png">
+    <ADOP type="PropertyChoiceValue" img="Fam.png"/>
    </FAMC>
   </ADOP>
-  <DEAT img="Death.gif" super="INDI:BIRT"/>
+  <DEAT img="Death.png" super="INDI:BIRT"/>
   +++++++++++++ Attributes are not events but have event_details +++++++++++++
-  <RESI cardinality="0:M" type="PropertySimpleReadOnly" img="Residency.gif" super="INDI:BIRT">
+  <RESI cardinality="0:M" type="PropertySimpleReadOnly" img="Residency.png" super="INDI:BIRT">
    <PLAC default="0"/>
    <ADDR default="1"/>
   </RESI>
-  <OCCU type="PropertyChoiceValue" img="Occupation.gif" super="INDI:BIRT" cardinality="0:M"/>
-  <RELI type="PropertyChoiceValue" img="Religion.gif" super="INDI:BIRT">
+  <OCCU type="PropertyChoiceValue" img="Occupation.png" super="INDI:BIRT" cardinality="0:M"/>
+  <RELI type="PropertyChoiceValue" img="Religion.png" super="INDI:BIRT">
    <DATE default="0"/>
    <PLAC default="0"/>
   </RELI>
-  <CAST type="PropertySimpleValue" img="Caste.gif" super="INDI:RELI"/>
-  <DSCR type="PropertyChoiceValue" img="Description.gif" super="INDI:RELI"/>
-  <EDUC type="PropertyChoiceValue" img="Education.gif" super="INDI:RELI"/>
-  <IDNO type="PropertySimpleValue" img="IDNumber.gif" super="INDI:RELI"/>
-  <NATI type="PropertyChoiceValue" img="Nationality.gif" super="INDI:RELI"/>
-  <NCHI type="PropertySimpleValue" img="NumChildren.gif" super="INDI:RELI"/>
-  <PROP type="PropertyChoiceValue" img="Property.gif" super="INDI:RELI"/>
-  <SSN  type="PropertySimpleValue" img="SSN.gif" super="INDI:RELI"/>
-  <TITL type="PropertyChoiceValue" img="Title.gif" super="INDI:RELI"/>
-  <NMR  type="PropertySimpleValue" img="Marriage.gif" super="INDI:RELI"/>
+  <CAST type="PropertySimpleValue" img="Caste.png" super="INDI:RELI"/>
+  <DSCR type="PropertyChoiceValue" img="Description.png" super="INDI:RELI"/>
+  <EDUC type="PropertyChoiceValue" img="Education.png" super="INDI:RELI"/>
+  <IDNO type="PropertySimpleValue" img="IDNumber.png" super="INDI:RELI"/>
+  <NATI type="PropertyChoiceValue" img="Nationality.png" super="INDI:RELI"/>
+  <NCHI type="PropertySimpleValue" img="NumChildren.png" super="INDI:RELI"/>
+  <PROP type="PropertyChoiceValue" img="Property.png" super="INDI:RELI"/>
+  <SSN  type="PropertySimpleValue" img="SSN.png" super="INDI:RELI"/>
+  <TITL type="PropertyChoiceValue" img="Title.png" super="INDI:RELI"/>
+  <NMR  type="PropertySimpleValue" img="Marriage.png" super="INDI:RELI"/>
   +++++++++++++ More Events +++++++++++++
-  <GRAD cardinality="0:M" img="Graduation.gif" super="INDI:BIRT"/>
-  <CHR  hide="1" img="Baptism.gif" super="INDI:GRAD">
-   <FAMC inherit="0" hide="1" type="PropertyFamilyChild" img="Fam.gif"/>
+  <GRAD cardinality="0:M" img="Graduation.png" super="INDI:BIRT"/>
+  <CHR  hide="1" img="Baptism.png" super="INDI:GRAD">
+   <FAMC inherit="0" hide="1" type="PropertyFamilyChild" img="Fam.png"/>
   </CHR>
-  <BURI img="Burial.gif" super="INDI:BIRT"/>
-  <CREM img="Cremation.gif" super="INDI:BIRT"/>
-  <BAPM img="Baptism.gif" super="INDI:BIRT"/>
-  <BARM img="Bar.gif" super="INDI:BIRT"/>
-  <BASM img="Bas.gif" super="INDI:BIRT"/>
-  <BLES img="Blessing.gif" super="INDI:BIRT"/>
-  <CHRA hide="1" img="AdultChristening.gif" super="INDI:BIRT"/>
-  <CONF super="INDI:BIRT"/>
-  <FCOM img="FirstCommunion.gif" super="INDI:BIRT"/>
-  <ORDN img="Ordination.gif" super="INDI:BIRT"/>
-  <NATU img="Naturalisation.gif" super="INDI:GRAD"/>
-  <EMIG img="Emmigration.gif" super="INDI:GRAD"/>
-  <IMMI img="Immigration.gif" super="INDI:GRAD"/>
-  <CENS img="Census.gif" super="INDI:GRAD"/>
-  <PROB img="Probate.gif" super="INDI:GRAD"/>
-  <WILL img="Will.gif" super="INDI:GRAD"/>
-  <RETI img="Retirement.gif" super="INDI:GRAD"/>
-  <EVEN img="Event.gif" super="INDI:GRAD">
+  <BURI img="Burial.png" super="INDI:BIRT"/>
+  <CREM img="Cremation.png" super="INDI:BIRT"/>
+  <BAPM img="Baptism.png" super="INDI:BIRT"/>
+  <BARM img="Bar.png" super="INDI:BIRT"/>
+  <BASM img="Bas.png" super="INDI:BIRT"/>
+  <BLES img="Blessing.png" super="INDI:BIRT"/>
+  <CHRA hide="1" img="AdultChristening.png" super="INDI:BIRT"/>
+  <CONF img="Confirmation.png" super="INDI:BIRT"/>
+  <FCOM img="FirstCommunion.png" super="INDI:BIRT"/>
+  <ORDN img="Ordination.png" super="INDI:BIRT"/>
+  <NATU img="Naturalisation.png" super="INDI:GRAD"/>
+  <EMIG img="Emmigration.png" super="INDI:GRAD"/>
+  <IMMI img="Immigration.png" super="INDI:GRAD"/>
+  <CENS img="Census.png" super="INDI:GRAD"/>
+  <PROB img="Probate.png" super="INDI:GRAD"/>
+  <WILL img="Will.png" super="INDI:GRAD"/>
+  <RETI img="Retirement.png" super="INDI:GRAD"/>
+  <EVEN img="Event.png" super="INDI:GRAD">
    <TYPE default="1"/>
   </EVEN>
   ++++++++++++++++ LDS ++++++++++++++++++
- <BAPL hide="1" img="Baptism.gif" type="PropertySimpleReadOnly">
-   <STAT type="PropertySimpleValue" img="Baptism.gif"/>
+ <BAPL hide="1" img="Baptism.png" type="PropertySimpleReadOnly">
+   <STAT type="PropertySimpleValue" img="Baptism.png"/>
    <DATE super="INDI:BIRT:DATE"/>
-   <TEMP type="PropertySimpleValue" img="Baptism.gif"/>
+   <TEMP type="PropertySimpleValue" img="Baptism.png"/>
    <PLAC super="INDI:BIRT:PLAC"/>
    <SOUR super="INDI:BIRT:SOUR"/>
    <NOTE super="INDI:BIRT:NOTE"/>
@@ -136,39 +136,39 @@
   <CONL super="INDI:BAPL"/>
   <ENDL super="INDI:BAPL"/>
   <SLGC super="INDI:BAPL">
-   <FAMC hide="1" type="PropertyFamilyChild" img="Fam.gif"/>
+   <FAMC hide="1" type="PropertyFamilyChild" img="Fam.png"/>
   </SLGC>
    +++++++++++++ Relationships +++++++++++++
   <NOTE super="INDI:NAME:NOTE"/>
-  <FAMC hide="1" type="PropertyFamilyChild" img="Fam.gif">
-   <PEDI type="PropertyChoiceValue" img="Type.gif"/>
+  <FAMC hide="1" type="PropertyFamilyChild" img="Fam.png">
+   <PEDI type="PropertyChoiceValue" img="Type.png"/>
    <NOTE super="INDI:NAME:NOTE"/>
   </FAMC>
-  <FAMS hide="1" type="PropertyFamilySpouse" img="Fam.gif">
+  <FAMS hide="1" type="PropertyFamilySpouse" img="Fam.png">
    <NOTE super="INDI:NAME:NOTE"/>
   </FAMS>
   <OBJE super="INDI:BIRT:OBJE"/>
-  <SUBM hide="1" type="PropertySubmitter" img="Submitter.gif"/>
+  <SUBM hide="1" type="PropertySubmitter" img="Submitter.png"/>
   <ANCI super="INDI:SUBM"/>
   <DESI super="INDI:SUBM"/>
   <SOUR super="INDI:NAME:SOUR"/>
-  <ASSO hide="1" type="PropertyAssociation" img="Association.gif">
-   <TYPE default="1" cardinality="0:1" type="PropertySimpleValue" img="Type.gif"/>
-   <RELA default="1" cardinality="0:1" type="PropertyRelationship" img="Type.gif"/>
+  <ASSO hide="1" type="PropertyAssociation" img="Association.png">
+   <TYPE default="1" cardinality="0:1" type="PropertySimpleValue" img="Type.png"/>
+   <RELA default="1" cardinality="0:1" type="PropertyRelationship" img="Type.png"/>
    <SOUR super="INDI:SOUR"/>
    <NOTE super="INDI:NAME:NOTE"/>
   </ASSO>
-  <ALIA hide="1" type="PropertyAlias" img="Indi.gif"/>
+  <ALIA hide="1" type="PropertyAlias" img="Indi.png"/>
   +++++++++++++ numbers / processing +++++++++++++
-  <RFN type="PropertySimpleValue" img="Code.gif" cardinality="0:1"/>
-  <AFN type="PropertyNumericValue" img="Code.gif"/>
-  <REFN type="PropertySimpleValue" img="Code.gif">
-   <TYPE type="PropertySimpleValue" img="Type.gif"/>
+  <RFN type="PropertySimpleValue" img="Code.png" cardinality="0:1"/>
+  <AFN type="PropertyNumericValue" img="Code.png"/>
+  <REFN type="PropertySimpleValue" img="Code.png">
+   <TYPE type="PropertySimpleValue" img="Type.png"/>
   </REFN>
-  <RIN type="PropertySimpleValue" img="Blob.gif" cardinality="0:1"/>
-  <RESN type="PropertySimpleReadOnly" img="Description.gif" cardinality="0:1"/>
+  <RIN type="PropertySimpleValue" img="Blob.png" cardinality="0:1"/>
+  <RESN type="PropertySimpleReadOnly" img="Description.png" cardinality="0:1"/>
   +++++++++++++ change  - it swallows subs DATE|TIME - no need to declare in grammar +++++++++++++
-  <CHAN hide="1" type="PropertyChange" img="Time.gif">
+  <CHAN hide="1" type="PropertyChange" img="Time.png">
    <NOTE super="INDI:NAME:NOTE"/>
   </CHAN>
  </INDI>
@@ -176,32 +176,32 @@
  *************************************
  ************   Families  ************
  *************************************
- <FAM type="Fam" img="Fam.gif">
-  <HUSB hide="1" type="PropertyHusband" img="IndiMale.gif"/>
-  <WIFE hide="1" type="PropertyWife" img="IndiFemale.gif"/>
-  <NCHI img="NumChildren.gif" type="PropertySimpleValue"/>
-  <ENGA img="Engagement.gif" super="INDI:BIRT">
-   <HUSB type="PropertySimpleReadOnly" img="IndiMale.gif" cardinality="0:1">
-    <AGE default="1" type="PropertyAge" img="Time.gif" cardinality="1:1"/>
+ <FAM type="Fam" img="Fam.png">
+  <HUSB hide="1" type="PropertyHusband" img="IndiMale.png"/>
+  <WIFE hide="1" type="PropertyWife" img="IndiFemale.png"/>
+  <NCHI img="NumChildren.png" type="PropertySimpleValue"/>
+  <ENGA img="Engagement.png" super="INDI:BIRT">
+   <HUSB type="PropertySimpleReadOnly" img="IndiMale.png" cardinality="0:1">
+    <AGE default="1" type="PropertyAge" img="Time.png" cardinality="1:1"/>
    </HUSB>
-   <WIFE type="PropertySimpleReadOnly" img="IndiFemale.gif" cardinality="0:1">
-    <AGE default="1" type="PropertyAge" img="Time.gif" cardinality="1:1"/>
+   <WIFE type="PropertySimpleReadOnly" img="IndiFemale.png" cardinality="0:1">
+    <AGE default="1" type="PropertyAge" img="Time.png" cardinality="1:1"/>
    </WIFE>
   </ENGA>
-  <MARB img="MarriageBann.gif" super="FAM:ENGA"/>
-  <MARC img="MarriageContract.gif" super="FAM:ENGA"/>
-  <MARL img="MarriageLicence.gif" super="FAM:ENGA"/>
-  <MARR img="Marriage.gif" super="FAM:ENGA"/>
-  <ANUL img="Annulment.gif" super="FAM:ENGA"/>
-  <MARS img="MarriageSettlement.gif" super="FAM:ENGA"/>
-  <CHIL hide="1" type="PropertyChild" img="Child.gif" img.male="MaleChild.gif" img.female="FemaleChild.gif"/>
-  <DIVF img="DivorceFiled.gif" super="FAM:ENGA"/>
-  <DIV  img="Divorce.gif" super="FAM:ENGA"/>
-  <CENS img="Census.gif" super="FAM:ENGA"/>
-  <EVEN super="FAM:ENGA" cardinality="0:M">
+  <MARB img="MarriageBann.png" super="FAM:ENGA"/>
+  <MARC img="MarriageContract.png" super="FAM:ENGA"/>
+  <MARL img="MarriageLicence.png" super="FAM:ENGA"/>
+  <MARR img="Marriage.png" super="FAM:ENGA"/>
+  <ANUL img="Annulment.png" super="FAM:ENGA"/>
+  <MARS img="MarriageSettlement.png" super="FAM:ENGA"/>
+  <CHIL hide="1" type="PropertyChild" img="Child.png" img.male="MaleChild.png" img.female="FemaleChild.png"/>
+  <DIVF img="DivorceFiled.png" super="FAM:ENGA"/>
+  <DIV  img="Divorce.png" super="FAM:ENGA"/>
+  <CENS img="Census.png" super="FAM:ENGA"/>
+  <EVEN img="Event.png" super="FAM:ENGA" cardinality="0:M">
    <TYPE default="1" super="INDI:EVEN:TYPE"/>
   </EVEN>
-  <SLGS hide="1" img="Marriage.gif" super="INDI:BAPL"/>
+  <SLGS hide="1" img="Marriage.png" super="INDI:BAPL"/>
   <OBJE super="INDI:OBJE"/>
   <NOTE super="INDI:NOTE"/>
   <SUBM hide="1" super="INDI:SUBM"/>
@@ -214,9 +214,9 @@
  *************************************
  ************    Notes    ************
  *************************************
- <NOTE type="Note" img="Note.gif">
+ <NOTE type="Note" img="Note.png">
   +++++++++++++ we use inline NOTE to store the entity's content (GEDCOM anomalie) +++++++++++++
-  <NOTE hide="1" type="PropertyMultilineValue" img="Note.gif"/>
+  <NOTE hide="1" type="PropertyMultilineValue" img="Note.png"/>
   +++++++++++++ References +++++++++++++
   <SOUR super="INDI:SOUR"/>
   <REFN super="INDI:REFN"/>
@@ -228,10 +228,10 @@
  *************************************
  ************    Medias   ************
  *************************************
- <OBJE type="Media" img="Media.gif">
-  <TITL default="0" type="PropertySimpleValue" img="Attribute.gif" cardinality="1:1"/>
-  <FORM default="0" type="PropertyChoiceValue" img="Format.gif" cardinality="1:1"/>
-  <BLOB default="0" type="PropertyBlob" img="Blob.gif" cardinality="1:1"/>
+ <OBJE type="Media" img="Media.png">
+  <TITL default="0" type="PropertySimpleValue" img="Attribute.png" cardinality="1:1"/>
+  <FORM default="0" type="PropertyChoiceValue" img="Format.png" cardinality="1:1"/>
+  <BLOB default="0" type="PropertyBlob" img="Blob.png" cardinality="1:1"/>
   +++++++++++++ References +++++++++++++
   <NOTE super="INDI:NOTE"/>
   <SOUR super="INDI:SOUR"/>
@@ -244,11 +244,11 @@
  *************************************
  ************ Repositories ***********
  *************************************
- <REPO type="Repository" img="Repository.gif">
-  <NAME default="1" type="PropertySimpleValue" img="Attribute.gif"/>
+ <REPO type="Repository" img="Repository.png">
+  <NAME default="1" type="PropertySimpleValue" img="Attribute.png"/>
   <ADDR default="1" super="INDI:BIRT:ADDR"/>
-  <PHON type="PropertySimpleValue" img="Phone.gif"/>
-  <NOTE type="PropertyMultilineValue" img="Note.gif"/>
+  <PHON type="PropertySimpleValue" img="Phone.png"/>
+  <NOTE type="PropertyMultilineValue" img="Note.png"/>
   +++++++++++++ References +++++++++++++
   <REFN super="INDI:REFN"/>
   <RIN super="INDI:RIN"/>
@@ -259,27 +259,27 @@
  *************************************
  ************   Sources   ************
  *************************************
- <SOUR type="Source" img="Source.gif">
-  <DATA type="PropertySimpleReadOnly" img="Attribute.gif">
-   <EVEN default="1" type="PropertyChoiceValue" img="Event.gif">
-    <DATE type="PropertySimpleValue" img="Date.gif"/>
+ <SOUR type="Source" img="Source.png">
+  <DATA type="PropertySimpleReadOnly" img="Attribute.png">
+   <EVEN default="1" type="PropertyChoiceValue" img="Event.png">
+    <DATE type="PropertySimpleValue" img="Date.png"/>
     <PLAC super="INDI:BIRT:PLAC"/>
    </EVEN>
-   <AGNC type="PropertySimpleValue" img="Attribute.gif"/>
+   <AGNC type="PropertySimpleValue" img="Attribute.png"/>
    <NOTE super="INDI:NOTE"/>
   </DATA>
-  <AUTH default="1" type="PropertyMultilineValue" img="Note.gif" cardinality="0:1"/>
-  <TITL default="1" type="PropertyMultilineValue" img="Attribute.gif" cardinality="0:1"/>
-  <ABBR type="PropertySimpleValue" img="Note.gif" cardinality="0:1"/>
-  <PUBL type="PropertyMultilineValue" img="Note.gif" cardinality="0:1"/>
-  <TEXT default="1" type="PropertyMultilineValue" img="Note.gif" cardinality="0:1"/>
+  <AUTH default="1" type="PropertyMultilineValue" img="Note.png" cardinality="0:1"/>
+  <TITL default="1" type="PropertyMultilineValue" img="Attribute.png" cardinality="0:1"/>
+  <ABBR type="PropertySimpleValue" img="Note.png" cardinality="0:1"/>
+  <PUBL type="PropertyMultilineValue" img="Note.png" cardinality="0:1"/>
+  <TEXT default="1" type="PropertyMultilineValue" img="Note.png" cardinality="0:1"/>
   +++++++++++++ References +++++++++++++
   <OBJE super="INDI:OBJE"/>
   <NOTE super="INDI:NOTE"/>
-  <REPO hide="1" type="PropertyRepository" img="Repository.gif">
-   <NOTE xref="1" type="PropertyNote" img="Note.gif"/>
-   <CALN xref="1" type="PropertySimpleValue" img="Attribute.gif">
-    <MEDI type="PropertyChoiceValue" img="Attribute.gif"/>
+  <REPO hide="1" type="PropertyRepository" img="Repository.png">
+   <NOTE xref="1" type="PropertyNote" img="Note.png"/>
+   <CALN xref="1" type="PropertySimpleValue" img="Attribute.png">
+    <MEDI type="PropertyChoiceValue" img="Attribute.png"/>
    </CALN>
   </REPO>
   <REFN super="INDI:REFN"/>
@@ -291,11 +291,11 @@
  *************************************
  ************  Submitters ************
  *************************************
- <SUBM type="Submitter" img="Submitter.gif">
-  <NAME default="1" type="PropertySimpleValue" img="Name.gif" cardinality="1:1"/>
+ <SUBM type="Submitter" img="Submitter.png">
+  <NAME default="1" type="PropertySimpleValue" img="Name.png" cardinality="1:1"/>
   <ADDR super="INDI:BIRT:ADDR"/>
-  <PHON type="PropertySimpleValue" img="Phone.gif"/>
-  <LANG type="PropertySimpleValue" img="Place.gif"/>
+  <PHON type="PropertySimpleValue" img="Phone.png"/>
+  <LANG type="PropertySimpleValue" img="Place.png"/>
   +++++++++++++ References +++++++++++++
   <OBJE super="INDI:OBJE"/>
   <RFN super="INDI:RFN"/>
diff -Naur original/src/core/genj/app/Images.java GenJ/src/core/genj/app/Images.java
--- original/src/core/genj/app/Images.java	2006-08-26 05:19:14.000000000 +0100
+++ GenJ/src/core/genj/app/Images.java	2008-07-15 12:18:41.000000000 +0100
@@ -35,12 +35,12 @@
    * Constructor which pre-loads all images
    */
   private Images() {
-    imgHelp         = new ImageIcon(this,"images/Help.gif");
-    imgClose        = new ImageIcon(this,"images/Close.gif");
-    imgNew         = new ImageIcon(this,"images/New.gif");
-    imgOpen         = new ImageIcon(this,"images/Open.gif");
-    imgExit         = new ImageIcon(this,"images/Exit.gif");
-    imgSave         = new ImageIcon(this,"images/Save.gif");
-    imgAbout        = new ImageIcon(this,"images/About.gif");
+    imgHelp         = new ImageIcon(this,"images/Help.png");
+    imgClose        = new ImageIcon(this,"images/Close.png");
+    imgNew         = new ImageIcon(this,"images/New.png");
+    imgOpen         = new ImageIcon(this,"images/Open.png");
+    imgExit         = new ImageIcon(this,"images/Exit.png");
+    imgSave         = new ImageIcon(this,"images/Save.png");
+    imgAbout        = new ImageIcon(this,"images/About.png");
   }
 }
diff -Naur original/src/core/genj/edit/beans/DateBean.java GenJ/src/core/genj/edit/beans/DateBean.java
--- original/src/core/genj/edit/beans/DateBean.java	2008-02-02 15:43:52.000000000 +0000
+++ GenJ/src/core/genj/edit/beans/DateBean.java	2008-07-15 12:18:41.000000000 +0100
@@ -40,7 +40,7 @@
 
   private final static NestedBlockLayout LAYOUT = new NestedBlockLayout("<col><row><a/><b/></row><row><c/><d/></row><row><e wx=\"0.1\"/></row></col>");
 
-  private final static ImageIcon PIT = new ImageIcon(PropertyBean.class, "/genj/gedcom/images/Time.gif");
+  private final static ImageIcon PIT = new ImageIcon(PropertyBean.class, "/genj/gedcom/images/Time.png");
   
   /** members */
   private PropertyDate.Format format; 
diff -Naur original/src/core/genj/edit/Images.java GenJ/src/core/genj/edit/Images.java
--- original/src/core/genj/edit/Images.java	2007-02-26 18:10:11.000000000 +0000
+++ GenJ/src/core/genj/edit/Images.java	2008-07-15 12:18:41.000000000 +0100
@@ -55,24 +55,24 @@
    */
   private Images() {
     
-    imgView      = new ImageIcon(this,"images/View.gif");
-    imgAdvanced  = new ImageIcon(this,"images/Advanced.gif");
+    imgView      = new ImageIcon(this,"images/View.png");
+    imgAdvanced  = new ImageIcon(this,"images/Advanced.png");
 
-    imgStickOn   = new ImageIcon(this,"images/StickOn.gif");
-    imgStickOff  = new ImageIcon(this,"images/StickOff.gif");
-    imgBack    = new ImageIcon(this,"images/Return.gif");
-    imgForward  = new ImageIcon(this,"images/Forward.gif");
+    imgStickOn   = new ImageIcon(this,"images/StickOn.png");
+    imgStickOff  = new ImageIcon(this,"images/StickOff.png");
+    imgBack    = new ImageIcon(this,"images/Return.png");
+    imgForward  = new ImageIcon(this,"images/Forward.png");
 
-    imgUndo      = new ImageIcon(this,"images/Undo.gif");
-    imgRedo      = new ImageIcon(this,"images/Redo.gif");
+    imgUndo      = new ImageIcon(this,"images/Undo.png");
+    imgRedo      = new ImageIcon(this,"images/Redo.png");
     
-    imgCut       = new ImageIcon(this,"images/Cut.gif");
-    imgCopy      = new ImageIcon(this,"images/Copy.gif");
-    imgPaste     = new ImageIcon(this,"images/Paste.gif");
+    imgCut       = new ImageIcon(this,"images/Cut.png");
+    imgCopy      = new ImageIcon(this,"images/Copy.png");
+    imgPaste     = new ImageIcon(this,"images/Paste.png");
     
-    imgNew     = new ImageIcon(this,"images/New.gif");
+    imgNew     = new ImageIcon(this,"images/New.png");
     
-    imgNewEntity   = new ImageIcon(this,"images/entity/New.gif");
-    imgDelEntity    = new ImageIcon(this,"images/entity/Delete.gif");
+    imgNewEntity   = new ImageIcon(this,"images/entity/New.png");
+    imgDelEntity    = new ImageIcon(this,"images/entity/Delete.png");
   }
 }
diff -Naur original/src/core/genj/entity/EntityViewFactory.java GenJ/src/core/genj/entity/EntityViewFactory.java
--- original/src/core/genj/entity/EntityViewFactory.java	2004-06-01 09:45:33.000000000 +0100
+++ GenJ/src/core/genj/entity/EntityViewFactory.java	2008-07-15 12:18:42.000000000 +0100
@@ -43,7 +43,7 @@
    * @see genj.view.ViewFactory#getImage()
    */
   public ImageIcon getImage() {
-    return new ImageIcon(this, "images/View.gif");
+    return new ImageIcon(this, "images/View.png");
   }
 
   /**
diff -Naur original/src/core/genj/gedcom/Gedcom.java GenJ/src/core/genj/gedcom/Gedcom.java
--- original/src/core/genj/gedcom/Gedcom.java	2008-03-28 20:40:52.000000000 +0000
+++ GenJ/src/core/genj/gedcom/Gedcom.java	2008-07-15 12:18:42.000000000 +0100
@@ -137,7 +137,7 @@
     E2IMAGE = new HashMap();
 
   /** image */
-  private final static ImageIcon image = new ImageIcon(Gedcom.class, "images/Gedcom.gif");
+  private final static ImageIcon image = new ImageIcon(Gedcom.class, "images/Gedcom.png");
   
   /** submitter of this Gedcom */
   private Submitter submitter;
diff -Naur original/src/core/genj/gedcom/MetaProperty.java GenJ/src/core/genj/gedcom/MetaProperty.java
--- original/src/core/genj/gedcom/MetaProperty.java	2007-11-26 00:53:02.000000000 +0000
+++ GenJ/src/core/genj/gedcom/MetaProperty.java	2008-07-15 12:18:42.000000000 +0100
@@ -45,11 +45,11 @@
   
   /** static - images */
   public final static ImageIcon
-    IMG_CUSTOM  = loadImage("Attribute.gif"),
-    IMG_LINK    = loadImage("Association.gif"),
-    IMG_UNKNOWN = loadImage("Question.gif"),
-    IMG_ERROR   = loadImage("Error.gif"),
-    IMG_PRIVATE = loadImage("Private.gif");
+    IMG_CUSTOM  = loadImage("Attribute.png"),
+    IMG_LINK    = loadImage("Association.png"),
+    IMG_UNKNOWN = loadImage("Question.png"),
+    IMG_ERROR   = loadImage("Error.png"),
+    IMG_PRIVATE = loadImage("Private.png");
   
   /** grammar */
   private Grammar grammar;
diff -Naur original/src/core/genj/gedcom/time/FrenchRCalendar.java GenJ/src/core/genj/gedcom/time/FrenchRCalendar.java
--- original/src/core/genj/gedcom/time/FrenchRCalendar.java	2006-03-11 12:49:11.000000000 +0000
+++ GenJ/src/core/genj/gedcom/time/FrenchRCalendar.java	2008-07-15 12:18:42.000000000 +0100
@@ -55,7 +55,7 @@
    * Constructor
    */
   protected FrenchRCalendar() {
-    super("@#DFRENCH R@" , "french", "images/FrenchR.gif", MONTHS, WEEKDAYS);
+    super("@#DFRENCH R@" , "french", "images/FrenchR.png", MONTHS, WEEKDAYS);
   }
   
   /**
diff -Naur original/src/core/genj/gedcom/time/GregorianCalendar.java GenJ/src/core/genj/gedcom/time/GregorianCalendar.java
--- original/src/core/genj/gedcom/time/GregorianCalendar.java	2004-03-18 23:46:49.000000000 +0000
+++ GenJ/src/core/genj/gedcom/time/GregorianCalendar.java	2008-07-15 12:18:42.000000000 +0100
@@ -42,7 +42,7 @@
    * Constructor
    */
   protected GregorianCalendar() {
-    this("@#DGREGORIAN@", "gregorian", "images/Gregorian.gif");
+    this("@#DGREGORIAN@", "gregorian", "images/Gregorian.png");
   }
   
   /**
diff -Naur original/src/core/genj/gedcom/time/HebrewCalendar.java GenJ/src/core/genj/gedcom/time/HebrewCalendar.java
--- original/src/core/genj/gedcom/time/HebrewCalendar.java	2004-03-18 23:46:49.000000000 +0000
+++ GenJ/src/core/genj/gedcom/time/HebrewCalendar.java	2008-07-15 12:18:42.000000000 +0100
@@ -52,7 +52,7 @@
    * Constructor
    */
   protected HebrewCalendar() {
-    super("@#DHEBREW@", "hebrew", "images/Hebrew.gif", MONTHS, WEEKDAYS);
+    super("@#DHEBREW@", "hebrew", "images/Hebrew.png", MONTHS, WEEKDAYS);
   }
   
   /**
diff -Naur original/src/core/genj/gedcom/time/JulianCalendar.java GenJ/src/core/genj/gedcom/time/JulianCalendar.java
--- original/src/core/genj/gedcom/time/JulianCalendar.java	2004-03-04 01:36:12.000000000 +0000
+++ GenJ/src/core/genj/gedcom/time/JulianCalendar.java	2008-07-15 12:18:42.000000000 +0100
@@ -30,7 +30,7 @@
    * Constructor
    */
   protected JulianCalendar() {
-    super("@#DJULIAN@", "julian", "images/Julian.gif");
+    super("@#DJULIAN@", "julian", "images/Julian.png");
   }
   
   /**
diff -Naur original/src/core/genj/nav/NavigatorViewFactory.java GenJ/src/core/genj/nav/NavigatorViewFactory.java
--- original/src/core/genj/nav/NavigatorViewFactory.java	2007-02-23 12:59:51.000000000 +0000
+++ GenJ/src/core/genj/nav/NavigatorViewFactory.java	2008-07-15 12:18:42.000000000 +0100
@@ -33,7 +33,7 @@
  */
 public class NavigatorViewFactory implements ViewFactory {
 
-  private final static ImageIcon img = new ImageIcon(NavigatorViewFactory.class,"View.gif");
+  private final static ImageIcon img = new ImageIcon(NavigatorViewFactory.class,"View.png");
 
   /**
    * @see genj.view.ViewFactory#createView(String, Gedcom, Registry, ViewManager)
diff -Naur original/src/core/genj/nav/NavigatorView.java GenJ/src/core/genj/nav/NavigatorView.java
--- original/src/core/genj/nav/NavigatorView.java	2007-02-28 14:13:47.000000000 +0000
+++ GenJ/src/core/genj/nav/NavigatorView.java	2008-07-15 12:32:18.000000000 +0100
@@ -73,11 +73,11 @@
     CHILD    = "child";
 
   private final static ImageIcon
-    imgYSiblings = new ImageIcon(NavigatorView.class,"YSiblings.gif"),
-    imgOSiblings = new ImageIcon(NavigatorView.class,"OSiblings.gif"),
-    imgChildren  = new ImageIcon(NavigatorView.class,"Children.gif"),
-    imgFather    = Indi.IMG_MALE,
-    imgMother    = Indi.IMG_FEMALE,
+    imgYSiblings = new ImageIcon(NavigatorView.class,"YSiblings.png"),
+    imgOSiblings = new ImageIcon(NavigatorView.class,"OSiblings.png"),
+    imgChildren  = new ImageIcon(NavigatorView.class,"Children.png"),
+    imgFather    = new ImageIcon(NavigatorView.class,"Father.png"),
+    imgMother    = new ImageIcon(NavigatorView.class,"Mother.png"),
     imgMPartner  = Indi.IMG_MALE,
     imgFPartner  = Indi.IMG_FEMALE;
 
diff -Naur original/src/core/genj/option/OptionsWidget.java GenJ/src/core/genj/option/OptionsWidget.java
--- original/src/core/genj/option/OptionsWidget.java	2008-02-14 23:30:44.000000000 +0000
+++ GenJ/src/core/genj/option/OptionsWidget.java	2008-07-15 12:23:17.000000000 +0100
@@ -54,7 +54,7 @@
 public class OptionsWidget extends JPanel {
 
   /** an image for options */
-  public final static ImageIcon IMAGE = new ImageIcon(OptionsWidget.class, "images/Options.gif");
+  public final static ImageIcon IMAGE = new ImageIcon(OptionsWidget.class, "images/Options.png");
 
   /** tree we're using */
   private JTree tree;
diff -Naur original/src/core/genj/print/PrintTask.java GenJ/src/core/genj/print/PrintTask.java
--- original/src/core/genj/print/PrintTask.java	2007-02-26 21:29:20.000000000 +0000
+++ GenJ/src/core/genj/print/PrintTask.java	2008-07-15 12:23:17.000000000 +0100
@@ -109,7 +109,7 @@
   public PrintTask(Printer setRenderer, String setTitle, JComponent setOwner, PrintRegistry setRegistry) throws PrintException {
     
     // looks
-    setImage(new ImageIcon(this,"images/Print.gif"));
+    setImage(new ImageIcon(this,"images/Print.png"));
 
     // remember 
     renderer = setRenderer;
diff -Naur original/src/core/genj/report/Report.java GenJ/src/core/genj/report/Report.java
--- original/src/core/genj/report/Report.java	2008-02-14 23:30:44.000000000 +0000
+++ GenJ/src/core/genj/report/Report.java	2008-07-15 12:23:17.000000000 +0100
@@ -84,9 +84,9 @@
   protected final static Logger LOG = Logger.getLogger("genj.report");
 
   protected final static ImageIcon
-    IMG_SHELL = new genj.util.swing.ImageIcon(ReportView.class,"ReportShell.gif"),
-    IMG_FO    = new genj.util.swing.ImageIcon(ReportView.class,"ReportFO.gif"  ),
-    IMG_GUI   = new genj.util.swing.ImageIcon(ReportView.class,"ReportGui.gif"  );
+    IMG_SHELL = new genj.util.swing.ImageIcon(ReportView.class,"ReportShell.png"),
+    IMG_FO    = new genj.util.swing.ImageIcon(ReportView.class,"ReportFO.png"  ),
+    IMG_GUI   = new genj.util.swing.ImageIcon(ReportView.class,"ReportGui.png"  );
 
   /** global report options */
   protected Options OPTIONS = Options.getInstance();
@@ -240,7 +240,7 @@
 
     // resolve an image
     if (image==null) try {
-      String file = getTypeName()+".gif";
+      String file = getTypeName()+".png";
       image = new genj.util.swing.ImageIcon(file, getClass().getResourceAsStream(file));
     } catch (Throwable t) {
       image = usesStandardOut() ? IMG_SHELL : IMG_GUI;
@@ -268,7 +268,7 @@
   }
 
   private Category createCategory(String name) {
-      String file = "Category" + name + ".gif";
+      String file = "Category" + name + ".png";
 
       InputStream in = Report.class.getResourceAsStream(file);
       if (in == null)
diff -Naur original/src/core/genj/report/ReportViewFactory.java GenJ/src/core/genj/report/ReportViewFactory.java
--- original/src/core/genj/report/ReportViewFactory.java	2007-02-23 12:59:49.000000000 +0000
+++ GenJ/src/core/genj/report/ReportViewFactory.java	2008-07-15 12:23:17.000000000 +0100
@@ -42,7 +42,7 @@
  */
 public class ReportViewFactory implements ViewFactory, ActionProvider {
 
-  /*package*/ final static ImageIcon IMG = new ImageIcon(ReportViewFactory.class, "View.gif");
+  /*package*/ final static ImageIcon IMG = new ImageIcon(ReportViewFactory.class, "View.png");
   
   /**
    * Factory method - create instance of view
diff -Naur original/src/core/genj/report/ReportView.java GenJ/src/core/genj/report/ReportView.java
--- original/src/core/genj/report/ReportView.java	2007-09-22 12:34:56.000000000 +0100
+++ GenJ/src/core/genj/report/ReportView.java	2008-07-15 12:23:17.000000000 +0100
@@ -92,11 +92,11 @@
 
   /** statics */
   private final static ImageIcon
-    imgStart = new ImageIcon(ReportView.class,"Start.gif"      ),
-    imgStop  = new ImageIcon(ReportView.class,"Stop.gif"       ),
-    imgSave  = new ImageIcon(ReportView.class,"Save.gif"       ),
-    imgReload= new ImageIcon(ReportView.class,"Reload.gif"     ),
-    imgGroup = new ImageIcon(ReportView.class,"Group.gif"      );
+    imgStart = new ImageIcon(ReportView.class,"Start.png"      ),
+    imgStop  = new ImageIcon(ReportView.class,"Stop.png"       ),
+    imgSave  = new ImageIcon(ReportView.class,"Save.png"       ),
+    imgReload= new ImageIcon(ReportView.class,"Reload.png"     ),
+    imgGroup = new ImageIcon(ReportView.class,"Group.png"      );
 
 
   /** gedcom this view is for */
diff -Naur original/src/core/genj/search/SearchViewFactory.java GenJ/src/core/genj/search/SearchViewFactory.java
--- original/src/core/genj/search/SearchViewFactory.java	2004-06-01 09:45:32.000000000 +0100
+++ GenJ/src/core/genj/search/SearchViewFactory.java	2008-07-15 12:23:17.000000000 +0100
@@ -33,7 +33,7 @@
 public class SearchViewFactory implements ViewFactory {
   
   /** image */
-  /*package*/ static final ImageIcon IMG = new ImageIcon(SearchViewFactory.class, "View.gif"); 
+  /*package*/ static final ImageIcon IMG = new ImageIcon(SearchViewFactory.class, "View.png"); 
   
   /**
    * @see genj.view.ViewFactory#createView(java.lang.String, genj.gedcom.Gedcom, genj.util.Registry, genj.view.ViewManager)
diff -Naur original/src/core/genj/search/SearchView.java GenJ/src/core/genj/search/SearchView.java
--- original/src/core/genj/search/SearchView.java	2007-09-17 05:17:22.000000000 +0100
+++ GenJ/src/core/genj/search/SearchView.java	2008-07-15 12:23:17.000000000 +0100
@@ -134,8 +134,8 @@
   
   /** images */
   private final static ImageIcon
-    IMG_START = new ImageIcon(SearchView.class, "Start.gif"),
-    IMG_STOP  = new ImageIcon(SearchView.class, "Stop.gif" );
+    IMG_START = new ImageIcon(SearchView.class, "Start.png"),
+    IMG_STOP  = new ImageIcon(SearchView.class, "Stop.png" );
 
   /**
    * Constructor
diff -Naur original/src/core/genj/table/TableViewFactory.java GenJ/src/core/genj/table/TableViewFactory.java
--- original/src/core/genj/table/TableViewFactory.java	2004-06-01 09:45:28.000000000 +0100
+++ GenJ/src/core/genj/table/TableViewFactory.java	2008-07-15 12:23:17.000000000 +0100
@@ -34,7 +34,7 @@
 public class TableViewFactory implements ViewFactory {
   
   /** our image */
-  private final static ImageIcon IMG = new ImageIcon(TableViewFactory.class, "images/View.gif");
+  private final static ImageIcon IMG = new ImageIcon(TableViewFactory.class, "images/View.png");
 
   /**
    * @see genj.view.ViewFactory#createView(String, Gedcom, Registry, ViewManager)
diff -Naur original/src/core/genj/timeline/TimelineViewFactory.java GenJ/src/core/genj/timeline/TimelineViewFactory.java
--- original/src/core/genj/timeline/TimelineViewFactory.java	2004-06-01 09:45:20.000000000 +0100
+++ GenJ/src/core/genj/timeline/TimelineViewFactory.java	2008-07-15 12:23:17.000000000 +0100
@@ -44,7 +44,7 @@
    * @see genj.view.ViewFactory#getImage()
    */
   public ImageIcon getImage() {
-    return new ImageIcon(this, "View.gif");
+    return new ImageIcon(this, "View.png");
   }
 
   /**
diff -Naur original/src/core/genj/tree/Images.java GenJ/src/core/genj/tree/Images.java
--- original/src/core/genj/tree/Images.java	2003-04-01 18:03:31.000000000 +0100
+++ GenJ/src/core/genj/tree/Images.java	2008-07-15 12:23:18.000000000 +0100
@@ -42,17 +42,17 @@
    */
   private Images() {
 
-    imgView        = new ImageIcon(this,"images/View.gif"       );
+    imgView        = new ImageIcon(this,"images/View.png"       );
 
-    imgOverview    = new ImageIcon(this,"images/Overview.gif"   );
+    imgOverview    = new ImageIcon(this,"images/Overview.png"   );
     
-    imgHori        = new ImageIcon(this,"images/Hori.gif"       );
-    imgVert        = new ImageIcon(this,"images/Vert.gif"       );
+    imgHori        = new ImageIcon(this,"images/Hori.png"       );
+    imgVert        = new ImageIcon(this,"images/Vert.png"       );
     
-    imgDoFams      = new ImageIcon(this,"images/DoFams.gif"     ); 
-    imgDontFams    = new ImageIcon(this,"images/DontFams.gif"   ); 
+    imgDoFams      = new ImageIcon(this,"images/DoFams.png"     ); 
+    imgDontFams    = new ImageIcon(this,"images/DontFams.png"   ); 
 
-    imgFoldSymbols = new ImageIcon(this,"images/FoldUnfold.gif"    );
+    imgFoldSymbols = new ImageIcon(this,"images/FoldUnfold.png"    );
   }
   
 } //Images
diff -Naur original/src/core/genj/tree/TreeView.java GenJ/src/core/genj/tree/TreeView.java
--- original/src/core/genj/tree/TreeView.java	2007-08-29 23:13:11.000000000 +0100
+++ GenJ/src/core/genj/tree/TreeView.java	2008-07-15 12:23:18.000000000 +0100
@@ -83,7 +83,7 @@
 public class TreeView extends JPanel implements ContextProvider, WindowBroadcastListener, ToolBarSupport, ActionProvider, Filter {
   
   /** an icon for bookmarking */
-  private final static ImageIcon BOOKMARK_ICON = new ImageIcon(TreeView.class, "images/Bookmark.gif");      
+  private final static ImageIcon BOOKMARK_ICON = new ImageIcon(TreeView.class, "images/Bookmark.png");      
 
   /** need resources */
   private Resources resources = Resources.get(this);
diff -Naur original/src/core/genj/view/Images.java GenJ/src/core/genj/view/Images.java
--- original/src/core/genj/view/Images.java	2007-02-26 21:29:21.000000000 +0000
+++ GenJ/src/core/genj/view/Images.java	2008-07-15 12:23:18.000000000 +0100
@@ -37,8 +37,8 @@
    */
   private Images() {
 
-    imgSettings  = new ImageIcon(this,"images/Settings.gif");
-    imgClose     = new ImageIcon(this,"images/Close.gif");
+    imgSettings  = new ImageIcon(this,"images/Settings.png");
+    imgClose     = new ImageIcon(this,"images/Close.png");
   }
   
 } //Images
