From 53806b7123e4749ca5e2e496381446ae9fa6c424 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Tue, 5 Nov 2019 15:49:15 +0300
Subject: [PATCH] base theme edited

---
 .../advs-module/src/Adv/AdvModel.php          |  4 +--
 .../Seed/Blocks/left-home-banner-area.twig    |  2 +-
 .../Blocks/list-item-right-sidebar-en.twig    |  6 ++---
 .../Blocks/list-item-right-sidebar-tr.twig    |  8 +++---
 .../Seed/Blocks/middle-home-banner-area.twig  |  2 +-
 .../Seed/Blocks/right-home-banner-area.twig   |  2 +-
 .../resources/css/default/fotorama.min.css    |  2 +-
 .../base-theme/resources/css/default/main.css |  8 +++---
 .../resources/font-awesome/css/all.css        | 12 ++++-----
 .../resources/scss/bootstrap/_glyphicons.scss | 10 +++----
 .../resources/scss/font-awesome/_path.scss    | 10 +++----
 .../resources/views/ad-detail/detail.twig     |  8 +++---
 .../views/ad-detail/partials/detail.twig      |  4 +--
 .../views/ad-detail/partials/slider.twig      |  4 +--
 .../addons/anomaly/pages-module/page.twig     |  6 ++---
 .../resources/views/errors/403.twig           |  2 +-
 .../resources/views/errors/404.twig           |  2 +-
 .../resources/views/errors/500.twig           |  2 +-
 .../resources/views/home/featured.twig        |  2 +-
 .../resources/views/indexes/index.twig        | 20 +++++++-------
 .../resources/views/indexes/indexcar.twig     |  8 +++---
 .../resources/views/indexes/s-index.twig      | 16 +++++------
 .../resources/views/layouts/default.twig      | 10 +++----
 .../base-theme/resources/views/list/list.twig | 12 ++++-----
 .../base-theme/resources/views/list/map.twig  |  2 +-
 .../views/list/partials/list-filter.twig      |  6 ++---
 .../views/list/partials/list-section.twig     |  6 ++---
 .../views/list/partials/user-section.twig     |  2 +-
 .../resources/views/list/table.twig           |  8 +++---
 .../base-theme/resources/views/login.twig     |  6 ++---
 .../resources/views/new-ad/edit-cat.twig      |  3 ++-
 .../resources/views/new-ad/new-create.twig    |  7 ++---
 .../resources/views/new-ad/post-cat.twig      |  7 ++---
 .../resources/views/page/contact.twig         | 12 ++++-----
 .../resources/views/partials/assets.twig      | 27 ++++++++++---------
 .../resources/views/partials/footer.twig      |  2 +-
 .../resources/views/partials/header.twig      |  4 +--
 .../resources/views/partials/metadata.twig    | 14 +++++-----
 .../resources/views/partials/nav-s.twig       |  4 +--
 .../resources/views/partials/nav.twig         | 10 +++----
 .../resources/views/passwords/forgot.twig     |  4 +--
 .../resources/views/passwords/reset.twig      |  2 +-
 .../base-theme/resources/views/register.twig  |  4 +--
 .../resources/views/scroll-modal.twig         |  8 +++---
 44 files changed, 152 insertions(+), 148 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
index eb9abab5d..cbcd74a6f 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
@@ -313,7 +313,7 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
     public function AddAdsDefaultCoverImage($ad)
     {
         if ($ad->cover_photo == null) {
-            $ad->cover_photo = $this->dispatch(new MakeImageInstance('theme::images/no-image-ads.jpg', 'img'))->url();
+            $ad->cover_photo = $this->dispatch(new MakeImageInstance('visiosoft.theme.base::images/no-image-ads.jpg', 'img'))->url();
         } else {
             $ad->cover_photo = url($ad->cover_photo);
         }
@@ -324,7 +324,7 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
     {
         $adv = $this->find($id);
         if ($adv == null or $adv->cover_photo == null) {
-            $cover_photo = $this->dispatch(new MakeImageInstance('theme::images/no-image-ads.jpg', 'img'))->url();
+            $cover_photo = $this->dispatch(new MakeImageInstance('visiosoft.theme.base::images/no-image-ads.jpg', 'img'))->url();
         } else {
             $cover_photo = url($adv->cover_photo);
         }
diff --git a/addons/default/visiosoft/advs-module/src/Seed/Blocks/left-home-banner-area.twig b/addons/default/visiosoft/advs-module/src/Seed/Blocks/left-home-banner-area.twig
index e8325f104..1cea819a0 100644
--- a/addons/default/visiosoft/advs-module/src/Seed/Blocks/left-home-banner-area.twig
+++ b/addons/default/visiosoft/advs-module/src/Seed/Blocks/left-home-banner-area.twig
@@ -1,3 +1,3 @@
 <div class="advertisement">
-    <a href="#"><img src="{{ img('theme::images/ads/2.jpg').url }}" alt="Images" class="img-responsive"></a>
+    <a href="#"><img src="{{ img('visiosoft.theme.base::images/ads/2.jpg').url }}" alt="Images" class="img-responsive"></a>
 </div>
\ No newline at end of file
diff --git a/addons/default/visiosoft/advs-module/src/Seed/Blocks/list-item-right-sidebar-en.twig b/addons/default/visiosoft/advs-module/src/Seed/Blocks/list-item-right-sidebar-en.twig
index 01e7f4332..eabaaeb4d 100644
--- a/addons/default/visiosoft/advs-module/src/Seed/Blocks/list-item-right-sidebar-en.twig
+++ b/addons/default/visiosoft/advs-module/src/Seed/Blocks/list-item-right-sidebar-en.twig
@@ -3,7 +3,7 @@
     <div class="single-cta">
         <!-- cta-icon -->
         <div class="cta-icon icon-secure">
-            <img src="{{ img('theme::images/icon/13.png').url }}" alt="Icon"
+            <img src="{{ img('visiosoft.theme.base::images/icon/13.png').url }}" alt="Icon"
                  class="img-responsive">
         </div><!-- cta-icon -->
 
@@ -15,7 +15,7 @@
     <div class="single-cta">
         <!-- cta-icon -->
         <div class="cta-icon icon-support">
-            <img src="{{ img('theme::images/icon/14.png').url }}" alt="Icon"
+            <img src="{{ img('visiosoft.theme.base::images/icon/14.png').url }}" alt="Icon"
                  class="img-responsive">
         </div><!-- cta-icon -->
 
@@ -28,7 +28,7 @@
     <div class="single-cta">
         <!-- cta-icon -->
         <div class="cta-icon icon-trading">
-            <img src="{{ img('theme::images/icon/15.png').url }}" alt="Icon"
+            <img src="{{ img('visiosoft.theme.base::images/icon/15.png').url }}" alt="Icon"
                  class="img-responsive">
         </div><!-- cta-icon -->
 
diff --git a/addons/default/visiosoft/advs-module/src/Seed/Blocks/list-item-right-sidebar-tr.twig b/addons/default/visiosoft/advs-module/src/Seed/Blocks/list-item-right-sidebar-tr.twig
index bce963ff7..e8ea4a415 100644
--- a/addons/default/visiosoft/advs-module/src/Seed/Blocks/list-item-right-sidebar-tr.twig
+++ b/addons/default/visiosoft/advs-module/src/Seed/Blocks/list-item-right-sidebar-tr.twig
@@ -3,7 +3,7 @@
     <div class="single-cta">
         <!-- cta-icon -->
         <div class="cta-icon icon-secure">
-            <img src="{{ img('theme::images/icon/13.png').url }}" alt="Icon"
+            <img src="{{ img('visiosoft.theme.base::images/icon/13.png').url }}" alt="Icon"
                  class="img-responsive">
         </div><!-- cta-icon -->
 
@@ -15,7 +15,7 @@
     <div class="single-cta">
         <!-- cta-icon -->
         <div class="cta-icon icon-support">
-            <img src="{{ img('theme::images/icon/14.png').url }}" alt="Icon"
+            <img src="{{ img('visiosoft.theme.base::images/icon/14.png').url }}" alt="Icon"
                  class="img-responsive">
         </div><!-- cta-icon -->
 
@@ -28,7 +28,7 @@
     <div class="single-cta">
         <!-- cta-icon -->
         <div class="cta-icon icon-trading">
-            <img src="{{ img('theme::images/icon/15.png').url }}" alt="Icon"
+            <img src="{{ img('visiosoft.theme.base::images/icon/15.png').url }}" alt="Icon"
                  class="img-responsive">
         </div><!-- cta-icon -->
 
@@ -40,7 +40,7 @@
     <div class="single-cta">
         <!-- cta-icon -->
         <div class="cta-icon icon-trading">
-            <img src="{{ img('theme::images/icon/14.png').url }}" alt="Icon"
+            <img src="{{ img('visiosoft.theme.base::images/icon/14.png').url }}" alt="Icon"
                  class="img-responsive">
         </div><!-- cta-icon -->
         <h5>Yardıma mı ihtiyacınız var?</h5>
diff --git a/addons/default/visiosoft/advs-module/src/Seed/Blocks/middle-home-banner-area.twig b/addons/default/visiosoft/advs-module/src/Seed/Blocks/middle-home-banner-area.twig
index 3e24115e7..15d1af80e 100644
--- a/addons/default/visiosoft/advs-module/src/Seed/Blocks/middle-home-banner-area.twig
+++ b/addons/default/visiosoft/advs-module/src/Seed/Blocks/middle-home-banner-area.twig
@@ -1,3 +1,3 @@
 <div class="ad-section text-center">
-    <a href="#"><img src="{{ img('theme::images/ads/3.jpg').url }}" alt="Image" class="img-responsive"></a>
+    <a href="#"><img src="{{ img('visiosoft.theme.base::images/ads/3.jpg').url }}" alt="Image" class="img-responsive"></a>
 </div>
\ No newline at end of file
diff --git a/addons/default/visiosoft/advs-module/src/Seed/Blocks/right-home-banner-area.twig b/addons/default/visiosoft/advs-module/src/Seed/Blocks/right-home-banner-area.twig
index 120413a60..0d530d900 100644
--- a/addons/default/visiosoft/advs-module/src/Seed/Blocks/right-home-banner-area.twig
+++ b/addons/default/visiosoft/advs-module/src/Seed/Blocks/right-home-banner-area.twig
@@ -1,3 +1,3 @@
 <div class="advertisement text-center">
-    <a href="#"><img src="{{ img('theme::images/ads/1.jpg').url }}" alt="Images" class="img-responsive"></a>
+    <a href="#"><img src="{{ img('visiosoft.theme.base::images/ads/1.jpg').url }}" alt="Images" class="img-responsive"></a>
 </div>
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/css/default/fotorama.min.css b/addons/default/visiosoft/base-theme/resources/css/default/fotorama.min.css
index a98787afa..2b0b69891 100644
--- a/addons/default/visiosoft/base-theme/resources/css/default/fotorama.min.css
+++ b/addons/default/visiosoft/base-theme/resources/css/default/fotorama.min.css
@@ -1,4 +1,4 @@
 /*!
  * Fotorama 4.6.4 | http://fotorama.io/license/
  */
-.fotorama__arr:focus:after,.fotorama__fullscreen-icon:focus:after,.fotorama__html,.fotorama__img,.fotorama__nav__frame:focus .fotorama__dot:after,.fotorama__nav__frame:focus .fotorama__thumb:after,.fotorama__stage__frame,.fotorama__stage__shaft,.fotorama__video iframe{position:absolute;width:100%;height:100%;top:0;right:0;left:0;bottom:0}.fotorama--fullscreen,.fotorama__img{max-width:99999px!important;max-height:99999px!important;min-width:0!important;min-height:0!important;border-radius:0!important;box-shadow:none!important;padding:0!important}.fotorama__wrap .fotorama__grab{cursor:move;cursor:-webkit-grab;cursor:-o-grab;cursor:-ms-grab;cursor:grab}.fotorama__grabbing *{cursor:move;cursor:-webkit-grabbing;cursor:-o-grabbing;cursor:-ms-grabbing;cursor:grabbing}.fotorama__spinner{position:absolute!important;top:50%!important;left:50%!important}.fotorama__wrap--css3 .fotorama__arr,.fotorama__wrap--css3 .fotorama__fullscreen-icon,.fotorama__wrap--css3 .fotorama__nav__shaft,.fotorama__wrap--css3 .fotorama__stage__shaft,.fotorama__wrap--css3 .fotorama__thumb-border,.fotorama__wrap--css3 .fotorama__video-close,.fotorama__wrap--css3 .fotorama__video-play{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.fotorama__caption,.fotorama__nav:after,.fotorama__nav:before,.fotorama__stage:after,.fotorama__stage:before,.fotorama__wrap--css3 .fotorama__html,.fotorama__wrap--css3 .fotorama__nav,.fotorama__wrap--css3 .fotorama__spinner,.fotorama__wrap--css3 .fotorama__stage,.fotorama__wrap--css3 .fotorama__stage .fotorama__img,.fotorama__wrap--css3 .fotorama__stage__frame{-webkit-transform:translateZ(0);transform:translateZ(0)}.fotorama__arr:focus,.fotorama__fullscreen-icon:focus,.fotorama__nav__frame{outline:0}.fotorama__arr:focus:after,.fotorama__fullscreen-icon:focus:after,.fotorama__nav__frame:focus .fotorama__dot:after,.fotorama__nav__frame:focus .fotorama__thumb:after{content:'';border-radius:inherit;background-color:rgba(0,175,234,.5)}.fotorama__wrap--video .fotorama__stage,.fotorama__wrap--video .fotorama__stage__frame--video,.fotorama__wrap--video .fotorama__stage__frame--video .fotorama__html,.fotorama__wrap--video .fotorama__stage__frame--video .fotorama__img,.fotorama__wrap--video .fotorama__stage__shaft{-webkit-transform:none!important;transform:none!important}.fotorama__wrap--css3 .fotorama__nav__shaft,.fotorama__wrap--css3 .fotorama__stage__shaft,.fotorama__wrap--css3 .fotorama__thumb-border{transition-property:-webkit-transform,width;transition-property:transform,width;transition-timing-function:cubic-bezier(0.1,0,.25,1);transition-duration:0ms}.fotorama__arr,.fotorama__fullscreen-icon,.fotorama__no-select,.fotorama__video-close,.fotorama__video-play,.fotorama__wrap{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.fotorama__select{-webkit-user-select:text;-moz-user-select:text;-ms-user-select:text;user-select:text}.fotorama__nav,.fotorama__nav__frame{margin:auto;padding:0}.fotorama__caption__wrap,.fotorama__nav__frame,.fotorama__nav__shaft{-moz-box-orient:vertical;display:inline-block;vertical-align:middle;*display:inline;*zoom:1}.fotorama__nav__frame,.fotorama__thumb-border{box-sizing:content-box}.fotorama__caption__wrap{box-sizing:border-box}.fotorama--hidden,.fotorama__load{position:absolute;left:-99999px;top:-99999px;z-index:-1}.fotorama__arr,.fotorama__fullscreen-icon,.fotorama__nav,.fotorama__nav__frame,.fotorama__nav__shaft,.fotorama__stage__frame,.fotorama__stage__shaft,.fotorama__video-close,.fotorama__video-play{-webkit-tap-highlight-color:transparent}.fotorama__arr,.fotorama__fullscreen-icon,.fotorama__video-close,.fotorama__video-play{background:url("{{ img('theme::images/fotorama.png').url }}") no-repeat}@media (-webkit-min-device-pixel-ratio:1.5),(min-resolution:2dppx){.fotorama__arr,.fotorama__fullscreen-icon,.fotorama__video-close,.fotorama__video-play{background:url(fotorama@2x.png) 0 0/96px 160px no-repeat}}.fotorama__thumb{background-color:#7f7f7f;background-color:rgba(127,127,127,.2)}@media print{.fotorama__arr,.fotorama__fullscreen-icon,.fotorama__thumb-border,.fotorama__video-close,.fotorama__video-play{background:none!important}}.fotorama{min-width:1px;overflow:hidden}.fotorama:not(.fotorama--unobtrusive)>*:not(:first-child){display:none}.fullscreen{width:100%!important;height:100%!important;max-width:100%!important;max-height:100%!important;margin:0!important;padding:0!important;overflow:hidden!important;background:#000}.fotorama--fullscreen{position:absolute!important;top:0!important;left:0!important;right:0!important;bottom:0!important;float:none!important;z-index:2147483647!important;background:#000;width:100%!important;height:100%!important;margin:0!important}.fotorama--fullscreen .fotorama__nav,.fotorama--fullscreen .fotorama__stage{background:#000}.fotorama__wrap{-webkit-text-size-adjust:100%;position:relative;direction:ltr;z-index:0}.fotorama__wrap--rtl .fotorama__stage__frame{direction:rtl}.fotorama__nav,.fotorama__stage{overflow:hidden;position:relative;max-width:100%}.fotorama__wrap--pan-y{-ms-touch-action:pan-y}.fotorama__wrap .fotorama__pointer{cursor:pointer}.fotorama__wrap--slide .fotorama__stage__frame{opacity:1!important}.fotorama__stage__frame{overflow:hidden}.fotorama__stage__frame.fotorama__active{z-index:8}.fotorama__wrap--fade .fotorama__stage__frame{display:none}.fotorama__wrap--fade .fotorama__fade-front,.fotorama__wrap--fade .fotorama__fade-rear,.fotorama__wrap--fade .fotorama__stage__frame.fotorama__active{display:block;left:0;top:0}.fotorama__wrap--fade .fotorama__fade-front{z-index:8}.fotorama__wrap--fade .fotorama__fade-rear{z-index:7}.fotorama__wrap--fade .fotorama__fade-rear.fotorama__active{z-index:9}.fotorama__wrap--fade .fotorama__stage .fotorama__shadow{display:none}.fotorama__img{-ms-filter:"alpha(Opacity=0)";filter:alpha(opacity=0);opacity:0;border:none!important}.fotorama__error .fotorama__img,.fotorama__loaded .fotorama__img{-ms-filter:"alpha(Opacity=100)";filter:alpha(opacity=100);opacity:1}.fotorama--fullscreen .fotorama__loaded--full .fotorama__img,.fotorama__img--full{display:none}.fotorama--fullscreen .fotorama__loaded--full .fotorama__img--full{display:block}.fotorama__wrap--only-active .fotorama__nav,.fotorama__wrap--only-active .fotorama__stage{max-width:99999px!important}.fotorama__wrap--only-active .fotorama__stage__frame{visibility:hidden}.fotorama__wrap--only-active .fotorama__stage__frame.fotorama__active{visibility:visible}.fotorama__nav{font-size:0;line-height:0;text-align:center;display:none;white-space:nowrap;z-index:5}.fotorama__nav__shaft{position:relative;left:0;top:0;text-align:left}.fotorama__nav__frame{position:relative;cursor:pointer}.fotorama__nav--dots{display:block}.fotorama__nav--dots .fotorama__nav__frame{width:18px;height:30px}.fotorama__nav--dots .fotorama__nav__frame--thumb,.fotorama__nav--dots .fotorama__thumb-border{display:none}.fotorama__nav--thumbs{display:block}.fotorama__nav--thumbs .fotorama__nav__frame{padding-left:0!important}.fotorama__nav--thumbs .fotorama__nav__frame:last-child{padding-right:0!important}.fotorama__nav--thumbs .fotorama__nav__frame--dot{display:none}.fotorama__dot{display:block;width:4px;height:4px;position:relative;top:12px;left:6px;border-radius:6px;border:1px solid #7f7f7f}.fotorama__nav__frame:focus .fotorama__dot:after{padding:1px;top:-1px;left:-1px}.fotorama__nav__frame.fotorama__active .fotorama__dot{width:0;height:0;border-width:3px}.fotorama__nav__frame.fotorama__active .fotorama__dot:after{padding:3px;top:-3px;left:-3px}.fotorama__thumb{overflow:hidden;position:relative;width:100%;height:100%}.fotorama__nav__frame:focus .fotorama__thumb{z-index:2}.fotorama__thumb-border{position:absolute;z-index:9;top:0;left:0;border-style:solid;border-color:#00afea;background-image:linear-gradient(to bottom right,rgba(255,255,255,.25),rgba(64,64,64,.1))}.fotorama__caption{position:absolute;z-index:12;bottom:0;left:0;right:0;font-family:'Helvetica Neue',Arial,sans-serif;font-size:14px;line-height:1.5;color:#000}.fotorama__caption a{text-decoration:none;color:#000;border-bottom:1px solid;border-color:rgba(0,0,0,.5)}.fotorama__caption a:hover{color:#333;border-color:rgba(51,51,51,.5)}.fotorama__wrap--rtl .fotorama__caption{left:auto;right:0}.fotorama__wrap--no-captions .fotorama__caption,.fotorama__wrap--video .fotorama__caption{display:none}.fotorama__caption__wrap{background-color:#fff;background-color:rgba(255,255,255,.9);padding:5px 10px}@-webkit-keyframes spinner{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes spinner{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.fotorama__wrap--css3 .fotorama__spinner{-webkit-animation:spinner 24s infinite linear;animation:spinner 24s infinite linear}.fotorama__wrap--css3 .fotorama__html,.fotorama__wrap--css3 .fotorama__stage .fotorama__img{transition-property:opacity;transition-timing-function:linear;transition-duration:.3s}.fotorama__wrap--video .fotorama__stage__frame--video .fotorama__html,.fotorama__wrap--video .fotorama__stage__frame--video .fotorama__img{-ms-filter:"alpha(Opacity=0)";filter:alpha(opacity=0);opacity:0}.fotorama__select{cursor:auto}.fotorama__video{top:32px;right:0;bottom:0;left:0;position:absolute;z-index:10}@-moz-document url-prefix(){.fotorama__active{box-shadow:0 0 0 transparent}}.fotorama__arr,.fotorama__fullscreen-icon,.fotorama__video-close,.fotorama__video-play{position:absolute;z-index:11;cursor:pointer}.fotorama__arr{position:absolute;width:32px;height:32px;top:50%;margin-top:-16px}.fotorama__arr--prev{left:2px;background-position:0 0}.fotorama__arr--next{right:2px;background-position:-32px 0}.fotorama__arr--disabled{pointer-events:none;cursor:default;*display:none;opacity:.1}.fotorama__fullscreen-icon{width:32px;height:32px;top:2px;right:2px;background-position:0 -32px;z-index:20}.fotorama__arr:focus,.fotorama__fullscreen-icon:focus{border-radius:50%}.fotorama--fullscreen .fotorama__fullscreen-icon{background-position:-32px -32px}.fotorama__video-play{width:96px;height:96px;left:50%;top:50%;margin-left:-48px;margin-top:-48px;background-position:0 -64px;opacity:0}.fotorama__wrap--css2 .fotorama__video-play,.fotorama__wrap--video .fotorama__stage .fotorama__video-play{display:none}.fotorama__error .fotorama__video-play,.fotorama__loaded .fotorama__video-play,.fotorama__nav__frame .fotorama__video-play{opacity:1;display:block}.fotorama__nav__frame .fotorama__video-play{width:32px;height:32px;margin-left:-16px;margin-top:-16px;background-position:-64px -32px}.fotorama__video-close{width:32px;height:32px;top:0;right:0;background-position:-64px 0;z-index:20;opacity:0}.fotorama__wrap--css2 .fotorama__video-close{display:none}.fotorama__wrap--css3 .fotorama__video-close{-webkit-transform:translate3d(32px,-32px,0);transform:translate3d(32px,-32px,0)}.fotorama__wrap--video .fotorama__video-close{display:block;opacity:1}.fotorama__wrap--css3.fotorama__wrap--video .fotorama__video-close{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.fotorama__wrap--no-controls.fotorama__wrap--toggle-arrows .fotorama__arr,.fotorama__wrap--no-controls.fotorama__wrap--toggle-arrows .fotorama__fullscreen-icon{opacity:0}.fotorama__wrap--no-controls.fotorama__wrap--toggle-arrows .fotorama__arr:focus,.fotorama__wrap--no-controls.fotorama__wrap--toggle-arrows .fotorama__fullscreen-icon:focus{opacity:1}.fotorama__wrap--video .fotorama__arr,.fotorama__wrap--video .fotorama__fullscreen-icon{opacity:0!important}.fotorama__wrap--css2.fotorama__wrap--no-controls.fotorama__wrap--toggle-arrows .fotorama__arr,.fotorama__wrap--css2.fotorama__wrap--no-controls.fotorama__wrap--toggle-arrows .fotorama__fullscreen-icon{display:none}.fotorama__wrap--css2.fotorama__wrap--no-controls.fotorama__wrap--toggle-arrows .fotorama__arr:focus,.fotorama__wrap--css2.fotorama__wrap--no-controls.fotorama__wrap--toggle-arrows .fotorama__fullscreen-icon:focus{display:block}.fotorama__wrap--css2.fotorama__wrap--video .fotorama__arr,.fotorama__wrap--css2.fotorama__wrap--video .fotorama__fullscreen-icon{display:none!important}.fotorama__wrap--css3.fotorama__wrap--no-controls.fotorama__wrap--slide.fotorama__wrap--toggle-arrows .fotorama__fullscreen-icon:not(:focus){-webkit-transform:translate3d(32px,-32px,0);transform:translate3d(32px,-32px,0)}.fotorama__wrap--css3.fotorama__wrap--no-controls.fotorama__wrap--slide.fotorama__wrap--toggle-arrows .fotorama__arr--prev:not(:focus){-webkit-transform:translate3d(-48px,0,0);transform:translate3d(-48px,0,0)}.fotorama__wrap--css3.fotorama__wrap--no-controls.fotorama__wrap--slide.fotorama__wrap--toggle-arrows .fotorama__arr--next:not(:focus){-webkit-transform:translate3d(48px,0,0);transform:translate3d(48px,0,0)}.fotorama__wrap--css3.fotorama__wrap--video .fotorama__fullscreen-icon{-webkit-transform:translate3d(32px,-32px,0)!important;transform:translate3d(32px,-32px,0)!important}.fotorama__wrap--css3.fotorama__wrap--video .fotorama__arr--prev{-webkit-transform:translate3d(-48px,0,0)!important;transform:translate3d(-48px,0,0)!important}.fotorama__wrap--css3.fotorama__wrap--video .fotorama__arr--next{-webkit-transform:translate3d(48px,0,0)!important;transform:translate3d(48px,0,0)!important}.fotorama__wrap--css3 .fotorama__arr:not(:focus),.fotorama__wrap--css3 .fotorama__fullscreen-icon:not(:focus),.fotorama__wrap--css3 .fotorama__video-close:not(:focus),.fotorama__wrap--css3 .fotorama__video-play:not(:focus){transition-property:-webkit-transform,opacity;transition-property:transform,opacity;transition-duration:.3s}.fotorama__nav:after,.fotorama__nav:before,.fotorama__stage:after,.fotorama__stage:before{content:"";display:block;position:absolute;text-decoration:none;top:0;bottom:0;width:10px;height:auto;z-index:10;pointer-events:none;background-repeat:no-repeat;background-size:1px 100%,5px 100%}.fotorama__nav:before,.fotorama__stage:before{background-image:linear-gradient(transparent,rgba(0,0,0,.2) 25%,rgba(0,0,0,.3) 75%,transparent),radial-gradient(farthest-side at 0 50%,rgba(0,0,0,.4),transparent);background-position:0 0,0 0;left:-10px}.fotorama__nav.fotorama__shadows--left:before,.fotorama__stage.fotorama__shadows--left:before{left:0}.fotorama__nav:after,.fotorama__stage:after{background-image:linear-gradient(transparent,rgba(0,0,0,.2) 25%,rgba(0,0,0,.3) 75%,transparent),radial-gradient(farthest-side at 100% 50%,rgba(0,0,0,.4),transparent);background-position:100% 0,100% 0;right:-10px}.fotorama__nav.fotorama__shadows--right:after,.fotorama__stage.fotorama__shadows--right:after{right:0}.fotorama--fullscreen .fotorama__nav:after,.fotorama--fullscreen .fotorama__nav:before,.fotorama--fullscreen .fotorama__stage:after,.fotorama--fullscreen .fotorama__stage:before,.fotorama__wrap--fade .fotorama__stage:after,.fotorama__wrap--fade .fotorama__stage:before,.fotorama__wrap--no-shadows .fotorama__nav:after,.fotorama__wrap--no-shadows .fotorama__nav:before,.fotorama__wrap--no-shadows .fotorama__stage:after,.fotorama__wrap--no-shadows .fotorama__stage:before{display:none}
\ No newline at end of file
+.fotorama__arr:focus:after,.fotorama__fullscreen-icon:focus:after,.fotorama__html,.fotorama__img,.fotorama__nav__frame:focus .fotorama__dot:after,.fotorama__nav__frame:focus .fotorama__thumb:after,.fotorama__stage__frame,.fotorama__stage__shaft,.fotorama__video iframe{position:absolute;width:100%;height:100%;top:0;right:0;left:0;bottom:0}.fotorama--fullscreen,.fotorama__img{max-width:99999px!important;max-height:99999px!important;min-width:0!important;min-height:0!important;border-radius:0!important;box-shadow:none!important;padding:0!important}.fotorama__wrap .fotorama__grab{cursor:move;cursor:-webkit-grab;cursor:-o-grab;cursor:-ms-grab;cursor:grab}.fotorama__grabbing *{cursor:move;cursor:-webkit-grabbing;cursor:-o-grabbing;cursor:-ms-grabbing;cursor:grabbing}.fotorama__spinner{position:absolute!important;top:50%!important;left:50%!important}.fotorama__wrap--css3 .fotorama__arr,.fotorama__wrap--css3 .fotorama__fullscreen-icon,.fotorama__wrap--css3 .fotorama__nav__shaft,.fotorama__wrap--css3 .fotorama__stage__shaft,.fotorama__wrap--css3 .fotorama__thumb-border,.fotorama__wrap--css3 .fotorama__video-close,.fotorama__wrap--css3 .fotorama__video-play{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.fotorama__caption,.fotorama__nav:after,.fotorama__nav:before,.fotorama__stage:after,.fotorama__stage:before,.fotorama__wrap--css3 .fotorama__html,.fotorama__wrap--css3 .fotorama__nav,.fotorama__wrap--css3 .fotorama__spinner,.fotorama__wrap--css3 .fotorama__stage,.fotorama__wrap--css3 .fotorama__stage .fotorama__img,.fotorama__wrap--css3 .fotorama__stage__frame{-webkit-transform:translateZ(0);transform:translateZ(0)}.fotorama__arr:focus,.fotorama__fullscreen-icon:focus,.fotorama__nav__frame{outline:0}.fotorama__arr:focus:after,.fotorama__fullscreen-icon:focus:after,.fotorama__nav__frame:focus .fotorama__dot:after,.fotorama__nav__frame:focus .fotorama__thumb:after{content:'';border-radius:inherit;background-color:rgba(0,175,234,.5)}.fotorama__wrap--video .fotorama__stage,.fotorama__wrap--video .fotorama__stage__frame--video,.fotorama__wrap--video .fotorama__stage__frame--video .fotorama__html,.fotorama__wrap--video .fotorama__stage__frame--video .fotorama__img,.fotorama__wrap--video .fotorama__stage__shaft{-webkit-transform:none!important;transform:none!important}.fotorama__wrap--css3 .fotorama__nav__shaft,.fotorama__wrap--css3 .fotorama__stage__shaft,.fotorama__wrap--css3 .fotorama__thumb-border{transition-property:-webkit-transform,width;transition-property:transform,width;transition-timing-function:cubic-bezier(0.1,0,.25,1);transition-duration:0ms}.fotorama__arr,.fotorama__fullscreen-icon,.fotorama__no-select,.fotorama__video-close,.fotorama__video-play,.fotorama__wrap{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.fotorama__select{-webkit-user-select:text;-moz-user-select:text;-ms-user-select:text;user-select:text}.fotorama__nav,.fotorama__nav__frame{margin:auto;padding:0}.fotorama__caption__wrap,.fotorama__nav__frame,.fotorama__nav__shaft{-moz-box-orient:vertical;display:inline-block;vertical-align:middle;*display:inline;*zoom:1}.fotorama__nav__frame,.fotorama__thumb-border{box-sizing:content-box}.fotorama__caption__wrap{box-sizing:border-box}.fotorama--hidden,.fotorama__load{position:absolute;left:-99999px;top:-99999px;z-index:-1}.fotorama__arr,.fotorama__fullscreen-icon,.fotorama__nav,.fotorama__nav__frame,.fotorama__nav__shaft,.fotorama__stage__frame,.fotorama__stage__shaft,.fotorama__video-close,.fotorama__video-play{-webkit-tap-highlight-color:transparent}.fotorama__arr,.fotorama__fullscreen-icon,.fotorama__video-close,.fotorama__video-play{background:url("{{ img('visiosoft.theme.base::images/fotorama.png').url }}") no-repeat}@media (-webkit-min-device-pixel-ratio:1.5),(min-resolution:2dppx){.fotorama__arr,.fotorama__fullscreen-icon,.fotorama__video-close,.fotorama__video-play{background:url(fotorama@2x.png) 0 0/96px 160px no-repeat}}.fotorama__thumb{background-color:#7f7f7f;background-color:rgba(127,127,127,.2)}@media print{.fotorama__arr,.fotorama__fullscreen-icon,.fotorama__thumb-border,.fotorama__video-close,.fotorama__video-play{background:none!important}}.fotorama{min-width:1px;overflow:hidden}.fotorama:not(.fotorama--unobtrusive)>*:not(:first-child){display:none}.fullscreen{width:100%!important;height:100%!important;max-width:100%!important;max-height:100%!important;margin:0!important;padding:0!important;overflow:hidden!important;background:#000}.fotorama--fullscreen{position:absolute!important;top:0!important;left:0!important;right:0!important;bottom:0!important;float:none!important;z-index:2147483647!important;background:#000;width:100%!important;height:100%!important;margin:0!important}.fotorama--fullscreen .fotorama__nav,.fotorama--fullscreen .fotorama__stage{background:#000}.fotorama__wrap{-webkit-text-size-adjust:100%;position:relative;direction:ltr;z-index:0}.fotorama__wrap--rtl .fotorama__stage__frame{direction:rtl}.fotorama__nav,.fotorama__stage{overflow:hidden;position:relative;max-width:100%}.fotorama__wrap--pan-y{-ms-touch-action:pan-y}.fotorama__wrap .fotorama__pointer{cursor:pointer}.fotorama__wrap--slide .fotorama__stage__frame{opacity:1!important}.fotorama__stage__frame{overflow:hidden}.fotorama__stage__frame.fotorama__active{z-index:8}.fotorama__wrap--fade .fotorama__stage__frame{display:none}.fotorama__wrap--fade .fotorama__fade-front,.fotorama__wrap--fade .fotorama__fade-rear,.fotorama__wrap--fade .fotorama__stage__frame.fotorama__active{display:block;left:0;top:0}.fotorama__wrap--fade .fotorama__fade-front{z-index:8}.fotorama__wrap--fade .fotorama__fade-rear{z-index:7}.fotorama__wrap--fade .fotorama__fade-rear.fotorama__active{z-index:9}.fotorama__wrap--fade .fotorama__stage .fotorama__shadow{display:none}.fotorama__img{-ms-filter:"alpha(Opacity=0)";filter:alpha(opacity=0);opacity:0;border:none!important}.fotorama__error .fotorama__img,.fotorama__loaded .fotorama__img{-ms-filter:"alpha(Opacity=100)";filter:alpha(opacity=100);opacity:1}.fotorama--fullscreen .fotorama__loaded--full .fotorama__img,.fotorama__img--full{display:none}.fotorama--fullscreen .fotorama__loaded--full .fotorama__img--full{display:block}.fotorama__wrap--only-active .fotorama__nav,.fotorama__wrap--only-active .fotorama__stage{max-width:99999px!important}.fotorama__wrap--only-active .fotorama__stage__frame{visibility:hidden}.fotorama__wrap--only-active .fotorama__stage__frame.fotorama__active{visibility:visible}.fotorama__nav{font-size:0;line-height:0;text-align:center;display:none;white-space:nowrap;z-index:5}.fotorama__nav__shaft{position:relative;left:0;top:0;text-align:left}.fotorama__nav__frame{position:relative;cursor:pointer}.fotorama__nav--dots{display:block}.fotorama__nav--dots .fotorama__nav__frame{width:18px;height:30px}.fotorama__nav--dots .fotorama__nav__frame--thumb,.fotorama__nav--dots .fotorama__thumb-border{display:none}.fotorama__nav--thumbs{display:block}.fotorama__nav--thumbs .fotorama__nav__frame{padding-left:0!important}.fotorama__nav--thumbs .fotorama__nav__frame:last-child{padding-right:0!important}.fotorama__nav--thumbs .fotorama__nav__frame--dot{display:none}.fotorama__dot{display:block;width:4px;height:4px;position:relative;top:12px;left:6px;border-radius:6px;border:1px solid #7f7f7f}.fotorama__nav__frame:focus .fotorama__dot:after{padding:1px;top:-1px;left:-1px}.fotorama__nav__frame.fotorama__active .fotorama__dot{width:0;height:0;border-width:3px}.fotorama__nav__frame.fotorama__active .fotorama__dot:after{padding:3px;top:-3px;left:-3px}.fotorama__thumb{overflow:hidden;position:relative;width:100%;height:100%}.fotorama__nav__frame:focus .fotorama__thumb{z-index:2}.fotorama__thumb-border{position:absolute;z-index:9;top:0;left:0;border-style:solid;border-color:#00afea;background-image:linear-gradient(to bottom right,rgba(255,255,255,.25),rgba(64,64,64,.1))}.fotorama__caption{position:absolute;z-index:12;bottom:0;left:0;right:0;font-family:'Helvetica Neue',Arial,sans-serif;font-size:14px;line-height:1.5;color:#000}.fotorama__caption a{text-decoration:none;color:#000;border-bottom:1px solid;border-color:rgba(0,0,0,.5)}.fotorama__caption a:hover{color:#333;border-color:rgba(51,51,51,.5)}.fotorama__wrap--rtl .fotorama__caption{left:auto;right:0}.fotorama__wrap--no-captions .fotorama__caption,.fotorama__wrap--video .fotorama__caption{display:none}.fotorama__caption__wrap{background-color:#fff;background-color:rgba(255,255,255,.9);padding:5px 10px}@-webkit-keyframes spinner{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes spinner{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.fotorama__wrap--css3 .fotorama__spinner{-webkit-animation:spinner 24s infinite linear;animation:spinner 24s infinite linear}.fotorama__wrap--css3 .fotorama__html,.fotorama__wrap--css3 .fotorama__stage .fotorama__img{transition-property:opacity;transition-timing-function:linear;transition-duration:.3s}.fotorama__wrap--video .fotorama__stage__frame--video .fotorama__html,.fotorama__wrap--video .fotorama__stage__frame--video .fotorama__img{-ms-filter:"alpha(Opacity=0)";filter:alpha(opacity=0);opacity:0}.fotorama__select{cursor:auto}.fotorama__video{top:32px;right:0;bottom:0;left:0;position:absolute;z-index:10}@-moz-document url-prefix(){.fotorama__active{box-shadow:0 0 0 transparent}}.fotorama__arr,.fotorama__fullscreen-icon,.fotorama__video-close,.fotorama__video-play{position:absolute;z-index:11;cursor:pointer}.fotorama__arr{position:absolute;width:32px;height:32px;top:50%;margin-top:-16px}.fotorama__arr--prev{left:2px;background-position:0 0}.fotorama__arr--next{right:2px;background-position:-32px 0}.fotorama__arr--disabled{pointer-events:none;cursor:default;*display:none;opacity:.1}.fotorama__fullscreen-icon{width:32px;height:32px;top:2px;right:2px;background-position:0 -32px;z-index:20}.fotorama__arr:focus,.fotorama__fullscreen-icon:focus{border-radius:50%}.fotorama--fullscreen .fotorama__fullscreen-icon{background-position:-32px -32px}.fotorama__video-play{width:96px;height:96px;left:50%;top:50%;margin-left:-48px;margin-top:-48px;background-position:0 -64px;opacity:0}.fotorama__wrap--css2 .fotorama__video-play,.fotorama__wrap--video .fotorama__stage .fotorama__video-play{display:none}.fotorama__error .fotorama__video-play,.fotorama__loaded .fotorama__video-play,.fotorama__nav__frame .fotorama__video-play{opacity:1;display:block}.fotorama__nav__frame .fotorama__video-play{width:32px;height:32px;margin-left:-16px;margin-top:-16px;background-position:-64px -32px}.fotorama__video-close{width:32px;height:32px;top:0;right:0;background-position:-64px 0;z-index:20;opacity:0}.fotorama__wrap--css2 .fotorama__video-close{display:none}.fotorama__wrap--css3 .fotorama__video-close{-webkit-transform:translate3d(32px,-32px,0);transform:translate3d(32px,-32px,0)}.fotorama__wrap--video .fotorama__video-close{display:block;opacity:1}.fotorama__wrap--css3.fotorama__wrap--video .fotorama__video-close{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.fotorama__wrap--no-controls.fotorama__wrap--toggle-arrows .fotorama__arr,.fotorama__wrap--no-controls.fotorama__wrap--toggle-arrows .fotorama__fullscreen-icon{opacity:0}.fotorama__wrap--no-controls.fotorama__wrap--toggle-arrows .fotorama__arr:focus,.fotorama__wrap--no-controls.fotorama__wrap--toggle-arrows .fotorama__fullscreen-icon:focus{opacity:1}.fotorama__wrap--video .fotorama__arr,.fotorama__wrap--video .fotorama__fullscreen-icon{opacity:0!important}.fotorama__wrap--css2.fotorama__wrap--no-controls.fotorama__wrap--toggle-arrows .fotorama__arr,.fotorama__wrap--css2.fotorama__wrap--no-controls.fotorama__wrap--toggle-arrows .fotorama__fullscreen-icon{display:none}.fotorama__wrap--css2.fotorama__wrap--no-controls.fotorama__wrap--toggle-arrows .fotorama__arr:focus,.fotorama__wrap--css2.fotorama__wrap--no-controls.fotorama__wrap--toggle-arrows .fotorama__fullscreen-icon:focus{display:block}.fotorama__wrap--css2.fotorama__wrap--video .fotorama__arr,.fotorama__wrap--css2.fotorama__wrap--video .fotorama__fullscreen-icon{display:none!important}.fotorama__wrap--css3.fotorama__wrap--no-controls.fotorama__wrap--slide.fotorama__wrap--toggle-arrows .fotorama__fullscreen-icon:not(:focus){-webkit-transform:translate3d(32px,-32px,0);transform:translate3d(32px,-32px,0)}.fotorama__wrap--css3.fotorama__wrap--no-controls.fotorama__wrap--slide.fotorama__wrap--toggle-arrows .fotorama__arr--prev:not(:focus){-webkit-transform:translate3d(-48px,0,0);transform:translate3d(-48px,0,0)}.fotorama__wrap--css3.fotorama__wrap--no-controls.fotorama__wrap--slide.fotorama__wrap--toggle-arrows .fotorama__arr--next:not(:focus){-webkit-transform:translate3d(48px,0,0);transform:translate3d(48px,0,0)}.fotorama__wrap--css3.fotorama__wrap--video .fotorama__fullscreen-icon{-webkit-transform:translate3d(32px,-32px,0)!important;transform:translate3d(32px,-32px,0)!important}.fotorama__wrap--css3.fotorama__wrap--video .fotorama__arr--prev{-webkit-transform:translate3d(-48px,0,0)!important;transform:translate3d(-48px,0,0)!important}.fotorama__wrap--css3.fotorama__wrap--video .fotorama__arr--next{-webkit-transform:translate3d(48px,0,0)!important;transform:translate3d(48px,0,0)!important}.fotorama__wrap--css3 .fotorama__arr:not(:focus),.fotorama__wrap--css3 .fotorama__fullscreen-icon:not(:focus),.fotorama__wrap--css3 .fotorama__video-close:not(:focus),.fotorama__wrap--css3 .fotorama__video-play:not(:focus){transition-property:-webkit-transform,opacity;transition-property:transform,opacity;transition-duration:.3s}.fotorama__nav:after,.fotorama__nav:before,.fotorama__stage:after,.fotorama__stage:before{content:"";display:block;position:absolute;text-decoration:none;top:0;bottom:0;width:10px;height:auto;z-index:10;pointer-events:none;background-repeat:no-repeat;background-size:1px 100%,5px 100%}.fotorama__nav:before,.fotorama__stage:before{background-image:linear-gradient(transparent,rgba(0,0,0,.2) 25%,rgba(0,0,0,.3) 75%,transparent),radial-gradient(farthest-side at 0 50%,rgba(0,0,0,.4),transparent);background-position:0 0,0 0;left:-10px}.fotorama__nav.fotorama__shadows--left:before,.fotorama__stage.fotorama__shadows--left:before{left:0}.fotorama__nav:after,.fotorama__stage:after{background-image:linear-gradient(transparent,rgba(0,0,0,.2) 25%,rgba(0,0,0,.3) 75%,transparent),radial-gradient(farthest-side at 100% 50%,rgba(0,0,0,.4),transparent);background-position:100% 0,100% 0;right:-10px}.fotorama__nav.fotorama__shadows--right:after,.fotorama__stage.fotorama__shadows--right:after{right:0}.fotorama--fullscreen .fotorama__nav:after,.fotorama--fullscreen .fotorama__nav:before,.fotorama--fullscreen .fotorama__stage:after,.fotorama--fullscreen .fotorama__stage:before,.fotorama__wrap--fade .fotorama__stage:after,.fotorama__wrap--fade .fotorama__stage:before,.fotorama__wrap--no-shadows .fotorama__nav:after,.fotorama__wrap--no-shadows .fotorama__nav:before,.fotorama__wrap--no-shadows .fotorama__stage:after,.fotorama__wrap--no-shadows .fotorama__stage:before{display:none}
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/css/default/main.css b/addons/default/visiosoft/base-theme/resources/css/default/main.css
index db7770bbf..42f1c4fd8 100755
--- a/addons/default/visiosoft/base-theme/resources/css/default/main.css
+++ b/addons/default/visiosoft/base-theme/resources/css/default/main.css
@@ -465,7 +465,7 @@ textarea {
  ========================================================================== */
 #main {
     background-image: linear-gradient(to bottom, #0c3483 0%, #a2b6df 100%, #6b8cce 100%, #a2b6df 100%);
-    /*background-image: url("{{ img('theme::images/bg/main.png').url }}");*/
+    /*background-image: url("{{ img('visiosoft.theme.base::images/bg/main.png').url }}");*/
     background-repeat: no-repeat;
     background-position: top center;
     background-color: #f7f7f7;
@@ -1127,7 +1127,7 @@ a.verified i {
 
 /* Download */
 #download {
-    background-image: url("{{ img('theme::images/bg/1.png').url }}");
+    background-image: url("{{ img('visiosoft.theme.base::images/bg/1.png').url }}");
     padding: 55px 0 90px;
 }
 
@@ -4293,7 +4293,7 @@ a.verified i {
  ========================================================================== */
 
 #scrollUp {
-    background-image: url("{{ img('theme::images/top.png').url }}");
+    background-image: url("{{ img('visiosoft.theme.base::images/top.png').url }}");
     bottom: 60px;
     right: 20px;
     width: 38px; /* Width of image */
@@ -5495,7 +5495,7 @@ input[name="username"] {
     background-repeat: no-repeat;
     background-size: 50% 45%;
     background-position: center;
-    background-image: url("{{ img('theme::images/cart-add-icon.png').url }}");
+    background-image: url("{{ img('visiosoft.theme.base::images/cart-add-icon.png').url }}");
 }
 
 .lds-ripple {
diff --git a/addons/default/visiosoft/base-theme/resources/font-awesome/css/all.css b/addons/default/visiosoft/base-theme/resources/font-awesome/css/all.css
index 47aca5f73..facb09442 100644
--- a/addons/default/visiosoft/base-theme/resources/font-awesome/css/all.css
+++ b/addons/default/visiosoft/base-theme/resources/font-awesome/css/all.css
@@ -4305,8 +4305,8 @@ readers do not read off random characters that represent icons */
   font-style: normal;
   font-weight: normal;
   font-display: auto;
-  src: url('{{ asset_path("theme::font-awesome/webfonts/fa-brands-400.eot") }}');
-  src: url('{{ asset_path("theme::font-awesome/webfonts/fa-brands-400.eot") }}') format("embedded-opentype"), url('{{ asset_path("theme::font-awesome/webfonts/fa-brands-400.woff2") }}') format("woff2"), url('{{ asset_path("theme::font-awesome/webfonts/fa-brands-400.woff") }}') format("woff"), url('{{ asset_path("theme::font-awesome/webfonts/fa-brands-400.ttf") }}') format("truetype"), url('{{ asset_path("theme::font-awesome/webfonts/fa-brands-400.svg#fontawesome") }}') format("svg"); }
+  src: url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-brands-400.eot") }}');
+  src: url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-brands-400.eot") }}') format("embedded-opentype"), url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-brands-400.woff2") }}') format("woff2"), url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-brands-400.woff") }}') format("woff"), url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-brands-400.ttf") }}') format("truetype"), url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-brands-400.svg#fontawesome") }}') format("svg"); }
 
 .fab {
   font-family: 'Font Awesome 5 Brands'; }
@@ -4315,8 +4315,8 @@ readers do not read off random characters that represent icons */
   font-style: normal;
   font-weight: 400;
   font-display: auto;
-  src: url('{{ asset_path("theme::font-awesome/webfonts/fa-regular-400.eot") }}');
-  src: url('{{ asset_path("theme::font-awesome/webfonts/fa-regular-400.eot") }}') format("embedded-opentype"), url('{{ asset_path("theme::font-awesome/webfonts/fa-regular-400.woff2") }}') format("woff2"), url('{{ asset_path("theme::font-awesome/webfonts/fa-regular-400.woff") }}') format("woff"), url('{{ asset_path("theme::font-awesome/webfonts/fa-regular-400.ttf") }}') format("truetype"), url('{{ asset_path("theme::font-awesome/webfonts/fa-regular-400.svg#fontawesome") }}') format("svg"); }
+  src: url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-regular-400.eot") }}');
+  src: url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-regular-400.eot") }}') format("embedded-opentype"), url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-regular-400.woff2") }}') format("woff2"), url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-regular-400.woff") }}') format("woff"), url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-regular-400.ttf") }}') format("truetype"), url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-regular-400.svg#fontawesome") }}') format("svg"); }
 
 .far {
   font-family: 'Font Awesome 5 Free';
@@ -4326,8 +4326,8 @@ readers do not read off random characters that represent icons */
   font-style: normal;
   font-weight: 900;
   font-display: auto;
-  src: url('{{ asset_path("theme::font-awesome/webfonts/fa-solid-900.eot") }}');
-  src: url('{{ asset_path("theme::font-awesome/webfonts/fa-solid-900.eot") }}') format("embedded-opentype"), url('{{ asset_path("theme::font-awesome/webfonts/fa-solid-900.woff2") }}') format("woff2"), url('{{ asset_path("theme::font-awesome/webfonts/fa-solid-900.woff") }}') format("woff"), url('{{ asset_path("theme::font-awesome/webfonts/fa-solid-900.ttf") }}') format("truetype"), url('{{ asset_path("theme::font-awesome/webfonts/fa-solid-900.svg#fontawesome") }}') format("svg"); }
+  src: url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-solid-900.eot") }}');
+  src: url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-solid-900.eot") }}') format("embedded-opentype"), url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-solid-900.woff2") }}') format("woff2"), url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-solid-900.woff") }}') format("woff"), url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-solid-900.ttf") }}') format("truetype"), url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-solid-900.svg#fontawesome") }}') format("svg"); }
 
 .fa,
 .fas {
diff --git a/addons/default/visiosoft/base-theme/resources/scss/bootstrap/_glyphicons.scss b/addons/default/visiosoft/base-theme/resources/scss/bootstrap/_glyphicons.scss
index f6ab88d8b..ee9055593 100644
--- a/addons/default/visiosoft/base-theme/resources/scss/bootstrap/_glyphicons.scss
+++ b/addons/default/visiosoft/base-theme/resources/scss/bootstrap/_glyphicons.scss
@@ -11,11 +11,11 @@
   // Import the fonts
   @font-face {
     font-family: 'Glyphicons Halflings';
-      src: url('{{ asset_path("theme::fonts/bootstrap/glyphicons-halflings-regular.eot") }}');
-      src: url('{{ asset_path("theme::fonts/bootstrap/glyphicons-halflings-regular.eot") }}') format('embedded-opentype'),
-      url('{{ asset_path("theme::fonts/bootstrap/glyphicons-halflings-regular.woff") }}') format('woff'),
-      url('{{ asset_path("theme::fonts/bootstrap/glyphicons-halflings-regular.ttf") }}') format('truetype'),
-      url('{{ asset_path("theme::fonts/bootstrap/glyphicons-halflings-regular.svg") }}') format('svg');
+      src: url('{{ asset_path("visiosoft.theme.base::fonts/bootstrap/glyphicons-halflings-regular.eot") }}');
+      src: url('{{ asset_path("visiosoft.theme.base::fonts/bootstrap/glyphicons-halflings-regular.eot") }}') format('embedded-opentype'),
+      url('{{ asset_path("visiosoft.theme.base::fonts/bootstrap/glyphicons-halflings-regular.woff") }}') format('woff'),
+      url('{{ asset_path("visiosoft.theme.base::fonts/bootstrap/glyphicons-halflings-regular.ttf") }}') format('truetype'),
+      url('{{ asset_path("visiosoft.theme.base::fonts/bootstrap/glyphicons-halflings-regular.svg") }}') format('svg');
       font-weight: normal;
       font-style: normal;
   }
diff --git a/addons/default/visiosoft/base-theme/resources/scss/font-awesome/_path.scss b/addons/default/visiosoft/base-theme/resources/scss/font-awesome/_path.scss
index 8f5696de8..c26cea656 100644
--- a/addons/default/visiosoft/base-theme/resources/scss/font-awesome/_path.scss
+++ b/addons/default/visiosoft/base-theme/resources/scss/font-awesome/_path.scss
@@ -3,11 +3,11 @@
 
 @font-face {
     font-family: 'FontAwesome';
-    src: url('{{ asset_path("theme::fonts/font-awesome/fontawesome-webfont.eot") }}');
-    src: url('{{ asset_path("theme::fonts/font-awesome/fontawesome-webfont.eot") }}') format('embedded-opentype'),
-    url('{{ asset_path("theme::fonts/font-awesome/fontawesome-webfont.woff") }}') format('woff'),
-    url('{{ asset_path("theme::fonts/font-awesome/fontawesome-webfont.ttf") }}') format('truetype'),
-    url('{{ asset_path("theme::fonts/font-awesome/fontawesome-webfont.svg") }}') format('svg');
+    src: url('{{ asset_path("visiosoft.theme.base::fonts/font-awesome/fontawesome-webfont.eot") }}');
+    src: url('{{ asset_path("visiosoft.theme.base::fonts/font-awesome/fontawesome-webfont.eot") }}') format('embedded-opentype'),
+    url('{{ asset_path("visiosoft.theme.base::fonts/font-awesome/fontawesome-webfont.woff") }}') format('woff'),
+    url('{{ asset_path("visiosoft.theme.base::fonts/font-awesome/fontawesome-webfont.ttf") }}') format('truetype'),
+    url('{{ asset_path("visiosoft.theme.base::fonts/font-awesome/fontawesome-webfont.svg") }}') format('svg');
     font-weight: normal;
     font-style: normal;
 }
diff --git a/addons/default/visiosoft/base-theme/resources/views/ad-detail/detail.twig b/addons/default/visiosoft/base-theme/resources/views/ad-detail/detail.twig
index b49657bc5..339ba59a2 100644
--- a/addons/default/visiosoft/base-theme/resources/views/ad-detail/detail.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/ad-detail/detail.twig
@@ -1,4 +1,4 @@
-{% extends "theme::layouts/default" %}
+{% extends layout('ad-detail') %}
 
 {% block ogdata %}
     <meta property="og:site_name"
@@ -19,7 +19,7 @@
     <section id="main" class="clearfix details-page">
         <div class="container">
 
-            {% include "theme::partials/messages" %}
+            {% include "visiosoft.theme.base::partials/messages" %}
 
             <!-- breadcrumb -->
             <div class="breadcrumb-section">
@@ -38,10 +38,10 @@
             <div class="section slider">
                 <div class="row">
 
-                    {% include "theme::ad-detail/partials/slider" %}
+                    {% include "visiosoft.theme.base::ad-detail/partials/slider" %}
 
                     <div class="col-md-5">
-                        {% include "theme::ad-detail/partials/detail" %}
+                        {% include "visiosoft.theme.base::ad-detail/partials/detail" %}
                     </div>
                 </div>
 
diff --git a/addons/default/visiosoft/base-theme/resources/views/ad-detail/partials/detail.twig b/addons/default/visiosoft/base-theme/resources/views/ad-detail/partials/detail.twig
index 7281a43a2..ae93a5fd8 100644
--- a/addons/default/visiosoft/base-theme/resources/views/ad-detail/partials/detail.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/ad-detail/partials/detail.twig
@@ -14,7 +14,7 @@
         <h2 class="ad-price">
             <b>{{ adv.price.format() }}</b> {{ adv.currency }}
 
-            {% include "theme::ad-detail/partials/author-button" %}
+            {% include "visiosoft.theme.base::ad-detail/partials/author-button" %}
 
         </h2>
 
@@ -99,7 +99,7 @@
 
             <!-- social-links -->
             <div class="social-links">
-                {% include "theme::ad-detail/partials/social" %}
+                {% include "visiosoft.theme.base::ad-detail/partials/social" %}
             </div>
             <!-- social-links -->
 
diff --git a/addons/default/visiosoft/base-theme/resources/views/ad-detail/partials/slider.twig b/addons/default/visiosoft/base-theme/resources/views/ad-detail/partials/slider.twig
index aa271a457..e6299d113 100644
--- a/addons/default/visiosoft/base-theme/resources/views/ad-detail/partials/slider.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/ad-detail/partials/slider.twig
@@ -7,8 +7,8 @@
              data-thumbheight="48">
             {% set advPhoto = '' %}
             {% if count(adv.files) == 0 %}
-                {% set advPhoto = img('theme::images/no-image.png').url %}
-                <a href="{{ image }}"><img src="{{ img('theme::images/no-image.png').url }}"></a>
+                {% set advPhoto = img('visiosoft.theme.base::images/no-image.png').url %}
+                <a href="{{ image }}"><img src="{{ img('visiosoft.theme.base::images/no-image.png').url }}"></a>
             {% else %}
                 {% for image in adv.getViewPhotoUrl %}
                     <a href="{{ image }}"><img src="{{ image }}"></a>
diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/pages-module/page.twig b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/pages-module/page.twig
index 506eff749..704ab1f11 100644
--- a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/pages-module/page.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/pages-module/page.twig
@@ -4,12 +4,12 @@
     {% block page %}
         {% if (request_path() == '/') %}
         {% if setting_value('visiosoft.theme.base::template') == "s" %}
-            {% include "theme::indexes/s-index" %}
+            {% include "visiosoft.theme.base::indexes/s-index" %}
         {% else %}
-            {% include "theme::indexes/index" %}
+            {% include "visiosoft.theme.base::indexes/index" %}
         {% endif %}
         {% elseif (request_path() == 'contact') %}
-            {% include "theme::page/contact" %}
+            {% include "visiosoft.theme.base::page/contact" %}
         {% else %}
 <section id="main">
     <div class="container">
diff --git a/addons/default/visiosoft/base-theme/resources/views/errors/403.twig b/addons/default/visiosoft/base-theme/resources/views/errors/403.twig
index 30b166ae2..482a57ad4 100644
--- a/addons/default/visiosoft/base-theme/resources/views/errors/403.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/errors/403.twig
@@ -1,4 +1,4 @@
-{% extends "theme::layouts/default" %}
+{% extends "visiosoft.theme.base::layouts/default" %}
 
 {% block content %}
 
diff --git a/addons/default/visiosoft/base-theme/resources/views/errors/404.twig b/addons/default/visiosoft/base-theme/resources/views/errors/404.twig
index 5e270dbcc..e1456f5b4 100644
--- a/addons/default/visiosoft/base-theme/resources/views/errors/404.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/errors/404.twig
@@ -1,4 +1,4 @@
-{% extends "theme::layouts/default" %}
+{% extends "visiosoft.theme.base::layouts/default" %}
 
 {% block content %}
 
diff --git a/addons/default/visiosoft/base-theme/resources/views/errors/500.twig b/addons/default/visiosoft/base-theme/resources/views/errors/500.twig
index bd5fee26a..2f12ee6ba 100644
--- a/addons/default/visiosoft/base-theme/resources/views/errors/500.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/errors/500.twig
@@ -1,4 +1,4 @@
-{% extends "theme::layouts/default" %}
+{% extends "visiosoft.theme.base::layouts/default" %}
 
 {% block content %}
 
diff --git a/addons/default/visiosoft/base-theme/resources/views/home/featured.twig b/addons/default/visiosoft/base-theme/resources/views/home/featured.twig
index cbf3902fb..3300ba781 100644
--- a/addons/default/visiosoft/base-theme/resources/views/home/featured.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/home/featured.twig
@@ -73,7 +73,7 @@
                         {% if homepageAdvs['homepage_left_advertisement_place'] %}
                             <!-- ad-section -->
                             <div class="ad-section text-center">
-                                <a href="#"><img src="{{ img('theme::images/ads/3.jpg').url }}" alt="Image"
+                                <a href="#"><img src="{{ img('visiosoft.theme.base::images/ads/3.jpg').url }}" alt="Image"
                                                  class="img-responsive"></a>
                             </div><!-- ad-section -->
                         {% endif %}
diff --git a/addons/default/visiosoft/base-theme/resources/views/indexes/index.twig b/addons/default/visiosoft/base-theme/resources/views/indexes/index.twig
index 4ae7f5e8e..cc7ff81ce 100644
--- a/addons/default/visiosoft/base-theme/resources/views/indexes/index.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/indexes/index.twig
@@ -2,7 +2,7 @@
     <div class="container">
         <!-- banner -->
         <div class="banner-section text-center">
-            {% include "theme::partials/messages" %}
+            {% include "visiosoft.theme.base::partials/messages" %}
             {{ content|raw }}
             <!-- banner-form -->
             <div class="banner-form">
@@ -14,7 +14,7 @@
                                 <div class="form-group ">
                                     {% set cities = entries('location','cities').orderBy('slug').get() %}
                                     <select id="cities" name="city[]" class="form-control">
-                                        <option selected disabled>{{ trans('theme::fields.city') }}</option>
+                                        <option selected disabled>{{ trans('visiosoft.theme.base::fields.city') }}</option>
                                         {% for city in cities %}
                                             <option value="{{ city.id }}">{{ city.name }}</option>
                                         {% endfor %}
@@ -32,7 +32,7 @@
                                             <a href="#" class="btn btn-default" data-toggle="dropdown" role="button"
                                                aria-haspopup="true" aria-expanded="false">
                                             <span class="selected-category-item"
-                                                  style="display: inline-block;">{{ trans('theme::fields.categories') }}</span>
+                                                  style="display: inline-block;">{{ trans('visiosoft.theme.base::fields.categories') }}</span>
                                             </a>
                                             <ul class="dropdown-menu cat-dropdown-menu">
                                                 {% for cat in cats %}
@@ -58,13 +58,13 @@
                             {% set search_on_map_btn = setting_value('visiosoft.theme.base::show_home_search_on_map_btn') %}
                             <div class="{% if search_on_map_btn != 1 %} col-md-4 {% else %}col-md-1 {% endif %} home-search-field">
                                 <button type="submit" class="btn btn-default pl-5 pr-5 search-button"><i
-                                            class="fa fa-search"></i> {{ trans('theme::fields.search') }}
+                                            class="fa fa-search"></i> {{ trans('visiosoft.theme.base::fields.search') }}
                                 </button>
                             </div>
                             {% if search_on_map_btn %}
                                 <div class="col-md-3 home-search-field">
                                     <button type="button" class="btn btn-default map-search-button pl-5 pr-5 "><i
-                                                class="fa fa-map-marker"></i> {{ trans('theme::fields.search_map') }}
+                                                class="fa fa-map-marker"></i> {{ trans('visiosoft.theme.base::fields.search_map') }}
                                     </button>
                                 </div>
                             {% endif %}
@@ -76,7 +76,7 @@
                         <div class="last-search">
                             <a href="{{ app.request.cookies.get('last_search') }}" class="btn btn-default center-block">
                                 <i class="fa fa-history"></i>
-                                {{ trans('theme::fields.last_search') }}</a>
+                                {{ trans('visiosoft.theme.base::fields.last_search') }}</a>
                         </div>
                     {% endif %}
                 {% endif %}
@@ -96,7 +96,7 @@
                                 <div class="row">
                                     <div class="col-sm-12">
                                         <div class="section-title featured-top">
-                                            <h4>{{ trans('theme::fields.featured_ads') }}</h4>
+                                            <h4>{{ trans('visiosoft.theme.base::fields.featured_ads') }}</h4>
                                         </div>
                                     </div>
                                 </div>
@@ -173,10 +173,10 @@
                             <!-- Nav tabs -->
                             <ul class="nav nav-tabs" role="tablist">
                                 <li role="presentation" class="active"><a href="#recent-ads"
-                                                                          data-toggle="tab">{{ trans('theme::fields.recent_ads') }}</a>
+                                                                          data-toggle="tab">{{ trans('visiosoft.theme.base::fields.recent_ads') }}</a>
                                 </li>
                                 <li role="presentation"><a href="#popular"
-                                                           data-toggle="tab">{{ trans('theme::fields.trending_ads') }}</a>
+                                                           data-toggle="tab">{{ trans('visiosoft.theme.base::fields.trending_ads') }}</a>
                                 </li>
                             </ul>
                         </div>
@@ -325,7 +325,7 @@
                 <div class="hidden-xs hidden-sm col-md-2">
                     {#{% if homepageAdvs['homepage_right_advertisement_place'] %}#}
                     {#<div class="advertisement text-center">#}
-                    {#<a href="#"><img src="{{ img('theme::images/ads/1.jpg').url }}" alt="Images" class="img-responsive"></a>#}
+                    {#<a href="#"><img src="{{ img('visiosoft.theme.base::images/ads/1.jpg').url }}" alt="Images" class="img-responsive"></a>#}
                     {#</div>#}
                     {{ blocks('right-home-banner-area') }}
 
diff --git a/addons/default/visiosoft/base-theme/resources/views/indexes/indexcar.twig b/addons/default/visiosoft/base-theme/resources/views/indexes/indexcar.twig
index f860be213..8b4e0e352 100644
--- a/addons/default/visiosoft/base-theme/resources/views/indexes/indexcar.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/indexes/indexcar.twig
@@ -1,10 +1,10 @@
-{% include "theme::home/carsearch" %}
+{% include "visiosoft.theme.base::home/carsearch" %}
 <div class="page">
     <div class="container">
 
-        {% include "theme::home/featured" %}
-        {% include "theme::home/trend" %}
-        {% include "theme::home/singlecta" %}
+        {% include "visiosoft.theme.base::home/featured" %}
+        {% include "visiosoft.theme.base::home/trend" %}
+        {% include "visiosoft.theme.base::home/singlecta" %}
 
 
     </div>
diff --git a/addons/default/visiosoft/base-theme/resources/views/indexes/s-index.twig b/addons/default/visiosoft/base-theme/resources/views/indexes/s-index.twig
index 79e85c8ca..141170164 100644
--- a/addons/default/visiosoft/base-theme/resources/views/indexes/s-index.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/indexes/s-index.twig
@@ -1,26 +1,26 @@
 <div class="col-xs-12 col-sm-12 col-md-12 text-center s-home-banner visible-xs">
     <div class="col-md-12 visible-xs">
-        {% set banner_default = img('theme::images/s-home-banner.png').url %}
-        {{ setting_value('visiosoft.default.theme::s-type-banner-mobile-code','<img src="'~banner_default~'">')|raw }}
+        {% set banner_default = img('visiosoft.theme.base::images/s-home-banner.png').url %}
+        {{ setting_value('visiosoft.default.visiosoft.theme.base::s-type-banner-mobile-code','<img src="'~banner_default~'">')|raw }}
     </div>
 </div>
-{% include "theme::partials/s-mobile-categories" %}
+{% include "visiosoft.theme.base::partials/s-mobile-categories" %}
 
 <div class="container s-container">
 
-    {% include "theme::partials/categories-s" %}
+    {% include "visiosoft.theme.base::partials/categories-s" %}
 
     <div class="col-sm-9 s-home-show">
         <div class="row s-home-showcase">
             <div class="col-xs-12 col-sm-12 col-md-12 text-center s-home-banner hidden-xs">
                 <div class="col-md-12 hidden-xs">
-                    {% set banner_default = img('theme::images/s-home-banner-web.png').url %}
-                    {{ setting_value('visiosoft.default.theme::s-type-banner-code','<img src="'~banner_default~'"/>')|raw }}
+                    {% set banner_default = img('visiosoft.theme.base::images/s-home-banner-web.png').url %}
+                    {{ setting_value('visiosoft.default.visiosoft.theme.base::s-type-banner-code','<img src="'~banner_default~'"/>')|raw }}
                 </div>
             </div>
-            {% include "theme::partials/home-showcase-s" %}
+            {% include "visiosoft.theme.base::partials/home-showcase-s" %}
             <div class="col-md-12 s-container">
-                {% include "theme::partials/home-latest-s" %}
+                {% include "visiosoft.theme.base::partials/home-latest-s" %}
             </div>
 
         </div>
diff --git a/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig b/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig
index b7eb36a33..7da26989f 100644
--- a/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig
@@ -12,14 +12,14 @@
 <html>
 
 <head>
-    {% include "theme::partials/metadata" %}
+    {% include "visiosoft.theme.base::partials/metadata" %}
     {% block ogdata %}
         {% if app.request.pathInfo == "/" %}
         <meta property="og:site_name" content="{{ template.get('og_site_name', setting_value('streams::name', config_get('streams::distribution.name'))) }}"/>
         <meta property="og:description" content="{{ template.get('og_description', trans(template.meta_description)) }}"/>
         <meta property="og:title" content="{{ template.get('og_title', trans(template.meta_title)) }}"/>
         <meta property="og:url" content="{{ template.get('og_url', url_current()) }}"/>
-        <meta property="og:image" content="{{ entries('advs').isOgImage(img('theme::images/logo-horizontal.png').url) }}">
+        <meta property="og:image" content="{{ entries('advs').isOgImage(img('visiosoft.theme.base::images/logo-horizontal.png').url) }}">
         <meta property="og:type" content="website"/>
         {% endif %}
     {% endblock %}
@@ -28,15 +28,15 @@
 
 <body>
 
-{% include "theme::partials/header" %}
+{% include "visiosoft.theme.base::partials/header" %}
 
 {% block content %}{% endblock %}
 
 {% if entries('advs').isEnabled('pushnotifications') %}
 {% include "visiosoft.module.pushnotifications::pushbar" %}
 {% endif %}
-{% include "theme::partials/footer" %}
-{% include "theme::partials/assets" %}
+{% include "visiosoft.theme.base::partials/footer" %}
+{% include "visiosoft.theme.base::partials/assets" %}
 
 {% block customjs %}{% endblock %}
 
diff --git a/addons/default/visiosoft/base-theme/resources/views/list/list.twig b/addons/default/visiosoft/base-theme/resources/views/list/list.twig
index f33ad0d73..c63e7a523 100644
--- a/addons/default/visiosoft/base-theme/resources/views/list/list.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/list/list.twig
@@ -1,14 +1,14 @@
-{% extends "theme::layouts/default" %}
+{% extends layout('list') %}
 
 {% block content %}
     <section id="main" class="clearfix category-page">
 
         <div class="container">
 
-            {% include "theme::partials/messages" %}
+            {% include "visiosoft.theme.base::partials/messages" %}
 
             <!-- breadcrumb -->
-            {% include "theme::list/partials/breadcrumb" %}
+            {% include "visiosoft.theme.base::list/partials/breadcrumb" %}
             <!-- breadcrumb -->
 
             {% block listContent %}
@@ -16,15 +16,15 @@
 
                     <div class="row">
 
-                        {% include "theme::list/partials/user-section" %}
+                        {% include "visiosoft.theme.base::list/partials/user-section" %}
 
                         <form action="{{ url_route('visiosoft.module.advs::list') }}" method="get">
 
-                            {% include "theme::list/partials/list-filter" %}
+                            {% include "visiosoft.theme.base::list/partials/list-filter" %}
 
                             <div class="col-sm-8 col-md-9">
 
-                                {% include "theme::list/partials/list-section" %}
+                                {% include "visiosoft.theme.base::list/partials/list-section" %}
 
 
                             </div>
diff --git a/addons/default/visiosoft/base-theme/resources/views/list/map.twig b/addons/default/visiosoft/base-theme/resources/views/list/map.twig
index 1aa8154d1..330002ea3 100644
--- a/addons/default/visiosoft/base-theme/resources/views/list/map.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/list/map.twig
@@ -1,4 +1,4 @@
-{% extends "theme::list/list" %}
+{% extends "visiosoft.theme.base::list/list" %}
 {% block listContent %}
     <div class="category-info">
         <div class="row">
diff --git a/addons/default/visiosoft/base-theme/resources/views/list/partials/list-filter.twig b/addons/default/visiosoft/base-theme/resources/views/list/partials/list-filter.twig
index be0d6cbe6..1d1997621 100644
--- a/addons/default/visiosoft/base-theme/resources/views/list/partials/list-filter.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/list/partials/list-filter.twig
@@ -22,7 +22,7 @@
                                href="{% if(type == "list") %}{{ url_route('visiosoft.module.advs::list') }}{% else %}{{ url_route('advs_map_list') }}{% endif %}?cat={{ maincat.id }}"> {% if maincat.files[0].path != "" %}
                                     <img class="catIcon" src="{{ url('files/' ~ maincat.files[0].path) }}"
                                          alt="">{% else %}<img class="catIcon"
-                                                               src="{{ img('theme::images/plus-categories.png').url }}"
+                                                               src="{{ img('visiosoft.theme.base::images/plus-categories.png').url }}"
                                                                alt="">{% endif %}{{ maincat.name }}</a>
                             {% for subcat in subCats %}
                                 <ul>
@@ -49,7 +49,7 @@
                 <div class="panel-heading">
                     <a data-toggle="collapse" data-parent="#accordion" href="#accordion-three">
                         <h4 class="panel-title">
-                            {{ trans('theme::fields.price.name') }}
+                            {{ trans('visiosoft.theme.base::fields.price.name') }}
                             <span class="pull-right"><i class="fa fa-minus"></i></span>
                         </h4>
                     </a>
@@ -94,7 +94,7 @@
                         <button type="submit" class="btn btn-primary search-filter-button">
                             {{ trans("visiosoft.module.advs::field.search") }}
                         </button>
-                        <h5><font color="#333">{{ trans('theme::message.filter_by_search_msg') }}</font></h5>
+                        <h5><font color="#333">{{ trans('visiosoft.theme.base::message.filter_by_search_msg') }}</font></h5>
                     </div>
                 </div>
             </div>
diff --git a/addons/default/visiosoft/base-theme/resources/views/list/partials/list-section.twig b/addons/default/visiosoft/base-theme/resources/views/list/partials/list-section.twig
index 318e60243..c384dd9e7 100644
--- a/addons/default/visiosoft/base-theme/resources/views/list/partials/list-section.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/list/partials/list-section.twig
@@ -3,7 +3,7 @@
     <div class="row list-header">
 
         <div class="col-md-6">
-            {% include "theme::list/partials/list-sort-by" %}
+            {% include "visiosoft.theme.base::list/partials/list-sort-by" %}
         </div>
         <div class="col-md-6">
             {% include "visiosoft.theme.base::list/partials/display-mode" %}
@@ -18,10 +18,10 @@
 
     <div class="category-tabs"></div>
 
-    {% include "theme::list/partials/featured-ads" %}
+    {% include "visiosoft.theme.base::list/partials/featured-ads" %}
 
 
-    {% include "theme::list/partials/ads" %}
+    {% include "visiosoft.theme.base::list/partials/ads" %}
 
 
     <!-- pagination  -->
diff --git a/addons/default/visiosoft/base-theme/resources/views/list/partials/user-section.twig b/addons/default/visiosoft/base-theme/resources/views/list/partials/user-section.twig
index b08c11c82..db82ff954 100644
--- a/addons/default/visiosoft/base-theme/resources/views/list/partials/user-section.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/list/partials/user-section.twig
@@ -9,7 +9,7 @@
             </div>
         </div>
         {% if userProfile.adv_listing_banner.url == '' %}
-            <img src="{{ img('theme::images/bg/1.png').url }}">
+            <img src="{{ img('visiosoft.theme.base::images/bg/1.png').url }}">
         {% else %}
             <img src="{{ userProfile.adv_listing_banner.url }}">
         {% endif %}
diff --git a/addons/default/visiosoft/base-theme/resources/views/list/table.twig b/addons/default/visiosoft/base-theme/resources/views/list/table.twig
index 3ca2edc9e..3024cc316 100644
--- a/addons/default/visiosoft/base-theme/resources/views/list/table.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/list/table.twig
@@ -1,10 +1,10 @@
-{% extends "theme::list/list" %}
+{% extends "visiosoft.theme.base::list/list" %}
 {% block listContent %}
 
     <div class="category-info">
         <div class="row">
 
-            {% include "theme::list/partials/user-section" %}
+            {% include "visiosoft.theme.base::list/partials/user-section" %}
 
             <form action="{{ url_route('visiosoft.module.advs::list') }}" method="get">
 
@@ -16,7 +16,7 @@
                         <div class="row">
 
                             <div class="col-md-6">
-                                    {% include "theme::list/partials/list-sort-by" %}
+                                    {% include "visiosoft.theme.base::list/partials/list-sort-by" %}
                             </div>
                             <div class="col-md-6">
                                 {% include "visiosoft.theme.base::list/partials/display-mode" %}
@@ -88,5 +88,5 @@
 {% endblock %}
 {% block customjs %}
     {{ asset_add("scripts.js", "visiosoft.theme.base::js/list-table.js") }}
-    {% include "theme::scroll-modal" %}
+    {% include "visiosoft.theme.base::scroll-modal" %}
 {% endblock %}
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/views/login.twig b/addons/default/visiosoft/base-theme/resources/views/login.twig
index f51bca66f..1ef064a99 100644
--- a/addons/default/visiosoft/base-theme/resources/views/login.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/login.twig
@@ -1,4 +1,4 @@
-{% extends "theme::layouts/default" %}
+{% extends "visiosoft.theme.base::layouts/default" %}
 {% block content %}
     <section id="main" class="clearfix user-page">
         <div class="container">
@@ -6,7 +6,7 @@
                 <!-- user-login -->
                 <div class="col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
                     <div class="user-account">
-                        {% include "theme::partials/messages" %}
+                        {% include "visiosoft.theme.base::partials/messages" %}
                         <h2>User Login</h2>
                         <!-- form -->
                         {% set form = form('login').redirect('/').get() %}
@@ -33,7 +33,7 @@
                         </div><!-- forgot-password -->
                         {% if isActiveSocial == 1 %}
                             <label>Login with:</label>
-                            {% include "theme::loginWith" %}
+                            {% include "visiosoft.theme.base::loginWith" %}
                         {% endif %}
                         {{ form.close()|raw }}
                     </div>
diff --git a/addons/default/visiosoft/base-theme/resources/views/new-ad/edit-cat.twig b/addons/default/visiosoft/base-theme/resources/views/new-ad/edit-cat.twig
index a1ee1f7c2..5f3cb6cac 100644
--- a/addons/default/visiosoft/base-theme/resources/views/new-ad/edit-cat.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/new-ad/edit-cat.twig
@@ -1,4 +1,5 @@
-{% extends "theme::layouts/default" %}
+{% extends layout('edit-cat') %}
+
 {% block content %}
     <section id="main" class="clearfix ad-post-page">
         <div class="container">
diff --git a/addons/default/visiosoft/base-theme/resources/views/new-ad/new-create.twig b/addons/default/visiosoft/base-theme/resources/views/new-ad/new-create.twig
index 40eedf3de..ca9fd966b 100644
--- a/addons/default/visiosoft/base-theme/resources/views/new-ad/new-create.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/new-ad/new-create.twig
@@ -1,10 +1,11 @@
-{% extends "theme::layouts/default" %}
+{% extends layout('new-ad') %}
+
 {% block content %}
     <section id="main" class="clearfix home-default">
         <div class="container">
-            {% include "theme::partials/messages" %}
+            {% include "visiosoft.theme.base::partials/messages" %}
 
-            {% include "theme::new-ad/partials/breadcrumb" %}
+            {% include "visiosoft.theme.base::new-ad/partials/breadcrumb" %}
 
             <div class="adpost-details">
                 <div class="row">
diff --git a/addons/default/visiosoft/base-theme/resources/views/new-ad/post-cat.twig b/addons/default/visiosoft/base-theme/resources/views/new-ad/post-cat.twig
index 3b5629f05..51f7fc0fc 100644
--- a/addons/default/visiosoft/base-theme/resources/views/new-ad/post-cat.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/new-ad/post-cat.twig
@@ -1,8 +1,9 @@
-{% extends "theme::layouts/default" %}
+{% extends layout('post-cat') %}
+
 {% block content %}
     <section id="main" class="clearfix ad-post-page">
         <div class="container">
-            {% include "theme::new-ad/partials/breadcrumb" %}
+            {% include "visiosoft.theme.base::new-ad/partials/breadcrumb" %}
             <div id="ad-cat-section">
                 <form action="{{ url_route('visiosoft.module.advs::post_cat') }}" method="post">
                     <div class="row category-tab">
@@ -118,7 +119,7 @@
         }
 
         #main {
-            background-image: {{ img('theme::images/bg/main.png').url }} !important;
+            background-image: {{ img('visiosoft.theme.base::images/bg/main.png').url }} !important;
         }
 
         .btn-1 {
diff --git a/addons/default/visiosoft/base-theme/resources/views/page/contact.twig b/addons/default/visiosoft/base-theme/resources/views/page/contact.twig
index 18fe6769f..378531619 100644
--- a/addons/default/visiosoft/base-theme/resources/views/page/contact.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/page/contact.twig
@@ -41,16 +41,16 @@
                         <h2>{{ trans('visiosoft.module.advs::field.send_us_your_feedback') }}</h2>
                         <p>{{ form('contact').to('info@openclassify.com').from(setting_value('streams::email')).
                             handler('\\Anomaly\\ContactPlugin\\Form\\ContactFormHandler@handle').
-                            fields({'email': {'label': trans('theme::fields.email.name'),'type': 'email','required': true,},
-                                'name': {'label': trans('theme::fields.name.name'),'type': 'text','required': true,},
-                                'subject': {'label': trans('theme::fields.subject.name'),'type': 'text','required': true,},
-                                'content': {'label': trans('theme::fields.content.name'),'type': 'textarea','required': true,}})
-                            .actions({'submit': {'text': trans('theme::button.send.name')}})|raw }}</p>
+                            fields({'email': {'label': trans('visiosoft.theme.base::fields.email.name'),'type': 'email','required': true,},
+                                'name': {'label': trans('visiosoft.theme.base::fields.name.name'),'type': 'text','required': true,},
+                                'subject': {'label': trans('visiosoft.theme.base::fields.subject.name'),'type': 'text','required': true,},
+                                'content': {'label': trans('visiosoft.theme.base::fields.content.name'),'type': 'textarea','required': true,}})
+                            .actions({'submit': {'text': trans('visiosoft.theme.base::button.send.name')}})|raw }}</p>
                     </div>
                 </div><!-- feedback -->
             </div><!-- row -->
         </div>
     </div><!-- container -->
 </section><!-- main -->
-{% include "theme::partials/messages" %}
+{% include "visiosoft.theme.base::partials/messages" %}
 {{ asset_add("scripts.js", "visiosoft.theme.base::js/map.js") }}
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig b/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig
index fee88c04d..d0ae8b2e4 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig
@@ -1,22 +1,23 @@
+
 {#
     Main CSS can be found in metadata.twig
 #}
 
 {# Core Theme Components #}
-{{ asset_add("theme.js", "theme::js/vendor/jquery.min.js") }}
-{{ asset_add("theme.js", "theme::js/vendor/bootstrap.min.js") }}
-{{ asset_add("theme.js", "theme::js/vendor/vue.min.js") }}
-{{ asset_add("theme.js", "theme::js/bootstrap-notify.js") }}
-{{ asset_add("theme.js", "theme::js/nav.js") }}
-{{ asset_add("theme.js", "theme::js/params.js") }}
-{{ asset_add("theme.js", "theme::js/notification.js") }}
-{{ asset_add("theme.js", "theme::js/ajaxLoader.js") }}
+{{ asset_add("theme.js", "visiosoft.theme.base::js/vendor/jquery.min.js") }}
+{{ asset_add("theme.js", "visiosoft.theme.base::js/vendor/bootstrap.min.js") }}
+{{ asset_add("theme.js", "visiosoft.theme.base::js/vendor/vue.min.js") }}
+{{ asset_add("theme.js", "visiosoft.theme.base::js/bootstrap-notify.js") }}
+{{ asset_add("theme.js", "visiosoft.theme.base::js/nav.js") }}
+{{ asset_add("theme.js", "visiosoft.theme.base::js/params.js") }}
+{{ asset_add("theme.js", "visiosoft.theme.base::js/notification.js") }}
+{{ asset_add("theme.js", "visiosoft.theme.base::js/ajaxLoader.js") }}
 {{ asset_add("theme.js", "visiosoft.theme.defaultadmin::js/theme/select2.js") }}
 
 
 {# Theme Scripts #}
-{#{{ asset_add("theme.js", "theme::js/plugins/*") }}#}
-{{ asset_add("theme.js", "theme::js/theme/initialize.js") }}
+{#{{ asset_add("theme.js", "visiosoft.theme.base::js/plugins/*") }}#}
+{{ asset_add("theme.js", "visiosoft.theme.base::js/theme/initialize.js") }}
 
 {{ asset_script("theme.js", ["min"]) }}
 
@@ -31,8 +32,8 @@
 {% for style in asset_styles("styles.css") %}
     {{ style|raw }}
 {% endfor %}
-{{ asset_style("theme::css/default/animate.css") }}
-{{ asset_add("visiosoft_default.js", "theme::js/default/*") }}
+{{ asset_style("visiosoft.theme.base::css/default/animate.css") }}
+{{ asset_add("visiosoft_default.js", "visiosoft.theme.base::js/default/*") }}
 {{ asset_script("visiosoft_default.js") }}
-{{ asset_add("visiosoft_default_custom.js", "theme::js/zcustom.js") }}
+{{ asset_add("visiosoft_default_custom.js", "visiosoft.theme.base::js/zcustom.js") }}
 {{ asset_script("visiosoft_default_custom.js") }}
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/footer.twig b/addons/default/visiosoft/base-theme/resources/views/partials/footer.twig
index 7aaa69dd1..de9ffd7a3 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/footer.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/footer.twig
@@ -134,7 +134,7 @@
 
 </footer>
 
-{% include "theme::partials/s-search-modal" %}
+{% include "visiosoft.theme.base::partials/s-search-modal" %}
 
 
 {% if setting('visiosoft.module.advs::google_statistic_code') != "" %}
diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/header.twig b/addons/default/visiosoft/base-theme/resources/views/partials/header.twig
index 2a58fa51a..712371c7b 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/header.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/header.twig
@@ -1,6 +1,6 @@
 {% if setting_value('visiosoft.theme.base::template') == "s" %}
-    {% include "theme::partials/nav-s" %}
+    {% include "visiosoft.theme.base::partials/nav-s" %}
 {% else %}
-    {% include "theme::partials/nav" %}
+    {% include "visiosoft.theme.base::partials/nav" %}
 {% endif %}
 
diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig b/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig
index a8942b058..6e5a87ba3 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig
@@ -42,27 +42,27 @@
 {{ favicons(url('files/' ~ file(setting_value('visiosoft.module.advs::favicon')).path)) }}
 
 {# Base Theme Components #}
-{{ asset_add("theme.css", "theme::scss/bootstrap/bootstrap.scss") }}
-{{ asset_add("theme.css", "theme::font-awesome/css/all.css") }}
+{{ asset_add("theme.css", "visiosoft.theme.base::scss/bootstrap/bootstrap.scss") }}
+{{ asset_add("theme.css", "visiosoft.theme.base::font-awesome/css/all.css") }}
 
 {{ asset_add("theme.css", "visiosoft.theme.defaultadmin::css/select2.css") }}
 
 {{ asset_style("theme.css") }}
 {# Specific Build Files #}
-{{ asset_add("build.css", "theme::scss/theme/theme.scss", ["live"]) }}
+{{ asset_add("build.css", "visiosoft.theme.base::scss/theme/theme.scss", ["live"]) }}
 
 {# Specific Build Files #}
-{{ asset_add("build.css", "theme::scss/theme/theme.scss", ["live"]) }}
+{{ asset_add("build.css", "visiosoft.theme.base::scss/theme/theme.scss", ["live"]) }}
 
 {# Include Asset Collections #}
 <style type="text/css">
     {#{{ asset_inline("theme.css", ["min"]) }}#}
-    {{ asset_inline("build.css", ["parse", "min", "watch@theme::scss/theme"]) }}
+    {{ asset_inline("build.css", ["parse", "min", "watch@visiosoft.theme.base::scss/theme"]) }}
 </style>
 
-{{ asset_add("visiosoft_default.css", "theme::css/default/*") }}
+{{ asset_add("visiosoft_default.css", "visiosoft.theme.base::css/default/*") }}
 {% if setting_value('visiosoft.theme.base::template') == "s" %}
-    {{ asset_add("visiosoft_default.css", "theme::css/sahb.css") }}
+    {{ asset_add("visiosoft_default.css", "visiosoft.theme.base::css/sahb.css") }}
 {% endif %}
 
 
diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/nav-s.twig b/addons/default/visiosoft/base-theme/resources/views/partials/nav-s.twig
index 301b32b63..bcd8d8b38 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/nav-s.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/nav-s.twig
@@ -48,7 +48,7 @@
                                             class="caret"></span>
                                 </a>
                                 <ul class="dropdown-menu login-user-dropdown-menu">
-                                    {% include "theme::partials/links" %}
+                                    {% include "visiosoft.theme.base::partials/links" %}
                                 </ul>
                             </li>
                             {#                        {% if entries('advs').isEnabled('messages') %}#}
@@ -116,7 +116,7 @@
                         <i class="fa fa-user"></i> <span class="login-username"></span><span class="caret"></span>
                     </a>
                     <ul class="dropdown-menu login-user-dropdown-menu">
-                        {% include "theme::partials/links" %}
+                        {% include "visiosoft.theme.base::partials/links" %}
                     </ul>
                 </li>
                 <li class="new-ads-navigation-mobile-field pull-right">
diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/nav.twig b/addons/default/visiosoft/base-theme/resources/views/partials/nav.twig
index 38d794156..5126ef89a 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/nav.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/nav.twig
@@ -11,7 +11,7 @@
                     <a class="navbar-brand" href="/">
                         {% if setting_value('visiosoft.module.advs::logo') == NULL %}
                             <img class="img-responsive" alt="{{ trans(template.meta_title) }}-Logo"
-                                 src="{{ img('theme::images/logo-horizontal.png').url }}">
+                                 src="{{ img('visiosoft.theme.base::images/logo-horizontal.png').url }}">
                         {% else %}
                             <img class="img-responsive"
                                  src="{{ url('files/' ~ file(setting_value('visiosoft.module.advs::logo')).path) }}"
@@ -73,7 +73,7 @@
 
                     <ul class="nav navbar-nav controls-menu-right" style="float: right;">
                         {% set current_locale = entries('advs').getCurrentLocale() %}
-                        {{ languageSwitcher('openclassify-lang', {'toggle_title': '<img alt="'~config('app.locale')~'" src="'~img('theme::images/flags/'~config('app.locale')~'.png').url~'" class="lang-flag" >' ~current_locale~'','toggle_class':'navigation-lang-field-none'}) }}
+                        {{ languageSwitcher('openclassify-lang', {'toggle_title': '<img alt="'~config('app.locale')~'" src="'~img('visiosoft.theme.base::images/flags/'~config('app.locale')~'.png').url~'" class="lang-flag" >' ~current_locale~'','toggle_class':'navigation-lang-field-none'}) }}
 
                         {% if auth_check() %}
                             <li class="dropdown profile-navigation-field">
@@ -88,14 +88,14 @@
                                             class="caret"></span>
                                 </a>
                                 <ul class="dropdown-menu login-user-dropdown-menu">
-                                    {% include "theme::partials/links" %}
+                                    {% include "visiosoft.theme.base::partials/links" %}
                                 </ul>
                             </li>
                         {% else %}
 
                             <li class="dropdown">
                                 <a href="#" class="dropdown-toggle" data-toggle="dropdown"><b><i class="fa fa-user"></i>
-                                        {{ trans('theme::fields.login') }}</b> <span
+                                        {{ trans('visiosoft.theme.base::fields.login') }}</b> <span
                                             class="caret"></span></a>
                                 <ul id="login-dp" class="dropdown-menu">
                                     <li>
@@ -189,7 +189,7 @@
                         <i class="fa fa-user"></i> <span class="login-username"></span><span class="caret"></span>
                     </a>
                     <ul class="dropdown-menu login-user-dropdown-menu">
-                        {% include "theme::partials/links" %}
+                        {% include "visiosoft.theme.base::partials/links" %}
                     </ul>
                 </li>
 
diff --git a/addons/default/visiosoft/base-theme/resources/views/passwords/forgot.twig b/addons/default/visiosoft/base-theme/resources/views/passwords/forgot.twig
index 492d9e242..367ed4e54 100644
--- a/addons/default/visiosoft/base-theme/resources/views/passwords/forgot.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/passwords/forgot.twig
@@ -1,4 +1,4 @@
-{% extends "theme::layouts/default" %}
+{% extends "visiosoft.theme.base::layouts/default" %}
 {% block content %}
     <section id="main" class="clearfix user-page">
         <div class="container">
@@ -6,7 +6,7 @@
                 <!-- user-login -->
                 <div class="col-lg-6 col-lg-offset-3">
                     <div class="user-account">
-                        {% include "theme::partials/messages" %}
+                        {% include "visiosoft.theme.base::partials/messages" %}
                         <h2>Password Forgot</h2>
                         <!-- form -->
                         {% set form = form('forgot_password').redirect(request_get('redirect', '/')).get()  %}
diff --git a/addons/default/visiosoft/base-theme/resources/views/passwords/reset.twig b/addons/default/visiosoft/base-theme/resources/views/passwords/reset.twig
index c186405b4..3f4a59c78 100644
--- a/addons/default/visiosoft/base-theme/resources/views/passwords/reset.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/passwords/reset.twig
@@ -7,7 +7,7 @@
                 <!-- user-login -->
                 <div class="col-lg-6 col-lg-offset-3">
                     <div class="user-account">
-                        {% include "theme::partials/messages" %}
+                        {% include "visiosoft.theme.base::partials/messages" %}
                         <h2>Password Reset</h2>
                         <!-- form -->
                         {% set form = form('reset_password').get()  %}
diff --git a/addons/default/visiosoft/base-theme/resources/views/register.twig b/addons/default/visiosoft/base-theme/resources/views/register.twig
index a968a0a46..e707179fe 100644
--- a/addons/default/visiosoft/base-theme/resources/views/register.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/register.twig
@@ -1,4 +1,4 @@
-{% extends "theme::layouts/default" %}
+{% extends "visiosoft.theme.base::layouts/default" %}
 {% block content %}
     <section id="main" class="clearfix user-page">
         <div class="container">
@@ -6,7 +6,7 @@
                 <!-- user-login -->
                 <div class="col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
                     <div class="user-account">
-                        {% include "theme::partials/messages" %}
+                        {% include "visiosoft.theme.base::partials/messages" %}
                         <h2>Create an Account</h2>
                         {% set form = form('register2').redirect(request_get('redirect', '/')).get()  %}
                             {{ form.open()|raw }}
diff --git a/addons/default/visiosoft/base-theme/resources/views/scroll-modal.twig b/addons/default/visiosoft/base-theme/resources/views/scroll-modal.twig
index ff3d2ed09..96fbb3ed1 100644
--- a/addons/default/visiosoft/base-theme/resources/views/scroll-modal.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/scroll-modal.twig
@@ -1,10 +1,10 @@
 <div id="swipeTableModal" class="modal fade" role="dialog">
     <div class="modal-dialog">
         <div class="modal-body" onclick="$('#swipeTableModal').modal('hide');">
-            <img src="{{ img('theme::images/scroll-screen.gif').url }}">
-            <p>{{ trans('theme::fields.scroll-screen-for-details') }}</p>
-            <button>{{ trans('theme::fields.close') }}</button>
+            <img src="{{ img('visiosoft.theme.base::images/scroll-screen.gif').url }}">
+            <p>{{ trans('visiosoft.theme.base::fields.scroll-screen-for-details') }}</p>
+            <button>{{ trans('visiosoft.theme.base::fields.close') }}</button>
         </div>
     </div>
 </div>
-{{ asset_add("scripts.js", "theme::js/scroll-screen.js") }}
+{{ asset_add("scripts.js", "visiosoft.theme.base::js/scroll-screen.js") }}