diff --git a/doc/src/Commands.rst b/doc/src/Commands.rst
index 79fa30003d..f192d6a59d 100644
--- a/doc/src/Commands.rst
+++ b/doc/src/Commands.rst
@@ -21,9 +21,6 @@ commands in it are used to define a LAMMPS simulation.
    Commands_compute
    Commands_pair
    Commands_bond
-   Commands_angle
-   Commands_dihedral
-   Commands_improper
    Commands_kspace
 
 .. toctree::
diff --git a/doc/src/Commands_all.rst b/doc/src/Commands_all.rst
index b9f5578137..d47c3299d0 100644
--- a/doc/src/Commands_all.rst
+++ b/doc/src/Commands_all.rst
@@ -5,10 +5,10 @@
    * :doc:`Fix styles <Commands_fix>`
    * :doc:`Compute styles <Commands_compute>`
    * :doc:`Pair styles <Commands_pair>`
-   * :doc:`Bond styles <Commands_bond>`
-   * :doc:`Angle styles <Commands_angle>`
-   * :doc:`Dihedral styles <Commands_dihedral>`
-   * :doc:`Improper styles <Commands_improper>`
+   * :ref:`Bond styles <bond>`
+   * :ref:`Angle styles <angle>`
+   * :ref:`Dihedral styles <dihedral>`
+   * :ref:`Improper styles <improper>`
    * :doc:`KSpace styles <Commands_kspace>`
 
 General commands
diff --git a/doc/src/Commands_angle.rst b/doc/src/Commands_angle.rst
deleted file mode 100644
index ca5e96d57e..0000000000
--- a/doc/src/Commands_angle.rst
+++ /dev/null
@@ -1,55 +0,0 @@
-.. table_from_list::
-   :columns: 3
-
-   * :doc:`General commands <Commands_all>`
-   * :doc:`Fix styles <Commands_fix>`
-   * :doc:`Compute styles <Commands_compute>`
-   * :doc:`Pair styles <Commands_pair>`
-   * :doc:`Bond styles <Commands_bond>`
-   * :doc:`Angle styles <Commands_angle>`
-   * :doc:`Dihedral styles <Commands_dihedral>`
-   * :doc:`Improper styles <Commands_improper>`
-   * :doc:`KSpace styles <Commands_kspace>`
-
-
-.. _angle:
-
-Angle\_style potentials
-=======================
-
-All LAMMPS :doc:`angle_style <angle_style>` commands.  Some styles have
-accelerated versions.  This is indicated by additional letters in
-parenthesis: g = GPU, i = USER-INTEL, k = KOKKOS, o = USER-OMP, t =
-OPT.
-
-.. table_from_list::
-   :columns: 4
-
-   * :doc:`none <angle_none>`
-   * :doc:`zero <angle_zero>`
-   * :doc:`hybrid <angle_hybrid>`
-   *
-   *
-   *
-   *
-   *
-   * :doc:`charmm (iko) <angle_charmm>`
-   * :doc:`class2 (ko) <angle_class2>`
-   * :doc:`class2/p6 <angle_class2>`
-   * :doc:`cosine (ko) <angle_cosine>`
-   * :doc:`cosine/buck6d <angle_cosine_buck6d>`
-   * :doc:`cosine/delta (o) <angle_cosine_delta>`
-   * :doc:`cosine/periodic (o) <angle_cosine_periodic>`
-   * :doc:`cosine/shift (o) <angle_cosine_shift>`
-   * :doc:`cosine/shift/exp (o) <angle_cosine_shift_exp>`
-   * :doc:`cosine/squared (o) <angle_cosine_squared>`
-   * :doc:`cross <angle_cross>`
-   * :doc:`dipole (o) <angle_dipole>`
-   * :doc:`fourier (o) <angle_fourier>`
-   * :doc:`fourier/simple (o) <angle_fourier_simple>`
-   * :doc:`harmonic (iko) <angle_harmonic>`
-   * :doc:`mm3 <angle_mm3>`
-   * :doc:`quartic (o) <angle_quartic>`
-   * :doc:`sdk (o) <angle_sdk>`
-   * :doc:`table (o) <angle_table>`
-   *
diff --git a/doc/src/Commands_bond.rst b/doc/src/Commands_bond.rst
index a7e22274e9..dbf7344394 100644
--- a/doc/src/Commands_bond.rst
+++ b/doc/src/Commands_bond.rst
@@ -5,18 +5,18 @@
    * :doc:`Fix styles <Commands_fix>`
    * :doc:`Compute styles <Commands_compute>`
    * :doc:`Pair styles <Commands_pair>`
-   * :doc:`Bond styles <Commands_bond>`
-   * :doc:`Angle styles <Commands_angle>`
-   * :doc:`Dihedral styles <Commands_dihedral>`
-   * :doc:`Improper styles <Commands_improper>`
+   * :ref:`Bond styles <bond>`
+   * :ref:`Angle styles <angle>`
+   * :ref:`Dihedral styles <dihedral>`
+   * :ref:`Improper styles <improper>`
    * :doc:`KSpace styles <Commands_kspace>`
 
 .. _bond:
 
-Bond\_style potentials
-=================================
+bond_style potentials
+=====================
 
-All LAMMPS :doc:`bond\_style <bond_style>` commands.  Some styles have
+All LAMMPS :doc:`bond_style <bond_style>` commands.  Some styles have
 accelerated versions.  This is indicated by additional letters in
 parenthesis: g = GPU, i = USER-INTEL, k = KOKKOS, o = USER-OMP, t =
 OPT.
@@ -48,3 +48,122 @@ OPT.
    * :doc:`table (o) <bond_table>`
    *
    *
+
+---
+
+.. _angle:
+
+angle_style potentials
+======================
+
+All LAMMPS :doc:`angle_style <angle_style>` commands.  Some styles have
+accelerated versions.  This is indicated by additional letters in
+parenthesis: g = GPU, i = USER-INTEL, k = KOKKOS, o = USER-OMP, t =
+OPT.
+
+.. table_from_list::
+   :columns: 4
+
+   * :doc:`none <angle_none>`
+   * :doc:`zero <angle_zero>`
+   * :doc:`hybrid <angle_hybrid>`
+   *
+   *
+   *
+   *
+   *
+   * :doc:`charmm (iko) <angle_charmm>`
+   * :doc:`class2 (ko) <angle_class2>`
+   * :doc:`class2/p6 <angle_class2>`
+   * :doc:`cosine (ko) <angle_cosine>`
+   * :doc:`cosine/buck6d <angle_cosine_buck6d>`
+   * :doc:`cosine/delta (o) <angle_cosine_delta>`
+   * :doc:`cosine/periodic (o) <angle_cosine_periodic>`
+   * :doc:`cosine/shift (o) <angle_cosine_shift>`
+   * :doc:`cosine/shift/exp (o) <angle_cosine_shift_exp>`
+   * :doc:`cosine/squared (o) <angle_cosine_squared>`
+   * :doc:`cross <angle_cross>`
+   * :doc:`dipole (o) <angle_dipole>`
+   * :doc:`fourier (o) <angle_fourier>`
+   * :doc:`fourier/simple (o) <angle_fourier_simple>`
+   * :doc:`harmonic (iko) <angle_harmonic>`
+   * :doc:`mm3 <angle_mm3>`
+   * :doc:`quartic (o) <angle_quartic>`
+   * :doc:`sdk (o) <angle_sdk>`
+   * :doc:`table (o) <angle_table>`
+   *
+
+---
+
+.. _dihedral:
+
+dihedral_style potentials
+=========================
+
+All LAMMPS :doc:`dihedral_style <dihedral_style>` commands.  Some styles
+have accelerated versions.  This is indicated by additional letters in
+parenthesis: g = GPU, i = USER-INTEL, k = KOKKOS, o = USER-OMP, t =
+OPT.
+
+
+.. table_from_list::
+   :columns: 4
+
+   * :doc:`none <dihedral_none>`
+   * :doc:`zero <dihedral_zero>`
+   * :doc:`hybrid <dihedral_hybrid>`
+   *
+   *
+   *
+   *
+   *
+   * :doc:`charmm (iko) <dihedral_charmm>`
+   * :doc:`charmmfsw <dihedral_charmm>`
+   * :doc:`class2 (ko) <dihedral_class2>`
+   * :doc:`cosine/shift/exp (o) <dihedral_cosine_shift_exp>`
+   * :doc:`fourier (io) <dihedral_fourier>`
+   * :doc:`harmonic (iko) <dihedral_harmonic>`
+   * :doc:`helix (o) <dihedral_helix>`
+   * :doc:`multi/harmonic (o) <dihedral_multi_harmonic>`
+   * :doc:`nharmonic (o) <dihedral_nharmonic>`
+   * :doc:`opls (iko) <dihedral_opls>`
+   * :doc:`quadratic (o) <dihedral_quadratic>`
+   * :doc:`spherical <dihedral_spherical>`
+   * :doc:`table (o) <dihedral_table>`
+   * :doc:`table/cut <dihedral_table_cut>`
+   *
+   *
+
+.. _improper:
+
+improper_style potentials
+=========================
+
+All LAMMPS :doc:`improper\_style <improper_style>` commands.  Some styles
+have accelerated versions.  This is indicated by additional letters in
+parenthesis: g = GPU, i = USER-INTEL, k = KOKKOS, o = USER-OMP, t =
+OPT.
+
+.. table_from_list::
+   :columns: 4
+
+   * :doc:`none <improper_none>`
+   * :doc:`zero <improper_zero>`
+   * :doc:`hybrid <improper_hybrid>`
+   *
+   *
+   *
+   *
+   *
+   * :doc:`class2 (ko) <improper_class2>`
+   * :doc:`cossq (o) <improper_cossq>`
+   * :doc:`cvff (io) <improper_cvff>`
+   * :doc:`distance <improper_distance>`
+   * :doc:`distharm <improper_distharm>`
+   * :doc:`fourier (o) <improper_fourier>`
+   * :doc:`harmonic (iko) <improper_harmonic>`
+   * :doc:`inversion/harmonic <improper_inversion_harmonic>`
+   * :doc:`ring (o) <improper_ring>`
+   * :doc:`sqdistharm <improper_sqdistharm>`
+   * :doc:`umbrella (o) <improper_umbrella>`
+   *
diff --git a/doc/src/Commands_compute.rst b/doc/src/Commands_compute.rst
index 1b3465eb53..a5093f1985 100644
--- a/doc/src/Commands_compute.rst
+++ b/doc/src/Commands_compute.rst
@@ -5,10 +5,10 @@
    * :doc:`Fix styles <Commands_fix>`
    * :doc:`Compute styles <Commands_compute>`
    * :doc:`Pair styles <Commands_pair>`
-   * :doc:`Bond styles <Commands_bond>`
-   * :doc:`Angle styles <Commands_angle>`
-   * :doc:`Dihedral styles <Commands_dihedral>`
-   * :doc:`Improper styles <Commands_improper>`
+   * :ref:`Bond styles <bond>`
+   * :ref:`Angle styles <angle>`
+   * :ref:`Dihedral styles <dihedral>`
+   * :ref:`Improper styles <improper>`
    * :doc:`KSpace styles <Commands_kspace>`
 
 Compute commands
diff --git a/doc/src/Commands_dihedral.rst b/doc/src/Commands_dihedral.rst
deleted file mode 100644
index 84ddb3d004..0000000000
--- a/doc/src/Commands_dihedral.rst
+++ /dev/null
@@ -1,51 +0,0 @@
-.. table_from_list::
-   :columns: 3
-
-   * :doc:`General commands <Commands_all>`
-   * :doc:`Fix styles <Commands_fix>`
-   * :doc:`Compute styles <Commands_compute>`
-   * :doc:`Pair styles <Commands_pair>`
-   * :doc:`Bond styles <Commands_bond>`
-   * :doc:`Angle styles <Commands_angle>`
-   * :doc:`Dihedral styles <Commands_dihedral>`
-   * :doc:`Improper styles <Commands_improper>`
-   * :doc:`KSpace styles <Commands_kspace>`
-
-.. _dihedral:
-
-Dihedral\_style potentials
-==========================
-
-All LAMMPS :doc:`dihedral_style <dihedral_style>` commands.  Some styles
-have accelerated versions.  This is indicated by additional letters in
-parenthesis: g = GPU, i = USER-INTEL, k = KOKKOS, o = USER-OMP, t =
-OPT.
-
-
-.. table_from_list::
-   :columns: 4
-
-   * :doc:`none <dihedral_none>`
-   * :doc:`zero <dihedral_zero>`
-   * :doc:`hybrid <dihedral_hybrid>`
-   *
-   *
-   *
-   *
-   *
-   * :doc:`charmm (iko) <dihedral_charmm>`
-   * :doc:`charmmfsw <dihedral_charmm>`
-   * :doc:`class2 (ko) <dihedral_class2>`
-   * :doc:`cosine/shift/exp (o) <dihedral_cosine_shift_exp>`
-   * :doc:`fourier (io) <dihedral_fourier>`
-   * :doc:`harmonic (iko) <dihedral_harmonic>`
-   * :doc:`helix (o) <dihedral_helix>`
-   * :doc:`multi/harmonic (o) <dihedral_multi_harmonic>`
-   * :doc:`nharmonic (o) <dihedral_nharmonic>`
-   * :doc:`opls (iko) <dihedral_opls>`
-   * :doc:`quadratic (o) <dihedral_quadratic>`
-   * :doc:`spherical <dihedral_spherical>`
-   * :doc:`table (o) <dihedral_table>`
-   * :doc:`table/cut <dihedral_table_cut>`
-   *
-   *
diff --git a/doc/src/Commands_fix.rst b/doc/src/Commands_fix.rst
index 11ae9a4a38..4cd9a4487c 100644
--- a/doc/src/Commands_fix.rst
+++ b/doc/src/Commands_fix.rst
@@ -5,10 +5,10 @@
    * :doc:`Fix styles <Commands_fix>`
    * :doc:`Compute styles <Commands_compute>`
    * :doc:`Pair styles <Commands_pair>`
-   * :doc:`Bond styles <Commands_bond>`
-   * :doc:`Angle styles <Commands_angle>`
-   * :doc:`Dihedral styles <Commands_dihedral>`
-   * :doc:`Improper styles <Commands_improper>`
+   * :ref:`Bond styles <bond>`
+   * :ref:`Angle styles <angle>`
+   * :ref:`Dihedral styles <dihedral>`
+   * :ref:`Improper styles <improper>`
    * :doc:`KSpace styles <Commands_kspace>`
 
 Fix commands
diff --git a/doc/src/Commands_improper.rst b/doc/src/Commands_improper.rst
deleted file mode 100644
index 7bbfa5b01b..0000000000
--- a/doc/src/Commands_improper.rst
+++ /dev/null
@@ -1,46 +0,0 @@
-.. table_from_list::
-   :columns: 3
-
-   * :doc:`General commands <Commands_all>`
-   * :doc:`Fix styles <Commands_fix>`
-   * :doc:`Compute styles <Commands_compute>`
-   * :doc:`Pair styles <Commands_pair>`
-   * :doc:`Bond styles <Commands_bond>`
-   * :doc:`Angle styles <Commands_angle>`
-   * :doc:`Dihedral styles <Commands_dihedral>`
-   * :doc:`Improper styles <Commands_improper>`
-   * :doc:`KSpace styles <Commands_kspace>`
-
-.. _improper:
-
-Improper\_style potentials
-=========================================
-
-All LAMMPS :doc:`improper\_style <improper_style>` commands.  Some styles
-have accelerated versions.  This is indicated by additional letters in
-parenthesis: g = GPU, i = USER-INTEL, k = KOKKOS, o = USER-OMP, t =
-OPT.
-
-.. table_from_list::
-   :columns: 4
-
-   * :doc:`none <improper_none>`
-   * :doc:`zero <improper_zero>`
-   * :doc:`hybrid <improper_hybrid>`
-   *
-   *
-   *
-   *
-   *
-   * :doc:`class2 (ko) <improper_class2>`
-   * :doc:`cossq (o) <improper_cossq>`
-   * :doc:`cvff (io) <improper_cvff>`
-   * :doc:`distance <improper_distance>`
-   * :doc:`distharm <improper_distharm>`
-   * :doc:`fourier (o) <improper_fourier>`
-   * :doc:`harmonic (iko) <improper_harmonic>`
-   * :doc:`inversion/harmonic <improper_inversion_harmonic>`
-   * :doc:`ring (o) <improper_ring>`
-   * :doc:`sqdistharm <improper_sqdistharm>`
-   * :doc:`umbrella (o) <improper_umbrella>`
-   *
diff --git a/doc/src/Commands_kspace.rst b/doc/src/Commands_kspace.rst
index 62e97f1a6a..fc2418ecf7 100644
--- a/doc/src/Commands_kspace.rst
+++ b/doc/src/Commands_kspace.rst
@@ -5,10 +5,10 @@
    * :doc:`Fix styles <Commands_fix>`
    * :doc:`Compute styles <Commands_compute>`
    * :doc:`Pair styles <Commands_pair>`
-   * :doc:`Bond styles <Commands_bond>`
-   * :doc:`Angle styles <Commands_angle>`
-   * :doc:`Dihedral styles <Commands_dihedral>`
-   * :doc:`Improper styles <Commands_improper>`
+   * :ref:`Bond styles <bond>`
+   * :ref:`Angle styles <angle>`
+   * :ref:`Dihedral styles <dihedral>`
+   * :ref:`Improper styles <improper>`
    * :doc:`KSpace styles <Commands_kspace>`
 
 KSpace solvers
diff --git a/doc/src/Commands_pair.rst b/doc/src/Commands_pair.rst
index c65164c02d..b4371420a7 100644
--- a/doc/src/Commands_pair.rst
+++ b/doc/src/Commands_pair.rst
@@ -5,10 +5,10 @@
    * :doc:`Fix styles <Commands_fix>`
    * :doc:`Compute styles <Commands_compute>`
    * :doc:`Pair styles <Commands_pair>`
-   * :doc:`Bond styles <Commands_bond>`
-   * :doc:`Angle styles <Commands_angle>`
-   * :doc:`Dihedral styles <Commands_dihedral>`
-   * :doc:`Improper styles <Commands_improper>`
+   * :ref:`Bond styles <bond>`
+   * :ref:`Angle styles <angle>`
+   * :ref:`Dihedral styles <dihedral>`
+   * :ref:`Improper styles <improper>`
    * :doc:`KSpace styles <Commands_kspace>`
 
 Pair\_style potentials