diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index 74e1f4629..e5493cdfd 100755
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -66,6 +66,10 @@
         <form name="thelia.admin.currency.modification" class="Thelia\Form\CurrencyModificationForm"/>
 
         <form name="thelia.admin.coupon.creation" class="Thelia\Form\CouponCreationForm"/>
+
+        <form name="thelia.admin.attribute.creation" class="Thelia\Form\AttributeCreationForm"/>
+        <form name="thelia.admin.attribute.modification" class="Thelia\Form\AttributeModificationForm"/>
+        <form name="thelia.admin.attribute-value.creation" class="Thelia\Form\AttributeValueCreationForm"/>
     </forms>
 
 
diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml
index 8eaeb2547..7cbb04b08 100755
--- a/core/lib/Thelia/Config/Resources/routing/admin.xml
+++ b/core/lib/Thelia/Config/Resources/routing/admin.xml
@@ -79,12 +79,8 @@
     </route>
 
 
-
-
-
-
-
     <!-- Route to the Coupon controller (process Coupon browsing) -->
+
     <route id="admin.coupon.list" path="/admin/coupon">
         <default key="_controller">Thelia\Controller\Admin\CouponController::browseAction</default>
     </route>
@@ -105,10 +101,6 @@
     </route>
 
 
-
-
-
-
     <!-- Routes to the Config (system variables) controller -->
 
     <route id="admin.configuration.variables.default" path="/admin/configuration/variables">
@@ -197,12 +189,36 @@
 
     <!-- attribute and feature routes  management -->
 
-    <route id="admin.configuration.product-attribute.default" path="/admin/configuration/product-attributes">
+    <route id="admin.configuration.attributes.default" path="/admin/configuration/attributes">
         <default key="_controller">Thelia\Controller\Admin\AttributeController::defaultAction</default>
     </route>
 
-    <route id="admin.configuration.product-attribute.edit" path="/admin/configuration/product-attributes/update">
-        <default key="_controller">Thelia\Controller\Admin\AttributeController::updateAction</default>
+    <route id="admin.configuration.attributes.create" path="/admin/configuration/attributes/create">
+        <default key="_controller">Thelia\Controller\Admin\AttributeController::createAction</default>
+    </route>
+
+    <route id="admin.configuration.attributes.create" path="/admin/configuration/attributes/create-value">
+        <default key="_controller">Thelia\Controller\Admin\AttributeController::createValueAction</default>
+    </route>
+
+    <route id="admin.configuration.attributes.update" path="/admin/configuration/attributes/update">
+        <default key="_controller">Thelia\Controller\Admin\AttributeController::changeAction</default>
+    </route>
+
+    <route id="admin.configuration.attributes.save" path="/admin/configuration/attributes/save">
+        <default key="_controller">Thelia\Controller\Admin\AttributeController::saveChangeAction</default>
+    </route>
+
+    <route id="admin.configuration.attributes.delete" path="/admin/configuration/attributes/delete">
+        <default key="_controller">Thelia\Controller\Admin\AttributeController::deleteAction</default>
+    </route>
+
+    <route id="admin.configuration.attributes.delete" path="/admin/configuration/attributes/delete-value">
+        <default key="_controller">Thelia\Controller\Admin\AttributeController::deleteValueAction</default>
+    </route>
+
+    <route id="admin.configuration.attributes.update-position" path="/admin/configuration/attributes/update-position">
+        <default key="_controller">Thelia\Controller\Admin\AttributeController::updatePositionAction</default>
     </route>
 
     <!-- end attribute and feature routes  management -->
diff --git a/core/lib/Thelia/Core/Event/TheliaEvents.php b/core/lib/Thelia/Core/Event/TheliaEvents.php
index c19d3a400..fa6b3e0c3 100755
--- a/core/lib/Thelia/Core/Event/TheliaEvents.php
+++ b/core/lib/Thelia/Core/Event/TheliaEvents.php
@@ -358,4 +358,35 @@ final class TheliaEvents
     const BEFORE_DELETECURRENCY = "action.before_deleteCurrency";
     const AFTER_DELETECURRENCY  = "action.after_deleteCurrency";
 
+    // -- Attributes management ---------------------------------------------
+
+    const ATTRIBUTE_CREATE          = "action.createAttribute";
+    const ATTRIBUTE_UPDATE          = "action.updateAttribute";
+    const ATTRIBUTE_DELETE          = "action.deleteAttribute";
+    const ATTRIBUTE_UPDATE_POSITION = "action.updateAttributePosition";
+
+    const BEFORE_CREATEATTRIBUTE = "action.before_createAttribute";
+    const AFTER_CREATEATTRIBUTE  = "action.after_createAttribute";
+
+    const BEFORE_UPDATEATTRIBUTE = "action.before_updateAttribute";
+    const AFTER_UPDATEATTRIBUTE  = "action.after_updateAttribute";
+
+    const BEFORE_DELETEATTRIBUTE = "action.before_deleteAttribute";
+    const AFTER_DELETEATTRIBUTE  = "action.after_deleteAttribute";
+
+    // -- Attributes values management ----------------------------------------
+
+    const ATTRIBUTE_VALUE_CREATE          = "action.createAttributeValue";
+    const ATTRIBUTE_VALUE_UPDATE          = "action.updateAttributeValue";
+    const ATTRIBUTE_VALUE_DELETE          = "action.deleteAttributeValue";
+    const ATTRIBUTE_VALUE_UPDATE_POSITION = "action.updateAttributeValuePosition";
+
+    const BEFORE_CREATEATTRIBUTE_VALUE = "action.before_createAttributeValue";
+    const AFTER_CREATEATTRIBUTE_VALUE  = "action.after_createAttributeValue";
+
+    const BEFORE_UPDATEATTRIBUTE_VALUE = "action.before_updateAttributeValue";
+    const AFTER_UPDATEATTRIBUTE_VALUE  = "action.after_updateAttributeValue";
+
+    const BEFORE_DELETEATTRIBUTE_VALUE = "action.before_deleteAttributeValue";
+    const AFTER_DELETEATTRIBUTE_VALUE  = "action.after_deleteAttributeValue";
 }
diff --git a/templates/admin/default/admin-layout.tpl b/templates/admin/default/admin-layout.tpl
index 942557600..334f95d44 100644
--- a/templates/admin/default/admin-layout.tpl
+++ b/templates/admin/default/admin-layout.tpl
@@ -144,9 +144,9 @@
                         </li>
                         {/loop}
 
-                        {loop name="menu-auth-discount" type="auth" roles="ADMIN" permissions="admin.discount.view"}
-                        <li class="{if $admin_current_location == 'discount'}active{/if}" id="discount_menu">
-                            <a href="{url path='/admin/discount'}">{intl l="Discount"}</a>
+                        {loop name="menu-auth-coupon" type="auth" roles="ADMIN" permissions="admin.coupon.view"}
+                        <li class="{if $admin_current_location == 'coupon'}active{/if}" id="coupon_menu">
+                            <a href="{url path='/admin/coupon-list'}">{intl l="Coupons"}</a>
                         </li>
                         {/loop}
 
@@ -222,10 +222,10 @@
 	{block name="before-javascript-include"}{/block}
 
 	<script src="http://code.jquery.com/jquery-2.0.3.min.js"></script>
-
+{*
     {debugbar_renderjs}
     {debugbar_renderresult}
-
+*}
 	{block name="after-javascript-include"}{/block}
 
     {block name="javascript-initialization"}{/block}