diff --git a/Makefile b/Makefile
index 1e59058..811bf43 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,9 @@ package doc:
 # CTAN submission
 ########################################################################
 #
-# For CTAN submission just run "make ctan". This creates the file 
+# For CTAN submission just run "make ctan".
+# This creates the file proposal.ctan.zip which can then be submitted to
+# http://ctan.org/upload directly. 
 #
 # Directories that should be copied into top-level directories
 # - source (the *.dtx and *.ins files),
@@ -35,6 +37,5 @@ filedate checksum enablechecksum disablechecksum:
 
 GITURI = git@github.com:KWARC/LaTeX-proposal.git 
 TDS.src = 
-TDS.src =
 TDS.readme = README.ctan
 include lib/Makefile.ctan
diff --git a/base/pdata.sty b/base/pdata.sty
index 5cd50ce..f629445 100644
--- a/base/pdata.sty
+++ b/base/pdata.sty
@@ -7,7 +7,7 @@
 %% proposal.dtx  (with options: `pdata')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{pdata}[2016/10/26 v1.6 Project Data]
+\ProvidesPackage{pdata}[2016/11/24 v1.6 Project Data]
 \RequirePackage{workaddress}[2016/07/06]
 \RequirePackage{eurosym}
 \newif\if@sites\@sitesfalse\let\prop@gen@sites=\relax%
diff --git a/base/proposal.cls b/base/proposal.cls
index 6cd1c88..e673845 100644
--- a/base/proposal.cls
+++ b/base/proposal.cls
@@ -7,7 +7,7 @@
 %% proposal.dtx  (with options: `cls')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{proposal}[2016/10/26 v1.6 Project Proposal]
+\ProvidesClass{proposal}[2016/11/24 v1.6 Project Proposal]
 \newif\if@wpsubsection\@wpsubsectionfalse
 \newif\ifsubmit\submitfalse
 \newif\ifgrantagreement\grantagreementfalse
diff --git a/base/proposal.dtx b/base/proposal.dtx
index 14a7ede..e4d4492 100644
--- a/base/proposal.dtx
+++ b/base/proposal.dtx
@@ -13,10 +13,10 @@
 %
 % \iffalse 
 %<cls|sty|pdata|reporting>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<cls>\ProvidesClass{proposal}[2016/11/24 v1.6 Project Proposal]
-%<sty>\ProvidesPackage{proposal}[2016/11/24 v1.6 Project Proposal]
-%<pdata>\ProvidesPackage{pdata}[2016/11/24 v1.6 Project Data]
-%<reporting>\ProvidesPackage{reporting}[2016/11/24 v1.6 Project Reporting]
+%<cls>\ProvidesClass{proposal}[2016/12/15 v1.6 Project Proposal]
+%<sty>\ProvidesPackage{proposal}[2016/12/15 v1.6 Project Proposal]
+%<pdata>\ProvidesPackage{pdata}[2016/12/15 v1.6 Project Data]
+%<reporting>\ProvidesPackage{reporting}[2016/12/15 v1.6 Project Reporting]
 %<*driver>
 \documentclass{ltxdoc}
 \DoNotIndex{\def,\long,\edef,\xdef,\gdef,\let,\global}
diff --git a/base/proposal.pdf b/base/proposal.pdf
index 87021c7..1470484 100644
Binary files a/base/proposal.pdf and b/base/proposal.pdf differ
diff --git a/base/proposal.sty b/base/proposal.sty
index 22058ce..262e727 100644
--- a/base/proposal.sty
+++ b/base/proposal.sty
@@ -7,7 +7,7 @@
 %% proposal.dtx  (with options: `sty')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{proposal}[2016/10/26 v1.6 Project Proposal]
+\ProvidesPackage{proposal}[2016/11/24 v1.6 Project Proposal]
 \RequirePackage{amssymb}
 \RequirePackage{wasysym}
 \RequirePackage{url}
diff --git a/base/reporting.cls b/base/reporting.cls
index d97fc36..7f980df 100644
--- a/base/reporting.cls
+++ b/base/reporting.cls
@@ -7,7 +7,7 @@
 %% proposal.dtx  (with options: `reporting')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{reporting}[2016/10/26 v1.6 Project Reporting]
+\ProvidesPackage{reporting}[2016/11/24 v1.6 Project Reporting]
 \newif\if@wpsubsection\@wpsubsectionfalse
 \newif\ifsubmit\submitfalse
 \newif\ifgrantagreement\grantagreementfalse
diff --git a/dfg/Makefile b/dfg/Makefile
index 6a35e70..a319098 100644
--- a/dfg/Makefile
+++ b/dfg/Makefile
@@ -4,7 +4,7 @@ TDSCOLL = proposal
 DTX.cls.base = dfgproposal
 DTX = dfgproposal.dtx
 TDS.tex = dfgreporting.cls dfgpdata.sty
-TDS.exdirs = examples/proposal examples/report
+TDS.exdirs = examples/proposal examples/report examples/lib
 CTAN = $(TDS.tex)
 EXDIRS = examples
 
diff --git a/dfg/dfgpdata.sty b/dfg/dfgpdata.sty
index 0acfff2..9ace969 100644
--- a/dfg/dfgpdata.sty
+++ b/dfg/dfgpdata.sty
@@ -7,7 +7,7 @@
 %% dfgproposal.dtx  (with options: `pdata')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{dfgpdata}[2016/04/15 v1.4 DFG Project Data]
+\ProvidesPackage{dfgpdata}[2016/11/24 v1.4 DFG Project Data]
 \newif\ifdeutsch\deutschfalse
 \DeclareOption{german}{\deutschtrue\message{Deutscher Antrag}}
 \ProcessOptions
diff --git a/dfg/dfgproposal.cls b/dfg/dfgproposal.cls
index 300e8bc..d4f56a6 100644
--- a/dfg/dfgproposal.cls
+++ b/dfg/dfgproposal.cls
@@ -7,7 +7,7 @@
 %% dfgproposal.dtx  (with options: `cls')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{dfgproposal}[2016/04/15 v1.4 DFG Proposal]
+\ProvidesClass{dfgproposal}[2016/11/24 v1.4 DFG Proposal]
 \newif\ifgeneral\generalfalse
 \DeclareOption{general}{\generaltrue}
 \DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}}
diff --git a/dfg/dfgproposal.dtx b/dfg/dfgproposal.dtx
index edcf384..f7e4770 100644
--- a/dfg/dfgproposal.dtx
+++ b/dfg/dfgproposal.dtx
@@ -13,9 +13,9 @@
 %
 % \iffalse 
 %<cls|pdata|reporting>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<cls>\ProvidesClass{dfgproposal}[2016/11/24 v1.4 DFG Proposal]
-%<pdata>\ProvidesPackage{dfgpdata}[2016/11/24 v1.4 DFG Project Data]
-%<reporting>\ProvidesPackage{dfgreporting}[2016/11/24 v1.4 DFG Project Reporting]
+%<cls>\ProvidesClass{dfgproposal}[2016/12/15 v1.4 DFG Proposal]
+%<pdata>\ProvidesPackage{dfgpdata}[2016/12/15 v1.4 DFG Project Data]
+%<reporting>\ProvidesPackage{dfgreporting}[2016/12/15 v1.4 DFG Project Reporting]
 %<*driver>
 \documentclass[twoside]{ltxdoc}
 \DoNotIndex{\def,\long,\edef,\xdef,\gdef,\let,\global}
diff --git a/dfg/dfgproposal.pdf b/dfg/dfgproposal.pdf
index c09836e..70a9158 100644
Binary files a/dfg/dfgproposal.pdf and b/dfg/dfgproposal.pdf differ
diff --git a/dfg/dfgreporting.cls b/dfg/dfgreporting.cls
index ebeeee7..f88a134 100644
--- a/dfg/dfgreporting.cls
+++ b/dfg/dfgreporting.cls
@@ -7,7 +7,7 @@
 %% dfgproposal.dtx  (with options: `reporting')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{dfgreporting}[2016/04/15 v1.4 DFG Project Reporting]
+\ProvidesPackage{dfgreporting}[2016/11/24 v1.4 DFG Project Reporting]
 \DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{dfgpdata}}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}}
 \ProcessOptions
diff --git a/dfg/examples/proposal/proposal.pdf b/dfg/examples/proposal/proposal.pdf
index 2b273a0..1ead921 100644
Binary files a/dfg/examples/proposal/proposal.pdf and b/dfg/examples/proposal/proposal.pdf differ
diff --git a/dfg/examples/report/finalreport.pdf b/dfg/examples/report/finalreport.pdf
index 8df36c2..67eefc5 100644
Binary files a/dfg/examples/report/finalreport.pdf and b/dfg/examples/report/finalreport.pdf differ
diff --git a/dfg/examples/simple-proposal/proposal.pdf b/dfg/examples/simple-proposal/proposal.pdf
index 8d1fb36..80a689f 100644
Binary files a/dfg/examples/simple-proposal/proposal.pdf and b/dfg/examples/simple-proposal/proposal.pdf differ
diff --git a/eu/Makefile b/eu/Makefile
index 29023ab..8d9eb18 100644
--- a/eu/Makefile
+++ b/eu/Makefile
@@ -4,7 +4,7 @@ TDSCOLL = proposal
 DTX.cls.base = euproposal
 DTX = euproposal.dtx
 TDS.tex = eureporting.cls eupdata.sty
-TDS.exdirs = examples/strep
+TDS.exdirs = examples/strep examples/lib
 EXDIRS = examples
 
 all: package doc
diff --git a/eu/eupdata.sty b/eu/eupdata.sty
index 9b4d46b..7b25884 100644
--- a/eu/eupdata.sty
+++ b/eu/eupdata.sty
@@ -7,7 +7,7 @@
 %% euproposal.dtx  (with options: `pdata')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{eupdata}[2016/04/15 v1.5 EU Project Data]
+\ProvidesPackage{eupdata}[2016/07/06 v1.5 EU Project Data]
 
 \define@key{prop@gen}{coordinator}{\def\prop@gen@coordinator{#1}\pdata@def{prop}{gen}{coordinator}{#1}}
 \define@key{prop@gen}{coordinatorsite}{\def\prop@gen@coordinatorsite{#1}\pdata@def{prop}{gen}{coordinator}{#1}}
diff --git a/eu/euproposal.cls b/eu/euproposal.cls
index 197bdff..39d72d2 100644
--- a/eu/euproposal.cls
+++ b/eu/euproposal.cls
@@ -7,7 +7,7 @@
 %% euproposal.dtx  (with options: `cls')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{euproposal}[2016/04/15 v1.5 EU Proposal]
+\ProvidesClass{euproposal}[2016/07/06 v1.5 EU Proposal]
 
 \newif\ifpartB\partBfalse
 \DeclareOption{partB}{\partBtrue}
diff --git a/eu/euproposal.dtx b/eu/euproposal.dtx
index 177ef08..efd0845 100644
--- a/eu/euproposal.dtx
+++ b/eu/euproposal.dtx
@@ -13,9 +13,9 @@
 % 
 % \iffalse
 %<cls|pdata|reporting>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<cls>\ProvidesClass{euproposal}[2016/07/06 v1.5 EU Proposal]
-%<pdata>\ProvidesPackage{eupdata}[2016/07/06 v1.5 EU Project Data]
-%<reporting>\ProvidesPackage{eureporting}[2016/07/06 v1.5 EU Project Reporting]
+%<cls>\ProvidesClass{euproposal}[2016/12/15 v1.5 EU Proposal]
+%<pdata>\ProvidesPackage{eupdata}[2016/12/15 v1.5 EU Project Data]
+%<reporting>\ProvidesPackage{eureporting}[2016/12/15 v1.5 EU Project Reporting]
 %<*driver>
 \documentclass[twoside]{ltxdoc}
 \DoNotIndex{\def,\long,\edef,\xdef,\gdef,\let,\global}
diff --git a/eu/euproposal.pdf b/eu/euproposal.pdf
index 8637a2e..aef5b24 100644
Binary files a/eu/euproposal.pdf and b/eu/euproposal.pdf differ
diff --git a/eu/eureporting.cls b/eu/eureporting.cls
index 10438ba..bb00257 100644
--- a/eu/eureporting.cls
+++ b/eu/eureporting.cls
@@ -7,7 +7,7 @@
 %% euproposal.dtx  (with options: `reporting')
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{eureporting}[2016/04/15 v1.5 EU Project Reporting]
+\ProvidesPackage{eureporting}[2016/07/06 v1.5 EU Project Reporting]
 
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{reporting}}
 \ProcessOptions
diff --git a/eu/examples/strep/propB.pdf b/eu/examples/strep/propB.pdf
index 09bbda0..749d1b2 100644
Binary files a/eu/examples/strep/propB.pdf and b/eu/examples/strep/propB.pdf differ