diff --git a/Doc/UserManual/FormFactors.tex b/Doc/UserManual/FormFactors.tex
index 72fb9ea64bc35915c96f529034a7624dfa3d5020..00d9ab03cfad9538a2436f12e1ffaf23bbc56bb1 100644
--- a/Doc/UserManual/FormFactors.tex
+++ b/Doc/UserManual/FormFactors.tex
@@ -328,7 +328,7 @@ for four different angles~$\omega$ of rotation around the $z$ axis.}
 \label{fig:FFAnisoPyramidEx}
 \end{figure}
 
-\paragraph{References}\strut\\
+\paragraph{History}\strut\\
 Agrees with the \E{In-plane anisotropic pyramid} form factor of \IsGISAXS\
 \cite[Eq.~2.40]{Laz08} \cite[Eq.~217]{ReLL09},
 except for different parametrization and
@@ -396,7 +396,7 @@ computed with $L=18$~nm, $W=4.6$~nm, and $H=3$~nm,
 for four different angles~$\omega$ of rotation around the $z$ axis.}
 \end{figure}
 
-\paragraph{References}\strut\\
+\paragraph{History}\strut\\
 Agrees with \E{Box} form factor of \IsGISAXS\
 \cite[Eq.~2.38]{Laz08} \cite[Eq.~214]{ReLL09},
 except for factors $1/2$ in the definitions of parameters $L$, $W$, $H$.
@@ -468,7 +468,7 @@ computed with $R=4$~nm, $H=11$~nm, and $\alpha=75^\circ$,
 for four different tilt angles~$\vartheta$ (rotation around the $y$ axis).}
 \end{figure}
 
-\paragraph{References}\strut\\
+\paragraph{History}\strut\\
 Agrees with \E{Cone} form factor of \IsGISAXS\
 \cite[Eq.~2.28]{Laz08} \cite[Eq.~225]{ReLL09},
 except for a substitution $z\to\rho$ in our expression for~$F$.
@@ -538,7 +538,7 @@ computed with $R=6$~nm, $H=5$~nm, and $\alpha=60^\circ$,
 for four different angles~$\omega$ of rotation around the $z$ axis.}
 \end{figure}
 
-\paragraph{References and History}\strut\\
+\paragraph{History}\strut\\
 Our parametrization deviates from the form factor \E{Cone6} of \IsGISAXS
 \cite[Eq.~2.32]{Laz08} \cite[Eq.~222]{ReLL09}.
 
@@ -614,7 +614,7 @@ computed with $L=8$~nm, $H=5$~nm, $r_H=0.5$, and $\alpha=60^\circ$,
 for four different angles~$\omega$ of rotation around the $z$ axis.}
 \end{figure}
 
-\paragraph{References and History}\strut\\
+\paragraph{History}\strut\\
 Agrees with \E{Cuboctahedron} form factor of \IsGISAXS\
 \cite[Eq.~2.34]{Laz08} \cite[Eq.~218]{ReLL09},
 except for different parametrization $L=2R_{\rm{\Code{IsGISAXS}}}$.
@@ -679,7 +679,7 @@ computed with $R=3$~nm and $H=8.8$~nm,
 for four different tilt angles~$\vartheta$ (rotation around the $y$ axis).}
 \end{figure}
 
-\paragraph{References}\strut\\
+\paragraph{History}\strut\\
 Agrees with \E{Cylinder} form factor of \IsGISAXS\
 \cite[Eq.~2.27]{Laz08} \cite[Eq.~223]{ReLL09}.
 
@@ -734,11 +734,11 @@ with inversion symmetry~\cite{ba:ffp},
 \includegraphics[width=\textwidth]{fig/ff2/ff_Dodecahedron.pdf}
 \end{center}
 \caption{Normalized intensity $|F|^2/V^2$,
-computed with $a=3.2$~nm, 
+computed with $a=3.2$~nm,
 for three different angles~$\omega$ of rotation around the $z$ axis.}
 \end{figure}
 
-\paragraph{References}\strut\\
+\paragraph{History}\strut\\
 New in \BornAgain-1.6,
 based on the generic form factor of the polyhedron~\cite{ba:ffp}.
 
@@ -802,7 +802,7 @@ computed with $R_a=6.3$~nm, $R_b=4.2$~nm and $H=3$~nm,
 for four different angles~$\omega$ of rotation around the $z$ axis.}
 \end{figure}
 
-\paragraph{References}\strut\\
+\paragraph{History}\strut\\
 Agrees with the \IsGISAXS\ form factor
 \E{Ellipsoid} \cite[Eq.~2.41, wrongly labeled in Fig.~2.4]{Laz08}
 or \E{Ellipsoidal Cylinder} \cite[Eq.~224]{ReLL09}.
@@ -860,7 +860,7 @@ F = 4\pi R^3 \exp(iq_z R)\frac{\sin(q R) - q R \cos(q R)}{(qR)^3},
 computed with $R=3.9$~nm.}
 \end{figure}
 
-\paragraph{References}\strut\\
+\paragraph{History}\strut\\
 This form factor, which goes back at least to Lord Rayleigh,
 agrees with the \E{Full sphere} of \IsGISAXS
 \cite[Eq.~2.36]{Laz08} \cite[Eq.~226]{ReLL09}.
@@ -928,7 +928,7 @@ computed with $R_a=10$~nm, $R_b=3.8$~nm and $H=3.2$~nm,
 for four different angles~$\omega$ of rotation around the $z$ axis.}
 \end{figure}
 
-\paragraph{References}\strut\\
+\paragraph{History}\strut\\
 Agrees with the \IsGISAXS\ form factor
 \E{Anisotropic hemi-ellipsoid}
 \cite[Eq.~2.42, with wrong sign in the $z$-dependent phase factor]{Laz08}
@@ -996,7 +996,7 @@ computed with $R=3.5$~nm and $H=9.8$~nm.}
 % changes very little under tilt !
 \end{figure}
 
-\paragraph{References}\strut\\
+\paragraph{History}\strut\\
 Agrees with the \E{Full spheroid} form factor of \IsGISAXS\
 \cite[Eq.~2.37]{Laz08} \cite[Eq.~227]{ReLL09},
 with corrected volume formula.
@@ -1053,11 +1053,11 @@ with inversion symmetry~\cite{ba:ffp},
 \includegraphics[width=\textwidth]{fig/ff2/ff_Icosahedron.pdf}
 \end{center}
 \caption{Normalized intensity $|F|^2/V^2$,
-computed with $a=4.8$~nm, 
+computed with $a=4.8$~nm,
 for three different angles~$\omega$ of rotation around the $z$ axis.}
 \end{figure}
 
-\paragraph{References}\strut\\
+\paragraph{History}\strut\\
 New in \BornAgain-1.6,
 based on the generic form factor of the polyhedron~\cite{ba:ffp}.
 
@@ -1120,7 +1120,7 @@ for four different angles~$\omega$ of rotation around the $z$ axis.}
 \label{fig:FFprism3Ex}
 \end{figure}
 
-\paragraph{References and History}\strut\\
+\paragraph{History}\strut\\
 Has been validated against the \E{Prism3} form factor of \IsGISAXS\
 \cite[Eq.~2.29]{Laz08} \cite[Eq.~219]{ReLL09}.
 Note the different parameterization $L= 2 R_{\rm{\Code{IsGISAXS}}}$.
@@ -1187,7 +1187,7 @@ for four different angles~$\omega$ of rotation around the $z$ axis.}
 \label{fig:FFprism6Ex}
 \end{figure}
 
-\paragraph{References and History}\strut\\
+\paragraph{History}\strut\\
 Has been validated against the \E{Prism6} form factor of \IsGISAXS\
 \cite[Eq.~2.31]{Laz08} \cite[Eq.~221]{ReLL09},
 which has different parametrization
@@ -1252,7 +1252,6 @@ They must fulfill
 
 \begin{figure}[H]
 \begin{center}
-%\includegraphics[angle=-90,width=\textwidth]{fig/ff/figffpyramid.pdf}
 \includegraphics[width=\textwidth]{fig/ff2/ff_Pyramid.pdf}
 \end{center}
 \caption{Normalized intensity $|F|^2/V^2$,
@@ -1260,7 +1259,7 @@ computed with $L=10$~nm, $H=4.2$~nm and $\alpha=60^{\circ}$,
 for four different angles~$\omega$ of rotation around the $z$ axis.}
 \end{figure}
 
-\paragraph{References and History}\strut\\
+\paragraph{History}\strut\\
 Corresponds to \E{Pyramid} form factor of \IsGISAXS\
 \cite[Eq.~2.31]{Laz08} \cite[Eq.~221]{ReLL09},
 except for different parametrization $L=2R_{\rm{\Code{IsGISXAXS}}}$
@@ -1339,7 +1338,7 @@ computed with $L=25$~nm, $W=10$~nm and $H=8$~nm,
 for four different angles~$\omega$ of rotation around the $z$ axis.}
 \end{figure}
 
-\paragraph{References}\strut\\
+\paragraph{History}\strut\\
 Agrees with the \E{Ripple1} form factor of \FitGISAXS\ \cite{Bab13}.
 
 %===============================================================================
@@ -1410,7 +1409,7 @@ for four different angles~$\omega$ of rotation around the $z$ axis.
 The low symmetry requires other angular ranges than used in most other figures.}
 \end{figure}
 
-\paragraph{References}\strut\\
+\paragraph{History}\strut\\
 Agrees with the \E{Ripple2} form factor of \FitGISAXS\ \cite{Bab13}.
 
 
@@ -1485,7 +1484,7 @@ for four different angles~$\omega$ of rotation around the $z$ axis.
 The low symmetry requires other angular ranges than used in most other figures.}
 \end{figure}
 
-\paragraph{References and History}\strut\\
+\paragraph{History}\strut\\
 Previous implementations as \E{Tetrahedron} in \IsGISAXS\
 \cite[Eq.~2.30]{Laz08} \cite[Eq.~220]{ReLL09},
 and as  \E{Truncated tetrahedron} in \FitGISAXS\ \cite{Bab13}.
@@ -1554,7 +1553,7 @@ computed with $L=25$~nm, $W=10$~nm, $H=8$~nm, and $d=5$~nm,
 for four different angles~$\omega$ of rotation around the $z$ axis.}
 \end{figure}
 
-\paragraph{References and History}\strut\\
+\paragraph{History}\strut\\
 Moitvated by \cite{HeSS74}.
 Reimplemented in \BornAgain-1.6 using the generic form factor
 of a polygonal prism \cite{ba:ffp},
@@ -1625,7 +1624,7 @@ computed with $R=4.2$~nm and $H=6.1$~nm,
 for four different tilt angles~$\vartheta$ (rotation around the $y$ axis).}
 \end{figure}
 
-\paragraph{References}\strut\\
+\paragraph{History}\strut\\
 Agrees with the \IsGISAXS\ form factor
 \E{Sphere} \cite[Eq.~2.33]{Laz08} or
 \E{Truncated sphere} \cite[Eq.~228]{ReLL09}.
@@ -1696,7 +1695,7 @@ computed with $R=3.3$~nm, $H=9.8$~nm, and $f_p=1.8$,
 for four different tilt angles~$\vartheta$ (rotation around the $y$ axis).}
 \end{figure}
 
-\paragraph{References}\strut\\
+\paragraph{History}\strut\\
 Agrees with the \IsGISAXS\ form factor
 \E{Sphere} \cite[Eq.~2.33]{Laz08} or
 \E{TruncatedSpheroid} \cite[Eq.~228]{ReLL09}.
diff --git a/Doc/UserManual/fig/ff/figffanisopyramid.pdf b/Doc/UserManual/fig/ff/figffanisopyramid.pdf
deleted file mode 100644
index 4d205ff4ae9f0f54e053b63735b2deb911e43856..0000000000000000000000000000000000000000
Binary files a/Doc/UserManual/fig/ff/figffanisopyramid.pdf and /dev/null differ
diff --git a/Doc/UserManual/fig/ff/figffbox.pdf b/Doc/UserManual/fig/ff/figffbox.pdf
deleted file mode 100644
index 5a5f7f28851dd206a1f7f82d02f7f19cdbd5bda2..0000000000000000000000000000000000000000
Binary files a/Doc/UserManual/fig/ff/figffbox.pdf and /dev/null differ
diff --git a/Doc/UserManual/fig/ff/figffcone.pdf b/Doc/UserManual/fig/ff/figffcone.pdf
deleted file mode 100644
index f7d93a7bd6089d80373a799d1bc118c7458dffff..0000000000000000000000000000000000000000
Binary files a/Doc/UserManual/fig/ff/figffcone.pdf and /dev/null differ
diff --git a/Doc/UserManual/fig/ff/figffcone6.pdf b/Doc/UserManual/fig/ff/figffcone6.pdf
deleted file mode 100644
index f31d0a64fa5ee156723ce5579abd346964439b45..0000000000000000000000000000000000000000
Binary files a/Doc/UserManual/fig/ff/figffcone6.pdf and /dev/null differ
diff --git a/Doc/UserManual/fig/ff/figffcuboctah.pdf b/Doc/UserManual/fig/ff/figffcuboctah.pdf
deleted file mode 100644
index cbaeab254c95eda27b268c3d9fff2ca282a728d4..0000000000000000000000000000000000000000
Binary files a/Doc/UserManual/fig/ff/figffcuboctah.pdf and /dev/null differ
diff --git a/Doc/UserManual/fig/ff/figffcylinder.pdf b/Doc/UserManual/fig/ff/figffcylinder.pdf
deleted file mode 100644
index fd4ee7d15caa82cf952e7fe518c3007e8e8b1974..0000000000000000000000000000000000000000
Binary files a/Doc/UserManual/fig/ff/figffcylinder.pdf and /dev/null differ
diff --git a/Doc/UserManual/fig/ff/figffellipscylinder.pdf b/Doc/UserManual/fig/ff/figffellipscylinder.pdf
deleted file mode 100644
index 94fb3219ef618e046bac80b6df32867c61d506d8..0000000000000000000000000000000000000000
Binary files a/Doc/UserManual/fig/ff/figffellipscylinder.pdf and /dev/null differ
diff --git a/Doc/UserManual/fig/ff/figfffsphere.pdf b/Doc/UserManual/fig/ff/figfffsphere.pdf
deleted file mode 100644
index f4b98fac093ecf8557feb11de558e685120a44c5..0000000000000000000000000000000000000000
Binary files a/Doc/UserManual/fig/ff/figfffsphere.pdf and /dev/null differ
diff --git a/Doc/UserManual/fig/ff/figfffspheroid.pdf b/Doc/UserManual/fig/ff/figfffspheroid.pdf
deleted file mode 100644
index 1d77f6c0eb3302ca70d628b5def93f95b4c91e58..0000000000000000000000000000000000000000
Binary files a/Doc/UserManual/fig/ff/figfffspheroid.pdf and /dev/null differ
diff --git a/Doc/UserManual/fig/ff/figffhemiellips.pdf b/Doc/UserManual/fig/ff/figffhemiellips.pdf
deleted file mode 100644
index 0275b35e6191143f0187a88abe259bdbfcdf938b..0000000000000000000000000000000000000000
Binary files a/Doc/UserManual/fig/ff/figffhemiellips.pdf and /dev/null differ
diff --git a/Doc/UserManual/fig/ff/figffparallel.pdf b/Doc/UserManual/fig/ff/figffparallel.pdf
deleted file mode 100644
index 9f0292b4e3d69ca19cef4b790bcbd1bdf986b5c4..0000000000000000000000000000000000000000
Binary files a/Doc/UserManual/fig/ff/figffparallel.pdf and /dev/null differ
diff --git a/Doc/UserManual/fig/ff/figffprism3.pdf b/Doc/UserManual/fig/ff/figffprism3.pdf
deleted file mode 100644
index 687013023e07727890cf272e7c606b61b49bf5e2..0000000000000000000000000000000000000000
Binary files a/Doc/UserManual/fig/ff/figffprism3.pdf and /dev/null differ
diff --git a/Doc/UserManual/fig/ff/figffprism6.pdf b/Doc/UserManual/fig/ff/figffprism6.pdf
deleted file mode 100644
index 4a7e26c417f90779252d9fd765e4f0d3dfaf498a..0000000000000000000000000000000000000000
Binary files a/Doc/UserManual/fig/ff/figffprism6.pdf and /dev/null differ
diff --git a/Doc/UserManual/fig/ff/figffpyramid.pdf b/Doc/UserManual/fig/ff/figffpyramid.pdf
deleted file mode 100644
index 2361f6735e76d5b38878a7702bfbb20093844ee8..0000000000000000000000000000000000000000
Binary files a/Doc/UserManual/fig/ff/figffpyramid.pdf and /dev/null differ
diff --git a/Doc/UserManual/fig/ff/figffripple1.pdf b/Doc/UserManual/fig/ff/figffripple1.pdf
deleted file mode 100644
index fa6749bbb0d104372e2cb97781b959ddb5f10e68..0000000000000000000000000000000000000000
Binary files a/Doc/UserManual/fig/ff/figffripple1.pdf and /dev/null differ
diff --git a/Doc/UserManual/fig/ff/figffripple2.pdf b/Doc/UserManual/fig/ff/figffripple2.pdf
deleted file mode 100644
index 623ea87057450c5587163bc6ade400cbc9ac1ae9..0000000000000000000000000000000000000000
Binary files a/Doc/UserManual/fig/ff/figffripple2.pdf and /dev/null differ
diff --git a/Doc/UserManual/fig/ff/figffsphere.pdf b/Doc/UserManual/fig/ff/figffsphere.pdf
deleted file mode 100644
index 757d2cb9ba95f6aa8ffa7a0f5aeca6576204652d..0000000000000000000000000000000000000000
Binary files a/Doc/UserManual/fig/ff/figffsphere.pdf and /dev/null differ
diff --git a/Doc/UserManual/fig/ff/figffspheroid.pdf b/Doc/UserManual/fig/ff/figffspheroid.pdf
deleted file mode 100644
index 49b496bd3b7693241864ffde65a9b14c8160929e..0000000000000000000000000000000000000000
Binary files a/Doc/UserManual/fig/ff/figffspheroid.pdf and /dev/null differ
diff --git a/Doc/UserManual/fig/ff/figfftetrahedron.pdf b/Doc/UserManual/fig/ff/figfftetrahedron.pdf
deleted file mode 100644
index f3819ab1526d3f76a2097ff51a9322680dc9e9d4..0000000000000000000000000000000000000000
Binary files a/Doc/UserManual/fig/ff/figfftetrahedron.pdf and /dev/null differ
diff --git a/Doc/UserManual/fig/ff/figfftruncatedcube.pdf b/Doc/UserManual/fig/ff/figfftruncatedcube.pdf
deleted file mode 100644
index ed9f0a2d5170fa6a6a2cd9394eac3c459d343714..0000000000000000000000000000000000000000
Binary files a/Doc/UserManual/fig/ff/figfftruncatedcube.pdf and /dev/null differ