diff --git a/pdex/src/galsasson/mode/tweak/TweakEditor.java b/pdex/src/galsasson/mode/tweak/TweakEditor.java
deleted file mode 100644
index 0453d165a..000000000
--- a/pdex/src/galsasson/mode/tweak/TweakEditor.java
+++ /dev/null
@@ -1,472 +0,0 @@
-/*
-  Part of TweakMode project (https://github.com/galsasson/TweakMode)
-  
-  Under Google Summer of Code 2013 - 
-  http://www.google-melange.com/gsoc/homepage/google/gsoc2013
-  
-  Copyright (C) 2013 Gal Sasson
-	
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2
-  as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software Foundation,
-  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-package galsasson.mode.tweak;
-
-import java.awt.BorderLayout;
-import java.awt.CardLayout;
-import java.awt.Frame;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.regex.Pattern;
-
-import javax.swing.Box;
-import javax.swing.JCheckBoxMenuItem;
-import javax.swing.JFileChooser;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.border.EtchedBorder;
-import javax.swing.table.TableModel;
-import javax.swing.text.BadLocationException;
-
-import processing.app.Base;
-import processing.app.EditorState;
-import processing.app.EditorToolbar;
-import processing.app.Mode;
-import processing.app.Sketch;
-import processing.app.SketchCode;
-import processing.app.SketchException;
-import processing.app.syntax.JEditTextArea;
-import processing.app.syntax.PdeTextAreaDefaults;
-import processing.app.syntax.SyntaxDocument;
-import processing.mode.java.JavaBuild;
-import processing.mode.java.JavaEditor;
-import processing.mode.java.JavaToolbar;
-import processing.mode.java.runner.Runner;
-
-/**
- * Editor for STMode
- * 
- * @author Gal Sasson <sasgal@gmail.com>
- * 
- */
-public class TweakEditor extends JavaEditor 
-{
-	TweakMode tweakMode;
-	
-	String[] baseCode;
-	
-	final static int SPACE_AMOUNT = 0;
-	
-	int oscPort;
-	
-	/**
-	 * Custom TextArea
-	 */
-	protected TweakTextArea tweakTextArea;
-
-	protected TweakEditor(Base base, String path, EditorState state,
-							final Mode mode) {
-		super(base, path, state, mode);
-
-		tweakMode = (TweakMode)mode;
-		
-		// random port for OSC (0xff0 - 0xfff0)
-		oscPort = (int)(Math.random()*0xf000) + 0xff0;
-	}
-	
-	public EditorToolbar createToolbar() {
-		return new TweakToolbar(this, base);
-	}
-
-	/**
-	 * Override creation of the default textarea.
-	 */
-	protected JEditTextArea createTextArea() {
-		tweakTextArea = new TweakTextArea(this, new PdeTextAreaDefaults(mode));
-		return tweakTextArea;
-	}
-	
-	public JMenu buildModeMenu() {
-		JMenu menu = new JMenu("Tweak");
-		JCheckBoxMenuItem item;
-
-		item = new JCheckBoxMenuItem("Dump modified code");
-		item.setSelected(false);
-		item.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				tweakMode.dumpModifiedCode = ((JCheckBoxMenuItem)e.getSource()).isSelected();
-			}
-		});
-		menu.add(item);
-
-		return menu;
-	}
-
-	public void startInteractiveMode()
-	{
-		tweakTextArea.startInteractiveMode();
-	}
-
-	public void stopInteractiveMode(ArrayList<Handle> handles[])
-	{				
-		tweakTextArea.stopInteractiveMode();
-
-		// remove space from the code (before and after)
-		removeSpacesFromCode();
-
-		// check which tabs were modified
-		boolean modified = false;
-		boolean[] modifiedTabs = getModifiedTabs(handles);
-		for (boolean mod : modifiedTabs) {
-			if (mod) {
-				modified = true;
-				break;
-			}
-		}
-
-		if (modified) {
-			// ask to keep the values
-			int ret = Base.showYesNoQuestion(this, "Tweak Mode",
-									"Keep the changes?",
-									"You changed some values in your sketch. Would you like to keep the changes?");
-			if (ret == 1) {
-				// NO! don't keep changes
-				loadSavedCode();
-				// update the painter to draw the saved (old) code
-				tweakTextArea.invalidate();
-			}
-			else {
-				// YES! keep changes
-				// the new values are already present, just make sure the user can save the modified tabs
-				for (int i=0; i<sketch.getCodeCount(); i++) {
-					if (modifiedTabs[i]) {
-						sketch.getCode(i).setModified(true);
-					}
-					else {
-						// load the saved code of tabs that didn't change
-						// (there might be formatting changes that should not be saved)
-						sketch.getCode(i).setProgram(sketch.getCode(i).getSavedProgram());		
-						/* Wild Hack: set document to null so the text editor will refresh 
-						   the program contents when the document tab is being clicked */
-						sketch.getCode(i).setDocument(null);
-
-						if (i == sketch.getCurrentCodeIndex()) {
-							// this will update the current code		
-							setCode(sketch.getCurrentCode());
-						}
-					}
-				}
-				
-				// save the sketch
-				try {
-					sketch.save();
-				}
-				catch (IOException e) {
-					Base.showWarning("Tweak Mode", "Could not save the modified sketch!", e);
-				}
-				
-				// repaint the editor header (show the modified tabs)
-				header.repaint();
-				tweakTextArea.invalidate();
-			}
-		}
-		else {
-			// number values were not modified but we need to load the saved code
-			// because of some formatting changes
-			loadSavedCode();
-			tweakTextArea.invalidate();
-		}
-	}
-
-	public void updateInterface(ArrayList<Handle> handles[], ArrayList<ColorControlBox> colorBoxes[])
-	{
-		// set OSC port of handles
-		for (int i=0; i<handles.length; i++) {
-			for (Handle h : handles[i]) {
-				h.setOscPort(oscPort);
-			}
-		}
-
-		tweakTextArea.updateInterface(handles, colorBoxes);
-	}
-
-	/**
-	* Deactivate run button
-	* Do this because when Mode.handleRun returns null the play button stays on.
-	*/
-	public void deactivateRun()
-	{
-		toolbar.deactivate(TweakToolbar.RUN);
-	}
-	
-	private boolean[] getModifiedTabs(ArrayList<Handle> handles[])
-	{
-		boolean[] modifiedTabs = new boolean[handles.length];
-		
-		for (int i=0; i<handles.length; i++) {
-			for (Handle h : handles[i]) {
-				if (h.valueChanged()) {
-					modifiedTabs[i] = true;
-				}
-			}
-		}
-		
-		return modifiedTabs;
-	}
-	
-	public void initBaseCode()
-	{
-    	SketchCode[] code = sketch.getCode();
-    	
-    	String space = new String();
-    	
-    	for (int i=0; i<SPACE_AMOUNT; i++) {
-    		space += "\n";
-    	}
-    	
-    	baseCode = new String[code.length];
-		for (int i=0; i<code.length; i++)
-		{
-			baseCode[i] = new String(code[i].getSavedProgram());
-			baseCode[i] = space + baseCode[i] + space;
-		} 
-	}
-	
-	public void initEditorCode(ArrayList<Handle> handles[], boolean withSpaces)
-	{
-		SketchCode[] sketchCode = sketch.getCode();
-		for (int tab=0; tab<baseCode.length; tab++) {
-				// beautify the numbers
-				int charInc = 0;
-				String code = baseCode[tab];
-		
-				for (Handle n : handles[tab])
-				{
-					int s = n.startChar + charInc;
-					int e = n.endChar + charInc;
-					String newStr = n.strNewValue;
-					if (withSpaces) {
-						newStr = "  " + newStr + "  ";
-					}
-					code = replaceString(code, s, e, newStr);
-					n.newStartChar = n.startChar + charInc;
-					charInc += n.strNewValue.length() - n.strValue.length();
-					if (withSpaces) {
-						charInc += 4;
-					}
-					n.newEndChar = n.endChar + charInc;
-				}
-				
-				sketchCode[tab].setProgram(code);		
-				/* Wild Hack: set document to null so the text editor will refresh 
-				   the program contents when the document tab is being clicked */
-				sketchCode[tab].setDocument(null);
-			}
-		
-		// this will update the current code		
-		setCode(sketch.getCurrentCode());
-	}
-	
-	private void loadSavedCode()
-	{
-		SketchCode[] code = sketch.getCode();
-		for (int i=0; i<code.length; i++) {
-			if (!code[i].getProgram().equals(code[i].getSavedProgram())) {
-				code[i].setProgram(code[i].getSavedProgram());		
-				/* Wild Hack: set document to null so the text editor will refresh 
-				   the program contents when the document tab is being clicked */
-				code[i].setDocument(null);
-			}
-		}
-		
-		// this will update the current code
-		setCode(sketch.getCurrentCode());
-	}
-	
-	private void removeSpacesFromCode()
-	{
-		SketchCode[] code = sketch.getCode();
-		for (int i=0; i<code.length; i++) {
-			String c = code[i].getProgram();
-			c = c.substring(SPACE_AMOUNT, c.length() - SPACE_AMOUNT);
-			code[i].setProgram(c);
-			/* Wild Hack: set document to null so the text editor will refresh
-			   the program contents when the document tab is being clicked */
-			code[i].setDocument(null);
-		}
-		// this will update the current code
-		setCode(sketch.getCurrentCode());
-	}
-	
-    /**
-     * Replace all numbers with variables and add code to initialize these variables and handle OSC messages.
-     * @param sketch
-     * 	the sketch to work on
-     * @param handles
-     * 	list of numbers to replace in this sketch
-     * @return
-     *  true on success
-     */
-    public boolean automateSketch(Sketch sketch, ArrayList<Handle> handles[])
-    {
-    	SketchCode[] code = sketch.getCode();
-
-    	if (code.length<1)
-    		return false;
-
-    	if (handles.length == 0)
-    		return false;
-
-    	int setupStartPos = SketchParser.getSetupStart(baseCode[0]);
-    	if (setupStartPos < 0) {
-    		return false;
-    	}
-
-		// Copy current program to interactive program
-
-    	/* modify the code below, replace all numbers with their variable names */
-    	// loop through all tabs in the current sketch
-    	for (int tab=0; tab<code.length; tab++)
-    	{
-    		int charInc = 0;
-			String c = baseCode[tab];
-			for (Handle n : handles[tab])
-    		{
-    			// replace number value with a variable
-    			c = replaceString(c, n.startChar + charInc, n.endChar + charInc, n.name);
-    			charInc += n.name.length() - n.strValue.length();
-    		}
-			code[tab].setProgram(c);
-    	}
-
-    	/* add the main header to the code in the first tab */
-    	String c = code[0].getProgram();
-
-    	// header contains variable declaration, initialization, and OSC listener function
-    	String header;
-    	header = "\n\n" +
-    		 "/*************************/\n" +
-    		 "/* MODIFIED BY TWEAKMODE */\n" +
-		 	 "/*************************/\n" +
-    		 "\n\n";
-
-    	// add needed OSC imports and the global OSC object
-    	header += "import oscP5.*;\n";
-    	header += "import netP5.*;\n\n";
-    	header += "OscP5 tweakmode_oscP5;\n\n";
-
-    	// write a declaration for int and float arrays
-    	int numOfInts = howManyInts(handles);
-    	int numOfFloats = howManyFloats(handles);
-    	if (numOfInts > 0) {
-    		header += "int[] tweakmode_int = new int["+numOfInts+"];\n";
-    	}
-    	if (numOfFloats > 0) {
-    		header += "float[] tweakmode_float = new float["+numOfFloats+"];\n\n";
-    	}
-
-    	/* add the class for the OSC event handler that will respond to our messages */
-    	header += "public class TweakMode_OscHandler {\n" +
-    			  "  public void oscEvent(OscMessage msg) {\n" +
-                  "    String type = msg.addrPattern();\n";
-        if (numOfInts > 0) {
-        	header += "    if (type.contains(\"/tm_change_int\")) {\n" +
-                      "      int index = msg.get(0).intValue();\n" +
-                      "      int value = msg.get(1).intValue();\n" +    
-                      "      tweakmode_int[index] = value;\n" +
-                      "    }\n";
-        	if (numOfFloats > 0) {
-        		header += "    else ";
-        	}
-        }
-        if (numOfFloats > 0) {
-            header += "if (type.contains(\"/tm_change_float\")) {\n" +
-                      "      int index = msg.get(0).intValue();\n" +
-                      "      float value = msg.get(1).floatValue();\n" +   
-                      "      tweakmode_float[index] = value;\n" +
-                      "    }\n";
-        }
-        header += "  }\n" +
-                  "}\n";
-    	header += "TweakMode_OscHandler tweakmode_oscHandler = new TweakMode_OscHandler();\n";
-
-    	header += "void tweakmode_initAllVars() {\n";
-    	for (int i=0; i<handles.length; i++) {
-    		for (Handle n : handles[i])
-    		{
-    			header += "  " + n.name + " = " + n.strValue + ";\n";
-    		}
-    	}
-    	header += "}\n\n";
-    	header += "void tweakmode_initOSC() {\n";
-    	header += "  tweakmode_oscP5 = new OscP5(tweakmode_oscHandler,"+oscPort+");\n";
-    	header += "}\n";
-    	
-    	header += "\n\n\n\n\n";
-    	
-    	// add call to our initAllVars and initOSC functions from the setup() function.
-    	String addToSetup = "\n  tweakmode_initAllVars();\n  tweakmode_initOSC();\n\n";
-    	setupStartPos = SketchParser.getSetupStart(c);
-    	c = replaceString(c, setupStartPos, setupStartPos, addToSetup);
-
-    	code[0].setProgram(header + c);
-    	
-    	/* print out modified code */
-    	if (tweakMode.dumpModifiedCode) {
-    		System.out.println("\nModified code:\n");
-    		for (int i=0; i<code.length; i++)
-    		{
-    			System.out.println("file " + i + "\n=========");
-    			System.out.println(code[i].getProgram());
-    		}
-    	}
-
-    	return true;
-    }	
-	
-	private String replaceString(String str, int start, int end, String put)
-	{
-		return str.substring(0, start) + put + str.substring(end, str.length());
-	}
-	
-	private int howManyInts(ArrayList<Handle> handles[])
-	{
-		int count = 0;
-		for (int i=0; i<handles.length; i++) {
-			for (Handle n : handles[i]) {
-				if (n.type == "int" || n.type == "hex" || n.type == "webcolor")
-					count++;
-			}
-		}
-		return count;
-	}
-
-	private int howManyFloats(ArrayList<Handle> handles[])
-	{
-		int count = 0;
-		for (int i=0; i<handles.length; i++) {
-			for (Handle n : handles[i]) {
-				if (n.type == "float")
-					count++;
-			}
-		}
-		return count;
-	}
-}
diff --git a/pdex/src/galsasson/mode/tweak/TweakMode.java b/pdex/src/galsasson/mode/tweak/TweakMode.java
deleted file mode 100644
index 8dc198e11..000000000
--- a/pdex/src/galsasson/mode/tweak/TweakMode.java
+++ /dev/null
@@ -1,220 +0,0 @@
-package galsasson.mode.tweak;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-
-import processing.app.Library;
-import processing.app.RunnerListener;
-import processing.app.Sketch;
-import processing.app.Base;
-import processing.app.Editor;
-import processing.app.EditorState;
-import processing.app.Mode;
-import processing.app.SketchCode;
-import processing.app.SketchException;
-import processing.mode.java.JavaBuild;
-import processing.mode.java.JavaMode;
-import processing.mode.java.runner.Runner;
-
-/**
- * Mode for enabling real-time modifications to numbers in the code.
- *
- */
-public class TweakMode extends JavaMode {
-
-	public boolean dumpModifiedCode;
-	
-	public TweakMode(Base base, File folder) 
-	{
-		super(base, folder);
-
-		// needed so that core libraries like opengl, etc. are loaded.
-		for (Mode m : base.getModeList()) {
-			if (m.getClass() == JavaMode.class) {
-				JavaMode jMode = (JavaMode) m;
-				librariesFolder = jMode.getLibrariesFolder();
-				rebuildLibraryList(); 
-				break;
-			}
-		}
-
-		// Fetch examples and reference from java mode
-		examplesFolder = Base.getContentFile("modes/java/examples");
-		referenceFolder = Base.getContentFile("modes/java/reference");
-
-		dumpModifiedCode = false;
-	}
-
-    /**
-     * Return the pretty/printable/menu name for this mode. This is separate
-     * from the single word name of the folder that contains this mode. It could
-     * even have spaces, though that might result in sheer madness or total
-     * mayhem.
-     */
-    @Override
-    public String getTitle() {
-        return "tweak";
-    }
-
-    /**
-     * Create a new editor associated with this mode.
-     */
-    @Override
-    public Editor createEditor(Base base, String path, EditorState state) {
-    	return new TweakEditor(base, path, state, this);
-    }
-
-    /**
-     * Returns the default extension for this editor setup.
-     */
-    /*
-    @Override
-    public String getDefaultExtension() {
-        return null;
-    }
-    */
-
-    /**
-     * Returns a String[] array of proper extensions.
-     */
-    /*
-    @Override
-    public String[] getExtensions() {
-        return null;
-    }
-    */
-
-    /**
-     * Get array of file/directory names that needn't be copied during "Save
-     * As".
-     */
-    /*
-    @Override
-    public String[] getIgnorable() {
-        return null;
-    }
-    */
-    
-    /**
-     * Retrieve the ClassLoader for JavaMode. This is used by Compiler to load
-     * ECJ classes. Thanks to Ben Fry.
-     *
-     * @return the class loader from java mode
-     */
-    @Override
-    public ClassLoader getClassLoader() {
-        for (Mode m : base.getModeList()) {
-            if (m.getClass() == JavaMode.class) {
-                JavaMode jMode = (JavaMode) m;
-                return jMode.getClassLoader();
-            }
-        }
-        return null;  // badness
-    }
-
-	@Override
-	public Runner handleRun(Sketch sketch, RunnerListener listener) throws SketchException 
-	{
-		return handlePresentOrRun(sketch, listener, false);
-	}
-	
-	@Override
-	public Runner handlePresent(Sketch sketch, RunnerListener listener) throws SketchException
-	{
-		return handlePresentOrRun(sketch, listener, true);
-	}
-	
-	public Runner handlePresentOrRun(Sketch sketch, RunnerListener listener, boolean present) throws SketchException 
-	{
-		final TweakEditor editor = (TweakEditor)listener;
-		final boolean toPresent = present;
-		
-		if (!verifyOscP5()) {
-			editor.deactivateRun();
-			return null;
-		}
-		
-		boolean launchInteractive = false;
-
-		if (isSketchModified(sketch)) {
-			editor.deactivateRun();
-			Base.showMessage("Save", "Please save the sketch before running in Tweak Mode.");
-			return null;	
-		}
-		
-		/* first try to build the unmodified code */
-		JavaBuild build = new JavaBuild(sketch);		
-		String appletClassName = build.build(false);
-		if (appletClassName == null) {
-			// unmodified build failed, so fail
-			return null;
-		}
-
-		/* if compilation passed, modify the code and build again */
-		editor.initBaseCode();
-		// check for "// tweak" comment in the sketch 
-		boolean requiresTweak = SketchParser.containsTweakComment(editor.baseCode);
-		// parse the saved sketch to get all (or only with "//tweak" comment) numbers
-		final SketchParser parser = new SketchParser(editor.baseCode, requiresTweak);
-		
-		// add our code to the sketch
-		launchInteractive = editor.automateSketch(sketch, parser.allHandles);
-		
-		build = new JavaBuild(sketch);
-		appletClassName = build.build(false);
-		
-		if (appletClassName != null) {
-			final Runner runtime = new Runner(build, listener);
-			new Thread(new Runnable() {				
-				public void run() {
-					runtime.launch(toPresent);  // this blocks until finished
-              
-					// executed when the sketch quits
-					editor.initEditorCode(parser.allHandles, false);
-					editor.stopInteractiveMode(parser.allHandles);
-				}
-				
-			}).start();
-          
-			if (launchInteractive) { 
-
-				// replace editor code with baseCode 
-				editor.initEditorCode(parser.allHandles, false);				
-				editor.updateInterface(parser.allHandles, parser.colorBoxes);
-				editor.startInteractiveMode();
-			}
-
-			return runtime;
-		}
-        
-		return null;    	
-	}
-	
-	private boolean verifyOscP5()
-	{
-		for (Library l : contribLibraries) {
-			if (l.getName().equals("oscP5")) {
-				return true;
-			}
-		}
-		
-		// could not find oscP5 library
-		Base.showWarning("Tweak Mode", "Tweak Mode needs the 'oscP5' library.\n"
-				+ "Please install this library by clicking \"Sketch --> Import Library --> Add Library ...\" and choose 'ocsP5'", null);
-		
-		return false;
-	}
-
-	private boolean isSketchModified(Sketch sketch)
-	{
-		for (SketchCode sc : sketch.getCode()) {
-			if (sc.isModified()) {
-				return true;
-			}
-		}
-		return false;
-	}	
-}
diff --git a/pdex/src/galsasson/mode/tweak/TweakTextArea.java b/pdex/src/galsasson/mode/tweak/TweakTextArea.java
deleted file mode 100644
index c6328cfdf..000000000
--- a/pdex/src/galsasson/mode/tweak/TweakTextArea.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
-  Part of TweakMode project (https://github.com/galsasson/TweakMode)
-  
-  Under Google Summer of Code 2013 - 
-  http://www.google-melange.com/gsoc/homepage/google/gsoc2013
-  
-  Copyright (C) 2013 Gal Sasson
-	
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2
-  as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software Foundation,
-  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-package galsasson.mode.tweak;
-
-import java.awt.Cursor;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.event.ComponentListener;
-import java.awt.event.KeyListener;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseMotionListener;
-import java.util.ArrayList;
-
-import processing.app.Editor;
-import processing.app.syntax.JEditTextArea;
-import processing.app.syntax.SyntaxDocument;
-import processing.app.syntax.SyntaxStyle;
-import processing.app.syntax.TextAreaDefaults;
-import processing.app.syntax.Token;
-import processing.app.syntax.TokenMarker;
-
-/**
- * Custom TextArea for Tweak Mode
- * 
- * @author Gal Sasson &lt;sasgal@gmail.com&gt;
- * 
- */
-public class TweakTextArea extends JEditTextArea {
-	public Editor editor;
-	TweakTextAreaPainter tweakPainter;
-	
-	// save input listeners to stop/start text edit
-	ComponentListener[] prevCompListeners;
-	MouseListener[] prevMouseListeners;
-	MouseMotionListener[] prevMMotionListeners;
-	KeyListener[] prevKeyListeners;
-	
-	boolean interactiveMode;
-
-	public TweakTextArea(Editor editor, TextAreaDefaults defaults) {
-		super(defaults);
-		this.editor = editor;
-		prevCompListeners = painter
-				.getComponentListeners();
-		prevMouseListeners = painter.getMouseListeners();
-		prevMMotionListeners = painter
-				.getMouseMotionListeners();
-		prevKeyListeners = editor.getKeyListeners();
-		
-		remove(painter);
-
-		tweakPainter = new TweakTextAreaPainter(this, defaults);
-		painter = tweakPainter;
-		
-		interactiveMode = false;
-		addPrevListeners();
-		
-		add(CENTER, painter);
-	}
-	
-	/**
-	* Set document with a twist, includes the old caret
-	* and scroll positions, added for p5. [fry]
-	* - verify that start and stop fall inside the document [gal]
-	*/
-	@Override
-	public void setDocument(SyntaxDocument document,
-			int start, int stop, int scroll) {
-		if (this.document == document)
-			return;
-		if (this.document != null)
-			this.document.removeDocumentListener(documentHandler);
-		this.document = document;
-
-		document.addDocumentListener(documentHandler);
-
-		if (start > document.getLength())
-			start = document.getLength();
-		if (stop > document.getLength())
-			stop = document.getLength();
-		
-		select(start, stop);
-		updateScrollBars();
-		setScrollPosition(scroll);
-		painter.repaint();
-	}
-	
-	
-	/* remove all standard interaction listeners */
-	public void removeAllListeners()
-	{
-		ComponentListener[] componentListeners = painter
-				.getComponentListeners();
-		MouseListener[] mouseListeners = painter.getMouseListeners();
-		MouseMotionListener[] mouseMotionListeners = painter
-				.getMouseMotionListeners();
-		KeyListener[] keyListeners = editor.getKeyListeners();
-
-		for (ComponentListener cl : componentListeners)
-			painter.removeComponentListener(cl);
-
-		for (MouseListener ml : mouseListeners)
-			painter.removeMouseListener(ml);
-
-		for (MouseMotionListener mml : mouseMotionListeners)
-			painter.removeMouseMotionListener(mml);
-			
-		for (KeyListener kl : keyListeners) {
-			editor.removeKeyListener(kl);
-		}	
-	}
-	
-	public void startInteractiveMode()
-	{
-		// ignore if we are already in interactiveMode
-		if (interactiveMode)
-			return;
-		
-		removeAllListeners();
-		
-		// add our private interaction listeners
-		tweakPainter.addMouseListener(tweakPainter);
-		tweakPainter.addMouseMotionListener(tweakPainter);
-		tweakPainter.startInterativeMode();
-		painter.setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
-		this.editable = false;
-		this.caretBlinks = false;
-		this.setCaretVisible(false);
-		interactiveMode = true;		
-	}
-	
-	public void stopInteractiveMode()
-	{
-		// ignore if we are not in interactive mode
-		if (!interactiveMode)
-			return;
-		
-		removeAllListeners();
-		addPrevListeners();
-		
-		tweakPainter.stopInteractiveMode();
-		painter.setCursor(new Cursor(Cursor.TEXT_CURSOR));
-		this.editable = true;
-		this.caretBlinks = true;
-		this.setCaretVisible(true);
-		
-		interactiveMode = false;
-	}
-	
-	public int getHorizontalScroll()
-	{
-		return horizontal.getValue();
-	}
-	
-	private void addPrevListeners()
-	{
-		// add the original text-edit listeners
-		for (ComponentListener cl : prevCompListeners) {
-			painter.addComponentListener(cl);
-		}
-		for (MouseListener ml : prevMouseListeners) {
-			painter.addMouseListener(ml);
-		}
-		for (MouseMotionListener mml : prevMMotionListeners) {
-			painter.addMouseMotionListener(mml);		
-		}
-		for (KeyListener kl : prevKeyListeners) {
-			editor.addKeyListener(kl);
-		}
-	}
-	
-	public void updateInterface(ArrayList<Handle> handles[], ArrayList<ColorControlBox> colorBoxes[])
-	{
-		tweakPainter.updateInterface(handles, colorBoxes);
-	}
-	
-}
diff --git a/pdex/src/galsasson/mode/tweak/TweakTextAreaPainter.java b/pdex/src/galsasson/mode/tweak/TweakTextAreaPainter.java
deleted file mode 100644
index 3b49e5d75..000000000
--- a/pdex/src/galsasson/mode/tweak/TweakTextAreaPainter.java
+++ /dev/null
@@ -1,386 +0,0 @@
-/*
-  Part of TweakMode project (https://github.com/galsasson/TweakMode)
-  
-  Under Google Summer of Code 2013 - 
-  http://www.google-melange.com/gsoc/homepage/google/gsoc2013
-  
-  Copyright (C) 2013 Gal Sasson
-	
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2
-  as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software Foundation,
-  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-package galsasson.mode.tweak;
-
-import java.awt.Color;
-import java.awt.Cursor;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.RenderingHints;
-import java.awt.Toolkit;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseMotionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.awt.image.BufferedImage;
-import java.awt.image.ImageObserver;
-import java.util.ArrayList;
-
-import javax.swing.text.BadLocationException;
-import javax.swing.text.DefaultCaret;
-
-import processing.app.SketchCode;
-import processing.app.syntax.JEditTextArea;
-import processing.app.syntax.SyntaxDocument;
-import processing.app.syntax.TextAreaDefaults;
-import processing.app.syntax.TextAreaPainter;
-import processing.app.syntax.TokenMarker;
-
-/**
- * Custom painter for XQTextArea. Handles underlining of error lines.
- * 
- * @author Gal Sasson &lt;sasgal@gmail.com&gt;
- * 
- */
-public class TweakTextAreaPainter extends TextAreaPainter 
-	implements MouseListener, MouseMotionListener {
-
-	protected TweakTextArea ta;
-	protected int horizontalAdjustment = 0;
-	
-	public boolean interactiveMode = false;
-	public ArrayList<Handle> handles[];
-	public ArrayList<ColorControlBox> colorBoxes[];
-	
-	public Handle mouseHandle = null;
-	public ColorSelector colorSelector;
-	
-	int cursorType;
-	BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
-
-	// Create a new blank cursor.
-	Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor(
-	    cursorImg, new Point(0, 0), "blank cursor");
-	
-	private final Object paintMutex = new Object();
-	
-	public TweakTextAreaPainter(TweakTextArea textArea, TextAreaDefaults defaults) 
-	{
-		super((JEditTextArea)textArea, defaults);
-		ta = textArea;
-		interactiveMode = false;
-		cursorType = Cursor.DEFAULT_CURSOR;
-	}
-	
-	/**
-	* Repaints the text.
-	* @param gfx The graphics context
-	*/
-	@Override
-	public synchronized void paint(Graphics gfx)
-	{
-		super.paint(gfx);
-
-		if (interactiveMode && handles!=null)
-		{
-			int currentTab = ta.editor.getSketch().getCurrentCodeIndex();
-			// enable anti-aliasing
-			Graphics2D g2d = (Graphics2D)gfx;
-			g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-                				RenderingHints.VALUE_ANTIALIAS_ON);
-			
-			for (Handle n : handles[currentTab])
-			{
-				// update n position and width, and draw it
-				int lineStartChar = ta.getLineStartOffset(n.line);
-				int x = ta.offsetToX(n.line, n.newStartChar - lineStartChar);
-				int y = ta.lineToY(n.line) + fm.getHeight() + 1;
-				int end = ta.offsetToX(n.line, n.newEndChar - lineStartChar);
-				n.setPos(x, y);
-				n.setWidth(end - x);
-				n.draw(g2d, n==mouseHandle);
-			}
-			
-			// draw color boxes
-			for (ColorControlBox cBox: colorBoxes[currentTab])
-			{
-				int lineStartChar = ta.getLineStartOffset(cBox.getLine());
-				int x = ta.offsetToX(cBox.getLine(), cBox.getCharIndex() - lineStartChar);
-				int y = ta.lineToY(cBox.getLine()) + fm.getDescent();
-				cBox.setPos(x, y+1);
-				cBox.draw(g2d);
-			}
-		}
-	}
-		  
-	public void startInterativeMode()
-	{
-		interactiveMode = true;
-		repaint();
-	}
-	
-	public void stopInteractiveMode()
-	{
-		interactiveMode = false;
-		
-		if (colorSelector != null) {
-			// close color selector
-			colorSelector.hide();
-			colorSelector.frame.dispatchEvent(new WindowEvent(colorSelector.frame, WindowEvent.WINDOW_CLOSING));
-		}
-		
-		repaint();
-	}
-	
-	// Update the interface
-	public void updateInterface(ArrayList<Handle> handles[], ArrayList<ColorControlBox> colorBoxes[])
-	{
-		this.handles = handles;
-		this.colorBoxes = colorBoxes;
-		
-		initInterfacePositions();
-		repaint();		
-	}
-
-	/**
-	* Initialize all the number changing interfaces.
-	* synchronize this method to prevent the execution of 'paint' in the middle.
-	* (don't paint while we make changes to the text of the editor)
-	*/
-	public synchronized void initInterfacePositions()
-	{
-		SketchCode[] code = ta.editor.getSketch().getCode();
-		int prevScroll = ta.getScrollPosition();
-		String prevText = ta.getText();
-		
-		for (int tab=0; tab<code.length; tab++)
-		{
-			String tabCode = ((TweakEditor)ta.editor).baseCode[tab];
-			ta.setText(tabCode);
-			for (Handle n : handles[tab])
-			{
-				int lineStartChar = ta.getLineStartOffset(n.line);
-				int x = ta.offsetToX(n.line, n.newStartChar - lineStartChar);
-				int end = ta.offsetToX(n.line, n.newEndChar - lineStartChar);
-				int y = ta.lineToY(n.line) + fm.getHeight() + 1;
-				n.initInterface(x, y, end-x, fm.getHeight());
-			}
-
-			for (ColorControlBox cBox : colorBoxes[tab])
-			{
-				int lineStartChar = ta.getLineStartOffset(cBox.getLine());
-				int x = ta.offsetToX(cBox.getLine(), cBox.getCharIndex() - lineStartChar);
-				int y = ta.lineToY(cBox.getLine()) + fm.getDescent();
-				cBox.initInterface(this, x, y+1, fm.getHeight()-2, fm.getHeight()-2);
-			}
-		}
-		
-		ta.setText(prevText);
-		ta.scrollTo(prevScroll, 0);	
-	}
-
-	/**
-	 * Take the saved code of the current tab and replace 
-	 * all numbers with their current values.
-	 * Update TextArea with the new code.
-	 */
-	public void updateCodeText()
-	{
-		int charInc = 0;
-		int currentTab = ta.editor.getSketch().getCurrentCodeIndex();
-		SketchCode sc = ta.editor.getSketch().getCode(currentTab);
-		String code = ((TweakEditor)ta.editor).baseCode[currentTab];
-		
-		for (Handle n : handles[currentTab])
-		{
-			int s = n.startChar + charInc;
-			int e = n.endChar + charInc;
-			code = replaceString(code, s, e, n.strNewValue);
-			n.newStartChar = n.startChar + charInc;
-			charInc += n.strNewValue.length() - n.strValue.length();
-			n.newEndChar = n.endChar + charInc;
-		}
-		
-		replaceTextAreaCode(code);
-		// update also the sketch code for later
-		sc.setProgram(code);
-	}
-	
-	private synchronized void replaceTextAreaCode(String code)
-	{
-			// don't paint while we do the stuff below
-			/* by default setText will scroll all the way to the end
-			 * remember current scroll position */
-			int scrollLine = ta.getScrollPosition();
-			int scrollHor = ta.getHorizontalScroll();
-			ta.setText(code);			
-			ta.setOrigin(scrollLine, -scrollHor);			
-	}
-	
-	public String replaceString(String str, int start, int end, String put)
-	{
-		return str.substring(0, start) + put + str.substring(end, str.length());
-	}
-
-	public void updateCursor(int mouseX, int mouseY)
-	{
-		int currentTab = ta.editor.getSketch().getCurrentCodeIndex();
-		for (Handle n : handles[currentTab])
-		{
-			if (n.pick(mouseX, mouseY))
-			{
-				cursorType = Cursor.W_RESIZE_CURSOR;
-				setCursor(new Cursor(cursorType));
-				return;
-			}
-		}
-		
-		for (ColorControlBox colorBox : colorBoxes[currentTab])
-		{
-			if (colorBox.pick(mouseX, mouseY))
-			{
-				cursorType = Cursor.HAND_CURSOR;
-				setCursor(new Cursor(cursorType));
-				return;
-			}
-		}
-		
-		if (cursorType == Cursor.W_RESIZE_CURSOR ||
-			cursorType == Cursor.HAND_CURSOR ||
-			cursorType == -1) {
-			cursorType = Cursor.DEFAULT_CURSOR;
-			setCursor(new Cursor(cursorType));
-		}	
-	}
-	
-	/* Handle color boxes show/hide
-	 * 
-	 * display the box if the mouse if in the same line.
-	 * always keep the color box of the color selector.
-	 */
-	private void showHideColorBoxes(int y)
-	{
-		int currentTab = ta.editor.getSketch().getCurrentCodeIndex();
-		
-		boolean change = false;
-		for (ColorControlBox box : colorBoxes[currentTab]) {
-			if (box.setMouseY(y)) {
-				change = true;
-			}
-		}
-
-		if (colorSelector != null) {
-			colorSelector.colorBox.visible = true;
-		}		
-
-		if (change) {
-			repaint();
-		}
-	}
-
-	@Override
-	public void mouseDragged(MouseEvent e) {
-		if (mouseHandle != null) {
-			// set the current drag amount of the arrows
-			mouseHandle.setCurrentX(e.getX());
-			
-			// update code text with the new value
-			updateCodeText();
-			
-			if (colorSelector != null) {
-				colorSelector.refreshColor();
-			}
-			
-			repaint();
-		}
-	}
-	
-	@Override
-	public void mouseExited(MouseEvent e) {
-	}
-
-	@Override
-	public void mousePressed(MouseEvent e) {
-		int currentTab = ta.editor.getSketch().getCurrentCodeIndex();
-		// check for clicks on number handles
-		for (Handle n : handles[currentTab])
-		{
-			if (n.pick(e.getX(), e.getY()))
-			{
-				cursorType = -1;
-				this.setCursor(blankCursor);
-				mouseHandle = n;
-				mouseHandle.setCenterX(e.getX());
-				repaint();
-				return;
-			}
-		}
-
-		// check for clicks on color boxes
-		for (ColorControlBox box : colorBoxes[currentTab])
-		{
-			if (box.pick(e.getX(), e.getY()))
-			{
-				if (colorSelector != null) {
-					// we already show a color selector, close it
-					colorSelector.frame.dispatchEvent(
-							new WindowEvent(colorSelector.frame, WindowEvent.WINDOW_CLOSING));
-				}
-				
-				colorSelector = new ColorSelector(box);
-				colorSelector.frame.addWindowListener(new WindowAdapter() {
-				        public void windowClosing(WindowEvent e) {
-				        	colorSelector.frame.setVisible(false);
-				        	colorSelector = null;
-				        }
-				      });
-				colorSelector.show(this.getLocationOnScreen().x + e.getX() + 30, 
-						this.getLocationOnScreen().y + e.getY() - 130);					
-			}
-		}
-	}
-
-	@Override
-	public void mouseReleased(MouseEvent e) {
-		if (mouseHandle != null) {
-			mouseHandle.resetProgress();
-			mouseHandle = null;
-			
-			updateCursor(e.getX(), e.getY());
-			repaint();
-		}
-	}
-
-	@Override
-	public void mouseMoved(MouseEvent e) {
-		updateCursor(e.getX(), e.getY());
-		
-		if (!Settings.alwaysShowColorBoxes) {
-			showHideColorBoxes(e.getY());
-		}
-	}
-
-	@Override
-	public void mouseClicked(MouseEvent e) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void mouseEntered(MouseEvent e) {
-		// TODO Auto-generated method stub
-		
-	}
-}
diff --git a/pdex/src/processing/mode/experimental/DebugEditor.java b/pdex/src/processing/mode/experimental/DebugEditor.java
index 3239d33cc..e5fae755d 100755
--- a/pdex/src/processing/mode/experimental/DebugEditor.java
+++ b/pdex/src/processing/mode/experimental/DebugEditor.java
@@ -20,8 +20,6 @@ import static processing.mode.experimental.ExperimentalMode.log;
 import galsasson.mode.tweak.ColorControlBox;
 import galsasson.mode.tweak.Handle;
 import galsasson.mode.tweak.SketchParser;
-import galsasson.mode.tweak.TweakTextArea;
-import galsasson.mode.tweak.TweakToolbar;
 
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
@@ -660,6 +658,22 @@ public class DebugEditor extends JavaEditor implements ActionListener {
         });
         debugMenu.add(writeErrorLog);
 
+        // TweakMode code
+        debugMenu.addSeparator();
+        enableTweakCB = new JCheckBoxMenuItem("Tweak Enabled");
+        enableTweakCB.setSelected(ExperimentalMode.enableTweak);
+        enableTweakCB.addActionListener(new ActionListener() {
+
+          @Override
+          public void actionPerformed(ActionEvent e) {
+            ExperimentalMode.enableTweak = ((JCheckBoxMenuItem) e
+                .getSource()).isSelected();
+            dmode.savePreferences();
+          }
+        });
+        debugMenu.add(enableTweakCB);
+        // TweakMode code end
+
         debugMenu.addSeparator();
         JMenuItem jitem = new JMenuItem("PDE X on GitHub");
         jitem.addActionListener(new ActionListener() {
@@ -1671,6 +1685,11 @@ public class DebugEditor extends JavaEditor implements ActionListener {
 	}
 
     // TweakMode code
+    /**
+     * Show warnings menu item
+     */
+    protected JCheckBoxMenuItem enableTweakCB;
+
 	String[] baseCode;
 
 	final static int SPACE_AMOUNT = 0;
diff --git a/pdex/src/processing/mode/experimental/ExperimentalMode.java b/pdex/src/processing/mode/experimental/ExperimentalMode.java
index 80070e615..d81606182 100755
--- a/pdex/src/processing/mode/experimental/ExperimentalMode.java
+++ b/pdex/src/processing/mode/experimental/ExperimentalMode.java
@@ -22,7 +22,6 @@
 package processing.mode.experimental;
 
 import galsasson.mode.tweak.SketchParser;
-import galsasson.mode.tweak.TweakEditor;
 
 import java.awt.Color;
 import java.io.File;
@@ -160,6 +159,10 @@ public class ExperimentalMode extends JavaMode {
       prefDefaultAutoSave = "pdex.autoSave.autoSaveByDefault",
       prefCCTriggerEnabled = "pdex.ccTriggerEnabled";
 
+  // TweakMode code (Preferences)
+  volatile public static boolean enableTweak = false;
+  public static final String prefEnableTweak = "pdex.enableTweak";
+
   public void loadPreferences() {
     log("Load PDEX prefs");
     ensurePrefsExist();
@@ -174,6 +177,9 @@ public class ExperimentalMode extends JavaMode {
     autoSavePromptEnabled = Preferences.getBoolean(prefAutoSavePrompt);
     defaultAutoSaveEnabled = Preferences.getBoolean(prefDefaultAutoSave);
     ccTriggerEnabled = Preferences.getBoolean(prefCCTriggerEnabled);
+
+    // TweakMode code
+    enableTweak = Preferences.getBoolean(prefEnableTweak);
   }
 
   public void savePreferences() {
@@ -189,6 +195,9 @@ public class ExperimentalMode extends JavaMode {
     Preferences.setBoolean(prefAutoSavePrompt, autoSavePromptEnabled);
     Preferences.setBoolean(prefDefaultAutoSave, defaultAutoSaveEnabled);
     Preferences.setBoolean(prefCCTriggerEnabled, ccTriggerEnabled);
+
+    // TweakMode code
+    Preferences.setBoolean(prefEnableTweak, enableTweak);
   }
 
   public void ensurePrefsExist() {
@@ -215,6 +224,11 @@ public class ExperimentalMode extends JavaMode {
       Preferences.setBoolean(prefDefaultAutoSave, defaultAutoSaveEnabled);
     if (Preferences.get(prefCCTriggerEnabled) == null)
       Preferences.setBoolean(prefCCTriggerEnabled, ccTriggerEnabled);
+
+    // TweakMode code
+    if (Preferences.get(prefEnableTweak) == null) {
+    	Preferences.setBoolean(prefEnableTweak, enableTweak);
+    }
   }
 
 
@@ -328,16 +342,50 @@ public class ExperimentalMode extends JavaMode {
 	@Override
 	public Runner handleRun(Sketch sketch, RunnerListener listener) throws SketchException
 	{
-		return handlePresentOrRun(sketch, listener, false);
+		if (enableTweak) {
+			return handleTweakPresentOrRun(sketch, listener, false);
+		}
+		else {
+			/* Do the usual (JavaMode style) */
+		    JavaBuild build = new JavaBuild(sketch);
+		    String appletClassName = build.build(false);
+		    if (appletClassName != null) {
+		      final Runner runtime = new Runner(build, listener);
+		      new Thread(new Runnable() {
+		        public void run() {
+		          runtime.launch(false);  // this blocks until finished
+		        }
+		      }).start();
+		      return runtime;
+		    }
+		    return null;
+		}
 	}
 
 	@Override
 	public Runner handlePresent(Sketch sketch, RunnerListener listener) throws SketchException
 	{
-		return handlePresentOrRun(sketch, listener, true);
+		if (enableTweak) {
+			return handleTweakPresentOrRun(sketch, listener, true);
+		}
+		else {
+			/* Do the usual (JavaMode style) */
+		    JavaBuild build = new JavaBuild(sketch);
+		    String appletClassName = build.build(false);
+		    if (appletClassName != null) {
+		      final Runner runtime = new Runner(build, listener);
+		      new Thread(new Runnable() {
+		        public void run() {
+		          runtime.launch(true);
+		        }
+		      }).start();
+		      return runtime;
+		    }
+		    return null;
+		}
 	}
 
-	public Runner handlePresentOrRun(Sketch sketch, RunnerListener listener, boolean present) throws SketchException
+	public Runner handleTweakPresentOrRun(Sketch sketch, RunnerListener listener, boolean present) throws SketchException
 	{
 		final DebugEditor editor = (DebugEditor)listener;
 		final boolean toPresent = present;
diff --git a/pdex/src/processing/mode/experimental/TextAreaPainter.java b/pdex/src/processing/mode/experimental/TextAreaPainter.java
index a53dd9740..3ba226be9 100644
--- a/pdex/src/processing/mode/experimental/TextAreaPainter.java
+++ b/pdex/src/processing/mode/experimental/TextAreaPainter.java
@@ -21,7 +21,6 @@ import galsasson.mode.tweak.ColorControlBox;
 import galsasson.mode.tweak.ColorSelector;
 import galsasson.mode.tweak.Handle;
 import galsasson.mode.tweak.Settings;
-import galsasson.mode.tweak.TweakEditor;
 
 import java.awt.Color;
 import java.awt.Cursor;