diff --git a/admin/form-builder/assets/js/form-builder.js b/admin/form-builder/assets/js/form-builder.js
index 283beff05..5368c12f7 100644
--- a/admin/form-builder/assets/js/form-builder.js
+++ b/admin/form-builder/assets/js/form-builder.js
@@ -136,7 +136,7 @@
                             });
                         }
 
-                        if ( ( payload.field_name === 'name'  && payload.value.length - 2 < payload.field_name.length ) || ! state.form_fields[i].hasOwnProperty('is_new') ) {
+                        if ( payload.field_name === 'name'  && payload.value.length - 2 < payload.field_name.length ) {
                             continue;
                         } else {
                             state.form_fields[i][payload.field_name] = payload.value;
diff --git a/assets/css/admin/form-builder.css b/assets/css/admin/form-builder.css
index 3eec38e38..a3e26afde 100644
--- a/assets/css/admin/form-builder.css
+++ b/assets/css/admin/form-builder.css
@@ -843,6 +843,63 @@ html {
   justify-content: center;
 }
 
+.wpuf-badge {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, -webkit-backdrop-filter;
+  transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter;
+  transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter, -webkit-backdrop-filter;
+  transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+  transition-timing-function: cubic-bezier(0, 0, 0.2, 1);
+  transition-duration: 200ms;
+  height: 1.25rem;
+  font-size: 0.875rem;
+  line-height: 1.25rem;
+  width: -moz-fit-content;
+  width: fit-content;
+  padding-left: 0.563rem;
+  padding-right: 0.563rem;
+  border-radius: var(--rounded-badge, 1.9rem);
+  border-width: 1px;
+  --tw-border-opacity: 1;
+  border-color: var(--fallback-b2,oklch(var(--b2)/var(--tw-border-opacity)));
+  --tw-bg-opacity: 1;
+  background-color: var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity)));
+  --tw-text-opacity: 1;
+  color: var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));
+}
+
+.wpuf-btm-nav {
+  position: fixed;
+  bottom: 0px;
+  left: 0px;
+  right: 0px;
+  display: flex;
+  width: 100%;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-around;
+  padding-bottom: env(safe-area-inset-bottom);
+  height: 4rem;
+  --tw-bg-opacity: 1;
+  background-color: var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity)));
+  color: currentColor;
+}
+
+.wpuf-btm-nav > * {
+  position: relative;
+  display: flex;
+  height: 100%;
+  flex-basis: 100%;
+  cursor: pointer;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 0.25rem;
+  border-color: currentColor;
+}
+
 @media (hover:hover) {
   .wpuf-label a:hover {
     --tw-text-opacity: 1;
@@ -1010,6 +1067,16 @@ html {
     opacity: 1;
   }
 
+  .wpuf-btm-nav > *.wpuf-disabled:hover,
+      .wpuf-btm-nav > *[disabled]:hover {
+    pointer-events: none;
+    --tw-border-opacity: 0;
+    background-color: var(--fallback-n,oklch(var(--n)/var(--tw-bg-opacity)));
+    --tw-bg-opacity: 0.1;
+    color: var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));
+    --tw-text-opacity: 0.2;
+  }
+
   .wpuf-btn:hover {
     --tw-border-opacity: 1;
     border-color: var(--fallback-b3,oklch(var(--b3)/var(--tw-border-opacity)));
@@ -1102,6 +1169,65 @@ html {
     --glass-border-opacity: 15%;
   }
 
+  .wpuf-btn-ghost:hover {
+    border-color: transparent;
+  }
+
+  @supports (color: oklch(0% 0 0)) {
+    .wpuf-btn-ghost:hover {
+      background-color: var(--fallback-bc,oklch(var(--bc)/0.2));
+    }
+  }
+
+  .wpuf-btn-ghost:hover {
+    border-color: transparent;
+  }
+
+  @supports (color: oklch(0% 0 0)) {
+    .wpuf-btn-ghost:hover {
+      background-color: var(--fallback-bc,oklch(var(--bc)/0.2));
+    }
+  }
+
+  .wpuf-btn-link:hover {
+    border-color: transparent;
+    background-color: transparent;
+    text-decoration-line: underline;
+  }
+
+  .wpuf-btn-outline:hover {
+    --tw-border-opacity: 1;
+    border-color: var(--fallback-bc,oklch(var(--bc)/var(--tw-border-opacity)));
+    --tw-bg-opacity: 1;
+    background-color: var(--fallback-bc,oklch(var(--bc)/var(--tw-bg-opacity)));
+    --tw-text-opacity: 1;
+    color: var(--fallback-b1,oklch(var(--b1)/var(--tw-text-opacity)));
+  }
+
+  .wpuf-btn-outline.wpuf-btn-primary:hover {
+    --tw-text-opacity: 1;
+    color: var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity)));
+  }
+
+  @supports (color: color-mix(in oklab, black, black)) {
+    .wpuf-btn-outline.wpuf-btn-primary:hover {
+      background-color: color-mix(in oklab, var(--fallback-p,oklch(var(--p)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-p,oklch(var(--p)/1)) 90%, black);
+    }
+  }
+
+  .wpuf-btn-outline.wpuf-btn-primary:hover {
+    --tw-text-opacity: 1;
+    color: var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity)));
+  }
+
+  @supports (color: color-mix(in oklab, black, black)) {
+    .wpuf-btn-outline.wpuf-btn-primary:hover {
+      background-color: color-mix(in oklab, var(--fallback-p,oklch(var(--p)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-p,oklch(var(--p)/1)) 90%, black);
+    }
+  }
+
   .wpuf-btn-outline.wpuf-btn-primary:hover {
     --tw-text-opacity: 1;
     color: var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity)));
@@ -1150,6 +1276,270 @@ html {
     }
   }
 
+  .wpuf-btn-outline.wpuf-btn-secondary:hover {
+    --tw-text-opacity: 1;
+    color: var(--fallback-sc,oklch(var(--sc)/var(--tw-text-opacity)));
+  }
+
+  @supports (color: color-mix(in oklab, black, black)) {
+    .wpuf-btn-outline.wpuf-btn-secondary:hover {
+      background-color: color-mix(in oklab, var(--fallback-s,oklch(var(--s)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-s,oklch(var(--s)/1)) 90%, black);
+    }
+  }
+
+  .wpuf-btn-outline.wpuf-btn-secondary:hover {
+    --tw-text-opacity: 1;
+    color: var(--fallback-sc,oklch(var(--sc)/var(--tw-text-opacity)));
+  }
+
+  @supports (color: color-mix(in oklab, black, black)) {
+    .wpuf-btn-outline.wpuf-btn-secondary:hover {
+      background-color: color-mix(in oklab, var(--fallback-s,oklch(var(--s)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-s,oklch(var(--s)/1)) 90%, black);
+    }
+  }
+
+  .wpuf-btn-outline.wpuf-btn-accent:hover {
+    --tw-text-opacity: 1;
+    color: var(--fallback-ac,oklch(var(--ac)/var(--tw-text-opacity)));
+  }
+
+  @supports (color: color-mix(in oklab, black, black)) {
+    .wpuf-btn-outline.wpuf-btn-accent:hover {
+      background-color: color-mix(in oklab, var(--fallback-a,oklch(var(--a)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-a,oklch(var(--a)/1)) 90%, black);
+    }
+  }
+
+  .wpuf-btn-outline.wpuf-btn-accent:hover {
+    --tw-text-opacity: 1;
+    color: var(--fallback-ac,oklch(var(--ac)/var(--tw-text-opacity)));
+  }
+
+  @supports (color: color-mix(in oklab, black, black)) {
+    .wpuf-btn-outline.wpuf-btn-accent:hover {
+      background-color: color-mix(in oklab, var(--fallback-a,oklch(var(--a)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-a,oklch(var(--a)/1)) 90%, black);
+    }
+  }
+
+  .wpuf-btn-outline.wpuf-btn-accent:hover {
+    --tw-text-opacity: 1;
+    color: var(--fallback-ac,oklch(var(--ac)/var(--tw-text-opacity)));
+  }
+
+  @supports (color: color-mix(in oklab, black, black)) {
+    .wpuf-btn-outline.wpuf-btn-accent:hover {
+      background-color: color-mix(in oklab, var(--fallback-a,oklch(var(--a)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-a,oklch(var(--a)/1)) 90%, black);
+    }
+  }
+
+  .wpuf-btn-outline.wpuf-btn-accent:hover {
+    --tw-text-opacity: 1;
+    color: var(--fallback-ac,oklch(var(--ac)/var(--tw-text-opacity)));
+  }
+
+  @supports (color: color-mix(in oklab, black, black)) {
+    .wpuf-btn-outline.wpuf-btn-accent:hover {
+      background-color: color-mix(in oklab, var(--fallback-a,oklch(var(--a)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-a,oklch(var(--a)/1)) 90%, black);
+    }
+  }
+
+  .wpuf-btn-outline.wpuf-btn-success:hover {
+    --tw-text-opacity: 1;
+    color: var(--fallback-suc,oklch(var(--suc)/var(--tw-text-opacity)));
+  }
+
+  @supports (color: color-mix(in oklab, black, black)) {
+    .wpuf-btn-outline.wpuf-btn-success:hover {
+      background-color: color-mix(in oklab, var(--fallback-su,oklch(var(--su)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-su,oklch(var(--su)/1)) 90%, black);
+    }
+  }
+
+  .wpuf-btn-outline.wpuf-btn-success:hover {
+    --tw-text-opacity: 1;
+    color: var(--fallback-suc,oklch(var(--suc)/var(--tw-text-opacity)));
+  }
+
+  @supports (color: color-mix(in oklab, black, black)) {
+    .wpuf-btn-outline.wpuf-btn-success:hover {
+      background-color: color-mix(in oklab, var(--fallback-su,oklch(var(--su)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-su,oklch(var(--su)/1)) 90%, black);
+    }
+  }
+
+  .wpuf-btn-outline.wpuf-btn-success:hover {
+    --tw-text-opacity: 1;
+    color: var(--fallback-suc,oklch(var(--suc)/var(--tw-text-opacity)));
+  }
+
+  @supports (color: color-mix(in oklab, black, black)) {
+    .wpuf-btn-outline.wpuf-btn-success:hover {
+      background-color: color-mix(in oklab, var(--fallback-su,oklch(var(--su)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-su,oklch(var(--su)/1)) 90%, black);
+    }
+  }
+
+  .wpuf-btn-outline.wpuf-btn-success:hover {
+    --tw-text-opacity: 1;
+    color: var(--fallback-suc,oklch(var(--suc)/var(--tw-text-opacity)));
+  }
+
+  @supports (color: color-mix(in oklab, black, black)) {
+    .wpuf-btn-outline.wpuf-btn-success:hover {
+      background-color: color-mix(in oklab, var(--fallback-su,oklch(var(--su)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-su,oklch(var(--su)/1)) 90%, black);
+    }
+  }
+
+  .wpuf-btn-outline.wpuf-btn-info:hover {
+    --tw-text-opacity: 1;
+    color: var(--fallback-inc,oklch(var(--inc)/var(--tw-text-opacity)));
+  }
+
+  @supports (color: color-mix(in oklab, black, black)) {
+    .wpuf-btn-outline.wpuf-btn-info:hover {
+      background-color: color-mix(in oklab, var(--fallback-in,oklch(var(--in)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-in,oklch(var(--in)/1)) 90%, black);
+    }
+  }
+
+  .wpuf-btn-outline.wpuf-btn-info:hover {
+    --tw-text-opacity: 1;
+    color: var(--fallback-inc,oklch(var(--inc)/var(--tw-text-opacity)));
+  }
+
+  @supports (color: color-mix(in oklab, black, black)) {
+    .wpuf-btn-outline.wpuf-btn-info:hover {
+      background-color: color-mix(in oklab, var(--fallback-in,oklch(var(--in)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-in,oklch(var(--in)/1)) 90%, black);
+    }
+  }
+
+  .wpuf-btn-outline.wpuf-btn-info:hover {
+    --tw-text-opacity: 1;
+    color: var(--fallback-inc,oklch(var(--inc)/var(--tw-text-opacity)));
+  }
+
+  @supports (color: color-mix(in oklab, black, black)) {
+    .wpuf-btn-outline.wpuf-btn-info:hover {
+      background-color: color-mix(in oklab, var(--fallback-in,oklch(var(--in)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-in,oklch(var(--in)/1)) 90%, black);
+    }
+  }
+
+  .wpuf-btn-outline.wpuf-btn-info:hover {
+    --tw-text-opacity: 1;
+    color: var(--fallback-inc,oklch(var(--inc)/var(--tw-text-opacity)));
+  }
+
+  @supports (color: color-mix(in oklab, black, black)) {
+    .wpuf-btn-outline.wpuf-btn-info:hover {
+      background-color: color-mix(in oklab, var(--fallback-in,oklch(var(--in)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-in,oklch(var(--in)/1)) 90%, black);
+    }
+  }
+
+  .wpuf-btn-outline.wpuf-btn-warning:hover {
+    --tw-text-opacity: 1;
+    color: var(--fallback-wac,oklch(var(--wac)/var(--tw-text-opacity)));
+  }
+
+  @supports (color: color-mix(in oklab, black, black)) {
+    .wpuf-btn-outline.wpuf-btn-warning:hover {
+      background-color: color-mix(in oklab, var(--fallback-wa,oklch(var(--wa)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-wa,oklch(var(--wa)/1)) 90%, black);
+    }
+  }
+
+  .wpuf-btn-outline.wpuf-btn-warning:hover {
+    --tw-text-opacity: 1;
+    color: var(--fallback-wac,oklch(var(--wac)/var(--tw-text-opacity)));
+  }
+
+  @supports (color: color-mix(in oklab, black, black)) {
+    .wpuf-btn-outline.wpuf-btn-warning:hover {
+      background-color: color-mix(in oklab, var(--fallback-wa,oklch(var(--wa)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-wa,oklch(var(--wa)/1)) 90%, black);
+    }
+  }
+
+  .wpuf-btn-outline.wpuf-btn-warning:hover {
+    --tw-text-opacity: 1;
+    color: var(--fallback-wac,oklch(var(--wac)/var(--tw-text-opacity)));
+  }
+
+  @supports (color: color-mix(in oklab, black, black)) {
+    .wpuf-btn-outline.wpuf-btn-warning:hover {
+      background-color: color-mix(in oklab, var(--fallback-wa,oklch(var(--wa)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-wa,oklch(var(--wa)/1)) 90%, black);
+    }
+  }
+
+  .wpuf-btn-outline.wpuf-btn-warning:hover {
+    --tw-text-opacity: 1;
+    color: var(--fallback-wac,oklch(var(--wac)/var(--tw-text-opacity)));
+  }
+
+  @supports (color: color-mix(in oklab, black, black)) {
+    .wpuf-btn-outline.wpuf-btn-warning:hover {
+      background-color: color-mix(in oklab, var(--fallback-wa,oklch(var(--wa)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-wa,oklch(var(--wa)/1)) 90%, black);
+    }
+  }
+
+  .wpuf-btn-outline.wpuf-btn-error:hover {
+    --tw-text-opacity: 1;
+    color: var(--fallback-erc,oklch(var(--erc)/var(--tw-text-opacity)));
+  }
+
+  @supports (color: color-mix(in oklab, black, black)) {
+    .wpuf-btn-outline.wpuf-btn-error:hover {
+      background-color: color-mix(in oklab, var(--fallback-er,oklch(var(--er)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-er,oklch(var(--er)/1)) 90%, black);
+    }
+  }
+
+  .wpuf-btn-outline.wpuf-btn-error:hover {
+    --tw-text-opacity: 1;
+    color: var(--fallback-erc,oklch(var(--erc)/var(--tw-text-opacity)));
+  }
+
+  @supports (color: color-mix(in oklab, black, black)) {
+    .wpuf-btn-outline.wpuf-btn-error:hover {
+      background-color: color-mix(in oklab, var(--fallback-er,oklch(var(--er)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-er,oklch(var(--er)/1)) 90%, black);
+    }
+  }
+
+  .wpuf-btn-outline.wpuf-btn-error:hover {
+    --tw-text-opacity: 1;
+    color: var(--fallback-erc,oklch(var(--erc)/var(--tw-text-opacity)));
+  }
+
+  @supports (color: color-mix(in oklab, black, black)) {
+    .wpuf-btn-outline.wpuf-btn-error:hover {
+      background-color: color-mix(in oklab, var(--fallback-er,oklch(var(--er)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-er,oklch(var(--er)/1)) 90%, black);
+    }
+  }
+
+  .wpuf-btn-outline.wpuf-btn-error:hover {
+    --tw-text-opacity: 1;
+    color: var(--fallback-erc,oklch(var(--erc)/var(--tw-text-opacity)));
+  }
+
+  @supports (color: color-mix(in oklab, black, black)) {
+    .wpuf-btn-outline.wpuf-btn-error:hover {
+      background-color: color-mix(in oklab, var(--fallback-er,oklch(var(--er)/1)) 90%, black);
+      border-color: color-mix(in oklab, var(--fallback-er,oklch(var(--er)/1)) 90%, black);
+    }
+  }
+
   .wpuf-btn-disabled:hover,
     .wpuf-btn[disabled]:hover,
     .wpuf-btn:disabled:hover {
@@ -1246,12 +1636,69 @@ html {
   padding-bottom: 0.5rem;
 }
 
+.wpuf-join {
+  display: inline-flex;
+  align-items: stretch;
+  border-radius: var(--rounded-btn, 0.5rem);
+}
+
+.wpuf-join :where(.wpuf-join-item) {
+  border-start-end-radius: 0;
+  border-end-end-radius: 0;
+  border-end-start-radius: 0;
+  border-start-start-radius: 0;
+}
+
+.wpuf-join .wpuf-join-item:not(:first-child):not(:last-child),
+  .wpuf-join *:not(:first-child):not(:last-child) .wpuf-join-item {
+  border-start-end-radius: 0;
+  border-end-end-radius: 0;
+  border-end-start-radius: 0;
+  border-start-start-radius: 0;
+}
+
+.wpuf-join .wpuf-join-item:first-child:not(:last-child),
+  .wpuf-join *:first-child:not(:last-child) .wpuf-join-item {
+  border-start-end-radius: 0;
+  border-end-end-radius: 0;
+}
+
 .wpuf-join .wpuf-dropdown .wpuf-join-item:first-child:not(:last-child),
   .wpuf-join *:first-child:not(:last-child) .wpuf-dropdown .wpuf-join-item {
   border-start-end-radius: inherit;
   border-end-end-radius: inherit;
 }
 
+.wpuf-join :where(.wpuf-join-item:first-child:not(:last-child)),
+  .wpuf-join :where(*:first-child:not(:last-child) .wpuf-join-item) {
+  border-end-start-radius: inherit;
+  border-start-start-radius: inherit;
+}
+
+.wpuf-join .wpuf-join-item:last-child:not(:first-child),
+  .wpuf-join *:last-child:not(:first-child) .wpuf-join-item {
+  border-end-start-radius: 0;
+  border-start-start-radius: 0;
+}
+
+.wpuf-join :where(.wpuf-join-item:last-child:not(:first-child)),
+  .wpuf-join :where(*:last-child:not(:first-child) .wpuf-join-item) {
+  border-start-end-radius: inherit;
+  border-end-end-radius: inherit;
+}
+
+@supports not selector(:has(*)) {
+  :where(.wpuf-join *) {
+    border-radius: inherit;
+  }
+}
+
+@supports selector(:has(*)) {
+  :where(.wpuf-join *:has(.wpuf-join-item)) {
+    border-radius: inherit;
+  }
+}
+
 .wpuf-menu {
   display: flex;
   flex-direction: column;
@@ -1305,6 +1752,58 @@ html {
   justify-self: end;
 }
 
+.wpuf-modal {
+  pointer-events: none;
+  position: fixed;
+  inset: 0px;
+  margin: 0px;
+  display: grid;
+  height: 100%;
+  max-height: none;
+  width: 100%;
+  max-width: none;
+  justify-items: center;
+  padding: 0px;
+  opacity: 0;
+  overscroll-behavior: contain;
+  z-index: 999;
+  background-color: transparent;
+  color: inherit;
+  transition-duration: 200ms;
+  transition-timing-function: cubic-bezier(0, 0, 0.2, 1);
+  transition-property: transform, opacity, visibility;
+  overflow-y: hidden;
+}
+
+:where(.wpuf-modal) {
+  align-items: center;
+}
+
+.wpuf-modal-box {
+  max-height: calc(100vh - 5em);
+  grid-column-start: 1;
+  grid-row-start: 1;
+  width: 91.666667%;
+  max-width: 32rem;
+  --tw-scale-x: .9;
+  --tw-scale-y: .9;
+  transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
+  border-bottom-right-radius: var(--rounded-box, 1rem);
+  border-bottom-left-radius: var(--rounded-box, 1rem);
+  border-top-left-radius: var(--rounded-box, 1rem);
+  border-top-right-radius: var(--rounded-box, 1rem);
+  --tw-bg-opacity: 1;
+  background-color: var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity)));
+  padding: 1.5rem;
+  transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter, -webkit-backdrop-filter;
+  transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+  transition-timing-function: cubic-bezier(0, 0, 0.2, 1);
+  transition-duration: 200ms;
+  box-shadow: rgba(0, 0, 0, 0.25) 0px 25px 50px -12px;
+  overflow-y: auto;
+  overscroll-behavior: contain;
+}
+
 .wpuf-modal-open,
 .wpuf-modal:target,
 .wpuf-modal-toggle:checked + .wpuf-modal,
@@ -1424,6 +1923,21 @@ html {
   grid-column-start: span 9999;
 }
 
+.wpuf-tab-content {
+  grid-column-start: 1;
+  grid-column-end: span 9999;
+  grid-row-start: 2;
+  margin-top: calc(var(--tab-border) * -1);
+  display: none;
+  border-color: transparent;
+  border-width: var(--tab-border, 0);
+}
+
+:checked + .wpuf-tab-content:nth-child(2),
+  :is(.wpuf-tab-active, [aria-selected="true"]) + .wpuf-tab-content:nth-child(2) {
+  border-start-start-radius: 0px;
+}
+
 input.wpuf-tab:checked + .wpuf-tab-content,
 :is(.wpuf-tab-active, [aria-selected="true"]) + .wpuf-tab-content {
   display: block;
@@ -1453,6 +1967,11 @@ input.wpuf-tab:checked + .wpuf-tab-content,
     var(--togglehandleborder);
 }
 
+.wpuf-avatar-group {
+  display: flex;
+  overflow: hidden;
+}
+
 .wpuf-avatar-group :where(.wpuf-avatar) {
   overflow: hidden;
   border-radius: 9999px;
@@ -1461,6 +1980,26 @@ input.wpuf-tab:checked + .wpuf-tab-content,
   border-color: var(--fallback-b1,oklch(var(--b1)/var(--tw-border-opacity)));
 }
 
+.wpuf-btm-nav > *:not(.wpuf-active) {
+  padding-top: 0.125rem;
+}
+
+.wpuf-btm-nav > *:where(.wpuf-active) {
+  border-top-width: 2px;
+  --tw-bg-opacity: 1;
+  background-color: var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity)));
+}
+
+.wpuf-btm-nav > *.wpuf-disabled,
+    .wpuf-btm-nav > *[disabled] {
+  pointer-events: none;
+  --tw-border-opacity: 0;
+  background-color: var(--fallback-n,oklch(var(--n)/var(--tw-bg-opacity)));
+  --tw-bg-opacity: 0.1;
+  color: var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));
+  --tw-text-opacity: 0.2;
+}
+
 .wpuf-btm-nav > * .wpuf-label {
   font-size: 1rem;
   line-height: 1.5rem;
@@ -1491,9 +2030,42 @@ input.wpuf-tab:checked + .wpuf-tab-content,
   .wpuf-btn-secondary {
     --btn-color: var(--fallback-s);
   }
+
+  .wpuf-btn-accent {
+    --btn-color: var(--fallback-a);
+  }
+
+  .wpuf-btn-info {
+    --btn-color: var(--fallback-in);
+  }
+
+  .wpuf-btn-success {
+    --btn-color: var(--fallback-su);
+  }
+
+  .wpuf-btn-warning {
+    --btn-color: var(--fallback-wa);
+  }
+
+  .wpuf-btn-error {
+    --btn-color: var(--fallback-er);
+  }
 }
 
 @supports (color: color-mix(in oklab, black, black)) {
+  .wpuf-btn-active {
+    background-color: color-mix(
+          in oklab,
+          oklch(var(--btn-color, var(--b3)) / var(--tw-bg-opacity, 1)) 90%,
+          black
+        );
+    border-color: color-mix(
+          in oklab,
+          oklch(var(--btn-color, var(--b3)) / var(--tw-border-opacity, 1)) 90%,
+          black
+        );
+  }
+
   .wpuf-btn-outline.wpuf-btn-primary.wpuf-btn-active {
     background-color: color-mix(in oklab, var(--fallback-p,oklch(var(--p)/1)) 90%, black);
     border-color: color-mix(in oklab, var(--fallback-p,oklch(var(--p)/1)) 90%, black);
@@ -1503,6 +2075,31 @@ input.wpuf-tab:checked + .wpuf-tab-content,
     background-color: color-mix(in oklab, var(--fallback-s,oklch(var(--s)/1)) 90%, black);
     border-color: color-mix(in oklab, var(--fallback-s,oklch(var(--s)/1)) 90%, black);
   }
+
+  .wpuf-btn-outline.wpuf-btn-accent.wpuf-btn-active {
+    background-color: color-mix(in oklab, var(--fallback-a,oklch(var(--a)/1)) 90%, black);
+    border-color: color-mix(in oklab, var(--fallback-a,oklch(var(--a)/1)) 90%, black);
+  }
+
+  .wpuf-btn-outline.wpuf-btn-success.wpuf-btn-active {
+    background-color: color-mix(in oklab, var(--fallback-su,oklch(var(--su)/1)) 90%, black);
+    border-color: color-mix(in oklab, var(--fallback-su,oklch(var(--su)/1)) 90%, black);
+  }
+
+  .wpuf-btn-outline.wpuf-btn-info.wpuf-btn-active {
+    background-color: color-mix(in oklab, var(--fallback-in,oklch(var(--in)/1)) 90%, black);
+    border-color: color-mix(in oklab, var(--fallback-in,oklch(var(--in)/1)) 90%, black);
+  }
+
+  .wpuf-btn-outline.wpuf-btn-warning.wpuf-btn-active {
+    background-color: color-mix(in oklab, var(--fallback-wa,oklch(var(--wa)/1)) 90%, black);
+    border-color: color-mix(in oklab, var(--fallback-wa,oklch(var(--wa)/1)) 90%, black);
+  }
+
+  .wpuf-btn-outline.wpuf-btn-error.wpuf-btn-active {
+    background-color: color-mix(in oklab, var(--fallback-er,oklch(var(--er)/1)) 90%, black);
+    border-color: color-mix(in oklab, var(--fallback-er,oklch(var(--er)/1)) 90%, black);
+  }
 }
 
 .wpuf-btn:focus-visible {
@@ -1525,24 +2122,127 @@ input.wpuf-tab:checked + .wpuf-tab-content,
   .wpuf-btn-secondary {
     --btn-color: var(--s);
   }
+
+  .wpuf-btn-accent {
+    --btn-color: var(--a);
+  }
+
+  .wpuf-btn-info {
+    --btn-color: var(--in);
+  }
+
+  .wpuf-btn-success {
+    --btn-color: var(--su);
+  }
+
+  .wpuf-btn-warning {
+    --btn-color: var(--wa);
+  }
+
+  .wpuf-btn-error {
+    --btn-color: var(--er);
+  }
+}
+
+.wpuf-btn-secondary {
+  --tw-text-opacity: 1;
+  color: var(--fallback-sc,oklch(var(--sc)/var(--tw-text-opacity)));
+  outline-color: var(--fallback-s,oklch(var(--s)/1));
+}
+
+.wpuf-btn-accent {
+  --tw-text-opacity: 1;
+  color: var(--fallback-ac,oklch(var(--ac)/var(--tw-text-opacity)));
+  outline-color: var(--fallback-a,oklch(var(--a)/1));
+}
+
+.wpuf-btn-info {
+  --tw-text-opacity: 1;
+  color: var(--fallback-inc,oklch(var(--inc)/var(--tw-text-opacity)));
+  outline-color: var(--fallback-in,oklch(var(--in)/1));
+}
+
+.wpuf-btn-success {
+  --tw-text-opacity: 1;
+  color: var(--fallback-suc,oklch(var(--suc)/var(--tw-text-opacity)));
+  outline-color: var(--fallback-su,oklch(var(--su)/1));
+}
+
+.wpuf-btn-warning {
+  --tw-text-opacity: 1;
+  color: var(--fallback-wac,oklch(var(--wac)/var(--tw-text-opacity)));
+  outline-color: var(--fallback-wa,oklch(var(--wa)/1));
+}
+
+.wpuf-btn-error {
+  --tw-text-opacity: 1;
+  color: var(--fallback-erc,oklch(var(--erc)/var(--tw-text-opacity)));
+  outline-color: var(--fallback-er,oklch(var(--er)/1));
+}
+
+.wpuf-btn.wpuf-glass {
+  --tw-shadow: 0 0 #0000;
+  --tw-shadow-colored: 0 0 #0000;
+  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
+  outline-color: currentColor;
+}
+
+.wpuf-btn.wpuf-glass.wpuf-btn-active {
+  --glass-opacity: 25%;
+  --glass-border-opacity: 15%;
+}
+
+.wpuf-btn-ghost {
+  border-width: 1px;
+  border-color: transparent;
+  background-color: transparent;
+  color: currentColor;
+  --tw-shadow: 0 0 #0000;
+  --tw-shadow-colored: 0 0 #0000;
+  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
+  outline-color: currentColor;
+}
+
+.wpuf-btn-ghost.wpuf-btn-active {
+  border-color: transparent;
+  background-color: var(--fallback-bc,oklch(var(--bc)/0.2));
+}
+
+.wpuf-btn-link {
+  border-color: transparent;
+  background-color: transparent;
+  --tw-text-opacity: 1;
+  color: var(--fallback-p,oklch(var(--p)/var(--tw-text-opacity)));
+  text-decoration-line: underline;
+  --tw-shadow: 0 0 #0000;
+  --tw-shadow-colored: 0 0 #0000;
+  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
+  outline-color: currentColor;
+}
+
+.wpuf-btn-link.wpuf-btn-active {
+  border-color: transparent;
+  background-color: transparent;
+  text-decoration-line: underline;
 }
 
-.wpuf-btn-secondary {
+.wpuf-btn-outline {
+  border-color: currentColor;
+  background-color: transparent;
   --tw-text-opacity: 1;
-  color: var(--fallback-sc,oklch(var(--sc)/var(--tw-text-opacity)));
-  outline-color: var(--fallback-s,oklch(var(--s)/1));
-}
-
-.wpuf-btn.wpuf-glass {
+  color: var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));
   --tw-shadow: 0 0 #0000;
   --tw-shadow-colored: 0 0 #0000;
   box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
-  outline-color: currentColor;
 }
 
-.wpuf-btn.wpuf-glass.wpuf-btn-active {
-  --glass-opacity: 25%;
-  --glass-border-opacity: 15%;
+.wpuf-btn-outline.wpuf-btn-active {
+  --tw-border-opacity: 1;
+  border-color: var(--fallback-bc,oklch(var(--bc)/var(--tw-border-opacity)));
+  --tw-bg-opacity: 1;
+  background-color: var(--fallback-bc,oklch(var(--bc)/var(--tw-bg-opacity)));
+  --tw-text-opacity: 1;
+  color: var(--fallback-b1,oklch(var(--b1)/var(--tw-text-opacity)));
 }
 
 .wpuf-btn-outline.wpuf-btn-primary {
@@ -1565,6 +2265,56 @@ input.wpuf-tab:checked + .wpuf-tab-content,
   color: var(--fallback-sc,oklch(var(--sc)/var(--tw-text-opacity)));
 }
 
+.wpuf-btn-outline.wpuf-btn-accent {
+  --tw-text-opacity: 1;
+  color: var(--fallback-a,oklch(var(--a)/var(--tw-text-opacity)));
+}
+
+.wpuf-btn-outline.wpuf-btn-accent.wpuf-btn-active {
+  --tw-text-opacity: 1;
+  color: var(--fallback-ac,oklch(var(--ac)/var(--tw-text-opacity)));
+}
+
+.wpuf-btn-outline.wpuf-btn-success {
+  --tw-text-opacity: 1;
+  color: var(--fallback-su,oklch(var(--su)/var(--tw-text-opacity)));
+}
+
+.wpuf-btn-outline.wpuf-btn-success.wpuf-btn-active {
+  --tw-text-opacity: 1;
+  color: var(--fallback-suc,oklch(var(--suc)/var(--tw-text-opacity)));
+}
+
+.wpuf-btn-outline.wpuf-btn-info {
+  --tw-text-opacity: 1;
+  color: var(--fallback-in,oklch(var(--in)/var(--tw-text-opacity)));
+}
+
+.wpuf-btn-outline.wpuf-btn-info.wpuf-btn-active {
+  --tw-text-opacity: 1;
+  color: var(--fallback-inc,oklch(var(--inc)/var(--tw-text-opacity)));
+}
+
+.wpuf-btn-outline.wpuf-btn-warning {
+  --tw-text-opacity: 1;
+  color: var(--fallback-wa,oklch(var(--wa)/var(--tw-text-opacity)));
+}
+
+.wpuf-btn-outline.wpuf-btn-warning.wpuf-btn-active {
+  --tw-text-opacity: 1;
+  color: var(--fallback-wac,oklch(var(--wac)/var(--tw-text-opacity)));
+}
+
+.wpuf-btn-outline.wpuf-btn-error {
+  --tw-text-opacity: 1;
+  color: var(--fallback-er,oklch(var(--er)/var(--tw-text-opacity)));
+}
+
+.wpuf-btn-outline.wpuf-btn-error.wpuf-btn-active {
+  --tw-text-opacity: 1;
+  color: var(--fallback-erc,oklch(var(--erc)/var(--tw-text-opacity)));
+}
+
 .wpuf-btn.wpuf-btn-disabled,
   .wpuf-btn[disabled],
   .wpuf-btn:disabled {
@@ -1625,10 +2375,20 @@ input.wpuf-tab:checked + .wpuf-tab-content,
   transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
 }
 
+.wpuf-join > :where(*:not(:first-child)) {
+  margin-top: 0px;
+  margin-bottom: 0px;
+  margin-inline-start: -1px;
+}
+
 .wpuf-join > :where(*:not(:first-child)):is(.wpuf-btn) {
   margin-inline-start: calc(var(--border-btn) * -1);
 }
 
+.wpuf-join-item:focus {
+  isolation: isolate;
+}
+
 .wpuf-loading {
   pointer-events: none;
   display: inline-block;
@@ -1729,6 +2489,23 @@ input.wpuf-tab:checked + .wpuf-tab-content,
   margin-top: 0;
 }
 
+.wpuf-menu-title {
+  padding-left: 1rem;
+  padding-right: 1rem;
+  padding-top: 0.5rem;
+  padding-bottom: 0.5rem;
+  font-size: 0.875rem;
+  line-height: 1.25rem;
+  font-weight: 700;
+  color: var(--fallback-bc,oklch(var(--bc)/0.4));
+}
+
+.wpuf-modal:not(dialog:not(.wpuf-modal-open)),
+  .wpuf-modal::backdrop {
+  background-color: #0006;
+  animation: modal-pop 0.2s ease-out;
+}
+
 .wpuf-modal-open .wpuf-modal-box,
 .wpuf-modal-toggle:checked + .wpuf-modal .wpuf-modal-box,
 .wpuf-modal:target .wpuf-modal-box,
@@ -1996,6 +2773,20 @@ input.wpuf-tab:checked + .wpuf-tab-content,
   color: var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity)));
 }
 
+.wpuf-table tr.wpuf-active,
+  .wpuf-table tr.wpuf-active:nth-child(even),
+  .wpuf-table-zebra tbody tr:nth-child(even) {
+  --tw-bg-opacity: 1;
+  background-color: var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity)));
+}
+
+.wpuf-table-zebra tr.wpuf-active,
+    .wpuf-table-zebra tr.wpuf-active:nth-child(even),
+    .wpuf-table-zebra-zebra tbody tr:nth-child(even) {
+  --tw-bg-opacity: 1;
+  background-color: var(--fallback-b3,oklch(var(--b3)/var(--tw-bg-opacity)));
+}
+
 @keyframes toast-pop {
   0% {
     transform: scale(0.9);
@@ -2059,6 +2850,117 @@ input.wpuf-tab:checked + .wpuf-tab-content,
       var(--handleoffsetcalculator) 0 0 3px var(--fallback-bc,oklch(var(--bc)/1)) inset;
 }
 
+.wpuf-glass,
+  .wpuf-glass.wpuf-btn-active {
+  border: none;
+  -webkit-backdrop-filter: blur(var(--glass-blur, 40px));
+          backdrop-filter: blur(var(--glass-blur, 40px));
+  background-color: transparent;
+  background-image: linear-gradient(
+        135deg,
+        rgb(255 255 255 / var(--glass-opacity, 30%)) 0%,
+        rgb(0 0 0 / 0%) 100%
+      ),
+      linear-gradient(
+        var(--glass-reflex-degree, 100deg),
+        rgb(255 255 255 / var(--glass-reflex-opacity, 10%)) 25%,
+        rgb(0 0 0 / 0%) 25%
+      );
+  box-shadow: 0 0 0 1px rgb(255 255 255 / var(--glass-border-opacity, 10%)) inset,
+      0 0 0 2px rgb(0 0 0 / 5%);
+  text-shadow: 0 1px rgb(0 0 0 / var(--glass-text-shadow-opacity, 5%));
+}
+
+@media (hover: hover) {
+  .wpuf-glass.wpuf-btn-active {
+    border: none;
+    -webkit-backdrop-filter: blur(var(--glass-blur, 40px));
+            backdrop-filter: blur(var(--glass-blur, 40px));
+    background-color: transparent;
+    background-image: linear-gradient(
+          135deg,
+          rgb(255 255 255 / var(--glass-opacity, 30%)) 0%,
+          rgb(0 0 0 / 0%) 100%
+        ),
+        linear-gradient(
+          var(--glass-reflex-degree, 100deg),
+          rgb(255 255 255 / var(--glass-reflex-opacity, 10%)) 25%,
+          rgb(0 0 0 / 0%) 25%
+        );
+    box-shadow: 0 0 0 1px rgb(255 255 255 / var(--glass-border-opacity, 10%)) inset,
+        0 0 0 2px rgb(0 0 0 / 5%);
+    text-shadow: 0 1px rgb(0 0 0 / var(--glass-text-shadow-opacity, 5%));
+  }
+}
+
+.wpuf-btm-nav-xs > *:where(.wpuf-active) {
+  border-top-width: 1px;
+}
+
+.wpuf-btm-nav-sm > *:where(.wpuf-active) {
+  border-top-width: 2px;
+}
+
+.wpuf-btm-nav-md > *:where(.wpuf-active) {
+  border-top-width: 2px;
+}
+
+.wpuf-btm-nav-lg > *:where(.wpuf-active) {
+  border-top-width: 4px;
+}
+
+.wpuf-join.wpuf-join-vertical {
+  flex-direction: column;
+}
+
+.wpuf-join.wpuf-join-vertical .wpuf-join-item:first-child:not(:last-child),
+  .wpuf-join.wpuf-join-vertical *:first-child:not(:last-child) .wpuf-join-item {
+  border-end-start-radius: 0;
+  border-end-end-radius: 0;
+  border-start-start-radius: inherit;
+  border-start-end-radius: inherit;
+}
+
+.wpuf-join.wpuf-join-vertical .wpuf-join-item:last-child:not(:first-child),
+  .wpuf-join.wpuf-join-vertical *:last-child:not(:first-child) .wpuf-join-item {
+  border-start-start-radius: 0;
+  border-start-end-radius: 0;
+  border-end-start-radius: inherit;
+  border-end-end-radius: inherit;
+}
+
+.wpuf-join.wpuf-join-horizontal {
+  flex-direction: row;
+}
+
+.wpuf-join.wpuf-join-horizontal .wpuf-join-item:first-child:not(:last-child),
+  .wpuf-join.wpuf-join-horizontal *:first-child:not(:last-child) .wpuf-join-item {
+  border-end-end-radius: 0;
+  border-start-end-radius: 0;
+  border-end-start-radius: inherit;
+  border-start-start-radius: inherit;
+}
+
+.wpuf-join.wpuf-join-horizontal .wpuf-join-item:last-child:not(:first-child),
+  .wpuf-join.wpuf-join-horizontal *:last-child:not(:first-child) .wpuf-join-item {
+  border-end-start-radius: 0;
+  border-start-start-radius: 0;
+  border-end-end-radius: inherit;
+  border-start-end-radius: inherit;
+}
+
+.wpuf-modal-top {
+  place-items: start;
+}
+
+.wpuf-modal-middle {
+  place-items: center;
+}
+
+.wpuf-modal-bottom {
+  place-items: end;
+}
+
 .wpuf-tabs-md :where(.wpuf-tab) {
   height: 2rem;
   font-size: 0.875rem;
@@ -2145,14 +3047,133 @@ input.wpuf-tab:checked + .wpuf-tab-content,
   right: 7%;
 }
 
+.wpuf-join.wpuf-join-vertical > :where(*:not(:first-child)) {
+  margin-left: 0px;
+  margin-right: 0px;
+  margin-top: -1px;
+}
+
 .wpuf-join.wpuf-join-vertical > :where(*:not(:first-child)):is(.wpuf-btn) {
   margin-top: calc(var(--border-btn) * -1);
 }
 
+.wpuf-join.wpuf-join-horizontal > :where(*:not(:first-child)) {
+  margin-top: 0px;
+  margin-bottom: 0px;
+  margin-inline-start: -1px;
+}
+
 .wpuf-join.wpuf-join-horizontal > :where(*:not(:first-child)):is(.wpuf-btn) {
   margin-inline-start: calc(var(--border-btn) * -1);
 }
 
+.wpuf-menu-xs :where(li:not(.wpuf-menu-title) > *:not(ul, details, .wpuf-menu-title)), .wpuf-menu-xs :where(li:not(.wpuf-menu-title) > details > summary:not(.wpuf-menu-title)) {
+  border-radius: 0.25rem;
+  padding-left: 0.5rem;
+  padding-right: 0.5rem;
+  padding-top: 0.25rem;
+  padding-bottom: 0.25rem;
+  font-size: 0.75rem;
+  line-height: 1rem;
+}
+
+.wpuf-menu-xs .wpuf-menu-title {
+  padding-left: 0.5rem;
+  padding-right: 0.5rem;
+  padding-top: 0.25rem;
+  padding-bottom: 0.25rem;
+}
+
+.wpuf-menu-sm :where(li:not(.wpuf-menu-title) > *:not(ul, details, .wpuf-menu-title)), .wpuf-menu-sm :where(li:not(.wpuf-menu-title) > details > summary:not(.wpuf-menu-title)) {
+  border-radius: var(--rounded-btn, 0.5rem);
+  padding-left: 0.75rem;
+  padding-right: 0.75rem;
+  padding-top: 0.25rem;
+  padding-bottom: 0.25rem;
+  font-size: 0.875rem;
+  line-height: 1.25rem;
+}
+
+.wpuf-menu-sm .wpuf-menu-title {
+  padding-left: 0.75rem;
+  padding-right: 0.75rem;
+  padding-top: 0.5rem;
+  padding-bottom: 0.5rem;
+}
+
+.wpuf-menu-md :where(li:not(.wpuf-menu-title) > *:not(ul, details, .wpuf-menu-title)), .wpuf-menu-md :where(li:not(.wpuf-menu-title) > details > summary:not(.wpuf-menu-title)) {
+  border-radius: var(--rounded-btn, 0.5rem);
+  padding-left: 1rem;
+  padding-right: 1rem;
+  padding-top: 0.5rem;
+  padding-bottom: 0.5rem;
+  font-size: 0.875rem;
+  line-height: 1.25rem;
+}
+
+.wpuf-menu-md .wpuf-menu-title {
+  padding-left: 1rem;
+  padding-right: 1rem;
+  padding-top: 0.5rem;
+  padding-bottom: 0.5rem;
+}
+
+.wpuf-menu-lg :where(li:not(.wpuf-menu-title) > *:not(ul, details, .wpuf-menu-title)), .wpuf-menu-lg :where(li:not(.wpuf-menu-title) > details > summary:not(.wpuf-menu-title)) {
+  border-radius: var(--rounded-btn, 0.5rem);
+  padding-left: 1.5rem;
+  padding-right: 1.5rem;
+  padding-top: 0.75rem;
+  padding-bottom: 0.75rem;
+  font-size: 1.125rem;
+  line-height: 1.75rem;
+}
+
+.wpuf-menu-lg .wpuf-menu-title {
+  padding-left: 1.5rem;
+  padding-right: 1.5rem;
+  padding-top: 0.75rem;
+  padding-bottom: 0.75rem;
+}
+
+.wpuf-modal-top :where(.wpuf-modal-box) {
+  width: 100%;
+  max-width: none;
+  --tw-translate-y: -2.5rem;
+  --tw-scale-x: 1;
+  --tw-scale-y: 1;
+  transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
+  border-bottom-right-radius: var(--rounded-box, 1rem);
+  border-bottom-left-radius: var(--rounded-box, 1rem);
+  border-top-left-radius: 0px;
+  border-top-right-radius: 0px;
+}
+
+.wpuf-modal-middle :where(.wpuf-modal-box) {
+  width: 91.666667%;
+  max-width: 32rem;
+  --tw-translate-y: 0px;
+  --tw-scale-x: .9;
+  --tw-scale-y: .9;
+  transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
+  border-top-left-radius: var(--rounded-box, 1rem);
+  border-top-right-radius: var(--rounded-box, 1rem);
+  border-bottom-right-radius: var(--rounded-box, 1rem);
+  border-bottom-left-radius: var(--rounded-box, 1rem);
+}
+
+.wpuf-modal-bottom :where(.wpuf-modal-box) {
+  width: 100%;
+  max-width: none;
+  --tw-translate-y: 2.5rem;
+  --tw-scale-x: 1;
+  --tw-scale-y: 1;
+  transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
+  border-top-left-radius: var(--rounded-box, 1rem);
+  border-top-right-radius: var(--rounded-box, 1rem);
+  border-bottom-right-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+
 .wpuf-tooltip {
   position: relative;
   display: inline-block;
@@ -2477,6 +3498,10 @@ input.wpuf-tab:checked + .wpuf-tab-content,
   top: 0px;
 }
 
+.wpuf-top-1 {
+  top: 0.25rem;
+}
+
 .wpuf-top-1\/2 {
   top: 50%;
 }
@@ -2573,6 +3598,11 @@ input.wpuf-tab:checked + .wpuf-tab-content,
   margin: 1rem;
 }
 
+.wpuf--mx-1 {
+  margin-left: -0.25rem;
+  margin-right: -0.25rem;
+}
+
 .wpuf--mx-1\.5 {
   margin-left: -0.375rem;
   margin-right: -0.375rem;
@@ -2588,6 +3618,11 @@ input.wpuf-tab:checked + .wpuf-tab-content,
   margin-right: -2rem;
 }
 
+.wpuf--my-1 {
+  margin-top: -0.25rem;
+  margin-bottom: -0.25rem;
+}
+
 .wpuf--my-1\.5 {
   margin-top: -0.375rem;
   margin-bottom: -0.375rem;
@@ -3066,6 +4101,10 @@ input.wpuf-tab:checked + .wpuf-tab-content,
   width: 100% !important;
 }
 
+.wpuf-w-1 {
+  width: 0.25rem;
+}
+
 .wpuf-w-1\/2 {
   width: 50%;
 }
@@ -3090,6 +4129,10 @@ input.wpuf-tab:checked + .wpuf-tab-content,
   width: 3rem;
 }
 
+.wpuf-w-2 {
+  width: 0.5rem;
+}
+
 .wpuf-w-2\/3 {
   width: 66.666667%;
 }
@@ -3244,6 +4287,10 @@ input.wpuf-tab:checked + .wpuf-tab-content,
   flex-grow: 1;
 }
 
+.wpuf-basis-1 {
+  flex-basis: 0.25rem;
+}
+
 .wpuf-basis-1\/2 {
   flex-basis: 50%;
 }
@@ -3252,6 +4299,10 @@ input.wpuf-tab:checked + .wpuf-tab-content,
   flex-basis: 20%;
 }
 
+.wpuf-basis-4 {
+  flex-basis: 1rem;
+}
+
 .wpuf-basis-4\/5 {
   flex-basis: 80%;
 }
@@ -3265,6 +4316,11 @@ input.wpuf-tab:checked + .wpuf-tab-content,
   transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
 }
 
+.wpuf--translate-y-1 {
+  --tw-translate-y: -0.25rem;
+  transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
+}
+
 .wpuf--translate-y-1\/2 {
   --tw-translate-y: -50%;
   transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
@@ -3420,6 +4476,11 @@ input.wpuf-tab:checked + .wpuf-tab-content,
   gap: 1.5rem;
 }
 
+.wpuf-gap-x-1 {
+  -moz-column-gap: 0.25rem;
+       column-gap: 0.25rem;
+}
+
 .wpuf-gap-x-1\.5 {
   -moz-column-gap: 0.375rem;
        column-gap: 0.375rem;
@@ -3706,6 +4767,11 @@ input.wpuf-tab:checked + .wpuf-tab-content,
   border-color: rgb(249 250 251 / var(--tw-border-opacity)) !important;
 }
 
+.\!wpuf-border-green-400 {
+  --tw-border-opacity: 1 !important;
+  border-color: rgb(74 222 128 / var(--tw-border-opacity)) !important;
+}
+
 .\!wpuf-border-red-500 {
   --tw-border-opacity: 1 !important;
   border-color: rgb(239 68 68 / var(--tw-border-opacity)) !important;
@@ -3819,6 +4885,11 @@ input.wpuf-tab:checked + .wpuf-tab-content,
   background-color: rgb(245 158 11 / var(--tw-bg-opacity));
 }
 
+.wpuf-bg-black {
+  --tw-bg-opacity: 1;
+  background-color: rgb(0 0 0 / var(--tw-bg-opacity));
+}
+
 .wpuf-bg-black\/25 {
   background-color: rgb(0 0 0 / 0.25);
 }
@@ -3968,6 +5039,10 @@ input.wpuf-tab:checked + .wpuf-tab-content,
   stroke: #f9fafb;
 }
 
+.wpuf-stroke-gray-500 {
+  stroke: #6b7280;
+}
+
 .\!wpuf-p-0 {
   padding: 0px !important;
 }
@@ -4034,6 +5109,11 @@ input.wpuf-tab:checked + .wpuf-tab-content,
   padding-right: 14px !important;
 }
 
+.\!wpuf-py-1 {
+  padding-top: 0.25rem !important;
+  padding-bottom: 0.25rem !important;
+}
+
 .\!wpuf-py-1\.5 {
   padding-top: 0.375rem !important;
   padding-bottom: 0.375rem !important;
@@ -4251,6 +5331,10 @@ input.wpuf-tab:checked + .wpuf-tab-content,
   padding-left: 48px;
 }
 
+.wpuf-pr-1 {
+  padding-right: 0.25rem;
+}
+
 .wpuf-pr-1\.5 {
   padding-right: 0.375rem;
 }
@@ -4699,6 +5783,12 @@ input.wpuf-tab:checked + .wpuf-tab-content,
   outline-color: #d1d5db;
 }
 
+.wpuf-ring {
+  --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);
+  --tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(3px + var(--tw-ring-offset-width)) var(--tw-ring-color);
+  box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000);
+}
+
 .wpuf-ring-0 {
   --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);
   --tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(0px + var(--tw-ring-offset-width)) var(--tw-ring-color);
@@ -4734,10 +5824,20 @@ input.wpuf-tab:checked + .wpuf-tab-content,
   --tw-ring-color: rgb(209 213 219 / var(--tw-ring-opacity));
 }
 
+.wpuf-ring-gray-900 {
+  --tw-ring-opacity: 1;
+  --tw-ring-color: rgb(17 24 39 / var(--tw-ring-opacity));
+}
+
 .wpuf-ring-gray-900\/5 {
   --tw-ring-color: rgb(17 24 39 / 0.05);
 }
 
+.wpuf-ring-green-600 {
+  --tw-ring-opacity: 1;
+  --tw-ring-color: rgb(22 163 74 / var(--tw-ring-opacity));
+}
+
 .wpuf-ring-green-600\/20 {
   --tw-ring-color: rgb(22 163 74 / 0.2);
 }
diff --git a/assets/js-templates/form-components.php b/assets/js-templates/form-components.php
index adadd650a..371fcace6 100644
--- a/assets/js-templates/form-components.php
+++ b/assets/js-templates/form-components.php
@@ -1436,15 +1436,17 @@ class="!wpuf-text-base"
         v-html ="get_term_dropdown_options()">
     </select>
 
-    <input
-        v-if="'ajax' === field.type"
-        type="text"
-        :class="builder_class_names('text')"
-        :placeholder="field.placeholder || 'Type to search ' + field.label"
-        :size="field.size"
-        value=""
-        autocomplete="off"
-    >
+    <div v-if="'ajax' === field.type" class="category-wrap">
+        <div>
+            <select
+                :class="builder_class_names('select')"
+                class="!wpuf-text-base"
+            >
+                <option class="wpuf-text-base !wpuf-leading-none"><?php esc_html_e( '— Select —', 'wp-user-frontend' ); ?></option>
+                <option v-for="term in sorted_terms" :value="term.id">{{ term.name }}</option>
+            </select>
+        </div>
+    </div>
 
     <div v-if="'multiselect' === field.type" class="category-wrap">
         <select
diff --git a/assets/js/wpuf-form-builder.js b/assets/js/wpuf-form-builder.js
index 283beff05..5368c12f7 100644
--- a/assets/js/wpuf-form-builder.js
+++ b/assets/js/wpuf-form-builder.js
@@ -136,7 +136,7 @@
                             });
                         }
 
-                        if ( ( payload.field_name === 'name'  && payload.value.length - 2 < payload.field_name.length ) || ! state.form_fields[i].hasOwnProperty('is_new') ) {
+                        if ( payload.field_name === 'name'  && payload.value.length - 2 < payload.field_name.length ) {
                             continue;
                         } else {
                             state.form_fields[i][payload.field_name] = payload.value;
diff --git a/includes/Ajax/Frontend_Form_Ajax.php b/includes/Ajax/Frontend_Form_Ajax.php
index f513304e2..3be2b642b 100644
--- a/includes/Ajax/Frontend_Form_Ajax.php
+++ b/includes/Ajax/Frontend_Form_Ajax.php
@@ -35,6 +35,7 @@ class Frontend_Form_Ajax {
     public function submit_post() {
         check_ajax_referer( 'wpuf_form_add' );
         add_filter( 'wpuf_form_fields', [ $this, 'add_field_settings' ] );
+        
         @header( 'Content-Type: application/json; charset=' . get_option( 'blog_charset' ) );
 
         $form_id               = isset( $_POST['form_id'] ) ? intval( wp_unslash( $_POST['form_id'] ) ) : 0;
@@ -514,6 +515,7 @@ public function send_mail_for_guest( $charging_enabled, $post_id, $form_id, $is_
         // now perform some post related actions. it should be done after other action. either count related problem emerge
         do_action( 'wpuf_add_post_after_insert', $post_id, $form_id, $this->form_settings, $meta_vars ); // plugin API to extend the functionality
 
+
         return $response;
     }
 
diff --git a/includes/Frontend/Frontend_Form.php b/includes/Frontend/Frontend_Form.php
index 992ad9574..e25b51a4c 100755
--- a/includes/Frontend/Frontend_Form.php
+++ b/includes/Frontend/Frontend_Form.php
@@ -20,6 +20,11 @@ public function __construct() {
         add_action( 'wpuf_guest_post_email_verified', [ $this, 'send_mail_to_admin_after_guest_mail_verified' ] );
 
         $this->set_wp_post_types();
+        
+        // Initialize WooCommerce hooks for proper attribute display
+        if ( method_exists( $this, 'init_woocommerce_hooks' ) ) {
+            $this->init_woocommerce_hooks();
+        }
 
         // Enable post edit link for post authors in frontend
         if ( ! is_admin() ) {
diff --git a/includes/Traits/FieldableTrait.php b/includes/Traits/FieldableTrait.php
index 394ac0081..5a6ad0b28 100644
--- a/includes/Traits/FieldableTrait.php
+++ b/includes/Traits/FieldableTrait.php
@@ -116,7 +116,7 @@ public function get_input_fields( $form_vars ) {
 
         foreach ( $form_vars as $key => $value ) {
             // get column field input fields
-            if ( $value['input_type'] == 'column_field' ) {
+            if ( 'column_field' === $value['input_type'] ) {
                 $inner_fields = $value['inner_fields'];
 
                 foreach ( $inner_fields as $column_key => $column_fields ) {
@@ -128,12 +128,12 @@ public function get_input_fields( $form_vars ) {
                             }
 
                             //separate the post and custom fields
-                            if ( isset( $column_field['is_meta'] ) && $column_field['is_meta'] == 'yes' ) {
+                            if ( isset( $column_field['is_meta'] ) && 'yes' === $column_field['is_meta'] ) {
                                 $meta_vars[] = $column_field;
                                 continue;
                             }
 
-                            if ( $column_field['input_type'] == 'taxonomy' ) {
+                            if ( 'taxonomy' === $column_field['input_type'] ) {
 
                                 // don't add "category"
                                 // if ( $column_field['name'] == 'category' ) {
@@ -156,17 +156,31 @@ public function get_input_fields( $form_vars ) {
             }
 
             //separate the post and custom fields
-            if ( isset( $value['is_meta'] ) && $value['is_meta'] == 'yes' ) {
+            if ( isset( $value['is_meta'] ) && 'yes' === $value['is_meta'] ) {
                 $meta_vars[] = $value;
                 continue;
             }
 
-            if ( $value['input_type'] == 'taxonomy' ) {
+            if ( 'taxonomy' === $value['input_type'] ) {
+                // Handle product categories and other WooCommerce taxonomies
+                if ( 'product_cat' === $value['name'] || 'product_category' === $value['name'] ) {
+                    $value['name'] = 'product_cat'; // Normalize to WooCommerce's taxonomy name
+                    $value['is_woocommerce'] = true;
+                }
+                
+                // Handle product tags
+                if ( 'product_tag' === $value['name'] ) {
+                    $value['is_woocommerce'] = true;
+                }
 
-                // don't add "category"
-                // if ( $value['name'] == 'category' ) {
-                //     continue;
-                // }
+                // Handle shipping class
+                if ( 'product_shipping_class' === $value['name'] ) {
+                    $value['is_woocommerce'] = true;
+                    $value['hierarchical'] = true;
+                    if ( empty( $value['type'] ) ) {
+                        $value['type'] = 'select';
+                    }
+                }
 
                 $taxonomy_vars[] = $value;
             } else {
@@ -205,10 +219,10 @@ public function on_edit_no_check_recaptcha( $post_vars ) {
                     wpuf()->ajax->send_error( __( 'Empty reCaptcha Field', 'wp-user-frontend' ) );
                 }
 
-                if ( $recaptcha_type == 'enable_no_captcha' ) {
+                if ( 'enable_no_captcha' === $recaptcha_type ) {
                     $no_captcha        = 1;
                     $invisible_captcha = 0;
-                } elseif ( $recaptcha_type == 'invisible_recaptcha' ) {
+                } elseif ( 'invisible_recaptcha' === $recaptcha_type ) {
                     $invisible_captcha = 1;
                     $no_captcha        = 0;
                 } else {
@@ -262,7 +276,7 @@ public function validate_re_captcha( $no_captcha = '', $invisible = '' ) {
         $remote_addr          = isset( $_SERVER['REMOTE_ADDR'] ) ? sanitize_text_field( wp_unslash( $_SERVER['REMOTE_ADDR'] ) ) : '';
         $g_recaptcha_response = isset( $_POST['g-recaptcha-response'] ) ? sanitize_text_field( wp_unslash( $_POST['g-recaptcha-response'] ) ) : '';
 
-        if ( $no_captcha == 1 && 0 == $invisible ) {
+        if ( 1 === $no_captcha && 0 === $invisible ) {
             if ( ! class_exists( 'WPUF_ReCaptcha' ) ) {
                 require_once WPUF_ROOT . '/Lib/recaptchalib_noCaptcha.php';
             }
@@ -278,7 +292,7 @@ public function validate_re_captcha( $no_captcha = '', $invisible = '' ) {
             if ( ! $resp->success ) {
                 $this->send_error( __( 'noCaptcha reCAPTCHA validation failed', 'wp-user-frontend' ) );
             }
-        } elseif ( $no_captcha == 0 && 0 == $invisible ) {
+        } elseif ( 0 === $no_captcha && 0 === $invisible ) {
             $recap_challenge = isset( $_POST['recaptcha_challenge_field'] ) ? sanitize_text_field( wp_unslash( $_POST['recaptcha_challenge_field'] ) ) : '';
             $recap_response  = isset( $_POST['recaptcha_response_field'] ) ? sanitize_text_field( wp_unslash( $_POST['recaptcha_response_field'] ) ) : '';
 
@@ -287,14 +301,14 @@ public function validate_re_captcha( $no_captcha = '', $invisible = '' ) {
             if ( ! $resp->is_valid ) {
                 $this->send_error( __( 'reCAPTCHA validation failed', 'wp-user-frontend' ) );
             }
-        } elseif ( $no_captcha == 0 && 1 == $invisible ) {
+        } elseif ( 0 === $no_captcha && 1 === $invisible ) {
             $response  = null;
             $recaptcha = isset( $_POST['g-recaptcha-response'] ) ? sanitize_text_field( wp_unslash( $_POST['g-recaptcha-response'] ) ) : '';
             $object    = new Invisible_Recaptcha( $site_key, $private_key );
 
             $response = $object->verifyResponse( $recaptcha );
 
-            if ( isset( $response['success'] ) and $response['success'] != true ) {
+            if ( isset( $response['success'] ) && true !== $response['success'] ) {
                 $this->send_error( __( 'Invisible reCAPTCHA validation failed', 'wp-user-frontend' ) );
             }
         }
@@ -438,106 +452,761 @@ public function update_post_meta( $meta_vars, $post_id ) {
      */
     public function set_custom_taxonomy( $post_id, $taxonomy_vars ) {
         check_ajax_referer( 'wpuf_form_add' );
-        // save any custom taxonomies
+        
         $woo_attr = [];
-
+        $is_product = 'product' === get_post_type( $post_id );
+        
+        // Store the form field labels for WooCommerce taxonomies
+        if ( $is_product ) {
+            $taxonomy_labels = [];
+            foreach ( $taxonomy_vars as $taxonomy ) {
+                if ( ! empty( $taxonomy['label'] ) && ! empty( $taxonomy['name'] ) ) {
+                    $taxonomy_labels[ $taxonomy['name'] ] = $taxonomy['label'];
+                }
+            }
+            
+            // Store labels in post meta for use in filter
+            if ( ! empty( $taxonomy_labels ) ) {
+                update_post_meta( $post_id, '_wpuf_taxonomy_labels', $taxonomy_labels );
+            }
+        }
+        
         foreach ( $taxonomy_vars as $taxonomy ) {
-            if ( isset( $_POST[ $taxonomy['name'] ] ) && is_array( $_POST[ $taxonomy['name'] ] ) ) {
-                $taxonomy_name = array_map( 'sanitize_text_field', wp_unslash( $_POST[ $taxonomy['name'] ] ) );
+            $taxonomy_name = $taxonomy['name'];
+            $posted_terms = isset( $_POST[$taxonomy_name] ) ? wp_unslash( $_POST[$taxonomy_name] ) : null;
+
+            // Use default terms if none posted
+            if ( empty( $posted_terms ) && ! empty( $taxonomy['default'] ) ) {
+                $posted_terms = $taxonomy['default'];
             }
 
-            if ( isset( $_POST[ $taxonomy['name'] ] ) && ! is_array( $_POST[ $taxonomy['name'] ] ) ) {
-                $taxonomy_name = sanitize_text_field( wp_unslash( $_POST[ $taxonomy['name'] ] ) );
+            if ( empty( $posted_terms ) ) {
+                continue;
+            }
+            
+            // Handle WooCommerce taxonomies if product post type
+            if ( 'product' === get_post_type( $post_id ) && class_exists( 'WooCommerce' ) ) {
+                $this->handle_woocommerce_taxonomy( $post_id, $taxonomy_name, $posted_terms, $taxonomy, $woo_attr );
+                continue;
+            }
 
-                if ( 'text' === $taxonomy['type'] ) {
-                    $terms = explode( ',', $taxonomy_name );
-                    $terms = array_map(
-                        function ( $term_name ) use ( $taxonomy ) {
-                            $term = get_term_by( 'name', $term_name, $taxonomy['name'] );
 
-                            if ( empty( $term_name ) ) {
-                                return null;
-                            }
+            // Handle regular taxonomies
+            $this->handle_regular_taxonomy( $post_id, $taxonomy_name, $posted_terms, $taxonomy );
+        }
 
-                            if ( $term instanceof \WP_Term ) {
-                                return $term->term_id;
-                            }
+        // Update WooCommerce attributes if any
+        if ( ! empty( $woo_attr ) ) {
+            update_post_meta( $post_id, '_product_attributes', $woo_attr );
+        }
+        
+        // Only do WooCommerce-specific processing if this is actually a product
+        if ( $is_product && function_exists( 'wc_delete_product_transients' ) ) {
+            // Ensure complete synchronization with WooCommerce
+            $this->sync_woocommerce_product_data( $post_id );
+            
+            // Force WooCommerce to recognize the changes
+            wc_delete_product_transients( $post_id );
+            clean_post_cache( $post_id );
+            
+            // Verify the final product type was saved correctly
+            if ( function_exists( 'wc_get_product' ) ) {
+                // Clear the product cache first
+                wp_cache_delete( 'product-' . $post_id, 'products' );
+                
+                // Check what product type is actually saved in the database
+                $saved_types = wp_get_object_terms( $post_id, 'product_type', array( 'fields' => 'slugs' ) );
+                
+                // Also check visibility terms
+                $saved_visibility = wp_get_object_terms( $post_id, 'product_visibility', array( 'fields' => 'slugs' ) );
+                
+                // Check if we have an intended product type stored
+                $intended_type = get_post_meta( $post_id, '_wpuf_intended_product_type', true );
+                if ( $intended_type ) {
+                    // If the saved type doesn't match the intended type, fix it
+                    if ( empty( $saved_types ) || ! in_array( $intended_type, $saved_types ) ) {
+                        wp_set_object_terms( $post_id, $intended_type, 'product_type', false );
+                        $this->sync_product_type_data( $post_id, $intended_type );
+                        
+                        // Clear the caches again
+                        wp_cache_delete( 'product-' . $post_id, 'products' );
+                        clean_object_term_cache( $post_id, 'product_type' );
+                    }
+                    // Clean up the meta
+                    delete_post_meta( $post_id, '_wpuf_intended_product_type' );
+                } elseif ( empty( $saved_types ) ) {
+                    // If no product type is set and no intended type, default to simple
+                    wp_set_object_terms( $post_id, 'simple', 'product_type', false );
+                    $this->sync_product_type_data( $post_id, 'simple' );
+                }
+            }
+        }
 
-                            $new_term = wp_insert_term( $term_name, $taxonomy['name'] );
+        return $woo_attr;
+    }
 
-                            return $new_term['term_id'];
-                        }, $terms
-                    );
+    /**
+     * Handle WooCommerce taxonomy terms
+     *
+     * @param int    $post_id
+     * @param string $taxonomy_name
+     * @param mixed  $posted_terms
+     * @param array  $taxonomy
+     * @param array  &$woo_attr
+     */
+    protected function handle_woocommerce_taxonomy( $post_id, $taxonomy_name, $posted_terms, $taxonomy, &$woo_attr ) {
+        // Map of core WooCommerce taxonomies and their handling methods
+        $core_woo_taxonomies = [
+            'product_type' => 'handle_product_type',
+            'product_cat' => 'handle_hierarchical_terms',
+            'product_tag' => 'handle_non_hierarchical_terms',
+            'product_shipping_class' => 'handle_shipping_class',
+            'product_visibility' => 'handle_product_visibility',
+        ];
+
+        // Check if it's a product attribute (starts with pa_)
+        if ( strpos( $taxonomy_name, 'pa_' ) === 0 ) {
+            $this->handle_product_attribute( $post_id, $taxonomy_name, $posted_terms, $taxonomy, $woo_attr );
+            return;
+        }
 
-                    $taxonomy_name = array_filter( $terms );
+        // Handle known core WooCommerce taxonomies
+        if ( isset( $core_woo_taxonomies[$taxonomy_name] ) ) {
+            $method = $core_woo_taxonomies[$taxonomy_name];
+            $this->$method( $post_id, $taxonomy_name, $posted_terms );
+            
+            // For system taxonomies, always add to attributes if visibility is enabled
+            // This ensures product_type, shipping_class, visibility show in Additional Information
+            if ( ! in_array( $taxonomy_name, ['product_cat', 'product_tag'] ) ) {
+                // Check if this should be visible in Additional Information
+                $should_show = false;
+                
+                // Always show core WooCommerce taxonomies if they have the woo_attr flag
+                if ( isset( $taxonomy['woo_attr'] ) && wpuf_is_checkbox_or_toggle_on( $taxonomy['woo_attr'] ) ) {
+                    $should_show = true;
+                } elseif ( isset( $taxonomy['woo_attr_vis'] ) && wpuf_is_checkbox_or_toggle_on( $taxonomy['woo_attr_vis'] ) ) {
+                    $should_show = true;
+                }
+                
+                if ( $should_show ) {
+                    $woo_attr[$taxonomy_name] = $this->build_woo_attribute( $taxonomy_name, $taxonomy );
                 }
             }
+            return;
+        }
 
-            // At this point $taxonomy_name should be a single id or array of ids
-            if ( isset( $taxonomy_name ) && $taxonomy_name != 0 && $taxonomy_name != -1 ) {
-                if ( is_object_in_taxonomy( $this->form_settings['post_type'], $taxonomy['name'] ) ) {
-                    $tax = $taxonomy_name;
-                    // if it's not an array, make it one
-                    if ( ! is_array( $tax ) ) {
-                        $tax = [ $tax ];
-                    }
+        // For any other taxonomy on a product (like custom brands, etc.)
+        // Treat as potential WooCommerce attribute  
+        if ( taxonomy_exists( $taxonomy_name ) ) {
+            $is_hierarchical = is_taxonomy_hierarchical( $taxonomy_name );
+            
+            if ( $is_hierarchical ) {
+                $this->handle_hierarchical_terms( $post_id, $taxonomy_name, $posted_terms );
+            } else {
+                $this->handle_non_hierarchical_terms( $post_id, $taxonomy_name, $posted_terms );
+            }
+            
+            // Add to WooCommerce attributes if enabled
+            if ( isset( $taxonomy['woo_attr'] ) && wpuf_is_checkbox_or_toggle_on( $taxonomy['woo_attr'] ) ) {
+                $woo_attr[$taxonomy_name] = $this->build_woo_attribute( $taxonomy_name, $taxonomy );
+            }
+        }
+    }
 
-                    if ( $taxonomy['type'] == 'text' ) {
-                        wp_set_object_terms( $post_id, $taxonomy_name, $taxonomy['name'] );
+    /**
+     * Handle product type taxonomy
+     */
+    protected function handle_product_type( $post_id, $taxonomy_name, $posted_terms ) {
+        // Log incoming data
+        
+        // First, completely clear ALL existing product types
+        $existing_types = wp_get_object_terms( $post_id, 'product_type', array( 'fields' => 'ids' ) );
+        if ( ! empty( $existing_types ) ) {
+            wp_remove_object_terms( $post_id, $existing_types, 'product_type' );
+        }
+        
+        if ( empty( $posted_terms ) ) {
+            wp_set_object_terms( $post_id, 'simple', 'product_type', false );
+            $this->sync_product_type_data( $post_id, 'simple' );
+            return;
+        }
 
-                        // woocommerce check
-                        if ( isset( $taxonomy['woo_attr'] ) && $taxonomy['woo_attr'] == 'yes' && ! empty( $taxonomy_name ) ) {
-                            $woo_attr[ $taxonomy['name'] ] = $this->woo_attribute( $taxonomy );
-                        }
-                    } else {
-                        if ( is_taxonomy_hierarchical( $taxonomy['name'] ) ) {
-                            wp_set_post_terms( $post_id, $taxonomy_name, $taxonomy['name'] );
+        $product_type = is_array( $posted_terms ) ? reset( $posted_terms ) : $posted_terms;
+        
+        // Map common term IDs to slugs
+        // These are the standard WooCommerce product type term IDs
+        $type_map = array(
+            '6' => 'simple',
+            '7' => 'grouped',
+            '8' => 'variable',
+            '9' => 'external'
+        );
+        
+        // Check if it's a known term ID
+        if ( isset( $type_map[ strval( $product_type ) ] ) ) {
+            $product_type = $type_map[ strval( $product_type ) ];
+        } elseif ( is_numeric( $product_type ) ) {
+            // Convert any other term ID to slug
+            $term = get_term( $product_type, 'product_type' );
+            if ( $term && ! is_wp_error( $term ) ) {
+                $product_type = $term->slug;
+            }
+        } else {
+            // Handle term name (like "Variable" or "variable")
+            // First try to get by slug
+            $term = get_term_by( 'slug', strtolower( $product_type ), 'product_type' );
+            if ( ! $term ) {
+                // Try by name
+                $term = get_term_by( 'name', $product_type, 'product_type' );
+            }
+            
+            if ( $term && ! is_wp_error( $term ) ) {
+                $product_type = $term->slug;
+            } else {
+                // Sanitize to create slug
+                $product_type = strtolower( sanitize_title( $product_type ) );
+            }
+        }
+        
+        
+        // Remove all existing product types first
+        wp_remove_object_terms( $post_id, array( 'simple', 'variable', 'grouped', 'external' ), 'product_type' );
+        
+        // Set the product type using term ID for better reliability
+        $term = get_term_by( 'slug', $product_type, 'product_type' );
+        if ( $term && ! is_wp_error( $term ) ) {
+            $result = wp_set_object_terms( $post_id, intval( $term->term_id ), 'product_type', false );
+        } else {
+            // Fallback to slug
+            $result = wp_set_object_terms( $post_id, $product_type, 'product_type', false );
+        }
+        
+        // Sync product type specific data with WooCommerce
+        $this->sync_product_type_data( $post_id, $product_type );
+        
+        // Clear caches to ensure WooCommerce recognizes the change
+        if ( function_exists( 'wc_get_product' ) ) {
+            wp_cache_delete( 'product-' . $post_id, 'products' );
+            wp_cache_delete( $post_id, 'post_meta' );
+            clean_object_term_cache( $post_id, 'product_type' );
+        }
+        
+        // Clear caches again
+        if ( function_exists( 'wc_delete_product_transients' ) ) {
+            wc_delete_product_transients( $post_id );
+        }
+        
+        // Final verification
+        $saved_types = wp_get_object_terms( $post_id, 'product_type', array( 'fields' => 'slugs' ) );
+        
+        // Store the intended product type in meta to preserve it
+        update_post_meta( $post_id, '_wpuf_intended_product_type', $product_type );
+    }
 
-                            // woocommerce check
-                            if ( isset( $taxonomy['woo_attr'] ) && $taxonomy['woo_attr'] == 'yes' && ! empty( $taxonomy_name ) ) {
-                                $woo_attr[ $taxonomy['name'] ] = $this->woo_attribute( $taxonomy );
-                            }
-                        } else {
-                            if ( $tax ) {
-                                $non_hierarchical = [];
+    /**
+     * Handle hierarchical terms (like product categories)
+     */
+    protected function handle_hierarchical_terms( $post_id, $taxonomy_name, $posted_terms ) {
+        // Clear existing terms first
+        wp_set_object_terms( $post_id, [], $taxonomy_name );
+        
+        if ( empty( $posted_terms ) ) {
+            return;
+        }
+        
+        $term_ids = $this->process_terms_to_ids( $posted_terms, $taxonomy_name );
+        
+        if ( ! empty( $term_ids ) ) {
+            wp_set_object_terms( $post_id, $term_ids, $taxonomy_name, false );
+        }
+    }
 
-                                foreach ( $tax as $value ) {
-                                    $term = get_term_by( 'id', $value, $taxonomy['name'] );
+    /**
+     * Handle non-hierarchical terms (like product tags)
+     */
+    protected function handle_non_hierarchical_terms( $post_id, $taxonomy_name, $posted_terms ) {
+        if ( empty( $posted_terms ) ) {
+            wp_set_object_terms( $post_id, [], $taxonomy_name );
+            return;
+        }
 
-                                    if ( $term && ! is_wp_error( $term ) ) {
-                                        $non_hierarchical[] = $term->name;
-                                    }
-                                }
+        $terms_array = is_array( $posted_terms ) ? $posted_terms : [ $posted_terms ];
+        $term_names = [];
 
-                                wp_set_post_terms( $post_id, $non_hierarchical, $taxonomy['name'] );
+        foreach ( $terms_array as $term ) {
+            if ( is_numeric( $term ) ) {
+                $term_obj = get_term( $term, $taxonomy_name );
+                if ( $term_obj && ! is_wp_error( $term_obj ) ) {
+                    $term_names[] = $term_obj->name;
+                }
+            } else {
+                $term_names[] = $term;
+            }
+        }
 
-                                // woocommerce check
-                                if ( isset( $taxonomy['woo_attr'] ) && $taxonomy['woo_attr'] == 'yes' && ! empty( $_POST[ $taxonomy['name'] ] ) ) {
-                                    $woo_attr[ $taxonomy['name'] ] = $this->woo_attribute( $taxonomy );
-                                }
-                            }
-                        } // hierarchical
-                    } // is text
-                } // is object tax
-            } // isset tax
+        if ( ! empty( $term_names ) ) {
+            wp_set_post_terms( $post_id, $term_names, $taxonomy_name, false );
+        }
+    }
 
-            else {
-                if ( isset( $taxonomy_name ) && 0 === absint( $taxonomy_name ) ) {
-                    wp_set_post_terms( $post_id, $taxonomy_name, $taxonomy['name'] );
+    /**
+     * Handle shipping class
+     */
+    protected function handle_shipping_class( $post_id, $taxonomy_name, $posted_terms ) {
+        // Clear existing shipping classes
+        wp_set_object_terms( $post_id, [], 'product_shipping_class' );
+        
+        if ( empty( $posted_terms ) || '0' === $posted_terms || '-1' === $posted_terms ) {
+            // No shipping class selected
+            return;
+        }
+        
+        // Handle both IDs and slugs
+        if ( is_numeric( $posted_terms ) ) {
+            $term = get_term( $posted_terms, 'product_shipping_class' );
+            if ( $term && ! is_wp_error( $term ) ) {
+                wp_set_object_terms( $post_id, $term->slug, 'product_shipping_class', false );
+            }
+        } else {
+            // It's already a slug or name
+            wp_set_object_terms( $post_id, $posted_terms, 'product_shipping_class', false );
+        }
+    }
+
+    /**
+     * Ensure complete synchronization with WooCommerce product data
+     *
+     * @param int $post_id
+     */
+    protected function sync_woocommerce_product_data( $post_id ) {
+        // Get current product type
+        $product_types = wp_get_object_terms( $post_id, 'product_type', array( 'fields' => 'slugs' ) );
+        $product_type = ! empty( $product_types ) ? $product_types[0] : 'simple';
+        
+        // Sync product type data
+        $this->sync_product_type_data( $post_id, $product_type );
+        
+        // Get visibility terms
+        $visibility_terms = wp_get_object_terms( $post_id, 'product_visibility', array( 'fields' => 'slugs' ) );
+        
+        // Sync visibility with meta
+        $this->sync_visibility_meta( $post_id, $visibility_terms );
+        
+        // Ensure product catalog visibility is set
+        if ( ! metadata_exists( 'post', $post_id, '_visibility' ) ) {
+            update_post_meta( $post_id, '_visibility', 'visible' );
+        }
+        
+        // Ensure stock status is set
+        if ( ! metadata_exists( 'post', $post_id, '_stock_status' ) ) {
+            update_post_meta( $post_id, '_stock_status', 'instock' );
+        }
+        
+        // Ensure manage stock is set
+        if ( ! metadata_exists( 'post', $post_id, '_manage_stock' ) ) {
+            update_post_meta( $post_id, '_manage_stock', 'no' );
+        }
+        
+        // Ensure SKU exists (even if empty)
+        if ( ! metadata_exists( 'post', $post_id, '_sku' ) ) {
+            update_post_meta( $post_id, '_sku', '' );
+        }
+        
+        // Set product status if not set
+        if ( ! metadata_exists( 'post', $post_id, '_status' ) ) {
+            update_post_meta( $post_id, '_status', 'publish' );
+        }
+    }
+    
+    /**
+     * Sync visibility meta with taxonomy terms
+     *
+     * @param int $post_id
+     * @param array $visibility_terms
+     */
+    protected function sync_visibility_meta( $post_id, $visibility_terms ) {
+        // Handle stock status
+        if ( in_array( 'outofstock', $visibility_terms ) ) {
+            update_post_meta( $post_id, '_stock_status', 'outofstock' );
+        }
+        
+        // Handle catalog visibility
+        if ( in_array( 'exclude-from-catalog', $visibility_terms ) && in_array( 'exclude-from-search', $visibility_terms ) ) {
+            update_post_meta( $post_id, '_visibility', 'hidden' );
+        } elseif ( in_array( 'exclude-from-catalog', $visibility_terms ) ) {
+            update_post_meta( $post_id, '_visibility', 'search' );
+        } elseif ( in_array( 'exclude-from-search', $visibility_terms ) ) {
+            update_post_meta( $post_id, '_visibility', 'catalog' );
+        } elseif ( ! in_array( 'featured', $visibility_terms ) && ! in_array( 'outofstock', $visibility_terms ) ) {
+            // Only set to visible if no special visibility terms
+            update_post_meta( $post_id, '_visibility', 'visible' );
+        }
+    }
+    
+    /**
+     * Sync product type specific meta data with WooCommerce
+     *
+     * @param int $post_id
+     * @param string $product_type
+     */
+    protected function sync_product_type_data( $post_id, $product_type ) {
+        // Store the product type to prevent WooCommerce from changing it
+        update_post_meta( $post_id, '_wpuf_product_type', $product_type );
+        
+        // Set product type specific meta based on WooCommerce standards
+        switch ( $product_type ) {
+            case 'external':
+                // External/Affiliate products
+                update_post_meta( $post_id, '_virtual', 'yes' );
+                update_post_meta( $post_id, '_downloadable', 'no' );
+                delete_post_meta( $post_id, '_manage_stock' );
+                delete_post_meta( $post_id, '_stock' );
+                delete_post_meta( $post_id, '_backorders' );
+                // External products need these fields
+                if ( ! metadata_exists( 'post', $post_id, '_product_url' ) ) {
+                    update_post_meta( $post_id, '_product_url', '' );
+                }
+                if ( ! metadata_exists( 'post', $post_id, '_button_text' ) ) {
+                    update_post_meta( $post_id, '_button_text', '' );
+                }
+                break;
+                
+            case 'grouped':
+                // Grouped products
+                update_post_meta( $post_id, '_virtual', 'no' );
+                update_post_meta( $post_id, '_downloadable', 'no' );
+                delete_post_meta( $post_id, '_manage_stock' );
+                delete_post_meta( $post_id, '_stock' );
+                delete_post_meta( $post_id, '_backorders' );
+                // Grouped products need children
+                if ( ! metadata_exists( 'post', $post_id, '_children' ) ) {
+                    update_post_meta( $post_id, '_children', array() );
+                }
+                break;
+                
+            case 'variable':
+                // Variable products - MUST have specific meta to prevent WooCommerce from resetting
+                update_post_meta( $post_id, '_virtual', 'no' );
+                update_post_meta( $post_id, '_downloadable', 'no' );
+                delete_post_meta( $post_id, '_manage_stock' );
+                delete_post_meta( $post_id, '_stock' );
+                delete_post_meta( $post_id, '_backorders' );
+                
+                // Critical: Variable products need these to be recognized
+                if ( ! metadata_exists( 'post', $post_id, '_product_attributes' ) ) {
+                    // Set empty attributes array to prevent reset
+                    update_post_meta( $post_id, '_product_attributes', array() );
+                }
+                
+                // Set default variation data
+                if ( ! metadata_exists( 'post', $post_id, '_default_attributes' ) ) {
+                    update_post_meta( $post_id, '_default_attributes', array() );
                 }
+                
+                // Variable products need min/max prices
+                if ( ! metadata_exists( 'post', $post_id, '_min_variation_price' ) ) {
+                    update_post_meta( $post_id, '_min_variation_price', '' );
+                    update_post_meta( $post_id, '_max_variation_price', '' );
+                    update_post_meta( $post_id, '_min_price_variation_id', '' );
+                    update_post_meta( $post_id, '_max_price_variation_id', '' );
+                    update_post_meta( $post_id, '_min_variation_regular_price', '' );
+                    update_post_meta( $post_id, '_max_variation_regular_price', '' );
+                    update_post_meta( $post_id, '_min_regular_price_variation_id', '' );
+                    update_post_meta( $post_id, '_max_regular_price_variation_id', '' );
+                    update_post_meta( $post_id, '_min_variation_sale_price', '' );
+                    update_post_meta( $post_id, '_max_variation_sale_price', '' );
+                    update_post_meta( $post_id, '_min_sale_price_variation_id', '' );
+                    update_post_meta( $post_id, '_max_sale_price_variation_id', '' );
+                }
+                break;
+                
+            case 'simple':
+            default:
+                // Simple products - don't change existing meta unless necessary
+                if ( ! metadata_exists( 'post', $post_id, '_virtual' ) ) {
+                    update_post_meta( $post_id, '_virtual', 'no' );
+                }
+                if ( ! metadata_exists( 'post', $post_id, '_downloadable' ) ) {
+                    update_post_meta( $post_id, '_downloadable', 'no' );
+                }
+                break;
+        }
+        
+        // Ensure basic product meta exists for all types
+        if ( ! metadata_exists( 'post', $post_id, '_regular_price' ) ) {
+            update_post_meta( $post_id, '_regular_price', '' );
+        }
+        if ( ! metadata_exists( 'post', $post_id, '_sale_price' ) ) {
+            update_post_meta( $post_id, '_sale_price', '' );
+        }
+        if ( ! metadata_exists( 'post', $post_id, '_price' ) ) {
+            update_post_meta( $post_id, '_price', '' );
+        }
+        
+        // Ensure tax and shipping data exists
+        if ( ! metadata_exists( 'post', $post_id, '_tax_status' ) ) {
+            update_post_meta( $post_id, '_tax_status', 'taxable' );
+        }
+        if ( ! metadata_exists( 'post', $post_id, '_tax_class' ) ) {
+            update_post_meta( $post_id, '_tax_class', '' );
+        }
+        if ( ! metadata_exists( 'post', $post_id, '_weight' ) ) {
+            update_post_meta( $post_id, '_weight', '' );
+        }
+        if ( ! metadata_exists( 'post', $post_id, '_length' ) ) {
+            update_post_meta( $post_id, '_length', '' );
+        }
+        if ( ! metadata_exists( 'post', $post_id, '_width' ) ) {
+            update_post_meta( $post_id, '_width', '' );
+        }
+        if ( ! metadata_exists( 'post', $post_id, '_height' ) ) {
+            update_post_meta( $post_id, '_height', '' );
+        }
+    }
+    
+    /**
+     * Handle product visibility
+     */
+    protected function handle_product_visibility( $post_id, $taxonomy_name, $posted_terms ) {
+        
+        // Clear ALL existing visibility terms first
+        $existing_terms = wp_get_object_terms( $post_id, 'product_visibility', array( 'fields' => 'ids' ) );
+        if ( ! empty( $existing_terms ) ) {
+            wp_remove_object_terms( $post_id, $existing_terms, 'product_visibility' );
+        }
+        
+        if ( empty( $posted_terms ) ) {
+            return;
+        }
+        
+        // Build a mapping of all visibility term IDs to slugs
+        $visibility_map = array();
+        $all_visibility_terms = get_terms( array(
+            'taxonomy' => 'product_visibility',
+            'hide_empty' => false
+        ) );
+        
+        foreach ( $all_visibility_terms as $term ) {
+            $visibility_map[ strval( $term->term_id ) ] = $term->slug;
+        }
+        
+        
+        // Handle both single and multiple visibility terms
+        $terms_to_set = array();
+        $visibility_terms = is_array( $posted_terms ) ? $posted_terms : array( $posted_terms );
+        
+        foreach ( $visibility_terms as $term ) {
+            $slug = null;
+            
+            // Check if it's a known term ID
+            if ( isset( $visibility_map[ strval( $term ) ] ) ) {
+                $slug = $visibility_map[ strval( $term ) ];
+            } elseif ( is_numeric( $term ) ) {
+                // Try to get term by ID
+                $term_obj = get_term( $term, 'product_visibility' );
+                if ( $term_obj && ! is_wp_error( $term_obj ) ) {
+                    $slug = $term_obj->slug;
+                }
+            } else {
+                // It's already a slug or name
+                $term_obj = get_term_by( 'slug', $term, 'product_visibility' );
+                if ( ! $term_obj ) {
+                    $term_obj = get_term_by( 'name', $term, 'product_visibility' );
+                }
+                if ( $term_obj && ! is_wp_error( $term_obj ) ) {
+                    $slug = $term_obj->slug;
+                } else {
+                    $slug = sanitize_title( $term );
+                }
+            }
+            
+            if ( $slug ) {
+                $terms_to_set[] = $slug;
+            }
+        }
+        
+        
+        if ( ! empty( $terms_to_set ) ) {
+            $result = wp_set_object_terms( $post_id, $terms_to_set, 'product_visibility', false );
+            
+            // Update WooCommerce meta values based on visibility terms
+            // Handle stock status
+            if ( in_array( 'outofstock', $terms_to_set ) ) {
+                update_post_meta( $post_id, '_stock_status', 'outofstock' );
+            } else {
+                // Don't change stock status if not explicitly set to outofstock
+                // This preserves the existing stock status
+            }
+            
+            // Handle catalog visibility
+            // WooCommerce uses _visibility meta with values: visible, catalog, search, hidden
+            $current_visibility = get_post_meta( $post_id, '_visibility', true );
+            if ( ! $current_visibility ) {
+                $current_visibility = 'visible'; // Default
+            }
+            
+            if ( in_array( 'exclude-from-catalog', $terms_to_set ) && in_array( 'exclude-from-search', $terms_to_set ) ) {
+                update_post_meta( $post_id, '_visibility', 'hidden' );
+            } elseif ( in_array( 'exclude-from-catalog', $terms_to_set ) ) {
+                update_post_meta( $post_id, '_visibility', 'search' );
+            } elseif ( in_array( 'exclude-from-search', $terms_to_set ) ) {
+                update_post_meta( $post_id, '_visibility', 'catalog' );
+            } else {
+                // If no exclusion terms, set to visible
+                if ( ! in_array( 'featured', $terms_to_set ) && ! in_array( 'outofstock', $terms_to_set ) && 
+                     ! preg_grep( '/^rated-/', $terms_to_set ) ) {
+                    // Only set to visible if there are no other special visibility terms
+                    update_post_meta( $post_id, '_visibility', 'visible' );
+                }
+            }
+        }
+        
+        // Verify what was saved
+        $saved_terms = wp_get_object_terms( $post_id, 'product_visibility', array( 'fields' => 'slugs' ) );
+    }
 
-                if ( ! isset( $taxonomy['woo_attr'] ) ) {
-                    $this->set_default_taxonomy( $post_id );
+    /**
+     * Handle product attributes
+     */
+    protected function handle_product_attribute( $post_id, $taxonomy_name, $posted_terms, $taxonomy, &$woo_attr ) {
+        // Clear existing terms first
+        wp_set_object_terms( $post_id, [], $taxonomy_name );
+        
+        if ( ! empty( $posted_terms ) ) {
+            // Process terms to IDs for consistent handling
+            $term_ids = $this->process_terms_to_ids( $posted_terms, $taxonomy_name );
+            
+            if ( ! empty( $term_ids ) ) {
+                wp_set_object_terms( $post_id, $term_ids, $taxonomy_name, false );
+            }
+        }
+        
+        // Always add product attributes to WooCommerce attributes array
+        // The visibility checkbox controls if it shows on product page
+        $woo_attr[$taxonomy_name] = $this->build_woo_attribute( $taxonomy_name, $taxonomy );
+    }
+
+    /**
+     * Handle regular (non-WooCommerce) taxonomies
+     */
+    protected function handle_regular_taxonomy( $post_id, $taxonomy_name, $posted_terms, $taxonomy ) {
+        $is_hierarchical = is_taxonomy_hierarchical( $taxonomy_name );
+        
+        if ( isset( $taxonomy['type'] ) && 'text' === $taxonomy['type'] ) {
+            // Handle text input (comma-separated values)
+            $this->handle_text_taxonomy( $post_id, $taxonomy_name, $posted_terms );
+        } else {
+            // Handle select/checkbox/radio inputs
+            $term_ids = $this->process_terms_to_ids( $posted_terms, $taxonomy_name );
+            
+            if ( ! empty( $term_ids ) ) {
+                if ( $is_hierarchical ) {
+                    wp_set_object_terms( $post_id, $term_ids, $taxonomy_name );
+                } else {
+                    // Convert IDs to names for non-hierarchical taxonomies
+                    $term_names = [];
+                    foreach ( $term_ids as $term_id ) {
+                        $term = get_term( $term_id, $taxonomy_name );
+                        if ( $term && ! is_wp_error( $term ) ) {
+                            $term_names[] = $term->name;
+                        }
+                    }
+                    wp_set_post_terms( $post_id, $term_names, $taxonomy_name );
                 }
             }
         }
+    }
 
-        // if a woocommerce attribute
-        if ( $woo_attr ) {
-            update_post_meta( $post_id, '_product_attributes', $woo_attr );
+    /**
+     * Handle text-based taxonomy input
+     */
+    protected function handle_text_taxonomy( $post_id, $taxonomy_name, $posted_terms ) {
+        $terms = is_array( $posted_terms ) ? $posted_terms : explode( ',', $posted_terms );
+        $terms = array_map( 'trim', $terms );
+        $terms = array_filter( $terms );
+        
+        $term_ids = [];
+        foreach ( $terms as $term ) {
+            $existing = term_exists( $term, $taxonomy_name );
+            if ( ! $existing ) {
+                $new_term = wp_insert_term( $term, $taxonomy_name );
+                if ( ! is_wp_error( $new_term ) ) {
+                    $term_ids[] = $new_term['term_id'];
+                }
+            } else {
+                $term_ids[] = is_array( $existing ) ? $existing['term_id'] : $existing;
+            }
         }
+        
+        if ( ! empty( $term_ids ) ) {
+            wp_set_object_terms( $post_id, $term_ids, $taxonomy_name );
+        }
+    }
 
-        return $woo_attr;
+    /**
+     * Process terms to IDs
+     */
+    protected function process_terms_to_ids( $posted_terms, $taxonomy_name ) {
+        $terms = is_array( $posted_terms ) ? $posted_terms : [ $posted_terms ];
+        $term_ids = [];
+        
+        foreach ( $terms as $term ) {
+            if ( empty( $term ) ) {
+                continue;
+            }
+            
+            if ( is_numeric( $term ) ) {
+                $term_obj = get_term( $term, $taxonomy_name );
+                if ( $term_obj && ! is_wp_error( $term_obj ) ) {
+                    $term_ids[] = (int) $term;
+                }
+            } else {
+                $existing = term_exists( $term, $taxonomy_name );
+                if ( $existing ) {
+                    $term_ids[] = is_array( $existing ) ? $existing['term_id'] : $existing;
+                } else {
+                    // Create new term if it doesn't exist
+                    $new_term = wp_insert_term( $term, $taxonomy_name );
+                    if ( ! is_wp_error( $new_term ) ) {
+                        $term_ids[] = $new_term['term_id'];
+                    }
+                }
+            }
+        }
+        
+        return array_unique( $term_ids );
+    }
+
+    /**
+     * Build WooCommerce attribute array
+     */
+    protected function build_woo_attribute( $taxonomy_name, $taxonomy ) {
+        // Only exclude product_cat and product_tag from attributes
+        // Allow product_type, shipping_class, visibility, brand to show if enabled
+        $excluded = [ 'product_cat', 'product_tag', 'product_brand' ];
+        if ( in_array( $taxonomy_name, $excluded ) ) {
+            return [];
+        }
+        
+        // PRIORITY 1: Always use the form field label if available
+        $label = '';
+        if ( ! empty( $taxonomy['label'] ) ) {
+            $label = $taxonomy['label'];
+        } else {
+            // If no form label, just use the taxonomy name as-is to match the form
+            // This ensures consistency between form and display
+            $label = $taxonomy_name;
+        }
+        
+        return [
+            'name'         => $taxonomy_name,
+            'value'        => '', // WooCommerce will populate this from the actual terms
+            'is_visible'   => isset( $taxonomy['woo_attr_vis'] ) && wpuf_is_checkbox_or_toggle_on( $taxonomy['woo_attr_vis'] ) ? 1 : 0,
+            'is_variation' => 0,
+            'is_taxonomy'  => 1,
+            'position'     => 0,
+            'label'        => $label,
+        ];
     }
 
     /**
@@ -598,7 +1267,7 @@ public static function prepare_meta_fields( $meta_vars ) {
                     $repeater_value = wp_unslash( $_POST[ $value['name'] ] ); // WPCS: sanitization ok.
 
                     // if it is a multi column repeat field
-                    if ( isset( $value['multiple'] ) && $value['multiple'] == 'true' ) {
+                    if ( isset( $value['multiple'] ) && 'true' === $value['multiple'] ) {
 
                         // if there's any items in the array, process it
                         if ( $repeater_value ) {
@@ -682,9 +1351,9 @@ public static function prepare_meta_fields( $meta_vars ) {
                     if ( ! empty( $value_name ) && is_array( $value_name ) ) {
                         $acf_compatibility = wpuf_get_option( 'wpuf_compatibility_acf', 'wpuf_general', 'no' );
 
-                        if ( $value['input_type'] == 'address' ) {
+                        if ( 'address' === $value['input_type'] ) {
                             $meta_key_value[ $value['name'] ] = $value_name;
-                        } elseif ( ! empty( $acf_compatibility ) && $acf_compatibility == 'yes' ) {
+                        } elseif ( ! empty( $acf_compatibility ) && 'yes' === $acf_compatibility ) {
                             $meta_key_value[ $value['name'] ] = $value_name;
                         } else {
                             $meta_key_value[ $value['name'] ] = implode( self::$separator, $value_name );
@@ -739,14 +1408,216 @@ public function search( $the_array, $key, $value ) {
      */
     public function woo_attribute( $taxonomy ) {
         check_ajax_referer( 'wpuf_form_add' );
-        $taxonomy_name = isset( $_POST[ $taxonomy['name'] ] ) ? sanitize_text_field( wp_unslash( $_POST[ $taxonomy['name'] ] ) ) : '';
-
+        
+        // Only exclude main categories and tags from additional information display
+        $excluded_taxonomies = [ 'product_cat', 'product_tag', 'product_brand' ];
+        if ( in_array( $taxonomy['name'], $excluded_taxonomies ) ) {
+            return [];
+        }
+        
+        // Special handling for product_brand - exclude if not specifically marked as visible
+        if ( 'product_brand' === $taxonomy['name'] && empty( $taxonomy['woo_attr_vis'] ) ) {
+            return [];
+        }
+        
+        $terms = $taxonomy['terms'] ?? [];
+        
+        if ( ! is_array( $terms ) ) {
+            $terms = [ $terms ];
+        }
+        
+        // Convert term IDs to term values for WooCommerce
+        $term_values = [];
+        foreach ( $terms as $term ) {
+            if ( empty( $term ) ) {
+                continue;
+            }
+            
+            if ( is_numeric( $term ) ) {
+                $term_obj = get_term( $term, $taxonomy['name'] );
+                if ( $term_obj && ! is_wp_error( $term_obj ) ) {
+                    $term_values[] = $term_obj->name;
+                }
+            } else {
+                // For text inputs, check if term exists or create it
+                $existing_term = term_exists( $term, $taxonomy['name'] );
+                if ( ! $existing_term ) {
+                    $new_term = wp_insert_term( $term, $taxonomy['name'] );
+                    if ( ! is_wp_error( $new_term ) ) {
+                        $term_values[] = $term;
+                    }
+                } else {
+                    $term_values[] = $term;
+                }
+            }
+        }
+        
+        // Get proper attribute label - prioritize form field label
+        $attribute_label = '';
+        
+        // First priority: Use the label from the form field configuration
+        if ( ! empty( $taxonomy['label'] ) ) {
+            $attribute_label = $taxonomy['label'];
+        } else {
+            // Second priority: Try WooCommerce attribute label
+            $attribute_label = wc_attribute_label( $taxonomy['name'] );
+            if ( empty( $attribute_label ) ) {
+                // Final fallback: format the taxonomy name
+                $attribute_label = ucwords( str_replace( [ '_', 'pa_' ], ' ', $taxonomy['name'] ) );
+            }
+        }
+        
         return [
-            'name'         => ! empty( $taxonomy['name'] ) ? $taxonomy['name'] : '',
-            'value'        => $taxonomy_name,
+            'name'         => $taxonomy['name'],
+            'value'        => implode( ' | ', array_filter( $term_values ) ),
             'is_visible'   => ! empty( $taxonomy['woo_attr_vis'] ) && ( 'yes' === $taxonomy['woo_attr_vis'] ) ? 1 : 0,
             'is_variation' => 0,
             'is_taxonomy'  => 1,
+            'position'     => 0,
+            'label'        => $attribute_label, // Use form-level label
         ];
     }
+
+    /**
+     * Initialize WooCommerce hooks
+     * Call this method when using the trait to set up required filters
+     *
+     * @since 4.0.6
+     */
+    public function init_woocommerce_hooks() {
+        if ( class_exists( 'WooCommerce' ) ) {
+            add_filter( 'woocommerce_display_product_attributes', [ $this, 'filter_woocommerce_product_attributes' ], 10, 2 );
+        }
+    }
+
+    /**
+     * Filter WooCommerce product attributes to exclude main taxonomies and show proper labels
+     *
+     * @param array $product_attributes
+     * @param \WC_Product $product
+     * @return array
+     */
+    public function filter_woocommerce_product_attributes( $product_attributes, $product ) {
+        // Remove product categories, tags, and brands from additional information
+        $unwanted_keys = [ 'product_cat', 'product_tag', 'product_brand' ];
+        foreach ( $unwanted_keys as $unwanted ) {
+            unset( $product_attributes[ $unwanted ] );
+        }
+
+        // For WPUF products, do additional processing
+        $form_id = get_post_meta( $product->get_id(), '_wpuf_form_id', true );
+        if ( ! $form_id ) {
+            return $product_attributes;
+        }
+
+        // Get form configuration to access field labels
+        $form_fields = get_post_meta( $form_id, 'wpuf_form', true );
+        $field_labels = [];
+        
+        // Extract field labels for taxonomy fields
+        if ( ! empty( $form_fields ) && is_array( $form_fields ) ) {
+            foreach ( $form_fields as $field ) {
+                if ( isset( $field['input_type'] ) && $field['input_type'] === 'taxonomy' && ! empty( $field['name'] ) && ! empty( $field['label'] ) ) {
+                    $field_labels[ $field['name'] ] = $field['label'];
+                }
+            }
+        }
+
+        // Process remaining attributes to ensure proper labels and values
+        foreach ( $product_attributes as $key => &$attribute ) {
+            // Skip weight and dimensions as they're handled by WooCommerce
+            if ( in_array( $key, [ 'weight', 'dimensions' ] ) ) {
+                continue;
+            }
+
+            // For attributes with 'attribute_' prefix, extract the actual taxonomy name
+            $taxonomy_name = $key;
+            if ( strpos( $key, 'attribute_' ) === 0 ) {
+                $taxonomy_name = substr( $key, 10 ); // Remove 'attribute_' prefix
+            }
+            
+            // ALWAYS use form-level labels if available for consistency
+            if ( ! empty( $field_labels[ $taxonomy_name ] ) ) {
+                $attribute['label'] = $field_labels[ $taxonomy_name ];
+            }
+            // If no form label found, keep the existing label (which should match the taxonomy name)
+
+            // Strip HTML tags from values first (WooCommerce may wrap values in HTML)
+            if ( ! empty( $attribute['value'] ) ) {
+                $attribute['value'] = wp_strip_all_tags( $attribute['value'] );
+            }
+            
+            // Ensure values are displayed as term names, not IDs
+            if ( taxonomy_exists( $taxonomy_name ) ) {
+                
+                $terms = get_the_terms( $product->get_id(), $taxonomy_name );
+                if ( $terms && ! is_wp_error( $terms ) ) {
+                    $term_names = [];
+                    foreach ( $terms as $term ) {
+                        // Special handling for certain taxonomies
+                        if ( 'product_shipping_class' === $taxonomy_name && '-1' === $term->name ) {
+                            $term_names[] = 'No shipping class';
+                        } elseif ( 'product_shipping_class' === $taxonomy_name && is_numeric( $term->name ) ) {
+                            // If shipping class term name is numeric, it might be referencing another term ID
+                            $real_term = get_term( intval( $term->name ), $taxonomy_name );
+                            if ( $real_term && ! is_wp_error( $real_term ) ) {
+                                $term_names[] = $real_term->name;
+                            } else {
+                                $term_names[] = $term->name;
+                            }
+                        } elseif ( 'product_visibility' === $taxonomy_name ) {
+                            // Keep visibility terms as-is (don't format them)
+                            $term_names[] = $term->name;
+                        } elseif ( 'product_type' === $taxonomy_name ) {
+                            // For product type, ensure we show the actual saved value
+                            $term_names[] = $term->slug; // Use slug for product type
+                        } else {
+                            $term_names[] = $term->name;
+                        }
+                    }
+                    if ( ! empty( $term_names ) ) {
+                        $attribute['value'] = implode( ', ', $term_names );
+                    }
+                } else {
+                    // If no terms found via get_the_terms, but attribute has a value,
+                    // try to convert ID values to term names
+                    if ( ! empty( $attribute['value'] ) ) {
+                        $value_parts = explode( ', ', $attribute['value'] );
+                        $converted_values = [];
+                        
+                        foreach ( $value_parts as $part ) {
+                            $part = trim( $part );
+                            // Check if it's a numeric ID
+                            if ( is_numeric( $part ) ) {
+                                $term = get_term( $part, $taxonomy_name );
+                                if ( $term && ! is_wp_error( $term ) ) {
+                                    if ( 'product_shipping_class' === $taxonomy_name && '-1' === $term->name ) {
+                                        $converted_values[] = 'No shipping class';
+                                    } elseif ( 'product_visibility' === $taxonomy_name ) {
+                                        // Keep visibility as-is
+                                        $converted_values[] = $term->name;
+                                    } elseif ( 'product_type' === $taxonomy_name ) {
+                                        // Use slug for product type
+                                        $converted_values[] = $term->slug;
+                                    } else {
+                                        $converted_values[] = $term->name;
+                                    }
+                                } else {
+                                    $converted_values[] = $part; // Keep original if conversion fails
+                                }
+                            } else {
+                                $converted_values[] = $part; // Keep original if not numeric
+                            }
+                        }
+                        
+                        if ( ! empty( $converted_values ) ) {
+                            $attribute['value'] = implode( ', ', $converted_values );
+                        }
+                    }
+                }
+            }
+        }
+
+        return $product_attributes;
+    }
 }
diff --git a/includes/functions/woocommerce-attribute-labels.php b/includes/functions/woocommerce-attribute-labels.php
new file mode 100644
index 000000000..f83141d9d
--- /dev/null
+++ b/includes/functions/woocommerce-attribute-labels.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * WooCommerce Attribute Label Customizations for WP User Frontend
+ *
+ * @package WPUF
+ */
+
+// Hook into WordPress init to register our filter
+add_action( 'init', 'wpuf_init_woocommerce_attribute_labels' );
+
+/**
+ * Initialize WooCommerce attribute label filters
+ */
+function wpuf_init_woocommerce_attribute_labels() {
+    if ( ! class_exists( 'WooCommerce' ) ) {
+        return;
+    }
+    
+    add_filter( 'woocommerce_attribute_label', 'wpuf_customize_woocommerce_attribute_labels', 20, 3 );
+}
+
+/**
+ * Customize WooCommerce attribute labels based on form field labels
+ *
+ * @param string $label The attribute label
+ * @param string $name The attribute name  
+ * @param WC_Product|null $product The product object
+ * @return string Modified label
+ */
+function wpuf_customize_woocommerce_attribute_labels( $label, $name, $product ) {
+    // First check if we have stored labels for this specific product
+    if ( $product && is_a( $product, 'WC_Product' ) ) {
+        $taxonomy_labels = get_post_meta( $product->get_id(), '_wpuf_taxonomy_labels', true );
+        
+        if ( ! empty( $taxonomy_labels ) && isset( $taxonomy_labels[ $name ] ) ) {
+            return $taxonomy_labels[ $name ];
+        }
+    }
+    
+    // If this is being displayed in admin or frontend without a product context,
+    // or if no stored label exists, use proper default labels for known taxonomies
+    $default_labels = [
+        'product_shipping_class' => __( 'Product shipping class', 'wp-user-frontend' ),
+        'product_visibility' => __( 'Product visibility', 'wp-user-frontend' ),
+        'product_type' => __( 'Product Type', 'wp-user-frontend' ),
+    ];
+    
+    if ( isset( $default_labels[ $name ] ) ) {
+        return $default_labels[ $name ];
+    }
+    
+    return $label;
+}
\ No newline at end of file
diff --git a/wpuf-functions.php b/wpuf-functions.php
index 72c875d39..892af4cad 100644
--- a/wpuf-functions.php
+++ b/wpuf-functions.php
@@ -5,6 +5,11 @@
 use WeDevs\Wpuf\Free\Pro_Prompt;
 use WeDevs\Wpuf\Frontend\Payment;
 
+// Include WooCommerce attribute label customizations
+if ( file_exists( WPUF_INCLUDES . '/functions/woocommerce-attribute-labels.php' ) ) {
+    require_once WPUF_INCLUDES . '/functions/woocommerce-attribute-labels.php';
+}
+
 /**
  * Start output buffering
  *