diff --git a/base/pom.xml b/base/pom.xml
index b037e70..5357089 100755
--- a/base/pom.xml
+++ b/base/pom.xml
@@ -15,6 +15,11 @@
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-controls</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
diff --git a/base/src/main/java/module-info.java b/base/src/main/java/module-info.java
index c586c47..d56c55c 100755
--- a/base/src/main/java/module-info.java
+++ b/base/src/main/java/module-info.java
@@ -3,6 +3,7 @@
 module atlantafx.base {
 
     requires transitive javafx.controls;
+    requires static org.jetbrains.annotations;
 
     exports atlantafx.base.controls;
     exports atlantafx.base.theme;
diff --git a/pom.xml b/pom.xml
index 5b1290f..c433bf0 100755
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
         <lib.cssfx.version>11.5.1</lib.cssfx.version>
         <lib.ikonli.version>12.3.1</lib.ikonli.version>
         <lib.datafaker.version>1.3.0</lib.datafaker.version>
-        <lib.jetbrains-annotations.version>22.0.0</lib.jetbrains-annotations.version>
+        <lib.jetbrains-annotations.version>23.0.0</lib.jetbrains-annotations.version>
         <test.assertj.version>3.21.0</test.assertj.version>
         <test.junit.version>5.8.1</test.junit.version>
     </properties>
@@ -124,6 +124,11 @@
                 <artifactId>ikonli-material2-pack</artifactId>
                 <version>${lib.ikonli.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.jetbrains</groupId>
+                <artifactId>annotations</artifactId>
+                <version>${lib.jetbrains-annotations.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>fr.brouillard.oss</groupId>
diff --git a/sampler/pom.xml b/sampler/pom.xml
index 7b82329..73c5c6e 100755
--- a/sampler/pom.xml
+++ b/sampler/pom.xml
@@ -67,6 +67,10 @@
             <groupId>org.kordamp.ikonli</groupId>
             <artifactId>ikonli-material2-pack</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+        </dependency>
         <dependency>
             <groupId>fr.brouillard.oss</groupId>
             <artifactId>cssfx</artifactId>
diff --git a/sampler/src/main/java/module-info.java b/sampler/src/main/java/module-info.java
index c31ea63..13ea029 100755
--- a/sampler/src/main/java/module-info.java
+++ b/sampler/src/main/java/module-info.java
@@ -14,6 +14,7 @@ module atlantafx.sampler {
     requires org.kordamp.ikonli.javafx;
     requires org.kordamp.ikonli.feather;
     requires org.kordamp.ikonli.material2;
+    requires org.jetbrains.annotations;
 
     requires fr.brouillard.oss.cssfx;
     requires datafaker;