diff --git a/build.gradle b/build.gradle
index 77b979b..0872a51 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,6 +37,7 @@ patchPluginXml {
 
     changeNotes = """
     <ul>
+    <li>3.3.0   Add JetBrains AI compatibility to themes</li>
     <li>3.2.0   Improve caret colors and blue theme</li>
     <li>3.1.0   Add support to 2025.1 IDEs</li>
     <li>3.0.0   Add support to 2024.3 IDEs and remove support for 2023.3 or previous</li>
diff --git a/src/main/resources/codely.theme.json b/src/main/resources/codely.theme.json
index aa840c8..563949b 100644
--- a/src/main/resources/codely.theme.json
+++ b/src/main/resources/codely.theme.json
@@ -168,7 +168,21 @@
       "background": "bg",
       "separatorColor": "bg"
     },
-    "Window.border": "bg1"
+    "Window.border": "bg1",
+    "JetBrainsAI": {
+      "Button.background": "bg",
+      "Button.foreground": "fg",
+      "Button.startBorderColor": "#504945",
+      "Button.endBorderColor": "#504945",
+      "Button.focusedBorderColor": "blue",
+      "CompletionPopup.foreground": "fg",
+      "Editor.background": "dark_grey",
+      "Editor.foreground": "fg",
+      "Notification.background": "dark_grey",
+      "Notification.borderColor": "bg1",
+      "Notification.foreground": "fg",
+      "ToolWindow.background": "dark_grey"
+    }
   },
   "icons": {
     "ColorPalette": {
diff --git a/src/main/resources/codely_blue.theme.json b/src/main/resources/codely_blue.theme.json
index 44284b6..8871ed3 100644
--- a/src/main/resources/codely_blue.theme.json
+++ b/src/main/resources/codely_blue.theme.json
@@ -171,7 +171,21 @@
       "background": "bg",
       "separatorColor": "bg"
     },
-    "Window.border": "bg1"
+    "Window.border": "bg1",
+    "JetBrainsAI": {
+      "Button.background": "bg",
+      "Button.foreground": "fg",
+      "Button.startBorderColor": "bg2",
+      "Button.endBorderColor": "bg2",
+      "Button.focusedBorderColor": "blue",
+      "CompletionPopup.foreground": "fg",
+      "Editor.background": "dark_blue",
+      "Editor.foreground": "fg",
+      "Notification.background": "dark_blue",
+      "Notification.borderColor": "bg1",
+      "Notification.foreground": "fg",
+      "ToolWindow.background": "dark_blue"
+    }
   },
   "icons": {
     "ColorPalette": {
diff --git a/src/main/resources/codely_dark.theme.json b/src/main/resources/codely_dark.theme.json
index 60af061..2a2bb35 100644
--- a/src/main/resources/codely_dark.theme.json
+++ b/src/main/resources/codely_dark.theme.json
@@ -163,7 +163,21 @@
       "background": "bg",
       "separatorColor": "bg"
     },
-    "Window.border": "bg1"
+    "Window.border": "bg1",
+    "JetBrainsAI": {
+      "Button.background": "bg",
+      "Button.foreground": "fg",
+      "Button.startBorderColor": "#504945",
+      "Button.endBorderColor": "#504945",
+      "Button.focusedBorderColor": "blue",
+      "CompletionPopup.foreground": "fg",
+      "Editor.background": "dark_grey",
+      "Editor.foreground": "fg",
+      "Notification.background": "dark_grey",
+      "Notification.borderColor": "bg1",
+      "Notification.foreground": "fg",
+      "ToolWindow.background": "dark_grey"
+    }
   },
   "icons": {
     "ColorPalette": {
diff --git a/src/main/resources/codely_light.theme.json b/src/main/resources/codely_light.theme.json
index 0a703a8..cb72330 100644
--- a/src/main/resources/codely_light.theme.json
+++ b/src/main/resources/codely_light.theme.json
@@ -163,7 +163,21 @@
       "background": "bg",
       "separatorColor": "bg"
     },
-    "Window.border": "bg1"
+    "Window.border": "bg1",
+    "JetBrainsAI": {
+      "Button.background": "bg",
+      "Button.foreground": "fg",
+      "Button.startBorderColor": "bg2",
+      "Button.endBorderColor": "bg2",
+      "Button.focusedBorderColor": "classic_blue",
+      "CompletionPopup.foreground": "fg",
+      "Editor.background": "bg0",
+      "Editor.foreground": "fg",
+      "Notification.background": "bg0",
+      "Notification.borderColor": "bg1",
+      "Notification.foreground": "fg",
+      "ToolWindow.background": "bg0"
+    }
   },
   "icons": {
     "ColorPalette": {