diff --git a/pom.xml b/pom.xml
index 17f8c95..866a798 100644
--- a/pom.xml
+++ b/pom.xml
@@ -512,7 +512,7 @@
 				<maven.compiler.target>17</maven.compiler.target>
 				<vaadin.version>24.2.6</vaadin.version>
 				<jetty.version>11.0.12</jetty.version>
-				<flowingcode.commons.demo.version>4.1.0</flowingcode.commons.demo.version>
+				<flowingcode.commons.demo.version>5.2.0</flowingcode.commons.demo.version>
 			</properties>
 			<repositories>
 				<repository>
@@ -542,7 +542,7 @@
 				<maven.compiler.target>21</maven.compiler.target>
 				<vaadin.version>25.0.0</vaadin.version>
 				<jetty.version>11.0.26</jetty.version>
-				<flowingcode.commons.demo.version>5.0.0</flowingcode.commons.demo.version>
+				<flowingcode.commons.demo.version>5.2.0</flowingcode.commons.demo.version>
 			</properties>
 			<dependencies>
 				<dependency>
diff --git a/src/main/resources/META-INF/frontend/fcEnhancedTabs/fc-enhanced-tabs.css b/src/main/resources/META-INF/frontend/fcEnhancedTabs/fc-enhanced-tabs.css
index 9b6cd66..e42c4b5 100644
--- a/src/main/resources/META-INF/frontend/fcEnhancedTabs/fc-enhanced-tabs.css
+++ b/src/main/resources/META-INF/frontend/fcEnhancedTabs/fc-enhanced-tabs.css
@@ -43,6 +43,10 @@ vaadin-menu-bar-list-box[theme="fc-enhanced-tabs"] vaadin-menu-bar-item {
   padding: 0;
 }
 
+vaadin-menu-bar-button[theme~='fc-enhanced-tabs'][slot="overflow"] {
+  padding: 0 var(--vaadin-gap-s, 0);
+}
+
 vaadin-menu-bar-list-box[theme="fc-enhanced-tabs"] vaadin-menu-bar-item::part(checkmark) {
   display: none
 }
@@ -78,5 +82,19 @@ vaadin-menu-bar-list-box vaadin-tab a[href] {
   justify-content: normal;
 }
 
+vaadin-menu-bar-button[theme~='fc-enhanced-tabs'] {
+    margin: 0;
+    box-shadow: none;
+    --vaadin-border-color-secondary: transparent;
+    &:nth-last-child(2):has(+ vaadin-menu-bar-button[slot="overflow"][hidden]) { border-left: none; }
+    &[role="menuitem"] ~ vaadin-menu-bar-button { border-left: none; }
+    &:not(:last-child) { border-right: none; }
+}
+
 
 
+vaadin-menu-bar-button[theme~='fc-enhanced-tabs'] vaadin-menu-bar-item {
+  background: var(--aura-surface-color, unset);
+  --aura-surface-level: -1;
+  --aura-surface-opacity: 0.3;
+}
diff --git a/src/test/resources/META-INF/dynamic-theme.properties b/src/test/resources/META-INF/dynamic-theme.properties
new file mode 100644
index 0000000..62d1f6f
--- /dev/null
+++ b/src/test/resources/META-INF/dynamic-theme.properties
@@ -0,0 +1 @@
+theme=LUMO
\ No newline at end of file