diff --git a/composer.json b/composer.json
index 6e3fb038..309d95ad 100644
--- a/composer.json
+++ b/composer.json
@@ -30,10 +30,10 @@
   "require": {
     "ext-dom": "*",
     "ext-simplexml": "*",
-    "php": "^7.4 || ^8.0",
+    "php": "^8.1",
     "contao/core-bundle": "^4.13.37",
-    "oveleon/contao-component-style-manager": "^3.0",
-    "oveleon/contao-theme-compiler-bundle": "1.4.*",
+    "oveleon/contao-component-style-manager": "^3.5",
+    "oveleon/contao-theme-compiler-bundle": "^1.8",
     "oveleon/contao-config-driver-bundle": "^1.1",
     "madeyourday/contao-rocksolid-custom-elements": "^2.4.8",
     "madeyourday/contao-rocksolid-icon-picker": "^2.0",
diff --git a/contao/classes/IconGenerator.php b/contao/classes/IconGenerator.php
index 25c1903f..46b9944e 100644
--- a/contao/classes/IconGenerator.php
+++ b/contao/classes/IconGenerator.php
@@ -12,7 +12,7 @@
 use Contao\File;
 use Contao\StringUtil;
 use Contao\System;
-use Oveleon\ContaoThemeCompilerBundle\FileCompiler;
+use Oveleon\ContaoThemeCompilerBundle\Compiler\FileCompiler;
 use SimpleXMLElement;
 use Symfony\Component\Filesystem\Path;
 
diff --git a/contao/dca/tl_thememanager.php b/contao/dca/tl_thememanager.php
index 775473df..8abbc635 100644
--- a/contao/dca/tl_thememanager.php
+++ b/contao/dca/tl_thememanager.php
@@ -8,7 +8,7 @@
 use Contao\Backend;
 use Contao\BackendUser;
 use Contao\CoreBundle\Exception\AccessDeniedException;
-use Oveleon\ContaoThemeCompilerBundle\CompilerUtils;
+use Oveleon\ContaoThemeCompilerBundle\Utils\CompilerUtils;
 
 $GLOBALS['TL_DCA']['tl_thememanager'] = [
     // Config