diff --git a/Resources/views/conversations/search.blade.php b/Resources/views/conversations/search.blade.php
index 494be29..2ffee28 100644
--- a/Resources/views/conversations/search.blade.php
+++ b/Resources/views/conversations/search.blade.php
@@ -4,27 +4,27 @@
 @section('body_class', 'body-search')
 
 @section('sidebar')
-    @include('partials/sidebar_menu_toggle')
-    <div class="sidebar-title">
+	@include('partials/sidebar_menu_toggle')
+	<div class="sidebar-title">
 		{!! Eventy::filter('search.title', __('Search')) !!}
 	</div>
-    <ul class="sidebar-menu sidebar-menu-noicons">
-    	@if (!$recent || (count($recent) == 1 && $recent[0] == $q))
-    	@else
-	        <li class="no-link"><span class="text-help">{{ __('Recent') }}</span></li>
+	<ul class="sidebar-menu sidebar-menu-noicons">
+		@if (!$recent || (count($recent) == 1 && $recent[0] == $q))
+		@else
+			<li class="no-link"><span class="text-help">{{ __('Recent') }}</span></li>
 			@foreach ($recent as $recent_query)
 				@if ($recent_query != $q)
-	            	<li class="menu-link menu-padded"><a href="{{ route('conversations.search', ['q' => $recent_query, 'mode' => $mode])}}">{{ $recent_query }}</a></li>
-	            @endif
-	        @endforeach
-	    @endif
-        <li class="no-link"><span class="text-help">{{ __('Filters') }}</span></li>
+					<li class="menu-link menu-padded"><a href="{{ route('conversations.search', ['q' => $recent_query, 'mode' => $mode])}}">{{ $recent_query }}</a></li>
+				@endif
+			@endforeach
+		@endif
+		<li class="no-link"><span class="text-help">{{ __('Filters') }}</span></li>
 		@foreach ($filters_list as $filter)
-            <li class="menu-link menu-padded">
-            	<a href="#" data-filter="{{ $filter }}" @if (isset($filters[$filter]))class="active"@endif>{{ mb_strtolower(__(ucwords($filter))) }}:</a>
-            </li>
-        @endforeach
-    </ul>
+			<li class="menu-link menu-padded">
+				<a href="#" data-filter="{{ $filter }}" @if (isset($filters[$filter]))class="active"@endif>{{ mb_strtolower(__(ucwords($filter))) }}:</a>
+			</li>
+		@endforeach
+	</ul>
 @endsection
 
 @section('content')
@@ -46,130 +46,130 @@
 
 			<div class="row" id="search-filters">
 				<div class="col-sm-6 form-group @if (isset($filters['assigned'])) active @endif" data-filter="assigned">
-		            <label>{{ __('Assigned') }} <b class="remove" data-toggle="tooltip" title="{{ __('Remove filter') }}">×</b></label>
-		            <select name="f[assigned]" class="form-control" @if (empty($filters['assigned'])) disabled @endif>
-		            	<option value=""></option>
+					<label>{{ __('Assigned') }} <b class="remove" data-toggle="tooltip" title="{{ __('Remove filter') }}">×</b></label>
+					<select name="f[assigned]" class="form-control" @if (empty($filters['assigned'])) disabled @endif>
+						<option value=""></option>
 						<option value="{{ App\Conversation::USER_UNASSIGNED }}" @if (!empty($filters['assigned']) && $filters['assigned'] == App\Conversation::USER_UNASSIGNED)selected="selected"@endif>{{ __('Unassigned') }}</option>
-                        @foreach ($users as $user)
-                            <option value="{{ $user->id }}" @if (!empty($filters['assigned']) && $filters['assigned'] == $user->id)selected="selected"@endif>{{ $user->getFullName() }}</option>
-                        @endforeach
-                    </select>
-		        </div>
+						@foreach ($users as $user)
+							<option value="{{ $user->id }}" @if (!empty($filters['assigned']) && $filters['assigned'] == $user->id)selected="selected"@endif>{{ $user->getFullName() }}</option>
+						@endforeach
+					</select>
+				</div>
 				<div class="col-sm-6 form-group @if (isset($filters['customer'])) active @endif" data-filter="customer">
-		            <label>{{ __('Customer') }} <b class="remove" data-toggle="tooltip" title="{{ __('Remove filter') }}">×</b></label>
-		            <div class="controls">
-		            	<select class="form-control" name="f[customer]" id="search-filter-customer" @if (empty($filters['customer'])) disabled @endif/>
-		            	 	@if (!empty($filters['customer']) && !empty($filters_data['customer']))
-		            			<option value="{{ $filters_data['customer']->id }}" selected="selected">{{ $filters_data['customer']->getEmailAndName() }}</option>
-		            		@endif
-		            	</select>
-		            </div>
-		        </div>
+					<label>{{ __('Customer') }} <b class="remove" data-toggle="tooltip" title="{{ __('Remove filter') }}">×</b></label>
+					<div class="controls">
+						<select class="form-control" name="f[customer]" id="search-filter-customer" @if (empty($filters['customer'])) disabled @endif/>
+							@if (!empty($filters['customer']) && !empty($filters_data['customer']))
+								<option value="{{ $filters_data['customer']->id }}" selected="selected">{{ $filters_data['customer']->getEmailAndName() }}</option>
+							@endif
+						</select>
+					</div>
+				</div>
 				<div class="col-sm-6 form-group @if (isset($filters['mailbox'])) active @endif" data-filter="mailbox">
-		            <label>{{ __('Mailbox') }} <b class="remove" data-toggle="tooltip" title="{{ __('Remove filter') }}">×</b></label>
-		            <select name="f[mailbox]" class="form-control" @if (empty($filters['mailbox'])) disabled @endif>
-		            	<option value=""></option>
-                        @foreach ($mailboxes as $mailbox_item)
-                            <option value="{{ $mailbox_item->id }}" @if (!empty($filters['mailbox']) && $filters['mailbox'] == $mailbox_item->id)selected="selected"@endif>{{ $mailbox_item->name }}</option>
-                        @endforeach
-                    </select>
-		        </div>
+					<label>{{ __('Mailbox') }} <b class="remove" data-toggle="tooltip" title="{{ __('Remove filter') }}">×</b></label>
+					<select name="f[mailbox]" class="form-control" @if (empty($filters['mailbox'])) disabled @endif>
+						<option value=""></option>
+						@foreach ($mailboxes as $mailbox_item)
+							<option value="{{ $mailbox_item->id }}" @if (!empty($filters['mailbox']) && $filters['mailbox'] == $mailbox_item->id)selected="selected"@endif>{{ $mailbox_item->name }}</option>
+						@endforeach
+					</select>
+				</div>
 				<div class="col-sm-6 form-group @if (isset($filters['status'])) active @endif" data-filter="status">
-		            <label>{{ __('Status') }} <b class="remove" data-toggle="tooltip" title="{{ __('Remove filter') }}">×</b></label>
-		            <select name="f[status][]" class="form-control filter-multiple" multiple @if (empty($filters['status'])) disabled @endif>
-		            	{{--<option value=""></option>--}}
-                        @foreach (App\Conversation::$statuses as $status_id => $dummy)
-                            <option value="{{ $status_id }}" @if (!empty($filters['status']) && in_array($status_id, $filters['status']))selected="selected"@endif>{{ App\Conversation::statusCodeToName($status_id) }}</option>
-                        @endforeach
-                    </select>
-		        </div>
+					<label>{{ __('Status') }} <b class="remove" data-toggle="tooltip" title="{{ __('Remove filter') }}">×</b></label>
+					<select name="f[status][]" class="form-control filter-multiple" multiple @if (empty($filters['status'])) disabled @endif>
+						{{--<option value=""></option>--}}
+						@foreach (App\Conversation::$statuses as $status_id => $dummy)
+							<option value="{{ $status_id }}" @if (!empty($filters['status']) && in_array($status_id, $filters['status']))selected="selected"@endif>{{ App\Conversation::statusCodeToName($status_id) }}</option>
+						@endforeach
+					</select>
+				</div>
 				<div class="col-sm-6 form-group @if (isset($filters['state'])) active @endif" data-filter="state">
-		            <label>{{ __('State') }} <b class="remove" data-toggle="tooltip" title="{{ __('Remove filter') }}">×</b></label>
-		            <select name="f[state][]" class="form-control filter-multiple" multiple @if (empty($filters['state'])) disabled @endif>
-		            	{{--<option value=""></option>--}}
-                        @foreach (App\Conversation::$states as $state_id => $dummy)
-                            <option value="{{ $state_id }}" @if (!empty($filters['state']) && in_array($state_id, $filters['state']))selected="selected"@endif>{{ App\Conversation::stateCodeToName($state_id) }}</option>
-                        @endforeach
-                    </select>
-		        </div>
+					<label>{{ __('State') }} <b class="remove" data-toggle="tooltip" title="{{ __('Remove filter') }}">×</b></label>
+					<select name="f[state][]" class="form-control filter-multiple" multiple @if (empty($filters['state'])) disabled @endif>
+						{{--<option value=""></option>--}}
+						@foreach (App\Conversation::$states as $state_id => $dummy)
+							<option value="{{ $state_id }}" @if (!empty($filters['state']) && in_array($state_id, $filters['state']))selected="selected"@endif>{{ App\Conversation::stateCodeToName($state_id) }}</option>
+						@endforeach
+					</select>
+				</div>
 				<div class="col-sm-6 form-group @if (isset($filters['subject'])) active @endif" data-filter="subject">
-		            <label>{{ __('Subject') }} <b class="remove" data-toggle="tooltip" title="{{ __('Remove filter') }}">×</b></label>
-		            <input type="text" name="f[subject]" value="{{ $filters['subject'] ?? ''}}" class="form-control" @if (empty($filters['subject'])) disabled @endif>
-		        </div>
+					<label>{{ __('Subject') }} <b class="remove" data-toggle="tooltip" title="{{ __('Remove filter') }}">×</b></label>
+					<input type="text" name="f[subject]" value="{{ $filters['subject'] ?? ''}}" class="form-control" @if (empty($filters['subject'])) disabled @endif>
+				</div>
 				<div class="col-sm-6 form-group @if (isset($filters['attachments'])) active @endif" data-filter="attachments">
-		            <label>{{ __('Attachments') }} <b class="remove" data-toggle="tooltip" title="{{ __('Remove filter') }}">×</b></label>
-		            <select name="f[attachments]" class="form-control" @if (empty($filters['attachments'])) disabled @endif>
-		            	<option value=""></option>
-                        <option value="yes" @if (!empty($filters['attachments']) && $filters['attachments'] == 'yes')selected="selected"@endif>{{ __('Yes') }}</option>
-                        <option value="no" @if (!empty($filters['attachments']) && $filters['attachments'] == 'no')selected="selected"@endif>{{ __('No') }}</option>
-                    </select>
-		        </div>
+					<label>{{ __('Attachments') }} <b class="remove" data-toggle="tooltip" title="{{ __('Remove filter') }}">×</b></label>
+					<select name="f[attachments]" class="form-control" @if (empty($filters['attachments'])) disabled @endif>
+						<option value=""></option>
+						<option value="yes" @if (!empty($filters['attachments']) && $filters['attachments'] == 'yes')selected="selected"@endif>{{ __('Yes') }}</option>
+						<option value="no" @if (!empty($filters['attachments']) && $filters['attachments'] == 'no')selected="selected"@endif>{{ __('No') }}</option>
+					</select>
+				</div>
 				<div class="col-sm-6 form-group @if (isset($filters['type'])) active @endif" data-filter="type">
-		            <label>{{ __('Type') }} <b class="remove" data-toggle="tooltip" title="{{ __('Remove filter') }}">×</b></label>
-		            <select name="f[type]" class="form-control" @if (empty($filters['type'])) disabled @endif>
-		            	<option value=""></option>
-                        @foreach (App\Conversation::$types as $type_id => $dummy)
-                            <option value="{{ $type_id }}" @if (!empty($filters['type']) && $filters['type'] == $type_id)selected="selected"@endif>{{ App\Conversation::typeToName($type_id) }}</option>
-                        @endforeach
-                    </select>
-		        </div>
+					<label>{{ __('Type') }} <b class="remove" data-toggle="tooltip" title="{{ __('Remove filter') }}">×</b></label>
+					<select name="f[type]" class="form-control" @if (empty($filters['type'])) disabled @endif>
+						<option value=""></option>
+						@foreach (App\Conversation::$types as $type_id => $dummy)
+							<option value="{{ $type_id }}" @if (!empty($filters['type']) && $filters['type'] == $type_id)selected="selected"@endif>{{ App\Conversation::typeToName($type_id) }}</option>
+						@endforeach
+					</select>
+				</div>
 				<div class="col-sm-6 form-group @if (isset($filters['body'])) active @endif" data-filter="body">
-		            <label>{{ __('Body') }} <b class="remove" data-toggle="tooltip" title="{{ __('Remove filter') }}">×</b></label>
-		            <input type="text" name="f[body]" value="{{ $filters['body'] ?? ''}}" class="form-control" @if (empty($filters['body'])) disabled @endif>
-		        </div>
+					<label>{{ __('Body') }} <b class="remove" data-toggle="tooltip" title="{{ __('Remove filter') }}">×</b></label>
+					<input type="text" name="f[body]" value="{{ $filters['body'] ?? ''}}" class="form-control" @if (empty($filters['body'])) disabled @endif>
+				</div>
 				<div class="col-sm-6 form-group @if (isset($filters['number'])) active @endif" data-filter="number">
-		            <label>{{ __('Number') }} <b class="remove" data-toggle="tooltip" title="{{ __('Remove filter') }}">×</b></label>
-		            <input type="text" name="f[number]" value="{{ $filters['number'] ?? ''}}" class="form-control" @if (empty($filters['number'])) disabled @endif>
-		        </div>
+					<label>{{ __('Number') }} <b class="remove" data-toggle="tooltip" title="{{ __('Remove filter') }}">×</b></label>
+					<input type="text" name="f[number]" value="{{ $filters['number'] ?? ''}}" class="form-control" @if (empty($filters['number'])) disabled @endif>
+				</div>
 				<div class="col-sm-6 form-group @if (isset($filters['following'])) active @endif" data-filter="following">
-		            <label>{{ __('Following') }} <b class="remove" data-toggle="tooltip" title="{{ __('Remove filter') }}">×</b></label>
-		            <select name="f[following]" class="form-control" @if (empty($filters['following'])) disabled @endif>
-		            	<option value=""></option>
-                        <option value="yes" @if (!empty($filters['following']) && $filters['following'] == 'yes')selected="selected"@endif>{{ __('Yes') }}</option>
-                    </select>
-		        </div>
+					<label>{{ __('Following') }} <b class="remove" data-toggle="tooltip" title="{{ __('Remove filter') }}">×</b></label>
+					<select name="f[following]" class="form-control" @if (empty($filters['following'])) disabled @endif>
+						<option value=""></option>
+						<option value="yes" @if (!empty($filters['following']) && $filters['following'] == 'yes')selected="selected"@endif>{{ __('Yes') }}</option>
+					</select>
+				</div>
 				<div class="col-sm-6 form-group @if (isset($filters['id'])) active @endif" data-filter="id">
-		            <label>{{ __('ID') }} <b class="remove" data-toggle="tooltip" title="{{ __('Remove filter') }}">×</b></label>
-		            <input type="text" name="f[id]" value="{{ $filters['id'] ?? ''}}" class="form-control" @if (empty($filters['id'])) disabled @endif>
-		        </div>
+					<label>{{ __('ID') }} <b class="remove" data-toggle="tooltip" title="{{ __('Remove filter') }}">×</b></label>
+					<input type="text" name="f[id]" value="{{ $filters['id'] ?? ''}}" class="form-control" @if (empty($filters['id'])) disabled @endif>
+				</div>
 				<div class="col-sm-6 form-group @if (isset($filters['after'])) active @endif" data-filter="after">
-		            <label>{{ __('After') }} <b class="remove" data-toggle="tooltip" title="{{ __('Remove filter') }}">×</b></label>
-		            <input type="text" name="f[after]" value="{{ $filters['after'] ?? ''}}" class="form-control input-date" @if (empty($filters['after'])) disabled @endif>
-		        </div>
+					<label>{{ __('After') }} <b class="remove" data-toggle="tooltip" title="{{ __('Remove filter') }}">×</b></label>
+					<input type="text" name="f[after]" value="{{ $filters['after'] ?? ''}}" class="form-control input-date" @if (empty($filters['after'])) disabled @endif>
+				</div>
 				<div class="col-sm-6 form-group @if (isset($filters['before'])) active @endif" data-filter="before">
-		            <label>{{ __('Before') }} <b class="remove" data-toggle="tooltip" title="{{ __('Remove filter') }}">×</b></label>
-		            <input type="text" name="f[before]" value="{{ $filters['before'] ?? ''}}" class="form-control input-date" @if (empty($filters['before'])) disabled @endif>
-		        </div>
-		        @action('search.display_filters', $filters, $filters_data, $mode)
-		    </div>
+					<label>{{ __('Before') }} <b class="remove" data-toggle="tooltip" title="{{ __('Remove filter') }}">×</b></label>
+					<input type="text" name="f[before]" value="{{ $filters['before'] ?? ''}}" class="form-control input-date" @if (empty($filters['before'])) disabled @endif>
+				</div>
+				@action('search.display_filters', $filters, $filters_data, $mode)
+			</div>
 
-	        <div class="input-group input-group-lg1">
-	            <input type="text" class="form-control" name="q" value="{{ $q }}">
-	            <span class="input-group-btn">
-	                <button class="btn btn-default" type="submit">{{ __('Search') }}</button>
-	            </span>
-	        </div>
-	    </form>
+			<div class="input-group input-group-lg1">
+				<input type="text" class="form-control" name="q" value="{{ $q }}">
+				<span class="input-group-btn">
+					<button class="btn btn-default" type="submit">{{ __('Search') }}</button>
+				</span>
+			</div>
+		</form>
 	</div>
 
 	<div class="search-results">
 		<ul class="nav nav-tabs nav-tabs-main margin-top">
 			@if (Eventy::filter('search.is_tab_visible', true, App\Conversation::SEARCH_MODE_CONV))
-		    	<li @if ($mode == App\Conversation::SEARCH_MODE_CONV)class="active search-tab-conv"@endif><a href="{{ \Helper::fixProtocol(request()->fullUrlWithQuery(['mode' => App\Conversation::SEARCH_MODE_CONV])) }}">{{ __('Conversations') }} <b>({{ $conversations->total() }})</b>@action('search.conversations_tab_append', $filters, $conversations->total())</a></li>
-		    @endif
-		    <li @if ($mode == App\Conversation::SEARCH_MODE_CUSTOMERS)class="active"@endif><a href="{{ \Helper::fixProtocol(request()->fullUrlWithQuery(['mode' => App\Conversation::SEARCH_MODE_CUSTOMERS])) }}">{{ __('Customers') }} <b>({{ $customers->total() }})</b></a></li>
+				<li @if ($mode == App\Conversation::SEARCH_MODE_CONV)class="active search-tab-conv"@endif><a href="{{ \Helper::fixProtocol(request()->fullUrlWithQuery(['mode' => App\Conversation::SEARCH_MODE_CONV])) }}">{{ __('Conversations') }} <b>({{ $conversations->total() }})</b>@action('search.conversations_tab_append', $filters, $conversations->total())</a></li>
+			@endif
+			<li @if ($mode == App\Conversation::SEARCH_MODE_CUSTOMERS)class="active"@endif><a href="{{ \Helper::fixProtocol(request()->fullUrlWithQuery(['mode' => App\Conversation::SEARCH_MODE_CUSTOMERS])) }}">{{ __('Customers') }} <b>({{ $customers->total() }})</b></a></li>
 		</ul>
 		@if ($mode == App\Conversation::SEARCH_MODE_CONV)
-	    	@include('conversations/conversations_table', ['mailbox' => $search_mailbox, 'params' => ['target_blank' => true, 'show_mailbox' => (count(Auth::user()->mailboxesCanView(true)) > 1)]])
-	    @else
-	    	@include('freescout-restricted-customers::customers/partials/customers_table')
-	    @endif
+			@include('conversations/conversations_table', ['mailbox' => $search_mailbox, 'params' => ['target_blank' => true, 'show_mailbox' => (count(Auth::user()->mailboxesCanView(true)) > 1)]])
+		@else
+			@include('mmfrestrictedcustomers::customers/partials/customers_table')
+		@endif
 	</div>
 @endsection
 
 @include('partials/include_datepicker')
 
 @section('javascript')
-    @parent
-    searchInit();
+	@parent
+	searchInit();
 @endsection
diff --git a/Resources/views/create_customer.blade.php b/Resources/views/create_customer.blade.php
index 316b0a6..e60f1de 100644
--- a/Resources/views/create_customer.blade.php
+++ b/Resources/views/create_customer.blade.php
@@ -3,7 +3,7 @@
 @section('title', 'Add Customer (MillionsMissingFrance)')
 
 @section('content')
-	@include('freescout-restricted-customers::customers/partials/edit_form', ['save_button_title' => __('Add')])
+	@include('mmfrestrictedcustomers::customers/partials/edit_form', ['save_button_title' => __('Add')])
 @endsection
 
 @section('javascript')
diff --git a/Resources/views/customers/update.blade.php b/Resources/views/customers/update.blade.php
index 6055bd1..851be42 100644
--- a/Resources/views/customers/update.blade.php
+++ b/Resources/views/customers/update.blade.php
@@ -6,18 +6,18 @@
 @section('body_attrs')@parent data-customer_id="{{ $customer->id }}"@endsection
 
 @section('sidebar')
-    <div class="profile-preview">
-    	@include('customers/profile_menu')
-        @include('customers/profile_snippet')
-    </div>
+	<div class="profile-preview">
+		@include('customers/profile_menu')
+		@include('customers/profile_snippet')
+	</div>
 @endsection
 
 @section('content')
-    @include('customers/profile_tabs')
-    @include('freescout-restricted-customers::customers/partials/edit_form')
+	@include('customers/profile_tabs')
+	@include('mmfrestrictedcustomers::customers/partials/edit_form')
 @endsection
 
 @section('javascript')
-    @parent
-    multiInputInit();
+	@parent
+	multiInputInit();
 @endsection