diff --git a/app/src/processing/app/syntax/DefaultInputHandler.java b/app/src/processing/app/syntax/DefaultInputHandler.java
index 30e47f087..aadc87a5e 100644
--- a/app/src/processing/app/syntax/DefaultInputHandler.java
+++ b/app/src/processing/app/syntax/DefaultInputHandler.java
@@ -188,7 +188,7 @@ public class DefaultInputHandler extends InputHandler {
     if ((modifiers & InputEvent.META_DOWN_MASK) != 0) return;
 
     // Prevent CTRL-/ from going through as a typed '/' character
-    // http://code.google.com/p/processing/issues/detail?id=596
+    // https://github.com/processing/processing/issues/635
     if ((modifiers & InputEvent.CTRL_DOWN_MASK) != 0 && c == '/') return;
 
     if (c != KeyEvent.CHAR_UNDEFINED) {
diff --git a/app/src/processing/app/syntax/JEditTextArea.java b/app/src/processing/app/syntax/JEditTextArea.java
index 7c3800aa5..566119e3d 100644
--- a/app/src/processing/app/syntax/JEditTextArea.java
+++ b/app/src/processing/app/syntax/JEditTextArea.java
@@ -421,8 +421,8 @@ public class JEditTextArea extends JComponent
       int painterWidth = painter.getScrollWidth();
 
       // Update to how horizontal scrolling is handled
-      // http://code.google.com/p/processing/issues/detail?id=280
-      // http://code.google.com/p/processing/issues/detail?id=316
+      // https://github.com/processing/processing/issues/319
+      // https://github.com/processing/processing/issues/355
       //setValues(int newValue, int newExtent, int newMin, int newMax)
       if (horizontalOffset < 0) {
         horizontal.setValues(-horizontalOffset, painterWidth, -leftHandGutter, width);
@@ -1951,7 +1951,7 @@ public class JEditTextArea extends JComponent
         }
 
         // Remove tabs and replace with spaces
-        // http://code.google.com/p/processing/issues/detail?id=69
+        // https://github.com/processing/processing/issues/108
         if (selection.contains("\t")) {
           int tabSize = Preferences.getInteger("editor.tabs.size");
           char[] c = new char[tabSize];
diff --git a/app/src/processing/app/syntax/PdeInputHandler.java b/app/src/processing/app/syntax/PdeInputHandler.java
index 3417bb19d..cc763bd3d 100644
--- a/app/src/processing/app/syntax/PdeInputHandler.java
+++ b/app/src/processing/app/syntax/PdeInputHandler.java
@@ -130,7 +130,7 @@ public class PdeInputHandler extends DefaultInputHandler {
     if (Platform.isMacOS()) {
       // Additional OS X key bindings added for 0215.
       // Also note that two more are added above and marked 0215.
-      // http://code.google.com/p/processing/issues/detail?id=1354
+      // https://github.com/processing/processing/issues/1392
       // "Mac keyboard shortcuts" document from Apple:
       // https://support.apple.com/en-us/HT201236
 
diff --git a/app/src/processing/app/ui/Editor.java b/app/src/processing/app/ui/Editor.java
index 3d928a57e..e81b162de 100644
--- a/app/src/processing/app/ui/Editor.java
+++ b/app/src/processing/app/ui/Editor.java
@@ -1007,7 +1007,7 @@ public abstract class Editor extends JFrame implements RunnerListener {
 
 
   static public void showChanges() {
-    // http://code.google.com/p/processing/issues/detail?id=1520
+    // https://github.com/processing/processing/issues/1558
     if (!Base.isCommandLine()) {
       Platform.openURL("https://github.com/processing/processing/wiki/Changes");
     }
@@ -1817,7 +1817,7 @@ public abstract class Editor extends JFrame implements RunnerListener {
         // Put the scrollbar position back, otherwise it jumps on each format.
         // Since we're not doing a good job of maintaining position anyway,
         // a more complicated workaround here is fairly pointless.
-        // http://code.google.com/p/processing/issues/detail?id=1533
+        // https://github.com/processing/processing/issues/1571
         if (scrollPos != textarea.getVerticalScrollPosition()) {
           textarea.setVerticalScrollPosition(scrollPos);
         }
diff --git a/core/src/processing/awt/PGraphicsJava2D.java b/core/src/processing/awt/PGraphicsJava2D.java
index ed696ac12..92b10cb33 100644
--- a/core/src/processing/awt/PGraphicsJava2D.java
+++ b/core/src/processing/awt/PGraphicsJava2D.java
@@ -174,7 +174,7 @@ public class PGraphicsJava2D extends PGraphics {
 
         if (useOffscreen) {
           // Needs to be RGB otherwise there's a major performance hit [0204]
-          // http://code.google.com/p/processing/issues/detail?id=729
+          // https://github.com/processing/processing/issues/768
           image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
 //        GraphicsConfiguration gc = parent.getGraphicsConfiguration();
 //        image = gc.createCompatibleImage(width, height);
@@ -575,7 +575,7 @@ public class PGraphicsJava2D extends PGraphics {
     super.hint(which);
 
     // Avoid badness when drawing shorter strokes.
-    // http://code.google.com/p/processing/issues/detail?id=1068
+    // https://github.com/processing/processing/issues/1106
     // Unfortunately cannot always be enabled, because it makes the
     // stroke in many standard Processing examples really gross.
     if (which == ENABLE_STROKE_PURE) {
@@ -960,11 +960,11 @@ public class PGraphicsJava2D extends PGraphics {
 
   /**
    *
-   * Blends the pixels in the display window according to a defined mode. 
-   * There is a choice of the following modes to blend the source pixels (A) 
-   * with the ones of pixels already in the display window (B). Each pixel's 
-   * final color is the result of applying one of the blend modes with each 
-   * channel of (A) and (B) independently. The red channel is compared with 
+   * Blends the pixels in the display window according to a defined mode.
+   * There is a choice of the following modes to blend the source pixels (A)
+   * with the ones of pixels already in the display window (B). Each pixel's
+   * final color is the result of applying one of the blend modes with each
+   * channel of (A) and (B) independently. The red channel is compared with
    * red, green with green, and blue with blue.<br />
    * <br />
    * BLEND - linear interpolation of colors: C = A*factor + B. This is the default.<br />
@@ -987,11 +987,11 @@ public class PGraphicsJava2D extends PGraphics {
    * <br />
    * REPLACE - the pixels entirely replace the others and don't utilize alpha (transparency) values<br />
    * <br />
-   * We recommend using <b>blendMode()</b> and not the previous <b>blend()</b> 
-   * function. However, unlike <b>blend()</b>, the <b>blendMode()</b> function 
-   * does not support the following: HARD_LIGHT, SOFT_LIGHT, OVERLAY, DODGE, 
-   * BURN. On older hardware, the LIGHTEST, DARKEST, and DIFFERENCE modes might 
-   * not be available as well. 
+   * We recommend using <b>blendMode()</b> and not the previous <b>blend()</b>
+   * function. However, unlike <b>blend()</b>, the <b>blendMode()</b> function
+   * does not support the following: HARD_LIGHT, SOFT_LIGHT, OVERLAY, DODGE,
+   * BURN. On older hardware, the LIGHTEST, DARKEST, and DIFFERENCE modes might
+   * not be available as well.
    *
    *
    * @webref Rendering
diff --git a/core/src/processing/awt/PSurfaceAWT.java b/core/src/processing/awt/PSurfaceAWT.java
index 30200f3b9..5f306a25d 100644
--- a/core/src/processing/awt/PSurfaceAWT.java
+++ b/core/src/processing/awt/PSurfaceAWT.java
@@ -150,11 +150,11 @@ public class PSurfaceAWT extends PSurfaceNone {
 //        // request focus for its canvas inside beginDraw().
 //        // http://java.sun.com/j2se/1.4.2/docs/api/java/awt/doc-files/FocusSpec.html
 //        // Disabling for 0185, because it causes an assertion failure on OS X
-//        // http://code.google.com/p/processing/issues/detail?id=258
+//        // https://github.com/processing/processing/issues/297
 //        //        requestFocus();
 //
 //        // Changing to this version for 0187
-//        // http://code.google.com/p/processing/issues/detail?id=279
+//        // https://github.com/processing/processing/issues/318
 //        //requestFocusInWindow();
 //
 //        // For 3.0, just call this directly on the Canvas object
@@ -441,7 +441,7 @@ public class PSurfaceAWT extends PSurfaceNone {
     //frame.validate();
 
     // disabling resize has to happen after pack() to avoid apparent Apple bug
-    // http://code.google.com/p/processing/issues/detail?id=467
+    // https://github.com/processing/processing/issues/506
     frame.setResizable(false);
 
     frame.addWindowListener(new WindowAdapter() {
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
index 87f886325..b5b960d9c 100644
--- a/core/src/processing/core/PApplet.java
+++ b/core/src/processing/core/PApplet.java
@@ -2038,7 +2038,7 @@ public class PApplet implements PConstants {
           (e instanceof IllegalAccessException)) {
         if (e.getMessage().contains("cannot be <= 0")) {
           // IllegalArgumentException will be thrown if w/h is <= 0
-          // http://code.google.com/p/processing/issues/detail?id=983
+          // https://github.com/processing/processing/issues/1021
           throw new RuntimeException(e);
 
         } else {
diff --git a/core/src/processing/core/PGraphics.java b/core/src/processing/core/PGraphics.java
index 3f07dcf96..60accd765 100644
--- a/core/src/processing/core/PGraphics.java
+++ b/core/src/processing/core/PGraphics.java
@@ -2752,7 +2752,7 @@ public class PGraphics extends PImage implements PConstants {
   // Still need to do a lot of work here to make it behave across renderers
   // (e.g. not all renderers use the vertices array)
   // Also seems to be some issues on quality here (too dense)
-  // http://code.google.com/p/processing/issues/detail?id=265
+  // https://github.com/processing/processing/issues/304
 //  private void quadraticVertex(float cpx, float cpy, float x, float y) {
 //    float[] prev = vertices[vertexCount - 1];
 //    float prevX = prev[X];
diff --git a/core/src/processing/core/PShapeSVG.java b/core/src/processing/core/PShapeSVG.java
index e125f9620..8e8e78242 100644
--- a/core/src/processing/core/PShapeSVG.java
+++ b/core/src/processing/core/PShapeSVG.java
@@ -863,7 +863,7 @@ public class PShapeSVG extends PShape {
       case 'z':
         // since closing the path, the 'current' point needs
         // to return back to the last moveto location.
-        // http://code.google.com/p/processing/issues/detail?id=1058
+        // https://github.com/processing/processing/issues/1096
         cx = movetoX;
         cy = movetoY;
         close = true;
diff --git a/core/src/processing/core/PVector.java b/core/src/processing/core/PVector.java
index c34623470..a2bdd4718 100644
--- a/core/src/processing/core/PVector.java
+++ b/core/src/processing/core/PVector.java
@@ -979,13 +979,13 @@ public class PVector implements Serializable {
     // This should be a number between -1 and 1, since it's "normalized"
     double amt = dot / (v1mag * v2mag);
     // But if it's not due to rounding error, then we need to fix it
-    // http://code.google.com/p/processing/issues/detail?id=340
+    // https://github.com/processing/processing/issues/379
     // Otherwise if outside the range, acos() will return NaN
     // http://www.cppreference.com/wiki/c/math/acos
     if (amt <= -1) {
       return PConstants.PI;
     } else if (amt >= 1) {
-      // http://code.google.com/p/processing/issues/detail?id=435
+      // https://github.com/processing/processing/issues/474
       return 0;
     }
     return (float) Math.acos(amt);
diff --git a/java/src/processing/mode/java/JavaInputHandler.java b/java/src/processing/mode/java/JavaInputHandler.java
index e4bb9bafd..56d6447a7 100644
--- a/java/src/processing/mode/java/JavaInputHandler.java
+++ b/java/src/processing/mode/java/JavaInputHandler.java
@@ -147,7 +147,7 @@ public class JavaInputHandler extends PdeInputHandler {
       //if ((event.getModifiers() & InputEvent.SHIFT_MASK) != 0) {
       if (event.isShiftDown()) {
         // if shift is down, the user always expects an outdent
-        // http://code.google.com/p/processing/issues/detail?id=458
+        // https://github.com/processing/processing/issues/497
         editor.handleOutdent();
 
       } else if (textarea.isSelectionActive()) {