Index: /extensions/simple_themes/simple/admin/admin.inc.php
===================================================================
--- /extensions/simple_themes/simple/admin/admin.inc.php	(revision 13558)
+++ /extensions/simple_themes/simple/admin/admin.inc.php	(revision 13559)
@@ -3,5 +3,5 @@
 
 global $conf;
-if (!isset($conf['stripped']))
+if (!isset($conf['simple']))
 {
   $conf['simple'] = serialize(array('albumDisplay' => 'column'));
Index: /extensions/simple_themes/simple/admin/admin.tpl
===================================================================
--- /extensions/simple_themes/simple/admin/admin.tpl	(revision 13558)
+++ /extensions/simple_themes/simple/admin/admin.tpl	(revision 13559)
@@ -11,5 +11,5 @@
             <span class="property">{'Album title and description'|@translate}</span>&nbsp;
             <select name="albumDisplay" style="min-width:150px;">
-              <option value="column" {if ($options.albumDisplay=="line")}selected="selected"{/if}>{'under the album thumbnail'|@translate}</option>
+              <option value="column" {if ($options.albumDisplay=="column")}selected="selected"{/if}>{'under the album thumbnail'|@translate}</option>
               <option value="line" {if ($options.albumDisplay=="line")}selected="selected"{/if}>{'next to the album thumbnail'|@translate}</option>
             </select>
Index: /extensions/simple_themes/simple/theme.css
===================================================================
--- /extensions/simple_themes/simple/theme.css	(revision 13549)
+++ /extensions/simple_themes/simple/theme.css	(revision 13559)
@@ -55,5 +55,6 @@
 }
 #thumbnails p {
-  margin: 0;
+  margin: 0 auto;
+  max-width: 12em;
 }
 
Index: /extensions/simple_themes/simple/README.md
===================================================================
--- /extensions/simple_themes/simple/README.md	(revision 13558)
+++ /extensions/simple_themes/simple/README.md	(revision 13559)
@@ -42,4 +42,10 @@
 Changelog
 ---------
+
+### version 2.5.4 (23/01/2012)
+
+* improve media-queries for small resolutions
+* limit with of descriptions - combine files
+* bugfix for the admin option
 
 ### version 2.5.3 (22/01/2012)
Index: /extensions/simple_themes/simple/content.css
===================================================================
--- /extensions/simple_themes/simple/content.css	(revision 13557)
+++ /extensions/simple_themes/simple/content.css	(revision 13559)
@@ -479,4 +479,12 @@
     margin: 1em;
   }
-}
-
+  .thumbnailCategories li {
+    width: 45%;
+  }
+}
+
+@media only screen and (max-width: 520px) {
+  .thumbnailCategories li {
+    width: 95%;
+  }
+}
Index: /extensions/simple_themes/simple/themeconf.inc.php
===================================================================
--- /extensions/simple_themes/simple/themeconf.inc.php	(revision 13558)
+++ /extensions/simple_themes/simple/themeconf.inc.php	(revision 13559)
@@ -2,5 +2,5 @@
 /*
 Theme Name: Simple Grey
-Version: 2.5.3
+Version: 2.5.4
 Description: Simple Grey
 Theme URI: http://piwigo.org/ext/extension_view.php?eid=308
@@ -29,5 +29,5 @@
 
 // debug - do not combine files
-$conf['template_combine_files'] = false;
+// $conf['template_combine_files'] = false;
 
 if (!isset($conf['simple']))