diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
index 82fedb219..84c0d0a8a 100644
--- a/core/src/processing/core/PApplet.java
+++ b/core/src/processing/core/PApplet.java
@@ -11541,9 +11541,9 @@ public class PApplet extends Applet
 
 
   /**
-   *
+   * 
    * @param level either 2, 4, or 8
-   */
+   */ 
   public void smooth(int level) {
     if (recorder != null) recorder.smooth(level);
     g.smooth(level);
diff --git a/java/examples/Basics/Input/Clock/Clock.pde b/java/examples/Basics/Input/Clock/Clock.pde
index cfcd16c31..09c45740e 100644
--- a/java/examples/Basics/Input/Clock/Clock.pde
+++ b/java/examples/Basics/Input/Clock/Clock.pde
@@ -55,8 +55,9 @@ void draw() {
   strokeWeight(2);
   beginShape(POINTS);
   for (int a = 0; a < 360; a+=6) {
-    float x = cx + cos(radians(a)) * secondsRadius;
-    float y = cy + sin(radians(a)) * secondsRadius;
+    float angle = radians(a);
+    float x = cx + cos(angle) * secondsRadius;
+    float y = cy + sin(angle) * secondsRadius;
     vertex(x, y);
   }
   endShape();
diff --git a/java/examples/Basics/Input/Easing/Easing.pde b/java/examples/Basics/Input/Easing/Easing.pde
index 82bdb5b67..c3772d05a 100644
--- a/java/examples/Basics/Input/Easing/Easing.pde
+++ b/java/examples/Basics/Input/Easing/Easing.pde
@@ -11,26 +11,23 @@
  
 float x;
 float y;
-float targetX, targetY;
 float easing = 0.05;
 
-void setup() 
-{
+void setup() {
   size(640, 360); 
   noStroke();  
 }
 
-void draw() 
-{ 
+void draw() { 
   background(51);
   
-  targetX = mouseX;
+  float targetX = mouseX;
   float dx = targetX - x;
   if(abs(dx) > 1) {
     x += dx * easing;
   }
   
-  targetY = mouseY;
+  float targetY = mouseY;
   float dy = targetY - y;
   if(abs(dy) > 1) {
     y += dy * easing;
diff --git a/java/examples/Basics/Input/KeyboardFunctions/KeyboardFunctions.pde b/java/examples/Basics/Input/KeyboardFunctions/KeyboardFunctions.pde
index a97896474..f0554ab93 100644
--- a/java/examples/Basics/Input/KeyboardFunctions/KeyboardFunctions.pde
+++ b/java/examples/Basics/Input/KeyboardFunctions/KeyboardFunctions.pde
@@ -26,11 +26,11 @@ void setup()
 {
   size(640, 360);
   noStroke();
-  colorMode(RGB, numChars);
+  colorMode(HSB, numChars);
   background(numChars/2);
   // Set a gray value for each key
-  for(int i=0; i<numChars; i++) {
-    colors[i] = color(i);    
+  for(int i = 0; i < numChars; i++) {
+    colors[i] = color(i, numChars, numChars);    
   }
 }
 
diff --git a/java/examples/Basics/Input/MousePress/MousePress.pde b/java/examples/Basics/Input/MousePress/MousePress.pde
index ad6fca74d..00d997f5a 100644
--- a/java/examples/Basics/Input/MousePress/MousePress.pde
+++ b/java/examples/Basics/Input/MousePress/MousePress.pde
@@ -8,6 +8,7 @@
 
 void setup() {
   size(640, 360);
+  noSmooth();
   fill(126);
   background(102);
 }
diff --git a/java/examples/Basics/Input/MouseSignals/MouseSignals.pde b/java/examples/Basics/Input/MouseSignals/MouseSignals.pde
index 607cf87be..c4776751d 100644
--- a/java/examples/Basics/Input/MouseSignals/MouseSignals.pde
+++ b/java/examples/Basics/Input/MouseSignals/MouseSignals.pde
@@ -14,6 +14,7 @@ int[] bvals;
 void setup() 
 {
   size(640, 360);
+  noSmooth();
   xvals = new int[width];
   yvals = new int[width];
   bvals = new int[width];
diff --git a/java/examples/Topics/Shaders/Deform/Deform.pde b/java/examples/Topics/Shaders/Deform/Deform.pde
index 2c15d428c..0648d2da0 100644
--- a/java/examples/Topics/Shaders/Deform/Deform.pde
+++ b/java/examples/Topics/Shaders/Deform/Deform.pde
@@ -1,10 +1,13 @@
+/**
+ * Deform
+ */
+ 
 PImage tex;
 PShader deform;
 
 void setup() {
-  size(512, 384, P2D);
+  size(640, 360, P2D);
   
-  textureWrap(REPEAT);   
   tex = loadImage("tex1.jpg");
  
   deform = loadShader("deform.glsl");
@@ -16,4 +19,4 @@ void draw() {
   deform.set("mouse", float(mouseX), float(mouseY));
   shader(deform);
   image(tex, 0, 0, width, height);
-}
+}
diff --git a/java/examples/Topics/Shaders/Monjori/Monjori.pde b/java/examples/Topics/Shaders/Monjori/Monjori.pde
index c260b5b4d..19bfcabd4 100644
--- a/java/examples/Topics/Shaders/Monjori/Monjori.pde
+++ b/java/examples/Topics/Shaders/Monjori/Monjori.pde
@@ -1,7 +1,11 @@
-PShader monjori;
+/**
+ * Monjori
+ */
+ 
+ PShader monjori;
 
 void setup() {
-  size(512, 384, P2D);
+  size(640, 360, P2D);
   noStroke();
  
   monjori = loadShader("monjori.glsl");
@@ -15,4 +19,4 @@ void draw() {
   shader(monjori);
   rect(0, 0, width, height);  
 }
-
+
diff --git a/java/examples/Topics/Shaders/Nebula/Nebula.pde b/java/examples/Topics/Shaders/Nebula/Nebula.pde
index bbb93db25..bf5f36ab6 100644
--- a/java/examples/Topics/Shaders/Nebula/Nebula.pde
+++ b/java/examples/Topics/Shaders/Nebula/Nebula.pde
@@ -1,7 +1,11 @@
+/**
+ * Nebula
+ */
+ 
 PShader nebula;
 
 void setup() {
-  size(320, 240, P3D);
+  size(640, 360, P2D);
   noStroke();
 
   nebula = loadShader("nebula.glsl");
@@ -14,4 +18,4 @@ void draw() {
   fill(0);
   rect(0, 0, width, height);
 }
-
+
diff --git a/java/keywords.txt b/java/keywords.txt
index 241c71d91..d64fc0c05 100644
--- a/java/keywords.txt
+++ b/java/keywords.txt
@@ -286,6 +286,31 @@ substring	KEYWORD3	String_substring_
 toLowerCase	KEYWORD3	String_toLowerCase_
 toUpperCase	KEYWORD3	String_toUpperCase_
 
+# Temporary additions 3 September 2012 as the reference is getting updated
+PShape	KEYWORD1
+createShape	KEYWORD2
+beginContour	KEYWORD2
+endContour	KEYWORD2
+end	KEYWORD2
+addChild	KEYWORD2
+
+PShader	KEYWORD1
+loadShader	KEYWORD2
+resetShader	KEYWORD2
+bind	KEYWORD2
+shader	KEYWORD2
+  
+blendMode	KEYWORD2
+  
+selectInput	KEYWORD2
+selectOutput	KEYWORD2
+selectFolder	KEYWORD2
+  
+saveType	KEYWORD2
+loadType	KEYWORD2
+clip	KEYWORD2
+noClip	KEYWORD2
+
 
 # Operators are without KEYWORDS
 
@@ -384,7 +409,7 @@ day	KEYWORD2	day_
 degrees	KEYWORD2	degrees_
 directionalLight	KEYWORD2	directionalLight_
 displayHeight	KEYWORD5	displayHeight
-width	KEYWORD5	displayWidth
+displayWidth	KEYWORD5	displayWidth
 dist	KEYWORD2	dist_
 draw	KEYWORD2	draw_
 ellipse	KEYWORD2	ellipse_
@@ -488,7 +513,6 @@ blend	KEYWORD3	PImage_blend_
 copy	KEYWORD3	PImage_copy_
 filter	KEYWORD3	PImage_filter_
 get	KEYWORD3	PImage_get_
-height	KEYWORD4	PImage_height
 loadPixels	KEYWORD3	PImage_loadPixels_
 mask	KEYWORD3	PImage_mask_
 pixels	KEYWORD4	PImage_pixels
@@ -496,7 +520,6 @@ resize	KEYWORD3	PImage_resize_
 save	KEYWORD3	PImage_save_
 set	KEYWORD3	PImage_set_
 updatePixels	KEYWORD3	PImage_updatePixels_
-width	KEYWORD4	PImage_width
 pixels	KEYWORD5	pixels
 pmouseX	KEYWORD5	pmouseX
 pmouseY	KEYWORD5	pmouseY
@@ -514,7 +537,6 @@ PShape	KEYWORD1	PShape
 disableStyle	KEYWORD3	PShape_disableStyle_
 enableStyle	KEYWORD3	PShape_enableStyle_
 getChild	KEYWORD3	PShape_getChild_
-height	KEYWORD4	PShape_height
 isVisible	KEYWORD3	PShape_isVisible_
 resetMatrix	KEYWORD3	PShape_resetMatrix_
 rotate	KEYWORD3	PShape_rotate_
@@ -524,7 +546,6 @@ rotateZ	KEYWORD3	PShape_rotateZ_
 scale	KEYWORD3	PShape_scale_
 setVisible	KEYWORD3	PShape_setVisible_
 translate	KEYWORD3	PShape_translate_
-width	KEYWORD4	PShape_width
 pushMatrix	KEYWORD2	pushMatrix_
 pushStyle	KEYWORD2	pushStyle_
 PVector	KEYWORD1	PVector
diff --git a/java/theme/theme.txt b/java/theme/theme.txt
index c81bb8957..7e3a3332c 100644
--- a/java/theme/theme.txt
+++ b/java/theme/theme.txt
@@ -83,6 +83,10 @@ editor.keyword2.style = #cc6600,plain
 # e.g. byte, char, short, color
 editor.keyword3.style = #cc6600,bold
 
+editor.keyword4.style = #006699,plain
+
+editor.keyword5.style = #006699,plain
+
 
 # TEXT - LITERALS