diff --git a/ChangeLog b/ChangeLog
index 6147cc21d..523db4844 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,12 +7,14 @@ $Source$
 
 2004-06-15 Michal ÄŒihaÅ™  <michal@cihar.com>
     * lang/czech: Updated.
-    * config.inc.php, libraries/common.lib.php,
-      libraries/config_import.lib.php: Support for SHA1 function (RFE
-      #971703).
-    * main.php: Possible undefined variable.
+    * config.inc.php, libraries/config_import.lib.php,
+      libraries/common.lib.php: Support for SHA1 function (RFE #971703).
     * queryframe.php: Do not show <hr /> when no logo is shown.
-    * main.php: Don't reset theme on language change.
+    * main.php: Generate hidden inputs nicely.
+    * main.php, libraries/common.lib.php, libraries/select_theme.lib.php: Use
+      pma_theme as cookie name, default theme to some reasonable value to
+      avoid undefined variables all around the code.
+    * main.php, lang/*: strSelectTheme is IMHO not needed.
 
 2004-06-09 Alexander M. Turek  <me@derrabus.de>
     * libraries/config_import.lib.php: The default settings should be merged.
diff --git a/lang/afrikaans-iso-8859-1.inc.php b/lang/afrikaans-iso-8859-1.inc.php
index e095a141b..05bdc8c31 100644
--- a/lang/afrikaans-iso-8859-1.inc.php
+++ b/lang/afrikaans-iso-8859-1.inc.php
@@ -758,7 +758,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php
index ebf4b5419..67d4f1958 100644
--- a/lang/afrikaans-utf-8.inc.php
+++ b/lang/afrikaans-utf-8.inc.php
@@ -759,7 +759,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/albanian-iso-8859-1.inc.php b/lang/albanian-iso-8859-1.inc.php
index b52285e26..148200f7a 100644
--- a/lang/albanian-iso-8859-1.inc.php
+++ b/lang/albanian-iso-8859-1.inc.php
@@ -750,7 +750,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php
index 84b484dc9..e79f22788 100644
--- a/lang/albanian-utf-8.inc.php
+++ b/lang/albanian-utf-8.inc.php
@@ -751,7 +751,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php
index fad407116..6e629d888 100644
--- a/lang/arabic-utf-8.inc.php
+++ b/lang/arabic-utf-8.inc.php
@@ -752,7 +752,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/arabic-windows-1256.inc.php b/lang/arabic-windows-1256.inc.php
index 0a40087d0..69a856d6d 100644
--- a/lang/arabic-windows-1256.inc.php
+++ b/lang/arabic-windows-1256.inc.php
@@ -751,7 +751,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/azerbaijani-iso-8859-9.inc.php b/lang/azerbaijani-iso-8859-9.inc.php
index 3ad7ee1c9..e5dfcfd01 100644
--- a/lang/azerbaijani-iso-8859-9.inc.php
+++ b/lang/azerbaijani-iso-8859-9.inc.php
@@ -747,7 +747,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php
index 5e8a7582a..2a3fa43e4 100644
--- a/lang/azerbaijani-utf-8.inc.php
+++ b/lang/azerbaijani-utf-8.inc.php
@@ -748,7 +748,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/basque-iso-8859-1.inc.php b/lang/basque-iso-8859-1.inc.php
index 6ca15feef..ae891b362 100644
--- a/lang/basque-iso-8859-1.inc.php
+++ b/lang/basque-iso-8859-1.inc.php
@@ -750,7 +750,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php
index 84680e93f..b6e129efe 100644
--- a/lang/basque-utf-8.inc.php
+++ b/lang/basque-utf-8.inc.php
@@ -751,7 +751,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php
index c32732689..f2bf17192 100644
--- a/lang/bosnian-utf-8.inc.php
+++ b/lang/bosnian-utf-8.inc.php
@@ -757,7 +757,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/bosnian-windows-1250.inc.php b/lang/bosnian-windows-1250.inc.php
index c520ab13e..a1d690efe 100644
--- a/lang/bosnian-windows-1250.inc.php
+++ b/lang/bosnian-windows-1250.inc.php
@@ -756,7 +756,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/brazilian_portuguese-iso-8859-1.inc.php b/lang/brazilian_portuguese-iso-8859-1.inc.php
index ca9d17e32..eadb242ab 100644
--- a/lang/brazilian_portuguese-iso-8859-1.inc.php
+++ b/lang/brazilian_portuguese-iso-8859-1.inc.php
@@ -772,7 +772,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php
index c9473fb77..9eb31cd69 100644
--- a/lang/brazilian_portuguese-utf-8.inc.php
+++ b/lang/brazilian_portuguese-utf-8.inc.php
@@ -773,7 +773,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/bulgarian-koi8-r.inc.php b/lang/bulgarian-koi8-r.inc.php
index 19cc28133..1950cf1af 100644
--- a/lang/bulgarian-koi8-r.inc.php
+++ b/lang/bulgarian-koi8-r.inc.php
@@ -755,7 +755,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php
index dcd65a56e..d00c96eab 100644
--- a/lang/bulgarian-utf-8.inc.php
+++ b/lang/bulgarian-utf-8.inc.php
@@ -756,7 +756,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/bulgarian-windows-1251.inc.php b/lang/bulgarian-windows-1251.inc.php
index 9efebd253..03b0bf3b8 100644
--- a/lang/bulgarian-windows-1251.inc.php
+++ b/lang/bulgarian-windows-1251.inc.php
@@ -755,7 +755,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/catalan-iso-8859-1.inc.php b/lang/catalan-iso-8859-1.inc.php
index 98267f2c3..ebd96ed5b 100644
--- a/lang/catalan-iso-8859-1.inc.php
+++ b/lang/catalan-iso-8859-1.inc.php
@@ -743,7 +743,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php
index 848d949a2..2114ea745 100644
--- a/lang/catalan-utf-8.inc.php
+++ b/lang/catalan-utf-8.inc.php
@@ -744,7 +744,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/chinese_big5-utf-8.inc.php b/lang/chinese_big5-utf-8.inc.php
index 72e8c638d..01da00c41 100644
--- a/lang/chinese_big5-utf-8.inc.php
+++ b/lang/chinese_big5-utf-8.inc.php
@@ -750,7 +750,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/chinese_big5.inc.php b/lang/chinese_big5.inc.php
index 9fe6882ee..2e250c196 100644
--- a/lang/chinese_big5.inc.php
+++ b/lang/chinese_big5.inc.php
@@ -749,7 +749,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/chinese_gb-utf-8.inc.php b/lang/chinese_gb-utf-8.inc.php
index 99d52f33c..b89d97111 100644
--- a/lang/chinese_gb-utf-8.inc.php
+++ b/lang/chinese_gb-utf-8.inc.php
@@ -750,7 +750,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/chinese_gb.inc.php b/lang/chinese_gb.inc.php
index 7673541d8..a2b3ab5e0 100644
--- a/lang/chinese_gb.inc.php
+++ b/lang/chinese_gb.inc.php
@@ -749,7 +749,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/croatian-iso-8859-2.inc.php b/lang/croatian-iso-8859-2.inc.php
index b267fd1d9..ae92bdbca 100644
--- a/lang/croatian-iso-8859-2.inc.php
+++ b/lang/croatian-iso-8859-2.inc.php
@@ -771,7 +771,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php
index a7639fcb1..cc27edd80 100644
--- a/lang/croatian-utf-8.inc.php
+++ b/lang/croatian-utf-8.inc.php
@@ -772,7 +772,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/croatian-windows-1250.inc.php b/lang/croatian-windows-1250.inc.php
index f817567ff..9dca282a8 100644
--- a/lang/croatian-windows-1250.inc.php
+++ b/lang/croatian-windows-1250.inc.php
@@ -771,7 +771,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/czech-iso-8859-2.inc.php b/lang/czech-iso-8859-2.inc.php
index 724d8e9ba..3d538c32e 100644
--- a/lang/czech-iso-8859-2.inc.php
+++ b/lang/czech-iso-8859-2.inc.php
@@ -600,7 +600,6 @@ $strSelectAll = 'Vybrat v
 $strSelectFields = 'Zvolte sloupec (alespoò jeden):';
 $strSelectNumRows = 'v&nbsp;dotazu';
 $strSelectTables = 'Vybrat tabulky';
-$strSelectTheme = 'prosím vyberte si...';
 $strSend = 'Do souboru';
 $strSent = 'Odesláno';
 $strServer = 'Server';
diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php
index b014f7eb3..1b8feb02a 100644
--- a/lang/czech-utf-8.inc.php
+++ b/lang/czech-utf-8.inc.php
@@ -601,7 +601,6 @@ $strSelectAll = 'Vybrat vše';
 $strSelectFields = 'Zvolte sloupec (alespoň jeden):';
 $strSelectNumRows = 'v&nbsp;dotazu';
 $strSelectTables = 'Vybrat tabulky';
-$strSelectTheme = 'prosím vyberte si...';
 $strSend = 'Do souboru';
 $strSent = 'Odesláno';
 $strServer = 'Server';
diff --git a/lang/czech-windows-1250.inc.php b/lang/czech-windows-1250.inc.php
index 93ec2b9d0..e6f1e5437 100644
--- a/lang/czech-windows-1250.inc.php
+++ b/lang/czech-windows-1250.inc.php
@@ -600,7 +600,6 @@ $strSelectAll = 'Vybrat v
 $strSelectFields = 'Zvolte sloupec (alespoò jeden):';
 $strSelectNumRows = 'v&nbsp;dotazu';
 $strSelectTables = 'Vybrat tabulky';
-$strSelectTheme = 'prosím vyberte si...';
 $strSend = 'Do souboru';
 $strSent = 'Odesláno';
 $strServer = 'Server';
diff --git a/lang/danish-iso-8859-1.inc.php b/lang/danish-iso-8859-1.inc.php
index 7cb8fc1dd..d439a9ebc 100644
--- a/lang/danish-iso-8859-1.inc.php
+++ b/lang/danish-iso-8859-1.inc.php
@@ -745,7 +745,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php
index b640935f5..1eef7c78d 100644
--- a/lang/danish-utf-8.inc.php
+++ b/lang/danish-utf-8.inc.php
@@ -746,7 +746,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/dutch-iso-8859-1.inc.php b/lang/dutch-iso-8859-1.inc.php
index bf09a130c..e7d8fb809 100644
--- a/lang/dutch-iso-8859-1.inc.php
+++ b/lang/dutch-iso-8859-1.inc.php
@@ -751,7 +751,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php
index b3b81b3e9..f0da9557d 100644
--- a/lang/dutch-utf-8.inc.php
+++ b/lang/dutch-utf-8.inc.php
@@ -752,7 +752,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/english-iso-8859-1.inc.php b/lang/english-iso-8859-1.inc.php
index a1ed52a69..d2ac8fac0 100644
--- a/lang/english-iso-8859-1.inc.php
+++ b/lang/english-iso-8859-1.inc.php
@@ -594,7 +594,6 @@ $strSelectAll = 'Select All';
 $strSelectFields = 'Select fields (at least one):';
 $strSelectNumRows = 'in query';
 $strSelectTables = 'Select Tables';
-$strSelectTheme = 'please select...';
 $strSend = 'Save as file';
 $strSent = 'Sent';
 $strServer = 'Server';
diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php
index e12aade8c..f06168194 100644
--- a/lang/english-utf-8.inc.php
+++ b/lang/english-utf-8.inc.php
@@ -595,7 +595,6 @@ $strSelectAll = 'Select All';
 $strSelectFields = 'Select fields (at least one):';
 $strSelectNumRows = 'in query';
 $strSelectTables = 'Select Tables';
-$strSelectTheme = 'please select...';
 $strSend = 'Save as file';
 $strSent = 'Sent';
 $strServer = 'Server';
diff --git a/lang/estonian-iso-8859-1.inc.php b/lang/estonian-iso-8859-1.inc.php
index 652a442eb..5d983b8cd 100644
--- a/lang/estonian-iso-8859-1.inc.php
+++ b/lang/estonian-iso-8859-1.inc.php
@@ -743,7 +743,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php
index c8c579a47..9a9db2bd8 100644
--- a/lang/estonian-utf-8.inc.php
+++ b/lang/estonian-utf-8.inc.php
@@ -744,7 +744,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/finnish-iso-8859-1.inc.php b/lang/finnish-iso-8859-1.inc.php
index 77d2ab7d6..5c72b8971 100644
--- a/lang/finnish-iso-8859-1.inc.php
+++ b/lang/finnish-iso-8859-1.inc.php
@@ -768,7 +768,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php
index 1005e290b..f9d4bcffa 100644
--- a/lang/finnish-utf-8.inc.php
+++ b/lang/finnish-utf-8.inc.php
@@ -769,7 +769,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/french-iso-8859-1.inc.php b/lang/french-iso-8859-1.inc.php
index 38703a367..fbc633bf3 100644
--- a/lang/french-iso-8859-1.inc.php
+++ b/lang/french-iso-8859-1.inc.php
@@ -595,7 +595,6 @@ $strSelectAll = 'Tout s
 $strSelectFields = 'Choisir les champs à afficher (au moins un)';
 $strSelectNumRows = 'dans la requête';
 $strSelectTables = 'Choisissez les tables';
-$strSelectTheme = 'veuillez choisir...';
 $strSend = 'Transmettre';
 $strSent = 'Envoyé';
 $strServer = 'Serveur';
diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php
index 6cdd2eb98..2b8545507 100644
--- a/lang/french-utf-8.inc.php
+++ b/lang/french-utf-8.inc.php
@@ -596,7 +596,6 @@ $strSelectAll = 'Tout sélectionner';
 $strSelectFields = 'Choisir les champs à afficher (au moins un)';
 $strSelectNumRows = 'dans la requête';
 $strSelectTables = 'Choisissez les tables';
-$strSelectTheme = 'veuillez choisir...';
 $strSend = 'Transmettre';
 $strSent = 'Envoyé';
 $strServer = 'Serveur';
diff --git a/lang/galician-iso-8859-1.inc.php b/lang/galician-iso-8859-1.inc.php
index 934252c68..b69c04319 100644
--- a/lang/galician-iso-8859-1.inc.php
+++ b/lang/galician-iso-8859-1.inc.php
@@ -750,7 +750,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php
index 6e753a30c..e1dade92b 100644
--- a/lang/galician-utf-8.inc.php
+++ b/lang/galician-utf-8.inc.php
@@ -751,7 +751,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php
index 703f0ec89..e75ab8cd3 100644
--- a/lang/georgian-utf-8.inc.php
+++ b/lang/georgian-utf-8.inc.php
@@ -772,7 +772,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/german-iso-8859-1.inc.php b/lang/german-iso-8859-1.inc.php
index 0c6786872..17f0ccdad 100644
--- a/lang/german-iso-8859-1.inc.php
+++ b/lang/german-iso-8859-1.inc.php
@@ -751,7 +751,6 @@ $strZip = 'Zip-komprimiert';
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php
index a29acf5e7..537e15b9b 100644
--- a/lang/german-utf-8.inc.php
+++ b/lang/german-utf-8.inc.php
@@ -752,7 +752,6 @@ $strZip = 'Zip-komprimiert';
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/greek-iso-8859-7.inc.php b/lang/greek-iso-8859-7.inc.php
index 66a3adce4..66191ee94 100644
--- a/lang/greek-iso-8859-7.inc.php
+++ b/lang/greek-iso-8859-7.inc.php
@@ -752,7 +752,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php
index d15043cca..023cb5817 100644
--- a/lang/greek-utf-8.inc.php
+++ b/lang/greek-utf-8.inc.php
@@ -753,7 +753,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/hebrew-iso-8859-8-i.inc.php b/lang/hebrew-iso-8859-8-i.inc.php
index b72f4e473..746cd0e10 100644
--- a/lang/hebrew-iso-8859-8-i.inc.php
+++ b/lang/hebrew-iso-8859-8-i.inc.php
@@ -768,7 +768,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php
index 881fd9a8d..7f01abc33 100644
--- a/lang/hindi-utf-8.inc.php
+++ b/lang/hindi-utf-8.inc.php
@@ -776,7 +776,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/hungarian-iso-8859-2.inc.php b/lang/hungarian-iso-8859-2.inc.php
index bf047f653..976c594be 100644
--- a/lang/hungarian-iso-8859-2.inc.php
+++ b/lang/hungarian-iso-8859-2.inc.php
@@ -756,7 +756,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php
index 1392bab29..c398dfe21 100644
--- a/lang/hungarian-utf-8.inc.php
+++ b/lang/hungarian-utf-8.inc.php
@@ -757,7 +757,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/indonesian-iso-8859-1.inc.php b/lang/indonesian-iso-8859-1.inc.php
index 98a3d183f..37c8b09d8 100644
--- a/lang/indonesian-iso-8859-1.inc.php
+++ b/lang/indonesian-iso-8859-1.inc.php
@@ -743,7 +743,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php
index 727b152c7..54ea1ea32 100644
--- a/lang/indonesian-utf-8.inc.php
+++ b/lang/indonesian-utf-8.inc.php
@@ -744,7 +744,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/italian-iso-8859-1.inc.php b/lang/italian-iso-8859-1.inc.php
index 5774e5ac4..b8fd37b98 100644
--- a/lang/italian-iso-8859-1.inc.php
+++ b/lang/italian-iso-8859-1.inc.php
@@ -748,7 +748,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php
index 8e813279b..e3e200a20 100644
--- a/lang/italian-utf-8.inc.php
+++ b/lang/italian-utf-8.inc.php
@@ -749,7 +749,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/japanese-euc.inc.php b/lang/japanese-euc.inc.php
index 0b463e97e..995c73836 100644
--- a/lang/japanese-euc.inc.php
+++ b/lang/japanese-euc.inc.php
@@ -756,7 +756,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/japanese-sjis.inc.php b/lang/japanese-sjis.inc.php
index 602b986b0..9f52d5bb0 100644
--- a/lang/japanese-sjis.inc.php
+++ b/lang/japanese-sjis.inc.php
@@ -756,7 +756,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php
index d2643981a..dda4d9496 100644
--- a/lang/japanese-utf-8.inc.php
+++ b/lang/japanese-utf-8.inc.php
@@ -757,7 +757,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/korean-euc-kr.inc.php b/lang/korean-euc-kr.inc.php
index dc0010215..f31dc494f 100644
--- a/lang/korean-euc-kr.inc.php
+++ b/lang/korean-euc-kr.inc.php
@@ -766,7 +766,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php
index 3482d7079..d63c5432e 100644
--- a/lang/korean-utf-8.inc.php
+++ b/lang/korean-utf-8.inc.php
@@ -767,7 +767,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php
index 4d3b00c39..0c9a977f8 100644
--- a/lang/latvian-utf-8.inc.php
+++ b/lang/latvian-utf-8.inc.php
@@ -749,7 +749,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/latvian-windows-1257.inc.php b/lang/latvian-windows-1257.inc.php
index 9f2155958..ad8e6d8f8 100644
--- a/lang/latvian-windows-1257.inc.php
+++ b/lang/latvian-windows-1257.inc.php
@@ -748,7 +748,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php
index 1064dbbee..387283204 100644
--- a/lang/lithuanian-utf-8.inc.php
+++ b/lang/lithuanian-utf-8.inc.php
@@ -744,7 +744,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/lithuanian-windows-1257.inc.php b/lang/lithuanian-windows-1257.inc.php
index 395c37cf3..168de863b 100644
--- a/lang/lithuanian-windows-1257.inc.php
+++ b/lang/lithuanian-windows-1257.inc.php
@@ -743,7 +743,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/malay-iso-8859-1.inc.php b/lang/malay-iso-8859-1.inc.php
index 3d50b6491..2608331a9 100644
--- a/lang/malay-iso-8859-1.inc.php
+++ b/lang/malay-iso-8859-1.inc.php
@@ -767,7 +767,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php
index 6edb4c616..a00a38c0b 100644
--- a/lang/malay-utf-8.inc.php
+++ b/lang/malay-utf-8.inc.php
@@ -768,7 +768,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/norwegian-iso-8859-1.inc.php b/lang/norwegian-iso-8859-1.inc.php
index 59487782e..b0bf4490a 100644
--- a/lang/norwegian-iso-8859-1.inc.php
+++ b/lang/norwegian-iso-8859-1.inc.php
@@ -750,7 +750,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php
index 9adccc3f2..d84938212 100644
--- a/lang/norwegian-utf-8.inc.php
+++ b/lang/norwegian-utf-8.inc.php
@@ -751,7 +751,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php
index 794f9fd65..943f3d3eb 100644
--- a/lang/persian-utf-8.inc.php
+++ b/lang/persian-utf-8.inc.php
@@ -774,7 +774,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/persian-windows-1256.inc.php b/lang/persian-windows-1256.inc.php
index d2730b8f5..e72ef96cd 100644
--- a/lang/persian-windows-1256.inc.php
+++ b/lang/persian-windows-1256.inc.php
@@ -773,7 +773,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/polish-iso-8859-2.inc.php b/lang/polish-iso-8859-2.inc.php
index 338a282c4..902bbf1ef 100644
--- a/lang/polish-iso-8859-2.inc.php
+++ b/lang/polish-iso-8859-2.inc.php
@@ -751,7 +751,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php
index 78a784d59..7f85b4a93 100644
--- a/lang/polish-utf-8.inc.php
+++ b/lang/polish-utf-8.inc.php
@@ -752,7 +752,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/portuguese-iso-8859-1.inc.php b/lang/portuguese-iso-8859-1.inc.php
index a1f767136..b5615293c 100644
--- a/lang/portuguese-iso-8859-1.inc.php
+++ b/lang/portuguese-iso-8859-1.inc.php
@@ -763,7 +763,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php
index 9222c4b65..343a19bfb 100644
--- a/lang/portuguese-utf-8.inc.php
+++ b/lang/portuguese-utf-8.inc.php
@@ -764,7 +764,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/romanian-iso-8859-1.inc.php b/lang/romanian-iso-8859-1.inc.php
index 957494364..9227b4538 100644
--- a/lang/romanian-iso-8859-1.inc.php
+++ b/lang/romanian-iso-8859-1.inc.php
@@ -744,7 +744,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php
index 2e9b78567..3f806aa8e 100644
--- a/lang/romanian-utf-8.inc.php
+++ b/lang/romanian-utf-8.inc.php
@@ -745,7 +745,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/russian-cp-866.inc.php b/lang/russian-cp-866.inc.php
index f81780413..b9c65954c 100644
--- a/lang/russian-cp-866.inc.php
+++ b/lang/russian-cp-866.inc.php
@@ -751,7 +751,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/russian-koi8-r.inc.php b/lang/russian-koi8-r.inc.php
index 003e45cad..b88d9b7a7 100644
--- a/lang/russian-koi8-r.inc.php
+++ b/lang/russian-koi8-r.inc.php
@@ -751,7 +751,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php
index d2958b4f5..79ef83bae 100644
--- a/lang/russian-utf-8.inc.php
+++ b/lang/russian-utf-8.inc.php
@@ -752,7 +752,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/russian-windows-1251.inc.php b/lang/russian-windows-1251.inc.php
index 4bb7cd2e9..df1a3817d 100644
--- a/lang/russian-windows-1251.inc.php
+++ b/lang/russian-windows-1251.inc.php
@@ -751,7 +751,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php
index 2b0670ac1..0661fdf1d 100644
--- a/lang/serbian_cyrillic-utf-8.inc.php
+++ b/lang/serbian_cyrillic-utf-8.inc.php
@@ -754,7 +754,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/serbian_cyrillic-windows-1251.inc.php b/lang/serbian_cyrillic-windows-1251.inc.php
index 1ad17aaeb..2c6dc9ee6 100644
--- a/lang/serbian_cyrillic-windows-1251.inc.php
+++ b/lang/serbian_cyrillic-windows-1251.inc.php
@@ -753,7 +753,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php
index 38fd67057..db5cd8a59 100644
--- a/lang/serbian_latin-utf-8.inc.php
+++ b/lang/serbian_latin-utf-8.inc.php
@@ -754,7 +754,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/serbian_latin-windows-1250.inc.php b/lang/serbian_latin-windows-1250.inc.php
index 18708af87..f2fec5e71 100644
--- a/lang/serbian_latin-windows-1250.inc.php
+++ b/lang/serbian_latin-windows-1250.inc.php
@@ -753,7 +753,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/slovak-iso-8859-2.inc.php b/lang/slovak-iso-8859-2.inc.php
index 9e533a6da..947c09735 100644
--- a/lang/slovak-iso-8859-2.inc.php
+++ b/lang/slovak-iso-8859-2.inc.php
@@ -745,7 +745,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php
index d06f4293f..69c160143 100644
--- a/lang/slovak-utf-8.inc.php
+++ b/lang/slovak-utf-8.inc.php
@@ -746,7 +746,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/slovak-windows-1250.inc.php b/lang/slovak-windows-1250.inc.php
index c175b0905..f33bb65d8 100644
--- a/lang/slovak-windows-1250.inc.php
+++ b/lang/slovak-windows-1250.inc.php
@@ -745,7 +745,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/slovenian-iso-8859-2.inc.php b/lang/slovenian-iso-8859-2.inc.php
index e794fe1e6..9c5b021bb 100644
--- a/lang/slovenian-iso-8859-2.inc.php
+++ b/lang/slovenian-iso-8859-2.inc.php
@@ -745,7 +745,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php
index aebc5b564..62ee3262d 100644
--- a/lang/slovenian-utf-8.inc.php
+++ b/lang/slovenian-utf-8.inc.php
@@ -746,7 +746,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/slovenian-windows-1250.inc.php b/lang/slovenian-windows-1250.inc.php
index 913faf97c..9f6dba3b6 100644
--- a/lang/slovenian-windows-1250.inc.php
+++ b/lang/slovenian-windows-1250.inc.php
@@ -745,7 +745,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/spanish-iso-8859-1.inc.php b/lang/spanish-iso-8859-1.inc.php
index bde6249a4..3aaadc5bd 100644
--- a/lang/spanish-iso-8859-1.inc.php
+++ b/lang/spanish-iso-8859-1.inc.php
@@ -743,7 +743,6 @@ $strYes = 'S
 $strZeroRemovesTheLimit = 'Nota: si cambia los parámetros de estas opciones a 0 (cero), remueve el límite.';
 $strZip = '"comprimido con zip"';
 
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php
index ace09947e..69d821f4a 100644
--- a/lang/spanish-utf-8.inc.php
+++ b/lang/spanish-utf-8.inc.php
@@ -744,7 +744,6 @@ $strYes = 'Sí';
 $strZeroRemovesTheLimit = 'Nota: si cambia los parámetros de estas opciones a 0 (cero), remueve el límite.';
 $strZip = '"comprimido con zip"';
 
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/swedish-iso-8859-1.inc.php b/lang/swedish-iso-8859-1.inc.php
index 3ad4954bb..22ba7cf0f 100644
--- a/lang/swedish-iso-8859-1.inc.php
+++ b/lang/swedish-iso-8859-1.inc.php
@@ -743,7 +743,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php
index 773763bea..c407ac883 100644
--- a/lang/swedish-utf-8.inc.php
+++ b/lang/swedish-utf-8.inc.php
@@ -744,7 +744,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/thai-tis-620.inc.php b/lang/thai-tis-620.inc.php
index 6c9475883..7d3a097e1 100644
--- a/lang/thai-tis-620.inc.php
+++ b/lang/thai-tis-620.inc.php
@@ -756,7 +756,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php
index 5c7edcc09..47b7618b9 100644
--- a/lang/thai-utf-8.inc.php
+++ b/lang/thai-utf-8.inc.php
@@ -757,7 +757,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/turkish-iso-8859-9.inc.php b/lang/turkish-iso-8859-9.inc.php
index 387684cc4..a9b666028 100644
--- a/lang/turkish-iso-8859-9.inc.php
+++ b/lang/turkish-iso-8859-9.inc.php
@@ -756,7 +756,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php
index e3c63418d..471850aeb 100644
--- a/lang/turkish-utf-8.inc.php
+++ b/lang/turkish-utf-8.inc.php
@@ -757,7 +757,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php
index 59f091411..86df7842e 100644
--- a/lang/ukrainian-utf-8.inc.php
+++ b/lang/ukrainian-utf-8.inc.php
@@ -749,7 +749,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/lang/ukrainian-windows-1251.inc.php b/lang/ukrainian-windows-1251.inc.php
index 2fad81547..fb4f67d75 100644
--- a/lang/ukrainian-windows-1251.inc.php
+++ b/lang/ukrainian-windows-1251.inc.php
@@ -748,7 +748,6 @@ $strSpanish = 'Spanish';  //to translate
 $strStrucNativeExcel = 'Native MS Excel data';  //to translate
 $strDisableForeignChecks = 'Disable foreign key checks';  //to translate
 $strServerNotResponding = 'The server is not responding';  //to translate
-$strSelectTheme = 'please select...';  //to translate
 $strTheme = 'Theme / Style';  //to translate
 $strTakeIt = 'take it';  //to translate
 ?>
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 11256ffaf..5ca48ab57 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -273,7 +273,8 @@ if (strtolower($cfg['OBGzip']) == 'auto') {
  *            If not, it will use default images
 */
 // Theme Manager
-if (!isset($_COOKIE['theme']) || empty($_COOKIE['theme'])){
+if (!isset($_COOKIE['pma_theme']) || empty($_COOKIE['pma_theme'])){
+    $GLOBALS['theme'] = $cfg['ThemeDefault'];
     $ThemeDefaultOk = FALSE;
     if ($cfg['ThemePath']!='' && $cfg['ThemePath'] != FALSE) {
         $tmp_theme_mainpath = './' . $cfg['ThemePath'];
@@ -294,9 +295,10 @@ if (!isset($_COOKIE['theme']) || empty($_COOKIE['theme'])){
         $pmaThemeImage = './images/';
     }
 } else {
-    if ($_COOKIE['theme']!='original') {
-        $pmaThemeImage  = './' . $cfg['ThemePath'] . '/' . $_COOKIE['theme'] . '/img/';
-        $tmp_color_file = './' . $cfg['ThemePath'] . '/' . $_COOKIE['theme'] . '/colors.inc.php';
+    $GLOBALS['theme'] = $_COOKIE['pma_theme'];
+    if ($_COOKIE['pma_theme'] != 'original') {
+        $pmaThemeImage  = './' . $cfg['ThemePath'] . '/' . $_COOKIE['pma_theme'] . '/img/';
+        $tmp_color_file = './' . $cfg['ThemePath'] . '/' . $_COOKIE['pma_theme'] . '/colors.inc.php';
         if (@file_exists($tmp_color_file)) {
             include($tmp_color_file);
         }
diff --git a/libraries/select_theme.lib.php b/libraries/select_theme.lib.php
index 3a3c9782a..ef7a31aaa 100644
--- a/libraries/select_theme.lib.php
+++ b/libraries/select_theme.lib.php
@@ -78,24 +78,24 @@ if (!isset($pma_uri_parts)) { // cookie-setup if needed
 } // end cookie setup
 
 if (isset($set_theme)) { // if user submit a theme
-    setcookie('theme', $set_theme, time() + 60*60*24*30, $cookie_path, '', $is_https);
+    setcookie('pma_theme', $set_theme, time() + 60*60*24*30, $cookie_path, '', $is_https);
 } else { // else check if user have a theme cookie
-    if (!isset($_COOKIE['theme']) || empty($_COOKIE['theme'])) {
+    if (!isset($_COOKIE['pma_theme']) || empty($_COOKIE['pma_theme'])) {
         if ($PMA_ThemeDefault == TRUE) { 
             if (basename($PHP_SELF) == 'index.php') {
-                setcookie('theme', $cfg['ThemeDefault'], time() + 60*60*24*30, $cookie_path, '', $is_https);
+                setcookie('pma_theme', $cfg['ThemeDefault'], time() + 60*60*24*30, $cookie_path, '', $is_https);
             }
             $pmaTheme=$cfg['ThemeDefault'];
         }else{
             if (basename($PHP_SELF) == 'index.php') {
-                setcookie('theme', 'original', time() + 60*60*24*30, $cookie_path, '', $is_https);
+                setcookie('pma_theme', 'original', time() + 60*60*24*30, $cookie_path, '', $is_https);
             }
             $pmaTheme='original';
         }
     } else {
-        $pmaTheme=$_COOKIE['theme'];
+        $pmaTheme=$_COOKIE['pma_theme'];
         if (basename($PHP_SELF) == 'index.php') {
-            setcookie('theme', $pmaTheme, time() + 60*60*24*30, $cookie_path, '', $is_https);
+            setcookie('pma_theme', $pmaTheme, time() + 60*60*24*30, $cookie_path, '', $is_https);
         }
     }
 } // end if
diff --git a/main.php b/main.php
index 4ee7e548f..7ed120e86 100644
--- a/main.php
+++ b/main.php
@@ -321,7 +321,7 @@ if ($server > 0) {
 <!-- MySQL server related links -->
 <table cellpadding="3" cellspacing="0">
     <tr>
-        <th<?php if(isset($theme) && $theme!='original'){ ?> class="tblHeaders"<?php } echo $str_iconic_colspan; ?>>&nbsp;&nbsp;MySQL</th>
+        <th<?php if($theme!='original'){ ?> class="tblHeaders"<?php } echo $str_iconic_colspan; ?>>&nbsp;&nbsp;MySQL</th>
     </tr>
     <tr><?php
         echo '        ' . ($str_iconic_list != '' ? sprintf($str_iconic_list,'','b_newdb.png',$strCreateNewDatabase,'') : $str_normal_list); 
@@ -515,7 +515,7 @@ echo "\n";
 <td valign="top">
 <table border="0" cellpadding="3" cellspacing="0">
     <tr>
-        <th<?php if(isset($theme) && $theme!='none'){ ?> class="tblHeaders"<?php } echo $str_iconic_colspan; ?>>&nbsp;&nbsp;phpMyAdmin</th>
+        <th<?php if($theme!='none'){ ?> class="tblHeaders"<?php } echo $str_iconic_colspan; ?>>&nbsp;&nbsp;phpMyAdmin</th>
     </tr>
 <?php
 // Displays language selection combo
@@ -585,7 +585,6 @@ if (isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding']
             <form method="post" action="index.php" target="_parent">
                 <input type="hidden" name="server" value="<?php echo $server; ?>" />
                 <input type="hidden" name="lang" value="<?php echo $lang; ?>" />
-                <input type="hidden" name="set_theme" value="<?php echo $theme; ?>" />
                 <?php echo $strMySQLCharset;?>:
                 <select name="convcharset" dir="ltr" onChange="this.form.submit();" style="vertical-align: middle">
     <?php
@@ -637,26 +636,20 @@ if (count($available_themes_choices)>1) {
 ?>
         <td>
             <form name="setTheme" method="post" action="index.php" target="_parent">
-                <input type="hidden" name="convcharset" value="<?php echo $convcharset; ?>" />
-                <input type="hidden" name="lang" value="<?php echo $lang; ?>" />
-                <input type="hidden" name="server" value="<?php echo $server; ?>" />
-                <?php
+                <?php 
+                echo PMA_generate_common_hidden_inputs(5);
                 echo $theme_preview_href
                    . (isset($strTheme) ? $strTheme : 'Theme (Style)')
                    . '</a>:' . "\n";
                 ?> 
                 <select name="set_theme" dir="ltr" onChange="this.form.submit();" style="vertical-align: middle">
                 <?php
-                    for($i=0;$i<count($available_themes_choices);$i++){
-                        echo '<option value="' . $available_themes_choices[$i] . '"';
-                        if (isset($theme) && $available_themes_choices[$i] == $theme) {
+                    foreach ($available_themes_choices AS $i => $cur_theme) {
+                        echo '<option value="' . $cur_theme . '"';
+                        if ($cur_theme == $theme) {
                             echo ' selected="selected"';
-                            $theme_selected = TRUE;
                         }
-                        echo '>' . $available_themes_choices[$i] . '</option>';
-                    }
-                    if ($theme_selected != TRUE) {
-                        echo '<option value="" selected="selected">' . (isset($strSelectTheme) ? $strSelectTheme : 'please select ...') . '</option>';
+                        echo '>' . $cur_theme . '</option>';
                     }
                 ?>
                 </select>