diff --git a/FL/Fl_Counter.H b/FL/Fl_Counter.H
index eaa71f5b4..7553416e7 100644
--- a/FL/Fl_Counter.H
+++ b/FL/Fl_Counter.H
@@ -1,7 +1,7 @@
 //
 // Counter header file for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2022 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -34,7 +34,7 @@
   Controls a single floating point value with button (or keyboard) arrows.
   Double arrows buttons achieve larger steps than simple arrows.
   \see Fl_Spinner for value input with vertical step arrows.
-  <P align=center>\image html counter.png</P>
+  \image html counter.png
   \image latex counter.png "Fl_Counter" width=4cm
 
   \todo Refactor the doxygen comments for Fl_Counter type() documentation.
diff --git a/FL/Fl_Dial.H b/FL/Fl_Dial.H
index d88416164..e11d3cb26 100644
--- a/FL/Fl_Dial.H
+++ b/FL/Fl_Dial.H
@@ -1,7 +1,7 @@
 //
 // Dial header file for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2022 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -32,7 +32,7 @@
 /**
   The Fl_Dial widget provides a circular dial to control a
   single floating point value.
-  <P ALIGN=CENTER>\image html dial.png
+  \image html dial.png
   \image latex dial.png "Fl_Dial" width=4cm
   Use type() to set the type of the dial to:
   <UL>
diff --git a/FL/Fl_File_Input.H b/FL/Fl_File_Input.H
index 256157afb..5b2d781cb 100644
--- a/FL/Fl_File_Input.H
+++ b/FL/Fl_File_Input.H
@@ -1,7 +1,7 @@
 //
 // File_Input header file for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2022 by Bill Spitzak and others.
 // Original version Copyright 1998 by Curtis Edwards.
 //
 // This library is free software. Distribution and use rights are outlined in
@@ -34,7 +34,7 @@
   FL_WHEN_RELEASE callback won't be called if the directory clicked
   is the same as the current one.
 
-  <P align=CENTER> \image html Fl_File_Input.png </P>
+  \image html Fl_File_Input.png
   \image latex Fl_File_Input.png "Fl_File_Input"  width=6cm
 
   \note As all Fl_Input derived objects, Fl_File_Input may call its callback
diff --git a/FL/Fl_Light_Button.H b/FL/Fl_Light_Button.H
index 2a3ca1007..2794073f3 100644
--- a/FL/Fl_Light_Button.H
+++ b/FL/Fl_Light_Button.H
@@ -1,7 +1,7 @@
 //
 // Lighted button header file for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2022 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -30,7 +30,7 @@
 
   Buttons generate callbacks when they are clicked by the user.  You
   control exactly when and how by changing the values for type() and when().
-  <P ALIGN=CENTER>\image html Fl_Light_Button.png</P>
+  \image html  Fl_Light_Button.png
   \image latex Fl_Light_Button.png "Fl_Light_Button" width=4cm
 */
 class FL_EXPORT Fl_Light_Button : public Fl_Button {
diff --git a/FL/Fl_Menu_Button.H b/FL/Fl_Menu_Button.H
index 947f849bb..7eb8e17ff 100644
--- a/FL/Fl_Menu_Button.H
+++ b/FL/Fl_Menu_Button.H
@@ -26,7 +26,7 @@
   This is a button that when pushed pops up a menu (or hierarchy of
   menus) defined by an array of
   Fl_Menu_Item objects.
-  <P ALIGN=CENTER>\image html  menu_button.png</P>
+  \image html  menu_button.png
   \image latex  menu_button.png " menu_button" width=5cm
   <P>Normally any mouse button will pop up a menu and it is lined up
   below the button as shown in the picture.  However an Fl_Menu_Button
diff --git a/FL/Fl_Output.H b/FL/Fl_Output.H
index 06dfeb650..099afbedf 100644
--- a/FL/Fl_Output.H
+++ b/FL/Fl_Output.H
@@ -1,7 +1,7 @@
 //
 // Output header file for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2011 by Bill Spitzak and others.
+// Copyright 1998-2022 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -29,7 +29,7 @@
   portions of the text using the mouse and paste the contents into other
   fields or programs.
 
-  <P align=CENTER>\image html text.png</P>
+  \image html text.png
   \image latex text.png "Fl_Output" width=8cm
 
   There is a single subclass, Fl_Multiline_Output, which allows you to
diff --git a/FL/Fl_Positioner.H b/FL/Fl_Positioner.H
index 02d872e03..17963f614 100644
--- a/FL/Fl_Positioner.H
+++ b/FL/Fl_Positioner.H
@@ -1,7 +1,7 @@
 //
 // Positioner header file for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2022 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -29,8 +29,8 @@
   It would be useful if this could be put atop another widget so that the
   crosshairs are on top, but this is not implemented.  The color of the
   crosshairs is selection_color().
-  <P ALIGN=CENTER>\image html  positioner.png </P>
-  \image latex  positioner.png " Fl_Positioner" width=4cm
+  \image html  positioner.png
+  \image latex positioner.png "Fl_Positioner" width=4cm
 */
 class FL_EXPORT Fl_Positioner : public Fl_Widget {
 
diff --git a/FL/Fl_Return_Button.H b/FL/Fl_Return_Button.H
index 845b15f7d..d998dd31f 100644
--- a/FL/Fl_Return_Button.H
+++ b/FL/Fl_Return_Button.H
@@ -1,7 +1,7 @@
 //
 // Return button header file for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2022 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -25,7 +25,7 @@
   The Fl_Return_Button is a subclass of Fl_Button that
   generates a callback when it is pressed or when the user presses the
   Enter key.  A carriage-return symbol is drawn next to the button label.
-  <P ALIGN=CENTER>\image html Fl_Return_Button.png
+  \image html Fl_Return_Button.png
   \image latex Fl_Return_Button.png "Fl_Return_Button" width=4cm
 */
 class FL_EXPORT Fl_Return_Button : public Fl_Button {
diff --git a/FL/Fl_Roller.H b/FL/Fl_Roller.H
index 4eeabd300..bd37a886c 100644
--- a/FL/Fl_Roller.H
+++ b/FL/Fl_Roller.H
@@ -1,7 +1,7 @@
 //
 // Roller header file for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2022 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -32,7 +32,7 @@
   corresponding arrow keys when the roller has the keyboard focus, or by the
   mousewheels when the mouse pointer is positioned over the roller widget.
 
-  <P ALIGN=CENTER>\image html Fl_Roller.png
+  \image html Fl_Roller.png
   \image latex Fl_Roller.png "Fl_Roller" width=4cm
 */
 class FL_EXPORT Fl_Roller : public Fl_Valuator {
diff --git a/FL/Fl_Round_Button.H b/FL/Fl_Round_Button.H
index 8c84e44cf..4994f56ec 100644
--- a/FL/Fl_Round_Button.H
+++ b/FL/Fl_Round_Button.H
@@ -1,7 +1,7 @@
 //
 // Round button header file for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2014 by Bill Spitzak and others.
+// Copyright 1998-2022 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file. If this
@@ -23,9 +23,9 @@
   Buttons generate callbacks when they are clicked by the user.  You
   control exactly when and how by changing the values for type()
   and when().
-  <P ALIGN=CENTER>\image html Fl_Round_Button.png</P>
-  \image latex  Fl_Round_Button.png " Fl_Round_Button" width=4cm
-  <P>The Fl_Round_Button subclass display the "on" state by
+  \image html  Fl_Round_Button.png
+  \image latex Fl_Round_Button.png "Fl_Round_Button" width=4cm
+  The Fl_Round_Button subclass displays the "on" state by
   turning on a light, rather than drawing pushed in.  The shape of the
   "light" is initially set to FL_ROUND_DOWN_BOX.  The color of the light
   when on is controlled with selection_color(), which defaults to
diff --git a/FL/Fl_Simple_Counter.H b/FL/Fl_Simple_Counter.H
index 1ec214740..a91f349d3 100644
--- a/FL/Fl_Simple_Counter.H
+++ b/FL/Fl_Simple_Counter.H
@@ -1,7 +1,7 @@
 //
 // Simple counter header file for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2022 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -23,7 +23,7 @@
 #include "Fl_Counter.H"
 /**
   This widget creates a counter with only 2 arrow buttons
-  <P align=center>\image html counter.png</P>
+  \image html counter.png
   \image latex  counter.png "Fl_Simple_Counter" width=4cm
 */
 class FL_EXPORT Fl_Simple_Counter : public Fl_Counter {
diff --git a/FL/Fl_Valuator.H b/FL/Fl_Valuator.H
index d8288b7ed..9eaf2eaac 100644
--- a/FL/Fl_Valuator.H
+++ b/FL/Fl_Valuator.H
@@ -1,7 +1,7 @@
 //
 // Valuator header file for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2016 by Bill Spitzak and others.
+// Copyright 1998-2022 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -35,7 +35,7 @@
 
   There are probably more of these classes in FLTK than any others:
 
-  <P ALIGN=CENTER>\image html valuators.png</P>
+  \image html  valuators.png
   \image latex valuators.png "Valuators derived from Fl_Valuators" width=10cm
 
   In the above diagram each box surrounds an actual subclass.  These
diff --git a/FL/Fl_Value_Input.H b/FL/Fl_Value_Input.H
index 995b36a00..03f9814b3 100644
--- a/FL/Fl_Value_Input.H
+++ b/FL/Fl_Value_Input.H
@@ -1,7 +1,7 @@
 //
 // Value input header file for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2022 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -44,12 +44,13 @@
   is therefore impossible to select text by dragging across it,
   although clicking can still move the insertion cursor.</P>
 
-  <P>If step() is non-zero and integral, then the range
+  If step() is non-zero and integral, then the range
   of numbers are limited to integers instead of floating point
   values.
 
-  <P ALIGN="CENTER">\image html Fl_Value_Input.png
+  \image html Fl_Value_Input.png
   \image latex  Fl_Value_Input.png "Fl_Value_Input" width=4cm
+
   \see Fl_Widget::shortcut_label(int)
 */
 class FL_EXPORT Fl_Value_Input : public Fl_Valuator {
diff --git a/FL/Fl_Value_Output.H b/FL/Fl_Value_Output.H
index 6a2e7e900..c78383286 100644
--- a/FL/Fl_Value_Output.H
+++ b/FL/Fl_Value_Output.H
@@ -1,7 +1,7 @@
 //
 // Value output header file for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2022 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -33,8 +33,8 @@
   <P>This is much lighter-weight than
   Fl_Value_Input because it contains no text editing code or
   character buffer. </P>
-  <P ALIGN=CENTER>\image html Fl_Value_Output.png
-  \image latex  Fl_Value_Output.png "Fl_Value_Output" width=4cm
+  \image html  Fl_Value_Output.png
+  \image latex Fl_Value_Output.png "Fl_Value_Output" width=4cm
 */
 class FL_EXPORT Fl_Value_Output : public Fl_Valuator {
   Fl_Font textfont_;
diff --git a/FL/Fl_Value_Slider.H b/FL/Fl_Value_Slider.H
index b139de71b..53d264de7 100644
--- a/FL/Fl_Value_Slider.H
+++ b/FL/Fl_Value_Slider.H
@@ -1,7 +1,7 @@
 //
 // Value slider header file for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2022 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -25,7 +25,7 @@
 /**
   The Fl_Value_Slider widget is a Fl_Slider widget
   with a box displaying the current value.
-  <P ALIGN=CENTER>\image html value_slider.png
+  \image html value_slider.png
   \image latex  value_slider.png "Fl_Value_Slider" width=4cm
 */
 class FL_EXPORT Fl_Value_Slider : public Fl_Slider {
diff --git a/src/Fl_Help_Dialog_Dox.cxx b/src/Fl_Help_Dialog_Dox.cxx
index 9461d9e23..5be2a9fcc 100644
--- a/src/Fl_Help_Dialog_Dox.cxx
+++ b/src/Fl_Help_Dialog_Dox.cxx
@@ -1,7 +1,7 @@
 //
 // Fl_Help_Dialog dialog for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2022 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -23,8 +23,8 @@
   The Fl_Help_Dialog class is not part of the FLTK core library, but instead
   of \em fltk_images. Use \c --use-images when compiling with \c fltk-config .
 
-  <P ALIGN=CENTER> \image html Fl_Help_Dialog.png </P>
-  \image latex  Fl_Help_Dialog.png "Fl_Help_Dialog" width=8cm
+  \image html  Fl_Help_Dialog.png </P>
+  \image latex Fl_Help_Dialog.png "Fl_Help_Dialog" width=8cm
 */
 
 /** \fn Fl_Help_Dialog::Fl_Help_Dialog()