diff --git a/etc/caseDicts/annotated/topoSetDict b/etc/caseDicts/annotated/topoSetDict
index 22792d3f6b..2c17763e27 100644
--- a/etc/caseDicts/annotated/topoSetDict
+++ b/etc/caseDicts/annotated/topoSetDict
@@ -24,7 +24,7 @@ actions
         type    cellSet;
         name    c0;
         source  labelToCell;
-        value (12 13 56);
+        value   (12 13 56);
     }
 
     // Get all faces in cellSet
@@ -43,7 +43,7 @@ actions
         type    cellSet;
         name    c1;
         source  cellToCell;
-        set c0;
+        set     c0;
     }
     {
         name    c1;
@@ -68,7 +68,7 @@ actions
         type    cellZoneSet;
         name    c0;
         source  boxToCell;
-        box   (0.04 0 0)(0.06 100 100);
+        box     (0.04 0 0)(0.06 100 100);
     }
 );
 
diff --git a/etc/caseDicts/mesh/manipulation/refineRegion/topoSetDict b/etc/caseDicts/mesh/manipulation/refineRegion/topoSetDict
index bfb0680ad1..28650bcaec 100644
--- a/etc/caseDicts/mesh/manipulation/refineRegion/topoSetDict
+++ b/etc/caseDicts/mesh/manipulation/refineRegion/topoSetDict
@@ -20,7 +20,7 @@ actions
         type    cellSet;
         name    c0;
         source  boxToCell;
-        box (-1 -1 -1) (1 1 1); // Edit box bounds as required
+        box     (-1 -1 -1) (1 1 1); // Edit box bounds as required
     }
 );
 
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/topoSetDict b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/topoSetDict
index 6f9ebc7849..0d4aaabf78 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/topoSetDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/topoSetDict
@@ -21,10 +21,7 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-       boxes
-       (
-            (0 0.04 0) (0.1 0.05 0.1)
-       );
+        box     (0 0.04 0) (0.1 0.05 0.1);
     }
 
     {
@@ -32,7 +29,7 @@ actions
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-       set  injection;
+        set     injection;
     }
 );
 
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/topoSetDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/topoSetDict
index 349dc866f7..ae7171b014 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/topoSetDict
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/topoSetDict
@@ -21,7 +21,7 @@ actions
         type    faceSet;
         action  new;
         source  boxToFace;
-        box (1 1 0.99) (2 2 1);
+        box     (1 1 0.99) (2 2 1);
     }
 
     {
@@ -29,7 +29,7 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (2.4 2.4 0) (3 3 1);
+        box     (2.4 2.4 0) (3 3 1);
     }
 
     {
@@ -37,7 +37,7 @@ actions
         type    cellSet;
         action  add;
         source  boxToCell;
-        box (0 0 0) (0.6 0.6 1);
+        box     (0 0 0) (0.6 0.6 1);
     }
 
     {
@@ -54,7 +54,7 @@ actions
         type    faceSet;
         action  new;
         source  boxToFace;
-        box (1.0 1.99 0) (2.0 2.09 0.6);
+        box     (1.0 1.99 0) (2.0 2.09 0.6);
     }
 
 );
diff --git a/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/topoSetDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/topoSetDict
index 493fc4e551..5e4c5cc051 100644
--- a/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/topoSetDict
+++ b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/topoSetDict
@@ -31,28 +31,28 @@ actions
         type    cellSet;
         action  delete;
         source  boxToCell;
-        box (0.4 0.1 0.1) (0.6 0.3 0.3);
+        box     (0.4 0.1 0.1) (0.6 0.3 0.3);
     }
     {
         name    c0;
         type    cellSet;
         action  delete;
         source  boxToCell;
-        box (0.4 0.1 0.4) (0.6 0.3 0.6);
+        box     (0.4 0.1 0.4) (0.6 0.3 0.6);
     }
     {
         name    c0;
         type    cellSet;
         action  delete;
         source  boxToCell;
-        box (0.4 0.4 0.1) (0.6 0.6 0.3);
+        box     (0.4 0.4 0.1) (0.6 0.6 0.3);
     }
     {
         name    c0;
         type    cellSet;
         action  delete;
         source  boxToCell;
-        box (0.4 0.4 0.4) (0.6 0.6 0.6);
+        box     (0.4 0.4 0.4) (0.6 0.6 0.6);
     }
 );
 
diff --git a/tutorials/combustion/buoyantReactingFoam/RAS/smallPoolFire2D/system/topoSetDict b/tutorials/combustion/buoyantReactingFoam/RAS/smallPoolFire2D/system/topoSetDict
index ae680eaffc..50807a3c2d 100644
--- a/tutorials/combustion/buoyantReactingFoam/RAS/smallPoolFire2D/system/topoSetDict
+++ b/tutorials/combustion/buoyantReactingFoam/RAS/smallPoolFire2D/system/topoSetDict
@@ -21,7 +21,7 @@ actions
         type    faceSet;
         action  new;
         source  boxToFace;
-        box (-0.0529 -0.001 -0.1)(0.0529 0.002 0.1);
+        box     (-0.0529 -0.001 -0.1)(0.0529 0.002 0.1);
     }
 );
 
diff --git a/tutorials/combustion/buoyantReactingFoam/RAS/smallPoolFire3D/system/topoSetDict b/tutorials/combustion/buoyantReactingFoam/RAS/smallPoolFire3D/system/topoSetDict
index 838b7bd92f..909939b0eb 100644
--- a/tutorials/combustion/buoyantReactingFoam/RAS/smallPoolFire3D/system/topoSetDict
+++ b/tutorials/combustion/buoyantReactingFoam/RAS/smallPoolFire3D/system/topoSetDict
@@ -21,7 +21,7 @@ actions
         type    faceSet;
         action  new;
         source  boxToFace;
-        box (-0.1 -0.001 -0.1)(0.1 0.005 0.1);
+        box     (-0.1 -0.001 -0.1)(0.1 0.005 0.1);
     }
 );
 
diff --git a/tutorials/combustion/reactingFoam/Lagrangian/filter/system/topoSetDict b/tutorials/combustion/reactingFoam/Lagrangian/filter/system/topoSetDict
index 3daa20c3b5..7557dd8434 100644
--- a/tutorials/combustion/reactingFoam/Lagrangian/filter/system/topoSetDict
+++ b/tutorials/combustion/reactingFoam/Lagrangian/filter/system/topoSetDict
@@ -22,14 +22,14 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (1.5 -10 -10) (2 10 10);
+        box     (1.5 -10 -10) (2 10 10);
     }
     {
         name    filter;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        set filterCellSet;
+        set     filterCellSet;
     }
 
 
@@ -38,28 +38,28 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (-10 -10 -10) (1.5 10 10);
+        box     (-10 -10 -10) (1.5 10 10);
     }
     {
         name    leftFluid;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        set leftFluidCellSet;
+        set     leftFluidCellSet;
     }
     {
         name    rightFluidCellSet;
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (2 -1 -1) (10 10 10);
+        box     (2 -1 -1) (10 10 10);
     }
     {
         name    rightFluid;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        set rightFluidCellSet;
+        set     rightFluidCellSet;
     }
 
 
diff --git a/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/system/topoSetDict b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/system/topoSetDict
index fb971e79e2..f913a5235c 100644
--- a/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/system/topoSetDict
+++ b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/system/topoSetDict
@@ -17,13 +17,13 @@ FoamFile
 actions
 (
     {
-        name ignitionCells;
-        type cellSet;
-        action new;
+        name    ignitionCells;
+        type    cellSet;
+        action  new;
 
-        source sphereToCell;
-        centre          (0.125 0.375 0.05);
-        radius          0.005;
+        source  sphereToCell;
+        centre  (0.125 0.375 0.05);
+        radius  0.005;
     }
 );
 
diff --git a/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/system/topoSetDict b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/system/topoSetDict
index 968e15742d..e0de0d4e51 100644
--- a/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/system/topoSetDict
+++ b/tutorials/heatTransfer/buoyantFoam/comfortHotRoom/system/topoSetDict
@@ -20,14 +20,14 @@ actions
         type    faceSet;
         action  new;
         source  boxToFace;
-        box   (-0.001 0.25 1.1)(0.001 0.75 1.3);
+        box     (-0.001 0.25 1.1)(0.001 0.75 1.3);
     }
     {
         name    outlet;
         type    faceSet;
         action  new;
         source  boxToFace;
-        box   (1.75 2.999 0.3)(2.25 3.001 0.5);
+        box     (1.75 2.999 0.3)(2.25 3.001 0.5);
     }
 );
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/coolingCylinder2D/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/coolingCylinder2D/system/topoSetDict
index cf104edf3b..d6e0afc92a 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/coolingCylinder2D/system/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/coolingCylinder2D/system/topoSetDict
@@ -23,17 +23,17 @@ actions
         type    cellSet;
         action  new;
         source  cylinderToCell;
-        point1 (0 0 -100);
-        point2 (0 0  100);
-        centre (0 0 0);
-        radius $cylinderRadius;
+        point1  (0 0 -100);
+        point2  (0 0  100);
+        centre  (0 0 0);
+        radius  $cylinderRadius;
     }
     {
         name    solid;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        set cs;
+        set     cs;
     }
 );
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/system/topoSetDict
index d6691e310b..81bd49feaf 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/system/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/system/topoSetDict
@@ -23,15 +23,15 @@ actions
         type    cellSet;
         action  new;
         source  sphereToCell;
-        centre (0 0 0);
-        radius $!geometry/sphere/radius;
+        centre  (0 0 0);
+        radius  $!geometry/sphere/radius;
     }
     {
         name    solid;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        set cs;
+        set     cs;
     }
 );
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/topoSetDict
index 34f7fdb25a..cdd824aab9 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/topoSetDict
@@ -20,7 +20,7 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (0.01 0.1 -0.01) (0.02 0.11 0.01);
+        box     (0.01 0.1 -0.01) (0.02 0.11 0.01);
     }
 );
 
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/topoSetDict b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/topoSetDict
index 00193cdb18..95a53023da 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/topoSetDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/topoSetDict
@@ -21,7 +21,7 @@ actions
         type    faceSet;
         action  new;
         source  boxToFace;
-        box (0.099 -0.006 0.004)(0.101 0.006 0.016);
+        box     (0.099 -0.006 0.004)(0.101 0.006 0.016);
     }
 
     {
@@ -29,7 +29,7 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (-10 -10 -10)(0.1 10 10);
+        box     (-10 -10 -10)(0.1 10 10);
     }
 
     {
@@ -46,7 +46,7 @@ actions
         type    faceSet;
         action  new;
         source  boxToFace;
-        box (0.099 -10 -10)(0.101 10 10);
+        box     (0.099 -10 -10)(0.101 10 10);
     }
 
     {
@@ -54,7 +54,7 @@ actions
         type    faceSet;
         action  delete;
         source  boxToFace;
-        box (0.099 -0.006 0.004)(0.101 0.006 0.016);
+        box     (0.099 -0.006 0.004)(0.101 0.006 0.016);
     }
 
     {
diff --git a/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/topoSetDict b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/topoSetDict
index 48be43fadf..d2793074e0 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/topoSetDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/topoSetDict
@@ -21,7 +21,7 @@ actions
         type    faceSet;
         action  new;
         source  boxToFace;
-        box (-0.84 -0.31 -0.01)(-0.82 0.31 0.06);
+        box     (-0.84 -0.31 -0.01)(-0.82 0.31 0.06);
     }
 );
 
diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/topoSetDict b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/topoSetDict
index b3731009dc..0b27fb0cbe 100644
--- a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/topoSetDict
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/topoSetDict
@@ -22,7 +22,7 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (-0.5 -0.5 -1) (0.5 0.5 1);
+        box     (-0.5 -0.5 -1) (0.5 0.5 1);
     }
 
     // Convert porousBlockage cellSet into a cellZone
@@ -31,7 +31,7 @@ actions
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        set porousBlockageCellSet;
+        set     porousBlockageCellSet;
     }
 );
 
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/system/topoSetDict b/tutorials/incompressible/simpleFoam/pipeCyclic/system/topoSetDict
index f765716154..10a9c68551 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/system/topoSetDict
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/system/topoSetDict
@@ -28,7 +28,7 @@ actions
         type    faceSet;
         action  subset;
         source  boxToFace;
-        box (0 -100 -100)(100 -0.2 100);
+        box     (0 -100 -100)(100 -0.2 100);
     }
     {
         name    c0;
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/topoSetDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/topoSetDict
index cd0d6a17ee..e8d3fe7872 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/system/topoSetDict
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/topoSetDict
@@ -22,14 +22,14 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (581850.5 4785805 1061) (581850.8 4785815 1071);
+        box     (581850.5 4785805 1061) (581850.8 4785815 1071);
     }
     {
         name    actuationDisk1;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        set actuationDisk1CellSet;
+        set     actuationDisk1CellSet;
     }
 
     // actuationDisk2
@@ -38,14 +38,14 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (581754 4785658 1065) (581754.4 4785668 1075);
+        box     (581754 4785658 1065) (581754.4 4785668 1075);
     }
     {
         name    actuationDisk2;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        set actuationDisk2CellSet;
+        set     actuationDisk2CellSet;
     }
 
 );
diff --git a/tutorials/mesh/foamyHexMesh/blob/system/topoSetDict b/tutorials/mesh/foamyHexMesh/blob/system/topoSetDict
index 04b87cacb4..78eed415eb 100644
--- a/tutorials/mesh/foamyHexMesh/blob/system/topoSetDict
+++ b/tutorials/mesh/foamyHexMesh/blob/system/topoSetDict
@@ -21,7 +21,7 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (-100 -100 -0.2)(100 100 100);
+        box     (-100 -100 -0.2)(100 100 100);
     }
 
     {
@@ -55,7 +55,7 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (-0.32 -100 -100)(100 100 100);
+        box     (-0.32 -100 -100)(100 100 100);
     }
 
     {
@@ -63,8 +63,8 @@ actions
         type    faceSet;
         action  new;
         source  cellToFace;
-        set    x;
-        option all;
+        set     x;
+        option  all;
     }
 
     {
@@ -78,8 +78,8 @@ actions
         type    faceSet;
         action  subset;
         source  cellToFace;
-        set    x;
-        option all;
+        set     x;
+        option  all;
     }
 
     // ~~~~~~~~~~~~~~~~ //
@@ -89,8 +89,8 @@ actions
         type    cellSet;
         action  new;
         source  sphereToCell;
-        centre (-0.3 -0.3 -0.3);
-        radius 0.4;
+        centre  (-0.3 -0.3 -0.3);
+        radius  0.4;
     }
 
     {
@@ -98,8 +98,8 @@ actions
         type    faceSet;
         action  new;
         source  cellToFace;
-        set    sp;
-        option all;
+        set     sp;
+        option  all;
     }
 
     {
@@ -113,8 +113,8 @@ actions
         type    faceSet;
         action  subset;
         source  cellToFace;
-        set    sp;
-        option all;
+        set     sp;
+        option  all;
     }
 );
 
diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/system/topoSetDict b/tutorials/mesh/foamyHexMesh/simpleShapes/system/topoSetDict
index dcfd4a16f2..75b3ae6b5e 100644
--- a/tutorials/mesh/foamyHexMesh/simpleShapes/system/topoSetDict
+++ b/tutorials/mesh/foamyHexMesh/simpleShapes/system/topoSetDict
@@ -21,7 +21,7 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (-100 -100 0)(100 100 100);
+        box     (-100 -100 0)(100 100 100);
     }
 
     {
@@ -29,8 +29,8 @@ actions
         type    faceSet;
         action  new;
         source  cellToFace;
-        set    z;
-        option all;
+        set     z;
+        option  all;
     }
 
     {
@@ -44,8 +44,8 @@ actions
         type    faceSet;
         action  subset;
         source  cellToFace;
-        set    z;
-        option all;
+        set     z;
+        option  all;
     }
 
     // ~~~~~~~~~~~~~~~~ //
@@ -55,7 +55,7 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (-100 0.1 -100)(100 100 100);
+        box     (-100 0.1 -100)(100 100 100);
     }
 
     {
@@ -78,8 +78,8 @@ actions
         type    faceSet;
         action  subset;
         source  cellToFace;
-        set    y;
-        option all;
+        set     y;
+        option  all;
     }
 
     // ~~~~~~~~~~~~~~~~ //
@@ -89,7 +89,7 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (0.3 -100 -100)(100 100 100);
+        box     (0.3 -100 -100)(100 100 100);
     }
 
     {
@@ -97,8 +97,8 @@ actions
         type    faceSet;
         action  new;
         source  cellToFace;
-        set    x;
-        option all;
+        set     x;
+        option  all;
     }
 
     {
@@ -112,8 +112,8 @@ actions
         type    faceSet;
         action  subset;
         source  cellToFace;
-        set    x;
-        option all;
+        set     x;
+        option  all;
     }
 );
 
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict
index 2dccaa15b8..7bb44d65fd 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict
@@ -21,42 +21,42 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (-10 -6 -3) (10 0 3);
+        box     (-10 -6 -3) (10 0 3);
     }
     {
         name    c2;
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (-5 -3 -2.5) (9 0 2);
+        box     (-5 -3 -2.5) (9 0 2);
     }
     {
         name    c3;
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (-3 -1.5 -1) (8 0 1.5);
+        box     (-3 -1.5 -1) (8 0 1.5);
     }
     {
         name    c4;
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (-2 -1 -0.6) (7 0 1);
+        box     (-2 -1 -0.6) (7 0 1);
     }
     {
         name    c5;
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (-1 -0.6 -0.3) (6.5 0 0.8);
+        box     (-1 -0.6 -0.3) (6.5 0 0.8);
     }
     {
         name    c6;
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (-0.5 -0.55 -0.15) (6.25 0 0.65);
+        box     (-0.5 -0.55 -0.15) (6.25 0 0.65);
     }
 );
 
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict
index 2dccaa15b8..7bb44d65fd 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict
@@ -21,42 +21,42 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (-10 -6 -3) (10 0 3);
+        box     (-10 -6 -3) (10 0 3);
     }
     {
         name    c2;
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (-5 -3 -2.5) (9 0 2);
+        box     (-5 -3 -2.5) (9 0 2);
     }
     {
         name    c3;
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (-3 -1.5 -1) (8 0 1.5);
+        box     (-3 -1.5 -1) (8 0 1.5);
     }
     {
         name    c4;
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (-2 -1 -0.6) (7 0 1);
+        box     (-2 -1 -0.6) (7 0 1);
     }
     {
         name    c5;
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (-1 -0.6 -0.3) (6.5 0 0.8);
+        box     (-1 -0.6 -0.3) (6.5 0 0.8);
     }
     {
         name    c6;
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (-0.5 -0.55 -0.15) (6.25 0 0.65);
+        box     (-0.5 -0.55 -0.15) (6.25 0 0.65);
     }
 );
 
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict
index d1162d72d5..136547d30e 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict
@@ -21,42 +21,42 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (-10 -6 -3) (10 0 3);
+        box     (-10 -6 -3) (10 0 3);
     }
     {
         name    c2;
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (-5 -3 -2.5) (10 0 2);
+        box     (-5 -3 -2.5) (10 0 2);
     }
     {
         name    c3;
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (-3 -1.5 -1) (10 0 1.5);
+        box     (-3 -1.5 -1) (10 0 1.5);
     }
     {
         name    c4;
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (-2 -1 -0.6) (10 0 1);
+        box     (-2 -1 -0.6) (10 0 1);
     }
     {
         name    c5;
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (-1 -0.6 -0.3) (10 0 0.8);
+        box     (-1 -0.6 -0.3) (10 0 0.8);
     }
     {
         name    c6;
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (-0.5 -0.55 -0.15) (6.25 0 0.65);
+        box     (-0.5 -0.55 -0.15) (6.25 0 0.65);
     }
 );
 
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/topoSetDict b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/topoSetDict
index 1bac05730e..1adfe0b9e0 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/topoSetDict
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/topoSetDict
@@ -21,7 +21,7 @@ actions
         type    faceSet;
         action  new;
         source  boxToFace;
-        box (0.3015 0.0493 -1) (0.3069 0.2077 1);
+        box     (0.3015 0.0493 -1) (0.3069 0.2077 1);
     }
 
     {
@@ -29,7 +29,7 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (-1 0 -1) (0.305 0.31 1);
+        box     (-1 0 -1) (0.305 0.31 1);
     }
 
     {
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/system/topoSetDict b/tutorials/multiphase/interFoam/RAS/floatingObject/system/topoSetDict
index bf495e9a42..aaa9ce7d20 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/system/topoSetDict
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/system/topoSetDict
@@ -21,7 +21,7 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (0.35 0.35 0.1) (0.65 0.55 0.6);
+        box     (0.35 0.35 0.1) (0.65 0.55 0.6);
     }
 
     {
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/topoSetDict b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/topoSetDict
index 87558ffe90..e7d4741dd5 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/topoSetDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/topoSetDict
@@ -31,7 +31,7 @@ actions
         type    cellSet;
         action  delete;
         source  boxToCell;
-        box (0.375 0.375 0) (0.625 0.625 0.25);
+        box     (0.375 0.375 0) (0.625 0.625 0.25);
     }
 );
 
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/topoSetDict b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/topoSetDict
index 2f670b9b1d..9959af19e0 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/topoSetDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/topoSetDict
@@ -20,10 +20,7 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-       boxes
-       (
-            (0 -1 0.0) (0.005 1 0.01)
-       );
+        box     (0 -1 0.0) (0.005 1 0.01);
     }
 
     {
@@ -31,7 +28,7 @@ actions
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-       set  injection;
+        set     injection;
     }
 
     {
@@ -39,10 +36,7 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-       boxes
-       (
-            (0 -1 0.89) (0.025 1 0.9)
-       );
+        box     (0 -1 0.89) (0.025 1 0.9);
     }
 
     {
@@ -50,7 +44,7 @@ actions
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-       set  outlet;
+        set     outlet;
     }
 );
 
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/topoSetDict b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/topoSetDict
index a1c7cc49d2..d05eef5475 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/topoSetDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/topoSetDict
@@ -20,10 +20,7 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        boxes
-        (
-            (3.48 -0.1 -0.1) (3.5 0.1 0.1)
-        );
+        box     (3.48 -0.1 -0.1) (3.5 0.1 0.1);
     }
 
     {
@@ -31,7 +28,7 @@ actions
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        set  x349;
+        set     x349;
     }
 
     {
@@ -39,10 +36,7 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        boxes
-        (
-            (3.48 0.0093 -0.1) (3.5 0.1 0.1)
-        );
+        box     (3.48 0.0093 -0.1) (3.5 0.1 0.1);
     }
 
     {
@@ -50,7 +44,7 @@ actions
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        set  x349_wall;
+        set     x349_wall;
     }
 
     {
@@ -58,10 +52,7 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        boxes
-        (
-            (3.48 0.0 -0.1) (3.5 0.005 0.1)
-        );
+        box     (3.48 0.0 -0.1) (3.5 0.005 0.1);
     }
 
     {
@@ -69,7 +60,7 @@ actions
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        set  x349_bulk;
+        set     x349_bulk;
     }
 );
 
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/topoSetDict b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/topoSetDict
index 7678967d4d..616c459e0b 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/topoSetDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/topoSetDict
@@ -20,10 +20,7 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-       boxes
-       (
-            (3.48 -0.1 -0.1) (3.5 0.1 0.1)
-       );
+        box     (3.48 -0.1 -0.1) (3.5 0.1 0.1);
     }
 
     {
@@ -31,7 +28,7 @@ actions
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-       set  x349;
+        set     x349;
     }
 
     {
@@ -39,10 +36,7 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-       boxes
-       (
-            (3.48 0.0093 -0.1) (3.5 0.1 0.1)
-       );
+        box     (3.48 0.0093 -0.1) (3.5 0.1 0.1);
     }
 
     {
@@ -50,7 +44,7 @@ actions
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-       set  x349_wall;
+        set     x349_wall;
     }
 
     {
@@ -58,10 +52,7 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-       boxes
-       (
-            (3.48 0.0 -0.1) (3.5 0.005 0.1)
-       );
+        box     (3.48 0.0 -0.1) (3.5 0.005 0.1);
     }
 
     {
@@ -69,7 +60,7 @@ actions
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-       set  x349_bulk;
+        set     x349_bulk;
     }
 
 );
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/topoSetDict b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/topoSetDict
index 58238b51d9..758a85da7e 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/topoSetDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/topoSetDict
@@ -20,9 +20,9 @@ actions
         type    cellSet;
         action  new;
         source  cylinderToCell;
-        point1       (0.435 0 0);
-        point2       (0.44 0 0);
-        radius       0.015875;
+        point1  (0.435 0 0);
+        point2  (0.44 0 0);
+        radius  0.015875;
     }
 
     {
@@ -30,7 +30,7 @@ actions
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        set  outlet;
+        set     outlet;
     }
 );
 
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/topoSetDict b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/topoSetDict
index 58238b51d9..758a85da7e 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/topoSetDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/topoSetDict
@@ -20,9 +20,9 @@ actions
         type    cellSet;
         action  new;
         source  cylinderToCell;
-        point1       (0.435 0 0);
-        point2       (0.44 0 0);
-        radius       0.015875;
+        point1  (0.435 0 0);
+        point2  (0.44 0 0);
+        radius  0.015875;
     }
 
     {
@@ -30,7 +30,7 @@ actions
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        set  outlet;
+        set     outlet;
     }
 );
 
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/topoSetDict b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/topoSetDict
index a4112f2125..e00972629a 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/topoSetDict
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/topoSetDict
@@ -21,7 +21,7 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (0.1 0.8 -100) (0.4 100 100);
+        box     (0.1 0.8 -100) (0.4 100 100);
     }
 
     {
@@ -43,7 +43,7 @@ actions
         type    faceSet;
         action  subset;
         source  boxToFace;
-        box (-100 0.9 -100) (0.2 100 100);
+        box     (-100 0.9 -100) (0.2 100 100);
     }
 
     {
@@ -51,7 +51,7 @@ actions
         type    faceZoneSet;
         action  new;
         source  setToFaceZone;
-        faceSet    f0FaceSet;
+        faceSet f0FaceSet;
     }
 );
 
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict
index a4112f2125..e00972629a 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict
@@ -21,7 +21,7 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        box (0.1 0.8 -100) (0.4 100 100);
+        box     (0.1 0.8 -100) (0.4 100 100);
     }
 
     {
@@ -43,7 +43,7 @@ actions
         type    faceSet;
         action  subset;
         source  boxToFace;
-        box (-100 0.9 -100) (0.2 100 100);
+        box     (-100 0.9 -100) (0.2 100 100);
     }
 
     {
@@ -51,7 +51,7 @@ actions
         type    faceZoneSet;
         action  new;
         source  setToFaceZone;
-        faceSet    f0FaceSet;
+        faceSet f0FaceSet;
     }
 );