diff --git a/app/Http/Controllers/Shop/ArticleController.php b/app/Http/Controllers/Shop/ArticleController.php
index f0788485..8ace1f33 100644
--- a/app/Http/Controllers/Shop/ArticleController.php
+++ b/app/Http/Controllers/Shop/ArticleController.php
@@ -6,12 +6,16 @@ use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 
 use App\Repositories\Shop\Articles;
+use App\Repositories\Shop\Categories;
 
 class ArticleController extends Controller
 {
     public function show($id)
     {
         $data['article'] = Articles::getArticleToSell($id);
+        // $data['breadcrumb'] = Categories::getAncestorsByCategory($category_id);
+        // dump($data);
+        // exit;
         return view('Shop.Articles.show', $data);
     }
 }
diff --git a/app/Http/Controllers/Shop/Auth/RegisterController.php b/app/Http/Controllers/Shop/Auth/RegisterController.php
index 7a40a159..160e99a4 100644
--- a/app/Http/Controllers/Shop/Auth/RegisterController.php
+++ b/app/Http/Controllers/Shop/Auth/RegisterController.php
@@ -15,6 +15,8 @@ use Illuminate\Routing\Redirector;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
 use Sebastienheyd\Boilerplate\Rules\Password;
+use App\Repositories\Shop\Customers;
+use App\Repositories\Shop\CustomerAddresses;
 
 use App\Models\Shop\Customer;
 
@@ -51,14 +53,8 @@ class RegisterController extends Controller
 
     protected function create(array $data)
     {
-        $user = Customer::withTrashed()->updateOrCreate(['email' => $data['email']], [
-            'active'     => true,
-            'first_name' => $data['first_name'],
-            'last_name'  => $data['last_name'],
-            'email'      => $data['email'],
-            'password'   => bcrypt($data['password']),
-        ]);
-
+        $user = Customers::create($data);
+        CustomerAddresses::add($user->id, $data);
         return $user;
     }
 
diff --git a/app/Repositories/Core/Categories.php b/app/Repositories/Core/Categories.php
index 7c7dd25d..82e57acc 100644
--- a/app/Repositories/Core/Categories.php
+++ b/app/Repositories/Core/Categories.php
@@ -54,6 +54,7 @@ class Categories
             }
             $tree[] = $leaf;
         }
+        $tree = collect($tree)->sortBy('name')->toArray();
         return $tree;
     }
 
diff --git a/app/Repositories/Shop/CustomerAddresses.php b/app/Repositories/Shop/CustomerAddresses.php
index 8e32f501..e069ee2e 100644
--- a/app/Repositories/Shop/CustomerAddresses.php
+++ b/app/Repositories/Shop/CustomerAddresses.php
@@ -21,6 +21,17 @@ class CustomerAddresses
         return CustomerAddress::find($id);
     }
 
+    public static function add($user_id, $data)
+    {
+        return self::store([
+            'customer_id' => $user_id,
+            'address' => $data['delivery_address'],
+            'address2' => $data['delivery_address2'],
+            'zipcode' => $data['delivery_zipcode'],
+            'city' => $data['city'],
+        ]);
+    }
+
     public static function store($data)
     {
         $id = $data['id'] ?? false;
diff --git a/app/Repositories/Shop/Customers.php b/app/Repositories/Shop/Customers.php
index a4259c77..610012e6 100644
--- a/app/Repositories/Shop/Customers.php
+++ b/app/Repositories/Shop/Customers.php
@@ -148,8 +148,22 @@ class Customers
 
     public static function create($data)
     {
-        $data['uuid'] = Str::uuid()->toString();
-        return Customer::create($data);
+        $user = Customer::create([
+            'uuid' => Str::uuid(),
+            'active' => true,
+            'first_name' => $data['first_name'],
+            'last_name' => $data['last_name'],
+            'company' => $data['company'],
+            'tva' => $data['tva'],
+            'phone' => $data['phone'],
+            'address' => $data['address'],
+            'address2' => $data['address2'],
+            'zipcode' => $data['zipcode'],
+            'city' => $data['city'],
+            'email' => $data['email'],
+            'password' => bcrypt($data['password']),
+        ]);
+        return $user;
     }
 
     public static function update($data, $id = false)
diff --git a/app/Repositories/Shop/Homepages.php b/app/Repositories/Shop/Homepages.php
index e1609eaa..16d11a90 100644
--- a/app/Repositories/Shop/Homepages.php
+++ b/app/Repositories/Shop/Homepages.php
@@ -20,12 +20,12 @@ class Homepages
 
     public static function getFooter()
     {
-        return self::get(2)->text  ?? '';
+        return self::get(2)->text ?? '';
     }
 
     public static function getExtraFooter()
     {
-        return self::get(3)->text  ?? '';
+        return self::get(3)->text ?? '';
     }
 
     public static function get($id)
diff --git a/build/css/site.css b/build/css/site.css
index b1ba35c5..a1c1950a 100644
--- a/build/css/site.css
+++ b/build/css/site.css
@@ -60,6 +60,10 @@ label {
 	color: #517C39;	
 }
 
+a.green {
+	color: #517C39 !important;	
+}
+
 .green-dark {
 	color: #335012;
 }
diff --git a/composer.json b/composer.json
index 14483abb..ef9924d3 100644
--- a/composer.json
+++ b/composer.json
@@ -130,7 +130,11 @@
     "config": {
         "optimize-autoloader": true,
         "preferred-install": "dist",
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "pestphp/pest-plugin": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     },
     "extra": {
         "laravel": {
diff --git a/resources/views/Shop/Articles/partials/article.blade.php b/resources/views/Shop/Articles/partials/article.blade.php
index 9a54912d..04db5939 100644
--- a/resources/views/Shop/Articles/partials/article.blade.php
+++ b/resources/views/Shop/Articles/partials/article.blade.php
@@ -3,7 +3,7 @@
 		<img src="{{ App\Repositories\Shop\Articles::getPreviewSrc($article['image'] ?? false) }}" class="card-img-top" alt="{{ $product_name }}">
 		<div class="card-body p-2 pb-1">
 			<div class="row card-title">
-				<div class="col-12">
+				<div class="col-12 light">
 					<!--
 					<i class="fa fa-heart red"></i>
 					-->
diff --git a/resources/views/Shop/Articles/show.blade.php b/resources/views/Shop/Articles/show.blade.php
index f2da5313..7527ae54 100644
--- a/resources/views/Shop/Articles/show.blade.php
+++ b/resources/views/Shop/Articles/show.blade.php
@@ -28,10 +28,10 @@
 			@if (count($article['tags'] ?? []))
 				<h3>Caractéristiques</h3>
 				@foreach ($article['tags'] as $tag_group => $items)
-					<div>
+					<div class="mb-2">
 						{{ $tag_group }} :
 						@foreach ($items as $tag)
-							<span class="btn btn-xs pt-0 pb-0">{{ $tag }}</span>
+							<span class="btn btn-xs btn-secondary pt-0 pb-0">{{ $tag }}</span>
 						@endforeach
 					</div>
 				@endforeach
diff --git a/resources/views/Shop/Customers/partials/address.blade.php b/resources/views/Shop/Customers/partials/address.blade.php
new file mode 100644
index 00000000..1686142c
--- /dev/null
+++ b/resources/views/Shop/Customers/partials/address.blade.php
@@ -0,0 +1,36 @@
+<div class="row">
+    <div class="col-12">
+        @include('components.form.input', [
+            'name' => ($prefix ?? '') . 'address',
+            'value' => $customer['address'] ?? '',
+            'label' => $label ?? '',
+        ])
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-12">
+        @include('components.form.input', [
+            'name' => ($prefix ?? '') . 'address2',
+            'value' => $customer['address2'] ?? '',
+            'label' => 'Complément d\'adresse',
+        ])
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-4">
+        @include('components.form.input', [
+            'name' => ($prefix ?? '') . 'zipcode',
+            'value' => $customer['zipcode'] ?? '',
+            'label' => 'Code postal',
+        ])
+    </div>
+    <div class="col-8">
+        @include('components.form.input', [
+            'name' => ($prefix ?? '') . 'city',
+            'value' => $customer['city'] ?? '',
+            'label' => 'Ville',
+        ])
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/Shop/Customers/partials/delivery.blade.php b/resources/views/Shop/Customers/partials/delivery.blade.php
new file mode 100644
index 00000000..4cb07d82
--- /dev/null
+++ b/resources/views/Shop/Customers/partials/delivery.blade.php
@@ -0,0 +1,36 @@
+<div class="row">
+    <div class="col-12">
+        @include('components.form.input', [
+            'name' => 'delivery_address',
+            'value' => $customer['address'] ?? '',
+            'label' => $label ?? '',
+        ])
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-12">
+        @include('components.form.input', [
+            'name' => 'delivery_address2',
+            'value' => $customer['address2'] ?? '',
+            'label' => 'Complément d\'adresse',
+        ])
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-4">
+        @include('components.form.input', [
+            'name' => 'delivery_zipcode',
+            'value' => $customer['zipcode'] ?? '',
+            'label' => 'Code postal',
+        ])
+    </div>
+    <div class="col-8">
+        @include('components.form.input', [
+            'name' => 'delivery_city',
+            'value' => $customer['city'] ?? '',
+            'label' => 'Ville',
+        ])
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/Shop/Customers/partials/registration.blade.php b/resources/views/Shop/Customers/partials/registration.blade.php
index 463d43fb..ffb5351d 100644
--- a/resources/views/Shop/Customers/partials/registration.blade.php
+++ b/resources/views/Shop/Customers/partials/registration.blade.php
@@ -49,40 +49,4 @@
     </div>
 </div>
 
-<div class="row">
-    <div class="col-12">
-        @include('components.form.input', [
-            'name' => 'address',
-            'value' => $customer['address'] ?? '',
-            'label' => 'Adresse de facturation',
-        ])
-    </div>
-</div>
-
-<div class="row">
-    <div class="col-12">
-        @include('components.form.input', [
-            'name' => 'address2',
-            'value' => $customer['address2'] ?? '',
-            'label' => 'Complément d\'adresse',
-        ])
-    </div>
-</div>
-
-<div class="row">
-    <div class="col-4">
-        @include('components.form.input', [
-            'name' => 'zipcode',
-            'value' => $customer['zipcode'] ?? '',
-            'label' => 'Code postal',
-        ])
-    </div>
-    <div class="col-8">
-        @include('components.form.input', [
-            'name' => 'city',
-            'value' => $customer['city'] ?? '',
-            'label' => 'Ville',
-        ])
-    </div>
-</div>
-
+@include('Shop.Customers.partials.address', ['label' => 'Adresse de facturation'])
diff --git a/resources/views/Shop/Homepage/partials/sliderByShelve.blade.php b/resources/views/Shop/Homepage/partials/sliderByShelve.blade.php
index 7d816b29..eee3e8fb 100644
--- a/resources/views/Shop/Homepage/partials/sliderByShelve.blade.php
+++ b/resources/views/Shop/Homepage/partials/sliderByShelve.blade.php
@@ -1,8 +1,8 @@
 @if ($shelve['articles'])
-	<div class="mb-3 bg-green-ultra-dark rounded-lg">
+	<div class="mb-3 rounded-lg">
 		<div class="row">
 			<div class="col-6">
-				<h1 class="p-2" style="font-size: 2em;">{{ $shelve['name'] }}</h1>
+				<h1 class="p-2 green" style="font-size: 2em;">{{ $shelve['name'] }}</h1>
 			</div>
 			<div class="col-6 text-right">
 				<a class="mt-2 btn btn-green-dark" href="{{ route('Shop.Categories.show', ['id' => $shelve['id']]) }}">Découvrir la sélection</a>
@@ -13,7 +13,7 @@
 			<div class="col-11 mx-auto shelve_slider_{{ $shelve['id'] }} slider">
 				@foreach ($shelve['articles'] as $name => $article)
 					<div class="text-center pr-2 pl-2">
-						<a class="green-fluo" href="{{ route('Shop.Articles.show', ['id' => $article['id']]) }}">
+						<a class="green" href="{{ route('Shop.Articles.show', ['id' => $article['id']]) }}">
 							<img data-lazy="{{ App\Repositories\Shop\Articles::getPreviewSrc($article['image'] ?? false) }}" class="d-block w-100 rounded" alt="{{ $name }}"/>
 							{{ $name }}
 						</a>
diff --git a/resources/views/Shop/Orders/order.blade.php b/resources/views/Shop/Orders/order.blade.php
index 21aab310..18f099a8 100644
--- a/resources/views/Shop/Orders/order.blade.php
+++ b/resources/views/Shop/Orders/order.blade.php
@@ -11,11 +11,11 @@
 					<button class="btn btn-secondary" id="register">Créez mon compte</button>
 				</p>
 
-				<x-layout.collapse id="identification" title="Déjà client" class="d-none identification gradient-green1 rounded-lg">
+				<x-layout.collapse id="identification" title="Déjà client" class="d-none identification rounded-lg">
 					@include('Shop.auth.partials.login')
 				</x-layout.collapse>
 
-				<x-layout.collapse id="personal_data" title="Informations personnelles" class="d-none personal_data gradient-green1 rounded-lg">
+				<x-layout.collapse id="personal_data" title="Informations personnelles" class="d-none personal_data rounded-lg" uncollapsed=true>
 					@include('Shop.auth.partials.register')		
 				</x-layout.collapse>
 			@endif
@@ -23,15 +23,15 @@
 			{{ Form::open(['route' => 'Shop.Orders.store', 'id' => 'order-form', 'autocomplete' => 'off']) }}
 
 				<div id="registred" @if (!App\Repositories\Shop\Customers::isConnected()) class="d-none" @endif>
-					<x-layout.collapse id="adresses" title="Adresses" class="gradient-green1 rounded-lg mb-3" uncollapsed=true>
+					<x-layout.collapse id="adresses" title="Adresses" class="rounded-lg mb-3" uncollapsed=true>
 						@include('Shop.Orders.partials.addresses')
 					</x-layout.collapse>
 
-					<x-layout.collapse id="delivery_mode" title="Mode de livraison" class="gradient-green1 rounded-lg mb-3" uncollapsed=true>
+					<x-layout.collapse id="delivery_mode" title="Mode de livraison" class="rounded-lg mb-3" uncollapsed=true>
 						@include('Shop.Orders.partials.deliveries')
 					</x-layout.collapse>
 
-					<x-layout.collapse id="payment" title="Paiement" class="gradient-green1 rounded-lg mb-3" uncollapsed=true>
+					<x-layout.collapse id="payment" title="Paiement" class="rounded-lg mb-3" uncollapsed=true>
 						@include('Shop.Orders.partials.payments')
 					</x-layout.collapse>
 				</div>
@@ -40,7 +40,7 @@
 			
 		</div>
 		<div class="col-4">
-			<x-card class='shadow gradient-green1'>
+			<x-card class='shadow'>
 				@include('Shop.Baskets.partials.basketTotal')
 			</x-card>
 		</div>
diff --git a/resources/views/Shop/auth/partials/register.blade.php b/resources/views/Shop/auth/partials/register.blade.php
index d0fb3628..e03213dd 100644
--- a/resources/views/Shop/auth/partials/register.blade.php
+++ b/resources/views/Shop/auth/partials/register.blade.php
@@ -1,5 +1,5 @@
 {!! Form::open(['route' => 'Shop.register.post', 'method' => 'post', 'autocomplete'=> 'off']) !!}
-    <div class="row">
+    <div class="row green">
         <div class="col-12">
             <x-card title='Créez votre compte' class='mt-3 mb-3'>
 
@@ -8,11 +8,13 @@
                 <div class="row">
                     <div class="col-6">
                         <div class="form-group {{ $errors->has('password') ? 'has-error' : '' }}">
+                            <label>Mot de passe</label>
                             {{ Form::password('password', ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.password'), 'required']) }}
                             {!! $errors->first('password','<p class="text-danger"><strong>:message</strong></p>') !!}
                         </div>
                     </div>
                     <div class="col-6">
+                        <label>Confirmation du mot de passe</label>
                         <div class="form-group {{ $errors->has('password_confirmation') ? 'has-error' : '' }}">
                             {{ Form::password('password_confirmation', ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.password_confirm'), 'required']) }}
                             {!! $errors->first('password_confirmation','<p class="text-danger"><strong>:message</strong></p>') !!}
@@ -22,8 +24,17 @@
 
                 <div class="row">
                     <div class="col-12">
-                        @include('components.form.checkbox', ['name' => 'use_for_delivery', 'value' => false])
-                        Utiliser une autre adresse pour la livraison
+                        @include('components.form.checkboxes.icheck', [
+                            'name' => 'use_for_delivery',
+                            'value' => false,
+                            'label' => 'Utiliser une autre adresse pour la livraison',
+                        ])
+                    </div>
+                </div>
+
+                <div class="row d-none" id="address_delivery">
+                    <div class="col-12">
+                        @include('Shop.Customers.partials.address', ['label' => 'Adresse de livraison', 'prefix' => 'delivery_'])
                     </div>
                 </div>
 
@@ -40,3 +51,12 @@
         </div>
     </div>
 {!! Form::close() !!}
+
+
+@push('js')
+    <script>
+        $('#use_for_delivery').click(function() {
+            $('#address_delivery').toggleClass('d-none');
+        })
+    </script>
+@endpush
\ No newline at end of file
diff --git a/resources/views/Shop/layout/layout.blade.php b/resources/views/Shop/layout/layout.blade.php
index 859af558..3d29495c 100644
--- a/resources/views/Shop/layout/layout.blade.php
+++ b/resources/views/Shop/layout/layout.blade.php
@@ -23,7 +23,7 @@
 
 <body class="bg-green-dark">
 
-	<div class="container bg-green-ultra-dark" style="min-height: 100vh;">
+	<div class="container bg-light" style="min-height: 100vh;">
 		<main>
             @include("Shop.layout.partials.header")
 			<div class="content-wrapper">
diff --git a/resources/views/Shop/layout/partials/header-basket.blade.php b/resources/views/Shop/layout/partials/header-basket.blade.php
index 646b2866..94964971 100644
--- a/resources/views/Shop/layout/partials/header-basket.blade.php
+++ b/resources/views/Shop/layout/partials/header-basket.blade.php
@@ -1,7 +1,7 @@
 <div class="row">
 	<div class="col-12 text-right p-2">
 		<a href="{{ route('Shop.Basket.basket') }}" style="color: white;">
-			<button type="button" class="btn bg-green-dark light">
+			<button type="button" class="btn green">
 				<i class="fa fa-2x fa-fw fa-shopping-basket mr-2"></i>
 				<span class="ml-2 badge bg-yellow green-dark">
 					<span id="count-basket">{{ \App\Repositories\Core\User\ShopCart::getTotalQuantity() }}</span>
diff --git a/resources/views/Shop/layout/partials/header-nav.blade.php b/resources/views/Shop/layout/partials/header-nav.blade.php
index 16d0fb9d..52dcfbde 100644
--- a/resources/views/Shop/layout/partials/header-nav.blade.php
+++ b/resources/views/Shop/layout/partials/header-nav.blade.php
@@ -1,7 +1,7 @@
-<div class="row bg-green">
+<div class="row bg-light">
 
 	<div class="col-3 form-inline">
-		<a href="/"><img src="/img/logo.jpg" class="img-responvive"></a>
+		<a href="/"><img src="/img/logo.png" height="52"></a>
 	</div>
 
 	<div class="col-5 form-inline">	
diff --git a/resources/views/Shop/layout/partials/header-profile.blade.php b/resources/views/Shop/layout/partials/header-profile.blade.php
index 1ea7976a..ce9610ba 100644
--- a/resources/views/Shop/layout/partials/header-profile.blade.php
+++ b/resources/views/Shop/layout/partials/header-profile.blade.php
@@ -1,6 +1,6 @@
 <div class="row">
 	<div class="col-12 text-right p-2">
-		<button type="button" class="btn bg-green-dark light" data-toggle="dropdown">
+		<button type="button" class="btn bg-light green" data-toggle="dropdown">
 			@if (App\Repositories\Shop\Customers::isConnected())
 				<img src="{{ App\Repositories\Shop\Customers::getAvatar() }}" class="img-fluid" title="{{ App\Repositories\Shop\Customers::getName() }}">
 			@else
diff --git a/resources/views/Shop/layout/partials/sections.blade.php b/resources/views/Shop/layout/partials/sections.blade.php
index 22c4a482..f18feecf 100644
--- a/resources/views/Shop/layout/partials/sections.blade.php
+++ b/resources/views/Shop/layout/partials/sections.blade.php
@@ -1,19 +1,19 @@
 <div class="row shadow mb-3">
 	<div class="col-12 pl-0 pr-0">
-		<nav class="navbar navbar-expand-lg navbar-light gradient-green1">
+		<nav class="navbar navbar-expand-lg navbar-light">
 			<div class="collapse navbar-collapse" id="navbarContent">
 				<ul class="navbar-nav">
 					@foreach ($categories as $menu)
 						<li class="nav-item dropdown megamenu">
 							@if ($menu['children'] ?? false)
-								<a id="megamenu_{{ $menu['id'] }}" href="{{ route('Shop.Categories.show', ['id' => $menu['id']]) }}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="nav-link dropdown-toggle font-weight-bold text-uppercase @if (($category['id'] ?? false) == $menu['id']) active @endif">
+								<a id="megamenu_{{ $menu['id'] }}" href="{{ route('Shop.Categories.show', ['id' => $menu['id']]) }}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="nav-link dropdown-toggle font-weight-bold text-uppercase green @if (($category['id'] ?? false) == $menu['id']) active @endif">
 									{{ $menu['name'] }}
 								</a>
 								<div aria-labelledby="megamenu_{{ $menu['id'] }}" class="dropdown-menu border-0 p-0 m-0">
 									@include('Shop.layout.partials.megamenu')
 								</div>
 							@else
-								<a href="{{ route('Shop.Categories.show', ['id' => $menu['id']]) }}" class="nav-link font-weight-bold text-uppercase @if (($category['id'] ?? false) == $menu['id']) active @endif">
+								<a href="{{ route('Shop.Categories.show', ['id' => $menu['id']]) }}" class="nav-link font-weight-bold text-uppercase green @if (($category['id'] ?? false) == $menu['id']) active @endif">
 									{{ $menu['name'] }}
 								</a>
 							@endif
@@ -22,7 +22,7 @@
 				</ul>
 			</div>
 			<div class="float-right p-3">
-				<span style="font-size: 1.2em; font-weight: 600;">
+				<span class="green" style="font-size: 1.2em; font-weight: 600;">
 					Variétés Paysannes de la Semence à l'Assiette
 				</span>
 			</div>
diff --git a/resources/views/components/form/checkboxes/icheck.blade.php b/resources/views/components/form/checkboxes/icheck.blade.php
index bfe27c4a..eada82e3 100644
--- a/resources/views/components/form/checkboxes/icheck.blade.php
+++ b/resources/views/components/form/checkboxes/icheck.blade.php
@@ -1,4 +1,4 @@
 <div class="icheck-{{ $color ?? 'success' }} {{ $class ?? '' }}">
     @include('components.form.checkbox')
-    <label class="control-label light" for="{{ $id_name ?? $name }}">{{ $label ?? '' }}</label>
+    <label class="control-label" for="{{ $id_name ?? $name }}">{{ $label ?? '' }}</label>
 </div>
\ No newline at end of file