diff --git a/etc/bashrc b/etc/bashrc
index b6103e3b2e5fdcb4050604448455768fa7796802..2b543596d6faf2552492963900b320d5df2a7050 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -6,28 +6,15 @@
 #    \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/bashrc
 #
 # Description
-#     Set the environment for OpenFOAM when using a POSIX shell.
-#     To be sourced manually or from the ~/.profile or ~/.bashrc files.
-#     Should be usable by any POSIX-compliant shell (eg, bash,dash,zsh,...)
+#     Set OpenFOAM environment for POSIX shell (eg, bash,dash,zsh,...)
+#     Source manually or from the ~/.profile or ~/.bashrc files.
 #
 #------------------------------------------------------------------------------
 
diff --git a/etc/config.csh/CGAL b/etc/config.csh/CGAL
index 4f4a5f3c95a2c1748544a9a6bf4a82ad1719d4ee..b45adadb519264965d4d9fe72afb058ef8fb2611 100644
--- a/etc/config.csh/CGAL
+++ b/etc/config.csh/CGAL
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.csh/CGAL
diff --git a/etc/config.csh/FFTW b/etc/config.csh/FFTW
index 8733ff591aca84bea9b29871c357f378acbe44b3..d3efa7dc70bac0d4d81e930ac1dda088625d28aa 100644
--- a/etc/config.csh/FFTW
+++ b/etc/config.csh/FFTW
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.csh/FFTW
diff --git a/etc/config.csh/aliases b/etc/config.csh/aliases
index 0dbff6732a9a76c148012b80d9dc805d25acada7..52520ce6bf4a124762241795c122444d47d3a467 100644
--- a/etc/config.csh/aliases
+++ b/etc/config.csh/aliases
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.csh/aliases
diff --git a/etc/config.csh/compiler b/etc/config.csh/compiler
index fa9915788b8a5ef1703e1c891cbe48a9c3862c15..8db05c34fec16439808311623843042a25d52447 100644
--- a/etc/config.csh/compiler
+++ b/etc/config.csh/compiler
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.csh/compiler
@@ -32,7 +20,7 @@
 
 switch ("$WM_COMPILER_TYPE")
 case ThirdParty:
-    # Default versions of GMP, MPFR and MPC, override as necessary
+    # Default versions of GMP, MPFR, MPC - override as necessary
     set gmp_version=gmp-system
     set mpfr_version=mpfr-system
     set mpc_version=mpc-system
@@ -57,6 +45,9 @@ case ThirdParty:
     case Gcc54:
         set gcc_version=gcc-5.4.0
         breaksw
+    case Gcc55:
+        set gcc_version=gcc-5.5.0
+        breaksw
     case Gcc61:
         set gcc_version=gcc-6.1.0
         breaksw
diff --git a/etc/config.csh/complete-wrapper b/etc/config.csh/complete-wrapper
index 8fbbdffac6766c134c7405aa2374be485d5a9dc7..db4822e48b7aee5f7142cd32b5034dbed1414b92 100644
--- a/etc/config.csh/complete-wrapper
+++ b/etc/config.csh/complete-wrapper
@@ -6,8 +6,9 @@
 #   \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-# This file is part of OpenFOAM, licensed under the GNU General Public License
-# <http://www.gnu.org/licenses/>.
+# License
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.csh/complete-wrapper
diff --git a/etc/config.csh/ensight b/etc/config.csh/ensight
index 6671523f63b35ebdc9045e67c02df940c2a98eb5..0212bb6e4f58ee767582a438017b574cb712e7b7 100644
--- a/etc/config.csh/ensight
+++ b/etc/config.csh/ensight
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     config.csh/ensight
diff --git a/etc/config.csh/example/compiler b/etc/config.csh/example/compiler
index 20e98115ae8bc8605cb4f4199d6e8bf87616120b..ebc90c35b154f58eed2f02b1124a4192d6422cd6 100644
--- a/etc/config.csh/example/compiler
+++ b/etc/config.csh/example/compiler
@@ -3,23 +3,11 @@
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
 #   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-#    \\/     M anipulation  |
+#    \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     config.csh/example/compiler
@@ -30,6 +18,9 @@
 #
 #------------------------------------------------------------------------------
 
+# Load the standard versions
+eval `$WM_PROJECT_DIR/bin/foamEtcFile -csh -mode=o config.csh/compiler`
+
 # Modify/override compiler settings
 switch ("$WM_COMPILER")
 case Gcc70:
diff --git a/etc/config.csh/example/openmpi b/etc/config.csh/example/openmpi
index 70dc5d69caaebe16a5ef217f36c613ca5f4b97fe..a23e951db9bd28e8a1af85ab6e601635ab3d11b0 100644
--- a/etc/config.csh/example/openmpi
+++ b/etc/config.csh/example/openmpi
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     config.csh/example/openmpi
@@ -31,6 +19,6 @@
 #------------------------------------------------------------------------------
 
 # Modified openmpi settings
-setenv FOAM_MPI openmpi-1.4.3
+setenv FOAM_MPI openmpi-3.0.0
 
 #------------------------------------------------------------------------------
diff --git a/etc/config.csh/example/paraview b/etc/config.csh/example/paraview
index 3ce3baa29960d658a7c35024d5dbf6a493af77ba..a2211ec2ec3065d5578c4f36d36ad7269b1ff7c1 100644
--- a/etc/config.csh/example/paraview
+++ b/etc/config.csh/example/paraview
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     config.csh/example/paraview
@@ -34,12 +22,10 @@
 #
 #------------------------------------------------------------------------------
 
-#
-# Use other (shipped) paraview with a different ParaView_VERSION
-#
+# Use shipped paraview config file (-mode=o) with a different ParaView_VERSION
 
 set foamFile=`$WM_PROJECT_DIR/bin/foamEtcFile -mode=o config.csh/paraview`
-if ( $status == 0 ) source $foamFile ParaView_VERSION=5.0.1
+if ( $status == 0 ) source $foamFile ParaView_VERSION=5.4.0
 
 unset foamFile
 
diff --git a/etc/config.csh/example/prefs.csh b/etc/config.csh/example/prefs.csh
index 99dca9f454db2775e355d760fde3da5a2423ff76..2d688b587b34ad98d7c8ddd29511435fadb2af17 100644
--- a/etc/config.csh/example/prefs.csh
+++ b/etc/config.csh/example/prefs.csh
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     config.csh/example/prefs.csh
@@ -36,17 +24,13 @@
 #
 #------------------------------------------------------------------------------
 
-## Specify OpenFOAM ThirdParty compiler
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# set WM_COMPILER_TYPE=ThirdParty
-
-## Specify compiler type
-## ~~~~~~~~~~~~~~~~~~~~~
-#setenv WM_COMPILER Clang
+#- Compiler location:
+setenv WM_COMPILER_TYPE ThirdParty
 
-## Specify system openmpi
-## ~~~~~~~~~~~~~~~~~~~~~~
-# setenv WM_MPLIB SYSTEMOPENMPI
+#- Compiler:
+setenv WM_COMPILER Clang
 
+#- MPI implementation:
+setenv WM_MPLIB SYSTEMOPENMPI
 
 #------------------------------------------------------------------------------
diff --git a/etc/config.csh/mpi b/etc/config.csh/mpi
index ae9a7c15a467a06e57000cdcc230930b3a8e70c6..a12e9397571a7ea4a0bb44bf889a9b655a07b56e 100644
--- a/etc/config.csh/mpi
+++ b/etc/config.csh/mpi
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.csh/mpi
diff --git a/etc/config.csh/paraview b/etc/config.csh/paraview
index fa0cea0f4953c0384fb0e42af91407e241ac0df4..b4e65fbf0c638ce6c32ac7f085b2df4871db26c0 100644
--- a/etc/config.csh/paraview
+++ b/etc/config.csh/paraview
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     config.csh/paraview
diff --git a/etc/config.csh/settings b/etc/config.csh/settings
index 40c3df898557536f4a10b424f488d4b2af8156a5..22982d1c49085ed520ff878b2d05d9593a976b2d 100644
--- a/etc/config.csh/settings
+++ b/etc/config.csh/settings
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.csh/settings
diff --git a/etc/config.csh/tcsh_completion b/etc/config.csh/tcsh_completion
index 9dfcca704650699d808a11aabd486c2678d1b603..f183e83387b7c550936bb209bc14f85cd827065c 100644
--- a/etc/config.csh/tcsh_completion
+++ b/etc/config.csh/tcsh_completion
@@ -5,8 +5,9 @@
 #   \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-# This file is part of OpenFOAM, licensed under the GNU General Public License
-# <http://www.gnu.org/licenses/>.
+# License
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.csh/tcsh_completion
diff --git a/etc/config.csh/unset b/etc/config.csh/unset
index 20f7c9eb6df633eba43b35fa4755bda3835de18c..fbad00c74a724ccb34cac3a1d76018738130baf7 100644
--- a/etc/config.csh/unset
+++ b/etc/config.csh/unset
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.csh/unset
diff --git a/etc/config.csh/vtk b/etc/config.csh/vtk
index 1abca1e975c5a7f14b1cacc14920c924694952c2..00927aae541f69ed9876b46a4453f6e8ec5b7eb2 100644
--- a/etc/config.csh/vtk
+++ b/etc/config.csh/vtk
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.csh/vtk
diff --git a/etc/config.sh/CGAL b/etc/config.sh/CGAL
index e3acd42cbec347bb3e86d31e4860fb8efac7b6c6..08d0c7ee75d26880928a9f314e54b9a96d4664c9 100644
--- a/etc/config.sh/CGAL
+++ b/etc/config.sh/CGAL
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.sh/CGAL
diff --git a/etc/config.sh/FFTW b/etc/config.sh/FFTW
index c8b707d6a5fc743383a85ba5887be622d4cc04f8..2d9b59c2540fded80ac11a47c70316b7bc9d775b 100644
--- a/etc/config.sh/FFTW
+++ b/etc/config.sh/FFTW
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.sh/FFTW
diff --git a/etc/config.sh/aliases b/etc/config.sh/aliases
index 0543a09a708af5fe2a6ad120e1ea97bcbf0a298a..68a1afba9ac277bbe7a4bb3db376a8eef9e52529 100644
--- a/etc/config.sh/aliases
+++ b/etc/config.sh/aliases
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.sh/aliases
diff --git a/etc/config.sh/bash_completion b/etc/config.sh/bash_completion
index 2355f340872fe183b66d0dace58cab7c64dea945..53cf60aa295bbe9d51afdb724c1f6a36577479ab 100644
--- a/etc/config.sh/bash_completion
+++ b/etc/config.sh/bash_completion
@@ -5,8 +5,9 @@
 #   \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-# This file is part of OpenFOAM, licensed under the GNU General Public License
-# <http://www.gnu.org/licenses/>.
+# License
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.sh/bash_completion
diff --git a/etc/config.sh/ccmio b/etc/config.sh/ccmio
index 782dcb77028a09222f65ad2868cbdc51e84ec123..88c0dd68d02299bb3f80bba900d79cfd15228a08 100644
--- a/etc/config.sh/ccmio
+++ b/etc/config.sh/ccmio
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.sh/ccmio
diff --git a/etc/config.sh/compiler b/etc/config.sh/compiler
index 3a1aefd63f0f4365049152688825f21c155d82fb..4f00fa46f43967396aae46e8a4bf8d95069fab56 100644
--- a/etc/config.sh/compiler
+++ b/etc/config.sh/compiler
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.sh/compiler
@@ -32,7 +20,7 @@
 
 case "$WM_COMPILER_TYPE" in
 ThirdParty)
-    # Default versions of GMP, MPFR and MPC, override as necessary
+    # Default versions of GMP, MPFR, MPC - override as necessary
     gmp_version=gmp-system
     mpfr_version=mpfr-system
     mpc_version=mpc-system
@@ -56,6 +44,9 @@ ThirdParty)
     Gcc54)
         gcc_version=gcc-5.4.0
         ;;
+    Gcc55)
+        gcc_version=gcc-5.5.0
+        ;;
     Gcc61)
         gcc_version=gcc-6.1.0
         ;;
diff --git a/etc/config.sh/ensight b/etc/config.sh/ensight
index ec7566a80a1858f20d841fa244e989c6808b38ac..9b0ab5423628e684ee299f796185ef4acf27a83f 100644
--- a/etc/config.sh/ensight
+++ b/etc/config.sh/ensight
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.sh/ensight
diff --git a/etc/config.sh/example/compiler b/etc/config.sh/example/compiler
index e8a86a042bb063745549099393fb5c9271898c88..8b3f412db082ae687600409f27b36dc5126ad6ba 100644
--- a/etc/config.sh/example/compiler
+++ b/etc/config.sh/example/compiler
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     config.sh/example/compiler
@@ -30,7 +18,7 @@
 #
 #------------------------------------------------------------------------------
 
-# Load the standard versions...
+# Load the standard versions
 eval $($WM_PROJECT_DIR/bin/foamEtcFile -sh -mode=o config.sh/compiler)
 
 # Modify/override compiler settings
diff --git a/etc/config.sh/example/openmpi b/etc/config.sh/example/openmpi
index 7fa099f841ff0c867a9b3ca10bca722d4224fdeb..4a6b2ddfd555303db34768fd458f780fc42dc75f 100644
--- a/etc/config.sh/example/openmpi
+++ b/etc/config.sh/example/openmpi
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     config.sh/example/openmpi
@@ -31,6 +19,6 @@
 #------------------------------------------------------------------------------
 
 # Modified openmpi settings
-export FOAM_MPI=openmpi-1.4.3
+export FOAM_MPI=openmpi-3.0.0
 
 #------------------------------------------------------------------------------
diff --git a/etc/config.sh/example/paraview b/etc/config.sh/example/paraview
index 0008243588afca7c84434d6b617cd5190e18451c..9f045e684c2b88bf654d0e30003ff3bfd241d066 100644
--- a/etc/config.sh/example/paraview
+++ b/etc/config.sh/example/paraview
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     config.sh/example/paraview
@@ -34,13 +22,10 @@
 #
 #------------------------------------------------------------------------------
 
-#
-# Use the shipped paraview config file (-mode=o)
-# with a different ParaView_VERSION
-#
+# Use shipped paraview config file (-mode=o) with a different ParaView_VERSION
 
 foamFile=$($WM_PROJECT_DIR/bin/foamEtcFile -mode=o config.sh/paraview 2>/dev/null)
-[ $? -eq 0 ] && . $foamFile ParaView_VERSION=5.0.1
+[ $? -eq 0 ] && . $foamFile ParaView_VERSION=5.4.0
 
 unset foamFile
 
diff --git a/etc/config.sh/example/prefs.sh b/etc/config.sh/example/prefs.sh
index 883db4bda53773d9f86592eeee31324f6fa6bd5d..fc7abeebf5d0fcfe92de02cac429b672192d9461 100644
--- a/etc/config.sh/example/prefs.sh
+++ b/etc/config.sh/example/prefs.sh
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     config.sh/example/prefs.sh
@@ -36,17 +24,13 @@
 #
 #------------------------------------------------------------------------------
 
-## Specify OpenFOAM ThirdParty compiler
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#WM_COMPILER_TYPE=ThirdParty
-
-## Specify compiler type
-## ~~~~~~~~~~~~~~~~~~~~~
-#export WM_COMPILER=Clang
+#- Compiler location:
+WM_COMPILER_TYPE=ThirdParty
 
-## Specify system openmpi
-## ~~~~~~~~~~~~~~~~~~~~~~
-#export WM_MPLIB=SYSTEMOPENMPI
+#- Compiler:
+export WM_COMPILER=Clang
 
+#- MPI implementation:
+export WM_MPLIB=SYSTEMOPENMPI
 
 #------------------------------------------------------------------------------
diff --git a/etc/config.sh/functions b/etc/config.sh/functions
index df3096d998b77928abb2f7c03e7d329ad642861f..5ebf2222dabf7787c42b6c1d7b70bab1ba7dcf99 100644
--- a/etc/config.sh/functions
+++ b/etc/config.sh/functions
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.sh/functions
diff --git a/etc/config.sh/gperftools b/etc/config.sh/gperftools
index 4e13f927bb2fc88fdc007f6aa83e5089ae3c1568..0bb46c32eaf187e796f36d0388019027d7d3d980 100644
--- a/etc/config.sh/gperftools
+++ b/etc/config.sh/gperftools
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.sh/gperftools
diff --git a/etc/config.sh/kahip b/etc/config.sh/kahip
index 42557831c3463fdccbd51bb2a9b7e07c96f4a590..e6b51c0291b9fff5554b755060f84d66779d5119 100644
--- a/etc/config.sh/kahip
+++ b/etc/config.sh/kahip
@@ -5,8 +5,9 @@
 #   \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-# This file is part of OpenFOAM, licensed under the GNU General Public License
-# <http://www.gnu.org/licenses/>.
+# License
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.sh/kahip
diff --git a/etc/config.sh/metis b/etc/config.sh/metis
index 2776a283c2faa6618e6cfb298cd64755e0b34678..59cfe40827cfa9a2ecf84721cbd5adf51f61ef0f 100644
--- a/etc/config.sh/metis
+++ b/etc/config.sh/metis
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.sh/metis
diff --git a/etc/config.sh/mgridgen b/etc/config.sh/mgridgen
index ffc7239d287f2002bac053141d14d85d6030489e..8fc237e3d9b8c3ab9561004b327ddd7f5ca9a859 100644
--- a/etc/config.sh/mgridgen
+++ b/etc/config.sh/mgridgen
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.sh/mgridgen
diff --git a/etc/config.sh/mpi b/etc/config.sh/mpi
index 1a87bf238f91ea1bbb5a322acba22090d9cd1ba8..2ee7b51898ece63a0087cb483b538ca8016e86c4 100644
--- a/etc/config.sh/mpi
+++ b/etc/config.sh/mpi
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.sh/mpi
diff --git a/etc/config.sh/paraview b/etc/config.sh/paraview
index b2a1cc161aa7e23abba8c5d16f15a786acf373b4..47e61b95f410fd012da02db284db962d498e9505 100644
--- a/etc/config.sh/paraview
+++ b/etc/config.sh/paraview
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.sh/paraview
diff --git a/etc/config.sh/scotch b/etc/config.sh/scotch
index 7c8cb13587b2077782db7efc4b88a2fe92897827..c8402ffdff9ad8d69080d18b85e07a150443a5d8 100644
--- a/etc/config.sh/scotch
+++ b/etc/config.sh/scotch
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.sh/scotch
diff --git a/etc/config.sh/settings b/etc/config.sh/settings
index 20821fae2e3dddfc028d5c98cb349c724fde3cd9..de1297805504d1c4e9ca9d0bf310e90dd278c39e 100644
--- a/etc/config.sh/settings
+++ b/etc/config.sh/settings
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.sh/settings
diff --git a/etc/config.sh/unset b/etc/config.sh/unset
index 31710db372ce80745e4b39ca92d96fa1fcc61d4d..1cc65e79f53eb8a78985f5601f9b68dba97d9f42 100644
--- a/etc/config.sh/unset
+++ b/etc/config.sh/unset
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.sh/unset
diff --git a/etc/config.sh/vtk b/etc/config.sh/vtk
index 8d881b64c567b6d68c1151502b3466d30ba6318e..0142c42eb5a53c257bd65b93d8f200c5d9074f83 100644
--- a/etc/config.sh/vtk
+++ b/etc/config.sh/vtk
@@ -6,20 +6,8 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.sh/vtk
diff --git a/etc/cshrc b/etc/cshrc
index 759599098b5aa306a41a541c9d65f0cf9245ae6b..4d9ed45aef08fd693ae72cce0025ee1ba127b518 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -6,27 +6,15 @@
 #    \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/cshrc
 #
 # Description
-#     Set the environment for OpenFOAM when using a cshell.
-#     To be sourced manually or from the ~/.login or ~/.cshrc files.
+#     Set OpenFOAM environment for C-shell (csh, tcsh).
+#     Source manually or from the ~/.login or ~/.cshrc files.
 #
 #------------------------------------------------------------------------------