diff --git a/src/main/java/com/ardublock/ArduBlockTool.java b/src/main/java/com/ardublock/ArduBlockTool.java
index 0042aaf78f868d6d053673f6d1623defe5944389..76a2e0a27e9bd283e1cf5f682196535c303dbe5f 100644
--- a/src/main/java/com/ardublock/ArduBlockTool.java
+++ b/src/main/java/com/ardublock/ArduBlockTool.java
@@ -94,7 +94,6 @@ public class ArduBlockTool implements Tool, OpenblocksFrameListener
 		if(upload) { //added by letsgoING
 			ArduBlockTool.editor.handleExport(false);
 		}
-		
 	}
 	
 	private String getArduinoVersion()
diff --git a/src/main/java/com/ardublock/translator/block/control/SketchBlock.java b/src/main/java/com/ardublock/translator/block/control/SketchBlock.java
index b2a2b1690431f87a7925c95d87b2571a069cc1a9..ca66fa268c34bea407f4fdba870465ba482c26d8 100644
--- a/src/main/java/com/ardublock/translator/block/control/SketchBlock.java
+++ b/src/main/java/com/ardublock/translator/block/control/SketchBlock.java
@@ -164,7 +164,7 @@ public class SketchBlock extends TranslatorBlock
 		mainVec.add(new CodeWhile(boolTrue, whileVec));
 		SimCodeFunction main = new SimCodeFunction("main", mainVec);
 
-		System.out.println("Add new Functions");
+		//System.out.println("Add new Functions");
 		
 		sim.addFunctionsCode(setupFunc);
 		sim.addFunctionsCode(loopFunc);
diff --git a/src/main/java/com/ardublock/ui/OpenblocksFrame.java b/src/main/java/com/ardublock/ui/OpenblocksFrame.java
index 03f5c17a240c367630683157b00ef5e98338d0cc..c972d8e19f3cc11cce6502e9140e598f89eeddd7 100644
--- a/src/main/java/com/ardublock/ui/OpenblocksFrame.java
+++ b/src/main/java/com/ardublock/ui/OpenblocksFrame.java
@@ -340,6 +340,10 @@ public class OpenblocksFrame extends JFrame
 		ActionListener modeBasicButtonListener = new ActionListener () {
 			public void actionPerformed(ActionEvent e) {
 				//get current zoomLevel
+				
+				//remove highlights
+				context.resetHightlightBlock();
+				
 				int currentWorkspaceZoom = zoomSlider.getValue();
 		        try {
 		        	WorkspaceController workspaceController = context.getWorkspaceController();
@@ -370,6 +374,10 @@ public class OpenblocksFrame extends JFrame
 		JButton modeProButton = new JButton(uiMessageBundle.getString("ardublock.ui.mode.expert"));
 		ActionListener modeProButtonListener = new ActionListener () {
 			public void actionPerformed(ActionEvent e) {
+				
+				//remove highlights
+				context.resetHightlightBlock();
+				
 				//get current zoomLevel
 				int currentWorkspaceZoom = zoomSlider.getValue();
 		        try {
@@ -401,6 +409,9 @@ public class OpenblocksFrame extends JFrame
 		JButton modeSimButton = new JButton(uiMessageBundle.getString("ardublock.ui.mode.sim"));
 		ActionListener modeSimButtonListener = new ActionListener () {
 			public void actionPerformed(ActionEvent e) {
+				
+				//remove highlights
+				context.resetHightlightBlock();
 				//get current zoomLevel
 				int currentWorkspaceZoom = zoomSlider.getValue();
 				try {
diff --git a/src/main/java/com/ardublock/ui/listener/ArdublockWorkspaceListener.java b/src/main/java/com/ardublock/ui/listener/ArdublockWorkspaceListener.java
index 286149f2a642450e940622ae59d4fdd496922c02..61cdbb0c13384f458d1e6feecf46e848bca51ce5 100644
--- a/src/main/java/com/ardublock/ui/listener/ArdublockWorkspaceListener.java
+++ b/src/main/java/com/ardublock/ui/listener/ArdublockWorkspaceListener.java
@@ -28,6 +28,7 @@ public class ArdublockWorkspaceListener implements WorkspaceListener
 				frame.setTitle(title);
 			}
 		}
+
 		context.resetHightlightBlock();
 		
 		
diff --git a/src/main/java/com/ardublock/ui/listener/NewButtonListener.java b/src/main/java/com/ardublock/ui/listener/NewButtonListener.java
index ff5fb5ccba43672e9ad43d7e76d66c7fb3bb6293..c89f882f432e5fa9106ed9bed5fcd82b7fbe9cd9 100644
--- a/src/main/java/com/ardublock/ui/listener/NewButtonListener.java
+++ b/src/main/java/com/ardublock/ui/listener/NewButtonListener.java
@@ -9,16 +9,17 @@ import com.ardublock.ui.OpenblocksFrame;
 public class NewButtonListener implements ActionListener
 {
 	private OpenblocksFrame parentFrame;
+	private Context context;
 	
 	public NewButtonListener(OpenblocksFrame frame)
 	{
-		Context.getContext();
-		
+		context = Context.getContext();
 		this.parentFrame = frame;
 	}
 	
 	public void actionPerformed(ActionEvent e)
 	{
+		context.resetHightlightBlock();
 		parentFrame.doNewArduBlockFile();
 	}
 
diff --git a/src/main/java/com/ardublock/ui/listener/OpenButtonListener.java b/src/main/java/com/ardublock/ui/listener/OpenButtonListener.java
index e409acbfcb3d68c0749051cf644c3aebe1f71c73..a6c1c4f43bba020864fe4af69631c321bed58592 100644
--- a/src/main/java/com/ardublock/ui/listener/OpenButtonListener.java
+++ b/src/main/java/com/ardublock/ui/listener/OpenButtonListener.java
@@ -9,16 +9,17 @@ import com.ardublock.ui.OpenblocksFrame;
 public class OpenButtonListener implements ActionListener
 {
 	private OpenblocksFrame parentFrame;
+	private Context context;
 	
 	public OpenButtonListener(OpenblocksFrame frame)
 	{
-		Context.getContext();
-		
+		context = Context.getContext();
 		this.parentFrame = frame;
 	}
 	
 	public void actionPerformed(ActionEvent e)
 	{
+		context.resetHightlightBlock();
 		parentFrame.doOpenArduBlockFile();
 	}