diff --git a/lib/doc/clipart/macrobox.png b/lib/doc/clipart/macrobox.png
index 5b20418e33..fc84dbaebd 100644
Binary files a/lib/doc/clipart/macrobox.png and b/lib/doc/clipart/macrobox.png differ
diff --git a/lib/doc/clipart/macrouse.png b/lib/doc/clipart/macrouse.png
index 0bd5366b21..4ace6e5225 100644
Binary files a/lib/doc/clipart/macrouse.png and b/lib/doc/clipart/macrouse.png differ
diff --git a/lib/doc/es/Math.lyx b/lib/doc/es/Math.lyx
index 73c3d0ad0d..b8ec3740c2 100644
--- a/lib/doc/es/Math.lyx
+++ b/lib/doc/es/Math.lyx
@@ -1,4 +1,4 @@
-#LyX 1.6.0 created this file. For more info see http://www.lyx.org/
+#LyX 1.6.1svn created this file. For more info see http://www.lyx.org/
 \lyxformat 345
 \begin_document
 \begin_header
@@ -154,6 +154,7 @@
 \font_osf false
 \font_sf_scale 100
 \font_tt_scale 100
+
 \graphics default
 \paperfontsize 12
 \spacing single
@@ -192,8 +193,8 @@
 \bullet 3 2 7 -1
 \tracking_changes false
 \output_changes false
-\author ""
-\author ""
+\author "" 
+\author "" 
 \end_header
 
 \begin_body
@@ -28444,7 +28445,7 @@ Si un lado de la ecuación es mucho más corto que la anchura de línea, este
  se elige para el lado izquierdo y el derecho se imprime en dos líneas:
 \begin_inset Formula \begin{eqnarray}
 H & = & W_{SB}+W_{mv}+W_{D}-\frac{\hbar^{2}}{2m_{0}}\Delta-\frac{\hbar^{2}}{2m_{1}}\Delta_{1}-\frac{\hbar^{2}}{2m_{2}}\Delta_{2}-\frac{e^{2}}{4\pi\varepsilon_{0}|\mathbf{r}-\mathbf{R}_{1}|}\nonumber \\
- &  & -\hspace{3pt}\frac{e^{2}}{4\pi\varepsilon_{0}|\mathbf{r}-\mathbf{R}_{2}|}+\frac{e^{2}}{4\pi\varepsilon_{0}|\mathbf{R}_{1}-\mathbf{R}_{2}|}\label{eq:kurzlang}\end{eqnarray}
+ &  & -\hspace{3pt}\frac{e^{2}}{4\pi\varepsilon_{0}|\mathbf{r}-\mathbf{R}_{2}|}+\frac{e^{2}}{4\pi\varepsilon_{0}|\mathbf{R}_{1}-\mathbf{R}_{2}|}\label{eq:cortolargo}\end{eqnarray}
 
 \end_inset
 
@@ -29503,7 +29504,7 @@ El entorno aligned también es apropiado para ecuaciones largas cuyas líneas
  Como ejemplo, la ecuación 
 \begin_inset CommandInset ref
 LatexCommand eqref
-reference "eq:kurzlang"
+reference "eq:cortolargo"
 
 \end_inset
 
@@ -34361,7 +34362,7 @@ end{multicols}
 
 
 \begin_inset Formula \begin{equation}
-S(t)=S_{0}(t)\int_{-\infty}^{\infty}P(\phi,t)\mathrm{e}^{\mathrm{i}\phi}\,\mathrm{d}\phi\label{eq:fouriertrafo}\end{equation}
+S(t)=S_{0}(t)\int_{-\infty}^{\infty}P(\phi,t)\mathrm{e}^{\mathrm{i}\phi}\,\mathrm{d}\phi\end{equation}
 
 \end_inset
 
diff --git a/lib/doc/fr/Math.lyx b/lib/doc/fr/Math.lyx
index f865d569e1..8dce761660 100644
--- a/lib/doc/fr/Math.lyx
+++ b/lib/doc/fr/Math.lyx
@@ -1,8 +1,7 @@
-#LyX 1.6.0 created this file. For more info see http://www.lyx.org/
+#LyX 1.6.1svn created this file. For more info see http://www.lyx.org/
 \lyxformat 345
 \begin_document
 \begin_header
-\use_default_options false
 \textclass scrartcl
 \begin_preamble
 % DO NOT ALTER THIS PREAMBLE!!!
@@ -147,6 +146,7 @@
 \StandardLayout
 \end_preamble
 \options bibtotoc,idxtotoc,BCOR7.5mm,titlepage,tablecaptionabove
+\use_default_options false
 \language french
 \inputencoding auto
 \font_roman default
@@ -157,6 +157,7 @@
 \font_osf false
 \font_sf_scale 100
 \font_tt_scale 100
+
 \graphics default
 \paperfontsize 12
 \spacing single
@@ -195,8 +196,8 @@
 \bullet 3 2 7 -1
 \tracking_changes false
 \output_changes false
-\author ""
-\author ""
+\author "" 
+\author "" 
 \end_header
 
 \begin_body
@@ -27724,7 +27725,7 @@ medskip
  
 \begin_inset Formula \begin{eqnarray}
 H & = & W_{SB}+W_{mv}+W_{D}-\frac{\hbar^{2}}{2m_{0}}\Delta-\frac{\hbar^{2}}{2m_{1}}\Delta_{1}-\frac{\hbar^{2}}{2m_{2}}\Delta_{2}-\frac{e^{2}}{4\pi\varepsilon_{0}|\mathbf{r}-\mathbf{R}_{1}|}\nonumber \\
- &  & -\hspace{3pt}\frac{e^{2}}{4\pi\varepsilon_{0}|\mathbf{r}-\mathbf{R}_{2}|}+\frac{e^{2}}{4\pi\varepsilon_{0}|\mathbf{R}_{1}-\mathbf{R}_{2}|}\label{eq:kurzlang}\end{eqnarray}
+ &  & -\hspace{3pt}\frac{e^{2}}{4\pi\varepsilon_{0}|\mathbf{r}-\mathbf{R}_{2}|}+\frac{e^{2}}{4\pi\varepsilon_{0}|\mathbf{R}_{1}-\mathbf{R}_{2}|}\label{eq:courtlong}\end{eqnarray}
 
 \end_inset
 
@@ -28841,7 +28842,7 @@ L'environnement aligned est aussi utilisable pour de longues formules dont
  Un exemple, la formule
 \begin_inset CommandInset ref
 LatexCommand eqref
-reference "eq:kurzlang"
+reference "eq:courtlong"
 
 \end_inset
 
@@ -33521,7 +33522,7 @@ end{multicols}
 
 
 \begin_inset Formula \begin{equation}
-S(t)=S_{0}(t)\int_{-\infty}^{\infty}P(\phi,t)\mathrm{e}^{\mathrm{i}\phi}\,\mathrm{d}\phi\label{eq:fouriertrafo}\end{equation}
+S(t)=S_{0}(t)\int_{-\infty}^{\infty}P(\phi,t)\mathrm{e}^{\mathrm{i}\phi}\,\mathrm{d}\phi\end{equation}
 
 \end_inset
 
diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc
index f8c078f890..850bdbdecd 100644
--- a/lib/ui/stdmenus.inc
+++ b/lib/ui/stdmenus.inc
@@ -214,17 +214,17 @@ Menuset
 	End
 
 	Menu "edit_math_macro_definition"
-		Item "Append Parameter" "math-macro-add-param"
-		Item "Remove Last Parameter" "math-macro-remove-param"
+		Item "Append Argument" "math-macro-add-param"
+		Item "Remove Last Argument" "math-macro-remove-param"
                 Separator
-		Item "Make First Non-Optional into Optional Parameter" "math-macro-make-optional"
-		Item "Make Last Optional into Non-Optional Parameter" "math-macro-make-nonoptional"
-                Item "Insert Optional Parameter" "math-macro-add-optional-param"
-                Item "Remove Optional Parameter" "math-macro-remove-optional-param"
+		Item "Make First Non-Optional into Optional Argument" "math-macro-make-optional"
+		Item "Make Last Optional into Non-Optional Argument" "math-macro-make-nonoptional"
+                Item "Insert Optional Argument" "math-macro-add-optional-param"
+                Item "Remove Optional Argument" "math-macro-remove-optional-param"
 		Separator
-		Item "Append Parameter Eating From The Right" "math-macro-append-greedy-param"
-                Item "Append Optional Parameter Eating From The Right" "math-macro-add-greedy-optional-param"
-		Item "Remove Last Parameter Spitting Out To The Right" "math-macro-remove-greedy-param"
+		Item "Append Argument Eating From The Right" "math-macro-append-greedy-param"
+                Item "Append Optional Argument Eating From The Right" "math-macro-add-greedy-optional-param"
+		Item "Remove Last Argument Spitting Out To The Right" "math-macro-remove-greedy-param"
 	End
 
 	Menu "edit_math_limits"
diff --git a/lib/ui/stdtoolbars.inc b/lib/ui/stdtoolbars.inc
index b233a74b4d..889a8a622e 100644
--- a/lib/ui/stdtoolbars.inc
+++ b/lib/ui/stdtoolbars.inc
@@ -167,18 +167,18 @@ ToolbarSet
 	End
 
 	Toolbar "mathmacrotemplate" "Math Macros"
-		Item "Remove Last Parameter" "math-macro-remove-param"
-		Item "Append Parameter" "math-macro-add-param"
+		Item "Remove Last Argument" "math-macro-remove-param"
+		Item "Append Argument" "math-macro-add-param"
                 Separator
-		Item "Make First Non-Optional into Optional Parameter" "math-macro-make-optional"
-		Item "Make Last Optional into Non-Optional Parameter"
+		Item "Make First Non-Optional into Optional Argument" "math-macro-make-optional"
+		Item "Make Last Optional into Non-Optional Argument"
 		"math-macro-make-nonoptional"
-                Item "Remove Optional Parameter" "math-macro-remove-optional-param"
-                Item "Insert Optional Parameter" "math-macro-add-optional-param"
+                Item "Remove Optional Argument" "math-macro-remove-optional-param"
+                Item "Insert Optional Argument" "math-macro-add-optional-param"
 		Separator
-		Item "Remove Last Parameter Spitting Out To The Right" "math-macro-remove-greedy-param"
-		Item "Append Parameter Eating From The Right" "math-macro-append-greedy-param"
-                Item "Append Optional Parameter Eating From The Right" "math-macro-add-greedy-optional-param"
+		Item "Remove Last Argument Spitting Out To The Right" "math-macro-remove-greedy-param"
+		Item "Append Argument Eating From The Right" "math-macro-append-greedy-param"
+                Item "Append Optional Argument Eating From The Right" "math-macro-add-greedy-optional-param"
 	End
 	
 	Toolbar "minibuffer" "Command Buffer"