diff --git a/pagetop-macros/src/lib.rs b/pagetop-macros/src/lib.rs
index 6b6eb3e8..cb2d08e9 100644
--- a/pagetop-macros/src/lib.rs
+++ b/pagetop-macros/src/lib.rs
@@ -14,7 +14,7 @@ pub fn html(input: TokenStream) -> TokenStream {
 }
 
 #[proc_macro_attribute]
-pub fn fn_builder(_attr: TokenStream, item: TokenStream) -> TokenStream {
+pub fn fn_with(_attr: TokenStream, item: TokenStream) -> TokenStream {
     let fn_item = parse_macro_input!(item as ItemFn);
     let fn_name = fn_item.sig.ident.to_string();
 
diff --git a/pagetop/src/base/component/block.rs b/pagetop/src/base/component/block.rs
index 67953eff..f4b7f1af 100644
--- a/pagetop/src/base/component/block.rs
+++ b/pagetop/src/base/component/block.rs
@@ -53,25 +53,25 @@ impl ComponentTrait for Block {
 impl Block {
     // Block BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_id(&mut self, id: impl Into<String>) -> &mut Self {
         self.id.alter_value(id);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_weight(&mut self, value: Weight) -> &mut Self {
         self.weight = value;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_title(&mut self, title: L10n) -> &mut Self {
         self.title.alter_value(title);
         self
@@ -83,7 +83,7 @@ impl Block {
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_components(&mut self, op: ArcAnyOp) -> &mut Self {
         self.stuff.alter_value(op);
         self
diff --git a/pagetop/src/base/component/branding.rs b/pagetop/src/base/component/branding.rs
index c95f2bf8..3784e6fb 100644
--- a/pagetop/src/base/component/branding.rs
+++ b/pagetop/src/base/component/branding.rs
@@ -62,43 +62,43 @@ impl ComponentTrait for Branding {
 impl Branding {
     // Branding BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_id(&mut self, id: impl Into<String>) -> &mut Self {
         self.id.alter_value(id);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_weight(&mut self, value: Weight) -> &mut Self {
         self.weight = value;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_app_name(&mut self, app_name: impl Into<String>) -> &mut Self {
         self.app_name = app_name.into();
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_slogan(&mut self, slogan: L10n) -> &mut Self {
         self.slogan.alter_value(slogan);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_logo(&mut self, logo: Option<Image>) -> &mut Self {
         self.logo.alter_value(logo);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_frontpage(&mut self, frontpage: FnContextualPath) -> &mut Self {
         self.frontpage = frontpage;
         self
diff --git a/pagetop/src/base/component/button.rs b/pagetop/src/base/component/button.rs
index d9540078..d7f097c6 100644
--- a/pagetop/src/base/component/button.rs
+++ b/pagetop/src/base/component/button.rs
@@ -79,61 +79,61 @@ impl Button {
 
     // Button BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_id(&mut self, id: impl Into<String>) -> &mut Self {
         self.id.alter_value(id);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_weight(&mut self, value: Weight) -> &mut Self {
         self.weight = value;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_style(&mut self, style: ButtonStyle) -> &mut Self {
         self.style = style;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_font_size(&mut self, font_size: FontSize) -> &mut Self {
         self.font_size = font_size;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_left_icon(&mut self, icon: Option<Icon>) -> &mut Self {
         self.left_icon.alter_value(icon);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_right_icon(&mut self, icon: Option<Icon>) -> &mut Self {
         self.right_icon.alter_value(icon);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_href(&mut self, href: impl Into<String>) -> &mut Self {
         self.href.alter_value(href);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_html(&mut self, html: L10n) -> &mut Self {
         self.html.alter_value(html);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_target(&mut self, target: ButtonTarget) -> &mut Self {
         self.target = target;
         self
diff --git a/pagetop/src/base/component/flex/container.rs b/pagetop/src/base/component/flex/container.rs
index 608b41bd..8f31c35d 100644
--- a/pagetop/src/base/component/flex/container.rs
+++ b/pagetop/src/base/component/flex/container.rs
@@ -64,19 +64,19 @@ impl ComponentTrait for Container {
 impl Container {
     // Container BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_id(&mut self, id: impl Into<String>) -> &mut Self {
         self.id.alter_value(id);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_weight(&mut self, value: Weight) -> &mut Self {
         self.weight = value;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
@@ -88,37 +88,37 @@ impl Container {
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_items(&mut self, op: ArcTypedOp<flex::Item>) -> &mut Self {
         self.items.alter_value(op);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_direction(&mut self, direction: flex::Direction) -> &mut Self {
         self.direction = direction;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_wrap_align(&mut self, wrap: flex::WrapAlign) -> &mut Self {
         self.wrap_align = wrap;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_content_justify(&mut self, justify: flex::ContentJustify) -> &mut Self {
         self.content_justify = justify;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_items_align(&mut self, align: flex::ItemAlign) -> &mut Self {
         self.items_align = align;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_gap(&mut self, gap: flex::Gap) -> &mut Self {
         self.gap = gap;
         self
diff --git a/pagetop/src/base/component/flex/item.rs b/pagetop/src/base/component/flex/item.rs
index 761c4b4e..4525931b 100644
--- a/pagetop/src/base/component/flex/item.rs
+++ b/pagetop/src/base/component/flex/item.rs
@@ -68,55 +68,55 @@ impl ComponentTrait for Item {
 impl Item {
     // Item BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_id(&mut self, id: impl Into<String>) -> &mut Self {
         self.id.alter_value(id);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_weight(&mut self, value: Weight) -> &mut Self {
         self.weight = value;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_inner_classes(&mut self, op: ClassesOp, classes: impl Into<String>) -> &mut Self {
         self.inner_classes.alter_value(op, classes);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_grow(&mut self, grow: flex::ItemGrow) -> &mut Self {
         self.item_grow = grow;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_shrink(&mut self, shrink: flex::ItemShrink) -> &mut Self {
         self.item_shrink = shrink;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_size(&mut self, size: flex::ItemSize) -> &mut Self {
         self.item_size = size;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_offset(&mut self, offset: flex::ItemOffset) -> &mut Self {
         self.item_offset = offset;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_align(&mut self, align: flex::ItemAlign) -> &mut Self {
         self.item_align = align;
         self
@@ -128,7 +128,7 @@ impl Item {
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_components(&mut self, op: ArcAnyOp) -> &mut Self {
         self.stuff.alter_value(op);
         self
diff --git a/pagetop/src/base/component/form/action_button.rs b/pagetop/src/base/component/form/action_button.rs
index be7c72c9..80ab4b4e 100644
--- a/pagetop/src/base/component/form/action_button.rs
+++ b/pagetop/src/base/component/form/action_button.rs
@@ -93,55 +93,55 @@ impl ActionButton {
 
     // Button BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_weight(&mut self, value: Weight) -> &mut Self {
         self.weight = value;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_style(&mut self, style: ButtonStyle) -> &mut Self {
         self.style = style;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_font_size(&mut self, font_size: FontSize) -> &mut Self {
         self.font_size = font_size;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_left_icon(&mut self, icon: Option<Icon>) -> &mut Self {
         self.left_icon.alter_value(icon);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_right_icon(&mut self, icon: Option<Icon>) -> &mut Self {
         self.right_icon.alter_value(icon);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_name(&mut self, name: &str) -> &mut Self {
         self.name.alter_value(name);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_value(&mut self, value: L10n) -> &mut Self {
         self.value.alter_value(value);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_autofocus(&mut self, toggle: bool) -> &mut Self {
         self.autofocus.alter_value(match toggle {
             true => "autofocus",
@@ -150,7 +150,7 @@ impl ActionButton {
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_disabled(&mut self, toggle: bool) -> &mut Self {
         self.disabled.alter_value(match toggle {
             true => "disabled",
diff --git a/pagetop/src/base/component/form/date.rs b/pagetop/src/base/component/form/date.rs
index 88e2f0a2..16f369ad 100644
--- a/pagetop/src/base/component/form/date.rs
+++ b/pagetop/src/base/component/form/date.rs
@@ -70,43 +70,43 @@ impl ComponentTrait for Date {
 impl Date {
     // Date BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_weight(&mut self, value: Weight) -> &mut Self {
         self.weight = value;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_name(&mut self, name: &str) -> &mut Self {
         self.name.alter_value(name);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_value(&mut self, value: &str) -> &mut Self {
         self.value.alter_value(value);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_label(&mut self, label: &str) -> &mut Self {
         self.label.alter_value(label);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_placeholder(&mut self, placeholder: &str) -> &mut Self {
         self.placeholder.alter_value(placeholder);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_autofocus(&mut self, toggle: bool) -> &mut Self {
         self.autofocus.alter_value(match toggle {
             true => "autofocus",
@@ -115,7 +115,7 @@ impl Date {
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_autocomplete(&mut self, toggle: bool) -> &mut Self {
         self.autocomplete.alter_value(match toggle {
             true => "",
@@ -124,7 +124,7 @@ impl Date {
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_disabled(&mut self, toggle: bool) -> &mut Self {
         self.disabled.alter_value(match toggle {
             true => "disabled",
@@ -133,7 +133,7 @@ impl Date {
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_readonly(&mut self, toggle: bool) -> &mut Self {
         self.readonly.alter_value(match toggle {
             true => "readonly",
@@ -142,7 +142,7 @@ impl Date {
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_required(&mut self, toggle: bool) -> &mut Self {
         self.required.alter_value(match toggle {
             true => "required",
@@ -151,13 +151,13 @@ impl Date {
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_help_text(&mut self, help_text: &str) -> &mut Self {
         self.help_text.alter_value(help_text);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_template(&mut self, template: &str) -> &mut Self {
         self.template = template.to_owned();
         self
diff --git a/pagetop/src/base/component/form/form_main.rs b/pagetop/src/base/component/form/form_main.rs
index ce476583..79ee9e5c 100644
--- a/pagetop/src/base/component/form/form_main.rs
+++ b/pagetop/src/base/component/form/form_main.rs
@@ -63,37 +63,37 @@ impl ComponentTrait for Form {
 impl Form {
     // Form BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_id(&mut self, id: impl Into<String>) -> &mut Self {
         self.id.alter_value(id);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_weight(&mut self, value: Weight) -> &mut Self {
         self.weight = value;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_action(&mut self, action: &str) -> &mut Self {
         self.action.alter_value(action);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_charset(&mut self, charset: &str) -> &mut Self {
         self.charset.alter_value(charset);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_method(&mut self, method: FormMethod) -> &mut Self {
         self.method = method;
         self
@@ -105,13 +105,13 @@ impl Form {
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_elements(&mut self, op: ArcAnyOp) -> &mut Self {
         self.stuff.alter_value(op);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_template(&mut self, template: &str) -> &mut Self {
         self.template = template.to_owned();
         self
diff --git a/pagetop/src/base/component/form/hidden.rs b/pagetop/src/base/component/form/hidden.rs
index 7ea32da0..16ef4079 100644
--- a/pagetop/src/base/component/form/hidden.rs
+++ b/pagetop/src/base/component/form/hidden.rs
@@ -33,19 +33,19 @@ impl Hidden {
 
     // Hidden BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_weight(&mut self, value: Weight) -> &mut Self {
         self.weight = value;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_name(&mut self, name: &str) -> &mut Self {
         self.name.alter_value(name);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_value(&mut self, value: &str) -> &mut Self {
         self.value.alter_value(value);
         self
diff --git a/pagetop/src/base/component/form/input.rs b/pagetop/src/base/component/form/input.rs
index f0df9aab..287a9155 100644
--- a/pagetop/src/base/component/form/input.rs
+++ b/pagetop/src/base/component/form/input.rs
@@ -149,19 +149,19 @@ impl Input {
 
     // Input BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_weight(&mut self, value: Weight) -> &mut Self {
         self.weight = value;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_name(&mut self, name: &str) -> &mut Self {
         if let Some(previous) = self.name.get() {
             self.remove_classes(concat_string!("form-item-", previous));
@@ -171,43 +171,43 @@ impl Input {
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_value(&mut self, value: &str) -> &mut Self {
         self.value.alter_value(value);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_label(&mut self, label: L10n) -> &mut Self {
         self.label.alter_value(label);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_size(&mut self, size: Option<u16>) -> &mut Self {
         self.size = size;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_minlength(&mut self, minlength: Option<u16>) -> &mut Self {
         self.minlength = minlength;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_maxlength(&mut self, maxlength: Option<u16>) -> &mut Self {
         self.maxlength = maxlength;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_placeholder(&mut self, placeholder: &str) -> &mut Self {
         self.placeholder.alter_value(placeholder);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_autofocus(&mut self, toggle: bool) -> &mut Self {
         self.autofocus.alter_value(match toggle {
             true => "autofocus",
@@ -216,7 +216,7 @@ impl Input {
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_autocomplete(&mut self, toggle: bool) -> &mut Self {
         self.autocomplete.alter_value(match toggle {
             true => "",
@@ -225,7 +225,7 @@ impl Input {
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_disabled(&mut self, toggle: bool) -> &mut Self {
         self.disabled.alter_value(match toggle {
             true => "disabled",
@@ -234,7 +234,7 @@ impl Input {
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_readonly(&mut self, toggle: bool) -> &mut Self {
         self.readonly.alter_value(match toggle {
             true => "readonly",
@@ -243,7 +243,7 @@ impl Input {
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_required(&mut self, toggle: bool) -> &mut Self {
         self.required.alter_value(match toggle {
             true => "required",
@@ -252,13 +252,13 @@ impl Input {
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_help_text(&mut self, help_text: L10n) -> &mut Self {
         self.help_text.alter_value(help_text);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_template(&mut self, template: &str) -> &mut Self {
         self.template = template.to_owned();
         self
diff --git a/pagetop/src/base/component/heading.rs b/pagetop/src/base/component/heading.rs
index 1325a820..40906cc5 100644
--- a/pagetop/src/base/component/heading.rs
+++ b/pagetop/src/base/component/heading.rs
@@ -126,37 +126,37 @@ impl Heading {
 
     // Heading BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_id(&mut self, id: impl Into<String>) -> &mut Self {
         self.id.alter_value(id);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_weight(&mut self, value: Weight) -> &mut Self {
         self.weight = value;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_heading_type(&mut self, heading_type: HeadingType) -> &mut Self {
         self.heading_type = heading_type;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_size(&mut self, size: HeadingSize) -> &mut Self {
         self.size = size;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_text(&mut self, text: L10n) -> &mut Self {
         self.text.alter_value(text);
         self
diff --git a/pagetop/src/base/component/html.rs b/pagetop/src/base/component/html.rs
index ab9781ef..a31a7034 100644
--- a/pagetop/src/base/component/html.rs
+++ b/pagetop/src/base/component/html.rs
@@ -21,7 +21,7 @@ impl Html {
 
     // Html BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_html(&mut self, html: Markup) -> &mut Self {
         self.0 = html;
         self
diff --git a/pagetop/src/base/component/icon.rs b/pagetop/src/base/component/icon.rs
index 1ed95e56..c88966f8 100644
--- a/pagetop/src/base/component/icon.rs
+++ b/pagetop/src/base/component/icon.rs
@@ -49,25 +49,25 @@ impl Icon {
 
     // Icon BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_weight(&mut self, value: Weight) -> &mut Self {
         self.weight = value;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_icon_name(&mut self, name: impl Into<String>) -> &mut Self {
         self.icon_name.alter_value(name);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_font_size(&mut self, font_size: FontSize) -> &mut Self {
         self.font_size = font_size;
         self
diff --git a/pagetop/src/base/component/image.rs b/pagetop/src/base/component/image.rs
index 2e8bf3dc..f6deade5 100644
--- a/pagetop/src/base/component/image.rs
+++ b/pagetop/src/base/component/image.rs
@@ -83,31 +83,31 @@ impl Image {
 
     // Image BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_id(&mut self, id: impl Into<String>) -> &mut Self {
         self.id.alter_value(id);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_weight(&mut self, value: Weight) -> &mut Self {
         self.weight = value;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_source(&mut self, source: &str) -> &mut Self {
         self.source.alter_value(source);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_size(&mut self, size: ImageSize) -> &mut Self {
         self.size = size;
         self
diff --git a/pagetop/src/base/component/menu/element.rs b/pagetop/src/base/component/menu/element.rs
index 0ffcfa53..9158bbfd 100644
--- a/pagetop/src/base/component/menu/element.rs
+++ b/pagetop/src/base/component/menu/element.rs
@@ -67,13 +67,13 @@ impl Element {
 
     // Element BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_weight(&mut self, value: Weight) -> &mut Self {
         self.weight = value;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
diff --git a/pagetop/src/base/component/menu/group.rs b/pagetop/src/base/component/menu/group.rs
index 9b80a546..92c36bbc 100644
--- a/pagetop/src/base/component/menu/group.rs
+++ b/pagetop/src/base/component/menu/group.rs
@@ -41,19 +41,19 @@ impl ComponentTrait for Group {
 impl Group {
     // Group BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_id(&mut self, id: impl Into<String>) -> &mut Self {
         self.id.alter_value(id);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_weight(&mut self, value: Weight) -> &mut Self {
         self.weight = value;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
@@ -65,7 +65,7 @@ impl Group {
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_elements(&mut self, op: ArcTypedOp<Element>) -> &mut Self {
         self.elements.alter_value(op);
         self
diff --git a/pagetop/src/base/component/menu/item.rs b/pagetop/src/base/component/menu/item.rs
index 15e4db4b..ec46c3b1 100644
--- a/pagetop/src/base/component/menu/item.rs
+++ b/pagetop/src/base/component/menu/item.rs
@@ -157,31 +157,31 @@ impl Item {
 
     // Item BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_weight(&mut self, value: Weight) -> &mut Self {
         self.weight = value;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_description(&mut self, text: L10n) -> &mut Self {
         self.description.alter_value(text);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_left_icon(&mut self, icon: Option<Icon>) -> &mut Self {
         self.left_icon.alter_value(icon);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_right_icon(&mut self, icon: Option<Icon>) -> &mut Self {
         self.right_icon.alter_value(icon);
         self
diff --git a/pagetop/src/base/component/menu/megamenu.rs b/pagetop/src/base/component/menu/megamenu.rs
index 777f8ca1..63a526e1 100644
--- a/pagetop/src/base/component/menu/megamenu.rs
+++ b/pagetop/src/base/component/menu/megamenu.rs
@@ -41,19 +41,19 @@ impl ComponentTrait for Megamenu {
 impl Megamenu {
     // Megamenu BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_id(&mut self, id: impl Into<String>) -> &mut Self {
         self.id.alter_value(id);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_weight(&mut self, value: Weight) -> &mut Self {
         self.weight = value;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
@@ -65,7 +65,7 @@ impl Megamenu {
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_groups(&mut self, op: ArcTypedOp<Group>) -> &mut Self {
         self.groups.alter_value(op);
         self
diff --git a/pagetop/src/base/component/menu/menu_main.rs b/pagetop/src/base/component/menu/menu_main.rs
index d94eef94..66fc375d 100644
--- a/pagetop/src/base/component/menu/menu_main.rs
+++ b/pagetop/src/base/component/menu/menu_main.rs
@@ -69,19 +69,19 @@ impl ComponentTrait for Menu {
 impl Menu {
     // Menu BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_id(&mut self, id: impl Into<String>) -> &mut Self {
         self.id.alter_value(id);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_weight(&mut self, value: Weight) -> &mut Self {
         self.weight = value;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
@@ -93,7 +93,7 @@ impl Menu {
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_items(&mut self, op: ArcTypedOp<Item>) -> &mut Self {
         self.items.alter_value(op);
         self
diff --git a/pagetop/src/base/component/menu/submenu.rs b/pagetop/src/base/component/menu/submenu.rs
index 457556a3..9b2dadd9 100644
--- a/pagetop/src/base/component/menu/submenu.rs
+++ b/pagetop/src/base/component/menu/submenu.rs
@@ -47,25 +47,25 @@ impl ComponentTrait for Submenu {
 impl Submenu {
     // Submenu BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_id(&mut self, id: impl Into<String>) -> &mut Self {
         self.id.alter_value(id);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_weight(&mut self, value: Weight) -> &mut Self {
         self.weight = value;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_title(&mut self, title: L10n) -> &mut Self {
         self.title.alter_value(title);
         self
@@ -77,7 +77,7 @@ impl Submenu {
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_items(&mut self, op: ArcTypedOp<Item>) -> &mut Self {
         self.items.alter_value(op);
         self
diff --git a/pagetop/src/base/component/paragraph.rs b/pagetop/src/base/component/paragraph.rs
index 0fba5006..5096b79e 100644
--- a/pagetop/src/base/component/paragraph.rs
+++ b/pagetop/src/base/component/paragraph.rs
@@ -56,25 +56,25 @@ impl Paragraph {
 
     // Paragraph BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_id(&mut self, id: impl Into<String>) -> &mut Self {
         self.id.alter_value(id);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_weight(&mut self, value: Weight) -> &mut Self {
         self.weight = value;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_font_size(&mut self, font_size: FontSize) -> &mut Self {
         self.font_size = font_size;
         self
@@ -92,7 +92,7 @@ impl Paragraph {
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_components(&mut self, op: ArcAnyOp) -> &mut Self {
         self.stuff.alter_value(op);
         self
diff --git a/pagetop/src/base/component/powered_by.rs b/pagetop/src/base/component/powered_by.rs
index 8b6739fc..b947ef85 100644
--- a/pagetop/src/base/component/powered_by.rs
+++ b/pagetop/src/base/component/powered_by.rs
@@ -72,25 +72,25 @@ impl ComponentTrait for PoweredBy {
 impl PoweredBy {
     // PoweredBy BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_weight(&mut self, value: Weight) -> &mut Self {
         self.weight = value;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_copyright(&mut self, copyright: Option<impl Into<String>>) -> &mut Self {
         self.copyright = copyright.map(|c| c.into());
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_logo(&mut self, logo: PoweredByLogo) -> &mut Self {
         self.logo = logo;
         self
diff --git a/pagetop/src/base/component/translate.rs b/pagetop/src/base/component/translate.rs
index 9731a3df..6b53bdd2 100644
--- a/pagetop/src/base/component/translate.rs
+++ b/pagetop/src/base/component/translate.rs
@@ -21,7 +21,7 @@ impl Translate {
 
     // Translate BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_l10n(&mut self, l10n: L10n) -> &mut Self {
         self.0 = l10n;
         self
diff --git a/pagetop/src/base/component/wrapper.rs b/pagetop/src/base/component/wrapper.rs
index 48f2eb36..641123aa 100644
--- a/pagetop/src/base/component/wrapper.rs
+++ b/pagetop/src/base/component/wrapper.rs
@@ -117,25 +117,25 @@ impl Wrapper {
 
     // Wrapper BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_id(&mut self, id: impl Into<String>) -> &mut Self {
         self.id.alter_value(id);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_weight(&mut self, value: Weight) -> &mut Self {
         self.weight = value;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_renderable(&mut self, check: FnIsRenderable) -> &mut Self {
         self.renderable.check = check;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_inner_classes(&mut self, op: ClassesOp, classes: impl Into<String>) -> &mut Self {
         self.inner_classes.alter_value(op, classes);
         self
@@ -147,13 +147,13 @@ impl Wrapper {
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_components(&mut self, op: ArcAnyOp) -> &mut Self {
         self.stuff.alter_value(op);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_template(&mut self, template: &str) -> &mut Self {
         self.template = template.to_owned();
         self
diff --git a/pagetop/src/core/component/arc_any.rs b/pagetop/src/core/component/arc_any.rs
index b9252c36..e8fa8bf9 100644
--- a/pagetop/src/core/component/arc_any.rs
+++ b/pagetop/src/core/component/arc_any.rs
@@ -1,6 +1,6 @@
 use crate::core::component::{ComponentTrait, Context};
 use crate::html::{html, Markup};
-use crate::{fn_builder, Handle, Weight};
+use crate::{fn_with, Handle, Weight};
 
 use std::sync::{Arc, RwLock, RwLockReadGuard, RwLockWriteGuard};
 
@@ -79,7 +79,7 @@ impl AnyComponents {
 
     // AnyComponents BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_value(&mut self, op: ArcAnyOp) -> &mut Self {
         match op {
             ArcAnyOp::Add(arc) => self.0.push(arc),
diff --git a/pagetop/src/core/component/arc_typed.rs b/pagetop/src/core/component/arc_typed.rs
index 483229a0..2c47c546 100644
--- a/pagetop/src/core/component/arc_typed.rs
+++ b/pagetop/src/core/component/arc_typed.rs
@@ -1,6 +1,6 @@
 use crate::core::component::{ComponentTrait, Context};
 use crate::html::{html, Markup};
-use crate::{fn_builder, Handle, Weight};
+use crate::{fn_with, Handle, Weight};
 
 use std::sync::{Arc, RwLock, RwLockReadGuard, RwLockWriteGuard};
 
@@ -76,7 +76,7 @@ impl<C: ComponentTrait + Default> TypedComponents<C> {
 
     // TypedComponents BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_value(&mut self, op: ArcTypedOp<C>) -> &mut Self {
         match op {
             ArcTypedOp::Add(one) => self.0.push(one),
diff --git a/pagetop/src/html/opt_classes.rs b/pagetop/src/html/opt_classes.rs
index aba25eaa..eb8f06a9 100644
--- a/pagetop/src/html/opt_classes.rs
+++ b/pagetop/src/html/opt_classes.rs
@@ -9,7 +9,7 @@
 //! **OptionClasses** assumes that the order of the classes is irrelevant
 //! (<https://stackoverflow.com/a/1321712>), and duplicate classes will not be allowed.
 
-use crate::{fn_builder, SmartDefault};
+use crate::{fn_with, SmartDefault};
 
 pub enum ClassesOp {
     Add,
@@ -30,7 +30,7 @@ impl OptionClasses {
 
     // OptionClasses BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_value(&mut self, op: ClassesOp, classes: impl Into<String>) -> &mut Self {
         let classes: String = classes.into();
         let classes: Vec<&str> = classes.split_ascii_whitespace().collect();
diff --git a/pagetop/src/html/opt_component.rs b/pagetop/src/html/opt_component.rs
index 059f2e3e..75a6bb71 100644
--- a/pagetop/src/html/opt_component.rs
+++ b/pagetop/src/html/opt_component.rs
@@ -1,5 +1,5 @@
 use crate::core::component::{ArcTypedComponent, ComponentTrait, Context};
-use crate::fn_builder;
+use crate::fn_with;
 use crate::html::{html, Markup};
 
 pub struct OptionComponent<C: ComponentTrait>(Option<ArcTypedComponent<C>>);
@@ -17,7 +17,7 @@ impl<C: ComponentTrait> OptionComponent<C> {
 
     // OptionComponent BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_value(&mut self, component: Option<C>) -> &mut Self {
         if let Some(component) = component {
             self.0 = Some(ArcTypedComponent::new(component));
diff --git a/pagetop/src/html/opt_id.rs b/pagetop/src/html/opt_id.rs
index 2022f16d..fa9df14f 100644
--- a/pagetop/src/html/opt_id.rs
+++ b/pagetop/src/html/opt_id.rs
@@ -1,4 +1,4 @@
-use crate::{fn_builder, SmartDefault};
+use crate::{fn_with, SmartDefault};
 
 #[derive(SmartDefault)]
 pub struct OptionId(Option<String>);
@@ -10,7 +10,7 @@ impl OptionId {
 
     // OptionId BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_value(&mut self, value: impl Into<String>) -> &mut Self {
         self.0 = Some(value.into().trim().replace(' ', "_"));
         self
diff --git a/pagetop/src/html/opt_name.rs b/pagetop/src/html/opt_name.rs
index 84c665a8..46421452 100644
--- a/pagetop/src/html/opt_name.rs
+++ b/pagetop/src/html/opt_name.rs
@@ -1,4 +1,4 @@
-use crate::{fn_builder, SmartDefault};
+use crate::{fn_with, SmartDefault};
 
 #[derive(SmartDefault)]
 pub struct OptionName(Option<String>);
@@ -10,7 +10,7 @@ impl OptionName {
 
     // OptionName BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_value(&mut self, value: impl Into<String>) -> &mut Self {
         self.0 = Some(value.into().trim().replace(' ', "_"));
         self
diff --git a/pagetop/src/html/opt_string.rs b/pagetop/src/html/opt_string.rs
index c1f55ebd..d34950ff 100644
--- a/pagetop/src/html/opt_string.rs
+++ b/pagetop/src/html/opt_string.rs
@@ -1,4 +1,4 @@
-use crate::{fn_builder, SmartDefault};
+use crate::{fn_with, SmartDefault};
 
 #[derive(SmartDefault)]
 pub struct OptionString(Option<String>);
@@ -10,7 +10,7 @@ impl OptionString {
 
     // OptionString BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_value(&mut self, value: impl Into<String>) -> &mut Self {
         self.0 = Some(value.into().trim().to_owned());
         self
diff --git a/pagetop/src/html/opt_translated.rs b/pagetop/src/html/opt_translated.rs
index 400170fc..ba1e7075 100644
--- a/pagetop/src/html/opt_translated.rs
+++ b/pagetop/src/html/opt_translated.rs
@@ -1,6 +1,6 @@
 use crate::html::Markup;
 use crate::locale::{L10n, LanguageIdentifier};
-use crate::{fn_builder, SmartDefault};
+use crate::{fn_with, SmartDefault};
 
 #[derive(SmartDefault)]
 pub struct OptionTranslated(L10n);
@@ -12,7 +12,7 @@ impl OptionTranslated {
 
     // OptionTranslated BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_value(&mut self, value: L10n) -> &mut Self {
         self.0 = value;
         self
diff --git a/pagetop/src/lib.rs b/pagetop/src/lib.rs
index ecbda884..eca5b591 100644
--- a/pagetop/src/lib.rs
+++ b/pagetop/src/lib.rs
@@ -108,7 +108,7 @@ pub use paste::paste;
 /// customized default values.
 pub use smart_default::SmartDefault;
 
-pub use pagetop_macros::{fn_builder, main, test, BindHandle, ComponentClasses};
+pub use pagetop_macros::{fn_with, main, test, BindHandle, ComponentClasses};
 
 pub(crate) use pagetop_macros::BaseHandle;
 
diff --git a/pagetop/src/prelude.rs b/pagetop/src/prelude.rs
index 935de58c..b12fe6d2 100644
--- a/pagetop/src/prelude.rs
+++ b/pagetop/src/prelude.rs
@@ -1,7 +1,7 @@
 //! The PageTop Prelude.
 
 // Re-exported macros and derives.
-pub use crate::{concat_string, fn_builder, main, paste, test, SmartDefault};
+pub use crate::{concat_string, fn_with, main, paste, test, SmartDefault};
 
 // Global.
 pub use crate::{Handle, HashMapResources, ImplementHandle, LazyStatic, Weight};
diff --git a/pagetop/src/response/page.rs b/pagetop/src/response/page.rs
index 66d7af37..ad9f245c 100644
--- a/pagetop/src/response/page.rs
+++ b/pagetop/src/response/page.rs
@@ -10,7 +10,7 @@ use crate::core::theme::ComponentsRegions;
 use crate::html::{html, Markup, DOCTYPE};
 use crate::html::{ClassesOp, Favicon, OptionClasses, OptionId, OptionTranslated};
 use crate::locale::L10n;
-use crate::{fn_builder, service};
+use crate::{fn_with, service};
 
 use unic_langid::CharacterDirection;
 
@@ -47,55 +47,55 @@ impl Page {
 
     // Page BUILDER.
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_title(&mut self, title: L10n) -> &mut Self {
         self.title.alter_value(title);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_description(&mut self, description: L10n) -> &mut Self {
         self.description.alter_value(description);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_metadata(&mut self, name: &'static str, content: &'static str) -> &mut Self {
         self.metadata.push((name, content));
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_property(&mut self, property: &'static str, content: &'static str) -> &mut Self {
         self.metadata.push((property, content));
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_favicon(&mut self, favicon: Option<Favicon>) -> &mut Self {
         self.favicon = favicon;
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_context(&mut self, op: ContextOp) -> &mut Self {
         self.context.alter(op);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_body_classes(&mut self, op: ClassesOp, classes: impl Into<String>) -> &mut Self {
         self.body_classes.alter_value(op, classes);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_skip_to(&mut self, id: impl Into<String>) -> &mut Self {
         self.skip_to.alter_value(id);
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_component_in(
         &mut self,
         region: &'static str,
@@ -106,7 +106,7 @@ impl Page {
         self
     }
 
-    #[fn_builder]
+    #[fn_with]
     pub fn alter_template(&mut self, template: &str) -> &mut Self {
         self.template = template.to_owned();
         self