From 162977e6bab2fcd4c46a9c65a2791f88c1d9da4a Mon Sep 17 00:00:00 2001
From: Wintersta7e <Wintersta7e@users.noreply.github.com>
Date: Sat, 7 Mar 2026 13:09:03 +0100
Subject: [PATCH 01/11] feat: add MoltenForge dual dark/light theme

Co-Authored-By: Rooty
---
 .../Themes/MoltenForgeTheme.axaml             | 325 ++++++++++++++++++
 1 file changed, 325 insertions(+)
 create mode 100644 src/FlowForge.UI/Themes/MoltenForgeTheme.axaml

diff --git a/src/FlowForge.UI/Themes/MoltenForgeTheme.axaml b/src/FlowForge.UI/Themes/MoltenForgeTheme.axaml
new file mode 100644
index 0000000..57534a0
--- /dev/null
+++ b/src/FlowForge.UI/Themes/MoltenForgeTheme.axaml
@@ -0,0 +1,325 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Styles.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.ThemeDictionaries>
+
+                <!-- ═══════════════════════════════════════════ -->
+                <!-- ═══ DARK VARIANT ═══════════════════════════ -->
+                <!-- ═══════════════════════════════════════════ -->
+                <ResourceDictionary x:Key="Dark">
+
+                    <!-- Background layers (darkest to lightest) -->
+                    <Color x:Key="ForgeBgColor">#08070a</Color>
+                    <Color x:Key="ForgeDeepColor">#0e0c11</Color>
+                    <Color x:Key="ForgePanelColor">#141218</Color>
+                    <Color x:Key="ForgeSurfaceColor">#1c1820</Color>
+                    <Color x:Key="ForgeElevatedColor">#252029</Color>
+                    <Color x:Key="ForgeHoverColor">#2e2735</Color>
+
+                    <!-- Borders -->
+                    <Color x:Key="ForgeBorderColor">#2a2230</Color>
+                    <Color x:Key="ForgeBorderFocusColor">#3d2f48</Color>
+
+                    <!-- Text -->
+                    <Color x:Key="ForgeTextColor">#ede6f0</Color>
+                    <Color x:Key="ForgeTextSecondaryColor">#9a8da8</Color>
+                    <Color x:Key="ForgeTextMutedColor">#564a62</Color>
+
+                    <!-- Accent -->
+                    <Color x:Key="ForgeAccentColor">#e8932f</Color>
+                    <Color x:Key="ForgeAccentBrightColor">#f5a623</Color>
+
+                    <!-- Categories -->
+                    <Color x:Key="ForgeSourceColor">#5bb8f5</Color>
+                    <Color x:Key="ForgeTransformColor">#5ce0a0</Color>
+                    <Color x:Key="ForgeOutputColor">#e8932f</Color>
+
+                    <!-- Status -->
+                    <Color x:Key="ForgeSuccessColor">#5ce0a0</Color>
+                    <Color x:Key="ForgeErrorColor">#f2716a</Color>
+                    <Color x:Key="ForgeWarningColor">#f5c842</Color>
+
+                    <!-- Molten gradient stops -->
+                    <Color x:Key="ForgeMoltenFromColor">#d4612c</Color>
+                    <Color x:Key="ForgeMoltenToColor">#f5c842</Color>
+
+                    <!-- ═══ Brush Resources ═══ -->
+
+                    <!-- Background brushes -->
+                    <SolidColorBrush x:Key="ForgeBg" Color="{StaticResource ForgeBgColor}" />
+                    <SolidColorBrush x:Key="ForgeDeep" Color="{StaticResource ForgeDeepColor}" />
+                    <SolidColorBrush x:Key="ForgePanel" Color="{StaticResource ForgePanelColor}" />
+                    <SolidColorBrush x:Key="ForgeSurface" Color="{StaticResource ForgeSurfaceColor}" />
+                    <SolidColorBrush x:Key="ForgeElevated" Color="{StaticResource ForgeElevatedColor}" />
+                    <SolidColorBrush x:Key="ForgeHover" Color="{StaticResource ForgeHoverColor}" />
+
+                    <!-- Border brushes -->
+                    <SolidColorBrush x:Key="ForgeBorder" Color="{StaticResource ForgeBorderColor}" />
+                    <SolidColorBrush x:Key="ForgeBorderFocus" Color="{StaticResource ForgeBorderFocusColor}" />
+
+                    <!-- Text brushes -->
+                    <SolidColorBrush x:Key="ForgeText" Color="{StaticResource ForgeTextColor}" />
+                    <SolidColorBrush x:Key="ForgeTextSecondary" Color="{StaticResource ForgeTextSecondaryColor}" />
+                    <SolidColorBrush x:Key="ForgeTextMuted" Color="{StaticResource ForgeTextMutedColor}" />
+
+                    <!-- Accent brushes -->
+                    <SolidColorBrush x:Key="ForgeAccent" Color="{StaticResource ForgeAccentColor}" />
+                    <SolidColorBrush x:Key="ForgeAccentBright" Color="{StaticResource ForgeAccentBrightColor}" />
+
+                    <!-- Category brushes -->
+                    <SolidColorBrush x:Key="ForgeSource" Color="{StaticResource ForgeSourceColor}" />
+                    <SolidColorBrush x:Key="ForgeTransform" Color="{StaticResource ForgeTransformColor}" />
+                    <SolidColorBrush x:Key="ForgeOutput" Color="{StaticResource ForgeOutputColor}" />
+
+                    <!-- Status brushes -->
+                    <SolidColorBrush x:Key="ForgeSuccess" Color="{StaticResource ForgeSuccessColor}" />
+                    <SolidColorBrush x:Key="ForgeError" Color="{StaticResource ForgeErrorColor}" />
+                    <SolidColorBrush x:Key="ForgeWarning" Color="{StaticResource ForgeWarningColor}" />
+
+                    <!-- Molten gradient brushes -->
+                    <SolidColorBrush x:Key="ForgeMoltenFrom" Color="{StaticResource ForgeMoltenFromColor}" />
+                    <SolidColorBrush x:Key="ForgeMoltenTo" Color="{StaticResource ForgeMoltenToColor}" />
+
+                    <!-- Dim variants (~15% opacity) for badges -->
+                    <SolidColorBrush x:Key="ForgeSourceDim" Color="#265bb8f5" />
+                    <SolidColorBrush x:Key="ForgeTransformDim" Color="#265ce0a0" />
+                    <SolidColorBrush x:Key="ForgeOutputDim" Color="#26e8932f" />
+                    <SolidColorBrush x:Key="ForgeSuccessDim" Color="#265ce0a0" />
+                    <SolidColorBrush x:Key="ForgeErrorDim" Color="#26f2716a" />
+                    <SolidColorBrush x:Key="ForgeWarningDim" Color="#26f5c842" />
+
+                </ResourceDictionary>
+
+                <!-- ═══════════════════════════════════════════ -->
+                <!-- ═══ LIGHT VARIANT ═════════════════════════ -->
+                <!-- ═══════════════════════════════════════════ -->
+                <ResourceDictionary x:Key="Light">
+
+                    <!-- Background layers (lightest to darkest) -->
+                    <Color x:Key="ForgeBgColor">#f5f2ee</Color>
+                    <Color x:Key="ForgeDeepColor">#eee9e3</Color>
+                    <Color x:Key="ForgePanelColor">#faf8f5</Color>
+                    <Color x:Key="ForgeSurfaceColor">#ffffff</Color>
+                    <Color x:Key="ForgeElevatedColor">#f0ece6</Color>
+                    <Color x:Key="ForgeHoverColor">#e8e3db</Color>
+
+                    <!-- Borders -->
+                    <Color x:Key="ForgeBorderColor">#ddd5ca</Color>
+                    <Color x:Key="ForgeBorderFocusColor">#c9bfb2</Color>
+
+                    <!-- Text -->
+                    <Color x:Key="ForgeTextColor">#1c1714</Color>
+                    <Color x:Key="ForgeTextSecondaryColor">#6b5e52</Color>
+                    <Color x:Key="ForgeTextMutedColor">#a89c8e</Color>
+
+                    <!-- Accent -->
+                    <Color x:Key="ForgeAccentColor">#d07a18</Color>
+                    <Color x:Key="ForgeAccentBrightColor">#e8932f</Color>
+
+                    <!-- Categories -->
+                    <Color x:Key="ForgeSourceColor">#2680c2</Color>
+                    <Color x:Key="ForgeTransformColor">#1a9a6c</Color>
+                    <Color x:Key="ForgeOutputColor">#d07a18</Color>
+
+                    <!-- Status -->
+                    <Color x:Key="ForgeSuccessColor">#1a9a6c</Color>
+                    <Color x:Key="ForgeErrorColor">#d44040</Color>
+                    <Color x:Key="ForgeWarningColor">#c88a15</Color>
+
+                    <!-- Molten gradient stops -->
+                    <Color x:Key="ForgeMoltenFromColor">#c05820</Color>
+                    <Color x:Key="ForgeMoltenToColor">#e8b530</Color>
+
+                    <!-- ═══ Brush Resources ═══ -->
+
+                    <!-- Background brushes -->
+                    <SolidColorBrush x:Key="ForgeBg" Color="{StaticResource ForgeBgColor}" />
+                    <SolidColorBrush x:Key="ForgeDeep" Color="{StaticResource ForgeDeepColor}" />
+                    <SolidColorBrush x:Key="ForgePanel" Color="{StaticResource ForgePanelColor}" />
+                    <SolidColorBrush x:Key="ForgeSurface" Color="{StaticResource ForgeSurfaceColor}" />
+                    <SolidColorBrush x:Key="ForgeElevated" Color="{StaticResource ForgeElevatedColor}" />
+                    <SolidColorBrush x:Key="ForgeHover" Color="{StaticResource ForgeHoverColor}" />
+
+                    <!-- Border brushes -->
+                    <SolidColorBrush x:Key="ForgeBorder" Color="{StaticResource ForgeBorderColor}" />
+                    <SolidColorBrush x:Key="ForgeBorderFocus" Color="{StaticResource ForgeBorderFocusColor}" />
+
+                    <!-- Text brushes -->
+                    <SolidColorBrush x:Key="ForgeText" Color="{StaticResource ForgeTextColor}" />
+                    <SolidColorBrush x:Key="ForgeTextSecondary" Color="{StaticResource ForgeTextSecondaryColor}" />
+                    <SolidColorBrush x:Key="ForgeTextMuted" Color="{StaticResource ForgeTextMutedColor}" />
+
+                    <!-- Accent brushes -->
+                    <SolidColorBrush x:Key="ForgeAccent" Color="{StaticResource ForgeAccentColor}" />
+                    <SolidColorBrush x:Key="ForgeAccentBright" Color="{StaticResource ForgeAccentBrightColor}" />
+
+                    <!-- Category brushes -->
+                    <SolidColorBrush x:Key="ForgeSource" Color="{StaticResource ForgeSourceColor}" />
+                    <SolidColorBrush x:Key="ForgeTransform" Color="{StaticResource ForgeTransformColor}" />
+                    <SolidColorBrush x:Key="ForgeOutput" Color="{StaticResource ForgeOutputColor}" />
+
+                    <!-- Status brushes -->
+                    <SolidColorBrush x:Key="ForgeSuccess" Color="{StaticResource ForgeSuccessColor}" />
+                    <SolidColorBrush x:Key="ForgeError" Color="{StaticResource ForgeErrorColor}" />
+                    <SolidColorBrush x:Key="ForgeWarning" Color="{StaticResource ForgeWarningColor}" />
+
+                    <!-- Molten gradient brushes -->
+                    <SolidColorBrush x:Key="ForgeMoltenFrom" Color="{StaticResource ForgeMoltenFromColor}" />
+                    <SolidColorBrush x:Key="ForgeMoltenTo" Color="{StaticResource ForgeMoltenToColor}" />
+
+                    <!-- Dim variants (~15% opacity) for badges -->
+                    <SolidColorBrush x:Key="ForgeSourceDim" Color="#262680c2" />
+                    <SolidColorBrush x:Key="ForgeTransformDim" Color="#261a9a6c" />
+                    <SolidColorBrush x:Key="ForgeOutputDim" Color="#26d07a18" />
+                    <SolidColorBrush x:Key="ForgeSuccessDim" Color="#261a9a6c" />
+                    <SolidColorBrush x:Key="ForgeErrorDim" Color="#26d44040" />
+                    <SolidColorBrush x:Key="ForgeWarningDim" Color="#26c88a15" />
+
+                </ResourceDictionary>
+
+            </ResourceDictionary.ThemeDictionaries>
+        </ResourceDictionary>
+    </Styles.Resources>
+
+    <!-- ═══ Global Style Overrides ═══ -->
+
+    <!-- Button: forge surface bg, border, rounded 8px -->
+    <Style Selector="Button">
+        <Setter Property="Background" Value="{DynamicResource ForgeSurface}" />
+        <Setter Property="Foreground" Value="{DynamicResource ForgeText}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ForgeBorder}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="CornerRadius" Value="8" />
+        <Setter Property="Padding" Value="10,5" />
+    </Style>
+    <Style Selector="Button:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ForgeElevated}" />
+    </Style>
+    <Style Selector="Button:pressed /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ForgeHover}" />
+    </Style>
+
+    <!-- Button.accent: forge accent run button -->
+    <Style Selector="Button.accent">
+        <Setter Property="Background" Value="{DynamicResource ForgeAccent}" />
+        <Setter Property="Foreground" Value="#08070a" />
+        <Setter Property="FontWeight" Value="SemiBold" />
+    </Style>
+    <Style Selector="Button.accent:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ForgeAccentBright}" />
+    </Style>
+
+    <!-- Button.preview: transparent outline with accent -->
+    <Style Selector="Button.preview">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ForgeAccent}" />
+        <Setter Property="Foreground" Value="{DynamicResource ForgeAccent}" />
+        <Setter Property="FontWeight" Value="SemiBold" />
+    </Style>
+    <Style Selector="Button.preview:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="#26e8932f" />
+    </Style>
+
+    <!-- Button.toolbarIcon: icon-only toolbar buttons -->
+    <Style Selector="Button.toolbarIcon">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Width" Value="34" />
+        <Setter Property="Height" Value="34" />
+        <Setter Property="Padding" Value="7" />
+        <Setter Property="CornerRadius" Value="8" />
+    </Style>
+    <Style Selector="Button.toolbarIcon:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ForgeElevated}" />
+        <Setter Property="CornerRadius" Value="8" />
+    </Style>
+
+    <!-- Button.templateButton: template quick-start buttons -->
+    <Style Selector="Button.templateButton">
+        <Setter Property="Background" Value="{DynamicResource ForgeSurface}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ForgeBorder}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="CornerRadius" Value="12" />
+        <Setter Property="Padding" Value="14,10" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+    </Style>
+    <Style Selector="Button.templateButton:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ForgeElevated}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ForgeAccent}" />
+    </Style>
+
+    <!-- TextBox: forge surface bg, rounded 6px -->
+    <Style Selector="TextBox">
+        <Setter Property="Background" Value="{DynamicResource ForgeSurface}" />
+        <Setter Property="Foreground" Value="{DynamicResource ForgeText}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ForgeBorder}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="CornerRadius" Value="6" />
+    </Style>
+    <Style Selector="TextBox:focus /template/ Border#PART_BorderElement">
+        <Setter Property="BorderBrush" Value="{DynamicResource ForgeAccent}" />
+    </Style>
+
+    <!-- ComboBox -->
+    <Style Selector="ComboBox">
+        <Setter Property="Background" Value="{DynamicResource ForgeSurface}" />
+        <Setter Property="Foreground" Value="{DynamicResource ForgeText}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ForgeBorder}" />
+        <Setter Property="CornerRadius" Value="6" />
+    </Style>
+
+    <!-- ToggleSwitch -->
+    <Style Selector="ToggleSwitch">
+        <Setter Property="Foreground" Value="{DynamicResource ForgeText}" />
+    </Style>
+
+    <!-- TreeView -->
+    <Style Selector="TreeView">
+        <Setter Property="Background" Value="Transparent" />
+    </Style>
+    <Style Selector="TreeViewItem">
+        <Setter Property="Foreground" Value="{DynamicResource ForgeText}" />
+    </Style>
+
+    <!-- ScrollViewer -->
+    <Style Selector="ScrollViewer">
+        <Setter Property="Background" Value="Transparent" />
+    </Style>
+
+    <!-- ProgressBar -->
+    <Style Selector="ProgressBar">
+        <Setter Property="Background" Value="{DynamicResource ForgeSurface}" />
+        <Setter Property="Foreground" Value="{DynamicResource ForgeAccent}" />
+        <Setter Property="CornerRadius" Value="4" />
+    </Style>
+
+    <!-- Expander -->
+    <Style Selector="Expander">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{DynamicResource ForgeText}" />
+    </Style>
+
+    <!-- ToggleButton.outputTab: flat tab button for output panel -->
+    <Style Selector="ToggleButton.outputTab">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{DynamicResource ForgeTextSecondary}" />
+        <Setter Property="BorderThickness" Value="0,0,0,2" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="CornerRadius" Value="0" />
+        <Setter Property="Padding" Value="12,6" />
+        <Setter Property="Cursor" Value="Hand" />
+    </Style>
+    <Style Selector="ToggleButton.outputTab:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ForgeSurface}" />
+    </Style>
+    <Style Selector="ToggleButton.outputTab:checked /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ForgePanel}" />
+    </Style>
+    <Style Selector="ToggleButton.outputTab:checked">
+        <Setter Property="Foreground" Value="{DynamicResource ForgeText}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ForgeAccent}" />
+    </Style>
+
+</Styles>

From 703a2b5b43a6d757d5267bd9e30535635e2d6657 Mon Sep 17 00:00:00 2001
From: Wintersta7e <Wintersta7e@users.noreply.github.com>
Date: Sat, 7 Mar 2026 13:13:24 +0100
Subject: [PATCH 02/11] feat: wire MoltenForge theme, remove MidnightTheme

Co-Authored-By: Rooty
---
 src/FlowForge.UI/App.axaml                    |   2 +-
 src/FlowForge.UI/MainWindow.axaml             |  12 +-
 src/FlowForge.UI/Themes/MidnightTheme.axaml   | 193 ------------------
 src/FlowForge.UI/Views/CanvasView.axaml       |  10 +-
 src/FlowForge.UI/Views/ExecutionLogView.axaml |  52 ++---
 src/FlowForge.UI/Views/NodeLibraryView.axaml  |  10 +-
 src/FlowForge.UI/Views/PropertiesView.axaml   |  10 +-
 src/FlowForge.UI/Views/ShortcutsWindow.axaml  |   8 +-
 src/FlowForge.UI/Views/ToolbarView.axaml      |  26 +--
 9 files changed, 65 insertions(+), 258 deletions(-)
 delete mode 100644 src/FlowForge.UI/Themes/MidnightTheme.axaml

diff --git a/src/FlowForge.UI/App.axaml b/src/FlowForge.UI/App.axaml
index d6dbbc5..690bf90 100644
--- a/src/FlowForge.UI/App.axaml
+++ b/src/FlowForge.UI/App.axaml
@@ -6,7 +6,7 @@
     <Application.Styles>
         <FluentTheme />
         <StyleInclude Source="avares://Nodify.Avalonia/Themes/Controls.xaml" />
-        <StyleInclude Source="avares://FlowForge.UI/Themes/MidnightTheme.axaml" />
+        <StyleInclude Source="avares://FlowForge.UI/Themes/MoltenForgeTheme.axaml" />
     </Application.Styles>
 
     <Application.Resources>
diff --git a/src/FlowForge.UI/MainWindow.axaml b/src/FlowForge.UI/MainWindow.axaml
index 0ca7d19..aec73f2 100644
--- a/src/FlowForge.UI/MainWindow.axaml
+++ b/src/FlowForge.UI/MainWindow.axaml
@@ -13,7 +13,7 @@
         MinWidth="800" MinHeight="500"
         Icon="avares://FlowForge.UI/Assets/icon.png"
         FontSize="14"
-        Background="{DynamicResource MidnightBg}"
+        Background="{DynamicResource ForgeBg}"
         KeyDown="OnKeyDown">
 
     <Grid RowDefinitions="Auto,*,Auto,180">
@@ -26,8 +26,8 @@
             <!-- Node library (left) -->
             <Border DockPanel.Dock="Left"
                     Width="200"
-                    Background="{DynamicResource MidnightPanel}"
-                    BorderBrush="{DynamicResource MidnightBorder}"
+                    Background="{DynamicResource ForgePanel}"
+                    BorderBrush="{DynamicResource ForgeBorder}"
                     BorderThickness="0,0,1,0">
                 <views:NodeLibraryView DataContext="{Binding NodeLibrary}" />
             </Border>
@@ -35,8 +35,8 @@
             <!-- Properties panel (right) -->
             <Border DockPanel.Dock="Right"
                     Width="250"
-                    Background="{DynamicResource MidnightPanel}"
-                    BorderBrush="{DynamicResource MidnightBorder}"
+                    Background="{DynamicResource ForgePanel}"
+                    BorderBrush="{DynamicResource ForgeBorder}"
                     BorderThickness="1,0,0,0">
                 <views:PropertiesView DataContext="{Binding Properties}" />
             </Border>
@@ -49,7 +49,7 @@
         <GridSplitter Grid.Row="2"
                       Height="4"
                       HorizontalAlignment="Stretch"
-                      Background="{DynamicResource MidnightBorder}"
+                      Background="{DynamicResource ForgeBorder}"
                       ResizeDirection="Rows" />
 
         <!-- Output panel (row 3) -->
diff --git a/src/FlowForge.UI/Themes/MidnightTheme.axaml b/src/FlowForge.UI/Themes/MidnightTheme.axaml
deleted file mode 100644
index 34bab9c..0000000
--- a/src/FlowForge.UI/Themes/MidnightTheme.axaml
+++ /dev/null
@@ -1,193 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <Styles.Resources>
-        <ResourceDictionary>
-            <!-- ═══ Color Tokens ═══ -->
-
-            <!-- Background layers (darkest to lightest) -->
-            <Color x:Key="MidnightBgColor">#0D1117</Color>
-            <Color x:Key="MidnightPanelColor">#161B22</Color>
-            <Color x:Key="MidnightSurfaceColor">#1C2128</Color>
-            <Color x:Key="MidnightElevatedColor">#21262D</Color>
-
-            <!-- Borders -->
-            <Color x:Key="MidnightBorderColor">#30363D</Color>
-            <Color x:Key="MidnightBorderFocusColor">#484F58</Color>
-
-            <!-- Text -->
-            <Color x:Key="MidnightTextColor">#E6EDF3</Color>
-            <Color x:Key="MidnightTextSecondaryColor">#8B949E</Color>
-            <Color x:Key="MidnightTextMutedColor">#484F58</Color>
-
-            <!-- Accents -->
-            <Color x:Key="MidnightAccentColor">#58A6FF</Color>
-            <Color x:Key="MidnightSourceColor">#58A6FF</Color>
-            <Color x:Key="MidnightTransformColor">#3FB950</Color>
-            <Color x:Key="MidnightOutputColor">#D29922</Color>
-
-            <!-- Status -->
-            <Color x:Key="MidnightSuccessColor">#3FB950</Color>
-            <Color x:Key="MidnightErrorColor">#F85149</Color>
-            <Color x:Key="MidnightWarningColor">#D29922</Color>
-            <Color x:Key="MidnightInfoColor">#58A6FF</Color>
-
-            <!-- ═══ Brush Resources ═══ -->
-            <SolidColorBrush x:Key="MidnightBg" Color="{StaticResource MidnightBgColor}" />
-            <SolidColorBrush x:Key="MidnightPanel" Color="{StaticResource MidnightPanelColor}" />
-            <SolidColorBrush x:Key="MidnightSurface" Color="{StaticResource MidnightSurfaceColor}" />
-            <SolidColorBrush x:Key="MidnightElevated" Color="{StaticResource MidnightElevatedColor}" />
-            <SolidColorBrush x:Key="MidnightBorder" Color="{StaticResource MidnightBorderColor}" />
-            <SolidColorBrush x:Key="MidnightBorderFocus" Color="{StaticResource MidnightBorderFocusColor}" />
-            <SolidColorBrush x:Key="MidnightText" Color="{StaticResource MidnightTextColor}" />
-            <SolidColorBrush x:Key="MidnightTextSecondary" Color="{StaticResource MidnightTextSecondaryColor}" />
-            <SolidColorBrush x:Key="MidnightTextMuted" Color="{StaticResource MidnightTextMutedColor}" />
-            <SolidColorBrush x:Key="MidnightAccent" Color="{StaticResource MidnightAccentColor}" />
-            <SolidColorBrush x:Key="MidnightSource" Color="{StaticResource MidnightSourceColor}" />
-            <SolidColorBrush x:Key="MidnightTransform" Color="{StaticResource MidnightTransformColor}" />
-            <SolidColorBrush x:Key="MidnightOutput" Color="{StaticResource MidnightOutputColor}" />
-            <SolidColorBrush x:Key="MidnightSuccess" Color="{StaticResource MidnightSuccessColor}" />
-            <SolidColorBrush x:Key="MidnightError" Color="{StaticResource MidnightErrorColor}" />
-            <SolidColorBrush x:Key="MidnightWarning" Color="{StaticResource MidnightWarningColor}" />
-            <SolidColorBrush x:Key="MidnightInfo" Color="{StaticResource MidnightInfoColor}" />
-        </ResourceDictionary>
-    </Styles.Resources>
-
-    <!-- ═══ Global Style Overrides ═══ -->
-
-    <!-- Button: midnight surface bg, border, rounded 4px -->
-    <Style Selector="Button">
-        <Setter Property="Background" Value="{StaticResource MidnightSurface}" />
-        <Setter Property="Foreground" Value="{StaticResource MidnightText}" />
-        <Setter Property="BorderBrush" Value="{StaticResource MidnightBorder}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="CornerRadius" Value="4" />
-        <Setter Property="Padding" Value="8,4" />
-    </Style>
-    <Style Selector="Button:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="Background" Value="{StaticResource MidnightElevated}" />
-    </Style>
-    <Style Selector="Button:pressed /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="Background" Value="{StaticResource MidnightBorder}" />
-    </Style>
-
-    <!-- Button.accent: green run button -->
-    <Style Selector="Button.accent">
-        <Setter Property="Background" Value="{StaticResource MidnightTransform}" />
-        <Setter Property="Foreground" Value="#0D1117" />
-        <Setter Property="FontWeight" Value="SemiBold" />
-    </Style>
-    <Style Selector="Button.accent:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="Background" Value="#4AC960" />
-    </Style>
-
-    <!-- Button.preview: blue preview button -->
-    <Style Selector="Button.preview">
-        <Setter Property="Background" Value="{StaticResource MidnightAccent}" />
-        <Setter Property="Foreground" Value="#0D1117" />
-        <Setter Property="FontWeight" Value="SemiBold" />
-    </Style>
-    <Style Selector="Button.preview:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="Background" Value="#79B8FF" />
-    </Style>
-
-    <!-- Button.toolbarIcon: icon-only toolbar buttons -->
-    <Style Selector="Button.toolbarIcon">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Width" Value="32" />
-        <Setter Property="Height" Value="32" />
-        <Setter Property="Padding" Value="6" />
-    </Style>
-    <Style Selector="Button.toolbarIcon:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="Background" Value="{StaticResource MidnightElevated}" />
-        <Setter Property="CornerRadius" Value="4" />
-    </Style>
-
-    <!-- Button.templateButton: template quick-start buttons -->
-    <Style Selector="Button.templateButton">
-        <Setter Property="Background" Value="{StaticResource MidnightSurface}" />
-        <Setter Property="BorderBrush" Value="{StaticResource MidnightBorder}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="CornerRadius" Value="6" />
-        <Setter Property="Padding" Value="12,8" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-    </Style>
-    <Style Selector="Button.templateButton:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="Background" Value="{StaticResource MidnightElevated}" />
-        <Setter Property="BorderBrush" Value="{StaticResource MidnightAccent}" />
-    </Style>
-
-    <!-- TextBox: midnight surface bg, rounded 4px -->
-    <Style Selector="TextBox">
-        <Setter Property="Background" Value="{StaticResource MidnightSurface}" />
-        <Setter Property="Foreground" Value="{StaticResource MidnightText}" />
-        <Setter Property="BorderBrush" Value="{StaticResource MidnightBorder}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="CornerRadius" Value="4" />
-    </Style>
-    <Style Selector="TextBox:focus /template/ Border#PART_BorderElement">
-        <Setter Property="BorderBrush" Value="{StaticResource MidnightAccent}" />
-    </Style>
-
-    <!-- ComboBox -->
-    <Style Selector="ComboBox">
-        <Setter Property="Background" Value="{StaticResource MidnightSurface}" />
-        <Setter Property="Foreground" Value="{StaticResource MidnightText}" />
-        <Setter Property="BorderBrush" Value="{StaticResource MidnightBorder}" />
-        <Setter Property="CornerRadius" Value="4" />
-    </Style>
-
-    <!-- ToggleSwitch -->
-    <Style Selector="ToggleSwitch">
-        <Setter Property="Foreground" Value="{StaticResource MidnightText}" />
-    </Style>
-
-    <!-- TreeView -->
-    <Style Selector="TreeView">
-        <Setter Property="Background" Value="Transparent" />
-    </Style>
-    <Style Selector="TreeViewItem">
-        <Setter Property="Foreground" Value="{StaticResource MidnightText}" />
-    </Style>
-
-    <!-- ScrollViewer -->
-    <Style Selector="ScrollViewer">
-        <Setter Property="Background" Value="Transparent" />
-    </Style>
-
-    <!-- ProgressBar -->
-    <Style Selector="ProgressBar">
-        <Setter Property="Background" Value="{StaticResource MidnightSurface}" />
-        <Setter Property="Foreground" Value="{StaticResource MidnightAccent}" />
-        <Setter Property="CornerRadius" Value="4" />
-    </Style>
-
-    <!-- Expander -->
-    <Style Selector="Expander">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Foreground" Value="{StaticResource MidnightText}" />
-    </Style>
-
-    <!-- ToggleButton.outputTab: flat tab button for output panel -->
-    <Style Selector="ToggleButton.outputTab">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Foreground" Value="{StaticResource MidnightTextSecondary}" />
-        <Setter Property="BorderThickness" Value="0,0,0,2" />
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="CornerRadius" Value="0" />
-        <Setter Property="Padding" Value="12,6" />
-        <Setter Property="Cursor" Value="Hand" />
-    </Style>
-    <Style Selector="ToggleButton.outputTab:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="Background" Value="{StaticResource MidnightSurface}" />
-    </Style>
-    <Style Selector="ToggleButton.outputTab:checked /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="Background" Value="{StaticResource MidnightPanel}" />
-    </Style>
-    <Style Selector="ToggleButton.outputTab:checked">
-        <Setter Property="Foreground" Value="{StaticResource MidnightText}" />
-        <Setter Property="BorderBrush" Value="{StaticResource MidnightAccent}" />
-    </Style>
-
-</Styles>
diff --git a/src/FlowForge.UI/Views/CanvasView.axaml b/src/FlowForge.UI/Views/CanvasView.axaml
index 71b91dc..39bc034 100644
--- a/src/FlowForge.UI/Views/CanvasView.axaml
+++ b/src/FlowForge.UI/Views/CanvasView.axaml
@@ -18,7 +18,7 @@
                              PendingConnection="{Binding PendingConnection}"
                              ItemsDragStartedCommand="{Binding ItemsDragStartedCommand}"
                              ItemsDragCompletedCommand="{Binding ItemsDragCompletedCommand}"
-                             Background="{DynamicResource MidnightBg}"
+                             Background="{DynamicResource ForgeBg}"
                              DragDrop.AllowDrop="True">
 
             <nodify:NodifyEditor.Styles>
@@ -81,7 +81,7 @@
                         Spacing="16"
                         MaxWidth="360">
                 <PathIcon Data="M10,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8C22,6.89 21.1,6 20,6H12L10,4Z"
-                          Foreground="{DynamicResource MidnightTextMuted}"
+                          Foreground="{DynamicResource ForgeTextMuted}"
                           Width="48" Height="48"
                           HorizontalAlignment="Center" />
 
@@ -89,18 +89,18 @@
                     <TextBlock Text="Drag a node from the sidebar"
                                FontSize="16"
                                FontWeight="SemiBold"
-                               Foreground="{DynamicResource MidnightText}"
+                               Foreground="{DynamicResource ForgeText}"
                                HorizontalAlignment="Center" />
                     <TextBlock Text="or double-click to add"
                                FontSize="16"
                                FontWeight="SemiBold"
-                               Foreground="{DynamicResource MidnightText}"
+                               Foreground="{DynamicResource ForgeText}"
                                HorizontalAlignment="Center" />
                 </StackPanel>
 
                 <TextBlock Text="&#x2014; or use a template &#x2014;"
                            FontSize="12"
-                           Foreground="{DynamicResource MidnightTextSecondary}"
+                           Foreground="{DynamicResource ForgeTextSecondary}"
                            HorizontalAlignment="Center" />
 
                 <WrapPanel HorizontalAlignment="Center" Orientation="Horizontal">
diff --git a/src/FlowForge.UI/Views/ExecutionLogView.axaml b/src/FlowForge.UI/Views/ExecutionLogView.axaml
index 8c782b5..1687d8c 100644
--- a/src/FlowForge.UI/Views/ExecutionLogView.axaml
+++ b/src/FlowForge.UI/Views/ExecutionLogView.axaml
@@ -8,10 +8,10 @@
              x:Class="FlowForge.UI.Views.ExecutionLogView"
              x:DataType="vm:ExecutionLogViewModel">
 
-    <DockPanel Background="{DynamicResource MidnightPanel}">
+    <DockPanel Background="{DynamicResource ForgePanel}">
         <!-- Tab strip -->
         <Border DockPanel.Dock="Top"
-                BorderBrush="{DynamicResource MidnightBorder}"
+                BorderBrush="{DynamicResource ForgeBorder}"
                 BorderThickness="0,1,0,0">
             <Grid ColumnDefinitions="Auto,Auto,Auto,*,Auto">
                 <!-- Output tab -->
@@ -25,7 +25,7 @@
                         <Border Background="#1A3FB950" CornerRadius="8" Padding="6,1"
                                 IsVisible="{Binding !!TotalFiles}">
                             <TextBlock Text="{Binding Succeeded}"
-                                       Foreground="{DynamicResource MidnightSuccess}"
+                                       Foreground="{DynamicResource ForgeSuccess}"
                                        FontSize="15" FontWeight="SemiBold" />
                         </Border>
                     </StackPanel>
@@ -42,7 +42,7 @@
                         <Border Background="#1AF85149" CornerRadius="8" Padding="6,1"
                                 IsVisible="{Binding !!Failed}">
                             <TextBlock Text="{Binding Failed}"
-                                       Foreground="{DynamicResource MidnightError}"
+                                       Foreground="{DynamicResource ForgeError}"
                                        FontSize="15" FontWeight="SemiBold" />
                         </Border>
                     </StackPanel>
@@ -59,7 +59,7 @@
                         <Border Background="#1AD29922" CornerRadius="8" Padding="6,1"
                                 IsVisible="{Binding !!Skipped}">
                             <TextBlock Text="{Binding Skipped}"
-                                       Foreground="{DynamicResource MidnightWarning}"
+                                       Foreground="{DynamicResource ForgeWarning}"
                                        FontSize="15" FontWeight="SemiBold" />
                         </Border>
                     </StackPanel>
@@ -71,7 +71,7 @@
                            TextTrimming="CharacterEllipsis"
                            VerticalAlignment="Center"
                            HorizontalAlignment="Right"
-                           Foreground="{DynamicResource MidnightTextSecondary}"
+                           Foreground="{DynamicResource ForgeTextSecondary}"
                            FontSize="15"
                            Margin="8,0,12,0"
                            IsVisible="{Binding !IsRunning}" />
@@ -81,23 +81,23 @@
         <!-- Progress bar (docked below tab strip, visible when running) -->
         <Border DockPanel.Dock="Top"
                 Padding="12,6"
-                BorderBrush="{DynamicResource MidnightBorder}"
+                BorderBrush="{DynamicResource ForgeBorder}"
                 BorderThickness="0,0,0,1"
                 IsVisible="{Binding IsRunning}">
             <Grid RowDefinitions="Auto,Auto">
                 <DockPanel>
                     <TextBlock DockPanel.Dock="Right"
                                Text="{Binding ProgressText}"
-                               Foreground="{DynamicResource MidnightTextSecondary}"
+                               Foreground="{DynamicResource ForgeTextSecondary}"
                                FontSize="14" VerticalAlignment="Center"
                                Margin="8,0,0,0" />
                     <StackPanel Orientation="Horizontal" Spacing="8">
                         <TextBlock Text="Processing"
-                                   Foreground="{DynamicResource MidnightAccent}"
+                                   Foreground="{DynamicResource ForgeAccent}"
                                    FontWeight="SemiBold" FontSize="14" />
                         <TextBlock Text="{Binding CurrentFile}"
                                    TextTrimming="CharacterEllipsis"
-                                   Foreground="{DynamicResource MidnightTextSecondary}"
+                                   Foreground="{DynamicResource ForgeTextSecondary}"
                                    FontSize="14" />
                     </StackPanel>
                 </DockPanel>
@@ -116,26 +116,26 @@
                         <ItemsControl.ItemTemplate>
                             <DataTemplate x:DataType="vm:FileJobLogEntryViewModel">
                                 <Border Padding="12,3"
-                                        BorderBrush="{DynamicResource MidnightBorder}"
+                                        BorderBrush="{DynamicResource ForgeBorder}"
                                         BorderThickness="0,0,0,1">
                                     <Grid ColumnDefinitions="55,Auto,*">
                                         <Panel Grid.Column="0">
                                             <TextBlock Text="{Binding StatusText}"
                                                        FontFamily="Cascadia Mono,Consolas,Courier New,monospace"
                                                        FontWeight="Bold" FontSize="15"
-                                                       Foreground="{DynamicResource MidnightSuccess}"
+                                                       Foreground="{DynamicResource ForgeSuccess}"
                                                        VerticalAlignment="Center"
                                                        IsVisible="{Binding IsSuccess}" />
                                             <TextBlock Text="{Binding StatusText}"
                                                        FontFamily="Cascadia Mono,Consolas,Courier New,monospace"
                                                        FontWeight="Bold" FontSize="15"
-                                                       Foreground="{DynamicResource MidnightError}"
+                                                       Foreground="{DynamicResource ForgeError}"
                                                        VerticalAlignment="Center"
                                                        IsVisible="{Binding IsError}" />
                                             <TextBlock Text="{Binding StatusText}"
                                                        FontFamily="Cascadia Mono,Consolas,Courier New,monospace"
                                                        FontWeight="Bold" FontSize="15"
-                                                       Foreground="{DynamicResource MidnightWarning}"
+                                                       Foreground="{DynamicResource ForgeWarning}"
                                                        VerticalAlignment="Center"
                                                        IsVisible="{Binding IsWarning}" />
                                         </Panel>
@@ -143,13 +143,13 @@
                                                    Text="{Binding FileName}"
                                                    FontFamily="Cascadia Mono,Consolas,Courier New,monospace"
                                                    VerticalAlignment="Center"
-                                                   Foreground="{DynamicResource MidnightText}"
+                                                   Foreground="{DynamicResource ForgeText}"
                                                    FontSize="15"
                                                    Margin="0,0,8,0" />
                                         <TextBlock Grid.Column="2"
                                                    Text="{Binding ErrorMessage}"
                                                    FontFamily="Cascadia Mono,Consolas,Courier New,monospace"
-                                                   Foreground="{DynamicResource MidnightError}"
+                                                   Foreground="{DynamicResource ForgeError}"
                                                    FontSize="15"
                                                    VerticalAlignment="Center"
                                                    TextTrimming="CharacterEllipsis"
@@ -167,7 +167,7 @@
                 <TextBlock Text="No errors"
                            HorizontalAlignment="Center"
                            VerticalAlignment="Center"
-                           Foreground="{DynamicResource MidnightTextMuted}"
+                           Foreground="{DynamicResource ForgeTextMuted}"
                            FontSize="15"
                            IsVisible="{Binding !ErrorEntries.Count}" />
 
@@ -176,26 +176,26 @@
                         <ItemsControl.ItemTemplate>
                             <DataTemplate x:DataType="vm:FileJobLogEntryViewModel">
                                 <Border Padding="12,3"
-                                        BorderBrush="{DynamicResource MidnightBorder}"
+                                        BorderBrush="{DynamicResource ForgeBorder}"
                                         BorderThickness="0,0,0,1">
                                     <Grid ColumnDefinitions="55,Auto,*">
                                         <TextBlock Grid.Column="0"
                                                    Text="{Binding StatusText}"
                                                    FontFamily="Cascadia Mono,Consolas,Courier New,monospace"
                                                    FontWeight="Bold" FontSize="15"
-                                                   Foreground="{DynamicResource MidnightError}"
+                                                   Foreground="{DynamicResource ForgeError}"
                                                    VerticalAlignment="Center" />
                                         <TextBlock Grid.Column="1"
                                                    Text="{Binding FileName}"
                                                    FontFamily="Cascadia Mono,Consolas,Courier New,monospace"
                                                    VerticalAlignment="Center"
-                                                   Foreground="{DynamicResource MidnightText}"
+                                                   Foreground="{DynamicResource ForgeText}"
                                                    FontSize="15"
                                                    Margin="0,0,8,0" />
                                         <TextBlock Grid.Column="2"
                                                    Text="{Binding ErrorMessage}"
                                                    FontFamily="Cascadia Mono,Consolas,Courier New,monospace"
-                                                   Foreground="{DynamicResource MidnightError}"
+                                                   Foreground="{DynamicResource ForgeError}"
                                                    FontSize="15"
                                                    VerticalAlignment="Center"
                                                    TextTrimming="CharacterEllipsis" />
@@ -212,7 +212,7 @@
                 <TextBlock Text="No warnings"
                            HorizontalAlignment="Center"
                            VerticalAlignment="Center"
-                           Foreground="{DynamicResource MidnightTextMuted}"
+                           Foreground="{DynamicResource ForgeTextMuted}"
                            FontSize="15"
                            IsVisible="{Binding !WarningEntries.Count}" />
 
@@ -221,26 +221,26 @@
                         <ItemsControl.ItemTemplate>
                             <DataTemplate x:DataType="vm:FileJobLogEntryViewModel">
                                 <Border Padding="12,3"
-                                        BorderBrush="{DynamicResource MidnightBorder}"
+                                        BorderBrush="{DynamicResource ForgeBorder}"
                                         BorderThickness="0,0,0,1">
                                     <Grid ColumnDefinitions="55,Auto,*">
                                         <TextBlock Grid.Column="0"
                                                    Text="{Binding StatusText}"
                                                    FontFamily="Cascadia Mono,Consolas,Courier New,monospace"
                                                    FontWeight="Bold" FontSize="15"
-                                                   Foreground="{DynamicResource MidnightWarning}"
+                                                   Foreground="{DynamicResource ForgeWarning}"
                                                    VerticalAlignment="Center" />
                                         <TextBlock Grid.Column="1"
                                                    Text="{Binding FileName}"
                                                    FontFamily="Cascadia Mono,Consolas,Courier New,monospace"
                                                    VerticalAlignment="Center"
-                                                   Foreground="{DynamicResource MidnightText}"
+                                                   Foreground="{DynamicResource ForgeText}"
                                                    FontSize="15"
                                                    Margin="0,0,8,0" />
                                         <TextBlock Grid.Column="2"
                                                    Text="{Binding ErrorMessage}"
                                                    FontFamily="Cascadia Mono,Consolas,Courier New,monospace"
-                                                   Foreground="{DynamicResource MidnightWarning}"
+                                                   Foreground="{DynamicResource ForgeWarning}"
                                                    FontSize="15"
                                                    VerticalAlignment="Center"
                                                    TextTrimming="CharacterEllipsis"
diff --git a/src/FlowForge.UI/Views/NodeLibraryView.axaml b/src/FlowForge.UI/Views/NodeLibraryView.axaml
index 62c93d6..6c747dd 100644
--- a/src/FlowForge.UI/Views/NodeLibraryView.axaml
+++ b/src/FlowForge.UI/Views/NodeLibraryView.axaml
@@ -20,11 +20,11 @@
                     PointerReleased="OnLibraryItemPointerReleased">
                 <Border.Styles>
                     <Style Selector="Border:pointerover">
-                        <Setter Property="Background" Value="{DynamicResource MidnightElevated}" />
+                        <Setter Property="Background" Value="{DynamicResource ForgeElevated}" />
                     </Style>
                 </Border.Styles>
                 <TextBlock Text="{Binding DisplayName}"
-                           Foreground="{DynamicResource MidnightText}"
+                           Foreground="{DynamicResource ForgeText}"
                            FontSize="12" />
             </Border>
         </DataTemplate>
@@ -35,10 +35,10 @@
             <TextBlock Text="Nodes"
                        FontSize="16"
                        FontWeight="SemiBold"
-                       Foreground="{DynamicResource MidnightText}" />
+                       Foreground="{DynamicResource ForgeText}" />
             <TextBlock Text="Drag or double-click to add"
                        FontSize="11"
-                       Foreground="{DynamicResource MidnightTextSecondary}"
+                       Foreground="{DynamicResource ForgeTextSecondary}"
                        Margin="0,2,0,0" />
         </StackPanel>
 
@@ -56,7 +56,7 @@
                     <TextBlock Text="{Binding Category}"
                                FontWeight="SemiBold"
                                FontSize="13"
-                               Foreground="{DynamicResource MidnightTextSecondary}"
+                               Foreground="{DynamicResource ForgeTextSecondary}"
                                Margin="0,8,0,4" />
                 </TreeDataTemplate>
             </TreeView.ItemTemplate>
diff --git a/src/FlowForge.UI/Views/PropertiesView.axaml b/src/FlowForge.UI/Views/PropertiesView.axaml
index 2173eb7..c96daa1 100644
--- a/src/FlowForge.UI/Views/PropertiesView.axaml
+++ b/src/FlowForge.UI/Views/PropertiesView.axaml
@@ -12,16 +12,16 @@
     <DockPanel>
         <Border DockPanel.Dock="Top"
                 Padding="12,12,12,8"
-                BorderBrush="{DynamicResource MidnightBorder}"
+                BorderBrush="{DynamicResource ForgeBorder}"
                 BorderThickness="0,0,0,1">
             <StackPanel>
                 <TextBlock Text="Properties"
                            FontSize="16"
                            FontWeight="SemiBold"
-                           Foreground="{DynamicResource MidnightText}" />
+                           Foreground="{DynamicResource ForgeText}" />
                 <TextBlock Text="{Binding SelectedNodeTitle}"
                            FontSize="12"
-                           Foreground="{DynamicResource MidnightTextSecondary}"
+                           Foreground="{DynamicResource ForgeTextSecondary}"
                            IsVisible="{Binding HasSelection}"
                            Margin="0,2,0,0" />
             </StackPanel>
@@ -34,13 +34,13 @@
                     Margin="16">
             <TextBlock Text="Select a node on the canvas"
                        FontSize="13"
-                       Foreground="{DynamicResource MidnightTextSecondary}"
+                       Foreground="{DynamicResource ForgeTextSecondary}"
                        HorizontalAlignment="Center"
                        TextWrapping="Wrap"
                        TextAlignment="Center" />
             <TextBlock Text="to edit its settings"
                        FontSize="13"
-                       Foreground="{DynamicResource MidnightTextSecondary}"
+                       Foreground="{DynamicResource ForgeTextSecondary}"
                        HorizontalAlignment="Center"
                        TextWrapping="Wrap"
                        TextAlignment="Center" />
diff --git a/src/FlowForge.UI/Views/ShortcutsWindow.axaml b/src/FlowForge.UI/Views/ShortcutsWindow.axaml
index 416bc86..bf4ffc5 100644
--- a/src/FlowForge.UI/Views/ShortcutsWindow.axaml
+++ b/src/FlowForge.UI/Views/ShortcutsWindow.axaml
@@ -5,13 +5,13 @@
         Width="400" Height="400"
         CanResize="False"
         WindowStartupLocation="CenterOwner"
-        Background="{DynamicResource MidnightPanel}">
+        Background="{DynamicResource ForgePanel}">
 
     <StackPanel Margin="24" Spacing="16">
         <TextBlock Text="Keyboard Shortcuts"
                    FontSize="20"
                    FontWeight="Bold"
-                   Foreground="{DynamicResource MidnightText}" />
+                   Foreground="{DynamicResource ForgeText}" />
 
         <Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto"
               Margin="0,8,0,0">
@@ -19,12 +19,12 @@
                 <Style Selector="TextBlock.key">
                     <Setter Property="FontFamily" Value="Cascadia Mono,Consolas,monospace" />
                     <Setter Property="FontSize" Value="13" />
-                    <Setter Property="Foreground" Value="{DynamicResource MidnightAccent}" />
+                    <Setter Property="Foreground" Value="{DynamicResource ForgeAccent}" />
                     <Setter Property="Margin" Value="0,4,24,4" />
                 </Style>
                 <Style Selector="TextBlock.desc">
                     <Setter Property="FontSize" Value="13" />
-                    <Setter Property="Foreground" Value="{DynamicResource MidnightText}" />
+                    <Setter Property="Foreground" Value="{DynamicResource ForgeText}" />
                     <Setter Property="Margin" Value="0,4" />
                     <Setter Property="VerticalAlignment" Value="Center" />
                 </Style>
diff --git a/src/FlowForge.UI/Views/ToolbarView.axaml b/src/FlowForge.UI/Views/ToolbarView.axaml
index d8df2f8..855493b 100644
--- a/src/FlowForge.UI/Views/ToolbarView.axaml
+++ b/src/FlowForge.UI/Views/ToolbarView.axaml
@@ -8,8 +8,8 @@
              x:Class="FlowForge.UI.Views.ToolbarView"
              x:DataType="vm:MainWindowViewModel">
 
-    <Border Background="{DynamicResource MidnightPanel}"
-            BorderBrush="{DynamicResource MidnightBorder}"
+    <Border Background="{DynamicResource ForgePanel}"
+            BorderBrush="{DynamicResource ForgeBorder}"
             BorderThickness="0,0,0,1"
             Padding="8,4">
         <DockPanel>
@@ -21,14 +21,14 @@
                 <TextBlock Text="?"
                            FontWeight="Bold"
                            FontSize="14"
-                           Foreground="{DynamicResource MidnightText}"
+                           Foreground="{DynamicResource ForgeText}"
                            HorizontalAlignment="Center"
                            VerticalAlignment="Center" />
             </Button>
 
             <TextBlock DockPanel.Dock="Right"
                        Text="{Binding Title}"
-                       Foreground="{DynamicResource MidnightTextSecondary}"
+                       Foreground="{DynamicResource ForgeTextSecondary}"
                        VerticalAlignment="Center"
                        FontSize="12"
                        Margin="8,0" />
@@ -38,14 +38,14 @@
                         Command="{Binding NewCommand}"
                         ToolTip.Tip="New Pipeline (Ctrl+N)">
                     <PathIcon Data="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z"
-                              Foreground="{DynamicResource MidnightText}"
+                              Foreground="{DynamicResource ForgeText}"
                               Width="16" Height="16" />
                 </Button>
                 <Button Classes="toolbarIcon"
                         Command="{Binding OpenCommand}"
                         ToolTip.Tip="Open Pipeline (Ctrl+O)">
                     <PathIcon Data="M10,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8C22,6.89 21.1,6 20,6H12L10,4Z"
-                              Foreground="{DynamicResource MidnightText}"
+                              Foreground="{DynamicResource ForgeText}"
                               Width="16" Height="16" />
                 </Button>
                 <Button x:Name="RecentButton"
@@ -55,21 +55,21 @@
                         <MenuFlyout Placement="BottomEdgeAlignedLeft" />
                     </Button.Flyout>
                     <PathIcon Data="M12,6V9L16,5L12,1V4A8,8 0 0,0 4,12C4,13.57 4.46,15.03 5.24,16.26L6.7,14.8C6.25,13.97 6,13 6,12A6,6 0 0,1 12,6M18.76,7.74L17.3,9.2C17.74,10.04 18,11 18,12A6,6 0 0,1 12,18V15L8,19L12,23V20A8,8 0 0,0 20,12C20,10.43 19.54,8.97 18.76,7.74Z"
-                              Foreground="{DynamicResource MidnightText}"
+                              Foreground="{DynamicResource ForgeText}"
                               Width="16" Height="16" />
                 </Button>
                 <Button Classes="toolbarIcon"
                         Command="{Binding SaveCommand}"
                         ToolTip.Tip="Save (Ctrl+S)">
                     <PathIcon Data="M15,9H5V5H15M12,19A3,3 0 0,1 9,16A3,3 0 0,1 12,13A3,3 0 0,1 15,16A3,3 0 0,1 12,19M17,3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V7L17,3Z"
-                              Foreground="{DynamicResource MidnightText}"
+                              Foreground="{DynamicResource ForgeText}"
                               Width="16" Height="16" />
                 </Button>
                 <Button Classes="toolbarIcon"
                         Command="{Binding SaveAsCommand}"
                         ToolTip.Tip="Save As (Ctrl+Shift+S)">
                     <PathIcon Data="M17,3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V7L17,3M15,9H5V5H15M12,19A3,3 0 0,1 9,16A3,3 0 0,1 12,13A3,3 0 0,1 15,16A3,3 0 0,1 12,19Z"
-                              Foreground="{DynamicResource MidnightTextSecondary}"
+                              Foreground="{DynamicResource ForgeTextSecondary}"
                               Width="16" Height="16" />
                 </Button>
 
@@ -77,13 +77,13 @@
                         ToolTip.Tip="Fit to Screen (Ctrl+0)"
                         Click="OnFitToScreenClick">
                     <PathIcon Data="M3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5A2,2 0 0,0 19,3H5A2,2 0 0,0 3,5M5,5H19V19H5V5M7,7V9H9V7H7M15,7V9H17V7H15M7,15V17H9V15H7M15,15V17H17V15H15Z"
-                              Foreground="{DynamicResource MidnightText}"
+                              Foreground="{DynamicResource ForgeText}"
                               Width="16" Height="16" />
                 </Button>
 
                 <Border Width="1"
                         Height="24"
-                        Background="{DynamicResource MidnightBorder}"
+                        Background="{DynamicResource ForgeBorder}"
                         VerticalAlignment="Center"
                         Margin="4,0" />
 
@@ -115,9 +115,9 @@
                         Padding="12,4">
                     <StackPanel Orientation="Horizontal" Spacing="6">
                         <PathIcon Data="M18,18H6V6H18V18Z"
-                                  Foreground="{DynamicResource MidnightError}"
+                                  Foreground="{DynamicResource ForgeError}"
                                   Width="12" Height="12" />
-                        <TextBlock Text="Stop" Foreground="{DynamicResource MidnightError}" VerticalAlignment="Center" />
+                        <TextBlock Text="Stop" Foreground="{DynamicResource ForgeError}" VerticalAlignment="Center" />
                     </StackPanel>
                 </Button>
             </StackPanel>

From a048b63044138d7a0a4a80b459ea09025b351805 Mon Sep 17 00:00:00 2001
From: Wintersta7e <Wintersta7e@users.noreply.github.com>
Date: Sat, 7 Mar 2026 13:14:46 +0100
Subject: [PATCH 03/11] style: update main window layout dimensions

Co-Authored-By: Rooty
---
 src/FlowForge.UI/MainWindow.axaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/FlowForge.UI/MainWindow.axaml b/src/FlowForge.UI/MainWindow.axaml
index aec73f2..7fe72dc 100644
--- a/src/FlowForge.UI/MainWindow.axaml
+++ b/src/FlowForge.UI/MainWindow.axaml
@@ -16,7 +16,7 @@
         Background="{DynamicResource ForgeBg}"
         KeyDown="OnKeyDown">
 
-    <Grid RowDefinitions="Auto,*,Auto,180">
+    <Grid RowDefinitions="Auto,*,Auto,185">
         <!-- Toolbar (row 0) -->
         <views:ToolbarView Grid.Row="0"
                            DataContext="{Binding}" />
@@ -25,7 +25,7 @@
         <DockPanel Grid.Row="1">
             <!-- Node library (left) -->
             <Border DockPanel.Dock="Left"
-                    Width="200"
+                    Width="250"
                     Background="{DynamicResource ForgePanel}"
                     BorderBrush="{DynamicResource ForgeBorder}"
                     BorderThickness="0,0,1,0">
@@ -34,7 +34,7 @@
 
             <!-- Properties panel (right) -->
             <Border DockPanel.Dock="Right"
-                    Width="250"
+                    Width="290"
                     Background="{DynamicResource ForgePanel}"
                     BorderBrush="{DynamicResource ForgeBorder}"
                     BorderThickness="1,0,0,0">

From ee1a56e5ab0b2be00a4c0504ec4c9f86c013730d Mon Sep 17 00:00:00 2001
From: Wintersta7e <Wintersta7e@users.noreply.github.com>
Date: Sat, 7 Mar 2026 13:15:06 +0100
Subject: [PATCH 04/11] fix: replace hardcoded colors with theme resource
 lookups

Co-Authored-By: Rooty
---
 .../ViewModels/PipelineNodeViewModel.cs        |  6 +++---
 .../Views/ConfigFieldTemplateSelector.cs       | 18 ++++++++++++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/FlowForge.UI/ViewModels/PipelineNodeViewModel.cs b/src/FlowForge.UI/ViewModels/PipelineNodeViewModel.cs
index ce4a7c2..a77c3ed 100644
--- a/src/FlowForge.UI/ViewModels/PipelineNodeViewModel.cs
+++ b/src/FlowForge.UI/ViewModels/PipelineNodeViewModel.cs
@@ -22,9 +22,9 @@ private static IBrush GetBrush(string key, string fallback)
         return new SolidColorBrush(Color.Parse(fallback));
     }
 
-    private static readonly IBrush SourceBrush = GetBrush("MidnightSource", "#58A6FF");
-    private static readonly IBrush TransformBrush = GetBrush("MidnightTransform", "#3FB950");
-    private static readonly IBrush OutputBrush = GetBrush("MidnightOutput", "#D29922");
+    private static readonly IBrush SourceBrush = GetBrush("ForgeSource", "#5bb8f5");
+    private static readonly IBrush TransformBrush = GetBrush("ForgeTransform", "#5ce0a0");
+    private static readonly IBrush OutputBrush = GetBrush("ForgeOutput", "#e8932f");
 
     [ObservableProperty]
     private Point _location;
diff --git a/src/FlowForge.UI/Views/ConfigFieldTemplateSelector.cs b/src/FlowForge.UI/Views/ConfigFieldTemplateSelector.cs
index cf5c86f..4f882b0 100644
--- a/src/FlowForge.UI/Views/ConfigFieldTemplateSelector.cs
+++ b/src/FlowForge.UI/Views/ConfigFieldTemplateSelector.cs
@@ -26,10 +26,10 @@ public Control Build(object? param)
 
         Border cardBorder = new()
         {
-            Background = new Avalonia.Media.SolidColorBrush(Avalonia.Media.Color.Parse("#1C2128")),
-            BorderBrush = new Avalonia.Media.SolidColorBrush(Avalonia.Media.Color.Parse("#30363D")),
+            Background = GetThemeBrush("ForgeDeep", "#0e0c11"),
+            BorderBrush = GetThemeBrush("ForgeBorder", "#2a2230"),
             BorderThickness = new Avalonia.Thickness(1),
-            CornerRadius = new Avalonia.CornerRadius(6),
+            CornerRadius = new Avalonia.CornerRadius(12),
             Padding = new Avalonia.Thickness(12, 8),
             Margin = new Avalonia.Thickness(0, 0, 0, 8)
         };
@@ -44,7 +44,7 @@ public Control Build(object? param)
             Text = field.IsRequired ? $"{field.Label} *" : field.Label,
             FontWeight = Avalonia.Media.FontWeight.SemiBold,
             FontSize = 12,
-            Foreground = new Avalonia.Media.SolidColorBrush(Avalonia.Media.Color.Parse("#E6EDF3")),
+            Foreground = GetThemeBrush("ForgeText", "#ede6f0"),
             Margin = new Avalonia.Thickness(0, 0, 0, 2)
         };
         panel.Children.Add(label);
@@ -255,4 +255,14 @@ private static TextBox BuildMultiLineEditor(ConfigFieldViewModel field)
             new Avalonia.Data.Binding("Value"));
         return textBox;
     }
+
+    private static Avalonia.Media.IBrush GetThemeBrush(string key, string fallback)
+    {
+        if (Avalonia.Application.Current?.TryFindResource(key, Avalonia.Application.Current.ActualThemeVariant, out object? resource) == true && resource is Avalonia.Media.IBrush brush)
+        {
+            return brush;
+        }
+
+        return new Avalonia.Media.SolidColorBrush(Avalonia.Media.Color.Parse(fallback));
+    }
 }

From d30a4231b0049bda9f6c771511269fac01d2a3f2 Mon Sep 17 00:00:00 2001
From: Wintersta7e <Wintersta7e@users.noreply.github.com>
Date: Sat, 7 Mar 2026 13:17:47 +0100
Subject: [PATCH 05/11] style: restyle node library with icons and category
 colors

Co-Authored-By: Rooty
---
 .../ViewModels/NodeLibraryItemViewModel.cs    |  4 +-
 .../ViewModels/NodeLibraryViewModel.cs        | 22 +++++++-
 src/FlowForge.UI/Views/NodeLibraryView.axaml  | 51 ++++++++++++-------
 3 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/src/FlowForge.UI/ViewModels/NodeLibraryItemViewModel.cs b/src/FlowForge.UI/ViewModels/NodeLibraryItemViewModel.cs
index a4884eb..b5c6202 100644
--- a/src/FlowForge.UI/ViewModels/NodeLibraryItemViewModel.cs
+++ b/src/FlowForge.UI/ViewModels/NodeLibraryItemViewModel.cs
@@ -4,10 +4,12 @@ public class NodeLibraryItemViewModel : ViewModelBase
 {
     public string TypeKey { get; }
     public string DisplayName { get; }
+    public string Icon { get; }
 
-    public NodeLibraryItemViewModel(string typeKey, string displayName)
+    public NodeLibraryItemViewModel(string typeKey, string displayName, string icon = "")
     {
         TypeKey = typeKey;
         DisplayName = displayName;
+        Icon = icon;
     }
 }
diff --git a/src/FlowForge.UI/ViewModels/NodeLibraryViewModel.cs b/src/FlowForge.UI/ViewModels/NodeLibraryViewModel.cs
index 418e970..e3a6c69 100644
--- a/src/FlowForge.UI/ViewModels/NodeLibraryViewModel.cs
+++ b/src/FlowForge.UI/ViewModels/NodeLibraryViewModel.cs
@@ -47,7 +47,8 @@ public void Initialize(NodeRegistry registry)
                 categoryItems[categoryName] = existingItems;
             }
 
-            existingItems.Add(new NodeLibraryItemViewModel(typeKey, displayName));
+            string icon = GetIconForTypeKey(typeKey);
+            existingItems.Add(new NodeLibraryItemViewModel(typeKey, displayName, icon));
         }
 
         // Add groups in canonical order: Input, Process, Save To
@@ -63,6 +64,25 @@ public void Initialize(NodeRegistry registry)
         }
     }
 
+    private static string GetIconForTypeKey(string typeKey)
+    {
+        return typeKey switch
+        {
+            "FolderInput" => "\U0001F4C1",
+            "PatternRename" => "\u270E",
+            "RegexRename" => ".*",
+            "AffixRename" => "+a",
+            "Filter" => "\U0001F50D",
+            "Sort" => "\u21C5",
+            "ImageResize" => "\U0001F4F7",
+            "ImageConvert" => "\U0001F3A8",
+            "ImageCompress" => "\U0001F4E6",
+            "MetadataExtract" => "\U0001F4C4",
+            "FolderOutput" => "\U0001F4E5",
+            _ => "\u2699",
+        };
+    }
+
     private void FilterItems()
     {
         Groups.Clear();
diff --git a/src/FlowForge.UI/Views/NodeLibraryView.axaml b/src/FlowForge.UI/Views/NodeLibraryView.axaml
index 6c747dd..834d368 100644
--- a/src/FlowForge.UI/Views/NodeLibraryView.axaml
+++ b/src/FlowForge.UI/Views/NodeLibraryView.axaml
@@ -4,16 +4,18 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="using:FlowForge.UI.ViewModels"
              mc:Ignorable="d"
-             d:DesignWidth="200" d:DesignHeight="600"
+             d:DesignWidth="250" d:DesignHeight="600"
              x:Class="FlowForge.UI.Views.NodeLibraryView"
              x:DataType="vm:NodeLibraryViewModel">
 
     <UserControl.DataTemplates>
         <DataTemplate x:DataType="vm:NodeLibraryItemViewModel">
-            <Border Padding="12,8"
-                    CornerRadius="4"
+            <Border Padding="8,6"
+                    CornerRadius="8"
                     Cursor="Hand"
                     Background="Transparent"
+                    BorderThickness="2,0,0,0"
+                    BorderBrush="Transparent"
                     DoubleTapped="OnLibraryItemDoubleTapped"
                     PointerPressed="OnLibraryItemPointerPressed"
                     PointerMoved="OnLibraryItemPointerMoved"
@@ -21,21 +23,34 @@
                 <Border.Styles>
                     <Style Selector="Border:pointerover">
                         <Setter Property="Background" Value="{DynamicResource ForgeElevated}" />
+                        <Setter Property="BorderBrush" Value="{DynamicResource ForgeAccent}" />
                     </Style>
                 </Border.Styles>
-                <TextBlock Text="{Binding DisplayName}"
-                           Foreground="{DynamicResource ForgeText}"
-                           FontSize="12" />
+                <StackPanel Orientation="Horizontal" Spacing="10">
+                    <Border Width="28" Height="28" CornerRadius="8"
+                            Background="{DynamicResource ForgeElevated}">
+                        <TextBlock Text="{Binding Icon}"
+                                   FontSize="14"
+                                   HorizontalAlignment="Center"
+                                   VerticalAlignment="Center" />
+                    </Border>
+                    <TextBlock Text="{Binding DisplayName}"
+                               Foreground="{DynamicResource ForgeText}"
+                               FontSize="12.5"
+                               FontWeight="Medium"
+                               VerticalAlignment="Center" />
+                </StackPanel>
             </Border>
         </DataTemplate>
     </UserControl.DataTemplates>
 
     <DockPanel>
-        <StackPanel DockPanel.Dock="Top" Margin="12,12,12,4">
-            <TextBlock Text="Nodes"
-                       FontSize="16"
-                       FontWeight="SemiBold"
-                       Foreground="{DynamicResource ForgeText}" />
+        <StackPanel DockPanel.Dock="Top" Margin="14,14,14,4">
+            <TextBlock Text="NODE LIBRARY"
+                       FontSize="10"
+                       FontWeight="Bold"
+                       Foreground="{DynamicResource ForgeTextMuted}"
+                       Margin="0,0,0,2" />
             <TextBlock Text="Drag or double-click to add"
                        FontSize="11"
                        Foreground="{DynamicResource ForgeTextSecondary}"
@@ -44,20 +59,20 @@
 
         <TextBox DockPanel.Dock="Top"
                  Text="{Binding SearchText}"
-                 Watermark="Search..."
-                 Margin="8,8,8,4" />
+                 Watermark="Search nodes..."
+                 Margin="10,10,10,4" />
 
         <TreeView ItemsSource="{Binding Groups}"
-                  Margin="4,4,4,4"
+                  Margin="6,4,6,4"
                   Background="Transparent">
             <TreeView.ItemTemplate>
                 <TreeDataTemplate x:DataType="vm:NodeLibraryGroupViewModel"
                                   ItemsSource="{Binding Items}">
                     <TextBlock Text="{Binding Category}"
-                               FontWeight="SemiBold"
-                               FontSize="13"
-                               Foreground="{DynamicResource ForgeTextSecondary}"
-                               Margin="0,8,0,4" />
+                               FontWeight="Bold"
+                               FontSize="10"
+                               Foreground="{DynamicResource ForgeTextMuted}"
+                               Margin="0,10,0,4" />
                 </TreeDataTemplate>
             </TreeView.ItemTemplate>
         </TreeView>

From eb3e284a55713d73e381b5075239e0899ef51c89 Mon Sep 17 00:00:00 2001
From: Wintersta7e <Wintersta7e@users.noreply.github.com>
Date: Sat, 7 Mar 2026 13:18:32 +0100
Subject: [PATCH 06/11] style: restyle toolbar with molten forge identity

Co-Authored-By: Rooty
---
 .../ViewModels/MainWindowViewModel.cs         |  12 +
 src/FlowForge.UI/Views/ToolbarView.axaml      | 279 +++++++++++-------
 2 files changed, 183 insertions(+), 108 deletions(-)

diff --git a/src/FlowForge.UI/ViewModels/MainWindowViewModel.cs b/src/FlowForge.UI/ViewModels/MainWindowViewModel.cs
index 3a44d60..5b4269f 100644
--- a/src/FlowForge.UI/ViewModels/MainWindowViewModel.cs
+++ b/src/FlowForge.UI/ViewModels/MainWindowViewModel.cs
@@ -370,6 +370,18 @@ private void Cancel()
         _cts?.Cancel();
     }
 
+    [RelayCommand]
+    private void Undo()
+    {
+        Editor.Undo();
+    }
+
+    [RelayCommand]
+    private void Redo()
+    {
+        Editor.Redo();
+    }
+
     [RelayCommand]
     private void LoadTemplate(string templateId)
     {
diff --git a/src/FlowForge.UI/Views/ToolbarView.axaml b/src/FlowForge.UI/Views/ToolbarView.axaml
index 855493b..7c76275 100644
--- a/src/FlowForge.UI/Views/ToolbarView.axaml
+++ b/src/FlowForge.UI/Views/ToolbarView.axaml
@@ -8,119 +8,182 @@
              x:Class="FlowForge.UI.Views.ToolbarView"
              x:DataType="vm:MainWindowViewModel">
 
-    <Border Background="{DynamicResource ForgePanel}"
-            BorderBrush="{DynamicResource ForgeBorder}"
-            BorderThickness="0,0,0,1"
-            Padding="8,4">
-        <DockPanel>
-            <Button DockPanel.Dock="Right"
-                    Classes="toolbarIcon"
-                    ToolTip.Tip="Keyboard Shortcuts (F1)"
-                    Click="OnShowShortcutsClick"
-                    Margin="4,0">
-                <TextBlock Text="?"
-                           FontWeight="Bold"
+    <DockPanel>
+        <!-- Molten gradient accent line at bottom -->
+        <Border DockPanel.Dock="Bottom" Height="2" Opacity="0.5">
+            <Border.Background>
+                <LinearGradientBrush StartPoint="0%,50%" EndPoint="100%,50%">
+                    <GradientStop Color="Transparent" Offset="0" />
+                    <GradientStop Color="#d4612c" Offset="0.2" />
+                    <GradientStop Color="#f5a623" Offset="0.5" />
+                    <GradientStop Color="#f5c842" Offset="0.8" />
+                    <GradientStop Color="Transparent" Offset="1" />
+                </LinearGradientBrush>
+            </Border.Background>
+        </Border>
+
+        <!-- Main toolbar content -->
+        <Border Background="{DynamicResource ForgePanel}"
+                BorderBrush="{DynamicResource ForgeBorder}"
+                BorderThickness="0,0,0,1"
+                Padding="10,6">
+            <DockPanel>
+                <!-- Right side: shortcuts button -->
+                <Button DockPanel.Dock="Right"
+                        Classes="toolbarIcon"
+                        ToolTip.Tip="Keyboard Shortcuts (F1)"
+                        Click="OnShowShortcutsClick"
+                        Margin="4,0">
+                    <TextBlock Text="?"
+                               FontWeight="Bold"
+                               FontSize="14"
+                               Foreground="{DynamicResource ForgeText}"
+                               HorizontalAlignment="Center"
+                               VerticalAlignment="Center" />
+                </Button>
+
+                <!-- Right side: title -->
+                <TextBlock DockPanel.Dock="Right"
+                           Text="{Binding Title}"
+                           Foreground="{DynamicResource ForgeTextMuted}"
+                           VerticalAlignment="Center"
+                           FontSize="12"
+                           Margin="8,0" />
+
+                <!-- Center brand text -->
+                <TextBlock DockPanel.Dock="Right"
+                           Text="FLOWFORGE"
+                           FontWeight="ExtraBold"
                            FontSize="14"
-                           Foreground="{DynamicResource ForgeText}"
+                           Foreground="{DynamicResource ForgeAccent}"
+                           VerticalAlignment="Center"
                            HorizontalAlignment="Center"
-                           VerticalAlignment="Center" />
-            </Button>
+                           Margin="12,0" />
 
-            <TextBlock DockPanel.Dock="Right"
-                       Text="{Binding Title}"
-                       Foreground="{DynamicResource ForgeTextSecondary}"
-                       VerticalAlignment="Center"
-                       FontSize="12"
-                       Margin="8,0" />
+                <!-- Left side: all buttons -->
+                <StackPanel Orientation="Horizontal" Spacing="4">
+                    <!-- File buttons -->
+                    <Button Classes="toolbarIcon"
+                            Command="{Binding NewCommand}"
+                            ToolTip.Tip="New Pipeline (Ctrl+N)">
+                        <PathIcon Data="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z"
+                                  Foreground="{DynamicResource ForgeText}"
+                                  Width="16" Height="16" />
+                    </Button>
+                    <Button Classes="toolbarIcon"
+                            Command="{Binding OpenCommand}"
+                            ToolTip.Tip="Open Pipeline (Ctrl+O)">
+                        <PathIcon Data="M10,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8C22,6.89 21.1,6 20,6H12L10,4Z"
+                                  Foreground="{DynamicResource ForgeText}"
+                                  Width="16" Height="16" />
+                    </Button>
+                    <Button x:Name="RecentButton"
+                            Classes="toolbarIcon"
+                            ToolTip.Tip="Recent Pipelines">
+                        <Button.Flyout>
+                            <MenuFlyout Placement="BottomEdgeAlignedLeft" />
+                        </Button.Flyout>
+                        <PathIcon Data="M12,6V9L16,5L12,1V4A8,8 0 0,0 4,12C4,13.57 4.46,15.03 5.24,16.26L6.7,14.8C6.25,13.97 6,13 6,12A6,6 0 0,1 12,6M18.76,7.74L17.3,9.2C17.74,10.04 18,11 18,12A6,6 0 0,1 12,18V15L8,19L12,23V20A8,8 0 0,0 20,12C20,10.43 19.54,8.97 18.76,7.74Z"
+                                  Foreground="{DynamicResource ForgeText}"
+                                  Width="16" Height="16" />
+                    </Button>
+                    <Button Classes="toolbarIcon"
+                            Command="{Binding SaveCommand}"
+                            ToolTip.Tip="Save (Ctrl+S)">
+                        <PathIcon Data="M15,9H5V5H15M12,19A3,3 0 0,1 9,16A3,3 0 0,1 12,13A3,3 0 0,1 15,16A3,3 0 0,1 12,19M17,3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V7L17,3Z"
+                                  Foreground="{DynamicResource ForgeText}"
+                                  Width="16" Height="16" />
+                    </Button>
+                    <Button Classes="toolbarIcon"
+                            Command="{Binding SaveAsCommand}"
+                            ToolTip.Tip="Save As (Ctrl+Shift+S)">
+                        <PathIcon Data="M17,3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V7L17,3M15,9H5V5H15M12,19A3,3 0 0,1 9,16A3,3 0 0,1 12,13A3,3 0 0,1 15,16A3,3 0 0,1 12,19Z"
+                                  Foreground="{DynamicResource ForgeTextSecondary}"
+                                  Width="16" Height="16" />
+                    </Button>
 
-            <StackPanel Orientation="Horizontal" Spacing="4">
-                <Button Classes="toolbarIcon"
-                        Command="{Binding NewCommand}"
-                        ToolTip.Tip="New Pipeline (Ctrl+N)">
-                    <PathIcon Data="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z"
-                              Foreground="{DynamicResource ForgeText}"
-                              Width="16" Height="16" />
-                </Button>
-                <Button Classes="toolbarIcon"
-                        Command="{Binding OpenCommand}"
-                        ToolTip.Tip="Open Pipeline (Ctrl+O)">
-                    <PathIcon Data="M10,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8C22,6.89 21.1,6 20,6H12L10,4Z"
-                              Foreground="{DynamicResource ForgeText}"
-                              Width="16" Height="16" />
-                </Button>
-                <Button x:Name="RecentButton"
-                        Classes="toolbarIcon"
-                        ToolTip.Tip="Recent Pipelines">
-                    <Button.Flyout>
-                        <MenuFlyout Placement="BottomEdgeAlignedLeft" />
-                    </Button.Flyout>
-                    <PathIcon Data="M12,6V9L16,5L12,1V4A8,8 0 0,0 4,12C4,13.57 4.46,15.03 5.24,16.26L6.7,14.8C6.25,13.97 6,13 6,12A6,6 0 0,1 12,6M18.76,7.74L17.3,9.2C17.74,10.04 18,11 18,12A6,6 0 0,1 12,18V15L8,19L12,23V20A8,8 0 0,0 20,12C20,10.43 19.54,8.97 18.76,7.74Z"
-                              Foreground="{DynamicResource ForgeText}"
-                              Width="16" Height="16" />
-                </Button>
-                <Button Classes="toolbarIcon"
-                        Command="{Binding SaveCommand}"
-                        ToolTip.Tip="Save (Ctrl+S)">
-                    <PathIcon Data="M15,9H5V5H15M12,19A3,3 0 0,1 9,16A3,3 0 0,1 12,13A3,3 0 0,1 15,16A3,3 0 0,1 12,19M17,3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V7L17,3Z"
-                              Foreground="{DynamicResource ForgeText}"
-                              Width="16" Height="16" />
-                </Button>
-                <Button Classes="toolbarIcon"
-                        Command="{Binding SaveAsCommand}"
-                        ToolTip.Tip="Save As (Ctrl+Shift+S)">
-                    <PathIcon Data="M17,3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V7L17,3M15,9H5V5H15M12,19A3,3 0 0,1 9,16A3,3 0 0,1 12,13A3,3 0 0,1 15,16A3,3 0 0,1 12,19Z"
-                              Foreground="{DynamicResource ForgeTextSecondary}"
-                              Width="16" Height="16" />
-                </Button>
+                    <!-- Separator -->
+                    <Border Width="1"
+                            Height="24"
+                            Background="{DynamicResource ForgeBorder}"
+                            VerticalAlignment="Center"
+                            Margin="4,0" />
 
-                <Button Classes="toolbarIcon"
-                        ToolTip.Tip="Fit to Screen (Ctrl+0)"
-                        Click="OnFitToScreenClick">
-                    <PathIcon Data="M3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5A2,2 0 0,0 19,3H5A2,2 0 0,0 3,5M5,5H19V19H5V5M7,7V9H9V7H7M15,7V9H17V7H15M7,15V17H9V15H7M15,15V17H17V15H15Z"
-                              Foreground="{DynamicResource ForgeText}"
-                              Width="16" Height="16" />
-                </Button>
+                    <!-- Undo/Redo -->
+                    <Button Classes="toolbarIcon"
+                            Command="{Binding UndoCommand}"
+                            ToolTip.Tip="Undo (Ctrl+Z)">
+                        <PathIcon Data="M12.5,8C9.85,8 7.45,9.16 5.86,11L3,8V16H11L7.9,12.9C9.09,11.84 10.73,11.19 12.5,11.19C15.49,11.19 18.04,13.18 18.86,16L21.73,15.14C20.6,11.14 16.86,8 12.5,8Z"
+                                  Foreground="{DynamicResource ForgeText}"
+                                  Width="16" Height="16" />
+                    </Button>
+                    <Button Classes="toolbarIcon"
+                            Command="{Binding RedoCommand}"
+                            ToolTip.Tip="Redo (Ctrl+Y)">
+                        <PathIcon Data="M18.14,11C16.55,9.16 14.15,8 11.5,8C7.14,8 3.4,11.14 2.27,15.14L5.14,16C5.96,13.18 8.5,11.19 11.5,11.19C13.27,11.19 14.91,11.84 16.1,12.9L13,16H21V8L18.14,11Z"
+                                  Foreground="{DynamicResource ForgeText}"
+                                  Width="16" Height="16" />
+                    </Button>
 
-                <Border Width="1"
-                        Height="24"
-                        Background="{DynamicResource ForgeBorder}"
-                        VerticalAlignment="Center"
-                        Margin="4,0" />
+                    <!-- Separator -->
+                    <Border Width="1"
+                            Height="24"
+                            Background="{DynamicResource ForgeBorder}"
+                            VerticalAlignment="Center"
+                            Margin="4,0" />
 
-                <Button Command="{Binding RunCommand}"
-                        Classes="accent"
-                        ToolTip.Tip="Run Pipeline"
-                        Padding="12,4">
-                    <StackPanel Orientation="Horizontal" Spacing="6">
-                        <PathIcon Data="M8,5.14V19.14L19,12.14L8,5.14Z"
-                                  Foreground="#0D1117"
-                                  Width="12" Height="12" />
-                        <TextBlock Text="Run" VerticalAlignment="Center" />
-                    </StackPanel>
-                </Button>
-                <Button Command="{Binding DryRunCommand}"
-                        Classes="preview"
-                        ToolTip.Tip="Preview — simulate run without changing any files"
-                        Padding="12,4">
-                    <StackPanel Orientation="Horizontal" Spacing="6">
-                        <PathIcon Data="M12,9A3,3 0 0,0 9,12A3,3 0 0,0 12,15A3,3 0 0,0 15,12A3,3 0 0,0 12,9M12,17A5,5 0 0,1 7,12A5,5 0 0,1 12,7A5,5 0 0,1 17,12A5,5 0 0,1 12,17M12,4.5C7,4.5 2.73,7.61 1,12C2.73,16.39 7,19.5 12,19.5C17,19.5 21.27,16.39 23,12C21.27,7.61 17,4.5 12,4.5Z"
-                                  Foreground="#0D1117"
-                                  Width="12" Height="12" />
-                        <TextBlock Text="Preview" VerticalAlignment="Center" />
-                    </StackPanel>
-                </Button>
-                <Button Command="{Binding CancelCommand}"
-                        IsVisible="{Binding ExecutionLog.IsRunning}"
-                        ToolTip.Tip="Stop Execution"
-                        Padding="12,4">
-                    <StackPanel Orientation="Horizontal" Spacing="6">
-                        <PathIcon Data="M18,18H6V6H18V18Z"
-                                  Foreground="{DynamicResource ForgeError}"
-                                  Width="12" Height="12" />
-                        <TextBlock Text="Stop" Foreground="{DynamicResource ForgeError}" VerticalAlignment="Center" />
-                    </StackPanel>
-                </Button>
-            </StackPanel>
-        </DockPanel>
-    </Border>
+                    <!-- Fit to screen -->
+                    <Button Classes="toolbarIcon"
+                            ToolTip.Tip="Fit to Screen (Ctrl+0)"
+                            Click="OnFitToScreenClick">
+                        <PathIcon Data="M3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5A2,2 0 0,0 19,3H5A2,2 0 0,0 3,5M5,5H19V19H5V5M7,7V9H9V7H7M15,7V9H17V7H15M7,15V17H9V15H7M15,15V17H17V15H15Z"
+                                  Foreground="{DynamicResource ForgeText}"
+                                  Width="16" Height="16" />
+                    </Button>
+
+                    <!-- Separator -->
+                    <Border Width="1"
+                            Height="24"
+                            Background="{DynamicResource ForgeBorder}"
+                            VerticalAlignment="Center"
+                            Margin="4,0" />
+
+                    <!-- Run/Preview/Stop -->
+                    <Button Command="{Binding RunCommand}"
+                            Classes="accent"
+                            ToolTip.Tip="Run Pipeline"
+                            Padding="12,4">
+                        <StackPanel Orientation="Horizontal" Spacing="6">
+                            <PathIcon Data="M8,5.14V19.14L19,12.14L8,5.14Z"
+                                      Foreground="#08070a"
+                                      Width="12" Height="12" />
+                            <TextBlock Text="Run" VerticalAlignment="Center" />
+                        </StackPanel>
+                    </Button>
+                    <Button Command="{Binding DryRunCommand}"
+                            Classes="preview"
+                            ToolTip.Tip="Preview — simulate run without changing any files"
+                            Padding="12,4">
+                        <StackPanel Orientation="Horizontal" Spacing="6">
+                            <PathIcon Data="M12,9A3,3 0 0,0 9,12A3,3 0 0,0 12,15A3,3 0 0,0 15,12A3,3 0 0,0 12,9M12,17A5,5 0 0,1 7,12A5,5 0 0,1 12,7A5,5 0 0,1 17,12A5,5 0 0,1 12,17M12,4.5C7,4.5 2.73,7.61 1,12C2.73,16.39 7,19.5 12,19.5C17,19.5 21.27,16.39 23,12C21.27,7.61 17,4.5 12,4.5Z"
+                                      Foreground="{DynamicResource ForgeAccent}"
+                                      Width="12" Height="12" />
+                            <TextBlock Text="Preview" VerticalAlignment="Center" />
+                        </StackPanel>
+                    </Button>
+                    <Button Command="{Binding CancelCommand}"
+                            IsVisible="{Binding ExecutionLog.IsRunning}"
+                            ToolTip.Tip="Stop Execution"
+                            Padding="12,4">
+                        <StackPanel Orientation="Horizontal" Spacing="6">
+                            <PathIcon Data="M18,18H6V6H18V18Z"
+                                      Foreground="{DynamicResource ForgeError}"
+                                      Width="12" Height="12" />
+                            <TextBlock Text="Stop" Foreground="{DynamicResource ForgeError}" VerticalAlignment="Center" />
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
+            </DockPanel>
+        </Border>
+    </DockPanel>
 </UserControl>

From e9dc892eeefe87361d7afdfc8262ece0021ba43e Mon Sep 17 00:00:00 2001
From: Wintersta7e <Wintersta7e@users.noreply.github.com>
Date: Sat, 7 Mar 2026 13:23:01 +0100
Subject: [PATCH 07/11] style: restyle canvas with dot grid, molten nodes,
 diamond ports

Co-Authored-By: Rooty
---
 src/FlowForge.UI/Views/CanvasView.axaml | 115 +++++++++++++++++-------
 1 file changed, 82 insertions(+), 33 deletions(-)

diff --git a/src/FlowForge.UI/Views/CanvasView.axaml b/src/FlowForge.UI/Views/CanvasView.axaml
index 39bc034..2d1d534 100644
--- a/src/FlowForge.UI/Views/CanvasView.axaml
+++ b/src/FlowForge.UI/Views/CanvasView.axaml
@@ -19,6 +19,7 @@
                              ItemsDragStartedCommand="{Binding ItemsDragStartedCommand}"
                              ItemsDragCompletedCommand="{Binding ItemsDragCompletedCommand}"
                              Background="{DynamicResource ForgeBg}"
+                             GridCellSize="20"
                              DragDrop.AllowDrop="True">
 
             <nodify:NodifyEditor.Styles>
@@ -26,6 +27,25 @@
                     <Setter Property="Location" Value="{Binding Location, Mode=TwoWay}" />
                     <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
                 </Style>
+                <Style Selector="nodifyNodes|Node">
+                    <Setter Property="CornerRadius" Value="16" />
+                    <Setter Property="Background" Value="{DynamicResource ForgeSurface}" />
+                    <Setter Property="Foreground" Value="{DynamicResource ForgeText}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource ForgeBorder}" />
+                    <Setter Property="BorderThickness" Value="1" />
+                    <Setter Property="Padding" Value="0" />
+                    <Setter Property="FontSize" Value="13" />
+                </Style>
+                <Style Selector="nodifyConn|Connector">
+                    <Setter Property="Width" Value="12" />
+                    <Setter Property="Height" Value="12" />
+                    <Setter Property="Background" Value="{DynamicResource ForgeAccent}" />
+                    <Setter Property="RenderTransformOrigin" Value="0.5,0.5" />
+                    <Setter Property="RenderTransform">
+                        <RotateTransform Angle="45" />
+                    </Setter>
+                    <Setter Property="CornerRadius" Value="2" />
+                </Style>
             </nodify:NodifyEditor.Styles>
 
             <nodify:NodifyEditor.ItemTemplate>
@@ -54,7 +74,9 @@
             <nodify:NodifyEditor.ConnectionTemplate>
                 <DataTemplate x:DataType="vm:PipelineConnectionViewModel">
                     <nodifyConn:Connection Source="{Binding Source.Anchor}"
-                                           Target="{Binding Target.Anchor}" />
+                                           Target="{Binding Target.Anchor}"
+                                           Stroke="{DynamicResource ForgeAccent}"
+                                           StrokeThickness="2.5" />
                 </DataTemplate>
             </nodify:NodifyEditor.ConnectionTemplate>
 
@@ -73,54 +95,81 @@
 
         <!-- Empty state overlay -->
         <Border IsVisible="{Binding !HasNodes}"
-                Background="#B00D1117"
                 IsHitTestVisible="True"
                 DragDrop.AllowDrop="True">
+            <Border.Background>
+                <SolidColorBrush Color="#08070a" Opacity="0.7" />
+            </Border.Background>
             <StackPanel HorizontalAlignment="Center"
                         VerticalAlignment="Center"
-                        Spacing="16"
-                        MaxWidth="360">
-                <PathIcon Data="M10,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8C22,6.89 21.1,6 20,6H12L10,4Z"
-                          Foreground="{DynamicResource ForgeTextMuted}"
-                          Width="48" Height="48"
-                          HorizontalAlignment="Center" />
+                        Spacing="20"
+                        MaxWidth="400">
 
-                <StackPanel Spacing="4" HorizontalAlignment="Center">
-                    <TextBlock Text="Drag a node from the sidebar"
-                               FontSize="16"
-                               FontWeight="SemiBold"
-                               Foreground="{DynamicResource ForgeText}"
-                               HorizontalAlignment="Center" />
-                    <TextBlock Text="or double-click to add"
-                               FontSize="16"
-                               FontWeight="SemiBold"
-                               Foreground="{DynamicResource ForgeText}"
-                               HorizontalAlignment="Center" />
-                </StackPanel>
+                <!-- Large forge icon with glow ring -->
+                <Border Width="84" Height="84"
+                        CornerRadius="22"
+                        HorizontalAlignment="Center"
+                        BorderThickness="2"
+                        BorderBrush="{DynamicResource ForgeAccent}">
+                    <Border.Background>
+                        <SolidColorBrush Color="#e8932f" Opacity="0.08" />
+                    </Border.Background>
+                    <PathIcon Data="M10,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8C22,6.89 21.1,6 20,6H12L10,4Z"
+                              Foreground="{DynamicResource ForgeAccent}"
+                              Width="40" Height="40"
+                              HorizontalAlignment="Center"
+                              VerticalAlignment="Center" />
+                </Border>
 
-                <TextBlock Text="&#x2014; or use a template &#x2014;"
-                           FontSize="12"
-                           Foreground="{DynamicResource ForgeTextSecondary}"
+                <!-- Heading -->
+                <TextBlock Text="Forge your pipeline"
+                           FontSize="20"
+                           FontWeight="Bold"
+                           Foreground="{DynamicResource ForgeAccent}"
                            HorizontalAlignment="Center" />
 
-                <WrapPanel HorizontalAlignment="Center" Orientation="Horizontal">
+                <TextBlock Text="Drag nodes from the sidebar or start with a template"
+                           FontSize="13"
+                           Foreground="{DynamicResource ForgeTextSecondary}"
+                           HorizontalAlignment="Center"
+                           TextAlignment="Center" />
+
+                <!-- Template buttons 2x2 grid -->
+                <UniformGrid Columns="2" HorizontalAlignment="Center"
+                             Rows="2" MaxWidth="320">
                     <Button Classes="templateButton" Margin="4"
-                            Content="Photo Import"
                             Tag="photo-import-by-date"
-                            Click="OnTemplateButtonClick" />
+                            Click="OnTemplateButtonClick">
+                        <StackPanel Orientation="Horizontal" Spacing="8">
+                            <TextBlock Text="&#x1F4F7;" FontSize="16" VerticalAlignment="Center" />
+                            <TextBlock Text="Photo Import" VerticalAlignment="Center" />
+                        </StackPanel>
+                    </Button>
                     <Button Classes="templateButton" Margin="4"
-                            Content="Batch Rename"
                             Tag="batch-sequential-rename"
-                            Click="OnTemplateButtonClick" />
+                            Click="OnTemplateButtonClick">
+                        <StackPanel Orientation="Horizontal" Spacing="8">
+                            <TextBlock Text="&#x270E;" FontSize="16" VerticalAlignment="Center" />
+                            <TextBlock Text="Batch Rename" VerticalAlignment="Center" />
+                        </StackPanel>
+                    </Button>
                     <Button Classes="templateButton" Margin="4"
-                            Content="Web Export"
                             Tag="image-web-export"
-                            Click="OnTemplateButtonClick" />
+                            Click="OnTemplateButtonClick">
+                        <StackPanel Orientation="Horizontal" Spacing="8">
+                            <TextBlock Text="&#x1F310;" FontSize="16" VerticalAlignment="Center" />
+                            <TextBlock Text="Web Export" VerticalAlignment="Center" />
+                        </StackPanel>
+                    </Button>
                     <Button Classes="templateButton" Margin="4"
-                            Content="Compress"
                             Tag="bulk-image-compress"
-                            Click="OnTemplateButtonClick" />
-                </WrapPanel>
+                            Click="OnTemplateButtonClick">
+                        <StackPanel Orientation="Horizontal" Spacing="8">
+                            <TextBlock Text="&#x1F4E6;" FontSize="16" VerticalAlignment="Center" />
+                            <TextBlock Text="Compress" VerticalAlignment="Center" />
+                        </StackPanel>
+                    </Button>
+                </UniformGrid>
             </StackPanel>
         </Border>
     </Grid>

From c6ed992704b0cce94003e2be9fb272c5c8cc62e3 Mon Sep 17 00:00:00 2001
From: Wintersta7e <Wintersta7e@users.noreply.github.com>
Date: Sat, 7 Mar 2026 13:24:25 +0100
Subject: [PATCH 08/11] style: restyle properties panel with node badge and
 forge focus

Co-Authored-By: Rooty
---
 src/FlowForge.UI/Views/PropertiesView.axaml | 42 ++++++++++-----------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/FlowForge.UI/Views/PropertiesView.axaml b/src/FlowForge.UI/Views/PropertiesView.axaml
index c96daa1..b9ac829 100644
--- a/src/FlowForge.UI/Views/PropertiesView.axaml
+++ b/src/FlowForge.UI/Views/PropertiesView.axaml
@@ -5,49 +5,47 @@
              xmlns:vm="using:FlowForge.UI.ViewModels"
              xmlns:views="using:FlowForge.UI.Views"
              mc:Ignorable="d"
-             d:DesignWidth="250" d:DesignHeight="600"
+             d:DesignWidth="290" d:DesignHeight="600"
              x:Class="FlowForge.UI.Views.PropertiesView"
              x:DataType="vm:PropertiesViewModel">
 
     <DockPanel>
         <Border DockPanel.Dock="Top"
-                Padding="12,12,12,8"
+                Padding="14,14,14,10"
                 BorderBrush="{DynamicResource ForgeBorder}"
                 BorderThickness="0,0,0,1">
-            <StackPanel>
-                <TextBlock Text="Properties"
-                           FontSize="16"
-                           FontWeight="SemiBold"
-                           Foreground="{DynamicResource ForgeText}" />
-                <TextBlock Text="{Binding SelectedNodeTitle}"
-                           FontSize="12"
-                           Foreground="{DynamicResource ForgeTextSecondary}"
-                           IsVisible="{Binding HasSelection}"
-                           Margin="0,2,0,0" />
+            <StackPanel Spacing="8">
+                <TextBlock Text="PROPERTIES"
+                           FontSize="10"
+                           FontWeight="Bold"
+                           Foreground="{DynamicResource ForgeTextMuted}" />
+                <Border IsVisible="{Binding HasSelection}"
+                        Background="{DynamicResource ForgeElevated}"
+                        CornerRadius="8"
+                        Padding="10,6">
+                    <TextBlock Text="{Binding SelectedNodeTitle}"
+                               FontSize="12"
+                               FontWeight="SemiBold"
+                               Foreground="{DynamicResource ForgeAccent}" />
+                </Border>
             </StackPanel>
         </Border>
 
         <StackPanel IsVisible="{Binding !HasSelection}"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
-                    Spacing="8"
+                    Spacing="4"
                     Margin="16">
-            <TextBlock Text="Select a node on the canvas"
+            <TextBlock Text="Select a node to edit its settings"
                        FontSize="13"
-                       Foreground="{DynamicResource ForgeTextSecondary}"
-                       HorizontalAlignment="Center"
-                       TextWrapping="Wrap"
-                       TextAlignment="Center" />
-            <TextBlock Text="to edit its settings"
-                       FontSize="13"
-                       Foreground="{DynamicResource ForgeTextSecondary}"
+                       Foreground="{DynamicResource ForgeTextMuted}"
                        HorizontalAlignment="Center"
                        TextWrapping="Wrap"
                        TextAlignment="Center" />
         </StackPanel>
 
         <ScrollViewer IsVisible="{Binding HasSelection}"
-                      Padding="8">
+                      Padding="10">
             <ItemsControl ItemsSource="{Binding Fields}">
                 <ItemsControl.ItemTemplate>
                     <views:ConfigFieldTemplateSelector />

From 8f167211f4c9d98b62785b470544aca2447f7e51 Mon Sep 17 00:00:00 2001
From: Wintersta7e <Wintersta7e@users.noreply.github.com>
Date: Sat, 7 Mar 2026 13:25:12 +0100
Subject: [PATCH 09/11] style: restyle shortcuts dialog with forge theme

Co-Authored-By: Rooty
---
 src/FlowForge.UI/Views/ShortcutsWindow.axaml | 92 +++++++++++---------
 1 file changed, 50 insertions(+), 42 deletions(-)

diff --git a/src/FlowForge.UI/Views/ShortcutsWindow.axaml b/src/FlowForge.UI/Views/ShortcutsWindow.axaml
index bf4ffc5..16a0c92 100644
--- a/src/FlowForge.UI/Views/ShortcutsWindow.axaml
+++ b/src/FlowForge.UI/Views/ShortcutsWindow.axaml
@@ -2,69 +2,77 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Class="FlowForge.UI.Views.ShortcutsWindow"
         Title="Keyboard Shortcuts"
-        Width="400" Height="400"
+        Width="420" Height="440"
         CanResize="False"
         WindowStartupLocation="CenterOwner"
         Background="{DynamicResource ForgePanel}">
 
     <StackPanel Margin="24" Spacing="16">
         <TextBlock Text="Keyboard Shortcuts"
-                   FontSize="20"
+                   FontSize="18"
                    FontWeight="Bold"
-                   Foreground="{DynamicResource ForgeText}" />
+                   Foreground="{DynamicResource ForgeAccent}" />
 
-        <Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto"
-              Margin="0,8,0,0">
-            <Grid.Styles>
-                <Style Selector="TextBlock.key">
-                    <Setter Property="FontFamily" Value="Cascadia Mono,Consolas,monospace" />
-                    <Setter Property="FontSize" Value="13" />
-                    <Setter Property="Foreground" Value="{DynamicResource ForgeAccent}" />
-                    <Setter Property="Margin" Value="0,4,24,4" />
-                </Style>
-                <Style Selector="TextBlock.desc">
-                    <Setter Property="FontSize" Value="13" />
-                    <Setter Property="Foreground" Value="{DynamicResource ForgeText}" />
-                    <Setter Property="Margin" Value="0,4" />
-                    <Setter Property="VerticalAlignment" Value="Center" />
-                </Style>
-            </Grid.Styles>
+        <Border Background="{DynamicResource ForgeDeep}"
+                CornerRadius="12"
+                Padding="16,12"
+                BorderBrush="{DynamicResource ForgeBorder}"
+                BorderThickness="1">
+            <Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
+                <Grid.Styles>
+                    <Style Selector="TextBlock.key">
+                        <Setter Property="FontFamily" Value="Cascadia Mono,Consolas,monospace" />
+                        <Setter Property="FontSize" Value="12" />
+                        <Setter Property="Foreground" Value="{DynamicResource ForgeAccent}" />
+                        <Setter Property="Background" Value="{DynamicResource ForgeElevated}" />
+                        <Setter Property="Padding" Value="6,2" />
+                        <Setter Property="Margin" Value="0,4,16,4" />
+                    </Style>
+                    <Style Selector="TextBlock.desc">
+                        <Setter Property="FontSize" Value="12.5" />
+                        <Setter Property="Foreground" Value="{DynamicResource ForgeText}" />
+                        <Setter Property="Margin" Value="0,4" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                </Grid.Styles>
 
-            <TextBlock Grid.Row="0" Grid.Column="0" Classes="key" Text="Ctrl+N" />
-            <TextBlock Grid.Row="0" Grid.Column="1" Classes="desc" Text="New pipeline" />
+                <TextBlock Grid.Row="0" Grid.Column="0" Classes="key" Text="Ctrl+N" />
+                <TextBlock Grid.Row="0" Grid.Column="1" Classes="desc" Text="New pipeline" />
 
-            <TextBlock Grid.Row="1" Grid.Column="0" Classes="key" Text="Ctrl+O" />
-            <TextBlock Grid.Row="1" Grid.Column="1" Classes="desc" Text="Open pipeline" />
+                <TextBlock Grid.Row="1" Grid.Column="0" Classes="key" Text="Ctrl+O" />
+                <TextBlock Grid.Row="1" Grid.Column="1" Classes="desc" Text="Open pipeline" />
 
-            <TextBlock Grid.Row="2" Grid.Column="0" Classes="key" Text="Ctrl+S" />
-            <TextBlock Grid.Row="2" Grid.Column="1" Classes="desc" Text="Save" />
+                <TextBlock Grid.Row="2" Grid.Column="0" Classes="key" Text="Ctrl+S" />
+                <TextBlock Grid.Row="2" Grid.Column="1" Classes="desc" Text="Save" />
 
-            <TextBlock Grid.Row="3" Grid.Column="0" Classes="key" Text="Ctrl+Shift+S" />
-            <TextBlock Grid.Row="3" Grid.Column="1" Classes="desc" Text="Save as" />
+                <TextBlock Grid.Row="3" Grid.Column="0" Classes="key" Text="Ctrl+Shift+S" />
+                <TextBlock Grid.Row="3" Grid.Column="1" Classes="desc" Text="Save as" />
 
-            <TextBlock Grid.Row="4" Grid.Column="0" Classes="key" Text="Delete" />
-            <TextBlock Grid.Row="4" Grid.Column="1" Classes="desc" Text="Remove selected nodes" />
+                <TextBlock Grid.Row="4" Grid.Column="0" Classes="key" Text="Delete" />
+                <TextBlock Grid.Row="4" Grid.Column="1" Classes="desc" Text="Remove selected nodes" />
 
-            <TextBlock Grid.Row="5" Grid.Column="0" Classes="key" Text="Ctrl+0" />
-            <TextBlock Grid.Row="5" Grid.Column="1" Classes="desc" Text="Zoom to fit all nodes" />
+                <TextBlock Grid.Row="5" Grid.Column="0" Classes="key" Text="Ctrl+0" />
+                <TextBlock Grid.Row="5" Grid.Column="1" Classes="desc" Text="Zoom to fit all nodes" />
 
-            <TextBlock Grid.Row="6" Grid.Column="0" Classes="key" Text="Space+Drag" />
-            <TextBlock Grid.Row="6" Grid.Column="1" Classes="desc" Text="Pan canvas" />
+                <TextBlock Grid.Row="6" Grid.Column="0" Classes="key" Text="Space+Drag" />
+                <TextBlock Grid.Row="6" Grid.Column="1" Classes="desc" Text="Pan canvas" />
 
-            <TextBlock Grid.Row="7" Grid.Column="0" Classes="key" Text="Ctrl+Scroll" />
-            <TextBlock Grid.Row="7" Grid.Column="1" Classes="desc" Text="Zoom in/out" />
+                <TextBlock Grid.Row="7" Grid.Column="0" Classes="key" Text="Ctrl+Scroll" />
+                <TextBlock Grid.Row="7" Grid.Column="1" Classes="desc" Text="Zoom in/out" />
 
-            <TextBlock Grid.Row="8" Grid.Column="0" Classes="key" Text="Ctrl+Z" />
-            <TextBlock Grid.Row="8" Grid.Column="1" Classes="desc" Text="Undo" />
+                <TextBlock Grid.Row="8" Grid.Column="0" Classes="key" Text="Ctrl+Z" />
+                <TextBlock Grid.Row="8" Grid.Column="1" Classes="desc" Text="Undo" />
 
-            <TextBlock Grid.Row="9" Grid.Column="0" Classes="key" Text="Ctrl+Y" />
-            <TextBlock Grid.Row="9" Grid.Column="1" Classes="desc" Text="Redo" />
+                <TextBlock Grid.Row="9" Grid.Column="0" Classes="key" Text="Ctrl+Y" />
+                <TextBlock Grid.Row="9" Grid.Column="1" Classes="desc" Text="Redo" />
 
-            <TextBlock Grid.Row="10" Grid.Column="0" Classes="key" Text="F1" />
-            <TextBlock Grid.Row="10" Grid.Column="1" Classes="desc" Text="Show this help" />
-        </Grid>
+                <TextBlock Grid.Row="10" Grid.Column="0" Classes="key" Text="F1" />
+                <TextBlock Grid.Row="10" Grid.Column="1" Classes="desc" Text="Show this help" />
+            </Grid>
+        </Border>
 
         <Button Content="Close"
+                Classes="accent"
                 HorizontalAlignment="Right"
                 Padding="16,6"
                 Click="OnCloseClick" />

From 0ef1a61368f4409fadd5afa97b6e020f68fe7025 Mon Sep 17 00:00:00 2001
From: Wintersta7e <Wintersta7e@users.noreply.github.com>
Date: Sat, 7 Mar 2026 13:25:59 +0100
Subject: [PATCH 10/11] style: restyle output panel with molten accent and
 status dots

Co-Authored-By: Rooty
---
 src/FlowForge.UI/Views/ExecutionLogView.axaml | 92 +++++++++++++------
 1 file changed, 62 insertions(+), 30 deletions(-)

diff --git a/src/FlowForge.UI/Views/ExecutionLogView.axaml b/src/FlowForge.UI/Views/ExecutionLogView.axaml
index 1687d8c..921353d 100644
--- a/src/FlowForge.UI/Views/ExecutionLogView.axaml
+++ b/src/FlowForge.UI/Views/ExecutionLogView.axaml
@@ -9,6 +9,19 @@
              x:DataType="vm:ExecutionLogViewModel">
 
     <DockPanel Background="{DynamicResource ForgePanel}">
+        <!-- Molten accent line -->
+        <Border DockPanel.Dock="Top" Height="2" Opacity="0.5">
+            <Border.Background>
+                <LinearGradientBrush StartPoint="0%,50%" EndPoint="100%,50%">
+                    <GradientStop Color="Transparent" Offset="0" />
+                    <GradientStop Color="#d4612c" Offset="0.2" />
+                    <GradientStop Color="#f5a623" Offset="0.5" />
+                    <GradientStop Color="#f5c842" Offset="0.8" />
+                    <GradientStop Color="Transparent" Offset="1" />
+                </LinearGradientBrush>
+            </Border.Background>
+        </Border>
+
         <!-- Tab strip -->
         <Border DockPanel.Dock="Top"
                 BorderBrush="{DynamicResource ForgeBorder}"
@@ -22,7 +35,7 @@
                               CommandParameter="0">
                     <StackPanel Orientation="Horizontal" Spacing="6">
                         <TextBlock Text="Output" VerticalAlignment="Center" FontSize="14" />
-                        <Border Background="#1A3FB950" CornerRadius="8" Padding="6,1"
+                        <Border Background="#265ce0a0" CornerRadius="8" Padding="6,1"
                                 IsVisible="{Binding !!TotalFiles}">
                             <TextBlock Text="{Binding Succeeded}"
                                        Foreground="{DynamicResource ForgeSuccess}"
@@ -39,7 +52,7 @@
                               CommandParameter="1">
                     <StackPanel Orientation="Horizontal" Spacing="6">
                         <TextBlock Text="Errors" VerticalAlignment="Center" FontSize="14" />
-                        <Border Background="#1AF85149" CornerRadius="8" Padding="6,1"
+                        <Border Background="#26f2716a" CornerRadius="8" Padding="6,1"
                                 IsVisible="{Binding !!Failed}">
                             <TextBlock Text="{Binding Failed}"
                                        Foreground="{DynamicResource ForgeError}"
@@ -56,7 +69,7 @@
                               CommandParameter="2">
                     <StackPanel Orientation="Horizontal" Spacing="6">
                         <TextBlock Text="Warnings" VerticalAlignment="Center" FontSize="14" />
-                        <Border Background="#1AD29922" CornerRadius="8" Padding="6,1"
+                        <Border Background="#26f5c842" CornerRadius="8" Padding="6,1"
                                 IsVisible="{Binding !!Skipped}">
                             <TextBlock Text="{Binding Skipped}"
                                        Foreground="{DynamicResource ForgeWarning}"
@@ -72,7 +85,7 @@
                            VerticalAlignment="Center"
                            HorizontalAlignment="Right"
                            Foreground="{DynamicResource ForgeTextSecondary}"
-                           FontSize="15"
+                           FontSize="12"
                            Margin="8,0,12,0"
                            IsVisible="{Binding !IsRunning}" />
             </Grid>
@@ -103,7 +116,8 @@
                 </DockPanel>
                 <ProgressBar Grid.Row="1"
                              IsIndeterminate="True"
-                             Height="3" Margin="0,6,0,0" />
+                             Height="4" Margin="0,6,0,0"
+                             CornerRadius="2" />
             </Grid>
         </Border>
 
@@ -118,39 +132,51 @@
                                 <Border Padding="12,3"
                                         BorderBrush="{DynamicResource ForgeBorder}"
                                         BorderThickness="0,0,0,1">
-                                    <Grid ColumnDefinitions="55,Auto,*">
-                                        <Panel Grid.Column="0">
+                                    <Grid ColumnDefinitions="8,55,Auto,*">
+                                        <Ellipse Grid.Column="0" Width="6" Height="6"
+                                                 Fill="{DynamicResource ForgeSuccess}"
+                                                 VerticalAlignment="Center"
+                                                 IsVisible="{Binding IsSuccess}" />
+                                        <Ellipse Grid.Column="0" Width="6" Height="6"
+                                                 Fill="{DynamicResource ForgeError}"
+                                                 VerticalAlignment="Center"
+                                                 IsVisible="{Binding IsError}" />
+                                        <Ellipse Grid.Column="0" Width="6" Height="6"
+                                                 Fill="{DynamicResource ForgeWarning}"
+                                                 VerticalAlignment="Center"
+                                                 IsVisible="{Binding IsWarning}" />
+                                        <Panel Grid.Column="1">
                                             <TextBlock Text="{Binding StatusText}"
                                                        FontFamily="Cascadia Mono,Consolas,Courier New,monospace"
-                                                       FontWeight="Bold" FontSize="15"
+                                                       FontWeight="Bold" FontSize="12"
                                                        Foreground="{DynamicResource ForgeSuccess}"
                                                        VerticalAlignment="Center"
                                                        IsVisible="{Binding IsSuccess}" />
                                             <TextBlock Text="{Binding StatusText}"
                                                        FontFamily="Cascadia Mono,Consolas,Courier New,monospace"
-                                                       FontWeight="Bold" FontSize="15"
+                                                       FontWeight="Bold" FontSize="12"
                                                        Foreground="{DynamicResource ForgeError}"
                                                        VerticalAlignment="Center"
                                                        IsVisible="{Binding IsError}" />
                                             <TextBlock Text="{Binding StatusText}"
                                                        FontFamily="Cascadia Mono,Consolas,Courier New,monospace"
-                                                       FontWeight="Bold" FontSize="15"
+                                                       FontWeight="Bold" FontSize="12"
                                                        Foreground="{DynamicResource ForgeWarning}"
                                                        VerticalAlignment="Center"
                                                        IsVisible="{Binding IsWarning}" />
                                         </Panel>
-                                        <TextBlock Grid.Column="1"
+                                        <TextBlock Grid.Column="2"
                                                    Text="{Binding FileName}"
                                                    FontFamily="Cascadia Mono,Consolas,Courier New,monospace"
                                                    VerticalAlignment="Center"
                                                    Foreground="{DynamicResource ForgeText}"
-                                                   FontSize="15"
+                                                   FontSize="12"
                                                    Margin="0,0,8,0" />
-                                        <TextBlock Grid.Column="2"
+                                        <TextBlock Grid.Column="3"
                                                    Text="{Binding ErrorMessage}"
                                                    FontFamily="Cascadia Mono,Consolas,Courier New,monospace"
                                                    Foreground="{DynamicResource ForgeError}"
-                                                   FontSize="15"
+                                                   FontSize="12"
                                                    VerticalAlignment="Center"
                                                    TextTrimming="CharacterEllipsis"
                                                    IsVisible="{Binding IsError}" />
@@ -168,7 +194,7 @@
                            HorizontalAlignment="Center"
                            VerticalAlignment="Center"
                            Foreground="{DynamicResource ForgeTextMuted}"
-                           FontSize="15"
+                           FontSize="12"
                            IsVisible="{Binding !ErrorEntries.Count}" />
 
                 <ScrollViewer IsVisible="{Binding !!ErrorEntries.Count}">
@@ -178,25 +204,28 @@
                                 <Border Padding="12,3"
                                         BorderBrush="{DynamicResource ForgeBorder}"
                                         BorderThickness="0,0,0,1">
-                                    <Grid ColumnDefinitions="55,Auto,*">
-                                        <TextBlock Grid.Column="0"
+                                    <Grid ColumnDefinitions="8,55,Auto,*">
+                                        <Ellipse Grid.Column="0" Width="6" Height="6"
+                                                 Fill="{DynamicResource ForgeError}"
+                                                 VerticalAlignment="Center" />
+                                        <TextBlock Grid.Column="1"
                                                    Text="{Binding StatusText}"
                                                    FontFamily="Cascadia Mono,Consolas,Courier New,monospace"
-                                                   FontWeight="Bold" FontSize="15"
+                                                   FontWeight="Bold" FontSize="12"
                                                    Foreground="{DynamicResource ForgeError}"
                                                    VerticalAlignment="Center" />
-                                        <TextBlock Grid.Column="1"
+                                        <TextBlock Grid.Column="2"
                                                    Text="{Binding FileName}"
                                                    FontFamily="Cascadia Mono,Consolas,Courier New,monospace"
                                                    VerticalAlignment="Center"
                                                    Foreground="{DynamicResource ForgeText}"
-                                                   FontSize="15"
+                                                   FontSize="12"
                                                    Margin="0,0,8,0" />
-                                        <TextBlock Grid.Column="2"
+                                        <TextBlock Grid.Column="3"
                                                    Text="{Binding ErrorMessage}"
                                                    FontFamily="Cascadia Mono,Consolas,Courier New,monospace"
                                                    Foreground="{DynamicResource ForgeError}"
-                                                   FontSize="15"
+                                                   FontSize="12"
                                                    VerticalAlignment="Center"
                                                    TextTrimming="CharacterEllipsis" />
                                     </Grid>
@@ -213,7 +242,7 @@
                            HorizontalAlignment="Center"
                            VerticalAlignment="Center"
                            Foreground="{DynamicResource ForgeTextMuted}"
-                           FontSize="15"
+                           FontSize="12"
                            IsVisible="{Binding !WarningEntries.Count}" />
 
                 <ScrollViewer IsVisible="{Binding !!WarningEntries.Count}">
@@ -223,25 +252,28 @@
                                 <Border Padding="12,3"
                                         BorderBrush="{DynamicResource ForgeBorder}"
                                         BorderThickness="0,0,0,1">
-                                    <Grid ColumnDefinitions="55,Auto,*">
-                                        <TextBlock Grid.Column="0"
+                                    <Grid ColumnDefinitions="8,55,Auto,*">
+                                        <Ellipse Grid.Column="0" Width="6" Height="6"
+                                                 Fill="{DynamicResource ForgeWarning}"
+                                                 VerticalAlignment="Center" />
+                                        <TextBlock Grid.Column="1"
                                                    Text="{Binding StatusText}"
                                                    FontFamily="Cascadia Mono,Consolas,Courier New,monospace"
-                                                   FontWeight="Bold" FontSize="15"
+                                                   FontWeight="Bold" FontSize="12"
                                                    Foreground="{DynamicResource ForgeWarning}"
                                                    VerticalAlignment="Center" />
-                                        <TextBlock Grid.Column="1"
+                                        <TextBlock Grid.Column="2"
                                                    Text="{Binding FileName}"
                                                    FontFamily="Cascadia Mono,Consolas,Courier New,monospace"
                                                    VerticalAlignment="Center"
                                                    Foreground="{DynamicResource ForgeText}"
-                                                   FontSize="15"
+                                                   FontSize="12"
                                                    Margin="0,0,8,0" />
-                                        <TextBlock Grid.Column="2"
+                                        <TextBlock Grid.Column="3"
                                                    Text="{Binding ErrorMessage}"
                                                    FontFamily="Cascadia Mono,Consolas,Courier New,monospace"
                                                    Foreground="{DynamicResource ForgeWarning}"
-                                                   FontSize="15"
+                                                   FontSize="12"
                                                    VerticalAlignment="Center"
                                                    TextTrimming="CharacterEllipsis"
                                                    IsVisible="{Binding ErrorMessage, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" />

From 107e349affda8f7858cb82c9ac652d2f875b630f Mon Sep 17 00:00:00 2001
From: Wintersta7e <Wintersta7e@users.noreply.github.com>
Date: Sat, 7 Mar 2026 16:49:39 +0100
Subject: [PATCH 11/11] style: refine nodes, connectors, and library to match
 mockup

Custom node template with rounded corners, gradient backgrounds,
category-colored header tints, emoji icons, config preview text,
and diamond-shaped connectors. Node library gets colored icon boxes
and category headers. Properties panel adds category badge. Font
sizes reduced for tighter layout.

Co-Authored-By: Rooty
---
 src/FlowForge.UI/MainWindow.axaml             |   2 +-
 .../ViewModels/NodeLibraryGroupViewModel.cs   |   5 +-
 .../ViewModels/NodeLibraryItemViewModel.cs    |   8 +-
 .../ViewModels/NodeLibraryViewModel.cs        |  72 +++--
 .../ViewModels/PipelineConnectorViewModel.cs  |   4 +
 .../ViewModels/PipelineNodeViewModel.cs       | 125 +++++++-
 .../ViewModels/PropertiesViewModel.cs         |  28 ++
 src/FlowForge.UI/Views/CanvasView.axaml       | 164 +++++++----
 src/FlowForge.UI/Views/ExecutionLogView.axaml |  18 +-
 src/FlowForge.UI/Views/NodeLibraryView.axaml  |  37 ++-
 src/FlowForge.UI/Views/PropertiesView.axaml   |   4 +-
 src/FlowForge.UI/Views/ToolbarView.axaml      | 272 ++++++++++--------
 12 files changed, 522 insertions(+), 217 deletions(-)

diff --git a/src/FlowForge.UI/MainWindow.axaml b/src/FlowForge.UI/MainWindow.axaml
index 7fe72dc..fd57708 100644
--- a/src/FlowForge.UI/MainWindow.axaml
+++ b/src/FlowForge.UI/MainWindow.axaml
@@ -12,7 +12,7 @@
         Width="1200" Height="700"
         MinWidth="800" MinHeight="500"
         Icon="avares://FlowForge.UI/Assets/icon.png"
-        FontSize="14"
+        FontSize="13"
         Background="{DynamicResource ForgeBg}"
         KeyDown="OnKeyDown">
 
diff --git a/src/FlowForge.UI/ViewModels/NodeLibraryGroupViewModel.cs b/src/FlowForge.UI/ViewModels/NodeLibraryGroupViewModel.cs
index e036265..1cbe1ae 100644
--- a/src/FlowForge.UI/ViewModels/NodeLibraryGroupViewModel.cs
+++ b/src/FlowForge.UI/ViewModels/NodeLibraryGroupViewModel.cs
@@ -1,15 +1,18 @@
 using System.Collections.ObjectModel;
+using Avalonia.Media;
 
 namespace FlowForge.UI.ViewModels;
 
 public class NodeLibraryGroupViewModel : ViewModelBase
 {
     public string Category { get; }
+    public IBrush CategoryBrush { get; }
     public ObservableCollection<NodeLibraryItemViewModel> Items { get; }
 
-    public NodeLibraryGroupViewModel(string category, ObservableCollection<NodeLibraryItemViewModel> items)
+    public NodeLibraryGroupViewModel(string category, ObservableCollection<NodeLibraryItemViewModel> items, IBrush categoryBrush)
     {
         Category = category;
         Items = items;
+        CategoryBrush = categoryBrush;
     }
 }
diff --git a/src/FlowForge.UI/ViewModels/NodeLibraryItemViewModel.cs b/src/FlowForge.UI/ViewModels/NodeLibraryItemViewModel.cs
index b5c6202..e0797ec 100644
--- a/src/FlowForge.UI/ViewModels/NodeLibraryItemViewModel.cs
+++ b/src/FlowForge.UI/ViewModels/NodeLibraryItemViewModel.cs
@@ -1,3 +1,5 @@
+using Avalonia.Media;
+
 namespace FlowForge.UI.ViewModels;
 
 public class NodeLibraryItemViewModel : ViewModelBase
@@ -5,11 +7,15 @@ public class NodeLibraryItemViewModel : ViewModelBase
     public string TypeKey { get; }
     public string DisplayName { get; }
     public string Icon { get; }
+    public IBrush IconBackground { get; }
+    public IBrush IconForeground { get; }
 
-    public NodeLibraryItemViewModel(string typeKey, string displayName, string icon = "")
+    public NodeLibraryItemViewModel(string typeKey, string displayName, string icon, IBrush iconBackground, IBrush iconForeground)
     {
         TypeKey = typeKey;
         DisplayName = displayName;
         Icon = icon;
+        IconBackground = iconBackground;
+        IconForeground = iconForeground;
     }
 }
diff --git a/src/FlowForge.UI/ViewModels/NodeLibraryViewModel.cs b/src/FlowForge.UI/ViewModels/NodeLibraryViewModel.cs
index e3a6c69..1ca5ea3 100644
--- a/src/FlowForge.UI/ViewModels/NodeLibraryViewModel.cs
+++ b/src/FlowForge.UI/ViewModels/NodeLibraryViewModel.cs
@@ -2,6 +2,9 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Media;
 using CommunityToolkit.Mvvm.ComponentModel;
 using FlowForge.Core.Execution;
 
@@ -16,6 +19,21 @@ public partial class NodeLibraryViewModel : ViewModelBase
         ["Output"] = "Save To"
     };
 
+    private static readonly Dictionary<string, string> NodeIcons = new()
+    {
+        ["FolderInput"] = "\U0001F4C1",
+        ["RenamePattern"] = "\u270E",
+        ["RenameRegex"] = ".*",
+        ["RenameAddAffix"] = "+a",
+        ["Filter"] = "\U0001F50D",
+        ["Sort"] = "\u21C5",
+        ["ImageResize"] = "\U0001F4F8",
+        ["ImageConvert"] = "\U0001F3A8",
+        ["ImageCompress"] = "\U0001F4E6",
+        ["MetadataExtract"] = "\U0001F4C4",
+        ["FolderOutput"] = "\U0001F4E5",
+    };
+
     private List<NodeLibraryGroupViewModel> _allGroups = new();
 
     [ObservableProperty]
@@ -34,6 +52,7 @@ public void Initialize(NodeRegistry registry)
         Groups.Clear();
 
         Dictionary<string, List<NodeLibraryItemViewModel>> categoryItems = new();
+        Dictionary<string, NodeCategory> categoryKeys = new();
 
         foreach (string typeKey in registry.GetRegisteredTypeKeys())
         {
@@ -45,44 +64,58 @@ public void Initialize(NodeRegistry registry)
             {
                 existingItems = new List<NodeLibraryItemViewModel>();
                 categoryItems[categoryName] = existingItems;
+                categoryKeys[categoryName] = category;
             }
 
-            string icon = GetIconForTypeKey(typeKey);
-            existingItems.Add(new NodeLibraryItemViewModel(typeKey, displayName, icon));
+            string icon = NodeIcons.GetValueOrDefault(typeKey, "\u2699");
+            var brushes = GetCategoryBrushes(category);
+            existingItems.Add(new NodeLibraryItemViewModel(typeKey, displayName, icon, brushes.IconBg, brushes.IconFg));
         }
 
-        // Add groups in canonical order: Input, Process, Save To
         string[] orderedCategories = ["Input", "Process", "Save To"];
         foreach (string cat in orderedCategories)
         {
             if (categoryItems.TryGetValue(cat, out List<NodeLibraryItemViewModel>? items))
             {
-                NodeLibraryGroupViewModel group = new(cat, new ObservableCollection<NodeLibraryItemViewModel>(items));
+                IBrush categoryBrush = GetCategoryHeaderBrush(categoryKeys[cat]);
+                NodeLibraryGroupViewModel group = new(cat, new ObservableCollection<NodeLibraryItemViewModel>(items), categoryBrush);
                 _allGroups.Add(group);
                 Groups.Add(group);
             }
         }
     }
 
-    private static string GetIconForTypeKey(string typeKey)
+    private static (IBrush IconBg, IBrush IconFg) GetCategoryBrushes(NodeCategory category)
     {
-        return typeKey switch
+        return category switch
         {
-            "FolderInput" => "\U0001F4C1",
-            "PatternRename" => "\u270E",
-            "RegexRename" => ".*",
-            "AffixRename" => "+a",
-            "Filter" => "\U0001F50D",
-            "Sort" => "\u21C5",
-            "ImageResize" => "\U0001F4F7",
-            "ImageConvert" => "\U0001F3A8",
-            "ImageCompress" => "\U0001F4E6",
-            "MetadataExtract" => "\U0001F4C4",
-            "FolderOutput" => "\U0001F4E5",
-            _ => "\u2699",
+            NodeCategory.Source => (GetBrush("ForgeSourceDim", "#145bb8f5"), GetBrush("ForgeSource", "#5bb8f5")),
+            NodeCategory.Transform => (GetBrush("ForgeTransformDim", "#145ce0a0"), GetBrush("ForgeTransform", "#5ce0a0")),
+            NodeCategory.Output => (GetBrush("ForgeOutputDim", "#14e8932f"), GetBrush("ForgeOutput", "#e8932f")),
+            _ => (GetBrush("ForgeElevated", "#252029"), GetBrush("ForgeTextMuted", "#564a62"))
         };
     }
 
+    private static IBrush GetCategoryHeaderBrush(NodeCategory category)
+    {
+        return category switch
+        {
+            NodeCategory.Source => GetBrush("ForgeSource", "#5bb8f5"),
+            NodeCategory.Transform => GetBrush("ForgeTransform", "#5ce0a0"),
+            NodeCategory.Output => GetBrush("ForgeOutput", "#e8932f"),
+            _ => GetBrush("ForgeTextMuted", "#564a62")
+        };
+    }
+
+    private static IBrush GetBrush(string key, string fallback)
+    {
+        if (Application.Current?.TryFindResource(key, Application.Current.ActualThemeVariant, out object? resource) == true && resource is IBrush brush)
+        {
+            return brush;
+        }
+        return new SolidColorBrush(Color.Parse(fallback));
+    }
+
     private void FilterItems()
     {
         Groups.Clear();
@@ -105,7 +138,8 @@ private void FilterItems()
             {
                 Groups.Add(new NodeLibraryGroupViewModel(
                     group.Category,
-                    new ObservableCollection<NodeLibraryItemViewModel>(filtered)));
+                    new ObservableCollection<NodeLibraryItemViewModel>(filtered),
+                    group.CategoryBrush));
             }
         }
     }
diff --git a/src/FlowForge.UI/ViewModels/PipelineConnectorViewModel.cs b/src/FlowForge.UI/ViewModels/PipelineConnectorViewModel.cs
index cac2f0b..fc1107b 100644
--- a/src/FlowForge.UI/ViewModels/PipelineConnectorViewModel.cs
+++ b/src/FlowForge.UI/ViewModels/PipelineConnectorViewModel.cs
@@ -1,4 +1,5 @@
 using Avalonia;
+using Avalonia.Media;
 using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace FlowForge.UI.ViewModels;
@@ -18,6 +19,9 @@ public partial class PipelineConnectorViewModel : ViewModelBase
 
     public PipelineNodeViewModel Node { get; }
 
+    /// <summary>Category color for this connector (from parent node).</summary>
+    public IBrush ConnectorBrush => Node.CategoryBrush;
+
     public PipelineConnectorViewModel(string title, bool isInput, PipelineNodeViewModel node)
     {
         _title = title;
diff --git a/src/FlowForge.UI/ViewModels/PipelineNodeViewModel.cs b/src/FlowForge.UI/ViewModels/PipelineNodeViewModel.cs
index a77c3ed..383aba2 100644
--- a/src/FlowForge.UI/ViewModels/PipelineNodeViewModel.cs
+++ b/src/FlowForge.UI/ViewModels/PipelineNodeViewModel.cs
@@ -22,10 +22,76 @@ private static IBrush GetBrush(string key, string fallback)
         return new SolidColorBrush(Color.Parse(fallback));
     }
 
+    // Category solid colors (for text, connectors)
     private static readonly IBrush SourceBrush = GetBrush("ForgeSource", "#5bb8f5");
     private static readonly IBrush TransformBrush = GetBrush("ForgeTransform", "#5ce0a0");
     private static readonly IBrush OutputBrush = GetBrush("ForgeOutput", "#e8932f");
 
+    // Category border colors (~20% opacity)
+    private static readonly IBrush SourceBorderBrush = new SolidColorBrush(Color.Parse("#335bb8f5"));
+    private static readonly IBrush TransformBorderBrush = new SolidColorBrush(Color.Parse("#335ce0a0"));
+    private static readonly IBrush OutputBorderBrush = new SolidColorBrush(Color.Parse("#33e8932f"));
+
+    // Category header gradients (subtle, not solid blocks)
+    private static readonly IBrush SourceHeaderGradient = new LinearGradientBrush
+    {
+        StartPoint = new RelativePoint(0, 0.5, RelativeUnit.Relative),
+        EndPoint = new RelativePoint(1, 0.5, RelativeUnit.Relative),
+        GradientStops = { new GradientStop(Color.Parse("#0D5bb8f5"), 0), new GradientStop(Colors.Transparent, 1) }
+    };
+
+    private static readonly IBrush TransformHeaderGradient = new LinearGradientBrush
+    {
+        StartPoint = new RelativePoint(0, 0.5, RelativeUnit.Relative),
+        EndPoint = new RelativePoint(1, 0.5, RelativeUnit.Relative),
+        GradientStops = { new GradientStop(Color.Parse("#0D5ce0a0"), 0), new GradientStop(Colors.Transparent, 1) }
+    };
+
+    private static readonly IBrush OutputHeaderGradient = new LinearGradientBrush
+    {
+        StartPoint = new RelativePoint(0, 0.5, RelativeUnit.Relative),
+        EndPoint = new RelativePoint(1, 0.5, RelativeUnit.Relative),
+        GradientStops = { new GradientStop(Color.Parse("#0Ee8932f"), 0), new GradientStop(Colors.Transparent, 1) }
+    };
+
+    // Category-tinted gradient backgrounds
+    private static readonly IBrush SourceNodeBg = new LinearGradientBrush
+    {
+        StartPoint = new RelativePoint(0.5, 0, RelativeUnit.Relative),
+        EndPoint = new RelativePoint(0.5, 1, RelativeUnit.Relative),
+        GradientStops = { new GradientStop(Color.Parse("#0F5bb8f5"), 0), new GradientStop(Color.Parse("#1c1820"), 0.5) }
+    };
+
+    private static readonly IBrush TransformNodeBg = new LinearGradientBrush
+    {
+        StartPoint = new RelativePoint(0.5, 0, RelativeUnit.Relative),
+        EndPoint = new RelativePoint(0.5, 1, RelativeUnit.Relative),
+        GradientStops = { new GradientStop(Color.Parse("#0F5ce0a0"), 0), new GradientStop(Color.Parse("#1c1820"), 0.5) }
+    };
+
+    private static readonly IBrush OutputNodeBg = new LinearGradientBrush
+    {
+        StartPoint = new RelativePoint(0.5, 0, RelativeUnit.Relative),
+        EndPoint = new RelativePoint(0.5, 1, RelativeUnit.Relative),
+        GradientStops = { new GradientStop(Color.Parse("#14e8932f"), 0), new GradientStop(Color.Parse("#1c1820"), 0.5) }
+    };
+
+    // Icon emoji per node type
+    private static readonly Dictionary<string, string> NodeIcons = new()
+    {
+        ["FolderInput"] = "\U0001F4C1",
+        ["RenamePattern"] = "\u270E",
+        ["RenameRegex"] = ".*",
+        ["RenameAddAffix"] = "+a",
+        ["Filter"] = "\U0001F50D",
+        ["Sort"] = "\u21C5",
+        ["ImageResize"] = "\U0001F4F8",
+        ["ImageConvert"] = "\U0001F3A8",
+        ["ImageCompress"] = "\U0001F4E6",
+        ["MetadataExtract"] = "\U0001F4C4",
+        ["FolderOutput"] = "\U0001F4E5",
+    };
+
     [ObservableProperty]
     private Point _location;
 
@@ -35,12 +101,25 @@ private static IBrush GetBrush(string key, string fallback)
     public Guid Id { get; }
     public string TypeKey { get; }
     public string Title { get; }
+    public string IconEmoji { get; }
+    public string ConfigPreview { get; }
     public NodeCategory Category { get; }
     public ObservableCollection<PipelineConnectorViewModel> Input { get; } = new();
     public ObservableCollection<PipelineConnectorViewModel> Output { get; } = new();
     public Dictionary<string, JsonElement> Config { get; }
+
+    /// <summary>Solid category color for text and connector fills.</summary>
+    public IBrush CategoryBrush { get; }
+
+    /// <summary>Subtle gradient for the node header area.</summary>
     public IBrush HeaderBrush { get; }
 
+    /// <summary>20% opacity category color for the node border.</summary>
+    public IBrush NodeBorderBrush { get; }
+
+    /// <summary>Top-down gradient with subtle category tint.</summary>
+    public IBrush NodeBackground { get; }
+
     public PipelineNodeViewModel(NodeDefinition definition, NodeRegistry registry)
     {
         Id = definition.Id;
@@ -48,9 +127,11 @@ public PipelineNodeViewModel(NodeDefinition definition, NodeRegistry registry)
         Title = registry.GetDisplayName(definition.TypeKey);
         Category = registry.GetCategoryForTypeKey(definition.TypeKey);
         Config = definition.Config;
+        IconEmoji = NodeIcons.GetValueOrDefault(definition.TypeKey, "\u2699");
+        ConfigPreview = BuildConfigPreview(definition.Config);
         _location = new Point(definition.Position.X, definition.Position.Y);
 
-        HeaderBrush = Category switch
+        CategoryBrush = Category switch
         {
             NodeCategory.Source => SourceBrush,
             NodeCategory.Transform => TransformBrush,
@@ -58,6 +139,30 @@ public PipelineNodeViewModel(NodeDefinition definition, NodeRegistry registry)
             _ => TransformBrush
         };
 
+        HeaderBrush = Category switch
+        {
+            NodeCategory.Source => SourceHeaderGradient,
+            NodeCategory.Transform => TransformHeaderGradient,
+            NodeCategory.Output => OutputHeaderGradient,
+            _ => TransformHeaderGradient
+        };
+
+        NodeBorderBrush = Category switch
+        {
+            NodeCategory.Source => SourceBorderBrush,
+            NodeCategory.Transform => TransformBorderBrush,
+            NodeCategory.Output => OutputBorderBrush,
+            _ => TransformBorderBrush
+        };
+
+        NodeBackground = Category switch
+        {
+            NodeCategory.Source => SourceNodeBg,
+            NodeCategory.Transform => TransformNodeBg,
+            NodeCategory.Output => OutputNodeBg,
+            _ => TransformNodeBg
+        };
+
         // Source nodes have no input; output nodes have no output
         if (Category != NodeCategory.Source)
         {
@@ -69,4 +174,22 @@ public PipelineNodeViewModel(NodeDefinition definition, NodeRegistry registry)
             Output.Add(new PipelineConnectorViewModel("Out", isInput: false, this));
         }
     }
+
+    private static string BuildConfigPreview(Dictionary<string, JsonElement> config)
+    {
+        // Show the first string config value as a preview (path, pattern, etc.)
+        foreach (KeyValuePair<string, JsonElement> kvp in config)
+        {
+            if (kvp.Value.ValueKind == JsonValueKind.String)
+            {
+                string val = kvp.Value.GetString() ?? string.Empty;
+                if (!string.IsNullOrWhiteSpace(val))
+                {
+                    return val;
+                }
+            }
+        }
+
+        return string.Empty;
+    }
 }
diff --git a/src/FlowForge.UI/ViewModels/PropertiesViewModel.cs b/src/FlowForge.UI/ViewModels/PropertiesViewModel.cs
index 861be95..8d79255 100644
--- a/src/FlowForge.UI/ViewModels/PropertiesViewModel.cs
+++ b/src/FlowForge.UI/ViewModels/PropertiesViewModel.cs
@@ -1,6 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Media;
 using CommunityToolkit.Mvvm.ComponentModel;
 using FlowForge.Core.Execution;
 using FlowForge.Core.Nodes.Base;
@@ -16,6 +19,12 @@ public partial class PropertiesViewModel : ViewModelBase
     [ObservableProperty]
     private bool _hasSelection;
 
+    [ObservableProperty]
+    private IBrush? _badgeForeground;
+
+    [ObservableProperty]
+    private IBrush? _badgeBackground;
+
     public ObservableCollection<ConfigFieldViewModel> Fields { get; } = new();
 
     public void LoadNode(PipelineNodeViewModel? node, NodeRegistry registry, Action<IUndoableCommand>? onConfigChanged = null)
@@ -26,11 +35,21 @@ public void LoadNode(PipelineNodeViewModel? node, NodeRegistry registry, Action<
         {
             SelectedNodeTitle = null;
             HasSelection = false;
+            BadgeForeground = null;
+            BadgeBackground = null;
             return;
         }
 
         SelectedNodeTitle = node.Title;
         HasSelection = true;
+        BadgeForeground = node.HeaderBrush;
+        BadgeBackground = node.Category switch
+        {
+            NodeCategory.Source => GetBrush("ForgeSourceDim", "#265bb8f5"),
+            NodeCategory.Transform => GetBrush("ForgeTransformDim", "#265ce0a0"),
+            NodeCategory.Output => GetBrush("ForgeOutputDim", "#26e8932f"),
+            _ => GetBrush("ForgeElevated", "#252029")
+        };
 
         IReadOnlyList<ConfigField> schema = registry.GetConfigSchema(node.TypeKey);
         foreach (ConfigField field in schema)
@@ -38,4 +57,13 @@ public void LoadNode(PipelineNodeViewModel? node, NodeRegistry registry, Action<
             Fields.Add(new ConfigFieldViewModel(field, node.Config, onConfigChanged));
         }
     }
+
+    private static IBrush GetBrush(string key, string fallback)
+    {
+        if (Application.Current?.TryFindResource(key, Application.Current.ActualThemeVariant, out object? resource) == true && resource is IBrush brush)
+        {
+            return brush;
+        }
+        return new SolidColorBrush(Color.Parse(fallback));
+    }
 }
diff --git a/src/FlowForge.UI/Views/CanvasView.axaml b/src/FlowForge.UI/Views/CanvasView.axaml
index 2d1d534..cd91d4c 100644
--- a/src/FlowForge.UI/Views/CanvasView.axaml
+++ b/src/FlowForge.UI/Views/CanvasView.axaml
@@ -4,7 +4,6 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="using:FlowForge.UI.ViewModels"
              xmlns:nodify="using:Nodify.Avalonia"
-             xmlns:nodifyNodes="using:Nodify.Avalonia.Nodes"
              xmlns:nodifyConn="using:Nodify.Avalonia.Connections"
              mc:Ignorable="d"
              d:DesignWidth="600" d:DesignHeight="400"
@@ -26,48 +25,116 @@
                 <Style Selector="nodify|ItemContainer" x:DataType="vm:PipelineNodeViewModel">
                     <Setter Property="Location" Value="{Binding Location, Mode=TwoWay}" />
                     <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
-                </Style>
-                <Style Selector="nodifyNodes|Node">
-                    <Setter Property="CornerRadius" Value="16" />
-                    <Setter Property="Background" Value="{DynamicResource ForgeSurface}" />
-                    <Setter Property="Foreground" Value="{DynamicResource ForgeText}" />
-                    <Setter Property="BorderBrush" Value="{DynamicResource ForgeBorder}" />
-                    <Setter Property="BorderThickness" Value="1" />
+                    <Setter Property="BorderThickness" Value="0" />
+                    <Setter Property="Background" Value="Transparent" />
                     <Setter Property="Padding" Value="0" />
-                    <Setter Property="FontSize" Value="13" />
                 </Style>
-                <Style Selector="nodifyConn|Connector">
-                    <Setter Property="Width" Value="12" />
-                    <Setter Property="Height" Value="12" />
-                    <Setter Property="Background" Value="{DynamicResource ForgeAccent}" />
-                    <Setter Property="RenderTransformOrigin" Value="0.5,0.5" />
-                    <Setter Property="RenderTransform">
-                        <RotateTransform Angle="45" />
-                    </Setter>
-                    <Setter Property="CornerRadius" Value="2" />
+                <!-- Hide the selection highlight border from ItemContainer -->
+                <Style Selector="nodify|ItemContainer:selected">
+                    <Setter Property="BorderThickness" Value="0" />
+                    <Setter Property="Background" Value="Transparent" />
                 </Style>
             </nodify:NodifyEditor.Styles>
 
             <nodify:NodifyEditor.ItemTemplate>
                 <DataTemplate x:DataType="vm:PipelineNodeViewModel">
-                    <nodifyNodes:Node Header="{Binding Title}"
-                                      HeaderBrush="{Binding HeaderBrush}"
-                                      Input="{Binding Input}"
-                                      Output="{Binding Output}"
-                                      x:CompileBindings="False">
-                        <nodifyNodes:Node.InputConnectorTemplate>
-                            <DataTemplate x:DataType="vm:PipelineConnectorViewModel">
-                                <nodifyConn:Connector Anchor="{Binding Anchor, Mode=OneWayToSource}"
-                                                      IsConnected="{Binding IsConnected}" />
-                            </DataTemplate>
-                        </nodifyNodes:Node.InputConnectorTemplate>
-                        <nodifyNodes:Node.OutputConnectorTemplate>
-                            <DataTemplate x:DataType="vm:PipelineConnectorViewModel">
-                                <nodifyConn:Connector Anchor="{Binding Anchor, Mode=OneWayToSource}"
-                                                      IsConnected="{Binding IsConnected}" />
-                            </DataTemplate>
-                        </nodifyNodes:Node.OutputConnectorTemplate>
-                    </nodifyNodes:Node>
+                    <Grid>
+                        <!-- Input connectors (left edge) -->
+                        <ItemsControl ItemsSource="{Binding Input}"
+                                      HorizontalAlignment="Left"
+                                      VerticalAlignment="Center"
+                                      Margin="-7,0,0,0"
+                                      IsHitTestVisible="True"
+                                      ZIndex="5">
+                            <ItemsControl.ItemTemplate>
+                                <DataTemplate x:DataType="vm:PipelineConnectorViewModel">
+                                    <nodifyConn:Connector Anchor="{Binding Anchor, Mode=OneWayToSource}"
+                                                          IsConnected="{Binding IsConnected}"
+                                                          Width="12" Height="12"
+                                                          Background="#1c1820"
+                                                          BorderBrush="{Binding ConnectorBrush}"
+                                                          BorderThickness="2"
+                                                          CornerRadius="2"
+                                                          RenderTransformOrigin="0.5,0.5"
+                                                          Cursor="Hand">
+                                        <nodifyConn:Connector.RenderTransform>
+                                            <RotateTransform Angle="45" />
+                                        </nodifyConn:Connector.RenderTransform>
+                                    </nodifyConn:Connector>
+                                </DataTemplate>
+                            </ItemsControl.ItemTemplate>
+                        </ItemsControl>
+
+                        <!-- Node body -->
+                        <Border CornerRadius="16"
+                                Background="{Binding NodeBackground}"
+                                BorderBrush="{Binding NodeBorderBrush}"
+                                BorderThickness="1"
+                                Margin="6,0"
+                                ClipToBounds="True"
+                                MinWidth="160"
+                                MaxWidth="240">
+                            <StackPanel>
+                                <!-- Header -->
+                                <Border Padding="10,8"
+                                        Background="{Binding HeaderBrush}">
+                                    <StackPanel Orientation="Horizontal" Spacing="8">
+                                        <Border Width="26" Height="26" CornerRadius="8"
+                                                Background="{Binding NodeBorderBrush}">
+                                            <TextBlock Text="{Binding IconEmoji}"
+                                                       FontFamily="Segoe UI Emoji"
+                                                       FontSize="13"
+                                                       HorizontalAlignment="Center"
+                                                       VerticalAlignment="Center" />
+                                        </Border>
+                                        <TextBlock Text="{Binding Title}"
+                                                   FontSize="13"
+                                                   FontWeight="SemiBold"
+                                                   Foreground="{Binding CategoryBrush}"
+                                                   VerticalAlignment="Center" />
+                                    </StackPanel>
+                                </Border>
+                                <!-- Subtle separator -->
+                                <Border Height="1" Opacity="0.05" Background="White" />
+                                <!-- Body: config preview -->
+                                <Border Padding="10,6,10,8"
+                                        IsVisible="{Binding ConfigPreview, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
+                                    <TextBlock Text="{Binding ConfigPreview}"
+                                               FontFamily="Cascadia Mono,Consolas,monospace"
+                                               FontSize="11"
+                                               Foreground="{DynamicResource ForgeTextMuted}"
+                                               TextTrimming="CharacterEllipsis"
+                                               MaxWidth="200" />
+                                </Border>
+                            </StackPanel>
+                        </Border>
+
+                        <!-- Output connectors (right edge) -->
+                        <ItemsControl ItemsSource="{Binding Output}"
+                                      HorizontalAlignment="Right"
+                                      VerticalAlignment="Center"
+                                      Margin="0,0,-7,0"
+                                      IsHitTestVisible="True"
+                                      ZIndex="5">
+                            <ItemsControl.ItemTemplate>
+                                <DataTemplate x:DataType="vm:PipelineConnectorViewModel">
+                                    <nodifyConn:Connector Anchor="{Binding Anchor, Mode=OneWayToSource}"
+                                                          IsConnected="{Binding IsConnected}"
+                                                          Width="12" Height="12"
+                                                          Background="#1c1820"
+                                                          BorderBrush="{Binding ConnectorBrush}"
+                                                          BorderThickness="2"
+                                                          CornerRadius="2"
+                                                          RenderTransformOrigin="0.5,0.5"
+                                                          Cursor="Hand">
+                                        <nodifyConn:Connector.RenderTransform>
+                                            <RotateTransform Angle="45" />
+                                        </nodifyConn:Connector.RenderTransform>
+                                    </nodifyConn:Connector>
+                                </DataTemplate>
+                            </ItemsControl.ItemTemplate>
+                        </ItemsControl>
+                    </Grid>
                 </DataTemplate>
             </nodify:NodifyEditor.ItemTemplate>
 
@@ -76,7 +143,7 @@
                     <nodifyConn:Connection Source="{Binding Source.Anchor}"
                                            Target="{Binding Target.Anchor}"
                                            Stroke="{DynamicResource ForgeAccent}"
-                                           StrokeThickness="2.5" />
+                                           StrokeThickness="2" />
                 </DataTemplate>
             </nodify:NodifyEditor.ConnectionTemplate>
 
@@ -105,23 +172,25 @@
                         Spacing="20"
                         MaxWidth="400">
 
-                <!-- Large forge icon with glow ring -->
+                <!-- Large gear icon with glow ring -->
                 <Border Width="84" Height="84"
-                        CornerRadius="22"
+                        CornerRadius="24"
                         HorizontalAlignment="Center"
                         BorderThickness="2"
                         BorderBrush="{DynamicResource ForgeAccent}">
                     <Border.Background>
-                        <SolidColorBrush Color="#e8932f" Opacity="0.08" />
+                        <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
+                            <GradientStop Color="#1c1820" Offset="0" />
+                            <GradientStop Color="#252029" Offset="1" />
+                        </LinearGradientBrush>
                     </Border.Background>
-                    <PathIcon Data="M10,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8C22,6.89 21.1,6 20,6H12L10,4Z"
+                    <PathIcon Data="M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.65 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.04 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.67 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.04 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z"
                               Foreground="{DynamicResource ForgeAccent}"
-                              Width="40" Height="40"
+                              Width="36" Height="36"
                               HorizontalAlignment="Center"
                               VerticalAlignment="Center" />
                 </Border>
 
-                <!-- Heading -->
                 <TextBlock Text="Forge your pipeline"
                            FontSize="20"
                            FontWeight="Bold"
@@ -134,14 +203,13 @@
                            HorizontalAlignment="Center"
                            TextAlignment="Center" />
 
-                <!-- Template buttons 2x2 grid -->
                 <UniformGrid Columns="2" HorizontalAlignment="Center"
                              Rows="2" MaxWidth="320">
                     <Button Classes="templateButton" Margin="4"
                             Tag="photo-import-by-date"
                             Click="OnTemplateButtonClick">
                         <StackPanel Orientation="Horizontal" Spacing="8">
-                            <TextBlock Text="&#x1F4F7;" FontSize="16" VerticalAlignment="Center" />
+                            <TextBlock Text="&#x1F4F7;" FontFamily="Segoe UI Emoji" FontSize="16" VerticalAlignment="Center" />
                             <TextBlock Text="Photo Import" VerticalAlignment="Center" />
                         </StackPanel>
                     </Button>
@@ -149,7 +217,7 @@
                             Tag="batch-sequential-rename"
                             Click="OnTemplateButtonClick">
                         <StackPanel Orientation="Horizontal" Spacing="8">
-                            <TextBlock Text="&#x270E;" FontSize="16" VerticalAlignment="Center" />
+                            <TextBlock Text="&#x270E;" FontFamily="Segoe UI Emoji" FontSize="16" VerticalAlignment="Center" />
                             <TextBlock Text="Batch Rename" VerticalAlignment="Center" />
                         </StackPanel>
                     </Button>
@@ -157,7 +225,7 @@
                             Tag="image-web-export"
                             Click="OnTemplateButtonClick">
                         <StackPanel Orientation="Horizontal" Spacing="8">
-                            <TextBlock Text="&#x1F310;" FontSize="16" VerticalAlignment="Center" />
+                            <TextBlock Text="&#x1F310;" FontFamily="Segoe UI Emoji" FontSize="16" VerticalAlignment="Center" />
                             <TextBlock Text="Web Export" VerticalAlignment="Center" />
                         </StackPanel>
                     </Button>
@@ -165,7 +233,7 @@
                             Tag="bulk-image-compress"
                             Click="OnTemplateButtonClick">
                         <StackPanel Orientation="Horizontal" Spacing="8">
-                            <TextBlock Text="&#x1F4E6;" FontSize="16" VerticalAlignment="Center" />
+                            <TextBlock Text="&#x1F4E6;" FontFamily="Segoe UI Emoji" FontSize="16" VerticalAlignment="Center" />
                             <TextBlock Text="Compress" VerticalAlignment="Center" />
                         </StackPanel>
                     </Button>
diff --git a/src/FlowForge.UI/Views/ExecutionLogView.axaml b/src/FlowForge.UI/Views/ExecutionLogView.axaml
index 921353d..e5e1936 100644
--- a/src/FlowForge.UI/Views/ExecutionLogView.axaml
+++ b/src/FlowForge.UI/Views/ExecutionLogView.axaml
@@ -34,12 +34,12 @@
                               Command="{Binding SelectTabCommand}"
                               CommandParameter="0">
                     <StackPanel Orientation="Horizontal" Spacing="6">
-                        <TextBlock Text="Output" VerticalAlignment="Center" FontSize="14" />
+                        <TextBlock Text="Output" VerticalAlignment="Center" FontSize="12" />
                         <Border Background="#265ce0a0" CornerRadius="8" Padding="6,1"
                                 IsVisible="{Binding !!TotalFiles}">
                             <TextBlock Text="{Binding Succeeded}"
                                        Foreground="{DynamicResource ForgeSuccess}"
-                                       FontSize="15" FontWeight="SemiBold" />
+                                       FontSize="10" FontWeight="Bold" />
                         </Border>
                     </StackPanel>
                 </ToggleButton>
@@ -51,12 +51,12 @@
                               Command="{Binding SelectTabCommand}"
                               CommandParameter="1">
                     <StackPanel Orientation="Horizontal" Spacing="6">
-                        <TextBlock Text="Errors" VerticalAlignment="Center" FontSize="14" />
+                        <TextBlock Text="Errors" VerticalAlignment="Center" FontSize="12" />
                         <Border Background="#26f2716a" CornerRadius="8" Padding="6,1"
                                 IsVisible="{Binding !!Failed}">
                             <TextBlock Text="{Binding Failed}"
                                        Foreground="{DynamicResource ForgeError}"
-                                       FontSize="15" FontWeight="SemiBold" />
+                                       FontSize="10" FontWeight="Bold" />
                         </Border>
                     </StackPanel>
                 </ToggleButton>
@@ -68,12 +68,12 @@
                               Command="{Binding SelectTabCommand}"
                               CommandParameter="2">
                     <StackPanel Orientation="Horizontal" Spacing="6">
-                        <TextBlock Text="Warnings" VerticalAlignment="Center" FontSize="14" />
+                        <TextBlock Text="Warnings" VerticalAlignment="Center" FontSize="12" />
                         <Border Background="#26f5c842" CornerRadius="8" Padding="6,1"
                                 IsVisible="{Binding !!Skipped}">
                             <TextBlock Text="{Binding Skipped}"
                                        Foreground="{DynamicResource ForgeWarning}"
-                                       FontSize="15" FontWeight="SemiBold" />
+                                       FontSize="10" FontWeight="Bold" />
                         </Border>
                     </StackPanel>
                 </ToggleButton>
@@ -102,16 +102,16 @@
                     <TextBlock DockPanel.Dock="Right"
                                Text="{Binding ProgressText}"
                                Foreground="{DynamicResource ForgeTextSecondary}"
-                               FontSize="14" VerticalAlignment="Center"
+                               FontSize="12" VerticalAlignment="Center"
                                Margin="8,0,0,0" />
                     <StackPanel Orientation="Horizontal" Spacing="8">
                         <TextBlock Text="Processing"
                                    Foreground="{DynamicResource ForgeAccent}"
-                                   FontWeight="SemiBold" FontSize="14" />
+                                   FontWeight="SemiBold" FontSize="12" />
                         <TextBlock Text="{Binding CurrentFile}"
                                    TextTrimming="CharacterEllipsis"
                                    Foreground="{DynamicResource ForgeTextSecondary}"
-                                   FontSize="14" />
+                                   FontSize="12" />
                     </StackPanel>
                 </DockPanel>
                 <ProgressBar Grid.Row="1"
diff --git a/src/FlowForge.UI/Views/NodeLibraryView.axaml b/src/FlowForge.UI/Views/NodeLibraryView.axaml
index 834d368..9dc300b 100644
--- a/src/FlowForge.UI/Views/NodeLibraryView.axaml
+++ b/src/FlowForge.UI/Views/NodeLibraryView.axaml
@@ -27,15 +27,17 @@
                     </Style>
                 </Border.Styles>
                 <StackPanel Orientation="Horizontal" Spacing="10">
-                    <Border Width="28" Height="28" CornerRadius="8"
-                            Background="{DynamicResource ForgeElevated}">
+                    <Border Width="32" Height="32" CornerRadius="8"
+                            Background="{Binding IconBackground}">
                         <TextBlock Text="{Binding Icon}"
-                                   FontSize="14"
+                                   FontFamily="Segoe UI Emoji"
+                                   FontSize="15"
+                                   Foreground="{Binding IconForeground}"
                                    HorizontalAlignment="Center"
                                    VerticalAlignment="Center" />
                     </Border>
                     <TextBlock Text="{Binding DisplayName}"
-                               Foreground="{DynamicResource ForgeText}"
+                               Foreground="{DynamicResource ForgeTextSecondary}"
                                FontSize="12.5"
                                FontWeight="Medium"
                                VerticalAlignment="Center" />
@@ -47,19 +49,18 @@
     <DockPanel>
         <StackPanel DockPanel.Dock="Top" Margin="14,14,14,4">
             <TextBlock Text="NODE LIBRARY"
-                       FontSize="10"
+                       FontSize="11"
                        FontWeight="Bold"
+                       LetterSpacing="1.2"
                        Foreground="{DynamicResource ForgeTextMuted}"
                        Margin="0,0,0,2" />
-            <TextBlock Text="Drag or double-click to add"
-                       FontSize="11"
-                       Foreground="{DynamicResource ForgeTextSecondary}"
-                       Margin="0,2,0,0" />
         </StackPanel>
 
         <TextBox DockPanel.Dock="Top"
                  Text="{Binding SearchText}"
                  Watermark="Search nodes..."
+                 Background="{DynamicResource ForgeDeep}"
+                 CornerRadius="12"
                  Margin="10,10,10,4" />
 
         <TreeView ItemsSource="{Binding Groups}"
@@ -68,11 +69,19 @@
             <TreeView.ItemTemplate>
                 <TreeDataTemplate x:DataType="vm:NodeLibraryGroupViewModel"
                                   ItemsSource="{Binding Items}">
-                    <TextBlock Text="{Binding Category}"
-                               FontWeight="Bold"
-                               FontSize="10"
-                               Foreground="{DynamicResource ForgeTextMuted}"
-                               Margin="0,10,0,4" />
+                    <DockPanel Margin="0,10,0,4">
+                        <TextBlock DockPanel.Dock="Left"
+                                   Text="{Binding Category}"
+                                   FontWeight="ExtraBold"
+                                   FontSize="10"
+                                   LetterSpacing="1"
+                                   Foreground="{Binding CategoryBrush}" />
+                        <Border Height="1"
+                                VerticalAlignment="Center"
+                                Margin="8,0,0,0"
+                                Background="{Binding CategoryBrush}"
+                                Opacity="0.25" />
+                    </DockPanel>
                 </TreeDataTemplate>
             </TreeView.ItemTemplate>
         </TreeView>
diff --git a/src/FlowForge.UI/Views/PropertiesView.axaml b/src/FlowForge.UI/Views/PropertiesView.axaml
index b9ac829..b586616 100644
--- a/src/FlowForge.UI/Views/PropertiesView.axaml
+++ b/src/FlowForge.UI/Views/PropertiesView.axaml
@@ -20,13 +20,13 @@
                            FontWeight="Bold"
                            Foreground="{DynamicResource ForgeTextMuted}" />
                 <Border IsVisible="{Binding HasSelection}"
-                        Background="{DynamicResource ForgeElevated}"
+                        Background="{Binding BadgeBackground}"
                         CornerRadius="8"
                         Padding="10,6">
                     <TextBlock Text="{Binding SelectedNodeTitle}"
                                FontSize="12"
                                FontWeight="SemiBold"
-                               Foreground="{DynamicResource ForgeAccent}" />
+                               Foreground="{Binding BadgeForeground}" />
                 </Border>
             </StackPanel>
         </Border>
diff --git a/src/FlowForge.UI/Views/ToolbarView.axaml b/src/FlowForge.UI/Views/ToolbarView.axaml
index 7c76275..0f3ba53 100644
--- a/src/FlowForge.UI/Views/ToolbarView.axaml
+++ b/src/FlowForge.UI/Views/ToolbarView.axaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="using:FlowForge.UI.ViewModels"
              mc:Ignorable="d"
-             d:DesignWidth="800" d:DesignHeight="40"
+             d:DesignWidth="800" d:DesignHeight="50"
              x:Class="FlowForge.UI.Views.ToolbarView"
              x:DataType="vm:MainWindowViewModel">
 
@@ -13,11 +13,11 @@
         <Border DockPanel.Dock="Bottom" Height="2" Opacity="0.5">
             <Border.Background>
                 <LinearGradientBrush StartPoint="0%,50%" EndPoint="100%,50%">
-                    <GradientStop Color="Transparent" Offset="0" />
-                    <GradientStop Color="#d4612c" Offset="0.2" />
+                    <GradientStop Color="Transparent" Offset="0.05" />
+                    <GradientStop Color="#d4612c" Offset="0.3" />
                     <GradientStop Color="#f5a623" Offset="0.5" />
-                    <GradientStop Color="#f5c842" Offset="0.8" />
-                    <GradientStop Color="Transparent" Offset="1" />
+                    <GradientStop Color="#f5c842" Offset="0.7" />
+                    <GradientStop Color="Transparent" Offset="0.95" />
                 </LinearGradientBrush>
             </Border.Background>
         </Border>
@@ -26,164 +26,194 @@
         <Border Background="{DynamicResource ForgePanel}"
                 BorderBrush="{DynamicResource ForgeBorder}"
                 BorderThickness="0,0,0,1"
-                Padding="10,6">
-            <DockPanel>
-                <!-- Right side: shortcuts button -->
-                <Button DockPanel.Dock="Right"
-                        Classes="toolbarIcon"
-                        ToolTip.Tip="Keyboard Shortcuts (F1)"
-                        Click="OnShowShortcutsClick"
-                        Margin="4,0">
-                    <TextBlock Text="?"
-                               FontWeight="Bold"
-                               FontSize="14"
-                               Foreground="{DynamicResource ForgeText}"
-                               HorizontalAlignment="Center"
-                               VerticalAlignment="Center" />
-                </Button>
-
-                <!-- Right side: title -->
-                <TextBlock DockPanel.Dock="Right"
-                           Text="{Binding Title}"
-                           Foreground="{DynamicResource ForgeTextMuted}"
-                           VerticalAlignment="Center"
-                           FontSize="12"
-                           Margin="8,0" />
-
-                <!-- Center brand text -->
-                <TextBlock DockPanel.Dock="Right"
-                           Text="FLOWFORGE"
-                           FontWeight="ExtraBold"
-                           FontSize="14"
-                           Foreground="{DynamicResource ForgeAccent}"
-                           VerticalAlignment="Center"
-                           HorizontalAlignment="Center"
-                           Margin="12,0" />
-
-                <!-- Left side: all buttons -->
-                <StackPanel Orientation="Horizontal" Spacing="4">
-                    <!-- File buttons -->
-                    <Button Classes="toolbarIcon"
-                            Command="{Binding NewCommand}"
-                            ToolTip.Tip="New Pipeline (Ctrl+N)">
-                        <PathIcon Data="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z"
-                                  Foreground="{DynamicResource ForgeText}"
-                                  Width="16" Height="16" />
-                    </Button>
-                    <Button Classes="toolbarIcon"
-                            Command="{Binding OpenCommand}"
-                            ToolTip.Tip="Open Pipeline (Ctrl+O)">
-                        <PathIcon Data="M10,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8C22,6.89 21.1,6 20,6H12L10,4Z"
-                                  Foreground="{DynamicResource ForgeText}"
-                                  Width="16" Height="16" />
-                    </Button>
-                    <Button x:Name="RecentButton"
-                            Classes="toolbarIcon"
-                            ToolTip.Tip="Recent Pipelines">
-                        <Button.Flyout>
-                            <MenuFlyout Placement="BottomEdgeAlignedLeft" />
-                        </Button.Flyout>
-                        <PathIcon Data="M12,6V9L16,5L12,1V4A8,8 0 0,0 4,12C4,13.57 4.46,15.03 5.24,16.26L6.7,14.8C6.25,13.97 6,13 6,12A6,6 0 0,1 12,6M18.76,7.74L17.3,9.2C17.74,10.04 18,11 18,12A6,6 0 0,1 12,18V15L8,19L12,23V20A8,8 0 0,0 20,12C20,10.43 19.54,8.97 18.76,7.74Z"
-                                  Foreground="{DynamicResource ForgeText}"
-                                  Width="16" Height="16" />
+                Padding="14,0">
+            <Grid>
+                <!-- Left: file + edit buttons -->
+                <StackPanel Orientation="Horizontal" Spacing="2"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center">
+                    <!-- New -->
+                    <Button Command="{Binding NewCommand}"
+                            ToolTip.Tip="New Pipeline (Ctrl+N)"
+                            Background="Transparent" BorderThickness="0"
+                            CornerRadius="8" Padding="6,6,10,6">
+                        <StackPanel Orientation="Horizontal" Spacing="5">
+                            <PathIcon Data="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z"
+                                      Foreground="{DynamicResource ForgeTextSecondary}"
+                                      Width="15" Height="15" />
+                            <TextBlock Text="New" FontSize="12"
+                                       Foreground="{DynamicResource ForgeTextSecondary}"
+                                       VerticalAlignment="Center" />
+                        </StackPanel>
                     </Button>
-                    <Button Classes="toolbarIcon"
-                            Command="{Binding SaveCommand}"
-                            ToolTip.Tip="Save (Ctrl+S)">
-                        <PathIcon Data="M15,9H5V5H15M12,19A3,3 0 0,1 9,16A3,3 0 0,1 12,13A3,3 0 0,1 15,16A3,3 0 0,1 12,19M17,3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V7L17,3Z"
-                                  Foreground="{DynamicResource ForgeText}"
-                                  Width="16" Height="16" />
+                    <!-- Open -->
+                    <Button Command="{Binding OpenCommand}"
+                            ToolTip.Tip="Open Pipeline (Ctrl+O)"
+                            Background="Transparent" BorderThickness="0"
+                            CornerRadius="8" Padding="6,6,10,6">
+                        <StackPanel Orientation="Horizontal" Spacing="5">
+                            <PathIcon Data="M10,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8C22,6.89 21.1,6 20,6H12L10,4Z"
+                                      Foreground="{DynamicResource ForgeTextSecondary}"
+                                      Width="15" Height="15" />
+                            <TextBlock Text="Open" FontSize="12"
+                                       Foreground="{DynamicResource ForgeTextSecondary}"
+                                       VerticalAlignment="Center" />
+                        </StackPanel>
                     </Button>
-                    <Button Classes="toolbarIcon"
-                            Command="{Binding SaveAsCommand}"
-                            ToolTip.Tip="Save As (Ctrl+Shift+S)">
-                        <PathIcon Data="M17,3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V7L17,3M15,9H5V5H15M12,19A3,3 0 0,1 9,16A3,3 0 0,1 12,13A3,3 0 0,1 15,16A3,3 0 0,1 12,19Z"
-                                  Foreground="{DynamicResource ForgeTextSecondary}"
-                                  Width="16" Height="16" />
+                    <!-- Save -->
+                    <Button Command="{Binding SaveCommand}"
+                            ToolTip.Tip="Save (Ctrl+S)"
+                            Background="Transparent" BorderThickness="0"
+                            CornerRadius="8" Padding="6,6,10,6">
+                        <StackPanel Orientation="Horizontal" Spacing="5">
+                            <PathIcon Data="M15,9H5V5H15M12,19A3,3 0 0,1 9,16A3,3 0 0,1 12,13A3,3 0 0,1 15,16A3,3 0 0,1 12,19M17,3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V7L17,3Z"
+                                      Foreground="{DynamicResource ForgeTextSecondary}"
+                                      Width="15" Height="15" />
+                            <TextBlock Text="Save" FontSize="12"
+                                       Foreground="{DynamicResource ForgeTextSecondary}"
+                                       VerticalAlignment="Center" />
+                        </StackPanel>
                     </Button>
 
                     <!-- Separator -->
-                    <Border Width="1"
-                            Height="24"
+                    <Border Width="1" Height="24"
                             Background="{DynamicResource ForgeBorder}"
-                            VerticalAlignment="Center"
-                            Margin="4,0" />
+                            VerticalAlignment="Center" Margin="10,0" />
 
-                    <!-- Undo/Redo -->
+                    <!-- Undo -->
                     <Button Classes="toolbarIcon"
                             Command="{Binding UndoCommand}"
                             ToolTip.Tip="Undo (Ctrl+Z)">
                         <PathIcon Data="M12.5,8C9.85,8 7.45,9.16 5.86,11L3,8V16H11L7.9,12.9C9.09,11.84 10.73,11.19 12.5,11.19C15.49,11.19 18.04,13.18 18.86,16L21.73,15.14C20.6,11.14 16.86,8 12.5,8Z"
-                                  Foreground="{DynamicResource ForgeText}"
-                                  Width="16" Height="16" />
+                                  Foreground="{DynamicResource ForgeTextSecondary}"
+                                  Width="15" Height="15" />
                     </Button>
+                    <!-- Redo -->
                     <Button Classes="toolbarIcon"
                             Command="{Binding RedoCommand}"
                             ToolTip.Tip="Redo (Ctrl+Y)">
                         <PathIcon Data="M18.14,11C16.55,9.16 14.15,8 11.5,8C7.14,8 3.4,11.14 2.27,15.14L5.14,16C5.96,13.18 8.5,11.19 11.5,11.19C13.27,11.19 14.91,11.84 16.1,12.9L13,16H21V8L18.14,11Z"
-                                  Foreground="{DynamicResource ForgeText}"
-                                  Width="16" Height="16" />
+                                  Foreground="{DynamicResource ForgeTextSecondary}"
+                                  Width="15" Height="15" />
                     </Button>
 
                     <!-- Separator -->
-                    <Border Width="1"
-                            Height="24"
+                    <Border Width="1" Height="24"
                             Background="{DynamicResource ForgeBorder}"
-                            VerticalAlignment="Center"
-                            Margin="4,0" />
+                            VerticalAlignment="Center" Margin="10,0" />
 
-                    <!-- Fit to screen -->
-                    <Button Classes="toolbarIcon"
-                            ToolTip.Tip="Fit to Screen (Ctrl+0)"
-                            Click="OnFitToScreenClick">
-                        <PathIcon Data="M3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5A2,2 0 0,0 19,3H5A2,2 0 0,0 3,5M5,5H19V19H5V5M7,7V9H9V7H7M15,7V9H17V7H15M7,15V17H9V15H7M15,15V17H17V15H15Z"
-                                  Foreground="{DynamicResource ForgeText}"
-                                  Width="16" Height="16" />
+                    <!-- Fit -->
+                    <Button ToolTip.Tip="Fit to Screen (Ctrl+0)"
+                            Click="OnFitToScreenClick"
+                            Background="Transparent" BorderThickness="0"
+                            CornerRadius="8" Padding="6,6,10,6">
+                        <StackPanel Orientation="Horizontal" Spacing="5">
+                            <PathIcon Data="M3,3H9V5H5V9H3M3,21V15H5V19H9V21M21,3V9H19V5H15V3M21,21H15V19H19V15H21"
+                                      Foreground="{DynamicResource ForgeTextSecondary}"
+                                      Width="15" Height="15" />
+                            <TextBlock Text="Fit" FontSize="12"
+                                       Foreground="{DynamicResource ForgeTextSecondary}"
+                                       VerticalAlignment="Center" />
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
+
+                <!-- Center: FLOWFORGE brand + filename -->
+                <StackPanel Orientation="Horizontal" Spacing="0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center">
+                    <TextBlock Text="FLOWFORGE"
+                               FontWeight="ExtraBold"
+                               FontSize="14"
+                               LetterSpacing="0.8"
+                               Foreground="{DynamicResource ForgeAccent}" />
+                    <TextBlock Text=" — "
+                               FontSize="12"
+                               Foreground="{DynamicResource ForgeTextMuted}"
+                               VerticalAlignment="Center" />
+                    <TextBlock Text="{Binding Title}"
+                               Foreground="{DynamicResource ForgeTextSecondary}"
+                               VerticalAlignment="Center"
+                               FontSize="12"
+                               FontWeight="Normal" />
+                </StackPanel>
+
+                <!-- Right: Preview + Run + shortcuts -->
+                <StackPanel Orientation="Horizontal" Spacing="8"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center">
+                    <!-- Recent -->
+                    <Button x:Name="RecentButton"
+                            Classes="toolbarIcon"
+                            ToolTip.Tip="Recent Pipelines">
+                        <Button.Flyout>
+                            <MenuFlyout Placement="BottomEdgeAlignedLeft" />
+                        </Button.Flyout>
+                        <PathIcon Data="M12,6V9L16,5L12,1V4A8,8 0 0,0 4,12C4,13.57 4.46,15.03 5.24,16.26L6.7,14.8C6.25,13.97 6,13 6,12A6,6 0 0,1 12,6M18.76,7.74L17.3,9.2C17.74,10.04 18,11 18,12A6,6 0 0,1 12,18V15L8,19L12,23V20A8,8 0 0,0 20,12C20,10.43 19.54,8.97 18.76,7.74Z"
+                                  Foreground="{DynamicResource ForgeTextSecondary}"
+                                  Width="15" Height="15" />
                     </Button>
 
                     <!-- Separator -->
-                    <Border Width="1"
-                            Height="24"
+                    <Border Width="1" Height="24"
                             Background="{DynamicResource ForgeBorder}"
-                            VerticalAlignment="Center"
-                            Margin="4,0" />
+                            VerticalAlignment="Center" />
 
-                    <!-- Run/Preview/Stop -->
-                    <Button Command="{Binding RunCommand}"
-                            Classes="accent"
-                            ToolTip.Tip="Run Pipeline"
-                            Padding="12,4">
-                        <StackPanel Orientation="Horizontal" Spacing="6">
-                            <PathIcon Data="M8,5.14V19.14L19,12.14L8,5.14Z"
-                                      Foreground="#08070a"
-                                      Width="12" Height="12" />
-                            <TextBlock Text="Run" VerticalAlignment="Center" />
-                        </StackPanel>
-                    </Button>
+                    <!-- Preview -->
                     <Button Command="{Binding DryRunCommand}"
                             Classes="preview"
                             ToolTip.Tip="Preview — simulate run without changing any files"
-                            Padding="12,4">
-                        <StackPanel Orientation="Horizontal" Spacing="6">
+                            Padding="12,6"
+                            CornerRadius="12">
+                        <StackPanel Orientation="Horizontal" Spacing="5">
                             <PathIcon Data="M12,9A3,3 0 0,0 9,12A3,3 0 0,0 12,15A3,3 0 0,0 15,12A3,3 0 0,0 12,9M12,17A5,5 0 0,1 7,12A5,5 0 0,1 12,7A5,5 0 0,1 17,12A5,5 0 0,1 12,17M12,4.5C7,4.5 2.73,7.61 1,12C2.73,16.39 7,19.5 12,19.5C17,19.5 21.27,16.39 23,12C21.27,7.61 17,4.5 12,4.5Z"
                                       Foreground="{DynamicResource ForgeAccent}"
-                                      Width="12" Height="12" />
-                            <TextBlock Text="Preview" VerticalAlignment="Center" />
+                                      Width="14" Height="14" />
+                            <TextBlock Text="Preview" VerticalAlignment="Center" FontSize="12" />
                         </StackPanel>
                     </Button>
+                    <!-- Run -->
+                    <Button Command="{Binding RunCommand}"
+                            Classes="accent"
+                            ToolTip.Tip="Run Pipeline"
+                            Padding="14,6"
+                            CornerRadius="12"
+                            FontWeight="Bold">
+                        <StackPanel Orientation="Horizontal" Spacing="5">
+                            <PathIcon Data="M8,5.14V19.14L19,12.14L8,5.14Z"
+                                      Foreground="#08070a"
+                                      Width="14" Height="14" />
+                            <TextBlock Text="Run" VerticalAlignment="Center" FontSize="12" />
+                        </StackPanel>
+                    </Button>
+                    <!-- Stop (only when running) -->
                     <Button Command="{Binding CancelCommand}"
                             IsVisible="{Binding ExecutionLog.IsRunning}"
                             ToolTip.Tip="Stop Execution"
-                            Padding="12,4">
-                        <StackPanel Orientation="Horizontal" Spacing="6">
+                            Padding="12,6">
+                        <StackPanel Orientation="Horizontal" Spacing="5">
                             <PathIcon Data="M18,18H6V6H18V18Z"
                                       Foreground="{DynamicResource ForgeError}"
                                       Width="12" Height="12" />
-                            <TextBlock Text="Stop" Foreground="{DynamicResource ForgeError}" VerticalAlignment="Center" />
+                            <TextBlock Text="Stop"
+                                       Foreground="{DynamicResource ForgeError}"
+                                       VerticalAlignment="Center" FontSize="12" />
                         </StackPanel>
                     </Button>
+
+                    <!-- Shortcuts -->
+                    <Button Classes="toolbarIcon"
+                            ToolTip.Tip="Keyboard Shortcuts (F1)"
+                            Click="OnShowShortcutsClick">
+                        <TextBlock Text="?"
+                                   FontWeight="Bold"
+                                   FontSize="14"
+                                   Foreground="{DynamicResource ForgeTextSecondary}"
+                                   HorizontalAlignment="Center"
+                                   VerticalAlignment="Center" />
+                    </Button>
                 </StackPanel>
-            </DockPanel>
+            </Grid>
         </Border>
     </DockPanel>
 </UserControl>