diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff17f938f..d39be15d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
 
+## 5.4.0
+
 ## 5.3.0
 
 ### Added
diff --git a/README.md b/README.md
index 3abc7f78d..2bbeca274 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@
 
 1. Check out this repository
 1. Open a folder with the project in the IntelliJ Ultimate using the `open` action button.
-1. Make sure that you on the latest develop branch (e.g `5.3.0-develop`)
+1. Make sure that you on the latest develop branch (e.g `5.4.0-develop`)
 1. Right-click on the `build.gradle` file, choose "Import Gradle project" (if this is not exist look for "Build module '<root folder name>'") (you need to have Gradle plugin installed)
 1. Check if the right SDK version is used for the project.
    - Current Java version for the project is **java 11**, so you should additionally download **SDK 11** and choose it in the module settings: `Right click by the project root > Open Module Settings > Project Settings > Project > Project SDK`
diff --git a/build.gradle b/build.gradle
index dd12551e4..13f3f61bf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ repositories {
 }
 
 group 'com.magento.idea'
-version '5.3.0'
+version '5.4.0'
 
 apply plugin: 'org.jetbrains.intellij'
 apply plugin: 'java'
@@ -23,8 +23,8 @@ apply plugin: 'idea'
 apply plugin: 'groovy'
 apply plugin: 'org.jetbrains.changelog'
 
-def phpPluginVersion = System.getProperty("phpPluginVersion", "241.14494.158")
-def ideaVersion = System.getProperty("ideaVersion", "2024.1")
+def phpPluginVersion = System.getProperty("phpPluginVersion", "242.20224.427")
+def ideaVersion = System.getProperty("ideaVersion", "2024.2")
 def javaVersion = 17
 
 java {
@@ -43,7 +43,7 @@ intellij {
             'properties',
             'com.intellij.css',
             'JavaScript',
-            'com.intellij.lang.jsgraphql:241.14494.150',
+            'com.intellij.lang.jsgraphql:242.20224.155',
             'platform-images',
             'copyright'
     ]
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
index db3b1e1fb..88a0496d0 100644
--- a/resources/META-INF/plugin.xml
+++ b/resources/META-INF/plugin.xml
@@ -7,7 +7,7 @@
 <idea-plugin require-restart="true">
     <id>com.magento.idea.magento2plugin</id>
     <name>Magento PhpStorm</name>
-    <version>5.3.0</version>
+    <version>5.4.0</version>
     <vendor url="https://github.com/magento/magento2-phpstorm-plugin">Magento Inc.</vendor>
 
     <description><![CDATA[
@@ -24,7 +24,7 @@
     </change-notes>
 
     <!-- please see http://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
-    <idea-version since-build="241.14494.158"/>
+    <idea-version since-build="242.20224.300"/>
 
     <!-- please see http://confluence.jetbrains.com/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
          on how to target different products -->
diff --git a/src/com/magento/idea/magento2plugin/util/RegExUtil.java b/src/com/magento/idea/magento2plugin/util/RegExUtil.java
index 194ca170a..80d0dedfe 100644
--- a/src/com/magento/idea/magento2plugin/util/RegExUtil.java
+++ b/src/com/magento/idea/magento2plugin/util/RegExUtil.java
@@ -64,7 +64,7 @@ public static class Magento {
                 = "[A-Z][a-zA-Z0-9]+_[A-Z][a-zA-Z0-9]+";
 
         public static final String THEME_NAME
-                = "[a-z]+/[A-Z][a-zA-Z0-9_]+/[a-z][a-zA-Z0-9_]+";
+                = "[a-z]+/[a-zA-Z0-9_-]+/[a-zA-Z0-9_-]+";
 
         public static final String MFTF_CURLY_BRACES
                 = ".*\\{\\{[^\\}]+\\}\\}.*";