- Continued work on borderless window (but: text rendering changes!)

- Improved shadow code

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

@@ -6,6 +6,7 @@
 package org.openzen.drawablegui;
 
 import org.openzen.drawablegui.listeners.DIRectangle;
+import org.openzen.drawablegui.style.DShadow;
 
 /**
  *
@@ -50,12 +51,9 @@ public interface DCanvas {
 	 * 
 	 * @param path
 	 * @param transform
-	 * @param color
-	 * @param dx
-	 * @param dy
-	 * @param radius 
+	 * @param shadow
 	 */
-	void shadowPath(DPath path, DTransform2D transform, int color, float dx, float dy, float radius);
+	void shadowPath(DPath path, DTransform2D transform, DShadow shadow);
 	
 	/**
 	 * Fills a rectangle.

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

@@ -34,6 +34,16 @@ public interface DPath {
 		};
 	}
 	
+	public static DPath rectangle(float x, float y, float width, float height) {
+		return tracer -> {
+			tracer.moveTo(x, y);
+			tracer.lineTo(x + width, y);
+			tracer.lineTo(x + width, y + height);
+			tracer.lineTo(x, y + height);
+			tracer.close();
+		};
+	}
+	
 	public static DPath roundedRectangle(float x, float y, float width, float height, float radius) {
 		return tracer -> {
 			float c = radius - radius * 0.551915024494f;

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

@@ -6,6 +6,7 @@
 package org.openzen.drawablegui;
 
 import org.openzen.drawablegui.listeners.DIRectangle;
+import org.openzen.drawablegui.live.LiveObject;
 import org.openzen.drawablegui.style.DStyleSheets;
 
 /**
@@ -35,6 +36,8 @@ public interface DUIContext {
 	
 	DFontMetrics getFontMetrics(DFont font);
 	
+	DUIWindow getWindow();
+		
 	enum Cursor {
 		NORMAL,
 		HAND,

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

@@ -0,0 +1,35 @@
+/*
+ * 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;
+
+import org.openzen.drawablegui.live.LiveBool;
+import org.openzen.drawablegui.live.LiveObject;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface DUIWindow {
+	public boolean hasTitleBar();
+	
+	public void close();
+	
+	public void maximize();
+	
+	public void restore();
+	
+	public void minimize();
+	
+	LiveObject<State> getWindowState();
+	
+	LiveBool getActive();
+	
+	enum State {
+		NORMAL,
+		MAXIMIZED,
+		MINIMIZED
+	};
+}

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

@@ -0,0 +1,184 @@
+/*
+ * 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.DComponent;
+import org.openzen.drawablegui.DDimensionPreferences;
+import org.openzen.drawablegui.DMouseEvent;
+import org.openzen.drawablegui.DPath;
+import org.openzen.drawablegui.DTransform2D;
+import org.openzen.drawablegui.DUIContext;
+import org.openzen.drawablegui.DUIWindow;
+import org.openzen.drawablegui.listeners.DIRectangle;
+import org.openzen.drawablegui.listeners.ListenerHandle;
+import org.openzen.drawablegui.live.ImmutableLiveObject;
+import org.openzen.drawablegui.live.LiveBool;
+import org.openzen.drawablegui.live.LiveObject;
+import org.openzen.drawablegui.style.DStyleClass;
+import org.openzen.drawablegui.style.DStylePath;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class DCustomWindowBorder implements DComponent {
+	private final DStyleClass styleClass;
+	private final DComponent content;
+	private final LiveObject<DDimensionPreferences> preferences = new ImmutableLiveObject<>(DDimensionPreferences.EMPTY);
+	
+	private DUIContext context;
+	private DCustomWindowBorderStyle style;
+	private DIRectangle bounds;
+	private DPath border;
+	
+	private LiveBool active;
+	private LiveObject<DUIWindow.State> state;
+	
+	private ListenerHandle<LiveObject.Listener<DUIWindow.State>> stateListener;
+	private ListenerHandle<LiveBool.Listener> activeListener;
+	
+	public DCustomWindowBorder(DStyleClass styleClass, DComponent content) {
+		this.styleClass = styleClass;
+		this.content = content;
+	}
+
+	@Override
+	public void setContext(DStylePath parent, DUIContext context) {
+		this.context = context;
+		content.setContext(parent, context);
+		
+		state = context.getWindow().getWindowState();
+		active = context.getWindow().getActive();
+		stateListener = state.addListener(this::onStateChanged);
+		activeListener = active.addListener(this::onActiveChanged);
+		
+		DStylePath path = parent.getChild("customwindowborder", styleClass);
+		style = new DCustomWindowBorderStyle(context.getStylesheets().get(context, path));
+		
+		if (bounds != null)
+			layout();
+	}
+
+	@Override
+	public LiveObject<DDimensionPreferences> getDimensionPreferences() {
+		return preferences;
+	}
+
+	@Override
+	public DIRectangle getBounds() {
+		return bounds;
+	}
+
+	@Override
+	public void setBounds(DIRectangle bounds) {
+		this.bounds = bounds;
+		layout();
+	}
+	
+	private void layout() {	
+		if (style == null)
+			return;
+		
+		if (state.getValue() != DUIWindow.State.MAXIMIZED) {
+			border = DPath.rectangle(
+				bounds.x + style.padding,
+				bounds.y + style.padding,
+				bounds.width - 2 * style.padding - style.borderWidth,
+				bounds.height - 2 * style.padding - style.borderWidth);
+			
+			int spacing = style.borderWidth + style.padding;
+			DIRectangle inner = new DIRectangle(
+					bounds.x + spacing,
+					bounds.y + spacing,
+					bounds.width - 2 * spacing,
+					bounds.height - 2 * spacing);
+
+			content.setBounds(inner);
+		} else {
+			content.setBounds(bounds);
+		}
+		context.repaint(bounds);
+	}
+
+	@Override
+	public void paint(DCanvas canvas) {
+		if (state.getValue() != DUIWindow.State.MAXIMIZED) {
+			int spacing = style.borderWidth + style.padding;
+			DIRectangle canvasBounds = canvas.getBounds();
+			if (canvasBounds == null
+					|| canvasBounds.x < bounds.x + spacing
+					|| 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.strokePath(
+						border,
+						DTransform2D.IDENTITY,
+						active.getValue() ? style.focusedBorderColor : style.inactiveBorderColor,
+						style.borderWidth);
+			}
+		} else {
+			canvas.fillRectangle(bounds.x, bounds.y, bounds.width, bounds.height, style.backgroundColor);
+		}
+		
+		content.paint(canvas);
+	}
+
+	@Override
+	public void onMouseEnter(DMouseEvent e) {
+		content.onMouseEnter(e);
+	}
+	
+	@Override
+	public void onMouseExit(DMouseEvent e) {
+		content.onMouseExit(e);
+	}
+	
+	@Override
+	public void onMouseMove(DMouseEvent e) {
+		content.onMouseMove(e);
+	}
+	
+	@Override
+	public void onMouseDrag(DMouseEvent e) {
+		content.onMouseDrag(e);
+	}
+	
+	@Override
+	public void onMouseClick(DMouseEvent e) {
+		content.onMouseClick(e);
+	}
+	
+	@Override
+	public void onMouseDown(DMouseEvent e) {
+		content.onMouseDown(e);
+	}
+	
+	@Override
+	public void onMouseRelease(DMouseEvent e) {
+		content.onMouseRelease(e);
+	}
+	
+	@Override
+	public void onMouseScroll(DMouseEvent e) {
+		content.onMouseScroll(e);
+	}
+	
+	@Override
+	public void close() {
+		
+	}
+	
+	private void onStateChanged(DUIWindow.State oldValue, DUIWindow.State newValue) {
+		layout();
+	}
+	
+	private void onActiveChanged(boolean oldValue, boolean newValue) {
+		context.repaint(bounds);
+	}
+}

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

@@ -0,0 +1,35 @@
+/*
+ * 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.style.DDpDimension;
+import org.openzen.drawablegui.style.DPxDimension;
+import org.openzen.drawablegui.style.DShadow;
+import org.openzen.drawablegui.style.DStyleDefinition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class DCustomWindowBorderStyle {
+	public final int padding;
+	public final DShadow shadow;
+	public final int borderWidth;
+	public final int backgroundColor;
+	
+	public final int focusedBorderColor;
+	public final int inactiveBorderColor;
+	
+	public DCustomWindowBorderStyle(DStyleDefinition style) {
+		padding = style.getDimension("padding", new DDpDimension(8));
+		shadow = style.getShadow("shadow", context -> new DShadow(0x80888888, 0, 0, 6 * context.getScale()));
+		borderWidth = style.getDimension("borderWidth", new DPxDimension(1));
+		backgroundColor = style.getColor("backgroundColor", 0xFFEEEEEE);
+		
+		focusedBorderColor = style.getColor("focusedBorderColor", 0xFF18B0FB);
+		inactiveBorderColor = style.getColor("inactiveBorderColor", 0xFF515252);
+	}
+}

DrawableGui/src/main/java/org/openzen/drawablegui/live/ImmutableLiveBool.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.live;
+
+import org.openzen.drawablegui.listeners.DummyListenerHandle;
+import org.openzen.drawablegui.listeners.ListenerHandle;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ImmutableLiveBool implements LiveBool {
+	public static final ImmutableLiveBool TRUE = new ImmutableLiveBool(true);
+	public static final ImmutableLiveBool FALSE = new ImmutableLiveBool(false);
+	
+	private final boolean value;
+	
+	private ImmutableLiveBool(boolean value) {
+		this.value = value;
+	}
+
+	@Override
+	public boolean getValue() {
+		return value;
+	}
+
+	@Override
+	public void setValue(boolean value) {
+		throw new UnsupportedOperationException("Cannot modify an immutable value");
+	}
+
+	@Override
+	public ListenerHandle<Listener> addListener(Listener listener) {
+		return new DummyListenerHandle<>(listener);
+	}
+}

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

@@ -6,33 +6,21 @@
 package org.openzen.drawablegui.live;
 
 import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.listeners.ListenerList;
 
 /**
  *
  * @author Hoofdgebruiker
  */
-public class LiveBool {
-	private final ListenerList<Listener> listeners = new ListenerList<>();
-	private boolean value;
+public interface LiveBool {
+	public boolean getValue();
 	
-	public boolean getValue() {
-		return value;
-	}
-	
-	public void setValue(boolean value) {
-		boolean oldValue = this.value;
-		this.value = value;
-		listeners.accept(listener -> listener.onChanged(oldValue, value));
-	}
+	public void setValue(boolean value);
 	
-	public void toggle() {
-		setValue(!value);
+	default void toggle() {
+		setValue(!getValue());
 	}
 	
-	public ListenerHandle<Listener> addListener(Listener listener) {
-		return listeners.add(listener);
-	}
+	public ListenerHandle<Listener> addListener(Listener listener);
 	
 	public interface Listener {
 		void onChanged(boolean oldValue, boolean newValue);

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

@@ -0,0 +1,64 @@
+/*
+ * 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 java.io.Closeable;
+import java.util.function.Predicate;
+import org.openzen.drawablegui.listeners.ListenerHandle;
+import org.openzen.drawablegui.listeners.ListenerList;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class LivePredicateBool<T> implements LiveBool, Closeable, LiveObject.Listener<T> {
+	private final ListenerList<LiveBool.Listener> listeners = new ListenerList<>();
+	private final LiveObject<T> source;
+	private final Predicate<T> predicate;
+	private final ListenerHandle<LiveObject.Listener<T>> sourceListener;
+	private boolean value;
+	
+	public LivePredicateBool(LiveObject<T> source, Predicate<T> predicate) {
+		this.source = source;
+		this.predicate = predicate;
+		this.sourceListener = source.addListener(this);
+		setValueInternal(predicate.test(source.getValue()));
+	}
+	
+	@Override
+	public void close() {
+		sourceListener.close();
+	}
+	
+	@Override
+	public void setValue(boolean value) {
+		throw new UnsupportedOperationException("Cannot modify a calculated value");
+	}
+
+	@Override
+	public boolean getValue() {
+		return value;
+	}
+
+	@Override
+	public ListenerHandle<Listener> addListener(Listener listener) {
+		return listeners.add(listener);
+	}
+	
+	private void setValueInternal(boolean value) {
+		if (value == this.value)
+			return;
+		
+		boolean oldValue = this.value;
+		this.value = value;
+		listeners.accept(listener -> listener.onChanged(oldValue, value));
+	}
+
+	@Override
+	public void onUpdated(T oldValue, T newValue) {
+		setValueInternal(predicate.test(newValue));
+	}
+}

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

@@ -0,0 +1,46 @@
+/*
+ * 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;
+import org.openzen.drawablegui.listeners.ListenerList;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class SimpleLiveBool implements LiveBool {
+	private final ListenerList<LiveBool.Listener> listeners = new ListenerList<>();
+	private boolean value;
+	
+	public SimpleLiveBool() {
+		this(false);
+	}
+	
+	public SimpleLiveBool(boolean value) {
+		this.value = value;
+	}
+	
+	@Override
+	public boolean getValue() {
+		return value;
+	}
+	
+	@Override
+	public void setValue(boolean value) {
+		if (value == this.value)
+			return;
+		
+		boolean oldValue = this.value;
+		this.value = value;
+		listeners.accept(listener -> listener.onChanged(oldValue, value));
+	}
+	
+	@Override
+	public ListenerHandle<LiveBool.Listener> addListener(LiveBool.Listener listener) {
+		return listeners.add(listener);
+	}
+}

DrawableGui/src/main/java/org/openzen/drawablegui/scroll/DScrollBarStyle.java

@@ -5,8 +5,8 @@
  */
 package org.openzen.drawablegui.scroll;
 
-import org.openzen.drawablegui.dimension.DDimension;
-import org.openzen.drawablegui.dimension.DDpDimension;
+import org.openzen.drawablegui.style.DDimension;
+import org.openzen.drawablegui.style.DDpDimension;
 import org.openzen.drawablegui.DUIContext;
 import org.openzen.drawablegui.style.DStyleDefinition;
 

DrawableGui/src/main/java/org/openzen/drawablegui/scroll/DScrollPane.java

@@ -19,6 +19,7 @@ import org.openzen.drawablegui.live.LiveInt;
 import org.openzen.drawablegui.live.LiveObject;
 import org.openzen.drawablegui.live.SimpleLiveInt;
 import org.openzen.drawablegui.DUIContext;
+import org.openzen.drawablegui.DUIWindow;
 import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.drawablegui.style.DStylePath;
 import org.openzen.drawablegui.style.DStyleSheets;
@@ -283,6 +284,11 @@ public class DScrollPane implements DComponent {
 		public DClipboard getClipboard() {
 			return context.getClipboard();
 		}
+
+		@Override
+		public DUIWindow getWindow() {
+			return context.getWindow();
+		}
 	}
 	
 	private class ScrollListener implements LiveInt.Listener {

DrawableGui/src/main/java/org/openzen/drawablegui/dimension/DDimension.java → DrawableGui/src/main/java/org/openzen/drawablegui/style/DDimension.java

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

DrawableGui/src/main/java/org/openzen/drawablegui/dimension/DDpDimension.java → DrawableGui/src/main/java/org/openzen/drawablegui/style/DDpDimension.java

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

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

@@ -9,7 +9,6 @@ import java.util.function.Function;
 import org.openzen.drawablegui.DFont;
 import org.openzen.drawablegui.DUIContext;
 import org.openzen.drawablegui.border.DBorder;
-import org.openzen.drawablegui.dimension.DDimension;
 
 /**
  *
@@ -37,6 +36,11 @@ public class DEmptyStyleDefinition implements DStyleDefinition {
 		return defaultValue;
 	}
 
+	@Override
+	public DShadow getShadow(String name, Function<DUIContext, DShadow> defaultValue) {
+		return defaultValue.apply(context);
+	}
+
 	@Override
 	public DFont getFont(String name, Function<DUIContext, DFont> defaultValue) {
 		return defaultValue.apply(context);

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

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

DrawableGui/src/main/java/org/openzen/drawablegui/style/DShadow.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.drawablegui.style;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class DShadow {
+	public static final DShadow NONE = new DShadow(0, 0, 0, 0);
+	
+	public final int color;
+	public final float offsetX;
+	public final float offsetY;
+	public final float radius;
+	
+	public DShadow(int color, float offsetX, float offsetY, float radius) {
+		this.color = color;
+		this.offsetX = offsetX;
+		this.offsetY = offsetY;
+		this.radius = radius;
+	}
+}

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

@@ -9,7 +9,6 @@ import java.util.function.Function;
 import org.openzen.drawablegui.DFont;
 import org.openzen.drawablegui.DUIContext;
 import org.openzen.drawablegui.border.DBorder;
-import org.openzen.drawablegui.dimension.DDimension;
 
 /**
  *
@@ -22,6 +21,8 @@ public interface DStyleDefinition {
 	
 	public int getColor(String name, int defaultValue);
 	
+	public DShadow getShadow(String name, Function<DUIContext, DShadow> defaultValue);
+	
 	public DFont getFont(String name, Function<DUIContext, DFont> defaultValue);
 	
 	public DBorder getBorder(String name, Function<DUIContext, DBorder> defaultValue);

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

@@ -25,6 +25,7 @@ import org.openzen.drawablegui.listeners.DIRectangle;
 import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DPathBoundsCalculator;
 import org.openzen.drawablegui.DUIContext;
+import org.openzen.drawablegui.style.DShadow;
 
 /**
  *
@@ -91,6 +92,9 @@ public class SwingCanvas implements DCanvas {
 
 	@Override
 	public void strokePath(DPath path, DTransform2D transform, int color, float lineWidth) {
+		if (color == 0)
+			return;
+		
 		AffineTransform old = g.getTransform();
 		GeneralPath jPath = context.getPath(path);
 		g.setColor(new Color(color, true));
@@ -102,6 +106,9 @@ public class SwingCanvas implements DCanvas {
 
 	@Override
 	public void fillPath(DPath path, DTransform2D transform, int color) {
+		if (color == 0)
+			return;
+		
 		AffineTransform old = g.getTransform();
 		GeneralPath jPath = context.getPath(path);
 		g.setColor(new Color(color, true));
@@ -111,9 +118,17 @@ public class SwingCanvas implements DCanvas {
 	}
 
 	@Override
-	public void shadowPath(DPath path, DTransform2D transform, int color, float dx, float dy, float radius) {
-		DIRectangle bounds = DPathBoundsCalculator.getBounds(path, transform.offset(dx, dy));
-		int offset = 2 * (int)Math.ceil(radius);
+	public void shadowPath(DPath path, DTransform2D transform, DShadow shadow) {
+		if (shadow.color == 0)
+			return;
+		
+		if (shadow.radius == 0) {
+			fillPath(path, transform, shadow.color);
+			return;
+		}
+		
+		DIRectangle bounds = DPathBoundsCalculator.getBounds(path, transform.offset(shadow.offsetX, shadow.offsetY));
+		int offset = 2 * (int)Math.ceil(shadow.radius);
 		
 		GeneralPath jPath = context.getPath(path);
 		
@@ -121,17 +136,20 @@ public class SwingCanvas implements DCanvas {
 		Graphics2D imageG = (Graphics2D) image.getGraphics();
 		
 		imageG.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-		imageG.setColor(new Color(color, true));
-		imageG.setTransform(getTransform(transform.offset(offset + dx - bounds.x, offset + dy - bounds.y)));
+		imageG.setColor(new Color(shadow.color, true));
+		imageG.setTransform(getTransform(transform.offset(offset + shadow.offsetX - bounds.x, offset + shadow.offsetY - bounds.y)));
 		imageG.fill(jPath);
 		
-		image = getGaussianBlurFilter((int)Math.ceil(radius), true).filter(image, null);
-		image = getGaussianBlurFilter((int)Math.ceil(radius), false).filter(image, null);
+		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);
 	}
 
 	@Override
 	public void fillRectangle(int x, int y, int width, int height, int color) {
+		if (color == 0)
+			return;
+		
 		g.setColor(new Color(color, true));
 		g.fillRect(x, y, width, height);
 	}

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

@@ -18,6 +18,7 @@ import org.openzen.drawablegui.DFontMetrics;
 import org.openzen.drawablegui.DPathTracer;
 import org.openzen.drawablegui.DTimerHandle;
 import org.openzen.drawablegui.DUIContext;
+import org.openzen.drawablegui.DUIWindow;
 import org.openzen.drawablegui.style.DStyleSheets;
 
 /**
@@ -31,6 +32,7 @@ public class SwingGraphicsContext implements DUIContext {
 	private final SwingRoot root;
 	private final JavaClipboard clipboard = new JavaClipboard();
 	private Graphics graphics;
+	private DUIWindow window;
 	
 	public SwingGraphicsContext(DStyleSheets stylesheets, float scale, SwingRoot root) {
 		this.stylesheets = stylesheets;
@@ -48,6 +50,10 @@ public class SwingGraphicsContext implements DUIContext {
 		return generalPath;
 	}
 	
+	public void setWindow(DUIWindow window) {
+		this.window = window;
+	}
+	
 	@Override
 	public DStyleSheets getStylesheets() {
 		return stylesheets;
@@ -125,6 +131,11 @@ public class SwingGraphicsContext implements DUIContext {
 	public DClipboard getClipboard() {
 		return clipboard;
 	}
+
+	@Override
+	public DUIWindow getWindow() {
+		return window;
+	}
 	
 	private class PathTracer implements DPathTracer {
 		private final GeneralPath path;

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

@@ -24,6 +24,7 @@ import org.openzen.drawablegui.listeners.DIRectangle;
 import org.openzen.drawablegui.DKeyEvent;
 import static org.openzen.drawablegui.DKeyEvent.KeyCode.*;
 import org.openzen.drawablegui.DMouseEvent;
+import org.openzen.drawablegui.DUIWindow;
 import org.openzen.drawablegui.style.DEmptyStylesheets;
 import org.openzen.drawablegui.style.DStylePathRoot;
 
@@ -54,6 +55,10 @@ public final class SwingRoot extends Component implements ComponentListener, Mou
 		addKeyListener(this);
 	}
 	
+	public void setWindow(DUIWindow window) {
+		context.setWindow(window);
+	}
+	
 	public void focus(DComponent component) {
 		if (component == focus)
 			return;

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

@@ -6,25 +6,140 @@
 package org.openzen.drawablegui.swing;
 
 import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
+import java.awt.event.WindowStateListener;
 import javax.swing.JFrame;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DUIContext;
+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.SimpleLiveBool;
+import org.openzen.drawablegui.live.SimpleLiveObject;
+import org.openzen.drawablegui.style.DStyleClass;
 
 /**
  *
  * @author Hoofdgebruiker
  */
-public final class SwingWindow extends JFrame {
+public final class SwingWindow extends JFrame implements WindowListener, WindowStateListener, DUIWindow {
 	private final SwingRoot swingComponent;
+	private final boolean noTitleBar;
+	private final SimpleLiveObject<State> state = new SimpleLiveObject<>(State.NORMAL);
+	private final SimpleLiveBool active = new SimpleLiveBool(true);
 	
-	public SwingWindow(String title, DComponent root) {
+	public SwingWindow(String title, DComponent root, boolean noTitleBar) {
 		super(title);
+		this.noTitleBar = noTitleBar;
+		
+		if (noTitleBar) {
+		    setUndecorated(true);
+			root = new DCustomWindowBorder(DStyleClass.EMPTY, root);
+			setBackground(new Color(0, 0, 0, 0));
+		}
+		
+		addWindowListener(this);
+		addWindowStateListener(this);
 		
 		getContentPane().add(swingComponent = new SwingRoot(root), BorderLayout.CENTER);
+		swingComponent.setWindow(this);
 		swingComponent.requestFocusInWindow();
 	}
 	
 	public DUIContext getContext() {
 		return swingComponent.context;
 	}
+
+	@Override
+	public boolean hasTitleBar() {
+		return !noTitleBar;
+	}
+
+	@Override
+	public void close() {
+		System.exit(0);
+	}
+
+	@Override
+	public void maximize() {
+		setExtendedState(JFrame.MAXIMIZED_BOTH);
+	}
+
+	@Override
+	public void restore() {
+		setExtendedState(JFrame.NORMAL);
+	}
+
+	@Override
+	public void minimize() {
+		setExtendedState(JFrame.ICONIFIED);
+	}
+
+	@Override
+	public LiveObject<State> getWindowState() {
+		return state;
+	}
+	
+	@Override
+	public LiveBool getActive() {
+		return active;
+	}
+
+	@Override
+	public void windowOpened(WindowEvent e) {
+		
+	}
+
+	@Override
+	public void windowClosing(WindowEvent e) {
+		
+	}
+
+	@Override
+	public void windowClosed(WindowEvent e) {
+		
+	}
+
+	@Override
+	public void windowIconified(WindowEvent e) {
+		
+	}
+
+	@Override
+	public void windowDeiconified(WindowEvent e) {
+		
+	}
+
+	@Override
+	public void windowActivated(WindowEvent e) {
+		active.setValue(true);
+	}
+
+	@Override
+	public void windowDeactivated(WindowEvent e) {
+		active.setValue(false);
+	}
+
+	@Override
+	public void windowStateChanged(WindowEvent e) {
+		state.setValue(getStateFromWindowState());
+	}
+	
+	private State getStateFromWindowState() {
+		switch (getExtendedState()) {
+			case NORMAL:
+				return State.NORMAL;
+			case ICONIFIED:
+				return State.MINIMIZED;
+			case MAXIMIZED_HORIZ:
+			case MAXIMIZED_VERT:
+			case MAXIMIZED_BOTH:
+				return State.MAXIMIZED;
+			default:
+				return State.NORMAL;
+		}
+	}
 }

DrawableGui/src/main/java/org/openzen/drawablegui/tree/DTreeViewStyle.java

@@ -8,8 +8,8 @@ package org.openzen.drawablegui.tree;
 import org.openzen.drawablegui.DDrawable;
 import org.openzen.drawablegui.DFont;
 import org.openzen.drawablegui.DFontFamily;
-import org.openzen.drawablegui.dimension.DDimension;
-import org.openzen.drawablegui.dimension.DDpDimension;
+import org.openzen.drawablegui.style.DDimension;
+import org.openzen.drawablegui.style.DDpDimension;
 import org.openzen.drawablegui.DUIContext;
 
 /**

DrawableGuiIconConverter/src/main/java/org/openzen/drawablegui/iconconverter/Main.java

@@ -21,9 +21,9 @@ import org.w3c.dom.NodeList;
  */
 public class Main {
 	public static void main(String[] args) throws Exception {
-		String filename = "baseline-settings-20px.svg"; //args[0];
+		String filename = "baseline-close-24px.svg"; //args[0];
 		//String filename = "baseline-dashboard-24px.svg";
-		String className = "ColorableSettingsIcon";
+		String className = "ColorableCloseIcon";
 		File file = new File(filename);
 		if (!file.exists()) {
 			System.out.println("No such file: " + filename);

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

@@ -27,7 +27,7 @@ public class Main {
 		IDEWindow window = new IDEWindow();
 		WindowView root = new WindowView(window, host);
 		
-		SwingWindow swingWindow = new SwingWindow("ZenCode IDE - " + host.getName(), root);
+		SwingWindow swingWindow = new SwingWindow("ZenCode IDE - " + host.getName(), root, false);
 		swingWindow.setSize(800 * pixelPerInch / 96, 600 * pixelPerInch / 96);
 		swingWindow.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 		swingWindow.setVisible(true);

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

@@ -5,7 +5,7 @@
  */
 package org.openzen.zenscript.ide.ui;
 
-import org.openzen.drawablegui.DColorableIcon;
+import org.openzen.drawablegui.DDrawable;
 import org.openzen.drawablegui.live.LiveArrayList;
 import org.openzen.drawablegui.live.LiveList;
 
@@ -15,12 +15,12 @@ import org.openzen.drawablegui.live.LiveList;
  */
 public class IDEAspectToolbar {
 	public final int order;
-	public final DColorableIcon icon;
+	public final DDrawable icon;
 	public final String title;
 	public final String description;
 	public final LiveList<IDEAspectBarControl> controls = new LiveArrayList<>();
 	
-	public IDEAspectToolbar(int order, DColorableIcon icon, String title, String description) {
+	public IDEAspectToolbar(int order, DDrawable icon, String title, String description) {
 		this.order = order;
 		this.icon = icon;
 		this.title = title;

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

@@ -5,10 +5,12 @@
  */
 package org.openzen.zenscript.ide.ui;
 
+import org.openzen.drawablegui.live.SimpleLiveBool;
+import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.zenscript.ide.host.IDESourceFile;
-import org.openzen.zenscript.ide.ui.icons.ColorableAddBoxIcon;
-import org.openzen.zenscript.ide.ui.icons.ColorableProjectIcon;
-import org.openzen.zenscript.ide.ui.icons.ColorableSettingsIcon;
+import org.openzen.zenscript.ide.ui.icons.AddBoxIcon;
+import org.openzen.zenscript.ide.ui.icons.ProjectIcon;
+import org.openzen.zenscript.ide.ui.icons.SettingsIcon;
 import org.openzen.zenscript.ide.ui.view.IconButtonControl;
 
 /**
@@ -39,9 +41,9 @@ public class IDEWindow {
 	}
 	
 	private void init() {
-		IDEAspectToolbar projectToolbar = new IDEAspectToolbar(0, ColorableProjectIcon.INSTANCE, "Project", "Project management");
-		projectToolbar.controls.add(() -> new IconButtonControl(ColorableAddBoxIcon.BLACK, e -> {}));
-		projectToolbar.controls.add(() -> new IconButtonControl(ColorableSettingsIcon.BLACK, e -> {}));
+		IDEAspectToolbar projectToolbar = new IDEAspectToolbar(0, ProjectIcon.GREY, "Project", "Project management");
+		projectToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, AddBoxIcon.BLACK, e -> {}));
+		projectToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, SettingsIcon.BLACK, e -> {}));
 		aspectBar.addToolbar(projectToolbar);
 	}
 }

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

@@ -9,11 +9,11 @@ import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DTransform2D;
 import org.openzen.drawablegui.DColorableIcon;
 
-public class ColorableAddBoxIcon implements DColorableIcon {
-	public static final ColorableAddBoxIcon INSTANCE = new ColorableAddBoxIcon();
+public class AddBoxIcon implements DColorableIcon {
+	public static final AddBoxIcon INSTANCE = new AddBoxIcon();
 	public static final ColoredIcon BLACK = new ColoredIcon(INSTANCE, 0xFF000000);
 	
-	private ColorableAddBoxIcon() {}
+	private AddBoxIcon() {}
 	
 	private static final DPath PATH = tracer -> {
 		tracer.moveTo(19f, 3f);

IDE/src/main/java/org/openzen/zenscript/ide/ui/icons/ColorableCodeIcon.java → IDE/src/main/java/org/openzen/zenscript/ide/ui/icons/CloseIcon.java

@@ -10,27 +10,24 @@ import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DTransform2D;
 import org.openzen.drawablegui.DColorableIcon;
 
-public class ColorableCodeIcon implements DColorableIcon {
-	public static final ColorableCodeIcon INSTANCE = new ColorableCodeIcon();
+public class CloseIcon implements DColorableIcon {
+	public static final CloseIcon INSTANCE = new CloseIcon();
 	
-	private ColorableCodeIcon() {}
+	private CloseIcon() {}
 	
 	private static final DPath PATH = tracer -> {
-		tracer.moveTo(9.4f, 16.6f);
-		tracer.lineTo(4.8f, 12f);
-		tracer.lineTo(9.4f, 7.4f);
-		tracer.lineTo(8f, 6f);
-		tracer.lineTo(2.0f, 12.0f);
-		tracer.lineTo(8.0f, 18.0f);
-		tracer.lineTo(9.4f, 16.6f);
-		tracer.close();
-		tracer.moveTo(14.599999f, 16.6f);
-		tracer.lineTo(19.199999f, 12.0f);
-		tracer.lineTo(14.599998f, 7.4f);
-		tracer.lineTo(16f, 6f);
-		tracer.lineTo(22.0f, 12.0f);
-		tracer.lineTo(16.0f, 18.0f);
-		tracer.lineTo(14.6f, 16.6f);
+		tracer.moveTo(19f, 6.41f);
+		tracer.lineTo(17.59f, 5f);
+		tracer.lineTo(12f, 10.59f);
+		tracer.lineTo(6.41f, 5f);
+		tracer.lineTo(5f, 6.41f);
+		tracer.lineTo(10.59f, 12f);
+		tracer.lineTo(5f, 17.59f);
+		tracer.lineTo(6.41f, 19f);
+		tracer.lineTo(12f, 13.41f);
+		tracer.lineTo(17.59f, 19f);
+		tracer.lineTo(19f, 17.59f);
+		tracer.lineTo(13.41f, 12f);
 		tracer.close();
 	};
 	

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

@@ -6,17 +6,39 @@
 package org.openzen.zenscript.ide.ui.icons;
 
 import org.openzen.drawablegui.DCanvas;
-import org.openzen.drawablegui.DDrawable;
+import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DTransform2D;
+import org.openzen.drawablegui.DColorableIcon;
 
-public class CodeIcon implements DDrawable {
+public class CodeIcon implements DColorableIcon {
 	public static final CodeIcon INSTANCE = new CodeIcon();
+	public static final ColoredIcon BLACK = new ColoredIcon(INSTANCE, 0xFF000000);
+	public static final ColoredIcon GREY = new ColoredIcon(INSTANCE, 0xFF888888);
 	
 	private CodeIcon() {}
 	
+	private static final DPath PATH = tracer -> {
+		tracer.moveTo(9.4f, 16.6f);
+		tracer.lineTo(4.8f, 12f);
+		tracer.lineTo(9.4f, 7.4f);
+		tracer.lineTo(8f, 6f);
+		tracer.lineTo(2.0f, 12.0f);
+		tracer.lineTo(8.0f, 18.0f);
+		tracer.lineTo(9.4f, 16.6f);
+		tracer.close();
+		tracer.moveTo(14.599999f, 16.6f);
+		tracer.lineTo(19.199999f, 12.0f);
+		tracer.lineTo(14.599998f, 7.4f);
+		tracer.lineTo(16f, 6f);
+		tracer.lineTo(22.0f, 12.0f);
+		tracer.lineTo(16.0f, 18.0f);
+		tracer.lineTo(14.6f, 16.6f);
+		tracer.close();
+	};
+	
 	@Override
-	public void draw(DCanvas canvas, DTransform2D transform) {
-		ColorableCodeIcon.INSTANCE.draw(canvas, transform, 0xFF000000);
+	public void draw(DCanvas canvas, DTransform2D transform, int color) {
+		canvas.fillPath(PATH, transform, color);
 	}
 
 	@Override

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

@@ -1,47 +0,0 @@
-/*
- * 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.icons;
-
-import org.openzen.drawablegui.DCanvas;
-import org.openzen.drawablegui.DPath;
-import org.openzen.drawablegui.DTransform2D;
-import org.openzen.drawablegui.DColorableIcon;
-
-public class ColorableFolderIcon implements DColorableIcon {
-	public static final ColorableFolderIcon INSTANCE = new ColorableFolderIcon();
-	
-	private ColorableFolderIcon() {}
-	
-	private static final DPath PATH = tracer -> {
-		tracer.moveTo(10f, 4f);
-		tracer.lineTo(4.0f, 4.0f);
-		tracer.bezierCubic(2.9f, 4.0f, 2.01f, 4.9f, 2.01f, 6.0f);
-		tracer.lineTo(2f, 18f);
-		tracer.bezierCubic(2.0f, 19.1f, 2.9f, 20.0f, 4.0f, 20.0f);
-		tracer.lineTo(20.0f, 20.0f);
-		tracer.bezierCubic(21.1f, 20.0f, 22.0f, 19.1f, 22.0f, 18.0f);
-		tracer.lineTo(22.0f, 8.0f);
-		tracer.bezierCubic(22.0f, 6.9f, 21.1f, 6.0f, 20.0f, 6.0f);
-		tracer.lineTo(12.0f, 6.0f);
-		tracer.lineTo(10.0f, 4.0f);
-		tracer.close();
-	};
-	
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.fillPath(PATH, transform, color);
-	}
-
-	@Override
-	public float getNominalWidth() {
-		return 24;
-	}
-
-	@Override
-	public float getNominalHeight() {
-		return 24;
-	}
-}

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

@@ -1,59 +0,0 @@
-/*
- * 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.icons;
-
-/**
- *
- * @author Hoofdgebruiker
- */
-import org.openzen.drawablegui.DCanvas;
-import org.openzen.drawablegui.DPath;
-import org.openzen.drawablegui.DTransform2D;
-import org.openzen.drawablegui.DColorableIcon;
-
-public class ColorableLibraryIcon implements DColorableIcon {
-	public static final ColorableLibraryIcon INSTANCE = new ColorableLibraryIcon();
-	
-	private ColorableLibraryIcon() {}
-	
-	private static final DPath PATH_0 = tracer -> {
-		tracer.moveTo(20.54f, 5.23f);
-		tracer.lineTo(19.15f, 3.55f);
-		tracer.bezierCubic(18.88f, 3.21f, 18.47f, 3.0f, 18.0f, 3.0f);
-		tracer.lineTo(6f, 3f);
-		tracer.bezierCubic(5.53f, 3.0f, 5.12f, 3.21f, 4.84f, 3.55f);
-		tracer.lineTo(3.46f, 5.23f);
-		tracer.bezierCubic(3.17f, 5.57f, 3.0f, 6.02f, 3.0f, 6.5f);
-		tracer.lineTo(3f, 19f);
-		tracer.bezierCubic(3.0f, 20.1f, 3.9f, 21.0f, 5.0f, 21.0f);
-		tracer.lineTo(19f, 21f);
-		tracer.bezierCubic(20.1f, 21.0f, 21.0f, 20.1f, 21.0f, 19.0f);
-		tracer.lineTo(21f, 6.5f);
-		tracer.bezierCubic(21.0f, 6.02f, 20.83f, 5.57f, 20.54f, 5.23f);
-		tracer.close();
-		tracer.moveTo(5.12f, 5f);
-		tracer.lineTo(5.93f, 4f);
-		tracer.lineTo(17.93f, 4f);
-		tracer.lineTo(18.87f, 5f);
-		tracer.lineTo(5.12f, 5f);
-		tracer.close();
-	};
-	
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.fillPath(PATH_0, transform, color);
-	}
-
-	@Override
-	public float getNominalWidth() {
-		return 24;
-	}
-
-	@Override
-	public float getNominalHeight() {
-		return 24;
-	}
-}

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

@@ -1,53 +0,0 @@
-/*
- * 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.icons;
-
-import org.openzen.drawablegui.DCanvas;
-import org.openzen.drawablegui.DPath;
-import org.openzen.drawablegui.DTransform2D;
-import org.openzen.drawablegui.DColorableIcon;
-
-public class ColorableModuleIcon implements DColorableIcon {
-	public static final ColorableModuleIcon INSTANCE = new ColorableModuleIcon();
-	
-	private ColorableModuleIcon() {}
-	
-	private static final DPath PATH = tracer -> {
-		tracer.moveTo(3f, 19f);
-		tracer.lineTo(9.0f, 19.0f);
-		tracer.lineTo(9.0f, 12.0f);
-		tracer.lineTo(3.0f, 12.0f);
-		tracer.lineTo(3.0f, 19.0f);
-		tracer.close();
-		tracer.moveTo(10.0f, 19.0f);
-		tracer.lineTo(22.0f, 19.0f);
-		tracer.lineTo(22.0f, 12.0f);
-		tracer.lineTo(10.0f, 12.0f);
-		tracer.lineTo(10.0f, 19.0f);
-		tracer.close();
-		tracer.moveTo(3f, 5f);
-		tracer.lineTo(3.0f, 11.0f);
-		tracer.lineTo(22.0f, 11.0f);
-		tracer.lineTo(22.0f, 5.0f);
-		tracer.lineTo(3.0f, 5.0f);
-		tracer.close();
-	};
-	
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.fillPath(PATH, transform, color);
-	}
-
-	@Override
-	public float getNominalWidth() {
-		return 24;
-	}
-
-	@Override
-	public float getNominalHeight() {
-		return 24;
-	}
-}

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

@@ -1,60 +0,0 @@
-/*
- * 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.icons;
-
-import org.openzen.drawablegui.DCanvas;
-import org.openzen.drawablegui.DPath;
-import org.openzen.drawablegui.DTransform2D;
-import org.openzen.drawablegui.DColorableIcon;
-
-public class ColorableProjectIcon implements DColorableIcon {
-	public static final ColorableProjectIcon INSTANCE = new ColorableProjectIcon();
-	public static final ColoredIcon GREY = new ColoredIcon(INSTANCE, 0xFF888888);
-	
-	private ColorableProjectIcon() {}
-	
-	private static final DPath PATH_0 = tracer -> {
-		tracer.moveTo(3f, 13f);
-		tracer.lineTo(11.0f, 13.0f);
-		tracer.lineTo(11.0f, 3.0f);
-		tracer.lineTo(3.0f, 3.0f);
-		tracer.lineTo(3.0f, 13.0f);
-		tracer.close();
-		tracer.moveTo(3.0f, 21.0f);
-		tracer.lineTo(11.0f, 21.0f);
-		tracer.lineTo(11.0f, 15.0f);
-		tracer.lineTo(3.0f, 15.0f);
-		tracer.lineTo(3.0f, 21.0f);
-		tracer.close();
-		tracer.moveTo(13.0f, 21.0f);
-		tracer.lineTo(21.0f, 21.0f);
-		tracer.lineTo(21.0f, 11.0f);
-		tracer.lineTo(13.0f, 11.0f);
-		tracer.lineTo(13.0f, 21.0f);
-		tracer.close();
-		tracer.moveTo(13.0f, 3.0f);
-		tracer.lineTo(13.0f, 9.0f);
-		tracer.lineTo(21.0f, 9.0f);
-		tracer.lineTo(21.0f, 3.0f);
-		tracer.lineTo(13.0f, 3.0f);
-		tracer.close();
-	};
-	
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.fillPath(PATH_0, transform, color);
-	}
-
-	@Override
-	public float getNominalWidth() {
-		return 24;
-	}
-
-	@Override
-	public float getNominalHeight() {
-		return 24;
-	}
-}

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

@@ -1,57 +0,0 @@
-/*
- * 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.icons;
-
-import org.openzen.drawablegui.DCanvas;
-import org.openzen.drawablegui.DPath;
-import org.openzen.drawablegui.DTransform2D;
-import org.openzen.drawablegui.DColorableIcon;
-
-public class ColorableSaveIcon implements DColorableIcon {
-	public static final ColorableSaveIcon INSTANCE = new ColorableSaveIcon();
-	
-	private ColorableSaveIcon() {}
-	
-	private static final DPath PATH = tracer -> {
-		tracer.moveTo(17f, 3f);
-		tracer.lineTo(5.0f, 3.0f);
-		tracer.bezierCubic(3.8899999f, 3.0f, 3.0f, 3.9f, 3.0f, 5.0f);
-		tracer.lineTo(3.0f, 19.0f);
-		tracer.bezierCubic(3.0f, 20.1f, 3.8899999f, 21.0f, 5.0f, 21.0f);
-		tracer.lineTo(19.0f, 21.0f);
-		tracer.bezierCubic(20.1f, 21.0f, 21.0f, 20.1f, 21.0f, 19.0f);
-		tracer.lineTo(21.0f, 7.0f);
-		tracer.lineTo(17.0f, 3.0f);
-		tracer.close();
-		tracer.moveTo(12.0f, 19.0f);
-		tracer.bezierCubic(10.34f, 19.0f, 9.0f, 17.66f, 9.0f, 16.0f);
-		tracer.bezierCubic(9.0f, 14.34f, 10.34f, 13.0f, 12.0f, 13.0f);
-		tracer.bezierCubic(13.66f, 13.0f, 15.0f, 14.34f, 15.0f, 16.0f);
-		tracer.bezierCubic(15.0f, 17.66f, 13.66f, 19.0f, 12.0f, 19.0f);
-		tracer.close();
-		tracer.moveTo(15.0f, 9.0f);
-		tracer.lineTo(5.0f, 9.0f);
-		tracer.lineTo(5.0f, 5.0f);
-		tracer.lineTo(15.0f, 5.0f);
-		tracer.lineTo(15.0f, 9.0f);
-		tracer.close();
-	};
-	
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.fillPath(PATH, transform, color);
-	}
-
-	@Override
-	public float getNominalWidth() {
-		return 24;
-	}
-
-	@Override
-	public float getNominalHeight() {
-		return 24;
-	}
-}

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

@@ -6,17 +6,34 @@
 package org.openzen.zenscript.ide.ui.icons;
 
 import org.openzen.drawablegui.DCanvas;
-import org.openzen.drawablegui.DDrawable;
+import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DTransform2D;
+import org.openzen.drawablegui.DColorableIcon;
 
-public class FolderIcon implements DDrawable {
+public class FolderIcon implements DColorableIcon {
 	public static final FolderIcon INSTANCE = new FolderIcon();
+	public static final ColoredIcon BLACK = new ColoredIcon(INSTANCE, 0xFF000000);
 	
 	private FolderIcon() {}
 	
+	private static final DPath PATH = tracer -> {
+		tracer.moveTo(10f, 4f);
+		tracer.lineTo(4.0f, 4.0f);
+		tracer.bezierCubic(2.9f, 4.0f, 2.01f, 4.9f, 2.01f, 6.0f);
+		tracer.lineTo(2f, 18f);
+		tracer.bezierCubic(2.0f, 19.1f, 2.9f, 20.0f, 4.0f, 20.0f);
+		tracer.lineTo(20.0f, 20.0f);
+		tracer.bezierCubic(21.1f, 20.0f, 22.0f, 19.1f, 22.0f, 18.0f);
+		tracer.lineTo(22.0f, 8.0f);
+		tracer.bezierCubic(22.0f, 6.9f, 21.1f, 6.0f, 20.0f, 6.0f);
+		tracer.lineTo(12.0f, 6.0f);
+		tracer.lineTo(10.0f, 4.0f);
+		tracer.close();
+	};
+	
 	@Override
-	public void draw(DCanvas canvas, DTransform2D transform) {
-		ColorableFolderIcon.INSTANCE.draw(canvas, transform, 0xFF000000);
+	public void draw(DCanvas canvas, DTransform2D transform, int color) {
+		canvas.fillPath(PATH, transform, color);
 	}
 
 	@Override

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

@@ -5,19 +5,47 @@
  */
 package org.openzen.zenscript.ide.ui.icons;
 
+/**
+ *
+ * @author Hoofdgebruiker
+ */
 import org.openzen.drawablegui.DCanvas;
-import org.openzen.drawablegui.DDrawable;
 import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DTransform2D;
+import org.openzen.drawablegui.DColorableIcon;
 
-public class LibraryIcon implements DDrawable {
+public class LibraryIcon implements DColorableIcon {
 	public static final LibraryIcon INSTANCE = new LibraryIcon();
+	public static final ColoredIcon BLACK = new ColoredIcon(INSTANCE, 0xFF000000);
 	
 	private LibraryIcon() {}
 	
+	private static final DPath PATH_0 = tracer -> {
+		tracer.moveTo(20.54f, 5.23f);
+		tracer.lineTo(19.15f, 3.55f);
+		tracer.bezierCubic(18.88f, 3.21f, 18.47f, 3.0f, 18.0f, 3.0f);
+		tracer.lineTo(6f, 3f);
+		tracer.bezierCubic(5.53f, 3.0f, 5.12f, 3.21f, 4.84f, 3.55f);
+		tracer.lineTo(3.46f, 5.23f);
+		tracer.bezierCubic(3.17f, 5.57f, 3.0f, 6.02f, 3.0f, 6.5f);
+		tracer.lineTo(3f, 19f);
+		tracer.bezierCubic(3.0f, 20.1f, 3.9f, 21.0f, 5.0f, 21.0f);
+		tracer.lineTo(19f, 21f);
+		tracer.bezierCubic(20.1f, 21.0f, 21.0f, 20.1f, 21.0f, 19.0f);
+		tracer.lineTo(21f, 6.5f);
+		tracer.bezierCubic(21.0f, 6.02f, 20.83f, 5.57f, 20.54f, 5.23f);
+		tracer.close();
+		tracer.moveTo(5.12f, 5f);
+		tracer.lineTo(5.93f, 4f);
+		tracer.lineTo(17.93f, 4f);
+		tracer.lineTo(18.87f, 5f);
+		tracer.lineTo(5.12f, 5f);
+		tracer.close();
+	};
+	
 	@Override
-	public void draw(DCanvas canvas, DTransform2D transform) {
-		ColorableLibraryIcon.INSTANCE.draw(canvas, transform, 0xFF888888);
+	public void draw(DCanvas canvas, DTransform2D transform, int color) {
+		canvas.fillPath(PATH_0, transform, color);
 	}
 
 	@Override

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

@@ -6,18 +6,40 @@
 package org.openzen.zenscript.ide.ui.icons;
 
 import org.openzen.drawablegui.DCanvas;
-import org.openzen.drawablegui.DDrawable;
 import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DTransform2D;
+import org.openzen.drawablegui.DColorableIcon;
 
-public class ModuleIcon implements DDrawable {
+public class ModuleIcon implements DColorableIcon {
 	public static final ModuleIcon INSTANCE = new ModuleIcon();
+	public static final ColoredIcon BLACK = new ColoredIcon(INSTANCE, 0xFF000000);
 	
 	private ModuleIcon() {}
 	
+	private static final DPath PATH = tracer -> {
+		tracer.moveTo(3f, 19f);
+		tracer.lineTo(9.0f, 19.0f);
+		tracer.lineTo(9.0f, 12.0f);
+		tracer.lineTo(3.0f, 12.0f);
+		tracer.lineTo(3.0f, 19.0f);
+		tracer.close();
+		tracer.moveTo(10.0f, 19.0f);
+		tracer.lineTo(22.0f, 19.0f);
+		tracer.lineTo(22.0f, 12.0f);
+		tracer.lineTo(10.0f, 12.0f);
+		tracer.lineTo(10.0f, 19.0f);
+		tracer.close();
+		tracer.moveTo(3f, 5f);
+		tracer.lineTo(3.0f, 11.0f);
+		tracer.lineTo(22.0f, 11.0f);
+		tracer.lineTo(22.0f, 5.0f);
+		tracer.lineTo(3.0f, 5.0f);
+		tracer.close();
+	};
+	
 	@Override
-	public void draw(DCanvas canvas, DTransform2D transform) {
-		ColorableModuleIcon.INSTANCE.draw(canvas, transform, 0xFF000000);
+	public void draw(DCanvas canvas, DTransform2D transform, int color) {
+		canvas.fillPath(PATH, transform, color);
 	}
 
 	@Override

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

@@ -6,18 +6,47 @@
 package org.openzen.zenscript.ide.ui.icons;
 
 import org.openzen.drawablegui.DCanvas;
-import org.openzen.drawablegui.DDrawable;
 import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DTransform2D;
+import org.openzen.drawablegui.DColorableIcon;
 
-public class ProjectIcon implements DDrawable {
+public class ProjectIcon implements DColorableIcon {
 	public static final ProjectIcon INSTANCE = new ProjectIcon();
+	public static final ColoredIcon BLACK = new ColoredIcon(INSTANCE, 0xFF000000);
+	public static final ColoredIcon GREY = new ColoredIcon(INSTANCE, 0xFF888888);
 	
 	private ProjectIcon() {}
 	
+	private static final DPath PATH = tracer -> {
+		tracer.moveTo(3f, 13f);
+		tracer.lineTo(11.0f, 13.0f);
+		tracer.lineTo(11.0f, 3.0f);
+		tracer.lineTo(3.0f, 3.0f);
+		tracer.lineTo(3.0f, 13.0f);
+		tracer.close();
+		tracer.moveTo(3.0f, 21.0f);
+		tracer.lineTo(11.0f, 21.0f);
+		tracer.lineTo(11.0f, 15.0f);
+		tracer.lineTo(3.0f, 15.0f);
+		tracer.lineTo(3.0f, 21.0f);
+		tracer.close();
+		tracer.moveTo(13.0f, 21.0f);
+		tracer.lineTo(21.0f, 21.0f);
+		tracer.lineTo(21.0f, 11.0f);
+		tracer.lineTo(13.0f, 11.0f);
+		tracer.lineTo(13.0f, 21.0f);
+		tracer.close();
+		tracer.moveTo(13.0f, 3.0f);
+		tracer.lineTo(13.0f, 9.0f);
+		tracer.lineTo(21.0f, 9.0f);
+		tracer.lineTo(21.0f, 3.0f);
+		tracer.lineTo(13.0f, 3.0f);
+		tracer.close();
+	};
+	
 	@Override
-	public void draw(DCanvas canvas, DTransform2D transform) {
-		ColorableProjectIcon.INSTANCE.draw(canvas, transform, 0xFF000000);
+	public void draw(DCanvas canvas, DTransform2D transform, int color) {
+		canvas.fillPath(PATH, transform, color);
 	}
 
 	@Override

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

@@ -6,17 +6,45 @@
 package org.openzen.zenscript.ide.ui.icons;
 
 import org.openzen.drawablegui.DCanvas;
-import org.openzen.drawablegui.DDrawable;
+import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DTransform2D;
+import org.openzen.drawablegui.DColorableIcon;
 
-public class SaveIcon implements DDrawable {
+public class SaveIcon implements DColorableIcon {
 	public static final SaveIcon INSTANCE = new SaveIcon();
+	public static final ColoredIcon BLACK = new ColoredIcon(INSTANCE, 0xFF000000);
+	public static final ColoredIcon GREY = new ColoredIcon(INSTANCE, 0xFF888888);
 	
 	private SaveIcon() {}
 	
+	private static final DPath PATH = tracer -> {
+		tracer.moveTo(17f, 3f);
+		tracer.lineTo(5.0f, 3.0f);
+		tracer.bezierCubic(3.8899999f, 3.0f, 3.0f, 3.9f, 3.0f, 5.0f);
+		tracer.lineTo(3.0f, 19.0f);
+		tracer.bezierCubic(3.0f, 20.1f, 3.8899999f, 21.0f, 5.0f, 21.0f);
+		tracer.lineTo(19.0f, 21.0f);
+		tracer.bezierCubic(20.1f, 21.0f, 21.0f, 20.1f, 21.0f, 19.0f);
+		tracer.lineTo(21.0f, 7.0f);
+		tracer.lineTo(17.0f, 3.0f);
+		tracer.close();
+		tracer.moveTo(12.0f, 19.0f);
+		tracer.bezierCubic(10.34f, 19.0f, 9.0f, 17.66f, 9.0f, 16.0f);
+		tracer.bezierCubic(9.0f, 14.34f, 10.34f, 13.0f, 12.0f, 13.0f);
+		tracer.bezierCubic(13.66f, 13.0f, 15.0f, 14.34f, 15.0f, 16.0f);
+		tracer.bezierCubic(15.0f, 17.66f, 13.66f, 19.0f, 12.0f, 19.0f);
+		tracer.close();
+		tracer.moveTo(15.0f, 9.0f);
+		tracer.lineTo(5.0f, 9.0f);
+		tracer.lineTo(5.0f, 5.0f);
+		tracer.lineTo(15.0f, 5.0f);
+		tracer.lineTo(15.0f, 9.0f);
+		tracer.close();
+	};
+	
 	@Override
-	public void draw(DCanvas canvas, DTransform2D transform) {
-		ColorableSaveIcon.INSTANCE.draw(canvas, transform, 0xFF000000);
+	public void draw(DCanvas canvas, DTransform2D transform, int color) {
+		canvas.fillPath(PATH, transform, color);
 	}
 
 	@Override

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

@@ -0,0 +1,41 @@
+/*
+ * 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.icons;
+
+import org.openzen.drawablegui.DCanvas;
+import org.openzen.drawablegui.DPath;
+import org.openzen.drawablegui.DTransform2D;
+import org.openzen.drawablegui.DColorableIcon;
+
+public class ScalableCloseIcon implements DColorableIcon {
+	private final DPath path;
+	private final float size;
+	
+	public ScalableCloseIcon(float scale) {
+		size = 24 * scale;
+		path = tracer -> {
+			tracer.moveTo(scale * 8, scale * 8);
+			tracer.lineTo(scale * 16, scale * 16);
+			tracer.moveTo(scale * 8, scale * 16);
+			tracer.lineTo(scale * 16, scale * 8);
+		};
+	}
+	
+	@Override
+	public void draw(DCanvas canvas, DTransform2D transform, int color) {
+		canvas.strokePath(path, transform, color, 1);
+	}
+
+	@Override
+	public float getNominalWidth() {
+		return size;
+	}
+
+	@Override
+	public float getNominalHeight() {
+		return size;
+	}
+}

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

@@ -0,0 +1,42 @@
+/*
+ * 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.icons;
+
+import org.openzen.drawablegui.DCanvas;
+import org.openzen.drawablegui.DPath;
+import org.openzen.drawablegui.DTransform2D;
+import org.openzen.drawablegui.DColorableIcon;
+
+public class ScalableMaximizeIcon implements DColorableIcon {
+	private final DPath path;
+	private final float size;
+	
+	public ScalableMaximizeIcon(float scale) {
+		size = 24 * scale;
+		path = tracer -> {
+			tracer.moveTo(scale * 8, scale * 8);
+			tracer.lineTo(scale * 16, scale * 8);
+			tracer.lineTo(scale * 16, scale * 16);
+			tracer.lineTo(scale * 8, scale * 16);
+			tracer.close();
+		};
+	}
+	
+	@Override
+	public void draw(DCanvas canvas, DTransform2D transform, int color) {
+		canvas.strokePath(path, transform, color, 1);
+	}
+
+	@Override
+	public float getNominalWidth() {
+		return size;
+	}
+
+	@Override
+	public float getNominalHeight() {
+		return size;
+	}
+}

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

@@ -0,0 +1,43 @@
+/*
+ * 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.icons;
+
+import org.openzen.drawablegui.DCanvas;
+import org.openzen.drawablegui.DColorableIcon;
+import org.openzen.drawablegui.DPath;
+import org.openzen.drawablegui.DTransform2D;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ScalableMinimizeIcon implements DColorableIcon {
+	private final float scale;
+	private final DPath path;
+	
+	public ScalableMinimizeIcon(float scale) {
+		this.scale = scale;
+		path = tracer -> {
+			tracer.moveTo(scale * 8, scale * 14);
+			tracer.lineTo(scale * 16, scale * 14);
+		};
+	}
+
+	@Override
+	public void draw(DCanvas canvas, DTransform2D transform, int color) {
+		canvas.strokePath(path, transform, color, 1);
+	}
+
+	@Override
+	public float getNominalWidth() {
+		return 24 * scale;
+	}
+
+	@Override
+	public float getNominalHeight() {
+		return 24 * scale;
+	}
+}

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

@@ -8,12 +8,13 @@ import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DTransform2D;
 import org.openzen.drawablegui.DColorableIcon;
+import org.openzen.drawablegui.style.DShadow;
 
-public class ColorableSettingsIcon implements DColorableIcon {
-	public static final ColorableSettingsIcon INSTANCE = new ColorableSettingsIcon();
+public class SettingsIcon implements DColorableIcon {
+	public static final SettingsIcon INSTANCE = new SettingsIcon();
 	public static final ColoredIcon BLACK = new ColoredIcon(INSTANCE, 0xFF000000);
 	
-	private ColorableSettingsIcon() {}
+	private SettingsIcon() {}
 	
 	private static final DPath PATH = tracer -> {
 		tracer.moveTo(15.95f, 10.78f);
@@ -66,6 +67,7 @@ public class ColorableSettingsIcon implements DColorableIcon {
 	
 	@Override
 	public void draw(DCanvas canvas, DTransform2D transform, int color) {
+		//canvas.shadowPath(PATH, transform, new DShadow(0xFF888888, 0, 1, 3.5f));
 		canvas.fillPath(PATH, transform, color);
 	}
 

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

@@ -11,11 +11,16 @@ import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DDimensionPreferences;
 import org.openzen.drawablegui.DDrawable;
 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.DIRectangle;
+import org.openzen.drawablegui.listeners.ListenerHandle;
+import org.openzen.drawablegui.live.ImmutableLiveBool;
+import org.openzen.drawablegui.live.LiveBool;
 import org.openzen.drawablegui.live.LiveObject;
 import org.openzen.drawablegui.live.SimpleLiveObject;
+import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.drawablegui.style.DStylePath;
 
 /**
@@ -23,25 +28,48 @@ import org.openzen.drawablegui.style.DStylePath;
  * @author Hoofdgebruiker
  */
 public class IconButtonControl implements DComponent {
+	private final DStyleClass styleClass;
 	private final DDrawable icon;
+	private final DDrawable iconDisabled;
 	private final Consumer<DMouseEvent> onClick;
+	private final LiveBool disabled;
+	private final ListenerHandle<LiveBool.Listener> disabledListener;
 	
 	private DUIContext context;
+	private IconButtonControlStyle style;
 	private DIRectangle bounds;
 	private final LiveObject<DDimensionPreferences> preferences = new SimpleLiveObject<>(DDimensionPreferences.EMPTY);
 	private boolean hover;
+	private boolean press;
+	private DPath shape;
 	
-	public IconButtonControl(DDrawable icon, Consumer<DMouseEvent> onClick) {
+	public IconButtonControl(DStyleClass styleClass, DDrawable icon, DDrawable iconDisabled, LiveBool disabled, Consumer<DMouseEvent> onClick) {
+		this.styleClass = styleClass;
 		this.icon = icon;
+		this.iconDisabled = iconDisabled;
 		this.onClick = onClick;
+		this.disabled = disabled;
+		disabledListener = disabled.addListener((oldValue, newValue) -> repaint());
+	}
+	
+	public IconButtonControl(DStyleClass styleClass, DDrawable icon, Consumer<DMouseEvent> onClick) {
+		this(styleClass, icon, icon, ImmutableLiveBool.FALSE, onClick);
 	}
 
 	@Override
 	public void setContext(DStylePath parent, DUIContext context) {
 		this.context = context;
-		preferences.setValue(new DDimensionPreferences(
-				(int)(icon.getNominalWidth() * context.getScale() + 0.5f),
-				(int)(icon.getNominalHeight() * context.getScale() + 0.5f)));
+		DStylePath path = parent.getChild("iconbutton", styleClass);
+		style = new IconButtonControlStyle(context.getStylesheets().get(context, path));
+		
+		int iconWidth = (int)(icon.getNominalWidth() * context.getScale() + 0.5f);
+		int iconHeight = (int)(icon.getNominalWidth() * context.getScale() + 0.5f);
+		int width = iconWidth + 2 * style.padding + 2 * style.margin;
+		int height = iconHeight + 2 * style.padding + 2 * style.margin;
+		preferences.setValue(new DDimensionPreferences(width, height));
+		
+		if (bounds != null)
+			setBounds(bounds);
 	}
 
 	@Override
@@ -57,13 +85,33 @@ public class IconButtonControl implements DComponent {
 	@Override
 	public void setBounds(DIRectangle bounds) {
 		this.bounds = bounds;
+		
+		if (context != null)
+			shape = DPath.roundedRectangle(
+					bounds.x + style.margin,
+					bounds.y + style.margin,
+					bounds.width - 2 * style.margin,
+					bounds.height - 2 * style.margin,
+					style.roundingRadius);
 	}
 
 	@Override
 	public void paint(DCanvas canvas) {
-		if (hover) {
-			canvas.fillRectangle(bounds.x, bounds.y, bounds.width, bounds.height, 0xFFE0E0E0);
+		if (disabled.getValue()) {
+			canvas.shadowPath(shape, DTransform2D.IDENTITY, style.shadowDisabled);
+			canvas.fillPath(shape, DTransform2D.IDENTITY, style.colorDisabled);
+		} else if (press) {
+			canvas.shadowPath(shape, DTransform2D.IDENTITY, style.shadowPress);
+			canvas.fillPath(shape, DTransform2D.IDENTITY, style.colorPress);
+		} else if (hover) {
+			canvas.shadowPath(shape, DTransform2D.IDENTITY, style.shadowHover);
+			canvas.fillPath(shape, DTransform2D.IDENTITY, style.colorHover);
+		} else {
+			canvas.shadowPath(shape, DTransform2D.IDENTITY, style.shadowNormal);
+			canvas.fillPath(shape, DTransform2D.IDENTITY, style.colorNormal);
 		}
+		
+		DDrawable icon = disabled.getValue() ? iconDisabled : this.icon;
 		icon.draw(canvas, DTransform2D.scaleAndTranslate(
 				bounds.x + (bounds.width - icon.getNominalWidth() * context.getScale()) / 2,
 				bounds.y + (bounds.height - icon.getNominalHeight() * context.getScale()) / 2,
@@ -72,19 +120,32 @@ public class IconButtonControl implements DComponent {
 
 	@Override
 	public void close() {
-		// nothing to clean up
+		disabledListener.close();
 	}
 	
 	@Override
 	public void onMouseEnter(DMouseEvent e) {
 		hover = true;
-		context.repaint(bounds);
+		repaint();
 	}
 	
 	@Override
 	public void onMouseExit(DMouseEvent e) {
 		hover = false;
-		context.repaint(bounds);
+		press = false;
+		repaint();
+	}
+	
+	@Override
+	public void onMouseDown(DMouseEvent e) {
+		press = true;
+		repaint();
+	}
+	
+	@Override
+	public void onMouseRelease(DMouseEvent e) {
+		press = false;
+		repaint();
 	}
 	
 	@Override
@@ -93,6 +154,6 @@ public class IconButtonControl implements DComponent {
 	}
 	
 	private void repaint() {
-		
+		context.repaint(bounds);
 	}
 }

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

@@ -0,0 +1,46 @@
+/*
+ * 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;
+
+import org.openzen.drawablegui.style.DDpDimension;
+import org.openzen.drawablegui.style.DShadow;
+import org.openzen.drawablegui.style.DStyleDefinition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class IconButtonControlStyle {
+	public final int margin;
+	public final int padding;
+	public final int roundingRadius;
+	
+	public final int colorNormal;
+	public final int colorHover;
+	public final int colorPress;
+	public final int colorDisabled;
+	
+	public final DShadow shadowNormal;
+	public final DShadow shadowHover;
+	public final DShadow shadowPress;
+	public final DShadow shadowDisabled;
+	
+	public IconButtonControlStyle(DStyleDefinition style) {
+		margin = style.getDimension("margin", new DDpDimension(3));
+		padding = style.getDimension("padding", new DDpDimension(2));
+		roundingRadius = style.getDimension("roundingRadius", new DDpDimension(4));
+		
+		colorNormal = style.getColor("colorNormal", 0);
+		colorHover = style.getColor("colorHover", 0xFFFFFFFF);
+		colorPress = style.getColor("colorPress", 0xFFF0F0F0);
+		colorDisabled = style.getColor("colorDisabled", 0);
+		
+		shadowNormal = style.getShadow("shadowNormal", context -> DShadow.NONE);
+		shadowHover = style.getShadow("shadowNormal", context -> new DShadow(0xFF888888, 0, 0.5f * context.getScale(), 2.0f * context.getScale()));
+		shadowPress = style.getShadow("shadowNormal", context -> new DShadow(0xFF888888, 0, 0.5f * context.getScale(), 1.5f * context.getScale()));
+		shadowDisabled = style.getShadow("shadowDisabled", context -> DShadow.NONE);
+	}
+}

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

@@ -5,18 +5,21 @@
  */
 package org.openzen.zenscript.ide.ui.view.aspectbar;
 
+import java.util.function.Consumer;
 import org.openzen.drawablegui.DCanvas;
-import org.openzen.drawablegui.DColorableIcon;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DDimensionPreferences;
 import org.openzen.drawablegui.DDrawable;
+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.DIRectangle;
+import org.openzen.drawablegui.listeners.ListenerHandle;
 import org.openzen.drawablegui.live.LiveBool;
 import org.openzen.drawablegui.live.LiveObject;
 import org.openzen.drawablegui.live.SimpleLiveObject;
+import org.openzen.drawablegui.style.DShadow;
 import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.drawablegui.style.DStylePath;
 
@@ -26,19 +29,28 @@ import org.openzen.drawablegui.style.DStylePath;
  */
 public class AspectBarSelectorButton implements DComponent {
 	
-	public final LiveBool active = new LiveBool();
+	public final LiveBool active;
 	
 	private final DStyleClass styleClass;
 	private final DDrawable icon;
 	private final LiveObject<DDimensionPreferences> preferences = new SimpleLiveObject<>(DDimensionPreferences.EMPTY);
+	private final Consumer<DMouseEvent> onClick;
 	private DUIContext context;
 	private AspectBarSelectorButtonStyle style;
 	private DIRectangle bounds;
 	private DPath shape;
+	private boolean hovering;
+	private boolean pressing;
 	
-	public AspectBarSelectorButton(DStyleClass styleClass, DDrawable icon) {
+	private final ListenerHandle<LiveBool.Listener> activeListener;
+	
+	public AspectBarSelectorButton(DStyleClass styleClass, DDrawable icon, LiveBool active, Consumer<DMouseEvent> onClick) {
+		this.active = active;
 		this.styleClass = styleClass;
 		this.icon = icon;
+		this.onClick = onClick;
+		
+		activeListener = active.addListener((oldValue, newValue) -> repaint());
 	}
 
 	@Override
@@ -46,6 +58,7 @@ public class AspectBarSelectorButton implements DComponent {
 		this.context = context;
 		DStylePath path = parent.getChild("selectorbutton", styleClass);
 		style = new AspectBarSelectorButtonStyle(context.getStylesheets().get(context, path));
+		preferences.setValue(new DDimensionPreferences(style.width, style.height));
 		shape = DPath.roundedRectangle(
 				0,
 				0,
@@ -71,25 +84,68 @@ public class AspectBarSelectorButton implements DComponent {
 
 	@Override
 	public void paint(DCanvas canvas) {
+		int color = style.colorNormal;
+		DShadow shadow = style.shadowNormal;
+		if (active.getValue()) {
+			color = style.colorActive;
+			shadow = style.shadowActive;
+		} else if (pressing) {
+			color = style.colorPress;
+			shadow = style.shadowPress;
+		} else if (hovering) {
+			color = style.colorHover;
+			shadow = style.shadowHover;
+		}
+		
 		canvas.shadowPath(
 					shape,
 					DTransform2D.translate(bounds.x, bounds.y),
-					style.shadowColor,
-					style.shadowOffsetX,
-					style.shadowOffsetY,
-					style.shadowRadius);
-			canvas.fillPath(
-					shape,
-					DTransform2D.translate(bounds.x, bounds.y),
-					style.colorNormal);
-			icon.draw(canvas, DTransform2D.scaleAndTranslate(
-					bounds.x + (style.width - icon.getNominalWidth() * context.getScale()) / 2,
-					bounds.y + (style.height - icon.getNominalHeight() * context.getScale()) / 2,
-					context.getScale()));
+					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,
+				context.getScale()));
+	}
+	
+	@Override
+	public void onMouseEnter(DMouseEvent e) {
+		hovering = true;
+		repaint();
+	}
+	
+	@Override
+	public void onMouseExit(DMouseEvent e) {
+		hovering = false;
+		pressing = false;
+		repaint();
+	}
+	
+	@Override
+	public void onMouseDown(DMouseEvent e) {
+		pressing = true;
+		repaint();
+	}
+	
+	@Override
+	public void onMouseRelease(DMouseEvent e) {
+		if (pressing)
+			onClick.accept(e);
+		
+		pressing = false;
+		repaint();
 	}
 
 	@Override
 	public void close() {
 		// nothing
 	}
+	
+	private void repaint() {
+		if (context != null)
+			context.repaint(bounds);
+	}
 }

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.ide.ui.view.aspectbar;
 
-import org.openzen.drawablegui.dimension.DDimension;
-import org.openzen.drawablegui.dimension.DDpDimension;
+import org.openzen.drawablegui.style.DDpDimension;
+import org.openzen.drawablegui.style.DShadow;
 import org.openzen.drawablegui.style.DStyleDefinition;
 
 /**
@@ -23,10 +23,10 @@ public class AspectBarSelectorButtonStyle {
 	public final int colorPress;
 	public final int colorActive;
 	
-	public final int shadowColor;
-	public final float shadowOffsetX;
-	public final float shadowOffsetY;
-	public final float shadowRadius;
+	public final DShadow shadowNormal;
+	public final DShadow shadowHover;
+	public final DShadow shadowPress;
+	public final DShadow shadowActive;
 	
 	public AspectBarSelectorButtonStyle(DStyleDefinition style) {
 		width = style.getDimension("width", new DDpDimension(24));
@@ -34,13 +34,13 @@ public class AspectBarSelectorButtonStyle {
 		roundingRadius = style.getDimension("roundingRadius", new DDpDimension(4));
 		
 		colorNormal = style.getColor("colorNormal", 0xFFFFFFFF);
-		colorHover = style.getColor("colorHover", 0xFFCCCCCC);
-		colorPress = style.getColor("colorPress", 0xFFBBBBBB);
-		colorActive = style.getColor("colorActive", 0xFFBBBBBB);
+		colorHover = style.getColor("colorHover", 0xFFE0E0E0);
+		colorPress = style.getColor("colorPress", 0xFFCCCCCC);
+		colorActive = style.getColor("colorActive", 0xFFCCCCCC);
 		
-		shadowRadius = style.getDimension("shadowRadius", new DDpDimension(3));
-		shadowColor = style.getColor("ashadowColor", 0xFF888888);
-		shadowOffsetX = style.getDimension("shadowOffsetX", new DDpDimension(0));
-		shadowOffsetY = style.getDimension("shadowOffsetY", new DDpDimension(0.5f));
+		shadowNormal = style.getShadow("shadowNormal", context -> new DShadow(0xFF888888, 0, 0.5f * context.getScale(), 3 * context.getScale()));
+		shadowHover = style.getShadow("shadowNormal", context -> new DShadow(0xFF888888, 0, 0.5f * context.getScale(), 3 * context.getScale()));
+		shadowPress = style.getShadow("shadowNormal", context -> new DShadow(0xFF888888, 0, 0.5f * context.getScale(), 3 * context.getScale()));
+		shadowActive = style.getShadow("shadowNormal", context -> new DShadow(0xFF888888, 0, 0.5f * context.getScale(), 3 * context.getScale()));
 	}
 }

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

@@ -5,7 +5,10 @@
  */
 package org.openzen.zenscript.ide.ui.view.aspectbar;
 
-import org.openzen.drawablegui.dimension.DDpDimension;
+import org.openzen.drawablegui.DFont;
+import org.openzen.drawablegui.DFontFamily;
+import org.openzen.drawablegui.style.DDpDimension;
+import org.openzen.drawablegui.style.DShadow;
 import org.openzen.drawablegui.style.DStyleDefinition;
 
 /**
@@ -20,44 +23,45 @@ public class AspectBarStyle {
 	public final int backgroundColor;
 	public final int foregroundColor;
 	
-	public final int aspectSelectorButtonRadius;
 	public final int aspectSelectorButtonSpacing;
-	public final int aspectSelectorButtonShadowRadius;
-	public final int aspectSelectorButtonShadowColor;
-	public final float aspectSelectorButtonShadowOffsetX;
-	public final float aspectSelectorButtonShadowOffsetY;
+	public final int toolbarTitleToControlsSpacing;
 	
-	public final int aspectBarShadowRadius;
-	public final int aspectBarShadowColor;
-	public final float aspectBarShadowOffsetX;
-	public final float aspectBarShadowOffsetY;
+	public final DShadow aspectBarShadow;
 	public final int aspectBarPaddingTop;
 	
 	public final int controlPaddingTop;
 	public final int controlPaddingBottom;
 	
+	public final DFont activeToolbarTitleFont;
+	public final int activeToolbarTitleColor;
+	
+	public final int windowControlSpacingLeft;
+	public final int windowControlSpacingBottom;
+	public final DShadow windowControlShadow;
+	
 	public AspectBarStyle(DStyleDefinition style) {
 		height = style.getDimension("height", new DDpDimension(32));
 		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", 0xFFF0F0F0);
 		foregroundColor = style.getColor("foregroundColor", 0xFFFFFFFF);
 		
-		aspectSelectorButtonRadius = style.getDimension("aspectSelectorButtonRadius", new DDpDimension(12));
 		aspectSelectorButtonSpacing = style.getDimension("aspectSelectorButtonSpacing", new DDpDimension(4));
-		aspectSelectorButtonShadowRadius = style.getDimension("aspectSelectorButtonShadowRadius", new DDpDimension(3));
-		aspectSelectorButtonShadowColor = style.getColor("aspectSelectorButtonShadowColor", 0xFF888888);
-		aspectSelectorButtonShadowOffsetX = style.getDimension("aspectSelectorButtonShadowOffsetX", new DDpDimension(0));
-		aspectSelectorButtonShadowOffsetY = style.getDimension("aspectSelectorButtonShadowOffsetY", new DDpDimension(0.5f));
 		
-		aspectBarShadowRadius = style.getDimension("aspectBarShadowRadius", new DDpDimension(2));
-		aspectBarShadowColor = style.getColor("aspectBarShadowColor", 0xFF888888);
-		aspectBarShadowOffsetX = style.getDimension("aspectBarShadowOffsetX", new DDpDimension(0));
-		aspectBarShadowOffsetY = style.getDimension("aspectBarShadowOffsetX", new DDpDimension(0.5f));
+		aspectBarShadow = style.getShadow("aspectBarShadow", context -> new DShadow(0xFF888888, 0, 0.5f * context.getScale(), 2 * context.getScale()));
 		aspectBarPaddingTop = style.getDimension("aspectBarPaddingTop", new DDpDimension(2));
 		
 		controlPaddingTop = style.getDimension("controlPaddingTop", new DDpDimension(2));
 		controlPaddingBottom = style.getDimension("controlPaddingBottom", new DDpDimension(2));
+		
+		activeToolbarTitleFont = style.getFont("activeToolbarTitleFont", context -> new DFont(DFontFamily.UI, false, false, false, (int)(12.0f * context.getScale())));
+		activeToolbarTitleColor = style.getColor("activeToolbarTitleColor", 0xFF888888);
+		
+		windowControlSpacingLeft = style.getDimension("windowControlSpacingLeft", new DDpDimension(4));
+		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()));
 	}
 }

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

@@ -13,6 +13,7 @@ import org.openzen.drawablegui.BaseComponentGroup;
 import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DDimensionPreferences;
+import org.openzen.drawablegui.DFontMetrics;
 import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DTransform2D;
 import org.openzen.drawablegui.listeners.DIRectangle;
@@ -21,12 +22,20 @@ import org.openzen.drawablegui.live.SimpleLiveObject;
 import org.openzen.zenscript.ide.ui.IDEAspectBar;
 import org.openzen.zenscript.ide.ui.IDEAspectToolbar;
 import org.openzen.drawablegui.DUIContext;
+import org.openzen.drawablegui.DUIWindow;
 import org.openzen.drawablegui.listeners.ListenerHandle;
+import org.openzen.drawablegui.live.LiveBool;
 import org.openzen.drawablegui.live.LiveList;
 import org.openzen.drawablegui.live.LiveMappedList;
+import org.openzen.drawablegui.live.LivePredicateBool;
+import org.openzen.drawablegui.live.SimpleLiveBool;
 import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.drawablegui.style.DStylePath;
 import org.openzen.zenscript.ide.ui.IDEAspectBarControl;
+import org.openzen.zenscript.ide.ui.icons.CloseIcon;
+import org.openzen.zenscript.ide.ui.icons.ScalableCloseIcon;
+import org.openzen.zenscript.ide.ui.icons.ScalableMaximizeIcon;
+import org.openzen.zenscript.ide.ui.icons.ScalableMinimizeIcon;
 
 /**
  *
@@ -42,11 +51,25 @@ public class AspectBarView extends BaseComponentGroup {
 	private DUIContext context;
 	private DStylePath path;
 	private AspectBarStyle style;
+	private DFontMetrics activeToolbarTitleFontMetrics;
+	private boolean showWindowControls;
+	
+	private final LiveMappedList<IDEAspectToolbar, AspectBarSelectorButton> selectorButtons;
 	public final LiveObject<IDEAspectToolbar> active = new SimpleLiveObject<>(null);
 	private LiveMappedList<IDEAspectBarControl, DComponent> activeToolbarComponents;
 	
 	private final ListenerHandle<LiveList.Listener<IDEAspectToolbar>> listener;
 	private DPath aspectBarShape;
+	private DPath windowControlsShape;
+	private int aspectSelectorEndX = 0;
+	
+	private WindowActionButton minimize;
+	private WindowActionButton maximizeRestore;
+	private WindowActionButton close;
+	
+	private final ListenerHandle<LiveObject.Listener<DDimensionPreferences>> minimizeRelayout;
+	private final ListenerHandle<LiveObject.Listener<DDimensionPreferences>> maximizeRestoreRelayout;
+	private final ListenerHandle<LiveObject.Listener<DDimensionPreferences>> closeRelayout;
 	
 	public AspectBarView(DStyleClass styleClass, IDEAspectBar aspectBar) {
 		this.styleClass = styleClass;
@@ -55,6 +78,29 @@ public class AspectBarView extends BaseComponentGroup {
 		active.addListener(this::onActiveChanged);
 		listener = aspectBar.aspectToolbars.addListener(new ToolbarListListener());
 		
+		minimize = new WindowActionButton(scale -> new ScalableMinimizeIcon(scale), e -> context.getWindow().minimize());
+		minimizeRelayout = minimize.getDimensionPreferences().addListener((a, b) -> layout());
+		maximizeRestore = new WindowActionButton(ScalableMaximizeIcon::new, e -> {
+			if (context.getWindow().getWindowState().getValue() == DUIWindow.State.MAXIMIZED)
+				context.getWindow().restore();
+			else
+				context.getWindow().maximize();
+		});
+		maximizeRestoreRelayout = maximizeRestore.getDimensionPreferences().addListener((a, b) -> layout());
+		close = new WindowActionButton(scale -> new ScalableCloseIcon(scale), e -> context.getWindow().close());
+		closeRelayout = close.getDimensionPreferences().addListener((a, b) -> layout());
+		
+		selectorButtons = new LiveMappedList<>(
+				aspectBar.aspectToolbars,
+				bar -> {
+					LiveBool buttonActive = new LivePredicateBool<>(active, activeBar -> activeBar == bar);
+					AspectBarSelectorButton button = new AspectBarSelectorButton(DStyleClass.EMPTY, bar.icon, buttonActive, e -> active.setValue(bar));
+					if (context != null)
+						button.setContext(path, context);
+					
+					return button;
+				});
+		
 		if (aspectBar.aspectToolbars.size() > 0)
 			active.setValue(aspectBar.aspectToolbars.get(0));
 	}
@@ -64,11 +110,24 @@ public class AspectBarView extends BaseComponentGroup {
 		this.context = context;
 		this.path = parent.getChild("aspectbar", styleClass);
 		this.style = new AspectBarStyle(context.getStylesheets().get(context, path));
+		activeToolbarTitleFontMetrics = context.getFontMetrics(style.activeToolbarTitleFont);
+		showWindowControls = !context.getWindow().hasTitleBar();
+		
+		for (DComponent selectorButton : selectorButtons)
+			selectorButton.setContext(path, context);
 		
 		if (bounds != null) {
-			calculateAspectBarShape();
+			layout();
 			active.setValue(active.getValue());
 		}
+		
+		if (activeToolbarComponents != null)
+			for (DComponent component : activeToolbarComponents)
+				component.setContext(path, context);
+		
+		minimize.setContext(path, context);
+		maximizeRestore.setContext(path, context);
+		close.setContext(path, context);
 	}
 	
 	@Override
@@ -86,7 +145,7 @@ public class AspectBarView extends BaseComponentGroup {
 		this.bounds = bounds;
 		
 		if (context != null) {
-			calculateAspectBarShape();
+			layout();
 			context.repaint(bounds);
 		}
 	}
@@ -96,70 +155,45 @@ public class AspectBarView extends BaseComponentGroup {
 		canvas.pushBounds(bounds);
 		canvas.fillRectangle(bounds.x, bounds.y, bounds.width, bounds.height, style.backgroundColor);
 		
-		//DPath circle = DPath.circle(0, 0, style.aspectSelectorButtonRadius);
-		DPath circle = DPath.roundedRectangle(
-				-style.aspectSelectorButtonRadius,
-				-style.aspectSelectorButtonRadius,
-				2 * style.aspectSelectorButtonRadius,
-				2 * style.aspectSelectorButtonRadius,
-				8);
-		int x = bounds.x + style.aspectSelectorPaddingLeft;
-		int y = bounds.y;
-		for (IDEAspectToolbar toolbar : aspectBar.aspectToolbars) {
-			canvas.shadowPath(
-					circle,
-					DTransform2D.translate(x + style.aspectSelectorButtonRadius, y + style.height / 2),
-					style.aspectSelectorButtonShadowColor,
-					style.aspectSelectorButtonShadowOffsetX,
-					style.aspectSelectorButtonShadowOffsetY,
-					style.aspectSelectorButtonShadowRadius);
-			canvas.fillPath(
-					circle,
-					DTransform2D.translate(x + style.aspectSelectorButtonRadius, y + style.height / 2),
-					style.foregroundColor);
-			toolbar.icon.draw(canvas, DTransform2D.scaleAndTranslate(
-					x + (2 * style.aspectSelectorButtonRadius - toolbar.icon.getNominalWidth() * context.getScale()) / 2,
-					y + (style.height - toolbar.icon.getNominalHeight() * context.getScale()) / 2,
-					context.getScale()), 0xFF888888);
-			x += style.aspectSelectorButtonRadius * 2 + style.aspectSelectorButtonSpacing;
-		}
-		for (IDEAspectToolbar toolbar : contextBars) {
-			canvas.shadowPath(
-					circle,
-					DTransform2D.translate(x + style.aspectSelectorButtonRadius, y + style.height / 2),
-					style.aspectSelectorButtonShadowColor,
-					style.aspectSelectorButtonShadowOffsetX,
-					style.aspectSelectorButtonShadowOffsetY,
-					style.aspectSelectorButtonShadowRadius);
-			canvas.fillPath(
-					circle,
-					DTransform2D.translate(x + style.aspectSelectorButtonRadius, y + style.height / 2),
-					style.foregroundColor);
-			toolbar.icon.draw(canvas, DTransform2D.scaleAndTranslate(
-					x + (2 * style.aspectSelectorButtonRadius - toolbar.icon.getNominalWidth() * context.getScale()) / 2,
-					y + (style.height - toolbar.icon.getNominalHeight() * context.getScale()) / 2,
-					context.getScale()), 0xFF000000);
-			x += style.aspectSelectorButtonRadius * 2 + style.aspectSelectorButtonSpacing;
-		}
-		
+		for (DComponent button : selectorButtons)
+			button.paint(canvas);
 		
 		canvas.shadowPath(
 				aspectBarShape,
 				DTransform2D.IDENTITY,
-				style.aspectBarShadowColor,
-				style.aspectBarShadowOffsetX,
-				style.aspectBarShadowOffsetY,
-				style.aspectBarShadowRadius);
+				style.aspectBarShadow);
 		canvas.fillPath(
 				aspectBarShape,
 				DTransform2D.IDENTITY,
 				style.foregroundColor);
 		
+		if (active.getValue() != null) {
+			int y = bounds.y
+					+ style.aspectBarPaddingTop
+					+ (int)(activeToolbarTitleFontMetrics.getAscent() * 0.35f)
+					+ (bounds.height - style.aspectBarPaddingTop) / 2;
+			int x = aspectSelectorEndX + style.aspectSelectorToToolbarSpacing;
+			canvas.drawText(style.activeToolbarTitleFont, style.activeToolbarTitleColor, x, y, active.getValue().title);
+			canvas.fillRectangle(
+					x + activeToolbarTitleFontMetrics.getWidth(active.getValue().title) + 8,
+					bounds.y + style.aspectBarPaddingTop + 8,
+					2,
+					bounds.height - style.aspectBarPaddingTop - 16,
+					0xFFCCCCCC);
+		}
+		
 		if (activeToolbarComponents != null) {
 			for (DComponent component : activeToolbarComponents)
 				component.paint(canvas);
 		}
 		
+		if (showWindowControls) {
+			canvas.shadowPath(windowControlsShape, DTransform2D.IDENTITY, style.windowControlShadow);
+			minimize.paint(canvas);
+			maximizeRestore.paint(canvas);
+			close.paint(canvas);
+		}
+		
 		canvas.popBounds();
 	}
 
@@ -182,14 +216,54 @@ public class AspectBarView extends BaseComponentGroup {
 		layoutActiveToolbarComponents();
 	}
 	
+	private void layout() {
+		if (bounds == null)
+			return;
+		
+		layoutAspectSelectorButtons();
+		layoutActiveToolbarComponents();
+		
+		int x = bounds.x + bounds.width;
+		DDimensionPreferences closeSize = close.getDimensionPreferences().getValue();
+		DDimensionPreferences maximizeRestoreSize = maximizeRestore.getDimensionPreferences().getValue();
+		DDimensionPreferences minimizeSize = minimize.getDimensionPreferences().getValue();
+		
+		x -= closeSize.preferredWidth;
+		close.setBounds(new DIRectangle(x, bounds.y, closeSize.preferredWidth, closeSize.preferredHeight));
+		x -= maximizeRestoreSize.preferredWidth;
+		maximizeRestore.setBounds(new DIRectangle(x, bounds.y, maximizeRestoreSize.preferredWidth, maximizeRestoreSize.preferredHeight));
+		x -= minimizeSize.preferredWidth;
+		minimize.setBounds(new DIRectangle(x, bounds.y, minimizeSize.preferredWidth, minimizeSize.preferredHeight));
+		
+		calculateAspectBarShape();
+	}
+	
+	private void layoutAspectSelectorButtons() {
+		if (bounds == null)
+			return;
+		
+		int x = bounds.x + style.aspectSelectorPaddingLeft;
+		
+		for (DComponent component : selectorButtons) {
+			int width = component.getDimensionPreferences().getValue().preferredWidth;
+			int height = component.getDimensionPreferences().getValue().preferredHeight;
+			int y = bounds.y + (bounds.height - style.aspectSelectorBottomSize - height) / 2;
+			component.setBounds(new DIRectangle(x, y, width, height));
+			
+			x += width + style.aspectSelectorButtonSpacing;
+		}
+		
+		aspectSelectorEndX = x;
+	}
+	
 	private void layoutActiveToolbarComponents() {
 		if (bounds == null)
 			return;
 		
-		int x = bounds.x
-				+ style.aspectSelectorPaddingLeft
-				+ (style.aspectSelectorButtonRadius * 2 + style.aspectSelectorButtonSpacing) * (aspectBar.aspectToolbars.size() + contextBars.size())
-				+ style.aspectSelectorToToolbarSpacing;
+		int x = aspectSelectorEndX
+				+ style.aspectSelectorToToolbarSpacing
+				+ activeToolbarTitleFontMetrics.getWidth(active.getValue().title)
+				+ style.toolbarTitleToControlsSpacing;
 		
 		int y = style.aspectBarPaddingTop + style.controlPaddingTop;
 		int height = bounds.height - y - style.controlPaddingBottom;
@@ -210,6 +284,14 @@ public class AspectBarView extends BaseComponentGroup {
 		
 		for (DComponent component : activeToolbarComponents)
 			children.accept(component);
+		for (DComponent component : selectorButtons)
+			children.accept(component);
+		
+		if (showWindowControls) {
+			children.accept(minimize);
+			children.accept(maximizeRestore);
+			children.accept(close);
+		}
 	}
 
 	@Override
@@ -220,14 +302,24 @@ public class AspectBarView extends BaseComponentGroup {
 		for (DComponent component : activeToolbarComponents)
 			if (predicate.test(component))
 				return component;
+		for (DComponent component : selectorButtons)
+			if (predicate.test(component))
+				return component;
+		
+		if (showWindowControls) {
+			if (predicate.test(minimize))
+				return minimize;
+			if (predicate.test(maximizeRestore))
+				return maximizeRestore;
+			if (predicate.test(close))
+				return close;
+		}
 		
 		return null;
 	}
 	
 	private void calculateAspectBarShape() {
-		int toX = bounds.x
-				+ style.aspectSelectorPaddingLeft
-				+ (style.aspectSelectorButtonRadius * 2 + style.aspectSelectorButtonSpacing) * (aspectBar.aspectToolbars.size() + contextBars.size());
+		int toX = aspectSelectorEndX;
 		
 		aspectBarShape = tracer -> {
 			int baseY = bounds.y + bounds.height - style.aspectSelectorBottomSize;
@@ -237,11 +329,33 @@ public class AspectBarView extends BaseComponentGroup {
 					toX + 6 * context.getScale(), baseY,
 					toX + style.aspectSelectorToToolbarSpacing - 6 * context.getScale(), bounds.y + style.aspectBarPaddingTop,
 					toX + style.aspectSelectorToToolbarSpacing, bounds.y + style.aspectBarPaddingTop);
-			tracer.lineTo(bounds.x + bounds.width, bounds.y + style.aspectBarPaddingTop);
+			
+			if (showWindowControls) {
+				int spacingLeft = style.windowControlSpacingLeft;
+				int spacingBottom = style.windowControlSpacingBottom;
+				int cornerX = minimize.getBounds().x - spacingLeft;
+				int cornerY = minimize.getBounds().y + minimize.getBounds().height + spacingBottom;
+				tracer.lineTo(cornerX, bounds.y + style.aspectBarPaddingTop);
+				tracer.lineTo(cornerX, cornerY);
+				tracer.lineTo(bounds.x + bounds.width, cornerY);
+			} else {
+				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.close();
 		};
+		
+		if (showWindowControls) {
+			DIRectangle minimizeBounds = minimize.getBounds();
+			DIRectangle closeBounds = close.getBounds();
+			windowControlsShape = DPath.rectangle(
+					minimizeBounds.x,
+					minimizeBounds.y,
+					closeBounds.x + closeBounds.width - minimizeBounds.x,
+					closeBounds.height);
+		}
 	}
 	
 	private class ToolbarListListener implements LiveList.Listener<IDEAspectToolbar> {
@@ -251,14 +365,15 @@ public class AspectBarView extends BaseComponentGroup {
 			if (index == 0 && activeToolbarComponents == null)
 				active.setValue(value);
 			
-			layoutActiveToolbarComponents();
-			calculateAspectBarShape();
+			layout();
 		}
 
 		@Override
 		public void onChanged(int index, IDEAspectToolbar oldValue, IDEAspectToolbar newValue) {
 			if (oldValue == active.getValue())
 				active.setValue(newValue);
+			
+			layoutAspectSelectorButtons();
 		}
 
 		@Override
@@ -266,8 +381,7 @@ public class AspectBarView extends BaseComponentGroup {
 			if (oldValue == active.getValue())
 				active.setValue(aspectBar.aspectToolbars.size() == 0 ? null : aspectBar.aspectToolbars.get(0));
 			
-			layoutActiveToolbarComponents();
-			calculateAspectBarShape();
+			layout();
 		}
 	}
 }

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

@@ -0,0 +1,142 @@
+/*
+ * 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.aspectbar;
+
+import java.util.function.Consumer;
+import java.util.function.Function;
+import org.openzen.drawablegui.DCanvas;
+import org.openzen.drawablegui.DColorableIcon;
+import org.openzen.drawablegui.DComponent;
+import org.openzen.drawablegui.DDimensionPreferences;
+import org.openzen.drawablegui.DMouseEvent;
+import org.openzen.drawablegui.DTransform2D;
+import org.openzen.drawablegui.DUIContext;
+import org.openzen.drawablegui.listeners.DIRectangle;
+import org.openzen.drawablegui.listeners.ListenerHandle;
+import org.openzen.drawablegui.live.LiveBool;
+import org.openzen.drawablegui.live.LiveObject;
+import org.openzen.drawablegui.live.SimpleLiveObject;
+import org.openzen.drawablegui.style.DStylePath;
+import org.openzen.zenscript.ide.ui.icons.ScalableCloseIcon;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class WindowActionButton implements DComponent {
+	private final SimpleLiveObject<DDimensionPreferences> preferences = new SimpleLiveObject<>(DDimensionPreferences.EMPTY);
+	
+	private final Function<Float, DColorableIcon> scalableIcon;
+	private final Consumer<DMouseEvent> action;
+	
+	private LiveBool windowFocused;
+	private ListenerHandle<LiveBool.Listener> windowFocusedListener;
+	
+	private DColorableIcon icon;
+	private DIRectangle bounds;
+	private boolean hover;
+	private boolean press;
+	private DUIContext context;
+	
+	public WindowActionButton(Function<Float, DColorableIcon> icon, Consumer<DMouseEvent> action) {
+		this.scalableIcon = icon;
+		this.action = action;
+	}
+
+	@Override
+	public void setContext(DStylePath parent, DUIContext context) {
+		this.context = context;
+		
+		windowFocused = context.getWindow().getActive();
+		windowFocusedListener = windowFocused.addListener((a, b) -> repaint());
+		
+		icon = scalableIcon == null ? null : scalableIcon.apply(context.getScale());
+		preferences.setValue(new DDimensionPreferences(
+				(int)(48 * context.getScale()),
+				(int)(24 * context.getScale())));
+	}
+
+	@Override
+	public LiveObject<DDimensionPreferences> getDimensionPreferences() {
+		return preferences;
+	}
+
+	@Override
+	public DIRectangle getBounds() {
+		return bounds;
+	}
+
+	@Override
+	public void setBounds(DIRectangle bounds) {
+		this.bounds = bounds;
+	}
+
+	@Override
+	public void paint(DCanvas canvas) {
+		int color = 0xFFFFFFFF;
+		int iconColor = windowFocused.getValue() ? 0xFF000000 : 0xFF999999;
+		
+		if (hover) {
+			if (icon instanceof ScalableCloseIcon) {
+				color = 0xFFE81123;
+				iconColor = 0xFFFFFFFF;
+			} else {
+				color = 0xFFE0E0E0;
+			}
+		}
+		if (press)
+			color = 0xFFCCCCCC;
+		
+		
+		canvas.fillRectangle(bounds.x, bounds.y, bounds.width, bounds.height, color);
+		
+		if (scalableIcon != null) {
+			int iconX = bounds.x + (int)(bounds.width - icon.getNominalWidth()) / 2;
+			int iconY = bounds.y + (int)(bounds.height - icon.getNominalHeight()) / 2;
+			icon.draw(canvas, DTransform2D.translate(iconX, iconY), iconColor);
+		}
+	}
+
+	@Override
+	public void close() {
+		windowFocusedListener.close();
+	}
+	
+	@Override
+	public void onMouseEnter(DMouseEvent e) {
+		hover = true;
+		repaint();
+	}
+	
+	@Override
+	public void onMouseExit(DMouseEvent e) {
+		hover = false;
+		press = false;
+		repaint();
+	}
+	
+	@Override
+	public void onMouseDown(DMouseEvent e) {
+		press = true;
+		repaint();
+	}
+	
+	@Override
+	public void onMouseRelease(DMouseEvent e) {
+		if (press)
+			action.accept(e);
+		
+		press = false;
+		repaint();
+	}
+	
+	private void repaint() {
+		if (context == null)
+			return;
+		
+		context.repaint(bounds);
+	}
+}

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

@@ -22,13 +22,14 @@ import org.openzen.drawablegui.live.SimpleLiveObject;
 import org.openzen.zenscript.ide.host.IDESourceFile;
 import org.openzen.zenscript.ide.ui.IDEAspectToolbar;
 import org.openzen.zenscript.ide.ui.IDEWindow;
-import org.openzen.zenscript.ide.ui.icons.ColorableCodeIcon;
+import org.openzen.zenscript.ide.ui.icons.CodeIcon;
 import org.openzen.zenscript.lexer.ReaderCharReader;
 import org.openzen.zenscript.lexer.TokenParser;
 import org.openzen.zenscript.lexer.ZSToken;
 import org.openzen.zenscript.lexer.ZSTokenParser;
 import org.openzen.zenscript.lexer.ZSTokenType;
 import org.openzen.drawablegui.DUIContext;
+import org.openzen.drawablegui.live.SimpleLiveBool;
 import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.drawablegui.style.DStylePath;
 import org.openzen.zenscript.ide.ui.icons.SaveIcon;
@@ -46,6 +47,7 @@ public class SourceEditor implements DComponent {
 	private final IDESourceFile sourceFile;
 	private final TokenModel tokens;
 	private final ListenerHandle<TokenModel.Listener> tokenListener;
+	private final SimpleLiveBool unchanged = new SimpleLiveBool(true);
 	
 	private DIRectangle bounds;
 	private DUIContext context;
@@ -67,7 +69,7 @@ public class SourceEditor implements DComponent {
 	private boolean dragging = false;
 	
 	private final IDEWindow window;
-	private final IDEAspectToolbar editToolbar = new IDEAspectToolbar(0, ColorableCodeIcon.INSTANCE, "Edit", "Source code editor");
+	private final IDEAspectToolbar editToolbar = new IDEAspectToolbar(0, CodeIcon.GREY, "Edit", "Source code editor");
 	
 	public SourceEditor(DStyleClass styleClass, IDEWindow window, IDESourceFile sourceFile) {
 		this.styleClass = styleClass;
@@ -77,7 +79,7 @@ public class SourceEditor implements DComponent {
 		tokens = new TokenModel(sourceFile.getName(), tab.length());
 		tokenListener = tokens.addListener(new TokenListener());
 		
-		editToolbar.controls.add(() -> new IconButtonControl(SaveIcon.INSTANCE, e -> save()));
+		editToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, SaveIcon.BLACK, SaveIcon.GREY, unchanged, e -> save()));
 		window.aspectBar.addToolbar(editToolbar);
 		
 		try {
@@ -94,6 +96,7 @@ public class SourceEditor implements DComponent {
 	@Override
 	public void close() {
 		window.aspectBar.removeToolbar(editToolbar);
+		tokenListener.close();
 	}
 
 	@Override
@@ -374,6 +377,7 @@ public class SourceEditor implements DComponent {
 		
 		SourcePosition cursor = SourcePosition.min(cursorStart, cursorEnd);
 		setCursor(cursor, cursor);
+		unchanged.setValue(false);
 	}
 	
 	private void paste() {
@@ -386,11 +390,13 @@ public class SourceEditor implements DComponent {
 		
 		SourcePosition cursor = cursorEnd.advance(text.length());
 		setCursor(cursor, cursor);
+		unchanged.setValue(false);
 	}
 	
 	private void save() {
 		String content = tokens.toString();
 		sourceFile.update(content);
+		unchanged.setValue(true);
 	}
 	
 	private void delete() {
@@ -405,6 +411,7 @@ public class SourceEditor implements DComponent {
 		}
 		
 		tokens.deleteCharacter(cursorEnd.line, cursorEnd.offset);
+		unchanged.setValue(false);
 	}
 	
 	private boolean hasSelection() {
@@ -417,6 +424,7 @@ public class SourceEditor implements DComponent {
 			SourcePosition max = SourcePosition.max(cursorStart, cursorEnd);
 			tokens.delete(min, max);
 			setCursor(min, min);
+			unchanged.setValue(false);
 			return true;
 		}
 		
@@ -433,6 +441,7 @@ public class SourceEditor implements DComponent {
 			
 			int length = tokens.getLineLength(cursorEnd.line - 1);
 			tokens.deleteNewline(cursorEnd.line - 1);
+			unchanged.setValue(false);
 			
 			SourcePosition position = new SourcePosition(tokens, cursorEnd.line - 1, length);
 			setCursor(position, position);
@@ -454,6 +463,7 @@ public class SourceEditor implements DComponent {
 		tokens.insert(cursorEnd, value);
 		SourcePosition position = new SourcePosition(tokens, cursorEnd.line, cursorEnd.offset + value.length());
 		setCursor(position, position);
+		unchanged.setValue(false);
 	}
 	
 	private void newline() {
@@ -463,6 +473,7 @@ public class SourceEditor implements DComponent {
 		tokens.insert(cursorEnd, "\n" + indent);
 		SourcePosition position = new SourcePosition(tokens, cursorEnd.line + 1, indent.length());
 		setCursor(position, position);
+		unchanged.setValue(false);
 	}
 	
 	private void repaint(SourcePosition from, SourcePosition to) {

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.ide.ui.view.editor;
 
-import org.openzen.drawablegui.dimension.DDpDimension;
-import org.openzen.drawablegui.dimension.DPxDimension;
+import org.openzen.drawablegui.style.DDpDimension;
+import org.openzen.drawablegui.style.DPxDimension;
 import org.openzen.drawablegui.style.DStyleDefinition;
 
 /**

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

@@ -101,9 +101,12 @@ public class TokenRelexer {
 			int result = peek();
 			tokenOffset++;
 			if (tokenOffset == token.length()) {
-				advance();
-				token = get();
-				tokenOffset = 0;
+				if (advance()) {
+					token = get();
+					tokenOffset = 0;
+				} else {
+					token = null;
+				}
 			}
 			return result;
 		}

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

@@ -10,7 +10,7 @@ import org.openzen.drawablegui.live.LiveList;
 import org.openzen.drawablegui.live.LiveMappedList;
 import org.openzen.zenscript.ide.host.IDELibrary;
 import org.openzen.zenscript.ide.ui.IDEWindow;
-import org.openzen.zenscript.ide.ui.icons.ColorableLibraryIcon;
+import org.openzen.zenscript.ide.ui.icons.LibraryIcon;
 
 /**
  *
@@ -28,7 +28,7 @@ public class LibraryTreeNode extends ProjectOverviewNode {
 	
 	@Override
 	public DColorableIcon getIcon() {
-		return ColorableLibraryIcon.INSTANCE;
+		return LibraryIcon.INSTANCE;
 	}
 
 	@Override

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

@@ -8,7 +8,7 @@ package org.openzen.zenscript.ide.ui.view.project;
 import org.openzen.drawablegui.DColorableIcon;
 import org.openzen.zenscript.ide.host.IDEModule;
 import org.openzen.zenscript.ide.ui.IDEWindow;
-import org.openzen.zenscript.ide.ui.icons.ColorableModuleIcon;
+import org.openzen.zenscript.ide.ui.icons.ModuleIcon;
 
 /**
  *
@@ -29,7 +29,7 @@ public class ModuleTreeNode extends PackageTreeNode {
 
 	@Override
 	public DColorableIcon getIcon() {
-		return ColorableModuleIcon.INSTANCE;
+		return ModuleIcon.INSTANCE;
 	}
 
 	@Override

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

@@ -11,7 +11,7 @@ import org.openzen.drawablegui.live.LiveList;
 import org.openzen.drawablegui.live.LiveMappedList;
 import org.openzen.zenscript.ide.host.IDEPackage;
 import org.openzen.zenscript.ide.ui.IDEWindow;
-import org.openzen.zenscript.ide.ui.icons.ColorableFolderIcon;
+import org.openzen.zenscript.ide.ui.icons.FolderIcon;
 
 /**
  *
@@ -42,7 +42,7 @@ public class PackageTreeNode extends ProjectOverviewNode {
 
 	@Override
 	public DColorableIcon getIcon() {
-		return ColorableFolderIcon.INSTANCE;
+		return FolderIcon.INSTANCE;
 	}
 
 	@Override

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.ide.ui.view.project;
 
-import org.openzen.drawablegui.DMouseEvent;
 import org.openzen.drawablegui.live.LiveBool;
+import org.openzen.drawablegui.live.SimpleLiveBool;
 import org.openzen.drawablegui.tree.DTreeNode;
 
 /**
@@ -14,7 +14,7 @@ import org.openzen.drawablegui.tree.DTreeNode;
  * @author Hoofdgebruiker
  */
 public abstract class ProjectOverviewNode implements DTreeNode<ProjectOverviewNode> {
-	private final LiveBool collapsed = new LiveBool();
+	private final LiveBool collapsed = new SimpleLiveBool();
 	
 	public abstract Kind getKind();
 	

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

@@ -10,7 +10,7 @@ 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.ColorableProjectIcon;
+import org.openzen.zenscript.ide.ui.icons.ProjectIcon;
 
 /**
  *
@@ -28,7 +28,7 @@ public class ProjectTreeNode extends ProjectOverviewNode {
 	
 	@Override
 	public DColorableIcon getIcon() {
-		return ColorableProjectIcon.INSTANCE;
+		return ProjectIcon.INSTANCE;
 	}
 
 	@Override

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

@@ -11,7 +11,7 @@ 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.ColorableProjectIcon;
+import org.openzen.zenscript.ide.ui.icons.ProjectIcon;
 
 /**
  *
@@ -31,7 +31,7 @@ public class RootTreeNode extends ProjectOverviewNode {
 	
 	@Override
 	public DColorableIcon getIcon() {
-		return ColorableProjectIcon.INSTANCE;
+		return ProjectIcon.INSTANCE;
 	}
 	
 	@Override

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

@@ -11,7 +11,7 @@ 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.ColorableCodeIcon;
+import org.openzen.zenscript.ide.ui.icons.CodeIcon;
 
 /**
  *
@@ -33,7 +33,7 @@ public class SourceFileTreeNode extends ProjectOverviewNode {
 
 	@Override
 	public DColorableIcon getIcon() {
-		return ColorableCodeIcon.INSTANCE;
+		return CodeIcon.INSTANCE;
 	}
 
 	@Override