diff --git a/interface/web/admin/form/users.tform.php b/interface/web/admin/form/users.tform.php
index 96ed417d091e9874852b9c72ea34f19e2a1cbf5f..dc445d58e3eed472ea8e3d3abfaed9a8f89a38fc 100644
--- a/interface/web/admin/form/users.tform.php
+++ b/interface/web/admin/form/users.tform.php
@@ -100,7 +100,7 @@ $handle = @opendir(ISPC_THEMES_PATH);
 while ($file = @readdir ($handle)) { 
     if (substr($file, 0, 1) != '.') {
         if(@is_dir(ISPC_THEMES_PATH."/$file")) {
-			if($file == 'default' || (@file_exists(ISPC_THEMES_PATH."/$file/ISPC_VERSION") && trim(@file_get_contents(ISPC_THEMES_PATH."/$file/ISPC_VERSION")) == ISPC_APP_VERSION)) {
+			if(!file_exists(ISPC_THEMES_PATH."/$file/ispconfig_version") || (@file_exists(ISPC_THEMES_PATH."/$file/ispconfig_version") && trim(@file_get_contents(ISPC_THEMES_PATH."/$file/ispconfig_version")) == ISPC_APP_VERSION)) {
                 $themes_list[$file] = $file;
             }
         }
diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index 8d4023908acc83d9f377ba7f4aa92b4a48323ee3..ad95413cd4678a925a1f7aade7e76ce91bd2b41d 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -73,7 +73,7 @@ $handle = @opendir(ISPC_THEMES_PATH);
 while ($file = @readdir ($handle)) { 
     if (substr($file, 0, 1) != '.') {
         if(@is_dir(ISPC_THEMES_PATH."/$file")) {
-			if($file == 'default' || (@file_exists(ISPC_THEMES_PATH."/$file/ISPC_VERSION") && trim(@file_get_contents(ISPC_THEMES_PATH."/$file/ISPC_VERSION")) == ISPC_APP_VERSION)) {
+			if(!file_exists(ISPC_THEMES_PATH."/$file/ispconfig_version") || (@file_exists(ISPC_THEMES_PATH."/$file/ispconfig_version") && trim(@file_get_contents(ISPC_THEMES_PATH."/$file/ispconfig_version")) == ISPC_APP_VERSION)) {
                 $themes_list[$file] = $file;
             }
         }
diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php
index 1669e36bfc56789a32ba4ca398b4ba1f507a416d..6163c7293a94cb9dabefb48f4500265349ecf642 100644
--- a/interface/web/client/form/reseller.tform.php
+++ b/interface/web/client/form/reseller.tform.php
@@ -61,7 +61,7 @@ $handle = @opendir(ISPC_THEMES_PATH);
 while ($file = @readdir ($handle)) {
     if (substr($file, 0, 1) != '.') {
         if(@is_dir(ISPC_THEMES_PATH."/$file")) {
-			if($file == 'default' || (@file_exists(ISPC_THEMES_PATH."/$file/ISPC_VERSION") && trim(@file_get_contents(ISPC_THEMES_PATH."/$file/ISPC_VERSION")) == ISPC_APP_VERSION)) {
+			if(!file_exists(ISPC_THEMES_PATH."/$file/ispconfig_version") || (@file_exists(ISPC_THEMES_PATH."/$file/ispconfig_version") && trim(@file_get_contents(ISPC_THEMES_PATH."/$file/ispconfig_version")) == ISPC_APP_VERSION)) {
                 $themes_list[$file] = $file;
             }
         }
diff --git a/interface/web/themes/default-304/ISPC_VERSION b/interface/web/themes/default-304/ispconfig_version
similarity index 100%
rename from interface/web/themes/default-304/ISPC_VERSION
rename to interface/web/themes/default-304/ispconfig_version
diff --git a/interface/web/themes/default_64_navimg/ISPC_VERSION b/interface/web/themes/default_64_navimg/ISPC_VERSION
deleted file mode 100644
index bb19ac367e61ef69398f09154456075f734e0d46..0000000000000000000000000000000000000000
--- a/interface/web/themes/default_64_navimg/ISPC_VERSION
+++ /dev/null
@@ -1 +0,0 @@
-3.0.4.6
\ No newline at end of file
diff --git a/interface/web/themes/default_combobox/ISPC_VERSION b/interface/web/themes/default_combobox/ISPC_VERSION
deleted file mode 100644
index bb19ac367e61ef69398f09154456075f734e0d46..0000000000000000000000000000000000000000
--- a/interface/web/themes/default_combobox/ISPC_VERSION
+++ /dev/null
@@ -1 +0,0 @@
-3.0.4.6
\ No newline at end of file
diff --git a/interface/web/themes/default_no_navimg/ISPC_VERSION b/interface/web/themes/default_no_navimg/ISPC_VERSION
deleted file mode 100644
index bb19ac367e61ef69398f09154456075f734e0d46..0000000000000000000000000000000000000000
--- a/interface/web/themes/default_no_navimg/ISPC_VERSION
+++ /dev/null
@@ -1 +0,0 @@
-3.0.4.6
\ No newline at end of file
diff --git a/interface/web/tools/form/interface_settings.tform.php b/interface/web/tools/form/interface_settings.tform.php
index e992c33217348e5c610156b095cbbaf990de66e8..49ed62d167a1fca45e832f685431c55e851c434e 100644
--- a/interface/web/tools/form/interface_settings.tform.php
+++ b/interface/web/tools/form/interface_settings.tform.php
@@ -113,7 +113,7 @@ $handle = @opendir(ISPC_THEMES_PATH);
 while ($file = @readdir ($handle)) { 
     if (substr($file, 0, 1) != '.') {
         if(@is_dir(ISPC_THEMES_PATH."/$file")) {
-			if($file == 'default' || (@file_exists(ISPC_THEMES_PATH."/$file/ISPC_VERSION") && trim(@file_get_contents(ISPC_THEMES_PATH."/$file/ISPC_VERSION")) == ISPC_APP_VERSION)) {
+			if(!file_exists(ISPC_THEMES_PATH."/$file/ispconfig_version") || (@file_exists(ISPC_THEMES_PATH."/$file/ispconfig_version") && trim(@file_get_contents(ISPC_THEMES_PATH."/$file/ispconfig_version")) == ISPC_APP_VERSION)) {
                 $themes_list[$file] = $file;
             }
         }