diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php
index 057007e7d..f81616c64 100644
--- a/core/lib/Thelia/Core/Thelia.php
+++ b/core/lib/Thelia/Core/Thelia.php
@@ -333,7 +333,7 @@ class Thelia extends Kernel
     public function getCacheDir()
     {
         if (defined('THELIA_ROOT')) {
-            return THELIA_CACHE_DIR.'cache/'.$this->environment;
+            return THELIA_CACHE_DIR.DS.$this->environment;
         } else {
             return parent::getCacheDir();
         }
diff --git a/templates/frontOffice/default/account.html b/templates/frontOffice/default/account.html
index 0514461fd..83e2b5a8e 100644
--- a/templates/frontOffice/default/account.html
+++ b/templates/frontOffice/default/account.html
@@ -157,7 +157,7 @@
                                     <td>{$REF}</td>
                                     <td>{format_date date=$CREATE_DATE}</td>
                                     <td>{format_number number=$TOTAL_TAXED_AMOUNT} {loop type="currency" name="order.currency" id={$CURRENCY}}{$SYMBOL}{/loop}</td>
-                                    <td><span class="label-delivered">{loop type="order-status" name="order.status" id={$STATUS}}{$TITLE}{/loop}</span></td>
+                                    <td>{loop type="order-status" name="order.status" id={$STATUS}}{assign "orderStatusLabel" "order_$CODE"}<span class="label label-{#$orderStatusLabel#}">{$TITLE}</span>{/loop}</td>
                                     <td>
                                     {if $STATUS >=2}
                                         <a href="{url path="/account/order/pdf/invoice/$ID"}" class="btn btn-order-details" data-toggle="tooltip" title="{intl l="View order %ref as pdf document" ref={$REF}}"><span class="icon-cloud-download"></span> {intl l="Order details"}</a>
diff --git a/templates/frontOffice/default/configs/variables.conf b/templates/frontOffice/default/configs/variables.conf
new file mode 100644
index 000000000..c2c81c01d
--- /dev/null
+++ b/templates/frontOffice/default/configs/variables.conf
@@ -0,0 +1,13 @@
+# Maximum number of lines in lists
+# --------------------------------
+max_displayed_orders = 20
+max_displayed_customers = 20
+
+# order status - seems ununsed ?
+# ------------------------------
+
+order_not_paid = 'warning'
+order_paid = 'success'
+order_processing = 'primary'
+order_sent = 'info'
+order_canceled = 'danger'
\ No newline at end of file
diff --git a/templates/frontOffice/default/layout.tpl b/templates/frontOffice/default/layout.tpl
index ae7de6894..ab57fe8da 100644
--- a/templates/frontOffice/default/layout.tpl
+++ b/templates/frontOffice/default/layout.tpl
@@ -21,6 +21,10 @@ GNU General Public License : http://www.gnu.org/licenses/
 {declare_assets directory='assets'}
 {* Set the default translation domain, that will be used by {intl} when the 'd' parameter is not set *}
 {default_translation_domain domain='fo.default'}
+
+{* -- Define some stuff for Smarty ------------------------------------------ *}
+{config_load file='variables.conf'}
+
 {block name="no-return-functions"}{/block}
 {assign var="store_name" value="{config key="store_name"}"}
 {if not $store_name}{assign var="store_name" value="{intl l='Thelia V2'}"}{/if}