unexCoder
diff --git a/‎app/src/processing/app/Mode.java‎
Lines changed: 6 additions & 0 deletions b/‎app/src/processing/app/Mode.java‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎app/src/processing/app/Settings.java‎
Lines changed: 6 additions & 1 deletion b/‎app/src/processing/app/Settings.java‎
Lines changed: 6 additions & 1 deletion
diff --git a/‎experimental/src/processing/mode/experimental/ExperimentalMode.java‎
Lines changed: 3 additions & 2 deletions b/‎experimental/src/processing/mode/experimental/ExperimentalMode.java‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎experimental/theme/tab-sel-left.gif‎
-62 Bytes b/‎experimental/theme/tab-sel-left.gif‎
-62 Bytes
diff --git a/‎experimental/theme/tab-sel-menu.gif‎
-104 Bytes b/‎experimental/theme/tab-sel-menu.gif‎
-104 Bytes
diff --git a/‎experimental/theme/tab-sel-mid.gif‎
-54 Bytes b/‎experimental/theme/tab-sel-mid.gif‎
-54 Bytes
diff --git a/‎experimental/theme/tab-sel-right.gif‎
-839 Bytes b/‎experimental/theme/tab-sel-right.gif‎
-839 Bytes
diff --git a/‎experimental/theme/tab-unsel-left.gif‎
-62 Bytes b/‎experimental/theme/tab-unsel-left.gif‎
-62 Bytes
diff --git a/‎experimental/theme/tab-unsel-menu.gif‎
-104 Bytes b/‎experimental/theme/tab-unsel-menu.gif‎
-104 Bytes
diff --git a/‎experimental/theme/tab-unsel-mid.gif‎
-54 Bytes b/‎experimental/theme/tab-unsel-mid.gif‎
-54 Bytes
@@ -172,6 +172,12 @@ public void setupGUI() {
     try {
       //theme = new Settings(new File(folder, "theme/theme.txt"));
       theme = new Settings(Base.getContentFile("lib/theme.txt"));
+      
+      File modeTheme = new File(folder, "theme/theme.txt");
+      if (modeTheme.exists()) {
+        // Override the built-in settings with what the theme provides
+        theme.load(modeTheme);
+      }
 
       // other things that have to be set explicitly for the defaults
       theme.setColor("run.window.bgcolor", SystemColor.control);
 
@@ -67,7 +67,12 @@ public Settings(File file) throws IOException {
 
 
   public void load() {
-    String[] lines = PApplet.loadStrings(file);
+    load(file);
+  }
+
+  
+  public void load(File additions) {
+    String[] lines = PApplet.loadStrings(additions);
     for (String line : lines) {
       if ((line.length() == 0) ||
           (line.charAt(0) == '#')) continue;
 
@@ -29,6 +29,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import processing.app.Base;
+import processing.app.Editor;
 import processing.app.EditorState;
 import processing.app.Mode;
 import processing.mode.java.JavaMode;
@@ -115,7 +116,7 @@ public File[] getKeywordFiles() {
    * Create a new editor associated with this mode.
    */
   @Override
-  public processing.app.Editor createEditor(Base base, String path, EditorState state) {
+  public Editor createEditor(Base base, String path, EditorState state) {
     return new DebugEditor(base, path, state, this);
   }
 
@@ -133,7 +134,7 @@ public String loadThemeString(String attribute, String defaultValue) {
     if (newString != null) {
       return newString;
     }
-    Logger.getLogger(ExperimentalMode.class.getName()).log(Level.WARNING, "Error loading String: {0}", attribute);
+    Logger.getLogger(getClass().getName()).log(Level.WARNING, "Error loading String: {0}", attribute);
     return defaultValue;
   }