diff --git a/src/lammps.cpp b/src/lammps.cpp
index 7d5a726ac3..984c8307fa 100644
--- a/src/lammps.cpp
+++ b/src/lammps.cpp
@@ -372,7 +372,7 @@ LAMMPS::LAMMPS(int narg, char **arg, MPI_Comm communicator)
   // if helpflag set, print help and exit
 
   if (helpflag) {
-    if (me == 0) print_styles();
+    if (universe->me == 0) print_styles();
     error->done();
   }
 }
@@ -490,94 +490,103 @@ void LAMMPS::destroy()
 
 void LAMMPS::print_styles()
 {
-  printf("Pair styles:\n");
+  printf("\nList of style options included in this executable:\n\n");
 
+  printf("Atom styles:");
+#define ATOM_CLASS
+#define AtomStyle(key,Class) printf(" %s",#key);
+#include "style_atom.h"
+#undef ATOM_CLASS
+  printf("\n\n");
+
+  printf("Integrate styles:");
+#define INTEGRATE_CLASS
+#define IntegrateStyle(key,Class) printf(" %s",#key);
+#include "style_integrate.h"
+#undef INTEGRATE_CLASS
+  printf("\n\n");
+
+  printf("Minimize styles:");
+#define MINIMIZE_CLASS
+#define MinimizeStyle(key,Class) printf(" %s",#key);
+#include "style_minimize.h"
+#undef MINIMIZE_CLASS
+  printf("\n\n");
+
+  printf("Pair styles:");
 #define PAIR_CLASS
 #define PairStyle(key,Class) printf(" %s",#key);
 #include "style_pair.h"
 #undef PAIR_CLASS
+  printf("\n\n");
 
-  printf("\n");
-
-  printf("Bond styles:\n");
-
+  printf("Bond styles:");
 #define BOND_CLASS
 #define BondStyle(key,Class) printf(" %s",#key);
 #include "style_bond.h"
 #undef BOND_CLASS
+  printf("\n\n");
 
-  printf("\n");
-
-  printf("Angle styles:\n");
-
+  printf("Angle styles:");
 #define ANGLE_CLASS
 #define AngleStyle(key,Class) printf(" %s",#key);
 #include "style_angle.h"
 #undef ANGLE_CLASS
+  printf("\n\n");
 
-  printf("\n");
-
-  printf("Dihedral styles:\n");
-
+  printf("Dihedral styles:");
 #define DIHEDRAL_CLASS
 #define DihedralStyle(key,Class) printf(" %s",#key);
 #include "style_dihedral.h"
 #undef DIHEDRAL_CLASS
+  printf("\n\n");
 
-  printf("\n");
-
-  printf("Improper styles:\n");
-
+  printf("Improper styles:");
 #define IMPROPER_CLASS
 #define ImproperStyle(key,Class) printf(" %s",#key);
 #include "style_improper.h"
 #undef IMPROPER_CLASS
+  printf("\n\n");
 
-  printf("\n");
-
-  printf("Fix styles:\n");
+  printf("KSpace styles:");
+#define KSPACE_CLASS
+#define KSpaceStyle(key,Class) printf(" %s",#key);
+#include "style_kspace.h"
+#undef KSPACE_CLASS
+  printf("\n\n");
 
+  printf("Fix styles (all caps are only for internal use):");
 #define FIX_CLASS
 #define FixStyle(key,Class) printf(" %s",#key);
 #include "style_fix.h"
 #undef FIX_CLASS
+  printf("\n\n");
 
-  printf("\n");
-
-  printf("Fix styles:\n");
-
+  printf("Compute styles:");
 #define COMPUTE_CLASS
 #define ComputeStyle(key,Class) printf(" %s",#key);
 #include "style_compute.h"
 #undef COMPUTE_CLASS
+  printf("\n\n");
 
-  printf("\n");
-
-  printf("Commands:\n");
-
-#define COMMAND_CLASS
-#define CommandStyle(key,Class) printf(" %s",#key);
-#include "style_command.h"
-#undef COMMAND_CLASS
-
-  printf("\n");
-
-  printf("Region styles:\n");
-
+  printf("Region styles:");
 #define REGION_CLASS
 #define RegionStyle(key,Class) printf(" %s",#key);
 #include "style_region.h"
 #undef REGION_CLASS
+  printf("\n\n");
 
-  printf("\n");
-
-  printf("Dump styles:\n");
-
+  printf("Dump styles:");
 #define DUMP_CLASS
 #define DumpStyle(key,Class) printf(" %s",#key);
 #include "style_dump.h"
 #undef DUMP_CLASS
+  printf("\n\n");
 
+  printf("Command styles (add-on input script commands):");
+#define COMMAND_CLASS
+#define CommandStyle(key,Class) printf(" %s",#key);
+#include "style_command.h"
+#undef COMMAND_CLASS
   printf("\n");
 }
-