From 999723dd1438c938a872e6b90162617ef66937d6 Mon Sep 17 00:00:00 2001
From: omigamedev <omarator@gmail.com>
Date: Thu, 14 Feb 2019 02:08:29 +0100
Subject: [PATCH] enable rtt dtor, default values for <text> node, dual-brush
 wip, more brush options

---
 data/layout.xml           | 730 +++++++++++++++++++++++++-------------
 src/abr.cpp               |   2 +-
 src/app_layout.cpp        |   2 +-
 src/app_shaders.cpp       |   5 +-
 src/brush.cpp             |  60 +++-
 src/brush.h               |  49 ++-
 src/canvas.cpp            | 166 ++++++---
 src/canvas.h              |  14 +-
 src/canvas_modes.cpp      |  25 +-
 src/layout.cpp            |   1 +
 src/node_button.cpp       |   3 +
 src/node_canvas.cpp       |  17 +-
 src/node_checkbox.cpp     |   2 +
 src/node_image.cpp        |   1 +
 src/node_panel_brush.cpp  |  58 ++-
 src/node_panel_brush.h    |  29 +-
 src/node_panel_stroke.cpp | 147 +++++++-
 src/node_panel_stroke.h   |  28 +-
 src/node_text.cpp         |   1 +
 src/node_text.h           |   4 +-
 src/node_viewport.cpp     |   1 +
 src/pch.h                 |   1 +
 src/rtt.cpp               |   2 +-
 src/shader.h              |   3 +
 src/util.cpp              |  13 +
 src/util.h                |  23 +-
 26 files changed, 998 insertions(+), 389 deletions(-)

diff --git a/data/layout.xml b/data/layout.xml
index 027bb8d..5a53e8c 100644
--- a/data/layout.xml
+++ b/data/layout.xml
@@ -1,30 +1,5 @@
 <?xml version="1.0"?>
 <root>
-  <layout id="button">
-    <border width="50" margin="0 5 0 0" color=".1" thickness="1" border-color=".5">
-      <text text="A" font-face="arial" font-size="11"/>
-    </border>
-  </layout>
-
-  <layout id="multi-button-item">
-    <button-custom height="50%" width="50%" justify="center" align="center">
-        <text text="A" font-face="arial" font-size="11"/>
-    </button-custom>
-  </layout>
-
-  <layout id="multi-button">
-    <node width="50" margin="0 5 0 0" dir="row" wrap="1" flood-events="1">
-      <ref id="multi-button-item"/>
-      <ref id="multi-button-item"/>
-      <ref id="multi-button-item"/>
-      <ref id="multi-button-item"/>
-    </node>
-  </layout>
-
-  <layout id="rounded-inside">
-    <border thickness="1" border-color=".9" color=".4" height="100%" pad="10">
-    </border>
-  </layout>
 
   <!--brush icon-->
   <layout id="tpl-brush-icon">
@@ -38,10 +13,10 @@
     <border height="30" border-color="1" thickness="1" color=".4" dir="col" margin="1 0 1 0">
       <node dir="row" height="30">
         <node width="30" pad="1">
-          <checkbox id="cb" icon="data/ui/check-layer-visibility.png"></checkbox>
+          <checkbox id="cb" icon="data/ui/check-layer-visibility.png"/>
         </node>
         <node width="1" grow="1" justify="center" pad="5">
-          <text id="label" font-face="arial" font-size="11"/>
+          <text id="label"/>
         </node>
       </node>
     </border>
@@ -51,11 +26,11 @@
   <layout id="tpl-panel-layers">
     <node width="220" margin="0 0 10 0" rtl="ltr">
       <border height="30" color=".5" align="center" justify="center" margin="0 0 0 0">
-        <text text="Layers" font-face="arial" font-size="11" color="1 1 1 1"/>
+        <text text="Layers" color="1 1 1 1"/>
       </border>
       
       <border height="35" color=".5" dir="row" align="center" flood-events="1" pad="0 0 5 0">
-        <checkbox id="alpha-lock" icon="data/ui/check-lock-transparency.png" width="30" margin="0 5 0 5"></checkbox>
+        <checkbox id="alpha-lock" icon="data/ui/check-lock-transparency.png" width="30" margin="0 5 0 5"/>
         <combobox id="blend-mode" width="100" height="30" margin="0 5 0 0" combo-list="Normal,-,Multiply,Screen,-,Color Dodge,Overlay" default="0"/>
         <slider-h id="opacity" value="1" grow="1" width="1" margin="0 5 0 0"/>
       </border>
@@ -148,7 +123,7 @@
   <layout id="tpl-panel-color">
     <node width="220" margin="0 0 10 0" rtl="ltr">
       <border height="30" color=".5" align="center" justify="center">
-        <text text="Colors" font-face="arial" font-size="11" color="1 1 1 1"/>
+        <text text="Colors" color="1 1 1 1"/>
       </border>
       <border color=".3" pad="5" dir="row" height="250">
         <color-quad id="quad" color="1 0 0 1" height="100%" grow="1"/>
@@ -161,34 +136,30 @@
   <layout id="tpl-panel-stroke">
     <node width="220" margin="0 0 10 0" rtl="ltr">
       <border height="30" color=".5" align="center" justify="center">
-        <text text="Stroke" font-face="arial" font-size="11" color="1 1 1 1"/>
+        <text text="Stroke" color="1 1 1 1"/>
       </border>
       <border color=".3" pad="5" dir="col" width="100%">
-        <border color=".2" pad="3" margin="0 0 10 0"> 
+
+        <!-- PREVIEW -->
+
+        <border color=".2" pad="3" margin="0 0 0 0"> 
           <stroke-preview id="canvas" width="100%" height="100"/>
-          <button-custom id="tip-change" width="50" height="50" position="0 56" positioning="absolute" pad="3">
-            <image id="tip-change-thumb" width="100%" height="100%"/>
-          </button-custom>
         </border>
-        
-        <border color=".2" height="20" justify="center" align="center"><text text="Tip Settings" font-face="arial" font-size="11"/></border>
+
+        <!-- PRESET AND SHAPE -->
+
         <node dir="row">
           <node width="30%" dir="col">
-            <!--<node height="20" justify="center" margin="5 0 5 0"><text text="Shade" font-face="arial" font-size="11"/></node>-->
-            <node height="40" justify="center" margin="5 0 0 0"><text text="Preset" font-face="arial" font-size="11"/></node>
-            <node height="30" justify="center" margin="5 0 5 0"><text text="Blend" font-face="arial" font-size="11"/></node>
-            <node height="20" justify="center"><text text="Size" font-face="arial" font-size="11"/></node>
-            <node height="20" justify="center"><text text="Flow" font-face="arial" font-size="11"/></node>
-            <node height="20" justify="center"><text text="Opacity" font-face="arial" font-size="11"/></node>
-            <node height="20" justify="center" margin="5 0 0 0"><text text="Spacing" font-face="arial" font-size="11"/></node>
-            <node height="20" justify="center"><text text="Angle" font-face="arial" font-size="11"/></node>
-            <node height="30" justify="center" margin="5 0 0 0"><text text="Stencil" font-face="arial" font-size="11"/></node>
-            <node height="20" justify="center" margin="5 0 0 0"><text text="Mixer" font-face="arial" font-size="11"/></node>
-            <node height="20" justify="center"><text text="Wet" font-face="arial" font-size="11"/></node>
-            <node height="20" justify="center"><text text="Noise" font-face="arial" font-size="11"/></node>
-            <node height="20" justify="center" margin="5 0 0 0"><text text="Hue" font-face="arial" font-size="11"/></node>
-            <node height="20" justify="center"><text text="Sat" font-face="arial" font-size="11"/></node>
-            <node height="20" justify="center"><text text="Val" font-face="arial" font-size="11"/></node>
+            <!--<node height="20" justify="center" margin="5 0 5 0"><text text="Shade"/></node>-->
+            <node height="40" justify="center" margin="5 0 0 0">
+              <text text="Preset"/>
+            </node>
+            <node height="40" justify="center" margin="5 0 0 0">
+              <text text="Shape"/>
+            </node>
+            <node height="20" justify="center" margin="5 0 0 0">
+              <text text="Aspect"/>
+            </node>
           </node>
           <node dir="col" align="center" grow="1" width="1" flood-events="1">
             <!--<node height="20" pad="1" width="100%" margin="5 0 5 0"><slider-h id="tip-shade" value="1"/></node>-->
@@ -196,78 +167,341 @@
               <image id="preset-thumb" path="data/thumbs/Round-Hard.png" width="32" height="100%"/>
               <stroke-preview id="preset-preview" width="10" grow="1" height="100%"/>
             </button-custom>
-            <node height="30" pad="1" width="100%" dir="row" margin="5 0 5 0">
-              <combobox id="blend-mode" text="Normal" width="100%" height="30" combo-list="Normal,-,Multiply,Screen,-,Color Dodge,Overlay" default="0"/>
-            </node>
-            <node height="20" pad="1" width="100%" dir="row">
-              <slider-h id="tip-size"  width="1" grow="1" value=".25"/>
-              <node width="20" pad="0" margin="0 0 0 2">
-                <checkbox id="tip-size-pressure"></checkbox>
+            <node dir="row" margin="5 0 0 0">
+              <button-custom id="tip-change" width="40" height="40" dir="row" pad="4">
+                <image id="tip-change-thumb" width="32" height="100%"/>
+              </button-custom>
+              <node width="1" grow="1" height="40">
+                <node align="center" dir="row">
+                  <checkbox id="tip-invert" width="20" height="19"/>
+                  <text text="invert value"/>
+                </node>
+                <node align="center" dir="row">
+                  <checkbox id="tip-flipx" width="20" height="19"/>
+                  <text text="flipX"/>
+                  <checkbox id="tip-flipy" width="20" height="19" margin="0 0 0 5"/>
+                  <text text="flipY"/>
+                </node>
               </node>
             </node>
-            <node height="20" pad="1" width="100%" dir="row">
-              <slider-h id="tip-flow"  width="1" grow="1" value=".5"/>
-              <node width="20" pad="0" margin="0 0 0 2">
-                <checkbox id="tip-flow-pressure"></checkbox>
+            <node height="20" dir="row" pad="1" width="100%" margin="5 0 0 0">
+              <slider-h id="tip-aspect" width="1" grow="1" value="0.5"/>
+              <button-custom id="tip-aspect-reset" width="20" height="20" margin="0 0 0 5">
+                <icon icon="arrow_rotate_clockwise"/>
+              </button-custom>
+            </node>
+          </node>
+        </node>
+
+        <!-- COLOR -->
+
+        <border color=".2" height="20" justify="center" align="center" margin="5 0 5 0">
+          <text text="Color"/>
+        </border>
+        <node dir="row">
+          <node width="30%" dir="col">
+            <!--labels-->
+            <node height="30" justify="center" margin="0 0 5 0">
+              <text text="Blend"/>
+            </node>
+            <node height="20" justify="center" margin="0 0 20 0">
+              <text text="Flow"/>
+            </node>
+            <node height="20" justify="center">
+              <text text="Opacity"/>
+            </node>
+          </node>
+          <node dir="col" align="center" grow="1" width="1">
+            <!--controls-->
+            <node height="30" pad="1" width="100%" dir="row" margin="0 0 5 0">
+              <combobox id="blend-mode" text="Normal" width="100%" height="28" combo-list="Normal,-,Multiply,Screen,-,Color Dodge,Overlay" default="0"/>
+            </node>
+            <node height="40" pad="1" width="100%" dir="col">
+              <slider-h id="tip-flow" height="19" value=".5"/>
+              <node align="center" dir="row">
+                <checkbox id="tip-flow-pressure" width="20" height="19"/>
+                <text text="flow pressure"/>
               </node>
             </node>
-            <node height="20" pad="1" width="100%"><slider-h id="tip-opacity" value="1"/></node>
-            <node height="20" pad="1" width="100%" margin="5 0 0 0"><slider-h id="tip-spacing" value=".25"/></node>
-            <node height="20" pad="1" width="100%" dir="row">
-              <slider-h id="tip-angle" width="1" grow="1"/>
-              <node width="20" pad="0" margin="0 0 0 2">
-                <checkbox id="tip-angle-follow"></checkbox>
+            <node height="20" pad="1" width="100%">
+              <slider-h id="tip-opacity" value="1"/>
+            </node>
+          </node>
+        </node>
+
+        <!-- METRICS -->
+
+        <border color=".2" height="20" justify="center" align="center" margin="5 0 5 0">
+          <text text="Metrics"/>
+        </border>
+        <node dir="row">
+          <node width="30%" dir="col">
+            <!--labels-->
+            <node height="20" justify="center" margin="0 0 20 0">
+              <text text="Size"/>
+            </node>
+            <node height="20" justify="center">
+              <text text="Spacing"/>
+            </node>
+            <node height="20" justify="center" margin="0 0 20 0">
+              <text text="Angle"/>
+            </node>
+            <node height="20" justify="center">
+              <text text="Delay"/>
+            </node>
+          </node>
+          <node dir="col" align="center" grow="1" width="1">
+            <!--controls-->
+            <node height="40" pad="1" width="100%" dir="col">
+              <slider-h id="tip-size" height="19" value=".25"/>
+              <node align="center" dir="row">
+                <checkbox id="tip-size-pressure" width="20" height="19"/>
+                <text text="size pressure"/>
               </node>
             </node>
-            <node height="30" pad="1" width="100%" dir="row" margin="5 0 0 0">
-              <slider-h id="tip-stencil" width="1" grow="1"/>
-              <node width="50"  pad="0" margin="0 0 0 5">
-                <button id="tip-stencil-load" text="Load" height="30"></button>
+            <node height="20" pad="1" width="100%">
+              <slider-h id="tip-spacing" value=".25"/>
+            </node>
+            <node height="40" pad="1" width="100%" dir="col">
+              <slider-h id="tip-angle" height="19"/>
+              <node align="center" dir="row">
+                <checkbox id="tip-angle-follow" width="20" height="19"/>
+                <text text="direction"/>
               </node>
             </node>
-            <node height="20" pad="1" width="100%" margin="5 0 0 0"><slider-h id="tip-mix"/></node>
-            <node height="20" pad="1" width="100%"><slider-h id="tip-wet"/></node>
-            <node height="20" pad="1" width="100%"><slider-h id="tip-noise"/></node>
-            <node height="20" pad="1" width="100%" dir="row" margin="5 0 0 0">
-              <slider-h id="tip-hue" width="1" grow="1"/>
-              <node width="20" pad="0" margin="0 0 0 2">
-                <checkbox id="tip-hue-pressure"></checkbox>
-              </node>
-            </node>
-            <node height="20" pad="1" width="100%" dir="row">
-              <slider-h id="tip-sat" width="1" grow="1"/>
-              <node width="20" pad="0" margin="0 0 0 2">
-                <checkbox id="tip-sat-pressure"></checkbox>
-              </node>
-            </node>
-            <node height="20" pad="1" width="100%" dir="row">
-              <slider-h id="tip-val" width="1" grow="1"/>
-              <node width="20" pad="0" margin="0 0 0 2">
-                <checkbox id="tip-val-pressure"></checkbox>
-              </node>
+            <node height="20" pad="1" width="100%">
+              <slider-h id="tip-angle-delay" value="0"/>
             </node>
           </node>
         </node>
         
-        <border color=".2" height="20" justify="center" align="center" margin="5 0 5 0"><text text="Jitter Settings" font-face="arial" font-size="11"/></border>
+        <!-- TEXTURE -->
+
+        <border color=".2" height="20" dir="row" justify="center" align="center" margin="5 0 5 0">
+          <checkbox id="tex-enabled" width="20" height="20"/>
+          <node align="center" width="1" grow="1">
+            <text text="Texture"/>
+          </node>
+        </border>
         <node dir="row">
           <node width="30%" dir="col">
-            <node height="20" justify="center"><text text="Scale" font-face="arial" font-size="11"/></node>
-            <node height="20" justify="center"><text text="Angle" font-face="arial" font-size="11"/></node>
-            <node height="20" justify="center"><text text="Spread" font-face="arial" font-size="11"/></node>
-            <node height="20" justify="center"><text text="Flow" font-face="arial" font-size="11"/></node>
-            <node height="20" justify="center"><text text="Hue" font-face="arial" font-size="11"/></node>
-            <node height="20" justify="center"><text text="Sat" font-face="arial" font-size="11"/></node>
-            <node height="20" justify="center"><text text="Val" font-face="arial" font-size="11"/></node>
+            <!--labels-->
+            <node height="30" justify="center">
+              <text text="Stencil"/>
+            </node>
           </node>
           <node dir="col" align="center" grow="1" width="1">
-            <node height="20" pad="1" width="100%"><slider-h id="jitter-scale"/></node>
-            <node height="20" pad="1" width="100%"><slider-h id="jitter-angle"/></node>
-            <node height="20" pad="1" width="100%"><slider-h id="jitter-spread"/></node>
-            <node height="20" pad="1" width="100%"><slider-h id="jitter-flow"/></node>
-            <node height="20" pad="1" width="100%"><slider-h id="jitter-hue"/></node>
-            <node height="20" pad="1" width="100%"><slider-h id="jitter-sat"/></node>
-            <node height="20" pad="1" width="100%"><slider-h id="jitter-val"/></node>
+            <!--controls-->
+            <node height="30" pad="1" width="100%" dir="row">
+              <slider-h id="tip-stencil" width="1" grow="1"/>
+              <node width="50"  pad="0" margin="0 0 0 5">
+                <button id="tip-stencil-load" text="Load" height="28"></button>
+              </node>
+            </node>
+          </node>
+        </node>
+
+        <!-- DUAL BRUSH -->
+
+        <border color=".2" height="20" dir="row" justify="center" align="center" margin="5 0 5 0">
+          <checkbox id="dual-enabled" width="20" height="20"/>
+          <node align="center" width="1" grow="1">
+            <text text="Dual Brush"/>
+          </node>
+        </border>
+        <node dir="row">
+          <node width="30%" dir="col">
+            <!--labels-->
+            <node height="40" justify="center" margin="0 0 5 0">
+              <text text="Preset"/>
+            </node>
+            <node height="40" justify="center" margin="5 0 0 0">
+              <text text="Shape"/>
+            </node>
+            <node height="30" justify="center" margin="0 0 5 0">
+              <text text="Blend"/>
+            </node>
+            <node height="20" justify="center">
+              <text text="Flip"/>
+            </node>
+            <node height="20" justify="center">
+              <text text="Size"/>
+            </node>
+            <node height="20" justify="center">
+              <text text="Spacing"/>
+            </node>
+            <node height="20" justify="center">
+              <text text="Scatter"/>
+            </node>
+          </node>
+          <node dir="col" grow="1" width="1">
+            <!--controls-->
+            <button-custom id="dual-preset-button" width="100%" height="40" margin="0 0 5 0" dir="row" pad="4">
+              <image id="dual-preset-thumb" path="data/thumbs/Round-Hard.png" width="32" height="100%"/>
+              <stroke-preview id="dual-preset-preview" width="10" grow="1" height="100%"/>
+            </button-custom>
+            <node dir="row" margin="0 0 5 0">
+              <button-custom id="dual-change" width="40" height="40" dir="row" pad="4">
+                <image id="dual-change-thumb" width="32" height="100%"/>
+              </button-custom>
+              <node width="1" grow="1" height="40">
+                <node align="center" dir="row">
+                  <checkbox id="dual-invert" width="20" height="19"/>
+                  <text text="invert value"/>
+                </node>
+                <node align="center" dir="row">
+                  <checkbox id="dual-flipx" width="20" height="19"/>
+                  <text text="flipX"/>
+                  <checkbox id="dual-flipy" width="20" height="19" margin="0 0 0 5"/>
+                  <text text="flipY"/>
+                </node>
+              </node>
+            </node>
+            <node height="30" width="100%" pad="1" dir="row" margin="0 0 5 0">
+              <combobox id="db-blend" width="100%" height="28" combo-list="Normal,-,Multiply,Screen,-,Color Dodge,Overlay" default="0"/>
+            </node>
+            <node align="center" dir="row">
+              <checkbox id="dual-randflip" height="20" width="20"/>
+              <text text="random flips"/>
+            </node>
+            <node height="20" pad="1" width="100%">
+              <slider-h id="dual-size" value=".25"/>
+            </node>
+            <node height="20" pad="1" width="100%">
+              <slider-h id="dual-spacing" value=".25"/>
+            </node>
+            <node height="40" pad="1" width="100%" dir="col">
+              <slider-h id="dual-scatter" height="19" value="0"/>
+              <node align="center" dir="row">
+                <checkbox width="20" height="19" id="dual-scatter-axis"/>
+                <text text="both axis"/>
+              </node>
+            </node>
+          </node>
+        </node>
+
+        <!-- MEDIUM -->
+
+        <border color=".2" height="20" dir="row" justify="center" align="center" margin="5 0 5 0">
+          <text text="Medium"/>
+        </border>
+        <node dir="row">
+          <node width="30%" dir="col">
+            <!--labels-->
+            <node height="20" justify="center">
+              <text text="Mixer"/>
+            </node>
+            <node height="20" justify="center">
+              <text text="Wet"/>
+            </node>
+            <node height="20" justify="center">
+              <text text="Noise"/>
+            </node>
+          </node>
+          <node dir="col" align="center" grow="1" width="1">
+            <!--controls-->
+            <node height="20" pad="1" width="100%">
+              <slider-h id="tip-mix"/>
+            </node>
+            <node height="20" pad="1" width="100%">
+              <slider-h id="tip-wet"/>
+            </node>
+            <node height="20" pad="1" width="100%">
+              <slider-h id="tip-noise"/>
+            </node>
+          </node>
+        </node>
+
+        <!-- COLOR VARIATIONS -->
+
+        <border color=".2" height="20" justify="center" align="center" margin="5 0 5 0">
+          <text text="Color Variations"/>
+        </border>
+        <node dir="row">
+          <node width="30%" dir="col">
+            <!--labels-->
+            <node height="20" justify="center">
+              <text text="Hue"/>
+            </node>
+            <node height="20" justify="center">
+              <text text="Sat"/>
+            </node>
+            <node height="20" justify="center">
+              <text text="Val"/>
+            </node>
+          </node>
+          <node dir="col" align="center" grow="1" width="1">
+            <!--controls-->
+            <node height="20" pad="1" width="100%">
+              <slider-h id="tip-hue"/>
+            </node>
+            <node height="20" pad="1" width="100%">
+              <slider-h id="tip-sat"/>
+            </node>
+            <node height="20" pad="1" width="100%">
+              <slider-h id="tip-val"/>
+            </node>
+          </node>
+        </node>
+
+        <!-- JITTER -->
+
+        <border color=".2" height="20" justify="center" align="center" margin="5 0 5 0"><text text="Jitter Settings"/></border>
+        <node dir="row">
+          <node width="30%" dir="col">
+            <node height="20" justify="center">
+              <text text="Flip"/>
+            </node>
+            <node height="20" justify="center">
+              <text text="Scale"/>
+            </node>
+            <node height="20" justify="center">
+              <text text="Angle"/>
+            </node>
+            <node height="20" justify="center" margin="0 0 5 0">
+              <text text="Spread"/>
+            </node>
+            <node height="20" justify="center" margin="0 0 5 0">
+              <text text="Flow"/>
+            </node>
+            <node height="20" justify="center">
+              <text text="Hue"/>
+            </node>
+            <node height="20" justify="center">
+              <text text="Sat"/>
+            </node>
+            <node height="20" justify="center">
+              <text text="Val"/>
+            </node>
+          </node>
+          <node dir="col" grow="1" width="1">
+            <node align="center" dir="row">
+              <checkbox id="tip-randflipx" width="20" height="19"/>
+              <text text="X axis"/>
+              <checkbox id="tip-randflipy" width="20" height="19" margin="0 0 0 10"/>
+              <text text="Y axis"/>
+            </node>
+            <node height="20" pad="1" width="100%">
+              <slider-h id="jitter-scale"/>
+            </node>
+            <node height="20" pad="1" width="100%">
+              <slider-h id="jitter-angle"/>
+            </node>
+            <node height="20" pad="1" width="100%" margin="0 0 5 0">
+              <slider-h id="jitter-spread"/>
+            </node>
+            <node height="20" pad="1" width="100%" margin="0 0 5 0">
+              <slider-h id="jitter-flow"/>
+            </node>
+            <node height="20" pad="1" width="100%">
+              <slider-h id="jitter-hue"/>
+            </node>
+            <node height="20" pad="1" width="100%">
+              <slider-h id="jitter-sat"/>
+            </node>
+            <node height="20" pad="1" width="100%">
+              <slider-h id="jitter-val"/>
+            </node>
           </node>
         </node>
         
@@ -279,16 +513,16 @@
   <layout id="tpl-panel-grid">
     <node width="220" margin="0 0 10 0" rtl="ltr">
       <border height="30" color=".5" align="center" justify="center">
-        <text text="Grids" font-face="arial" font-size="11" color="1 1 1 1"/>
+        <text text="Grids" color="1 1 1 1"/>
       </border>
       <border color=".3" pad="5" dir="col" width="100%">
         
         <node dir="row">
           <node width="40%" dir="col">
-            <node height="20" justify="center"><text text="Opacity" font-face="arial" font-size="11"/></node>
-            <node height="20" justify="center"><text text="Value" font-face="arial" font-size="11"/></node>
-            <node height="20" justify="center"><text text="Offset" font-face="arial" font-size="11"/></node>
-            <node height="30" justify="center" margin="5 0 0 0"><text text="Resolution" font-face="arial" font-size="11"/></node>
+            <node height="20" justify="center"><text text="Opacity"/></node>
+            <node height="20" justify="center"><text text="Value"/></node>
+            <node height="20" justify="center"><text text="Offset"/></node>
+            <node height="30" justify="center" margin="5 0 0 0"><text text="Resolution"/></node>
           </node>
           <node dir="col" align="center" grow="1" width="1" flood-events="1">
             <node height="20" pad="1" width="100%"><slider-h id="grid-ground-opacity"/></node>
@@ -300,23 +534,23 @@
           </node>
         </node>
         <node height="5"/>
-        <border color=".2" height="20" justify="center" align="center"><text text="Heightmap" font-face="arial" font-size="11"/></border>
+        <border color=".2" height="20" justify="center" align="center"><text text="Heightmap"/></border>
         <border color="1" align="center" pad="5" margin="0 0 5 0">
           <image-texture id="grid-heightmap-preview" width="100%" grow="1" height="100" aspect-ratio="1"/>
         </border>
         <node dir="row">
           <node width="40%" dir="col">
-            <node height="30" justify="center"><text text="File" font-face="arial" font-size="11"/></node>
-            <node height="30" justify="center" margin="5 0 0 0"><text text="Shading" font-face="arial" font-size="11"/></node>
-            <node height="20" justify="center" margin="5 0 0 0"><text text="Wireframe" font-face="arial" font-size="11"/></node>
-            <!--<node height="20" justify="center"><text text="Thickness" font-face="arial" font-size="11"/></node>-->
-            <node height="20" justify="center"><text text="Height" font-face="arial" font-size="11"/></node>
-            <node height="20" justify="center"><text text="L-Yaw" font-face="arial" font-size="11"/></node>
-            <node height="20" justify="center"><text text="L-Pitch" font-face="arial" font-size="11"/></node>
-            <node height="20" justify="center"><text text="Ambient" font-face="arial" font-size="11"/></node>
-            <node height="20" justify="center"><text text="Radius" font-face="arial" font-size="11"/></node>
-            <node height="30" justify="center" margin="5 0 0 0"><text text="Samples" font-face="arial" font-size="11"/></node>
-            <node height="30" justify="center" margin="5 0 0 0"><text text="Tex Res." font-face="arial" font-size="11"/></node>
+            <node height="30" justify="center"><text text="File"/></node>
+            <node height="30" justify="center" margin="5 0 0 0"><text text="Shading"/></node>
+            <node height="20" justify="center" margin="5 0 0 0"><text text="Wireframe"/></node>
+            <!--<node height="20" justify="center"><text text="Thickness"/></node>-->
+            <node height="20" justify="center"><text text="Height"/></node>
+            <node height="20" justify="center"><text text="L-Yaw"/></node>
+            <node height="20" justify="center"><text text="L-Pitch"/></node>
+            <node height="20" justify="center"><text text="Ambient"/></node>
+            <node height="20" justify="center"><text text="Radius"/></node>
+            <node height="30" justify="center" margin="5 0 0 0"><text text="Samples"/></node>
+            <node height="30" justify="center" margin="5 0 0 0"><text text="Tex Res."/></node>
           </node>
           <node dir="col" align="center" grow="1" width="1" flood-events="1" color=".3" >
             <node height="30" width="100%" dir="row" pad="0 1 0 1">
@@ -355,10 +589,10 @@
     <border positioning="absolute" position="0 0" color=".4 .4 .4 .8" width="100%" height="100%" align="center" justify="center" mouse-capture="true">
       <border thickness="1" border-color=".2" pad="3">
         <border width="400" height="30" color=".2 .2 .2 .9" dir="row" align="center" justify="center">
-          <text id="title" text="Just a test message" font-face="arial" font-size="11"></text>
+          <text id="title" text="Just a test message"></text>
         </border>
         <border width="400" color="0 0 0 .9" pad="10" dir="col">
-          <text id="message" text-wrap-width="380" text="Longer description for the error or the message." font-face="arial" font-size="11"></text>
+          <text id="message" text-wrap-width="380" text="Longer description for the error or the message."></text>
           <node height="40" grow="1" dir="row" align="flex-end" justify="flex-end">
             <button id="btn-ok" text="Ok" width="50" height="30" margin="0 10 0 0"/>
             <button id="btn-cancel" text="Cancel" width="60" height="30"/>
@@ -372,7 +606,7 @@
     <border positioning="absolute" position="0 0" color=".4 .4 .4 .8" width="100%" height="100%" align="center" justify="center" mouse-capture="true">
       <border thickness="1" border-color=".2" pad="3">
         <border width="400" height="30" color=".2 .2 .2 .9" dir="row" align="center" justify="center">
-          <text id="title" text="Just a test message" font-face="arial" font-size="11"></text>
+          <text id="title" text="Just a test message"></text>
         </border>
         <border width="400" color="0 0 0 .9" pad="10" dir="col">
           <node height="40" grow="1" dir="row" align="flex-end" justify="flex-end">
@@ -392,7 +626,7 @@
       <border thickness="1" border-color=".2" pad="3">
         <border width="300" height="30" color=".2 .2 .2 .9" dir="row" align="center">
           <node grow="1" width="10" align="center">
-            <text id="title" text="Color Picker" font-face="arial" font-size="11"/>
+            <text id="title" text="Color Picker"/>
           </node>
           <!--<combobox justify="flex-end" pad="5" margin="0 5 0 0" text="Triangle" combo-list="Triangle,Square" default="0"/>-->
         </border>
@@ -405,23 +639,23 @@
             <border border-color="0 0 0 1" thickness="1" id="color-old2" height="30" grow="1" color="0"/>
           </border>
           <node width="100%" pad="2" height="20" dir="row" align="center" margin="10 0 0 0">
-            <node width="20"><text text="H" font-face="arial" font-size="11"/></node>
+            <node width="20"><text text="H"/></node>
             <slider-h id="hsv-h" width="10" grow="1" value="1"/>
           </node>
           <node width="100%" pad="2" height="20" dir="row" align="center">
-            <node width="20"><text text="S" font-face="arial" font-size="11"/></node>
+            <node width="20"><text text="S"/></node>
             <slider-h id="hsv-s" width="10" grow="1" value="1"/>
           </node>
           <node width="100%" pad="2" height="20" dir="row" align="center">
-            <node width="20"><text text="V" font-face="arial" font-size="11"/></node>
+            <node width="20"><text text="V"/></node>
             <slider-h id="hsv-v" width="10" grow="1" value="1"/>
           </node>
           <node width="100%" pad="2" height="20" dir="row" align="center" margin="5 0 0 0">
-            <node width="20"><text text="R" font-face="arial" font-size="11"/></node>
+            <node width="20"><text text="R"/></node>
             <slider-h id="rgb-r" width="10" grow="1" value="1"/>
-            <node width="15" margin="0 0 0 5"><text text="G" font-face="arial" font-size="11"/></node>
+            <node width="15" margin="0 0 0 5"><text text="G"/></node>
             <slider-h id="rgb-g" width="10" grow="1" value="1"/>
-            <node width="15" margin="0 0 0 5"><text text="B" font-face="arial" font-size="11"/></node>
+            <node width="15" margin="0 0 0 5"><text text="B"/></node>
             <slider-h id="rgb-b" width="10" grow="1" value="1"/>
           </node>
 
@@ -439,11 +673,11 @@
     <border positioning="absolute" position="0 0" color=".4 .4 .4 .8" width="100%" height="100%" align="center" justify="center" mouse-capture="true">
       <border thickness="1" border-color=".2" pad="3">
         <border width="400" height="30" color=".2 .2 .2 .9" dir="row" align="center" justify="center">
-          <text text="Rename Layer" font-face="arial" font-size="11"></text>
+          <text text="Rename Layer"></text>
         </border>
         <border width="400" color="0 0 0 .9" pad="10" dir="col">
           <border dir="row" align="center" height="30" color=".2 .2 .2 1">
-            <text text="New name: " font-face="arial" font-size="11" margin="0 5 0 5"/>
+            <text text="New name: " margin="0 5 0 5"/>
             <text-input id="txt-input" align="center" pad="5" grow="1" height="30" color=".3"/>
           </border>
           <node height="40" grow="1" dir="row" align="flex-end" justify="flex-end">
@@ -460,13 +694,13 @@
     <border positioning="absolute" position="0 0" color=".4 .4 .4 .8" width="100%" height="100%" align="center" justify="center" mouse-capture="true">
       <border thickness="1" border-color=".2" pad="3">
         <border width="500" height="30" color=".2 .2 .2 .9" dir="row" align="center" justify="center">
-          <text text="Resize Document Resolution" font-face="arial" font-size="11"></text>
+          <text text="Resize Document Resolution"></text>
         </border>
         <border width="500" color="0 0 0 .9" pad="10" dir="col">
-          <text text="This action is permanent and cannot be undone.\nAll of the history will be cleared." font-face="arial" font-size="11" margin="0 5 10 5"/>
+          <text text="This action is permanent and cannot be undone.\nAll of the history will be cleared." margin="0 5 10 5"/>
           <border dir="row" align="center" height="30" color=".2 .2 .2 1">
-            <node grow="1"><text id="current-res" text="Current: 2K" font-face="arial" font-size="11" margin="0 5 0 5"/></node>
-            <text text="New Resolution:" font-face="arial" font-size="11" margin="0 5 0 5"/>
+            <node grow="1"><text id="current-res" text="Current: 2K" margin="0 5 0 5"/></node>
+            <text text="New Resolution:" margin="0 5 0 5"/>
             <combobox id="resolution" width="100" height="30" text="2K" combo-list="2K,4K,6K,8K,16K,32K" default="1"/>
           </border>
           <node height="40" grow="1" dir="row" align="flex-end" justify="flex-end">
@@ -483,21 +717,21 @@
   <layout id="dialog-browse-item">
     <border dir="col" color=".4 .4 .4 .8" pad="4" height="120" width="100" margin="1 1 1 1" grow="1" align="center">
       <image-texture id="thumb-tex" width="100%" grow="1" height="1" aspect-ratio="1"/>
-      <text id="title" text="File Name" margin="5 0 0 0" font-face="arial" font-size="11"/>
+      <text id="title" text="File Name" margin="5 0 0 0"/>
     </border>
   </layout>
   <layout id="dialog-browse">
     <border id="background" positioning="absolute" position="0 0" color=".4 .4 .4 .8" width="100%" height="100%" align="center" justify="center" mouse-capture="true">
       <border id="form" thickness="1" border-color=".2" pad="3" width="90%" height="90%" dir="col">
         <border id="title-bar" width="100%" height="30" color=".2 .2 .2 .9" dir="row" align="center" justify="center">
-          <text text="Browse PanoPainter Projects" font-face="arial" font-size="11"></text>
+          <text text="Browse PanoPainter Projects"></text>
         </border>
         <border width="100%" height="100" color="0 0 0 .9" pad="10" dir="row" grow="1">
           <scroll id="files-list" dir="row" wrap="1" flood-events="1" grow="1" height="100%" margin="0 0 0 0" pad="0 20 0 0" color=".2 .2 .2 1">
           </scroll>
         </border>
         <node dir="row">
-          <node grow="1"><text os="win,osx" id="path" text="Workind dir: path" text-wrap-width="470" font-face="arial" font-size="11" margin="10 5 10 10"/></node>
+          <node grow="1"><text os="win,osx" id="path" text="Workind dir: path" text-wrap-width="470" margin="10 5 10 10"/></node>
           <button os="win,osx" id="btn-path" text="Set destination dir" width="140" height="30" margin="0 10 0 0"/>
         </node>
         <node id="footer" height="50" dir="row" align="flex-end" justify="flex-end" pad="10">
@@ -514,7 +748,7 @@
   <layout id="dialog-cloud-item">
     <border dir="col" color=".4 .4 .4 .8" pad="4" height="120" width="100" margin="1 1 1 1" grow="1" align="center">
       <image-texture id="thumb-tex" width="100%" grow="1" height="1" aspect-ratio="1"/>
-      <text id="title" text="File Name" margin="5 0 0 0" font-face="arial" font-size="11"/>
+      <text id="title" text="File Name" margin="5 0 0 0"/>
     </border>
   </layout>
   
@@ -522,7 +756,7 @@
     <border id="background" positioning="absolute" position="0 0" color=".4 .4 .4 .8" width="100%" height="100%" align="center" justify="center" mouse-capture="true">
       <border id="form" thickness="1" border-color=".2" pad="3" width="90%" height="90%" dir="col">
         <border id="title-bar" width="100%" height="30" color=".2 .2 .2 .9" dir="row" align="center" justify="center">
-          <text text="Browse PanoPainter Projects" font-face="arial" font-size="11"></text>
+          <text text="Browse PanoPainter Projects"></text>
         </border>
         <border width="100%" height="100" color="0 0 0 .9" pad="10" dir="row" grow="1">
           <scroll id="files-list" dir="row" wrap="1" flood-events="1" grow="1" height="100%" margin="0 0 0 0" pad="0 20 0 0" color=".2 .2 .2 1">
@@ -542,22 +776,22 @@
   <layout id="dialog-open-item">
     <border dir="row" color=".4 .4 .4 .8" pad="4" height="30" margin="1 0 1 0" align="center">
       <!--<image-texture id="thumb-tex" width="64" height="64"/>-->
-      <text id="title" text="Title" font-face="arial" font-size="11"/>
+      <text id="title" text="Title"/>
     </border>
   </layout>
   <layout id="dialog-open">
     <border positioning="absolute" position="0 0" color=".4 .4 .4 .8" width="100%" height="100%" align="center" justify="center" mouse-capture="true">
       <border thickness="1" border-color=".2" pad="3">
         <border width="400" height="30" color=".2 .2 .2 .9" dir="row" align="center" justify="center">
-          <text text="Open PanoPainter Project" font-face="arial" font-size="11"></text>
+          <text text="Open PanoPainter Project"></text>
         </border>
         <border width="400" color="0 0 0 .9" pad="10" dir="col">
           <node dir="row">
             <scroll id="files-list" dir="col" flood-events="1" grow="1" height="250" margin="0 10 0 0" pad="0 20 0 0" color=".2 .2 .2 1"/>
             <!--
             <node dir="col" grow="1" margin="0 0 0 10">
-              <border height="20" align="center" justify="center" color=".2 .2 .2 1"><text id="info-title" text="Title" font-face="arial" font-size="11"/></border>
-              <text id="info-data" text="Title" font-face="arial" font-size="11"/>
+              <border height="20" align="center" justify="center" color=".2 .2 .2 1"><text id="info-title" text="Title"/></border>
+              <text id="info-data" text="Title"/>
             </node>
             -->
             <image-texture id="thumb-tex" aspect-ratio="1" width="150" height="150"/>
@@ -578,14 +812,14 @@
     <border positioning="absolute" position="0 0" color=".4 .4 .4 .8" width="100%" height="100%" align="center" justify="center" mouse-capture="true">
       <border thickness="1" border-color=".2" pad="3">
         <border width="400" height="30" color=".2 .2 .2 .9" dir="row" align="center" justify="center">
-          <text text="Save Pano Project" font-face="arial" font-size="11"></text>
+          <text text="Save Pano Project"></text>
         </border>
         <border width="400" color="0 0 0 .9" pad="10" dir="col">
           <border dir="row" align="center" height="30" color=".2 .2 .2 1">
-            <text text="Project name: " font-face="arial" font-size="11" margin="0 5 0 5"/>
+            <text text="Project name: " margin="0 5 0 5"/>
             <text-input id="txt-input" align="center" pad="5" grow="1" height="30" color=".3"/>
           </border>
-          <text os="win,osx" id="path" text="Workind dir: path" text-wrap-width="470" font-face="arial" font-size="11" margin="10 5 10 5"/>
+          <text os="win,osx" id="path" text="Workind dir: path" text-wrap-width="470" margin="10 5 10 5"/>
           <node height="40" grow="1" dir="row" align="flex-end" justify="flex-end">
             <node grow="1" os="win,osx"><button id="btn-path" text="Set working dir" width="120" height="30" margin="0 10 0 0"/></node>
             <button id="btn-ok" text="Save Project" width="100" height="30" margin="0 10 0 0"/>
@@ -601,16 +835,16 @@
     <border positioning="absolute" position="0 0" color=".4 .4 .4 .8" width="100%" height="100%" align="center" justify="center" mouse-capture="true">
       <border thickness="1" border-color=".2" pad="3">
         <border width="500" height="30" color=".2 .2 .2 .9" dir="row" align="center" justify="center">
-          <text text="Create New Pano Project" font-face="arial" font-size="11"></text>
+          <text text="Create New Pano Project"></text>
         </border>
         <border width="500" color="0 0 0 .9" pad="10" dir="col">
-          <text text="Note: resolution is measured in K-pixels, so a 2K document produces\na 2048x1024 equirectangular output." font-face="arial" font-size="11" margin="0 5 10 5"/>
+          <text text="Note: resolution is measured in K-pixels, so a 2K document produces\na 2048x1024 equirectangular output." margin="0 5 10 5"/>
           <border dir="row" align="center" height="30" color=".2 .2 .2 1">
-            <text text="Project name: " font-face="arial" font-size="11" margin="0 5 0 5"/>
+            <text text="Project name: " margin="0 5 0 5"/>
             <text-input id="txt-input" align="center" pad="5" grow="1" height="30" color=".3"/>
             <combobox id="resolution" width="100" height="30" text="2K" combo-list="2K,4K,6K,8K,16K,32K" default="1"/>
           </border>
-          <text os="win,osx" id="path" text="Workind dir: path" text-wrap-width="470" font-face="arial" font-size="11" margin="10 5 10 5"/>
+          <text os="win,osx" id="path" text="Workind dir: path" text-wrap-width="470" margin="10 5 10 5"/>
           <node height="40" grow="1" dir="row" align="flex-end" justify="flex-end">
             <node grow="1" os="win,osx"><button id="btn-path" text="Set working dir" width="120" height="30" margin="0 10 0 0"/></node>
             <button id="btn-ok" text="Create Project" width="110" height="30" margin="0 10 0 0"/>
@@ -626,7 +860,7 @@
     <border positioning="absolute" position="0 0" color=".4 .4 .4 .8" width="100%" height="100%" align="center" justify="center" mouse-capture="true">
       <border thickness="1" border-color=".2" pad="3" width="80%" min-width="400">
         <border width="100%" height="30" color=".2 .2 .2 .9" dir="row" align="center" justify="center">
-          <text text="Global Settings" font-face="arial" font-size="11"></text>
+          <text text="Global Settings"></text>
         </border>
         <border width="100%" color="0 0 0 .9" pad="10" dir="col">
           <!--window content-->
@@ -634,16 +868,16 @@
             <!--sidebar-->
             <node width="100" flood-events="1">
               <border height="30" width="100%" color=".2" pad="0 0 0 10" align="flex-begin" justify="center">
-                <text text="Viewport" font-face="arial" font-size="11"/>
+                <text text="Viewport"/>
               </border>
               <button-custom height="30" width="100%" color=".1" pad="0 0 0 10" align="flex-begin" justify="center">
-                <text text="Registers" font-face="arial" font-size="11"/>
+                <text text="Registers"/>
               </button-custom>
               <button-custom height="30" width="100%" color=".1" pad="0 0 0 10" align="flex-begin" justify="center">
-                <text text="Toolbar" font-face="arial" font-size="11"/>
+                <text text="Toolbar"/>
               </button-custom>
               <button-custom height="30" width="100%" color=".1" pad="0 0 0 10" align="flex-begin" justify="center">
-                <text text="Panorama" font-face="arial" font-size="11"/>
+                <text text="Panorama"/>
               </button-custom>
             </node>
             <!--settings tab-->
@@ -664,13 +898,13 @@
     <border positioning="absolute" position="0 0" color=".4 .4 .4 .8" width="100%" height="100%" align="center" justify="center" mouse-capture="1">
       <border thickness="1" border-color=".2" pad="3" max-width="650">
         <border width="100%" height="30" color=".2 .2 .2 .9" dir="row" align="center" justify="center">
-          <text text="About PanoPainter" font-face="arial" font-size="11"></text>
+          <text text="About PanoPainter"></text>
         </border>
         <border width="100%" color="0 0 0 .9" pad="10" dir="col">
           <!--window content-->
           <border color=".2" width="100%" height="300">
             <scroll pad="10" margin="5" color=".3 .3 .3 .4" height="100%" dir="col" wrap="0" shrink="1">
-              <text margin="0 0 0 5" font-face="arial" font-size="11" text=
+              <text margin="0 0 0 5" text=
 "
 --------------------------------------------------- ABOUT PANOPAINTER -----------------------------------------------------
 PanoPainter - Copyright 2018 OmixLab Ltd
@@ -725,14 +959,14 @@ Roboto Font License:
     <border positioning="absolute" position="0 0" color=".4 .4 .4 .8" width="100%" height="100%" align="center" justify="center" mouse-capture="true">
       <border thickness="1" border-color=".2" pad="3" max-width="650">
         <border width="100%" height="30" color=".2 .2 .2 .9" dir="row" align="center" justify="center">
-          <text text="What's new in PanoPainter" font-face="arial" font-size="11"></text>
+          <text text="What's new in PanoPainter"></text>
         </border>
         <border width="100%" color="0 0 0 .9" pad="10" dir="col">
           <!--window content-->
           <border color=".2" width="100%" height="400">
             <scroll pad="10" margin="5" color=".3 .3 .3 .4" dir="col" shrink="1">
-              <text margin="0 0 0 5" font-face="arial" font-size="30" text="0.1.6"/>
-              <text margin="10 0 0 5" font-face="arial" font-size="11" text=
+              <text margin="0 0 0 5" font-size="30" text="0.1.6"/>
+              <text margin="10 0 0 5" text=
 "- [FIX] Set system message box on top when recovery
 - [FIX] Skip Apple Pencil first samples to overcome the initial pressure spike
 - [WIN] Add initial VR support with openvr
@@ -743,8 +977,8 @@ Roboto Font License:
 - Add camera reset menu in Layers
 - Add share button on iOS and MacOS
 "/>
-              <text margin="20 0 0 5" font-face="arial" font-size="30" text="0.1.4"/>
-              <text margin="10 0 0 5" font-face="arial" font-size="11" text=
+              <text margin="20 0 0 5" font-size="30" text="0.1.4"/>
+              <text margin="10 0 0 5" text=
 "- [WIN] Add: Windows Store package installer
 - [OSX] Quick Look plugin for thumbnail generation
 - [FIX] Browse Dialog crashing at empty files
@@ -758,17 +992,17 @@ Roboto Font License:
 - Add: Current working directory workflow, allows you to change the current
   open/save/export directory
 "/>
-              <text margin="20 0 0 5" font-face="arial" font-size="30" text="0.1.3"/>
-              <text margin="10 0 0 5" font-face="arial" font-size="11" text=
+              <text margin="20 0 0 5" font-size="30" text="0.1.3"/>
+              <text margin="10 0 0 5" text=
 "- [OSX] Fix: use the right extension when exporting a .jpg
 "/>
-              <text margin="20 0 0 5" font-face="arial" font-size="30" text="0.1.2"/>
-              <text margin="10 0 0 5" font-face="arial" font-size="11" text=
+              <text margin="20 0 0 5" font-size="30" text="0.1.2"/>
+              <text margin="10 0 0 5" text=
 "- [OSX] Fix: fixed permissions issue preventing to import images
 "/>
-              <text margin="20 0 0 5" font-face="arial" font-size="30" text="0.1.1"/>
-              <text margin="10 0 0 5" font-face="arial" font-size="11" text="First public release!"/>
-              <!--<text margin="10 0 0 5" font-face="arial" font-size="11" text=
+              <text margin="20 0 0 5" font-size="30" text="0.1.1"/>
+              <text margin="10 0 0 5" text="First public release!"/>
+              <!--<text margin="10 0 0 5" text=
 "This is the first public release of PanoPainter. It's important to note this is an early
 access to the software, so be aware it may crash or behave in unexpected ways.
 Always save your work. It comes with a lot of features that will be improved over time.
@@ -801,23 +1035,23 @@ Here's a list of what's available in this release.
     <border positioning="absolute" position="0 0" color=".4 .4 .4 .8" width="100%" height="100%" align="center" justify="center" mouse-capture="true">
       <border thickness="1" border-color=".2" pad="3" max-width="650">
         <border width="100%" height="30" color=".2 .2 .2 .9" dir="row" align="center" justify="center">
-          <text text="PanoPainter User Manual" font-face="arial" font-size="11"></text>
+          <text text="PanoPainter User Manual"></text>
         </border>
         <border width="100%" color="0 0 0 .9" pad="10" dir="col">
           <!--window content-->
           <border color=".2" width="100%" height="500">
             <scroll pad="10" margin="5" color="1" dir="col" shrink="1">
-              <node align="center" margin="10 0 10 0"><text color="0" font-face="arial" font-size="30" text="Getting started with PanoPainter"/></node>
+              <node align="center" margin="10 0 10 0"><text color="0" font-size="30" text="Getting started with PanoPainter"/></node>
               <image path="data/doc/images/panopainter-doc-overview.jpg" width="100%" align="center" justify="flex-end" autosize="1"/>
-              <node align="center" margin="40 0 20 0"><text color="0" font-face="arial" font-size="30" text="Brush Settings"/></node>
+              <node align="center" margin="40 0 20 0"><text color="0" font-size="30" text="Brush Settings"/></node>
               <image path="data/doc/images/panopainter-doc-brush-settings.jpg" width="100%" align="center" justify="flex-end" autosize="1"/>
-              <node align="center" margin="40 0 20 0"><text color="0" font-face="arial" font-size="30" text="Layers Settings"/></node>
+              <node align="center" margin="40 0 20 0"><text color="0" font-size="30" text="Layers Settings"/></node>
               <image path="data/doc/images/panopainter-doc-layers.jpg" width="100%" align="center" justify="flex-end" autosize="1"/>
-              <node align="center" margin="40 0 20 0"><text color="0" font-face="arial" font-size="30" text="File Menu"/></node>
+              <node align="center" margin="40 0 20 0"><text color="0" font-size="30" text="File Menu"/></node>
               <image path="data/doc/images/panopainter-doc-menu-file.jpg" width="100%" align="center" justify="flex-end" autosize="1"/>
-              <node align="center" margin="40 0 20 0"><text color="0" font-face="arial" font-size="30" text="Layers Menu"/></node>
+              <node align="center" margin="40 0 20 0"><text color="0" font-size="30" text="Layers Menu"/></node>
               <image path="data/doc/images/panopainter-doc-menu-layers.jpg" width="100%" align="center" justify="flex-end" autosize="1"/>
-              <node align="center" margin="40 0 20 0"><text color="0" font-face="arial" font-size="30" text="Timelapse Menu"/></node>
+              <node align="center" margin="40 0 20 0"><text color="0" font-size="30" text="Timelapse Menu"/></node>
               <image path="data/doc/images/panopainter-doc-menu-timelapse.jpg" width="100%" align="center" justify="flex-end" autosize="1"/>
               <node height="40" margin="0 0 40 0"></node>
             </scroll>
@@ -837,23 +1071,23 @@ Here's a list of what's available in this release.
     <popup-menu positioning="absolute" position="100 100" width="150" thickness="1" border-color=".1" color=".4 .4 .4 .8" dir="col">
       <button-custom height="30" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="camera" width="20"/>
-        <text text="Snapshot" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text text="Snapshot" margin="0 0 0 5"/>
       </button-custom>
       <button-custom height="30" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="layers" width="20"/>
-        <text text="Layers" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text text="Layers" margin="0 0 0 5"/>
       </button-custom>
       <button-custom height="30" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="page_white" width="20"/>
-        <text text="New Layer" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text text="New Layer" margin="0 0 0 5"/>
       </button-custom>
       <button-custom height="30" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="page_white_paste" width="20"/>
-        <text text="Paste" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text text="Paste" margin="0 0 0 5"/>
       </button-custom>
       <button-custom height="30" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="page_white_stack" width="20"/>
-        <text text="Copy" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text text="Copy" margin="0 0 0 5"/>
       </button-custom>
     </popup-menu>
   </layout>
@@ -877,47 +1111,47 @@ Here's a list of what's available in this release.
       -->
       <button-custom id="file-newdoc" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="page_add" width="20"/>
-        <text text="New Pano" grow="1" margin="0 0 0 5" font-face="arial" font-size="11"/>
-        <text text="Ctrl-N" color=".4" justify="flex-end" margin="0 10 0 10" font-face="arial" font-size="11"/>
+        <text text="New Pano" grow="1" margin="0 0 0 5"/>
+        <text text="Ctrl-N" color=".4" justify="flex-end" margin="0 10 0 10"/>
       </button-custom>
       <button-custom id="file-import" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="image_add" width="20"/>
-        <text text="Import" grow="1" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text text="Import" grow="1" margin="0 0 0 5"/>
       </button-custom>
       <!--
       <button-custom id="file-open" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="page_add" width="20"/>
-        <text text="Open" grow="1" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text text="Open" grow="1" margin="0 0 0 5"/>
       </button-custom>
       -->
       <button-custom id="file-browse" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="images" width="20"/>
-        <text text="Browse" grow="1" margin="0 0 0 5" font-face="arial" font-size="11"/>
-        <text text="Ctrl-Shift-O" color=".4" justify="flex-end" margin="0 10 0 10" font-face="arial" font-size="11"/>
+        <text text="Browse" grow="1" margin="0 0 0 5"/>
+        <text text="Ctrl-Shift-O" color=".4" justify="flex-end" margin="0 10 0 10"/>
       </button-custom>
       <button-custom id="file-open" os="osx,win" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="image" width="20"/>
-        <text text="Open Path" grow="1" margin="0 0 0 5" font-face="arial" font-size="11"/>
-        <text text="Ctrl-O" color=".4" justify="flex-end" margin="0 10 0 10" font-face="arial" font-size="11"/>
+        <text text="Open Path" grow="1" margin="0 0 0 5"/>
+        <text text="Ctrl-O" color=".4" justify="flex-end" margin="0 10 0 10"/>
       </button-custom>
       <button-custom id="file-save" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="disk" width="20"/>
-        <text text="Save" grow="1" margin="0 0 0 5" font-face="arial" font-size="11"/>
-        <text text="Ctrl-S" color=".4" justify="flex-end" margin="0 10 0 10" font-face="arial" font-size="11"/>
+        <text text="Save" grow="1" margin="0 0 0 5"/>
+        <text text="Ctrl-S" color=".4" justify="flex-end" margin="0 10 0 10"/>
       </button-custom>
       <button-custom id="file-save-as" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="disk_multiple" width="20"/>
-        <text text="Save As.." grow="1" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text text="Save As.." grow="1" margin="0 0 0 5"/>
       </button-custom>
       <button-custom id="file-save-ver" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="disk_multiple" width="20"/>
-        <text text="Save Version" grow="1" margin="0 0 0 5" font-face="arial" font-size="11"/>
-        <text text="Ctrl-Shift-S" color=".4" justify="flex-end" margin="0 10 0 10" font-face="arial" font-size="11"/>
+        <text text="Save Version" grow="1" margin="0 0 0 5"/>
+        <text text="Ctrl-Shift-S" color=".4" justify="flex-end" margin="0 10 0 10"/>
       </button-custom>
       <node dir="row">
         <button-custom id="file-export" height="40" align="center" color=".2" pad="0 0 0 10" dir="row" grow="1">
           <icon icon="picture_go" width="20"/>
-          <text text="Export JPG" grow="1" margin="0 0 0 5" font-face="arial" font-size="11"/>
+          <text text="Export JPG" grow="1" margin="0 0 0 5"/>
         </button-custom>
         <button-custom id="file-export-tick" height="40" width="40" align="center" justify="center" color=".2" dir="row">
           <icon icon="resultset_next" width="20"/>
@@ -925,29 +1159,29 @@ Here's a list of what's available in this release.
       </node>
       <button-custom id="file-share" os="osx,ios" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="picture_go" width="20"/>
-        <text text="Share" grow="1" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text text="Share" grow="1" margin="0 0 0 5"/>
       </button-custom>
       <button-custom id="file-resize" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="arrow_out" width="20"/>
-        <text text="Resize Document" grow="1" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text text="Resize Document" grow="1" margin="0 0 0 5"/>
       </button-custom>
       <!--
       <button-custom id="file-export-cubes" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="page_white_stack" width="20"/>
-        <text text="Export Cubes" grow="1" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text text="Export Cubes" grow="1" margin="0 0 0 5"/>
       </button-custom>
       -->
       <button-custom id="file-cloud-upload" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="weather_clouds" width="20"/>
-        <text text="Cloud Publish" grow="1" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text text="Cloud Publish" grow="1" margin="0 0 0 5"/>
       </button-custom>
       <button-custom id="file-cloud-browse" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="weather_clouds" width="20"/>
-        <text text="Cloud Browse" grow="1" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text text="Cloud Browse" grow="1" margin="0 0 0 5"/>
       </button-custom>
       <!--<button-custom height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon width="20"/>
-        <text text="Quit" grow="1" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text text="Quit" grow="1" margin="0 0 0 5"/>
       </button-custom>-->
     </popup-menu>
   </layout>
@@ -956,10 +1190,10 @@ Here's a list of what's available in this release.
   <layout id="file-submenu-export">
     <popup-menu positioning="absolute" position="100 100" width="150" thickness="1" border-color=".1" color=".4 .4 .4 .8" dir="col">
       <button-custom id="file-submenu-export-png" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
-        <text text="PNG" grow="1" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text text="PNG" grow="1" margin="0 0 0 5"/>
       </button-custom>
       <button-custom id="file-submenu-export-layers" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
-        <text text="Separate Layers" grow="1" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text text="Separate Layers" grow="1" margin="0 0 0 5"/>
       </button-custom>
     </popup-menu>
   </layout>
@@ -969,15 +1203,15 @@ Here's a list of what's available in this release.
     <popup-menu positioning="absolute" position="100 100" width="150" thickness="1" border-color=".1" color=".4 .4 .4 .8" dir="col">
       <button-custom height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="page_add" width="20"/>
-        <text text="New Panodoc" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text text="New Panodoc" margin="0 0 0 5"/>
       </button-custom>
       <button-custom height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="disk" width="20"/>
-        <text text="Save" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text text="Save" margin="0 0 0 5"/>
       </button-custom>
       <button-custom height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="disk_multiple" width="20"/>
-        <text text="Save as.." margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text text="Save as.." margin="0 0 0 5"/>
       </button-custom>
     </popup-menu>
   </layout>
@@ -987,23 +1221,23 @@ Here's a list of what's available in this release.
     <popup-menu positioning="absolute" position="100 100" width="270" thickness="1" border-color=".1" color=".4 .4 .4 .8" dir="col">
       <button-custom id="layer-clear" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="cancel" width="20"/>
-        <text id="menu-label" text="Clear layer" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text id="menu-label" text="Clear layer" margin="0 0 0 5"/>
       </button-custom>
       <button-custom id="clear-grids" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="bin" width="20"/>
-        <text text="Clear grids" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text text="Clear grids" margin="0 0 0 5"/>
       </button-custom>
       <button-custom id="layer-rename" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="application_edit" width="20"/>
-        <text id="menu-label" text="Rename Layer" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text id="menu-label" text="Rename Layer" margin="0 0 0 5"/>
       </button-custom>
       <button-custom id="layer-merge" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="application_edit" width="20"/>
-        <text id="menu-label" text="Merge with" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text id="menu-label" text="Merge with" margin="0 0 0 5"/>
       </button-custom>
       <button-custom id="camera-reset" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="arrow_rotate_clockwise" width="20"/>
-        <text id="menu-label" text="Reset Camera" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text id="menu-label" text="Reset Camera" margin="0 0 0 5"/>
       </button-custom>
     </popup-menu>
   </layout>
@@ -1013,15 +1247,15 @@ Here's a list of what's available in this release.
     <popup-menu positioning="absolute" position="100 100" width="150" thickness="1" border-color=".1" color=".4 .4 .4 .8" dir="col">
       <button-custom id="timelapse-start" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="camera" width="20"/>
-        <text id="menu-label" text="Start Recording" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text id="menu-label" text="Start Recording" margin="0 0 0 5"/>
       </button-custom>
       <button-custom id="timelapse-clear" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="bin" width="20"/>
-        <text id="menu-label" text="Clear Frames" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text id="menu-label" text="Clear Frames" margin="0 0 0 5"/>
       </button-custom>
       <button-custom id="timelapse-export" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="film_save" width="20"/>
-        <text id="menu-label" text="Export MP4" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text id="menu-label" text="Export MP4" margin="0 0 0 5"/>
       </button-custom>
     </popup-menu>
   </layout>
@@ -1031,23 +1265,23 @@ Here's a list of what's available in this release.
     <popup-menu positioning="absolute" position="100 100" width="200" thickness="1" border-color=".1" color=".4 .4 .4 .8" dir="col">
       <button-custom id="about-doc" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="help" width="20"/>
-        <text id="menu-label" text="Help Guide" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text id="menu-label" text="Help Guide" margin="0 0 0 5"/>
       </button-custom>
       <button-custom id="about-app" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="application_view_gallery" width="20"/>
-        <text id="menu-label" text="About PanoPainter" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text id="menu-label" text="About PanoPainter" margin="0 0 0 5"/>
       </button-custom>
       <button-custom id="about-news" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="bug" width="20"/>
-        <text id="menu-label" text="What's new?" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text id="menu-label" text="What's new?" margin="0 0 0 5"/>
       </button-custom>
       <button-custom id="about-crash" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="bug" width="20"/>
-        <text id="menu-label" text="Induce crash" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text id="menu-label" text="Induce crash" margin="0 0 0 5"/>
       </button-custom>
       <button-custom id="about-perf" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="bug" width="20"/>
-        <text id="menu-label" text="Performance test" margin="0 0 0 5" font-face="arial" font-size="11"/>
+        <text id="menu-label" text="Performance test" margin="0 0 0 5"/>
       </button-custom>
     </popup-menu>
   </layout>
@@ -1061,25 +1295,25 @@ Here's a list of what's available in this release.
       <border flood-events="1" margin="0 0 0 0" pad="0 0 0 0" color=".1" width="100%" height="30" dir="row" align="center" mouse-capture="true">
         <!--
         <button-custom id="menu-file" height="100%" margin="0 0 0 0" justify="center" align="center" pad="8" color=".1">
-          <text text="File" font-face="arial" font-size="11"/>
+          <text text="File"/>
         </button-custom>
         <button-custom id="menu-edit" height="100%" margin="0 0 0 0" justify="center" align="center" pad="8" color=".1">
-          <text text="Edit" font-face="arial" font-size="11"/>
+          <text text="Edit"/>
         </button-custom>
         <button-custom id="menu-layers" height="100%" margin="0 0 0 0" justify="center" align="center" pad="8" color=".1">
-          <text text="Layers" font-face="arial" font-size="11"/>
+          <text text="Layers"/>
         </button-custom>
         -->
-        <text id="txt-docname" text="Panodoc: no-name" font-face="arial" font-size="11" margin="0 20 0 10" color=".6 .6 .6 1"/>
+        <text id="txt-docname" text="Panodoc: no-name" margin="0 20 0 10" color=".6 .6 .6 1"/>
         <node height="100%" color="1" grow="1" align="center" justify="flex-end" dir="row">
-          <text id="txt-rec" text="" font-face="arial" font-size="11" margin="0 10 0 0" color=".6 .6 .6 1"/>
-          <text id="txt-memory" text="History memory: 0.00 Mb" font-face="arial" font-size="11" margin="0 5 0 0" color=".6 .6 .6 1"/>
+          <text id="txt-rec" text="" margin="0 10 0 0" color=".6 .6 .6 1"/>
+          <text id="txt-memory" text="History memory: 0.00 Mb" margin="0 5 0 0" color=".6 .6 .6 1"/>
           <button-custom id="btn-clean-memory" margin="0 20 0 0">
             <icon icon="cancel" width="20"/>
           </button-custom>
-          <text id="version" text="PanoPainter" font-face="arial" font-size="11" margin="0 10 0 0" color=".2 .5 1 1"/>
+          <text id="version" text="PanoPainter" margin="0 10 0 0" color=".2 .5 1 1"/>
           <border id="ext-fbf" height="20" width="30" color="0 0 0 1" align="center" justify="center" margin="0 5 0 0">
-            <text id="txt-rec" text="FbF" font-face="arial" font-size="11" color="0 0 0 1"/>
+            <text id="txt-rec" text="FbF" color="0 0 0 1"/>
           </border>
         </node>
       </border>
@@ -1092,21 +1326,21 @@ Here's a list of what's available in this release.
         <button id="btn-clear" width="50" height="100%" margin="0 5 0 15" text="Clear"/>
         -->
         <button-custom id="menu-file" width="50" height="100%" margin="0 0 0 0" justify="center" align="center" pad="8" color=".1">
-          <text text="File" font-face="arial" font-size="11"/>
+          <text text="File"/>
         </button-custom>
         <!--
         <button-custom id="menu-edit" width="50" height="100%" margin="0 0 0 0" justify="center" align="center" pad="8" color=".1">
-          <text text="Edit" font-face="arial" font-size="11"/>
+          <text text="Edit"/>
         </button-custom>
         -->
         <button-custom id="menu-layers" width="60" height="100%" margin="0 0 0 0" justify="center" align="center" pad="8" color=".1">
-          <text text="Layers" font-face="arial" font-size="11"/>
+          <text text="Layers"/>
         </button-custom>
         <button-custom id="menu-timelapse" width="80" height="100%" margin="0 0 0 0" justify="center" align="center" pad="8" color=".1">
-          <text text="Timelapse" font-face="arial" font-size="11"/>
+          <text text="Timelapse"/>
         </button-custom>
         <button-custom id="menu-about" width="60" height="100%" margin="0 0 0 0" justify="center" align="center" pad="8" color=".1">
-          <text text="About" font-face="arial" font-size="11"/>
+          <text text="About"/>
         </button-custom>
         <!--<button id="btn-anim" width="70" height="100%" margin="1 0 0 10" text="Animate"/>-->
         <node dir="row" justify="center" grow="1">
@@ -1185,7 +1419,7 @@ Here's a list of what's available in this release.
         <node height="100%" dir="row" shrink="1">
           <scroll id="panels" pad="5 5 5 5" margin="0 0 0 0" color=".3 .3 .3 .4" height="100%" dir="col" wrap="0" shrink="1">
             <!--Stroke-->
-            <!--<panel-stroke id="panel-stroke"/>-->
+            <panel-stroke id="panel-stroke"/>
             <!--Brushes-->
             <!--<panel-brush id="panel-brush"/>-->
             <!--Layers-->
@@ -1200,10 +1434,10 @@ Here's a list of what's available in this release.
         <!--
         <node height="100%" width="1" grow="1" dir="col" justify="flex-start" rtl="ltr">
           <border color=".3 .3 .3 .4" height="50" width="100%" pad="10" dir="row">
-            <text text="Timeline: " font-face="arial" font-size="11" margin="8 10 0 0"/>
+            <text text="Timeline: " margin="8 10 0 0"/>
             <slider-h id="frames-slider" width="1" grow="1" margin="0 10 0 0"></slider-h>
             <node width="30" margin="5 10 0 10">
-              <text id="timeline-frame" text="00" font-face="arial" font-size="30"/>
+              <text id="timeline-frame" text="00" font-size="30"/>
             </node>
           </border>
         </node>
@@ -1214,19 +1448,19 @@ Here's a list of what's available in this release.
             <node dir="col">
               <node dir="row" align="center" margin="0 0 2 0">
                 <slider-h id="pitch-slider" value="0.5" width="200" height="15"></slider-h>
-                <text text="Pitch" font-face="arial" font-size="11" margin="0 0 0 10"/>
+                <text text="Pitch" margin="0 0 0 10"/>
               </node>
               <node dir="row" align="center" margin="0 0 2 0">
                 <slider-h id="yaw-slider" value="0.5" width="200" height="15"></slider-h>
-                <text text="Yaw" font-face="arial" font-size="11" margin="0 0 0 10"/>
+                <text text="Yaw" margin="0 0 0 10"/>
               </node>
               <node dir="row" align="center">
                 <slider-h id="roll-slider" value="0.5" width="200" height="15"></slider-h>
-                <text text="Roll" font-face="arial" font-size="11" margin="0 0 0 10"/>
+                <text text="Roll" margin="0 0 0 10"/>
               </node>
             </node>
             <button-custom margin="0 0 0 10" thickness="1" border-color=".1" pad="5" justify="center">
-              <text text="Apply" font-face="arial" font-size="11"/>
+              <text text="Apply"/>
             </button-custom>
           </border>
         </node>-->
@@ -1235,8 +1469,8 @@ Here's a list of what's available in this release.
       <!-- status bar -->
       <!--<border height="30" width="100%" color=".15" border-color=".3" dir="row" pad="0 0 0 10" align="center">
         --><!--<text-input width="100" height="100%" color=".3"/>--><!--
-        <text text="Status Bar: nothing to show here." font-face="arial" font-size="11"/>
-        <text text="#opengl #fromscratch #c++" font-face="arial" font-size="11" margin="0 0 0 10" color=".2 .5 1 1"/>
+        <text text="Status Bar: nothing to show here."/>
+        <text text="#opengl #fromscratch #c++" margin="0 0 0 10" color=".2 .5 1 1"/>
       </border>-->
     </node>
     <!--
diff --git a/src/abr.cpp b/src/abr.cpp
index 8fc01d5..6d429e9 100644
--- a/src/abr.cpp
+++ b/src/abr.cpp
@@ -112,7 +112,7 @@ std::vector<std::shared_ptr<Brush>> ABR::compute_brushes(const std::string& path
         auto b = std::make_shared<Brush>();
         b->m_name = wstr2str(p->value<String>("Nm  "));
         //b->m_tip_color = i.m_tip_color;
-        b->m_tip_size = samp->value<UnitFloat>("Dmtr") / (800.f * 4.f);
+        b->m_tip_size = samp->value<UnitFloat>("Dmtr") / 800.f;
         b->m_tip_spacing = samp->value<UnitFloat>("Spcn") * 0.01f;
         b->m_tip_flow = .25f;
         b->m_tip_opacity = 1.f;
diff --git a/src/app_layout.cpp b/src/app_layout.cpp
index 906c45b..8e7f4d7 100644
--- a/src/app_layout.cpp
+++ b/src/app_layout.cpp
@@ -664,7 +664,7 @@ void App::init_menu_about()
                 b->on_click = [this, popup](Node*) {
                     LOG("perf");
                     auto start = std::chrono::high_resolution_clock::now();
-                    Canvas::I->stroke_start({ 0, 0, 0 }, 0.9f, Canvas::I->m_current_brush);
+                    Canvas::I->stroke_start({ 0, 0, 0 }, 0.9f);
                     for (int i = 0; i < 100; i++)
                     {
                         Canvas::I->stroke_update({ 100, 100, 0 }, 0.9f);
diff --git a/src/app_shaders.cpp b/src/app_shaders.cpp
index e987b55..1b6b0e8 100644
--- a/src/app_shaders.cpp
+++ b/src/app_shaders.cpp
@@ -218,7 +218,7 @@ void App::initShaders()
         "uniform bool lock;\n"
         "uniform bool mask;\n"
         "uniform bool fragUV2;\n"
-        "uniform bool useDual;\n"
+        "uniform bool use_dual;\n"
         "in mediump vec2 uv;\n"
         "out mediump vec4 frag;\n"
         SHADER_FUNCTION_BLUR
@@ -227,6 +227,9 @@ void App::initShaders()
         "   mediump vec2 uv2 = fragUV2 ? (gl_FragCoord.st / resolution) : uv;\n"
         "   mediump vec4 base = texture(tex, uv2);\n"
         "   mediump vec4 stroke = texture(tex_stroke, uv);\n"
+        "   mediump vec4 dual = texture(tex_dual, uv);\n"
+        "   if (use_dual)\n"
+        "       stroke.a = stroke.a * dual.a;\n"
         "   stroke.a = mask ? stroke.a * stroke_alpha * blur(tex_mask, uv2).r : stroke.a * stroke_alpha;\n"
         "   if (!lock && base.a == 0.0) { frag = stroke * vec4(1.0, 1.0, 1.0, alpha); return; }\n"
         "   mediump vec4 blended = blend(base, stroke, blend_mode);\n"
diff --git a/src/brush.cpp b/src/brush.cpp
index 75d1735..ce4cb5e 100644
--- a/src/brush.cpp
+++ b/src/brush.cpp
@@ -132,21 +132,28 @@ StrokeSample Stroke::randomize_sample(const glm::vec3& pos, float pressure, floa
     auto rnd_neg = [&] { return float((double)prng() / (double)prng.max() * 2.0 - 1.0); };  // normalized [-1, +1]
     auto rnd_rad = [&] { return float((double)prng() / (double)prng.max() * M_PI * 2.0); }; // normalized [0, 2pi]
     auto rnd_vec = [&] { float rad = rnd_rad(); return glm::vec3(cosf(rad), sinf(rad), 0); };  // normalized direction vector
+    auto rnd_bneg = [&] { return prng() % 2 == 0 ? -1.f : 1.f; }; // -1 or 1
 
     float size_dyn = m_brush->m_tip_size_pressure ? pressure : 1.f;
     float flow_dyn = m_brush->m_tip_flow_pressure ? pressure : 1.f;
     float size = glm::min(m_brush->m_tip_size / glm::tan(glm::radians(m_camera.fov * 0.5f)), m_max_size);
-
+    float randflipx = m_brush->m_tip_randflipx ? rnd_bneg() : 1.f;
+    float randflipy = m_brush->m_tip_randflipy ? rnd_bneg() : 1.f;
+    
     StrokeSample s;
+    s.scale.x = randflipx * (m_brush->m_tip_flipx ? -1.f : 1.f) * 
+        (m_brush->m_tip_aspect <= 0.5 ? m_brush->m_tip_aspect * 2.f : 1.f);
+    s.scale.y = randflipy * (m_brush->m_tip_flipy ? -1.f : 1.f) * 
+        (m_brush->m_tip_aspect >  0.5 ? 1.f - (m_brush->m_tip_aspect - .5f) * 2.f : 1.f);
     s.origin = pos;
     s.angle = -curve_angle + (m_brush->m_tip_angle + rnd_neg() * m_brush->m_jitter_angle) * (float)(M_PI * 2.0);
     s.size = 800.f * size * (1.f - rnd_nor() * m_brush->m_jitter_scale) * size_dyn;
     s.pos = pos + (rnd_vec() * m_brush->m_jitter_spread * s.size);
     s.flow = m_brush->m_tip_flow * (1.f - rnd_nor() * m_brush->m_jitter_flow) * flow_dyn;
     auto hsv = convert_rgb2hsv(m_brush->m_tip_color);
-    hsv.x = glm::clamp(glm::mix(hsv.x, (pressure - 0.5f) * 2.0f, m_brush->m_tip_hue * (float)m_brush->m_tip_hue_pressure) + (rnd_nor() - 0.5f) * m_brush->m_jitter_hue, 0.f, 1.f);
-    hsv.y = glm::clamp(glm::mix(hsv.y, (1.f - pressure - 0.5f) * 2.0f, m_brush->m_tip_sat * (float)m_brush->m_tip_sat_pressure) + (rnd_nor() - 0.5f) * m_brush->m_jitter_sat, 0.f, 1.f);
-    hsv.z = glm::clamp(glm::mix(hsv.z, (pressure - 0.5f) * 2.0f, m_brush->m_tip_val * (float)m_brush->m_tip_val_pressure) + (rnd_nor() - 0.5f) * m_brush->m_jitter_val, 0.f, 1.f);
+    hsv.x = glm::clamp(glm::mix(hsv.x, (pressure - 0.5f) * 2.0f, m_brush->m_tip_hue) + (rnd_nor() - 0.5f) * m_brush->m_jitter_hue, 0.f, 1.f);
+    hsv.y = glm::clamp(glm::mix(hsv.y, (1.f - pressure - 0.5f) * 2.0f, m_brush->m_tip_sat) + (rnd_nor() - 0.5f) * m_brush->m_jitter_sat, 0.f, 1.f);
+    hsv.z = glm::clamp(glm::mix(hsv.z, (pressure - 0.5f) * 2.0f, m_brush->m_tip_val) + (rnd_nor() - 0.5f) * m_brush->m_jitter_val, 0.f, 1.f);
     m_hsv_jitter.add(hsv);
     s.col = convert_hsv2rgb(m_hsv_jitter.average());
     return s;
@@ -159,13 +166,13 @@ std::vector<StrokeSample> Stroke::compute_samples()
     samples.reserve(nsamples); // preallocate the estimate number of samples
     while (m_keypoints.back().dist > (m_dist + m_step))
     {
-        bool is_first = m_last_kp == 0;
         m_dist += m_step;
         m_dir_dist += m_step;
+        int old_kp = m_last_kp;
         while (m_dist > m_keypoints[m_last_kp + 1].dist)
             m_last_kp++;
-        const auto& A = m_keypoints[m_last_kp];
-        const auto& B = m_keypoints[m_last_kp + 1]; // NOTE: this should be true when while is true
+        const auto& A = m_keypoints[old_kp];
+        const auto& B = m_keypoints[m_last_kp == old_kp ? m_last_kp + 1 : m_last_kp]; // NOTE: this should be true when while is true
         float t = (m_dist - A.dist) / (B.dist - A.dist); // NOTE: must be A != B
         auto pos = glm::lerp(A.pos, B.pos, t);
         float pressure = glm::lerp(A.pressure, B.pressure, t);
@@ -175,16 +182,20 @@ std::vector<StrokeSample> Stroke::compute_samples()
         {
             if (m_brush->m_tip_angle_follow)
             {
-                if (m_dir_dist > m_dir_step)
+                if (m_dir_dist > m_dir_step && m_last_kp != m_dir_kp)
                 {
                     glm::vec2 v = glm::normalize(m_keypoints[m_last_kp].pos - m_keypoints[m_dir_kp].pos);
                     m_dir_angle = -glm::orientedAngle(v, m_dir_ref);
-                    if (glm::abs(m_dir_angle) > glm::pi<float>() / 2.f || !m_dir_valid)
+                    if (m_brush->m_tip_angle_delay > 0 && (glm::abs(m_dir_angle) > glm::pi<float>() / 2.f || !m_dir_valid))
                     {
-                        m_direction.clear();
+                        auto old_dir = m_dir_ref;
                         m_dir_ref = v;
                         m_dir_ref_angle = -glm::orientedAngle(m_dir_ref, { 1, 0 });
                         m_dir_angle = 0;
+                        //m_direction.clear();
+                        auto angle_diff = -glm::orientedAngle(m_dir_ref, old_dir);
+                        for (int i = 0; i < m_direction.m_count; i++)
+                            m_direction.m_vec[i] -= angle_diff;
                     }
                     m_dir_kp = m_last_kp;
                     m_dir_dist = 0;
@@ -245,7 +256,7 @@ void Stroke::add_point(glm::vec3 pos, float pressure)
     if (m_brush->m_tip_size_pressure)
     {
         float size = glm::min(m_brush->m_tip_size / glm::tan(glm::radians(m_camera.fov * 0.5f)), m_max_size);
-        m_step = glm::max(m_brush->m_tip_spacing * size * pressure * 800.f, 1.f);
+        m_step = glm::max(m_brush->m_tip_spacing * size * pressure * 800.f, 0.1f);
     }
 
     float dist = m_keypoints.empty() ? m_step :
@@ -276,6 +287,7 @@ void Stroke::start(const std::shared_ptr<Brush>& brush)
     m_brush = brush;
     float size = glm::min(m_brush->m_tip_size / glm::tan(glm::radians(m_camera.fov * 0.5f)), m_max_size);
     m_step = glm::max(m_brush->m_tip_spacing * size * 800.f, 1.f);
+    m_direction.resize(std::max<int>(1, m_brush->m_tip_angle_delay * 200.f / m_step));
     prng.seed(0);
 }
 
@@ -291,6 +303,18 @@ bool Brush::load_texture(const std::string& path, const std::string& thumb)
     return true;
 }
 
+bool Brush::load_dual(const std::string& path, const std::string& thumb)
+{
+    m_dual_texture = std::make_shared<Texture2D>();
+    if (!m_dual_texture->load(path))
+        return false;
+    m_dual_texture->create_mipmaps();
+    m_dual_texture->auto_destroy = true;
+    m_dual_path = path;
+    m_dual_thumb_path = thumb;
+    return true;
+}
+
 bool Brush::load_stencil(const std::string& path)
 {
     m_stencil_texture = std::make_shared<Texture2D>();
@@ -316,6 +340,19 @@ bool Brush::load()
         m_tip_texture->create_mipmaps();
         m_tip_texture->auto_destroy = true;
     }
+    if (!m_dual_path.empty())
+    {
+        m_dual_texture = std::make_shared<Texture2D>();
+        if (!m_dual_texture->load(m_dual_path))
+        {
+            LOG("failed to load %s", m_dual_path.c_str());
+            m_tip_texture = nullptr;
+            m_dual_texture = nullptr;
+            return false;
+        }
+        m_dual_texture->create_mipmaps();
+        m_dual_texture->auto_destroy = true;
+    }
     if (!m_stencil_path.empty())
     {
         m_stencil_texture = std::make_shared<Texture2D>();
@@ -323,6 +360,7 @@ bool Brush::load()
         {
             LOG("failed to load %s", m_stencil_path.c_str());
             m_tip_texture = nullptr;
+            m_dual_texture = nullptr;
             m_stencil_texture = nullptr;
             return false;
         }
diff --git a/src/brush.h b/src/brush.h
index 41896ab..a703a1b 100644
--- a/src/brush.h
+++ b/src/brush.h
@@ -6,22 +6,29 @@
 class Brush
 {
 public:
-    Brush() = default;
-    Brush(const Brush& brush) = default;
+    //Brush() = default;
+    //Brush(const Brush& brush) = default;
     std::string m_name;
+
+    std::shared_ptr<Texture2D> m_tip_texture;
     std::string m_brush_path;
     std::string m_brush_thumb_path;
-    std::string m_stencil_path;
-    std::shared_ptr<Texture2D> m_tip_texture;
+
+    std::shared_ptr<Texture2D> m_dual_texture;
+    std::string m_dual_path;
+    std::string m_dual_thumb_path;
+    
     std::shared_ptr<Texture2D> m_stencil_texture;
-    //uint16_t m_tex_id = 0;
-    //uint16_t m_tex_stencil_id = const_hash("data/paper.jpg");
+    std::string m_stencil_path;
+    std::string m_stencil_thumb_path;
+
     glm::vec4 m_tip_color{0, 0, 0, 1};
     float m_tip_size = 0;
     float m_tip_spacing = 0;
     float m_tip_flow = 0;
     float m_tip_opacity = 0;
     float m_tip_angle = 0;
+    float m_tip_angle_delay = 0;
     float m_tip_mix = 0;
     float m_tip_stencil = 0;
     float m_tip_wet = 0;
@@ -32,9 +39,6 @@ public:
     bool  m_tip_angle_follow = false;
     bool  m_tip_flow_pressure = false;
     bool  m_tip_size_pressure = false;
-    bool  m_tip_hue_pressure = false;
-    bool  m_tip_sat_pressure = false;
-    bool  m_tip_val_pressure = false;
     float m_jitter_scale = 0;
     float m_jitter_angle = 0;
     float m_jitter_spread = 0;
@@ -43,7 +47,27 @@ public:
     float m_jitter_sat = 0;
     float m_jitter_val = 0;
     int m_blend_mode = 0;
+
+    bool m_tip_invert = false;
+    bool m_tip_flipx = false;
+    bool m_tip_flipy = false;
+    bool m_tex_enabled = false;
+    bool m_dual_enabled = false;
+    int m_dual_blend_mode = 0;
+    bool m_dual_randflip = false;
+    float m_dual_size = 0;
+    float m_dual_spacing = 0;
+    float m_dual_scatter = 0;
+    bool m_dual_scatter_axis = false;
+    bool m_dual_invert = false;
+    bool m_dual_flipx = false;
+    bool m_dual_flipy = false;
+    bool m_tip_randflipx = false;
+    bool m_tip_randflipy = false;
+    float m_tip_aspect = 0.5;
+
     bool load_texture(const std::string& path, const std::string& thumb);
+    bool load_dual(const std::string& path, const std::string& thumb);
     bool load_stencil(const std::string& path);
     bool load();
 };
@@ -53,6 +77,7 @@ struct StrokeSample
     glm::vec3 col = { 0, 0, 0 };
     glm::vec3 pos = { 0, 0, 0 };
     glm::vec3 origin = { 0, 0, 0 };
+    glm::vec2 scale = { 1, 1 };
     float size = 0;
     float flow = 0;
     float angle = 0;
@@ -110,9 +135,9 @@ public:
     bool m_filter_points = true;
     Camera m_camera;
     std::shared_ptr<Brush> m_brush;
-    cbuffer<float, 3> m_direction;
-    cbuffer<float, 10> m_pressure_buff;
-    cbuffer<glm::vec3, 3> m_hsv_jitter;
+    cbuffer<float> m_direction{ 1 };
+    cbuffer<float> m_pressure_buff{ 10 };
+    cbuffer<glm::vec3> m_hsv_jitter{ 3 };
     StrokeSample m_prev_sample;
     std::vector<Keypoint> m_keypoints;
     std::vector<std::pair<glm::vec3, float>> m_hold_points;
diff --git a/src/canvas.cpp b/src/canvas.cpp
index d9cc904..b402961 100644
--- a/src/canvas.cpp
+++ b/src/canvas.cpp
@@ -252,6 +252,7 @@ void Canvas::stroke_draw_mix(const glm::vec2& bb_min, const glm::vec2& bb_sz)
         ShaderManager::u_int(kShaderUniform::Lock, false/*m_layers[layer_index].m_alpha_locked*/);
         ShaderManager::u_int(kShaderUniform::Mask, false/*m_smask_active*/);
         ShaderManager::u_int(kShaderUniform::UseFragCoordUV2, false);
+        ShaderManager::u_int(kShaderUniform::UseDual, false);
         ShaderManager::u_int(kShaderUniform::BlendMode, m_current_stroke->m_brush->m_blend_mode);
         ShaderManager::u_mat4(kShaderUniform::MVP, plane_mvp_z);
         glActiveTexture(GL_TEXTURE0);
@@ -273,11 +274,11 @@ void Canvas::stroke_draw_mix(const glm::vec2& bb_min, const glm::vec2& bb_sz)
     gl.restore();
 }
 
-std::array<std::vector<vertex_t>, 6> Canvas::stroke_draw_project(std::array<vertex_t, 4>& B)
+std::array<std::vector<vertex_t>, 6> Canvas::stroke_draw_project(std::array<vertex_t, 4>& B) const
 {
     // intersect P with the current face to clip diverging points from the plane
-    auto unp_vp = zw(m_box);
-    auto unp_inv = glm::inverse(m_proj * m_mv);
+    const auto unp_vp = zw(m_box);
+    const auto unp_inv = glm::inverse(m_proj * m_mv);
     std::array<std::vector<vertex_t>, 6> ret;
     for (int i = 0; i < 6; i++)
     {
@@ -338,7 +339,7 @@ std::array<std::vector<vertex_t>, 6> Canvas::stroke_draw_project(std::array<vert
     return ret;
 }
 
-void Canvas::stroke_draw_samples(int i, std::vector<vertex_t>& P)
+glm::vec4 Canvas::stroke_draw_samples(int i, std::vector<vertex_t>& P)
 {
     if (!ShaderManager::ext_framebuffer_fetch)
     {
@@ -364,9 +365,6 @@ void Canvas::stroke_draw_samples(int i, std::vector<vertex_t>& P)
             tex_pos.x, tex_pos.y, tex_sz.x, tex_sz.y);
     }
 
-    m_dirty_box[i] = glm::vec4(glm::min(xy(m_dirty_box[i]), (glm::vec2)tex_pos),
-        glm::max(zw(m_dirty_box[i]), (glm::vec2)(tex_pos + tex_sz)));
-
     if (P.size() == 4)
     {
         static vertex_t rect[6];
@@ -394,13 +392,15 @@ void Canvas::stroke_draw_samples(int i, std::vector<vertex_t>& P)
         glActiveTexture(GL_TEXTURE1);
         m_tex[i].unbind();
     }
+
+    return glm::vec4(tex_pos, tex_pos + tex_sz);
 }
 
-std::vector<Canvas::StrokeFrame>  Canvas::stroke_draw_compute()
+std::vector<Canvas::StrokeFrame> Canvas::stroke_draw_compute(Stroke& stroke) const
 {
     std::vector<StrokeFrame> ret;
-    const auto& m_brush = m_current_stroke->m_brush;
-    auto samples = m_current_stroke->compute_samples();
+    StrokeSample prev = stroke.m_prev_sample;
+    auto samples = stroke.compute_samples();
     std::array<vertex_t, 4> B = {
         vertex_t{ {0, 0, 1, 1}, {0, 0}, {0, 0} },
         vertex_t{ {0, 0, 1, 1}, {0, 1}, {0, 1} },
@@ -415,13 +415,7 @@ std::vector<Canvas::StrokeFrame>  Canvas::stroke_draw_compute()
         ret.emplace_back();
         auto& f = ret.back();
 
-        if (m_mixer_idle)
-        {
-            m_mixer_sample = s;
-            m_mixer_idle = false;
-        }
-
-        glm::vec2 dx_mix(m_mixer_sample.size * 0.5f, 0), dy_mix(0, m_mixer_sample.size * 0.5f);
+        glm::vec2 dx_mix(prev.size * 0.5f, 0), dy_mix(0, prev.size * 0.5f);
         glm::vec2 off_mix[4] = {
             -dx_mix - dy_mix, // A - bottom-left
             -dx_mix + dy_mix, // B - top-left
@@ -442,20 +436,20 @@ std::vector<Canvas::StrokeFrame>  Canvas::stroke_draw_compute()
         glm::vec2 mixer_bb_max(0, 0);
         for (int j = 0; j < 4; j++)
         {
-            auto p = (xy(m_mixer_sample.pos) + off_mix[j] * glm::orientate2(-s.angle) + glm::vec2(0, 1));
+            auto p = (xy(prev.pos) + s.scale * off_mix[j] * glm::orientate2(-s.angle));
             mixer_bb_min = glm::max({ 0, 0 }, glm::min(mixer_bb_min, p));
             mixer_bb_max = glm::min(mixer_sz, glm::max(mixer_bb_max, p));
 
-            B[j].pos = glm::vec4(xy(s.pos) + off[j] * glm::orientate2(-s.angle), 1, 1);
+            B[j].pos = glm::vec4(xy(s.pos) + s.scale * off[j] * glm::orientate2(-s.angle) - glm::vec2(0, 1), 1, 1);
             B[j].uvs2 = p / mixer_sz;
         }
         
         f.m_mixer_rect = { mixer_bb_min, mixer_bb_max - mixer_bb_min };
-        f.col = glm::vec4(s.col, m_brush->m_tip_color.a);
+        f.col = glm::vec4(s.col, 1);
         f.pressure = s.flow;
         f.shapes = stroke_draw_project(B);
 
-        m_mixer_sample = s;
+        prev = s;
     }
     return ret;
 }
@@ -475,29 +469,18 @@ void Canvas::stroke_draw()
     glGetIntegerv(GL_VIEWPORT, vp);
     glGetFloatv(GL_COLOR_CLEAR_VALUE, cc);
     
-    const auto& m_brush = m_current_stroke->m_brush;
-    auto& tex = *m_brush->m_tip_texture;
+    const auto& brush = m_current_stroke->m_brush;
+    const auto& dual_brush = m_dual_stroke->m_brush;
     auto ortho_proj = glm::ortho(0.f, (float)m_width, 0.f, (float)m_height, -1.f, 1.f);
 
     glViewport(0, 0, m_width, m_height);
 
-    glActiveTexture(GL_TEXTURE0);
-    tex.bind();
     m_sampler_brush.bind(0);
     m_sampler_bg.bind(1);
     m_sampler_stencil.bind(2);
     m_sampler.bind(3);
     //m_sampler_linear.bind(5);
 
-    glActiveTexture(GL_TEXTURE2);
-    if (m_brush->m_stencil_texture)
-        m_brush->m_stencil_texture->bind();
-    else
-        glBindTexture(GL_TEXTURE_2D, 0);
-
-    glActiveTexture(GL_TEXTURE3);
-    m_mixer.bindTexture();
-
     glDisable(GL_BLEND);
     ShaderManager::use(kShader::Stroke);
     ShaderManager::u_int(kShaderUniform::Tex, 0); // brush
@@ -508,21 +491,32 @@ void Canvas::stroke_draw()
     //ShaderManager::u_int(kShaderUniform::TexMixA, 4); // mixer
     ShaderManager::u_vec2(kShaderUniform::Resolution, { m_width, m_height });
     ShaderManager::u_vec2(kShaderUniform::StencilOffset, stencil_offset);
-    ShaderManager::u_float(kShaderUniform::StencilAlpha, m_brush->m_tip_stencil);
-    ShaderManager::u_float(kShaderUniform::MixAlpha, m_brush->m_tip_mix);
-    ShaderManager::u_float(kShaderUniform::Wet, m_brush->m_tip_wet);
-    ShaderManager::u_float(kShaderUniform::Noise, m_brush->m_tip_noise);
+    ShaderManager::u_float(kShaderUniform::StencilAlpha, brush->m_tip_stencil);
+    ShaderManager::u_float(kShaderUniform::MixAlpha, brush->m_tip_mix);
+    ShaderManager::u_float(kShaderUniform::Wet, brush->m_tip_wet);
+    ShaderManager::u_float(kShaderUniform::Noise, brush->m_tip_noise);
     ShaderManager::u_mat4(kShaderUniform::MVP, ortho_proj);
 
-    auto frames = stroke_draw_compute();
+    // DRAW MAIN BRUSH
+
+    glActiveTexture(GL_TEXTURE0);
+    brush->m_tip_texture->bind();
+    glActiveTexture(GL_TEXTURE2);
+    if (brush->m_stencil_texture)
+        brush->m_stencil_texture->bind();
+    else
+        glBindTexture(GL_TEXTURE_2D, 0);
+    glActiveTexture(GL_TEXTURE3);
+    m_mixer.bindTexture();
+    auto frames = stroke_draw_compute(*m_current_stroke);
     for (auto& f : frames)
     {
-        if (m_brush->m_tip_mix > 0.f)
+        if (brush->m_tip_mix > 0.f)
         {
             stroke_draw_mix(xy(f.m_mixer_rect), zw(f.m_mixer_rect));
         }
 
-        //ShaderManager::use(kShader::Stroke);
+        ShaderManager::use(kShader::Stroke);
         ShaderManager::u_vec4(kShaderUniform::Col, f.col);
         ShaderManager::u_float(kShaderUniform::Alpha, f.pressure);
         for (int i = 0; i < 6; i++)
@@ -532,22 +526,56 @@ void Canvas::stroke_draw()
                 continue;
             m_dirty_face[i] = true;
             m_tmp[i].bindFramebuffer();
-            stroke_draw_samples(i, P);
+            auto rect = stroke_draw_samples(i, P);
             m_tmp[i].unbindFramebuffer();
+            m_dirty_box[i] = glm::clamp(box_union(m_dirty_box[i], rect), glm::vec4(0), glm::vec4(m_width));
         }
     }
-
-    glActiveTexture(GL_TEXTURE2);
-    if (m_brush->m_stencil_texture)
-        m_brush->m_stencil_texture->unbind();
     glActiveTexture(GL_TEXTURE3);
     m_mixer.unbindTexture();
-
+    glActiveTexture(GL_TEXTURE2);
+    if (brush->m_stencil_texture)
+        brush->m_stencil_texture->unbind();
     glActiveTexture(GL_TEXTURE0);
+    brush->m_tip_texture->unbind();
+
+    // DRAW DUAL BRUSH
+
+    if (brush->m_dual_enabled)
+    {
+        glActiveTexture(GL_TEXTURE0);
+        dual_brush->m_tip_texture->bind();
+        glActiveTexture(GL_TEXTURE2);
+        if (dual_brush->m_stencil_texture)
+            dual_brush->m_stencil_texture->bind();
+        else
+            glBindTexture(GL_TEXTURE_2D, 0);
+        auto frames_dual = stroke_draw_compute(*m_dual_stroke);
+        for (auto& f : frames_dual)
+        {
+            ShaderManager::use(kShader::Stroke);
+            ShaderManager::u_vec4(kShaderUniform::Col, f.col);
+            ShaderManager::u_float(kShaderUniform::Alpha, f.pressure);
+            for (int i = 0; i < 6; i++)
+            {
+                auto& P = f.shapes[i];
+                if (P.size() < 3)
+                    continue;
+                m_tmp_dual[i].bindFramebuffer();
+                stroke_draw_samples(i, P);
+                m_tmp_dual[i].unbindFramebuffer();
+            }
+        }
+        glActiveTexture(GL_TEXTURE2);
+        if (dual_brush->m_stencil_texture)
+            dual_brush->m_stencil_texture->unbind();
+        glActiveTexture(GL_TEXTURE0);
+        dual_brush->m_tip_texture->unbind();
+    }
+
     m_sampler_brush.unbind();
     m_sampler_bg.unbind();
     m_sampler_stencil.unbind();
-    tex.unbind();
     
     glViewport(vp[0], vp[1], vp[2], vp[3]);
     glClearColor(cc[0], cc[1], cc[2], cc[3]);
@@ -665,7 +693,6 @@ void Canvas::stroke_commit()
     if (!m_dirty || m_layers.empty())
         return;
 
-    m_mixer_idle = true;
     m_dirty = false;
     m_dirty_stroke = true; // new stroke ready for timelapse capture
     App::I.redraw = true;
@@ -763,6 +790,9 @@ void Canvas::stroke_commit()
             ShaderManager::u_int(kShaderUniform::UseFragCoordUV2, false);
             ShaderManager::u_int(kShaderUniform::BlendMode, m_current_stroke->m_brush->m_blend_mode);
             ShaderManager::u_mat4(kShaderUniform::MVP, glm::ortho(-.5f, .5f, -.5f, .5f, -1.f, 1.f));
+            ShaderManager::u_int(kShaderUniform::TexDual, 3);
+            ShaderManager::u_int(kShaderUniform::UseDual, true);
+            ShaderManager::u_int(kShaderUniform::DualBlendMode, 1);
 
             glActiveTexture(GL_TEXTURE0);
             m_tex2[i].bind();
@@ -771,13 +801,11 @@ void Canvas::stroke_commit()
             glActiveTexture(GL_TEXTURE2);
             m_smask.m_rtt[i].bindTexture();
             glActiveTexture(GL_TEXTURE3);
-            if (m_current_stroke->m_brush->m_stencil_texture)
-                m_current_stroke->m_brush->m_stencil_texture->bind();
-            else
-                glBindTexture(GL_TEXTURE_2D, 0);
+            m_current_stroke->m_brush->m_dual_enabled ? 
+                m_tmp_dual[i].bindTexture() : glBindTexture(GL_TEXTURE_2D, 0);
             m_plane.draw_fill();
-            if (m_current_stroke->m_brush->m_stencil_texture)
-                m_current_stroke->m_brush->m_stencil_texture->unbind();
+            if (m_current_stroke->m_brush->m_dual_enabled)
+                m_tmp_dual[i].unbindTexture();
             glActiveTexture(GL_TEXTURE2);
             m_smask.m_rtt[i].unbindTexture();
             glActiveTexture(GL_TEXTURE1);
@@ -790,7 +818,7 @@ void Canvas::stroke_commit()
 //            ShaderManager::use(kShader::StrokeLayer);
 //            ShaderManager::u_int(kShaderUniform::TexBG, 1);
 //            ShaderManager::u_int(kShaderUniform::Lock, m_layers[m_current_layer_idx].m_alpha_locked);
-//            ShaderManager::u_float(kShaderUniform::Alpha, m_current_stroke->m_brush->m_tip_opacity);
+//            ShaderManager::u_float(kShaderUniform::Alpha, m_current_stroke->brush->m_tip_opacity);
 //
 //            ShaderManager::u_int(kShaderUniform::Tex, 0);
 //            ShaderManager::u_mat4(kShaderUniform::MVP, glm::ortho(-.5f, .5f, -.5f, .5f, -1.f, 1.f));
@@ -819,14 +847,16 @@ void Canvas::stroke_commit()
 void Canvas::stroke_update(glm::vec3 point, float pressure)
 {
     m_current_stroke->add_point(point, pressure);
+    m_dual_stroke->add_point(point, pressure);
 }
-void Canvas::stroke_start(glm::vec3 point, float pressure, const std::shared_ptr<Brush>& brush)
+void Canvas::stroke_start(glm::vec3 point, float pressure)
 {
     // need to commit this now before starting a new stroke
     if (m_current_stroke && m_commit_delayed)
     {
         stroke_commit();
         m_current_stroke = nullptr;
+        m_dual_stroke = nullptr;
         m_show_tmp = false;
         m_commit_delayed = false;
     }
@@ -836,9 +866,15 @@ void Canvas::stroke_start(glm::vec3 point, float pressure, const std::shared_ptr
     m_current_stroke = std::make_unique<Stroke>();
     m_current_stroke->m_camera.rot = m_cam_rot;
     m_current_stroke->m_camera.fov = m_cam_fov;
-    m_current_stroke->start(brush);
+    m_current_stroke->start(m_current_brush);
     m_current_stroke->add_point(point, pressure);
-    
+
+    m_dual_stroke = std::make_unique<Stroke>();
+    m_dual_stroke->m_camera.rot = m_cam_rot;
+    m_dual_stroke->m_camera.fov = m_cam_fov;
+    m_dual_stroke->start(m_dual_brush);
+    m_dual_stroke->add_point(point, pressure);
+
     for (int i = 0; i < 6; i++)
     {
         m_dirty_box[i] = glm::vec4(m_width, m_height, 0, 0); // reset bounding box
@@ -847,6 +883,13 @@ void Canvas::stroke_start(glm::vec3 point, float pressure, const std::shared_ptr
         m_tmp[i].bindFramebuffer();
         m_tmp[i].clear({ 0, 0, 0, 0 });
         m_tmp[i].unbindFramebuffer();
+
+        if (m_current_stroke->m_brush->m_dual_enabled)
+        {
+            m_tmp_dual[i].bindFramebuffer();
+            m_tmp_dual[i].clear({ 0, 0, 0, 0 });
+            m_tmp_dual[i].unbindFramebuffer();
+        }
     }
     m_show_tmp = true;
 }
@@ -934,6 +977,7 @@ void Canvas::layer_merge(int source_idx, int dest_idx) // m_layer index
             ShaderManager::u_int(kShaderUniform::Lock, false);
             ShaderManager::u_int(kShaderUniform::BlendMode, m_layers[source_idx].m_blend_mode);
             ShaderManager::u_mat4(kShaderUniform::MVP, glm::ortho(-.5f, .5f, -.5f, .5f, -1.f, 1.f));
+            ShaderManager::u_int(kShaderUniform::UseDual, false);
 
             glActiveTexture(GL_TEXTURE0);
             m_tex2[i].bind();
@@ -971,9 +1015,11 @@ void Canvas::resize(int width, int height)
     {
 #if defined(__IOS__) || defined(__ANDROID__)
         m_tmp[i].create(width, height, -1, GL_RGBA8);
+        m_tmp_dual[i].create(width, height, -1, GL_RGBA8);
         m_tex[i].create(width, height, GL_RGBA8);
 #else
         m_tmp[i].create(width, height, -1, GL_RGBA32F);
+        m_tmp_dual[i].create(width, height, -1, GL_RGBA32F);
         m_tex[i].create(width, height, GL_RGBA32F);
 #endif
         m_tex2[i].create(width, height, GL_RGBA8);
@@ -992,10 +1038,12 @@ bool Canvas::create(int width, int height)
     {
 #if defined(__IOS__) || defined(__ANDROID__)
         m_tmp[i].create(width, height, -1, GL_RGBA8);
+        m_tmp_dual[i].create(width, height, -1, GL_RGBA8);
         m_tex[i].create(width, height, GL_RGBA8);
         m_sampler_brush.create();
 #else
         m_tmp[i].create(width, height, -1, GL_RGBA32F);
+        m_tmp_dual[i].create(width, height, -1, GL_RGBA32F);
         m_tex[i].create(width, height, GL_RGBA32F);
         m_sampler_brush.create(GL_LINEAR, GL_CLAMP_TO_BORDER);
 #endif
diff --git a/src/canvas.h b/src/canvas.h
index db85bc2..f1e065d 100644
--- a/src/canvas.h
+++ b/src/canvas.h
@@ -161,6 +161,7 @@ public:
     bool m_use_instanced = false;
     int m_current_layer_idx = 0;
     std::unique_ptr<Stroke> m_current_stroke;
+    std::unique_ptr<Stroke> m_dual_stroke;
     bool m_show_tmp = false;
     std::vector<Layer> m_layers;
     std::vector<int> m_order;
@@ -172,10 +173,9 @@ public:
     Layer m_smask; // selection mask
     bool m_smask_active = false;
     RTT m_tmp[6];
+    RTT m_tmp_dual[6];
     RTT m_mixer;
     float m_mixer_scale = 1;
-    StrokeSample m_mixer_sample;
-    bool m_mixer_idle = true;
     Texture2D m_brush_mix;
     Texture2D m_tex[6];
     Texture2D m_tex2[6];
@@ -200,6 +200,7 @@ public:
     glm::vec2 m_cur_pos;
 
     std::shared_ptr<Brush> m_current_brush;
+    std::shared_ptr<Brush> m_dual_brush;
 
     static std::vector<CanvasMode*> modes[];
     std::vector<CanvasMode*>* m_mode = nullptr;
@@ -229,12 +230,13 @@ public:
     void layer_add(std::string name);
     void layer_order(int idx, int pos);
     void layer_merge(int source_idx, int dest_idx);
-    void stroke_start(glm::vec3 point, float pressure, const std::shared_ptr<Brush>& brush);
+    void stroke_start(glm::vec3 point, float pressure);
     void stroke_update(glm::vec3 point, float pressure);
     void stroke_draw_mix(const glm::vec2& bb_min, const glm::vec2& bb_sz);
-    std::array<std::vector<vertex_t>, 6> stroke_draw_project(std::array<vertex_t, 4>& B);
-    void stroke_draw_samples(int i, std::vector<vertex_t>& P);
-    std::vector<StrokeFrame> stroke_draw_compute();
+    std::array<std::vector<vertex_t>, 6> stroke_draw_project(std::array<vertex_t, 4>& B) const;
+    // return rect {origin, size}
+    glm::vec4 stroke_draw_samples(int i, std::vector<vertex_t>& P);
+    std::vector<StrokeFrame> stroke_draw_compute(Stroke& stroke) const;
     void stroke_draw();
     void stroke_end();
     void stroke_cancel();
diff --git a/src/canvas_modes.cpp b/src/canvas_modes.cpp
index aabea1e..669b874 100644
--- a/src/canvas_modes.cpp
+++ b/src/canvas_modes.cpp
@@ -124,7 +124,7 @@ void CanvasModePen::on_MouseEvent(MouseEvent* me, glm::vec2& loc)
             }
             else
             {
-                Canvas::I->stroke_start({ loc, 0 }, me->m_pressure, Canvas::I->m_current_brush);
+                Canvas::I->stroke_start({ loc, 0 }, me->m_pressure);
             }
             m_dragging = true;
             node->mouse_capture();
@@ -203,22 +203,26 @@ void CanvasModePen::on_Draw(const glm::mat4& ortho, const glm::mat4& proj, const
 {
     if (m_draw_tip)
     {
+        const auto& brush = Canvas::I->m_current_brush;
         auto pos = m_resizing ? m_size_pos_start : m_cur_pos;
         if (App::I.keys[(int)kKey::KeyAlt] && !m_resizing)
-            pos.x = pos.x - Canvas::I->m_current_brush->m_tip_size * 500.f;
+            pos.x = pos.x - brush->m_tip_size * 500.f;
         ShaderManager::use(kShader::StrokePreview);
         ShaderManager::u_int(kShaderUniform::Tex, 0);
         float tip_scale_fix = 1.f / glm::tan(glm::radians(Canvas::I->m_cam_fov * 0.5f));
-        float tip_scale = Canvas::I->m_current_brush->m_tip_size * 800.f * tip_scale_fix;
-        float tip_angle = Canvas::I->m_current_brush->m_tip_angle * (float)(M_PI * 2.0);
+        float tip_angle = brush->m_tip_angle * (float)(M_PI * 2.0);
+        glm::vec2 tip_scale = glm::vec2(brush->m_tip_size * 800.f * tip_scale_fix) * 
+            glm::vec2(brush->m_tip_flipx ? -1 : 1, brush->m_tip_flipy ? -1.f : 1.f) * 
+            glm::vec2((brush->m_tip_aspect <= 0.5 ? brush->m_tip_aspect * 2.f : 1.f),
+                      (brush->m_tip_aspect > 0.5  ? 1.f - (brush->m_tip_aspect - .5f) * 2.f : 1.f));
         glm::vec2 tip_offset = glm::vec2(0);
-        auto tip_color = glm::vec4(glm::vec3(Canvas::I->m_current_brush->m_tip_color), 1);
+        auto tip_color = glm::vec4(glm::vec3(brush->m_tip_color), 1.f);
         if (Canvas::I->m_current_stroke)
         {
             const auto& s = Canvas::I->m_current_stroke->m_prev_sample;
             if (s.size > 0.f)
             {
-                tip_scale = s.size;
+                tip_scale = (brush->m_tip_size * 800.f * tip_scale_fix) * s.scale;
                 tip_angle = s.angle;
                 tip_offset = s.pos - s.origin;
                 tip_color = glm::vec4(s.col, s.flow);
@@ -229,13 +233,13 @@ void CanvasModePen::on_Draw(const glm::mat4& ortho, const glm::mat4& proj, const
             glm::scale(glm::vec3(1, -1, 1)) *
             ortho *
             glm::translate(glm::vec3(pos + tip_offset, 0)) *
-            glm::scale(glm::vec3(tip_scale)) *
-            glm::eulerAngleZ(tip_angle)
+            glm::eulerAngleZ(tip_angle) *
+            glm::scale(glm::vec3(tip_scale, 1))
         );
         bool blend = glIsEnabled(GL_BLEND);
         glEnable(GL_BLEND);
         glActiveTexture(GL_TEXTURE0);
-        auto& tex = *Canvas::I->m_current_brush->m_tip_texture;
+        auto& tex = *brush->m_tip_texture;
         tex.bind();
         Canvas::I->m_sampler_brush.bind(0);
         Canvas::I->m_plane.draw_fill();
@@ -281,7 +285,7 @@ void CanvasModeLine::on_MouseEvent(MouseEvent* me, glm::vec2& loc)
             node->mouse_release();
             if (m_dragging)
             {
-                Canvas::I->stroke_start({ m_drag_start, 0 }, 1.f, Canvas::I->m_current_brush);
+                Canvas::I->stroke_start({ m_drag_start, 0 }, 1.f);
                 Canvas::I->stroke_update({ m_drag_pos, 0 }, 1.f);
                 Canvas::I->stroke_end();
             }
@@ -1156,6 +1160,7 @@ void CanvasModeTransform::leave()
     ShaderManager::u_int(kShaderUniform::UseFragCoordUV2, true);
     ShaderManager::u_vec2(kShaderUniform::Resolution, Canvas::I->m_size);
     ShaderManager::u_int(kShaderUniform::BlendMode, 0);
+    ShaderManager::u_int(kShaderUniform::UseDual, false);
 
     Canvas::I->m_sampler_bg.bind(1);
     Canvas::I->m_sampler_bg.bind(0);
diff --git a/src/layout.cpp b/src/layout.cpp
index 2684b1b..0384c51 100644
--- a/src/layout.cpp
+++ b/src/layout.cpp
@@ -94,6 +94,7 @@ bool LayoutManager::load(const char* path)
         }
         current = current->NextSiblingElement("layout");
     }
+    
     if (on_loaded)
         on_loaded();
     m_loaded = true;
diff --git a/src/node_button.cpp b/src/node_button.cpp
index 559926c..84eaa23 100644
--- a/src/node_button.cpp
+++ b/src/node_button.cpp
@@ -31,6 +31,7 @@ void NodeButton::clone_copy(Node* dest) const
 
 void NodeButton::init()
 {
+    Node::init();
     m_border = new NodeBorder();
     m_text = new NodeText();
     add_child(m_border);
@@ -48,6 +49,7 @@ void NodeButton::init()
 
 void NodeButton::create()
 {
+    Node::create();
     m_border->create();
     m_text->create();
     m_border->m_mouse_ignore = false;
@@ -56,6 +58,7 @@ void NodeButton::create()
 
 void NodeButton::loaded()
 {
+    Node::loaded();
     m_border->m_thinkness = 1;
     m_border->m_border_color = glm::vec4(0, 0, 0, 1);
     m_border->m_color = color_normal;
diff --git a/src/node_canvas.cpp b/src/node_canvas.cpp
index e66f374..7fa473a 100644
--- a/src/node_canvas.cpp
+++ b/src/node_canvas.cpp
@@ -213,13 +213,24 @@ void NodeCanvas::draw()
                 ShaderManager::u_int(kShaderUniform::UseFragCoordUV2, false);
                 ShaderManager::u_int(kShaderUniform::BlendMode, m_canvas->m_current_stroke->m_brush->m_blend_mode);
                 ShaderManager::u_mat4(kShaderUniform::MVP, plane_mvp_z);
+                ShaderManager::u_int(kShaderUniform::TexDual, 3);
+                ShaderManager::u_int(kShaderUniform::UseDual, true);
+                ShaderManager::u_int(kShaderUniform::DualBlendMode, 1);
+
                 glActiveTexture(GL_TEXTURE0);
                 m_canvas->m_layers[layer_index].m_rtt[plane_index].bindTexture();
                 glActiveTexture(GL_TEXTURE1);
                 m_canvas->m_tmp[plane_index].bindTexture();
                 glActiveTexture(GL_TEXTURE2);
                 m_canvas->m_smask.m_rtt[plane_index].bindTexture();
+                glActiveTexture(GL_TEXTURE3);
+                m_canvas->m_current_stroke->m_brush->m_dual_enabled ?
+                    m_canvas->m_tmp_dual[plane_index].bindTexture() :
+                    glBindTexture(GL_TEXTURE_2D, 0);
                 m_face_plane.draw_fill();
+                if (m_canvas->m_current_stroke->m_brush->m_dual_enabled)
+                    m_canvas->m_tmp_dual[plane_index].unbindTexture();
+                glActiveTexture(GL_TEXTURE2);
                 m_canvas->m_smask.m_rtt[plane_index].unbindTexture();
                 glActiveTexture(GL_TEXTURE1);
                 m_canvas->m_tmp[plane_index].unbindTexture();
@@ -329,9 +340,9 @@ void NodeCanvas::draw()
         for (int plane_index = 0; plane_index < 6; plane_index++)
         {
             auto plane_mvp = proj * camera *
-                glm::scale(glm::vec3(m_canvas->m_order.size() + 500)) *
+                glm::scale(glm::vec3(m_canvas->m_order.size() + 500.f)) *
                 m_canvas->m_plane_transform[plane_index] *
-                glm::translate(glm::vec3(0, 0, -1));
+                glm::translate(glm::vec3(0, 0, -1.f));
 
             ShaderManager::use(kShader::Checkerboard);
             ShaderManager::u_mat4(kShaderUniform::MVP, plane_mvp);
@@ -344,7 +355,7 @@ void NodeCanvas::draw()
         m_cache_rtt.bindTexture();
         ShaderManager::use(kShader::Texture);
         ShaderManager::u_int(kShaderUniform::Tex, 0);
-        ShaderManager::u_mat4(kShaderUniform::MVP, glm::ortho(-1, 1, -1, 1));
+        ShaderManager::u_mat4(kShaderUniform::MVP, glm::ortho<float>(-1, 1, -1, 1));
         m_face_plane.draw_fill();
         m_cache_rtt.unbindTexture();
     }
diff --git a/src/node_checkbox.cpp b/src/node_checkbox.cpp
index 8838a66..d13bb58 100644
--- a/src/node_checkbox.cpp
+++ b/src/node_checkbox.cpp
@@ -21,6 +21,7 @@ void NodeCheckBox::clone_children(Node* dest) const
 
 void NodeCheckBox::init()
 {
+    Node::init();
     m_outer = new NodeBorder();
     m_inner = new NodeBorder();
     add_child(m_outer);
@@ -44,6 +45,7 @@ void NodeCheckBox::init()
 
 void NodeCheckBox::create()
 {
+    Node::create();
     m_outer->create();
     m_inner->create();
     if (!m_icon_path.empty())
diff --git a/src/node_image.cpp b/src/node_image.cpp
index 1f68214..8289155 100644
--- a/src/node_image.cpp
+++ b/src/node_image.cpp
@@ -34,6 +34,7 @@ void NodeImage::clone_copy(Node* dest) const
 
 void NodeImage::create()
 {
+    Node::create();
     if (!m_path.empty() && TextureManager::load(m_path.c_str(), m_use_mipmaps))
     {
         //LOG("load image node %s", m_path.c_str());
diff --git a/src/node_panel_brush.cpp b/src/node_panel_brush.cpp
index 58b81af..ec7655b 100644
--- a/src/node_panel_brush.cpp
+++ b/src/node_panel_brush.cpp
@@ -126,7 +126,7 @@ void NodePanelBrush::init()
                 std::string path_thumb = App::I.data_path + "/brushes/thumbs/" + name + ".png";
 
                 img = img.resize_squared(glm::u8vec4(255));
-                img.gayscale_alpha();
+                //img.gayscale_alpha();
 
                 auto thumb = img.resize(64, 64);
                 thumb.save(path_thumb);
@@ -533,13 +533,17 @@ bool NodePanelBrushPreset::save()
             i.m_name_len = b->m_brush->m_name.size();
             i.m_brush_path_len = b->m_brush->m_brush_path.size();
             i.m_brush_thumb_path_len = b->m_brush->m_brush_thumb_path.size();
+            i.m_dual_path_len = b->m_brush->m_brush_path.size();
+            i.m_dual_thumb_path_len = b->m_brush->m_brush_thumb_path.size();
             i.m_stencil_path_len = b->m_brush->m_stencil_path.size();
+            i.m_stencil_thumb_path_len = b->m_brush->m_stencil_thumb_path.size();
             i.m_tip_color = b->m_brush->m_tip_color;
             i.m_tip_size = b->m_brush->m_tip_size;
             i.m_tip_spacing = b->m_brush->m_tip_spacing;
             i.m_tip_flow = b->m_brush->m_tip_flow;
             i.m_tip_opacity = b->m_brush->m_tip_opacity;
             i.m_tip_angle = b->m_brush->m_tip_angle;
+            i.m_tip_angle_delay = b->m_brush->m_tip_angle_delay;
             i.m_tip_mix = b->m_brush->m_tip_mix;
             i.m_tip_stencil = b->m_brush->m_tip_stencil;
             i.m_tip_wet = b->m_brush->m_tip_wet;
@@ -550,9 +554,6 @@ bool NodePanelBrushPreset::save()
             i.m_tip_angle_follow = b->m_brush->m_tip_angle_follow;
             i.m_tip_flow_pressure = b->m_brush->m_tip_flow_pressure;
             i.m_tip_size_pressure = b->m_brush->m_tip_size_pressure;
-            i.m_tip_hue_pressure = b->m_brush->m_tip_hue_pressure;
-            i.m_tip_sat_pressure = b->m_brush->m_tip_sat_pressure;
-            i.m_tip_val_pressure = b->m_brush->m_tip_val_pressure;
             i.m_jitter_scale = b->m_brush->m_jitter_scale;
             i.m_jitter_angle = b->m_brush->m_jitter_angle;
             i.m_jitter_spread = b->m_brush->m_jitter_spread;
@@ -561,11 +562,33 @@ bool NodePanelBrushPreset::save()
             i.m_jitter_sat = b->m_brush->m_jitter_sat;
             i.m_jitter_val = b->m_brush->m_jitter_val;
             i.m_blend_mode = b->m_brush->m_blend_mode;
+
+            i.m_tip_invert = b->m_brush->m_tip_invert;
+            i.m_tip_flipx = b->m_brush->m_tip_flipx;
+            i.m_tip_flipy = b->m_brush->m_tip_flipy;
+            i.m_tex_enabled = b->m_brush->m_tex_enabled;
+            i.m_dual_enabled = b->m_brush->m_dual_enabled;
+            i.m_dual_blend_mode = b->m_brush->m_dual_blend_mode;
+            i.m_dual_randflip = b->m_brush->m_dual_randflip;
+            i.m_dual_size = b->m_brush->m_dual_size;
+            i.m_dual_spacing = b->m_brush->m_dual_spacing;
+            i.m_dual_scatter = b->m_brush->m_dual_scatter;
+            i.m_dual_scatter_axis = b->m_brush->m_dual_scatter_axis;
+            i.m_dual_invert = b->m_brush->m_dual_invert;
+            i.m_dual_flipx = b->m_brush->m_dual_flipx;
+            i.m_dual_flipy = b->m_brush->m_dual_flipy;
+            i.m_tip_randflipx = b->m_brush->m_tip_randflipx;
+            i.m_tip_randflipy = b->m_brush->m_tip_randflipy;
+            i.m_tip_aspect = b->m_brush->m_tip_aspect;
+
             fwrite(&i, sizeof(i), 1, fp);
             fwrite(b->m_brush->m_name.c_str(), 1, b->m_brush->m_name.size(), fp);
             fwrite(b->m_brush->m_brush_path.c_str(), 1, b->m_brush->m_brush_path.size(), fp);
             fwrite(b->m_brush->m_brush_thumb_path.c_str(), 1, b->m_brush->m_brush_thumb_path.size(), fp);
+            fwrite(b->m_brush->m_dual_path.c_str(), 1, b->m_brush->m_brush_path.size(), fp);
+            fwrite(b->m_brush->m_dual_thumb_path.c_str(), 1, b->m_brush->m_brush_thumb_path.size(), fp);
             fwrite(b->m_brush->m_stencil_path.c_str(), 1, b->m_brush->m_stencil_path.size(), fp);
+            fwrite(b->m_brush->m_stencil_thumb_path.c_str(), 1, b->m_brush->m_stencil_thumb_path.size(), fp);
         }
         fclose(fp);
         return true;
@@ -604,6 +627,7 @@ bool NodePanelBrushPreset::restore()
             b->m_tip_flow = i.m_tip_flow;
             b->m_tip_opacity = i.m_tip_opacity;
             b->m_tip_angle = i.m_tip_angle;
+            b->m_tip_angle_delay = i.m_tip_angle_delay;
             b->m_tip_mix = i.m_tip_mix;
             b->m_tip_stencil = i.m_tip_stencil;
             b->m_tip_wet = i.m_tip_wet;
@@ -614,9 +638,6 @@ bool NodePanelBrushPreset::restore()
             b->m_tip_angle_follow = i.m_tip_angle_follow;
             b->m_tip_flow_pressure = i.m_tip_flow_pressure;
             b->m_tip_size_pressure = i.m_tip_size_pressure;
-            b->m_tip_hue_pressure = i.m_tip_hue_pressure;
-            b->m_tip_sat_pressure = i.m_tip_sat_pressure;
-            b->m_tip_val_pressure = i.m_tip_val_pressure;
             b->m_jitter_scale = i.m_jitter_scale;
             b->m_jitter_angle = i.m_jitter_angle;
             b->m_jitter_spread = i.m_jitter_spread;
@@ -625,14 +646,37 @@ bool NodePanelBrushPreset::restore()
             b->m_jitter_sat = i.m_jitter_sat;
             b->m_jitter_val = i.m_jitter_val;
             b->m_blend_mode = i.m_blend_mode;
+
+            b->m_tip_invert = i.m_tip_invert;
+            b->m_tip_flipx = i.m_tip_flipx;
+            b->m_tip_flipy = i.m_tip_flipy;
+            b->m_tex_enabled = i.m_tex_enabled;
+            b->m_dual_enabled = i.m_dual_enabled;
+            b->m_dual_blend_mode = i.m_dual_blend_mode;
+            b->m_dual_randflip = i.m_dual_randflip;
+            b->m_dual_size = i.m_dual_size;
+            b->m_dual_spacing = i.m_dual_spacing;
+            b->m_dual_scatter = i.m_dual_scatter;
+            b->m_dual_scatter_axis = i.m_dual_scatter_axis;
+            b->m_dual_invert = i.m_dual_invert;
+            b->m_dual_flipx = i.m_dual_flipx;
+            b->m_dual_flipy = i.m_dual_flipy;
+            b->m_tip_aspect = i.m_tip_aspect;
+
             b->m_name.resize(i.m_name_len);
             b->m_brush_path.resize(i.m_brush_path_len);
             b->m_brush_thumb_path.resize(i.m_brush_thumb_path_len);
+            b->m_dual_path.resize(i.m_brush_path_len);
+            b->m_dual_thumb_path.resize(i.m_brush_thumb_path_len);
             b->m_stencil_path.resize(i.m_stencil_path_len);
+            b->m_stencil_thumb_path.resize(i.m_stencil_thumb_path_len);
             fread((char*)b->m_name.c_str(), 1, b->m_name.size(), fp);
             fread((char*)b->m_brush_path.c_str(), 1, b->m_brush_path.size(), fp);
             fread((char*)b->m_brush_thumb_path.c_str(), 1, b->m_brush_thumb_path.size(), fp);
+            fread((char*)b->m_dual_path.c_str(), 1, b->m_brush_path.size(), fp);
+            fread((char*)b->m_dual_thumb_path.c_str(), 1, b->m_brush_thumb_path.size(), fp);
             fread((char*)b->m_stencil_path.c_str(), 1, b->m_stencil_path.size(), fp);
+            fread((char*)b->m_stencil_thumb_path.c_str(), 1, b->m_stencil_thumb_path.size(), fp);
 
             if (b->load_texture(b->m_brush_path, b->m_brush_thumb_path))
             {
diff --git a/src/node_panel_brush.h b/src/node_panel_brush.h
index cd211ce..18420a3 100644
--- a/src/node_panel_brush.h
+++ b/src/node_panel_brush.h
@@ -92,15 +92,23 @@ class NodePanelBrushPreset : public Node
     };
     struct item_t {
         int m_name_len = 0;
+        
         int m_brush_path_len = 0;
         int m_brush_thumb_path_len = 0;
+        
+        int m_dual_path_len = 0;
+        int m_dual_thumb_path_len = 0;
+        
         int m_stencil_path_len = 0;
+        int m_stencil_thumb_path_len = 0;
+
         glm::vec4 m_tip_color{ 0, 0, 0, 1 };
         float m_tip_size = 0;
         float m_tip_spacing = 0;
         float m_tip_flow = 0;
         float m_tip_opacity = 0;
         float m_tip_angle = 0;
+        float m_tip_angle_delay = 0;
         float m_tip_mix = 0;
         float m_tip_stencil = 0;
         float m_tip_wet = 0;
@@ -111,9 +119,6 @@ class NodePanelBrushPreset : public Node
         bool  m_tip_angle_follow = false;
         bool  m_tip_flow_pressure = false;
         bool  m_tip_size_pressure = false;
-        bool  m_tip_hue_pressure = false;
-        bool  m_tip_sat_pressure = false;
-        bool  m_tip_val_pressure = false;
         float m_jitter_scale = 0;
         float m_jitter_angle = 0;
         float m_jitter_spread = 0;
@@ -122,6 +127,24 @@ class NodePanelBrushPreset : public Node
         float m_jitter_sat = 0;
         float m_jitter_val = 0;
         int m_blend_mode = 0;
+
+        bool m_tip_invert = false;
+        bool m_tip_flipx = false;
+        bool m_tip_flipy = false;
+        bool m_tex_enabled = false;
+        bool m_dual_enabled = false;
+        int m_dual_blend_mode = 0;
+        bool m_dual_randflip = false;
+        float m_dual_size = 0;
+        float m_dual_spacing = 0;
+        float m_dual_scatter = 0;
+        bool m_dual_scatter_axis = false;
+        bool m_dual_invert = false;
+        bool m_dual_flipx = false;
+        bool m_dual_flipy = false;
+        bool m_tip_randflipx = false;
+        bool m_tip_randflipy = false;
+        float m_tip_aspect = 0;
     };
 public:
     std::function<void(Node* target, std::shared_ptr<Brush>& brush)> on_brush_changed;
diff --git a/src/node_panel_stroke.cpp b/src/node_panel_stroke.cpp
index 6e5215b..ef9d66a 100644
--- a/src/node_panel_stroke.cpp
+++ b/src/node_panel_stroke.cpp
@@ -26,10 +26,11 @@ void NodePanelStroke::update_controls()
 {
     const auto& b = Canvas::I->m_current_brush;
     m_tip_size->m_value.x = glm::pow(b->m_tip_size, 1.f/3.f);
-    m_tip_spacing->m_value.x = glm::pow(b->m_tip_spacing, 1.f/2.f) / 4.f;
+    m_tip_spacing->m_value.x = glm::pow(b->m_tip_spacing, 1.f/2.f);
     m_tip_flow->m_value.x = glm::pow(b->m_tip_flow, 1.f/2.f);
     m_tip_opacity->m_value.x = b->m_tip_opacity;
     m_tip_angle->m_value.x = b->m_tip_angle;
+    m_tip_angle_delay->m_value.x = b->m_tip_angle_delay;
     m_tip_stencil->m_value.x = b->m_tip_stencil;
     m_tip_wet->m_value.x = b->m_tip_wet;
     m_tip_noise->m_value.x = b->m_tip_noise;
@@ -43,6 +44,28 @@ void NodePanelStroke::update_controls()
     m_tip_angle_follow->checked = b->m_tip_angle_follow;
     m_tip_flow_pressure->checked = b->m_tip_flow_pressure;
     m_tip_size_pressure->checked = b->m_tip_size_pressure;
+
+    m_tip_invert->checked = b->m_tip_invert;
+    m_tip_flipx->checked = b->m_tip_flipx;
+    m_tip_flipy->checked = b->m_tip_flipy;
+    m_tex_enabled->checked = b->m_tex_enabled;
+    m_dual_enabled->checked = b->m_dual_enabled;
+    m_dual_scatter_axis->checked = b->m_dual_scatter_axis;
+    m_dual_invert->checked = b->m_dual_invert;
+    m_dual_flipx->checked = b->m_dual_flipx;
+    m_dual_flipy->checked = b->m_dual_flipy;
+    m_dual_randflip->checked = b->m_dual_randflip;
+    m_tip_randflipx->checked = b->m_tip_randflipx;
+    m_tip_randflipy->checked = b->m_tip_randflipy;
+   
+    m_dual_size->m_value.x = b->m_dual_size;
+    m_dual_spacing->m_value.x = b->m_dual_spacing;
+    m_dual_scatter->m_value.x = b->m_dual_scatter;
+    m_tip_aspect->m_value.x = b->m_tip_aspect;
+
+    m_blend_mode->set_index(b->m_blend_mode);
+    m_dual_blend_mode->set_index(b->m_dual_blend_mode);
+
     m_preview->m_brush = b;
     m_preview->draw_stroke();
 }
@@ -71,17 +94,23 @@ void NodePanelStroke::init_controls()
     m_presets_popup->m_flood_events = true;
     m_presets_popup->m_capture_children = false;
 
+    int br_idx = std::max(m_brush_popup->find_brush("Round-Hard"), 0);
+    // init main brush
     auto b = std::make_shared<Brush>();
-    int br_idx = m_brush_popup->find_brush("Round-Hard");
-    if (br_idx == -1)
-        br_idx = 0;
     b->load_texture(m_brush_popup->get_texture_path(br_idx), m_brush_popup->get_thumb_path(br_idx));
-    //b->load_stencil("data/paper.jpg");
     b->m_tip_size = .1f;
     b->m_tip_flow = .5f;
     b->m_tip_spacing = .1f;
     b->m_tip_opacity = 1.f;
     Canvas::I->m_current_brush = b;
+    // init dual brush
+    auto db = std::make_shared<Brush>();
+    db->load_texture(m_brush_popup->get_texture_path(br_idx), m_brush_popup->get_thumb_path(br_idx));
+    db->m_tip_size = .3f;
+    db->m_tip_flow = .5f;
+    db->m_tip_spacing = .1f;
+    db->m_tip_opacity = 1.f;
+    Canvas::I->m_dual_brush = db;
 
     m_preset_thumb = find<NodeImage>("preset-thumb");
     m_preset_thumb->m_use_mipmaps = true;
@@ -99,8 +128,10 @@ void NodePanelStroke::init_controls()
         tick->SetPosition(pos.x, pos.y + (m_preset_button->m_size.y - 32) * 0.5f);
         tick->set_image("data/ui/popup-tick.png");
         root()->update();
-        if ((pos.y + m_presets_popup->m_size.y) > screen.y) pos.y = screen.y - m_presets_popup->m_size.y;
-        if (pos.y < 0) pos.y = 0;
+        if ((pos.y + m_presets_popup->m_size.y) > screen.y) 
+            pos.y = screen.y - m_presets_popup->m_size.y;
+        if (pos.y < 0) 
+            pos.y = 0;
         m_presets_popup->SetPosition(pos.x + 16, pos.y);
         m_presets_popup->mouse_capture();
         root()->update();
@@ -111,7 +142,7 @@ void NodePanelStroke::init_controls()
 
         m_presets_popup->on_brush_changed = [this](Node* target, std::shared_ptr<Brush>& b) {
             // don't change some params
-            //b->m_tip_size = Canvas::I->m_current_brush->m_tip_size;
+            b->m_tip_size = Canvas::I->m_current_brush->m_tip_size;
             b->m_tip_color = Canvas::I->m_current_brush->m_tip_color;
             *Canvas::I->m_current_brush = *b;
             m_preview->draw_stroke();
@@ -125,8 +156,54 @@ void NodePanelStroke::init_controls()
         };
     };
 
+    m_dual_preset_thumb = find<NodeImage>("dual-preset-thumb");
+    m_dual_preset_thumb->m_use_mipmaps = true;
+    m_dual_preset_preview = find<NodeStrokePreview>("dual-preset-preview");
+    m_dual_preset_preview->m_brush = b;
+    m_dual_preset_preview->draw_stroke();
+    m_dual_preset_button = find<NodeButtonCustom>("dual-preset-button");
+    m_dual_preset_button->on_click = [this](Node*) {
+        auto screen = root()->m_size;
+        glm::vec2 pos = m_dual_preset_button->m_pos + glm::vec2(m_dual_preset_button->m_size.x, 0);
+        root()->add_child(m_presets_popup);
+        auto tick = root()->add_child<NodeImage>();
+        tick->SetPositioning(YGPositionTypeAbsolute);
+        tick->SetSize(16, 32);
+        tick->SetPosition(pos.x, pos.y + (m_dual_preset_button->m_size.y - 32) * 0.5f);
+        tick->set_image("data/ui/popup-tick.png");
+        root()->update();
+        if ((pos.y + m_presets_popup->m_size.y) > screen.y)
+            pos.y = screen.y - m_presets_popup->m_size.y;
+        if (pos.y < 0)
+            pos.y = 0;
+        m_presets_popup->SetPosition(pos.x + 16, pos.y);
+        m_presets_popup->mouse_capture();
+        root()->update();
+
+        m_presets_popup->on_popup_close = [this, tick](Node*) {
+            tick->destroy();
+        };
+
+        m_presets_popup->on_brush_changed = [this](Node* target, std::shared_ptr<Brush>& b) {
+            // don't change some params
+            b->m_tip_size = Canvas::I->m_current_brush->m_tip_size;
+            b->m_tip_color = { 0, 0, 0, 1 };
+            *Canvas::I->m_dual_brush = *b;
+            m_preview->draw_stroke();
+            m_dual_preset_preview->draw_stroke();
+            m_dual_brush_thumb->set_image(b->m_brush_thumb_path);
+            m_dual_preset_thumb->set_image(b->m_brush_thumb_path);
+            update_controls();
+
+            //m_presets_popup->mouse_release();
+            //m_presets_popup->parent->remove_child(m_presets_popup.get());
+        };
+    };
+
     m_brush_thumb = find<NodeImage>("tip-change-thumb");
     m_brush_thumb->set_image(m_brush_popup->get_thumb_path(br_idx));
+    m_dual_brush_thumb = find<NodeImage>("dual-change-thumb");
+    m_dual_brush_thumb->set_image(m_brush_popup->get_thumb_path(br_idx));
 
     m_brush_button = find<NodeButtonCustom>("tip-change");
     m_brush_button->on_click = [this](Node*) {
@@ -139,8 +216,10 @@ void NodePanelStroke::init_controls()
         tick->SetPosition(pos.x, pos.y + (m_brush_button->m_size.y - 32) * 0.5f);
         tick->set_image("data/ui/popup-tick.png");
         root()->update();
-        if ((pos.y + m_brush_popup->m_size.y) > screen.y) pos.y = screen.y - m_brush_popup->m_size.y;
-        if (pos.y < 0) pos.y = 0;
+        if ((pos.y + m_brush_popup->m_size.y) > screen.y)
+            pos.y = screen.y - m_brush_popup->m_size.y;
+        if (pos.y < 0)
+            pos.y = 0;
         m_brush_popup->SetPosition(pos.x + 16, pos.y);
         m_brush_popup->mouse_capture();
         root()->update();
@@ -160,8 +239,11 @@ void NodePanelStroke::init_controls()
 
     m_preview = find<NodeStrokePreview>("canvas");
     m_blend_mode = find<NodeComboBox>("blend-mode");
-    m_blend_mode->on_select = [](Node*, int index) {
+    m_blend_mode->on_select = [this](Node*, int index) {
         Canvas::I->m_current_brush->m_blend_mode = index;
+        m_preview->draw_stroke();
+        if (on_stroke_change)
+            on_stroke_change(this);
     };
 
     init_slider(m_tip_size, "tip-size", &Brush::m_tip_size);
@@ -169,6 +251,7 @@ void NodePanelStroke::init_controls()
     init_slider(m_tip_flow, "tip-flow", &Brush::m_tip_flow);
     init_slider(m_tip_opacity, "tip-opacity", &Brush::m_tip_opacity);
     init_slider(m_tip_angle, "tip-angle", &Brush::m_tip_angle);
+    init_slider(m_tip_angle_delay, "tip-angle-delay", &Brush::m_tip_angle_delay);
     init_slider(m_tip_mix, "tip-mix", &Brush::m_tip_mix);
     init_slider(m_tip_stencil, "tip-stencil", &Brush::m_tip_stencil);
     init_slider(m_tip_wet, "tip-wet", &Brush::m_tip_wet);
@@ -184,15 +267,47 @@ void NodePanelStroke::init_controls()
     init_slider(m_jitter_sat, "jitter-sat", &Brush::m_jitter_sat);
     init_slider(m_jitter_val, "jitter-val", &Brush::m_jitter_val);
     m_curves[m_tip_size] = [](float v){ return glm::pow(v, 3.f); };
-    m_curves[m_tip_spacing] = [](float v){ return glm::pow(v * 4.f, 2.f); };
+    m_curves[m_tip_spacing] = [](float v){ return glm::pow(v, 2.f); };
     m_curves[m_tip_flow] = [](float v){ return glm::pow(v, 2.f); };
 
     init_checkbox(m_tip_angle_follow, "tip-angle-follow", &Brush::m_tip_angle_follow);
     init_checkbox(m_tip_flow_pressure, "tip-flow-pressure", &Brush::m_tip_flow_pressure);
     init_checkbox(m_tip_size_pressure, "tip-size-pressure", &Brush::m_tip_size_pressure);
-    init_checkbox(m_tip_hue_pressure, "tip-hue-pressure", &Brush::m_tip_hue_pressure);
-    init_checkbox(m_tip_sat_pressure, "tip-sat-pressure", &Brush::m_tip_sat_pressure);
-    init_checkbox(m_tip_val_pressure, "tip-val-pressure", &Brush::m_tip_val_pressure);
+
+    init_checkbox(m_tip_invert, "tip-invert", &Brush::m_tip_invert);
+    init_checkbox(m_tip_flipx, "tip-flipx", &Brush::m_tip_flipx);
+    init_checkbox(m_tip_flipy, "tip-flipy", &Brush::m_tip_flipy);
+    init_checkbox(m_tex_enabled, "tex-enabled", &Brush::m_tex_enabled);
+    init_checkbox(m_dual_enabled, "dual-enabled", &Brush::m_dual_enabled);
+    init_checkbox(m_dual_scatter_axis, "dual-scatter-axis", &Brush::m_dual_scatter_axis);
+    init_checkbox(m_dual_invert, "dual-invert", &Brush::m_dual_invert);
+    init_checkbox(m_dual_flipx, "dual-flipx", &Brush::m_dual_flipx);
+    init_checkbox(m_dual_flipy, "dual-flipy", &Brush::m_dual_flipy);
+    init_checkbox(m_dual_randflip, "dual-randflip", &Brush::m_dual_randflip);
+    init_checkbox(m_tip_randflipx, "tip-randflipx", &Brush::m_tip_randflipx);
+    init_checkbox(m_tip_randflipy, "tip-randflipy", &Brush::m_tip_randflipy);
+
+    init_slider(m_dual_size, "dual-size", &Brush::m_dual_size);
+    init_slider(m_dual_spacing, "dual-spacing", &Brush::m_dual_spacing);
+    init_slider(m_dual_scatter, "dual-scatter", &Brush::m_dual_scatter);
+    init_slider(m_tip_aspect, "tip-aspect", &Brush::m_tip_aspect);
+
+    m_tip_aspect_reset = find<NodeButtonCustom>("tip-aspect-reset");
+    m_tip_aspect_reset->on_click = [this](Node*) {
+        m_tip_aspect->set_value(0.5);
+        Canvas::I->m_current_brush->m_tip_aspect = 0.5f;
+        m_preview->draw_stroke();
+        if (on_stroke_change)
+            on_stroke_change(this);
+    };
+
+    m_dual_blend_mode = find<NodeComboBox>("blend-mode");
+    m_dual_blend_mode->on_select = [this](Node*, int index) {
+        Canvas::I->m_current_brush->m_dual_blend_mode = index;
+        m_preview->draw_stroke();
+        if (on_stroke_change)
+            on_stroke_change(this);
+    };
 
     m_preview->m_brush = Canvas::I->m_current_brush;
     m_preview->draw_stroke();
@@ -226,7 +341,6 @@ void NodePanelStroke::handle_slide(float Brush::* prop, Node* target, float valu
 {
     auto curve = m_curves.find((NodeSliderH*)target);
     Canvas::I->m_current_brush.get()->*prop = curve != m_curves.end() ? curve->second(value) : value;
-    m_preview->m_brush = Canvas::I->m_current_brush;
     m_preview->draw_stroke();
     if (on_stroke_change)
         on_stroke_change(this);
@@ -243,7 +357,6 @@ void NodePanelStroke::init_checkbox(NodeCheckBox*& target, const char* id, bool
 void NodePanelStroke::handle_checkbox(bool Brush::* prop, Node *target, bool value)
 {
     Canvas::I->m_current_brush.get()->*prop = value;
-    m_preview->m_brush = Canvas::I->m_current_brush;
     m_preview->draw_stroke();
     if (on_stroke_change)
         on_stroke_change(this);
diff --git a/src/node_panel_stroke.h b/src/node_panel_stroke.h
index 480f9c9..bcc4dca 100644
--- a/src/node_panel_stroke.h
+++ b/src/node_panel_stroke.h
@@ -19,6 +19,7 @@ public:
     NodeSliderH* m_tip_flow;
     NodeSliderH* m_tip_opacity;
     NodeSliderH* m_tip_angle;
+    NodeSliderH* m_tip_angle_delay;
     NodeSliderH* m_tip_mix;
     NodeSliderH* m_tip_stencil;
     NodeSliderH* m_tip_wet;
@@ -36,14 +37,35 @@ public:
     NodeCheckBox* m_tip_angle_follow;
     NodeCheckBox* m_tip_flow_pressure;
     NodeCheckBox* m_tip_size_pressure;
-    NodeCheckBox* m_tip_hue_pressure;
-    NodeCheckBox* m_tip_sat_pressure;
-    NodeCheckBox* m_tip_val_pressure;
     NodeButtonCustom* m_brush_button;
     NodeImage* m_brush_thumb;
+    NodeImage* m_dual_brush_thumb;
     NodeImage* m_preset_thumb;
+    NodeImage* m_dual_preset_thumb;
     NodeButtonCustom* m_preset_button;
+    NodeButtonCustom* m_dual_preset_button;
     NodeStrokePreview* m_preset_preview;
+    NodeStrokePreview* m_dual_preset_preview;
+
+    NodeCheckBox* m_tip_invert;
+    NodeCheckBox* m_tip_flipx;
+    NodeCheckBox* m_tip_flipy;
+    NodeCheckBox* m_tex_enabled;
+    NodeCheckBox* m_dual_enabled;
+    NodeCheckBox* m_dual_scatter_axis;
+    NodeCheckBox* m_dual_invert;
+    NodeCheckBox* m_dual_flipx;
+    NodeCheckBox* m_dual_flipy;
+    NodeCheckBox* m_dual_randflip;
+    NodeCheckBox* m_tip_randflipx;
+    NodeCheckBox* m_tip_randflipy;
+    NodeSliderH*  m_dual_size;
+    NodeSliderH*  m_dual_spacing;
+    NodeSliderH*  m_dual_scatter;
+    NodeSliderH*  m_tip_aspect;
+    NodeComboBox* m_dual_blend_mode;
+    NodeButtonCustom* m_tip_aspect_reset;
+
     std::shared_ptr<NodePanelBrush> m_brush_popup;
     std::shared_ptr<NodePanelBrushPreset> m_presets_popup;
     std::function<void(Node* target)> on_stroke_change;
diff --git a/src/node_text.cpp b/src/node_text.cpp
index a0e0cee..5e632f5 100644
--- a/src/node_text.cpp
+++ b/src/node_text.cpp
@@ -24,6 +24,7 @@ void NodeText::clone_copy(Node* dest) const
 
 void NodeText::create()
 {
+    Node::create();
     if (!m_font.empty())
     {
         char font[64];
diff --git a/src/node_text.h b/src/node_text.h
index 7d9bc1d..d45e22f 100644
--- a/src/node_text.h
+++ b/src/node_text.h
@@ -7,9 +7,9 @@ class NodeText : public Node
 public:
     TextMesh m_text_mesh;
     std::string m_text;
-    std::string m_font;
+    std::string m_font = "arial";
     glm::vec4 m_color{ 1, 1, 1, 1 };
-    int m_font_size;
+    int m_font_size = 11;
     kFont font_id;
     virtual Node* clone_instantiate() const override;
     virtual void clone_copy(Node* dest) const override;
diff --git a/src/node_viewport.cpp b/src/node_viewport.cpp
index e58d515..27572e6 100644
--- a/src/node_viewport.cpp
+++ b/src/node_viewport.cpp
@@ -39,6 +39,7 @@ Node* NodeViewport::clone_instantiate() const
 }
 void NodeViewport::create()
 {
+    Node::create();
     m_faces = std::make_unique<Plane>();
     m_faces->create<1>(10, 10);
     m_sampler = std::make_unique<Sampler>();
diff --git a/src/pch.h b/src/pch.h
index 6dd013d..61bcf04 100644
--- a/src/pch.h
+++ b/src/pch.h
@@ -113,6 +113,7 @@
 #include <glm/gtx/intersect.hpp>
 #include <glm/gtx/component_wise.hpp>
 #include <glm/gtx/normal.hpp>
+#include <glm/gtx/matrix_transform_2d.hpp>
 
 #include <tinyxml2.h>
 #include <jpge.h>
diff --git a/src/rtt.cpp b/src/rtt.cpp
index 9137dba..0cf20c2 100644
--- a/src/rtt.cpp
+++ b/src/rtt.cpp
@@ -14,7 +14,7 @@ RTT::RTT()
 
 RTT::~RTT()
 {
-    //destroy();
+    destroy();
 }
 
 void RTT::resize(int width, int height)
diff --git a/src/shader.h b/src/shader.h
index 1a2d815..46210a5 100644
--- a/src/shader.h
+++ b/src/shader.h
@@ -11,6 +11,7 @@ enum class kShaderUniform : uint16_t
     TexMix = const_hash("tex_mix"),
     TexMixA = const_hash("tex_mix_alpha"),
     TexMask = const_hash("tex_mask"),
+    TexDual = const_hash("tex_dual"),
     TexStroke = const_hash("tex_stroke"),
     TexStencil = const_hash("tex_stencil"),
     StencilOffset = const_hash("stencil_offset"),
@@ -27,9 +28,11 @@ enum class kShaderUniform : uint16_t
     Resolution = const_hash("resolution"),
     Highlight = const_hash("highlight"),
     BlendMode = const_hash("blend_mode"),
+    DualBlendMode = const_hash("blend_mode"),
     Noise = const_hash("noise"),
     Direction = const_hash("dir"),
     UseFragCoordUV2 = const_hash("fragUV2"),
+    UseDual = const_hash("use_dual"),
     LightDir = const_hash("light_dir"),
     Mode = const_hash("mode"),
     Ambient = const_hash("ambient"),
diff --git a/src/util.cpp b/src/util.cpp
index 8ae1895..0f34d66 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -14,6 +14,7 @@ std::vector<vertex_t> poly_remove_duplicate<vertex_t>(const std::vector<vertex_t
     return ret;
 }
 
+// params {x, y} and {origin, size} form
 bool point_in_rect(const glm::vec2& p, const glm::vec4& r)
 {
     return p.x > r.x && p.x < r.x+r.z && p.y > r.y && p.y < r.y+r.w;
@@ -45,6 +46,18 @@ glm::vec4 rect_union(glm::vec4 a, glm::vec4 b)
     return o;
 }
 
+// params and returns {min, max} form
+glm::vec4 box_union(glm::vec4 a, glm::vec4 b)
+{
+    return { glm::min(xy(a), xy(b)), glm::max(zw(a), zw(b)) };
+}
+
+// params and returns {min, max} form
+glm::vec4 box_intersection(glm::vec4 a, glm::vec4 b)
+{
+    return { glm::max(xy(a), xy(b)), glm::min(zw(a), zw(b)) };
+}
+
 bool ray_intersect(glm::vec3 ray_origin, glm::vec3 ray_dir, glm::vec3 plane_origin,
     glm::vec3 plane_normal, glm::vec3 plane_tangent, glm::vec3& out_hit, float& out_t)
 {
diff --git a/src/util.h b/src/util.h
index c1efd59..18e7eba 100644
--- a/src/util.h
+++ b/src/util.h
@@ -45,9 +45,16 @@ std::vector<T> poly_remove_duplicate(const std::vector<T>& v, const float toller
 template<>
 std::vector<vertex_t> poly_remove_duplicate<vertex_t>(const std::vector<vertex_t>& v, const float tollerance);
 
+// params {x, y} and {origin, size} form
 bool point_in_rect(const glm::vec2& point, const glm::vec4& rect);
+// params and returns {origin, size} form
 glm::vec4 rect_intersection(glm::vec4 a, glm::vec4 b);
+// params and returns {origin, size} form
 glm::vec4 rect_union(glm::vec4 a, glm::vec4 b);
+// params and returns {min, max} form
+glm::vec4 box_union(glm::vec4 a, glm::vec4 b);
+// params and returns {min, max} form
+glm::vec4 box_intersection(glm::vec4 a, glm::vec4 b);
 bool ray_intersect(glm::vec3 ray_origin, glm::vec3 ray_dir, glm::vec3 plane_origin,
     glm::vec3 plane_normal, glm::vec3 plane_tangent, glm::vec3& out_hit, float& out_t);
 bool segments_intersect(const glm::vec2& p0a, const glm::vec2& p0b,
@@ -78,15 +85,23 @@ inline glm::vec2 xy(const glm::vec3& v) { return glm::vec2(v.x, v.y); }
 
 void parallel_for(unsigned nb_elements, std::function<void(int i)> functor, bool use_threads = true);
 
-template<typename T, int N> struct cbuffer
+template<typename T> struct cbuffer
 {
-    T m_vec[N];
+    std::unique_ptr<T[]> m_vec;
     int m_capacity = 0;
     int m_count = 0;
     int m_index = 0;
-    cbuffer()
+    cbuffer(int initial_capacity)
     {
-        m_capacity = N;
+        m_capacity = initial_capacity;
+        m_index = 0;
+        m_count = 0;
+        m_vec = std::make_unique<T[]>(m_capacity);
+    }
+    void resize(int new_capacity)
+    {
+        m_capacity = new_capacity;
+        m_vec = std::make_unique<T[]>(m_capacity);
         m_index = 0;
         m_count = 0;
     }