diff --git a/core/src/processing/opengl/FontTexture.java b/core/src/processing/opengl/FontTexture.java
index d5754b701..350b93677 100644
--- a/core/src/processing/opengl/FontTexture.java
+++ b/core/src/processing/opengl/FontTexture.java
@@ -1,16 +1,15 @@
 /* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 
 /*
-  Processing OpenGL (c) 2011-2015 Andres Colubri
-
   Part of the Processing project - http://processing.org
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
+
   Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
-  License version 2.1 as published by the Free Software Foundation.
+  License as published by the Free Software Foundation, version 2.1.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +20,7 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
+*/
 
 package processing.opengl;
 
diff --git a/core/src/processing/opengl/FrameBuffer.java b/core/src/processing/opengl/FrameBuffer.java
index 3c6b927b2..e591290a8 100644
--- a/core/src/processing/opengl/FrameBuffer.java
+++ b/core/src/processing/opengl/FrameBuffer.java
@@ -1,16 +1,15 @@
 /* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 
 /*
-  Processing OpenGL (c) 2011-2015 Andres Colubri
-
   Part of the Processing project - http://processing.org
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
+
   Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
-  License version 2.1 as published by the Free Software Foundation.
+  License as published by the Free Software Foundation, version 2.1.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +20,7 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
+*/
 
 package processing.opengl;
 
diff --git a/core/src/processing/opengl/PGL.java b/core/src/processing/opengl/PGL.java
index 236d0ee2f..796d234b9 100644
--- a/core/src/processing/opengl/PGL.java
+++ b/core/src/processing/opengl/PGL.java
@@ -1,17 +1,15 @@
 /* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 
 /*
-  Processing OpenGL (c) 2011-2015 Andres Colubri
-
   Part of the Processing project - http://processing.org
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
+
   Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
+  License as published by the Free Software Foundation, version 2.1.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/core/src/processing/opengl/PGraphics2D.java b/core/src/processing/opengl/PGraphics2D.java
index e26ac1a04..f3860e20d 100644
--- a/core/src/processing/opengl/PGraphics2D.java
+++ b/core/src/processing/opengl/PGraphics2D.java
@@ -1,16 +1,15 @@
 /* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 
 /*
-  Processing OpenGL (c) 2011-2015 Andres Colubri
-
   Part of the Processing project - http://processing.org
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
+
   Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
-  License version 2.1 as published by the Free Software Foundation.
+  License as published by the Free Software Foundation, version 2.1.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +20,7 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
+*/
 
 package processing.opengl;
 
diff --git a/core/src/processing/opengl/PGraphics3D.java b/core/src/processing/opengl/PGraphics3D.java
index ce60d19d0..50b18b167 100644
--- a/core/src/processing/opengl/PGraphics3D.java
+++ b/core/src/processing/opengl/PGraphics3D.java
@@ -1,16 +1,15 @@
 /* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 
 /*
-  Processing OpenGL (c) 2011-2015 Andres Colubri
-
   Part of the Processing project - http://processing.org
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
+
   Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
-  License version 2.1 as published by the Free Software Foundation.
+  License as published by the Free Software Foundation, version 2.1.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +20,7 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
+*/
 
 package processing.opengl;
 
diff --git a/core/src/processing/opengl/PGraphicsOpenGL.java b/core/src/processing/opengl/PGraphicsOpenGL.java
index b3e9171ee..d66ced5d9 100644
--- a/core/src/processing/opengl/PGraphicsOpenGL.java
+++ b/core/src/processing/opengl/PGraphicsOpenGL.java
@@ -1,16 +1,15 @@
 /* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 
 /*
-  Processing OpenGL (c) 2011-2015 Andres Colubri
-
   Part of the Processing project - http://processing.org
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
+
   Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
-  License version 2.1 as published by the Free Software Foundation.
+  License as published by the Free Software Foundation, version 2.1.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +20,7 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
+*/
 
 package processing.opengl;
 
diff --git a/core/src/processing/opengl/PJOGL.java b/core/src/processing/opengl/PJOGL.java
index 2ac187ebc..5b5ed498b 100644
--- a/core/src/processing/opengl/PJOGL.java
+++ b/core/src/processing/opengl/PJOGL.java
@@ -1,17 +1,15 @@
 /* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 
 /*
-  Processing OpenGL (c) 2011-2015 Andres Colubri
-
   Part of the Processing project - http://processing.org
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
+
   Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
+  License as published by the Free Software Foundation, version 2.1.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/core/src/processing/opengl/PShader.java b/core/src/processing/opengl/PShader.java
index 0d460c124..d24d1ae0a 100644
--- a/core/src/processing/opengl/PShader.java
+++ b/core/src/processing/opengl/PShader.java
@@ -1,16 +1,15 @@
 /* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 
 /*
-  Processing OpenGL (c) 2011-2015 Andres Colubri
-
   Part of the Processing project - http://processing.org
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
+
   Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
-  License version 2.1 as published by the Free Software Foundation.
+  License as published by the Free Software Foundation, version 2.1.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +20,7 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
+*/
 
 package processing.opengl;
 
diff --git a/core/src/processing/opengl/PShapeOpenGL.java b/core/src/processing/opengl/PShapeOpenGL.java
index d62f19f3f..d0c01faa3 100644
--- a/core/src/processing/opengl/PShapeOpenGL.java
+++ b/core/src/processing/opengl/PShapeOpenGL.java
@@ -1,16 +1,15 @@
 /* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 
 /*
-  Processing OpenGL (c) 2011-2015 Andres Colubri
-
   Part of the Processing project - http://processing.org
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
+
   Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
-  License version 2.1 as published by the Free Software Foundation.
+  License as published by the Free Software Foundation, version 2.1.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +20,7 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
+*/
 
 package processing.opengl;
 
diff --git a/core/src/processing/opengl/PSurfaceJOGL.java b/core/src/processing/opengl/PSurfaceJOGL.java
index a029b42c3..3727f3472 100644
--- a/core/src/processing/opengl/PSurfaceJOGL.java
+++ b/core/src/processing/opengl/PSurfaceJOGL.java
@@ -1,17 +1,15 @@
 /* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 
 /*
-  Processing OpenGL (c) 2011-2015 Andres Colubri
-
   Part of the Processing project - http://processing.org
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
+
   Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
+  License as published by the Free Software Foundation, version 2.1.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/core/src/processing/opengl/Texture.java b/core/src/processing/opengl/Texture.java
index c0e188b4d..4c5b85641 100644
--- a/core/src/processing/opengl/Texture.java
+++ b/core/src/processing/opengl/Texture.java
@@ -1,16 +1,15 @@
 /* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 
 /*
-  Processing OpenGL (c) 2011-2015 Andres Colubri
-
   Part of the Processing project - http://processing.org
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
+
   Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
-  License version 2.1 as published by the Free Software Foundation.
+  License as published by the Free Software Foundation, version 2.1.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +20,7 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
+*/
 
 package processing.opengl;
 
diff --git a/core/src/processing/opengl/VertexBuffer.java b/core/src/processing/opengl/VertexBuffer.java
index f3982c846..6315ba067 100644
--- a/core/src/processing/opengl/VertexBuffer.java
+++ b/core/src/processing/opengl/VertexBuffer.java
@@ -1,16 +1,15 @@
 /* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 
 /*
-  Processing OpenGL (c) 2011-2015 Andres Colubri
-
   Part of the Processing project - http://processing.org
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
+
   Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
-  License version 2.1 as published by the Free Software Foundation.
+  License as published by the Free Software Foundation, version 2.1.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +20,7 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
+*/
 
 package processing.opengl;
 
diff --git a/core/src/processing/opengl/shaders/ColorFrag.glsl b/core/src/processing/opengl/shaders/ColorFrag.glsl
index 92cb66a3c..59adfdad3 100644
--- a/core/src/processing/opengl/shaders/ColorFrag.glsl
+++ b/core/src/processing/opengl/shaders/ColorFrag.glsl
@@ -1,14 +1,13 @@
 /*
-  Processing OpenGL (c) 2011-2015 Andres Colubri
-
   Part of the Processing project - http://processing.org
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
+
   Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
-  License version 2.1 as published by the Free Software Foundation.
+  License as published by the Free Software Foundation, version 2.1.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +18,7 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
+*/
 
 #ifdef GL_ES
 precision mediump float;
diff --git a/core/src/processing/opengl/shaders/ColorVert.glsl b/core/src/processing/opengl/shaders/ColorVert.glsl
index 7788e7075..6e8820c22 100644
--- a/core/src/processing/opengl/shaders/ColorVert.glsl
+++ b/core/src/processing/opengl/shaders/ColorVert.glsl
@@ -1,14 +1,13 @@
 /*
-  Processing OpenGL (c) 2011-2015 Andres Colubri
-
   Part of the Processing project - http://processing.org
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
+
   Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
-  License version 2.1 as published by the Free Software Foundation.
+  License as published by the Free Software Foundation, version 2.1.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +18,7 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
+*/
 
 uniform mat4 transformMatrix;
 
diff --git a/core/src/processing/opengl/shaders/LightFrag.glsl b/core/src/processing/opengl/shaders/LightFrag.glsl
index b8fa80b48..b9cd44726 100644
--- a/core/src/processing/opengl/shaders/LightFrag.glsl
+++ b/core/src/processing/opengl/shaders/LightFrag.glsl
@@ -1,14 +1,13 @@
 /*
-  Processing OpenGL (c) 2011-2015 Andres Colubri
-
   Part of the Processing project - http://processing.org
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
+
   Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
-  License version 2.1 as published by the Free Software Foundation.
+  License as published by the Free Software Foundation, version 2.1.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +18,7 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
+*/
  
 #ifdef GL_ES
 precision mediump float;
diff --git a/core/src/processing/opengl/shaders/LightVert-vc4.glsl b/core/src/processing/opengl/shaders/LightVert-vc4.glsl
index f7984da81..ae145a0fd 100644
--- a/core/src/processing/opengl/shaders/LightVert-vc4.glsl
+++ b/core/src/processing/opengl/shaders/LightVert-vc4.glsl
@@ -1,14 +1,13 @@
 /*
-  Processing OpenGL (c) 2011-2015 Andres Colubri
-
   Part of the Processing project - http://processing.org
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
+
   Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
-  License version 2.1 as published by the Free Software Foundation.
+  License as published by the Free Software Foundation, version 2.1.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +18,7 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
+*/
 
 uniform mat4 modelviewMatrix;
 uniform mat4 transformMatrix;
diff --git a/core/src/processing/opengl/shaders/LightVert.glsl b/core/src/processing/opengl/shaders/LightVert.glsl
index d4ca719d3..559ca6407 100644
--- a/core/src/processing/opengl/shaders/LightVert.glsl
+++ b/core/src/processing/opengl/shaders/LightVert.glsl
@@ -1,14 +1,13 @@
 /*
-  Processing OpenGL (c) 2011-2015 Andres Colubri
-
   Part of the Processing project - http://processing.org
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
+
   Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
-  License version 2.1 as published by the Free Software Foundation.
+  License as published by the Free Software Foundation, version 2.1.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +18,7 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
+*/
 
 uniform mat4 modelviewMatrix;
 uniform mat4 transformMatrix;
diff --git a/core/src/processing/opengl/shaders/LineFrag.glsl b/core/src/processing/opengl/shaders/LineFrag.glsl
index a91a87ff6..09fffcb85 100644
--- a/core/src/processing/opengl/shaders/LineFrag.glsl
+++ b/core/src/processing/opengl/shaders/LineFrag.glsl
@@ -1,14 +1,13 @@
 /*
-  Processing OpenGL (c) 2011-2015 Andres Colubri
-
   Part of the Processing project - http://processing.org
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
+
   Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
-  License version 2.1 as published by the Free Software Foundation.
+  License as published by the Free Software Foundation, version 2.1.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +18,7 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
+*/
  
 #ifdef GL_ES
 precision mediump float;
diff --git a/core/src/processing/opengl/shaders/LineVert.glsl b/core/src/processing/opengl/shaders/LineVert.glsl
index 7c7da5164..b9237451d 100644
--- a/core/src/processing/opengl/shaders/LineVert.glsl
+++ b/core/src/processing/opengl/shaders/LineVert.glsl
@@ -1,14 +1,13 @@
 /*
-  Processing OpenGL (c) 2011-2015 Andres Colubri
-
   Part of the Processing project - http://processing.org
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
+
   Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
-  License version 2.1 as published by the Free Software Foundation.
+  License as published by the Free Software Foundation, version 2.1.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +18,7 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
+*/
 
 #define PROCESSING_LINE_SHADER
 
diff --git a/core/src/processing/opengl/shaders/MaskFrag.glsl b/core/src/processing/opengl/shaders/MaskFrag.glsl
index c6e67b86d..74fad83a9 100644
--- a/core/src/processing/opengl/shaders/MaskFrag.glsl
+++ b/core/src/processing/opengl/shaders/MaskFrag.glsl
@@ -1,14 +1,13 @@
 /*
-  Processing OpenGL (c) 2011-2015 Andres Colubri
-
   Part of the Processing project - http://processing.org
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
+
   Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
-  License version 2.1 as published by the Free Software Foundation.
+  License as published by the Free Software Foundation, version 2.1.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +18,7 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
+*/
  
 #ifdef GL_ES
 precision mediump float;
diff --git a/core/src/processing/opengl/shaders/PointFrag.glsl b/core/src/processing/opengl/shaders/PointFrag.glsl
index 92cb66a3c..59adfdad3 100644
--- a/core/src/processing/opengl/shaders/PointFrag.glsl
+++ b/core/src/processing/opengl/shaders/PointFrag.glsl
@@ -1,14 +1,13 @@
 /*
-  Processing OpenGL (c) 2011-2015 Andres Colubri
-
   Part of the Processing project - http://processing.org
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
+
   Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
-  License version 2.1 as published by the Free Software Foundation.
+  License as published by the Free Software Foundation, version 2.1.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +18,7 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
+*/
 
 #ifdef GL_ES
 precision mediump float;
diff --git a/core/src/processing/opengl/shaders/PointVert.glsl b/core/src/processing/opengl/shaders/PointVert.glsl
index a2682c379..847e3c7b1 100644
--- a/core/src/processing/opengl/shaders/PointVert.glsl
+++ b/core/src/processing/opengl/shaders/PointVert.glsl
@@ -1,14 +1,13 @@
 /*
-  Processing OpenGL (c) 2011-2015 Andres Colubri
-
   Part of the Processing project - http://processing.org
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
+
   Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
-  License version 2.1 as published by the Free Software Foundation.
+  License as published by the Free Software Foundation, version 2.1.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +18,7 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
+*/
 
 uniform mat4 projectionMatrix;
 uniform mat4 modelviewMatrix;
diff --git a/core/src/processing/opengl/shaders/TexFrag.glsl b/core/src/processing/opengl/shaders/TexFrag.glsl
index e6e245daf..5e236ee91 100644
--- a/core/src/processing/opengl/shaders/TexFrag.glsl
+++ b/core/src/processing/opengl/shaders/TexFrag.glsl
@@ -1,14 +1,13 @@
 /*
-  Processing OpenGL (c) 2011-2015 Andres Colubri
-
   Part of the Processing project - http://processing.org
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
+
   Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
-  License version 2.1 as published by the Free Software Foundation.
+  License as published by the Free Software Foundation, version 2.1.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +18,7 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
+*/
 
 #ifdef GL_ES
 precision mediump float;
diff --git a/core/src/processing/opengl/shaders/TexLightFrag.glsl b/core/src/processing/opengl/shaders/TexLightFrag.glsl
index 3d22df7bd..1e9cc7e19 100644
--- a/core/src/processing/opengl/shaders/TexLightFrag.glsl
+++ b/core/src/processing/opengl/shaders/TexLightFrag.glsl
@@ -1,14 +1,13 @@
 /*
-  Processing OpenGL (c) 2011-2015 Andres Colubri
-
   Part of the Processing project - http://processing.org
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
+
   Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
-  License version 2.1 as published by the Free Software Foundation.
+  License as published by the Free Software Foundation, version 2.1.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,8 +18,7 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
-
+*/
 #ifdef GL_ES
 precision mediump float;
 precision mediump int;
diff --git a/core/src/processing/opengl/shaders/TexLightVert-vc4.glsl b/core/src/processing/opengl/shaders/TexLightVert-vc4.glsl
index d34e4f876..c23ce1539 100644
--- a/core/src/processing/opengl/shaders/TexLightVert-vc4.glsl
+++ b/core/src/processing/opengl/shaders/TexLightVert-vc4.glsl
@@ -1,14 +1,13 @@
 /*
-  Processing OpenGL (c) 2011-2015 Andres Colubri
-
   Part of the Processing project - http://processing.org
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
+
   Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
-  License version 2.1 as published by the Free Software Foundation.
+  License as published by the Free Software Foundation, version 2.1.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +18,7 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
+*/
 
 uniform mat4 modelviewMatrix;
 uniform mat4 transformMatrix;
diff --git a/core/src/processing/opengl/shaders/TexLightVert.glsl b/core/src/processing/opengl/shaders/TexLightVert.glsl
index 5deb09956..3bef7bf3b 100644
--- a/core/src/processing/opengl/shaders/TexLightVert.glsl
+++ b/core/src/processing/opengl/shaders/TexLightVert.glsl
@@ -1,14 +1,13 @@
 /*
-  Processing OpenGL (c) 2011-2015 Andres Colubri
-
   Part of the Processing project - http://processing.org
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
+
   Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
-  License version 2.1 as published by the Free Software Foundation.
+  License as published by the Free Software Foundation, version 2.1.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +18,7 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
+*/
 
 uniform mat4 modelviewMatrix;
 uniform mat4 transformMatrix;
diff --git a/core/src/processing/opengl/shaders/TexVert.glsl b/core/src/processing/opengl/shaders/TexVert.glsl
index 44889eb40..3bc62e32f 100644
--- a/core/src/processing/opengl/shaders/TexVert.glsl
+++ b/core/src/processing/opengl/shaders/TexVert.glsl
@@ -1,14 +1,13 @@
 /*
-  Processing OpenGL (c) 2011-2015 Andres Colubri
-
   Part of the Processing project - http://processing.org
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
+
   Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
-  License version 2.1 as published by the Free Software Foundation.
+  License as published by the Free Software Foundation, version 2.1.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +18,7 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
+*/
 
 uniform mat4 transformMatrix;
 uniform mat4 texMatrix;