diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87f9e3d30..6d5f547e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Change Log for SD.Next
 
-## Update for 2026-04-07
+## Update for 2026-04-08
 
 - **Models**
   - [AiArtLab SDXS-1B](https://huggingface.co/AiArtLab/sdxs-1b) Simple Diffusion XS *(training still in progress)*  
@@ -9,6 +9,10 @@
   - **ROCm** futher work on advanced configuration and tuning, thanks @resonantsky  
     now covers both ROCm on Windows and Linux  
     see *main interface -> scripts -> rocm advanced config*  
+- **Features**
+  - enhanced filename pattern processing  
+    allows for any *processing* property name (as defined in `modules/processing_class.py` and saved to `ui-config.json`)  
+    allows for any *settings* property name (as defined in `modules/ui_definitions.py` and saved to `config.json`)  
 - **Obsoleted**
   - remove *system-info* from *extensions-builtin*
 - **Internal**
diff --git a/html/locale_ar.json b/html/locale_ar.json
index ab13d6d46..596040792 100644
--- a/html/locale_ar.json
+++ b/html/locale_ar.json
@@ -11295,4 +11295,4 @@
       "hint": "نموذج تقدير العمق Zoe Depth"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/html/locale_bn.json b/html/locale_bn.json
index f6581acde..f7fe99ac3 100644
--- a/html/locale_bn.json
+++ b/html/locale_bn.json
@@ -11295,4 +11295,4 @@
       "hint": "Zoe Depth"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/html/locale_de.json b/html/locale_de.json
index 37a9c5189..1bdd46a1a 100644
--- a/html/locale_de.json
+++ b/html/locale_de.json
@@ -11295,4 +11295,4 @@
       "hint": "Zoe-Tiefe"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/html/locale_es.json b/html/locale_es.json
index e65178818..42f8f72bb 100644
--- a/html/locale_es.json
+++ b/html/locale_es.json
@@ -11295,4 +11295,4 @@
       "hint": "Profundidad Zoe"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/html/locale_fr.json b/html/locale_fr.json
index ee1f67ed0..470792ab9 100644
--- a/html/locale_fr.json
+++ b/html/locale_fr.json
@@ -11295,4 +11295,4 @@
       "hint": "Modèle d'estimation de profondeur Zoe"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/html/locale_he.json b/html/locale_he.json
index 893c726fc..8d1e7704f 100644
--- a/html/locale_he.json
+++ b/html/locale_he.json
@@ -11295,4 +11295,4 @@
       "hint": "Zoe Depth (מודל להערכת עומק)"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/html/locale_hi.json b/html/locale_hi.json
index e08f9e6ed..54d213b59 100644
--- a/html/locale_hi.json
+++ b/html/locale_hi.json
@@ -11295,4 +11295,4 @@
       "hint": "Zoe Depth मॉडल"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/html/locale_hr.json b/html/locale_hr.json
index 83e60e2f1..d092a3e55 100644
--- a/html/locale_hr.json
+++ b/html/locale_hr.json
@@ -11302,4 +11302,4 @@
       "hint": "Zoe Depth (model za procjenu dubine)"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/html/locale_id.json b/html/locale_id.json
index d4af6239e..c13c3fe19 100644
--- a/html/locale_id.json
+++ b/html/locale_id.json
@@ -11295,4 +11295,4 @@
       "hint": "Zoe Depth (Model estimasi kedalaman)"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/html/locale_it.json b/html/locale_it.json
index 09f742b92..c557311c1 100644
--- a/html/locale_it.json
+++ b/html/locale_it.json
@@ -11295,4 +11295,4 @@
       "hint": "Zoe Depth"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/html/locale_ja.json b/html/locale_ja.json
index a97aa9198..d16520c68 100644
--- a/html/locale_ja.json
+++ b/html/locale_ja.json
@@ -11288,4 +11288,4 @@
       "hint": "Z軸の値をカンマ区切りで入力してください"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/html/locale_ko.json b/html/locale_ko.json
index 2b9a25898..00e3a4032 100644
--- a/html/locale_ko.json
+++ b/html/locale_ko.json
@@ -11295,4 +11295,4 @@
       "hint": "Zoe Depth"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/html/locale_nb.json b/html/locale_nb.json
index b8d372086..1542f19f6 100644
--- a/html/locale_nb.json
+++ b/html/locale_nb.json
@@ -11295,4 +11295,4 @@
       "hint": "Uses Zoe to calculate the depth of the image."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/html/locale_po.json b/html/locale_po.json
index fa117d2ac..8d8055819 100644
--- a/html/locale_po.json
+++ b/html/locale_po.json
@@ -11295,4 +11295,4 @@
       "hint": "Zoe Depth (model estymacji głębi)"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/html/locale_pt.json b/html/locale_pt.json
index e5870cc0b..db261911e 100644
--- a/html/locale_pt.json
+++ b/html/locale_pt.json
@@ -11295,4 +11295,4 @@
       "hint": "Profundidade Zoe"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/html/locale_qq.json b/html/locale_qq.json
index 919acbe42..b033d7be9 100644
--- a/html/locale_qq.json
+++ b/html/locale_qq.json
@@ -11295,4 +11295,4 @@
       "hint": "Aestimatio profunditatis per Zoe"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/html/locale_ru.json b/html/locale_ru.json
index 911db93f8..db706a1a2 100644
--- a/html/locale_ru.json
+++ b/html/locale_ru.json
@@ -11295,4 +11295,4 @@
       "hint": "Zoe Depth (модель оценки глубины изображения)"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/html/locale_sr.json b/html/locale_sr.json
index 775d4fe3f..d0df82d7b 100644
--- a/html/locale_sr.json
+++ b/html/locale_sr.json
@@ -11295,4 +11295,4 @@
       "hint": "Zoe Depth (model za procenu dubine scene)"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/html/locale_tb.json b/html/locale_tb.json
index ee549a317..53f4ad85a 100644
--- a/html/locale_tb.json
+++ b/html/locale_tb.json
@@ -11295,4 +11295,4 @@
       "hint": "Activates the monocular depth-sensing manifold via Zoe-Net neural pathways."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/html/locale_tlh.json b/html/locale_tlh.json
index 32a640989..80e758920 100644
--- a/html/locale_tlh.json
+++ b/html/locale_tlh.json
@@ -11295,4 +11295,4 @@
       "hint": "Zoe Depth, (nI'qu'moHwI')"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/html/locale_tr.json b/html/locale_tr.json
index 05a3e7d67..275409c4c 100644
--- a/html/locale_tr.json
+++ b/html/locale_tr.json
@@ -11295,4 +11295,4 @@
       "hint": "Zoe Derinliği"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/html/locale_ur.json b/html/locale_ur.json
index 7bc7380e5..5063f6e7e 100644
--- a/html/locale_ur.json
+++ b/html/locale_ur.json
@@ -11295,4 +11295,4 @@
       "hint": "زوئی ڈیپتھ (گہرائی کا ماڈل)"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/html/locale_vi.json b/html/locale_vi.json
index 1f75df5e4..4e631bb43 100644
--- a/html/locale_vi.json
+++ b/html/locale_vi.json
@@ -11295,4 +11295,4 @@
       "hint": "Mô hình ước tính độ sâu Zoe Depth"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/html/locale_xx.json b/html/locale_xx.json
index 2d6215570..5674c5994 100644
--- a/html/locale_xx.json
+++ b/html/locale_xx.json
@@ -11295,4 +11295,4 @@
       "hint": "Zoe-profundo (Zoe Depth)"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/html/locale_zh.json b/html/locale_zh.json
index 5f2464655..7aa02402e 100644
--- a/html/locale_zh.json
+++ b/html/locale_zh.json
@@ -11295,4 +11295,4 @@
       "hint": "Zoe 深度图"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/modules/image/namegen.py b/modules/image/namegen.py
index 905427eed..be850e6b9 100644
--- a/modules/image/namegen.py
+++ b/modules/image/namegen.py
@@ -97,6 +97,30 @@ class FilenameGenerator:
             self.batch_number = NOTHING
             self.iter_number = NOTHING
 
+    def apply_p(self, param):
+        try:
+            if self.p is None:
+                return NOTHING
+            val = getattr(self.p, param, None)
+            if val is not None:
+                val = str(val)
+                debug_log(f'Filename apply: param="{param}" value="{val}"')
+                return val
+        except Exception as e:
+            log.error(f'Filename apply param: {param} {e}')
+        return NOTHING
+
+    def apply_opt(self, opt):
+        try:
+            val = shared.opts.data.get(opt, None)
+            if val is not None:
+                val = str(val)
+                debug_log(f'Filename apply: opt="{opt}" value="{val}"')
+                return val
+        except Exception as e:
+            log.error(f'Filename apply opt: {opt} {e}')
+        return NOTHING
+
     def hasprompt(self, *args):
         lower = self.prompt.lower()
         if getattr(self, 'p', None) is None or getattr(self, 'prompt', None) is None:
@@ -279,6 +303,14 @@ class FilenameGenerator:
                     res += text + str(replacement).replace('/', '-').replace('\\', '-')
                     continue
             else:
+                replacement = self.apply_p(pattern)
+                if replacement != NOTHING:
+                    res += text + str(replacement).replace('/', '-').replace('\\', '-')
+                    continue
+                replacement = self.apply_opt(pattern)
+                if replacement != NOTHING:
+                    res += text + str(replacement).replace('/', '-').replace('\\', '-')
+                    continue
                 res += text + f'[{pattern}]' # reinsert unknown pattern
         return res
 
diff --git a/scripts/rocm/rocm_vars.py b/scripts/rocm/rocm_vars.py
index 74714610d..1537d038b 100644
--- a/scripts/rocm/rocm_vars.py
+++ b/scripts/rocm/rocm_vars.py
@@ -349,4 +349,3 @@ HIPBLASLT_VARS: set = {
     "PYTORCH_TUNABLEOP_HIPBLASLT_ENABLED",
     "HIPBLASLT_LOG_LEVEL",
 }
-