diff --git a/css/modules/blockbestsellers/blockbestsellers.css b/css/modules/blockbestsellers/blockbestsellers.css
deleted file mode 100644
index e69de29..0000000
diff --git a/css/modules/blockbestsellers/index.php b/css/modules/blockbestsellers/index.php
deleted file mode 100644
index 38c73f4..0000000
--- a/css/modules/blockbestsellers/index.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * 2007-2016 PrestaShop
- *
- * Thirty Bees is an extension to the PrestaShop e-commerce software developed by PrestaShop SA
- * Copyright (C) 2017-2024 thirty bees
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@thirtybees.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://www.thirtybees.com for more information.
- *
- *  @author    Thirty Bees <contact@thirtybees.com>
- *  @author    PrestaShop SA <contact@prestashop.com>
- *  @copyright 2017-2024 thirty bees
- *  @copyright 2007-2016 PrestaShop SA
- *  @license   https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- *  PrestaShop is an internationally registered trademark & property of PrestaShop SA
- */
-
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-header("Location: ../");
-exit;
diff --git a/css/modules/blockcurrencies/blockcurrencies.css b/css/modules/blockcurrencies/blockcurrencies.css
deleted file mode 100644
index e69de29..0000000
diff --git a/css/modules/blockcurrencies/index.php b/css/modules/blockcurrencies/index.php
deleted file mode 100644
index 38c73f4..0000000
--- a/css/modules/blockcurrencies/index.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * 2007-2016 PrestaShop
- *
- * Thirty Bees is an extension to the PrestaShop e-commerce software developed by PrestaShop SA
- * Copyright (C) 2017-2024 thirty bees
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@thirtybees.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://www.thirtybees.com for more information.
- *
- *  @author    Thirty Bees <contact@thirtybees.com>
- *  @author    PrestaShop SA <contact@prestashop.com>
- *  @copyright 2017-2024 thirty bees
- *  @copyright 2007-2016 PrestaShop SA
- *  @license   https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- *  PrestaShop is an internationally registered trademark & property of PrestaShop SA
- */
-
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-header("Location: ../");
-exit;
diff --git a/css/modules/blocklanguages/blocklanguages.css b/css/modules/blocklanguages/blocklanguages.css
deleted file mode 100644
index e69de29..0000000
diff --git a/css/modules/blocklanguages/index.php b/css/modules/blocklanguages/index.php
deleted file mode 100644
index 38c73f4..0000000
--- a/css/modules/blocklanguages/index.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * 2007-2016 PrestaShop
- *
- * Thirty Bees is an extension to the PrestaShop e-commerce software developed by PrestaShop SA
- * Copyright (C) 2017-2024 thirty bees
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@thirtybees.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://www.thirtybees.com for more information.
- *
- *  @author    Thirty Bees <contact@thirtybees.com>
- *  @author    PrestaShop SA <contact@prestashop.com>
- *  @copyright 2017-2024 thirty bees
- *  @copyright 2007-2016 PrestaShop SA
- *  @license   https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- *  PrestaShop is an internationally registered trademark & property of PrestaShop SA
- */
-
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-header("Location: ../");
-exit;
diff --git a/css/modules/blockmyaccountfooter/blockmyaccount.css b/css/modules/blockmyaccountfooter/blockmyaccount.css
deleted file mode 100644
index e69de29..0000000
diff --git a/css/modules/blockmyaccountfooter/index.php b/css/modules/blockmyaccountfooter/index.php
deleted file mode 100644
index 38c73f4..0000000
--- a/css/modules/blockmyaccountfooter/index.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * 2007-2016 PrestaShop
- *
- * Thirty Bees is an extension to the PrestaShop e-commerce software developed by PrestaShop SA
- * Copyright (C) 2017-2024 thirty bees
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@thirtybees.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://www.thirtybees.com for more information.
- *
- *  @author    Thirty Bees <contact@thirtybees.com>
- *  @author    PrestaShop SA <contact@prestashop.com>
- *  @copyright 2017-2024 thirty bees
- *  @copyright 2007-2016 PrestaShop SA
- *  @license   https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- *  PrestaShop is an internationally registered trademark & property of PrestaShop SA
- */
-
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-header("Location: ../");
-exit;
diff --git a/css/modules/blocknewproducts/blocknewproducts.css b/css/modules/blocknewproducts/blocknewproducts.css
deleted file mode 100644
index e69de29..0000000
diff --git a/css/modules/blocknewproducts/index.php b/css/modules/blocknewproducts/index.php
deleted file mode 100644
index 38c73f4..0000000
--- a/css/modules/blocknewproducts/index.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * 2007-2016 PrestaShop
- *
- * Thirty Bees is an extension to the PrestaShop e-commerce software developed by PrestaShop SA
- * Copyright (C) 2017-2024 thirty bees
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@thirtybees.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://www.thirtybees.com for more information.
- *
- *  @author    Thirty Bees <contact@thirtybees.com>
- *  @author    PrestaShop SA <contact@prestashop.com>
- *  @copyright 2017-2024 thirty bees
- *  @copyright 2007-2016 PrestaShop SA
- *  @license   https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- *  PrestaShop is an internationally registered trademark & property of PrestaShop SA
- */
-
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-header("Location: ../");
-exit;
diff --git a/css/modules/blocknewsletter/blocknewsletter.css b/css/modules/blocknewsletter/blocknewsletter.css
deleted file mode 100644
index a786b89..0000000
--- a/css/modules/blocknewsletter/blocknewsletter.css
+++ /dev/null
@@ -1,3 +0,0 @@
-#blocknewsletter-captcha {
-    display: none;
-}
\ No newline at end of file
diff --git a/css/modules/blocknewsletter/index.php b/css/modules/blocknewsletter/index.php
deleted file mode 100644
index 38c73f4..0000000
--- a/css/modules/blocknewsletter/index.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * 2007-2016 PrestaShop
- *
- * Thirty Bees is an extension to the PrestaShop e-commerce software developed by PrestaShop SA
- * Copyright (C) 2017-2024 thirty bees
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@thirtybees.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://www.thirtybees.com for more information.
- *
- *  @author    Thirty Bees <contact@thirtybees.com>
- *  @author    PrestaShop SA <contact@prestashop.com>
- *  @copyright 2017-2024 thirty bees
- *  @copyright 2007-2016 PrestaShop SA
- *  @license   https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- *  PrestaShop is an internationally registered trademark & property of PrestaShop SA
- */
-
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-header("Location: ../");
-exit;
diff --git a/css/modules/blockspecials/blockspecials.css b/css/modules/blockspecials/blockspecials.css
deleted file mode 100644
index e69de29..0000000
diff --git a/css/modules/blockspecials/index.php b/css/modules/blockspecials/index.php
deleted file mode 100644
index 38c73f4..0000000
--- a/css/modules/blockspecials/index.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * 2007-2016 PrestaShop
- *
- * Thirty Bees is an extension to the PrestaShop e-commerce software developed by PrestaShop SA
- * Copyright (C) 2017-2024 thirty bees
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@thirtybees.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://www.thirtybees.com for more information.
- *
- *  @author    Thirty Bees <contact@thirtybees.com>
- *  @author    PrestaShop SA <contact@prestashop.com>
- *  @copyright 2017-2024 thirty bees
- *  @copyright 2007-2016 PrestaShop SA
- *  @license   https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- *  PrestaShop is an internationally registered trademark & property of PrestaShop SA
- */
-
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-header("Location: ../");
-exit;
diff --git a/css/print.css b/css/print.css
deleted file mode 100644
index e69de29..0000000
diff --git a/gulpfile.js b/gulpfile.js
index 4cdf25c..40e61d7 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -10,6 +10,7 @@ var sourcemaps = require('gulp-sourcemaps');
 var notify = require('gulp-notify');
 var gulpif = require('gulp-if');
 var options = require('./package.json').options;
+var clip = require('gulp-clip-empty-files');
 
 var createFolders = [
 	'./cache/',
@@ -64,6 +65,8 @@ gulp.task('compile-css', function() {
 		)
 		.pipe(autoprefixer())
 		.pipe(gulpif(options.sourcemaps, sourcemaps.write('./')))
+		// remove empty files
+		.pipe(clip())
 		.pipe(gulp.dest('./css/'))
 		.pipe(displayNotification({
 			message: 'Theme CSS compilation successful for ' + options.themeName,
diff --git a/package.json b/package.json
index 24cde05..5c0f6f5 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
     "glob-all": "^3.1.0",
     "gulp": "^4.0.1",
     "gulp-autoprefixer": "^7.0.1",
+    "gulp-clip-empty-files": "^0.1.2",
     "gulp-eslint": "^6.0.0",
     "gulp-if": "^3.0.0",
     "gulp-notify": "^3.2.0",