diff --git a/Sources/arm/Uniforms.hx b/Sources/arm/Uniforms.hx
index 21d9ba46..5ddf10ae 100644
--- a/Sources/arm/Uniforms.hx
+++ b/Sources/arm/Uniforms.hx
@@ -16,20 +16,27 @@ class Uniforms {
 
 	public static function linkFloat(object:Object, mat:MaterialData, link:String):Null<kha.FastFloat> {
 		if (link == '_brushRadius') {
-			var r = (UITrait.inst.brushRadius * UITrait.inst.brushNodesRadius) / 15.0;
+			var val = (UITrait.inst.brushRadius * UITrait.inst.brushNodesRadius) / 15.0;
 			var pen = iron.system.Input.getPen();
-			if (UITrait.penPressure && pen.down()) r *= pen.pressure;
-			r *= 900 / App.h(); // Projection ratio
-			return r;
+			if (UITrait.penPressureRadius && pen.down()) val *= pen.pressure;
+			val *= 900 / App.h(); // Projection ratio
+			return val;
 		}
 		else if (link == '_brushOpacity') {
-			return UITrait.inst.brushOpacity * UITrait.inst.brushNodesOpacity;
-		}
-		else if (link == '_brushScale') {
-			return UITrait.inst.brushScale * UITrait.inst.brushNodesScale;
+			var val = UITrait.inst.brushOpacity * UITrait.inst.brushNodesOpacity;
+			var pen = iron.system.Input.getPen();
+			if (UITrait.penPressureOpacity && pen.down()) val *= pen.pressure;
+			return val;
 		}
 		else if (link == '_brushHardness') {
-			return UITrait.inst.brushHardness * UITrait.inst.brushNodesHardness;
+			var val = UITrait.inst.brushHardness * UITrait.inst.brushNodesHardness;
+			var pen = iron.system.Input.getPen();
+			if (UITrait.penPressureHardness && pen.down()) val *= pen.pressure;
+			return val;
+		}
+		else if (link == '_brushScale') {
+			var val = UITrait.inst.brushScale * UITrait.inst.brushNodesScale;
+			return val;
 		}
 		else if (link == '_paintDepthBias') {
 			var f = 0.0001;
diff --git a/Sources/arm/ui/UITrait.hx b/Sources/arm/ui/UITrait.hx
index fbe2c36c..26558e89 100644
--- a/Sources/arm/ui/UITrait.hx
+++ b/Sources/arm/ui/UITrait.hx
@@ -31,7 +31,9 @@ class UITrait extends iron.Trait {
 	public static var inst:UITrait;
 	public static var defaultWindowW = 280;
 
-	public static var penPressure = true;
+	public static var penPressureRadius = true;
+	public static var penPressureOpacity = false;
+	public static var penPressureHardness = false;
 	public var undoI = 0; // Undo layer
 	public var undos = 0; // Undos available
 	public var redos = 0; // Redos available
@@ -1890,7 +1892,7 @@ class UITrait extends iron.Trait {
 
 			if (ui.tab(htab, "Preferences")) {
 				
-				if (ui.panel(Id.handle({selected: true}), "Interface", 1)) {
+				if (ui.panel(Id.handle({selected: false}), "Interface", 1)) {
 					var hscale = Id.handle({value: App.C.window_scale});
 					ui.slider(hscale, "UI Scale", 0.5, 4.0, true);
 					if (!hscale.changed && hscaleWasChanged) {
@@ -1938,7 +1940,7 @@ class UITrait extends iron.Trait {
 				}
 
 				ui.separator();
-				if (ui.panel(Id.handle({selected: true}), "Usage", 1)) {
+				if (ui.panel(Id.handle({selected: false}), "Usage", 1)) {
 					undoHandle = Id.handle({value: App.C.undo_steps});
 					App.C.undo_steps = Std.int(ui.slider(undoHandle, "Undo Steps", 1, 64, false, 1));
 					if (undoHandle.changed) {
@@ -1958,7 +1960,13 @@ class UITrait extends iron.Trait {
 						ui.g.begin(false);
 						armory.data.Config.save();
 					}
-					penPressure = ui.check(Id.handle({selected: penPressure}), "Pen Pressure");
+				}
+
+				ui.separator();
+				if (ui.panel(Id.handle({selected: false}), "Pen Pressure", 1)) {
+					penPressureRadius = ui.check(Id.handle({selected: penPressureRadius}), "Brush Radius");
+					penPressureOpacity = ui.check(Id.handle({selected: penPressureOpacity}), "Brush Opacity");
+					penPressureHardness = ui.check(Id.handle({selected: penPressureHardness}), "Brush Hardness");
 				}
 
 				#if arm_debug