diff --git a/pdex/src/processing/mode/experimental/ErrorCheckerService.java b/pdex/src/processing/mode/experimental/ErrorCheckerService.java
index 89c9266be..f25a08854 100644
--- a/pdex/src/processing/mode/experimental/ErrorCheckerService.java
+++ b/pdex/src/processing/mode/experimental/ErrorCheckerService.java
@@ -424,8 +424,7 @@ public class ErrorCheckerService implements Runnable{
         // .println("Experimental Mode: Loading contributed libraries referenced by import statements.");
         
         // The folder SketchBook/modes/ExperimentalMode/mode
-        File f = new File(Base.getSketchbookModesFolder().getAbsolutePath() + File.separator + "ExperimentalMode"
-            + File.separator + "mode");
+        File f = editor.getMode().getContentFile("mode");
         
         if(!f.exists()) {
         	System.err.println("Could not locate the files required for on-the-fly error checking. Bummer.");
diff --git a/pdex/src/processing/mode/experimental/SketchOutline.java b/pdex/src/processing/mode/experimental/SketchOutline.java
index b135a6fbc..f753d15d0 100644
--- a/pdex/src/processing/mode/experimental/SketchOutline.java
+++ b/pdex/src/processing/mode/experimental/SketchOutline.java
@@ -349,13 +349,9 @@ public class SketchOutline {
     protected final ImageIcon classIcon, fieldIcon, methodIcon;
 
     public CustomCellRenderer() {
-      String iconPath = "data" + File.separator + "icons";
-      iconPath = (Base.getSketchbookFolder().getAbsolutePath())
-      + File.separator + "modes" + File.separator
-          + editor.getMode().getClass().getSimpleName() + File.separator
-          + "data" + File.separator + "icons";
-      ;
-
+      String iconPath = editor.getMode().getContentFile("data")
+          .getAbsolutePath()
+          + File.separator + "icons";
       classIcon = new ImageIcon(iconPath + File.separator + "class_obj.png");
       methodIcon = new ImageIcon(iconPath + File.separator
           + "methpub_obj.png");