diff --git a/extensions/pagetop-bootsier/src/theme/form/check.rs b/extensions/pagetop-bootsier/src/theme/form/check.rs
index 1dc45e4d..b0578092 100644
--- a/extensions/pagetop-bootsier/src/theme/form/check.rs
+++ b/extensions/pagetop-bootsier/src/theme/form/check.rs
@@ -136,7 +136,7 @@ impl Component for Group {
     }
 
     fn setup(&mut self, _cx: &Context) {
-        self.alter_classes(ClassesOp::Prepend, "form-item form-item-checkboxes");
+        self.alter_classes(ClassesOp::Prepend, "form-field form-field-checkboxes");
     }
 
     fn prepare(&self, cx: &mut Context) -> Result<Markup, ComponentError> {
diff --git a/extensions/pagetop-bootsier/src/theme/form/checkbox.rs b/extensions/pagetop-bootsier/src/theme/form/checkbox.rs
index 063902f2..6206d983 100644
--- a/extensions/pagetop-bootsier/src/theme/form/checkbox.rs
+++ b/extensions/pagetop-bootsier/src/theme/form/checkbox.rs
@@ -77,7 +77,7 @@ impl Component for Checkbox {
     }
 
     fn setup(&mut self, _cx: &Context) {
-        let mut classes = "form-item form-check".to_string();
+        let mut classes = "form-field form-check".to_string();
         if *self.checkbox_kind() == form::CheckboxKind::Switch {
             classes.push_str(" form-switch");
         }
diff --git a/extensions/pagetop-bootsier/src/theme/form/radio.rs b/extensions/pagetop-bootsier/src/theme/form/radio.rs
index 3ea88b45..a27a36a8 100644
--- a/extensions/pagetop-bootsier/src/theme/form/radio.rs
+++ b/extensions/pagetop-bootsier/src/theme/form/radio.rs
@@ -126,7 +126,7 @@ impl Component for Group {
     }
 
     fn setup(&mut self, _cx: &Context) {
-        self.alter_classes(ClassesOp::Prepend, "form-item form-item-radios");
+        self.alter_classes(ClassesOp::Prepend, "form-field form-field-radios");
     }
 
     fn prepare(&self, cx: &mut Context) -> Result<Markup, ComponentError> {