diff --git a/annotations/changelog b/annotations/changelog
index 43ae6451..90740e16 100644
--- a/annotations/changelog
+++ b/annotations/changelog
@@ -1,4 +1,9 @@
-C++-annotations (10.3.1)    NOT YET TAGGED
+C++-annotations (10.4.0)    NOT YET TAGGED
+
+  * Added a section about reference bindings to the Overloading chapter
+
+  * Added cplusplus.css which can be used to fine-tune the layout of the
+    Annotatiions' html conversion.
 
   * Standardized the installation procedure
 
diff --git a/annotations/icmake/distclean b/annotations/icmake/distclean
index 4e4f642d..9e86c1c3 100644
--- a/annotations/icmake/distclean
+++ b/annotations/icmake/distclean
@@ -11,7 +11,7 @@ void distclean()
     run("rm -f html/cppindex.html html/cplusplus.index zip/cplusplus.*.zip");
 
     extensions = strtok("aux dvi idx ilg ind latex log out pdf ps toc", " ");
-    for(idx = sizeof(extensions); idx--; )
+    for(idx = listlen(extensions); idx--; )
         run("rm -f latex/cplusplus*." + extensions[idx]);
 
     run("rm -rf src/*/*/o src/*/o");
diff --git a/annotations/icmake/docs b/annotations/icmake/docs
index 07de38c4..1678d8e2 100644
--- a/annotations/icmake/docs
+++ b/annotations/icmake/docs
@@ -10,12 +10,12 @@ string stringlist(string path, string subdir, string pattern)
 
     lst = makelist(O_SUBDIR, "*");
 
-    for (idx = sizeof(lst); idx--; )
+    for (idx = listlen(lst); idx--; )
         ret += stringlist(path, element(idx, lst), pattern);
 
     lst = makelist(pattern);
 
-    for (idx = sizeof(lst); idx--; )
+    for (idx = listlen(lst); idx--; )
         ret +=  path + element(idx, lst) + " ";
 
     chdir("..");
@@ -30,7 +30,7 @@ void cleanup(string task, string files)
 
     filelist = strtok(files, " ");
     
-    for (idx = sizeof(filelist); idx--; )
+    for (idx = listlen(filelist); idx--; )
         system("tmp/bin/" + task + " -q " + element(idx, filelist));
 }
 
@@ -77,7 +77,7 @@ void htmldoc()
     htmlList = (list)"cplusplus.html" + makelist("cplusplus??.html");
 
                                     // patch the html-files
-    for (idx = sizeof(htmlList); idx--; )
+    for (idx = listlen(htmlList); idx--; )
     {
         html = element(idx, htmlList);
         system("../../../scripts/patchhtml < " + html + " > _" + html);
@@ -95,7 +95,7 @@ void htmldoc()
 
                                     // remove the <index> entries from the
                                     // html files
-    for (idx = sizeof(htmlList); idx--; )
+    for (idx = listlen(htmlList); idx--; )
     {
         html = element(idx, htmlList);
         system("../../bin/rmindexlines < " + html + " > _" + html);
diff --git a/annotations/icmake/examples b/annotations/icmake/examples
index 90f9fc62..ee54d8a9 100644
--- a/annotations/icmake/examples
+++ b/annotations/icmake/examples
@@ -37,7 +37,7 @@ void compile(string dir)
 
     sources = makelist("*.cc");
 
-    for (idx = sizeof(sources); idx--; )
+    for (idx = listlen(sources); idx--; )
         tryCompile(sources[idx]);
 }
     
@@ -63,7 +63,7 @@ void examples()
             , 
             ":");
 
-    for (idx = sizeof(dirs); idx--; )
+    for (idx = listlen(dirs); idx--; )
     {
         compile(dirs[idx]);
         chdir(cwd);
diff --git a/annotations/icmake/findall b/annotations/icmake/findall
index 2eed65c1..70bbab3b 100644
--- a/annotations/icmake/findall
+++ b/annotations/icmake/findall
@@ -17,7 +17,7 @@ list findAll(string type, string source, string pattern)
 
     entries = backtick(cmd + " " + pattern + " -printf \"%f\\n\"");
 
-    for (idx = sizeof(entries); idx--; )
+    for (idx = listlen(entries); idx--; )
         ret += (list)cutEoln(entries[idx]);
 
     chdir(g_cwd);
diff --git a/annotations/icmake/loginstall b/annotations/icmake/loginstall
index 55d3376f..bf2a9f8a 100644
--- a/annotations/icmake/loginstall
+++ b/annotations/icmake/loginstall
@@ -17,22 +17,22 @@ void logInstall(string src, string pattern, string dest)
 
     entries = findAll("f", src, pattern);
 
-    for (idx = sizeof(entries); idx--; )
+    for (idx = listlen(entries); idx--; )
         run("cp " + src + entries[idx] + " " + dest);
 
     chdir(dest);
-    for (idx = sizeof(entries); idx--; )
+    for (idx = listlen(entries); idx--; )
         log(entries[idx]);
 
     chdir(g_cwd);
     entries = findAll("l", src, pattern);
 
-    for (idx = sizeof(entries); idx--; )
+    for (idx = listlen(entries); idx--; )
         run("cp " CPOPTS " " + src + entries[idx] + " " + dest);
 
     chdir(dest);
 
-    for (idx = sizeof(entries); idx--; )
+    for (idx = listlen(entries); idx--; )
         logLink(entries[idx]);
 }
 
diff --git a/annotations/icmake/logzip b/annotations/icmake/logzip
index 25a9cd2e..6c185818 100644
--- a/annotations/icmake/logzip
+++ b/annotations/icmake/logzip
@@ -23,14 +23,14 @@ void logZip(string src, string names, string dest)
     else
         files = strtok(names, " ");
 
-    for (idx = sizeof(files); idx--; )
+    for (idx = listlen(files); idx--; )
     {
         file = files[idx];
         run("gzip -n -9 < " + file + " > " + g_cwd + dest + file + ".gz");
     }
 
     chdir(g_cwd + dest);
-    for (idx = sizeof(files); idx--; )
+    for (idx = listlen(files); idx--; )
         log(files[idx] + ".gz");
 }
 
diff --git a/annotations/icmake/readlog b/annotations/icmake/readlog
index d633fbec..ee6db1c4 100644
--- a/annotations/icmake/readlog
+++ b/annotations/icmake/readlog
@@ -2,7 +2,7 @@ void readlog()
 {
     list line;
 
-    while (line = fgets(g_logPath, (int)line[1]))
+    while (line = fgets(g_logPath, line))
         g_log += strtok(line[0], "\n");     // add logfile entries w/o \n
 }
 
diff --git a/annotations/icmake/removedir b/annotations/icmake/removedir
index 6aa6e8fe..648dad0c 100644
--- a/annotations/icmake/removedir
+++ b/annotations/icmake/removedir
@@ -10,17 +10,17 @@ void removeDir(string dir)
         return;
 
     parts = findAll("d", dir, "");          // if there are still subdirs
-    if (sizeof(parts) != 0)                 // then remove at some later stage
+    if (listlen(parts) != 0)                 // then remove at some later stage
         return;
 
     chdir(dir);
     parts = strtok(dir, "/");
     
-    for (idx = sizeof(parts); idx--; )
+    for (idx = listlen(parts); idx--; )
     {
         entries = backtick("ls -A");
 
-        if (sizeof(entries) != 0)
+        if (listlen(entries) != 0)
         {
             if (warn)
                 printf("not removing non-empty dir ", dir, "\n");
diff --git a/annotations/icmake/uninstall b/annotations/icmake/uninstall
index f8031105..3afae436 100644
--- a/annotations/icmake/uninstall
+++ b/annotations/icmake/uninstall
@@ -15,7 +15,7 @@ void uninstall()
 
     readlog();
 
-    for (idx = sizeof(g_log); idx--; )    
+    for (idx = listlen(g_log); idx--; )    
     {
         entry = strtok(g_log[idx], " ");
 
@@ -31,7 +31,7 @@ void uninstall()
             run("rm " + entry[2]);
     }
 
-    for (idx = 0, nDirs = sizeof(dirs); idx != nDirs; ++idx)
+    for (idx = 0, nDirs = listlen(dirs); idx != nDirs; ++idx)
         removeDir(dirs[idx]);
 
     run("rm " + g_logPath);
diff --git a/annotations/icmake/writelog b/annotations/icmake/writelog
index a8144826..95d5e75e 100644
--- a/annotations/icmake/writelog
+++ b/annotations/icmake/writelog
@@ -4,7 +4,7 @@ void writeLog()
 
     if (g_logPath != "")            // do not store uninstall info
     {
-        for (idx = sizeof(g_log); idx--; )
+        for (idx = listlen(g_log); idx--; )
             fprintf(g_logPath, g_log[idx], "\n");
     }
 
diff --git a/annotations/required b/annotations/required
index 809738ab..d42a79b8 100644
--- a/annotations/required
+++ b/annotations/required
@@ -2,10 +2,10 @@ This file lists non-standard software only. Thus, standard utilities like cp,
 mv, sed, etc, etc, are not explicitly mentioned. Neither are the gcc and g++
 compilers explicitly mentioned, but fairly recent ones are assumed.
 
-Required software for building the C++ Annotations 10.3.0
+Required software for building the C++ Annotations 10.4.0
 ---------------------------------------------------------
 
-icmake (>= 7.22.01), yodl (>= 3.05.01), libbobcat-dev (>= 3.25.01), flex, zip,
+icmake (>= 8.00.02), yodl (>= 3.06.00), libbobcat-dev (>= 4.01.03), flex, zip,
 texlive-latex-base, texlive-generic-recommended, texlive-latex-recommended,
 texlive-fonts-recommended, ghostscript
 
diff --git a/annotations/yo/cplusplus.yo b/annotations/yo/cplusplus.yo
index c532f943..eb195f9e 100644
--- a/annotations/yo/cplusplus.yo
+++ b/annotations/yo/cplusplus.yo
@@ -133,4 +133,3 @@ lchapter(CONCRETE)(Concrete Examples)
 includefile(concrete)
 
 IFDEF(latex)(latexcommand(\printindex))()
-
diff --git a/annotations/yo/preamble.yo b/annotations/yo/preamble.yo
index b871d938..dd71ceb9 100644
--- a/annotations/yo/preamble.yo
+++ b/annotations/yo/preamble.yo
@@ -260,76 +260,3 @@ IFDEF(html)(\
     )
 )()
 
-redef(XXsethtmldocumentheader)(3)(\
-    XXifnzero(XXhtmlfive)(NOTRANS(<!DOCTYPE html>))\
-    NOTRANS(<html><head>)XXnl()\
-    XXifnempty(XXhtmlmetacharset)
-    (\
-        NOTRANS(<meta charset=")\
-            SYMBOLVALUE(XXhtmlmetacharset)NOTRANS(">)XXnl()\
-        INTERNALINDEX(preset metacharset SYMBOLVALUE(XXhtmlmetacharset))\
-    )\
-    XXifnempty(ARG1)
-    (\
-        TYPEOUT(Document title: ARG1)\
-        NOTRANS(<title>)ARG1+NOTRANS(</title>)XXnl()\
-        INTERNALINDEX(preset title ARG1)\
-    )\
-    XXifnempty(XXheadopt)(\
-        SYMBOLVALUE(XXheadopt)\
-        INTERNALINDEX(preset headopt SYMBOLVALUE(XXheadopt))\
-    )\
-    XXifnzero(XXhtmlimgstyle)(\
-        htmlstyle(figure)(text-align: center)\
-        htmlstyle(img)(vertical-align: center)\
-    )
-    XXifnempty(XXhtmlstyleopt)(\
-        NOTRANS(<style type="text/css">)XXnl()\
-            EVAL(SYMBOLVALUE(XXhtmlstyleopt))\
-            NOTRANS(</style>)XXnl()\
-    )\
-    IFSTREQUAL(XXmailto)()(\
-        WARNING(no NOTRANS(mailto(..)) set, document will be without!)\
-    )(\
-        NOTRANS(<link rev="made" href="mailto:)\
-            SYMBOLVALUE(XXmailto)\
-            NOTRANS(">)XXnl()\
-    )\
-    XXifnempty(XXheadfile)(\
-        INTERNALINDEX(preset headfile SYMBOLVALUE(XXheadfile))\
-        EVAL(NOTRANS(includeverbatim+CHAR(40))\
-                SYMBOLVALUE(XXheadfile)CHAR(41))\
-    )
-    NOTRANS(</head>)\
-    XXnl()\
-    NOTRANS(<body)\
-    XXifnempty(XXbodyopt)(\
-        SYMBOLVALUE(XXbodyopt)\
-        INTERNALINDEX(set bodytagopt SYMBOLVALUE(XXbodyopt))\
-    )\
-    NOTRANS(>)\
-    XXnl()\
-    NOTRANS(<hr>)\
-    XXnl()\
-    NOTRANS(<h1 id="title">)ARG1+NOTRANS(</h1>)\
-    XXnl()\
-    XXifnempty(ARG2)
-    (\
-        NOTRANS(<h2 id="author">)ARG2+NOTRANS(</h2>)\
-        XXnl()\
-    )\
-    XXifnempty(XXaffilstring)
-    (\
-        XXnl()\
-        NOTRANS(<h2 id="affiliation">)SYMBOLVALUE(XXaffilstring)NOTRANS(</h2>)\
-    )\
-    XXifnempty(ARG3)
-    (\
-        NOTRANS(<h2 id="date">)ARG3+NOTRANS(</h2>)\
-        XXnl()\
-    )\
-    XXabstract()\
-    XXnl()\
-    XXsettitleclearpage()\
-    XXtableofcontents()\
-)
diff --git a/annotations/yo/version.yo b/annotations/yo/version.yo
index 8068a811..6a31ead5 100644
--- a/annotations/yo/version.yo
+++ b/annotations/yo/version.yo
@@ -1,2 +1,2 @@
-SUBST(DOCVERSION)(10.3.0)
+SUBST(DOCVERSION)(10.4.0)
 SUBST(YEARS)(1994 - 2015)