diff --git a/base/src/main/java/com/flowingcode/vaadin/addons/demo/EnhancedRouteTabs.java b/base/src/main/java/com/flowingcode/vaadin/addons/demo/EnhancedRouteTabs.java
index 6a10fc9..9fc02f3 100644
--- a/base/src/main/java/com/flowingcode/vaadin/addons/demo/EnhancedRouteTabs.java
+++ b/base/src/main/java/com/flowingcode/vaadin/addons/demo/EnhancedRouteTabs.java
@@ -83,7 +83,7 @@ private RouterLink getFirstRoute() {
     return first.isPresent() ? first.get() : null;
   }
 
-  @Deprecated
+  @Deprecated(forRemoval = true, since = "4.1.0")
   public void addLegacyTab(String label, Component content) {
     Tab tab = new Tab(label);
     getContent().add(tab);
diff --git a/base/src/main/java/com/flowingcode/vaadin/addons/demo/TabbedDemo.java b/base/src/main/java/com/flowingcode/vaadin/addons/demo/TabbedDemo.java
index 6505f93..cc70e12 100644
--- a/base/src/main/java/com/flowingcode/vaadin/addons/demo/TabbedDemo.java
+++ b/base/src/main/java/com/flowingcode/vaadin/addons/demo/TabbedDemo.java
@@ -407,7 +407,7 @@ public void setOrientation(Orientation orientation) {
    * @deprecated Use {@link #getColorScheme()}
    * @return the theme attribute value
    */
-  @Deprecated
+  @Deprecated(forRemoval = true, since = "5.2.0")
   public static String getThemeAttribute() {
     ColorScheme scheme = getColorScheme();
     return scheme == ColorScheme.LIGHT ? "" : scheme.getValue();
@@ -433,7 +433,7 @@ public static ColorScheme getColorScheme() {
    * @param theme   the theme attribute value
    * @deprecated Use {@link #setColorScheme(Component, ColorScheme)}
    */
-  @Deprecated
+  @Deprecated(forRemoval = true, since = "5.2.0")
   public static void applyThemeAttribute(Element element, String theme) {
     Component c = element.getComponent().get();
     if (theme.isEmpty()) {