diff --git a/config/debugbar.php b/config/debugbar.php
index 8350e1c8d..c7c9ceee3 100755
--- a/config/debugbar.php
+++ b/config/debugbar.php
@@ -16,7 +16,7 @@ return [
 
     'enabled' => env('DEBUGBAR_ENABLED', null),
     'except' => [
-        //
+        'telescope*'
     ],
 
     /*
diff --git a/config/imagecache.php b/config/imagecache.php
index da65ce2b5..84f656b19 100755
--- a/config/imagecache.php
+++ b/config/imagecache.php
@@ -16,7 +16,7 @@ return array(
     |
     */
    
-    'route' => 'cache',
+    'route' => null,
 
     /*
     |--------------------------------------------------------------------------
@@ -31,8 +31,8 @@ return array(
     */
     
     'paths' => array(
-        storage_path('app/public'),
-        public_path('storage')
+        public_path('upload'),
+        public_path('images')
     ),
 
     /*
@@ -52,9 +52,9 @@ return array(
     */
    
     'templates' => array(
-        'small' => 'Webkul\Product\CacheFilters\Small',
-        'medium' => 'Webkul\Product\CacheFilters\Medium',
-        'large' => 'Webkul\Product\CacheFilters\Large',
+        'small' => 'Intervention\Image\Templates\Small',
+        'medium' => 'Intervention\Image\Templates\Medium',
+        'large' => 'Intervention\Image\Templates\Large',
     ),
 
     /*
diff --git a/config/tinker.php b/config/tinker.php
index 1341c1b03..181f0fdbd 100755
--- a/config/tinker.php
+++ b/config/tinker.php
@@ -2,6 +2,21 @@
 
 return [
 
+    /*
+    |--------------------------------------------------------------------------
+    | Console Commands
+    |--------------------------------------------------------------------------
+    |
+    | This option allows you to add additional Artisan commands that should
+    | be available within the Tinker environment. Once the command is in
+    | this array you may execute the command in Tinker using its name.
+    |
+    */
+
+    'commands' => [
+        // App\Console\Commands\ExampleCommand::class,
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | Alias Blacklist
diff --git a/config/translatable.php b/config/translatable.php
index 7c556e1ab..87f898b4e 100755
--- a/config/translatable.php
+++ b/config/translatable.php
@@ -39,6 +39,8 @@ return [
     | As a default locale, Translatable takes the locale of Laravel's
     | translator. If for some reason you want to override this,
     | you can specify what default should be used here.
+    | If you set a value here it will only use the current config value
+    | and never fallback to the translator one.
     |
     */
     'locale' => null,
@@ -54,7 +56,7 @@ return [
     | $useTranslationFallback when defined
     |
     */
-    'use_fallback' => true,
+    'use_fallback' => false,
 
     /*
     |--------------------------------------------------------------------------
@@ -80,6 +82,18 @@ return [
     */
     'fallback_locale' => 'en',
 
+    /*
+    |--------------------------------------------------------------------------
+    | Translation Model Namespace
+    |--------------------------------------------------------------------------
+    |
+    | Defines the default 'Translation' class namespace. For example, if
+    | you want to use App\Translations\CountryTranslation instead of App\CountryTranslation
+    | set this to 'App\Translations'.
+    |
+    */
+    'translation_model_namespace' => null,
+
     /*
     |--------------------------------------------------------------------------
     | Translation Suffix
diff --git a/packages/Webkul/Admin/src/Resources/views/users/roles/create.blade.php b/packages/Webkul/Admin/src/Resources/views/users/roles/create.blade.php
index f575fb86f..75b958b02 100755
--- a/packages/Webkul/Admin/src/Resources/views/users/roles/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/users/roles/create.blade.php
@@ -73,7 +73,7 @@
                 } else {
                     $('.tree-container').addClass('hide')
                 }
-                
+
             })
         });
     </script>
diff --git a/packages/Webkul/Shop/src/Resources/views/home/index.blade.php b/packages/Webkul/Shop/src/Resources/views/home/index.blade.php
index 978e0ee75..b01a56c38 100755
--- a/packages/Webkul/Shop/src/Resources/views/home/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/home/index.blade.php
@@ -9,7 +9,7 @@
     {!! view_render_event('bagisto.shop.home.content.before') !!}
 
     {!! DbView::make(core()->getCurrentChannel())->field('home_page_content')->with(['sliderData' => $sliderData])->render() !!}
-    
+
     {{ view_render_event('bagisto.shop.home.content.after') }}
 
 @endsection
diff --git a/public/installer/Admin.php b/public/installer/Admin.php
index 9c279dfd1..f48b48de3 100755
--- a/public/installer/Admin.php
+++ b/public/installer/Admin.php
@@ -24,13 +24,13 @@
                             <div class="control-group" id="admin_password">
                                 <label for="admin_password" class="required">Password</label>
                                 <input type="password" name="admin_password" class="control"
-                                data-validation="length required" data-validation-length="max50">
+                                data-validation="length required" data-validation-length="min6">
                             </div>
 
                             <div class="control-group" id="admin_re_password">
                                 <label for="admin_re_password" class="required">Re-Password</label>
                                 <input type="password" name="admin_re_password" class="control"
-                                data-validation="length required" data-validation-length="max50">
+                                data-validation="length required" data-validation-length="min6">
                             </div>
                         </div>
                     </div>
diff --git a/resources/views/vendor/mail/html/message.blade.php b/resources/views/vendor/mail/html/message.blade.php
index 2ad23a66e..1ae9ed8f1 100755
--- a/resources/views/vendor/mail/html/message.blade.php
+++ b/resources/views/vendor/mail/html/message.blade.php
@@ -21,7 +21,7 @@
     {{-- Footer --}}
     @slot('footer')
         @component('mail::footer')
-            &copy; {{ date('Y') }} {{ config('app.name') }}. All rights reserved.
+            © {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.')
         @endcomponent
     @endslot
 @endcomponent
diff --git a/resources/views/vendor/mail/markdown/message.blade.php b/resources/views/vendor/mail/markdown/message.blade.php
index b409c71cb..1ae9ed8f1 100755
--- a/resources/views/vendor/mail/markdown/message.blade.php
+++ b/resources/views/vendor/mail/markdown/message.blade.php
@@ -21,7 +21,7 @@
     {{-- Footer --}}
     @slot('footer')
         @component('mail::footer')
-            © {{ date('Y') }} {{ config('app.name') }}. All rights reserved.
+            © {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.')
         @endcomponent
     @endslot
 @endcomponent
diff --git a/resources/views/vendor/notifications/email.blade.php b/resources/views/vendor/notifications/email.blade.php
index fe3889532..e2c68be68 100755
--- a/resources/views/vendor/notifications/email.blade.php
+++ b/resources/views/vendor/notifications/email.blade.php
@@ -56,7 +56,7 @@
     'into your web browser: [:actionURL](:actionURL)',
     [
         'actionText' => $actionText,
-        'actionURL' => $actionUrl
+        'actionURL' => $actionUrl,
     ]
 )
 @endcomponent