diff --git a/pom.xml b/pom.xml
index 007941a..e31f9bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,6 +15,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <jetty.version>9.4.36.v20210114</jetty.version>
+        <flowingcode.commons.demo.version>3.10.0</flowingcode.commons.demo.version>
     </properties>
     <organization>
        <name>Flowing Code</name>
@@ -133,7 +134,7 @@
 		<dependency>
 			<groupId>com.flowingcode.vaadin.addons.demo</groupId>
 			<artifactId>commons-demo</artifactId>
-			<version>3.5.0</version>
+			<version>${flowingcode.commons.demo.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -351,6 +352,7 @@
 										<exclude>**/integration/*</exclude>
 										<exclude>**/DemoView.class</exclude>
 										<exclude>**/DemoLayout.class</exclude>
+                                        <exclude>**/dynamic-theme.properties</exclude>
 									</excludes>
 								</configuration>
 							</execution>
@@ -376,6 +378,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>5.2.0</flowingcode.commons.demo.version>
 			</properties>
 			<repositories>
 				<repository>
@@ -405,16 +408,16 @@
 			<properties>
 				<maven.compiler.source>21</maven.compiler.source>
 				<maven.compiler.target>21</maven.compiler.target>
-				<vaadin.version>25.0.0-beta2</vaadin.version>
+				<vaadin.version>25.1.0</vaadin.version>
 				<jetty.version>11.0.26</jetty.version>
-			</properties>
+                <flowingcode.commons.demo.version>5.2.0</flowingcode.commons.demo.version>
+			</properties>            
 			<dependencies>
-				<dependency>
-					<groupId>com.flowingcode.vaadin.addons.demo</groupId>
-					<artifactId>commons-demo</artifactId>
-					<version>5.0.0</version>
-					<scope>test</scope>
-				</dependency>
+                 <dependency>
+                    <groupId>com.vaadin</groupId>
+                    <artifactId>vaadin-dev</artifactId>
+                    <optional>true</optional>
+                </dependency>
 			</dependencies>
 		</profile>
 		
diff --git a/src/main/java/com/flowingcode/vaadin/addons/simpletimer/SimpleTimer.java b/src/main/java/com/flowingcode/vaadin/addons/simpletimer/SimpleTimer.java
index 45302ab..29050f0 100644
--- a/src/main/java/com/flowingcode/vaadin/addons/simpletimer/SimpleTimer.java
+++ b/src/main/java/com/flowingcode/vaadin/addons/simpletimer/SimpleTimer.java
@@ -2,7 +2,7 @@
  * #%L
  * Simple Timer Addon
  * %%
- * Copyright (C) 2019 - 2020 Flowing Code
+ * Copyright (C) 2019 - 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.
@@ -28,6 +28,7 @@
 import com.vaadin.flow.component.Synchronize;
 import com.vaadin.flow.component.Tag;
 import com.vaadin.flow.component.dependency.JsModule;
+import com.vaadin.flow.component.dependency.NpmPackage;
 import com.vaadin.flow.dom.PropertyChangeListener;
 import com.vaadin.flow.shared.Registration;
 import java.io.Serializable;
@@ -37,6 +38,7 @@
 
 /** @author Leonardo Scardanzan / Flowing Code */
 @Tag("simple-timer")
+@NpmPackage(value = "@polymer/polymer", version = "3.5.2")
 @JsModule("./simple-timer/simple-timer.js")
 public class SimpleTimer extends Component implements HasSize, HasStyle, Serializable {
 
diff --git a/src/test/java/com/flowingcode/addons/simpletimer/test/SerializationTest.java b/src/test/java/com/flowingcode/addons/simpletimer/test/SerializationTest.java
index 74281cb..a757b97 100644
--- a/src/test/java/com/flowingcode/addons/simpletimer/test/SerializationTest.java
+++ b/src/test/java/com/flowingcode/addons/simpletimer/test/SerializationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * Simple Timer Addon
  * %%
- * Copyright (C) 2019 Flowing Code
+ * Copyright (C) 2019 - 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.
diff --git a/src/test/java/com/flowingcode/vaadin/addons/DemoLayout.java b/src/test/java/com/flowingcode/vaadin/addons/DemoLayout.java
index 50796c0..960371c 100644
--- a/src/test/java/com/flowingcode/vaadin/addons/DemoLayout.java
+++ b/src/test/java/com/flowingcode/vaadin/addons/DemoLayout.java
@@ -2,7 +2,7 @@
  * #%L
  * Simple Timer Addon
  * %%
- * Copyright (C) 2019 - 2020 Flowing Code
+ * Copyright (C) 2019 - 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.
diff --git a/src/test/java/com/flowingcode/vaadin/addons/simpletimer/DemoView.java b/src/test/java/com/flowingcode/vaadin/addons/simpletimer/DemoView.java
index 64d1e0e..2078570 100644
--- a/src/test/java/com/flowingcode/vaadin/addons/simpletimer/DemoView.java
+++ b/src/test/java/com/flowingcode/vaadin/addons/simpletimer/DemoView.java
@@ -2,7 +2,7 @@
  * #%L
  * Simple Timer Addon
  * %%
- * Copyright (C) 2019 - 2020 Flowing Code
+ * Copyright (C) 2019 - 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.
diff --git a/src/test/java/com/flowingcode/vaadin/addons/simpletimer/SimpletimerDemo.java b/src/test/java/com/flowingcode/vaadin/addons/simpletimer/SimpletimerDemo.java
index adb133a..d2d8bd6 100644
--- a/src/test/java/com/flowingcode/vaadin/addons/simpletimer/SimpletimerDemo.java
+++ b/src/test/java/com/flowingcode/vaadin/addons/simpletimer/SimpletimerDemo.java
@@ -2,7 +2,7 @@
  * #%L
  * Simple Timer Addon
  * %%
- * Copyright (C) 2019 - 2020 Flowing Code
+ * Copyright (C) 2019 - 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.
diff --git a/src/test/java/com/flowingcode/vaadin/addons/simpletimer/SimpletimerDemoView.java b/src/test/java/com/flowingcode/vaadin/addons/simpletimer/SimpletimerDemoView.java
index 9367ae6..94a4b7d 100644
--- a/src/test/java/com/flowingcode/vaadin/addons/simpletimer/SimpletimerDemoView.java
+++ b/src/test/java/com/flowingcode/vaadin/addons/simpletimer/SimpletimerDemoView.java
@@ -2,7 +2,7 @@
  * #%L
  * Simple Timer Addon
  * %%
- * Copyright (C) 2019 - 2020 Flowing Code
+ * Copyright (C) 2019 - 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.
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
diff --git a/src/test/resources/META-INF/resources/frontend/styles/shared-styles.html b/src/test/resources/META-INF/resources/frontend/styles/shared-styles.html
index 8aa043f..9009472 100644
--- a/src/test/resources/META-INF/resources/frontend/styles/shared-styles.html
+++ b/src/test/resources/META-INF/resources/frontend/styles/shared-styles.html
@@ -2,7 +2,7 @@
   #%L
   Simple Timer Addon
   %%
-  Copyright (C) 2019 - 2020 Flowing Code
+  Copyright (C) 2019 - 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.