diff --git a/pom.xml b/pom.xml
index 7f20e7c..3d44729 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
             <dependency>
             	<groupId>com.flowingcode.vaadin.addons.demo</groupId>
             	<artifactId>commons-demo</artifactId>
-            	<version>5.0.0</version>
+            	<version>5.4.0</version>
             </dependency>
 		</dependencies>
 	</dependencyManagement>
@@ -513,6 +513,7 @@
 										<exclude>**/it/*</exclude>
 										<exclude>**/DemoView.class</exclude>
 										<exclude>**/DemoLayout.class</exclude>
+										<exclude>**/AppShellConfiguratorImpl.class</exclude>
 										<exclude>META-INF/services/com.vaadin.flow.server.VaadinServiceInitListener</exclude>
 									</excludes>
 								</configuration>
@@ -553,7 +554,66 @@
 				</dependency>
 			</dependencies>
 		</profile>
-		
+
+		<profile>
+			<id>dance</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-clean-plugin</artifactId>
+						<version>3.3.2</version>
+						<configuration>
+							<filesets>
+								<fileset>
+									<directory>${project.basedir}</directory>
+									<includes>
+										<include>package.json</include>
+										<include>package-lock.json</include>
+										<include>tsconfig.json</include>
+										<include>tsconfig.json.*</include>
+										<include>types.d.ts</include>
+										<include>types.d.ts.*</include>
+										<include>vite.config.ts</include>
+										<include>vite.generated.ts</include>
+										<include>webpack.config.js</include>
+										<include>webpack.generated.js</include>
+									</includes>
+								</fileset>
+								<fileset>
+									<directory>${project.basedir}/frontend</directory>
+									<includes>
+										<include>index.html</include>
+									</includes>
+								</fileset>
+								<fileset>
+									<directory>${project.basedir}/frontend/generated</directory>
+								</fileset>
+								<fileset>
+									<directory>${project.basedir}/src/main/frontend</directory>
+									<includes>
+										<include>index.html</include>
+									</includes>
+								</fileset>
+								<fileset>
+									<directory>${project.basedir}/src/main/frontend/generated</directory>
+								</fileset>
+								<fileset>
+									<directory>${project.basedir}/node_modules</directory>
+								</fileset>
+								<fileset>
+									<directory>${project.basedir}/src/main/bundles</directory>
+								</fileset>
+								<fileset>
+									<directory>${project.basedir}/src/main/dev-bundle</directory>
+								</fileset>
+							</filesets>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
 	</profiles>
 
 </project>
diff --git a/src/main/resources/META-INF/frontend/fcGridHelper/vaadin-grid.css b/src/main/resources/META-INF/frontend/fcGridHelper/vaadin-grid.css
index 4821bc9..675f114 100644
--- a/src/main/resources/META-INF/frontend/fcGridHelper/vaadin-grid.css
+++ b/src/main/resources/META-INF/frontend/fcGridHelper/vaadin-grid.css
@@ -46,7 +46,8 @@
   --fcgh-toggle-right: 0;
 }
 
-:host([overflow~="right"]), :host([overflow~="left"]) {
+:host([overflow~="right"]), :host([overflow~="left"]),
+:host([overflow~="start"]), :host([overflow~="end"])  {
   --fcgh-toggle-right: 24px;
 }
 
diff --git a/src/test/java/com/flowingcode/vaadin/addons/AppShellConfiguratorImpl.java b/src/test/java/com/flowingcode/vaadin/addons/AppShellConfiguratorImpl.java
new file mode 100644
index 0000000..29e8a38
--- /dev/null
+++ b/src/test/java/com/flowingcode/vaadin/addons/AppShellConfiguratorImpl.java
@@ -0,0 +1,35 @@
+/*-
+ * #%L
+ * Grid Helpers Add-on
+ * %%
+ * Copyright (C) 2022 - 2026 Flowing Code
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+package com.flowingcode.vaadin.addons;
+
+import com.flowingcode.vaadin.addons.demo.DynamicTheme;
+import com.vaadin.flow.component.page.AppShellConfigurator;
+import com.vaadin.flow.server.AppShellSettings;
+
+public class AppShellConfiguratorImpl implements AppShellConfigurator {
+
+    @Override
+    public void configurePage(AppShellSettings settings) {
+        if (DynamicTheme.isFeatureSupported()) {
+            DynamicTheme.LUMO.initialize(settings);
+        }
+    }
+
+}