diff --git a/templates/button.php b/templates/button.php
index ada4f7e..786e9c9 100644
--- a/templates/button.php
+++ b/templates/button.php
@@ -1,6 +1,7 @@
 <?php
 
 use \Wt\Core\Templater\Tools as TemplaterTools;
+use Wt\Core\Tools as Tools;
 
 /**
  * @var array $arParams
@@ -9,11 +10,11 @@ use \Wt\Core\Templater\Tools as TemplaterTools;
  * type : button | reset | submit
  */
 
-$preloader = \Wt\Core\Tools::isTrue($arParams['PRELOADER']);
+$preloader = Tools::isTrue($arParams['PRELOADER']);
 
 
 ?><button
-    <?if(\Wt\Core\Tools::isTrue($arParams['DISABLED'])){?>disabled<?}?>
+    <?if(Tools::isTrue($arParams['DISABLED'])){?>disabled<?}?>
     aria-label="<?=$arParams['LABEL']?>"
     type="<?=$arParams['TYPE']?:'button'?>"
     <?if($arParams['ID']){?>id="<?=$arParams['ID']?>"<?}?>
diff --git a/templates/collapse.php b/templates/collapse.php
index 8c3c8ad..02e1cf8 100644
--- a/templates/collapse.php
+++ b/templates/collapse.php
@@ -1,11 +1,17 @@
 <?php
+
+
+use Wt\Core\Tools;
+use Wt\Core\Type\Str;
+
+
 app()->service()->assets()->setPlugin('collapse');
-$arParams['ID'] = $arParams['ID']?:'collapse_'.\Wt\Core\Type\Str::random(6);
-?>
+$arParams['ID'] = $arParams['ID']?: ('collapse_' . Str::random(6));
+ ?>
 <div class="accordion" id="<?=$arParams['ID']?>">
     <?foreach ($arParams['ITEMS'] as $key => $data) {
         $data['ID'] = $data['ID']?:$arParams['ID'].'_'.$key;
-        $data['SHOW'] = \Wt\Core\Tools::isTrue($data['SHOW']);
+        $data['SHOW'] = Tools::isTrue($data['SHOW']);
         ?>
         <div class="accordion-item">
             <h4 class="accordion-header" id="<?=$data['ID'].'_header'?>">
diff --git a/templates/modal.php b/templates/modal.php
index 6ec0083..1681c74 100644
--- a/templates/modal.php
+++ b/templates/modal.php
@@ -9,7 +9,7 @@ use \Wt\Core\Templater\Tools as TemplaterTools;
             <div class="modal-header">
                 <h5 class="modal-title"><?=$arParams['TITLE']?></h5>
                 <button type="button" class="btn-close kit-icon" data-bs-dismiss="modal" aria-label="Close">
-                    <svg class xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"></path></svg>
+                    <svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"></path></svg>
                 </button>
                 <?=$arParams['HEADER']?>
             </div>
diff --git a/templates/picture.php b/templates/picture.php
index 17248ce..1f3d0e9 100644
--- a/templates/picture.php
+++ b/templates/picture.php
@@ -1,11 +1,12 @@
 <?
 
+use \Wt\Core\Media\Webp;
 use \Wt\Core\Templater\Tools as TemplaterTools;
 
 ?>
 <picture class="kit-picture <?=$arParams['CLASS']?>">
     <?
-    $webp = new \Wt\Core\Media\Webp($_SERVER['DOCUMENT_ROOT'] . $arParams['SRC']);
+    $webp = new Webp($_SERVER['DOCUMENT_ROOT'] . $arParams['SRC']);
     if($webp->make()->isSuccess()) {
         ?><source srcset="<?=$webp->getPathOut(true)?>" type="image/webp"><?
     }
diff --git a/templates/pictureOwlLazy.php b/templates/pictureOwlLazy.php
index c6b5a1c..5579975 100644
--- a/templates/pictureOwlLazy.php
+++ b/templates/pictureOwlLazy.php
@@ -1,11 +1,12 @@
 <?
 
+use \Wt\Core\Media\Webp;
 use \Wt\Core\Templater\Tools as TemplaterTools;
 
 ?>
 <picture class="kit-picture <?=$arParams['CLASS']?>">
     <?
-    $webp = new \Wt\Core\Media\Webp($_SERVER['DOCUMENT_ROOT'] . $arParams['SRC']);
+    $webp = new Webp($_SERVER['DOCUMENT_ROOT'] . $arParams['SRC']);
     if($webp->make()->isSuccess()) {
         ?><source class="owl-lazy" data-srcset="<?=$webp->getPathOut(true)?>" type="image/webp"><?
     }