Added some UI improvements to the IDE and performed some minor refactoring.

DrawableGui/src/main/java/org/openzen/drawablegui/DButton.java

@@ -91,8 +91,7 @@ public class DButton implements DComponent {
 		}
 		
 		DPath shape = DPath.roundedRectangle(bounds.x, bounds.y, bounds.width, bounds.height, 2 * context.getScale());
-		canvas.shadowPath(shape, DTransform2D.IDENTITY, shadow);
-		canvas.fillPath(shape, DTransform2D.IDENTITY, backgroundColor);
+		canvas.shadowPath(shape, DTransform2D.IDENTITY, backgroundColor, shadow);
 		canvas.drawText(style.font, style.textColor, bounds.x + style.paddingLeft, bounds.y + style.paddingTop + fontMetrics.getAscent(), label.getValue());
 	}
 

DrawableGui/src/main/java/org/openzen/drawablegui/DCanvas.java

@@ -52,7 +52,7 @@ public interface DCanvas {
 	 * @param transform
 	 * @param shadow
 	 */
-	void shadowPath(DPath path, DTransform2D transform, DShadow shadow);
+	void shadowPath(DPath path, DTransform2D transform, int color, DShadow shadow);
 	
 	/**
 	 * Fills a rectangle.

DrawableGui/src/main/java/org/openzen/drawablegui/DPath.java

@@ -10,6 +10,13 @@ package org.openzen.drawablegui;
  * @author Hoofdgebruiker
  */
 public interface DPath {
+	public static DPath line(float x1, float y1, float x2, float y2) {
+		return tracer -> {
+			tracer.moveTo(x1, y1);
+			tracer.lineTo(x2, y2);
+		};
+	}
+	
 	public static DPath circle(float x, float y, float radius) {
 		// see http://spencermortensen.com/articles/bezier-circle/
 		return tracer -> {
@@ -45,6 +52,9 @@ public interface DPath {
 	}
 	
 	public static DPath roundedRectangle(float x, float y, float width, float height, float radius) {
+		if (radius < 0.01f)
+			return rectangle(x, y, width, height);
+		
 		return tracer -> {
 			float c = radius - radius * 0.551915024494f;
 			tracer.moveTo(x + width - radius, y + height);

DrawableGui/src/main/java/org/openzen/drawablegui/DUIWindow.java

@@ -13,7 +13,7 @@ import org.openzen.drawablegui.live.LiveObject;
  * @author Hoofdgebruiker
  */
 public interface DUIWindow {
-	DIRectangle getWindowBounds();
+	LiveObject<DIRectangle> getWindowBounds();
 	
 	DUIContext getContext();
 	

DrawableGui/src/main/java/org/openzen/drawablegui/border/DCustomWindowBorder.java

@@ -120,8 +120,7 @@ public class DCustomWindowBorder implements DComponent {
 					|| canvasBounds.y < bounds.y + spacing
 					|| canvasBounds.x + canvasBounds.width > bounds.x + bounds.width - spacing
 					|| canvasBounds.y + canvasBounds.height > bounds.y + bounds.height - spacing) {
-				canvas.shadowPath(border, DTransform2D.IDENTITY, style.shadow);
-				canvas.fillPath(border, DTransform2D.IDENTITY, style.backgroundColor);
+				canvas.shadowPath(border, DTransform2D.IDENTITY, style.backgroundColor, style.shadow);
 				canvas.strokePath(
 						border,
 						DTransform2D.IDENTITY,

DrawableGui/src/main/java/org/openzen/drawablegui/border/DEmptyBorder.java

@@ -7,6 +7,7 @@ package org.openzen.drawablegui.border;
 
 import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DIRectangle;
+import org.openzen.drawablegui.style.DBorderElement;
 
 /**
  *
@@ -14,6 +15,7 @@ import org.openzen.drawablegui.DIRectangle;
  */
 public class DEmptyBorder implements DBorder {
 	public static final DEmptyBorder INSTANCE = new DEmptyBorder();
+	public static final DBorderElement ELEMENT = context -> INSTANCE;
 	
 	private DEmptyBorder() {}
 	

DrawableGui/src/main/java/org/openzen/drawablegui/border/DSideBorder.java

@@ -0,0 +1,81 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.drawablegui.border;
+
+import org.openzen.drawablegui.DCanvas;
+import org.openzen.drawablegui.DIRectangle;
+import org.openzen.drawablegui.DPath;
+import org.openzen.drawablegui.DTransform2D;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class DSideBorder implements DBorder {
+	public final int leftWidth;
+	public final int leftColor;
+	public final int topWidth;
+	public final int topColor;
+	public final int rightWidth;
+	public final int rightColor;
+	public final int bottomWidth;
+	public final int bottomColor;
+	
+	public DSideBorder(
+			int leftWidth, int leftColor,
+			int topWidth, int topColor,
+			int rightWidth, int rightColor,
+			int bottomWidth, int bottomColor) {
+		this.leftWidth = leftWidth;
+		this.leftColor = leftColor;
+		this.topWidth = topWidth;
+		this.topColor = topColor;
+		this.rightWidth = rightWidth;
+		this.rightColor = rightColor;
+		this.bottomWidth = bottomWidth;
+		this.bottomColor = bottomColor;
+	}
+
+	@Override
+	public void paint(DCanvas canvas, DIRectangle bounds) {
+		if (leftWidth > 0) {
+			int x = bounds.x;
+			canvas.strokePath(DPath.line(x, bounds.y, x, bounds.y + bounds.height), DTransform2D.IDENTITY, topColor, topWidth);
+		}
+		if (topWidth > 0) {
+			int y = bounds.y;
+			canvas.strokePath(DPath.line(bounds.x, y, bounds.x + bounds.width, y), DTransform2D.IDENTITY, topColor, topWidth);
+		}
+		if (rightWidth > 0) {
+			int x = bounds.x + bounds.width - rightWidth;
+			canvas.strokePath(DPath.line(x, bounds.y, x, bounds.y + bounds.height), DTransform2D.IDENTITY, topColor, topWidth);
+		}
+		if (bottomWidth > 0) {
+			int y = bounds.y + bounds.height - bottomWidth;
+			canvas.strokePath(DPath.line(bounds.x, y, bounds.x + bounds.width, y), DTransform2D.IDENTITY, topColor, topWidth);
+		}
+	}
+
+	@Override
+	public int getPaddingLeft() {
+		return leftWidth;
+	}
+
+	@Override
+	public int getPaddingRight() {
+		return rightWidth;
+	}
+
+	@Override
+	public int getPaddingTop() {
+		return topWidth;
+	}
+
+	@Override
+	public int getPaddingBottom() {
+		return bottomWidth;
+	}
+}

DrawableGui/src/main/java/org/openzen/drawablegui/DHorizontalLayout.java → DrawableGui/src/main/java/org/openzen/drawablegui/layout/DHorizontalLayout.java

@@ -3,10 +3,16 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.drawablegui;
+package org.openzen.drawablegui.layout;
 
 import java.util.function.Consumer;
 import java.util.function.Predicate;
+import org.openzen.drawablegui.BaseComponentGroup;
+import org.openzen.drawablegui.DCanvas;
+import org.openzen.drawablegui.DComponent;
+import org.openzen.drawablegui.DIRectangle;
+import org.openzen.drawablegui.DSizing;
+import org.openzen.drawablegui.DUIContext;
 import org.openzen.drawablegui.listeners.ListenerHandle;
 import org.openzen.drawablegui.live.LiveObject;
 import org.openzen.drawablegui.live.MutableLiveObject;
@@ -99,6 +105,7 @@ public class DHorizontalLayout extends BaseComponentGroup {
 	@Override
 	public void paint(DCanvas canvas) {
 		canvas.fillRectangle(bounds.x, bounds.y, bounds.width, bounds.height, style.backgroundColor);
+		style.border.paint(canvas, bounds);
 		for (Element element : components) {
 			element.component.paint(canvas);
 		}

DrawableGui/src/main/java/org/openzen/drawablegui/DHorizontalLayoutStyle.java → DrawableGui/src/main/java/org/openzen/drawablegui/layout/DHorizontalLayoutStyle.java

@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.drawablegui;
+package org.openzen.drawablegui.layout;
 
 import org.openzen.drawablegui.border.DBorder;
 import org.openzen.drawablegui.border.DPaddedBorder;

DrawableGui/src/main/java/org/openzen/drawablegui/DSideLayout.java → DrawableGui/src/main/java/org/openzen/drawablegui/layout/DSideLayout.java

@@ -3,17 +3,22 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.drawablegui;
+package org.openzen.drawablegui.layout;
 
 import java.io.Closeable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
+import org.openzen.drawablegui.BaseComponentGroup;
+import org.openzen.drawablegui.DCanvas;
+import org.openzen.drawablegui.DComponent;
+import org.openzen.drawablegui.DIRectangle;
+import org.openzen.drawablegui.DSizing;
+import org.openzen.drawablegui.DUIContext;
 import org.openzen.drawablegui.listeners.ListenerHandle;
 import org.openzen.drawablegui.live.LiveObject;
 import org.openzen.drawablegui.live.MutableLiveObject;
-import org.openzen.drawablegui.live.SimpleLiveObject;
 import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.drawablegui.style.DStylePath;
 
@@ -30,6 +35,7 @@ public class DSideLayout extends BaseComponentGroup {
 	
 	private DStylePath path;
 	private DUIContext context;
+	private DSideLayoutStyle style;
 	private DIRectangle bounds;
 	
 	public DSideLayout(DStyleClass styleClass, DComponent main) {
@@ -61,6 +67,7 @@ public class DSideLayout extends BaseComponentGroup {
 	public void setContext(DStylePath parent, DUIContext context) {
 		this.context = context;
 		this.path = parent.getChild("sidelayout", styleClass);
+		style = new DSideLayoutStyle(context.getStylesheets().get(context, path));
 		
 		main.setContext(path, context);
 		for (SideComponent side : sides)
@@ -169,6 +176,7 @@ public class DSideLayout extends BaseComponentGroup {
 
 	@Override
 	public void paint(DCanvas canvas) {
+		canvas.fillRectangle(bounds.x, bounds.y, bounds.width, bounds.height, style.backgroundColor);
 		main.paint(canvas);
 		
 		for (SideComponent component : sides)

DrawableGui/src/main/java/org/openzen/drawablegui/layout/DSideLayoutStyle.java

@@ -0,0 +1,20 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.drawablegui.layout;
+
+import org.openzen.drawablegui.style.DStyleDefinition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class DSideLayoutStyle {
+	public final int backgroundColor;
+	
+	public DSideLayoutStyle(DStyleDefinition style) {
+		backgroundColor = style.getColor("backgroundColor", 0);
+	}
+}

DrawableGui/src/main/java/org/openzen/drawablegui/DVerticalLayout.java → DrawableGui/src/main/java/org/openzen/drawablegui/layout/DVerticalLayout.java

@@ -3,14 +3,21 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.drawablegui;
+package org.openzen.drawablegui.layout;
 
 import java.util.function.Consumer;
 import java.util.function.Predicate;
+import org.openzen.drawablegui.BaseComponentGroup;
+import org.openzen.drawablegui.DCanvas;
+import org.openzen.drawablegui.DComponent;
+import org.openzen.drawablegui.DIRectangle;
+import org.openzen.drawablegui.DPath;
+import org.openzen.drawablegui.DSizing;
+import org.openzen.drawablegui.DTransform2D;
+import org.openzen.drawablegui.DUIContext;
 import org.openzen.drawablegui.listeners.ListenerHandle;
 import org.openzen.drawablegui.live.LiveObject;
 import org.openzen.drawablegui.live.MutableLiveObject;
-import org.openzen.drawablegui.live.SimpleLiveObject;
 import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.drawablegui.style.DStylePath;
 
@@ -30,6 +37,7 @@ public class DVerticalLayout extends BaseComponentGroup {
 	private DIRectangle bounds;
 	private float totalGrow;
 	private float totalShrink;
+	private DPath shape;
 	
 	public DVerticalLayout(DStyleClass styleClass, Alignment alignment, Element... components) {
 		this.styleClass = styleClass;
@@ -92,12 +100,18 @@ public class DVerticalLayout extends BaseComponentGroup {
 	@Override
 	public void setBounds(DIRectangle bounds) {
 		this.bounds = bounds;
+		shape = DPath.roundedRectangle(
+				bounds.x + style.margin.left,
+				bounds.y + style.margin.top,
+				bounds.width - style.margin.getHorizontal(),
+				bounds.height - style.margin.getVertical(),
+				style.cornerRadius);
 		layout();
 	}
 
 	@Override
 	public void paint(DCanvas canvas) {
-		canvas.fillRectangle(bounds.x, bounds.y, bounds.width, bounds.height, style.backgroundColor);
+		canvas.shadowPath(shape, DTransform2D.IDENTITY, style.backgroundColor, style.shadow);
 		for (Element element : components) {
 			element.component.paint(canvas);
 		}
@@ -155,13 +169,31 @@ public class DVerticalLayout extends BaseComponentGroup {
 		}
 	}
 	
-	private void layoutShrinked() {
+	private int getInnerWidth() {
+		return bounds.width - style.margin.getHorizontal() - style.border.getPaddingHorizontal();
+	}
+	
+	private int getInnerHeight() {
+		return bounds.height - style.margin.getVertical() - style.border.getPaddingVertical();
+	}
+	
+	private int getPreferredInnerWidth() {
+		DSizing myPreferences = sizing.getValue();
+		return myPreferences.preferredWidth - style.margin.getHorizontal() - style.border.getPaddingHorizontal();
+	}
+	
+	private int getPreferredInnerHeight() {
 		DSizing myPreferences = sizing.getValue();
+		return myPreferences.preferredHeight - style.margin.getVertical() - style.border.getPaddingVertical();
+	}
+	
+	private void layoutShrinked() {
 		if (totalShrink == 0) {
 			// now what?
 			// shrink proportionally, we have to shrink...
-			float scale = (float)(bounds.height - (components.length - 1) * style.spacing) / (myPreferences.preferredHeight - (components.length - 1) * style.spacing);
-			int y = 0;
+			float availableHeight = getInnerHeight() - (components.length - 1) * style.spacing;
+			float scale = (float)(availableHeight) / (getPreferredInnerHeight() - (components.length - 1) * style.spacing);
+			int y = bounds.y + style.margin.top + style.border.getPaddingTop();
 			
 			for (int i = 0; i < components.length; i++) {
 				Element element = components[i];
@@ -173,7 +205,7 @@ public class DVerticalLayout extends BaseComponentGroup {
 				y = idealY;
 			}
 		} else {
-			int delta = bounds.height - myPreferences.preferredHeight;
+			int delta = getInnerHeight() - getPreferredInnerHeight();
 			float deltaScaled = delta / totalShrink;
 			int y = bounds.y;
 			for (Element element : components) {
@@ -189,11 +221,9 @@ public class DVerticalLayout extends BaseComponentGroup {
 	
 	private void layoutGrown() {
 		// resize according to grow values
-		DSizing myPreferences = sizing.getValue();
-		
 		if (totalGrow == 0) {
-			int deltaY = (int)(myPreferences.preferredHeight - bounds.height);
-			int y = bounds.y + (int)(deltaY * alignment.align);
+			int deltaY = getPreferredInnerHeight() - getInnerHeight();
+			int y = bounds.y + style.margin.top + style.border.getPaddingTop() + (int)(deltaY * alignment.align);
 			for (Element element : components) {
 				DSizing preferences = element.component.getSizing().getValue();
 				int newY = y + preferences.preferredHeight;
@@ -201,9 +231,9 @@ public class DVerticalLayout extends BaseComponentGroup {
 				y = newY;
 			}
 		} else {
-			int delta = bounds.width - myPreferences.preferredWidth;
+			int delta = getPreferredInnerHeight() - getInnerHeight();
 			float deltaScaled = delta / totalGrow;
-			int y = bounds.y;
+			int y = bounds.y + style.margin.top + style.border.getPaddingTop();
 			for (Element element : components) {
 				DSizing preferences = element.component.getSizing().getValue();
 				float scaledSize = preferences.preferredHeight + deltaScaled * element.grow;
@@ -221,21 +251,21 @@ public class DVerticalLayout extends BaseComponentGroup {
 		int width;
 		switch (element.alignment) {
 			case LEFT:
-				width = Math.min(preferences.preferredWidth, bounds.width - style.border.getPaddingHorizontal());
-				x = bounds.x + style.border.getPaddingLeft();
+				width = Math.min(preferences.preferredWidth, bounds.width - style.border.getPaddingHorizontal() - style.margin.getHorizontal());
+				x = bounds.x + style.margin.left + style.border.getPaddingLeft();
 				break;
 			case CENTER:
 				width = Math.min(preferences.preferredWidth, bounds.width - style.border.getPaddingHorizontal());
-				x = bounds.x + style.border.getPaddingLeft() + (bounds.width - style.border.getPaddingHorizontal() - width) / 2;
+				x = bounds.x + style.margin.left + style.border.getPaddingLeft() + (bounds.width - style.border.getPaddingHorizontal() - width) / 2;
 				break;
 			case RIGHT:
 				width = Math.min(preferences.preferredWidth, bounds.width - style.border.getPaddingHorizontal());
-				x = bounds.x + bounds.width - style.border.getPaddingLeft() - width;
+				x = bounds.x + bounds.width - style.margin.right - style.border.getPaddingRight() - width;
 				break;
 			case STRETCH:
 			default:
-				width = bounds.width - style.border.getPaddingHorizontal();
-				x = bounds.x + style.border.getPaddingLeft();
+				width = bounds.width - style.border.getPaddingHorizontal() - style.margin.getHorizontal();
+				x = bounds.x + style.margin.left + style.border.getPaddingLeft();
 				break;
 		}
 		element.component.setBounds(new DIRectangle(x, y, width, height));

DrawableGui/src/main/java/org/openzen/drawablegui/DVerticalLayoutStyle.java → DrawableGui/src/main/java/org/openzen/drawablegui/layout/DVerticalLayoutStyle.java

@@ -3,11 +3,14 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.drawablegui;
+package org.openzen.drawablegui.layout;
 
 import org.openzen.drawablegui.border.DBorder;
 import org.openzen.drawablegui.border.DPaddedBorder;
 import org.openzen.drawablegui.style.DDpDimension;
+import org.openzen.drawablegui.style.DMargin;
+import org.openzen.drawablegui.style.DPxDimension;
+import org.openzen.drawablegui.style.DShadow;
 import org.openzen.drawablegui.style.DStyleDefinition;
 
 /**
@@ -18,10 +21,16 @@ public class DVerticalLayoutStyle {
 	public final int spacing;
 	public final DBorder border;
 	public final int backgroundColor;
+	public final DMargin margin;
+	public final int cornerRadius;
+	public final DShadow shadow;
 	
 	public DVerticalLayoutStyle(DStyleDefinition style) {
 		spacing = style.getDimension("spacing", new DDpDimension(8));
 		border = style.getBorder("border", context -> new DPaddedBorder(context.dp(8)));
 		backgroundColor = style.getColor("backgroundColor", 0);
+		margin = style.getMargin("margin", DMargin.EMPTY_ELEMENT);
+		cornerRadius = style.getDimension("cornerRadius", DPxDimension.ZERO);
+		shadow = style.getShadow("shadow", DShadow.NONE_ELEMENT);
 	}
 }

DrawableGui/src/main/java/org/openzen/drawablegui/live/InverseLiveBool.java

@@ -0,0 +1,30 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.drawablegui.live;
+
+import org.openzen.drawablegui.listeners.ListenerHandle;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class InverseLiveBool implements LiveBool {
+	private final LiveBool source;
+	
+	public InverseLiveBool(LiveBool source) {
+		this.source = source;
+	}
+
+	@Override
+	public boolean getValue() {
+		return !source.getValue();
+	}
+
+	@Override
+	public ListenerHandle<Listener> addListener(Listener listener) {
+		return source.addListener((oldValue, newValue) -> listener.onChanged(!oldValue, !newValue));
+	}
+}

DrawableGui/src/main/java/org/openzen/drawablegui/live/SimpleLiveInt.java

@@ -23,6 +23,9 @@ public class SimpleLiveInt implements LiveInt {
 
 	@Override
 	public void setValue(int value) {
+		if (value == this.value)
+			return;
+		
 		int oldValue = this.value;
 		this.value = value;
 		listeners.accept(listener -> listener.onChanged(oldValue, value));

DrawableGui/src/main/java/org/openzen/drawablegui/live/SimpleLiveObject.java

@@ -27,6 +27,9 @@ public class SimpleLiveObject<T> implements MutableLiveObject<T> {
 	
 	@Override
 	public void setValue(T value) {
+		if (value == this.value)
+			return;
+		
 		T oldValue = this.value;
 		this.value = value;
 		listeners.accept(listener -> listener.onUpdated(oldValue, value));

DrawableGui/src/main/java/org/openzen/drawablegui/live/SimpleLiveString.java

@@ -33,6 +33,9 @@ public class SimpleLiveString implements MutableLiveString {
 
 	@Override
 	public void setValue(String value) {
+		if (value.equals(this.value))
+			return;
+		
 		String oldValue = this.value;
 		this.value = value;
 		listeners.accept(listener -> listener.onChanged(oldValue, value));

DrawableGui/src/main/java/org/openzen/drawablegui/style/DEmptyStyleDefinition.java

@@ -49,4 +49,9 @@ public class DEmptyStyleDefinition implements DStyleDefinition {
 	public DBorder getBorder(String name, DBorderElement defaultValue) {
 		return defaultValue.eval(context);
 	}
+	
+	@Override
+	public DMargin getMargin(String name, DMarginElement defaultValue) {
+		return defaultValue.eval(context);
+	}
 }

DrawableGui/src/main/java/org/openzen/drawablegui/style/DMargin.java

@@ -0,0 +1,39 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.drawablegui.style;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class DMargin {
+	public static final DMargin EMPTY = new DMargin(0);
+	public static final DMarginElement EMPTY_ELEMENT = context -> EMPTY;
+	
+	public final int left;
+	public final int right;
+	public final int top;
+	public final int bottom;
+	
+	public DMargin(int left, int right, int top, int bottom) {
+		this.left = left;
+		this.right = right;
+		this.top = top;
+		this.bottom = bottom;
+	}
+	
+	public DMargin(int amount) {
+		this(amount, amount, amount, amount);
+	}
+	
+	public int getVertical() {
+		return top + bottom;
+	}
+	
+	public int getHorizontal() {
+		return left + right;
+	}
+}

DrawableGui/src/main/java/org/openzen/drawablegui/style/DMarginElement.java

@@ -0,0 +1,20 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.drawablegui.style;
+
+import org.openzen.drawablegui.DUIContext;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface DMarginElement extends DStyleElement {
+	DMargin eval(DUIContext context);
+	
+	default DMarginElement asMargin() {
+		return this;
+	}
+}

DrawableGui/src/main/java/org/openzen/drawablegui/style/DPxDimension.java

@@ -12,6 +12,8 @@ import org.openzen.drawablegui.DUIContext;
  * @author Hoofdgebruiker
  */
 public class DPxDimension implements DDimension {
+	public static final DPxDimension ZERO = new DPxDimension(0);
+	
 	private final float pixels;
 	
 	public DPxDimension(float pixels) {

DrawableGui/src/main/java/org/openzen/drawablegui/style/DShadow.java

@@ -11,6 +11,7 @@ package org.openzen.drawablegui.style;
  */
 public class DShadow {
 	public static final DShadow NONE = new DShadow(0, 0, 0, 0);
+	public static final DShadowElement NONE_ELEMENT = context -> NONE;
 	
 	public final int color;
 	public final float offsetX;

DrawableGui/src/main/java/org/openzen/drawablegui/style/DSimpleStylesheet.java

@@ -80,5 +80,13 @@ public class DSimpleStylesheet implements DStylesheet {
 			
 			return elements.get(name).asBorder().eval(context);
 		}
+		
+		@Override
+		public DMargin getMargin(String name, DMarginElement defaultValue) {
+			if (!elements.containsKey(name))
+				return defaultValue.eval(context);
+			
+			return elements.get(name).asMargin().eval(context);
+		}
 	}
 }

DrawableGui/src/main/java/org/openzen/drawablegui/style/DStyleDefinition.java

@@ -24,4 +24,6 @@ public interface DStyleDefinition {
 	public DFont getFont(String name, DFontElement defaultValue);
 	
 	public DBorder getBorder(String name, DBorderElement defaultValue);
+	
+	public DMargin getMargin(String name, DMarginElement defaultValue);
 }

DrawableGui/src/main/java/org/openzen/drawablegui/style/DStyleElement.java

@@ -31,6 +31,10 @@ public interface DStyleElement {
 		throw new RuntimeException("Not a border!");
 	}
 	
+	default DMarginElement asMargin() {
+		throw new RuntimeException("Not a margin!");
+	}
+	
 	default DShadowElement asShadow() {
 		throw new RuntimeException("Not a shadow!");
 	}

DrawableGui/src/main/java/org/openzen/drawablegui/style/DStylesheetBuilder.java

@@ -50,6 +50,11 @@ public class DStylesheetBuilder {
 		return this;
 	}
 	
+	public DStylesheetBuilder marginDp(String name, float value) {
+		elements.put(name, (DMarginElement)context -> new DMargin(context.dp(value)));
+		return this;
+	}
+	
 	public DStylesheet build() {
 		return new DSimpleStylesheet(elements);
 	}

DrawableGui/src/main/java/org/openzen/drawablegui/swing/SwingCanvas.java

@@ -118,12 +118,15 @@ public class SwingCanvas implements DCanvas {
 	}
 
 	@Override
-	public void shadowPath(DPath path, DTransform2D transform, DShadow shadow) {
-		if (shadow.color == 0)
+	public void shadowPath(DPath path, DTransform2D transform, int color, DShadow shadow) {
+		if (shadow.color == 0) {
+			fillPath(path, transform, color);
 			return;
+		}
 		
 		if (shadow.radius == 0) {
 			fillPath(path, transform, shadow.color);
+			fillPath(path, transform, color);
 			return;
 		}
 		
@@ -143,6 +146,8 @@ public class SwingCanvas implements DCanvas {
 		image = getGaussianBlurFilter((int)Math.ceil(shadow.radius), true).filter(image, null);
 		image = getGaussianBlurFilter((int)Math.ceil(shadow.radius), false).filter(image, null);
 		g.drawImage(image, bounds.x - offset, bounds.y - offset, null);
+		
+		fillPath(path, transform, color);
 	}
 
 	@Override

DrawableGui/src/main/java/org/openzen/drawablegui/swing/SwingDialog.java

@@ -7,6 +7,8 @@ package org.openzen.drawablegui.swing;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
 import java.awt.event.WindowStateListener;
@@ -20,6 +22,7 @@ import org.openzen.drawablegui.DUIWindow;
 import org.openzen.drawablegui.border.DCustomWindowBorder;
 import org.openzen.drawablegui.live.LiveBool;
 import org.openzen.drawablegui.live.LiveObject;
+import org.openzen.drawablegui.live.MutableLiveObject;
 import org.openzen.drawablegui.live.SimpleLiveBool;
 import org.openzen.drawablegui.live.SimpleLiveObject;
 import org.openzen.drawablegui.style.DStyleClass;
@@ -33,6 +36,7 @@ public final class SwingDialog extends JDialog implements WindowListener, Window
 	private final boolean noTitleBar;
 	private final SimpleLiveObject<State> state = new SimpleLiveObject<>(State.NORMAL);
 	private final SimpleLiveBool active = new SimpleLiveBool(true);
+	private final MutableLiveObject<DIRectangle> bounds = new SimpleLiveObject<>(DIRectangle.EMPTY);
 	
 	public SwingDialog(SwingWindow owner, String title, DComponent root, boolean noTitleBar) {
 		super(owner, title);
@@ -46,6 +50,17 @@ public final class SwingDialog extends JDialog implements WindowListener, Window
 		
 		addWindowListener(this);
 		addWindowStateListener(this);
+		addComponentListener(new ComponentAdapter() {
+			@Override
+			public void componentMoved(ComponentEvent componentEvent) {
+				updateBounds();
+			}
+			
+			@Override
+			public void componentResized(ComponentEvent componentEvent) {
+				updateBounds();
+			}
+		});
 		
 		getContentPane().add(swingComponent = new SwingRoot(root), BorderLayout.CENTER);
 		swingComponent.setWindow(this);
@@ -76,8 +91,8 @@ public final class SwingDialog extends JDialog implements WindowListener, Window
 	}
 
 	@Override
-	public DIRectangle getWindowBounds() {
-		return new DIRectangle(getX(), getY(), getWidth(), getHeight());
+	public LiveObject<DIRectangle> getWindowBounds() {
+		return bounds;
 	}
 
 	@Override
@@ -135,7 +150,7 @@ public final class SwingDialog extends JDialog implements WindowListener, Window
 
 	@Override
 	public void windowOpened(WindowEvent e) {
-		
+		updateBounds();
 	}
 
 	@Override
@@ -173,6 +188,10 @@ public final class SwingDialog extends JDialog implements WindowListener, Window
 		state.setValue(getStateFromWindowState());
 	}
 	
+	private void updateBounds() {
+		bounds.setValue(new DIRectangle(getX(), getY(), getWidth(), getHeight()));
+	}
+	
 	private State getStateFromWindowState() {
 		/*switch (ge()) {
 			case NORMAL:

DrawableGui/src/main/java/org/openzen/drawablegui/swing/SwingGraphicsContext.java

@@ -150,15 +150,18 @@ public class SwingGraphicsContext implements DUIContext {
 
 	@Override
 	public DUIWindow openDialog(int x, int y, DAnchor anchor, String title, DComponent root) {
-		SwingDialog window = new SwingDialog((SwingWindow)this.window, title, root, false);
+		SwingWindow swingWindow = (SwingWindow)this.window;
+		SwingDialog window = new SwingDialog(swingWindow, title, root, false);
 		SwingGraphicsContext windowContext = new SwingGraphicsContext(stylesheets, scale, textScale, window.swingComponent);
 		windowContext.setWindow(window);
 		windowContext.graphics = this.graphics; // help a little...
 		
+		Point rootLocation = swingWindow.swingComponent.getLocationOnScreen();
+		
 		root.setContext(DStylePathRoot.INSTANCE, windowContext);
 		DSizing dimension = root.getSizing().getValue();
-		int tx = (int)(x - anchor.alignX * dimension.preferredWidth);
-		int ty = (int)(y - anchor.alignY * dimension.preferredHeight);
+		int tx = (int)(x + rootLocation.x - anchor.alignX * dimension.preferredWidth);
+		int ty = (int)(y + rootLocation.y - anchor.alignY * dimension.preferredHeight);
 		
 		window.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
 		window.swingComponent.setPreferredSize(new Dimension(dimension.preferredWidth, dimension.preferredHeight));
@@ -183,7 +186,6 @@ public class SwingGraphicsContext implements DUIContext {
 		
 		int tx = (int)(x + rootLocation.x - anchor.alignX * dimension.preferredWidth);
 		int ty = (int)(y + rootLocation.y - anchor.alignY * dimension.preferredHeight);
-		System.out.println("Position: " + tx + ", " + ty);
 		
 		window.swingComponent.setPreferredSize(new Dimension(dimension.preferredWidth, dimension.preferredHeight));
 		window.setLocation(tx, ty);
@@ -191,7 +193,6 @@ public class SwingGraphicsContext implements DUIContext {
 		window.setVisible(true);
 		window.swingComponent.repaint();
 		
-		System.out.println("Window size: " + window.getWidth() + " x " + window.getHeight());
 		return window;
 	}
 	

DrawableGui/src/main/java/org/openzen/drawablegui/swing/SwingInlineWindow.java

@@ -6,6 +6,8 @@
 package org.openzen.drawablegui.swing;
 
 import java.awt.BorderLayout;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
 import java.awt.event.WindowStateListener;
@@ -17,7 +19,9 @@ import org.openzen.drawablegui.DUIWindow;
 import org.openzen.drawablegui.live.ImmutableLiveObject;
 import org.openzen.drawablegui.live.LiveBool;
 import org.openzen.drawablegui.live.LiveObject;
+import org.openzen.drawablegui.live.MutableLiveObject;
 import org.openzen.drawablegui.live.SimpleLiveBool;
+import org.openzen.drawablegui.live.SimpleLiveObject;
 
 /**
  *
@@ -27,6 +31,7 @@ public final class SwingInlineWindow extends JWindow implements WindowListener,
 	public final SwingRoot swingComponent;
 	private final LiveObject<State> state = new ImmutableLiveObject<>(State.NORMAL);
 	private final SimpleLiveBool active = new SimpleLiveBool(true);
+	private final MutableLiveObject<DIRectangle> bounds = new SimpleLiveObject<>(DIRectangle.EMPTY);
 	
 	public SwingInlineWindow(SwingWindow owner, String title, DComponent root) {
 		super(owner);
@@ -37,6 +42,17 @@ public final class SwingInlineWindow extends JWindow implements WindowListener,
 		getContentPane().add(swingComponent = new SwingRoot(root), BorderLayout.CENTER);
 		swingComponent.setWindow(this);
 		swingComponent.requestFocusInWindow();
+		addComponentListener(new ComponentAdapter() {
+			@Override
+			public void componentMoved(ComponentEvent componentEvent) {
+				updateBounds();
+			}
+			
+			@Override
+			public void componentResized(ComponentEvent componentEvent) {
+				updateBounds();
+			}
+		});
 	}
 	
 	@Override
@@ -45,8 +61,8 @@ public final class SwingInlineWindow extends JWindow implements WindowListener,
 	}
 
 	@Override
-	public DIRectangle getWindowBounds() {
-		return new DIRectangle(getX(), getY(), getWidth(), getHeight());
+	public LiveObject<DIRectangle> getWindowBounds() {
+		return bounds;
 	}
 
 	@Override
@@ -96,7 +112,7 @@ public final class SwingInlineWindow extends JWindow implements WindowListener,
 
 	@Override
 	public void windowOpened(WindowEvent e) {
-		
+		updateBounds();
 	}
 
 	@Override
@@ -133,4 +149,8 @@ public final class SwingInlineWindow extends JWindow implements WindowListener,
 	public void windowStateChanged(WindowEvent e) {
 		
 	}
+	
+	private void updateBounds() {
+		bounds.setValue(new DIRectangle(getX(), getY(), getWidth(), getHeight()));
+	}
 }

DrawableGui/src/main/java/org/openzen/drawablegui/swing/SwingRoot.java

@@ -87,6 +87,9 @@ public final class SwingRoot extends Component implements ComponentListener, Mou
 
 	@Override
 	public void componentResized(ComponentEvent e) {
+		if (firstPaint)
+			return;
+		
 		component.setBounds(new DIRectangle(0, 0,
 				e.getComponent().getWidth(),
 				e.getComponent().getHeight()));

DrawableGui/src/main/java/org/openzen/drawablegui/swing/SwingWindow.java

@@ -7,6 +7,8 @@ package org.openzen.drawablegui.swing;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
 import java.awt.event.WindowStateListener;
@@ -19,6 +21,7 @@ import org.openzen.drawablegui.DUIWindow;
 import org.openzen.drawablegui.border.DCustomWindowBorder;
 import org.openzen.drawablegui.live.LiveBool;
 import org.openzen.drawablegui.live.LiveObject;
+import org.openzen.drawablegui.live.MutableLiveObject;
 import org.openzen.drawablegui.live.SimpleLiveBool;
 import org.openzen.drawablegui.live.SimpleLiveObject;
 import org.openzen.drawablegui.style.DStyleClass;
@@ -32,6 +35,7 @@ public final class SwingWindow extends JFrame implements WindowListener, WindowS
 	private final boolean noTitleBar;
 	private final SimpleLiveObject<State> state = new SimpleLiveObject<>(State.NORMAL);
 	private final SimpleLiveBool active = new SimpleLiveBool(true);
+	private final MutableLiveObject<DIRectangle> bounds = new SimpleLiveObject<>(DIRectangle.EMPTY);
 	
 	public SwingWindow(String title, DComponent root, boolean noTitleBar) {
 		super(title);
@@ -45,10 +49,22 @@ public final class SwingWindow extends JFrame implements WindowListener, WindowS
 		
 		addWindowListener(this);
 		addWindowStateListener(this);
+		addComponentListener(new ComponentAdapter() {
+			@Override
+			public void componentMoved(ComponentEvent componentEvent) {
+				updateBounds();
+			}
+			
+			@Override
+			public void componentResized(ComponentEvent componentEvent) {
+				updateBounds();
+			}
+		});
 		
 		getContentPane().add(swingComponent = new SwingRoot(root), BorderLayout.CENTER);
 		swingComponent.setWindow(this);
 		swingComponent.requestFocusInWindow();
+		
 	}
 	
 	@Override
@@ -57,8 +73,8 @@ public final class SwingWindow extends JFrame implements WindowListener, WindowS
 	}
 
 	@Override
-	public DIRectangle getWindowBounds() {
-		return new DIRectangle(getX(), getY(), getWidth(), getHeight());
+	public LiveObject<DIRectangle> getWindowBounds() {
+		return bounds;
 	}
 
 	@Override
@@ -116,7 +132,7 @@ public final class SwingWindow extends JFrame implements WindowListener, WindowS
 
 	@Override
 	public void windowOpened(WindowEvent e) {
-		
+		updateBounds();
 	}
 
 	@Override
@@ -154,6 +170,11 @@ public final class SwingWindow extends JFrame implements WindowListener, WindowS
 		state.setValue(getStateFromWindowState());
 	}
 	
+	private void updateBounds() {
+		state.setValue(getStateFromWindowState());
+		bounds.setValue(new DIRectangle(getX(), getY(), getWidth(), getHeight()));
+	}
+	
 	private State getStateFromWindowState() {
 		switch (getExtendedState()) {
 			case NORMAL:

IDE/src/main/java/org/openzen/zenscript/ide/Main.java

@@ -4,12 +4,15 @@ import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
 import javax.swing.JFrame;
+import org.openzen.drawablegui.DUIWindow;
 import org.openzen.zenscript.ide.host.DevelopmentHost;
 import org.openzen.zenscript.ide.host.local.LocalProjectDevelopmentHost;
 import org.openzen.drawablegui.swing.SwingWindow;
 import org.openzen.zenscript.compiler.CompilationUnit;
 import org.openzen.zenscript.constructor.ModuleLoader;
 import org.openzen.zenscript.constructor.Project;
+import org.openzen.zenscript.ide.host.IDEPropertyDirectory;
+import org.openzen.zenscript.ide.host.IDEPropertyStore;
 import org.openzen.zenscript.ide.ui.IDEWindow;
 import org.openzen.zenscript.ide.ui.view.WindowView;
 
@@ -26,15 +29,44 @@ public class Main {
 		Project project = new Project(loader, directory);
 		
 		DevelopmentHost host = new LocalProjectDevelopmentHost(project);
-		
-		int pixelPerInch = java.awt.Toolkit.getDefaultToolkit().getScreenResolution();
+		open(host);
+    }
+	
+	private static void open(DevelopmentHost host) {
+		IDEPropertyStore properties = host.getPropertyStore();
 		
 		IDEWindow window = new IDEWindow(host);
 		WindowView root = new WindowView(window, host);
 		
+		IDEPropertyDirectory uiState = properties.getRoot().getSubdirectory("uiState");
+		
+		int pixelPerInch = java.awt.Toolkit.getDefaultToolkit().getScreenResolution();
 		SwingWindow swingWindow = new SwingWindow("ZenCode IDE - " + host.getName(), root, false);
-		swingWindow.setSize(800 * pixelPerInch / 96, 600 * pixelPerInch / 96);
+		swingWindow.setSize(
+				uiState.getInt("width", 800 * pixelPerInch / 96),
+				uiState.getInt("height", 600 * pixelPerInch / 96));
+		swingWindow.setLocation(
+				uiState.getInt("x", 0),
+				uiState.getInt("y", 0));
 		swingWindow.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+		swingWindow.setExtendedState(uiState.getBool("maximized", false) ? JFrame.MAXIMIZED_BOTH : JFrame.NORMAL);
 		swingWindow.setVisible(true);
-    }
+		
+		swingWindow.getWindowBounds().addListener((oldBounds, newBounds) -> {
+			if (swingWindow.getWindowState().getValue() == DUIWindow.State.NORMAL) {
+				uiState.setInt("x", newBounds.x);
+				uiState.setInt("y", newBounds.y);
+				uiState.setInt("width", newBounds.width);
+				uiState.setInt("height", newBounds.height);
+				properties.save();
+			}
+		});
+		swingWindow.getWindowState().addListener((oldState, newState) -> {
+			boolean isMaximized = newState == DUIWindow.State.MAXIMIZED;
+			if (isMaximized != uiState.getBool("maximized", false)) {
+				uiState.setBool("maximized", isMaximized);
+				properties.save();
+			}
+		});
+	}
 }

IDE/src/main/java/org/openzen/zenscript/ide/codemodel/IDECodeSpace.java

@@ -0,0 +1,25 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.zenscript.ide.codemodel;
+
+import org.openzen.zenscript.ide.host.DevelopmentHost;
+import org.openzen.zenscript.ide.host.IDESourceFile;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class IDECodeSpace {
+	private final DevelopmentHost host;
+	
+	public IDECodeSpace(DevelopmentHost host) {
+		this.host = host;
+	}
+	
+	public void onSaved(IDESourceFile file) {
+		
+	}
+}

IDE/src/main/java/org/openzen/zenscript/ide/host/DevelopmentHost.java

@@ -14,6 +14,8 @@ import org.openzen.drawablegui.live.LiveList;
 public interface DevelopmentHost {
 	public String getName();
 	
+	public IDEPropertyStore getPropertyStore();
+	
 	public LiveList<IDEModule> getModules();
 	
 	public LiveList<IDELibrary> getLibraries();

IDE/src/main/java/org/openzen/zenscript/ide/host/IDEPropertyDirectory.java

@@ -0,0 +1,26 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.zenscript.ide.host;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface IDEPropertyDirectory {
+	public boolean getBool(String name, boolean defaultValue);
+	
+	public void setBool(String name, boolean value);
+	
+	public int getInt(String name, int defaultValue);
+	
+	public void setInt(String name, int value);
+	
+	public String getString(String name, String defaultValue);
+	
+	public void setString(String name, String value);
+	
+	public IDEPropertyDirectory getSubdirectory(String name);
+}

IDE/src/main/java/org/openzen/zenscript/ide/host/IDEPropertyStore.java

@@ -0,0 +1,16 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.zenscript.ide.host;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface IDEPropertyStore {
+	IDEPropertyDirectory getRoot();
+	
+	void save();
+}

IDE/src/main/java/org/openzen/zenscript/ide/host/IDESourceFile.java

@@ -7,13 +7,14 @@ package org.openzen.zenscript.ide.host;
 
 import java.io.IOException;
 import java.io.Reader;
+import org.openzen.drawablegui.live.LiveString;
 
 /**
  *
  * @author Hoofdgebruiker
  */
 public interface IDESourceFile {
-	public String getName();
+	public LiveString getName();
 	
 	public Reader read() throws IOException;
 	

IDE/src/main/java/org/openzen/zenscript/ide/host/local/FilePropertyStore.java

@@ -0,0 +1,57 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.zenscript.ide.host.local;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.openzen.zenscript.ide.host.IDEPropertyDirectory;
+import org.openzen.zenscript.ide.host.IDEPropertyStore;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class FilePropertyStore implements IDEPropertyStore {
+	private final File file;
+	private JSONObject data;
+	
+	public FilePropertyStore(File file) {
+		this.file = file;
+		
+		if (!file.exists()) {
+			data = new JSONObject();
+			save();
+		} else {
+			try (InputStreamReader input = new InputStreamReader(new BufferedInputStream(new FileInputStream(file)), StandardCharsets.UTF_8)) {
+				data = new JSONObject(new JSONTokener(input));
+			} catch (IOException ex) {
+				data = new JSONObject();
+			}
+		}
+	}
+	
+	@Override
+	public IDEPropertyDirectory getRoot() {
+		return new JSONPropertyDirectory(data);
+	}
+	
+	@Override
+	public void save() {
+		try (OutputStreamWriter output = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8)) {
+			output.write(data.toString(2));
+		} catch (IOException ex) {
+			ex.printStackTrace();
+		}
+	}
+}

IDE/src/main/java/org/openzen/zenscript/ide/host/local/JSONPropertyDirectory.java

@@ -0,0 +1,60 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.zenscript.ide.host.local;
+
+import org.json.JSONObject;
+import org.openzen.zenscript.ide.host.IDEPropertyDirectory;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class JSONPropertyDirectory implements IDEPropertyDirectory {
+	private final JSONObject data;
+	
+	public JSONPropertyDirectory(JSONObject data) {
+		this.data = data;
+	}
+	
+	@Override
+	public boolean getBool(String name, boolean defaultValue) {
+		return data.optBoolean(name, defaultValue);
+	}
+	
+	@Override
+	public void setBool(String name, boolean value) {
+		data.put(name, value);
+	}
+	
+	@Override
+	public int getInt(String name, int defaultValue) {
+		return data.optInt(name, defaultValue);
+	}
+	
+	@Override
+	public void setInt(String name, int value) {
+		data.put(name, value);
+	}
+
+	@Override
+	public String getString(String name, String defaultValue) {
+		return data.optString(name, defaultValue);
+	}
+	
+	@Override
+	public void setString(String name, String value) {
+		data.put(name, value);
+	}
+
+	@Override
+	public IDEPropertyDirectory getSubdirectory(String name) {
+		if (!data.has(name)) {
+			data.put(name, new JSONObject());
+		}
+		
+		return new JSONPropertyDirectory(data.getJSONObject(name));
+	}
+}

IDE/src/main/java/org/openzen/zenscript/ide/host/local/LocalPackage.java

@@ -48,7 +48,7 @@ public class LocalPackage implements IDEPackage {
 		}
 		
 		subPackagesSorted = new SortedLiveList<>(subPackages, (a, b) -> a.getName().compareTo(b.getName()));
-		sourceFilesSorted = new SortedLiveList<>(sourceFiles, (a, b) -> a.getName().compareTo(b.getName()));
+		sourceFilesSorted = new SortedLiveList<>(sourceFiles, (a, b) -> a.getName().getValue().compareTo(b.getName().getValue()));
 	}
 	
 	@Override

IDE/src/main/java/org/openzen/zenscript/ide/host/local/LocalProjectDevelopmentHost.java

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.ide.host.local;
 
+import java.io.File;
 import org.openzen.drawablegui.live.LiveArrayList;
 import org.openzen.drawablegui.live.LiveList;
 import org.openzen.drawablegui.live.MutableLiveList;
@@ -15,6 +16,7 @@ import org.openzen.zenscript.compiler.Target;
 import org.openzen.zenscript.ide.host.DevelopmentHost;
 import org.openzen.zenscript.ide.host.IDEModule;
 import org.openzen.zenscript.ide.host.IDELibrary;
+import org.openzen.zenscript.ide.host.IDEPropertyStore;
 import org.openzen.zenscript.ide.host.IDETarget;
 
 /**
@@ -47,6 +49,11 @@ public class LocalProjectDevelopmentHost implements DevelopmentHost {
 	public String getName() {
 		return project.name;
 	}
+	
+	@Override
+	public IDEPropertyStore getPropertyStore() {
+		return new FilePropertyStore(new File(project.directory, "ide.json"));
+	}
 
 	@Override
 	public LiveList<IDEModule> getModules() {

IDE/src/main/java/org/openzen/zenscript/ide/host/local/LocalSourceFile.java

@@ -15,6 +15,9 @@ import java.io.OutputStreamWriter;
 import java.io.Reader;
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
+import org.openzen.drawablegui.live.LiveString;
+import org.openzen.drawablegui.live.MutableLiveString;
+import org.openzen.drawablegui.live.SimpleLiveString;
 import org.openzen.zenscript.constructor.module.SourceFile;
 import org.openzen.zenscript.ide.host.IDESourceFile;
 
@@ -24,14 +27,16 @@ import org.openzen.zenscript.ide.host.IDESourceFile;
  */
 public class LocalSourceFile implements IDESourceFile {
 	private final SourceFile file;
+	private final MutableLiveString name;
 	
 	public LocalSourceFile(SourceFile file) {
 		this.file = file;
+		this.name = new SimpleLiveString(file.name);
 	}
 
 	@Override
-	public String getName() {
-		return file.name;
+	public LiveString getName() {
+		return name;
 	}
 
 	@Override

IDE/src/main/java/org/openzen/zenscript/ide/ui/IDEWindow.java

@@ -6,19 +6,10 @@
 package org.openzen.zenscript.ide.ui;
 
 import org.openzen.drawablegui.live.ImmutableLiveString;
-import org.openzen.drawablegui.live.LiveBool;
-import org.openzen.drawablegui.live.LivePredicateBool;
-import org.openzen.drawablegui.live.MutableLiveObject;
-import org.openzen.drawablegui.live.SimpleLiveObject;
 import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.zenscript.ide.host.DevelopmentHost;
-import org.openzen.zenscript.ide.host.IDEModule;
-import org.openzen.zenscript.ide.host.IDEPackage;
 import org.openzen.zenscript.ide.host.IDESourceFile;
 import org.openzen.zenscript.ide.host.IDETarget;
-import org.openzen.zenscript.ide.ui.dialog.CreatePackageDialog;
-import org.openzen.zenscript.ide.ui.dialog.CreateSourceFileDialog;
-import org.openzen.zenscript.ide.ui.icons.AddBoxIcon;
 import org.openzen.zenscript.ide.ui.icons.BuildIcon;
 import org.openzen.zenscript.ide.ui.icons.PlayIcon;
 import org.openzen.zenscript.ide.ui.icons.SettingsIcon;
@@ -38,11 +29,6 @@ public class IDEWindow {
 	
 	public IDEAspectToolbar projectToolbar;
 	
-	public final MutableLiveObject<IDEModule> contextModule = new SimpleLiveObject<>(null);
-	public final MutableLiveObject<IDEPackage> contextPackage = new SimpleLiveObject<>(null);
-	public final MutableLiveObject<IDESourceFile> contextFile = new SimpleLiveObject<>(null);
-	public final LiveBool addContentDisabled = new LivePredicateBool(contextPackage, pkg -> pkg == null);
-	
 	public IDEWindow(DevelopmentHost host) {
 		this.host = host;
 		
@@ -84,22 +70,4 @@ public class IDEWindow {
 		}));
 		aspectBar.toolbars.add(projectToolbar);
 	}
-	
-	public void setContextModule(IDEModule module) {
-		contextModule.setValue(module);
-		contextPackage.setValue(module.getRootPackage());
-		contextFile.setValue(null);
-	}
-	
-	public void setContextPackage(IDEModule module, IDEPackage pkg) {
-		contextModule.setValue(module);
-		contextPackage.setValue(pkg);
-		contextFile.setValue(null);
-	}
-	
-	public void setContextFile(IDESourceFile file) {
-		contextModule.setValue(null);
-		contextPackage.setValue(null);
-		contextFile.setValue(file);
-	}
 }

IDE/src/main/java/org/openzen/zenscript/ide/ui/dialog/CreatePackageDialog.java

@@ -8,12 +8,12 @@ package org.openzen.zenscript.ide.ui.dialog;
 import org.openzen.drawablegui.DAnchor;
 import org.openzen.drawablegui.DButton;
 import org.openzen.drawablegui.DComponent;
-import org.openzen.drawablegui.DHorizontalLayout;
+import org.openzen.drawablegui.layout.DHorizontalLayout;
 import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.DInputField;
 import org.openzen.drawablegui.DLabel;
 import org.openzen.drawablegui.DUIWindow;
-import org.openzen.drawablegui.DVerticalLayout;
+import org.openzen.drawablegui.layout.DVerticalLayout;
 import org.openzen.drawablegui.form.DForm;
 import org.openzen.drawablegui.form.DFormComponent;
 import org.openzen.drawablegui.live.ImmutableLiveBool;
@@ -23,7 +23,6 @@ import org.openzen.drawablegui.style.DDpDimension;
 import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.zenscript.ide.host.IDEModule;
 import org.openzen.zenscript.ide.host.IDEPackage;
-import org.openzen.zenscript.ide.ui.IDEWindow;
 
 /**
  *
@@ -71,8 +70,8 @@ public class CreatePackageDialog {
 	}
 	
 	public void open(DUIWindow parent) {
-		DIRectangle rectangle = parent.getWindowBounds();
-		window = parent.getContext().openDialog(rectangle.getCenterX(), rectangle.getCenterY(), DAnchor.MIDDLE_LEFT, "Create package", root);
+		DIRectangle rectangle = parent.getWindowBounds().getValue();
+		window = parent.getContext().openDialog(rectangle.width / 2, rectangle.height / 2, DAnchor.MIDDLE_CENTER, "Create package", root);
 		window.focus(input);
 	}
 	

IDE/src/main/java/org/openzen/zenscript/ide/ui/dialog/CreateSourceFileDialog.java

@@ -8,12 +8,12 @@ package org.openzen.zenscript.ide.ui.dialog;
 import org.openzen.drawablegui.DAnchor;
 import org.openzen.drawablegui.DButton;
 import org.openzen.drawablegui.DComponent;
-import org.openzen.drawablegui.DHorizontalLayout;
+import org.openzen.drawablegui.layout.DHorizontalLayout;
 import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.DInputField;
 import org.openzen.drawablegui.DLabel;
 import org.openzen.drawablegui.DUIWindow;
-import org.openzen.drawablegui.DVerticalLayout;
+import org.openzen.drawablegui.layout.DVerticalLayout;
 import org.openzen.drawablegui.form.DForm;
 import org.openzen.drawablegui.form.DFormComponent;
 import org.openzen.drawablegui.live.ImmutableLiveBool;
@@ -74,8 +74,8 @@ public class CreateSourceFileDialog {
 	}
 	
 	public void open(DUIWindow parent) {
-		DIRectangle rectangle = parent.getWindowBounds();
-		window = parent.getContext().openDialog(rectangle.getCenterX(), rectangle.getCenterY(), DAnchor.MIDDLE_LEFT, "Create source file", root);
+		DIRectangle rectangle = parent.getWindowBounds().getValue();
+		window = parent.getContext().openDialog(rectangle.getCenterX(), rectangle.getCenterY(), DAnchor.MIDDLE_CENTER, "Create source file", root);
 		window.focus(input);
 	}
 	

IDE/src/main/java/org/openzen/zenscript/ide/ui/icons/AddBoxIcon.java

@@ -49,8 +49,7 @@ public class AddBoxIcon implements DColorableIcon {
 	
 	@Override
 	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.shadowPath(PATH, transform, new DShadow(0xFF999999, 0, 1, 6));
-		canvas.fillPath(PATH, transform, color);
+		canvas.shadowPath(PATH, transform, color, new DShadow(0xFF999999, 0, 1, 6));
 	}
 
 	@Override

IDE/src/main/java/org/openzen/zenscript/ide/ui/icons/BuildIcon.java

@@ -36,8 +36,7 @@ public class BuildIcon implements DColorableIcon {
 	
 	@Override
 	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.shadowPath(PATH, transform, new DShadow(0xFFCCCCCC, 0, 1, 4));
-		canvas.fillPath(PATH, transform, color);
+		canvas.shadowPath(PATH, transform, color, new DShadow(0xFFCCCCCC, 0, 1, 4));
 	}
 
 	@Override

IDE/src/main/java/org/openzen/zenscript/ide/ui/icons/PlayIcon.java

@@ -26,8 +26,7 @@ public class PlayIcon implements DColorableIcon {
 	
 	@Override
 	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.shadowPath(PATH, transform, new DShadow(0xFFCCCCCC, 0, 1, 4));
-		canvas.fillPath(PATH, transform, color);
+		canvas.shadowPath(PATH, transform, color, new DShadow(0xFFCCCCCC, 0, 1, 4));
 	}
 
 	@Override

IDE/src/main/java/org/openzen/zenscript/ide/ui/icons/SettingsIcon.java

@@ -68,8 +68,7 @@ public class SettingsIcon implements DColorableIcon {
 	
 	@Override
 	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.shadowPath(PATH, transform, new DShadow(0xFF888888, 0, 1, 4));
-		canvas.fillPath(PATH, transform, color);
+		canvas.shadowPath(PATH, transform, color, new DShadow(0xFF888888, 0, 1, 4));
 	}
 
 	@Override

IDE/src/main/java/org/openzen/zenscript/ide/ui/icons/ShadedSaveIcon.java

@@ -45,8 +45,7 @@ public class ShadedSaveIcon implements DColorableIcon {
 	
 	@Override
 	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.shadowPath(PATH, transform, new DShadow(0xFFCCCCCC, 0, 1, 4));
-		canvas.fillPath(PATH, transform, color);
+		canvas.shadowPath(PATH, transform, color, new DShadow(0xFFCCCCCC, 0, 1, 4));
 	}
 
 	@Override

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/IconButtonControl.java

@@ -109,17 +109,13 @@ public class IconButtonControl implements DComponent {
 	@Override
 	public void paint(DCanvas canvas) {
 		if (disabled.getValue()) {
-			canvas.shadowPath(shape, DTransform2D.IDENTITY, style.shadowDisabled);
-			canvas.fillPath(shape, DTransform2D.IDENTITY, style.colorDisabled);
+			canvas.shadowPath(shape, DTransform2D.IDENTITY, style.colorDisabled, style.shadowDisabled);
 		} else if (press) {
-			canvas.shadowPath(shape, DTransform2D.IDENTITY, style.shadowPress);
-			canvas.fillPath(shape, DTransform2D.IDENTITY, style.colorPress);
+			canvas.shadowPath(shape, DTransform2D.IDENTITY, style.colorPress, style.shadowPress);
 		} else if (hover) {
-			canvas.shadowPath(shape, DTransform2D.IDENTITY, style.shadowHover);
-			canvas.fillPath(shape, DTransform2D.IDENTITY, style.colorHover);
+			canvas.shadowPath(shape, DTransform2D.IDENTITY, style.colorHover, style.shadowHover);
 		} else {
-			canvas.shadowPath(shape, DTransform2D.IDENTITY, style.shadowNormal);
-			canvas.fillPath(shape, DTransform2D.IDENTITY, style.colorNormal);
+			canvas.shadowPath(shape, DTransform2D.IDENTITY, style.colorNormal, style.shadowNormal);
 		}
 		
 		DDrawable icon = disabled.getValue() ? iconDisabled : this.icon;

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/TabbedView.java

@@ -5,6 +5,8 @@
  */
 package org.openzen.zenscript.ide.ui.view;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import org.openzen.drawablegui.BaseComponentGroup;
@@ -14,6 +16,7 @@ import org.openzen.drawablegui.DSizing;
 import org.openzen.drawablegui.DFontMetrics;
 import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.DUIContext;
+import org.openzen.drawablegui.listeners.ListenerHandle;
 import org.openzen.drawablegui.live.LiveArrayList;
 import org.openzen.drawablegui.live.LiveList;
 import org.openzen.drawablegui.live.LiveMappedList;
@@ -34,6 +37,8 @@ public class TabbedView extends BaseComponentGroup {
 	private final MutableLiveObject<DSizing> sizing = DSizing.create();
 	public final MutableLiveObject<TabbedViewComponent> currentTab = new SimpleLiveObject<>(null);
 	
+	private final Map<TabbedViewTab, ListenerHandle<LiveObject.Listener<DSizing>>> tabSizeListeners = new HashMap<>();
+	
 	private DUIContext context;
 	private DStylePath path;
 	private DIRectangle bounds;
@@ -45,6 +50,8 @@ public class TabbedView extends BaseComponentGroup {
 		TabbedViewTab result = new TabbedViewTab(this, currentTab, tab);
 		if (context != null)
 			result.setContext(path, context);
+		
+		tabSizeListeners.put(result, result.getSizing().addListener((oldSize, newSize) -> layoutTabs()));
 		return result;
 	});
 	

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/TabbedViewComponent.java

@@ -7,19 +7,23 @@ package org.openzen.zenscript.ide.ui.view;
 
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DDrawable;
+import org.openzen.drawablegui.live.LiveBool;
+import org.openzen.drawablegui.live.LiveString;
 
 /**
  *
  * @author Hoofdgebruiker
  */
 public class TabbedViewComponent {
-	public final String title;
+	public final LiveString title;
 	public final DDrawable icon;
 	public final DComponent content;
+	public final LiveBool updated;
 	
-	public TabbedViewComponent(String title, DDrawable icon, DComponent content) {
+	public TabbedViewComponent(LiveString title, DDrawable icon, DComponent content, LiveBool updated) {
 		this.title = title;
 		this.icon = icon;
 		this.content = content;
+		this.updated = updated;
 	}
 }

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/TabbedViewTab.java

@@ -14,7 +14,10 @@ import org.openzen.drawablegui.DMouseEvent;
 import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DTransform2D;
 import org.openzen.drawablegui.DUIContext;
+import org.openzen.drawablegui.listeners.ListenerHandle;
+import org.openzen.drawablegui.live.LiveBool;
 import org.openzen.drawablegui.live.LiveObject;
+import org.openzen.drawablegui.live.LiveString;
 import org.openzen.drawablegui.live.MutableLiveObject;
 import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.drawablegui.style.DStylePath;
@@ -37,6 +40,9 @@ public class TabbedViewTab implements DComponent {
 	private int textWidth;
 	private DIRectangle bounds;
 	
+	private final ListenerHandle<LiveString.Listener> titleListener;
+	private final ListenerHandle<LiveBool.Listener> updatedListener;
+	
 	private boolean hover;
 	private boolean press;
 	
@@ -45,6 +51,9 @@ public class TabbedViewTab implements DComponent {
 		this.currentTab = currentTab;
 		this.tab = tab;
 		this.closeButton = new TabbedViewTabClose(this);
+		
+		titleListener = tab.title.addListener((oldValue, newValue) -> calculateSizing());
+		updatedListener = tab.updated.addListener((oldValue, newValue) -> calculateSizing());
 	}
 	
 	public void closeTab() {
@@ -59,11 +68,22 @@ public class TabbedViewTab implements DComponent {
 		fontMetrics = context.getFontMetrics(style.tabFont);
 		closeButton.setContext(path, context);
 		
-		textWidth = fontMetrics.getWidth(tab.title);
-		sizing.setValue(new DSizing(
-				style.paddingLeft + textWidth + style.paddingRight
+		calculateSizing();
+	}
+	
+	private void calculateSizing() {
+		textWidth = fontMetrics.getWidth(tab.title.getValue());
+		
+		int width = style.paddingLeft + textWidth + style.paddingRight
 						+ style.closeIconPadding
-						+ closeButton.getSizing().getValue().preferredWidth,
+						+ closeButton.getSizing().getValue().preferredWidth;
+		
+		if (tab.updated.getValue()) {
+			width += style.updatedDiameter + style.updatedPadding;
+		}
+		
+		sizing.setValue(new DSizing(
+				width,
 				style.paddingTop + fontMetrics.getAscent() + fontMetrics.getDescent()
 						+ style.paddingBottom));
 	}
@@ -99,6 +119,9 @@ public class TabbedViewTab implements DComponent {
 	public void paint(DCanvas canvas) {
 		int width = style.paddingLeft + textWidth + style.paddingRight
 				+ closeButton.getSizing().getValue().preferredWidth + style.closeIconPadding;
+		
+		if (tab.updated.getValue())
+			width += style.updatedDiameter + style.updatedPadding;
 
 		int color = style.tabColorNormal;
 		if (currentTab.getValue() == tab)
@@ -110,15 +133,25 @@ public class TabbedViewTab implements DComponent {
 
 		canvas.fillRectangle(bounds.x, bounds.y, width, bounds.height, color);
 		canvas.strokePath(DPath.rectangle(bounds.x, bounds.y, width, bounds.height), DTransform2D.IDENTITY, style.borderColor, style.borderWidth);
-
-		canvas.drawText(style.tabFont, style.tabFontColor, bounds.x + style.paddingLeft, bounds.y + style.paddingTop + fontMetrics.getAscent(), tab.title);
+		
+		canvas.drawText(style.tabFont, style.tabFontColor, bounds.x + style.paddingLeft, bounds.y + style.paddingTop + fontMetrics.getAscent(), tab.title.getValue());
+		
+		if (tab.updated.getValue()) {
+			canvas.fillPath(
+					DPath.circle(
+						bounds.x + bounds.width - style.paddingRight - closeButton.getBounds().width - style.closeIconPadding - style.updatedDiameter / 2,
+						bounds.y + style.paddingTop + ((bounds.height - style.paddingTop - style.paddingBottom) / 2), style.updatedDiameter / 2),
+					DTransform2D.IDENTITY,
+					style.updatedColor);
+		}
 		
 		closeButton.paint(canvas);
 	}
 
 	@Override
 	public void close() {
-		
+		titleListener.close();
+		updatedListener.close();
 	}
 	
 	@Override

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/TabbedViewTabStyle.java

@@ -35,6 +35,10 @@ public class TabbedViewTabStyle {
 	public final int closeIconSize;
 	public final int closeIconPadding;
 	
+	public final int updatedDiameter;
+	public final int updatedPadding;
+	public final int updatedColor;
+	
 	public TabbedViewTabStyle(DStyleDefinition style) {
 		tabFont = style.getFont("tabFont", context -> new DFont(DFontFamily.UI, false, false, false, (int)(12 * context.getScale())));
 		tabFontColor = style.getColor("tabFontColor", 0xFF000000);
@@ -54,5 +58,9 @@ public class TabbedViewTabStyle {
 		
 		closeIconSize = style.getDimension("closeIconSize", new DDpDimension(16));
 		closeIconPadding = style.getDimension("closeIconPadding", new DDpDimension(6));
+		
+		updatedDiameter = style.getDimension("updatedDiameter", new DDpDimension(6));
+		updatedPadding = style.getDimension("updatedPadding", new DDpDimension(8));
+		updatedColor = style.getColor("updatedColor", 0xFF000000);
 	}
 }

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/WindowView.java

@@ -5,30 +5,20 @@
  */
 package org.openzen.zenscript.ide.ui.view;
 
-import org.openzen.drawablegui.DSizing;
 import org.openzen.drawablegui.DEmptyView;
-import org.openzen.drawablegui.DHorizontalLayout;
 import org.openzen.drawablegui.scroll.DScrollPane;
-import org.openzen.drawablegui.DSideLayout;
-import org.openzen.drawablegui.DVerticalLayout;
-import org.openzen.drawablegui.border.DEmptyBorder;
-import org.openzen.drawablegui.live.ImmutableLiveString;
+import org.openzen.drawablegui.layout.DSideLayout;
 import org.openzen.drawablegui.live.LiveString;
 import org.openzen.drawablegui.live.SimpleLiveString;
 import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.drawablegui.style.DStylesheetBuilder;
-import org.openzen.drawablegui.tree.DTreeView;
-import org.openzen.drawablegui.tree.DTreeViewStyle;
 import org.openzen.zenscript.ide.host.DevelopmentHost;
 import org.openzen.zenscript.ide.host.IDESourceFile;
 import org.openzen.zenscript.ide.ui.IDEDockWindow;
 import org.openzen.zenscript.ide.ui.IDEWindow;
-import org.openzen.zenscript.ide.ui.dialog.CreatePackageDialog;
-import org.openzen.zenscript.ide.ui.dialog.CreateSourceFileDialog;
-import org.openzen.zenscript.ide.ui.icons.AddBoxIcon;
 import org.openzen.zenscript.ide.ui.view.aspectbar.AspectBarView;
 import org.openzen.zenscript.ide.ui.view.editor.SourceEditor;
-import org.openzen.zenscript.ide.ui.view.project.RootTreeNode;
+import org.openzen.zenscript.ide.ui.view.project.ProjectBrowser;
 
 /**
  *
@@ -38,60 +28,18 @@ public final class WindowView extends DSideLayout {
 	private final IDEWindow window;
 	private final TabbedView tabs;
 	public final LiveString status = new SimpleLiveString("IDE initialized");
+	private final ProjectBrowser projectBrowser;
 	
 	public WindowView(IDEWindow window, DevelopmentHost host) {
-		super(DStyleClass.EMPTY, DEmptyView.INSTANCE);
+		super(DStyleClass.inline(
+				new DStylesheetBuilder().color("backgroundColor", 0xFFEEEEEE).build()),
+				DEmptyView.INSTANCE);
 		this.window = window;
 		
-		DStyleClass minimalButtonPadding = DStyleClass.inline(new DStylesheetBuilder()
-				.dimensionDp("margin", 3)
-				.dimensionDp("padding", 0)
-				.build());
-		
-		IconButtonControl addPackageButton = new IconButtonControl(
-				minimalButtonPadding,
-				AddBoxIcon.BLUE,
-				AddBoxIcon.GRAY,
-				window.addContentDisabled,
-				new ImmutableLiveString("Create package"),
-				e -> {
-					CreatePackageDialog dialog = new CreatePackageDialog(window.contextModule.getValue(), window.contextPackage.getValue());
-					dialog.open(e.window);
-				});
-		IconButtonControl addFileButton = new IconButtonControl(
-				minimalButtonPadding,
-				AddBoxIcon.ORANGE,
-				AddBoxIcon.GRAY,
-				window.addContentDisabled,
-				new ImmutableLiveString("Create source file"),
-				e -> {
-					CreateSourceFileDialog dialog = new CreateSourceFileDialog(window, window.contextModule.getValue(), window.contextPackage.getValue());
-					dialog.open(e.window);
-				});
-		
-		DHorizontalLayout toolbar = new DHorizontalLayout(
-				DStyleClass.inline(new DStylesheetBuilder()
-						.border("border", context -> DEmptyBorder.INSTANCE)
-						.dimensionPx("spacing", 0)
-						.color("backgroundColor", 0xFFFFFFFF)
-						.build()),
-				DHorizontalLayout.Alignment.LEFT,
-				new DHorizontalLayout.Element(addPackageButton, 0, 0, DHorizontalLayout.ElementAlignment.TOP),
-				new DHorizontalLayout.Element(addFileButton, 0, 0, DHorizontalLayout.ElementAlignment.TOP));
-		DTreeView projectTree = new DTreeView(DTreeViewStyle.DEFAULT, new RootTreeNode(window, host), false);
-		projectTree.getSizing().setValue(new DSizing(500, 500));
-		
-		DVerticalLayout projectView = new DVerticalLayout(
-				DStyleClass.inline(new DStylesheetBuilder()
-						.border("border", context -> DEmptyBorder.INSTANCE)
-						.dimensionPx("spacing", 0)
-						.build()),
-				DVerticalLayout.Alignment.TOP,
-				new DVerticalLayout.Element(toolbar, 0, 0, DVerticalLayout.ElementAlignment.STRETCH),
-				new DVerticalLayout.Element(new DScrollPane(DStyleClass.forId("projectView"), projectTree), 1, 1, DVerticalLayout.ElementAlignment.STRETCH));
+		projectBrowser = new ProjectBrowser(window, host);
 		
 		setMain(tabs = new TabbedView(DStyleClass.EMPTY));
-		add(Side.LEFT,projectView);
+		add(Side.LEFT, projectBrowser.view);
 		add(Side.BOTTOM, new StatusBarView(DStyleClass.EMPTY, status));
 		add(Side.TOP, new AspectBarView(DStyleClass.EMPTY, window.aspectBar));
 		
@@ -101,10 +49,12 @@ public final class WindowView extends DSideLayout {
 	private class DockWindowListener implements IDEDockWindow.Listener {
 		@Override
 		public void onOpen(IDESourceFile sourceFile) {
+			SourceEditor editor = new SourceEditor(DStyleClass.EMPTY, window, sourceFile);
 			TabbedViewComponent tab = new TabbedViewComponent(
 					sourceFile.getName(),
 					null,
-					new DScrollPane(DStyleClass.EMPTY, new SourceEditor(DStyleClass.EMPTY, window, sourceFile)));
+					new DScrollPane(DStyleClass.EMPTY, editor),
+					editor.isUpdated());
 			tabs.tabs.add(tab);
 			tabs.currentTab.setValue(tab);
 		}

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/aspectbar/AspectBarSelectorButton.java

@@ -110,11 +110,8 @@ public class AspectBarSelectorButton implements DComponent {
 		canvas.shadowPath(
 					shape,
 					DTransform2D.translate(bounds.x, bounds.y),
+					color,
 					shadow);
-		canvas.fillPath(
-				shape,
-				DTransform2D.translate(bounds.x, bounds.y),
-				color);
 		icon.draw(canvas, DTransform2D.scaleAndTranslate(
 				bounds.x + (style.width - icon.getNominalWidth() * context.getScale()) / 2,
 				bounds.y + (style.height - icon.getNominalHeight() * context.getScale()) / 2,

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/aspectbar/AspectBarStyle.java

@@ -21,7 +21,9 @@ public class AspectBarStyle {
 	public final int aspectSelectorToToolbarSpacing;
 	public final int aspectSelectorBottomSize;
 	public final int backgroundColor;
+	public final int backgroundColorBottom;
 	public final int foregroundColor;
+	public final int marginBottom;
 	
 	public final int aspectSelectorButtonSpacing;
 	public final int toolbarTitleToControlsSpacing;
@@ -29,6 +31,7 @@ public class AspectBarStyle {
 	public final DShadow aspectBarShadow;
 	public final int aspectBarPaddingTop;
 	
+	public final int controlHeight;
 	public final int controlPaddingTop;
 	public final int controlPaddingBottom;
 	
@@ -40,19 +43,21 @@ public class AspectBarStyle {
 	public final DShadow windowControlShadow;
 	
 	public AspectBarStyle(DStyleDefinition style) {
-		height = style.getDimension("height", new DDpDimension(38));
 		aspectSelectorPaddingLeft = style.getDimension("aspectSelectorPaddingLeft", new DDpDimension(4));
 		aspectSelectorToToolbarSpacing = style.getDimension("aspectSelectorToToolbarSpacing", new DDpDimension(16));
 		toolbarTitleToControlsSpacing = style.getDimension("toolbarTitleToControlsSpacing", new DDpDimension(8));
 		aspectSelectorBottomSize = style.getDimension("aspectSelectorBottomSize", new DDpDimension(4));
 		backgroundColor = style.getColor("backgroundColor", 0xFFCCCCCC); // 0xFFF0F0F0
+		backgroundColorBottom = style.getColor("backgroundColorBottom", 0xFFEEEEEE);
 		foregroundColor = style.getColor("foregroundColor", 0xFFFFFFFF);
+		marginBottom = style.getDimension("marginBottom", new DDpDimension(2));
 		
 		aspectSelectorButtonSpacing = style.getDimension("aspectSelectorButtonSpacing", new DDpDimension(4));
 		
 		aspectBarShadow = style.getShadow("aspectBarShadow", context -> new DShadow(0xFF888888, 0, 0.5f * context.getScale(), 2 * context.getScale()));
 		aspectBarPaddingTop = style.getDimension("aspectBarPaddingTop", new DDpDimension(4));
 		
+		controlHeight = style.getDimension("controlHeight", new DDpDimension(28));
 		controlPaddingTop = style.getDimension("controlPaddingTop", new DDpDimension(2));
 		controlPaddingBottom = style.getDimension("controlPaddingBottom", new DDpDimension(2));
 		
@@ -63,5 +68,7 @@ public class AspectBarStyle {
 		windowControlSpacingBottom = style.getDimension("windowControlSpacingBottom", new DDpDimension(4));
 		//windowControlShadow = style.getShadow("windowControlShadow", context -> DShadow.NONE);
 		windowControlShadow = style.getShadow("windowControlShadow", context -> new DShadow(0x80888888, 0, 0, 2 * context.getScale()));
+		
+		height = aspectBarPaddingTop + controlPaddingTop + controlHeight + controlPaddingBottom + marginBottom;
 	}
 }

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/aspectbar/AspectBarView.java

@@ -153,6 +153,7 @@ public class AspectBarView extends BaseComponentGroup {
 	public void paint(DCanvas canvas) {
 		canvas.pushBounds(bounds);
 		canvas.fillRectangle(bounds.x, bounds.y, bounds.width, bounds.height, style.backgroundColor);
+		canvas.fillRectangle(bounds.x, bounds.y + bounds.height - style.marginBottom, bounds.width, style.marginBottom, style.backgroundColorBottom);
 		
 		for (DComponent button : selectorButtons) {
 			if (button.getBounds() == null)
@@ -164,11 +165,8 @@ public class AspectBarView extends BaseComponentGroup {
 		canvas.shadowPath(
 				aspectBarShape,
 				DTransform2D.IDENTITY,
+				style.foregroundColor,
 				style.aspectBarShadow);
-		canvas.fillPath(
-				aspectBarShape,
-				DTransform2D.IDENTITY,
-				style.foregroundColor);
 		
 		if (aspectBar.active.getValue() != null) {
 			int y = bounds.y
@@ -191,7 +189,7 @@ public class AspectBarView extends BaseComponentGroup {
 		}
 		
 		if (showWindowControls) {
-			canvas.shadowPath(windowControlsShape, DTransform2D.IDENTITY, style.windowControlShadow);
+			canvas.shadowPath(windowControlsShape, DTransform2D.IDENTITY, style.backgroundColor, style.windowControlShadow);
 			minimize.paint(canvas);
 			maximizeRestore.paint(canvas);
 			close.paint(canvas);
@@ -251,7 +249,7 @@ public class AspectBarView extends BaseComponentGroup {
 		for (DComponent component : selectorButtons) {
 			int width = component.getSizing().getValue().preferredWidth;
 			int height = component.getSizing().getValue().preferredHeight;
-			int y = bounds.y + (bounds.height - style.aspectSelectorBottomSize - height) / 2;
+			int y = bounds.y + (bounds.height - style.marginBottom - style.aspectSelectorBottomSize - height) / 2;
 			component.setBounds(new DIRectangle(x, y, width, height));
 			
 			x += width + style.aspectSelectorButtonSpacing;
@@ -327,7 +325,8 @@ public class AspectBarView extends BaseComponentGroup {
 		int toX = aspectSelectorEndX;
 		
 		aspectBarShape = tracer -> {
-			int baseY = bounds.y + bounds.height - style.aspectSelectorBottomSize;
+			int height = bounds.height - style.marginBottom;
+			int baseY = bounds.y + height - style.aspectSelectorBottomSize;
 			int barBaseX = toX + style.aspectSelectorToToolbarSpacing;
 			int barBaseY = bounds.y + style.aspectBarPaddingTop;
 			
@@ -355,8 +354,8 @@ public class AspectBarView extends BaseComponentGroup {
 				tracer.lineTo(bounds.x + bounds.width, bounds.y + style.aspectBarPaddingTop);
 			}
 			
-			tracer.lineTo(bounds.x + bounds.width, bounds.y + bounds.height);
-			tracer.lineTo(bounds.x, bounds.y + bounds.height);
+			tracer.lineTo(bounds.x + bounds.width, bounds.y + height);
+			tracer.lineTo(bounds.x, bounds.y + height);
 			tracer.close();
 		};
 		

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/editor/SourceEditor.java

@@ -29,6 +29,8 @@ import org.openzen.zenscript.lexer.ZSTokenParser;
 import org.openzen.zenscript.lexer.ZSTokenType;
 import org.openzen.drawablegui.DUIContext;
 import org.openzen.drawablegui.live.ImmutableLiveString;
+import org.openzen.drawablegui.live.InverseLiveBool;
+import org.openzen.drawablegui.live.LiveBool;
 import org.openzen.drawablegui.live.MutableLiveObject;
 import org.openzen.drawablegui.live.SimpleLiveBool;
 import org.openzen.drawablegui.style.DStyleClass;
@@ -75,19 +77,22 @@ public class SourceEditor implements DComponent {
 	private final IDEWindow window;
 	private final IDEAspectToolbar editToolbar = new IDEAspectToolbar(0, ShadedCodeIcon.BLUE, "Edit", "Source code editor");
 	
+	private final LiveBool updated;
+	
 	public SourceEditor(DStyleClass styleClass, IDEWindow window, IDESourceFile sourceFile) {
 		this.styleClass = styleClass;
 		this.window = window;
 		this.sourceFile = sourceFile;
 		
-		tokens = new TokenModel(sourceFile.getName(), tab.length());
+		tokens = new TokenModel(sourceFile.getName().getValue(), tab.length());
 		tokenListener = tokens.addListener(new TokenListener());
 		
 		editToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, ShadedSaveIcon.PURPLE, SaveIcon.GREY, unchanged, new ImmutableLiveString("Save file"), e -> save()));
+		updated = new InverseLiveBool(unchanged);
 		
 		try {
 			TokenParser<ZSToken, ZSTokenType> parser = ZSTokenParser.createRaw(
-					sourceFile.getName(),
+					sourceFile.getName().getValue(),
 					new ReaderCharReader(sourceFile.read()),
 					tab.length());
 			tokens.set(parser);
@@ -96,6 +101,10 @@ public class SourceEditor implements DComponent {
 		}
 	}
 	
+	public LiveBool isUpdated() {
+		return updated;
+	}
+	
 	@Override
 	public void onMounted() {
 		window.aspectBar.toolbars.add(editToolbar);

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/output/BasicOutputSpan.java

@@ -0,0 +1,23 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.zenscript.ide.ui.view.output;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class BasicOutputSpan implements OutputSpan {
+	private final String value;
+	
+	public BasicOutputSpan(String value) {
+		this.value = value;
+	}
+	
+	@Override
+	public String toString() {
+		return value;
+	}
+}

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/output/ErrorOutputSpan.java

@@ -0,0 +1,23 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.zenscript.ide.ui.view.output;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ErrorOutputSpan implements OutputSpan {
+	private final String value;
+	
+	public ErrorOutputSpan(String value) {
+		this.value = value;
+	}
+	
+	@Override
+	public String toString() {
+		return value;
+	}
+}

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/output/OutputLine.java

@@ -0,0 +1,26 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.zenscript.ide.ui.view.output;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class OutputLine {
+	public final OutputSpan[] spans;
+	
+	public OutputLine(OutputSpan[] spans) {
+		this.spans = spans;
+	}
+	
+	@Override
+	public String toString() {
+		StringBuilder result = new StringBuilder();
+		for (OutputSpan span : spans)
+			result.append(span.toString());
+		return result.toString();
+	}
+}

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/output/OutputSpan.java

@@ -0,0 +1,14 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.zenscript.ide.ui.view.output;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface OutputSpan {
+	
+}

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/output/OutputView.java

@@ -0,0 +1,20 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.zenscript.ide.ui.view.output;
+
+import org.openzen.drawablegui.live.LiveList;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class OutputView {
+	public final LiveList<OutputLine> lines;
+	
+	public OutputView(LiveList<OutputLine> lines) {
+		this.lines = lines;
+	}
+}

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/project/LibraryTreeNode.java

@@ -20,10 +20,10 @@ public class LibraryTreeNode extends ProjectOverviewNode {
 	private final IDELibrary library;
 	private final LiveList<ProjectOverviewNode> modules;
 	
-	public LibraryTreeNode(IDEWindow window, IDELibrary library) {
+	public LibraryTreeNode(ProjectBrowser browser, IDELibrary library) {
 		this.library = library;
 		
-		modules = new LiveMappedList<>(library.getModules(), module -> new ModuleTreeNode(window, module));
+		modules = new LiveMappedList<>(library.getModules(), module -> new ModuleTreeNode(browser, module));
 	}
 	
 	@Override

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/project/ModuleTreeNode.java

@@ -16,8 +16,8 @@ import org.openzen.zenscript.ide.ui.icons.ModuleIcon;
  * @author Hoofdgebruiker
  */
 public class ModuleTreeNode extends PackageTreeNode {
-	public ModuleTreeNode(IDEWindow window, IDEModule module) {
-		super(window, module.getRootPackage());
+	public ModuleTreeNode(ProjectBrowser projectBrowser, IDEModule module) {
+		super(projectBrowser, module.getRootPackage());
 		
 		init(module);
 	}
@@ -39,7 +39,7 @@ public class ModuleTreeNode extends PackageTreeNode {
 	
 	@Override
 	public void onMouseClick(DMouseEvent e) {
-		window.setContextModule(module);
+		browser.setContextModule(module);
 	}
 
 	@Override

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/project/PackageTreeNode.java

@@ -12,7 +12,6 @@ import org.openzen.drawablegui.live.LiveList;
 import org.openzen.drawablegui.live.LiveMappedList;
 import org.openzen.zenscript.ide.host.IDEModule;
 import org.openzen.zenscript.ide.host.IDEPackage;
-import org.openzen.zenscript.ide.ui.IDEWindow;
 import org.openzen.zenscript.ide.ui.icons.FolderIcon;
 
 /**
@@ -20,18 +19,18 @@ import org.openzen.zenscript.ide.ui.icons.FolderIcon;
  * @author Hoofdgebruiker
  */
 public class PackageTreeNode extends ProjectOverviewNode {
-	protected final IDEWindow window;
+	protected final ProjectBrowser browser;
 	protected IDEModule module;
 	private final IDEPackage pkg;
 	private LiveList<ProjectOverviewNode> contents;
 	
-	public PackageTreeNode(IDEWindow window, IDEPackage pkg) {
-		this.window = window;
+	public PackageTreeNode(ProjectBrowser browser, IDEPackage pkg) {
+		this.browser = browser;
 		this.pkg = pkg;
 	}
 	
-	public PackageTreeNode(IDEWindow window, IDEModule module, IDEPackage pkg) {
-		this.window = window;
+	public PackageTreeNode(ProjectBrowser browser, IDEModule module, IDEPackage pkg) {
+		this.browser = browser;
 		this.module = module;
 		this.pkg = pkg;
 		
@@ -41,8 +40,8 @@ public class PackageTreeNode extends ProjectOverviewNode {
 	protected final void init(IDEModule module) {
 		this.module = module;
 		contents = new LiveConcatList<>(
-				new LiveMappedList<>(pkg.getSubPackages(), sub -> new PackageTreeNode(window, module, sub)),
-				new LiveMappedList<>(pkg.getSourceFiles(), source -> new SourceFileTreeNode(window, source))
+				new LiveMappedList<>(pkg.getSubPackages(), sub -> new PackageTreeNode(browser, module, sub)),
+				new LiveMappedList<>(pkg.getSourceFiles(), source -> new SourceFileTreeNode(browser, source))
 		);
 	}
 	
@@ -78,6 +77,6 @@ public class PackageTreeNode extends ProjectOverviewNode {
 	
 	@Override
 	public void onMouseClick(DMouseEvent e) {
-		window.setContextPackage(module, pkg);
+		browser.setContextPackage(module, pkg);
 	}
 }

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/project/ProjectBrowser.java

@@ -0,0 +1,132 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.zenscript.ide.ui.view.project;
+
+import org.openzen.drawablegui.DComponent;
+import org.openzen.drawablegui.layout.DHorizontalLayout;
+import org.openzen.drawablegui.DSizing;
+import org.openzen.drawablegui.layout.DVerticalLayout;
+import org.openzen.drawablegui.border.DEmptyBorder;
+import org.openzen.drawablegui.border.DPaddedBorder;
+import org.openzen.drawablegui.live.ImmutableLiveString;
+import org.openzen.drawablegui.live.LiveBool;
+import org.openzen.drawablegui.live.LivePredicateBool;
+import org.openzen.drawablegui.live.MutableLiveObject;
+import org.openzen.drawablegui.live.SimpleLiveObject;
+import org.openzen.drawablegui.scroll.DScrollPane;
+import org.openzen.drawablegui.style.DShadow;
+import org.openzen.drawablegui.style.DStyleClass;
+import org.openzen.drawablegui.style.DStylesheetBuilder;
+import org.openzen.drawablegui.tree.DTreeView;
+import org.openzen.drawablegui.tree.DTreeViewStyle;
+import org.openzen.zenscript.ide.host.DevelopmentHost;
+import org.openzen.zenscript.ide.host.IDEModule;
+import org.openzen.zenscript.ide.host.IDEPackage;
+import org.openzen.zenscript.ide.host.IDESourceFile;
+import org.openzen.zenscript.ide.ui.IDEWindow;
+import org.openzen.zenscript.ide.ui.dialog.CreatePackageDialog;
+import org.openzen.zenscript.ide.ui.dialog.CreateSourceFileDialog;
+import org.openzen.zenscript.ide.ui.icons.AddBoxIcon;
+import org.openzen.zenscript.ide.ui.view.IconButtonControl;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ProjectBrowser {
+	public final IDEWindow window;
+	public final DComponent view;
+	
+	public final MutableLiveObject<IDEModule> contextModule = new SimpleLiveObject<>(null);
+	public final MutableLiveObject<IDEPackage> contextPackage = new SimpleLiveObject<>(null);
+	public final MutableLiveObject<IDESourceFile> contextFile = new SimpleLiveObject<>(null);
+	public final LiveBool addContentDisabled = new LivePredicateBool(contextPackage, pkg -> pkg == null);
+	
+	public ProjectBrowser(IDEWindow window, DevelopmentHost host) {
+		this.window = window;
+		
+		DStyleClass minimalButtonPadding = DStyleClass.inline(new DStylesheetBuilder()
+				.dimensionDp("margin", 3)
+				.dimensionDp("padding", 0)
+				.build());
+		
+		IconButtonControl addPackageButton = new IconButtonControl(
+				minimalButtonPadding,
+				AddBoxIcon.BLUE,
+				AddBoxIcon.GRAY,
+				addContentDisabled,
+				new ImmutableLiveString("Create package"),
+				e -> {
+					CreatePackageDialog dialog = new CreatePackageDialog(contextModule.getValue(), contextPackage.getValue());
+					dialog.open(e.window);
+				});
+		IconButtonControl addFileButton = new IconButtonControl(
+				minimalButtonPadding,
+				AddBoxIcon.ORANGE,
+				AddBoxIcon.GRAY,
+				addContentDisabled,
+				new ImmutableLiveString("Create source file"),
+				e -> {
+					CreateSourceFileDialog dialog = new CreateSourceFileDialog(window, contextModule.getValue(), contextPackage.getValue());
+					dialog.open(e.window);
+				});
+		
+		DHorizontalLayout toolbar = new DHorizontalLayout(
+				DStyleClass.inline(new DStylesheetBuilder()
+						.border("border", context -> new DPaddedBorder(0, context.dp(2), 0, 0))
+						.dimensionPx("spacing", 0)
+						.build()),
+				DHorizontalLayout.Alignment.LEFT,
+				new DHorizontalLayout.Element(addPackageButton, 0, 0, DHorizontalLayout.ElementAlignment.TOP),
+				new DHorizontalLayout.Element(addFileButton, 0, 0, DHorizontalLayout.ElementAlignment.TOP));
+		DTreeView projectTree = new DTreeView(
+				DTreeViewStyle.DEFAULT,
+				new RootTreeNode(this, host), false);
+		projectTree.getSizing().setValue(new DSizing(500, 500));
+		
+		view = new DVerticalLayout(
+				DStyleClass.inline(new DStylesheetBuilder()
+						.border("border", DEmptyBorder.ELEMENT)
+						.dimensionPx("spacing", 0)
+						.marginDp("margin", 3)
+						.dimensionDp("cornerRadius", 2)
+						.color("backgroundColor", 0xFFFFFFFF)
+						.shadow("shadow", context -> new DShadow(0xFF888888, 0, 0.5f * context.getScale(), 3 * context.getScale()))
+						.build()),
+				DVerticalLayout.Alignment.TOP,
+				new DVerticalLayout.Element(toolbar, 0, 0, DVerticalLayout.ElementAlignment.STRETCH),
+				new DVerticalLayout.Element(new DScrollPane(DStyleClass.forId("projectView"), projectTree), 1, 1, DVerticalLayout.ElementAlignment.STRETCH));
+	}
+	
+	public void setContextModule(IDEModule module) {
+		contextModule.setValue(module);
+		contextPackage.setValue(module.getRootPackage());
+		contextFile.setValue(null);
+	}
+	
+	public void setContextPackage(IDEModule module, IDEPackage pkg) {
+		contextModule.setValue(module);
+		contextPackage.setValue(pkg);
+		contextFile.setValue(null);
+	}
+	
+	public void setContextFile(IDESourceFile file) {
+		contextModule.setValue(null);
+		contextPackage.setValue(null);
+		contextFile.setValue(file);
+	}
+	
+	public void setContextProject() {
+		contextModule.setValue(null);
+		contextPackage.setValue(null);
+		contextFile.setValue(null);
+		window.aspectBar.active.setValue(window.projectToolbar);
+	}
+	
+	public void open(IDESourceFile file) {
+		window.open(file);
+	}
+}

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/project/ProjectTreeNode.java

@@ -10,7 +10,6 @@ import org.openzen.drawablegui.DMouseEvent;
 import org.openzen.drawablegui.live.LiveList;
 import org.openzen.drawablegui.live.LiveMappedList;
 import org.openzen.zenscript.ide.host.DevelopmentHost;
-import org.openzen.zenscript.ide.ui.IDEWindow;
 import org.openzen.zenscript.ide.ui.icons.ProjectIcon;
 
 /**
@@ -18,15 +17,15 @@ import org.openzen.zenscript.ide.ui.icons.ProjectIcon;
  * @author Hoofdgebruiker
  */
 public class ProjectTreeNode extends ProjectOverviewNode {
-	private final IDEWindow window;
+	private final ProjectBrowser browser;
 	private final DevelopmentHost host;
 	private final LiveList<ProjectOverviewNode> modules;
 	
-	public ProjectTreeNode(IDEWindow window, DevelopmentHost host) {
-		this.window = window;
+	public ProjectTreeNode(ProjectBrowser browser, DevelopmentHost host) {
+		this.browser = browser;
 		this.host = host;
 		
-		modules = new LiveMappedList<>(host.getModules(), module -> new ModuleTreeNode(window, module));
+		modules = new LiveMappedList<>(host.getModules(), module -> new ModuleTreeNode(browser, module));
 	}
 	
 	@Override
@@ -61,6 +60,6 @@ public class ProjectTreeNode extends ProjectOverviewNode {
 	
 	@Override
 	public void onMouseClick(DMouseEvent e) {
-		window.aspectBar.active.setValue(window.projectToolbar);
+		browser.setContextProject();
 	}
 }

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/project/RootTreeNode.java

@@ -10,7 +10,6 @@ import org.openzen.drawablegui.live.LiveList;
 import org.openzen.drawablegui.live.LiveMappedList;
 import org.openzen.drawablegui.live.LivePrefixedList;
 import org.openzen.zenscript.ide.host.DevelopmentHost;
-import org.openzen.zenscript.ide.ui.IDEWindow;
 import org.openzen.zenscript.ide.ui.icons.ProjectIcon;
 
 /**
@@ -21,12 +20,12 @@ public class RootTreeNode extends ProjectOverviewNode {
 	private final DevelopmentHost host;
 	private final LiveList<ProjectOverviewNode> children;
 	
-	public RootTreeNode(IDEWindow window, DevelopmentHost host) {
+	public RootTreeNode(ProjectBrowser browser, DevelopmentHost host) {
 		this.host = host;
 		
 		children = new LivePrefixedList<>(
-				new ProjectTreeNode(window, host),
-				new LiveMappedList<>(host.getLibraries(), library -> new LibraryTreeNode(window, library)));
+				new ProjectTreeNode(browser, host),
+				new LiveMappedList<>(host.getLibraries(), library -> new LibraryTreeNode(browser, library)));
 	}
 	
 	@Override

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/project/SourceFileTreeNode.java

@@ -10,7 +10,6 @@ import org.openzen.drawablegui.DMouseEvent;
 import org.openzen.drawablegui.live.LiveEmptyList;
 import org.openzen.drawablegui.live.LiveList;
 import org.openzen.zenscript.ide.host.IDESourceFile;
-import org.openzen.zenscript.ide.ui.IDEWindow;
 import org.openzen.zenscript.ide.ui.icons.CodeIcon;
 
 /**
@@ -18,11 +17,11 @@ import org.openzen.zenscript.ide.ui.icons.CodeIcon;
  * @author Hoofdgebruiker
  */
 public class SourceFileTreeNode extends ProjectOverviewNode {
-	private final IDEWindow window;
+	private final ProjectBrowser browser;
 	private final IDESourceFile sourceFile;
 	
-	public SourceFileTreeNode(IDEWindow window, IDESourceFile sourceFile) {
-		this.window = window;
+	public SourceFileTreeNode(ProjectBrowser browser, IDESourceFile sourceFile) {
+		this.browser = browser;
 		this.sourceFile = sourceFile;
 	}
 	
@@ -43,7 +42,7 @@ public class SourceFileTreeNode extends ProjectOverviewNode {
 
 	@Override
 	public String getTitle() {
-		return sourceFile.getName();
+		return sourceFile.getName().getValue(); // TODO: live strings for node names
 	}
 
 	@Override
@@ -58,9 +57,9 @@ public class SourceFileTreeNode extends ProjectOverviewNode {
 	
 	@Override
 	public void onMouseClick(DMouseEvent e) {
-		window.setContextFile(sourceFile);
+		browser.setContextFile(sourceFile);
 		if (e.isDoubleClick()) {
-			window.open(sourceFile);
+			browser.open(sourceFile);
 		}
 	}
 }