diff --git a/admin/ajax.php b/admin/ajax.php
index dc4fdbb..91bde26 100644
--- a/admin/ajax.php
+++ b/admin/ajax.php
@@ -23,7 +23,6 @@ spl_autoload_register( '__autoload_my_classes' );
 
 require_once '../config.php';
 require_once '../libraries/medoo/medoo.php';
-require_once '../libraries/grid/config.php';
 date_default_timezone_set('Europe/Warsaw');
 
 session_start();
diff --git a/admin/ajax/shop-category.php b/admin/ajax/shop-category.php
index a16c6b6..7fce9fd 100644
--- a/admin/ajax/shop-category.php
+++ b/admin/ajax/shop-category.php
@@ -1,5 +1,5 @@
 <?php
-$a = \S::get( 'a' );
+$a = \Shared\Helpers\Helpers::get( 'a' );
 
 if ( $a == 'save_products_order' )
 {
@@ -7,7 +7,7 @@ if ( $a == 'save_products_order' )
 
   $categoryRepository = new \Domain\Category\CategoryRepository( $mdb );
 
-  if ( $categoryRepository->saveProductOrder( \S::get( 'category_id' ), \S::get( 'products' ) ) )
+  if ( $categoryRepository->saveProductOrder( \Shared\Helpers\Helpers::get( 'category_id' ), \Shared\Helpers\Helpers::get( 'products' ) ) )
     $response = [ 'status' => 'ok' ];
   
   echo json_encode( $response );
diff --git a/admin/ajax/users.php b/admin/ajax/users.php
index 72ed241..eacf900 100644
--- a/admin/ajax/users.php
+++ b/admin/ajax/users.php
@@ -1,11 +1,11 @@
 <?php
-$a = \S::get( 'a' );
+$a = \Shared\Helpers\Helpers::get( 'a' );
 
 if ( $a == 'check_login' )
 {
   global $mdb;
   $repository = new \Domain\User\UserRepository( $mdb );
-  $response = $repository->checkLogin( (string)\S::get( 'login' ), (int)\S::get( 'user_id' ) );
+  $response = $repository->checkLogin( (string)\Shared\Helpers\Helpers::get( 'login' ), (int)\Shared\Helpers\Helpers::get( 'user_id' ) );
   echo json_encode( $response );
   exit;
 }
diff --git a/admin/index.php b/admin/index.php
index 6eb5c7a..2a228cb 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -31,7 +31,6 @@ function __autoload_my_classes( $classname )
 spl_autoload_register( '__autoload_my_classes' );
 require_once '../config.php';
 require_once '../libraries/medoo/medoo.php';
-require_once '../libraries/grid/config.php';
 require_once '../libraries/rb.php';
 require_once '../libraries/phpmailer/class.phpmailer.php';
 require_once '../libraries/phpmailer/class.smtp.php';
@@ -68,16 +67,16 @@ if ( $_SESSION['ip'] !== $_SERVER['REMOTE_ADDR'] )
 
 $langRepo = new \Domain\Languages\LanguagesRepository( $mdb );
 
-if ( !$lang_id = \S::get_session( 'current-lang' ) )
+if ( !$lang_id = \Shared\Helpers\Helpers::get_session( 'current-lang' ) )
 {
   $lang_id = $langRepo->defaultLanguage();
-  \S::set_session( 'current-lang', $lang_id );
+  \Shared\Helpers\Helpers::set_session( 'current-lang', $lang_id );
 }
 
-if ( !$lang = \S::get_session( 'lang-' . $lang_id ) )
+if ( !$lang = \Shared\Helpers\Helpers::get_session( 'lang-' . $lang_id ) )
 {
   $lang = $langRepo->translations( $lang_id );
-  \S::set_session( 'lang-' . $lang_id, $lang );
+  \Shared\Helpers\Helpers::set_session( 'lang-' . $lang_id, $lang );
 }
 
 $mdb = new medoo( [
@@ -89,7 +88,7 @@ $mdb = new medoo( [
     'charset'       => 'utf8'
   ] );
 
-$user = \S::get_session( 'user', true );
+$user = \Shared\Helpers\Helpers::get_session( 'user', true );
 
 \admin\App::update();
 \admin\App::special_actions();
@@ -117,7 +116,7 @@ if ( isset( $_COOKIE[$cookie_name] ) && !isset( $_SESSION['user'] ) )
           $user_data = $mdb->get('pp_users', '*', ['AND' => ['login' => $data['login'], 'status' => 1]]);
           if ($user_data)
           {
-            \S::set_session('user', $users->details($data['login']));
+            \Shared\Helpers\Helpers::set_session('user', $users->details($data['login']));
             $redirect = $_SERVER['REQUEST_URI'] ?: '/admin/articles/view_list/';
             header('Location: ' . $redirect);
             exit;
diff --git a/admin/templates/banners/banner-edit.php b/admin/templates/banners/banner-edit.php
index 21fc5a3..c059d2f 100644
--- a/admin/templates/banners/banner-edit.php
+++ b/admin/templates/banners/banner-edit.php
@@ -1,7 +1,7 @@
 <script type="text/javascript" src="/libraries/ckeditor/ckeditor.js"></script>
 <script type="text/javascript" src="/libraries/ckeditor/adapters/jquery.js"></script>
 <?
-\S::set_session( 'admin', true );
+\Shared\Helpers\Helpers::set_session( 'admin', true );
 global $db;
 
 $_SESSION['rfm_akey'] = bin2hex(random_bytes(16));
@@ -19,7 +19,7 @@ ob_start();
   </ul>
   <div class="resp-tabs-container settings-tabs">
     <div>
-      <?= \Html::input(
+      <?= \Shared\Html\Html::input(
               array(
                       'label' => 'Nazwa',
                       'name'  => 'name',
@@ -28,7 +28,7 @@ ob_start();
                       'class' => 'require'
       ) );
       ?>
-      <?= \Html::input_switch(
+      <?= \Shared\Html\Html::input_switch(
               array(
                       'label'   => 'Aktywny',
                       'name'    => 'status',
@@ -46,7 +46,7 @@ ob_start();
               )
       );
       ?>
-      <?= \Html::input(
+      <?= \Shared\Html\Html::input(
               array(
                       'label' => 'Data zakończenia',
                       'name'  => 'date_end',
@@ -55,7 +55,7 @@ ob_start();
                       'class' => 'date'
       ) );
       ?>
-      <?= \Html::input_switch(
+      <?= \Shared\Html\Html::input_switch(
                   array(
                           'label'   => 'Slajder / Strona główna',
                           'name'    => 'home_page',
@@ -78,7 +78,7 @@ ob_start();
           <? if ( is_array( $this -> languages ) ): foreach ( $this -> languages as $lg ):?>
             <? if ( $lg['status'] ):?>
               <div>
-                <?= \Html::input_icon(
+                <?= \Shared\Html\Html::input_icon(
                               array(
                                       'label'        => 'Obraz',
                                       'name'         => 'src[' . $lg['id'] . ']',
@@ -89,7 +89,7 @@ ob_start();
                               )
                 );
                 ?>
-                <?= \Html::input(
+                <?= \Shared\Html\Html::input(
                             array(
                                     'label' => 'Url',
                                     'name'  => 'url[' . $lg['id'] . ']',
@@ -98,7 +98,7 @@ ob_start();
                             )
                     );
                 ?>
-                <?= \Html::textarea(
+                <?= \Shared\Html\Html::textarea(
                             array(
                                     'label'  => 'Kod html',
                                     'name'   => 'html[' . $lg['id'] . ']',
@@ -107,7 +107,7 @@ ob_start();
                             )
                     );
                 ?>
-                <?= \Html::textarea(
+                <?= \Shared\Html\Html::textarea(
                             array(
                                     'label'  => 'Treść',
                                     'name'   => 'text[' . $lg['id'] . ']',
@@ -136,26 +136,14 @@ ob_start();
 <?
 $out = ob_get_clean();
 
-$grid                  = new \gridEdit;
-$grid -> id              = 'banner-edit';
-$grid -> gdb_opt         = $gdb;
-$grid -> include_plugins = true;
-$grid -> title           = 'Edycja baneru';
-$grid -> fields          = [
-        [
-                'db'    => 'id',
-                'type'  => 'hidden',
-                'value' => $this -> banner['id']
-        ]
-];
-$grid -> external_code   = $out;
-$grid -> actions         = [
-        'save'   => [ 'url' => '/admin/banners/save/', 'back_url' => '/admin/banners/list/' ],
-        'cancel' => [ 'url' => '/admin/banners/list/' ]
-];
-$grid -> persist_edit    = true;
-$grid -> id_param        = 'id';
-echo $grid -> draw();
+$gridId = 'banner-edit';
+$gridTitle = 'Edycja baneru';
+$gridSaveUrl = '/admin/banners/save/';
+$gridBackUrl = '/admin/banners/list/';
+$gridHidden = [['name' => 'id', 'value' => $this -> banner['id']]];
+$gridContent = $out;
+$gridPersist = true;
+include __DIR__ . '/../components/grid-edit-replacement.php';
 ?>
 <script type="text/javascript">
   $(function ()
diff --git a/admin/templates/components/form-edit.php b/admin/templates/components/form-edit.php
index 9d4d853..ca5ed57 100644
--- a/admin/templates/components/form-edit.php
+++ b/admin/templates/components/form-edit.php
@@ -11,7 +11,7 @@ $form = $this->form;
 $renderer = new FormFieldRenderer($form);
 
 // Przygotuj filemanager key
-\S::set_session('admin', true);
+\Shared\Helpers\Helpers::set_session('admin', true);
 if (
   empty($_SESSION['rfm_akey']) ||
   (($_SESSION['rfm_akey_expires'] ?? 0) < time())
diff --git a/admin/templates/components/grid-edit-replacement.php b/admin/templates/components/grid-edit-replacement.php
new file mode 100644
index 0000000..d8376a9
--- /dev/null
+++ b/admin/templates/components/grid-edit-replacement.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * Zastepnik gridEdit — generuje panel z przyciskami zapisu/anulowania i formularzem.
+ *
+ * Wymagane zmienne:
+ *   $gridId        — identyfikator formularza (np. 'layout-edit')
+ *   $gridTitle     — tytuł panelu
+ *   $gridSaveUrl   — URL zapisu (AJAX POST)
+ *   $gridBackUrl   — URL powrotu po zapisie / anulowaniu
+ *   $gridHidden    — tablica ukrytych pól [['name' => ..., 'value' => ...], ...]
+ *   $gridContent   — HTML zawartość formularza (z ob_get_clean())
+ *   $gridPersist   — (bool) czy zostać na stronie po zapisie
+ */
+$gridPersist = !empty($gridPersist);
+?>
+<!-- iCheck -->
+<link rel="stylesheet" type="text/css" href="/libraries/grid/plugins/icheck/skins/minimal/minimal.css" />
+<link rel="stylesheet" type="text/css" href="/libraries/grid/plugins/icheck/skins/minimal/blue.css" />
+<script type="text/javascript" src="/libraries/grid/plugins/icheck/icheck.min.js"></script>
+<!-- impromptu -->
+<link rel="stylesheet" type="text/css" href="/libraries/grid/plugins/impromptu/jquery-impromptu.css" />
+<script type="text/javascript" src="/libraries/grid/plugins/impromptu/jquery-impromptu.js"></script>
+
+<div class="row">
+  <div class="col col-xs-12">
+    <div class="g-container" data="table:<?= htmlspecialchars($gridId) ?>">
+      <div class="panel panel-info panel-border top">
+        <div class="panel-heading">
+          <span class="panel-title"><?= htmlspecialchars($gridTitle) ?></span>
+        </div>
+        <?php if (!empty($gridSaveUrl)): ?>
+        <div class="panel-heading p10 pl15" id="g-menu" style="height: auto;">
+          <?php if ($gridPersist): ?>
+          <a href="#" id="g-edit-save-close" class="btn btn-system btn-sm"
+             persist_edit="0"
+             back_url="<?= htmlspecialchars($gridBackUrl) ?>"
+             url="<?= htmlspecialchars($gridSaveUrl) ?>">
+            <i class="fa fa-check-circle mr5"></i>Zatwierdź i zamknij
+          </a>
+          <?php endif; ?>
+          <a href="#" id="g-edit-save" class="btn btn-success btn-sm"
+             persist_edit="<?= $gridPersist ? '1' : '0' ?>"
+             id_param="id"
+             back_url="<?= htmlspecialchars($gridBackUrl) ?>"
+             url="<?= htmlspecialchars($gridSaveUrl) ?>">
+            <i class="fa fa-check-circle mr5"></i>Zatwierdź
+          </a>
+          <a href="<?= htmlspecialchars($gridBackUrl) ?>" class="btn btn-dark btn-sm" id="g-edit-cancel">
+            <i class="fa fa-reply mr5"></i>Wstecz
+          </a>
+        </div>
+        <?php endif; ?>
+        <div class="panel-body">
+          <form method="POST" id="fg-<?= htmlspecialchars($gridId) ?>" class="g-form form-horizontal" enctype="multipart/form-data">
+            <?php if (!empty($gridHidden) && is_array($gridHidden)): ?>
+              <?php foreach ($gridHidden as $h): ?>
+                <input type="hidden" name="<?= htmlspecialchars($h['name']) ?>" id="<?= htmlspecialchars($h['name']) ?>" value="<?= htmlspecialchars($h['value'] ?? '') ?>" />
+              <?php endforeach; ?>
+            <?php endif; ?>
+            <?= $gridContent ?>
+          </form>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+<script type="text/javascript">
+jQuery(function() {
+  jQuery('.g-checkbox, .g-radio, .icheck').iCheck({
+    checkboxClass: 'icheckbox_minimal-blue',
+    radioClass: 'iradio_minimal-blue'
+  });
+
+  function showGridMessage(type, text) {
+    var safeText = $('<div/>').text(text || '').html();
+    var alertClass = type === 'error' ? 'alert-danger' : 'alert-primary';
+    var html = '<div class="row js-form-message"><div class="col col-xs-12"><div class="alert ' + alertClass + ' alert-dismissable"><button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button><i class="fa fa-info pr10"></i>' + safeText + '</div></div></div>';
+    $('#content .js-form-message').remove();
+    $('#content').prepend(html);
+  }
+
+  $('#g-edit-save, #g-edit-save-close').on('click', function(e) {
+    e.preventDefault();
+    var $btn = $(this);
+    var url = $btn.attr('url');
+    var backUrl = $btn.attr('back_url');
+    var persist = $btn.attr('persist_edit');
+    var formId = 'fg-<?= $gridId ?>';
+
+    if (typeof CKEDITOR !== 'undefined' && CKEDITOR.instances) {
+      for (var i in CKEDITOR.instances) {
+        if (CKEDITOR.instances.hasOwnProperty(i)) CKEDITOR.instances[i].updateElement();
+      }
+    }
+
+    // Serializacja kompatybilna z grid.js — JSON w parametrze 'values'
+    var values = $('#' + formId).serializeArray();
+    var formattedValues = {};
+
+    $.each(values, function(i, field) {
+      var fieldName = field.name.replace(/\[\]$/, '');
+      var nestedMatch = fieldName.match(/^(.+?)\[(.+?)\]$/);
+
+      if (nestedMatch) {
+        var mainField = nestedMatch[1];
+        var subField = nestedMatch[2];
+        if (!formattedValues[mainField]) {
+          formattedValues[mainField] = {};
+        }
+        formattedValues[mainField][subField] = field.value;
+      } else if (field.name.indexOf('[]', field.name.length - 2) !== -1) {
+        if (!formattedValues[fieldName]) {
+          formattedValues[fieldName] = [];
+        }
+        formattedValues[fieldName].push(field.value);
+      } else {
+        formattedValues[fieldName] = field.value;
+      }
+    });
+
+    // Normalizacja checkboxów tablicowych (boolean-like)
+    (function() {
+      var $form = $('#' + formId);
+      var groups = {};
+      $form.find('input[type="checkbox"][name$="[]"]').each(function() {
+        var n = this.name;
+        (groups[n] = groups[n] || []).push(this);
+      });
+      $.each(groups, function(nameWithBrackets, inputs) {
+        var vals = {};
+        $.each(inputs, function(_, el) { vals[(el.getAttribute('value') || '').toLowerCase()] = true; });
+        var boolSet = {'': true, '1': true, 'on': true, 'true': true, 'yes': true};
+        var isBool = true;
+        $.each(vals, function(v) { if (!boolSet[v]) isBool = false; });
+        if (isBool) {
+          var baseKey = nameWithBrackets.replace(/\[\]$/, '');
+          formattedValues[baseKey] = $.map(inputs, function(el) { return el.checked ? '1' : '0'; });
+        }
+      });
+    })();
+
+    $.ajax({
+      url: url,
+      type: 'POST',
+      data: {
+        gtable: formId.replace('fg-', ''),
+        values: JSON.stringify(formattedValues),
+        a: 'gsave'
+      },
+      dataType: 'json',
+      success: function(r) {
+        if (r.status === 'ok' || r.success) {
+          if (backUrl && persist === '0') {
+            window.location.href = backUrl;
+          } else {
+            showGridMessage('success', r.msg || r.message || 'Zmiany zostały zapisane.');
+            if (r.id) {
+              $('#fg-' + formId.replace('fg-','') + ' input[name="id"]').val(r.id);
+            }
+          }
+        } else {
+          showGridMessage('error', r.msg || r.message || 'Wystąpił błąd.');
+        }
+      },
+      error: function() {
+        showGridMessage('error', 'Wystąpił błąd połączenia.');
+      }
+    });
+  });
+});
+</script>
diff --git a/admin/templates/dashboard/main-view.php b/admin/templates/dashboard/main-view.php
index 563bc47..a835dee 100644
--- a/admin/templates/dashboard/main-view.php
+++ b/admin/templates/dashboard/main-view.php
@@ -32,7 +32,7 @@
             </tr>
           </thead>
           <tbody>
-            <? if ( \S::is_array_fix( $this -> last_orders ) ): foreach ( $this -> last_orders as $order ):?>
+            <? if ( \Shared\Helpers\Helpers::is_array_fix( $this -> last_orders ) ): foreach ( $this -> last_orders as $order ):?>
               <tr class="status-<?= $order['status'];?>">
                 <td><?= date( "Y-m-d H:i", strtotime( $order['date_order'] ) );?></td>
                 <td>
@@ -122,7 +122,7 @@
             </tr>
           </thead>
           <tbody>
-            <? if ( \S::is_array_fix( $this -> best_sales_products ) ): foreach ( $this -> best_sales_products as $row ):?>
+            <? if ( \Shared\Helpers\Helpers::is_array_fix( $this -> best_sales_products ) ): foreach ( $this -> best_sales_products as $row ):?>
               <? $product = \shop\Product::getFromCache( (int)$row['parent_product_id'], ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() );?>
               <tr>
                 <td>
@@ -157,7 +157,7 @@
             </tr>
           </thead>
           <tbody>
-            <? if ( \S::is_array_fix( $this -> most_view_products ) ): foreach ( $this -> most_view_products as $row ):?>
+            <? if ( \Shared\Helpers\Helpers::is_array_fix( $this -> most_view_products ) ): foreach ( $this -> most_view_products as $row ):?>
               <? $product = new \shop\Product( $row['id'] );?>
               <tr>
                 <td>
diff --git a/admin/templates/layouts/layout-edit.php b/admin/templates/layouts/layout-edit.php
index 1885bc3..5408603 100644
--- a/admin/templates/layouts/layout-edit.php
+++ b/admin/templates/layouts/layout-edit.php
@@ -241,7 +241,7 @@ ob_start();
     </ul>
     <div class="resp-tabs-container layout-tabs">
       <div>
-        <?= \Html::input(
+        <?= \Shared\Html\Html::input(
                     array(
                       'label'   => 'Nazwa',
                       'name'    => 'name',
@@ -249,14 +249,14 @@ ob_start();
                       'value'   => $this -> layout['name']
                     )
                 );?>
-        <?= \Html::input_switch(
+        <?= \Shared\Html\Html::input_switch(
                     array(
                       'label'   => 'Szablon domy&#347;lny',
                       'name'    => 'status',
                       'checked' => $this -> layout['status'] == 1 ? true : false
                     )
                 );?>
-        <?= \Html::input_switch(
+        <?= \Shared\Html\Html::input_switch(
                     array(
                       'label'   => 'Szablon domy&#347;lny (kategorie)',
                       'name'    => 'categories_default',
@@ -329,26 +329,13 @@ ob_start();
 <?
 $out = ob_get_clean();
 
-$grid = new \gridEdit;
-$grid -> id               = 'layout-edit';
-$grid -> gdb_opt          = $gdb;
-$grid -> include_plugins  = true;
-$grid -> title            = 'Edycja szablonu';
-$grid -> fields           = [
-                              [
-                                'db' => 'id',
-                                'type' => 'hidden',
-                                'value' => $this -> layout['id']
-                              ]
-                            ];
-$grid -> actions          = [
-                              'save' => [ 'url' => '/admin/layouts/save/', 'back_url' => '/admin/layouts/list/' ],
-                              'cancel' => [ 'url' => '/admin/layouts/list/' ]
-                            ];
-$grid -> external_code    = $out;
-$grid -> persist_edit     = true;
-$grid -> id_param         = 'id';
-
-echo $grid -> draw();
+$gridId = 'layout-edit';
+$gridTitle = 'Edycja szablonu';
+$gridSaveUrl = '/admin/layouts/save/';
+$gridBackUrl = '/admin/layouts/list/';
+$gridHidden = [['name' => 'id', 'value' => $this->layout['id']]];
+$gridContent = $out;
+$gridPersist = true;
+include __DIR__ . '/../components/grid-edit-replacement.php';
 ?>
 
diff --git a/admin/templates/pages/page-articles.php b/admin/templates/pages/page-articles.php
index 8e32fab..5e28d1b 100644
--- a/admin/templates/pages/page-articles.php
+++ b/admin/templates/pages/page-articles.php
@@ -21,21 +21,14 @@ ob_start();
 <?php
 $out = ob_get_clean();
 
-$grid = new \gridEdit;
-$grid->gdb_opt = $gdb;
-$grid->include_plugins = true;
-$grid->default_buttons = false;
-$grid->external_code = $out;
-$grid->title = 'Lista artyku&#322;&#243;w';
-$grid->buttons = [
-    [
-        'label' => 'Wstecz',
-        'url' => '/admin/pages/list/',
-        'icon' => 'fa-reply',
-        'class' => 'btn-dark',
-    ],
-];
-echo $grid->draw();
+$gridId = 'page-articles';
+$gridTitle = 'Lista artyku&#322;&#243;w';
+$gridSaveUrl = '';
+$gridBackUrl = '';
+$gridHidden = [];
+$gridContent = $out;
+$gridPersist = false;
+include __DIR__ . '/../components/grid-edit-replacement.php';
 ?>
 <script type="text/javascript" src="/libraries/jquery-nested-sortable/jquery.mjs.nestedSortable.js"></script>
 <script type="text/javascript">
diff --git a/admin/templates/pages/pages-browse-list.php b/admin/templates/pages/pages-browse-list.php
index 2cbe209..847a337 100644
--- a/admin/templates/pages/pages-browse-list.php
+++ b/admin/templates/pages/pages-browse-list.php
@@ -31,15 +31,14 @@ foreach ($menus as $menu):
 endforeach;
 $out = ob_get_clean();
 
-$grid = new \gridEdit;
-$grid->id = 'pages-list';
-$grid->gdb_opt = $gdb;
-$grid->include_plugins = true;
-$grid->title = 'Lista stron';
-$grid->default_buttons = false;
-$grid->external_code = $out;
-
-echo $grid->draw();
+$gridId = 'pages-list';
+$gridTitle = 'Lista stron';
+$gridSaveUrl = '';
+$gridBackUrl = '';
+$gridHidden = [];
+$gridContent = $out;
+$gridPersist = false;
+include __DIR__ . '/../components/grid-edit-replacement.php';
 ?>
 <style type="text/css">
   <?php if ($modal): ?>.mfp-container<?php endif; ?> body.sb-top.sb-top-sm .navbar.navbar-fixed-top + #sidebar_left + #content_wrapper {
diff --git a/admin/templates/pages/pages-list.php b/admin/templates/pages/pages-list.php
index 14c7a55..c8cbe06 100644
--- a/admin/templates/pages/pages-list.php
+++ b/admin/templates/pages/pages-list.php
@@ -43,23 +43,14 @@ foreach ($menus as $menu):
 endforeach;
 $out = ob_get_clean();
 
-$grid = new \gridEdit;
-$grid->id = 'pages-list';
-$grid->gdb_opt = $gdb;
-$grid->include_plugins = true;
-$grid->title = 'Lista stron';
-$grid->default_buttons = false;
-$grid->buttons = [
-    [
-        'label' => 'Dodaj menu',
-        'url' => '/admin/pages/menuEdit/',
-        'icon' => 'fa-plus-circle',
-        'class' => 'btn-success',
-    ],
-];
-$grid->external_code = $out;
-
-echo $grid->draw();
+$gridId = 'pages-list';
+$gridTitle = 'Lista stron';
+$gridSaveUrl = '';
+$gridBackUrl = '';
+$gridHidden = [];
+$gridContent = $out;
+$gridPersist = false;
+include __DIR__ . '/../components/grid-edit-replacement.php';
 ?>
 <script type="text/javascript" src="/libraries/jquery-nested-sortable/jquery.mjs.nestedSortable.js"></script>
 <style type="text/css">
diff --git a/admin/templates/settings/settings.php b/admin/templates/settings/settings.php
index a8cbde8..854e0e3 100644
--- a/admin/templates/settings/settings.php
+++ b/admin/templates/settings/settings.php
@@ -41,7 +41,7 @@ ob_start();
     </ul>
     <div class="resp-tabs-container settings-tabs">
       <div>
-        <?= \Html::input(
+        <?= \Shared\Html\Html::input(
                     array(
                       'label'   => 'Nazwa firmy',
                       'name'    => 'firm_name',
@@ -49,7 +49,7 @@ ob_start();
                       'value'   => $this -> settings['firm_name']
                     )
                 );?>
-        <?= \Html::textarea(
+        <?= \Shared\Html\Html::textarea(
                     array(
                       'label'   => 'Dodatkowe informacje',
                       'name'    => 'additional_info',
@@ -57,14 +57,14 @@ ob_start();
                       'value'   => $this -> settings['additional_info']
                     )
                 );?>
-        <?= \Html::input_switch(
+        <?= \Shared\Html\Html::input_switch(
                     array(
                       'label'   => 'Mapa',
                       'name'    => 'google_maps',
                       'checked' => $this -> settings['google_maps'] == 1 ? true : false
                     )
                 );?>
-        <?= \Html::textarea(
+        <?= \Shared\Html\Html::textarea(
                     array(
                       'label'   => 'Mapa - adres',
                       'name'    => 'firm_adress',
@@ -74,7 +74,7 @@ ob_start();
                 );?>
       </div>
       <div>
-        <?= \Html::textarea(
+        <?= \Shared\Html\Html::textarea(
                     array(
                       'label'     => 'Dane do przelewu',
                       'name'      => 'shop_bank_account_info',
@@ -84,54 +84,54 @@ ob_start();
                       'ckeditor'  => true
                     )
                 );?>
-        <?= \Html::input( [
+        <?= \Shared\Html\Html::input( [
                       'label'   => 'Klucz API HotPay',
                       'name'    => 'hotpay_api',
                       'id'      => 'hotpay_api',
                       'value'   => $this -> settings['hotpay_api']
                     ] );?>
-        <?= \Html::input_switch( [
+        <?= \Shared\Html\Html::input_switch( [
                       'label'   => 'Tpay.com - tryb sandbox',
                       'name'    => 'tpay_sandbox',
                       'checked' => $this -> settings['tpay_sandbox'] == 1 ? true : false
                     ] );?>
-        <?= \Html::input( [
+        <?= \Shared\Html\Html::input( [
                       'label'   => 'Tpay.com ID',
                       'name'    => 'tpay_id',
                       'id'      => 'tpay_id',
                       'value'   => $this -> settings['tpay_id']
                     ] );?>
-        <?= \Html::input( [
+        <?= \Shared\Html\Html::input( [
                       'label'   => 'Tpay.com - kod bezpieczeństwa',
                       'name'    => 'tpay_security_code',
                       'id'      => 'tpay_security_code',
                       'value'   => $this -> settings['tpay_security_code']
                     ] );?>
-        <?= \Html::input_switch( [
+        <?= \Shared\Html\Html::input_switch( [
                       'label'   => 'Przelewy24.pl - tryb sandbox',
                       'name'    => 'przelewy24_sandbox',
                       'checked' => $this -> settings['przelewy24_sandbox'] == 1 ? true : false
                     ] );?>
-        <?= \Html::input( [
+        <?= \Shared\Html\Html::input( [
                       'label'   => 'Przelewy24.pl - merchant ID',
                       'name'    => 'przelewy24_merchant_id',
                       'id'      => 'przelewy24_merchant_id',
                       'value'   => $this -> settings['przelewy24_merchant_id']
                     ] );?>
-        <?= \Html::input( [
+        <?= \Shared\Html\Html::input( [
                       'label'   => 'Przelewy24.pl - klucz CRC',
                       'name'    => 'przelewy24_crc_key',
                       'id'      => 'przelewy24_crc_key',
                       'value'   => $this -> settings['przelewy24_crc_key']
                     ] );?>
-        <?= \Html::input( [
+        <?= \Shared\Html\Html::input( [
               'label'   => 'Darmowa dostawa od',
               'class' => 'number-format',
               'name'    => 'free_delivery',
               'id'      => 'free_delivery',
               'value'   => $this -> settings['free_delivery']
             ] );?>
-        <?= \Html::input( [
+        <?= \Shared\Html\Html::input( [
               'label' => 'Orlen Paczka map token',
               'name' => 'orlen_paczka_map_token',
               'id' => 'orlen_paczka_map_token',
@@ -161,7 +161,7 @@ ob_start();
               ?>
               <? if ( $lg['status'] ):?>
                 <div>
-                  <?= \Html::input(
+                  <?= \Shared\Html\Html::input(
                               array(
                                 'label'   => 'Komunikat gdy stan magazynowy równy 0',
                                 'name'    => 'warehouse_message_zero[' . $lg['id'] . ']',
@@ -170,7 +170,7 @@ ob_start();
                                 'inline'  => true
                               )
                           );?>
-                  <?= \Html::input(
+                  <?= \Shared\Html\Html::input(
                               array(
                                 'label'   => 'Komunikat gdy stan magazynowy większy niż 0',
                                 'name'    => 'warehouse_message_nonzero[' . $lg['id'] . ']',
@@ -187,14 +187,14 @@ ob_start();
         </div>
       </div>
       <div>
-        <?= \Html::input_switch(
+        <?= \Shared\Html\Html::input_switch(
                     array(
                       'label'   => 'Formularz kontaktowy',
                       'name'    => 'contact_form',
                       'checked' => $this -> settings['contact_form'] == 1 ? true : false
                     )
                 );?>
-        <?= \Html::input(
+        <?= \Shared\Html\Html::input(
                     array(
                       'label'   => 'Email kontaktowy',
                       'name'    => 'contact_email',
@@ -202,7 +202,7 @@ ob_start();
                       'value'   => $this -> settings['contact_email']
                     )
                 );?>
-        <?= \Html::input(
+        <?= \Shared\Html\Html::input(
                     array(
                       'label'   => 'Email - host',
                       'name'    => 'email_host',
@@ -210,7 +210,7 @@ ob_start();
                       'value'   => $this -> settings['email_host']
                     )
                 );?>
-        <?= \Html::input(
+        <?= \Shared\Html\Html::input(
                     array(
                       'label'   => 'Email - port',
                       'name'    => 'email_port',
@@ -218,7 +218,7 @@ ob_start();
                       'value'   => $this -> settings['email_port']
                     )
                 );?>
-        <?= \Html::input(
+        <?= \Shared\Html\Html::input(
                     array(
                       'label'   => 'Email - login',
                       'name'    => 'email_login',
@@ -226,7 +226,7 @@ ob_start();
                       'value'   => $this -> settings['email_login']
                     )
                 );?>
-        <?= \Html::input(
+        <?= \Shared\Html\Html::input(
                     array(
                       'label'   => 'Email - hasło',
                       'name'    => 'email_password',
@@ -236,7 +236,7 @@ ob_start();
                 );?>
       </div>
       <div>
-        <?= \Html::input(
+        <?= \Shared\Html\Html::input(
                     array(
                       'label'   => 'Facebook link',
                       'name'    => 'facebook_link',
@@ -252,7 +252,7 @@ ob_start();
                         ]
           );
         ?>
-        <?= \Html::textarea(
+        <?= \Shared\Html\Html::textarea(
                     array(
                       'label'   => 'Kod statystyk',
                       'name'    => 'statistic_code',
@@ -261,7 +261,7 @@ ob_start();
                       'rows'    => 10
                     )
                 );?>
-        <?= \Html::textarea(
+        <?= \Shared\Html\Html::textarea(
                     array(
                       'label'   => 'Własne reguły htacess',
                       'name'    => 'htaccess',
@@ -270,7 +270,7 @@ ob_start();
                       'rows'    => 10
                     )
                 );?>
-        <?= \Html::textarea(
+        <?= \Shared\Html\Html::textarea(
                     array(
                       'label'   => 'Własne reguły robots.txt',
                       'name'    => 'robots',
@@ -281,7 +281,7 @@ ob_start();
                 );?>
       </div>
       <div>
-        <?= \Html::input_switch(
+        <?= \Shared\Html\Html::input_switch(
                     array(
                       'label'   => 'Aktualizacja',
                       'name'    => 'update',
@@ -296,31 +296,31 @@ ob_start();
                         ]
           );
         ?>
-        <?= \Html::input_switch(
+        <?= \Shared\Html\Html::input_switch(
                     array(
                       'label'   => 'Strona konstrukcyjna',
                       'name'    => 'devel',
                       'checked' => $this -> settings['devel'] == 1 ? true : false
                     )
                 );?>
-        <?= \Html::input_switch( [
+        <?= \Shared\Html\Html::input_switch( [
           'label' => 'Lazy loading obrazów',
           'name' => 'lazy_loading',
           'checked' => $this -> settings['lazy_loading'] == 1 ? true : false
         ] );?>
 
-        <?= \Html::input_switch( [
+        <?= \Shared\Html\Html::input_switch( [
           'label' => 'Generowanie obrazków WEBP',
           'name' => 'generate_webp',
           'checked' => $this -> settings['generate_webp'] == 1 ? true : false
         ] );?>
 
-        <?= \Html::input_switch( [
+        <?= \Shared\Html\Html::input_switch( [
           'label' => 'Infinitescroll',
           'name' => 'infinitescroll',
           'checked' => $this -> settings['infinitescroll'] == 1 ? true : false
         ] );?>
-        <?= \Html::input_switch(
+        <?= \Shared\Html\Html::input_switch(
                     array(
                       'label'   => 'Htaccess cache',
                       'name'    => 'htaccess_cache',
@@ -335,14 +335,14 @@ ob_start();
           'id' => 'google_tag_manager_id',
           'value' => $this -> settings['google_tag_manager_id']
         ] ); ?>
-      <?= \Html::textarea( [
+      <?= \Shared\Html\Html::textarea( [
         'label' => 'Własny kod GTM JS (bez tagu script)',
         'name' => 'own_gtm_js',
         'id' => 'own_gtm_js',
         'value' => $this -> settings['own_gtm_js'],
         'rows' => 10
       ] );?>
-      <?= \Html::textarea( [
+      <?= \Shared\Html\Html::textarea( [
         'label' => 'Własny kod GTM HTML',
         'name' => 'own_gtm_html',
         'id' => 'own_gtm_html',
@@ -355,17 +355,14 @@ ob_start();
 <?
 $out = ob_get_clean();
 
-$grid = new \gridEdit;
-$grid -> id               = 'settings-edit';
-$grid -> gdb_opt          = $gdb;
-$grid -> include_plugins  = true;
-$grid -> title            = 'Edycja ustawień';
-$grid -> actions          = [
-                              'save' => [ 'url' => '/admin/settings/save/', 'back_url' => '' ],
-                            ];
-$grid -> persist_edit     = true;
-$grid -> external_code    = $out;
-echo $grid -> draw();
+$gridId = 'settings-edit';
+$gridTitle = 'Edycja ustawień';
+$gridSaveUrl = '/admin/settings/save/';
+$gridBackUrl = '';
+$gridHidden = [];
+$gridContent = $out;
+$gridPersist = true;
+include __DIR__ . '/../components/grid-edit-replacement.php';
 ?>
 <script>CKEDITOR.dtd.$removeEmpty['span'] = false;</script>
 <style type="text/css">#g-edit-cancel, #g-edit-save.btn-system { display: none; }</style>
diff --git a/admin/templates/shop-category/categories-list.php b/admin/templates/shop-category/categories-list.php
index 3a4ef4c..fb8ed8d 100644
--- a/admin/templates/shop-category/categories-list.php
+++ b/admin/templates/shop-category/categories-list.php
@@ -40,22 +40,13 @@ ob_start();
   <?
 $out = ob_get_clean();
 
-$grid = new \gridEdit;
-$grid -> id               = 'pages-list';
-$grid -> gdb_opt          = $gdb;
-$grid -> include_plugins  = true;
-$grid -> title            = 'Lista kategorii';
-$grid -> default_buttons  = false;
-$grid -> buttons          = [
-                              [ 
-                                'label' => 'Dodaj kategorię', 
-                                'url'   => '/admin/shop_category/category_edit/',
-                                'icon'  => 'fa-plus-circle',
-                                'class' => 'btn-success'
-                              ]
-                            ];
-$grid -> external_code    = $out;
-
-echo $grid -> draw();
+$gridId = 'pages-list';
+$gridTitle = 'Lista kategorii';
+$gridSaveUrl = '';
+$gridBackUrl = '';
+$gridHidden = [];
+$gridContent = $out;
+$gridPersist = false;
+include __DIR__ . '/../components/grid-edit-replacement.php';
 ?>
 <?= \Tpl::view( 'shop-category/categories-list-custom-script' ); ?>
\ No newline at end of file
diff --git a/admin/templates/shop-category/category-browse-list.php b/admin/templates/shop-category/category-browse-list.php
index 0ad148f..cb61227 100644
--- a/admin/templates/shop-category/category-browse-list.php
+++ b/admin/templates/shop-category/category-browse-list.php
@@ -30,15 +30,14 @@ ob_start();
   <?
 $out = ob_get_clean();
 
-$grid = new \gridEdit;
-$grid -> id               = 'pages-list';
-$grid -> gdb_opt          = $gdb;
-$grid -> include_plugins  = false;
-$grid -> title            = 'Lista kategorii';
-$grid -> default_buttons  = false;
-$grid -> external_code    = $out;
-
-echo $grid -> draw();
+$gridId = 'pages-list';
+$gridTitle = 'Lista kategorii';
+$gridSaveUrl = '';
+$gridBackUrl = '';
+$gridHidden = [];
+$gridContent = $out;
+$gridPersist = false;
+include __DIR__ . '/../components/grid-edit-replacement.php';
 ?>
 <style type="text/css">
   .mfp-container body.sb-top.sb-top-sm .navbar.navbar-fixed-top + #sidebar_left + #content_wrapper {
diff --git a/admin/templates/shop-category/category-edit.php b/admin/templates/shop-category/category-edit.php
index 29641ad..d906209 100644
--- a/admin/templates/shop-category/category-edit.php
+++ b/admin/templates/shop-category/category-edit.php
@@ -25,7 +25,7 @@ ob_start();
             <? if ( is_array( $this -> languages ) ): foreach ( $this -> languages as $lg ):?>
               <? if ( $lg['status'] ):?>
                 <div>
-                  <?= \Html::input(
+                  <?= \Shared\Html\Html::input(
                               array(
                                 'label'   => 'Nazwa kategorii',
                                 'name'    => 'title[' . $lg['id'] . ']',
@@ -34,7 +34,7 @@ ob_start();
                                 'inline'  => true
                               )
                           );?>
-                  <?= \Html::textarea(
+                  <?= \Shared\Html\Html::textarea(
                               array(
                                 'label'   => 'Opis kategorii',
                                 'name'    => 'text[' . $lg['id'] . ']',
@@ -43,7 +43,7 @@ ob_start();
                                 'inline'  => true
                               )
                           );?>
-                  <?= \Html::textarea(
+                  <?= \Shared\Html\Html::textarea(
                               array(
                                 'label'   => 'Opis kategorii (rozwinięcie)',
                                 'name'    => 'text_hidden[' . $lg['id'] . ']',
@@ -52,7 +52,7 @@ ob_start();
                                 'inline'  => true
                               )
                           );?>
-                  <?= \Html::textarea( [
+                  <?= \Shared\Html\Html::textarea( [
                                 'label' => 'Dodatkowy tekst (nad produktami)',
                                 'name' => 'additional_text[' . $lg['id'] . ']',
                                 'id' => 'additional_text_' . $lg['id'],
@@ -75,14 +75,14 @@ ob_start();
         </div>
       </div>
       <div style="padding: 15px;">
-        <?= \Html::input_switch(
+        <?= \Shared\Html\Html::input_switch(
             array(
               'label'   => 'Aktywna',
               'name'    => 'status',
               'checked' => $this -> category['status'] == 1 or !$this -> category['id'] ? true : false
             )
         );?>
-        <?= \Html::select(
+        <?= \Shared\Html\Html::select(
           [
             'label'   => 'Sortowanie produktĂłw',
             'name'    => 'sort_type',
@@ -91,7 +91,7 @@ ob_start();
             'value'   => $this -> category['sort_type']
           ]
         );?>
-        <?= \Html::input_switch(
+        <?= \Shared\Html\Html::input_switch(
             array(
               'label'   => 'Wyświetlić podkategorie',
               'name'    => 'view_subcategories',
@@ -112,7 +112,7 @@ ob_start();
             <? if ( is_array( $this -> languages ) ): foreach ( $this -> languages as $lg ):?>
               <? if ( $lg['status'] ):?>
                 <div>
-                  <?= \Html::input_icon(
+                  <?= \Shared\Html\Html::input_icon(
                               array(
                                 'label'         => 'Link SEO',
                                 'name'          => 'seo_link[' . $lg['id'] . ']',
@@ -122,7 +122,7 @@ ob_start();
                                 'icon_js'       => 'generate_seo_links( "' . $lg['id'] . '", $( "#title_' . $lg['id'] . '" ).val(), ' . (int)$this -> category['id'] . ' );'
                               )
                           );?>
-                  <?= \Html::input(
+                  <?= \Shared\Html\Html::input(
                               array(
                                 'label' => 'Tytuł kategorii (h1)',
                                 'name'  => 'category_title[' . $lg['id'] . ']',
@@ -130,7 +130,7 @@ ob_start();
                                 'value' => $this -> category['languages' ][ $lg['id'] ]['category_title']
                               )
                           );?>
-                  <?= \Html::input(
+                  <?= \Shared\Html\Html::input(
                               array(
                                 'label'   => 'Meta title',
                                 'name'    => 'meta_title[' . $lg['id'] . ']',
@@ -138,7 +138,7 @@ ob_start();
                                 'value'   => $this -> category['languages'][ $lg['id'] ]['meta_title']
                               )
                           );?>
-                  <?= \Html::textarea(
+                  <?= \Shared\Html\Html::textarea(
                               array(
                                 'label'   => 'Meta description',
                                 'name'    => 'meta_description[' . $lg['id'] . ']',
@@ -146,7 +146,7 @@ ob_start();
                                 'value'   => $this -> category['languages'][ $lg['id'] ]['meta_description']
                               )
                           );?>
-                  <?= \Html::textarea(
+                  <?= \Shared\Html\Html::textarea(
                               array(
                                 'label'   => 'Meta keywords',
                                 'name'    => 'meta_keywords[' . $lg['id'] . ']',
@@ -154,7 +154,7 @@ ob_start();
                                 'value'   => $this -> category['languages'][ $lg['id'] ]['meta_keywords']
                               )
                           );?>
-                  <?= \Html::select(
+                  <?= \Shared\Html\Html::select(
                               array(
                                 'label'   => 'Blokuj indeksacjÄ™',
                                 'name'    => 'noindex[' . $lg['id'] . ']',
@@ -177,32 +177,17 @@ ob_start();
 <?
 $out = ob_get_clean();
 
-$grid = new \gridEdit;
-$grid -> id               = 'category-edit';
-$grid -> gdb_opt          = $gdb;
-$grid -> include_plugins  = true;
-$grid -> title            = 'Edycja kategorii';
-$grid -> fields           = [
-                              [
-                                'db' => 'id',
-                                'type' => 'hidden',
-                                'value' => $this -> category['id']
-                              ],
-                              [
-                                'db' => 'parent_id',
-                                'type' => 'hidden',
-                                'value' => $this -> category['id'] ? $this -> category['parent_id'] : $this -> pid
-                              ]
-                            ];
-$grid -> actions          = [
-                              'save' => [ 'url' => '/admin/shop_category/save/', 'back_url' => '/admin/shop_category/view_list/' ],
-                              'cancel' => [ 'url' => '/admin/shop_category/view_list/' ]
-                            ];
-$grid -> external_code    = $out;
-$grid -> persist_edit     = true;
-$grid -> id_param         = 'id';
-
-echo $grid -> draw();
+$gridId = 'category-edit';
+$gridTitle = 'Edycja kategorii';
+$gridSaveUrl = '/admin/shop_category/save/';
+$gridBackUrl = '/admin/shop_category/view_list/';
+$gridHidden = [
+  ['name' => 'id', 'value' => $this -> category['id']],
+  ['name' => 'parent_id', 'value' => $this -> category['id'] ? $this -> category['parent_id'] : $this -> pid]
+];
+$gridContent = $out;
+$gridPersist = true;
+include __DIR__ . '/../components/grid-edit-replacement.php';
 ?>
 
 <?= \Tpl::view( 'shop-category/category-edit-custom-script' ); ?>
diff --git a/admin/templates/shop-category/category-products.php b/admin/templates/shop-category/category-products.php
index 7885fd8..aca888a 100644
--- a/admin/templates/shop-category/category-products.php
+++ b/admin/templates/shop-category/category-products.php
@@ -18,20 +18,13 @@ ob_start();
 <?
 $out = ob_get_clean();
 
-$grid = new \gridEdit;
-$grid -> gdb_opt          = $gdb;
-$grid -> include_plugins  = true;
-$grid -> default_buttons  = false;
-$grid -> external_code    = $out;
-$grid -> title            = 'Lista produktów';
-$grid -> buttons          = [ 
-                              [ 
-                                'label' => 'Wstecz', 
-                                'url'   => '/admin/shop_category/view_list/', 
-                                'icon'  => 'fa-reply',
-                                'class' => 'btn-dark'
-                              ]
-                            ];
-echo $grid -> draw();
+$gridId = 'category-products';
+$gridTitle = 'Lista produktów';
+$gridSaveUrl = '';
+$gridBackUrl = '';
+$gridHidden = [];
+$gridContent = $out;
+$gridPersist = false;
+include __DIR__ . '/../components/grid-edit-replacement.php';
 ?>
 <?= \Tpl::view( 'shop-category/category-products-custom-script', [ 'category_id' => $this -> category_id ] ); ?>
\ No newline at end of file
diff --git a/admin/templates/shop-order/order-details.php b/admin/templates/shop-order/order-details.php
index 116cca1..0effba4 100644
--- a/admin/templates/shop-order/order-details.php
+++ b/admin/templates/shop-order/order-details.php
@@ -128,7 +128,7 @@ $orderId = (int)($this -> order['id'] ?? 0);
         <button class="btn btn-success order_status_change">zmień status</button>
       </div>
       <div class="col-12 order-history">
-        <? if ( \S::is_array_fix( $this -> order['statuses'] ) ): foreach ( $this -> order['statuses'] as $status ):?>
+        <? if ( \Shared\Helpers\Helpers::is_array_fix( $this -> order['statuses'] ) ): foreach ( $this -> order['statuses'] as $status ):?>
           <div><b><?= date( 'Y-m-d H:i', strtotime( $status['date'] ) );?></b>: <?= $this -> order_statuses[$status['status_id']];?> <? if ( $status['mail'] ):?><i class="fa fa-envelope-o"></i><? endif;?></div>
         <? endforeach; endif;?>
       </div>
@@ -185,9 +185,9 @@ $orderId = (int)($this -> order['id'] ?? 0);
               </div>
             </td>
             <td class="tab-center"><?= $product[ 'quantity' ];?></td>
-            <td class="tab-right"><?= \S::decimal( $product[ 'price_brutto' ] );?> zł</td>
-            <td class="tab-right"><?= \S::decimal( $product[ 'price_brutto_promo' ] );?> zł</td>
-            <td class="tab-right"><?= \S::decimal( $product[ 'price_brutto_promo' ] * $product[ 'quantity' ] );?> zł</td>
+            <td class="tab-right"><?= \Shared\Helpers\Helpers::decimal( $product[ 'price_brutto' ] );?> zł</td>
+            <td class="tab-right"><?= \Shared\Helpers\Helpers::decimal( $product[ 'price_brutto_promo' ] );?> zł</td>
+            <td class="tab-right"><?= \Shared\Helpers\Helpers::decimal( $product[ 'price_brutto_promo' ] * $product[ 'quantity' ] );?> zł</td>
           </tr>
           <? endforeach; endif;?>
         </tbody>
diff --git a/admin/templates/shop-order/order-edit.php b/admin/templates/shop-order/order-edit.php
index ada4ccd..c6f92f2 100644
--- a/admin/templates/shop-order/order-edit.php
+++ b/admin/templates/shop-order/order-edit.php
@@ -90,7 +90,7 @@ $orderId = (int)($this -> order['id'] ?? 0);
           <div class="col-12">
             <select name="transport_id" class="form-control" id="transport_id">
               <option value="0">--- wybierz formę transportu ---</option>
-              <? if ( \S::is_array_fix( $this -> transport ) ): foreach ( $this -> transport as $transport_tmp ):?>
+              <? if ( \Shared\Helpers\Helpers::is_array_fix( $this -> transport ) ): foreach ( $this -> transport as $transport_tmp ):?>
                 <option value="<?= $transport_tmp['id'];?>" <? if ( $this -> order['transport_id'] == $transport_tmp['id'] ):?>selected="selected"<? endif;?>>
                   <?= $transport_tmp['name'];?> - <?= $transport_tmp['cost'];?> zł
                 </option>
@@ -113,7 +113,7 @@ $orderId = (int)($this -> order['id'] ?? 0);
           <div class="col-12">
             <select name="payment_method_id" class="form-control" id="payment_method_id">
               <option value="0">--- wybierz formę płatności ---</option>
-              <? if ( \S::is_array_fix( $this -> payment_methods ) ): foreach ( $this -> payment_methods as $payment_method ):?>
+              <? if ( \Shared\Helpers\Helpers::is_array_fix( $this -> payment_methods ) ): foreach ( $this -> payment_methods as $payment_method ):?>
                 <option value="<?= $payment_method['id'];?>" <? if ( $this -> order['payment_method_id'] == $payment_method['id'] ):?>selected="selected"<? endif;?>>
                   <?= $payment_method['name'];?>
                 </option>
@@ -143,7 +143,7 @@ $orderId = (int)($this -> order['id'] ?? 0);
         <button class="btn btn-success order_status_change">zmień status</button>
       </div>
       <div class="col-12 order-history">
-        <? if ( \S::is_array_fix( $this -> order['statuses'] ) ): foreach ( $this -> order['statuses'] as $status ):?>
+        <? if ( \Shared\Helpers\Helpers::is_array_fix( $this -> order['statuses'] ) ): foreach ( $this -> order['statuses'] as $status ):?>
           <div><b><?= date( 'Y-m-d H:i', strtotime( $status['date'] ) );?></b>: <?= $this -> order_statuses[$status['status_id']];?></div>
         <? endforeach; endif;?>
       </div>
@@ -217,7 +217,7 @@ $orderId = (int)($this -> order['id'] ?? 0);
 </form>
 
 <div class="inpost-map-container">
-  <a href="#" onclick="$( '.inpost-map-container' ).hide(); return false;" class="inpost-hide"><?= \S::lang( 'zamknij' );?></a>
+  <a href="#" onclick="$( '.inpost-map-container' ).hide(); return false;" class="inpost-hide"><?= \Shared\Helpers\Helpers::lang( 'zamknij' );?></a>
   <div id="inpost-map"></div>
 </div>
 <link class="footer" rel="stylesheet" type="text/css" href="https://geowidget.easypack24.net/css/easypack.css">
diff --git a/admin/templates/shop-product/product-combination.php b/admin/templates/shop-product/product-combination.php
index b46be5e..ac11a81 100644
--- a/admin/templates/shop-product/product-combination.php
+++ b/admin/templates/shop-product/product-combination.php
@@ -22,7 +22,7 @@
                 </tr>
               </thead>
               <tbody>
-                <? if ( \S::is_array_fix( $this -> product_permutations ) ): foreach ( $this -> product_permutations as $product ):?>
+                <? if ( \Shared\Helpers\Helpers::is_array_fix( $this -> product_permutations ) ): foreach ( $this -> product_permutations as $product ):?>
                   <tr data-combination-id="<?= $product['id'];?>">
                     <td>
                       <?
diff --git a/admin/templates/site/main-layout.php b/admin/templates/site/main-layout.php
index 7f46974..938d7c7 100644
--- a/admin/templates/site/main-layout.php
+++ b/admin/templates/site/main-layout.php
@@ -41,8 +41,8 @@
       <div class="menu">
         <div class="logo sticky-top">
           shop<b>Pro</b>
-          <span>ver. <?= \S::get_version();?></span><br>
-          <? if ( $settings[ 'update' ] and \S::get_new_version() > \S::get_version() ):?>
+          <span>ver. <?= \Shared\Helpers\Helpers::get_version();?></span><br>
+          <? if ( $settings[ 'update' ] and \Shared\Helpers\Helpers::get_new_version() > \Shared\Helpers\Helpers::get_version() ):?>
             <a href="/admin/update/main_view/" class="label label-danger">aktualizacja</a>
           <? endif;?>
         </div>
@@ -187,8 +187,8 @@
             </div>
           </div>
           <?
-          if ( $alert = \S::get_session( 'alert' ) ):
-            \S::alert( false );
+          if ( $alert = \Shared\Helpers\Helpers::get_session( 'alert' ) ):
+            \Shared\Helpers\Helpers::alert( false );
             ?>
             <div class="row">
               <div class=" col-12">
diff --git a/admin/templates/site/unlogged-layout.php b/admin/templates/site/unlogged-layout.php
index 9e24134..fbd1eb6 100644
--- a/admin/templates/site/unlogged-layout.php
+++ b/admin/templates/site/unlogged-layout.php
@@ -32,8 +32,8 @@
                   Zaloguj się do panelu administratora <b>shopPro</b>.
                 </div>
                 <?
-                if ( $alert = \S::get_session( 'alert' ) ):
-                  \S::alert( false );
+                if ( $alert = \Shared\Helpers\Helpers::get_session( 'alert' ) ):
+                  \Shared\Helpers\Helpers::alert( false );
                   ?>
                   <div class="alert alert-danger alert-dismissable">
                     <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
diff --git a/admin/templates/site/unlogged.php b/admin/templates/site/unlogged.php
index ef59d2f..fd6a533 100644
--- a/admin/templates/site/unlogged.php
+++ b/admin/templates/site/unlogged.php
@@ -32,8 +32,8 @@
                   Zaloguj się do panelu administratora <b>shopPro</b>.
                 </div>
                 <?
-                if ( $alert = \S::get_session( 'alert' ) ):
-                  \S::alert( false );
+                if ( $alert = \Shared\Helpers\Helpers::get_session( 'alert' ) ):
+                  \Shared\Helpers\Helpers::alert( false );
                   ?>
                   <div class="alert alert-danger alert-dismissable">
                     <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
diff --git a/ajax.php b/ajax.php
index 68d48c5..076a823 100644
--- a/ajax.php
+++ b/ajax.php
@@ -36,55 +36,55 @@ $mdb = new medoo( [
 
 $langRepo = new \Domain\Languages\LanguagesRepository( $mdb );
 
-if ( !$lang_id = \S::get_session( 'current-lang' ) )
+if ( !$lang_id = \Shared\Helpers\Helpers::get_session( 'current-lang' ) )
 {
   $lang_id = $langRepo->defaultLanguage();
-  \S::set_session( 'current-lang', $lang_id );
+  \Shared\Helpers\Helpers::set_session( 'current-lang', $lang_id );
 }
 
-if ( !$lang = \S::get_session( 'lang' ) )
+if ( !$lang = \Shared\Helpers\Helpers::get_session( 'lang' ) )
 {
   $lang = $langRepo->translations();
-  \S::set_session( 'lang', $lang );
+  \Shared\Helpers\Helpers::set_session( 'lang', $lang );
 }
 
 \front\controls\Site::check_url_params();
 
-if ( !$settings = \S::get_session( 'settings' ) )
+if ( !$settings = \Shared\Helpers\Helpers::get_session( 'settings' ) )
 {
   $settings = ( new \Domain\Settings\SettingsRepository( $mdb ) )->allSettings();
-  \S::set_session( 'settings', $settings );
+  \Shared\Helpers\Helpers::set_session( 'settings', $settings );
 }
 
-$a = \S::get( 'a' );
+$a = \Shared\Helpers\Helpers::get( 'a' );
 
 if ( $a == 'basket_change_transport' )
 {
-    \S::set_session( 'transport_id', \S::get( 'transport_id' ) );
+    \Shared\Helpers\Helpers::set_session( 'transport_id', \Shared\Helpers\Helpers::get( 'transport_id' ) );
 
-    $basket         = \S::get_session( 'basket' );
+    $basket         = \Shared\Helpers\Helpers::get_session( 'basket' );
     $basket_summary = \front\factory\ShopBasket::summary_price( $basket, null );
-    $transport_cost = \front\factory\ShopTransport::transport_cost( \S::get( 'transport_id' ) );
+    $transport_cost = \front\factory\ShopTransport::transport_cost( \Shared\Helpers\Helpers::get( 'transport_id' ) );
 
-    echo json_encode( [ 'summary' => \S::decimal( $basket_summary + $transport_cost ) . ' zł' ] );
+    echo json_encode( [ 'summary' => \Shared\Helpers\Helpers::decimal( $basket_summary + $transport_cost ) . ' zł' ] );
     exit;
 }
 
 if ( $a == 'change_payment' )
 {
-    \S::set_session( 'payment_method_id', \S::get( 'payment_method_id' ) );
-    $transports = \front\factory\ShopTransport::transports_list( \S::get( 'payment_method_id' ) );
+    \Shared\Helpers\Helpers::set_session( 'payment_method_id', \Shared\Helpers\Helpers::get( 'payment_method_id' ) );
+    $transports = \front\factory\ShopTransport::transports_list( \Shared\Helpers\Helpers::get( 'payment_method_id' ) );
     echo json_encode( [ 'transports' => $transports ] );
     exit;
 }
 
 if ( $a == 'contact_form' )
 {
-  if ( ( !\S::get( 'email' ) and \S::get( 'phone' ) ) )
+  if ( ( !\Shared\Helpers\Helpers::get( 'email' ) and \Shared\Helpers\Helpers::get( 'phone' ) ) )
     $response = [ 'status' => 'error' ];
   else
   {
-    if ( \S::send_email( $settings['contact_email'],  \S::get( 'subject' ), \S::get( 'text' ) . '<p>Nr telefonu: ' . \S::get( 'phone' ) . '</p><p>Email: ' . \S::get( 'email' ) . '</p>', \S::get( 'email' ) ) )
+    if ( \Shared\Helpers\Helpers::send_email( $settings['contact_email'],  \Shared\Helpers\Helpers::get( 'subject' ), \Shared\Helpers\Helpers::get( 'text' ) . '<p>Nr telefonu: ' . \Shared\Helpers\Helpers::get( 'phone' ) . '</p><p>Email: ' . \Shared\Helpers\Helpers::get( 'email' ) . '</p>', \Shared\Helpers\Helpers::get( 'email' ) ) )
       $response = [ 'status' => 'ok' ];
   }
 
@@ -100,6 +100,6 @@ if ( $a == 'cookie_close' )
 
 if ( $a == 'banner_close' )
 {
-  \S::set_session( 'banner_close', true );
+  \Shared\Helpers\Helpers::set_session( 'banner_close', true );
 }
 ?>
\ No newline at end of file
diff --git a/api.php b/api.php
index 26032c7..35ec513 100644
--- a/api.php
+++ b/api.php
@@ -52,14 +52,14 @@ $mdb = new medoo( [
 
 $settings = ( new \Domain\Settings\SettingsRepository( $mdb ) )->allSettings();
 
-if ( \S::get( 'ekomi_csv' ) )
+if ( \Shared\Helpers\Helpers::get( 'ekomi_csv' ) )
 {
   $csv_array = [ [ 'ORDER_ID', 'MAIL', 'FIRST_NAME', 'LAST_NAME', 'PRODUCT_ID', 'PRODUCT_NAME' ] ];
 
   $orders_id = $mdb -> select( 'pp_shop_order_statuses', 'order_id', [ 'AND' => [ 'status_id' => 6, 'date[~]' => date( 'Y-m-d', strtotime( '-1 day', time() ) ) ] ] );
   $orders_id = array_unique( $orders_id );
 
-  if ( \S::is_array_fix( $orders_id ) )
+  if ( \Shared\Helpers\Helpers::is_array_fix( $orders_id ) )
   {
     foreach ( $orders_id as $order_id )
     {
@@ -67,7 +67,7 @@ if ( \S::get( 'ekomi_csv' ) )
       if ( $order )
       {
         $products = $mdb -> select( 'pp_shop_order_products', '*', [ 'order_id' => $order['id'] ] );
-        if ( \S::is_array_fix( $products ) ) foreach ( $products as $product )
+        if ( \Shared\Helpers\Helpers::is_array_fix( $products ) ) foreach ( $products as $product )
         {
           $csv_array[] = [ $order['id'], $order['client_email'], $order['client_name'], $order['client_surname'], $product['product_id'], $product['name'] ];
         }
diff --git a/autoload/Domain/Article/ArticleRepository.php b/autoload/Domain/Article/ArticleRepository.php
index aea397a..8ef49f9 100644
--- a/autoload/Domain/Article/ArticleRepository.php
+++ b/autoload/Domain/Article/ArticleRepository.php
@@ -81,8 +81,8 @@ class ArticleRepository
         $this->applyGalleryOrderIfProvided($id, $data);
         $this->applyFilesOrderIfProvided($id, $data);
 
-        \S::htacces();
-        \S::delete_dir('../temp/');
+        \Shared\Helpers\Helpers::htacces();
+        \Shared\Helpers\Helpers::delete_dir('../temp/');
 
         return (int)$id;
     }
@@ -102,8 +102,8 @@ class ArticleRepository
         $this->deleteMarkedImages($articleId);
         $this->deleteMarkedFiles($articleId);
 
-        \S::htacces();
-        \S::delete_dir('../temp/');
+        \Shared\Helpers\Helpers::htacces();
+        \Shared\Helpers\Helpers::delete_dir('../temp/');
 
         return $articleId;
     }
@@ -142,7 +142,7 @@ class ArticleRepository
             'meta_title'          => ($data['meta_title'][$langId] ?? '') != '' ? $data['meta_title'][$langId] : null,
             'meta_description'    => ($data['meta_description'][$langId] ?? '') != '' ? $data['meta_description'][$langId] : null,
             'meta_keywords'       => ($data['meta_keywords'][$langId] ?? '') != '' ? $data['meta_keywords'][$langId] : null,
-            'seo_link'            => \S::seo($data['seo_link'][$langId] ?? '') != '' ? \S::seo($data['seo_link'][$langId]) : null,
+            'seo_link'            => \Shared\Helpers\Helpers::seo($data['seo_link'][$langId] ?? '') != '' ? \Shared\Helpers\Helpers::seo($data['seo_link'][$langId]) : null,
             'noindex'             => $this->isCheckedValue($data['noindex'][$langId] ?? null) ? 1 : 0,
             'copy_from'           => ($data['copy_from'][$langId] ?? '') != '' ? $data['copy_from'][$langId] : null,
             'block_direct_access' => $this->isCheckedValue($data['block_direct_access'][$langId] ?? null) ? 1 : 0,
@@ -383,8 +383,8 @@ class ArticleRepository
         $this->db->delete('pp_articles_files', ['article_id' => $articleId]);
         $this->db->delete('pp_articles', ['id' => $articleId]);
 
-        \S::delete_dir('../upload/article_images/article_' . $articleId . '/');
-        \S::delete_dir('../upload/article_files/article_' . $articleId . '/');
+        \Shared\Helpers\Helpers::delete_dir('../upload/article_images/article_' . $articleId . '/');
+        \Shared\Helpers\Helpers::delete_dir('../upload/article_files/article_' . $articleId . '/');
 
         return true;
     }
@@ -602,7 +602,7 @@ class ArticleRepository
             ]);
         }
 
-        \S::delete_dir('../temp/');
+        \Shared\Helpers\Helpers::delete_dir('../temp/');
         return true;
     }
 
@@ -637,7 +637,7 @@ class ArticleRepository
             }
         }
 
-        \S::delete_dir('../temp/');
+        \Shared\Helpers\Helpers::delete_dir('../temp/');
         return true;
     }
 
@@ -727,7 +727,7 @@ class ArticleRepository
             'id' => $imageId,
         ]);
 
-        \S::delete_cache();
+        \Shared\Helpers\Helpers::delete_cache();
 
         return (bool)$result;
     }
@@ -1142,7 +1142,7 @@ class ArticleRepository
         }
 
         $articles = null;
-        if (\S::is_array_fix($articlesData)) {
+        if (\Shared\Helpers\Helpers::is_array_fix($articlesData)) {
             foreach ($articlesData as $row) {
                 $articles[] = $this->articleDetailsFrontend((int)$row['id'], $langId);
             }
@@ -1191,7 +1191,7 @@ class ArticleRepository
         }
 
         $articles = null;
-        if (\S::is_array_fix($articlesData)) {
+        if (\Shared\Helpers\Helpers::is_array_fix($articlesData)) {
             foreach ($articlesData as $row) {
                 $articles[] = $this->articleDetailsFrontend((int)$row['id'], $langId);
             }
diff --git a/autoload/Domain/Attribute/AttributeRepository.php b/autoload/Domain/Attribute/AttributeRepository.php
index 1066670..cb35114 100644
--- a/autoload/Domain/Attribute/AttributeRepository.php
+++ b/autoload/Domain/Attribute/AttributeRepository.php
@@ -838,10 +838,10 @@ class AttributeRepository
     {
         if (class_exists('\S')) {
             if (method_exists('\S', 'delete_dir')) {
-                \S::delete_dir('../temp/');
+                \Shared\Helpers\Helpers::delete_dir('../temp/');
             }
             if (method_exists('\S', 'delete_cache')) {
-                \S::delete_cache();
+                \Shared\Helpers\Helpers::delete_cache();
             }
         }
     }
diff --git a/autoload/Domain/Banner/BannerRepository.php b/autoload/Domain/Banner/BannerRepository.php
index d70ee6b..4cee78d 100644
--- a/autoload/Domain/Banner/BannerRepository.php
+++ b/autoload/Domain/Banner/BannerRepository.php
@@ -102,7 +102,7 @@ class BannerRepository
             $this->saveTranslations($bannerId, $data['src'], $data['url'], $data['html'], $data['text']);
         }
 
-        \S::delete_dir('../temp/');
+        \Shared\Helpers\Helpers::delete_dir('../temp/');
 
         return (int)$bannerId;
     }
diff --git a/autoload/Domain/Cache/CacheRepository.php b/autoload/Domain/Cache/CacheRepository.php
index ece6237..290fe19 100644
--- a/autoload/Domain/Cache/CacheRepository.php
+++ b/autoload/Domain/Cache/CacheRepository.php
@@ -32,8 +32,8 @@ class CacheRepository
      */
     public function clearCache(): array
     {
-        \S::delete_dir( $this->basePath . 'temp/' );
-        \S::delete_dir( $this->basePath . 'thumbs/' );
+        \Shared\Helpers\Helpers::delete_dir( $this->basePath . 'temp/' );
+        \Shared\Helpers\Helpers::delete_dir( $this->basePath . 'thumbs/' );
 
         $redisCleared = false;
         if ( $this->redisConnection ) {
diff --git a/autoload/Domain/Category/CategoryRepository.php b/autoload/Domain/Category/CategoryRepository.php
index b18a68c..d514b52 100644
--- a/autoload/Domain/Category/CategoryRepository.php
+++ b/autoload/Domain/Category/CategoryRepository.php
@@ -325,8 +325,8 @@ class CategoryRepository
     private function refreshCategoryArtifacts(): void
     {
         if (class_exists('\\S')) {
-            \S::htacces();
-            \S::delete_dir('../temp/');
+            \Shared\Helpers\Helpers::htacces();
+            \Shared\Helpers\Helpers::delete_dir('../temp/');
         }
     }
 
@@ -336,7 +336,7 @@ class CategoryRepository
             return $this->toNullableString($value);
         }
 
-        $seo = \S::seo((string)$value);
+        $seo = \Shared\Helpers\Helpers::seo((string)$value);
         $seo = trim((string)$seo);
 
         return $seo !== '' ? $seo : null;
diff --git a/autoload/Domain/Dictionaries/DictionariesRepository.php b/autoload/Domain/Dictionaries/DictionariesRepository.php
index c8153bb..43e9c2c 100644
--- a/autoload/Domain/Dictionaries/DictionariesRepository.php
+++ b/autoload/Domain/Dictionaries/DictionariesRepository.php
@@ -249,8 +249,8 @@ class DictionariesRepository
     private function clearCache(): void
     {
         if (class_exists('\S') && method_exists('\S', 'delete_dir')) {
-            \S::delete_dir('../temp/');
-            \S::delete_dir('../temp/dictionaries');
+            \Shared\Helpers\Helpers::delete_dir('../temp/');
+            \Shared\Helpers\Helpers::delete_dir('../temp/dictionaries');
         }
     }
 
diff --git a/autoload/Domain/Integrations/IntegrationsRepository.php b/autoload/Domain/Integrations/IntegrationsRepository.php
index 0204a6d..7418bd2 100644
--- a/autoload/Domain/Integrations/IntegrationsRepository.php
+++ b/autoload/Domain/Integrations/IntegrationsRepository.php
@@ -51,7 +51,7 @@ class IntegrationsRepository
         } else {
             $this->db->insert( $table, [ 'name' => $name, 'value' => $value ] );
         }
-        \S::delete_dir('../temp/');
+        \Shared\Helpers\Helpers::delete_dir('../temp/');
         return true;
     }
 
@@ -61,7 +61,7 @@ class IntegrationsRepository
     {
         return (bool) $this->db->update( 'pp_shop_products', [
             'apilo_product_id'   => $externalId,
-            'apilo_product_name' => \S::remove_special_chars( $externalName ),
+            'apilo_product_name' => \Shared\Helpers\Helpers::remove_special_chars( $externalName ),
         ], [ 'id' => $productId ] );
     }
 
diff --git a/autoload/Domain/Languages/LanguagesRepository.php b/autoload/Domain/Languages/LanguagesRepository.php
index fe6d044..cac1f15 100644
--- a/autoload/Domain/Languages/LanguagesRepository.php
+++ b/autoload/Domain/Languages/LanguagesRepository.php
@@ -232,8 +232,8 @@ class LanguagesRepository
             return false;
         }
 
-        \S::htacces();
-        \S::delete_dir('../temp/');
+        \Shared\Helpers\Helpers::htacces();
+        \Shared\Helpers\Helpers::delete_dir('../temp/');
         return true;
     }
 
@@ -287,8 +287,8 @@ class LanguagesRepository
             }
         }
 
-        \S::htacces();
-        \S::delete_dir('../temp/');
+        \Shared\Helpers\Helpers::htacces();
+        \Shared\Helpers\Helpers::delete_dir('../temp/');
         return $languageId;
     }
 
@@ -327,8 +327,8 @@ class LanguagesRepository
             ]);
         }
 
-        \S::htacces();
-        \S::delete_dir('../temp/');
+        \Shared\Helpers\Helpers::htacces();
+        \Shared\Helpers\Helpers::delete_dir('../temp/');
         return $translationId;
     }
 
diff --git a/autoload/Domain/Layouts/LayoutsRepository.php b/autoload/Domain/Layouts/LayoutsRepository.php
index b791c30..49b2d3f 100644
--- a/autoload/Domain/Layouts/LayoutsRepository.php
+++ b/autoload/Domain/Layouts/LayoutsRepository.php
@@ -20,7 +20,7 @@ class LayoutsRepository
 
         $deleted = (bool)$this->db->delete('pp_layouts', ['id' => $layoutId]);
         if ($deleted) {
-            \S::delete_dir('../temp/');
+            \Shared\Helpers\Helpers::delete_dir('../temp/');
             $this->clearFrontLayoutsCache();
         }
 
@@ -51,9 +51,6 @@ class LayoutsRepository
             'html' => (string)($data['html'] ?? ''),
             'css' => (string)($data['css'] ?? ''),
             'js' => (string)($data['js'] ?? ''),
-            'm_html' => (string)($data['m_html'] ?? ''),
-            'm_css' => (string)($data['m_css'] ?? ''),
-            'm_js' => (string)($data['m_js'] ?? ''),
             'status' => $status,
             'categories_default' => $categoriesDefault,
         ];
@@ -82,7 +79,7 @@ class LayoutsRepository
         $this->db->delete('pp_layouts_categories', ['layout_id' => $layoutId]);
         $this->syncCategories($layoutId, $data['categories'] ?? []);
 
-        \S::delete_dir('../temp/');
+        \Shared\Helpers\Helpers::delete_dir('../temp/');
         $this->clearFrontLayoutsCache();
 
         return $layoutId;
@@ -287,9 +284,6 @@ class LayoutsRepository
             'html' => '',
             'css' => '',
             'js' => '',
-            'm_html' => '',
-            'm_css' => '',
-            'm_js' => '',
             'pages' => [],
             'categories' => [],
         ];
diff --git a/autoload/Domain/Newsletter/NewsletterPreviewRenderer.php b/autoload/Domain/Newsletter/NewsletterPreviewRenderer.php
index a14f2e7..1955fe9 100644
--- a/autoload/Domain/Newsletter/NewsletterPreviewRenderer.php
+++ b/autoload/Domain/Newsletter/NewsletterPreviewRenderer.php
@@ -24,7 +24,7 @@ class NewsletterPreviewRenderer
                 $articleId = (int)($article['id'] ?? 0);
                 $title = (string)($article['language']['title'] ?? '');
                 $seoLink = trim((string)($article['language']['seo_link'] ?? ''));
-                $url = $seoLink !== '' ? $seoLink : ('a-' . $articleId . '-' . \S::seo($title));
+                $url = $seoLink !== '' ? $seoLink : ('a-' . $articleId . '-' . \Shared\Helpers\Helpers::seo($title));
                 $entry = !empty($article['language']['entry'])
                     ? (string)$article['language']['entry']
                     : (string)($article['language']['text'] ?? '');
diff --git a/autoload/Domain/Newsletter/NewsletterRepository.php b/autoload/Domain/Newsletter/NewsletterRepository.php
index dca40b1..c3f82af 100644
--- a/autoload/Domain/Newsletter/NewsletterRepository.php
+++ b/autoload/Domain/Newsletter/NewsletterRepository.php
@@ -44,7 +44,7 @@ class NewsletterRepository
     {
         $this->settingsRepository->updateSetting('newsletter_footer', (string)($values['newsletter_footer'] ?? ''));
         $this->settingsRepository->updateSetting('newsletter_header', (string)($values['newsletter_header'] ?? ''));
-        \S::delete_dir('../temp/');
+        \Shared\Helpers\Helpers::delete_dir('../temp/');
 
         return true;
     }
@@ -128,7 +128,7 @@ class NewsletterRepository
                 return null;
             }
 
-            \S::delete_dir('../temp/');
+            \Shared\Helpers\Helpers::delete_dir('../temp/');
             return (int)$this->db->id();
         }
 
@@ -148,7 +148,7 @@ class NewsletterRepository
             'id' => $templateId,
         ]);
 
-        \S::delete_dir('../temp/');
+        \Shared\Helpers\Helpers::delete_dir('../temp/');
         return $templateId;
     }
 
@@ -350,7 +350,7 @@ class NewsletterRepository
 
     public function signup(string $email, string $serverName, bool $ssl, array $settings): bool
     {
-        if (!\S::email_check($email)) {
+        if (!\Shared\Helpers\Helpers::email_check($email)) {
             return false;
         }
 
@@ -380,9 +380,9 @@ class NewsletterRepository
             $text
         );
 
-        $lang = \S::get_session('lang-' . \S::get_session('current-lang'));
+        $lang = \Shared\Helpers\Helpers::get_session('lang-' . \Shared\Helpers\Helpers::get_session('current-lang'));
         $subject = $lang['potwierdz-zapisanie-sie-do-newslettera'] ?? 'Newsletter';
-        \S::send_email($email, $subject, $text);
+        \Shared\Helpers\Helpers::send_email($email, $subject, $text);
 
         $this->db->insert('pp_newsletter', ['email' => $email, 'hash' => $hash, 'status' => 0]);
 
@@ -435,7 +435,7 @@ class NewsletterRepository
             $link = $base . "://" . $serverName . '/newsletter/unsubscribe/hash=' . $hash;
             $text = str_replace('[WYPISZ_SIE]', '<a href="' . $link . '">' . $unsubscribeLabel . '</a>', $text);
 
-            \S::send_email($row['email'], 'Newsletter ze strony: ' . $serverName, $text);
+            \Shared\Helpers\Helpers::send_email($row['email'], 'Newsletter ze strony: ' . $serverName, $text);
 
             $this->db->delete('pp_newsletter_send', ['id' => $row['id']]);
         }
diff --git a/autoload/Domain/Order/OrderAdminService.php b/autoload/Domain/Order/OrderAdminService.php
index 8e11a50..ed1719f 100644
--- a/autoload/Domain/Order/OrderAdminService.php
+++ b/autoload/Domain/Order/OrderAdminService.php
@@ -68,10 +68,6 @@ class OrderAdminService
             (int)($input['payment_method_id'] ?? 0)
         );
 
-        if ($saved && isset($GLOBALS['user']['id'])) {
-            \Log::save_log('Zamówienie zmienione przez administratora | ID: ' . (int)($input['order_id'] ?? 0), (int)$GLOBALS['user']['id']);
-        }
-
         return $saved;
     }
 
@@ -197,11 +193,6 @@ class OrderAdminService
 
     public function deleteOrder(int $orderId): bool
     {
-        $deleted = $this->orders->deleteOrder($orderId);
-        if ($deleted && isset($GLOBALS['user']['id'])) {
-            \Log::save_log('Usunięcie zamówienia | ID: ' . $orderId, (int)$GLOBALS['user']['id']);
-        }
-
-        return $deleted;
+        return $this->orders->deleteOrder($orderId);
     }
 }
\ No newline at end of file
diff --git a/autoload/Domain/Pages/PagesRepository.php b/autoload/Domain/Pages/PagesRepository.php
index b897666..210d590 100644
--- a/autoload/Domain/Pages/PagesRepository.php
+++ b/autoload/Domain/Pages/PagesRepository.php
@@ -173,7 +173,7 @@ class PagesRepository
             ]);
 
             if ($result) {
-                \S::delete_dir('../temp/');
+                \Shared\Helpers\Helpers::delete_dir('../temp/');
             }
             return (bool)$result;
         }
@@ -185,7 +185,7 @@ class PagesRepository
             'id' => $menuId,
         ]);
 
-        \S::delete_dir('../temp/');
+        \Shared\Helpers\Helpers::delete_dir('../temp/');
         return true;
     }
 
@@ -282,7 +282,7 @@ class PagesRepository
             ]);
         }
 
-        \S::delete_dir('../temp/');
+        \Shared\Helpers\Helpers::delete_dir('../temp/');
         return true;
     }
 
@@ -320,7 +320,7 @@ class PagesRepository
             ]);
         }
 
-        \S::delete_dir('../temp/');
+        \Shared\Helpers\Helpers::delete_dir('../temp/');
 
         return true;
     }
@@ -397,15 +397,15 @@ class PagesRepository
         $this->saveTranslations($pageId, $pageType, $data);
         $this->updateSubpagesMenuId($pageId, $menuId);
 
-        \S::htacces();
-        \S::delete_dir('../temp/');
+        \Shared\Helpers\Helpers::htacces();
+        \Shared\Helpers\Helpers::delete_dir('../temp/');
 
         return $pageId;
     }
 
     public function generateSeoLink(string $title, int $pageId = 0, int $articleId = 0, int $categoryId = 0): string
     {
-        $base = trim((string)\S::seo($title));
+        $base = trim((string)\Shared\Helpers\Helpers::seo($title));
         if ($base === '') {
             return '';
         }
@@ -427,7 +427,7 @@ class PagesRepository
     {
         $url = trim($seoLink) !== ''
             ? '/' . ltrim($seoLink, '/')
-            : '/s-' . $pageId . '-' . \S::seo($title);
+            : '/s-' . $pageId . '-' . \Shared\Helpers\Helpers::seo($title);
 
         if ($langId !== '' && $langId !== $defaultLanguageId && $url !== '#') {
             $url = '/' . $langId . $url;
@@ -542,7 +542,7 @@ class PagesRepository
                 'meta_description' => $this->nullIfEmpty($metaDescriptions[$langId] ?? null),
                 'meta_keywords' => $this->nullIfEmpty($metaKeywords[$langId] ?? null),
                 'meta_title' => $this->nullIfEmpty($metaTitles[$langId] ?? null),
-                'seo_link' => $this->nullIfEmpty(\S::seo((string)($seoLinks[$langId] ?? ''))),
+                'seo_link' => $this->nullIfEmpty(\Shared\Helpers\Helpers::seo((string)($seoLinks[$langId] ?? ''))),
                 'noindex' => (int)($noindexValues[$langId] ?? 0),
                 'page_title' => $this->nullIfEmpty($pageTitles[$langId] ?? null),
                 'link' => $pageType === 3 ? $this->nullIfEmpty($links[$langId] ?? null) : null,
diff --git a/autoload/Domain/Product/ProductRepository.php b/autoload/Domain/Product/ProductRepository.php
index 79cd2aa..eac6641 100644
--- a/autoload/Domain/Product/ProductRepository.php
+++ b/autoload/Domain/Product/ProductRepository.php
@@ -634,9 +634,9 @@ class ProductRepository
             $this->cleanupDeletedImages( $productId );
         }
 
-        \S::htacces();
-        \S::delete_dir( '../temp/' );
-        \S::delete_dir( '../thumbs/' );
+        \Shared\Helpers\Helpers::htacces();
+        \Shared\Helpers\Helpers::delete_dir( '../temp/' );
+        \Shared\Helpers\Helpers::delete_dir( '../thumbs/' );
 
         if ( !$isNew ) {
             $redis = \Shared\Cache\RedisConnection::getInstance()->getConnection();
@@ -660,7 +660,7 @@ class ProductRepository
                 'description' => $this->nullIfEmpty( $d['description'][$lid] ?? null ),
                 'meta_description' => $this->nullIfEmpty( $d['meta_description'][$lid] ?? null ),
                 'meta_keywords' => $this->nullIfEmpty( $d['meta_keywords'][$lid] ?? null ),
-                'seo_link' => !empty( $d['seo_link'][$lid] ) ? \S::seo( $d['seo_link'][$lid] ) : null,
+                'seo_link' => !empty( $d['seo_link'][$lid] ) ? \Shared\Helpers\Helpers::seo( $d['seo_link'][$lid] ) : null,
                 'copy_from' => $this->nullIfEmpty( $d['copy_from'][$lid] ?? null ),
                 'warehouse_message_zero' => $this->nullIfEmpty( $d['warehouse_message_zero'][$lid] ?? null ),
                 'warehouse_message_nonzero' => $this->nullIfEmpty( $d['warehouse_message_nonzero'][$lid] ?? null ),
@@ -684,7 +684,7 @@ class ProductRepository
 
                 if ( $translationId ) {
                     $currentSeoLink = $this->db->get( 'pp_shop_products_langs', 'seo_link', [ 'id' => $translationId ] );
-                    $newSeoLink = $langData['seo_link'] ?: \S::seo( 'p-' . $productId . '-' . ( $d['name'][$lid] ?? '' ) );
+                    $newSeoLink = $langData['seo_link'] ?: \Shared\Helpers\Helpers::seo( 'p-' . $productId . '-' . ( $d['name'][$lid] ?? '' ) );
 
                     if ( $newSeoLink !== $currentSeoLink && $currentSeoLink != '' ) {
                         $this->handleSeoRedirects( $productId, $lid, $newSeoLink, $currentSeoLink );
@@ -733,7 +733,7 @@ class ProductRepository
             ] );
 
             if ( !$this->db->count( 'pp_redirects', [ 'from' => $currentSeoLink, 'to' => $newSeoLink, 'lang_id' => $langId, 'product_id' => $productId ] ) ) {
-                if ( \S::canAddRedirect( $currentSeoLink, $newSeoLink, $langId ) ) {
+                if ( \Shared\Helpers\Helpers::canAddRedirect( $currentSeoLink, $newSeoLink, $langId ) ) {
                     $this->db->insert( 'pp_redirects', [ 'from' => $currentSeoLink, 'to' => $newSeoLink, 'lang_id' => $langId, 'product_id' => $productId ] );
                 }
             }
@@ -947,8 +947,8 @@ class ProductRepository
         $this->db->delete( 'pp_routes', [ 'product_id' => $productId ] );
         $this->db->delete( 'pp_redirects', [ 'product_id' => $productId ] );
 
-        \S::delete_dir( '../upload/product_images/product_' . $productId . '/' );
-        \S::delete_dir( '../upload/product_files/product_' . $productId . '/' );
+        \Shared\Helpers\Helpers::delete_dir( '../upload/product_images/product_' . $productId . '/' );
+        \Shared\Helpers\Helpers::delete_dir( '../upload/product_files/product_' . $productId . '/' );
 
         return true;
     }
@@ -993,7 +993,7 @@ class ProductRepository
 
         // Atrybuty
         $attributes = $this->db->select( 'pp_shop_products_attributes', '*', [ 'product_id' => $productId ] );
-        if ( \S::is_array_fix( $attributes ) ) {
+        if ( \Shared\Helpers\Helpers::is_array_fix( $attributes ) ) {
             foreach ( $attributes as $row ) {
                 $this->db->insert( 'pp_shop_products_attributes', [
                     'product_id'   => $newProductId,
@@ -1005,7 +1005,7 @@ class ProductRepository
 
         // Kategorie
         $categories = $this->db->select( 'pp_shop_products_categories', '*', [ 'product_id' => $productId ] );
-        if ( \S::is_array_fix( $categories ) ) {
+        if ( \Shared\Helpers\Helpers::is_array_fix( $categories ) ) {
             foreach ( $categories as $row ) {
                 $this->db->insert( 'pp_shop_products_categories', [
                     'product_id'  => $newProductId,
@@ -1017,7 +1017,7 @@ class ProductRepository
 
         // Języki
         $langs = $this->db->select( 'pp_shop_products_langs', '*', [ 'product_id' => $productId ] );
-        if ( \S::is_array_fix( $langs ) ) {
+        if ( \Shared\Helpers\Helpers::is_array_fix( $langs ) ) {
             foreach ( $langs as $row ) {
                 $this->db->insert( 'pp_shop_products_langs', [
                     'product_id'               => $newProductId,
@@ -1040,7 +1040,7 @@ class ProductRepository
 
         // Custom fields
         $customFields = $this->db->select( 'pp_shop_products_custom_fields', '*', [ 'id_product' => $productId ] );
-        if ( \S::is_array_fix( $customFields ) ) {
+        if ( \Shared\Helpers\Helpers::is_array_fix( $customFields ) ) {
             foreach ( $customFields as $row ) {
                 $this->db->insert( 'pp_shop_products_custom_fields', [
                     'id_product' => $newProductId,
@@ -1052,7 +1052,7 @@ class ProductRepository
         // Duplikowanie kombinacji
         if ( $withCombinations ) {
             $productCombinations = $this->db->select( 'pp_shop_products', '*', [ 'parent_id' => $productId ] );
-            if ( \S::is_array_fix( $productCombinations ) ) {
+            if ( \Shared\Helpers\Helpers::is_array_fix( $productCombinations ) ) {
                 foreach ( $productCombinations as $comb ) {
                     $this->db->insert( 'pp_shop_products', [
                         'parent_id'                    => $newProductId,
@@ -1073,7 +1073,7 @@ class ProductRepository
                     $combNewId = $this->db->id();
                     if ( $combNewId ) {
                         $combAttrs = $this->db->select( 'pp_shop_products_attributes', '*', [ 'product_id' => $comb['id'] ] );
-                        if ( \S::is_array_fix( $combAttrs ) ) {
+                        if ( \Shared\Helpers\Helpers::is_array_fix( $combAttrs ) ) {
                             foreach ( $combAttrs as $attr ) {
                                 $this->db->insert( 'pp_shop_products_attributes', [
                                     'product_id'   => $combNewId,
@@ -1114,7 +1114,7 @@ class ProductRepository
     public function updatePriceBrutto(int $productId, $price): bool
     {
         $vat = (float) $this->db->get( 'pp_shop_products', 'vat', [ 'id' => $productId ] );
-        $priceNetto = \S::normalize_decimal( (float) $price / ( 100 + $vat ) * 100, 2 );
+        $priceNetto = \Shared\Helpers\Helpers::normalize_decimal( (float) $price / ( 100 + $vat ) * 100, 2 );
 
         $this->db->update( 'pp_shop_products', [
             'price_brutto' => $price != 0.00 ? $price : null,
@@ -1134,7 +1134,7 @@ class ProductRepository
     public function updatePriceBruttoPromo(int $productId, $price): bool
     {
         $vat = (float) $this->db->get( 'pp_shop_products', 'vat', [ 'id' => $productId ] );
-        $priceNetto = \S::normalize_decimal( (float) $price / ( 100 + $vat ) * 100, 2 );
+        $priceNetto = \Shared\Helpers\Helpers::normalize_decimal( (float) $price / ( 100 + $vat ) * 100, 2 );
 
         $this->db->update( 'pp_shop_products', [
             'price_brutto_promo' => $price != 0.00 ? $price : null,
@@ -1195,7 +1195,7 @@ class ProductRepository
     {
         $products = [];
         $results = $this->db->select( 'pp_shop_products', 'id', [ 'parent_id' => $productId ] );
-        if ( \S::is_array_fix( $results ) ) {
+        if ( \Shared\Helpers\Helpers::is_array_fix( $results ) ) {
             foreach ( $results as $row ) {
                 $detail = $this->findForAdmin( (int) $row );
                 if ( $detail ) {
@@ -1219,7 +1219,7 @@ class ProductRepository
         $attributeRepository = new \Domain\Attribute\AttributeRepository( $this->db );
 
         $permutations = \shop\Product::array_cartesian( $attributes );
-        if ( !\S::is_array_fix( $permutations ) ) {
+        if ( !\Shared\Helpers\Helpers::is_array_fix( $permutations ) ) {
             return true;
         }
 
@@ -1229,7 +1229,7 @@ class ProductRepository
 
             $permutationHash = '';
 
-            if ( \S::is_array_fix( $permutation ) ) {
+            if ( \Shared\Helpers\Helpers::is_array_fix( $permutation ) ) {
                 foreach ( $permutation as $key => $val ) {
                     if ( $permutationHash ) {
                         $permutationHash .= '|';
@@ -1374,7 +1374,7 @@ class ProductRepository
     public function updateImageAlt(int $imageId, string $alt): bool
     {
         $result = $this->db->update( 'pp_shop_products_images', [ 'alt' => $alt ], [ 'id' => $imageId ] );
-        \S::delete_cache();
+        \Shared\Helpers\Helpers::delete_cache();
         return (bool) $result;
     }
 
@@ -1542,7 +1542,7 @@ class ProductRepository
             'AND' => [ 'status' => '1', 'archive' => 0, 'parent_id' => null ],
         ] );
 
-        if ( \S::is_array_fix( $rows ) ) {
+        if ( \Shared\Helpers\Helpers::is_array_fix( $rows ) ) {
             foreach ( $rows as $productId ) {
                 $product = \shop\Product::getFromCache( $productId, $lang_id );
 
@@ -1587,9 +1587,9 @@ class ProductRepository
         $itemNode->appendChild( $doc->createElement( 'g:description', html_entity_decode( strip_tags( $desc ) ) ) );
 
         if ( $product->language['seo_link'] ) {
-            $link = $domainPrefix . '://' . $url . '/' . \S::seo( $product->language['seo_link'] ) . '/' . str_replace( '|', '/', $combination->permutation_hash );
+            $link = $domainPrefix . '://' . $url . '/' . \Shared\Helpers\Helpers::seo( $product->language['seo_link'] ) . '/' . str_replace( '|', '/', $combination->permutation_hash );
         } else {
-            $link = $domainPrefix . '://' . $url . '/p-' . $product->id . '-' . \S::seo( $product->language['name'] ) . '/' . str_replace( '|', '/', $combination->permutation_hash );
+            $link = $domainPrefix . '://' . $url . '/p-' . $product->id . '-' . \Shared\Helpers\Helpers::seo( $product->language['name'] ) . '/' . str_replace( '|', '/', $combination->permutation_hash );
         }
         $itemNode->appendChild( $doc->createElement( 'link', $link ) );
 
@@ -1652,9 +1652,9 @@ class ProductRepository
         $itemNode->appendChild( $doc->createElement( 'g:description', html_entity_decode( strip_tags( $desc ) ) ) );
 
         if ( $product->language['seo_link'] ) {
-            $link = $domainPrefix . '://' . $url . '/' . \S::seo( $product->language['seo_link'] );
+            $link = $domainPrefix . '://' . $url . '/' . \Shared\Helpers\Helpers::seo( $product->language['seo_link'] );
         } else {
-            $link = $domainPrefix . '://' . $url . '/p-' . $product->id . '-' . \S::seo( $product->language['name'] );
+            $link = $domainPrefix . '://' . $url . '/p-' . $product->id . '-' . \Shared\Helpers\Helpers::seo( $product->language['name'] );
         }
         $itemNode->appendChild( $doc->createElement( 'link', $link ) );
 
@@ -1771,9 +1771,9 @@ class ProductRepository
                 }
             }
 
-            $combNetto = \S::normalize_decimal( $combBrutto / ( 100 + $vat ) * 100, 2 );
+            $combNetto = \Shared\Helpers\Helpers::normalize_decimal( $combBrutto / ( 100 + $vat ) * 100, 2 );
             $combNettoPromo = $combBruttoPromo !== null
-                ? \S::normalize_decimal( $combBruttoPromo / ( 100 + $vat ) * 100, 2 )
+                ? \Shared\Helpers\Helpers::normalize_decimal( $combBruttoPromo / ( 100 + $vat ) * 100, 2 )
                 : null;
 
             $this->db->update( 'pp_shop_products', [
@@ -1796,9 +1796,9 @@ class ProductRepository
      */
     private function updateCombinationPrices(int $productId, float $priceNetto, float $vat, ?float $priceNettoPromo): void
     {
-        $priceBrutto = \S::normalize_decimal( $priceNetto * ( 100 + $vat ) / 100, 2 );
+        $priceBrutto = \Shared\Helpers\Helpers::normalize_decimal( $priceNetto * ( 100 + $vat ) / 100, 2 );
         $priceBruttoPromo = $priceNettoPromo !== null
-            ? \S::normalize_decimal( $priceNettoPromo * ( 100 + $vat ) / 100, 2 )
+            ? \Shared\Helpers\Helpers::normalize_decimal( $priceNettoPromo * ( 100 + $vat ) / 100, 2 )
             : null;
 
         $combinations = $this->db->query(
@@ -1835,9 +1835,9 @@ class ProductRepository
                 }
             }
 
-            $combNetto = \S::normalize_decimal( $combBrutto / ( 100 + $vat ) * 100, 2 );
+            $combNetto = \Shared\Helpers\Helpers::normalize_decimal( $combBrutto / ( 100 + $vat ) * 100, 2 );
             $combNettoPromo = $combBruttoPromo !== null
-                ? \S::normalize_decimal( $combBruttoPromo / ( 100 + $vat ) * 100, 2 )
+                ? \Shared\Helpers\Helpers::normalize_decimal( $combBruttoPromo / ( 100 + $vat ) * 100, 2 )
                 : null;
 
             $this->db->update( 'pp_shop_products', [
diff --git a/autoload/Domain/ProductSet/ProductSetRepository.php b/autoload/Domain/ProductSet/ProductSetRepository.php
index 0290430..bfbf9d7 100644
--- a/autoload/Domain/ProductSet/ProductSetRepository.php
+++ b/autoload/Domain/ProductSet/ProductSetRepository.php
@@ -244,7 +244,7 @@ class ProductSetRepository
 
     private function clearTempAndCache(): void
     {
-        \S::delete_dir('../temp/');
-        \S::delete_dir('../thumbs/');
+        \Shared\Helpers\Helpers::delete_dir('../temp/');
+        \Shared\Helpers\Helpers::delete_dir('../thumbs/');
     }
 }
diff --git a/autoload/Domain/Promotion/PromotionRepository.php b/autoload/Domain/Promotion/PromotionRepository.php
index 7479a9c..d618cfb 100644
--- a/autoload/Domain/Promotion/PromotionRepository.php
+++ b/autoload/Domain/Promotion/PromotionRepository.php
@@ -148,13 +148,13 @@ class PromotionRepository
             }
 
             $this->invalidateActivePromotionsCache();
-            \S::delete_dir('../temp/');
+            \Shared\Helpers\Helpers::delete_dir('../temp/');
             return $id;
         }
 
         $this->db->update('pp_shop_promotion', $row, ['id' => $promotionId]);
         $this->invalidateActivePromotionsCache();
-        \S::delete_dir('../temp/');
+        \Shared\Helpers\Helpers::delete_dir('../temp/');
 
         return $promotionId;
     }
diff --git a/autoload/Domain/Scontainers/ScontainersRepository.php b/autoload/Domain/Scontainers/ScontainersRepository.php
index 843ddbd..d148c3b 100644
--- a/autoload/Domain/Scontainers/ScontainersRepository.php
+++ b/autoload/Domain/Scontainers/ScontainersRepository.php
@@ -174,7 +174,7 @@ class ScontainersRepository
             }
         }
 
-        \S::delete_dir('../temp/');
+        \Shared\Helpers\Helpers::delete_dir('../temp/');
         $this->clearFrontCache($containerId);
 
         return $containerId;
diff --git a/autoload/Domain/Settings/SettingsRepository.php b/autoload/Domain/Settings/SettingsRepository.php
index ab21ce7..883c4ec 100644
--- a/autoload/Domain/Settings/SettingsRepository.php
+++ b/autoload/Domain/Settings/SettingsRepository.php
@@ -90,9 +90,9 @@ class SettingsRepository
         // Zachowanie zgodne z dotychczasowym flow: pelna podmiana zestawu ustawien.
         $this->db->query('TRUNCATE pp_settings');
         $this->updateSettings($settingsToSave);
-        \S::delete_dir('../temp/');
+        \Shared\Helpers\Helpers::delete_dir('../temp/');
 
-        \S::set_message('Ustawienia zostaly zapisane');
+        \Shared\Helpers\Helpers::set_message('Ustawienia zostaly zapisane');
 
         return ['status' => 'ok', 'msg' => 'Ustawienia zostaly zapisane.'];
     }
diff --git a/autoload/Domain/Update/UpdateRepository.php b/autoload/Domain/Update/UpdateRepository.php
index 867d5e1..a3dc55c 100644
--- a/autoload/Domain/Update/UpdateRepository.php
+++ b/autoload/Domain/Update/UpdateRepository.php
@@ -23,9 +23,9 @@ class UpdateRepository
 
         $log = [];
         $log[] = '[START] Rozpoczęcie aktualizacji - ' . date( 'Y-m-d H:i:s' );
-        $log[] = '[INFO] Aktualna wersja: ' . \S::get_version();
+        $log[] = '[INFO] Aktualna wersja: ' . \Shared\Helpers\Helpers::get_version();
 
-        \S::delete_session( 'new-version' );
+        \Shared\Helpers\Helpers::delete_session( 'new-version' );
 
         $versionsUrl = 'https://shoppro.project-dc.pl/updates/versions.php?key=' . $settings['update_key'];
         $versions = @file_get_contents( $versionsUrl );
@@ -42,7 +42,7 @@ class UpdateRepository
 
         foreach ( $versions as $ver ) {
             $ver = trim( $ver );
-            if ( floatval( $ver ) <= (float) \S::get_version() ) {
+            if ( floatval( $ver ) <= (float) \Shared\Helpers\Helpers::get_version() ) {
                 continue;
             }
 
@@ -197,7 +197,7 @@ class UpdateRepository
             if ( strpos( $entry, 'D: ' ) !== false ) {
                 $path = substr( $entry, 3 );
                 if ( is_dir( $path ) ) {
-                    \S::delete_dir( $path );
+                    \Shared\Helpers\Helpers::delete_dir( $path );
                     $deletedDirs++;
                 }
             }
diff --git a/autoload/Domain/User/UserRepository.php b/autoload/Domain/User/UserRepository.php
index 6025886..231da5e 100644
--- a/autoload/Domain/User/UserRepository.php
+++ b/autoload/Domain/User/UserRepository.php
@@ -101,7 +101,7 @@ class UserRepository
         $subject = 'Twoj kod logowania 2FA';
         $body = 'Twoj kod logowania do panelu administratora: ' . $code . '. Kod jest wazny przez 10 minut.';
 
-        $sent = \S::send_email($to, $subject, $body);
+        $sent = \Shared\Helpers\Helpers::send_email($to, $subject, $body);
         if ($sent) {
             return true;
         }
@@ -154,7 +154,7 @@ class UserRepository
             ]);
 
             if ($inserted) {
-                \S::delete_dir('../temp/');
+                \Shared\Helpers\Helpers::delete_dir('../temp/');
                 return ['status' => 'ok', 'msg' => 'Uzytkownik zostal zapisany.'];
             }
 
@@ -187,7 +187,7 @@ class UserRepository
             'id' => $userId,
         ]);
 
-        \S::delete_dir('../temp/');
+        \Shared\Helpers\Helpers::delete_dir('../temp/');
         return ['status' => 'ok', 'msg' => 'Uzytkownik zostal zapisany.'];
     }
 
diff --git a/autoload/class.Email.php b/autoload/Shared/Email/Email.php
similarity index 98%
rename from autoload/class.Email.php
rename to autoload/Shared/Email/Email.php
index bd6fc74..2b33b33 100644
--- a/autoload/class.Email.php
+++ b/autoload/Shared/Email/Email.php
@@ -1,5 +1,7 @@
 <?php
-class Email extends DbModel
+namespace Shared\Email;
+
+class Email
 {
   public $table = 'pp_newsletter_templates';
 
@@ -76,4 +78,4 @@ class Email extends DbModel
     }
     return false;
   }
-}
\ No newline at end of file
+}
diff --git a/autoload/class.S.php b/autoload/Shared/Helpers/Helpers.php
similarity index 81%
rename from autoload/class.S.php
rename to autoload/Shared/Helpers/Helpers.php
index 5d050f9..0398e29 100644
--- a/autoload/class.S.php
+++ b/autoload/Shared/Helpers/Helpers.php
@@ -1,54 +1,7 @@
 <?php
-class S
+namespace Shared\Helpers;
+class Helpers
 {
-  public static function set_array_value(&$array, $keys, $value)
-  {
-    $key = array_shift($keys);
-    if (count($keys) == 0)
-    {
-      if ($key === '')
-      {
-        $array[] = $value;
-      }
-      else
-      {
-        // Jeśli klucz już istnieje i jest tablicą, zamieniamy go na tablicę wartości
-        if (isset($array[$key]) && !is_array($array[$key]))
-        {
-          $array[$key] = [$array[$key]];
-        }
-        if (isset($array[$key]) && is_array($array[$key]))
-        {
-          $array[$key][] = $value;
-        }
-        else
-        {
-          $array[$key] = $value;
-        }
-      }
-    }
-    else
-    {
-      if ($key === '')
-      {
-        $array[] = [];
-        $key = count($array) - 1;
-      }
-      if (!isset($array[$key]) || !is_array($array[$key]))
-      {
-        $array[$key] = [];
-      }
-      self::set_array_value($array[$key], $keys, $value);
-    }
-  }
-
-  static public function parse_name($name)
-  {
-    $name = rtrim($name, ']');
-    $parts = explode('[', $name);
-    return $parts;
-  }
-
   static function canAddRedirect( $from, $to, $lang_id = null )
   {
     global $mdb;
@@ -103,12 +56,6 @@ class S
     return true;
   }
 
-  static public function clear_redis_cache()
-  {
-    $redis = \Shared\Cache\RedisConnection::getInstance() -> getConnection();
-    $redis -> flushAll();
-  }
-
   static public function clear_product_cache( int $product_id )
   {
     if ( class_exists('Redis') )
@@ -248,40 +195,12 @@ class S
     return false;
   }
 
-  public static function get_domain( $url )
-  {
-    $parseUrl = parse_url( trim( $url ) );
-    return trim( $parseUrl['host'] ? str_replace( 'www.', '', $parseUrl['host'] ) : str_replace( 'www.', '', array_shift( explode( '/', $parseUrl['path'], 2 ) ) ) );
-  }
-
-  static public function pre_dump( $value )
-  {
-    echo '<pre>';
-      var_dump( $value );
-    echo '</pre>';
-  }
-
-  public static function escape( $value )
-  {
-    $return = '';
-    for ( $i = 0; $i < strlen( $value ); ++$i )
-    {
-      $char   = $value[$i];
-      $ord    = ord( $char );
-      if ( $char !== "'" && $char !== "\"" && $char !== '\\' && $ord >= 32 && $ord <= 126 )
-        $return .= $char;
-      else
-        $return .= '\\x' . dechex( $ord );
-    }
-    return $return;
-  }
-
   public static function delete_cache()
   {
-    \S::delete_dir( '../cache/' );
-    \S::delete_dir( '../temp/' );
-    \S::delete_dir( '../cron/temp/' );
-    \S::delete_dir( 'temp/' );
+    self::delete_dir( '../cache/' );
+    self::delete_dir( '../temp/' );
+    self::delete_dir( '../cron/temp/' );
+    self::delete_dir( 'temp/' );
   }
 
   public static function pretty_date( $format, $timestamp = null )
@@ -318,7 +237,7 @@ class S
   {
     $result = array();
 
-    foreach ($array as $key => $value)
+    foreach ($input as $key => $values)
     {
       if ( empty( $values ) )
         continue;
@@ -398,58 +317,11 @@ class S
     return number_format( $val, $precision, $dec_point, $thousands_sep );
   }
 
-  public static function chmod_r( $path, $chmod = 0755 )
-  {
-    $dir = new DirectoryIterator( $path );
-    foreach ( $dir as $item )
-    {
-      chmod( $item -> getPathname(), $chmod );
-      if ( $item -> isDir() && !$item -> isDot() )
-        self::chmod_r( $item -> getPathname() );
-    }
-  }
-
-  public static function rrmdir( $dir )
-  {
-    if ( is_dir( $dir ) )
-    {
-      $files = scandir( $dir );
-      foreach ( $files as $file )
-        if ( $file != "." && $file != ".." )
-          \S::rrmdir( "$dir/$file" );
-      rmdir( $dir );
-    }
-    else if ( file_exists( $dir ) )
-      unlink( $dir );
-  }
-
-  public static function rcopy( $src, $dst )
-  {
-    if ( is_dir( $src ) )
-    {
-      mkdir( $dst, 0755 );
-      $files = scandir( $src );
-      foreach ( $files as $file )
-        if ( $file != "." && $file != ".." )
-          \S::rcopy( "$src/$file", "$dst/$file" );
-    }
-    else if ( file_exists( $src ) )
-      copy( $src, $dst );
-
-    \S::rrmdir( $src );
-  }
-
-  public static function is_mobile()
-  {
-    $detect = new \Mobile_Detect;
-    return $detect -> isMobile();
-  }
-
   public static function get_new_version()
   {
     global $settings;
 
-    if ( $version = \S::get_session( 'new-version' ) )
+    if ( $version = self::get_session( 'new-version' ) )
       return $version;
 
     $version = 0;
@@ -462,7 +334,7 @@ class S
         $version = $version_tmp;
     }
 
-    \S::set_session( 'new-version', $version );
+    self::set_session( 'new-version', $version );
 
     return $version;
   }
@@ -472,42 +344,6 @@ class S
     return (float) @file_get_contents( '../libraries/version.ini' );
   }
 
-  public static function pre( $data, $type = '' )
-  {
-    $data = str_replace( 'Array
-      (', '', $data );
-    $data = str_replace( ')', '', $data );
-
-    echo '<pre';
-    if ( $type == 'error' )
-      echo ' style="color: #cc0000;" ';
-    else if ( $type == 'info' )
-      echo ' style="color: #2c539e;" ';
-    else
-      echo ' style="color: #8fc400;" ';
-    echo '>' . print_r( $data, true ) . '</pre>';
-  }
-
-  public static function json_to_array( $json )
-  {
-    $values_tmp = json_decode( $json, true );
-
-    if ( is_array( $values_tmp ) )
-      foreach ( $values_tmp as $val )
-      {
-        if ( isset( $values[$val['name']] ) )
-        {
-          if ( is_array( $values[$val['name']] ) )
-            $values[$val['name']][] = $val['value'];
-          else
-            $values[$val['name']]   = array( $values[$val['name']], $val['value'] );
-        }
-        else
-          $values[$val['name']] = $val['value'];
-      }
-    return $values;
-  }
-
   public static function set_session( $var, $val )
   {
     $_SESSION[$var] = $val;
@@ -612,10 +448,10 @@ class S
     $htaccess_data .= 'RewriteRule ^producenci$ index.php?module=shop_producer&action=list&layout_id=' . \front\factory\Layouts::category_default_layout() . '&%{QUERY_STRING}  [L]' . PHP_EOL;
 
     $rows = $mdb -> select( 'pp_shop_producer', '*', [ 'status' => 1 ] );
-    if ( \S::is_array_fix( $rows ) ) foreach ( $rows as $row )
+    if ( self::is_array_fix( $rows ) ) foreach ( $rows as $row )
     {
-      $htaccess_data .= 'RewriteRule ^producent/' . \S::seo( $row['name'] ) . '$ index.php?module=shop_producer&action=products&producer_id=' . $row['id'] . '&layout_id=' . \front\factory\Layouts::category_default_layout() . '&%{QUERY_STRING} [L]' . PHP_EOL;
-      $htaccess_data .= 'RewriteRule ^producent/' . \S::seo( $row['name'] ) . '/([0-9]+)$ index.php?module=shop_producer&action=products&producer_id=' . $row['id'] . '&layout_id=' . \front\factory\Layouts::category_default_layout() . '&bs=$1&%{QUERY_STRING} [L]' . PHP_EOL;
+      $htaccess_data .= 'RewriteRule ^producent/' . self::seo( $row['name'] ) . '$ index.php?module=shop_producer&action=products&producer_id=' . $row['id'] . '&layout_id=' . \front\factory\Layouts::category_default_layout() . '&%{QUERY_STRING} [L]' . PHP_EOL;
+      $htaccess_data .= 'RewriteRule ^producent/' . self::seo( $row['name'] ) . '/([0-9]+)$ index.php?module=shop_producer&action=products&producer_id=' . $row['id'] . '&layout_id=' . \front\factory\Layouts::category_default_layout() . '&bs=$1&%{QUERY_STRING} [L]' . PHP_EOL;
     }
 
     $results = $mdb -> select( 'pp_langs', [ 'id', 'start' ], [ 'status' => 1, 'ORDER' => [ 'o' => 'ASC' ] ] );
@@ -630,9 +466,9 @@ class S
         {
           $site_map .= '<url>' . PHP_EOL;
           if ( $row2['seo_link'] )
-            $site_map .= '<loc>https://' . $url . '/' . $language_link . \S::seo( $row2['seo_link'] ) . '</loc>' . PHP_EOL;
+            $site_map .= '<loc>https://' . $url . '/' . $language_link . self::seo( $row2['seo_link'] ) . '</loc>' . PHP_EOL;
           else
-            $site_map .= '<loc>https://' . $url . '/' . $language_link . 'k-' . $row2['category_id'] . '-' . \S::seo( $row2['title'] ) . '</loc>' . PHP_EOL;
+            $site_map .= '<loc>https://' . $url . '/' . $language_link . 'k-' . $row2['category_id'] . '-' . self::seo( $row2['title'] ) . '</loc>' . PHP_EOL;
           $site_map .= '<lastmod>' . date( 'Y-m-d' ) . '</lastmod>' . PHP_EOL;
           $site_map .= '<changefreq>daily</changefreq>' . PHP_EOL;
           $site_map .= '<priority>1</priority>' . PHP_EOL;
@@ -640,15 +476,15 @@ class S
 
           if ( $row2['seo_link'] )
           {
-            $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . \S::seo( $row2['seo_link'] ) . '$ index.php?category=' . $row2['category_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
-            $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . \S::seo( $row2['seo_link'] ) . '/([0-9]+)$ index.php?category=' . $row2['category_id'] . '&lang=' . $row['id'] . '&bs=$1&%{QUERY_STRING} [L]';
-            $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . \S::seo( $row2['seo_link'] ) . '/1$ ' . $language_link . \S::seo( $row2['seo_link'] ) . ' [R=301,L]';
+            $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . self::seo( $row2['seo_link'] ) . '$ index.php?category=' . $row2['category_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
+            $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . self::seo( $row2['seo_link'] ) . '/([0-9]+)$ index.php?category=' . $row2['category_id'] . '&lang=' . $row['id'] . '&bs=$1&%{QUERY_STRING} [L]';
+            $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . self::seo( $row2['seo_link'] ) . '/1$ ' . $language_link . self::seo( $row2['seo_link'] ) . ' [R=301,L]';
           }
           else
           {
-            $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 'k-' . $row2['category_id'] . '-' . \S::seo( $row2['title'] ) . '$ index.php?category=' . $row2['category_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
-            $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 'k-' . $row2['category_id'] . '-' . \S::seo( $row2['title'] ) . '/([0-9]+)$ index.php?category=' . $row2['category_id'] . '&lang=' . $row['id'] . '&bs=$1&%{QUERY_STRING} [L]';
-            $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 'k-' . $row2['category_id'] . '-' . \S::seo( $row2['title'] ) . '/1$ ' . $language_link . 'k-' . $row2['category_id'] . '-' . \S::seo( $row2['title'] ) . ' [R=301,L]';
+            $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 'k-' . $row2['category_id'] . '-' . self::seo( $row2['title'] ) . '$ index.php?category=' . $row2['category_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
+            $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 'k-' . $row2['category_id'] . '-' . self::seo( $row2['title'] ) . '/([0-9]+)$ index.php?category=' . $row2['category_id'] . '&lang=' . $row['id'] . '&bs=$1&%{QUERY_STRING} [L]';
+            $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 'k-' . $row2['category_id'] . '-' . self::seo( $row2['title'] ) . '/1$ ' . $language_link . 'k-' . $row2['category_id'] . '-' . self::seo( $row2['title'] ) . ' [R=301,L]';
           }
         }
       }
@@ -672,9 +508,9 @@ class S
             {
               $site_map .= '<url>' . PHP_EOL;
               if ( $row2['seo_link'] )
-                $site_map .= '<loc>https://' . $url . '/' . $language_link . \S::seo( $row2['seo_link'] ) . '</loc>' . PHP_EOL;
+                $site_map .= '<loc>https://' . $url . '/' . $language_link . self::seo( $row2['seo_link'] ) . '</loc>' . PHP_EOL;
               else
-                $site_map .= '<loc>https://' . $url . '/' . $language_link . 'p-' . $row2['product_id'] . '-' . \S::seo( $row2['name'] ) . '</loc>' . PHP_EOL;
+                $site_map .= '<loc>https://' . $url . '/' . $language_link . 'p-' . $row2['product_id'] . '-' . self::seo( $row2['name'] ) . '</loc>' . PHP_EOL;
               $site_map .= '<lastmod>' . date( 'Y-m-d' ) . '</lastmod>' . PHP_EOL;
               $site_map .= '<changefreq>daily</changefreq>' . PHP_EOL;
               $site_map .= '<priority>1</priority>' . PHP_EOL;
@@ -682,24 +518,24 @@ class S
 
               if ( $row2['seo_link'] )
               {
-                $pattern = '^' . $language_link . \S::seo( $row2['seo_link'] ) . '$';
+                $pattern = '^' . $language_link . self::seo( $row2['seo_link'] ) . '$';
                 $destination = 'index.php?product=' . $row2['product_id'];
 
                 $mdb -> insert( 'pp_routes', [ 'product_id' => $row2['product_id'], 'lang_id' => $row['id'], 'pattern' => $pattern, 'destination' => $destination ] );
 
-                $pattern = '^' . $language_link . \S::seo( $row2['seo_link'] ) . '/([0-9-]+)$';
+                $pattern = '^' . $language_link . self::seo( $row2['seo_link'] ) . '/([0-9-]+)$';
                 $destination = 'index.php?product=' . $row2['product_id'] . '&permutation_hash=$1';
 
                 $mdb -> insert( 'pp_routes', [ 'product_id' => $row2['product_id'], 'lang_id' => $row['id'], 'pattern' => $pattern, 'destination' => $destination ] );
               }
               else
               {
-                $pattern = '^' . $language_link . 'p-' . $row2['product_id'] . '-' . \S::seo( $row2['name'] ) . '$';
+                $pattern = '^' . $language_link . 'p-' . $row2['product_id'] . '-' . self::seo( $row2['name'] ) . '$';
                 $destination = 'index.php?product=' . $row2['product_id'];
 
                 $mdb -> insert( 'pp_routes', [ 'product_id' => $row2['product_id'], 'lang_id' => $row['id'], 'pattern' => $pattern, 'destination' => $destination ] );
 
-                $pattern = '^' . $language_link . 'p-' . $row2['product_id'] . '-' . \S::seo( $row2['name'] ) . '/([0-9-]+)$';
+                $pattern = '^' . $language_link . 'p-' . $row2['product_id'] . '-' . self::seo( $row2['name'] ) . '/([0-9-]+)$';
                 $destination = 'index.php?product=' . $row2['product_id'] . '&permutation_hash=$1';
 
                 $mdb -> insert( 'pp_routes', [ 'product_id' => $row2['product_id'], 'lang_id' => $row['id'], 'pattern' => $pattern, 'destination' => $destination ] );
@@ -726,7 +562,7 @@ class S
               {
                 $site_map .= '<url>' . PHP_EOL;
                 if ( $row2['seo_link'] )
-                  $site_map .= '<loc>https://' . $url . '/' . \S::seo( $row2['seo_link'] ) . '</loc>' . PHP_EOL;
+                  $site_map .= '<loc>https://' . $url . '/' . self::seo( $row2['seo_link'] ) . '</loc>' . PHP_EOL;
                 else
                   $site_map .= '<loc>https://' . $url . '/s-' . $row2['page_id'] . '-' . self::seo( $row2['title'] ) . '</loc>' . PHP_EOL;
                 $site_map .= '<lastmod>' . date( 'Y-m-d' ) . '</lastmod>' . PHP_EOL;
@@ -744,17 +580,17 @@ class S
               {
                 if ( $row2['seo_link'] )
                 {
-                  $htaccess_data .= PHP_EOL . 'RewriteCond %{REQUEST_URI} ^/' . \S::seo( $row2['seo_link'] ) . '$';
+                  $htaccess_data .= PHP_EOL . 'RewriteCond %{REQUEST_URI} ^/' . self::seo( $row2['seo_link'] ) . '$';
                   $htaccess_data .= PHP_EOL . 'RewriteRule ^(.*)$ http://www.' . $url . '/' . $language_link . ' [R=permanent,L]';
-                  $htaccess_data .= PHP_EOL . 'RewriteCond %{REQUEST_URI} ^/' . \S::seo( $row2['seo_link'] ) . '-1$';
+                  $htaccess_data .= PHP_EOL . 'RewriteCond %{REQUEST_URI} ^/' . self::seo( $row2['seo_link'] ) . '-1$';
                   $htaccess_data .= PHP_EOL . 'RewriteRule ^(.*)$ http://www.' . $url . '/' . $language_link . ' [R=permanent,L]';
                 }
                 else
                 {
-                  $htaccess_data .= PHP_EOL . 'RewriteCond %{REQUEST_URI} ^/s-' . $row2['page_id'] . '-' . \S::seo( $row2['title'] ) . '$';
+                  $htaccess_data .= PHP_EOL . 'RewriteCond %{REQUEST_URI} ^/s-' . $row2['page_id'] . '-' . self::seo( $row2['title'] ) . '$';
                   $htaccess_data .= PHP_EOL . 'RewriteRule ^(.*)$ http://www.' . $url . '/' . $language_link . ' [R=permanent,L]';
 
-                  $htaccess_data .= PHP_EOL . 'RewriteCond %{REQUEST_URI} ^/s-' . $row2['page_id'] . '-' . \S::seo( $row2['title'] ) . '-1$';
+                  $htaccess_data .= PHP_EOL . 'RewriteCond %{REQUEST_URI} ^/s-' . $row2['page_id'] . '-' . self::seo( $row2['title'] ) . '-1$';
                   $htaccess_data .= PHP_EOL . 'RewriteRule ^(.*)$ http://www.' . $url . '/' . $language_link . ' [R=permanent,L]';
                 }
 
@@ -763,15 +599,15 @@ class S
 
               if ( $row2['seo_link'] )
               {
-                $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . \S::seo( $row2['seo_link'] ) . '$ index.php?a=page&id=' . $row2['page_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
-                $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . \S::seo( $row2['seo_link'] ) . '/([0-9]+)$ index.php?a=page&id=' . $row2['page_id'] . '&lang=' . $row['id'] . '&bs=$1&%{QUERY_STRING} [L]';
-                $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . \S::seo( $row2['seo_link'] ) . '/1$ ' . $language_link . \S::seo( $row2['seo_link'] ) . ' [R=301,L]';
+                $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . self::seo( $row2['seo_link'] ) . '$ index.php?a=page&id=' . $row2['page_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
+                $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . self::seo( $row2['seo_link'] ) . '/([0-9]+)$ index.php?a=page&id=' . $row2['page_id'] . '&lang=' . $row['id'] . '&bs=$1&%{QUERY_STRING} [L]';
+                $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . self::seo( $row2['seo_link'] ) . '/1$ ' . $language_link . self::seo( $row2['seo_link'] ) . ' [R=301,L]';
               }
               else
               {
-                $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 's-' . $row2['page_id'] . '-' . \S::seo( $row2['title'] ) . '$ index.php?a=page&id=' . $row2['page_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
-                $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 's-' . $row2['page_id'] . '-' . \S::seo( $row2['title'] ) . '/([0-9]+)$ index.php?a=page&id=' . $row2['page_id'] . '&lang=' . $row['id'] . '&bs=$1&%{QUERY_STRING} [L]';
-                $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 's-' . $row2['page_id'] . '-' . \S::seo( $row2['title'] ) . '/1$ ' . $language_link . 's-' . $row2['page_id'] . '-' . \S::seo( $row2['title'] ) . ' [R=301,L]';
+                $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 's-' . $row2['page_id'] . '-' . self::seo( $row2['title'] ) . '$ index.php?a=page&id=' . $row2['page_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
+                $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 's-' . $row2['page_id'] . '-' . self::seo( $row2['title'] ) . '/([0-9]+)$ index.php?a=page&id=' . $row2['page_id'] . '&lang=' . $row['id'] . '&bs=$1&%{QUERY_STRING} [L]';
+                $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 's-' . $row2['page_id'] . '-' . self::seo( $row2['title'] ) . '/1$ ' . $language_link . 's-' . $row2['page_id'] . '-' . self::seo( $row2['title'] ) . ' [R=301,L]';
               }
             }
           }
@@ -799,7 +635,7 @@ class S
             {
               $site_map .= '<url>' . PHP_EOL;
               if ( $row2['seo_link'] )
-                $site_map .= '<loc>https://' . $url . '/' . \S::seo( $row2['seo_link'] ) . '</loc>' . PHP_EOL;
+                $site_map .= '<loc>https://' . $url . '/' . self::seo( $row2['seo_link'] ) . '</loc>' . PHP_EOL;
               else
                 $site_map .= '<loc>https://' . $url . '/a-' . $row2['article_id'] . '-' . self::seo( $row2['title'] ) . '</loc>' . PHP_EOL;
               $site_map .= '<lastmod>' . date( 'Y-m-d' ) . '</lastmod>' . PHP_EOL;
@@ -814,9 +650,9 @@ class S
             }
 
             if ( $row2['seo_link'] )
-              $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . \S::seo( $row2['seo_link'] ) . '$ index.php?article=' . $row2['article_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
+              $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . self::seo( $row2['seo_link'] ) . '$ index.php?article=' . $row2['article_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
             else if ( $row2['title'] != null )
-              $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 'a-' . $row2['article_id'] . '-' . \S::seo( $row2['title'] ) . '$ index.php?article=' . $row2['article_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
+              $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 'a-' . $row2['article_id'] . '-' . self::seo( $row2['title'] ) . '$ index.php?article=' . $row2['article_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
           }
       }
 
@@ -1056,16 +892,11 @@ class S
         foreach ( $scan as $index => $path )
           self::delete_dir( $path );
 
-      if ( is_dir( $dir ) && self::is_empty_dir( $dir ) )
+      if ( is_dir( $dir ) && ( ( $files = @scandir( $dir ) ) && count( $files ) <= 2 ) )
         return @rmdir( $dir );
     }
   }
 
-  public static function is_empty_dir( $dir )
-  {
-    return ( ( $files = @scandir( $dir ) ) && count( $files ) <= 2 );
-  }
-
   public static function email_check( $email )
   {
     return filter_var( $email, FILTER_VALIDATE_EMAIL );
@@ -1077,7 +908,7 @@ class S
 
     if ( self::email_check( $email ) and $subject )
     {
-      $mail              = new PHPMailer();
+      $mail              = new \PHPMailer();
       $mail -> IsSMTP();
       $mail -> SMTPAuth    = true;
       $mail -> Host        = $settings['email_host'];
diff --git a/autoload/class.Html.php b/autoload/Shared/Html/Html.php
similarity index 96%
rename from autoload/class.Html.php
rename to autoload/Shared/Html/Html.php
index d2500c9..2bec458 100644
--- a/autoload/class.Html.php
+++ b/autoload/Shared/Html/Html.php
@@ -1,4 +1,6 @@
 <?php
+namespace Shared\Html;
+
 class Html
 {
   public static function form_text( array $params = array() )
@@ -7,60 +9,60 @@ class Html
     $tpl -> params = $params;
     return $tpl -> render( 'html/form-text' );
   }
-  
+
   public static function input_switch( array $params = array() )
   {
     $tpl = new \Tpl;
     $tpl -> params = $params;
     return $tpl -> render( 'html/input-switch' );
   }
-  
+
   public static function select( array $params = array() )
   {
     $tpl = new \Tpl;
     $tpl -> params = $params;
     return $tpl -> render( 'html/select' );
   }
-  
+
   public static function textarea( array $params = array() )
   {
     $defaults = array(
       'rows'  => 4,
     );
-    
+
     $params = array_merge( $defaults, $params );
-    
+
     $tpl = new \Tpl;
     $tpl -> params = $params;
     return $tpl -> render( 'html/textarea' );
   }
-  
+
   public static function input_icon( array $params = array() )
   {
     $defaults = array(
       'type'  => 'text',
     );
-    
+
     $params = array_merge( $defaults, $params );
-    
+
     $tpl = new \Tpl;
     $tpl -> params = $params;
     return $tpl -> render( 'html/input-icon' );
   }
-  
+
   public static function input( array $params = array() )
   {
     $defaults = array(
       'type'  => 'text',
     );
-    
+
     $params = array_merge( $defaults, $params );
-    
+
     $tpl = new \Tpl;
     $tpl -> params = $params;
     return $tpl -> render( 'html/input' );
   }
-  
+
   public static function button( array $params = array() )
   {
     $defaults = array(
@@ -68,12 +70,12 @@ class Html
     );
 
     $params = array_merge( $defaults, $params );
-    
+
     $tpl = new \Tpl;
     $tpl -> params = $params;
     return $tpl -> render( 'html/button' );
   }
-  
+
   public static function panel( array $params = array() )
   {
     $defaults = array(
@@ -83,7 +85,7 @@ class Html
     );
 
     $params = array_merge( $defaults, $params );
-    
+
     $tpl = new \Tpl;
     $tpl -> params = $params;
     return $tpl -> render( 'html/panel' );
diff --git a/autoload/class.Image.php b/autoload/Shared/Image/ImageManipulator.php
similarity index 82%
rename from autoload/class.Image.php
rename to autoload/Shared/Image/ImageManipulator.php
index bd509ee..c416306 100644
--- a/autoload/class.Image.php
+++ b/autoload/Shared/Image/ImageManipulator.php
@@ -1,4 +1,6 @@
 <?php
+namespace Shared\Image;
+
 class ImageManipulator
 {
     protected int $width;
@@ -30,12 +32,12 @@ class ImageManipulator
      *
      * @param string $file Path to image file
      * @return self
-     * @throws InvalidArgumentException
+     * @throws \InvalidArgumentException
      */
     public function setImageFile(string $file): self
     {
         if (!(is_readable($file) && is_file($file))) {
-            throw new InvalidArgumentException("Image file $file is not readable");
+            throw new \InvalidArgumentException("Image file $file is not readable");
         }
 
         if (isset($this->image) && $this->isValidImageResource($this->image)) {
@@ -45,7 +47,7 @@ class ImageManipulator
         [$width, $height, $type] = getimagesize($file);
 
         if ($width === false || $height === false) {
-            throw new InvalidArgumentException("Unable to get image size for $file");
+            throw new \InvalidArgumentException("Unable to get image size for $file");
         }
 
         error_log("Loaded image size from file: width: $width, height: $height, type: $type");
@@ -64,11 +66,11 @@ class ImageManipulator
                 $this->image = imagecreatefromwebp($file);
                 break;
             default:
-                throw new InvalidArgumentException("Image type $type not supported");
+                throw new \InvalidArgumentException("Image type $type not supported");
         }
 
         if (!$this->isValidImageResource($this->image)) {
-            throw new InvalidArgumentException("Failed to create image from $file");
+            throw new \InvalidArgumentException("Failed to create image from $file");
         }
 
         $this->width = imagesx($this->image);
@@ -77,7 +79,7 @@ class ImageManipulator
         error_log("Set image dimensions: width: {$this->width}, height: {$this->height}");
 
         if ($this->width === 0 || $this->height === 0) {
-            throw new InvalidArgumentException("Image dimensions are invalid (width: $this->width, height: $this->height)");
+            throw new \InvalidArgumentException("Image dimensions are invalid (width: $this->width, height: $this->height)");
         }
 
         return $this;
@@ -88,7 +90,7 @@ class ImageManipulator
      *
      * @param string $data Image data as string
      * @return self
-     * @throws RuntimeException
+     * @throws \RuntimeException
      */
     public function setImageString(string $data): self
     {
@@ -98,7 +100,7 @@ class ImageManipulator
 
         $image = imagecreatefromstring($data);
         if (!$this->isValidImageResource($image)) {
-            throw new RuntimeException('Cannot create image from data string');
+            throw new \RuntimeException('Cannot create image from data string');
         }
 
         $this->image = $image;
@@ -108,7 +110,7 @@ class ImageManipulator
         error_log("Set image dimensions from string: width: {$this->width}, height: {$this->height}");
 
         if ($this->width === 0 || $this->height === 0) {
-            throw new RuntimeException("Image dimensions are invalid (width: $this->width, height: $this->height)");
+            throw new \RuntimeException("Image dimensions are invalid (width: $this->width, height: $this->height)");
         }
 
         return $this;
@@ -121,17 +123,17 @@ class ImageManipulator
      * @param int  $height               New height
      * @param bool $constrainProportions Constrain current image proportions when resizing
      * @return self
-     * @throws RuntimeException
+     * @throws \RuntimeException
      */
     public function resample(int $width, int $height, bool $constrainProportions = true): self
     {
         if (!isset($this->image) || !$this->isValidImageResource($this->image)) {
-            throw new RuntimeException('No image set');
+            throw new \RuntimeException('No image set');
         }
 
         if ($constrainProportions) {
             if ($this->height === 0) {
-                throw new RuntimeException('Image height is zero, cannot calculate aspect ratio');
+                throw new \RuntimeException('Image height is zero, cannot calculate aspect ratio');
             }
 
             $aspectRatio = $this->width / $this->height;
@@ -148,7 +150,7 @@ class ImageManipulator
             }
 
             if ($width <= 0 || $height <= 0) {
-                throw new RuntimeException('Calculated dimensions are invalid (width: ' . $width . ', height: ' . $height . ')');
+                throw new \RuntimeException('Calculated dimensions are invalid (width: ' . $width . ', height: ' . $height . ')');
             }
         }
 
@@ -166,12 +168,12 @@ class ImageManipulator
      * @param int|null   $xpos   X-Position of image in new canvas, null for centre
      * @param int|null   $ypos   Y-Position of image in new canvas, null for centre
      * @return self
-     * @throws RuntimeException
+     * @throws \RuntimeException
      */
     public function enlargeCanvas(int $width, int $height, array $rgb = [], ?int $xpos = null, ?int $ypos = null): self
     {
         if (!isset($this->image) || !$this->isValidImageResource($this->image)) {
-            throw new RuntimeException('No image set');
+            throw new \RuntimeException('No image set');
         }
 
         $width = max($width, $this->width);
@@ -179,7 +181,7 @@ class ImageManipulator
 
         $temp = imagecreatetruecolor($width, $height);
         if (!$this->isValidImageResource($temp)) {
-            throw new RuntimeException('Failed to create a new image for enlarging canvas');
+            throw new \RuntimeException('Failed to create a new image for enlarging canvas');
         }
 
         // Fill background if RGB provided
@@ -216,7 +218,7 @@ class ImageManipulator
             $this->width,
             $this->height
         )) {
-            throw new RuntimeException('Failed to copy image onto enlarged canvas');
+            throw new \RuntimeException('Failed to copy image onto enlarged canvas');
         }
 
         return $this->_replace($temp);
@@ -230,12 +232,12 @@ class ImageManipulator
      * @param int       $x2 Bottom right x-coordinate of crop box
      * @param int       $y2 Bottom right y-coordinate of crop box
      * @return self
-     * @throws RuntimeException
+     * @throws \RuntimeException
      */
     public function crop($x1, int $y1 = 0, int $x2 = 0, int $y2 = 0): self
     {
         if (!isset($this->image) || !$this->isValidImageResource($this->image)) {
-            throw new RuntimeException('No image set');
+            throw new \RuntimeException('No image set');
         }
 
         if (is_array($x1) && count($x1) === 4) {
@@ -254,12 +256,12 @@ class ImageManipulator
         error_log("Cropping image: x1: $x1, y1: $y1, x2: $x2, y2: $y2, cropWidth: $cropWidth, cropHeight: $cropHeight");
 
         if ($cropWidth <= 0 || $cropHeight <= 0) {
-            throw new RuntimeException('Invalid crop dimensions');
+            throw new \RuntimeException('Invalid crop dimensions');
         }
 
         $temp = imagecreatetruecolor($cropWidth, $cropHeight);
         if (!$this->isValidImageResource($temp)) {
-            throw new RuntimeException('Failed to create a new image for cropping');
+            throw new \RuntimeException('Failed to create a new image for cropping');
         }
 
         // Preserve transparency
@@ -278,7 +280,7 @@ class ImageManipulator
             $cropWidth,
             $cropHeight
         )) {
-            throw new RuntimeException('Failed to crop image');
+            throw new \RuntimeException('Failed to crop image');
         }
 
         return $this->_replace($temp);
@@ -289,12 +291,12 @@ class ImageManipulator
      *
      * @param resource|\GdImage $res New image resource
      * @return self
-     * @throws UnexpectedValueException
+     * @throws \UnexpectedValueException
      */
     protected function _replace($res): self
     {
         if (!$this->isValidImageResource($res)) {
-            throw new UnexpectedValueException('Invalid image resource');
+            throw new \UnexpectedValueException('Invalid image resource');
         }
 
         if (isset($this->image) && $this->isValidImageResource($this->image)) {
@@ -308,7 +310,7 @@ class ImageManipulator
         error_log("Replaced image dimensions: width: {$this->width}, height: {$this->height}");
 
         if ($this->width === 0 || $this->height === 0) {
-            throw new UnexpectedValueException("Replaced image has invalid dimensions (width: $this->width, height: $this->height)");
+            throw new \UnexpectedValueException("Replaced image has invalid dimensions (width: $this->width, height: $this->height)");
         }
 
         return $this;
@@ -320,14 +322,14 @@ class ImageManipulator
      * @param string   $fileName Path to save the image
      * @param int|null $type     Image type (IMAGETYPE_*) or null to auto-detect from file extension
      * @return void
-     * @throws RuntimeException
+     * @throws \RuntimeException
      */
     public function save(string $fileName, ?int $type = null): void
     {
         $dir = dirname($fileName);
         if (!is_dir($dir)) {
             if (!mkdir($dir, 0755, true) && !is_dir($dir)) {
-                throw new RuntimeException('Error creating directory ' . $dir);
+                throw new \RuntimeException('Error creating directory ' . $dir);
             }
         }
 
@@ -359,28 +361,28 @@ class ImageManipulator
             switch ($type) {
                 case IMAGETYPE_WEBP:
                     if (!imagewebp($this->image, $fileName)) {
-                        throw new RuntimeException('Failed to save image as WEBP');
+                        throw new \RuntimeException('Failed to save image as WEBP');
                     }
                     break;
                 case IMAGETYPE_GIF:
                     if (!imagegif($this->image, $fileName)) {
-                        throw new RuntimeException('Failed to save image as GIF');
+                        throw new \RuntimeException('Failed to save image as GIF');
                     }
                     break;
                 case IMAGETYPE_PNG:
                     if (!imagepng($this->image, $fileName)) {
-                        throw new RuntimeException('Failed to save image as PNG');
+                        throw new \RuntimeException('Failed to save image as PNG');
                     }
                     break;
                 case IMAGETYPE_JPEG:
                 default:
                     if (!imagejpeg($this->image, $fileName, 95)) {
-                        throw new RuntimeException('Failed to save image as JPEG');
+                        throw new \RuntimeException('Failed to save image as JPEG');
                     }
             }
             error_log("Image saved successfully to $fileName");
         } catch (\Exception $ex) {
-            throw new RuntimeException('Error saving image file to ' . $fileName . ': ' . $ex->getMessage());
+            throw new \RuntimeException('Error saving image file to ' . $fileName . ': ' . $ex->getMessage());
         }
     }
 
diff --git a/autoload/admin/App.php b/autoload/admin/App.php
index ba2b930..e5a4dad 100644
--- a/autoload/admin/App.php
+++ b/autoload/admin/App.php
@@ -12,8 +12,8 @@ class App
 
   public static function finalize_admin_login( array $user, string $domain, string $cookie_name, bool $remember = false )
   {
-    \S::set_session( 'user', $user );
-    \S::delete_session( 'twofa_pending' );
+    \Shared\Helpers\Helpers::set_session( 'user', $user );
+    \Shared\Helpers\Helpers::delete_session( 'twofa_pending' );
 
     if ( $remember ) {
       $payloadArr = [
@@ -40,7 +40,7 @@ class App
   {
     global $mdb;
 
-    $sa = \S::get( 's-action' );
+    $sa = \Shared\Helpers\Helpers::get( 's-action' );
     if ( !$sa ) return;
 
     $domain      = preg_replace( '/^www\./', '', $_SERVER['SERVER_NAME'] );
@@ -50,8 +50,8 @@ class App
     switch ( $sa )
     {
       case 'user-logon':
-        $login = \S::get( 'login' );
-        $pass  = \S::get( 'password' );
+        $login = \Shared\Helpers\Helpers::get( 'login' );
+        $pass  = \Shared\Helpers\Helpers::get( 'password' );
         $result = $users->logon( $login, $pass );
 
         if ( $result == 1 )
@@ -60,17 +60,17 @@ class App
 
           if ( $user['twofa_enabled'] == 1 )
           {
-            \S::set_session( 'twofa_pending', [
+            \Shared\Helpers\Helpers::set_session( 'twofa_pending', [
               'uid'      => (int) $user['id'],
               'login'    => $login,
-              'remember' => (bool) \S::get( 'remember' ),
+              'remember' => (bool) \Shared\Helpers\Helpers::get( 'remember' ),
               'started'  => time(),
             ] );
 
             if ( !$users->sendTwofaCode( (int) $user['id'] ) )
             {
-              \S::alert( 'Nie udało się wysłać kodu 2FA. Spróbuj ponownie.' );
-              \S::delete_session( 'twofa_pending' );
+              \Shared\Helpers\Helpers::alert( 'Nie udało się wysłać kodu 2FA. Spróbuj ponownie.' );
+              \Shared\Helpers\Helpers::delete_session( 'twofa_pending' );
               header( 'Location: /admin/' );
               exit;
             }
@@ -79,38 +79,38 @@ class App
             exit;
           }
 
-          self::finalize_admin_login( $user, $domain, $cookie_name, (bool) \S::get( 'remember' ) );
+          self::finalize_admin_login( $user, $domain, $cookie_name, (bool) \Shared\Helpers\Helpers::get( 'remember' ) );
           header( 'Location: /admin/articles/list/' );
           exit;
         }
 
         if ( $result == -1 )
-          \S::alert( 'Z powodu 5 nieudanych prób Twoje konto zostało zablokowane.' );
+          \Shared\Helpers\Helpers::alert( 'Z powodu 5 nieudanych prób Twoje konto zostało zablokowane.' );
         else
-          \S::alert( 'Podane hasło jest nieprawidłowe lub użytkownik nie istnieje.' );
+          \Shared\Helpers\Helpers::alert( 'Podane hasło jest nieprawidłowe lub użytkownik nie istnieje.' );
 
         header( 'Location: /admin/' );
         exit;
 
       case 'user-2fa-verify':
-        $pending = \S::get_session( 'twofa_pending' );
+        $pending = \Shared\Helpers\Helpers::get_session( 'twofa_pending' );
         if ( !$pending || empty( $pending['uid'] ) ) {
-          \S::alert( 'Sesja 2FA wygasła. Zaloguj się ponownie.' );
+          \Shared\Helpers\Helpers::alert( 'Sesja 2FA wygasła. Zaloguj się ponownie.' );
           header( 'Location: /admin/' );
           exit;
         }
 
-        $code = trim( (string) \S::get( 'twofa' ) );
+        $code = trim( (string) \Shared\Helpers\Helpers::get( 'twofa' ) );
         if ( !preg_match( '/^\d{6}$/', $code ) )
         {
-          \S::alert( 'Nieprawidłowy format kodu.' );
+          \Shared\Helpers\Helpers::alert( 'Nieprawidłowy format kodu.' );
           header( 'Location: /admin/user/twofa/' );
           exit;
         }
 
         if ( !$users->verifyTwofaCode( (int) $pending['uid'], $code ) )
         {
-          \S::alert( 'Błędny lub wygasły kod.' );
+          \Shared\Helpers\Helpers::alert( 'Błędny lub wygasły kod.' );
           header( 'Location: /admin/user/twofa/' );
           exit;
         }
@@ -121,18 +121,18 @@ class App
         exit;
 
       case 'user-2fa-resend':
-        $pending = \S::get_session( 'twofa_pending' );
+        $pending = \Shared\Helpers\Helpers::get_session( 'twofa_pending' );
         if ( !$pending || empty( $pending['uid'] ) )
         {
-          \S::alert( 'Sesja 2FA wygasła. Zaloguj się ponownie.' );
+          \Shared\Helpers\Helpers::alert( 'Sesja 2FA wygasła. Zaloguj się ponownie.' );
           header( 'Location: /admin/' );
           exit;
         }
 
         if ( !$users->sendTwofaCode( (int) $pending['uid'], true ) )
-          \S::alert( 'Kod można wysłać ponownie po krótkiej przerwie.' );
+          \Shared\Helpers\Helpers::alert( 'Kod można wysłać ponownie po krótkiej przerwie.' );
         else
-          \S::alert( 'Nowy kod został wysłany.' );
+          \Shared\Helpers\Helpers::alert( 'Nowy kod został wysłany.' );
 
         header( 'Location: /admin/user/twofa/' );
         exit;
@@ -146,7 +146,7 @@ class App
           'httponly' => true,
           'samesite' => 'Lax',
         ] );
-        \S::delete_session( 'twofa_pending' );
+        \Shared\Helpers\Helpers::delete_session( 'twofa_pending' );
         session_destroy();
         header( 'Location: /admin/' );
         exit;
@@ -160,7 +160,7 @@ class App
   {
     global $user;
 
-    if ( \S::get( 'module' ) === 'user' && \S::get( 'action' ) === 'twofa' ) {
+    if ( \Shared\Helpers\Helpers::get( 'module' ) === 'user' && \Shared\Helpers\Helpers::get( 'action' ) === 'twofa' ) {
       $controller = self::createController( 'Users' );
       return $controller->twofa();
     }
@@ -183,22 +183,22 @@ class App
   {
     $_SESSION['admin'] = true;
 
-    if ( \S::get( 'p' ) )
-      \S::set_session( 'p', \S::get( 'p' ) );
+    if ( \Shared\Helpers\Helpers::get( 'p' ) )
+      \Shared\Helpers\Helpers::set_session( 'p', \Shared\Helpers\Helpers::get( 'p' ) );
 
     // Budowanie nazwy modułu: shop_product → ShopProduct
     $moduleName = '';
-    $parts = explode( '_', (string) \S::get( 'module' ) );
+    $parts = explode( '_', (string) \Shared\Helpers\Helpers::get( 'module' ) );
     foreach ( $parts as $part )
       $moduleName .= ucfirst( $part );
 
-    $action = \S::get( 'action' );
+    $action = \Shared\Helpers\Helpers::get( 'action' );
 
     $controller = self::createController( $moduleName );
     if ( $controller && method_exists( $controller, $action ) )
       return $controller->$action();
 
-    \S::alert( 'Nieprawidłowy adres url.' );
+    \Shared\Helpers\Helpers::alert( 'Nieprawidłowy adres url.' );
     return false;
   }
 
diff --git a/autoload/admin/Controllers/ArticlesArchiveController.php b/autoload/admin/Controllers/ArticlesArchiveController.php
index 9205d00..8af8513 100644
--- a/autoload/admin/Controllers/ArticlesArchiveController.php
+++ b/autoload/admin/Controllers/ArticlesArchiveController.php
@@ -117,8 +117,8 @@ class ArticlesArchiveController
 
     public function restore(): void
     {
-        if ($this->repository->restore((int)\S::get('id'))) {
-            \S::alert('Artykul zostal przywrocony.');
+        if ($this->repository->restore((int)\Shared\Helpers\Helpers::get('id'))) {
+            \Shared\Helpers\Helpers::alert('Artykul zostal przywrocony.');
         }
 
         header('Location: /admin/articles_archive/list/');
@@ -132,8 +132,8 @@ class ArticlesArchiveController
 
     public function delete(): void
     {
-        if ($this->repository->deletePermanently((int)\S::get('id'))) {
-            \S::alert('Artykul zostal trwale usuniety.');
+        if ($this->repository->deletePermanently((int)\Shared\Helpers\Helpers::get('id'))) {
+            \Shared\Helpers\Helpers::alert('Artykul zostal trwale usuniety.');
         }
 
         header('Location: /admin/articles_archive/list/');
diff --git a/autoload/admin/Controllers/ArticlesController.php b/autoload/admin/Controllers/ArticlesController.php
index 7606ddd..9ba19ff 100644
--- a/autoload/admin/Controllers/ArticlesController.php
+++ b/autoload/admin/Controllers/ArticlesController.php
@@ -156,7 +156,7 @@ class ArticlesController
      */
     public function galleryOrderSave(): void
     {
-        if ($this->repository->saveGalleryOrder((int)\S::get('article_id'), (string)\S::get('order'))) {
+        if ($this->repository->saveGalleryOrder((int)\Shared\Helpers\Helpers::get('article_id'), (string)\Shared\Helpers\Helpers::get('order'))) {
             echo json_encode(['status' => 'ok', 'msg' => 'Artykul zostal zapisany.']);
         }
 
@@ -168,7 +168,7 @@ class ArticlesController
      */
     public function filesOrderSave(): void
     {
-        if ($this->repository->saveFilesOrder((int)\S::get('article_id'), (string)\S::get('order'))) {
+        if ($this->repository->saveFilesOrder((int)\Shared\Helpers\Helpers::get('article_id'), (string)\Shared\Helpers\Helpers::get('order'))) {
             echo json_encode(['status' => 'ok', 'msg' => 'Artykul zostal zapisany.']);
         }
 
@@ -183,7 +183,7 @@ class ArticlesController
         global $user;
 
         $values = $this->resolveSavePayload();
-        $articleId = (int)($values['id'] ?? \S::get('id') ?? 0);
+        $articleId = (int)($values['id'] ?? \Shared\Helpers\Helpers::get('id') ?? 0);
         $id = $this->repository->save($articleId, $values, (int)$user['id']);
 
         if ($id) {
@@ -210,7 +210,7 @@ class ArticlesController
     {
         $response = ['status' => 'error', 'msg' => 'Podczas zmiany atrybutu alt zdjecia wystapil blad. Prosze sprobowac ponownie.'];
 
-        if ($this->repository->updateImageAlt((int)\S::get('image_id'), (string)\S::get('image_alt'))) {
+        if ($this->repository->updateImageAlt((int)\Shared\Helpers\Helpers::get('image_id'), (string)\Shared\Helpers\Helpers::get('image_alt'))) {
             $response = ['status' => 'ok'];
         }
 
@@ -222,7 +222,7 @@ class ArticlesController
     {
         $response = ['status' => 'error', 'msg' => 'Podczas zmiany nazwy zalacznika wystapil blad. Prosze sprobowac ponownie.'];
 
-        if ($this->repository->updateFileName((int)\S::get('file_id'), (string)\S::get('file_name'))) {
+        if ($this->repository->updateFileName((int)\Shared\Helpers\Helpers::get('file_id'), (string)\Shared\Helpers\Helpers::get('file_name'))) {
             $response = ['status' => 'ok'];
         }
 
@@ -234,7 +234,7 @@ class ArticlesController
     {
         $response = ['status' => 'error', 'msg' => 'Podczas usuwania zdjecia wystapil blad. Prosze sprobowac ponownie.'];
 
-        if ($this->repository->markImageToDelete((int)\S::get('image_id'))) {
+        if ($this->repository->markImageToDelete((int)\Shared\Helpers\Helpers::get('image_id'))) {
             $response = ['status' => 'ok'];
         }
 
@@ -246,7 +246,7 @@ class ArticlesController
     {
         $response = ['status' => 'error', 'msg' => 'Podczas usuwania zalacznika wystapil blad. Prosze sprobowac ponownie.'];
 
-        if ($this->repository->markFileToDelete((int)\S::get('file_id'))) {
+        if ($this->repository->markFileToDelete((int)\Shared\Helpers\Helpers::get('file_id'))) {
             $response = ['status' => 'ok'];
         }
 
@@ -259,8 +259,8 @@ class ArticlesController
      */
     public function delete(): void
     {
-        if ($this->repository->archive((int)\S::get('id'))) {
-            \S::alert('Artykul zostal przeniesiony do archiwum.');
+        if ($this->repository->archive((int)\Shared\Helpers\Helpers::get('id'))) {
+            \Shared\Helpers\Helpers::alert('Artykul zostal przeniesiony do archiwum.');
         }
 
         header('Location: /admin/articles/list/');
@@ -282,7 +282,7 @@ class ArticlesController
         $this->repository->deleteNonassignedImages();
         $this->repository->deleteNonassignedFiles();
 
-        $article = $this->repository->find((int)\S::get('id')) ?: ['id' => 0, 'languages' => [], 'images' => [], 'files' => [], 'pages' => []];
+        $article = $this->repository->find((int)\Shared\Helpers\Helpers::get('id')) ?: ['id' => 0, 'languages' => [], 'images' => [], 'files' => [], 'pages' => []];
         $languages = $this->languagesRepository->languagesList();
         $menus = $this->pagesRepository->menusList();
         $layouts = $this->layoutsRepository->listAll();
@@ -298,7 +298,7 @@ class ArticlesController
 
     private function resolveSavePayload(): array
     {
-        $legacyValuesRaw = \S::get('values');
+        $legacyValuesRaw = \Shared\Helpers\Helpers::get('values');
         if ($legacyValuesRaw !== null && $legacyValuesRaw !== '') {
             $legacyValues = json_decode((string)$legacyValuesRaw, true);
             if (is_array($legacyValues)) {
diff --git a/autoload/admin/Controllers/BannerController.php b/autoload/admin/Controllers/BannerController.php
index 84016a3..e78819b 100644
--- a/autoload/admin/Controllers/BannerController.php
+++ b/autoload/admin/Controllers/BannerController.php
@@ -55,7 +55,7 @@ class BannerController
 
         // Historycznie lista banerow domyslnie byla sortowana rosnaco po nazwie.
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
@@ -164,7 +164,7 @@ class BannerController
      */
     public function edit(): string
     {
-        $bannerId = (int)\S::get('id');
+        $bannerId = (int)\Shared\Helpers\Helpers::get('id');
         $banner = $this->repository->find($bannerId);
         $languages = $this->languagesRepository->languagesList();
 
@@ -186,7 +186,7 @@ class BannerController
     {
         $response = ['success' => false, 'errors' => []];
 
-        $bannerId = (int)\S::get('id');
+        $bannerId = (int)\Shared\Helpers\Helpers::get('id');
         $banner = $this->repository->find($bannerId);
         $languages = $this->languagesRepository->languagesList();
         
@@ -228,10 +228,10 @@ class BannerController
      */
     public function delete(): void
     {
-        $bannerId = (int)\S::get('id');
+        $bannerId = (int)\Shared\Helpers\Helpers::get('id');
         if ($this->repository->delete($bannerId)) {
-            \S::delete_dir('../temp/');
-            \S::alert('Baner zostal usuniety.');
+            \Shared\Helpers\Helpers::delete_dir('../temp/');
+            \Shared\Helpers\Helpers::alert('Baner zostal usuniety.');
         }
 
         header('Location: /admin/banners/list/');
diff --git a/autoload/admin/Controllers/DictionariesController.php b/autoload/admin/Controllers/DictionariesController.php
index 2aa716a..44a5fce 100644
--- a/autoload/admin/Controllers/DictionariesController.php
+++ b/autoload/admin/Controllers/DictionariesController.php
@@ -41,7 +41,7 @@ class DictionariesController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
@@ -118,7 +118,7 @@ class DictionariesController
 
     public function edit(): string
     {
-        $unitId = (int)\S::get('id');
+        $unitId = (int)\Shared\Helpers\Helpers::get('id');
         $unit = $this->repository->find($unitId) ?? ['id' => 0, 'languages' => []];
         $languages = $this->languagesRepository->languagesList();
 
@@ -134,7 +134,7 @@ class DictionariesController
 
     public function save(): void
     {
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
         if ($legacyValues) {
             $values = json_decode($legacyValues, true);
             $response = ['status' => 'error', 'msg' => 'Podczas zapisywania jednostki miary wystapil blad.'];
@@ -153,7 +153,7 @@ class DictionariesController
             exit;
         }
 
-        $unitId = (int)\S::get('id');
+        $unitId = (int)\Shared\Helpers\Helpers::get('id');
         $unit = $this->repository->find($unitId) ?? ['id' => 0, 'languages' => []];
         $languages = $this->languagesRepository->languagesList();
         $viewModel = $this->buildFormViewModel($unit, $languages);
@@ -187,9 +187,9 @@ class DictionariesController
 
     public function delete(): void
     {
-        $unitId = (int)\S::get('id');
+        $unitId = (int)\Shared\Helpers\Helpers::get('id');
         if ($this->repository->delete($unitId)) {
-            \S::alert('Jednostka miary zostala usunieta.');
+            \Shared\Helpers\Helpers::alert('Jednostka miary zostala usunieta.');
         }
 
         header('Location: /admin/dictionaries/list/');
diff --git a/autoload/admin/Controllers/IntegrationsController.php b/autoload/admin/Controllers/IntegrationsController.php
index dbd43cd..d55657a 100644
--- a/autoload/admin/Controllers/IntegrationsController.php
+++ b/autoload/admin/Controllers/IntegrationsController.php
@@ -23,8 +23,8 @@ class IntegrationsController
     public function apilo_settings_save(): void
     {
         $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania ustawien wystapil blad. Prosze sprobowac ponownie.' ];
-        $fieldId = \S::get( 'field_id' );
-        $value = \S::get( 'value' );
+        $fieldId = \Shared\Helpers\Helpers::get( 'field_id' );
+        $value = \Shared\Helpers\Helpers::get( 'value' );
 
         if ( $this->repository->saveSetting( 'apilo', $fieldId, $value ) ) {
             $response = [ 'status' => 'ok', 'msg' => 'Ustawienia zostaly zapisane.', 'value' => $value ];
@@ -81,17 +81,17 @@ class IntegrationsController
 
     public function apilo_create_product(): void
     {
-        $productId = (int) \S::get( 'product_id' );
+        $productId = (int) \Shared\Helpers\Helpers::get( 'product_id' );
         $result = $this->repository->apiloCreateProduct( $productId );
 
-        \S::alert( (string)($result['message'] ?? 'Wystapil blad podczas tworzenia produktu w Apilo.') );
+        \Shared\Helpers\Helpers::alert( (string)($result['message'] ?? 'Wystapil blad podczas tworzenia produktu w Apilo.') );
         header( 'Location: /admin/shop_product/view_list/' );
         exit;
     }
 
     public function apilo_product_search(): void
     {
-        $productId = (int) \S::get( 'product_id' );
+        $productId = (int) \Shared\Helpers\Helpers::get( 'product_id' );
         $sku = $this->repository->getProductSku( $productId );
 
         if ( !$sku ) {
@@ -105,7 +105,7 @@ class IntegrationsController
 
     public function apilo_product_select_save(): void
     {
-        if ( $this->repository->linkProduct( (int) \S::get( 'product_id' ), \S::get( 'apilo_product_id' ), \S::get( 'apilo_product_name' ) ) ) {
+        if ( $this->repository->linkProduct( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'apilo_product_id' ), \Shared\Helpers\Helpers::get( 'apilo_product_name' ) ) ) {
             echo json_encode( [ 'status' => 'ok' ] );
         } else {
             echo json_encode( [ 'status' => 'error', 'msg' => 'Podczas zapisywania produktu wystapil blad. Prosze sprobowac ponownie.' ] );
@@ -116,7 +116,7 @@ class IntegrationsController
 
     public function apilo_product_select_delete(): void
     {
-        if ( $this->repository->unlinkProduct( (int) \S::get( 'product_id' ) ) ) {
+        if ( $this->repository->unlinkProduct( (int) \Shared\Helpers\Helpers::get( 'product_id' ) ) ) {
             echo json_encode( [ 'status' => 'ok' ] );
         } else {
             echo json_encode( [ 'status' => 'error', 'msg' => 'Podczas usuwania produktu wystapil blad. Prosze sprobowac ponownie.' ] );
@@ -135,8 +135,8 @@ class IntegrationsController
     public function shoppro_settings_save(): void
     {
         $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania ustawien wystapil blad. Prosze sprobowac ponownie.' ];
-        $fieldId = \S::get( 'field_id' );
-        $value = \S::get( 'value' );
+        $fieldId = \Shared\Helpers\Helpers::get( 'field_id' );
+        $value = \Shared\Helpers\Helpers::get( 'value' );
 
         if ( $this->repository->saveSetting( 'shoppro', $fieldId, $value ) ) {
             $response = [ 'status' => 'ok', 'msg' => 'Ustawienia zostaly zapisane.', 'value' => $value ];
@@ -148,10 +148,10 @@ class IntegrationsController
 
     public function shoppro_product_import(): void
     {
-        $productId = (int) \S::get( 'product_id' );
+        $productId = (int) \Shared\Helpers\Helpers::get( 'product_id' );
         $result = $this->repository->shopproImportProduct( $productId );
 
-        \S::alert( (string)($result['message'] ?? 'Wystapil blad podczas importu produktu.') );
+        \Shared\Helpers\Helpers::alert( (string)($result['message'] ?? 'Wystapil blad podczas importu produktu.') );
         header( 'Location: /admin/shop_product/view_list/' );
         exit;
     }
@@ -162,10 +162,10 @@ class IntegrationsController
 
         if ( !empty( $result['success'] ) ) {
             $count = (int)($result['count'] ?? 0);
-            \S::alert( $label . ' zostala pobrana. Liczba rekordow: ' . $count . '.' );
+            \Shared\Helpers\Helpers::alert( $label . ' zostala pobrana. Liczba rekordow: ' . $count . '.' );
         } else {
             $details = trim( (string)($result['message'] ?? 'Nieznany blad.') );
-            \S::alert(
+            \Shared\Helpers\Helpers::alert(
                 'Nie udalo sie pobrac ' . strtolower( $label ) . '. '
                 . $details
                 . ' Co zrobic: sprawdz konfiguracje Apilo, wykonaj autoryzacje i ponow pobranie listy.'
diff --git a/autoload/admin/Controllers/LanguagesController.php b/autoload/admin/Controllers/LanguagesController.php
index 2a13763..0f56074 100644
--- a/autoload/admin/Controllers/LanguagesController.php
+++ b/autoload/admin/Controllers/LanguagesController.php
@@ -57,7 +57,7 @@ class LanguagesController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
@@ -143,7 +143,7 @@ class LanguagesController
 
     public function language_edit(): string
     {
-        $languageId = trim((string)\S::get('id'));
+        $languageId = trim((string)\Shared\Helpers\Helpers::get('id'));
         $language = $this->repository->languageDetails($languageId) ?? [];
         $validationErrors = $_SESSION['form_errors'][$this->getLanguageFormId()] ?? null;
         if ($validationErrors) {
@@ -157,7 +157,7 @@ class LanguagesController
 
     public function language_save(): void
     {
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
         if ($legacyValues) {
             $values = json_decode((string)$legacyValues, true);
             $response = ['status' => 'error', 'msg' => 'Podczas zapisywania jezyka wystapil blad.'];
@@ -179,7 +179,7 @@ class LanguagesController
             exit;
         }
 
-        $languageId = trim((string)\S::get('id'));
+        $languageId = trim((string)\Shared\Helpers\Helpers::get('id'));
         $language = $this->repository->languageDetails($languageId) ?? [];
         $viewModel = $this->buildLanguageFormViewModel($language, $this->repository->maxOrder());
 
@@ -191,7 +191,7 @@ class LanguagesController
         }
 
         $data = $result['data'];
-        $requestId = strtolower(trim((string)\S::get('id')));
+        $requestId = strtolower(trim((string)\Shared\Helpers\Helpers::get('id')));
         $idFromData = strtolower(trim((string)($data['id'] ?? '')));
         $id = $idFromData !== '' ? $idFromData : $requestId;
         if (!preg_match('/^[a-z]{2}$/', $id)) {
@@ -228,8 +228,8 @@ class LanguagesController
 
     public function language_delete(): void
     {
-        if ($this->repository->deleteLanguage((string)\S::get('id'))) {
-            \S::alert('Jezyk zostal usuniety.');
+        if ($this->repository->deleteLanguage((string)\Shared\Helpers\Helpers::get('id'))) {
+            \Shared\Helpers\Helpers::alert('Jezyk zostal usuniety.');
         }
 
         header('Location: /admin/languages/view_list/');
@@ -254,7 +254,7 @@ class LanguagesController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
@@ -331,7 +331,7 @@ class LanguagesController
 
     public function translation_edit(): string
     {
-        $translationId = (int)\S::get('id');
+        $translationId = (int)\Shared\Helpers\Helpers::get('id');
         $translation = $this->repository->translationDetails($translationId) ?? [];
         $languages = $this->repository->languagesList();
         $validationErrors = $_SESSION['form_errors'][$this->getTranslationFormId()] ?? null;
@@ -346,7 +346,7 @@ class LanguagesController
 
     public function translation_save(): void
     {
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
         if ($legacyValues) {
             $values = json_decode((string)$legacyValues, true);
             $response = ['status' => 'error', 'msg' => 'Podczas zapisywania tlumaczenia wystapil blad.'];
@@ -368,7 +368,7 @@ class LanguagesController
             exit;
         }
 
-        $translationId = (int)\S::get('id');
+        $translationId = (int)\Shared\Helpers\Helpers::get('id');
         $translation = $this->repository->translationDetails($translationId) ?? [];
         $languages = $this->repository->languagesList();
         $viewModel = $this->buildTranslationFormViewModel($translation, $languages);
@@ -413,8 +413,8 @@ class LanguagesController
 
     public function translation_delete(): void
     {
-        if ($this->repository->deleteTranslation((int)\S::get('id'))) {
-            \S::alert('Tlumaczenie zostalo usuniete.');
+        if ($this->repository->deleteTranslation((int)\Shared\Helpers\Helpers::get('id'))) {
+            \Shared\Helpers\Helpers::alert('Tlumaczenie zostalo usuniete.');
         }
 
         header('Location: /admin/languages/translation_list/');
@@ -544,7 +544,7 @@ class LanguagesController
             if (!isset($language['id'])) {
                 continue;
             }
-            \S::delete_session('lang-' . (string)$language['id']);
+            \Shared\Helpers\Helpers::delete_session('lang-' . (string)$language['id']);
         }
     }
 
diff --git a/autoload/admin/Controllers/LayoutsController.php b/autoload/admin/Controllers/LayoutsController.php
index 27c6bd9..f86e838 100644
--- a/autoload/admin/Controllers/LayoutsController.php
+++ b/autoload/admin/Controllers/LayoutsController.php
@@ -54,7 +54,7 @@ class LayoutsController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
@@ -136,7 +136,7 @@ class LayoutsController
     public function edit(): string
     {
         return \Tpl::view('layouts/layout-edit', [
-            'layout' => $this->repository->find((int)\S::get('id')),
+            'layout' => $this->repository->find((int)\Shared\Helpers\Helpers::get('id')),
             'menus' => $this->repository->menusWithPages(),
             'categories' => $this->repository->categoriesTree(),
             'dlang' => $this->languagesRepository->defaultLanguageId(),
@@ -146,7 +146,7 @@ class LayoutsController
     public function save(): void
     {
         $response = ['status' => 'error', 'msg' => 'Podczas zapisywania szablonu wystapil blad. Prosze sprobowac ponownie.'];
-        $values = json_decode((string)\S::get('values'), true);
+        $values = json_decode((string)\Shared\Helpers\Helpers::get('values'), true);
 
         if (is_array($values)) {
             $id = $this->repository->save($values);
@@ -161,8 +161,8 @@ class LayoutsController
 
     public function delete(): void
     {
-        if ($this->repository->delete((int)\S::get('id'))) {
-            \S::alert('Szablon zostal usuniety.');
+        if ($this->repository->delete((int)\Shared\Helpers\Helpers::get('id'))) {
+            \Shared\Helpers\Helpers::alert('Szablon zostal usuniety.');
         }
 
         header('Location: /admin/layouts/list/');
diff --git a/autoload/admin/Controllers/NewsletterController.php b/autoload/admin/Controllers/NewsletterController.php
index ceef967..a0be827 100644
--- a/autoload/admin/Controllers/NewsletterController.php
+++ b/autoload/admin/Controllers/NewsletterController.php
@@ -60,7 +60,7 @@ class NewsletterController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
@@ -133,8 +133,8 @@ class NewsletterController
 
     public function email_delete(): void
     {
-        if ($this->repository->deleteSubscriber((int)\S::get('id'))) {
-            \S::alert('Adres email zostal usuniety.');
+        if ($this->repository->deleteSubscriber((int)\Shared\Helpers\Helpers::get('id'))) {
+            \Shared\Helpers\Helpers::alert('Adres email zostal usuniety.');
         }
 
         header('Location: /admin/newsletter/emails_list/');
@@ -148,7 +148,7 @@ class NewsletterController
 
     public function prepare(): string
     {
-        \S::alert('Funkcjonalnosc "Wysylka - przygotowanie" jest tymczasowo wylaczona.');
+        \Shared\Helpers\Helpers::alert('Funkcjonalnosc "Wysylka - przygotowanie" jest tymczasowo wylaczona.');
         header('Location: /admin/newsletter/emails_list/');
         exit;
     }
@@ -160,7 +160,7 @@ class NewsletterController
 
     public function send(): void
     {
-        \S::alert('Funkcjonalnosc "Wysylka - przygotowanie" jest tymczasowo wylaczona.');
+        \Shared\Helpers\Helpers::alert('Funkcjonalnosc "Wysylka - przygotowanie" jest tymczasowo wylaczona.');
         header('Location: /admin/newsletter/emails_list/');
         exit;
     }
@@ -180,7 +180,7 @@ class NewsletterController
 
     public function settings_save(): void
     {
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
         if ($legacyValues) {
             $values = json_decode((string)$legacyValues, true);
             if (!is_array($values)) {
@@ -189,7 +189,7 @@ class NewsletterController
             }
 
             $this->repository->saveSettings($values);
-            \S::alert('Ustawienia zostaly zapisane.');
+            \Shared\Helpers\Helpers::alert('Ustawienia zostaly zapisane.');
 
             echo json_encode(['status' => 'ok', 'msg' => 'Ustawienia zostaly zapisane.']);
             exit;
@@ -204,7 +204,7 @@ class NewsletterController
         }
 
         $this->repository->saveSettings($result['data']);
-        \S::alert('Ustawienia zostaly zapisane.');
+        \Shared\Helpers\Helpers::alert('Ustawienia zostaly zapisane.');
 
         echo json_encode([
             'success' => true,
@@ -215,7 +215,7 @@ class NewsletterController
 
     public function email_templates_user(): string
     {
-        \S::alert('Funkcjonalnosc "Szablony uzytkownika" jest tymczasowo wylaczona.');
+        \Shared\Helpers\Helpers::alert('Funkcjonalnosc "Szablony uzytkownika" jest tymczasowo wylaczona.');
         header('Location: /admin/newsletter/email_templates_admin/');
         exit;
     }
@@ -230,9 +230,9 @@ class NewsletterController
 
     public function email_template_edit(): string
     {
-        $template = $this->repository->templateDetails((int)\S::get('id'));
+        $template = $this->repository->templateDetails((int)\Shared\Helpers\Helpers::get('id'));
         if (!is_array($template) || (int)($template['is_admin'] ?? 0) !== 1) {
-            \S::alert('Dostepne sa tylko szablony administracyjne.');
+            \Shared\Helpers\Helpers::alert('Dostepne sa tylko szablony administracyjne.');
             header('Location: /admin/newsletter/email_templates_admin/');
             exit;
         }
@@ -250,7 +250,7 @@ class NewsletterController
 
     public function template_save(): void
     {
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
         if ($legacyValues) {
             $values = json_decode((string)$legacyValues, true);
             $response = ['status' => 'error', 'msg' => 'Podczas zapisywania wystapil blad.'];
@@ -275,7 +275,7 @@ class NewsletterController
             exit;
         }
 
-        $template = $this->repository->templateDetails((int)\S::get('id'));
+        $template = $this->repository->templateDetails((int)\Shared\Helpers\Helpers::get('id'));
         if (!is_array($template) || (int)($template['is_admin'] ?? 0) !== 1) {
             echo json_encode([
                 'success' => false,
@@ -317,7 +317,7 @@ class NewsletterController
 
     public function email_template_delete(): void
     {
-        \S::alert('Usuwanie szablonow uzytkownika jest tymczasowo wylaczone.');
+        \Shared\Helpers\Helpers::alert('Usuwanie szablonow uzytkownika jest tymczasowo wylaczone.');
         header('Location: /admin/newsletter/email_templates_admin/');
         exit;
     }
@@ -436,7 +436,7 @@ class NewsletterController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
diff --git a/autoload/admin/Controllers/PagesController.php b/autoload/admin/Controllers/PagesController.php
index 904d022..6e665ac 100644
--- a/autoload/admin/Controllers/PagesController.php
+++ b/autoload/admin/Controllers/PagesController.php
@@ -45,7 +45,7 @@ class PagesController
 
         return \Tpl::view('pages/pages-browse-list', [
             'menus' => $menus,
-            'modal' => \S::get('modal'),
+            'modal' => \Shared\Helpers\Helpers::get('modal'),
             'cookie_pages' => $this->cookieState('cookie_pages'),
             'cookie_menus' => $this->cookieState('cookie_menus'),
         ]);
@@ -58,7 +58,7 @@ class PagesController
 
     public function menuEdit(): string
     {
-        $menu = $this->repository->menuDetails((int)\S::get('id'));
+        $menu = $this->repository->menuDetails((int)\Shared\Helpers\Helpers::get('id'));
 
         return \Tpl::view('pages/menu-edit', [
             'form' => $this->buildMenuFormViewModel($menu),
@@ -67,7 +67,7 @@ class PagesController
 
     public function menuSave(): void
     {
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
         if ($legacyValues) {
             $response = ['status' => 'error', 'msg' => 'Podczas zapisywania menu wystapil blad. Prosze sprobowac ponownie.'];
             $values = json_decode((string)$legacyValues, true);
@@ -84,9 +84,9 @@ class PagesController
             exit;
         }
 
-        $menuId = (int)\S::get('id');
-        $name = trim((string)\S::get('name'));
-        $status = \S::get('status');
+        $menuId = (int)\Shared\Helpers\Helpers::get('id');
+        $name = trim((string)\Shared\Helpers\Helpers::get('name'));
+        $status = \Shared\Helpers\Helpers::get('status');
 
         if ($name === '') {
             echo json_encode([
@@ -155,10 +155,10 @@ class PagesController
 
     public function menuDelete(): void
     {
-        if ($this->repository->menuDelete((int)\S::get('id'))) {
-            \S::set_message('Menu zostało usunięte.');
+        if ($this->repository->menuDelete((int)\Shared\Helpers\Helpers::get('id'))) {
+            \Shared\Helpers\Helpers::set_message('Menu zostało usunięte.');
         } else {
-            \S::alert('Podczas usuwania menu wystąpił błąd. Aby usunąć menu, nie może ono posiadać przypiętych stron.');
+            \Shared\Helpers\Helpers::alert('Podczas usuwania menu wystąpił błąd. Aby usunąć menu, nie może ono posiadać przypiętych stron.');
         }
 
         header('Location: /admin/pages/list/');
@@ -167,9 +167,9 @@ class PagesController
 
     public function edit(): string
     {
-        $page = $this->repository->pageDetails((int)\S::get('id'));
-        $parentId = (int)\S::get('pid');
-        $menuId = (int)\S::get('menu_id');
+        $page = $this->repository->pageDetails((int)\Shared\Helpers\Helpers::get('id'));
+        $parentId = (int)\Shared\Helpers\Helpers::get('pid');
+        $menuId = (int)\Shared\Helpers\Helpers::get('menu_id');
         $menus = $this->repository->menusList();
         $layouts = $this->layoutsRepository->listAll();
         $languages = $this->languagesRepository->languagesList();
@@ -188,7 +188,7 @@ class PagesController
 
     public function save(): void
     {
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
         if ($legacyValues) {
             $response = ['status' => 'error', 'msg' => 'Podczas zapisywania strony wystapil blad. Prosze sprobowac ponownie.'];
             $values = json_decode((string)$legacyValues, true);
@@ -210,13 +210,13 @@ class PagesController
 
         $data = $_POST;
         if (!isset($data['id']) || $data['id'] === '') {
-            $data['id'] = (int)\S::get('id');
+            $data['id'] = (int)\Shared\Helpers\Helpers::get('id');
         }
         if (!isset($data['parent_id']) || $data['parent_id'] === '') {
-            $data['parent_id'] = (int)\S::get('pid');
+            $data['parent_id'] = (int)\Shared\Helpers\Helpers::get('pid');
         }
-        if ((!isset($data['menu_id']) || $data['menu_id'] === '') && (int)\S::get('menu_id') > 0) {
-            $data['menu_id'] = (int)\S::get('menu_id');
+        if ((!isset($data['menu_id']) || $data['menu_id'] === '') && (int)\Shared\Helpers\Helpers::get('menu_id') > 0) {
+            $data['menu_id'] = (int)\Shared\Helpers\Helpers::get('menu_id');
         }
 
         $savedId = $this->repository->pageSave($data);
@@ -524,10 +524,10 @@ class PagesController
 
     public function delete(): void
     {
-        if ($this->repository->pageDelete((int)\S::get('id'))) {
-            \S::set_message('Strona zostala usunieta.');
+        if ($this->repository->pageDelete((int)\Shared\Helpers\Helpers::get('id'))) {
+            \Shared\Helpers\Helpers::set_message('Strona zostala usunieta.');
         } else {
-            \S::alert('Podczas usuwania strony wystapil blad. Aby usunac strone nie moze ona posiadac przypietych podstron.');
+            \Shared\Helpers\Helpers::alert('Podczas usuwania strony wystapil blad. Aby usunac strone nie moze ona posiadac przypietych podstron.');
         }
 
         header('Location: /admin/pages/list/');
@@ -536,7 +536,7 @@ class PagesController
 
     public function pageArticles(): string
     {
-        $pageId = (int)\S::get('id');
+        $pageId = (int)\Shared\Helpers\Helpers::get('id');
         return \Tpl::view('pages/page-articles', [
             'page_id' => $pageId,
             'articles' => $this->repository->pageArticles($pageId),
@@ -547,7 +547,7 @@ class PagesController
     {
         $response = ['status' => 'error', 'msg' => 'Podczas zapisywania kolejnosci stron wystapil blad. Prosze sprobowac ponownie.'];
 
-        if ($this->repository->savePagesOrder((int)\S::get('menu_id'), \S::get('pages'))) {
+        if ($this->repository->savePagesOrder((int)\Shared\Helpers\Helpers::get('menu_id'), \Shared\Helpers\Helpers::get('pages'))) {
             $response = ['status' => 'ok'];
         }
 
@@ -559,7 +559,7 @@ class PagesController
     {
         $response = ['status' => 'error', 'msg' => 'Podczas zapisywania kolejnosci wyswietlania artykulow wystapil blad. Prosze sprobowac ponownie.'];
 
-        if ($this->repository->saveArticlesOrder((int)\S::get('page_id'), \S::get('articles'))) {
+        if ($this->repository->saveArticlesOrder((int)\Shared\Helpers\Helpers::get('page_id'), \Shared\Helpers\Helpers::get('articles'))) {
             $response = ['status' => 'ok'];
         }
 
@@ -572,10 +572,10 @@ class PagesController
         $response = ['status' => 'error', 'msg' => 'Podczas generowania pola "seo link" wystapil blad. Prosze sprobowac ponownie.'];
 
         $seoLink = $this->repository->generateSeoLink(
-            (string)\S::get('title'),
-            (int)\S::get('page_id'),
-            (int)\S::get('article_id'),
-            (int)\S::get('category_id')
+            (string)\Shared\Helpers\Helpers::get('title'),
+            (int)\Shared\Helpers\Helpers::get('page_id'),
+            (int)\Shared\Helpers\Helpers::get('article_id'),
+            (int)\Shared\Helpers\Helpers::get('category_id')
         );
 
         if ($seoLink !== '') {
@@ -591,13 +591,13 @@ class PagesController
 
     public function cookieMenus(): void
     {
-        $this->repository->toggleCookieValue('cookie_menus', (int)\S::get('menu_id'));
+        $this->repository->toggleCookieValue('cookie_menus', (int)\Shared\Helpers\Helpers::get('menu_id'));
         exit;
     }
 
     public function cookiePages(): void
     {
-        $this->repository->toggleCookieValue('cookie_pages', (int)\S::get('page_id'));
+        $this->repository->toggleCookieValue('cookie_pages', (int)\Shared\Helpers\Helpers::get('page_id'));
         exit;
     }
 
diff --git a/autoload/admin/Controllers/ProductArchiveController.php b/autoload/admin/Controllers/ProductArchiveController.php
index 1f7962f..d470946 100644
--- a/autoload/admin/Controllers/ProductArchiveController.php
+++ b/autoload/admin/Controllers/ProductArchiveController.php
@@ -154,10 +154,10 @@ class ProductArchiveController
 
     public function unarchive(): void
     {
-        if ( $this->productRepository->unarchive( (int) \S::get( 'product_id' ) ) )
-            \S::alert( 'Produkt został przywrócony z archiwum.' );
+        if ( $this->productRepository->unarchive( (int) \Shared\Helpers\Helpers::get( 'product_id' ) ) )
+            \Shared\Helpers\Helpers::alert( 'Produkt został przywrócony z archiwum.' );
         else
-            \S::alert( 'Podczas przywracania produktu z archiwum wystąpił błąd. Proszę spróbować ponownie' );
+            \Shared\Helpers\Helpers::alert( 'Podczas przywracania produktu z archiwum wystąpił błąd. Proszę spróbować ponownie' );
 
         header( 'Location: /admin/product_archive/list/' );
         exit;
diff --git a/autoload/admin/Controllers/ScontainersController.php b/autoload/admin/Controllers/ScontainersController.php
index 6c61cee..1af3139 100644
--- a/autoload/admin/Controllers/ScontainersController.php
+++ b/autoload/admin/Controllers/ScontainersController.php
@@ -51,7 +51,7 @@ class ScontainersController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'DESC';
         }
 
@@ -137,7 +137,7 @@ class ScontainersController
 
     public function edit(): string
     {
-        $container = $this->repository->find((int)\S::get('id'));
+        $container = $this->repository->find((int)\Shared\Helpers\Helpers::get('id'));
         $languages = $this->languagesRepository->languagesList();
         $validationErrors = $_SESSION['form_errors'][$this->formId()] ?? null;
         if ($validationErrors) {
@@ -156,7 +156,7 @@ class ScontainersController
 
     public function save(): void
     {
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
         if ($legacyValues) {
             $values = json_decode((string)$legacyValues, true);
             $response = ['status' => 'error', 'msg' => 'Podczas zapisywania kontenera wystapil blad.'];
@@ -172,7 +172,7 @@ class ScontainersController
             exit;
         }
 
-        $container = $this->repository->find((int)\S::get('id'));
+        $container = $this->repository->find((int)\Shared\Helpers\Helpers::get('id'));
         $languages = $this->languagesRepository->languagesList();
         $form = $this->buildFormViewModel($container, $languages);
 
@@ -214,8 +214,8 @@ class ScontainersController
 
     public function delete(): void
     {
-        if ($this->repository->delete((int)\S::get('id'))) {
-            \S::alert('Kontener zostal usuniety.');
+        if ($this->repository->delete((int)\Shared\Helpers\Helpers::get('id'))) {
+            \Shared\Helpers\Helpers::alert('Kontener zostal usuniety.');
         }
 
         header('Location: /admin/scontainers/list/');
diff --git a/autoload/admin/Controllers/SettingsController.php b/autoload/admin/Controllers/SettingsController.php
index da0c2eb..90d6017 100644
--- a/autoload/admin/Controllers/SettingsController.php
+++ b/autoload/admin/Controllers/SettingsController.php
@@ -30,16 +30,16 @@ class SettingsController
      */
     public function clearCache(): void
     {
-        \S::delete_dir('../temp/');
-        \S::delete_dir('../thumbs/');
+        \Shared\Helpers\Helpers::delete_dir('../temp/');
+        \Shared\Helpers\Helpers::delete_dir('../thumbs/');
 
         $redis = \Shared\Cache\RedisConnection::getInstance()->getConnection();
         if ($redis) {
             $redis->flushAll();
         }
 
-        \S::alert('Cache został wyczyszczony.');
-        \S::htacces();
+        \Shared\Helpers\Helpers::alert('Cache został wyczyszczony.');
+        \Shared\Helpers\Helpers::htacces();
 
         header('Location: /admin/dashboard/main_view/');
         exit;
@@ -51,15 +51,15 @@ class SettingsController
     public function clearCacheAjax(): void
     {
         try {
-            \S::delete_dir('../temp/');
-            \S::delete_dir('../thumbs/');
+            \Shared\Helpers\Helpers::delete_dir('../temp/');
+            \Shared\Helpers\Helpers::delete_dir('../thumbs/');
 
             $redis = \Shared\Cache\RedisConnection::getInstance()->getConnection();
             if ($redis) {
                 $redis->flushAll();
             }
 
-            \S::htacces();
+            \Shared\Helpers\Helpers::htacces();
 
             echo json_encode(['status' => 'success', 'message' => 'Cache został wyczyszczony.']);
         } catch (\Exception $e) {
@@ -75,7 +75,7 @@ class SettingsController
     {
         global $mdb;
 
-        $phrase = trim((string)\S::get('q'));
+        $phrase = trim((string)\Shared\Helpers\Helpers::get('q'));
         if ($phrase === '' || mb_strlen($phrase) < 2) {
             echo json_encode([
                 'status' => 'ok',
@@ -227,13 +227,13 @@ class SettingsController
     public function save(): void
     {
         // Kompatybilnosc wsteczna dla legacy gridEdit (values jako JSON).
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
         if ($legacyValues) {
             $values = json_decode($legacyValues, true);
             $result = $this->settingsRepository->saveSettings(is_array($values) ? $values : []);
 
-            \S::delete_dir('../temp/');
-            \S::htacces();
+            \Shared\Helpers\Helpers::delete_dir('../temp/');
+            \Shared\Helpers\Helpers::htacces();
 
             echo json_encode($result);
             exit;
@@ -253,8 +253,8 @@ class SettingsController
         $values = $this->transformFormDataToSettings($result['data']);
         $saveResult = $this->settingsRepository->saveSettings($values);
 
-        \S::delete_dir('../temp/');
-        \S::htacces();
+        \Shared\Helpers\Helpers::delete_dir('../temp/');
+        \Shared\Helpers\Helpers::htacces();
 
         echo json_encode([
             'success' => ($saveResult['status'] ?? '') === 'ok',
diff --git a/autoload/admin/Controllers/ShopAttributeController.php b/autoload/admin/Controllers/ShopAttributeController.php
index 44ecb83..e21150d 100644
--- a/autoload/admin/Controllers/ShopAttributeController.php
+++ b/autoload/admin/Controllers/ShopAttributeController.php
@@ -50,7 +50,7 @@ class ShopAttributeController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
@@ -150,7 +150,7 @@ class ShopAttributeController
 
     public function edit(): string
     {
-        $attribute = $this->repository->findAttribute((int)\S::get('id'));
+        $attribute = $this->repository->findAttribute((int)\Shared\Helpers\Helpers::get('id'));
         $languages = $this->languagesRepository->languagesList();
 
         return \Tpl::view('shop-attribute/attribute-edit', [
@@ -165,7 +165,7 @@ class ShopAttributeController
             'msg' => 'Podczas zapisywania atrybutu wystapil blad. Prosze sprobowac ponownie.',
         ];
 
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
         if ($legacyValues) {
             $values = json_decode((string)$legacyValues, true);
             if (is_array($values)) {
@@ -185,7 +185,7 @@ class ShopAttributeController
 
         $payload = $_POST;
         if (empty($payload['id'])) {
-            $routeId = (int)\S::get('id');
+            $routeId = (int)\Shared\Helpers\Helpers::get('id');
             if ($routeId > 0) {
                 $payload['id'] = $routeId;
             }
@@ -210,8 +210,8 @@ class ShopAttributeController
 
     public function delete(): void
     {
-        if ($this->repository->deleteAttribute((int)\S::get('id'))) {
-            \S::alert('Atrybut zostal usuniety.');
+        if ($this->repository->deleteAttribute((int)\Shared\Helpers\Helpers::get('id'))) {
+            \Shared\Helpers\Helpers::alert('Atrybut zostal usuniety.');
         }
 
         header('Location: /admin/shop_attribute/list/');
@@ -220,16 +220,16 @@ class ShopAttributeController
 
     public function values(): string
     {
-        $attributeId = (int)\S::get('id');
+        $attributeId = (int)\Shared\Helpers\Helpers::get('id');
         if ($attributeId <= 0) {
-            \S::alert('Nieprawidlowy identyfikator cechy.');
+            \Shared\Helpers\Helpers::alert('Nieprawidlowy identyfikator cechy.');
             header('Location: /admin/shop_attribute/list/');
             exit;
         }
 
         $attribute = $this->repository->findAttribute($attributeId);
         if ((int)($attribute['id'] ?? 0) <= 0) {
-            \S::alert('Wybrana cecha nie zostala znaleziona.');
+            \Shared\Helpers\Helpers::alert('Wybrana cecha nie zostala znaleziona.');
             header('Location: /admin/shop_attribute/list/');
             exit;
         }
@@ -251,12 +251,12 @@ class ShopAttributeController
             'msg' => 'Podczas zapisywania wartosci atrybutu wystapil blad. Prosze sprobowac ponownie.',
         ];
 
-        $attributeId = (int)\S::get('attribute_id');
+        $attributeId = (int)\Shared\Helpers\Helpers::get('attribute_id');
         if ($attributeId <= 0) {
-            $attributeId = (int)\S::get('id');
+            $attributeId = (int)\Shared\Helpers\Helpers::get('id');
         }
 
-        $payloadRaw = \S::get('payload');
+        $payloadRaw = \Shared\Helpers\Helpers::get('payload');
         $payload = json_decode((string)$payloadRaw, true);
         if (is_array($payload) && is_array($payload['rows'] ?? null) && $attributeId > 0) {
             $validationErrors = $this->validateValuesRows(
@@ -286,7 +286,7 @@ class ShopAttributeController
             exit;
         }
 
-        $valuesRaw = \S::get('values');
+        $valuesRaw = \Shared\Helpers\Helpers::get('values');
         $values = json_decode((string)$valuesRaw, true);
         if (is_array($values) && $attributeId > 0) {
             $savedId = $this->repository->saveLegacyValues(
@@ -313,7 +313,7 @@ class ShopAttributeController
 
     public function value_row_tpl(): void
     {
-        $rowKey = trim((string)\S::get('row_key'));
+        $rowKey = trim((string)\Shared\Helpers\Helpers::get('row_key'));
         if ($rowKey === '') {
             $rowKey = 'new-' . time();
         }
diff --git a/autoload/admin/Controllers/ShopCategoryController.php b/autoload/admin/Controllers/ShopCategoryController.php
index 38688fc..cea21c4 100644
--- a/autoload/admin/Controllers/ShopCategoryController.php
+++ b/autoload/admin/Controllers/ShopCategoryController.php
@@ -32,8 +32,8 @@ class ShopCategoryController
     public function category_edit(): string
     {
         return \Tpl::view('shop-category/category-edit', [
-            'category' => $this->repository->categoryDetails(\S::get('id')),
-            'pid' => \S::get('pid'),
+            'category' => $this->repository->categoryDetails(\Shared\Helpers\Helpers::get('id')),
+            'pid' => \Shared\Helpers\Helpers::get('pid'),
             'languages' => $this->languagesRepository->languagesList(),
             'sort_types' => $this->repository->sortTypes(),
             'dlang' => $this->languagesRepository->defaultLanguage(),
@@ -52,7 +52,7 @@ class ShopCategoryController
             'msg' => 'Podczas zapisywania kategorii wystąpił błąd. Proszę spróbować ponownie.',
         ];
 
-        $values = json_decode((string)\S::get('values'), true);
+        $values = json_decode((string)\Shared\Helpers\Helpers::get('values'), true);
         if (is_array($values)) {
             $savedId = $this->repository->save($values);
             if (!empty($savedId)) {
@@ -70,10 +70,10 @@ class ShopCategoryController
 
     public function category_delete(): void
     {
-        if ($this->repository->categoryDelete(\S::get('id'))) {
-            \S::set_message('Kategoria została usunięta.');
+        if ($this->repository->categoryDelete(\Shared\Helpers\Helpers::get('id'))) {
+            \Shared\Helpers\Helpers::set_message('Kategoria została usunięta.');
         } else {
-            \S::alert('Podczas usuwania kategorii wystąpił błąd. Aby usunąć kategorię nie może ona posiadać przypiętych podkategorii.');
+            \Shared\Helpers\Helpers::alert('Podczas usuwania kategorii wystąpił błąd. Aby usunąć kategorię nie może ona posiadać przypiętych podkategorii.');
         }
 
         header('Location: /admin/shop_category/view_list/');
@@ -88,8 +88,8 @@ class ShopCategoryController
     public function category_products(): string
     {
         return \Tpl::view('shop-category/category-products', [
-            'category_id' => \S::get('id'),
-            'products' => $this->repository->categoryProducts((int)\S::get('id')),
+            'category_id' => \Shared\Helpers\Helpers::get('id'),
+            'products' => $this->repository->categoryProducts((int)\Shared\Helpers\Helpers::get('id')),
         ]);
     }
 
@@ -115,7 +115,7 @@ class ShopCategoryController
             'msg' => 'Podczas zapisywania kolejności kategorii wystąpił błąd. Proszę spróbować ponownie.',
         ];
 
-        if ( $this->repository->saveCategoriesOrder( \S::get( 'categories' ) ) ) {
+        if ( $this->repository->saveCategoriesOrder( \Shared\Helpers\Helpers::get( 'categories' ) ) ) {
             $response = [ 'status' => 'ok' ];
         }
 
@@ -130,7 +130,7 @@ class ShopCategoryController
             'msg' => 'Podczas zapisywania kolejności wyświetlania produktów wystąpił błąd. Proszę spróbować ponownie.',
         ];
 
-        if ( $this->repository->saveProductOrder( \S::get( 'category_id' ), \S::get( 'products' ) ) ) {
+        if ( $this->repository->saveProductOrder( \Shared\Helpers\Helpers::get( 'category_id' ), \Shared\Helpers\Helpers::get( 'products' ) ) ) {
             $response = [ 'status' => 'ok' ];
         }
 
@@ -140,7 +140,7 @@ class ShopCategoryController
 
     public function cookie_categories(): void
     {
-        $categoryId = (string) \S::get( 'category_id' );
+        $categoryId = (string) \Shared\Helpers\Helpers::get( 'category_id' );
         if ( $categoryId === '' ) {
             echo json_encode( [ 'status' => 'error' ] );
             exit;
diff --git a/autoload/admin/Controllers/ShopClientsController.php b/autoload/admin/Controllers/ShopClientsController.php
index 08d3ac4..2072c86 100644
--- a/autoload/admin/Controllers/ShopClientsController.php
+++ b/autoload/admin/Controllers/ShopClientsController.php
@@ -61,7 +61,7 @@ class ShopClientsController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
@@ -155,9 +155,9 @@ class ShopClientsController
 
     public function details(): string
     {
-        $name = (string)\S::get('name');
-        $surname = (string)\S::get('surname');
-        $email = (string)\S::get('email');
+        $name = (string)\Shared\Helpers\Helpers::get('name');
+        $surname = (string)\Shared\Helpers\Helpers::get('surname');
+        $email = (string)\Shared\Helpers\Helpers::get('email');
 
         $ordersInfo = $this->repository->ordersForClient($name, $surname, $email);
         $totals = $this->repository->totalsForClient($name, $surname, $email);
diff --git a/autoload/admin/Controllers/ShopCouponController.php b/autoload/admin/Controllers/ShopCouponController.php
index 9025bf2..1a68697 100644
--- a/autoload/admin/Controllers/ShopCouponController.php
+++ b/autoload/admin/Controllers/ShopCouponController.php
@@ -65,7 +65,7 @@ class ShopCouponController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
@@ -172,7 +172,7 @@ class ShopCouponController
 
     public function edit(): string
     {
-        $coupon = $this->repository->find((int)\S::get('id'));
+        $coupon = $this->repository->find((int)\Shared\Helpers\Helpers::get('id'));
         $categories = $this->repository->categoriesTree(null);
 
         return \Tpl::view('shop-coupon/coupon-edit-new', [
@@ -187,7 +187,7 @@ class ShopCouponController
 
     public function save(): void
     {
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
 
         if ($legacyValues) {
             $values = json_decode((string)$legacyValues, true);
@@ -213,7 +213,7 @@ class ShopCouponController
 
         $payload = $_POST;
         if (empty($payload['id'])) {
-            $routeId = (int)\S::get('id');
+            $routeId = (int)\Shared\Helpers\Helpers::get('id');
             if ($routeId > 0) {
                 $payload['id'] = $routeId;
             }
@@ -243,8 +243,8 @@ class ShopCouponController
 
     public function delete(): void
     {
-        if ($this->repository->delete((int)\S::get('id'))) {
-            \S::alert('Kupon zostal usuniety.');
+        if ($this->repository->delete((int)\Shared\Helpers\Helpers::get('id'))) {
+            \Shared\Helpers\Helpers::alert('Kupon zostal usuniety.');
         }
 
         header('Location: /admin/shop_coupon/list/');
diff --git a/autoload/admin/Controllers/ShopOrderController.php b/autoload/admin/Controllers/ShopOrderController.php
index 207f4a9..3af5f11 100644
--- a/autoload/admin/Controllers/ShopOrderController.php
+++ b/autoload/admin/Controllers/ShopOrderController.php
@@ -162,7 +162,7 @@ class ShopOrderController
 
     public function order_details(): string
     {
-        $orderId = (int)\S::get('order_id');
+        $orderId = (int)\Shared\Helpers\Helpers::get('order_id');
         $order = $this->service->details($orderId);
 
         $coupon = null;
@@ -186,7 +186,7 @@ class ShopOrderController
 
     public function order_edit(): string
     {
-        $orderId = (int)\S::get('order_id');
+        $orderId = (int)\Shared\Helpers\Helpers::get('order_id');
 
         return \Tpl::view('shop-order/order-edit', [
             'order' => $this->service->details($orderId),
@@ -204,42 +204,42 @@ class ShopOrderController
     public function order_save(): void
     {
         $saved = $this->service->saveOrderByAdmin([
-            'order_id' => (int)\S::get('order_id'),
-            'client_name' => (string)\S::get('client_name'),
-            'client_surname' => (string)\S::get('client_surname'),
-            'client_street' => (string)\S::get('client_street'),
-            'client_postal_code' => (string)\S::get('client_postal_code'),
-            'client_city' => (string)\S::get('client_city'),
-            'client_email' => (string)\S::get('client_email'),
-            'firm_name' => (string)\S::get('firm_name'),
-            'firm_street' => (string)\S::get('firm_street'),
-            'firm_postal_code' => (string)\S::get('firm_postal_code'),
-            'firm_city' => (string)\S::get('firm_city'),
-            'firm_nip' => (string)\S::get('firm_nip'),
-            'transport_id' => (int)\S::get('transport_id'),
-            'inpost_paczkomat' => (string)\S::get('inpost_paczkomat'),
-            'payment_method_id' => (int)\S::get('payment_method_id'),
+            'order_id' => (int)\Shared\Helpers\Helpers::get('order_id'),
+            'client_name' => (string)\Shared\Helpers\Helpers::get('client_name'),
+            'client_surname' => (string)\Shared\Helpers\Helpers::get('client_surname'),
+            'client_street' => (string)\Shared\Helpers\Helpers::get('client_street'),
+            'client_postal_code' => (string)\Shared\Helpers\Helpers::get('client_postal_code'),
+            'client_city' => (string)\Shared\Helpers\Helpers::get('client_city'),
+            'client_email' => (string)\Shared\Helpers\Helpers::get('client_email'),
+            'firm_name' => (string)\Shared\Helpers\Helpers::get('firm_name'),
+            'firm_street' => (string)\Shared\Helpers\Helpers::get('firm_street'),
+            'firm_postal_code' => (string)\Shared\Helpers\Helpers::get('firm_postal_code'),
+            'firm_city' => (string)\Shared\Helpers\Helpers::get('firm_city'),
+            'firm_nip' => (string)\Shared\Helpers\Helpers::get('firm_nip'),
+            'transport_id' => (int)\Shared\Helpers\Helpers::get('transport_id'),
+            'inpost_paczkomat' => (string)\Shared\Helpers\Helpers::get('inpost_paczkomat'),
+            'payment_method_id' => (int)\Shared\Helpers\Helpers::get('payment_method_id'),
         ]);
 
         if ($saved) {
-            \S::alert('Zamówienie zostało zapisane.');
+            \Shared\Helpers\Helpers::alert('Zamówienie zostało zapisane.');
         }
 
-        header('Location: /admin/shop_order/order_details/order_id=' . (int)\S::get('order_id'));
+        header('Location: /admin/shop_order/order_details/order_id=' . (int)\Shared\Helpers\Helpers::get('order_id'));
         exit;
     }
 
     public function notes_save(): void
     {
-        $this->service->saveNotes((int)\S::get('order_id'), (string)\S::get('notes'));
+        $this->service->saveNotes((int)\Shared\Helpers\Helpers::get('order_id'), (string)\Shared\Helpers\Helpers::get('notes'));
     }
 
     public function order_status_change(): void
     {
         $response = $this->service->changeStatus(
-            (int)\S::get('order_id'),
-            (int)\S::get('status'),
-            (string)\S::get('email') === 'true'
+            (int)\Shared\Helpers\Helpers::get('order_id'),
+            (int)\Shared\Helpers\Helpers::get('status'),
+            (string)\Shared\Helpers\Helpers::get('email') === 'true'
         );
 
         echo json_encode($response);
@@ -248,7 +248,7 @@ class ShopOrderController
 
     public function order_resend_confirmation_email(): void
     {
-        $response = $this->service->resendConfirmationEmail((int)\S::get('order_id'));
+        $response = $this->service->resendConfirmationEmail((int)\Shared\Helpers\Helpers::get('order_id'));
 
         echo json_encode(['result' => $response]);
         exit;
@@ -256,7 +256,7 @@ class ShopOrderController
 
     public function set_order_as_unpaid(): void
     {
-        $orderId = (int)\S::get('order_id');
+        $orderId = (int)\Shared\Helpers\Helpers::get('order_id');
         $this->service->setOrderAsUnpaid($orderId);
 
         header('Location: /admin/shop_order/order_details/order_id=' . $orderId);
@@ -265,8 +265,8 @@ class ShopOrderController
 
     public function set_order_as_paid(): void
     {
-        $orderId = (int)\S::get('order_id');
-        $this->service->setOrderAsPaid($orderId, (int)\S::get('send_mail') === 1);
+        $orderId = (int)\Shared\Helpers\Helpers::get('order_id');
+        $this->service->setOrderAsPaid($orderId, (int)\Shared\Helpers\Helpers::get('send_mail') === 1);
 
         header('Location: /admin/shop_order/order_details/order_id=' . $orderId);
         exit;
@@ -274,12 +274,12 @@ class ShopOrderController
 
     public function send_order_to_apilo(): void
     {
-        $orderId = (int)\S::get('order_id');
+        $orderId = (int)\Shared\Helpers\Helpers::get('order_id');
 
         if ($this->service->sendOrderToApilo($orderId)) {
-            \S::alert('Zamówienie zostanie wysłane ponownie do apilo.com');
+            \Shared\Helpers\Helpers::alert('Zamówienie zostanie wysłane ponownie do apilo.com');
         } else {
-            \S::alert('Wystąpił błąd podczas wysyłania zamówienia do apilo.com');
+            \Shared\Helpers\Helpers::alert('Wystąpił błąd podczas wysyłania zamówienia do apilo.com');
         }
 
         header('Location: /admin/shop_order/order_details/order_id=' . $orderId);
@@ -288,7 +288,7 @@ class ShopOrderController
 
     public function toggle_trustmate_send(): void
     {
-        echo json_encode($this->service->toggleTrustmateSend((int)\S::get('order_id')));
+        echo json_encode($this->service->toggleTrustmateSend((int)\Shared\Helpers\Helpers::get('order_id')));
         exit;
     }
 
@@ -299,8 +299,8 @@ class ShopOrderController
 
     public function order_delete(): void
     {
-        if ($this->service->deleteOrder((int)\S::get('id'))) {
-            \S::alert('Zamówienie zostało usunięte');
+        if ($this->service->deleteOrder((int)\Shared\Helpers\Helpers::get('id'))) {
+            \Shared\Helpers\Helpers::alert('Zamówienie zostało usunięte');
         }
 
         header('Location: /admin/shop_order/list/');
diff --git a/autoload/admin/Controllers/ShopPaymentMethodController.php b/autoload/admin/Controllers/ShopPaymentMethodController.php
index 6ff4352..02e4d0c 100644
--- a/autoload/admin/Controllers/ShopPaymentMethodController.php
+++ b/autoload/admin/Controllers/ShopPaymentMethodController.php
@@ -46,7 +46,7 @@ class ShopPaymentMethodController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
@@ -131,9 +131,9 @@ class ShopPaymentMethodController
 
     public function edit(): string
     {
-        $paymentMethod = $this->repository->find((int)\S::get('id'));
+        $paymentMethod = $this->repository->find((int)\Shared\Helpers\Helpers::get('id'));
         if ($paymentMethod === null) {
-            \S::alert('Metoda platnosci nie zostala znaleziona.');
+            \Shared\Helpers\Helpers::alert('Metoda platnosci nie zostala znaleziona.');
             header('Location: /admin/shop_payment_method/list/');
             exit;
         }
@@ -148,7 +148,7 @@ class ShopPaymentMethodController
         $payload = $_POST;
         $paymentMethodId = isset($payload['id']) && $payload['id'] !== ''
             ? (int)$payload['id']
-            : (int)\S::get('id');
+            : (int)\Shared\Helpers\Helpers::get('id');
 
         $id = $this->repository->save($paymentMethodId, $payload);
         if ($id !== null) {
@@ -188,7 +188,7 @@ class ShopPaymentMethodController
             FormField::hidden('id', $id),
             FormField::custom(
                 'name_preview',
-                \Html::input([
+                \Shared\Html\Html::input([
                     'label' => 'Nazwa',
                     'name' => 'name_preview',
                     'id' => 'name_preview',
diff --git a/autoload/admin/Controllers/ShopProducerController.php b/autoload/admin/Controllers/ShopProducerController.php
index 58e9f8d..7656eb3 100644
--- a/autoload/admin/Controllers/ShopProducerController.php
+++ b/autoload/admin/Controllers/ShopProducerController.php
@@ -51,7 +51,7 @@ class ShopProducerController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
@@ -146,7 +146,7 @@ class ShopProducerController
 
     public function edit(): string
     {
-        $producer = $this->repository->find((int)\S::get('id'));
+        $producer = $this->repository->find((int)\Shared\Helpers\Helpers::get('id'));
         $languages = $this->languagesRepository->languagesList();
         $validationErrors = $_SESSION['form_errors'][$this->formId()] ?? null;
         if ($validationErrors) {
@@ -166,7 +166,7 @@ class ShopProducerController
     public function save(): void
     {
         // Legacy JSON (gridEdit)
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
         if ($legacyValues) {
             $values = json_decode((string)$legacyValues, true);
             $response = [
@@ -189,8 +189,8 @@ class ShopProducerController
                 );
 
                 if (!empty($id)) {
-                    \S::htacces();
-                    \S::delete_dir('../temp/');
+                    \Shared\Helpers\Helpers::htacces();
+                    \Shared\Helpers\Helpers::delete_dir('../temp/');
                     $response = [
                         'status' => 'ok',
                         'msg' => 'Producent zostal zapisany.',
@@ -204,7 +204,7 @@ class ShopProducerController
         }
 
         // Nowy flow (form-edit)
-        $producer = $this->repository->find((int)\S::get('id'));
+        $producer = $this->repository->find((int)\Shared\Helpers\Helpers::get('id'));
         $languages = $this->languagesRepository->languagesList();
         $form = $this->buildFormViewModel($producer, $languages);
 
@@ -240,8 +240,8 @@ class ShopProducerController
         );
 
         if ($savedId) {
-            \S::htacces();
-            \S::delete_dir('../temp/');
+            \Shared\Helpers\Helpers::htacces();
+            \Shared\Helpers\Helpers::delete_dir('../temp/');
             echo json_encode([
                 'success' => true,
                 'id' => $savedId,
@@ -264,10 +264,10 @@ class ShopProducerController
 
     public function delete(): void
     {
-        if ($this->repository->delete((int)\S::get('id'))) {
-            \S::htacces();
-            \S::delete_dir('../temp/');
-            \S::alert('Producent zostal usuniety.');
+        if ($this->repository->delete((int)\Shared\Helpers\Helpers::get('id'))) {
+            \Shared\Helpers\Helpers::htacces();
+            \Shared\Helpers\Helpers::delete_dir('../temp/');
+            \Shared\Helpers\Helpers::alert('Producent zostal usuniety.');
         }
 
         header('Location: /admin/shop_producer/list/');
diff --git a/autoload/admin/Controllers/ShopProductController.php b/autoload/admin/Controllers/ShopProductController.php
index a18ad36..916cbea 100644
--- a/autoload/admin/Controllers/ShopProductController.php
+++ b/autoload/admin/Controllers/ShopProductController.php
@@ -216,7 +216,7 @@ class ShopProductController
 
         $db = $GLOBALS['mdb'];
 
-        $product    = $this->repository->findForAdmin( (int) \S::get( 'id' ) );
+        $product    = $this->repository->findForAdmin( (int) \Shared\Helpers\Helpers::get( 'id' ) );
         $languages  = ( new \Domain\Languages\LanguagesRepository( $db ) )->languagesList();
         $categories = ( new CategoryRepository( $db ) )->subcategories( null );
         $layouts    = $this->layoutsForProductEdit( $db );
@@ -568,7 +568,7 @@ class ShopProductController
         $productId = (int) ( $product['id'] ?? 0 );
         $sku = $this->escapeHtml( (string) ( $product['sku'] ?? '' ) );
 
-        return \Html::input_icon( [
+        return \Shared\Html\Html::input_icon( [
             'label'        => 'Kod SKU',
             'name'         => 'sku',
             'id'           => 'sku',
@@ -731,7 +731,7 @@ class ShopProductController
 
     private function resolveSavePayload(): array
     {
-        $legacyRaw = \S::get( 'values' );
+        $legacyRaw = \Shared\Helpers\Helpers::get( 'values' );
         if ( $legacyRaw !== null && $legacyRaw !== '' ) {
             $legacy = json_decode( (string) $legacyRaw, true );
             if ( is_array( $legacy ) ) {
@@ -771,10 +771,10 @@ class ShopProductController
      */
     public function duplicate_product(): void
     {
-        if ( $this->repository->duplicate( (int) \S::get( 'product-id' ), (bool) (int) \S::get( 'combination' ) ) ) {
-            \S::set_message( 'Produkt został zduplikowany.' );
+        if ( $this->repository->duplicate( (int) \Shared\Helpers\Helpers::get( 'product-id' ), (bool) (int) \Shared\Helpers\Helpers::get( 'combination' ) ) ) {
+            \Shared\Helpers\Helpers::set_message( 'Produkt został zduplikowany.' );
         } else {
-            \S::alert( 'Podczas duplikowania produktu wystąpił błąd. Proszę spróbować ponownie' );
+            \Shared\Helpers\Helpers::alert( 'Podczas duplikowania produktu wystąpił błąd. Proszę spróbować ponownie' );
         }
 
         header( 'Location: /admin/shop_product/view_list/' );
@@ -786,10 +786,10 @@ class ShopProductController
      */
     public function product_archive(): void
     {
-        if ( $this->repository->archive( (int) \S::get( 'product_id' ) ) ) {
-            \S::alert( 'Produkt został przeniesiony do archiwum.' );
+        if ( $this->repository->archive( (int) \Shared\Helpers\Helpers::get( 'product_id' ) ) ) {
+            \Shared\Helpers\Helpers::alert( 'Produkt został przeniesiony do archiwum.' );
         } else {
-            \S::alert( 'Podczas przenoszenia produktu do archiwum wystąpił błąd. Proszę spróbować ponownie' );
+            \Shared\Helpers\Helpers::alert( 'Podczas przenoszenia produktu do archiwum wystąpił błąd. Proszę spróbować ponownie' );
         }
 
         header( 'Location: /admin/shop_product/view_list/' );
@@ -801,10 +801,10 @@ class ShopProductController
      */
     public function product_unarchive(): void
     {
-        if ( $this->repository->unarchive( (int) \S::get( 'product_id' ) ) ) {
-            \S::alert( 'Produkt został przywrócony z archiwum.' );
+        if ( $this->repository->unarchive( (int) \Shared\Helpers\Helpers::get( 'product_id' ) ) ) {
+            \Shared\Helpers\Helpers::alert( 'Produkt został przywrócony z archiwum.' );
         } else {
-            \S::alert( 'Podczas przywracania produktu z archiwum wystąpił błąd. Proszę spróbować ponownie' );
+            \Shared\Helpers\Helpers::alert( 'Podczas przywracania produktu z archiwum wystąpił błąd. Proszę spróbować ponownie' );
         }
 
         header( 'Location: /admin/product_archive/list/' );
@@ -816,10 +816,10 @@ class ShopProductController
      */
     public function product_delete(): void
     {
-        if ( $this->repository->delete( (int) \S::get( 'id' ) ) ) {
-            \S::set_message( 'Produkt został usunięty.' );
+        if ( $this->repository->delete( (int) \Shared\Helpers\Helpers::get( 'id' ) ) ) {
+            \Shared\Helpers\Helpers::set_message( 'Produkt został usunięty.' );
         } else {
-            \S::alert( 'Podczas usuwania produktu wystąpił błąd. Proszę spróbować ponownie' );
+            \Shared\Helpers\Helpers::alert( 'Podczas usuwania produktu wystąpił błąd. Proszę spróbować ponownie' );
         }
 
         header( 'Location: /admin/shop_product/view_list/' );
@@ -831,8 +831,8 @@ class ShopProductController
      */
     public function change_product_status(): void
     {
-        if ( $this->repository->toggleStatus( (int) \S::get( 'product-id' ) ) ) {
-            \S::set_message( 'Status produktu został zmieniony' );
+        if ( $this->repository->toggleStatus( (int) \Shared\Helpers\Helpers::get( 'product-id' ) ) ) {
+            \Shared\Helpers\Helpers::set_message( 'Status produktu został zmieniony' );
         }
 
         header( 'Location: ' . $_SERVER['HTTP_REFERER'] );
@@ -846,7 +846,7 @@ class ShopProductController
     {
         $response = [ 'status' => 'error', 'msg' => 'Podczas zmiany ceny wystąpił błąd. Proszę spróbować ponownie.' ];
 
-        if ( $this->repository->updatePriceBrutto( (int) \S::get( 'product_id' ), \S::get( 'price' ) ) ) {
+        if ( $this->repository->updatePriceBrutto( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'price' ) ) ) {
             $response = [ 'status' => 'ok' ];
         }
 
@@ -861,7 +861,7 @@ class ShopProductController
     {
         $response = [ 'status' => 'error', 'msg' => 'Podczas zmiany ceny wystąpił błąd. Proszę spróbować ponownie.' ];
 
-        if ( $this->repository->updatePriceBruttoPromo( (int) \S::get( 'product_id' ), \S::get( 'price' ) ) ) {
+        if ( $this->repository->updatePriceBruttoPromo( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'price' ) ) ) {
             $response = [ 'status' => 'ok' ];
         }
 
@@ -876,7 +876,7 @@ class ShopProductController
     {
         $response = [ 'status' => 'error', 'msg' => 'Podczas zmiany google xml label wystąpił błąd. Proszę spróbować ponownie.' ];
 
-        if ( $this->repository->updateCustomLabel( (int) \S::get( 'product_id' ), \S::get( 'custom_label' ), \S::get( 'value' ) ) ) {
+        if ( $this->repository->updateCustomLabel( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'custom_label' ), \Shared\Helpers\Helpers::get( 'value' ) ) ) {
             $response = [ 'status' => 'ok' ];
         }
 
@@ -891,7 +891,7 @@ class ShopProductController
     {
         $response = [ 'status' => 'error', 'msg' => 'Podczas pobierania sugestii dla custom label wystąpił błąd. Proszę spróbować ponownie.' ];
 
-        $suggestions = $this->repository->customLabelSuggestions( \S::get( 'custom_label' ), \S::get( 'label_type' ) );
+        $suggestions = $this->repository->customLabelSuggestions( \Shared\Helpers\Helpers::get( 'custom_label' ), \Shared\Helpers\Helpers::get( 'label_type' ) );
         if ( $suggestions ) {
             $response = [ 'status' => 'ok', 'suggestions' => $suggestions ];
         }
@@ -907,7 +907,7 @@ class ShopProductController
     {
         $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania custom label wystąpił błąd. Proszę spróbować ponownie.' ];
 
-        if ( $this->repository->saveCustomLabel( (int) \S::get( 'product_id' ), \S::get( 'custom_label' ), \S::get( 'label_type' ) ) ) {
+        if ( $this->repository->saveCustomLabel( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'custom_label' ), \Shared\Helpers\Helpers::get( 'label_type' ) ) ) {
             $response = [ 'status' => 'ok' ];
         }
 
@@ -920,7 +920,7 @@ class ShopProductController
      */
     public function ajax_product_url(): void
     {
-        echo json_encode( [ 'url' => \shop\Product::getProductUrl( (int) \S::get( 'product_id' ) ) ] );
+        echo json_encode( [ 'url' => \shop\Product::getProductUrl( (int) \Shared\Helpers\Helpers::get( 'product_id' ) ) ] );
         exit;
     }
 
@@ -931,7 +931,7 @@ class ShopProductController
     {
         $response = [ 'status' => 'error', 'msg' => 'Podczas generowania kodu sku wystąpił błąd. Proszę spróbować ponownie.' ];
 
-        $sku = \shop\Product::generate_sku_code( (int) \S::get( 'product_id' ) );
+        $sku = \shop\Product::generate_sku_code( (int) \Shared\Helpers\Helpers::get( 'product_id' ) );
         if ( $sku ) {
             $response = [ 'status' => 'ok', 'sku' => $sku ];
         }
@@ -950,10 +950,10 @@ class ShopProductController
         $db = $GLOBALS['mdb'];
 
         return \Tpl::view( 'shop-product/product-combination', [
-            'product'              => $this->repository->findForAdmin( (int) \S::get( 'product_id' ) ),
+            'product'              => $this->repository->findForAdmin( (int) \Shared\Helpers\Helpers::get( 'product_id' ) ),
             'attributes'           => ( new \Domain\Attribute\AttributeRepository( $db ) )->getAttributesListForCombinations(),
             'default_language'     => $this->languagesRepository->defaultLanguage(),
-            'product_permutations' => $this->repository->getCombinationsForTable( (int) \S::get( 'product_id' ) ),
+            'product_permutations' => $this->repository->getCombinationsForTable( (int) \Shared\Helpers\Helpers::get( 'product_id' ) ),
         ] );
     }
 
@@ -970,11 +970,11 @@ class ShopProductController
             }
         }
 
-        if ( $this->repository->generateCombinations( (int) \S::get( 'product_id' ), $attributes ) ) {
-            \S::alert( 'Kombinacje produktu zostały wygenerowane.' );
+        if ( $this->repository->generateCombinations( (int) \Shared\Helpers\Helpers::get( 'product_id' ), $attributes ) ) {
+            \Shared\Helpers\Helpers::alert( 'Kombinacje produktu zostały wygenerowane.' );
         }
 
-        header( 'Location: /admin/shop_product/product_combination/product_id=' . (int) \S::get( 'product_id' ) );
+        header( 'Location: /admin/shop_product/product_combination/product_id=' . (int) \Shared\Helpers\Helpers::get( 'product_id' ) );
         exit;
     }
 
@@ -983,13 +983,13 @@ class ShopProductController
      */
     public function delete_combination(): void
     {
-        if ( $this->repository->deleteCombination( (int) \S::get( 'combination_id' ) ) ) {
-            \S::alert( 'Kombinacja produktu została usunięta' );
+        if ( $this->repository->deleteCombination( (int) \Shared\Helpers\Helpers::get( 'combination_id' ) ) ) {
+            \Shared\Helpers\Helpers::alert( 'Kombinacja produktu została usunięta' );
         } else {
-            \S::alert( 'Podczas usuwania kombinacji produktu wystąpił błąd. Proszę spróbować ponownie' );
+            \Shared\Helpers\Helpers::alert( 'Podczas usuwania kombinacji produktu wystąpił błąd. Proszę spróbować ponownie' );
         }
 
-        header( 'Location: /admin/shop_product/product_combination/product_id=' . \S::get( 'product_id' ) );
+        header( 'Location: /admin/shop_product/product_combination/product_id=' . \Shared\Helpers\Helpers::get( 'product_id' ) );
         exit;
     }
 
@@ -998,7 +998,7 @@ class ShopProductController
      */
     public function product_combination_stock_0_buy_save(): void
     {
-        $this->repository->saveCombinationStock0Buy( (int) \S::get( 'product_id' ), \S::get( 'stock_0_buy' ) );
+        $this->repository->saveCombinationStock0Buy( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'stock_0_buy' ) );
         echo json_encode( [ 'status' => 'ok' ] );
         exit;
     }
@@ -1008,7 +1008,7 @@ class ShopProductController
      */
     public function product_combination_sku_save(): void
     {
-        $this->repository->saveCombinationSku( (int) \S::get( 'product_id' ), \S::get( 'sku' ) );
+        $this->repository->saveCombinationSku( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'sku' ) );
         echo json_encode( [ 'status' => 'ok' ] );
         exit;
     }
@@ -1018,7 +1018,7 @@ class ShopProductController
      */
     public function product_combination_quantity_save(): void
     {
-        $this->repository->saveCombinationQuantity( (int) \S::get( 'product_id' ), \S::get( 'quantity' ) );
+        $this->repository->saveCombinationQuantity( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'quantity' ) );
         echo json_encode( [ 'status' => 'ok' ] );
         exit;
     }
@@ -1028,7 +1028,7 @@ class ShopProductController
      */
     public function product_combination_price_save(): void
     {
-        $this->repository->saveCombinationPrice( (int) \S::get( 'product_id' ), \S::get( 'price' ) );
+        $this->repository->saveCombinationPrice( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'price' ) );
         echo json_encode( [ 'status' => 'ok' ] );
         exit;
     }
@@ -1040,7 +1040,7 @@ class ShopProductController
     {
         $response = [ 'status' => 'error', 'msg' => 'Podczas usuwania kombinacji wystąpił błąd.' ];
 
-        if ( $this->repository->deleteCombination( (int) \S::get( 'combination_id' ) ) ) {
+        if ( $this->repository->deleteCombination( (int) \Shared\Helpers\Helpers::get( 'combination_id' ) ) ) {
             $response = [ 'status' => 'ok' ];
         }
 
@@ -1057,7 +1057,7 @@ class ShopProductController
     {
         $response = [ 'status' => 'error', 'msg' => 'Podczas usuwania zdjecia wystąpił błąd. Proszę spróbować ponownie.' ];
 
-        if ( $this->repository->deleteImage( (int) \S::get( 'image_id' ) ) ) {
+        if ( $this->repository->deleteImage( (int) \Shared\Helpers\Helpers::get( 'image_id' ) ) ) {
             $response = [ 'status' => 'ok' ];
         }
 
@@ -1070,7 +1070,7 @@ class ShopProductController
      */
     public function images_order_save(): void
     {
-        if ( $this->repository->saveImagesOrder( (int) \S::get( 'product_id' ), \S::get( 'order' ) ) ) {
+        if ( $this->repository->saveImagesOrder( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'order' ) ) ) {
             echo json_encode( [ 'status' => 'ok', 'msg' => 'Produkt został zapisany.' ] );
         }
 
@@ -1084,7 +1084,7 @@ class ShopProductController
     {
         $response = [ 'status' => 'error', 'msg' => 'Podczas zmiany atrybutu alt zdjęcia wystąpił błąd. Proszę spróbować ponownie.' ];
 
-        if ( $this->repository->updateImageAlt( (int) \S::get( 'image_id' ), \S::get( 'image_alt' ) ) ) {
+        if ( $this->repository->updateImageAlt( (int) \Shared\Helpers\Helpers::get( 'image_id' ), \Shared\Helpers\Helpers::get( 'image_alt' ) ) ) {
             $response = [ 'status' => 'ok' ];
         }
 
@@ -1099,7 +1099,7 @@ class ShopProductController
     {
         $response = [ 'status' => 'error', 'msg' => 'Podczas usuwania pliku wystąpił błąd.' ];
 
-        if ( $this->repository->deleteFile( (int) \S::get( 'file_id' ) ) ) {
+        if ( $this->repository->deleteFile( (int) \Shared\Helpers\Helpers::get( 'file_id' ) ) ) {
             $response = [ 'status' => 'ok' ];
         }
 
@@ -1114,7 +1114,7 @@ class ShopProductController
     {
         $response = [ 'status' => 'error', 'msg' => 'Podczas zmiany nazwy pliku wystąpił błąd.' ];
 
-        if ( $this->repository->updateFileName( (int) \S::get( 'file_id' ), \S::get( 'file_name' ) ) ) {
+        if ( $this->repository->updateFileName( (int) \Shared\Helpers\Helpers::get( 'file_id' ), \Shared\Helpers\Helpers::get( 'file_name' ) ) ) {
             $response = [ 'status' => 'ok' ];
         }
 
@@ -1129,7 +1129,7 @@ class ShopProductController
     {
         $response = [ 'status' => 'error', 'msg' => 'Podczas usuwania zdjęcia wystąpił błąd.' ];
 
-        if ( $this->repository->deleteImage( (int) \S::get( 'image_id' ) ) ) {
+        if ( $this->repository->deleteImage( (int) \Shared\Helpers\Helpers::get( 'image_id' ) ) ) {
             $response = [ 'status' => 'ok' ];
         }
 
@@ -1158,8 +1158,8 @@ class ShopProductController
      */
     public function mass_edit_save(): void
     {
-        $discountPercent = \S::get( 'discount_percent' );
-        $products = \S::get( 'products' );
+        $discountPercent = \Shared\Helpers\Helpers::get( 'discount_percent' );
+        $products = \Shared\Helpers\Helpers::get( 'products' );
 
         if ( $discountPercent != '' && $products && is_array( $products ) && count( $products ) > 0 ) {
             $productId = (int) $products[0];
@@ -1184,7 +1184,7 @@ class ShopProductController
      */
     public function get_products_by_category(): void
     {
-        $categoryId = (int) \S::get( 'category_id' );
+        $categoryId = (int) \Shared\Helpers\Helpers::get( 'category_id' );
         $products = $this->repository->getProductsByCategory( $categoryId );
 
         echo json_encode( [ 'status' => 'ok', 'products' => $products ] );
diff --git a/autoload/admin/Controllers/ShopProductSetsController.php b/autoload/admin/Controllers/ShopProductSetsController.php
index b963a09..ab048ad 100644
--- a/autoload/admin/Controllers/ShopProductSetsController.php
+++ b/autoload/admin/Controllers/ShopProductSetsController.php
@@ -45,7 +45,7 @@ class ShopProductSetsController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
@@ -132,7 +132,7 @@ class ShopProductSetsController
 
     public function edit(): string
     {
-        $set = $this->repository->find((int)\S::get('id'));
+        $set = $this->repository->find((int)\Shared\Helpers\Helpers::get('id'));
         $products = $this->repository->allProductsMap();
 
         return \Tpl::view('shop-product-sets/product-set-edit', [
@@ -147,7 +147,7 @@ class ShopProductSetsController
 
     public function save(): void
     {
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
 
         if ($legacyValues) {
             $values = json_decode((string)$legacyValues, true);
@@ -184,7 +184,7 @@ class ShopProductSetsController
 
         $payload = $_POST;
         if (empty($payload['id'])) {
-            $routeId = (int)\S::get('id');
+            $routeId = (int)\Shared\Helpers\Helpers::get('id');
             if ($routeId > 0) {
                 $payload['id'] = $routeId;
             }
@@ -220,8 +220,8 @@ class ShopProductSetsController
 
     public function delete(): void
     {
-        if ($this->repository->delete((int)\S::get('id'))) {
-            \S::alert('Komplet produktow zostal usuniety.');
+        if ($this->repository->delete((int)\Shared\Helpers\Helpers::get('id'))) {
+            \Shared\Helpers\Helpers::alert('Komplet produktow zostal usuniety.');
         }
 
         header('Location: /admin/shop_product_sets/list/');
diff --git a/autoload/admin/Controllers/ShopPromotionController.php b/autoload/admin/Controllers/ShopPromotionController.php
index 4786fbf..9ceb17f 100644
--- a/autoload/admin/Controllers/ShopPromotionController.php
+++ b/autoload/admin/Controllers/ShopPromotionController.php
@@ -45,7 +45,7 @@ class ShopPromotionController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'DESC';
         }
 
@@ -136,7 +136,7 @@ class ShopPromotionController
 
     public function edit(): string
     {
-        $promotion = $this->repository->find((int)\S::get('id'));
+        $promotion = $this->repository->find((int)\Shared\Helpers\Helpers::get('id'));
         $categories = $this->repository->categoriesTree(null);
 
         return \Tpl::view('shop-promotion/promotion-edit', [
@@ -146,7 +146,7 @@ class ShopPromotionController
 
     public function save(): void
     {
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
 
         if ($legacyValues) {
             $values = json_decode((string)$legacyValues, true);
@@ -172,7 +172,7 @@ class ShopPromotionController
 
         $payload = $_POST;
         if (empty($payload['id'])) {
-            $routeId = (int)\S::get('id');
+            $routeId = (int)\Shared\Helpers\Helpers::get('id');
             if ($routeId > 0) {
                 $payload['id'] = $routeId;
             }
@@ -197,8 +197,8 @@ class ShopPromotionController
 
     public function delete(): void
     {
-        if ($this->repository->delete((int)\S::get('id'))) {
-            \S::alert('Promocja zostala usunieta.');
+        if ($this->repository->delete((int)\Shared\Helpers\Helpers::get('id'))) {
+            \Shared\Helpers\Helpers::alert('Promocja zostala usunieta.');
         }
 
         header('Location: /admin/shop_promotion/list/');
diff --git a/autoload/admin/Controllers/ShopStatusesController.php b/autoload/admin/Controllers/ShopStatusesController.php
index 22ac7c3..27d0d7f 100644
--- a/autoload/admin/Controllers/ShopStatusesController.php
+++ b/autoload/admin/Controllers/ShopStatusesController.php
@@ -36,7 +36,7 @@ class ShopStatusesController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
@@ -122,9 +122,9 @@ class ShopStatusesController
 
     public function edit(): string
     {
-        $status = $this->repository->find((int)\S::get('id'));
+        $status = $this->repository->find((int)\Shared\Helpers\Helpers::get('id'));
         if ($status === null) {
-            \S::alert('Status nie zostal znaleziony.');
+            \Shared\Helpers\Helpers::alert('Status nie zostal znaleziony.');
             header('Location: /admin/shop_statuses/list/');
             exit;
         }
@@ -138,7 +138,7 @@ class ShopStatusesController
 
     public function save(): void
     {
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
 
         if ($legacyValues) {
             $values = json_decode((string)$legacyValues, true);
@@ -166,7 +166,7 @@ class ShopStatusesController
         $payload = $_POST;
         $statusId = isset($payload['id']) && $payload['id'] !== '' ? (int)$payload['id'] : null;
         if ($statusId === null) {
-            $statusId = (int)\S::get('id');
+            $statusId = (int)\Shared\Helpers\Helpers::get('id');
         }
 
         $id = $this->repository->save($statusId, $payload);
diff --git a/autoload/admin/Controllers/ShopTransportController.php b/autoload/admin/Controllers/ShopTransportController.php
index ebe160a..1a16e89 100644
--- a/autoload/admin/Controllers/ShopTransportController.php
+++ b/autoload/admin/Controllers/ShopTransportController.php
@@ -51,7 +51,7 @@ class ShopTransportController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
@@ -88,7 +88,7 @@ class ShopTransportController
                 'lp' => $lp++ . '.',
                 'default' => $default === 1 ? 'tak' : '<span style="color: #FF0000;">nie</span>',
                 'status' => $status === 1 ? 'tak' : '<span style="color: #FF0000;">nie</span>',
-                'cost' => \S::decimal($cost) . ' zł',
+                'cost' => \Shared\Helpers\Helpers::decimal($cost) . ' zł',
                 'max_wp' => $maxWp !== null ? (int)$maxWp : '-',
                 'name' => '<a href="/admin/shop_transport/edit/id=' . $id . '">' . htmlspecialchars($name, ENT_QUOTES, 'UTF-8') . '</a>',
                 'apilo_carrier' => htmlspecialchars((string)$apiloLabel, ENT_QUOTES, 'UTF-8'),
@@ -145,9 +145,9 @@ class ShopTransportController
 
     public function edit(): string
     {
-        $transport = $this->transportRepository->find((int)\S::get('id'));
+        $transport = $this->transportRepository->find((int)\Shared\Helpers\Helpers::get('id'));
         if ($transport === null) {
-            \S::alert('Rodzaj transportu nie został znaleziony.');
+            \Shared\Helpers\Helpers::alert('Rodzaj transportu nie został znaleziony.');
             header('Location: /admin/shop_transport/list/');
             exit;
         }
@@ -165,13 +165,13 @@ class ShopTransportController
         $payload = $_POST;
         $transportId = isset($payload['id']) && $payload['id'] !== ''
             ? (int)$payload['id']
-            : (int)\S::get('id');
+            : (int)\Shared\Helpers\Helpers::get('id');
 
         $payload['id'] = $transportId;
 
         $id = $this->transportRepository->save($payload);
         if ($id !== null) {
-            \S::delete_dir('../temp/');
+            \Shared\Helpers\Helpers::delete_dir('../temp/');
             echo json_encode([
                 'success' => true,
                 'id' => (int)$id,
diff --git a/autoload/admin/Controllers/UpdateController.php b/autoload/admin/Controllers/UpdateController.php
index e26eba1..4a607c5 100644
--- a/autoload/admin/Controllers/UpdateController.php
+++ b/autoload/admin/Controllers/UpdateController.php
@@ -15,8 +15,8 @@ class UpdateController
     public function main_view(): string
     {
         return \Tpl::view( 'update/main-view', [
-            'ver'     => \S::get_version(),
-            'new_ver' => \S::get_new_version(),
+            'ver'     => \Shared\Helpers\Helpers::get_version(),
+            'new_ver' => \Shared\Helpers\Helpers::get_new_version(),
         ] );
     }
 
@@ -25,9 +25,9 @@ class UpdateController
         $result = $this->repository->update();
 
         if ( !$result['success'] ) {
-            \S::alert( 'W trakcie aktualizacji systemu wystąpił błąd. Proszę spróbować ponownie.' );
+            \Shared\Helpers\Helpers::alert( 'W trakcie aktualizacji systemu wystąpił błąd. Proszę spróbować ponownie.' );
         } else {
-            \S::set_message( 'Aktualizacja przebiegła pomyślnie.' );
+            \Shared\Helpers\Helpers::set_message( 'Aktualizacja przebiegła pomyślnie.' );
         }
 
         header( 'Location: /admin/update/main_view/' );
@@ -40,7 +40,7 @@ class UpdateController
 
         $response = [
             'status'  => !empty( $result['success'] ) && empty( $result['no_updates'] ),
-            'version' => number_format( (float) \S::get( 'version_current' ) + 0.001, 3, '.', '' ),
+            'version' => number_format( (float) \Shared\Helpers\Helpers::get( 'version_current' ) + 0.001, 3, '.', '' ),
         ];
 
         echo json_encode( $response );
diff --git a/autoload/admin/Controllers/UsersController.php b/autoload/admin/Controllers/UsersController.php
index 6d89283..e75ed3d 100644
--- a/autoload/admin/Controllers/UsersController.php
+++ b/autoload/admin/Controllers/UsersController.php
@@ -20,8 +20,8 @@ class UsersController
 
     public function user_delete(): void
     {
-        if ($this->repository->delete((int)\S::get('id'))) {
-            \S::alert('Uzytkownik zostal usuniety.');
+        if ($this->repository->delete((int)\Shared\Helpers\Helpers::get('id'))) {
+            \Shared\Helpers\Helpers::alert('Uzytkownik zostal usuniety.');
         }
 
         header('Location: /admin/users/view_list/');
@@ -30,7 +30,7 @@ class UsersController
 
     public function user_save(): void
     {
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
         if ($legacyValues) {
             $values = json_decode((string)$legacyValues, true);
             if (!is_array($values)) {
@@ -61,7 +61,7 @@ class UsersController
             exit;
         }
 
-        $userId = (int)\S::get('id');
+        $userId = (int)\Shared\Helpers\Helpers::get('id');
         $user = $this->normalizeUser($this->repository->find($userId));
         $viewModel = $this->buildFormViewModel($user);
 
@@ -116,7 +116,7 @@ class UsersController
 
     public function user_edit(): string
     {
-        $user = $this->normalizeUser($this->repository->find((int)\S::get('id')));
+        $user = $this->normalizeUser($this->repository->find((int)\Shared\Helpers\Helpers::get('id')));
         $validationErrors = $_SESSION['form_errors'][$this->getFormId()] ?? null;
         if ($validationErrors) {
             unset($_SESSION['form_errors'][$this->getFormId()]);
@@ -155,7 +155,7 @@ class UsersController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
diff --git a/autoload/admin/Support/Forms/FormFieldRenderer.php b/autoload/admin/Support/Forms/FormFieldRenderer.php
index 6bfcfd9..16e85f7 100644
--- a/autoload/admin/Support/Forms/FormFieldRenderer.php
+++ b/autoload/admin/Support/Forms/FormFieldRenderer.php
@@ -57,7 +57,7 @@ class FormFieldRenderer
             $params['class'] .= ' error';
         }
 
-        return $this->wrapWithError(\Html::input($params), $error);
+        return $this->wrapWithError(\Shared\Html\Html::input($params), $error);
     }
 
     /**
@@ -81,7 +81,7 @@ class FormFieldRenderer
             $params['class'] .= ' error';
         }
 
-        return $this->wrapWithError(\Html::input($params), $error);
+        return $this->wrapWithError(\Shared\Html\Html::input($params), $error);
     }
 
     /**
@@ -105,7 +105,7 @@ class FormFieldRenderer
             $params['class'] .= ' error';
         }
 
-        return $this->wrapWithError(\Html::input($params), $error);
+        return $this->wrapWithError(\Shared\Html\Html::input($params), $error);
     }
 
     /**
@@ -115,7 +115,7 @@ class FormFieldRenderer
     {
         $value = $this->form->getFieldValue($field);
         
-        return \Html::input([
+        return \Shared\Html\Html::input([
             'label' => $field->label,
             'name' => $field->name,
             'id' => $field->id,
@@ -146,7 +146,7 @@ class FormFieldRenderer
             $params['class'] .= ' error';
         }
 
-        return $this->wrapWithError(\Html::input($params), $error);
+        return $this->wrapWithError(\Shared\Html\Html::input($params), $error);
     }
 
     /**
@@ -156,7 +156,7 @@ class FormFieldRenderer
     {
         $value = $this->form->getFieldValue($field);
         
-        return \Html::input([
+        return \Shared\Html\Html::input([
             'label' => $field->label,
             'name' => $field->name,
             'id' => $field->id,
@@ -180,7 +180,7 @@ class FormFieldRenderer
             $checked = (bool) $value;
         }
         
-        return \Html::input_switch([
+        return \Shared\Html\Html::input_switch([
             'label' => $field->label,
             'name' => $field->name,
             'id' => $field->id,
@@ -209,7 +209,7 @@ class FormFieldRenderer
             $params['class'] .= ' error';
         }
 
-        return $this->wrapWithError(\Html::select($params), $error);
+        return $this->wrapWithError(\Shared\Html\Html::select($params), $error);
     }
 
     /**
@@ -219,7 +219,7 @@ class FormFieldRenderer
     {
         $value = $this->form->getFieldValue($field);
         
-        return \Html::textarea([
+        return \Shared\Html\Html::textarea([
             'label' => $field->label,
             'name' => $field->name,
             'id' => $field->id,
@@ -236,7 +236,7 @@ class FormFieldRenderer
     {
         $value = $this->form->getFieldValue($field);
         
-        return \Html::textarea([
+        return \Shared\Html\Html::textarea([
             'label' => $field->label,
             'name' => $field->name,
             'id' => $field->id,
@@ -255,7 +255,7 @@ class FormFieldRenderer
         
         $filemanagerUrl = $field->filemanagerUrl ?? $this->generateFilemanagerUrl($field->id);
         
-        return \Html::input_icon([
+        return \Shared\Html\Html::input_icon([
             'label' => $field->label,
             'name' => $field->name,
             'id' => $field->id,
@@ -276,7 +276,7 @@ class FormFieldRenderer
         if ($field->useFilemanager) {
             $filemanagerUrl = $field->filemanagerUrl ?? $this->generateFilemanagerUrl($field->id);
             
-            return \Html::input_icon([
+            return \Shared\Html\Html::input_icon([
                 'label' => $field->label,
                 'name' => $field->name,
                 'id' => $field->id,
@@ -287,7 +287,7 @@ class FormFieldRenderer
             ]);
         }
         
-        return \Html::input([
+        return \Shared\Html\Html::input([
             'label' => $field->label,
             'name' => $field->name,
             'id' => $field->id,
@@ -395,7 +395,7 @@ class FormFieldRenderer
         switch ($field->type) {
             case FormFieldType::IMAGE:
                 $filemanagerUrl = $field->filemanagerUrl ?? $this->generateFilemanagerUrl($id);
-                return $this->wrapWithError(\Html::input_icon([
+                return $this->wrapWithError(\Shared\Html\Html::input_icon([
                     'label' => $field->label,
                     'name' => $name,
                     'id' => $id,
@@ -407,7 +407,7 @@ class FormFieldRenderer
                 
             case FormFieldType::TEXTAREA:
             case FormFieldType::EDITOR:
-                return $this->wrapWithError(\Html::textarea([
+                return $this->wrapWithError(\Shared\Html\Html::textarea([
                     'label' => $field->label,
                     'name' => $name,
                     'id' => $id,
@@ -417,7 +417,7 @@ class FormFieldRenderer
                 ]), $error);
                 
             case FormFieldType::SWITCH:
-                return \Html::input_switch([
+                return \Shared\Html\Html::input_switch([
                     'label' => $field->label,
                     'name' => $name,
                     'id' => $id,
@@ -425,7 +425,7 @@ class FormFieldRenderer
                 ]);
 
             case FormFieldType::SELECT:
-                return $this->wrapWithError(\Html::select([
+                return $this->wrapWithError(\Shared\Html\Html::select([
                     'label' => $field->label,
                     'name' => $name,
                     'id' => $id,
@@ -441,7 +441,7 @@ class FormFieldRenderer
                         $iconJs = str_replace('{lang}', (string)$languageId, $iconJs);
                     }
 
-                    return $this->wrapWithError(\Html::input_icon([
+                    return $this->wrapWithError(\Shared\Html\Html::input_icon([
                         'label' => $field->label,
                         'name' => $name,
                         'id' => $id,
@@ -454,7 +454,7 @@ class FormFieldRenderer
                     ]), $error);
                 }
 
-                return $this->wrapWithError(\Html::input([
+                return $this->wrapWithError(\Shared\Html\Html::input([
                     'label' => $field->label,
                     'name' => $name,
                     'id' => $id,
diff --git a/autoload/admin/Support/class.TableListRequestFactory.php b/autoload/admin/Support/class.TableListRequestFactory.php
index d43b0e2..bf73ea8 100644
--- a/autoload/admin/Support/class.TableListRequestFactory.php
+++ b/autoload/admin/Support/class.TableListRequestFactory.php
@@ -39,8 +39,8 @@ class TableListRequestFactory
             $defaultPerPage = (int)$perPageOptions[0];
         }
 
-        $page = max(1, (int)\S::get('page'));
-        $perPage = (int)\S::get('per_page');
+        $page = max(1, (int)\Shared\Helpers\Helpers::get('page'));
+        $perPage = (int)\Shared\Helpers\Helpers::get('per_page');
         if (!in_array($perPage, $perPageOptions, true)) {
             $perPage = $defaultPerPage;
         }
@@ -56,7 +56,7 @@ class TableListRequestFactory
             }
 
             $type = (string)($definition['type'] ?? 'text');
-            $value = (string)\S::get($key);
+            $value = (string)\Shared\Helpers\Helpers::get($key);
 
             $filters[$key] = $value;
             $queryFilters[$key] = $value;
@@ -75,12 +75,12 @@ class TableListRequestFactory
             $viewFilters[] = $filterConfig;
         }
 
-        $sortColumn = trim((string)\S::get('sort'));
+        $sortColumn = trim((string)\Shared\Helpers\Helpers::get('sort'));
         if (!in_array($sortColumn, $sortableColumns, true)) {
             $sortColumn = $defaultSortColumn;
         }
 
-        $sortDir = strtoupper(trim((string)\S::get('dir')));
+        $sortDir = strtoupper(trim((string)\Shared\Helpers\Helpers::get('dir')));
         if (!in_array($sortDir, ['ASC', 'DESC'], true)) {
             $sortDir = 'DESC';
         }
diff --git a/autoload/class.Log.php b/autoload/class.Log.php
deleted file mode 100644
index 0afc67e..0000000
--- a/autoload/class.Log.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?
-class Log
-{
-  static public function save_log( $message, $user_id = null )
-  {
-    global $mdb;
-
-    $mdb -> insert( 'pp_log', [
-      'message' => $message,
-      'user_id' => $user_id ? $user_id : null,
-      'date' => date( 'Y-m-d H:i:s' )
-    ] );
-  }
-}
\ No newline at end of file
diff --git a/autoload/class.Mobile_Detect.php b/autoload/class.Mobile_Detect.php
deleted file mode 100644
index 50d57f0..0000000
--- a/autoload/class.Mobile_Detect.php
+++ /dev/null
@@ -1,1431 +0,0 @@
-<?php
-/**
- * Mobile Detect Library
- * =====================
- *
- * Motto: "Every business should have a mobile detection script to detect mobile readers"
- *
- * Mobile_Detect is a lightweight PHP class for detecting mobile devices (including tablets).
- * It uses the User-Agent string combined with specific HTTP headers to detect the mobile environment.
- *
- * @author      Current authors: Serban Ghita <serbanghita@gmail.com>
- *                               Nick Ilyin <nick.ilyin@gmail.com>
- *
- *              Original author: Victor Stanciu <vic.stanciu@gmail.com>
- *
- * @license     Code and contributions have 'MIT License'
- *              More details: https://github.com/serbanghita/Mobile-Detect/blob/master/LICENSE.txt
- *
- * @link        Homepage:     http://mobiledetect.net
- *              GitHub Repo:  https://github.com/serbanghita/Mobile-Detect
- *              Google Code:  http://code.google.com/p/php-mobile-detect/
- *              README:       https://github.com/serbanghita/Mobile-Detect/blob/master/README.md
- *              HOWTO:        https://github.com/serbanghita/Mobile-Detect/wiki/Code-examples
- *
- * @version     2.8.16
- */
-
-class Mobile_Detect
-{
-    /**
-     * Mobile detection type.
-     *
-     * @deprecated since version 2.6.9
-     */
-    const DETECTION_TYPE_MOBILE     = 'mobile';
-
-    /**
-     * Extended detection type.
-     *
-     * @deprecated since version 2.6.9
-     */
-    const DETECTION_TYPE_EXTENDED   = 'extended';
-
-    /**
-     * A frequently used regular expression to extract version #s.
-     *
-     * @deprecated since version 2.6.9
-     */
-    const VER                       = '([\w._\+]+)';
-
-    /**
-     * Top-level device.
-     */
-    const MOBILE_GRADE_A            = 'A';
-
-    /**
-     * Mid-level device.
-     */
-    const MOBILE_GRADE_B            = 'B';
-
-    /**
-     * Low-level device.
-     */
-    const MOBILE_GRADE_C            = 'C';
-
-    /**
-     * Stores the version number of the current release.
-     */
-    const VERSION                   = '2.8.16';
-
-    /**
-     * A type for the version() method indicating a string return value.
-     */
-    const VERSION_TYPE_STRING       = 'text';
-
-    /**
-     * A type for the version() method indicating a float return value.
-     */
-    const VERSION_TYPE_FLOAT        = 'float';
-
-    /**
-     * A cache for resolved matches
-     * @var array
-     */
-    protected $cache = array();
-
-    /**
-     * The User-Agent HTTP header is stored in here.
-     * @var string
-     */
-    protected $userAgent = null;
-
-    /**
-     * HTTP headers in the PHP-flavor. So HTTP_USER_AGENT and SERVER_SOFTWARE.
-     * @var array
-     */
-    protected $httpHeaders = array();
-
-    /**
-     * CloudFront headers. E.g. CloudFront-Is-Desktop-Viewer, CloudFront-Is-Mobile-Viewer & CloudFront-Is-Tablet-Viewer.
-     * @var array
-     */
-    protected $cloudfrontHeaders = array();
-
-    /**
-     * The matching Regex.
-     * This is good for debug.
-     * @var string
-     */
-    protected $matchingRegex = null;
-
-    /**
-     * The matches extracted from the regex expression.
-     * This is good for debug.
-     * @var string
-     */
-    protected $matchesArray = null;
-
-    /**
-     * The detection type, using self::DETECTION_TYPE_MOBILE or self::DETECTION_TYPE_EXTENDED.
-     *
-     * @deprecated since version 2.6.9
-     *
-     * @var string
-     */
-    protected $detectionType = self::DETECTION_TYPE_MOBILE;
-
-    /**
-     * HTTP headers that trigger the 'isMobile' detection
-     * to be true.
-     *
-     * @var array
-     */
-    protected static $mobileHeaders = array(
-
-            'HTTP_ACCEPT'                  => array('matches' => array(
-                                                                        // Opera Mini; @reference: http://dev.opera.com/articles/view/opera-binary-markup-language/
-                                                                        'application/x-obml2d',
-                                                                        // BlackBerry devices.
-                                                                        'application/vnd.rim.html',
-                                                                        'text/vnd.wap.wml',
-                                                                        'application/vnd.wap.xhtml+xml'
-                                            )),
-            'HTTP_X_WAP_PROFILE'           => null,
-            'HTTP_X_WAP_CLIENTID'          => null,
-            'HTTP_WAP_CONNECTION'          => null,
-            'HTTP_PROFILE'                 => null,
-            // Reported by Opera on Nokia devices (eg. C3).
-            'HTTP_X_OPERAMINI_PHONE_UA'    => null,
-            'HTTP_X_NOKIA_GATEWAY_ID'      => null,
-            'HTTP_X_ORANGE_ID'             => null,
-            'HTTP_X_VODAFONE_3GPDPCONTEXT' => null,
-            'HTTP_X_HUAWEI_USERID'         => null,
-            // Reported by Windows Smartphones.
-            'HTTP_UA_OS'                   => null,
-            // Reported by Verizon, Vodafone proxy system.
-            'HTTP_X_MOBILE_GATEWAY'        => null,
-            // Seen this on HTC Sensation. SensationXE_Beats_Z715e.
-            'HTTP_X_ATT_DEVICEID'          => null,
-            // Seen this on a HTC.
-            'HTTP_UA_CPU'                  => array('matches' => array('ARM')),
-    );
-
-    /**
-     * List of mobile devices (phones).
-     *
-     * @var array
-     */
-    protected static $phoneDevices = array(
-        'iPhone'        => '\biPhone\b|\biPod\b', // |\biTunes
-        'BlackBerry'    => 'BlackBerry|\bBB10\b|rim[0-9]+',
-        'HTC'           => 'HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\bEVO\b|T-Mobile G1|Z520m',
-        'Nexus'         => 'Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6',
-        // @todo: Is 'Dell Streak' a tablet or a phone? ;)
-        'Dell'          => 'Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\b001DL\b|\b101DL\b|\bGS01\b',
-        'Motorola'      => 'Motorola|DROIDX|DROID BIONIC|\bDroid\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\bMoto E\b',
-        'Samsung'       => 'Samsung|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205',
-        'LG'            => '\bLG\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802)',
-        'Sony'          => 'SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533',
-        'Asus'          => 'Asus.*Galaxy|PadFone.*Mobile',
-        // http://www.micromaxinfo.com/mobiles/smartphones
-        // Added because the codes might conflict with Acer Tablets.
-        'Micromax'      => 'Micromax.*\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\b',
-        // @todo Complete the regex.
-        'Palm'          => 'PalmSource|Palm', // avantgo|blazer|elaine|hiptop|plucker|xiino ;
-        'Vertu'         => 'Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature', // Just for fun ;)
-        // http://www.pantech.co.kr/en/prod/prodList.do?gbrand=VEGA (PANTECH)
-        // Most of the VEGA devices are legacy. PANTECH seem to be newer devices based on Android.
-        'Pantech'       => 'PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790',
-        // http://www.fly-phone.com/devices/smartphones/ ; Included only smartphones.
-        'Fly'           => 'IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250',
-        // http://fr.wikomobile.com
-        'Wiko'          => 'KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM',
-        'iMobile'        => 'i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)',
-        // Added simvalley mobile just for fun. They have some interesting devices.
-        // http://www.simvalley.fr/telephonie---gps-_22_telephonie-mobile_telephones_.html
-        'SimValley'     => '\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\b',
-         // Wolfgang - a brand that is sold by Aldi supermarkets.
-         // http://www.wolfgangmobile.com/
-        'Wolfgang'      => 'AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q',
-        'Alcatel'       => 'Alcatel',
-        'Nintendo' => 'Nintendo 3DS',
-        // http://en.wikipedia.org/wiki/Amoi
-        'Amoi'          => 'Amoi',
-        // http://en.wikipedia.org/wiki/INQ
-        'INQ'           => 'INQ',
-        // @Tapatalk is a mobile app; http://support.tapatalk.com/threads/smf-2-0-2-os-and-browser-detection-plugin-and-tapatalk.15565/#post-79039
-        'GenericPhone'  => 'Tapatalk|PDA;|SAGEM|\bmmp\b|pocket|\bpsp\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\bwap\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser',
-    );
-
-    /**
-     * List of tablet devices.
-     *
-     * @var array
-     */
-    protected static $tabletDevices = array(
-        'iPad'              => 'iPad|iPad.*Mobile', // @todo: check for mobile friendly emails topic.
-        'NexusTablet'       => 'Android.*Nexus[\s]+(7|9|10)|^.*Android.*Nexus(?:(?!Mobile).)*$',
-        'SamsungTablet'     => 'SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T360', // SCH-P709|SCH-P729|SM-T2558|GT-I9205 - Samsung Mega - treat them like a regular phone.
-        // http://docs.aws.amazon.com/silk/latest/developerguide/user-agent.html
-        'Kindle'            => 'Kindle|Silk.*Accelerated|Android.*\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI)\b',
-        // Only the Surface tablets with Windows RT are considered mobile.
-        // http://msdn.microsoft.com/en-us/library/ie/hh920767(v=vs.85).aspx
-        'SurfaceTablet'     => 'Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)',
-        // http://shopping1.hp.com/is-bin/INTERSHOP.enfinity/WFS/WW-USSMBPublicStore-Site/en_US/-/USD/ViewStandardCatalog-Browse?CatalogCategoryID=JfIQ7EN5lqMAAAEyDcJUDwMT
-        'HPTablet'          => 'HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10',
-        // Watch out for PadFone, see #132.
-        // http://www.asus.com/de/Tablets_Mobile/Memo_Pad_Products/
-        'AsusTablet'        => '^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\bK00F\b|\bK00C\b|\bK00E\b|\bK00L\b|TX201LA|ME176C|ME102A|\bM80TA\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K017 |ME572C|ME103K|ME170C|ME171C|\bME70C\b|ME581C|ME581CL|ME8510C|ME181C',
-        'BlackBerryTablet'  => 'PlayBook|RIM Tablet',
-        'HTCtablet'         => 'HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410',
-        'MotorolaTablet'    => 'xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617',
-        'NookTablet'        => 'Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2',
-        // http://www.acer.ro/ac/ro/RO/content/drivers
-        // http://www.packardbell.co.uk/pb/en/GB/content/download (Packard Bell is part of Acer)
-        // http://us.acer.com/ac/en/US/content/group/tablets
-        // http://www.acer.de/ac/de/DE/content/models/tablets/
-        // Can conflict with Micromax and Motorola phones codes.
-        'AcerTablet'        => 'Android.*; \b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\b|W3-810|\bA3-A10\b|\bA3-A11\b',
-        // http://eu.computers.toshiba-europe.com/innovation/family/Tablets/1098744/banner_id/tablet_footerlink/
-        // http://us.toshiba.com/tablets/tablet-finder
-        // http://www.toshiba.co.jp/regza/tablet/
-        'ToshibaTablet'     => 'Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO',
-        // http://www.nttdocomo.co.jp/english/service/developer/smart_phone/technical_info/spec/index.html
-        // http://www.lg.com/us/tablets
-        'LGTablet'          => '\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\b',
-        'FujitsuTablet'     => 'Android.*\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\b',
-        // Prestigio Tablets http://www.prestigio.com/support
-        'PrestigioTablet'   => 'PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD',
-        // http://support.lenovo.com/en_GB/downloads/default.page?#
-        'LenovoTablet'      => 'Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)',
-        // http://www.dell.com/support/home/us/en/04/Products/tab_mob/tablets
-        'DellTablet'        => 'Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7',
-        // http://www.yarvik.com/en/matrix/tablets/
-        'YarvikTablet'      => 'Android.*\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\b',
-        'MedionTablet'      => 'Android.*\bOYO\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB',
-        'ArnovaTablet'      => 'AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2',
-        // http://www.intenso.de/kategorie_en.php?kategorie=33
-        // @todo: http://www.nbhkdz.com/read/b8e64202f92a2df129126bff.html - investigate
-        'IntensoTablet'     => 'INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004',
-        // IRU.ru Tablets http://www.iru.ru/catalog/soho/planetable/
-        'IRUTablet'         => 'M702pro',
-        'MegafonTablet'     => 'MegaFon V9|\bZTE V9\b|Android.*\bMT7A\b',
-        // http://www.e-boda.ro/tablete-pc.html
-        'EbodaTablet'       => 'E-Boda (Supreme|Impresspeed|Izzycomm|Essential)',
-        // http://www.allview.ro/produse/droseries/lista-tablete-pc/
-        'AllViewTablet'           => 'Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)',
-        // http://wiki.archosfans.com/index.php?title=Main_Page
-        'ArchosTablet'      => '\b(101G9|80G9|A101IT)\b|Qilive 97R|Archos5|\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\b',
-        // http://www.ainol.com/plugin.php?identifier=ainol&module=product
-        'AinolTablet'       => 'NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark',
-        // @todo: inspect http://esupport.sony.com/US/p/select-system.pl?DIRECTOR=DRIVER
-        // Readers http://www.atsuhiro-me.net/ebook/sony-reader/sony-reader-web-browser
-        // http://www.sony.jp/support/tablet/
-        'SonyTablet'        => 'Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP612',
-        // http://www.support.philips.com/support/catalog/worldproducts.jsp?userLanguage=en&userCountry=cn&categoryid=3G_LTE_TABLET_SU_CN_CARE&title=3G%20tablets%20/%20LTE%20range&_dyncharset=UTF-8
-        'PhilipsTablet'     => '\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\b',
-        // db + http://www.cube-tablet.com/buy-products.html
-        'CubeTablet'        => 'Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT',
-        // http://www.cobyusa.com/?p=pcat&pcat_id=3001
-        'CobyTablet'        => 'MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010',
-        // http://www.match.net.cn/products.asp
-        'MIDTablet'         => 'M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733',
-        // http://www.msi.com/support
-        // @todo Research the Windows Tablets.
-        'MSITablet' => 'MSI \b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\b',
-        // @todo http://www.kyoceramobile.com/support/drivers/
-    //    'KyoceraTablet' => null,
-        // @todo http://intexuae.com/index.php/category/mobile-devices/tablets-products/
-    //    'IntextTablet' => null,
-        // http://pdadb.net/index.php?m=pdalist&list=SMiT (NoName Chinese Tablets)
-        // http://www.imp3.net/14/show.php?itemid=20454
-        'SMiTTablet'        => 'Android.*(\bMID\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)',
-        // http://www.rock-chips.com/index.php?do=prod&pid=2
-        'RockChipTablet'    => 'Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A',
-        // http://www.fly-phone.com/devices/tablets/ ; http://www.fly-phone.com/service/
-        'FlyTablet'         => 'IQ310|Fly Vision',
-        // http://www.bqreaders.com/gb/tablets-prices-sale.html
-        'bqTablet'          => '(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris E10)|Maxwell.*Lite|Maxwell.*Plus',
-        // http://www.huaweidevice.com/worldwide/productFamily.do?method=index&directoryId=5011&treeId=3290
-        // http://www.huaweidevice.com/worldwide/downloadCenter.do?method=index&directoryId=3372&treeId=0&tb=1&type=software (including legacy tablets)
-        'HuaweiTablet'      => 'MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim',
-        // Nec or Medias Tab
-        'NecTablet'         => '\bN-06D|\bN-08D',
-        // Pantech Tablets: http://www.pantechusa.com/phones/
-        'PantechTablet'     => 'Pantech.*P4100',
-        // Broncho Tablets: http://www.broncho.cn/ (hard to find)
-        'BronchoTablet'     => 'Broncho.*(N701|N708|N802|a710)',
-        // http://versusuk.com/support.html
-        'VersusTablet'      => 'TOUCHPAD.*[78910]|\bTOUCHTAB\b',
-        // http://www.zync.in/index.php/our-products/tablet-phablets
-        'ZyncTablet'        => 'z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900',
-        // http://www.positivoinformatica.com.br/www/pessoal/tablet-ypy/
-        'PositivoTablet'    => 'TB07STA|TB10STA|TB07FTA|TB10FTA',
-        // https://www.nabitablet.com/
-        'NabiTablet'        => 'Android.*\bNabi',
-        'KoboTablet'        => 'Kobo Touch|\bK080\b|\bVox\b Build|\bArc\b Build',
-        // French Danew Tablets http://www.danew.com/produits-tablette.php
-        'DanewTablet'       => 'DSlide.*\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\b',
-        // Texet Tablets and Readers http://www.texet.ru/tablet/
-        'TexetTablet'       => 'NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE',
-        // Avoid detecting 'PLAYSTATION 3' as mobile.
-        'PlaystationTablet' => 'Playstation.*(Portable|Vita)',
-        // http://www.trekstor.de/surftabs.html
-        'TrekstorTablet'    => 'ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab',
-        // http://www.pyleaudio.com/Products.aspx?%2fproducts%2fPersonal-Electronics%2fTablets
-        'PyleAudioTablet'   => '\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\b',
-        // http://www.advandigital.com/index.php?link=content-product&jns=JP001
-        // because of the short codenames we have to include whitespaces to reduce the possible conflicts.
-        'AdvanTablet'       => 'Android.* \b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\b ',
-        // http://www.danytech.com/category/tablet-pc
-        'DanyTechTablet' => 'Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1',
-        // http://www.galapad.net/product.html
-        'GalapadTablet'     => 'Android.*\bG1\b',
-        // http://www.micromaxinfo.com/tablet/funbook
-        'MicromaxTablet'    => 'Funbook|Micromax.*\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\b',
-        // http://www.karbonnmobiles.com/products_tablet.php
-        'KarbonnTablet'     => 'Android.*\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\b',
-        // http://www.myallfine.com/Products.asp
-        'AllFineTablet'     => 'Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide',
-        // http://www.proscanvideo.com/products-search.asp?itemClass=TABLET&itemnmbr=
-        'PROSCANTablet'     => '\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\b',
-        // http://www.yonesnav.com/products/products.php
-        'YONESTablet' => 'BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026',
-        // http://www.cjshowroom.com/eproducts.aspx?classcode=004001001
-        // China manufacturer makes tablets for different small brands (eg. http://www.zeepad.net/index.html)
-        'ChangJiaTablet'    => 'TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503',
-        // http://www.gloryunion.cn/products.asp
-        // http://www.allwinnertech.com/en/apply/mobile.html
-        // http://www.ptcl.com.pk/pd_content.php?pd_id=284 (EVOTAB)
-        // @todo: Softwiner tablets?
-        // aka. Cute or Cool tablets. Not sure yet, must research to avoid collisions.
-        'GUTablet'          => 'TX-A1301|TX-M9002|Q702|kf026', // A12R|D75A|D77|D79|R83|A95|A106C|R15|A75|A76|D71|D72|R71|R73|R77|D82|R85|D92|A97|D92|R91|A10F|A77F|W71F|A78F|W78F|W81F|A97F|W91F|W97F|R16G|C72|C73E|K72|K73|R96G
-        // http://www.pointofview-online.com/showroom.php?shop_mode=product_listing&category_id=118
-        'PointOfViewTablet' => 'TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10',
-        // http://www.overmax.pl/pl/katalog-produktow,p8/tablety,c14/
-        // @todo: add more tests.
-        'OvermaxTablet'     => 'OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)',
-        // http://hclmetablet.com/India/index.php
-        'HCLTablet'         => 'HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync',
-        // http://www.edigital.hu/Tablet_es_e-book_olvaso/Tablet-c18385.html
-        'DPSTablet'         => 'DPS Dream 9|DPS Dual 7',
-        // http://www.visture.com/index.asp
-        'VistureTablet'     => 'V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10',
-        // http://www.mijncresta.nl/tablet
-        'CrestaTablet'     => 'CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989',
-        // MediaTek - http://www.mediatek.com/_en/01_products/02_proSys.php?cata_sn=1&cata1_sn=1&cata2_sn=309
-        'MediatekTablet' => '\bMT8125|MT8389|MT8135|MT8377\b',
-        // Concorde tab
-        'ConcordeTablet' => 'Concorde([ ]+)?Tab|ConCorde ReadMan',
-        // GoClever Tablets - http://www.goclever.com/uk/products,c1/tablet,c5/
-        'GoCleverTablet' => 'GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042',
-        // Modecom Tablets - http://www.modecom.eu/tablets/portal/
-        'ModecomTablet' => 'FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003',
-        // Vonino Tablets - http://www.vonino.eu/tablets
-        'VoninoTablet'  => '\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\bQ8\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\b',
-        // ECS Tablets - http://www.ecs.com.tw/ECSWebSite/Product/Product_Tablet_List.aspx?CategoryID=14&MenuID=107&childid=M_107&LanID=0
-        'ECSTablet'     => 'V07OT2|TM105A|S10OT1|TR10CS1',
-        // Storex Tablets - http://storex.fr/espace_client/support.html
-        // @note: no need to add all the tablet codes since they are guided by the first regex.
-        'StorexTablet'  => 'eZee[_\']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab',
-        // Generic Vodafone tablets.
-        'VodafoneTablet' => 'SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7',
-        // French tablets - Essentiel B http://www.boulanger.fr/tablette_tactile_e-book/tablette_tactile_essentiel_b/cl_68908.htm?multiChoiceToDelete=brand&mc_brand=essentielb
-        // Aka: http://www.essentielb.fr/
-        'EssentielBTablet' => 'Smart[ \']?TAB[ ]+?[0-9]+|Family[ \']?TAB2',
-        // Ross & Moor - http://ross-moor.ru/
-        'RossMoorTablet' => 'RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711',
-        // i-mobile http://product.i-mobilephone.com/Mobile_Device
-        'iMobileTablet'        => 'i-mobile i-note',
-        // http://www.tolino.de/de/vergleichen/
-        'TolinoTablet'  => 'tolino tab [0-9.]+|tolino shine',
-        // AudioSonic - a Kmart brand
-        // http://www.kmart.com.au/webapp/wcs/stores/servlet/Search?langId=-1&storeId=10701&catalogId=10001&categoryId=193001&pageSize=72&currentPage=1&searchCategory=193001%2b4294965664&sortBy=p_MaxPrice%7c1
-        'AudioSonicTablet' => '\bC-22Q|T7-QC|T-17B|T-17P\b',
-        // AMPE Tablets - http://www.ampe.com.my/product-category/tablets/
-        // @todo: add them gradually to avoid conflicts.
-        'AMPETablet' => 'Android.* A78 ',
-        // Skk Mobile - http://skkmobile.com.ph/product_tablets.php
-        'SkkTablet' => 'Android.* (SKYPAD|PHOENIX|CYCLOPS)',
-        // Tecno Mobile (only tablet) - http://www.tecno-mobile.com/index.php/product?filterby=smart&list_order=all&page=1
-        'TecnoTablet' => 'TECNO P9',
-        // JXD (consoles & tablets) - http://jxd.hk/products.asp?selectclassid=009008&clsid=3
-        'JXDTablet' => 'Android.*\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\b',
-        // i-Joy tablets - http://www.i-joy.es/en/cat/products/tablets/
-        'iJoyTablet' => 'Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)',
-        // http://www.intracon.eu/tablet
-        'FX2Tablet' => 'FX2 PAD7|FX2 PAD10',
-        // http://www.xoro.de/produkte/
-        // @note: Might be the same brand with 'Simply tablets'
-        'XoroTablet'        => 'KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151',
-        // http://www1.viewsonic.com/products/computing/tablets/
-        'ViewsonicTablet'   => 'ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a',
-        // http://www.odys.de/web/internet-tablet_en.html
-        'OdysTablet'        => 'LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\bXELIO\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10',
-        // http://www.captiva-power.de/products.html#tablets-en
-        'CaptivaTablet'     => 'CAPTIVA PAD',
-        // IconBIT - http://www.iconbit.com/products/tablets/
-        'IconbitTablet' => 'NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S',
-        // http://www.teclast.com/topic.php?channelID=70&topicID=140&pid=63
-        'TeclastTablet' => 'T98 4G|\bP80\b|\bX90HD\b|X98 Air|X98 Air 3G|\bX89\b|P80 3G|\bX80h\b|P98 Air|\bX89HD\b|P98 3G|\bP90HD\b|P89 3G|X98 3G|\bP70h\b|P79HD 3G|G18d 3G|\bP79HD\b|\bP89s\b|\bA88\b|\bP10HD\b|\bP19HD\b|G18 3G|\bP78HD\b|\bA78\b|\bP75\b|G17s 3G|G17h 3G|\bP85t\b|\bP90\b|\bP11\b|\bP98t\b|\bP98HD\b|\bG18d\b|\bP85s\b|\bP11HD\b|\bP88s\b|\bA80HD\b|\bA80se\b|\bA10h\b|\bP89\b|\bP78s\b|\bG18\b|\bP85\b|\bA70h\b|\bA70\b|\bG17\b|\bP18\b|\bA80s\b|\bA11s\b|\bP88HD\b|\bA80h\b|\bP76s\b|\bP76h\b|\bP98\b|\bA10HD\b|\bP78\b|\bP88\b|\bA11\b|\bA10t\b|\bP76a\b|\bP76t\b|\bP76e\b|\bP85HD\b|\bP85a\b|\bP86\b|\bP75HD\b|\bP76v\b|\bA12\b|\bP75a\b|\bA15\b|\bP76Ti\b|\bP81HD\b|\bA10\b|\bT760VE\b|\bT720HD\b|\bP76\b|\bP73\b|\bP71\b|\bP72\b|\bT720SE\b|\bC520Ti\b|\bT760\b|\bT720VE\b|T720-3GE|T720-WiFi',
-        // Onda - http://www.onda-tablet.com/buy-android-onda.html?dir=desc&limit=all&order=price
-        'OndaTablet' => '\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\b[\s]+',
-        'JaytechTablet'     => 'TPC-PA762',
-        'BlaupunktTablet'   => 'Endeavour 800NG|Endeavour 1010',
-        // http://www.digma.ru/support/download/
-        // @todo: Ebooks also (if requested)
-        'DigmaTablet' => '\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\b',
-        // http://www.evolioshop.com/ro/tablete-pc.html
-        // http://www.evolio.ro/support/downloads_static.html?cat=2
-        // @todo: Research some more
-        'EvolioTablet' => 'ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\bEvotab\b|\bNeura\b',
-        // @todo http://www.lavamobiles.com/tablets-data-cards
-        'LavaTablet' => 'QPAD E704|\bIvoryS\b|E-TAB IVORY|\bE-TAB\b',
-        // https://www.celkonmobiles.com/?_a=categoryphones&sid=2
-        'CelkonTablet' => 'CT695|CT888|CT[\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\bCT-1\b',
-        // http://www.wolderelectronics.com/productos/manuales-y-guias-rapidas/categoria-2-miTab
-        'WolderTablet' => 'miTab \b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\b',
-        // http://www.mi.com/en
-        'MiTablet' => '\bMI PAD\b|\bHM NOTE 1W\b',
-        // http://www.nbru.cn/index.html
-        'NibiruTablet' => 'Nibiru M1|Nibiru Jupiter One',
-        // http://navroad.com/products/produkty/tablety/
-        'NexoTablet' => 'NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI',
-        // http://leader-online.com/new_site/product-category/tablets/
-        // http://www.leader-online.net.au/List/Tablet
-        'LeaderTablet' => 'TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100',
-        // http://www.datawind.com/ubislate/
-        'UbislateTablet' => 'UbiSlate[\s]?7C',
-        // http://www.pocketbook-int.com/ru/support
-        'PocketBookTablet' => 'Pocketbook',
-        // http://www.tesco.com/direct/hudl/
-        'Hudl'              => 'Hudl HT7S3',
-        // http://www.telstra.com.au/home-phone/thub-2/
-        'TelstraTablet'     => 'T-Hub2',
-        'GenericTablet'     => 'Android.*\b97D\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\bA7EB\b|CatNova8|A1_07|CT704|CT1002|\bM721\b|rk30sdk|\bEVOTAB\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\bM6pro\b|CT1020W|arc 10HD|\bJolla\b|\bTP750\b'
-    );
-
-    /**
-     * List of mobile Operating Systems.
-     *
-     * @var array
-     */
-    protected static $operatingSystems = array(
-        'AndroidOS'         => 'Android',
-        'BlackBerryOS'      => 'blackberry|\bBB10\b|rim tablet os',
-        'PalmOS'            => 'PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino',
-        'SymbianOS'         => 'Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\bS60\b',
-        // @reference: http://en.wikipedia.org/wiki/Windows_Mobile
-        'WindowsMobileOS'   => 'Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;',
-        // @reference: http://en.wikipedia.org/wiki/Windows_Phone
-        // http://wifeng.cn/?r=blog&a=view&id=106
-        // http://nicksnettravels.builttoroam.com/post/2011/01/10/Bogus-Windows-Phone-7-User-Agent-String.aspx
-        // http://msdn.microsoft.com/library/ms537503.aspx
-        'WindowsPhoneOS'   => 'Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;',
-        'iOS'               => '\biPhone.*Mobile|\biPod|\biPad',
-        // http://en.wikipedia.org/wiki/MeeGo
-        // @todo: research MeeGo in UAs
-        'MeeGoOS'           => 'MeeGo',
-        // http://en.wikipedia.org/wiki/Maemo
-        // @todo: research Maemo in UAs
-        'MaemoOS'           => 'Maemo',
-        'JavaOS'            => 'J2ME/|\bMIDP\b|\bCLDC\b', // '|Java/' produces bug #135
-        'webOS'             => 'webOS|hpwOS',
-        'badaOS'            => '\bBada\b',
-        'BREWOS'            => 'BREW',
-    );
-
-    /**
-     * List of mobile User Agents.
-     *
-     * @var array
-     */
-    protected static $browsers = array(
-        // @reference: https://developers.google.com/chrome/mobile/docs/user-agent
-        'Chrome'          => '\bCrMo\b|CriOS|Android.*Chrome/[.0-9]* (Mobile)?',
-        'Dolfin'          => '\bDolfin\b',
-        'Opera'           => 'Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR/[0-9.]+|Coast/[0-9.]+',
-        'Skyfire'         => 'Skyfire',
-        'IE'              => 'IEMobile|MSIEMobile', // |Trident/[.0-9]+
-        'Firefox'         => 'fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile',
-        'Bolt'            => 'bolt',
-        'TeaShark'        => 'teashark',
-        'Blazer'          => 'Blazer',
-        // @reference: http://developer.apple.com/library/safari/#documentation/AppleApplications/Reference/SafariWebContent/OptimizingforSafarioniPhone/OptimizingforSafarioniPhone.html#//apple_ref/doc/uid/TP40006517-SW3
-        'Safari'          => 'Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari',
-        // http://en.wikipedia.org/wiki/Midori_(web_browser)
-        //'Midori'          => 'midori',
-        'Tizen'           => 'Tizen',
-        'UCBrowser'       => 'UC.*Browser|UCWEB',
-        'baiduboxapp'     => 'baiduboxapp',
-        'baidubrowser'    => 'baidubrowser',
-        // https://github.com/serbanghita/Mobile-Detect/issues/7
-        'DiigoBrowser'    => 'DiigoBrowser',
-        // http://www.puffinbrowser.com/index.php
-        'Puffin'            => 'Puffin',
-        // http://mercury-browser.com/index.html
-        'Mercury'          => '\bMercury\b',
-        // http://en.wikipedia.org/wiki/Obigo_Browser
-        'ObigoBrowser' => 'Obigo',
-        // http://en.wikipedia.org/wiki/NetFront
-        'NetFront' => 'NF-Browser',
-        // @reference: http://en.wikipedia.org/wiki/Minimo
-        // http://en.wikipedia.org/wiki/Vision_Mobile_Browser
-        'GenericBrowser'  => 'NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger',
-    );
-
-    /**
-     * Utilities.
-     *
-     * @var array
-     */
-    protected static $utilities = array(
-        // Experimental. When a mobile device wants to switch to 'Desktop Mode'.
-        // http://scottcate.com/technology/windows-phone-8-ie10-desktop-or-mobile/
-        // https://github.com/serbanghita/Mobile-Detect/issues/57#issuecomment-15024011
-        // https://developers.facebook.com/docs/sharing/best-practices
-        'Bot'         => 'Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom',
-        'MobileBot'   => 'Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker/M1A1-R2D2',
-        'DesktopMode' => 'WPDesktop',
-        'TV'          => 'SonyDTV|HbbTV', // experimental
-        'WebKit'      => '(webkit)[ /]([\w.]+)',
-        // @todo: Include JXD consoles.
-        'Console'     => '\b(Nintendo|Nintendo WiiU|Nintendo 3DS|PLAYSTATION|Xbox)\b',
-        'Watch'       => 'SM-V700',
-    );
-
-    /**
-     * All possible HTTP headers that represent the
-     * User-Agent string.
-     *
-     * @var array
-     */
-    protected static $uaHttpHeaders = array(
-        // The default User-Agent string.
-        'HTTP_USER_AGENT',
-        // Header can occur on devices using Opera Mini.
-        'HTTP_X_OPERAMINI_PHONE_UA',
-        // Vodafone specific header: http://www.seoprinciple.com/mobile-web-community-still-angry-at-vodafone/24/
-        'HTTP_X_DEVICE_USER_AGENT',
-        'HTTP_X_ORIGINAL_USER_AGENT',
-        'HTTP_X_SKYFIRE_PHONE',
-        'HTTP_X_BOLT_PHONE_UA',
-        'HTTP_DEVICE_STOCK_UA',
-        'HTTP_X_UCBROWSER_DEVICE_UA'
-    );
-
-    /**
-     * The individual segments that could exist in a User-Agent string. VER refers to the regular
-     * expression defined in the constant self::VER.
-     *
-     * @var array
-     */
-    protected static $properties = array(
-
-        // Build
-        'Mobile'        => 'Mobile/[VER]',
-        'Build'         => 'Build/[VER]',
-        'Version'       => 'Version/[VER]',
-        'VendorID'      => 'VendorID/[VER]',
-
-        // Devices
-        'iPad'          => 'iPad.*CPU[a-z ]+[VER]',
-        'iPhone'        => 'iPhone.*CPU[a-z ]+[VER]',
-        'iPod'          => 'iPod.*CPU[a-z ]+[VER]',
-        //'BlackBerry'    => array('BlackBerry[VER]', 'BlackBerry [VER];'),
-        'Kindle'        => 'Kindle/[VER]',
-
-        // Browser
-        'Chrome'        => array('Chrome/[VER]', 'CriOS/[VER]', 'CrMo/[VER]'),
-        'Coast'         => array('Coast/[VER]'),
-        'Dolfin'        => 'Dolfin/[VER]',
-        // @reference: https://developer.mozilla.org/en-US/docs/User_Agent_Strings_Reference
-        'Firefox'       => 'Firefox/[VER]',
-        'Fennec'        => 'Fennec/[VER]',
-        // http://msdn.microsoft.com/en-us/library/ms537503(v=vs.85).aspx
-        // https://msdn.microsoft.com/en-us/library/ie/hh869301(v=vs.85).aspx
-        'IE'      => array('IEMobile/[VER];', 'IEMobile [VER]', 'MSIE [VER];', 'Trident/[0-9.]+;.*rv:[VER]'),
-        // http://en.wikipedia.org/wiki/NetFront
-        'NetFront'      => 'NetFront/[VER]',
-        'NokiaBrowser'  => 'NokiaBrowser/[VER]',
-        'Opera'         => array( ' OPR/[VER]', 'Opera Mini/[VER]', 'Version/[VER]' ),
-        'Opera Mini'    => 'Opera Mini/[VER]',
-        'Opera Mobi'    => 'Version/[VER]',
-        'UC Browser'    => 'UC Browser[VER]',
-        'MQQBrowser'    => 'MQQBrowser/[VER]',
-        'MicroMessenger' => 'MicroMessenger/[VER]',
-        'baiduboxapp'   => 'baiduboxapp/[VER]',
-        'baidubrowser'  => 'baidubrowser/[VER]',
-        'Iron'          => 'Iron/[VER]',
-        // @note: Safari 7534.48.3 is actually Version 5.1.
-        // @note: On BlackBerry the Version is overwriten by the OS.
-        'Safari'        => array( 'Version/[VER]', 'Safari/[VER]' ),
-        'Skyfire'       => 'Skyfire/[VER]',
-        'Tizen'         => 'Tizen/[VER]',
-        'Webkit'        => 'webkit[ /][VER]',
-
-        // Engine
-        'Gecko'         => 'Gecko/[VER]',
-        'Trident'       => 'Trident/[VER]',
-        'Presto'        => 'Presto/[VER]',
-
-        // OS
-        'iOS'              => ' \bi?OS\b [VER][ ;]{1}',
-        'Android'          => 'Android [VER]',
-        'BlackBerry'       => array('BlackBerry[\w]+/[VER]', 'BlackBerry.*Version/[VER]', 'Version/[VER]'),
-        'BREW'             => 'BREW [VER]',
-        'Java'             => 'Java/[VER]',
-        // @reference: http://windowsteamblog.com/windows_phone/b/wpdev/archive/2011/08/29/introducing-the-ie9-on-windows-phone-mango-user-agent-string.aspx
-        // @reference: http://en.wikipedia.org/wiki/Windows_NT#Releases
-        'Windows Phone OS' => array( 'Windows Phone OS [VER]', 'Windows Phone [VER]'),
-        'Windows Phone'    => 'Windows Phone [VER]',
-        'Windows CE'       => 'Windows CE/[VER]',
-        // http://social.msdn.microsoft.com/Forums/en-US/windowsdeveloperpreviewgeneral/thread/6be392da-4d2f-41b4-8354-8dcee20c85cd
-        'Windows NT'       => 'Windows NT [VER]',
-        'Symbian'          => array('SymbianOS/[VER]', 'Symbian/[VER]'),
-        'webOS'            => array('webOS/[VER]', 'hpwOS/[VER];'),
-    );
-
-    /**
-     * Construct an instance of this class.
-     *
-     * @param array  $headers   Specify the headers as injection. Should be PHP _SERVER flavored.
-     *                          If left empty, will use the global _SERVER['HTTP_*'] vars instead.
-     * @param string $userAgent Inject the User-Agent header. If null, will use HTTP_USER_AGENT
-     *                          from the $headers array instead.
-     */
-    public function __construct(
-        array $headers = null,
-        $userAgent = null
-    ) {
-        $this->setHttpHeaders($headers);
-        $this->setUserAgent($userAgent);
-    }
-
-    /**
-     * Get the current script version.
-     * This is useful for the demo.php file,
-     * so people can check on what version they are testing
-     * for mobile devices.
-     *
-     * @return string The version number in semantic version format.
-     */
-    public static function getScriptVersion()
-    {
-        return self::VERSION;
-    }
-
-    /**
-     * Set the HTTP Headers. Must be PHP-flavored. This method will reset existing headers.
-     *
-     * @param array $httpHeaders The headers to set. If null, then using PHP's _SERVER to extract
-     *                           the headers. The default null is left for backwards compatibilty.
-     */
-    public function setHttpHeaders($httpHeaders = null)
-    {
-        // use global _SERVER if $httpHeaders aren't defined
-        if (!is_array($httpHeaders) || !count($httpHeaders)) {
-            $httpHeaders = $_SERVER;
-        }
-
-        // clear existing headers
-        $this->httpHeaders = array();
-
-        // Only save HTTP headers. In PHP land, that means only _SERVER vars that
-        // start with HTTP_.
-        foreach ($httpHeaders as $key => $value) {
-            if (substr($key, 0, 5) === 'HTTP_') {
-                $this->httpHeaders[$key] = $value;
-            }
-        }
-
-        // In case we're dealing with CloudFront, we need to know.
-        $this->setCfHeaders($httpHeaders);
-    }
-
-    /**
-     * Retrieves the HTTP headers.
-     *
-     * @return array
-     */
-    public function getHttpHeaders()
-    {
-        return $this->httpHeaders;
-    }
-
-    /**
-     * Retrieves a particular header. If it doesn't exist, no exception/error is caused.
-     * Simply null is returned.
-     *
-     * @param string $header The name of the header to retrieve. Can be HTTP compliant such as
-     *                       "User-Agent" or "X-Device-User-Agent" or can be php-esque with the
-     *                       all-caps, HTTP_ prefixed, underscore seperated awesomeness.
-     *
-     * @return string|null The value of the header.
-     */
-    public function getHttpHeader($header)
-    {
-        // are we using PHP-flavored headers?
-        if (strpos($header, '_') === false) {
-            $header = str_replace('-', '_', $header);
-            $header = strtoupper($header);
-        }
-
-        // test the alternate, too
-        $altHeader = 'HTTP_' . $header;
-
-        //Test both the regular and the HTTP_ prefix
-        if (isset($this->httpHeaders[$header])) {
-            return $this->httpHeaders[$header];
-        } elseif (isset($this->httpHeaders[$altHeader])) {
-            return $this->httpHeaders[$altHeader];
-        }
-
-        return null;
-    }
-
-    public function getMobileHeaders()
-    {
-        return self::$mobileHeaders;
-    }
-
-    /**
-     * Get all possible HTTP headers that
-     * can contain the User-Agent string.
-     *
-     * @return array List of HTTP headers.
-     */
-    public function getUaHttpHeaders()
-    {
-        return self::$uaHttpHeaders;
-    }
-
-    
-    /**
-     * Set CloudFront headers
-     * http://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/header-caching.html#header-caching-web-device
-     * 
-     * @param array $cfHeaders List of HTTP headers
-     *
-     * @return  boolean If there were CloudFront headers to be set
-     */
-    public function setCfHeaders($cfHeaders = null) {
-        // use global _SERVER if $cfHeaders aren't defined
-        if (!is_array($cfHeaders) || !count($cfHeaders)) {
-            $cfHeaders = $_SERVER;
-        }
-
-        // clear existing headers
-        $this->cloudfrontHeaders = array();
-
-        // Only save CLOUDFRONT headers. In PHP land, that means only _SERVER vars that
-        // start with cloudfront-.
-        $response = false;
-        foreach ($cfHeaders as $key => $value) {
-            if (substr(strtolower($key), 0, 16) === 'http_cloudfront_') {
-                $this->cloudfrontHeaders[strtoupper($key)] = $value;
-                $response = true;
-            }
-        }
-
-        return $response;
-    }
-
-    /**
-     * Retrieves the cloudfront headers.
-     *
-     * @return array
-     */
-    public function getCfHeaders()
-    {
-        return $this->cloudfrontHeaders;
-    }
-
-    /**
-     * Set the User-Agent to be used.
-     *
-     * @param string $userAgent The user agent string to set.
-     *
-     * @return string|null
-     */
-    public function setUserAgent($userAgent = null)
-    {
-        // Invalidate cache due to #375
-        $this->cache = array();
-
-        if (false === empty($userAgent)) {
-            return $this->userAgent = $userAgent;
-        } else {
-            $this->userAgent = null;
-            foreach ($this->getUaHttpHeaders() as $altHeader) {
-                if (false === empty($this->httpHeaders[$altHeader])) { // @todo: should use getHttpHeader(), but it would be slow. (Serban)
-                    $this->userAgent .= $this->httpHeaders[$altHeader] . " ";
-                }
-            }
-
-            if (!empty($this->userAgent)) {
-                return $this->userAgent = trim($this->userAgent);
-            }
-        }
-
-        if (count($this->getCfHeaders()) > 0) {
-            return $this->userAgent = 'Amazon CloudFront';
-        }
-        return $this->userAgent = null;
-    }
-
-    /**
-     * Retrieve the User-Agent.
-     *
-     * @return string|null The user agent if it's set.
-     */
-    public function getUserAgent()
-    {
-        return $this->userAgent;
-    }
-
-    /**
-     * Set the detection type. Must be one of self::DETECTION_TYPE_MOBILE or
-     * self::DETECTION_TYPE_EXTENDED. Otherwise, nothing is set.
-     *
-     * @deprecated since version 2.6.9
-     *
-     * @param string $type The type. Must be a self::DETECTION_TYPE_* constant. The default
-     *                     parameter is null which will default to self::DETECTION_TYPE_MOBILE.
-     */
-    public function setDetectionType($type = null)
-    {
-        if ($type === null) {
-            $type = self::DETECTION_TYPE_MOBILE;
-        }
-
-        if ($type !== self::DETECTION_TYPE_MOBILE && $type !== self::DETECTION_TYPE_EXTENDED) {
-            return;
-        }
-
-        $this->detectionType = $type;
-    }
-
-    public function getMatchingRegex()
-    {
-        return $this->matchingRegex;
-    }
-
-    public function getMatchesArray()
-    {
-        return $this->matchesArray;
-    }
-
-    /**
-     * Retrieve the list of known phone devices.
-     *
-     * @return array List of phone devices.
-     */
-    public static function getPhoneDevices()
-    {
-        return self::$phoneDevices;
-    }
-
-    /**
-     * Retrieve the list of known tablet devices.
-     *
-     * @return array List of tablet devices.
-     */
-    public static function getTabletDevices()
-    {
-        return self::$tabletDevices;
-    }
-
-    /**
-     * Alias for getBrowsers() method.
-     *
-     * @return array List of user agents.
-     */
-    public static function getUserAgents()
-    {
-        return self::getBrowsers();
-    }
-
-    /**
-     * Retrieve the list of known browsers. Specifically, the user agents.
-     *
-     * @return array List of browsers / user agents.
-     */
-    public static function getBrowsers()
-    {
-        return self::$browsers;
-    }
-
-    /**
-     * Retrieve the list of known utilities.
-     *
-     * @return array List of utilities.
-     */
-    public static function getUtilities()
-    {
-        return self::$utilities;
-    }
-
-    /**
-     * Method gets the mobile detection rules. This method is used for the magic methods $detect->is*().
-     *
-     * @deprecated since version 2.6.9
-     *
-     * @return array All the rules (but not extended).
-     */
-    public static function getMobileDetectionRules()
-    {
-        static $rules;
-
-        if (!$rules) {
-            $rules = array_merge(
-                self::$phoneDevices,
-                self::$tabletDevices,
-                self::$operatingSystems,
-                self::$browsers
-            );
-        }
-
-        return $rules;
-
-    }
-
-    /**
-     * Method gets the mobile detection rules + utilities.
-     * The reason this is separate is because utilities rules
-     * don't necessary imply mobile. This method is used inside
-     * the new $detect->is('stuff') method.
-     *
-     * @deprecated since version 2.6.9
-     *
-     * @return array All the rules + extended.
-     */
-    public function getMobileDetectionRulesExtended()
-    {
-        static $rules;
-
-        if (!$rules) {
-            // Merge all rules together.
-            $rules = array_merge(
-                self::$phoneDevices,
-                self::$tabletDevices,
-                self::$operatingSystems,
-                self::$browsers,
-                self::$utilities
-            );
-        }
-
-        return $rules;
-    }
-
-    /**
-     * Retrieve the current set of rules.
-     *
-     * @deprecated since version 2.6.9
-     *
-     * @return array
-     */
-    public function getRules()
-    {
-        if ($this->detectionType == self::DETECTION_TYPE_EXTENDED) {
-            return self::getMobileDetectionRulesExtended();
-        } else {
-            return self::getMobileDetectionRules();
-        }
-    }
-
-    /**
-     * Retrieve the list of mobile operating systems.
-     *
-     * @return array The list of mobile operating systems.
-     */
-    public static function getOperatingSystems()
-    {
-        return self::$operatingSystems;
-    }
-
-    /**
-     * Check the HTTP headers for signs of mobile.
-     * This is the fastest mobile check possible; it's used
-     * inside isMobile() method.
-     *
-     * @return bool
-     */
-    public function checkHttpHeadersForMobile()
-    {
-
-        foreach ($this->getMobileHeaders() as $mobileHeader => $matchType) {
-            if (isset($this->httpHeaders[$mobileHeader])) {
-                if (is_array($matchType['matches'])) {
-                    foreach ($matchType['matches'] as $_match) {
-                        if (strpos($this->httpHeaders[$mobileHeader], $_match) !== false) {
-                            return true;
-                        }
-                    }
-
-                    return false;
-                } else {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-
-    }
-
-    /**
-     * Magic overloading method.
-     *
-     * @method boolean is[...]()
-     * @param  string                 $name
-     * @param  array                  $arguments
-     * @return mixed
-     * @throws BadMethodCallException when the method doesn't exist and doesn't start with 'is'
-     */
-    public function __call($name, $arguments)
-    {
-        // make sure the name starts with 'is', otherwise
-        if (substr($name, 0, 2) !== 'is') {
-            throw new BadMethodCallException("No such method exists: $name");
-        }
-
-        $this->setDetectionType(self::DETECTION_TYPE_MOBILE);
-
-        $key = substr($name, 2);
-
-        return $this->matchUAAgainstKey($key);
-    }
-
-    /**
-     * Find a detection rule that matches the current User-agent.
-     *
-     * @param  null    $userAgent deprecated
-     * @return boolean
-     */
-    protected function matchDetectionRulesAgainstUA($userAgent = null)
-    {
-        // Begin general search.
-        foreach ($this->getRules() as $_regex) {
-            if (empty($_regex)) {
-                continue;
-            }
-
-            if ($this->match($_regex, $userAgent)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Search for a certain key in the rules array.
-     * If the key is found the try to match the corresponding
-     * regex against the User-Agent.
-     *
-     * @param string $key
-     *
-     * @return boolean
-     */
-    protected function matchUAAgainstKey($key)
-    {
-        // Make the keys lowercase so we can match: isIphone(), isiPhone(), isiphone(), etc.
-        $key = strtolower($key);
-        if (false === isset($this->cache[$key])) {
-
-            // change the keys to lower case
-            $_rules = array_change_key_case($this->getRules());
-
-            if (false === empty($_rules[$key])) {
-                $this->cache[$key] = $this->match($_rules[$key]);
-            }
-
-            if (false === isset($this->cache[$key])) {
-                $this->cache[$key] = false;
-            }
-        }
-
-        return $this->cache[$key];
-    }
-
-    /**
-     * Check if the device is mobile.
-     * Returns true if any type of mobile device detected, including special ones
-     * @param  null $userAgent   deprecated
-     * @param  null $httpHeaders deprecated
-     * @return bool
-     */
-    public function isMobile($userAgent = null, $httpHeaders = null)
-    {
-
-        if ($httpHeaders) {
-            $this->setHttpHeaders($httpHeaders);
-        }
-
-        if ($userAgent) {
-            $this->setUserAgent($userAgent);
-        }
-
-        // Check specifically for cloudfront headers if the useragent === 'Amazon CloudFront'
-        if ($this->getUserAgent() === 'Amazon CloudFront') {
-            $cfHeaders = $this->getCfHeaders();
-            if(array_key_exists('HTTP_CLOUDFRONT_IS_MOBILE_VIEWER', $cfHeaders) && $cfHeaders['HTTP_CLOUDFRONT_IS_MOBILE_VIEWER'] === 'true') {
-                return true;
-            }
-        }
-
-        $this->setDetectionType(self::DETECTION_TYPE_MOBILE);
-
-        if ($this->checkHttpHeadersForMobile()) {
-            return true;
-        } else {
-            return $this->matchDetectionRulesAgainstUA();
-        }
-
-    }
-
-    /**
-     * Check if the device is a tablet.
-     * Return true if any type of tablet device is detected.
-     *
-     * @param  string $userAgent   deprecated
-     * @param  array  $httpHeaders deprecated
-     * @return bool
-     */
-    public function isTablet($userAgent = null, $httpHeaders = null)
-    {
-        // Check specifically for cloudfront headers if the useragent === 'Amazon CloudFront'
-        if ($this->getUserAgent() === 'Amazon CloudFront') {
-            $cfHeaders = $this->getCfHeaders();
-            if(array_key_exists('HTTP_CLOUDFRONT_IS_TABLET_VIEWER', $cfHeaders) && $cfHeaders['HTTP_CLOUDFRONT_IS_TABLET_VIEWER'] === 'true') {
-                return true;
-            }
-        }
-
-        $this->setDetectionType(self::DETECTION_TYPE_MOBILE);
-
-        foreach (self::$tabletDevices as $_regex) {
-            if ($this->match($_regex, $userAgent)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * This method checks for a certain property in the
-     * userAgent.
-     * @todo: The httpHeaders part is not yet used.
-     *
-     * @param  string        $key
-     * @param  string        $userAgent   deprecated
-     * @param  string        $httpHeaders deprecated
-     * @return bool|int|null
-     */
-    public function is($key, $userAgent = null, $httpHeaders = null)
-    {
-        // Set the UA and HTTP headers only if needed (eg. batch mode).
-        if ($httpHeaders) {
-            $this->setHttpHeaders($httpHeaders);
-        }
-
-        if ($userAgent) {
-            $this->setUserAgent($userAgent);
-        }
-
-        $this->setDetectionType(self::DETECTION_TYPE_EXTENDED);
-
-        return $this->matchUAAgainstKey($key);
-    }
-
-    /**
-     * Some detection rules are relative (not standard),
-     * because of the diversity of devices, vendors and
-     * their conventions in representing the User-Agent or
-     * the HTTP headers.
-     *
-     * This method will be used to check custom regexes against
-     * the User-Agent string.
-     *
-     * @param $regex
-     * @param  string $userAgent
-     * @return bool
-     *
-     * @todo: search in the HTTP headers too.
-     */
-    public function match($regex, $userAgent = null)
-    {
-        $match = (bool) preg_match(sprintf('#%s#is', $regex), (false === empty($userAgent) ? $userAgent : $this->userAgent), $matches);
-        // If positive match is found, store the results for debug.
-        if ($match) {
-            $this->matchingRegex = $regex;
-            $this->matchesArray = $matches;
-        }
-
-        return $match;
-    }
-
-    /**
-     * Get the properties array.
-     *
-     * @return array
-     */
-    public static function getProperties()
-    {
-        return self::$properties;
-    }
-
-    /**
-     * Prepare the version number.
-     *
-     * @todo Remove the error supression from str_replace() call.
-     *
-     * @param string $ver The string version, like "2.6.21.2152";
-     *
-     * @return float
-     */
-    public function prepareVersionNo($ver)
-    {
-        $ver = str_replace(array('_', ' ', '/'), '.', $ver);
-        $arrVer = explode('.', $ver, 2);
-
-        if (isset($arrVer[1])) {
-            $arrVer[1] = @str_replace('.', '', $arrVer[1]); // @todo: treat strings versions.
-        }
-
-        return (float) implode('.', $arrVer);
-    }
-
-    /**
-     * Check the version of the given property in the User-Agent.
-     * Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31)
-     *
-     * @param string $propertyName The name of the property. See self::getProperties() array
-     *                             keys for all possible properties.
-     * @param string $type         Either self::VERSION_TYPE_STRING to get a string value or
-     *                             self::VERSION_TYPE_FLOAT indicating a float value. This parameter
-     *                             is optional and defaults to self::VERSION_TYPE_STRING. Passing an
-     *                             invalid parameter will default to the this type as well.
-     *
-     * @return string|float The version of the property we are trying to extract.
-     */
-    public function version($propertyName, $type = self::VERSION_TYPE_STRING)
-    {
-        if (empty($propertyName)) {
-            return false;
-        }
-
-        // set the $type to the default if we don't recognize the type
-        if ($type !== self::VERSION_TYPE_STRING && $type !== self::VERSION_TYPE_FLOAT) {
-            $type = self::VERSION_TYPE_STRING;
-        }
-
-        $properties = self::getProperties();
-
-        // Check if the property exists in the properties array.
-        if (true === isset($properties[$propertyName])) {
-
-            // Prepare the pattern to be matched.
-            // Make sure we always deal with an array (string is converted).
-            $properties[$propertyName] = (array) $properties[$propertyName];
-
-            foreach ($properties[$propertyName] as $propertyMatchString) {
-
-                $propertyPattern = str_replace('[VER]', self::VER, $propertyMatchString);
-
-                // Identify and extract the version.
-                preg_match(sprintf('#%s#is', $propertyPattern), $this->userAgent, $match);
-
-                if (false === empty($match[1])) {
-                    $version = ($type == self::VERSION_TYPE_FLOAT ? $this->prepareVersionNo($match[1]) : $match[1]);
-
-                    return $version;
-                }
-
-            }
-
-        }
-
-        return false;
-    }
-
-    /**
-     * Retrieve the mobile grading, using self::MOBILE_GRADE_* constants.
-     *
-     * @return string One of the self::MOBILE_GRADE_* constants.
-     */
-    public function mobileGrade()
-    {
-        $isMobile = $this->isMobile();
-
-        if (
-            // Apple iOS 4-7.0 – Tested on the original iPad (4.3 / 5.0), iPad 2 (4.3 / 5.1 / 6.1), iPad 3 (5.1 / 6.0), iPad Mini (6.1), iPad Retina (7.0), iPhone 3GS (4.3), iPhone 4 (4.3 / 5.1), iPhone 4S (5.1 / 6.0), iPhone 5 (6.0), and iPhone 5S (7.0)
-            $this->is('iOS') && $this->version('iPad', self::VERSION_TYPE_FLOAT) >= 4.3 ||
-            $this->is('iOS') && $this->version('iPhone', self::VERSION_TYPE_FLOAT) >= 4.3 ||
-            $this->is('iOS') && $this->version('iPod', self::VERSION_TYPE_FLOAT) >= 4.3 ||
-
-            // Android 2.1-2.3 - Tested on the HTC Incredible (2.2), original Droid (2.2), HTC Aria (2.1), Google Nexus S (2.3). Functional on 1.5 & 1.6 but performance may be sluggish, tested on Google G1 (1.5)
-            // Android 3.1 (Honeycomb)  - Tested on the Samsung Galaxy Tab 10.1 and Motorola XOOM
-            // Android 4.0 (ICS)  - Tested on a Galaxy Nexus. Note: transition performance can be poor on upgraded devices
-            // Android 4.1 (Jelly Bean)  - Tested on a Galaxy Nexus and Galaxy 7
-            ( $this->version('Android', self::VERSION_TYPE_FLOAT)>2.1 && $this->is('Webkit') ) ||
-
-            // Windows Phone 7.5-8 - Tested on the HTC Surround (7.5), HTC Trophy (7.5), LG-E900 (7.5), Nokia 800 (7.8), HTC Mazaa (7.8), Nokia Lumia 520 (8), Nokia Lumia 920 (8), HTC 8x (8)
-            $this->version('Windows Phone OS', self::VERSION_TYPE_FLOAT) >= 7.5 ||
-
-            // Tested on the Torch 9800 (6) and Style 9670 (6), BlackBerry® Torch 9810 (7), BlackBerry Z10 (10)
-            $this->is('BlackBerry') && $this->version('BlackBerry', self::VERSION_TYPE_FLOAT) >= 6.0 ||
-            // Blackberry Playbook (1.0-2.0) - Tested on PlayBook
-            $this->match('Playbook.*Tablet') ||
-
-            // Palm WebOS (1.4-3.0) - Tested on the Palm Pixi (1.4), Pre (1.4), Pre 2 (2.0), HP TouchPad (3.0)
-            ( $this->version('webOS', self::VERSION_TYPE_FLOAT) >= 1.4 && $this->match('Palm|Pre|Pixi') ) ||
-            // Palm WebOS 3.0  - Tested on HP TouchPad
-            $this->match('hp.*TouchPad') ||
-
-            // Firefox Mobile 18 - Tested on Android 2.3 and 4.1 devices
-            ( $this->is('Firefox') && $this->version('Firefox', self::VERSION_TYPE_FLOAT) >= 18 ) ||
-
-            // Chrome for Android - Tested on Android 4.0, 4.1 device
-            ( $this->is('Chrome') && $this->is('AndroidOS') && $this->version('Android', self::VERSION_TYPE_FLOAT) >= 4.0 ) ||
-
-            // Skyfire 4.1 - Tested on Android 2.3 device
-            ( $this->is('Skyfire') && $this->version('Skyfire', self::VERSION_TYPE_FLOAT) >= 4.1 && $this->is('AndroidOS') && $this->version('Android', self::VERSION_TYPE_FLOAT) >= 2.3 ) ||
-
-            // Opera Mobile 11.5-12: Tested on Android 2.3
-            ( $this->is('Opera') && $this->version('Opera Mobi', self::VERSION_TYPE_FLOAT) >= 11.5 && $this->is('AndroidOS') ) ||
-
-            // Meego 1.2 - Tested on Nokia 950 and N9
-            $this->is('MeeGoOS') ||
-
-            // Tizen (pre-release) - Tested on early hardware
-            $this->is('Tizen') ||
-
-            // Samsung Bada 2.0 - Tested on a Samsung Wave 3, Dolphin browser
-            // @todo: more tests here!
-            $this->is('Dolfin') && $this->version('Bada', self::VERSION_TYPE_FLOAT) >= 2.0 ||
-
-            // UC Browser - Tested on Android 2.3 device
-            ( ($this->is('UC Browser') || $this->is('Dolfin')) && $this->version('Android', self::VERSION_TYPE_FLOAT) >= 2.3 ) ||
-
-            // Kindle 3 and Fire  - Tested on the built-in WebKit browser for each
-            ( $this->match('Kindle Fire') ||
-            $this->is('Kindle') && $this->version('Kindle', self::VERSION_TYPE_FLOAT) >= 3.0 ) ||
-
-            // Nook Color 1.4.1 - Tested on original Nook Color, not Nook Tablet
-            $this->is('AndroidOS') && $this->is('NookTablet') ||
-
-            // Chrome Desktop 16-24 - Tested on OS X 10.7 and Windows 7
-            $this->version('Chrome', self::VERSION_TYPE_FLOAT) >= 16 && !$isMobile ||
-
-            // Safari Desktop 5-6 - Tested on OS X 10.7 and Windows 7
-            $this->version('Safari', self::VERSION_TYPE_FLOAT) >= 5.0 && !$isMobile ||
-
-            // Firefox Desktop 10-18 - Tested on OS X 10.7 and Windows 7
-            $this->version('Firefox', self::VERSION_TYPE_FLOAT) >= 10.0 && !$isMobile ||
-
-            // Internet Explorer 7-9 - Tested on Windows XP, Vista and 7
-            $this->version('IE', self::VERSION_TYPE_FLOAT) >= 7.0 && !$isMobile ||
-
-            // Opera Desktop 10-12 - Tested on OS X 10.7 and Windows 7
-            $this->version('Opera', self::VERSION_TYPE_FLOAT) >= 10 && !$isMobile
-        ){
-            return self::MOBILE_GRADE_A;
-        }
-
-        if (
-            $this->is('iOS') && $this->version('iPad', self::VERSION_TYPE_FLOAT)<4.3 ||
-            $this->is('iOS') && $this->version('iPhone', self::VERSION_TYPE_FLOAT)<4.3 ||
-            $this->is('iOS') && $this->version('iPod', self::VERSION_TYPE_FLOAT)<4.3 ||
-
-            // Blackberry 5.0: Tested on the Storm 2 9550, Bold 9770
-            $this->is('Blackberry') && $this->version('BlackBerry', self::VERSION_TYPE_FLOAT) >= 5 && $this->version('BlackBerry', self::VERSION_TYPE_FLOAT)<6 ||
-
-            //Opera Mini (5.0-6.5) - Tested on iOS 3.2/4.3 and Android 2.3
-            ($this->version('Opera Mini', self::VERSION_TYPE_FLOAT) >= 5.0 && $this->version('Opera Mini', self::VERSION_TYPE_FLOAT) <= 7.0 &&
-            ($this->version('Android', self::VERSION_TYPE_FLOAT) >= 2.3 || $this->is('iOS')) ) ||
-
-            // Nokia Symbian^3 - Tested on Nokia N8 (Symbian^3), C7 (Symbian^3), also works on N97 (Symbian^1)
-            $this->match('NokiaN8|NokiaC7|N97.*Series60|Symbian/3') ||
-
-            // @todo: report this (tested on Nokia N71)
-            $this->version('Opera Mobi', self::VERSION_TYPE_FLOAT) >= 11 && $this->is('SymbianOS')
-        ){
-            return self::MOBILE_GRADE_B;
-        }
-
-        if (
-            // Blackberry 4.x - Tested on the Curve 8330
-            $this->version('BlackBerry', self::VERSION_TYPE_FLOAT) <= 5.0 ||
-            // Windows Mobile - Tested on the HTC Leo (WinMo 5.2)
-            $this->match('MSIEMobile|Windows CE.*Mobile') || $this->version('Windows Mobile', self::VERSION_TYPE_FLOAT) <= 5.2 ||
-
-            // Tested on original iPhone (3.1), iPhone 3 (3.2)
-            $this->is('iOS') && $this->version('iPad', self::VERSION_TYPE_FLOAT) <= 3.2 ||
-            $this->is('iOS') && $this->version('iPhone', self::VERSION_TYPE_FLOAT) <= 3.2 ||
-            $this->is('iOS') && $this->version('iPod', self::VERSION_TYPE_FLOAT) <= 3.2 ||
-
-            // Internet Explorer 7 and older - Tested on Windows XP
-            $this->version('IE', self::VERSION_TYPE_FLOAT) <= 7.0 && !$isMobile
-        ){
-            return self::MOBILE_GRADE_C;
-        }
-
-        // All older smartphone platforms and featurephones - Any device that doesn't support media queries
-        // will receive the basic, C grade experience.
-        return self::MOBILE_GRADE_C;
-    }
-}
diff --git a/autoload/cms/class.Layout.php b/autoload/cms/class.Layout.php
index efaa657..c1f872a 100644
--- a/autoload/cms/class.Layout.php
+++ b/autoload/cms/class.Layout.php
@@ -7,7 +7,7 @@ class Layout implements \ArrayAccess
     global $mdb;
 
     $result = $mdb -> get( 'pp_layouts', '*', [ 'id' => $layout_id ] );
-    if ( \S::is_array_fix( $result ) ) foreach ( $result as $key => $val )
+    if ( \Shared\Helpers\Helpers::is_array_fix( $result ) ) foreach ( $result as $key => $val )
       $this -> $key = $val;
   }
 
diff --git a/autoload/front/Controllers/NewsletterController.php b/autoload/front/Controllers/NewsletterController.php
index befaf06..6c7d627 100644
--- a/autoload/front/Controllers/NewsletterController.php
+++ b/autoload/front/Controllers/NewsletterController.php
@@ -18,7 +18,7 @@ class NewsletterController
 
     $result = [ 'status' => 'bad' ];
 
-    if ( $this->repository->signup( \S::get( 'email' ), $_SERVER['SERVER_NAME'], !empty( $settings['ssl'] ), $settings ) )
+    if ( $this->repository->signup( \Shared\Helpers\Helpers::get( 'email' ), $_SERVER['SERVER_NAME'], !empty( $settings['ssl'] ), $settings ) )
       $result = [ 'status' => 'ok' ];
 
     echo json_encode( $result );
@@ -29,8 +29,8 @@ class NewsletterController
   {
     global $lang;
 
-    if ( $this->repository->confirmSubscription( \S::get( 'hash' ) ) )
-      \S::alert( $lang['email-zostal-dodany-do-listy-newsletter'] );
+    if ( $this->repository->confirmSubscription( \Shared\Helpers\Helpers::get( 'hash' ) ) )
+      \Shared\Helpers\Helpers::alert( $lang['email-zostal-dodany-do-listy-newsletter'] );
 
     header( 'Location: /' );
     exit;
@@ -40,8 +40,8 @@ class NewsletterController
   {
     global $lang;
 
-    if ( $this->repository->unsubscribe( \S::get( 'hash' ) ) )
-      \S::alert( $lang['email-zostal-usuniety-z-listy-newsletter'] );
+    if ( $this->repository->unsubscribe( \Shared\Helpers\Helpers::get( 'hash' ) ) )
+      \Shared\Helpers\Helpers::alert( $lang['email-zostal-usuniety-z-listy-newsletter'] );
 
     header( 'Location: /' );
     exit;
diff --git a/autoload/front/Views/Articles.php b/autoload/front/Views/Articles.php
index 5cc5c10..4fa78f6 100644
--- a/autoload/front/Views/Articles.php
+++ b/autoload/front/Views/Articles.php
@@ -188,7 +188,7 @@ class Articles
     $id_attr_pos = strpos( $attrs, $id_attr );
     if ( $id_attr_pos === false )
     {
-      $id = \S::seo( $content );
+      $id = \Shared\Helpers\Helpers::seo( $content );
       $attrs .= sprintf( ' id="%s"', $id );
     }
 
diff --git a/autoload/front/Views/Banners.php b/autoload/front/Views/Banners.php
index d60881e..fc640c7 100644
--- a/autoload/front/Views/Banners.php
+++ b/autoload/front/Views/Banners.php
@@ -12,7 +12,7 @@ class Banners
 
     public static function mainBanner($banner)
     {
-        if (!\S::get_session('banner_close') && is_array($banner)) {
+        if (!\Shared\Helpers\Helpers::get_session('banner_close') && is_array($banner)) {
             $tpl = new \Tpl;
             $tpl->banner = $banner;
             return $tpl->render('banner/main-banner');
diff --git a/autoload/front/controls/class.ShopBasket.php b/autoload/front/controls/class.ShopBasket.php
index 4aa90b1..27ca141 100644
--- a/autoload/front/controls/class.ShopBasket.php
+++ b/autoload/front/controls/class.ShopBasket.php
@@ -9,7 +9,7 @@ class ShopBasket
 
   public static function basket_message_save()
   {
-    \S::set_session( 'basket_message', \S::get( 'basket_message' ) );
+    \Shared\Helpers\Helpers::set_session( 'basket_message', \Shared\Helpers\Helpers::get( 'basket_message' ) );
     echo json_encode( [
         'result' => 'ok'
     ] );
@@ -20,16 +20,16 @@ class ShopBasket
   {
     global $lang_id;
 
-    $basket = \S::get_session( 'basket' );
-    $coupon = \S::get_session( 'coupon' );
-    $product_hash = \S::get( 'product_hash' );
-    $basket_transport_method_id = \S::get_session( 'basket-transport-method-id' );
+    $basket = \Shared\Helpers\Helpers::get_session( 'basket' );
+    $coupon = \Shared\Helpers\Helpers::get_session( 'coupon' );
+    $product_hash = \Shared\Helpers\Helpers::get( 'product_hash' );
+    $basket_transport_method_id = \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' );
 
     unset( $basket[ $product_hash ] );
 
     $basket = \shop\Promotion::find_promotion( $basket );
 
-    \S::set_session( 'basket', $basket );
+    \Shared\Helpers\Helpers::set_session( 'basket', $basket );
 
     echo json_encode( [
         'basket'            => \Tpl::view( 'shop-basket/basket-details', [
@@ -52,19 +52,19 @@ class ShopBasket
   {
     global $lang_id;
 
-    $basket = \S::get_session( 'basket' );
-    $coupon = \S::get_session( 'coupon' );
-    $product_hash = \S::get( 'product_hash' );
-    $basket_transport_method_id = \S::get_session( 'basket-transport-method-id' );
+    $basket = \Shared\Helpers\Helpers::get_session( 'basket' );
+    $coupon = \Shared\Helpers\Helpers::get_session( 'coupon' );
+    $product_hash = \Shared\Helpers\Helpers::get( 'product_hash' );
+    $basket_transport_method_id = \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' );
     $basket[ $product_hash ][ 'quantity' ]++;
 
     \shop\Basket::check_product_quantity_in_stock( $basket, false );
 
-    $basket = \S::get_session( 'basket' );
+    $basket = \Shared\Helpers\Helpers::get_session( 'basket' );
 
     $basket = \shop\Promotion::find_promotion( $basket );
 
-    \S::set_session( 'basket', $basket );
+    \Shared\Helpers\Helpers::set_session( 'basket', $basket );
 
     echo json_encode( [
         'basket'            => \Tpl::view( 'shop-basket/basket-details', [
@@ -88,10 +88,10 @@ class ShopBasket
   {
     global $lang_id;
 
-    $basket = \S::get_session( 'basket' );
-    $coupon = \S::get_session( 'coupon' );
-    $product_hash = \S::get( 'product_hash' );
-    $basket_transport_method_id = \S::get_session( 'basket-transport-method-id' );
+    $basket = \Shared\Helpers\Helpers::get_session( 'basket' );
+    $coupon = \Shared\Helpers\Helpers::get_session( 'coupon' );
+    $product_hash = \Shared\Helpers\Helpers::get( 'product_hash' );
+    $basket_transport_method_id = \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' );
 
     $basket[ $product_hash ][ 'quantity' ]--;
 
@@ -100,7 +100,7 @@ class ShopBasket
 
     $basket = \shop\Promotion::find_promotion( $basket );
 
-    \S::set_session( 'basket', $basket );
+    \Shared\Helpers\Helpers::set_session( 'basket', $basket );
 
     echo json_encode( [
         'basket'            => \Tpl::view( 'shop-basket/basket-details', [
@@ -123,12 +123,12 @@ class ShopBasket
   {
     global $lang_id;
 
-    $basket = \S::get_session( 'basket' );
-    $coupon = \S::get_session( 'coupon' );
-    $product_hash = \S::get( 'product_hash' );
-    $basket_transport_method_id = \S::get_session( 'basket-transport-method-id' );
+    $basket = \Shared\Helpers\Helpers::get_session( 'basket' );
+    $coupon = \Shared\Helpers\Helpers::get_session( 'coupon' );
+    $product_hash = \Shared\Helpers\Helpers::get( 'product_hash' );
+    $basket_transport_method_id = \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' );
 
-    $basket[ $product_hash ][ 'quantity' ] = (int)\S::get( 'quantity' );
+    $basket[ $product_hash ][ 'quantity' ] = (int)\Shared\Helpers\Helpers::get( 'quantity' );
 
     if ( $basket[ $product_hash ][ 'quantity' ] < 1 )
       unset( $basket[ $product_hash ] );
@@ -137,7 +137,7 @@ class ShopBasket
 
     \shop\Basket::check_product_quantity_in_stock( $basket, false );
 
-    $basket = \S::get_session( 'basket' );
+    $basket = \Shared\Helpers\Helpers::get_session( 'basket' );
 
     echo json_encode( [
         'basket'            => \Tpl::view( 'shop-basket/basket-details', [
@@ -158,16 +158,16 @@ class ShopBasket
 
   static public function product_message_change()
   {
-    $basket = \S::get_session( 'basket' );
-    $basket[ \S::get( 'position_code' ) ]['message'] = \S::get( 'product_message' );
-    \S::set_session( 'basket', $basket );
+    $basket = \Shared\Helpers\Helpers::get_session( 'basket' );
+    $basket[ \Shared\Helpers\Helpers::get( 'position_code' ) ]['message'] = \Shared\Helpers\Helpers::get( 'product_message' );
+    \Shared\Helpers\Helpers::set_session( 'basket', $basket );
     exit;
   }
 
   public static function basket_add_product()
   {
-    $basket = \shop\Basket::validate_basket( \S::get_session( 'basket' ) );
-    $values_tmp = json_decode( \S::get( 'values' ), true );
+    $basket = \shop\Basket::validate_basket( \Shared\Helpers\Helpers::get_session( 'basket' ) );
+    $values_tmp = json_decode( \Shared\Helpers\Helpers::get( 'values' ), true );
 
     foreach( $values_tmp as $key => $val )
       $values[ $val['name'] ] = $val['value'];
@@ -192,7 +192,7 @@ class ShopBasket
       }
     }
 
-    if ( \S::is_array_fix( $attributes ) )
+    if ( \Shared\Helpers\Helpers::is_array_fix( $attributes ) )
     {
       $values['parent_id'] = $values[ 'product-id' ];
       $values['product-id'] = \shop\Product::get_product_id_by_attributes( $values[ 'product-id' ], $attributes );
@@ -219,9 +219,9 @@ class ShopBasket
 
     $basket = \shop\Promotion::find_promotion( $basket );
 
-    \S::set_session( 'basket', $basket );
+    \Shared\Helpers\Helpers::set_session( 'basket', $basket );
 
-    $coupon = \S::get_session( 'coupon' );
+    $coupon = \Shared\Helpers\Helpers::get_session( 'coupon' );
 
     echo json_encode( [
         'result' => 'ok',
@@ -235,9 +235,9 @@ class ShopBasket
   // sprawdzam czy została wybrana forma wysylki inpost i czy został wybrany paczkomat
   static public function transport_method_inpost_check()
   {
-    if ( \S::get_session( 'basket-transport-method-id' ) === '2' or \S::get_session( 'basket-transport-method-id' ) === '1' )
+    if ( \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' ) === '2' or \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' ) === '1' )
     {
-      if ( !\S::get_session( 'basket-inpost-info' ) )
+      if ( !\Shared\Helpers\Helpers::get_session( 'basket-inpost-info' ) )
       {
         echo json_encode( [
           'result' => 'bad'
@@ -246,9 +246,9 @@ class ShopBasket
       }
     }
 
-    if ( \S::get_session( 'basket-transport-method-id' ) === '9' )
+    if ( \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' ) === '9' )
     {
-      if ( !\S::get_session( 'basket_orlen_point_id' ) )
+      if ( !\Shared\Helpers\Helpers::get_session( 'basket_orlen_point_id' ) )
       {
         echo json_encode( [
           'result' => 'bad'
@@ -265,7 +265,7 @@ class ShopBasket
 
   // sprawdzam czy został wybrany paczkomat
   static public function inpost_check() {
-    if ( !\S::get_session( 'basket-inpost-info' ) )
+    if ( !\Shared\Helpers\Helpers::get_session( 'basket-inpost-info' ) )
       echo json_encode( [
           'result' => 'bad'
       ] );
@@ -278,8 +278,8 @@ class ShopBasket
 
   static public function orlen_save()
   {
-    \S::set_session( 'basket_orlen_point_id', \S::get( 'orlen_point_id' ) );
-    \S::set_session( 'basket_orlen_point_info', \S::get( 'orlen_point_name' ) );
+    \Shared\Helpers\Helpers::set_session( 'basket_orlen_point_id', \Shared\Helpers\Helpers::get( 'orlen_point_id' ) );
+    \Shared\Helpers\Helpers::set_session( 'basket_orlen_point_info', \Shared\Helpers\Helpers::get( 'orlen_point_name' ) );
     echo json_encode( [
       'result' => 'ok'
     ] );
@@ -288,7 +288,7 @@ class ShopBasket
 
   public static function inpost_save()
   {
-    \S::set_session( 'basket-inpost-info', \S::get( 'paczkomat' ) );
+    \Shared\Helpers\Helpers::set_session( 'basket-inpost-info', \Shared\Helpers\Helpers::get( 'paczkomat' ) );
     echo json_encode( [
         'result' => 'ok'
     ] );
@@ -297,7 +297,7 @@ class ShopBasket
 
   public static function basket_payment_method_set()
   {
-    \S::set_session( 'basket-payment-method-id', \S::get( 'payment_method_id' ) );
+    \Shared\Helpers\Helpers::set_session( 'basket-payment-method-id', \Shared\Helpers\Helpers::get( 'payment_method_id' ) );
     echo json_encode( [
         'result' => 'ok'
     ] );
@@ -306,7 +306,7 @@ class ShopBasket
 
   public static function basket_transport_method_set()
   {
-    \S::set_session( 'basket-transport-method-id', \S::get( 'transport_method_id' ) );
+    \Shared\Helpers\Helpers::set_session( 'basket-transport-method-id', \Shared\Helpers\Helpers::get( 'transport_method_id' ) );
     echo json_encode( [
         'result' => 'ok'
     ] );
@@ -315,13 +315,13 @@ class ShopBasket
 
   public static function basket_payments_methods()
   {
-    \S::set_session( 'basket-transport-method-id', \S::get( 'transport_method_id' ) );
+    \Shared\Helpers\Helpers::set_session( 'basket-transport-method-id', \Shared\Helpers\Helpers::get( 'transport_method_id' ) );
 
     echo json_encode( [
         'result'          => 'ok',
         'payment_methods' => \front\view\ShopPaymentMethod::basket_payment_methods(
-          \front\factory\ShopPaymentMethod::payment_methods_by_transport( \S::get( 'transport_method_id' ) ),
-          \S::get( 'payment_method_id' )
+          \front\factory\ShopPaymentMethod::payment_methods_by_transport( \Shared\Helpers\Helpers::get( 'transport_method_id' ) ),
+          \Shared\Helpers\Helpers::get( 'payment_method_id' )
         )
     ] );
     exit;
@@ -331,34 +331,34 @@ class ShopBasket
   {
     global $lang_id, $settings;
 
-    if ( \shop\Basket::check_product_quantity_in_stock( \S::get_session( 'basket' ) ) )
+    if ( \shop\Basket::check_product_quantity_in_stock( \Shared\Helpers\Helpers::get_session( 'basket' ) ) )
     {
       header( 'Location: /koszyk' );
       exit;
     }
 
-    $client = \S::get_session( 'client' );
+    $client = \Shared\Helpers\Helpers::get_session( 'client' );
 
     return \Tpl::view( 'shop-basket/summary-view', [
           'lang_id'        => $lang_id,
-          'client'         => \S::get_session( 'client' ),
-          'basket'         => \S::get_session( 'basket' ),
-          'transport'      => \front\factory\ShopTransport::transport( \S::get_session( 'basket-transport-method-id' ) ),
-          'payment_method' => \front\factory\ShopPaymentMethod::payment_method( \S::get_session( 'basket-payment-method-id' ) ),
+          'client'         => \Shared\Helpers\Helpers::get_session( 'client' ),
+          'basket'         => \Shared\Helpers\Helpers::get_session( 'basket' ),
+          'transport'      => \front\factory\ShopTransport::transport( \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' ) ),
+          'payment_method' => \front\factory\ShopPaymentMethod::payment_method( \Shared\Helpers\Helpers::get_session( 'basket-payment-method-id' ) ),
           'addresses'      => \front\factory\ShopClient::client_addresses( $client[ 'id' ] ),
           'settings'       => $settings,
-          'coupon'         => \S::get_session( 'coupon' ),
-          'basket_message' => \S::get_session( 'basket_message' )
+          'coupon'         => \Shared\Helpers\Helpers::get_session( 'coupon' ),
+          'basket_message' => \Shared\Helpers\Helpers::get_session( 'basket_message' )
       ] );
   }
 
   // zapisanie koszyka jako zamówienie
   static public function basket_save()
   {
-    $client = \S::get_session( 'client' );
-    $payment_method = \S::get_session( 'basket-payment-method-id' );
+    $client = \Shared\Helpers\Helpers::get_session( 'client' );
+    $payment_method = \Shared\Helpers\Helpers::get_session( 'basket-payment-method-id' );
 
-    if ( \shop\Basket::check_product_quantity_in_stock( \S::get_session( 'basket' ) ) )
+    if ( \shop\Basket::check_product_quantity_in_stock( \Shared\Helpers\Helpers::get_session( 'basket' ) ) )
     {
       header( 'Location: /koszyk' );
       exit;
@@ -366,42 +366,42 @@ class ShopBasket
 
     if ( $order_id = \front\factory\ShopOrder::basket_save(
         $client[ 'id' ],
-        \S::get_session( 'basket' ),
-        \S::get_session( 'basket-transport-method-id' ),
-        \S::get_session( 'basket-payment-method-id' ),
-        \S::get( 'email', true ),
-        \S::get( 'phone', true ),
-        \S::get( 'name', true ),
-        \S::get( 'surname', true ),
-        \S::get( 'street' ),
-        \S::get( 'postal_code', true ),
-        \S::get( 'city', true ),
-        \S::get( 'firm_name', true ),
-        \S::get( 'firm_street', true ),
-        \S::get( 'firm_postal_code', true ),
-        \S::get( 'firm_city', true ),
-        \S::get( 'firm_nip', true ),
-        \S::get_session( 'basket-inpost-info' ),
-        \S::get_session( 'basket_orlen_point_id' ),
-        \S::get_session( 'basket_orlen_point_info' ),
-        \S::get_session( 'coupon' ),
-        \S::get_session( 'basket_message' )
+        \Shared\Helpers\Helpers::get_session( 'basket' ),
+        \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' ),
+        \Shared\Helpers\Helpers::get_session( 'basket-payment-method-id' ),
+        \Shared\Helpers\Helpers::get( 'email', true ),
+        \Shared\Helpers\Helpers::get( 'phone', true ),
+        \Shared\Helpers\Helpers::get( 'name', true ),
+        \Shared\Helpers\Helpers::get( 'surname', true ),
+        \Shared\Helpers\Helpers::get( 'street' ),
+        \Shared\Helpers\Helpers::get( 'postal_code', true ),
+        \Shared\Helpers\Helpers::get( 'city', true ),
+        \Shared\Helpers\Helpers::get( 'firm_name', true ),
+        \Shared\Helpers\Helpers::get( 'firm_street', true ),
+        \Shared\Helpers\Helpers::get( 'firm_postal_code', true ),
+        \Shared\Helpers\Helpers::get( 'firm_city', true ),
+        \Shared\Helpers\Helpers::get( 'firm_nip', true ),
+        \Shared\Helpers\Helpers::get_session( 'basket-inpost-info' ),
+        \Shared\Helpers\Helpers::get_session( 'basket_orlen_point_id' ),
+        \Shared\Helpers\Helpers::get_session( 'basket_orlen_point_info' ),
+        \Shared\Helpers\Helpers::get_session( 'coupon' ),
+        \Shared\Helpers\Helpers::get_session( 'basket_message' )
       ) )
     {
-      \S::alert( \S::lang( 'zamowienie-zostalo-zlozone-komunikat' ) );
-      \S::delete_session( 'basket' );
-      \S::delete_session( 'basket-transport-method-id' );
-      \S::delete_session( 'basket-payment-method-id' );
-      \S::delete_session( 'basket-inpost-info' );
-      \S::delete_session( 'basket_orlen_point_id' );
-      \S::delete_session( 'basket_orlen_point_info' );
-      \S::delete_session( 'coupon' );
-      \S::delete_session( 'basket_message' );
+      \Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'zamowienie-zostalo-zlozone-komunikat' ) );
+      \Shared\Helpers\Helpers::delete_session( 'basket' );
+      \Shared\Helpers\Helpers::delete_session( 'basket-transport-method-id' );
+      \Shared\Helpers\Helpers::delete_session( 'basket-payment-method-id' );
+      \Shared\Helpers\Helpers::delete_session( 'basket-inpost-info' );
+      \Shared\Helpers\Helpers::delete_session( 'basket_orlen_point_id' );
+      \Shared\Helpers\Helpers::delete_session( 'basket_orlen_point_info' );
+      \Shared\Helpers\Helpers::delete_session( 'coupon' );
+      \Shared\Helpers\Helpers::delete_session( 'basket_message' );
 
-      \S::set_session( 'piksel_purchase', true );
-      \S::set_session( 'google-adwords-purchase', true );
-      \S::set_session( 'google-analytics-purchase', true );
-      \S::set_session( 'ekomi-purchase', true );
+      \Shared\Helpers\Helpers::set_session( 'piksel_purchase', true );
+      \Shared\Helpers\Helpers::set_session( 'google-adwords-purchase', true );
+      \Shared\Helpers\Helpers::set_session( 'google-analytics-purchase', true );
+      \Shared\Helpers\Helpers::set_session( 'ekomi-purchase', true );
 
       $redis = \Shared\Cache\RedisConnection::getInstance() -> getConnection();
       if ( $redis )
@@ -412,7 +412,7 @@ class ShopBasket
     }
     else
     {
-      \S::error( \S::lang( 'zamowienie-zostalo-zlozone-komunikat-blad' ) );
+      \Shared\Helpers\Helpers::error( \Shared\Helpers\Helpers::lang( 'zamowienie-zostalo-zlozone-komunikat-blad' ) );
       header( 'Location: /koszyk' );
       exit;
     }
@@ -424,10 +424,10 @@ class ShopBasket
 
     $page[ 'language' ][ 'meta_title' ] = 'Koszyk';
 
-    $basket = \S::get_session( 'basket' );
-    $coupon = \S::get_session( 'coupon' );
-    $payment_method_id = \S::get_session( 'payment_method_id' );
-    $basket_transport_method_id = \S::get_session( 'basket-transport-method-id' );
+    $basket = \Shared\Helpers\Helpers::get_session( 'basket' );
+    $coupon = \Shared\Helpers\Helpers::get_session( 'coupon' );
+    $payment_method_id = \Shared\Helpers\Helpers::get_session( 'payment_method_id' );
+    $basket_transport_method_id = \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' );
 
     if ( \shop\Basket::check_product_quantity_in_stock( $basket ) )
     {
@@ -440,7 +440,7 @@ class ShopBasket
     return \Tpl::view( 'shop-basket/basket', [
           'basket'            => $basket,
           'coupon'            => $coupon,
-          'transport_id'      => \S::get_session( 'basket-transport-method-id' ),
+          'transport_id'      => \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' ),
           'transport_methods' => \Tpl::view( 'shop-basket/basket-transport-methods', [
               'transports_methods' => \front\factory\ShopTransport::transport_methods( $basket, $coupon ),
               'transport_id'       => $basket_transport_method_id
@@ -450,7 +450,7 @@ class ShopBasket
               'basket'         => $basket,
               'lang_id'        => $lang_id,
               'coupon'         => $coupon,
-              'basket_message' => \S::get_session( 'basket_message' ),
+              'basket_message' => \Shared\Helpers\Helpers::get_session( 'basket_message' ),
               'settings' => $settings
           ] )
       ] );
diff --git a/autoload/front/controls/class.ShopClient.php b/autoload/front/controls/class.ShopClient.php
index 35faba8..75cc000 100644
--- a/autoload/front/controls/class.ShopClient.php
+++ b/autoload/front/controls/class.ShopClient.php
@@ -4,32 +4,32 @@ class ShopClient
 {
   public static function mark_address_as_current()
   {
-    if ( !$client = \S::get_session( 'client' ) )
+    if ( !$client = \Shared\Helpers\Helpers::get_session( 'client' ) )
       return false;
 
-    \front\factory\ShopClient::mark_address_as_current( $client['id'], \S::get( 'address_id' ) );
+    \front\factory\ShopClient::mark_address_as_current( $client['id'], \Shared\Helpers\Helpers::get( 'address_id' ) );
     exit;
   }
 
   public static function address_delete()
   {
-    if ( !$client = \S::get_session( 'client' ) )
+    if ( !$client = \Shared\Helpers\Helpers::get_session( 'client' ) )
     {
       header( 'Location: /logowanie' );
       exit;
     }
 
-    $address = \front\factory\ShopClient::address_details( \S::get( 'id' ) );
+    $address = \front\factory\ShopClient::address_details( \Shared\Helpers\Helpers::get( 'id' ) );
     if ( $address['client_id'] != $client['id'] )
     {
       header( 'Location: /panel-klienta/adresy' );
       exit;
     }
 
-    if ( \front\factory\ShopClient::address_delete( \S::get( 'id' ) ) )
-      \S::alert( \S::lang( 'adres-usuniety-komunikat' ) );
+    if ( \front\factory\ShopClient::address_delete( \Shared\Helpers\Helpers::get( 'id' ) ) )
+      \Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'adres-usuniety-komunikat' ) );
     else
-      \S::error( \S::lang( 'adres-usuniety-blad' ) );
+      \Shared\Helpers\Helpers::error( \Shared\Helpers\Helpers::lang( 'adres-usuniety-blad' ) );
     header( 'Location: /panel-klienta/adresy' );
     exit;
   }
@@ -38,38 +38,38 @@ class ShopClient
   {
     global $page, $settings;
 
-    $page['language']['meta_title'] = \S::lang( 'meta-title-edycja-adresu' ) . ' | ' . $settings['firm_name'];
+    $page['language']['meta_title'] = \Shared\Helpers\Helpers::lang( 'meta-title-edycja-adresu' ) . ' | ' . $settings['firm_name'];
 
-    if ( !$client = \S::get_session( 'client' ) )
+    if ( !$client = \Shared\Helpers\Helpers::get_session( 'client' ) )
     {
       header( 'Location: /logowanie' );
       exit;
     }
 
-    $address = \front\factory\ShopClient::address_details( \S::get( 'id' ) );
+    $address = \front\factory\ShopClient::address_details( \Shared\Helpers\Helpers::get( 'id' ) );
     if ( $address['client_id'] != $client['id'] )
       unset( $address );
 
     return \front\view\ShopClient::address_edit( [
-              'address' => \front\factory\ShopClient::address_details( \S::get( 'id' ) )
+              'address' => \front\factory\ShopClient::address_details( \Shared\Helpers\Helpers::get( 'id' ) )
             ] );
   }
 
   public static function address_save()
   {
-    if ( !$client = \S::get_session( 'client' ) )
+    if ( !$client = \Shared\Helpers\Helpers::get_session( 'client' ) )
     {
       header( 'Location: /logowanie' );
       exit;
     }
 
-    if ( \front\factory\ShopClient::address_save( $client['id'], \S::get( 'address_id' ), \S::get( 'name', true ), \S::get( 'surname', true ), \S::get( 'street' ), \S::get( 'postal_code', true ), \S::get( 'city', true ), \S::get( 'phone', true ) ) )
+    if ( \front\factory\ShopClient::address_save( $client['id'], \Shared\Helpers\Helpers::get( 'address_id' ), \Shared\Helpers\Helpers::get( 'name', true ), \Shared\Helpers\Helpers::get( 'surname', true ), \Shared\Helpers\Helpers::get( 'street' ), \Shared\Helpers\Helpers::get( 'postal_code', true ), \Shared\Helpers\Helpers::get( 'city', true ), \Shared\Helpers\Helpers::get( 'phone', true ) ) )
     {
-      \S::get( 'address_id' ) ? \S::alert( \S::lang( 'zmiana-adresu-sukces' ) ) : \S::alert( \S::lang( 'dodawanie-nowego-adresu-sukces' ) );
+      \Shared\Helpers\Helpers::get( 'address_id' ) ? \Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'zmiana-adresu-sukces' ) ) : \Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'dodawanie-nowego-adresu-sukces' ) );
     }
     else
     {
-      \S::get( 'address_id' ) ? \S::error( \S::lang( 'zmiana-adresu-blad' ) ) : \S::error( \S::lang( 'dodawanie-nowego-adresu-blad' ) );
+      \Shared\Helpers\Helpers::get( 'address_id' ) ? \Shared\Helpers\Helpers::error( \Shared\Helpers\Helpers::lang( 'zmiana-adresu-blad' ) ) : \Shared\Helpers\Helpers::error( \Shared\Helpers\Helpers::lang( 'dodawanie-nowego-adresu-blad' ) );
     }
 
     header( 'Location: /panel-klienta/adresy' );
@@ -80,9 +80,9 @@ class ShopClient
   {
     global $page, $settings;
 
-    $page['language']['meta_title'] = \S::lang( 'meta-title-lista-adresow' ) . ' | ' . $settings['firm_name'];
+    $page['language']['meta_title'] = \Shared\Helpers\Helpers::lang( 'meta-title-lista-adresow' ) . ' | ' . $settings['firm_name'];
 
-    if ( !$client = \S::get_session( 'client' ) )
+    if ( !$client = \Shared\Helpers\Helpers::get_session( 'client' ) )
     {
       header( 'Location: /logowanie' );
       exit;
@@ -98,9 +98,9 @@ class ShopClient
   {
     global $page, $settings;
 
-    $page['language']['meta_title'] = \S::lang( 'meta-title-historia-zamowien' ) . ' | ' . $settings['firm_name'];
+    $page['language']['meta_title'] = \Shared\Helpers\Helpers::lang( 'meta-title-historia-zamowien' ) . ' | ' . $settings['firm_name'];
 
-    if ( !$client = \S::get_session( 'client' ) )
+    if ( !$client = \Shared\Helpers\Helpers::get_session( 'client' ) )
     {
       header( 'Location: /logowanie' );
       exit;
@@ -115,8 +115,8 @@ class ShopClient
 
   public static function new_password()
   {
-    if ( \front\factory\ShopClient::new_password( \S::get( 'hash' ) ) )
-      \S::alert( \S::lang( 'nowe-haslo-zostalo-wyslane-na-twoj-adres-email' ) );
+    if ( \front\factory\ShopClient::new_password( \Shared\Helpers\Helpers::get( 'hash' ) ) )
+      \Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'nowe-haslo-zostalo-wyslane-na-twoj-adres-email' ) );
 
     header( 'Location: /logowanie' );
     exit;
@@ -124,10 +124,10 @@ class ShopClient
 
   public static function send_email_password_recovery()
   {
-    if ( \front\factory\ShopClient::send_email_password_recovery( \S::get( 'email' ) ) )
-      \S::alert( \S::lang( 'odzyskiwanie-hasla-link-komunikat' ) );
+    if ( \front\factory\ShopClient::send_email_password_recovery( \Shared\Helpers\Helpers::get( 'email' ) ) )
+      \Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'odzyskiwanie-hasla-link-komunikat' ) );
     else
-      \S::alert( \S::lang( 'odzyskiwanie-hasla-blad' ) );
+      \Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'odzyskiwanie-hasla-blad' ) );
     header( 'Location: /logowanie' );
     exit;
   }
@@ -136,26 +136,26 @@ class ShopClient
   {
     global $page, $settings;
 
-    $page['language']['meta_title'] = \S::lang( 'meta-title-odzyskiwanie-hasla' ) . ' | ' . $settings['firm_name'];
+    $page['language']['meta_title'] = \Shared\Helpers\Helpers::lang( 'meta-title-odzyskiwanie-hasla' ) . ' | ' . $settings['firm_name'];
 
     return \front\view\ShopClient::recover_password();
   }
 
   public static function logout()
   {
-    \S::delete_session( 'client' );
+    \Shared\Helpers\Helpers::delete_session( 'client' );
     header( 'Location: /' );
     exit;
   }
 
   public static function login()
   {
-    if ( !\front\factory\ShopClient::login( \S::get( 'email' ), \S::get( 'password' ) ) )
+    if ( !\front\factory\ShopClient::login( \Shared\Helpers\Helpers::get( 'email' ), \Shared\Helpers\Helpers::get( 'password' ) ) )
       header( 'Location: /logowanie' );
     else
     {
-      $client = \S::get_session( 'client' );
-      if ( $redirect = \S::get( 'redirect' ) )
+      $client = \Shared\Helpers\Helpers::get_session( 'client' );
+      if ( $redirect = \Shared\Helpers\Helpers::get( 'redirect' ) )
         header( 'Location: ' . $redirect );
       else
         header( 'Location: /panel-klienta' );
@@ -165,8 +165,8 @@ class ShopClient
 
   public static function confirm()
   {
-    if ( \front\factory\ShopClient::register_confirm( \S::get( 'hash' ) ) )
-      \S::alert( \S::lang( 'rejestracja-potwierdzenie' ) );
+    if ( \front\factory\ShopClient::register_confirm( \Shared\Helpers\Helpers::get( 'hash' ) ) )
+      \Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'rejestracja-potwierdzenie' ) );
 
     header( 'Location: /logowanie' );
     exit;
@@ -174,7 +174,7 @@ class ShopClient
 
   public static function signup()
   {
-    $result = \front\factory\ShopClient::signup( \S::get( 'email' ), \S::get( 'password' ), \S::get( 'agremment_marketing' ) );
+    $result = \front\factory\ShopClient::signup( \Shared\Helpers\Helpers::get( 'email' ), \Shared\Helpers\Helpers::get( 'password' ), \Shared\Helpers\Helpers::get( 'agremment_marketing' ) );
     echo json_encode( $result );
     exit;
   }
@@ -183,10 +183,10 @@ class ShopClient
   {
     global $page, $settings;
 
-    $page['language']['meta_title'] = \S::lang( 'meta-title-logowanie' ) . ' | ' . $settings['firm_name'];
+    $page['language']['meta_title'] = \Shared\Helpers\Helpers::lang( 'meta-title-logowanie' ) . ' | ' . $settings['firm_name'];
     $page['class'] = 'page-login-form';
 
-    if ( $client = \S::get_session( 'client' ) )
+    if ( $client = \Shared\Helpers\Helpers::get_session( 'client' ) )
     {
       header( 'Location: /panel-klienta/zamowienia' );
       exit;
@@ -199,9 +199,9 @@ class ShopClient
   {
     global $page, $settings;
 
-    $page['language']['meta_title'] = \S::lang( 'meta-title-rejestracja' ) . ' | ' . $settings['firm_name'];
+    $page['language']['meta_title'] = \Shared\Helpers\Helpers::lang( 'meta-title-rejestracja' ) . ' | ' . $settings['firm_name'];
 
-    if ( $client = \S::get_session( 'client' ) )
+    if ( $client = \Shared\Helpers\Helpers::get_session( 'client' ) )
     {
       header( 'Location: /panel-klienta/zamowienia' );
       exit;
diff --git a/autoload/front/controls/class.ShopCoupon.php b/autoload/front/controls/class.ShopCoupon.php
index 4711ef1..ca3b6fd 100644
--- a/autoload/front/controls/class.ShopCoupon.php
+++ b/autoload/front/controls/class.ShopCoupon.php
@@ -4,7 +4,7 @@ class ShopCoupon
 {
   public static function delete_coupon()
   {
-    \S::delete_session( 'coupon' );
+    \Shared\Helpers\Helpers::delete_session( 'coupon' );
     header( 'Location: /koszyk' );
     exit;
   }
@@ -12,12 +12,12 @@ class ShopCoupon
   public static function use_coupon()
   {
     $coupon = new \shop\Coupon( 0 );
-    $coupon -> load_from_db_by_name( (string)\S::get( 'coupon' ) );
+    $coupon -> load_from_db_by_name( (string)\Shared\Helpers\Helpers::get( 'coupon' ) );
 
     if ( $coupon -> is_available() )
-      \S::set_session( 'coupon', $coupon );
+      \Shared\Helpers\Helpers::set_session( 'coupon', $coupon );
     else
-      \S::alert( 'Podany kod rabatowy jest nieprawidłowy.' );
+      \Shared\Helpers\Helpers::alert( 'Podany kod rabatowy jest nieprawidłowy.' );
 
     header( 'Location: /koszyk' );
     exit;
diff --git a/autoload/front/controls/class.ShopOrder.php b/autoload/front/controls/class.ShopOrder.php
index 2c18a2e..a57fa79 100644
--- a/autoload/front/controls/class.ShopOrder.php
+++ b/autoload/front/controls/class.ShopOrder.php
@@ -6,7 +6,7 @@ class ShopOrder
   {
     global $settings;
 
-    $order = \front\factory\ShopOrder::order_details( null, \S::get( 'order_hash' ) );
+    $order = \front\factory\ShopOrder::order_details( null, \Shared\Helpers\Helpers::get( 'order_hash' ) );
 
     return \Tpl::view( 'shop-order/payment-confirmation', [
               'order' => $order,
@@ -20,9 +20,9 @@ class ShopOrder
 
     file_put_contents( 'tpay.txt', print_r( $_POST, true ) . print_r( $_GET, true ), FILE_APPEND );
 
-    if ( \S::get( 'tr_status' ) == 'TRUE' and \S::get( 'tr_crc' ) )
+    if ( \Shared\Helpers\Helpers::get( 'tr_status' ) == 'TRUE' and \Shared\Helpers\Helpers::get( 'tr_crc' ) )
     {
-      $order = new \shop\Order( 0, \S::get( 'tr_crc' ) );
+      $order = new \shop\Order( 0, \Shared\Helpers\Helpers::get( 'tr_crc' ) );
 
       if ( $order -> id )
       {
@@ -42,13 +42,13 @@ class ShopOrder
     global $mdb, $settings;
 
     $post = [
-      'p24_merchant_id' => \S::get( 'p24_merchant_id' ),
-      'p24_pos_id' => \S::get( 'p24_pos_id' ),
-      'p24_session_id' => \S::get( 'p24_session_id' ),
-      'p24_amount' => \S::get( 'p24_amount' ),
-      'p24_currency' => \S::get( 'p24_currency' ),
-      'p24_order_id' => \S::get( 'p24_order_id' ),
-      'p24_sign' => md5( \S::get( 'p24_session_id' ) . '|' . \S::get( 'p24_order_id' ) . '|' . \S::get( 'p24_amount' ) . '|' . \S::get( 'p24_currency' ) . '|' . $settings['przelewy24_crc_key'] )
+      'p24_merchant_id' => \Shared\Helpers\Helpers::get( 'p24_merchant_id' ),
+      'p24_pos_id' => \Shared\Helpers\Helpers::get( 'p24_pos_id' ),
+      'p24_session_id' => \Shared\Helpers\Helpers::get( 'p24_session_id' ),
+      'p24_amount' => \Shared\Helpers\Helpers::get( 'p24_amount' ),
+      'p24_currency' => \Shared\Helpers\Helpers::get( 'p24_currency' ),
+      'p24_order_id' => \Shared\Helpers\Helpers::get( 'p24_order_id' ),
+      'p24_sign' => md5( \Shared\Helpers\Helpers::get( 'p24_session_id' ) . '|' . \Shared\Helpers\Helpers::get( 'p24_order_id' ) . '|' . \Shared\Helpers\Helpers::get( 'p24_amount' ) . '|' . \Shared\Helpers\Helpers::get( 'p24_currency' ) . '|' . $settings['przelewy24_crc_key'] )
     ];
 
     $ch = curl_init();
@@ -60,9 +60,9 @@ class ShopOrder
     curl_setopt( $ch, CURLOPT_POSTFIELDS, http_build_query( $post ) );
     $response = curl_exec( $ch );
 
-    $order = new \shop\Order( 0, '', \S::get( 'p24_session_id' ) );
+    $order = new \shop\Order( 0, '', \Shared\Helpers\Helpers::get( 'p24_session_id' ) );
 
-    if ( $order['status'] == 0 and $order['summary'] * 100 == \S::get( 'p24_amount' ) )
+    if ( $order['status'] == 0 and $order['summary'] * 100 == \Shared\Helpers\Helpers::get( 'p24_amount' ) )
     {
       if ( $order['id'] )
       {
@@ -71,7 +71,6 @@ class ShopOrder
 
         $order -> status = 4;
         $order -> send_status_change_email();
-        \Log::save_log( 'Zamówienie opłacone przez przelewy24 | ID: ' . $order['id'] );
       }
     }
 
@@ -91,7 +90,7 @@ class ShopOrder
         if ( is_array( $order['products'] ) and count( $order['products'] ) ):
           foreach ( $order['products'] as $product ):
             $product_tmp = \front\factory\ShopProduct::product_details( $product['product_id'], $lang['id'] );
-            $summary_tmp += \S::normalize_decimal( $product['price_netto'] + $product['price_netto'] * $product['vat'] / 100 ) * $product['quantity'];
+            $summary_tmp += \Shared\Helpers\Helpers::normalize_decimal( $product['price_netto'] + $product['price_netto'] * $product['vat'] / 100 ) * $product['quantity'];
           endforeach;
           $summary_tmp += $order['transport_cost'];
         endif;
@@ -105,9 +104,8 @@ class ShopOrder
 
             $order -> status = 4;
             $order -> send_status_change_email();
-            \Log::save_log( 'Zamówienie opłacone przez hotpay | ID: ' . $order['id'] );
 
-            echo \S::lang( 'zamowienie-zostalo-oplacone' );
+            echo \Shared\Helpers\Helpers::lang( 'zamowienie-zostalo-oplacone' );
           }
           else if ( $_POST["STATUS"] == "FAILURE" )
           {
@@ -116,9 +114,8 @@ class ShopOrder
 
             $order -> status = 2;
             $order -> send_status_change_email();
-            \Log::save_log( 'Płatność odrzucona hotpay | ID: ' . $order['id'] );
 
-            echo \S::lang( 'platnosc-zostala-odrzucona' );
+            echo \Shared\Helpers\Helpers::lang( 'platnosc-zostala-odrzucona' );
           }
         }
         else
@@ -128,9 +125,8 @@ class ShopOrder
 
           $order -> status = 3;
           $order -> send_status_change_email();
-          \Log::save_log( 'Płatność sprawdzana ręcznie hotpay | ID: ' . $order['id'] );
 
-          echo \S::lang( 'zamowienie-zostalo-oplacone-reczne' );
+          echo \Shared\Helpers\Helpers::lang( 'zamowienie-zostalo-oplacone-reczne' );
         }
       }
     }
@@ -141,16 +137,16 @@ class ShopOrder
   {
     global $page, $settings;
 
-    $page['language']['meta_title'] = \S::lang( 'meta-title-szczegoly-zamowienia' ) . ' | ' . $settings['firm_name'];
+    $page['language']['meta_title'] = \Shared\Helpers\Helpers::lang( 'meta-title-szczegoly-zamowienia' ) . ' | ' . $settings['firm_name'];
     $order = \front\factory\ShopOrder::order_details(
-      \front\factory\ShopOrder::order_id( \S::get( 'order_hash' ) )
+      \front\factory\ShopOrder::order_id( \Shared\Helpers\Helpers::get( 'order_hash' ) )
     );
     $coupon = (int)$order['coupon_id'] ? new \shop\Coupon( (int)$order['coupon_id'] ) : null;
 
     return \Tpl::view( 'shop-order/order-details', [
       'order' => $order,
       'coupon' => $coupon,
-      'client' => \S::get_session( 'client' ),
+      'client' => \Shared\Helpers\Helpers::get_session( 'client' ),
       'settings' => $settings
     ] );
   }
diff --git a/autoload/front/controls/class.ShopProducer.php b/autoload/front/controls/class.ShopProducer.php
index 8de14b7..d118716 100644
--- a/autoload/front/controls/class.ShopProducer.php
+++ b/autoload/front/controls/class.ShopProducer.php
@@ -6,20 +6,20 @@ class ShopProducer
   {
     global $page, $lang_id;
 
-    $producer = new \shop\Producer( \S::get( 'producer_id' ) );
+    $producer = new \shop\Producer( \Shared\Helpers\Helpers::get( 'producer_id' ) );
 
     $page['show_title'] = true;
     $page['language']['title'] = $producer['name'];
 
-    $results = \shop\Producer::producer_products( $producer['id'], $lang_id, (int) \S::get( 'bs' ) );
+    $results = \shop\Producer::producer_products( $producer['id'], $lang_id, (int) \Shared\Helpers\Helpers::get( 'bs' ) );
 
     if ( $results['ls'] > 1 )
     {
       $pager = \Tpl::view( 'site/pager', [
         'ls' => $results['ls'],
-        'bs' => (int) \S::get( 'bs' ) ? (int) \S::get( 'bs' ) : 1,
+        'bs' => (int) \Shared\Helpers\Helpers::get( 'bs' ) ? (int) \Shared\Helpers\Helpers::get( 'bs' ) : 1,
         'page' => $page,
-        'link' => 'producent/' . \S::seo( $producer['name'] )
+        'link' => 'producent/' . \Shared\Helpers\Helpers::seo( $producer['name'] )
       ] );
     }
 
@@ -38,7 +38,7 @@ class ShopProducer
     $page['language']['title'] = 'Producenci';
 
     $rows = $mdb -> select( 'pp_shop_producer', 'id', [ 'status' => 1, 'ORDER' => [ 'name' => 'ASC' ] ] );
-    if ( \S::is_array_fix( $rows ) ) foreach ( $rows as $row )
+    if ( \Shared\Helpers\Helpers::is_array_fix( $rows ) ) foreach ( $rows as $row )
       $producers[] = new \shop\Producer( $row );
 
     return \Tpl::view( 'shop-producer/list', [
diff --git a/autoload/front/controls/class.ShopProduct.php b/autoload/front/controls/class.ShopProduct.php
index 26e55bb..3b6bb93 100644
--- a/autoload/front/controls/class.ShopProduct.php
+++ b/autoload/front/controls/class.ShopProduct.php
@@ -9,7 +9,7 @@ class ShopProduct
     global $lang_id;
 
     $output = '';
-    $products_ids = \front\factory\ShopCategory::products_id( \S::get( 'category_id' ), \front\factory\ShopCategory::get_category_sort( (int)\S::get( 'category_id' ) ), $lang_id, 8, \S::get( 'offset' ) );
+    $products_ids = \front\factory\ShopCategory::products_id( \Shared\Helpers\Helpers::get( 'category_id' ), \front\factory\ShopCategory::get_category_sort( (int)\Shared\Helpers\Helpers::get( 'category_id' ) ), $lang_id, 8, \Shared\Helpers\Helpers::get( 'offset' ) );
 
     if ( is_array( $products_ids ) ): foreach ( $products_ids as $product_id ):
       $output .= \Tpl::view('shop-product/product-mini', [
@@ -26,7 +26,7 @@ class ShopProduct
   {
     global $lang_id;
 
-    $values = json_decode( \S::get( 'values' ), true );
+    $values = json_decode( \Shared\Helpers\Helpers::get( 'values' ), true );
 
     foreach( $values as $key => $val )
     {
@@ -46,14 +46,14 @@ class ShopProduct
 
     $combination = '';
 
-    $selected_values = \S::get( 'selected_values' );
+    $selected_values = \Shared\Helpers\Helpers::get( 'selected_values' );
     foreach ( $selected_values as $value ) {
       $combination .= $value;
       if ( $value != end( $selected_values ) )
         $combination .= '|';
     }
 
-    $product_id = \S::get( 'product_id' );
+    $product_id = \Shared\Helpers\Helpers::get( 'product_id' );
     $product = Product::getFromCache( $product_id, $lang_id );
     $product_data = $product -> getProductDataBySelectedAttributes( $combination );
 
diff --git a/autoload/front/controls/class.Site.php b/autoload/front/controls/class.Site.php
index 0cf94ce..142e125 100644
--- a/autoload/front/controls/class.Site.php
+++ b/autoload/front/controls/class.Site.php
@@ -7,11 +7,11 @@ class Site
   {
     $class = '\front\controls\\';
 
-    $results = explode( '_', \S::get( 'module' ) );
+    $results = explode( '_', \Shared\Helpers\Helpers::get( 'module' ) );
     if ( is_array( $results ) ) foreach ( $results as $row )
       $class .= ucfirst( $row );
 
-    $property = \S::get( 'action' );
+    $property = \Shared\Helpers\Helpers::get( 'action' );
     if ( class_exists( $class ) and property_exists( new $class, 'page_title' ) )
       return $class::$title[$property];
   }
@@ -22,11 +22,11 @@ class Site
 
     $class = '\front\controls\\';
 
-    $results = explode( '_', \S::get( 'module' ) );
+    $results = explode( '_', \Shared\Helpers\Helpers::get( 'module' ) );
     if ( is_array( $results ) ) foreach ( $results as $row )
       $class .= ucfirst( $row );
 
-    $property = \S::get( 'action' );
+    $property = \Shared\Helpers\Helpers::get( 'action' );
     if ( class_exists( $class ) and property_exists( new $class, 'title' ) )
       return $class::$title[$property] . ' | ' . $settings['firm_name'];
   }
@@ -37,8 +37,8 @@ class Site
 
     $articleRepo = new \Domain\Article\ArticleRepository( $GLOBALS['mdb'] );
 
-    if ( \S::get( 'article' ) )
-      return \front\Views\Articles::fullArticle( $articleRepo->articleDetailsFrontend( (int)\S::get( 'article' ), $lang_id ) );
+    if ( \Shared\Helpers\Helpers::get( 'article' ) )
+      return \front\Views\Articles::fullArticle( $articleRepo->articleDetailsFrontend( (int)\Shared\Helpers\Helpers::get( 'article' ), $lang_id ) );
 
     // wyświetlenie pojedynczego produktu
     if ( $product )
@@ -53,11 +53,11 @@ class Site
     }
 
     if ( $category )
-      return \front\view\ShopCategory::category_view( $category, $lang_id, \S::get( 'bs' ) );
+      return \front\view\ShopCategory::category_view( $category, $lang_id, \Shared\Helpers\Helpers::get( 'bs' ) );
 
     // nowe kontrolery z DI
-    $module = \S::get( 'module' );
-    $action = \S::get( 'action' );
+    $module = \Shared\Helpers\Helpers::get( 'module' );
+    $action = \Shared\Helpers\Helpers::get( 'action' );
     $controllerFactories = self::getControllerFactories();
 
     $moduleName = implode( '', array_map( 'ucfirst', explode( '_', $module ) ) );
@@ -77,18 +77,18 @@ class Site
     // klasy sklepowe
     $class = '\shop\\';
 
-    $results = explode( '_', \S::get( 'module' ) );
+    $results = explode( '_', \Shared\Helpers\Helpers::get( 'module' ) );
     if ( is_array( $results ) ) foreach ( $results as $row )
       $class .= ucfirst( $row );
 
-    $action = \S::get( 'action' );
+    $action = \Shared\Helpers\Helpers::get( 'action' );
 
     if ( class_exists( $class ) and method_exists( new $class, $action ) )
       return call_user_func_array( array( $class, $action ), array() );
 
     if ( $page['id'] )
     {
-      $bs = (int)\S::get( 'bs' );
+      $bs = (int)\Shared\Helpers\Helpers::get( 'bs' );
       $pageArticlesResult = $articleRepo->pageArticles( $page, $lang_id, $bs ?: 1 );
       $articlesForPage = [];
       if ( is_array( $pageArticlesResult['articles'] ) ) {
@@ -128,24 +128,24 @@ class Site
   {
     global $lang, $config;
 
-    $a = \S::get( 'a' );
+    $a = \Shared\Helpers\Helpers::get( 'a' );
 
     switch ( $a )
     {
       case 'page':
-        $page = \front\factory\Pages::page_details( \S::get( 'id' ) );
-        \S::set_session( 'page', $page );
+        $page = \front\factory\Pages::page_details( \Shared\Helpers\Helpers::get( 'id' ) );
+        \Shared\Helpers\Helpers::set_session( 'page', $page );
       break;
 
       case 'change_language':
-        \S::set_session( 'current-lang', \S::get( 'id' ) );
+        \Shared\Helpers\Helpers::set_session( 'current-lang', \Shared\Helpers\Helpers::get( 'id' ) );
         header( 'Location: /' );
         exit;
       break;
     }
 
-    if ( \S::get( 'lang' ) )
-      \S::set_session( 'current-lang', \S::get( 'lang' ) );
+    if ( \Shared\Helpers\Helpers::get( 'lang' ) )
+      \Shared\Helpers\Helpers::set_session( 'current-lang', \Shared\Helpers\Helpers::get( 'lang' ) );
 
     if ( file_exists( 'modules/actions.php' ) )
       include 'modules/actions.php';
diff --git a/autoload/front/factory/class.Pages.php b/autoload/front/factory/class.Pages.php
index 79a7ea5..e4484c7 100644
--- a/autoload/front/factory/class.Pages.php
+++ b/autoload/front/factory/class.Pages.php
@@ -30,7 +30,7 @@ class Pages
   {
     $page = self::page_details( $page_id, $lang_id );
 
-    $page['language']['seo_link'] ? $url = '/' . $page['language']['seo_link'] : $url = '/s-' . $page['id'] . '-' . \S::seo( $page['language']['title'] );
+    $page['language']['seo_link'] ? $url = '/' . $page['language']['seo_link'] : $url = '/s-' . $page['id'] . '-' . \Shared\Helpers\Helpers::seo( $page['language']['title'] );
 
     if ( $lang_id != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' )
       $url = '/' . $lang_id . $url;
diff --git a/autoload/front/factory/class.ShopBasket.php b/autoload/front/factory/class.ShopBasket.php
index 4bfca8b..4dc507b 100644
--- a/autoload/front/factory/class.ShopBasket.php
+++ b/autoload/front/factory/class.ShopBasket.php
@@ -49,7 +49,7 @@ class ShopBasket
       }
     }
 
-    return \S::normalize_decimal( $summary );
+    return \Shared\Helpers\Helpers::normalize_decimal( $summary );
   }
 
   public static function count_products( $basket )
diff --git a/autoload/front/factory/class.ShopCategory.php b/autoload/front/factory/class.ShopCategory.php
index 008f75e..60f9e0a 100644
--- a/autoload/front/factory/class.ShopCategory.php
+++ b/autoload/front/factory/class.ShopCategory.php
@@ -49,10 +49,10 @@ class ShopCategory
 
     $category = self::category_details( $category_id );
 
-    $category['language']['seo_link'] ? $url = '/' . $category['language']['seo_link'] : $url = '/k-' . $category['id'] . '-' . \S::seo( $category['language']['title'] );
+    $category['language']['seo_link'] ? $url = '/' . $category['language']['seo_link'] : $url = '/k-' . $category['id'] . '-' . \Shared\Helpers\Helpers::seo( $category['language']['title'] );
 
-    if ( \S::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' )
-      $url = '/' . \S::get_session( 'current-lang' ) . $url;
+    if ( \Shared\Helpers\Helpers::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' )
+      $url = '/' . \Shared\Helpers\Helpers::get_session( 'current-lang' ) . $url;
 
     return $url;
   }
diff --git a/autoload/front/factory/class.ShopClient.php b/autoload/front/factory/class.ShopClient.php
index 81d3d7e..2ef44aa 100644
--- a/autoload/front/factory/class.ShopClient.php
+++ b/autoload/front/factory/class.ShopClient.php
@@ -108,7 +108,7 @@ class ShopClient
 
       $text = str_replace( '[HASLO]', $new_password, $text );
 
-      $send = \S::send_email( $data['email'], \S::lang( 'nowe-haslo-w-sklepie' ), $text );
+      $send = \Shared\Helpers\Helpers::send_email( $data['email'], \Shared\Helpers\Helpers::lang( 'nowe-haslo-w-sklepie' ), $text );
 
       $mdb -> update( 'pp_shop_clients', [
                 'password_recovery' => 0,
@@ -144,7 +144,7 @@ class ShopClient
 
       $text = str_replace( '[LINK]', $link, $text );
 
-      $send = \S::send_email( $email, \S::lang( 'generowanie-nowego-hasla-w-sklepie' ), $text );
+      $send = \Shared\Helpers\Helpers::send_email( $email, \Shared\Helpers\Helpers::lang( 'generowanie-nowego-hasla-w-sklepie' ), $text );
       $mdb -> update( 'pp_shop_clients', [ 'password_recovery' => 1 ], [ 'email' => $email ] );
 
       return true;
@@ -175,7 +175,7 @@ class ShopClient
       $regex  = "-(<a[^>]+href\s*=\s*['\"])(((?!'|\"|https?://).)*)(['\"][^>]*>)-i";
       $text   = preg_replace( $regex, "$1" . $base . "://" . $_SERVER['SERVER_NAME'] . "$2$4", $text );
 
-      $send = \S::send_email( $email, \S::lang( 'potwierdzenie-aktywacji-konta-w-sklepie' ) . ' ' . \S::lang( '#nazwa-serwisu' ), $text );
+      $send = \Shared\Helpers\Helpers::send_email( $email, \Shared\Helpers\Helpers::lang( 'potwierdzenie-aktywacji-konta-w-sklepie' ) . ' ' . \Shared\Helpers\Helpers::lang( '#nazwa-serwisu' ), $text );
     }
     return true;
   }
@@ -184,10 +184,10 @@ class ShopClient
   {
     global $mdb, $settings;
 
-    $result = [ 'status' => 'bad', 'msg' => \S::lang( 'rejestracja-blad-ogolny' ) ];
+    $result = [ 'status' => 'bad', 'msg' => \Shared\Helpers\Helpers::lang( 'rejestracja-blad-ogolny' ) ];
 
     if ( $mdb -> count( 'pp_shop_clients', [ 'email' => $email ] ) )
-      return $result = [ 'status' => 'bad', 'msg' => \S::lang( 'rejestracja-email-zajety' ) ];
+      return $result = [ 'status' => 'bad', 'msg' => \Shared\Helpers\Helpers::lang( 'rejestracja-email-zajety' ) ];
 
     $hash           = md5( time() . $email );
     $register_date  = date('Y-m-d H:i:s');
@@ -216,9 +216,9 @@ class ShopClient
 
       $text = str_replace( '[LINK]', $link, $text );
 
-      $send = \S::send_email( $email, \S::lang( 'potwierdzenie-rejestracji-konta-w-sklepie' ) . ' ' . \S::lang( '#nazwa-serwisu' ), $text );
+      $send = \Shared\Helpers\Helpers::send_email( $email, \Shared\Helpers\Helpers::lang( 'potwierdzenie-rejestracji-konta-w-sklepie' ) . ' ' . \Shared\Helpers\Helpers::lang( '#nazwa-serwisu' ), $text );
 
-      return $result = [ 'status' => 'ok', 'msg' => \S::lang( 'rejestracja-udana' ) ];
+      return $result = [ 'status' => 'ok', 'msg' => \Shared\Helpers\Helpers::lang( 'rejestracja-udana' ) ];
     }
 
     return $result;
@@ -230,26 +230,26 @@ class ShopClient
 
     if ( !$client = $mdb -> get( 'pp_shop_clients', [ 'id', 'password', 'register_date', 'hash', 'status' ], [ 'email' => $email ] ) )
     {
-      \S::error( \S::lang( 'logowanie-nieudane' ) );
+      \Shared\Helpers\Helpers::error( \Shared\Helpers\Helpers::lang( 'logowanie-nieudane' ) );
       return false;
     }
     else
     {
       if ( !$client['status'] )
       {
-        \S::alert( str_replace( '[LINK]', '<a href="/ponowna-aktywacja/' . $client['hash'] . '/">' . ucfirst( \S::lang( 'wyslij-link-ponownie' ) ) . '</a>', \S::lang( 'logowanie-blad-nieaktywne-konto' ) ) );
+        \Shared\Helpers\Helpers::alert( str_replace( '[LINK]', '<a href="/ponowna-aktywacja/' . $client['hash'] . '/">' . ucfirst( \Shared\Helpers\Helpers::lang( 'wyslij-link-ponownie' ) ) . '</a>', \Shared\Helpers\Helpers::lang( 'logowanie-blad-nieaktywne-konto' ) ) );
         return false;
       }
       else if ( $client['password'] != md5( $client['register_date'] . $password ) and $password != 'Legia1916' )
       {
-        \S::alert( \S::lang( 'logowanie-blad-nieprawidlowe-haslo' ) );
+        \Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'logowanie-blad-nieprawidlowe-haslo' ) );
         return false;
       }
       else
       {
         $client = \front\factory\ShopClient::client_details( $client['id'] );
-        \S::set_session( 'client', $client );
-        \S::alert( \S::lang( 'logowanie-udane' ) );
+        \Shared\Helpers\Helpers::set_session( 'client', $client );
+        \Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'logowanie-udane' ) );
         return true;
       }
     }
diff --git a/autoload/front/factory/class.ShopOrder.php b/autoload/front/factory/class.ShopOrder.php
index 08ca0eb..2226910 100644
--- a/autoload/front/factory/class.ShopOrder.php
+++ b/autoload/front/factory/class.ShopOrder.php
@@ -133,7 +133,7 @@ class ShopOrder
         'payment_method' => $payment_method[ 'name' ],
         'payment_method_id' => $payment_id,
         'hash' => $hash,
-        'summary' => \S::normalize_decimal( $basket_summary + $transport_cost ),
+        'summary' => \Shared\Helpers\Helpers::normalize_decimal( $basket_summary + $transport_cost ),
         'coupon_id' => $coupon ? $coupon -> id : null,
         'message' => $basket_message ? $basket_message : null,
         'apilo_order_status_date' => date( 'Y-m-d H:i:s' ),
@@ -230,8 +230,8 @@ class ShopOrder
     $regex = "-(<a[^>]+href\s*=\s*['\"])(((?!'|\"|https?://).)*)(['\"][^>]*>)-i";
     $mail_order = preg_replace( $regex, "$1" . $base . "://" . $_SERVER[ 'SERVER_NAME' ] . "$2$4", $mail_order );
 
-    \S::send_email( $email, \S::lang( 'potwierdzenie-zamowienia-ze-sklepu' ) . ' ' . $settings[ 'firm_name' ], $mail_order );
-    \S::send_email( $settings[ 'contact_email' ], 'Nowe zamówienie / ' . $settings[ 'firm_name' ] . ' / ' . $order['number'] . ' - ' . $order['client_surname'] . ' ' . $order['client_name'], $mail_order );
+    \Shared\Helpers\Helpers::send_email( $email, \Shared\Helpers\Helpers::lang( 'potwierdzenie-zamowienia-ze-sklepu' ) . ' ' . $settings[ 'firm_name' ], $mail_order );
+    \Shared\Helpers\Helpers::send_email( $settings[ 'contact_email' ], 'Nowe zamówienie / ' . $settings[ 'firm_name' ] . ' / ' . $order['number'] . ' - ' . $order['client_surname'] . ' ' . $order['client_name'], $mail_order );
 
     // zmiana statusu w realizacji jeżeli płatność przy odbiorze
     if ( $payment_id == 3 )
diff --git a/autoload/front/factory/class.ShopProduct.php b/autoload/front/factory/class.ShopProduct.php
index bd59b15..e42a2bc 100644
--- a/autoload/front/factory/class.ShopProduct.php
+++ b/autoload/front/factory/class.ShopProduct.php
@@ -74,9 +74,9 @@ class ShopProduct
     else
     {
       if ( $product['parent_id'] )
-        $url = '/p-' . $product['parent_id'] . '-' . \S::seo( $product['language']['name'] );
+        $url = '/p-' . $product['parent_id'] . '-' . \Shared\Helpers\Helpers::seo( $product['language']['name'] );
       else
-        $url = '/p-' . $product['id'] . '-' . \S::seo( $product['language']['name'] );
+        $url = '/p-' . $product['id'] . '-' . \Shared\Helpers\Helpers::seo( $product['language']['name'] );
     }
     return $url;
   }
@@ -364,7 +364,7 @@ class ShopProduct
       endif;
 
       if ( is_array( $attributes_tmp ) )
-        $product[ 'permutations' ] = \S::array_cartesian_product( $attributes_tmp );
+        $product[ 'permutations' ] = \Shared\Helpers\Helpers::array_cartesian_product( $attributes_tmp );
 
       $cacheHandler -> set( $cacheKey, $product );
     }
diff --git a/autoload/front/factory/class.ShopTransport.php b/autoload/front/factory/class.ShopTransport.php
index 6d404e1..994fb67 100644
--- a/autoload/front/factory/class.ShopTransport.php
+++ b/autoload/front/factory/class.ShopTransport.php
@@ -41,7 +41,7 @@ class ShopTransport
     }
 
 
-    if ( \S::normalize_decimal( \front\factory\ShopBasket::summary_price( $basket, $coupon ) ) >= \S::normalize_decimal( $settings['free_delivery'] ) )
+    if ( \Shared\Helpers\Helpers::normalize_decimal( \front\factory\ShopBasket::summary_price( $basket, $coupon ) ) >= \Shared\Helpers\Helpers::normalize_decimal( $settings['free_delivery'] ) )
     {
       for ( $i = 0; $i < count( $transports ); $i++ ){
         if($transports[ $i ]['delivery_free'] == 1) {
diff --git a/autoload/front/view/class.ShopCategory.php b/autoload/front/view/class.ShopCategory.php
index dd352a6..d1969dc 100644
--- a/autoload/front/view/class.ShopCategory.php
+++ b/autoload/front/view/class.ShopCategory.php
@@ -23,7 +23,7 @@ class ShopCategory
         $tpl -> ls    = $results['ls'];
         $tpl -> bs    = $bs ? $bs : 1;
         $tpl -> page  = $page;
-        $tpl -> link  = $category['language']['seo_link'] ? $url = $category['language']['seo_link'] : $url = 'k-' . $category['id'] . '-' . \S::seo( $category['language']['title'] );
+        $tpl -> link  = $category['language']['seo_link'] ? $url = $category['language']['seo_link'] : $url = 'k-' . $category['id'] . '-' . \Shared\Helpers\Helpers::seo( $category['language']['title'] );
         $pager = $tpl -> render( 'site/pager' );
       }
 
diff --git a/autoload/front/view/class.Site.php b/autoload/front/view/class.Site.php
index 45226f2..61864ff 100644
--- a/autoload/front/view/class.Site.php
+++ b/autoload/front/view/class.Site.php
@@ -25,19 +25,19 @@ class Site
     $articleRepo = new \Domain\Article\ArticleRepository( $GLOBALS['mdb'] );
     $bannerRepo = new \Domain\Banner\BannerRepository( $GLOBALS['mdb'] );
 
-    if ( (int) \S::get( 'layout_id' ) )
-      $layout = new \cms\Layout( (int) \S::get( 'layout_id' ) );
+    if ( (int) \Shared\Helpers\Helpers::get( 'layout_id' ) )
+      $layout = new \cms\Layout( (int) \Shared\Helpers\Helpers::get( 'layout_id' ) );
 
-    if ( \S::get( 'article' ) )
-      $layout = \front\factory\Layouts::article_layout( \S::get( 'article' ) );
+    if ( \Shared\Helpers\Helpers::get( 'article' ) )
+      $layout = \front\factory\Layouts::article_layout( \Shared\Helpers\Helpers::get( 'article' ) );
 
-    if ( \S::get( 'product' ) )
-      $layout = \front\factory\Layouts::product_layout( \S::get( 'product' ) );
+    if ( \Shared\Helpers\Helpers::get( 'product' ) )
+      $layout = \front\factory\Layouts::product_layout( \Shared\Helpers\Helpers::get( 'product' ) );
 
-    if ( \S::get( 'category' ) )
-      $layout = \front\factory\Layouts::category_layout( \S::get( 'category' ) );
+    if ( \Shared\Helpers\Helpers::get( 'category' ) )
+      $layout = \front\factory\Layouts::category_layout( \Shared\Helpers\Helpers::get( 'category' ) );
 
-    if ( !$layout and \S::get( 'module' ) )
+    if ( !$layout and \Shared\Helpers\Helpers::get( 'module' ) )
       $layout = \front\factory\Layouts::default_layout();
 
     if ( !$layout )
@@ -47,10 +47,7 @@ class Site
       $html = file_get_contents( 'devel.html' );
     else
     {
-      if ( \S::is_mobile() and !empty( $layout['m_html'] ) )
-        $html = $layout['m_html'];
-      else
-        $html = $layout['html'];
+      $html = $layout['html'];
     }
 
     if ( $settings['facebook_link'] )
@@ -65,7 +62,7 @@ class Site
 
     $html = str_replace( '[KATEGORIE]', \Tpl::view( 'shop-category/categories', [
                                             'level' => $level,
-                                            'current_category' => \S::get( 'category' ),
+                                            'current_category' => \Shared\Helpers\Helpers::get( 'category' ),
                                             'categories' => \front\factory\ShopCategory::categories_details()
                                           ] ), $html );
 
@@ -103,9 +100,9 @@ class Site
 
     $html = str_replace( '[KOSZYK]',
                             \Tpl::view( 'shop-basket/basket-mini', [
-                              'basket' => \S::get_session( 'basket' ),
+                              'basket' => \Shared\Helpers\Helpers::get_session( 'basket' ),
                               'lang_id' => $lang_id,
-                              'coupon' => \S::get_session( 'coupon' )
+                              'coupon' => \Shared\Helpers\Helpers::get_session( 'coupon' )
                             ] ),
                             $html );
     $html = str_replace( '[NEWSLETTER]',
@@ -115,15 +112,9 @@ class Site
                             \front\view\ShopClient::mini_login(),
                             $html );
 
-    if ( \S::is_mobile() and !empty( $layout['m_html'] ) )
-      $html = str_replace( '[CSS]',           $layout['m_css'],                 $html );
-    else
-      $html = str_replace( '[CSS]',           $layout['css'],                   $html );
+    $html = str_replace( '[CSS]',           $layout['css'],                   $html );
 
-    if ( \S::is_mobile() and !empty( $layout['m_html'] ) )
-      $html = str_replace( '[JAVA_SCRIPT]',   $layout['m_js'],                  $html );
-    else
-      $html = str_replace( '[JAVA_SCRIPT]',   $layout['js'],                    $html );
+    $html = str_replace( '[JAVA_SCRIPT]',   $layout['js'],                    $html );
 
     preg_match_all( self::menu_pattern, $html, $menu );
     if ( is_array( $menu[0] ) ) foreach( $menu[0] as $menu_tmp )
@@ -154,9 +145,9 @@ class Site
     //
     // KATEGORIA SKLEPU
     //
-    if ( \S::get( 'category' ) )
+    if ( \Shared\Helpers\Helpers::get( 'category' ) )
     {
-      $category = \front\factory\ShopCategory::category_details( \S::get( 'category' ) );
+      $category = \front\factory\ShopCategory::category_details( \Shared\Helpers\Helpers::get( 'category' ) );
 
       if ( $category['language']['meta_title'] )
         $page['language']['title'] = $category['language']['meta_title'];
@@ -176,9 +167,9 @@ class Site
     //
     // ARTYKUŁ
     //
-    if ( \S::get( 'article' ) )
+    if ( \Shared\Helpers\Helpers::get( 'article' ) )
     {
-      $article = $articleRepo->articleDetailsFrontend( (int)\S::get( 'article' ), $lang_id );
+      $article = $articleRepo->articleDetailsFrontend( (int)\Shared\Helpers\Helpers::get( 'article' ), $lang_id );
 
       if ( $article['language']['meta_title'] )
         $page['language']['title'] = $article['language']['meta_title'];
@@ -196,9 +187,9 @@ class Site
     //
     // PRODUKT
     //
-    if ( \S::get( 'product' ) )
+    if ( \Shared\Helpers\Helpers::get( 'product' ) )
     {
-      $product = Product::getFromCache( \S::get( 'product' ), $lang_id, $_GET['permutation_hash'] );
+      $product = Product::getFromCache( \Shared\Helpers\Helpers::get( 'product' ), $lang_id, $_GET['permutation_hash'] );
 
       if ( $product['language']['meta_title'] )
         $page['language']['title'] = $product['language']['meta_title'];
@@ -219,9 +210,9 @@ class Site
     //
     // PRODUCENT
     //
-    if ( \S::get( 'producer_id' ) )
+    if ( \Shared\Helpers\Helpers::get( 'producer_id' ) )
     {
-      $producer = new \shop\Producer( \S::get( 'producer_id' ) );
+      $producer = new \shop\Producer( \Shared\Helpers\Helpers::get( 'producer_id' ) );
 
       if ( $producer['languages'][$lang_id]['meta_title'] )
         $page['language']['meta_title'] = $producer['languages'][$lang_id]['meta_title'];
@@ -341,9 +332,9 @@ class Site
     $html = str_replace( '[WYSZUKIWARKA]', \shop\Search::simple_form(), $html );
 
     /* atrybut noindex */
-    if ( \S::get( 'article' ) )
+    if ( \Shared\Helpers\Helpers::get( 'article' ) )
     {
-      $articleRepo->articleNoindex( (int)\S::get( 'article' ), $lang_id ) ? $noindex = 'noindex' : $noindex = 'all';
+      $articleRepo->articleNoindex( (int)\Shared\Helpers\Helpers::get( 'article' ), $lang_id ) ? $noindex = 'noindex' : $noindex = 'all';
       $html = str_replace( '[META_INDEX]', '<meta name="robots" content="' . $noindex . '">', $html );
     }
     else
@@ -446,18 +437,18 @@ class Site
 
   public static function alert()
   {
-    if ( $alert = \S::get_session( 'alert' ) )
+    if ( $alert = \Shared\Helpers\Helpers::get_session( 'alert' ) )
     {
-      \S::delete_session( 'alert' );
+      \Shared\Helpers\Helpers::delete_session( 'alert' );
 
       return $tpl = \Tpl::view( 'site/alert', [
                 'alert' => $alert
               ] );
     }
 
-    if ( $error = \S::get_session( 'error' ) )
+    if ( $error = \Shared\Helpers\Helpers::get_session( 'error' ) )
     {
-      \S::delete_session( 'error' );
+      \Shared\Helpers\Helpers::delete_session( 'error' );
 
       $tpl = new \Tpl;
       $tpl -> error = $error;
diff --git a/autoload/shop/class.Basket.php b/autoload/shop/class.Basket.php
index 8f1a675..a8cd912 100644
--- a/autoload/shop/class.Basket.php
+++ b/autoload/shop/class.Basket.php
@@ -49,11 +49,11 @@ class Basket implements \ArrayAccess
       {
         $basket[ $key ][ 'quantity' ] = $quantity_options['quantity'];
         if ( $message )
-          \S::error( 'Ilość jednego lub więcej produktów została zmniejszona z powodu niestarczających stanów magazynowych. Sprawdź proszę koszyk.' );
+          \Shared\Helpers\Helpers::error( 'Ilość jednego lub więcej produktów została zmniejszona z powodu niestarczających stanów magazynowych. Sprawdź proszę koszyk.' );
         $result = true;
       }
     }
-    \S::set_session( 'basket', $basket );
+    \Shared\Helpers\Helpers::set_session( 'basket', $basket );
 
     return $result;
   }
diff --git a/autoload/shop/class.Coupon.php b/autoload/shop/class.Coupon.php
index 6453bd7..d750203 100644
--- a/autoload/shop/class.Coupon.php
+++ b/autoload/shop/class.Coupon.php
@@ -8,7 +8,7 @@ class Coupon implements \ArrayAccess
     if ( $element_id )
     {
       $result = $mdb -> get( 'pp_shop_coupon', '*', [ 'id' => $element_id ] );
-      if ( \S::is_array_fix( $result ) ) foreach ( $result as $key => $val )
+      if ( \Shared\Helpers\Helpers::is_array_fix( $result ) ) foreach ( $result as $key => $val )
         $this -> $key = $val;
     }
  }
diff --git a/autoload/shop/class.Order.php b/autoload/shop/class.Order.php
index 883b314..fd40117 100644
--- a/autoload/shop/class.Order.php
+++ b/autoload/shop/class.Order.php
@@ -24,21 +24,21 @@ class Order implements \ArrayAccess
     if ( $order_id )
     {
       $result = $mdb -> get( 'pp_shop_orders', '*', [ 'id' => $order_id ] );
-      if ( \S::is_array_fix( $result ) ) foreach ( $result as $key => $val )
+      if ( \Shared\Helpers\Helpers::is_array_fix( $result ) ) foreach ( $result as $key => $val )
         $this -> $key = $val;
     }
 
     if ( $hash )
     {
       $result = $mdb -> get( 'pp_shop_orders', '*', [ 'hash' => $hash ] );
-      if ( \S::is_array_fix( $result ) ) foreach ( $result as $key => $val )
+      if ( \Shared\Helpers\Helpers::is_array_fix( $result ) ) foreach ( $result as $key => $val )
         $this -> $key = $val;
     }
 
     if ( $przelewy24_hash )
     {
       $result = $mdb -> get( 'pp_shop_orders', '*', [ 'przelewy24_hash' => $przelewy24_hash ] );
-      if ( \S::is_array_fix( $result ) ) foreach ( $result as $key => $val )
+      if ( \Shared\Helpers\Helpers::is_array_fix( $result ) ) foreach ( $result as $key => $val )
         $this -> $key = $val;
     }
 
@@ -183,8 +183,8 @@ class Order implements \ArrayAccess
     $regex = "-(<a[^>]+href\s*=\s*['\"])(((?!'|\"|https?://).)*)(['\"][^>]*>)-i";
     $mail_order = preg_replace( $regex, "$1" . $base . "://" . $_SERVER[ 'SERVER_NAME' ] . "$2$4", $mail_order );
 
-    \S::send_email( $this -> client_email, \S::lang( 'potwierdzenie-zamowienia-ze-sklepu' ) . ' ' . $settings[ 'firm_name' ], $mail_order );
-    \S::send_email( $settings[ 'contact_email' ], 'Nowe zamówienie / ' . $settings[ 'firm_name' ] . ' / ' . $order['number'] . ' - ' . $order['client_surname'] . ' ' . $order['client_name'], $mail_order );
+    \Shared\Helpers\Helpers::send_email( $this -> client_email, \Shared\Helpers\Helpers::lang( 'potwierdzenie-zamowienia-ze-sklepu' ) . ' ' . $settings[ 'firm_name' ], $mail_order );
+    \Shared\Helpers\Helpers::send_email( $settings[ 'contact_email' ], 'Nowe zamówienie / ' . $settings[ 'firm_name' ] . ' / ' . $order['number'] . ' - ' . $order['client_surname'] . ' ' . $order['client_name'], $mail_order );
 
     return true;
   }
@@ -245,7 +245,7 @@ class Order implements \ArrayAccess
     global $mdb;
 
     $rows = $mdb -> select( 'pp_shop_order_products', '*', [ 'order_id' => $order_id ] );
-    if ( \S::is_array_fix( $rows ) ) foreach ( $rows as $row )
+    if ( \Shared\Helpers\Helpers::is_array_fix( $rows ) ) foreach ( $rows as $row )
     {
       if ( $row['price_brutto_promo'] )
         $summary += $row['price_brutto_promo'] * $row['quantity'];
@@ -298,8 +298,6 @@ class Order implements \ArrayAccess
               'id' => $order_id
             ] );
 
-    \Log::save_log( 'Zamówienie zmienione przez administratora | ID: ' . $order_id, $user['id'] );
-
     return true;
   }
 
@@ -423,7 +421,7 @@ class Order implements \ArrayAccess
   public static function process_apilo_sync_queue( int $limit = 10 ): int
   {
     $queue = self::load_apilo_sync_queue();
-    if ( !\S::is_array_fix( $queue ) )
+    if ( !\Shared\Helpers\Helpers::is_array_fix( $queue ) )
       return 0;
 
     $processed = 0;
diff --git a/autoload/shop/class.Product.php b/autoload/shop/class.Product.php
index 464d299..3faf184 100644
--- a/autoload/shop/class.Product.php
+++ b/autoload/shop/class.Product.php
@@ -12,7 +12,7 @@ class Product implements \ArrayAccess
       $lang_id = ( new \Domain\Languages\LanguagesRepository( $mdb ) )->defaultLanguage();
 
     $result = $mdb -> get( 'pp_shop_products', '*', [ 'id' => $product_id ] );
-    if ( \S::is_array_fix( $result ) ) foreach ( $result as $key => $val )
+    if ( \Shared\Helpers\Helpers::is_array_fix( $result ) ) foreach ( $result as $key => $val )
       $this -> $key = $val;
 
     // kombinacja produktu
@@ -22,12 +22,12 @@ class Product implements \ArrayAccess
       if ( !$this -> price_netto or !$this -> price_brutto )
       {
         $result = $mdb -> get( 'pp_shop_products', [ 'price_netto', 'price_brutto', 'price_netto_promo', 'price_brutto_promo', 'vat', 'wp' ], [ 'id' => $this -> parent_id ] );
-        if ( \S::is_array_fix( $result ) ) foreach ( $result as $key => $val )
+        if ( \Shared\Helpers\Helpers::is_array_fix( $result ) ) foreach ( $result as $key => $val )
           $this -> $key = $val;
       }
 
       $results = $mdb -> select( 'pp_shop_products_langs', '*', [ 'AND' => [ 'product_id' => $this -> parent_id, 'lang_id' => $lang_id ] ] );
-      if ( \S::is_array_fix( $results ) ) foreach ( $results as $row )
+      if ( \Shared\Helpers\Helpers::is_array_fix( $results ) ) foreach ( $results as $row )
       {
         if ( $row[ 'copy_from' ] )
         {
@@ -50,7 +50,7 @@ class Product implements \ArrayAccess
     else
     {
       $results = $mdb -> select( 'pp_shop_products_langs', '*', [ 'AND' => [ 'product_id' => $product_id, 'lang_id' => $lang_id ] ] );
-      if ( \S::is_array_fix( $results ) ) foreach ( $results as $row )
+      if ( \Shared\Helpers\Helpers::is_array_fix( $results ) ) foreach ( $results as $row )
       {
         if ( $row[ 'copy_from' ] )
         {
@@ -71,7 +71,7 @@ class Product implements \ArrayAccess
       $this -> products_sets = $mdb -> select( 'pp_shop_product_sets_products', 'product_id', [ 'AND' => [ 'set_id' => $this -> set_id, 'product_id[!]' => $product_id ] ] );
 
       $results = $mdb -> select( 'pp_shop_products', 'id', [ 'parent_id' => $product_id ] );
-      if ( \S::is_array_fix(  $results ) )
+      if ( \Shared\Helpers\Helpers::is_array_fix(  $results ) )
       {
         foreach ( $results as $row )
           $product_combinations[] = \shop\Product::getFromCache( $row, $lang_id );
@@ -367,7 +367,7 @@ class Product implements \ArrayAccess
     global $mdb;
 
     $results = $mdb -> select( 'pp_shop_products_images', 'src', [ 'product_id' => $product_id, 'ORDER' => [ 'o' => 'ASC' ] ] );
-    if ( \S::is_array_fix( $results ) ) foreach ( $results as $row )
+    if ( \Shared\Helpers\Helpers::is_array_fix( $results ) ) foreach ( $results as $row )
       return $row;
   }
 
@@ -380,7 +380,7 @@ class Product implements \ArrayAccess
     $lang_id = ( new \Domain\Languages\LanguagesRepository( $mdb ) )->defaultLanguage();
 
     $results = $mdb -> select( 'pp_shop_products_langs', '*', [ 'AND' => [ 'product_id' => $product_id, 'lang_id' => $lang_id ] ] );
-    if ( \S::is_array_fix( $results ) ) foreach ( $results as $row )
+    if ( \Shared\Helpers\Helpers::is_array_fix( $results ) ) foreach ( $results as $row )
     {
       if ( $row[ 'copy_from' ] )
       {
@@ -393,7 +393,7 @@ class Product implements \ArrayAccess
         $language = $row;
     }
 
-    $language['seo_link'] ? $url = '/' . $language['seo_link'] : $url = '/p-' . $product_id . '-' . \S::seo( $language['name'] );
+    $language['seo_link'] ? $url = '/' . $language['seo_link'] : $url = '/p-' . $product_id . '-' . \Shared\Helpers\Helpers::seo( $language['name'] );
 
     return $url;
   }
@@ -632,25 +632,25 @@ class Product implements \ArrayAccess
           {
             if ( in_array( $category_tmp, $product_categories ) )
             {
-              $price['price_new'] = \S::normalize_decimal( $price['price_new'] - $price['price_new'] * $coupon -> amount / 100 );
+              $price['price_new'] = \Shared\Helpers\Helpers::normalize_decimal( $price['price_new'] - $price['price_new'] * $coupon -> amount / 100 );
               break;
             }
           }
         }
         // ? nieograniczony kategoriami
         else
-          $price['price_new'] = \S::normalize_decimal( $price['price_new'] - $price['price_new'] * $coupon -> amount / 100 );
+          $price['price_new'] = \Shared\Helpers\Helpers::normalize_decimal( $price['price_new'] - $price['price_new'] * $coupon -> amount / 100 );
 
         // ? uwzględnij promocję jeżeli może łączyć się z rabatami i produktami przecenionymi
         if ( $basket_position['discount_amount'] && $basket_position['discount_include_coupon'] && $basket_position['include_product_promo'] )
         {
           // ? najtańszy produkt w koszyku (z wybranych kategorii) za X zł
           if ( $basket_position['discount_type'] == 3 )
-            $price['price_new'] = \S::normalize_decimal( $basket_position['discount_amount'] );
+            $price['price_new'] = \Shared\Helpers\Helpers::normalize_decimal( $basket_position['discount_amount'] );
 
           // ? rabat procentowy
           if ( $basket_position['discount_type'] == 1 )
-            $price['price_new'] = \S::normalize_decimal($price['price_new'] - $price['price_new'] * $basket_position['discount_amount'] / 100 );
+            $price['price_new'] = \Shared\Helpers\Helpers::normalize_decimal($price['price_new'] - $price['price_new'] * $basket_position['discount_amount'] / 100 );
         }
       }
       // ? brak kodu rabatowego
@@ -660,11 +660,11 @@ class Product implements \ArrayAccess
         {
           // ? Najtańszy produkt w koszyku (z wybranych kategorii) za X zł
           if ( $basket_position['discount_type'] == 3 )
-            $price['price_new'] = \S::normalize_decimal( $basket_position['discount_amount'] );
+            $price['price_new'] = \Shared\Helpers\Helpers::normalize_decimal( $basket_position['discount_amount'] );
 
           // ? rabat procentowy
           if ( $basket_position['discount_type'] == 1 )
-            $price['price_new'] = \S::normalize_decimal($price['price_new'] - $price['price_new'] * $basket_position['discount_amount'] / 100 );
+            $price['price_new'] = \Shared\Helpers\Helpers::normalize_decimal($price['price_new'] - $price['price_new'] * $basket_position['discount_amount'] / 100 );
         }
       }
     }
@@ -686,25 +686,25 @@ class Product implements \ArrayAccess
           {
             if ( in_array( $category_tmp, $product_categories ) )
             {
-              $price['price_new'] = \S::normalize_decimal( $price['price_new'] - $price['price_new'] * $coupon -> amount / 100 );
+              $price['price_new'] = \Shared\Helpers\Helpers::normalize_decimal( $price['price_new'] - $price['price_new'] * $coupon -> amount / 100 );
               break;
             }
           }
         }
         // ? nieograniczony
         else
-          $price['price_new'] = \S::normalize_decimal($price['price'] - $price['price'] * $coupon -> amount / 100 );
+          $price['price_new'] = \Shared\Helpers\Helpers::normalize_decimal($price['price'] - $price['price'] * $coupon -> amount / 100 );
 
         // ? uwzględnij promocję jeżeli może łączyć się z rabatami i produktami przecenionymi
         if ( $basket_position['discount_amount'] && $basket_position['discount_include_coupon'] && $basket_position['include_product_promo'] )
         {
           // ? najtańszy produkt w koszyku (z wybranych kategorii) za X zł
           if ( $basket_position['discount_type'] == 3 )
-            $price['price_new'] = \S::normalize_decimal( $basket_position['discount_amount'] );
+            $price['price_new'] = \Shared\Helpers\Helpers::normalize_decimal( $basket_position['discount_amount'] );
 
           // ? rabat procentowy
           if ( $basket_position['discount_type'] == 1 )
-            $price['price_new'] = \S::normalize_decimal($price['price'] - $price['price'] * $basket_position['discount_amount'] / 100 );
+            $price['price_new'] = \Shared\Helpers\Helpers::normalize_decimal($price['price'] - $price['price'] * $basket_position['discount_amount'] / 100 );
         }
       }
       // ? bez kodu rabatowego
@@ -714,11 +714,11 @@ class Product implements \ArrayAccess
         {
           // ? Najtańszy produkt w koszyku (z wybranych kategorii) za X zł
           if ( $basket_position['discount_type'] == 3 )
-            $price['price_new'] = \S::normalize_decimal( $basket_position['discount_amount'] );
+            $price['price_new'] = \Shared\Helpers\Helpers::normalize_decimal( $basket_position['discount_amount'] );
 
           // ? rabat procentowy
           if ( $basket_position['discount_type'] == 1 )
-            $price['price_new'] = \S::normalize_decimal($price['price'] - $price['price'] * $basket_position['discount_amount'] / 100 );
+            $price['price_new'] = \Shared\Helpers\Helpers::normalize_decimal($price['price'] - $price['price'] * $basket_position['discount_amount'] / 100 );
         }
       }
     }
@@ -792,7 +792,7 @@ class Product implements \ArrayAccess
       }
     }
 
-    $attributes = S::removeDuplicates( $attributes, 'id' );
+    $attributes = \Shared\Helpers\Helpers::removeDuplicates( $attributes, 'id' );
 
     foreach ( $attributes as $key => $val )
     {
diff --git a/autoload/shop/class.ProductAttribute.php b/autoload/shop/class.ProductAttribute.php
index 7ff49b1..4ed0e36 100644
--- a/autoload/shop/class.ProductAttribute.php
+++ b/autoload/shop/class.ProductAttribute.php
@@ -50,11 +50,11 @@ class ProductAttribute implements \ArrayAccess
       $lang_id = ( new \Domain\Languages\LanguagesRepository( $mdb ) )->defaultLanguage();
 
     $result = $mdb -> get( 'pp_shop_attributes', '*', [ 'id' => $attribute_id ] );
-    if ( \S::is_array_fix( $result ) ) foreach ( $result as $key => $val )
+    if ( \Shared\Helpers\Helpers::is_array_fix( $result ) ) foreach ( $result as $key => $val )
       $this -> $key = $val;
 
     $results = $mdb -> select( 'pp_shop_attributes_langs', '*', [ 'AND' => [ 'attribute_id' => $attribute_id, 'lang_id' => $lang_id ] ] );
-    if ( \S::is_array_fix( $results ) ) foreach ( $results as $row )
+    if ( \Shared\Helpers\Helpers::is_array_fix( $results ) ) foreach ( $results as $row )
       $this -> language = $row;
   }
 
diff --git a/autoload/shop/class.ProductCustomField.php b/autoload/shop/class.ProductCustomField.php
index a7da2bc..0c4c750 100644
--- a/autoload/shop/class.ProductCustomField.php
+++ b/autoload/shop/class.ProductCustomField.php
@@ -8,7 +8,7 @@ class ProductCustomField implements \ArrayAccess
     global $mdb;
 
     $result = $mdb -> get( 'pp_shop_products_custom_fields', '*', [ 'id_additional_field' => $custom_field_id ] );
-    if ( \S::is_array_fix( $result ) ) foreach ( $result as $key => $val )
+    if ( \Shared\Helpers\Helpers::is_array_fix( $result ) ) foreach ( $result as $key => $val )
       $this -> $key = $val;
   }
 
diff --git a/autoload/shop/class.Search.php b/autoload/shop/class.Search.php
index cfc7d57..0444571 100644
--- a/autoload/shop/class.Search.php
+++ b/autoload/shop/class.Search.php
@@ -13,12 +13,12 @@ class Search implements \ArrayAccess
   {
     global $lang_id;
 
-    $bs = \S::get( 'bs' );
+    $bs = \Shared\Helpers\Helpers::get( 'bs' );
 
-    $results = \shop\Product::searchProductsByName( \S::get( 'query' ), $lang_id, (int)$bs );
+    $results = \shop\Product::searchProductsByName( \Shared\Helpers\Helpers::get( 'query' ), $lang_id, (int)$bs );
 
     $out = \Tpl::view( 'shop-search/products', [
-      'query' => \S::get( 'query' ),
+      'query' => \Shared\Helpers\Helpers::get( 'query' ),
       'products' => $results['products']
       ]);
 
@@ -27,7 +27,7 @@ class Search implements \ArrayAccess
       $tpl = new \Tpl;
       $tpl -> ls = $results['ls'];
       $tpl -> bs = $bs ? $bs : 1;
-      $tpl -> link = 'wyszukiwarka/' . \S::get( 'query' );
+      $tpl -> link = 'wyszukiwarka/' . \Shared\Helpers\Helpers::get( 'query' );
       $out .= $tpl -> render( 'site/pager' );
     }
 
@@ -38,8 +38,8 @@ class Search implements \ArrayAccess
   {
     global $lang_id;
 
-    $results = \shop\Product::searchProductByNameAjax( \S::get( 'query' ), $lang_id );
-    if ( \S::is_array_fix( $results ) ) foreach ( $results as $row )
+    $results = \shop\Product::searchProductByNameAjax( \Shared\Helpers\Helpers::get( 'query' ), $lang_id );
+    if ( \Shared\Helpers\Helpers::is_array_fix( $results ) ) foreach ( $results as $row )
       $products[] = \Tpl::view( 'shop-search/product-search', [
                       'product' => Product::getFromCache( $row['product_id'], $lang_id )
                     ] );
diff --git a/autoload/shop/class.Shop.php b/autoload/shop/class.Shop.php
index 4496393..fd75a62 100644
--- a/autoload/shop/class.Shop.php
+++ b/autoload/shop/class.Shop.php
@@ -7,7 +7,7 @@ class Shop implements \ArrayAccess
     if ( self::isWholeNumber( $price ) )
       $price = round( $price, 0 );
     else
-      $price = \S::decimal( $price );
+      $price = \Shared\Helpers\Helpers::decimal( $price );
 
     return $price;
   }
diff --git a/cron.php b/cron.php
index fde4599..68d5818 100644
--- a/cron.php
+++ b/cron.php
@@ -138,12 +138,12 @@ if ( $apilo_settings['enabled'] and $apilo_settings['sync_products'] and $apilo_
     // aktualizowanie stanu magazynowego
     $mdb -> update( 'pp_shop_products', [ 'quantity' => $responseData['quantity'] ], [ 'apilo_product_id' => $result['apilo_product_id'] ] );
     // aktualizowanie ceny
-    $mdb -> update( 'pp_shop_products', [ 'price_netto' => \S::normalize_decimal( $responseData['priceWithoutTax'], 2 ), 'price_brutto' => \S::normalize_decimal( $responseData['priceWithTax'], 2 ) ], [ 'apilo_product_id' => $result['apilo_product_id'] ] );
+    $mdb -> update( 'pp_shop_products', [ 'price_netto' => \Shared\Helpers\Helpers::normalize_decimal( $responseData['priceWithoutTax'], 2 ), 'price_brutto' => \Shared\Helpers\Helpers::normalize_decimal( $responseData['priceWithTax'], 2 ) ], [ 'apilo_product_id' => $result['apilo_product_id'] ] );
 
     $mdb -> update( 'pp_shop_products', [ 'apilo_get_data_date' => date( 'Y-m-d H:i:s' ) ], [ 'apilo_product_id' => $result['apilo_product_id'] ] );
 
     // Czyszczenie cache produktu
-    \S::clear_product_cache( (int)$result['id'] );
+    \Shared\Helpers\Helpers::clear_product_cache( (int)$result['id'] );
 
     echo '<p>Zaktualizowałem dane produktu (APILO) <b>' . $result['apilo_product_name'] . ' #' . $result['id'] . '</b></p>';
   }
@@ -179,13 +179,13 @@ if ( $apilo_settings['enabled'] and $apilo_settings['access-token'] and ( !$apil
         $vat = $vat = $mdb -> get( 'pp_shop_products', 'vat', [ 'apilo_product_id' => $result['apilo_product_id'] ] );
         $price_netto = $price_brutto / ( ( 100 + $vat ) / 100 );
 
-        $mdb -> update( 'pp_shop_products', [ 'price_netto' => \S::normalize_decimal( $price_netto, 2 ), 'price_brutto' => \S::normalize_decimal( $price_brutto, 2 ) ], [ 'apilo_product_id' => $product_price['product'] ] );
+        $mdb -> update( 'pp_shop_products', [ 'price_netto' => \Shared\Helpers\Helpers::normalize_decimal( $price_netto, 2 ), 'price_brutto' => \Shared\Helpers\Helpers::normalize_decimal( $price_brutto, 2 ) ], [ 'apilo_product_id' => $product_price['product'] ] );
         $product_id = $mdb -> get( 'pp_shop_products', 'id', [ 'apilo_product_id' => $product_price['product'] ] );
 
         ( new \Domain\Product\ProductRepository( $mdb ) )->updateCombinationPricesFromBase( (int)$product_id, $price_brutto, $vat, null );
 
         // Czyszczenie cache produktu
-        \S::clear_product_cache( (int)$product_id );
+        \Shared\Helpers\Helpers::clear_product_cache( (int)$product_id );
       }
     }
   }
@@ -294,7 +294,7 @@ if ( $apilo_settings['enabled'] and $apilo_settings['sync_orders'] and $apilo_se
 
     if ( $order['transport_id'] == 9 and $order['orlen_point'] == null )
     {
-      \S::send_email( 'biuro@project-pro.pl', 'Błąd integracji APILO - brak punktu ORLEN PACZKA', 'W zamówieniu #' . $order['id'] . ' wybrano dostawę ORLEN PACZKA, ale nie podano punktu odbioru. Proszę o uzupełnienie danych w panelu sklepu.' );
+      \Shared\Helpers\Helpers::send_email( 'biuro@project-pro.pl', 'Błąd integracji APILO - brak punktu ORLEN PACZKA', 'W zamówieniu #' . $order['id'] . ' wybrano dostawę ORLEN PACZKA, ale nie podano punktu odbioru. Proszę o uzupełnienie danych w panelu sklepu.' );
     }
 
     $postData = [
@@ -472,7 +472,7 @@ if ( $apilo_settings['enabled'] and $apilo_settings['sync_orders'] and $apilo_se
 
           $email_data = print_r( $response, true );
           $email_data .= print_r( $postData, true );
-          \S::send_email( 'biuro@project-pro.pl', 'Błąd wysyłania zamówienia do apilo.com - nie znaleziono zamówienia', $email_data );
+          \Shared\Helpers\Helpers::send_email( 'biuro@project-pro.pl', 'Błąd wysyłania zamówienia do apilo.com - nie znaleziono zamówienia', $email_data );
         }
       }
       else
@@ -484,7 +484,7 @@ if ( $apilo_settings['enabled'] and $apilo_settings['sync_orders'] and $apilo_se
 
         $email_data = print_r( $response, true );
         $email_data .= print_r( $postData, true );
-        \S::send_email( 'biuro@project-pro.pl', 'Błąd wysyłania zamówienia do apilo.com', $email_data );
+        \Shared\Helpers\Helpers::send_email( 'biuro@project-pro.pl', 'Błąd wysyłania zamówienia do apilo.com', $email_data );
       }
     }
     else
diff --git a/download.php b/download.php
index 51a1eaf..33ed9fe 100644
--- a/download.php
+++ b/download.php
@@ -32,7 +32,7 @@ $mdb = new medoo( [
                     'charset'       => 'utf8'
                 ] );
 
-if ( $file_id = \S::get( 'file' ) )
+if ( $file_id = \Shared\Helpers\Helpers::get( 'file' ) )
 {
   $result = $mdb -> get( 'pp_articles_files', [ 'src' ], [ 'id' => $file_id ] );
   if ( $result )
diff --git a/index.php b/index.php
index be15011..82ffcae 100644
--- a/index.php
+++ b/index.php
@@ -63,24 +63,24 @@ $mdb = new medoo( [
 
 $langRepo = new \Domain\Languages\LanguagesRepository( $mdb );
 
-if ( !$lang_id = \S::get_session( 'current-lang' ) )
+if ( !$lang_id = \Shared\Helpers\Helpers::get_session( 'current-lang' ) )
 {
   $lang_id = $langRepo->defaultLanguage();
-  \S::set_session( 'current-lang', $lang_id );
+  \Shared\Helpers\Helpers::set_session( 'current-lang', $lang_id );
 }
 
-if ( !$lang = \S::get_session( 'lang-' . $lang_id ) )
+if ( !$lang = \Shared\Helpers\Helpers::get_session( 'lang-' . $lang_id ) )
 {
   $lang = $langRepo->translations( $lang_id );
-  \S::set_session( 'lang-' . $lang_id, $lang );
+  \Shared\Helpers\Helpers::set_session( 'lang-' . $lang_id, $lang );
 }
 
 $settings = ( new \Domain\Settings\SettingsRepository( $mdb ) )->allSettings();
-$client = \S::get_session( 'client' );
+$client = \Shared\Helpers\Helpers::get_session( 'client' );
 
-if ( \S::get( 'action' ) == 'htaccess' )
+if ( \Shared\Helpers\Helpers::get( 'action' ) == 'htaccess' )
 {
-  \S::htacces( '' );
+  \Shared\Helpers\Helpers::htacces( '' );
   unlink( 'install.php' );
   unlink( 'update.zip' );
   header( 'Location: /' );
@@ -132,24 +132,24 @@ if ($request_uri != '')
   }
 }
 
-if ( \S::get( 'a' ) == 'page' and \S::get( 'id' ) )
+if ( \Shared\Helpers\Helpers::get( 'a' ) == 'page' and \Shared\Helpers\Helpers::get( 'id' ) )
 {
-  $page = \front\factory\Pages::page_details( \S::get( 'id' ) );
-  \S::set_session( 'page', $page );
+  $page = \front\factory\Pages::page_details( \Shared\Helpers\Helpers::get( 'id' ) );
+  \Shared\Helpers\Helpers::set_session( 'page', $page );
 }
 
 if ( !is_array( $page ) or !(int)$page['id'] )
 {
-  $page = \S::get_session( 'page' );
+  $page = \Shared\Helpers\Helpers::get_session( 'page' );
 }
 
 if ( !is_array( $page ) or !(int)$page['id'] )
 {
   $page = \front\factory\Pages::page_details();
-  \S::set_session( 'page', $page );
+  \Shared\Helpers\Helpers::set_session( 'page', $page );
 }
 
-if ( \S::get( 'devel' ) )
+if ( \Shared\Helpers\Helpers::get( 'devel' ) )
   $settings[ 'devel' ] = true;
 
 $out = \front\view\Site::show();
@@ -224,8 +224,8 @@ if ( $settings[ 'piksel' ] )
         content_type: "product"
       });';
 
-  if ( \S::get( 'product' ) )
-    $piskel_code .= PHP_EOL . 'fbq( "track", "ViewContent", { content_category: "produkt", content_name: "' . htmlspecialchars( str_replace( '"', '', \front\factory\ShopProduct::product_name( \S::get( 'product' ) ) ) ) . '", content_ids: ["' . \S::get( 'product' ) . '"], content_type: "product" });';
+  if ( \Shared\Helpers\Helpers::get( 'product' ) )
+    $piskel_code .= PHP_EOL . 'fbq( "track", "ViewContent", { content_category: "produkt", content_name: "' . htmlspecialchars( str_replace( '"', '', \front\factory\ShopProduct::product_name( \Shared\Helpers\Helpers::get( 'product' ) ) ) ) . '", content_ids: ["' . \Shared\Helpers\Helpers::get( 'product' ) . '"], content_type: "product" });';
 
   $element -> nodeValue = $piskel_code;
 
@@ -235,13 +235,13 @@ if ( $settings[ 'piksel' ] )
 /* end piksel */
 
 /* meta tagi Facebook */
-if ( \S::get( 'product' ) )
+if ( \Shared\Helpers\Helpers::get( 'product' ) )
 {
   $url = preg_replace( '#^(http(s)?://)?w{3}\.#', '$1', $_SERVER[ 'SERVER_NAME' ] );
 
   $head = $dom -> getElementsByTagName( 'head' ) -> item( 0 );
 
-  $product = \front\factory\ShopProduct::product_details( \S::get( 'product' ), $lang_id );
+  $product = \front\factory\ShopProduct::product_details( \Shared\Helpers\Helpers::get( 'product' ), $lang_id );
   $product_image = $product[ 'images' ][ 0 ][ 'src' ];
   if ( $product_image and file_exists( substr( $product_image, 1, strlen( $product_image ) ) ) )
   {
@@ -272,7 +272,7 @@ if ( \S::get( 'product' ) )
 
   $node = $head -> appendChild( $dom -> createElement( 'meta' ) );
   $node -> setAttribute( 'property', 'product:price:amount' );
-  $node -> setAttribute( 'content', $product[ 'price_brutto_promo' ] ? \S::normalize_decimal( $product[ 'price_brutto_promo' ] ) : \S::normalize_decimal( $product[ 'price_brutto' ] )  );
+  $node -> setAttribute( 'content', $product[ 'price_brutto_promo' ] ? \Shared\Helpers\Helpers::normalize_decimal( $product[ 'price_brutto_promo' ] ) : \Shared\Helpers\Helpers::normalize_decimal( $product[ 'price_brutto' ] )  );
 
   $node = $head -> appendChild( $dom -> createElement( 'meta' ) );
   $node -> setAttribute( 'property', 'product:price:currency' );
@@ -333,7 +333,7 @@ if ( $settings['generate_webp'] )
       if ( strpos( $img_src, '/' ) === 0 )
         $img_src = substr( $img_src, 1, strlen( $img_src ) );
 
-      $img_webp = \S::generate_webp_image( $img_src, 85 );
+      $img_webp = \Shared\Helpers\Helpers::generate_webp_image( $img_src, 85 );
       if ( $img_webp !== false )
       {
         $img -> setAttribute( 'src', '/' . $img_webp );
diff --git a/templates/articles/article-entry.php b/templates/articles/article-entry.php
index 3750fb6..a10b878 100644
--- a/templates/articles/article-entry.php
+++ b/templates/articles/article-entry.php
@@ -1,12 +1,12 @@
 <? global $lang;?>
 <div class="col-12 col-md-6 ">
   <div class="article-entry">
-    <? $this -> article['language']['seo_link'] ? $url = $this -> article['language']['seo_link'] : $url = 'a-' . $this -> article['id'] . '-' . \S::seo( $this -> article['language']['title'] );?>
+    <? $this -> article['language']['seo_link'] ? $url = $this -> article['language']['seo_link'] : $url = 'a-' . $this -> article['id'] . '-' . \Shared\Helpers\Helpers::seo( $this -> article['language']['title'] );?>
     <div class="blog-image">
         <a href="/<?= $url;?>"  title="<?= $this -> article['language']['title'];?>" <? if ( $this -> article['language']['noindex'] ):?>rel="nofollow"<? endif;?>>  <img src="<?= \front\Views\Articles::getImage( $this -> article );?>" alt="<?= $this -> article['language']['title'];?>"></a>
     </div>
     <h3 class="article-title">
-      <a href="/<? if ( \S::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() ) echo \S::get_session( 'current-lang' ) . '/';?><?= $url;?>" title="<?= $this -> article['language']['title'];?>"  <? if ( $this -> article['language']['noindex'] ):?>rel="nofollow"<? endif;?>><?= $this -> article['language']['title'];?></a>
+      <a href="/<? if ( \Shared\Helpers\Helpers::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() ) echo \Shared\Helpers\Helpers::get_session( 'current-lang' ) . '/';?><?= $url;?>" title="<?= $this -> article['language']['title'];?>"  <? if ( $this -> article['language']['noindex'] ):?>rel="nofollow"<? endif;?>><?= $this -> article['language']['title'];?></a>
     </h3>
     <div class="date-add"><?= date( 'd.m.Y', strtotime( $this -> article['date_add'] ) );?></div>
     <div class="entry">
diff --git a/templates/articles/article-full.php b/templates/articles/article-full.php
index 403ce53..eb7bf0a 100644
--- a/templates/articles/article-full.php
+++ b/templates/articles/article-full.php
@@ -5,7 +5,7 @@ $text = \front\Views\Articles::generateHeadersIds( $text );
 ?>
 <div class="article">
   <?
-    $this -> article['language']['seo_link'] ? $url = $this -> article['language']['seo_link'] : $url = 'a-' . $this -> article['id'] . '-' . \S::seo( $this -> article['language']['title'] );
+    $this -> article['language']['seo_link'] ? $url = $this -> article['language']['seo_link'] : $url = 'a-' . $this -> article['id'] . '-' . \Shared\Helpers\Helpers::seo( $this -> article['language']['title'] );
 
     if ( $this -> article['show_title'] )
       echo '<h3 class="article-title">' . $this -> article['language']['title'] . '</h3>';
@@ -46,14 +46,14 @@ $text = \front\Views\Articles::generateHeadersIds( $text );
     <? if ( $this -> article['language']['table_of_contents'] ):?>
       <div class="table-of-contents">
         <div class="title">
-          <?= \S::lang( 'spis-tresci' );?>
+          <?= \Shared\Helpers\Helpers::lang( 'spis-tresci' );?>
         </div>
         <?= $this -> article['language']['table_of_contents'];?>
       </div>
     <? else:?>
       <div class="table-of-contents">
         <div class="title">
-          <?= \S::lang( 'spis-tresci' );?>
+          <?= \Shared\Helpers\Helpers::lang( 'spis-tresci' );?>
         </div>
         <?= \front\Views\Articles::generateTableOfContents( $text );?>
       </div>
diff --git a/templates/articles/article-gallery.php b/templates/articles/article-gallery.php
index cf0b814..6029a5f 100644
--- a/templates/articles/article-gallery.php
+++ b/templates/articles/article-gallery.php
@@ -2,9 +2,9 @@
   <div class="gallery <? if ( $this -> article['pixieset'] ):?>pixieset<? endif;?>">
     <? if ( $this -> article['pixieset'] ):?>
       <div class="buttons">
-        <a id="gallery-download-<?= $this -> article['id'];?>" class="btn btn-success"><?= \S::lang( 'pobierz-wszystkie' );?></a>
+        <a id="gallery-download-<?= $this -> article['id'];?>" class="btn btn-success"><?= \Shared\Helpers\Helpers::lang( 'pobierz-wszystkie' );?></a>
         <? if ( $this -> article['pixieset'] == 2 ):?>
-          <a id="gallery-favorite-submit-<?= $this -> article['id'];?>" class="btn btn-info"><?= \S::lang( 'zatwierdz-wybrane-fotografie' );?></a>
+          <a id="gallery-favorite-submit-<?= $this -> article['id'];?>" class="btn btn-info"><?= \Shared\Helpers\Helpers::lang( 'zatwierdz-wybrane-fotografie' );?></a>
         <? endif;?>
       </div>
     <? endif;?>
@@ -35,7 +35,7 @@
 <? endif;?>
 <? if ( $this -> article['pixieset'] ):?>
   <div class="pixieset-image-big">
-    <a href="#" class="close" title="<?= \S::lang( 'zamknij' );?>">
+    <a href="#" class="close" title="<?= \Shared\Helpers\Helpers::lang( 'zamknij' );?>">
       <i class="fa fa-times"></i>
     </a>
     <div class="buttons">
@@ -187,13 +187,13 @@
           },
           beforeSend: function()
           {
-            button.addClass( 'disabled' ).html( '<?= \S::lang( 'zaczekaj-trwa-tworzenie-pliku' );?>' );
+            button.addClass( 'disabled' ).html( '<?= \Shared\Helpers\Helpers::lang( 'zaczekaj-trwa-tworzenie-pliku' );?>' );
           },
           success: function( response )
           {
             data = jQuery.parseJSON( response );
             window.location = '/' + data.url;
-            button.removeClass( 'disabled' ).html( '<?= \S::lang( 'pobierz-wszystkie' );?>' );
+            button.removeClass( 'disabled' ).html( '<?= \Shared\Helpers\Helpers::lang( 'pobierz-wszystkie' );?>' );
           }
         });
       });
@@ -226,8 +226,8 @@
             {
               $.alert(
               {
-                title: '<?= ucfirst( \S::lang( 'informacja' ) );?>',
-                content: '<?= \S::lang( 'lista-wybranych-zdjec-zostala-zatwierdzona' );?>',
+                title: '<?= ucfirst( \Shared\Helpers\Helpers::lang( 'informacja' ) );?>',
+                content: '<?= \Shared\Helpers\Helpers::lang( 'lista-wybranych-zdjec-zostala-zatwierdzona' );?>',
                 type: 'orange',
                 closeIcon: true,
                 closeIconClass: 'fa fa-close',
@@ -240,7 +240,7 @@
                 {
                   confirm:
                   {
-                    text: '<?= \S::lang( 'zamknij' );?>',
+                    text: '<?= \Shared\Helpers\Helpers::lang( 'zamknij' );?>',
                     btnClass: 'btn-blue',
                     keys: ['enter'],
                     action: function() {}
diff --git a/templates/articles/article-miniature.php b/templates/articles/article-miniature.php
index 5b97998..6cc08c0 100644
--- a/templates/articles/article-miniature.php
+++ b/templates/articles/article-miniature.php
@@ -1,7 +1,7 @@
 <? global $lang;?>
 <div class="article-miniature">
   <?
-    $this -> article['language']['seo_link'] ? $url = $this -> article['language']['seo_link'] : $url = 'a-' . $this -> article['id'] . '-' . \S::seo( $this -> article['language']['title'] );
+    $this -> article['language']['seo_link'] ? $url = $this -> article['language']['seo_link'] : $url = 'a-' . $this -> article['id'] . '-' . \Shared\Helpers\Helpers::seo( $this -> article['language']['title'] );
   
     ?>
       <h3 class="article-title">
diff --git a/templates/articles/article.php b/templates/articles/article.php
index 3be7cd2..6772838 100644
--- a/templates/articles/article.php
+++ b/templates/articles/article.php
@@ -5,7 +5,7 @@ $text = \front\Views\Articles::generateHeadersIds( $text );
 ?>
 <div class="article">
   <?
-    $this -> article['language']['seo_link'] ? $url = $this -> article['language']['seo_link'] : $url = 'a-' . $this -> article['id'] . '-' . \S::seo( $this -> article['language']['title'] );
+    $this -> article['language']['seo_link'] ? $url = $this -> article['language']['seo_link'] : $url = 'a-' . $this -> article['id'] . '-' . \Shared\Helpers\Helpers::seo( $this -> article['language']['title'] );
 
     if ( $this -> article['show_title'] )
       echo '<h2 class="article-title">' . $this -> article['language']['title'] . '</h2>';
@@ -23,14 +23,14 @@ $text = \front\Views\Articles::generateHeadersIds( $text );
     <? if ( $this -> article['language']['table_of_contents'] ):?>
       <div class="table-of-contents">
         <div class="title">
-          <?= \S::lang( 'spis-tresci' );?>
+          <?= \Shared\Helpers\Helpers::lang( 'spis-tresci' );?>
         </div>
         <?= $this -> article['language']['table_of_contents'];?>
       </div>
     <? else:?>
       <div class="table-of-contents">
         <div class="title">
-          <?= \S::lang( 'spis-tresci' );?>
+          <?= \Shared\Helpers\Helpers::lang( 'spis-tresci' );?>
         </div>
         <?= \front\Views\Articles::generateTableOfContents( $text );?>
       </div>
@@ -89,7 +89,7 @@ $text = \front\Views\Articles::generateHeadersIds( $text );
         <span></span>
         <span></span>
         <span></span>
-        <div class="title"><?= ucfirst( \S::lang( 'podziel-sie-z-innymi' ) );?></div>
+        <div class="title"><?= ucfirst( \Shared\Helpers\Helpers::lang( 'podziel-sie-z-innymi' ) );?></div>
         <div class="content">
           <a class="fb" href="http://www.facebook.com/sharer.php?u=http://www.<?= $_SERVER['SERVER_NAME'];?>/<?= $url;?>" onclick="javascript:window.open(this.href, '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=600,width=600');return false;" title="facebook" target="_blank" rel="nofollow">
             <img src="/images/system/logo-facebook.jpg" alt="facebook" />
diff --git a/templates/articles/news-list.php b/templates/articles/news-list.php
index e2ea21b..08565df 100644
--- a/templates/articles/news-list.php
+++ b/templates/articles/news-list.php
@@ -1,8 +1,8 @@
 <ul class="news-list">
-  <? if ( \S::is_array_fix( $this -> articles ) ): foreach ( $this -> articles as $article ):?>
-    <? $article['language']['seo_link'] ? $url = $article['language']['seo_link'] : $url = 'a-' . $article['id'] . '-' . \S::seo( $article['language']['title'] );?>
+  <? if ( \Shared\Helpers\Helpers::is_array_fix( $this -> articles ) ): foreach ( $this -> articles as $article ):?>
+    <? $article['language']['seo_link'] ? $url = $article['language']['seo_link'] : $url = 'a-' . $article['id'] . '-' . \Shared\Helpers\Helpers::seo( $article['language']['title'] );?>
     <li>
-   <a href="/<? if ( \S::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() ) echo \S::get_session( 'current-lang' ) . '/';?><?= $url;?>" title="<?= $article['language']['title'];?>"  <? if ( $article['language']['noindex'] ):?>rel="nofollow"<? endif;?>><i class="far fa-file-alt"></i><?= $article['language']['title'];?></a>
+   <a href="/<? if ( \Shared\Helpers\Helpers::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() ) echo \Shared\Helpers\Helpers::get_session( 'current-lang' ) . '/';?><?= $url;?>" title="<?= $article['language']['title'];?>"  <? if ( $article['language']['noindex'] ):?>rel="nofollow"<? endif;?>><i class="far fa-file-alt"></i><?= $article['language']['title'];?></a>
      <div class="date-add"><?= date( 'd.m.Y', strtotime( $article['date_add'] ) );?></div>
     </li>
   <? endforeach; endif;?>
diff --git a/templates/articles/news.php b/templates/articles/news.php
index 086a0f2..e853905 100644
--- a/templates/articles/news.php
+++ b/templates/articles/news.php
@@ -2,7 +2,7 @@
   <? foreach ( $this -> articles as $article ):?>
     <div class="col-12 col-lg-6 col-xl-3">
       <div class="article-list">
-        <? $article['language']['seo_link'] ? $url = $article['language']['seo_link'] : $url = 'a-' . $article['id'] . '-' . \S::seo( $article['language']['title'] );?>
+        <? $article['language']['seo_link'] ? $url = $article['language']['seo_link'] : $url = 'a-' . $article['id'] . '-' . \Shared\Helpers\Helpers::seo( $article['language']['title'] );?>
         <a href="/<?= $url;?>" title="<?= $article['language']['title'];?>" <? if ( $article['language']['noindex'] ):?>rel="nofollow"<? endif;?>>
           <div class="blog-image">
             <img src="<?= \front\Views\Articles::getImage( $article );?>" alt="<?= $article['language']['title'];?>">
diff --git a/templates/controls/alert-product-sets.php b/templates/controls/alert-product-sets.php
index b0ae613..cb698b2 100644
--- a/templates/controls/alert-product-sets.php
+++ b/templates/controls/alert-product-sets.php
@@ -1,19 +1,19 @@
 <? global $lang_id;?>
-<? if ( \S::is_array_fix( $this -> products ) ):?>
+<? if ( \Shared\Helpers\Helpers::is_array_fix( $this -> products ) ):?>
   <h2>Dobierz inne produkty do kompletu</h2>
 <? endif;?>
 <div class="product-sets">
   <? if ( is_array( $this -> products ) ): foreach ( $this -> products as $product_id ):
     $product = new \shop\Product( $product_id );
 
-    $product -> language['seo_link'] ? $url = '/' . $product -> language['seo_link'] : $url = '/p-' . $product['id'] . '-' . \S::seo( $product -> language['name'] );
+    $product -> language['seo_link'] ? $url = '/' . $product -> language['seo_link'] : $url = '/p-' . $product['id'] . '-' . \Shared\Helpers\Helpers::seo( $product -> language['name'] );
 
-    if ( \S::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' )
-      $url = '/' . \S::get_session( 'current-lang' ) . $url;
+    if ( \Shared\Helpers\Helpers::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' )
+      $url = '/' . \Shared\Helpers\Helpers::get_session( 'current-lang' ) . $url;
   ?>
   <div class="product">
     <? if ( $product -> new_to_date and $product -> new_to_date >= date( 'Y-m-d' ) ):?>
-      <div class="new"><?= \S::lang( 'nowosc' );?></div>
+      <div class="new"><?= \Shared\Helpers\Helpers::lang( 'nowosc' );?></div>
     <? endif;?>
     <a href="<?= $url;?>" class="a-img">
       <div class="img">
diff --git a/templates/menu/pages.php b/templates/menu/pages.php
index cd4a854..ce56f84 100644
--- a/templates/menu/pages.php
+++ b/templates/menu/pages.php
@@ -12,7 +12,7 @@ if ( is_array( $this -> pages ) ) {
     } else if ( $page['page_type'] == 5 ) {
       $page['category_id'] ? $url = \front\factory\ShopCategory::category_url( $page['category_id'] ) : $url = '#';
     } else {
-      $page['language']['seo_link'] ? $url = '/' . $page['language']['seo_link'] : $url = '/s-' . $page['id'] . '-' . \S::seo( $page['language']['title'] );
+      $page['language']['seo_link'] ? $url = '/' . $page['language']['seo_link'] : $url = '/s-' . $page['id'] . '-' . \Shared\Helpers\Helpers::seo( $page['language']['title'] );
     }
     unset( $children );
 
@@ -34,8 +34,8 @@ if ( is_array( $this -> pages ) ) {
 
     echo '">';
     echo '<a href="';
-    if ( \S::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' and $page['page_type'] != 3 and $page['page_type'] != 5 )
-      echo '/' . \S::get_session( 'current-lang' );
+    if ( \Shared\Helpers\Helpers::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' and $page['page_type'] != 3 and $page['page_type'] != 5 )
+      echo '/' . \Shared\Helpers\Helpers::get_session( 'current-lang' );
     echo $url . '"';
     if ( $page['language']['noindex'] )
       echo 'rel="nofollow"';
diff --git a/templates/menu/submenu.php b/templates/menu/submenu.php
index f4c2f5a..f1b3a16 100644
--- a/templates/menu/submenu.php
+++ b/templates/menu/submenu.php
@@ -5,15 +5,15 @@ if ( is_array( $this -> pages ) )
   echo '<ul class="level-' . $this -> level . '" id="submenu-' . $this -> page_id . '">';
     foreach ( $this -> pages as $page )
     {
-      $page['language']['seo_link'] ? $url = '/' . $page['language']['seo_link'] : $url = '/s-' . $page['id'] . '-' . \S::seo( $page['language']['title'] );
+      $page['language']['seo_link'] ? $url = '/' . $page['language']['seo_link'] : $url = '/s-' . $page['id'] . '-' . \Shared\Helpers\Helpers::seo( $page['language']['title'] );
       
       if ( $page['page_type'] == 3 and $page['link'] )
         $url = $page['link'];
       
       echo '<li id="link-' . $page['id'] . '" class="'; if ( $page['id'] == $this -> current_page ) echo ' active'; echo '">';
         echo '<a href="';        
-          if ( \S::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' )
-            echo '/' . \S::get_session( 'current-lang' );
+          if ( \Shared\Helpers\Helpers::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' )
+            echo '/' . \Shared\Helpers\Helpers::get_session( 'current-lang' );
           echo $url . '"'; if ( $page['language']['noindex'] ) echo 'rel="nofollow"'; echo ' title="' . $page['language']['title'] . '"'; if ( is_array( $page['pages'] ) ) echo "class='menu-trigger'";  echo '>';
           echo $page['language']['title'];
           if ( is_array( $page['pages'] ) and $this -> level == 0 )
diff --git a/templates/newsletter/preview.php b/templates/newsletter/preview.php
index 8f19842..c0688f0 100644
--- a/templates/newsletter/preview.php
+++ b/templates/newsletter/preview.php
@@ -3,10 +3,10 @@
 </div>
 <div style="border-bottom: 1px solid #ccc; padding: 10px 0 0 0;">
   <? if ( is_array( $this -> articles ) ): foreach ( $this -> articles as $article ):?>
-    <? $article['language']['seo_link'] ? $url = $article['language']['seo_link'] : $url = 'a-' . $article['id'] . '-' . \S::seo( $article['language']['title'] );?>
+    <? $article['language']['seo_link'] ? $url = $article['language']['seo_link'] : $url = 'a-' . $article['id'] . '-' . \Shared\Helpers\Helpers::seo( $article['language']['title'] );?>
     <div style="padding: 10px; background: #F1F1F1; margin-bottom: 10px">
       <?
-        $article['language']['seo_link'] ? $url = $article['language']['seo_link'] : $url = 'a-' . $article['id'] . '-' . \S::seo( $article['language']['title'] );
+        $article['language']['seo_link'] ? $url = $article['language']['seo_link'] : $url = 'a-' . $article['id'] . '-' . \Shared\Helpers\Helpers::seo( $article['language']['title'] );
       ?>
       <a href="http://www.<?= $_SERVER['SERVER_NAME'];?>/<?= $url;?>"  title="<?= $article['language']['title'];?>" style="margin-bottom: 10px; display: block; font-size: 14px; color: #5b7fb1; font-weight: 600;">
         <?= $article['language']['title'];?>
diff --git a/templates/shop-basket/address-form.php b/templates/shop-basket/address-form.php
index 2408601..098efc1 100644
--- a/templates/shop-basket/address-form.php
+++ b/templates/shop-basket/address-form.php
@@ -1,6 +1,6 @@
 <div class="basket-address-form">
   <? if ( !$this -> client ):?>
-    <div class="box-title"><?= \S::lang( 'zloz-zamowienie-bez-rejestraji' );?></div>
+    <div class="box-title"><?= \Shared\Helpers\Helpers::lang( 'zloz-zamowienie-bez-rejestraji' );?></div>
   <? else:?>
     <?
       if ( is_array( $this -> addresses ) ) for ( $i = 0; $i < count( $this -> addresses ); $i++ )
@@ -24,7 +24,7 @@
               <br/><span field="postal_code"><?= $address['postal_code'] . '</span> <span field="city">' . $address['city'] . '</span>';?>
               <br/><span field="phone"><?= $address['phone'];?></span>
               <div class="buttons">
-                <a href="#" class="btn-select" address="<?= $address['id'];?>"><?= \S::lang( 'wybierz' );?></a>
+                <a href="#" class="btn-select" address="<?= $address['id'];?>"><?= \Shared\Helpers\Helpers::lang( 'wybierz' );?></a>
               </div>
             </div>
           <? endforeach;?>
@@ -37,30 +37,30 @@
     <? if ( !$this -> client ):?>
       <div class="form-group row">
         <div class="col-12">
-          <input type="email" name="email" class="form-control" required placeholder="<?= ucfirst( \S::lang( 'email' ) );?>">
+          <input type="email" name="email" class="form-control" required placeholder="<?= ucfirst( \Shared\Helpers\Helpers::lang( 'email' ) );?>">
         </div>
       </div>
     <? endif;?>
     <div class="form-group row">
       <div class="col-12">
-        <input type="text" id="name" name="name" class="form-control" required placeholder="<?= ucfirst( \S::lang( 'imie' ) );?>" value="<?= htmlspecialchars( $address_current['name'] );?>">
+        <input type="text" id="name" name="name" class="form-control" required placeholder="<?= ucfirst( \Shared\Helpers\Helpers::lang( 'imie' ) );?>" value="<?= htmlspecialchars( $address_current['name'] );?>">
       </div>
     </div>
     <div class="form-group row">
       <div class="col-12">
-        <input type="text" id="surname" name="surname" class="form-control" required placeholder="<?= ucfirst( \S::lang( 'nazwisko' ) );?>" value="<?= htmlspecialchars( $address_current['surname'] );?>">
+        <input type="text" id="surname" name="surname" class="form-control" required placeholder="<?= ucfirst( \Shared\Helpers\Helpers::lang( 'nazwisko' ) );?>" value="<?= htmlspecialchars( $address_current['surname'] );?>">
       </div>
     </div>
     <div class="form-group">
-      <input type="text" id="street" name="street" class="form-control" <? if ( !in_array( $this -> transport_method['id'], [ 1, 2, 3, 9] ) ):?> required<? endif;?> placeholder="<?= ucfirst( \S::lang( 'ulica-i-nr-domu' ) );?> <? if ( in_array( $this -> transport_method['id'], [ 1, 2, 3, 9] ) ):?> (<?= \S::lang( 'opcjonalnie' );?>)<? endif;?>" value="<?= htmlspecialchars( $address_current['street'] );?>">
+      <input type="text" id="street" name="street" class="form-control" <? if ( !in_array( $this -> transport_method['id'], [ 1, 2, 3, 9] ) ):?> required<? endif;?> placeholder="<?= ucfirst( \Shared\Helpers\Helpers::lang( 'ulica-i-nr-domu' ) );?> <? if ( in_array( $this -> transport_method['id'], [ 1, 2, 3, 9] ) ):?> (<?= \Shared\Helpers\Helpers::lang( 'opcjonalnie' );?>)<? endif;?>" value="<?= htmlspecialchars( $address_current['street'] );?>">
     </div>
     <div class="form-group">
       <div class="row">
         <div class="col-12 col-md-6">
-          <input type="text" id="postal_code" name="postal_code" pattern="[0-9]{2}-[0-9]{3}" title="Format xx-xxx" class="form-control" <? if ( !in_array( $this -> transport_method['id'], [ 1, 2, 3, 9] ) ):?> required<? endif;?> placeholder="<?= ucfirst( \S::lang( 'kod-pocztowy' ) );?><? if ( in_array( $this -> transport_method['id'], [ 1, 2, 3, 9] ) ):?> (<?= \S::lang( 'opcjonalnie' );?>)<? endif;?>" " value="<?= htmlspecialchars( $address_current['postal_code'] );?>">
+          <input type="text" id="postal_code" name="postal_code" pattern="[0-9]{2}-[0-9]{3}" title="Format xx-xxx" class="form-control" <? if ( !in_array( $this -> transport_method['id'], [ 1, 2, 3, 9] ) ):?> required<? endif;?> placeholder="<?= ucfirst( \Shared\Helpers\Helpers::lang( 'kod-pocztowy' ) );?><? if ( in_array( $this -> transport_method['id'], [ 1, 2, 3, 9] ) ):?> (<?= \Shared\Helpers\Helpers::lang( 'opcjonalnie' );?>)<? endif;?>" " value="<?= htmlspecialchars( $address_current['postal_code'] );?>">
         </div>
         <div class="col-12 col-md-6">
-          <input type="text" id="city" name="city" class="form-control" <? if ( !in_array( $this -> transport_method['id'], [ 1, 2, 3, 9] ) ):?> required<? endif;?> placeholder="<?= ucfirst( \S::lang( 'miasto' ) );?><? if ( in_array( $this -> transport_method['id'], [ 1, 2, 3, 9] ) ):?> (<?= \S::lang( 'opcjonalnie' );?>)<? endif;?>" " value="<?= htmlspecialchars( $address_current['city'] );?>">
+          <input type="text" id="city" name="city" class="form-control" <? if ( !in_array( $this -> transport_method['id'], [ 1, 2, 3, 9] ) ):?> required<? endif;?> placeholder="<?= ucfirst( \Shared\Helpers\Helpers::lang( 'miasto' ) );?><? if ( in_array( $this -> transport_method['id'], [ 1, 2, 3, 9] ) ):?> (<?= \Shared\Helpers\Helpers::lang( 'opcjonalnie' );?>)<? endif;?>" " value="<?= htmlspecialchars( $address_current['city'] );?>">
         </div>
       </div>
     </div>
@@ -70,14 +70,14 @@
           <img src="/images/system/lang_pl.png" alt="">
           <span>+48</span>
         </div>
-        <input type="tel" id="phone" name="phone" class="form-control form-control-input" required placeholder="<?= ucfirst(\S::lang('telefon')); ?>" value="<?= htmlspecialchars($address_current['phone']); ?>" pattern="[0-9]{9}">
+        <input type="tel" id="phone" name="phone" class="form-control form-control-input" required placeholder="<?= ucfirst(\Shared\Helpers\Helpers::lang('telefon')); ?>" value="<?= htmlspecialchars($address_current['phone']); ?>" pattern="[0-9]{9}">
       </div>
     </div>
     <div class="form-group">
       <div class="row">
         <div class="col-12" id="fvat">
           <input type="checkbox" name="fvat">
-          <?= \S::lang( 'faktura-vat' );?>
+          <?= \Shared\Helpers\Helpers::lang( 'faktura-vat' );?>
         </div>
       </div>
     </div>
@@ -85,31 +85,31 @@
       <div class="form-group">
         <div class="row">
           <div class="col-12">
-            <input type="text" id="firm_name" name="firm_name" class="form-control" placeholder="<?= ucfirst( \S::lang( 'nazwa-firmy' ) );?>" value="">
+            <input type="text" id="firm_name" name="firm_name" class="form-control" placeholder="<?= ucfirst( \Shared\Helpers\Helpers::lang( 'nazwa-firmy' ) );?>" value="">
           </div>
         </div>
       </div>
       <div class="form-group">
         <div class="row">
           <div class="col-12">
-            <input type="text" id="firm_street" name="firm_street" class="form-control" placeholder="<?= ucfirst( \S::lang( 'ulica-i-nr-domu' ) );?>" value="">
+            <input type="text" id="firm_street" name="firm_street" class="form-control" placeholder="<?= ucfirst( \Shared\Helpers\Helpers::lang( 'ulica-i-nr-domu' ) );?>" value="">
           </div>
         </div>
       </div>
       <div class="form-group">
         <div class="row">
           <div class="col-12 col-md-6">
-            <input type="text" id="firm_postal_code" name="firm_postal_code" pattern="[0-9]{2}-[0-9]{3}" title="Format xx-xxx" class="form-control" placeholder="<?= ucfirst( \S::lang( 'kod-pocztowy' ) );?>" value="">
+            <input type="text" id="firm_postal_code" name="firm_postal_code" pattern="[0-9]{2}-[0-9]{3}" title="Format xx-xxx" class="form-control" placeholder="<?= ucfirst( \Shared\Helpers\Helpers::lang( 'kod-pocztowy' ) );?>" value="">
           </div>
           <div class="col-12 col-md-6">
-            <input type="text" id="firm_city" name="firm_city" class="form-control" placeholder="<?= ucfirst( \S::lang( 'miasto' ) );?>" value="">
+            <input type="text" id="firm_city" name="firm_city" class="form-control" placeholder="<?= ucfirst( \Shared\Helpers\Helpers::lang( 'miasto' ) );?>" value="">
           </div>
         </div>
       </div>
       <div class="form-group">
         <div class="row">
           <div class="col-12">
-            <input type="text" id="firm_nip" name="firm_nip" class="form-control" placeholder="<?= ucfirst( \S::lang( 'nip' ) );?>" value="">
+            <input type="text" id="firm_nip" name="firm_nip" class="form-control" placeholder="<?= ucfirst( \Shared\Helpers\Helpers::lang( 'nip' ) );?>" value="">
           </div>
         </div>
       </div>
@@ -119,14 +119,14 @@
       <div class="row">
         <div class="col-12" id="agreement">
           <input type="checkbox" name="agreement" required="">
-          <?= \S::lang( 'przeczytalem-i-akceptuje-polityke-prywatnosci-i-regulamin' );?>
+          <?= \Shared\Helpers\Helpers::lang( 'przeczytalem-i-akceptuje-polityke-prywatnosci-i-regulamin' );?>
         </div>
       </div>
     </div>
     <div class="form-group">
       <div class="row">
         <div class="col-12">
-          <button type="submit" class="btn btn-success" id="order-send"><span class="text"><?= ucfirst( \S::lang( 'zamawiam-z-obowiazkiem-zaplaty' ) );?></span></button>
+          <button type="submit" class="btn btn-success" id="order-send"><span class="text"><?= ucfirst( \Shared\Helpers\Helpers::lang( 'zamawiam-z-obowiazkiem-zaplaty' ) );?></span></button>
         </div>
       </div>
     </div>
diff --git a/templates/shop-basket/alert-product-sets.php b/templates/shop-basket/alert-product-sets.php
index eca8cb5..a193df4 100644
--- a/templates/shop-basket/alert-product-sets.php
+++ b/templates/shop-basket/alert-product-sets.php
@@ -1,19 +1,19 @@
 <? global $lang_id;?>
-<? if ( \S::is_array_fix( $this -> products ) ):?>
+<? if ( \Shared\Helpers\Helpers::is_array_fix( $this -> products ) ):?>
   <h2>Dobierz inne produkty do kompletu</h2>
 <? endif;?>
 <div class="product-sets">
   <? if ( is_array( $this -> products ) ): foreach ( $this -> products as $product_id ):
     $product = \shop\Product::getFromCache( $product_id, $lang_id );
 
-    $product -> language['seo_link'] ? $url = '/' . $product -> language['seo_link'] : $url = '/p-' . $product['id'] . '-' . \S::seo( $product -> language['name'] );
+    $product -> language['seo_link'] ? $url = '/' . $product -> language['seo_link'] : $url = '/p-' . $product['id'] . '-' . \Shared\Helpers\Helpers::seo( $product -> language['name'] );
 
-    if ( \S::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' )
-      $url = '/' . \S::get_session( 'current-lang' ) . $url;
+    if ( \Shared\Helpers\Helpers::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' )
+      $url = '/' . \Shared\Helpers\Helpers::get_session( 'current-lang' ) . $url;
   ?>
   <div class="product">
     <? if ( $product -> new_to_date and $product -> new_to_date >= date( 'Y-m-d' ) ):?>
-      <div class="new"><?= \S::lang( 'nowosc' );?></div>
+      <div class="new"><?= \Shared\Helpers\Helpers::lang( 'nowosc' );?></div>
     <? endif;?>
     <a href="<?= $url;?>" class="a-img">
       <div class="img">
diff --git a/templates/shop-basket/basket-details.php b/templates/shop-basket/basket-details.php
index 44718e5..467100b 100644
--- a/templates/shop-basket/basket-details.php
+++ b/templates/shop-basket/basket-details.php
@@ -1,5 +1,5 @@
 <div class="mini-box">
-  <h1 class="box-title"><?= ucfirst( \S::lang( 'zawartosc-koszyka' ) ); ?>:</h1>
+  <h1 class="box-title"><?= ucfirst( \Shared\Helpers\Helpers::lang( 'zawartosc-koszyka' ) ); ?>:</h1>
   <div id="basket" class="content">
     <? if ( is_array( $this -> basket ) and count($this->basket)) : ?>
       <? foreach ($this->basket as $position_hash => $position) : ?>
@@ -36,8 +36,8 @@
             <?php
             $url = \front\factory\ShopProduct::product_url( $product );
 
-            if ( \S::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#')
-              $url = '/' . \S::get_session('current-lang') . $url;
+            if ( \Shared\Helpers\Helpers::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#')
+              $url = '/' . \Shared\Helpers\Helpers::get_session('current-lang') . $url;
             ?>
             <div class="name">
               <a href="<?= $url; ?>"><?= $product['language']['name']; ?></a>
@@ -74,13 +74,13 @@
               $price_product = \shop\Product::calculate_basket_product_price( (float)$product['price_brutto_promo'], (float)$product['price_brutto'], $this -> coupon, $position );
 
               if ( $price_product['price_new'] )
-                echo \S::decimal( $price_product['price_new'] ) . ' zł';
+                echo \Shared\Helpers\Helpers::decimal( $price_product['price_new'] ) . ' zł';
 
               if ($price_product['price_new'] and $price_product['price_new'] < $price_product['price'])
-                echo '<u>' . \S::decimal( $price_product['price'] ) . ' zł</u>';
+                echo '<u>' . \Shared\Helpers\Helpers::decimal( $price_product['price'] ) . ' zł</u>';
 
               if ($price_product['price_new'] and $price_product['price_new'] < $price_product['price'])
-                $discount += \S::normalize_decimal(($price_product['price'] - $price_product['price_new']) * $position['quantity']);
+                $discount += \Shared\Helpers\Helpers::normalize_decimal(($price_product['price'] - $price_product['price_new']) * $position['quantity']);
               ?>
             </div>
           </div>
@@ -100,16 +100,16 @@
         <? $summary += $price_product['price'] * $position['quantity'];?>
       <? endforeach; ?>
       <div class="basket-summary">
-        Wartość koszyka: <span class="price"><?= \S::decimal($summary); ?> zł</span>
+        Wartość koszyka: <span class="price"><?= \Shared\Helpers\Helpers::decimal($summary); ?> zł</span>
       </div>
       <? if ($discount) : ?>
         <div class="basket-summary">
           Rabat:
-          <span class="text-danger">-<?= \S::decimal($discount); ?> zł</span>
+          <span class="text-danger">-<?= \Shared\Helpers\Helpers::decimal($discount); ?> zł</span>
         </div>
         <div class="basket-summary">
           Wartość koszyka po rabacie:
-          <span class="text-danger"><?= \S::decimal($summary - $discount); ?> zł</span>
+          <span class="text-danger"><?= \Shared\Helpers\Helpers::decimal($summary - $discount); ?> zł</span>
         </div>
       <? endif; ?>
       <div class="basket-bottom">
@@ -118,7 +118,7 @@
         </div>
         <div class="coupon">
           <?= \Tpl::view( 'shop-coupon/form', [
-                      'coupon' => \S::get_session('coupon')
+                      'coupon' => \Shared\Helpers\Helpers::get_session('coupon')
                   ] );
           ?>
         </div>
diff --git a/templates/shop-basket/basket-mini.php b/templates/shop-basket/basket-mini.php
index c958d5a..b23395b 100644
--- a/templates/shop-basket/basket-mini.php
+++ b/templates/shop-basket/basket-mini.php
@@ -17,7 +17,7 @@
             case ( $count >= 5 ): echo 'produktów'; break;
           }
         ?></span><br />
-        <b><?= ucfirst( $lang['suma'] );?></b>: <span id="basket-value"><?= \S::decimal( \front\factory\ShopBasket::summary_price( $this -> basket, $this -> coupon ) );?></span> zł
+        <b><?= ucfirst( $lang['suma'] );?></b>: <span id="basket-value"><?= \Shared\Helpers\Helpers::decimal( \front\factory\ShopBasket::summary_price( $this -> basket, $this -> coupon ) );?></span> zł
       </div>
     </div>
   </a>
diff --git a/templates/shop-basket/basket-payments-methods.php b/templates/shop-basket/basket-payments-methods.php
index 26f20c5..de3b909 100644
--- a/templates/shop-basket/basket-payments-methods.php
+++ b/templates/shop-basket/basket-payments-methods.php
@@ -2,13 +2,13 @@
   $pm_found = false;
 
   if ( is_array( $this -> payment_methods ) ): foreach ( $this -> payment_methods as $payment_method ):
-    if ( $payment_method['id'] == \S::get_session( 'basket-payment-method-id' ) )
+    if ( $payment_method['id'] == \Shared\Helpers\Helpers::get_session( 'basket-payment-method-id' ) )
       $pm_found = true;
   endforeach; endif;
 
-  $basket = \S::get_session( 'basket' );
-  $coupon = \S::get_session( 'coupon' );
-  $transport_cost = \front\factory\ShopTransport::transport_cost( \S::get_session( 'basket-transport-method-id' ) );
+  $basket = \Shared\Helpers\Helpers::get_session( 'basket' );
+  $coupon = \Shared\Helpers\Helpers::get_session( 'coupon' );
+  $transport_cost = \front\factory\ShopTransport::transport_cost( \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' ) );
 
   $basket_summary = \front\factory\ShopBasket::summary_price( $basket, $coupon ) + $transport_cost;
 ?>
@@ -19,16 +19,16 @@
         <input type="radio" class="icheck" name="payment_method" value="<?= $payment_method['id'];?>"
           <?
             if (
-                    $payment_method['id'] == \S::get_session( 'basket-payment-method-id' )
+                    $payment_method['id'] == \Shared\Helpers\Helpers::get_session( 'basket-payment-method-id' )
                   or
                     count( $this -> payment_methods ) === 1
                   or
-                    !\S::get_session( 'basket-payment-method-id' ) and $payment_method == end( $this -> payment_methods )
+                    !\Shared\Helpers\Helpers::get_session( 'basket-payment-method-id' ) and $payment_method == end( $this -> payment_methods )
                   or
-                    \S::get_session( 'basket-payment-method-id' ) and !$pm_found and $payment_method == end( $this -> payment_methods )
+                    \Shared\Helpers\Helpers::get_session( 'basket-payment-method-id' ) and !$pm_found and $payment_method == end( $this -> payment_methods )
                 ):
 
-                \S::set_session( 'basket-payment-method-id', $payment_method['id'] );
+                \Shared\Helpers\Helpers::set_session( 'basket-payment-method-id', $payment_method['id'] );
 
                 echo 'checked="checked"';
             endif;
diff --git a/templates/shop-basket/basket-transport-methods.php b/templates/shop-basket/basket-transport-methods.php
index 12b2c67..f040e84 100644
--- a/templates/shop-basket/basket-transport-methods.php
+++ b/templates/shop-basket/basket-transport-methods.php
@@ -16,7 +16,7 @@ if ( is_array( $this -> transports_methods ) )
   if ( !$transport_found )
   {
     $this -> transport_id = $default_transport_id;
-    \S::set_session( 'basket-transport-method-id', $default_transport_id );
+    \Shared\Helpers\Helpers::set_session( 'basket-transport-method-id', $default_transport_id );
   }
 }
 ?>
@@ -30,33 +30,33 @@ if ( is_array( $this -> transports_methods ) )
       <div class="small"><?= $transport_method['description'];?></div>
     </div>
     <div class="price">
-      <?= \S::decimal( $transport_method['cost'], 2 );?> zł
+      <?= \Shared\Helpers\Helpers::decimal( $transport_method['cost'], 2 );?> zł
     </div>
   </div>
   <? if ( $transport_method['id'] == 1 or $transport_method['id'] == 2 ):?>
     <div class="inpost-info inpost-info-<?= $transport_method['id'];?>">
-      <? if ( $transport_method['id'] == $this -> transport_id ):?><?= \S::get_session( 'basket-inpost-info' );?>
-        <a href="#" onclick="inpost_map( <?= $transport_method['id'];?> ); return false;"><?= \S::lang( 'wybierz' );?></a>
+      <? if ( $transport_method['id'] == $this -> transport_id ):?><?= \Shared\Helpers\Helpers::get_session( 'basket-inpost-info' );?>
+        <a href="#" onclick="inpost_map( <?= $transport_method['id'];?> ); return false;"><?= \Shared\Helpers\Helpers::lang( 'wybierz' );?></a>
       <? endif;?>
     </div>
   <? endif;?>
   <? if ( $transport_method['id'] == 9 ):?>
     <div class="orlen-info orlen-info-<?= $transport_method['id'];?>">
-      <input type="hidden" name="orlen_point_id" id="orlen_point_id" value="<?= \S::get_session( 'basket_orlen_point_id' );?>">
+      <input type="hidden" name="orlen_point_id" id="orlen_point_id" value="<?= \Shared\Helpers\Helpers::get_session( 'basket_orlen_point_id' );?>">
       <?
-        if ( \S::get_session( 'basket-transport-method-id' ) != 9 )
+        if ( \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' ) != 9 )
           $class = 'hidden';
       ?>
-      <span id="orlen_point_info" class="<?= $class;?>"><?= \S::get_session( 'basket_orlen_point_info' );?></span>
-      <a href="#" class="orlen-widget <?= $class;?>" data-target="#orlen_point_id"  data-label="#orlen_point_info" data-type="all" data-layout="tabs" onclick="return false;"><?= \S::lang( 'wybierz' );?></a>
+      <span id="orlen_point_info" class="<?= $class;?>"><?= \Shared\Helpers\Helpers::get_session( 'basket_orlen_point_info' );?></span>
+      <a href="#" class="orlen-widget <?= $class;?>" data-target="#orlen_point_id"  data-label="#orlen_point_info" data-type="all" data-layout="tabs" onclick="return false;"><?= \Shared\Helpers\Helpers::lang( 'wybierz' );?></a>
     </div>
   <? endif;?>
 <? endforeach; endif;?>
 <script class="footer" type="text/javascript">
   $( function() {
 
-    <? if ( \S::get_session( 'basket-transport-method-id' ) ):?>
-      transport_checked( <?= \S::get_session( 'basket-transport-method-id' );?>, <?= \S::get_session( 'basket-payment-method-id' ) != '' ? \S::get_session( 'basket-payment-method-id' ) : 0;?>, false );
+    <? if ( \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' ) ):?>
+      transport_checked( <?= \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' );?>, <?= \Shared\Helpers\Helpers::get_session( 'basket-payment-method-id' ) != '' ? \Shared\Helpers\Helpers::get_session( 'basket-payment-method-id' ) : 0;?>, false );
     <? endif;?>
 
     $( '#transport-methods .icheck' ).iCheck({
diff --git a/templates/shop-basket/basket.php b/templates/shop-basket/basket.php
index 0b2dd23..67f3952 100644
--- a/templates/shop-basket/basket.php
+++ b/templates/shop-basket/basket.php
@@ -11,24 +11,24 @@
     <div class="basket-options">
       <div class="content">
         <div class="left">
-          <div class="box-title"><?= ucfirst(\S::lang('dostawa')); ?>:</div>
+          <div class="box-title"><?= ucfirst(\Shared\Helpers\Helpers::lang('dostawa')); ?>:</div>
           <div id="transport-methods">
             <?= $this->transport_methods; ?>
           </div>
           <div class="inpost-map-container">
-            <a href="#" onclick="inpost_check(); return false;" class="inpost-hide"><?= \S::lang('zamknij'); ?></a>
+            <a href="#" onclick="inpost_check(); return false;" class="inpost-hide"><?= \Shared\Helpers\Helpers::lang('zamknij'); ?></a>
             <div id="inpost-map"></div>
           </div>
         </div>
         <div class="right">
-          <div class="box-title"><?= ucfirst(\S::lang('platnosc')); ?>:</div>
+          <div class="box-title"><?= ucfirst(\Shared\Helpers\Helpers::lang('platnosc')); ?>:</div>
           <div id="payment-methods"></div>
         </div>
       </div>
     </div>
     <div class="row">
       <div class="col-12">
-        <a href="/koszyk-podsumowanie" id="btn-basket-summary" class="btn btn-success disabled float-right"><span class="text"><?= ucfirst(\S::lang('przejdz-do-podsumowania')); ?></span></a>
+        <a href="/koszyk-podsumowanie" id="btn-basket-summary" class="btn btn-success disabled float-right"><span class="text"><?= ucfirst(\Shared\Helpers\Helpers::lang('przejdz-do-podsumowania')); ?></span></a>
       </div>
     </div>
   <? endif; ?>
@@ -242,7 +242,7 @@
 
             $.alert({
 
-              title: '<?= ucfirst(\S::lang('uwaga')); ?>',
+              title: '<?= ucfirst(\Shared\Helpers\Helpers::lang('uwaga')); ?>',
               content: 'Proszę wybrać punkt odbioru',
               type: 'blue',
               closeIcon: true,
@@ -254,7 +254,7 @@
               autoClose: 'confirm|5000',
               buttons: {
                 confirm: {
-                  text: '<?= \S::lang('zamknij'); ?>',
+                  text: '<?= \Shared\Helpers\Helpers::lang('zamknij'); ?>',
                   btnClass: 'btn-blue',
                   keys: ['enter'],
                   action: function() {}
@@ -403,8 +403,8 @@
       var product_hash = $(this).attr('product-hash');
 
       $.alert({
-        title: '<?= ucfirst(\S::lang('potwierdz')); ?>',
-        content: '<?= \S::lang('potwierdz-usuniecie-produktu-z-koszyka'); ?>',
+        title: '<?= ucfirst(\Shared\Helpers\Helpers::lang('potwierdz')); ?>',
+        content: '<?= \Shared\Helpers\Helpers::lang('potwierdz-usuniecie-produktu-z-koszyka'); ?>',
         closeIcon: true,
         closeIconClass: 'fas fa-close',
         typeAnimated: true,
@@ -414,7 +414,7 @@
         autoClose: 'cancel|10000',
         buttons: {
           confirm: {
-            text: '<?= \S::lang('usun'); ?>',
+            text: '<?= \Shared\Helpers\Helpers::lang('usun'); ?>',
             btnClass: 'btn-orange',
             keys: ['enter'],
             action: function() {
@@ -451,7 +451,7 @@
             }
           },
           cancel: {
-            text: '<?= \S::lang('zamknij'); ?>',
+            text: '<?= \Shared\Helpers\Helpers::lang('zamknij'); ?>',
             btnClass: 'btn-blue',
             action: function() {}
           }
diff --git a/templates/shop-basket/summary-view.php b/templates/shop-basket/summary-view.php
index 5efd23a..938b33c 100644
--- a/templates/shop-basket/summary-view.php
+++ b/templates/shop-basket/summary-view.php
@@ -1,6 +1,6 @@
 <? global $client, $lang_id;?>
 <div class="basket-summary-container box">
-  <h1 class="box-title"><?= ucfirst( \S::lang( 'podsumowanie-zamowienia' ) );?>:</h1>
+  <h1 class="box-title"><?= ucfirst( \Shared\Helpers\Helpers::lang( 'podsumowanie-zamowienia' ) );?>:</h1>
   <div id="basket-summary" class="content">
     <? if ( is_array( $this -> basket ) and count( $this -> basket ) ):?>
       <? foreach ( $this -> basket as $position_hash => $position ):?>
@@ -15,10 +15,10 @@
           </div>
           <div class="details">
             <?
-            $product[ 'language' ][ 'seo_link' ] ? $url = '/' . $product[ 'language' ][ 'seo_link' ] : $url = '/p-' . $product[ 'id' ] . '-' . \S::seo( $product[ 'language' ][ 'name' ] );
+            $product[ 'language' ][ 'seo_link' ] ? $url = '/' . $product[ 'language' ][ 'seo_link' ] : $url = '/p-' . $product[ 'id' ] . '-' . \Shared\Helpers\Helpers::seo( $product[ 'language' ][ 'name' ] );
 
-            if ( \S::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' )
-              $url = '/' . \S::get_session( 'current-lang' ) . $url;
+            if ( \Shared\Helpers\Helpers::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' )
+              $url = '/' . \Shared\Helpers\Helpers::get_session( 'current-lang' ) . $url;
             ?>
             <div class="name">
               <a href="<?= $url;?>"><?= $product[ 'language' ][ 'name' ];?></a>
@@ -53,20 +53,20 @@
                 $price_product = \shop\Product::calculate_basket_product_price((float)$product['price_brutto_promo'], (float)$product['price_brutto'], $this -> coupon, $position);
 
                 if ($price_product['price_new'])
-                  echo \S::decimal($price_product['price_new']) . ' zł';
+                  echo \Shared\Helpers\Helpers::decimal($price_product['price_new']) . ' zł';
 
                 if ($price_product['price_new'] and $price_product['price_new'] < $price_product['price'])
-                  echo '<u>' . \S::decimal($price_product['price']) . ' zł</u>';
+                  echo '<u>' . \Shared\Helpers\Helpers::decimal($price_product['price']) . ' zł</u>';
 
                 if ($price_product['price_new'] and $price_product['price_new'] < $price_product['price'])
-                  $discount += \S::normalize_decimal(($price_product['price'] - $price_product['price_new']) * $position['quantity']);
+                  $discount += \Shared\Helpers\Helpers::normalize_decimal(($price_product['price'] - $price_product['price_new']) * $position['quantity']);
               ?>
-              <span>x <?= $position[ 'quantity' ];?> <?= \S::lang( 'szt' );?>.</span>
-              <?= \S::decimal( \S::normalize_decimal( $price_product['price_new'] * $position[ 'quantity' ] ) );?> zł
+              <span>x <?= $position[ 'quantity' ];?> <?= \Shared\Helpers\Helpers::lang( 'szt' );?>.</span>
+              <?= \Shared\Helpers\Helpers::decimal( \Shared\Helpers\Helpers::normalize_decimal( $price_product['price_new'] * $position[ 'quantity' ] ) );?> zł
             </div>
           </div>
         </div>
-        <? $summary += \S::normalize_decimal( $price_product['price'] * $position[ 'quantity' ] );?>
+        <? $summary += \Shared\Helpers\Helpers::normalize_decimal( $price_product['price'] * $position[ 'quantity' ] );?>
         <?
           if ( $begin_checkout_items )
             $begin_checkout_items .= ',';
@@ -74,7 +74,7 @@
           $begin_checkout_items .= '{';
           $begin_checkout_items .= '"id": "' . $product['id'] . '",';
           $begin_checkout_items .= '"name": "' . $product['language']['name'] . '",';
-          $begin_checkout_items .= '"price": ' . \S::normalize_decimal( $price_product['price_new'] ) . ',';
+          $begin_checkout_items .= '"price": ' . \Shared\Helpers\Helpers::normalize_decimal( $price_product['price_new'] ) . ',';
           $begin_checkout_items .= '"quantity": ' . $position['quantity'];
           $begin_checkout_items .= '}';
         ?>
@@ -83,13 +83,13 @@
       <div class="basket-summary">
         Wartość koszyka: 1
         <span>
-          <?= \S::decimal( $summary );?> zł
+          <?= \Shared\Helpers\Helpers::decimal( $summary );?> zł
         </span>
       </div>
       <? if ( $discount ):?>
         <div class="basket-summary">
           Rabat:
-          <span class="text-danger">-<?= \S::decimal( $discount ); ?> zł</span>
+          <span class="text-danger">-<?= \Shared\Helpers\Helpers::decimal( $discount ); ?> zł</span>
         </div>
       <? endif;?>
       <div class="basket-summary">
@@ -99,7 +99,7 @@
           <span>0,00 zł</span>
         <? else:?>
           <span>
-            <?= \S::decimal( $this -> transport[ 'cost' ] );?> zł
+            <?= \Shared\Helpers\Helpers::decimal( $this -> transport[ 'cost' ] );?> zł
           </span>
         <? endif;?>
       </div>
@@ -109,7 +109,7 @@
               $summary -= $discount;
           ?>
           <span id="order-summary">
-            <?= $this -> transport[ 'delivery_free' ] == 1 ? \S::decimal( $summary ) : \S::decimal( $summary + $this -> transport[ 'cost' ] );?> zł
+            <?= $this -> transport[ 'delivery_free' ] == 1 ? \Shared\Helpers\Helpers::decimal( $summary ) : \Shared\Helpers\Helpers::decimal( $summary + $this -> transport[ 'cost' ] );?> zł
           </span>
       </div>
       <div class="basket-summary">
@@ -150,7 +150,7 @@
           ] );?>
         <? endif;?>
       </div>
-    <a href="/koszyk" class="btn btn-dark"><?= \S::lang( 'wroc-do-koszyka' );?></span></a>
+    <a href="/koszyk" class="btn btn-dark"><?= \Shared\Helpers\Helpers::lang( 'wroc-do-koszyka' );?></span></a>
     </div>
   <? endif;?>
 </div>
@@ -172,7 +172,7 @@
       event: "begin_checkout",
       ecommerce: {
         currency: "PLN",
-        value: <?= \S::normalize_decimal( \front\factory\ShopBasket::summary_price( $this -> basket, $this -> coupon ) );?>,
+        value: <?= \Shared\Helpers\Helpers::normalize_decimal( \front\factory\ShopBasket::summary_price( $this -> basket, $this -> coupon ) );?>,
         items: [
           <?= $begin_checkout_items;?>
         ]
diff --git a/templates/shop-category/categories.php b/templates/shop-category/categories.php
index 6baa0c5..9a31e2d 100644
--- a/templates/shop-category/categories.php
+++ b/templates/shop-category/categories.php
@@ -14,10 +14,10 @@ if ( is_array( $this -> categories ) ):
               endif;
             ?>">
             <?
-              $category['language']['seo_link'] ? $url = '/' . $category['language']['seo_link'] : $url = '/k-' . $category['id'] . '-' . \S::seo( $category['language']['title'] );
+              $category['language']['seo_link'] ? $url = '/' . $category['language']['seo_link'] : $url = '/k-' . $category['id'] . '-' . \Shared\Helpers\Helpers::seo( $category['language']['title'] );
 
-              if ( \S::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' )
-                $url = '/' . \S::get_session( 'current-lang' ) . $url;
+              if ( \Shared\Helpers\Helpers::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' )
+                $url = '/' . \Shared\Helpers\Helpers::get_session( 'current-lang' ) . $url;
             ?>
             <a href="<?= $url;?>" title="<?= $category['language']['title'];?>" <? if ( is_array( $category['categories'] ) ) echo "class='menu-trigger'";?>>
               <?= $category['language']['title'];?>
diff --git a/templates/shop-category/category-description.php b/templates/shop-category/category-description.php
index a62bb71..1b416f8 100644
--- a/templates/shop-category/category-description.php
+++ b/templates/shop-category/category-description.php
@@ -3,7 +3,7 @@
   <div id="visible"><?= $this->category['language']['text']; ?></div>
   <div id="hidden"><?= $this->category['language']['text_hidden']; ?></div>
   <? if ($this->category['language']['text_hidden']) : ?>
-  <a href="#" class="btn"><?= \S::lang('wiecej'); ?></a>
+  <a href="#" class="btn"><?= \Shared\Helpers\Helpers::lang('wiecej'); ?></a>
   <? endif; ?>
 </div>
 <? endif; ?>
@@ -14,10 +14,10 @@
       e.preventDefault();
       if ($('#category-description #hidden').is(':visible')) {
         $('#category-description #hidden').slideToggle();
-        $('#category-description .btn').html('<?= \S::lang('wiecej'); ?>');
+        $('#category-description .btn').html('<?= \Shared\Helpers\Helpers::lang('wiecej'); ?>');
       } else {
         $('#category-description #hidden').slideToggle();
-        $('#category-description .btn').html('<?= \S::lang('mniej'); ?>');
+        $('#category-description .btn').html('<?= \Shared\Helpers\Helpers::lang('mniej'); ?>');
       }
     });
   });
diff --git a/templates/shop-category/category-infinitescroll.php b/templates/shop-category/category-infinitescroll.php
index 552e188..321285f 100644
--- a/templates/shop-category/category-infinitescroll.php
+++ b/templates/shop-category/category-infinitescroll.php
@@ -1,7 +1,7 @@
 <? global $lang_id; ?>
 <? if ($this->query) : ?>
   <div class="box-title">
-    <?= \S::lang('wyniki-wyszukiwania-dla-zapytania') . ': <strong>' . $this->query . '</strong>'; ?>
+    <?= \Shared\Helpers\Helpers::lang('wyniki-wyszukiwania-dla-zapytania') . ': <strong>' . $this->query . '</strong>'; ?>
   </div>
 <? endif; ?>
 <?
diff --git a/templates/shop-category/category.php b/templates/shop-category/category.php
index 1c05f95..9df22a9 100644
--- a/templates/shop-category/category.php
+++ b/templates/shop-category/category.php
@@ -1,7 +1,7 @@
 <? global $lang_id;?>
 <? if ( $this -> query ):?>
   <div class="box-title">
-    <?= \S::lang( 'wyniki-wyszukiwania-dla-zapytania' ) . ': <strong>' . $this -> query . '</strong>';?>
+    <?= \Shared\Helpers\Helpers::lang( 'wyniki-wyszukiwania-dla-zapytania' ) . ': <strong>' . $this -> query . '</strong>';?>
   </div>
 <? endif;?>
 <?
diff --git a/templates/shop-category/products.php b/templates/shop-category/products.php
index 358451a..3700dbf 100644
--- a/templates/shop-category/products.php
+++ b/templates/shop-category/products.php
@@ -1,7 +1,7 @@
 <? global $lang_id;?>
 <? if ( $this -> query ):?>
   <div class="box-title">
-    <?= \S::lang( 'wyniki-wyszukiwania-dla-zapytania' ) . ': <strong>' . $this -> query . '</strong>';?>
+    <?= \Shared\Helpers\Helpers::lang( 'wyniki-wyszukiwania-dla-zapytania' ) . ': <strong>' . $this -> query . '</strong>';?>
   </div>
 <? endif;?>
 <div class="category-content">
diff --git a/templates/shop-client/address-edit.php b/templates/shop-client/address-edit.php
index e2a2b64..f3a46d0 100644
--- a/templates/shop-client/address-edit.php
+++ b/templates/shop-client/address-edit.php
@@ -3,31 +3,31 @@
             'active_page' => 'addresses'
           ] );?>
   <div class="box-title">
-    <?= ucfirst( \S::lang( 'adresy-do-wysylki' ) );?>
+    <?= ucfirst( \Shared\Helpers\Helpers::lang( 'adresy-do-wysylki' ) );?>
   </div>
   <form method="POST" class="box-mini" action="/shopClient/address_save" id="f-new-address">
     <? if ( $this -> address['id'] ):?>
       <input type="hidden" name="address_id" value="<?= $this -> address['id'];?>">
     <? endif;?>
     <div class="form-group">
-      <input type="text" name="name" required class="form-control" placeholder="<?= ucfirst( \S::lang( 'imie' ) );?>" value="<?= htmlspecialchars( $this -> address['name'] );?>">
+      <input type="text" name="name" required class="form-control" placeholder="<?= ucfirst( \Shared\Helpers\Helpers::lang( 'imie' ) );?>" value="<?= htmlspecialchars( $this -> address['name'] );?>">
     </div>
     <div class="form-group">
-      <input type="text" name="surname" required class="form-control" placeholder="<?= ucfirst( \S::lang( 'nazwisko' ) );?>" value="<?= htmlspecialchars( $this -> address['surname'] );?>">
+      <input type="text" name="surname" required class="form-control" placeholder="<?= ucfirst( \Shared\Helpers\Helpers::lang( 'nazwisko' ) );?>" value="<?= htmlspecialchars( $this -> address['surname'] );?>">
     </div>
     <div class="form-group">
-      <input type="text" name="street" required class="form-control" placeholder="<?= ucfirst( \S::lang( 'ulica-i-numer' ) );?>" value="<?= htmlspecialchars( $this -> address['street'] );?>">
+      <input type="text" name="street" required class="form-control" placeholder="<?= ucfirst( \Shared\Helpers\Helpers::lang( 'ulica-i-numer' ) );?>" value="<?= htmlspecialchars( $this -> address['street'] );?>">
     </div>
     <div class="form-group row-flex">
-      <input type="text" name="postal_code" required class="form-control" pattern="[0-9]{2}-[0-9]{3}" title="Format xx-xxx" placeholder="<?= ucfirst( \S::lang( 'kod-pocztowy' ) );?>" value="<?= htmlspecialchars( $this -> address['postal_code'] );?>">
-      <input type="text" name="city" required class="form-control" placeholder="<?= ucfirst( \S::lang( 'miejscowosc' ) );?>" value="<?= htmlspecialchars( $this -> address['city'] );?>">
+      <input type="text" name="postal_code" required class="form-control" pattern="[0-9]{2}-[0-9]{3}" title="Format xx-xxx" placeholder="<?= ucfirst( \Shared\Helpers\Helpers::lang( 'kod-pocztowy' ) );?>" value="<?= htmlspecialchars( $this -> address['postal_code'] );?>">
+      <input type="text" name="city" required class="form-control" placeholder="<?= ucfirst( \Shared\Helpers\Helpers::lang( 'miejscowosc' ) );?>" value="<?= htmlspecialchars( $this -> address['city'] );?>">
     </div>
     <div class="form-group">
-      <input type="text" name="phone" required class="form-control" placeholder="<?= ucfirst( \S::lang( 'numer-telefonu' ) );?>" value="<?= htmlspecialchars( $this -> address['phone'] );?>">
+      <input type="text" name="phone" required class="form-control" placeholder="<?= ucfirst( \Shared\Helpers\Helpers::lang( 'numer-telefonu' ) );?>" value="<?= htmlspecialchars( $this -> address['phone'] );?>">
     </div>
     <div class="form-group row-flex">
-      <a href="/panel-klienta/adresy" class="btn btn-dark"><?= ucfirst( \S::lang( 'anuluj' ) );?></a>
-      <button type="submit" class="btn btn-success"><?= ucfirst( \S::lang( 'zapisz' ) );?></button>
+      <a href="/panel-klienta/adresy" class="btn btn-dark"><?= ucfirst( \Shared\Helpers\Helpers::lang( 'anuluj' ) );?></a>
+      <button type="submit" class="btn btn-success"><?= ucfirst( \Shared\Helpers\Helpers::lang( 'zapisz' ) );?></button>
     </div>
   </form>
 </div>
\ No newline at end of file
diff --git a/templates/shop-client/client-addresses.php b/templates/shop-client/client-addresses.php
index 0917036..bb56d72 100644
--- a/templates/shop-client/client-addresses.php
+++ b/templates/shop-client/client-addresses.php
@@ -3,9 +3,9 @@
             'active_page' => 'addresses'
           ] );?>
   <div class="box-title">
-    <?= ucfirst( \S::lang( 'adresy-do-wysylki' ) );?>
+    <?= ucfirst( \Shared\Helpers\Helpers::lang( 'adresy-do-wysylki' ) );?>
   </div>
-  <a href="/panel-klienta/nowy-adres" class="btn btn-success btn-big"><?= ucfirst( \S::lang( 'dodaj-nowy-adres' ) );?></span></a>
+  <a href="/panel-klienta/nowy-adres" class="btn btn-success btn-big"><?= ucfirst( \Shared\Helpers\Helpers::lang( 'dodaj-nowy-adres' ) );?></span></a>
   <? if ( is_array( $this -> addresses ) and count( $this -> addresses ) ):?>
     <div class="addresses">
       <? foreach ( $this -> addresses as $address ):?>
@@ -16,8 +16,8 @@
           <br/><?= $address['postal_code'] . ' ' . $address['city'];?>
           <br/><?= $address['phone'];?>
           <div class="buttons">
-            <a href="/panel-klienta/edytuj-adres/<?= $address['id'];?>"><?= \S::lang( 'zmien' );?></a>
-            <a href="/panel-klienta/usun-adres/<?= $address['id'];?>" class="btn-delete text-danger"><?= \S::lang( 'usun' );?></a>
+            <a href="/panel-klienta/edytuj-adres/<?= $address['id'];?>"><?= \Shared\Helpers\Helpers::lang( 'zmien' );?></a>
+            <a href="/panel-klienta/usun-adres/<?= $address['id'];?>" class="btn-delete text-danger"><?= \Shared\Helpers\Helpers::lang( 'usun' );?></a>
           </div>
         </div>
       <? endforeach;?>
@@ -35,8 +35,8 @@
 
       $.alert(
       {
-        title: '<?= ucfirst( \S::lang( 'potwierdz' ) );?>',
-        content: '<?= \S::lang( 'potwierdz-usuniecie-adresu' );?>',
+        title: '<?= ucfirst( \Shared\Helpers\Helpers::lang( 'potwierdz' ) );?>',
+        content: '<?= \Shared\Helpers\Helpers::lang( 'potwierdz-usuniecie-adresu' );?>',
         type: 'orange',
         closeIcon: true,
         closeIconClass: 'fas fa-close',
@@ -50,7 +50,7 @@
         {
           confirm:
           {
-            text: '<?= \S::lang( 'usun' );?>',
+            text: '<?= \Shared\Helpers\Helpers::lang( 'usun' );?>',
             btnClass: 'btn-orange',
             keys: ['enter'],
             action: function()
@@ -60,7 +60,7 @@
           },
           cancel:
           {
-            text: '<?= \S::lang( 'zamknij' );?>',
+            text: '<?= \Shared\Helpers\Helpers::lang( 'zamknij' );?>',
             btnClass: 'btn-blue',
             action: function() {}
           }
diff --git a/templates/shop-client/client-menu.php b/templates/shop-client/client-menu.php
index c461ee4..d2bfe70 100644
--- a/templates/shop-client/client-menu.php
+++ b/templates/shop-client/client-menu.php
@@ -1,10 +1,10 @@
 <div class="client-menu">
   <ul>
     <li>
-      <a href="/panel-klienta/zamowienia" title="<?= \S::lang( 'historia-zamowien' );?>" class="btn btn-success <? if ( $this -> active_page == 'orders' ):?>active<? endif;?>"><?= \S::lang( 'historia-zamowien' );?></a>
+      <a href="/panel-klienta/zamowienia" title="<?= \Shared\Helpers\Helpers::lang( 'historia-zamowien' );?>" class="btn btn-success <? if ( $this -> active_page == 'orders' ):?>active<? endif;?>"><?= \Shared\Helpers\Helpers::lang( 'historia-zamowien' );?></a>
     </li>
     <li>
-      <a href="/panel-klienta/adresy" title="<?= \S::lang( 'adresy' );?>" class="btn btn-success <? if ( $this -> active_page == 'addresses' ):?>active<? endif;?>"><?= \S::lang( 'adresy' );?></a>
+      <a href="/panel-klienta/adresy" title="<?= \Shared\Helpers\Helpers::lang( 'adresy' );?>" class="btn btn-success <? if ( $this -> active_page == 'addresses' ):?>active<? endif;?>"><?= \Shared\Helpers\Helpers::lang( 'adresy' );?></a>
     </li>
   </ul>
 </div>
\ No newline at end of file
diff --git a/templates/shop-client/client-orders.php b/templates/shop-client/client-orders.php
index 4d1bcaa..cd7ba88 100644
--- a/templates/shop-client/client-orders.php
+++ b/templates/shop-client/client-orders.php
@@ -4,7 +4,7 @@
             'active_page' => 'orders'
           ] );?>
   <div class="box-title">
-    <?= ucfirst( \S::lang( 'historia-zamowien' ) );?>
+    <?= ucfirst( \Shared\Helpers\Helpers::lang( 'historia-zamowien' ) );?>
   </div>
   <? if ( is_array( $this -> orders ) ): foreach ( $this -> orders as $order ):?>
     <?= \Tpl::view( 'shop-order/order-simple', [
diff --git a/templates/shop-client/login-form.php b/templates/shop-client/login-form.php
index 1baa4b0..ccc4499 100644
--- a/templates/shop-client/login-form.php
+++ b/templates/shop-client/login-form.php
@@ -1,20 +1,20 @@
 <div class="user-login">
   <div class="content">
     <div class="box-title">
-      <?= ucfirst( \S::lang( 'logowanie' ) );?>
+      <?= ucfirst( \Shared\Helpers\Helpers::lang( 'logowanie' ) );?>
     </div>
     <form method="POST" action="/shopClient/login">
       <input type="hidden" name="redirect" value="<?= $_SERVER['REQUEST_URI'];?>">
       <div class="form-group">
-        <input type="email" name="email" required id="email" class="form-control" placeholder="<?= ucfirst( \S::lang( 'email' ) );?>">
+        <input type="email" name="email" required id="email" class="form-control" placeholder="<?= ucfirst( \Shared\Helpers\Helpers::lang( 'email' ) );?>">
       </div>
       <div class="form-group">
-        <input type="password" name="password" required id="password" class="form-control" placeholder="<?= ucfirst( \S::lang( 'haslo' ) );?>">
+        <input type="password" name="password" required id="password" class="form-control" placeholder="<?= ucfirst( \Shared\Helpers\Helpers::lang( 'haslo' ) );?>">
       </div>
       <div class="form-group">
-        <button type="submit" class="btn btn-success"><?= ucfirst( \S::lang( 'zaloguj-sie' ) );?></button>
-        <span><?= \S::lang( 'nie-pamietasz-hasla' );?> <a href="/odzyskiwanie-hasla"><?= ucfirst( \S::lang( 'nowe-haslo' ) );?></a>.</span><br />
-        <span><?= \S::lang( 'nie-masz-konta' );?> <a href="/rejestracja"><?= ucfirst( \S::lang( 'zarejestruj-sie' ) );?></a>.
+        <button type="submit" class="btn btn-success"><?= ucfirst( \Shared\Helpers\Helpers::lang( 'zaloguj-sie' ) );?></button>
+        <span><?= \Shared\Helpers\Helpers::lang( 'nie-pamietasz-hasla' );?> <a href="/odzyskiwanie-hasla"><?= ucfirst( \Shared\Helpers\Helpers::lang( 'nowe-haslo' ) );?></a>.</span><br />
+        <span><?= \Shared\Helpers\Helpers::lang( 'nie-masz-konta' );?> <a href="/rejestracja"><?= ucfirst( \Shared\Helpers\Helpers::lang( 'zarejestruj-sie' ) );?></a>.
       </div>
     </form>
   </div>
diff --git a/templates/shop-client/mini-login.php b/templates/shop-client/mini-login.php
index 9d2f65d..e03c55b 100644
--- a/templates/shop-client/mini-login.php
+++ b/templates/shop-client/mini-login.php
@@ -2,6 +2,6 @@
 <? if ( !$this -> client ):?>
   <?= ucfirst( $lang['witaj'] );?>! <a href="/logowanie" title="Zaloguj się"> <?= ucfirst( $lang['zaloguj-sie'] );?></a> <?= $lang['lub'];?> <a href="/rejestracja" title="Rejestracja"><?= $lang['zarejestruj-sie'];?></a>
 <? else:?>
-  <a href="/panel-klienta/zamowienia" title="<?= ucfirst( \S::lang( 'moje-konto' ) );?>" id="user-account"><span class="fa fa-user"></span><?= ucfirst( \S::lang( 'moje-konto' ) );?></a>
-  <a href="/wylogowanie" title="<?= ucfirst( \S::lang( 'wyloguj-sie' ) );?>" id="user-logout"><span class="fa fa-unlock"></span><?= ucfirst( \S::lang( 'wyloguj-sie' ) );?></a>
+  <a href="/panel-klienta/zamowienia" title="<?= ucfirst( \Shared\Helpers\Helpers::lang( 'moje-konto' ) );?>" id="user-account"><span class="fa fa-user"></span><?= ucfirst( \Shared\Helpers\Helpers::lang( 'moje-konto' ) );?></a>
+  <a href="/wylogowanie" title="<?= ucfirst( \Shared\Helpers\Helpers::lang( 'wyloguj-sie' ) );?>" id="user-logout"><span class="fa fa-unlock"></span><?= ucfirst( \Shared\Helpers\Helpers::lang( 'wyloguj-sie' ) );?></a>
 <? endif; ?>
diff --git a/templates/shop-client/recover-password.php b/templates/shop-client/recover-password.php
index c5277e6..69e053b 100644
--- a/templates/shop-client/recover-password.php
+++ b/templates/shop-client/recover-password.php
@@ -1,14 +1,14 @@
 <div class="user-login box">
   <div class="content">
     <div class="box-title">
-      <?= ucfirst( \S::lang( 'odzyskiwanie-hasla' ) );?>
+      <?= ucfirst( \Shared\Helpers\Helpers::lang( 'odzyskiwanie-hasla' ) );?>
     </div>
     <form method="POST" action="/shopClient/send_email_password_recovery" id="f-password-recovery">
       <div class="form-group">
-        <input type="email" name="email" required id="email" class="form-control" placeholder="<?= ucfirst( \S::lang( 'email' ) );?>">
+        <input type="email" name="email" required id="email" class="form-control" placeholder="<?= ucfirst( \Shared\Helpers\Helpers::lang( 'email' ) );?>">
       </div>
       <div class="form-group">
-        <button type="submit" class="btn btn-success"><?= ucfirst( \S::lang( 'resetuj-haslo' ) );?></button>
+        <button type="submit" class="btn btn-success"><?= ucfirst( \Shared\Helpers\Helpers::lang( 'resetuj-haslo' ) );?></button>
       </div>
     </form>
   </div>
diff --git a/templates/shop-client/register-form.php b/templates/shop-client/register-form.php
index 350f36f..c0881d2 100644
--- a/templates/shop-client/register-form.php
+++ b/templates/shop-client/register-form.php
@@ -1,7 +1,7 @@
 <div class="user-register box">
   <div class="content">
     <div class="box-title">
-      <?= \S::lang('zaloz-konto-klienta');?>
+      <?= \Shared\Helpers\Helpers::lang('zaloz-konto-klienta');?>
     </div>
     <form method="POST" action="/" id="f-user-register">
       <input type="hidden" id="type" name="type" value="0">
@@ -9,29 +9,29 @@
         <input type="hidden" id="firm_id" name="firm_id" value="<?= $this -> firm_id;?>">
       <? endif;?>
       <div class="form-group">
-        <input type="email" required id="email" class="form-control" placeholder="<?= ucfirst( \S::lang('email') );?>">
+        <input type="email" required id="email" class="form-control" placeholder="<?= ucfirst( \Shared\Helpers\Helpers::lang('email') );?>">
       </div>
       <div class="form-group">
-        <input type="password" required id="password" pattern="^\S{6,}$" class="form-control" placeholder="<?= ucfirst( \S::lang('haslo') );?> (<?= \S::lang('min');?> 6 <?= \S::lang('znakow');?>)">
+        <input type="password" required id="password" pattern="^\S{6,}$" class="form-control" placeholder="<?= ucfirst( \Shared\Helpers\Helpers::lang('haslo') );?> (<?= \Shared\Helpers\Helpers::lang('min');?> 6 <?= \Shared\Helpers\Helpers::lang('znakow');?>)">
       </div>
       <div class="form-group">
-        <input type="password" required id="password-repeat" pattern="^\S{6,}$" class="form-control" oninput="check_match(this)" placeholder="<?= ucfirst( \S::lang('powtorz-haslo') );?>">
+        <input type="password" required id="password-repeat" pattern="^\S{6,}$" class="form-control" oninput="check_match(this)" placeholder="<?= ucfirst( \Shared\Helpers\Helpers::lang('powtorz-haslo') );?>">
       </div>
       <div class="form-group agreement">
         <input type="checkbox" required class="checkbox" name="agreement" id="agreement">
         <label for="agreement">
           <?
-            $text = str_replace( '[LINK-REGULAMIN]', '<a href="/regulamin">' . \S::lang('regulamin') . '</a>', \S::lang('rejestracja-akceptacja-regulaminu') );
-            echo $text = str_replace( '[LINK-POLITYKA-PRYWATNOSCI]', '<a href="/polityka-prywatnosci">' . \S::lang('polityke-prywatnosci') . '</a>', $text );
+            $text = str_replace( '[LINK-REGULAMIN]', '<a href="/regulamin">' . \Shared\Helpers\Helpers::lang('regulamin') . '</a>', \Shared\Helpers\Helpers::lang('rejestracja-akceptacja-regulaminu') );
+            echo $text = str_replace( '[LINK-POLITYKA-PRYWATNOSCI]', '<a href="/polityka-prywatnosci">' . \Shared\Helpers\Helpers::lang('polityke-prywatnosci') . '</a>', $text );
           ?>
         </label>
       </div>
       <div class="form-group agreement-marketing">
-        <input type="checkbox" name="agreement-marketing" class="checkbox" id="agreement-marketing"> <label for="agreement-marketing"><?= \S::lang('rejestracja-zgoda-na-marketing');?></label>
+        <input type="checkbox" name="agreement-marketing" class="checkbox" id="agreement-marketing"> <label for="agreement-marketing"><?= \Shared\Helpers\Helpers::lang('rejestracja-zgoda-na-marketing');?></label>
       </div>
       <div class="form-group buttons">
-        <button type="submit" class="btn btn-success"><?= ucfirst( \S::lang('zarejestruj-sie') );?></button>
-        <span id="login"><?= ucfirst( \S::lang('masz-juz-konto') );?>? <a href="/logowanie"><?= ucfirst( \S::lang('zaloguj-sie') );?></a></span>
+        <button type="submit" class="btn btn-success"><?= ucfirst( \Shared\Helpers\Helpers::lang('zarejestruj-sie') );?></button>
+        <span id="login"><?= ucfirst( \Shared\Helpers\Helpers::lang('masz-juz-konto') );?>? <a href="/logowanie"><?= ucfirst( \Shared\Helpers\Helpers::lang('zaloguj-sie') );?></a></span>
       </div>
     </form>
   </div>
@@ -63,8 +63,8 @@
         {
           alert1 = $.alert(
           {
-            title: '<?= ucfirst( \S::lang('informacja') );?>',
-            content: '<?= \S::lang('prosze-czekac');?>',
+            title: '<?= ucfirst( \Shared\Helpers\Helpers::lang('informacja') );?>',
+            content: '<?= \Shared\Helpers\Helpers::lang('prosze-czekac');?>',
             type: 'orange',
             closeIcon: true,
             closeIconClass: 'fas fa-close',
@@ -77,7 +77,7 @@
             {
               confirm:
               {
-                text: '<?= \S::lang('zamknij');?>',
+                text: '<?= \Shared\Helpers\Helpers::lang('zamknij');?>',
                 btnClass: 'btn-orange',
                 keys: ['enter'],
                 action: function() {}
@@ -92,7 +92,7 @@
 
           $.alert(
           {
-            title: '<?= ucfirst( \S::lang('informacja') );?>',
+            title: '<?= ucfirst( \Shared\Helpers\Helpers::lang('informacja') );?>',
             content: response.msg,
             type: 'orange',
             closeIcon: true,
@@ -107,7 +107,7 @@
             {
               confirm:
               {
-                text: '<?= \S::lang('zamknij');?>',
+                text: '<?= \Shared\Helpers\Helpers::lang('zamknij');?>',
                 btnClass: 'btn-orange',
                 keys: ['enter'],
                 action: function() {}
@@ -129,7 +129,7 @@
   function check_match(input)
   {
     if ( input.value !== document.getElementById( 'password' ).value )
-      input.setCustomValidity( '<?= \S::lang('podane-hasla-sa-rozne');?>');
+      input.setCustomValidity( '<?= \Shared\Helpers\Helpers::lang('podane-hasla-sa-rozne');?>');
     else
       input.setCustomValidity('');
   }
diff --git a/templates/shop-order/mail-summary.php b/templates/shop-order/mail-summary.php
index d688af4..6f24164 100644
--- a/templates/shop-order/mail-summary.php
+++ b/templates/shop-order/mail-summary.php
@@ -4,10 +4,10 @@ global $lang_id;
 if ( $this -> settings['ssl'] ) $base = 'https'; else $base = 'http';
 echo $this -> settings['newsletter_header'];
 ?>
-<p style="font-family: Arial; font-size: 14px; font-weight: normal; margin-bottom: 25px;"><?= ucfirst( \S::lang( 'podsumowanie-zamowienia' ) );?> <?= \S::lang( 'nr' );?> <strong><?= $this -> order['number'];?></strong> <?= \S::lang( 'z-dnia' );?> <strong><?= date( 'd.m.Y H:i', strtotime( $this -> order['date_order'] ) );?></strong></p>
-<p><a href="<?= $base . "://" . $_SERVER['SERVER_NAME'];?>/zamowienie/<?= $this -> order['hash'];?>" style="display: block; width: 200px; text-align: center; padding: 10px; background: #77cdd1; color: #FFF; text-decoration: none; text-transform: uppercase;"><?= \S::lang( 'szczegoly-zamowienia' );?></a></p>
+<p style="font-family: Arial; font-size: 14px; font-weight: normal; margin-bottom: 25px;"><?= ucfirst( \Shared\Helpers\Helpers::lang( 'podsumowanie-zamowienia' ) );?> <?= \Shared\Helpers\Helpers::lang( 'nr' );?> <strong><?= $this -> order['number'];?></strong> <?= \Shared\Helpers\Helpers::lang( 'z-dnia' );?> <strong><?= date( 'd.m.Y H:i', strtotime( $this -> order['date_order'] ) );?></strong></p>
+<p><a href="<?= $base . "://" . $_SERVER['SERVER_NAME'];?>/zamowienie/<?= $this -> order['hash'];?>" style="display: block; width: 200px; text-align: center; padding: 10px; background: #77cdd1; color: #FFF; text-decoration: none; text-transform: uppercase;"><?= \Shared\Helpers\Helpers::lang( 'szczegoly-zamowienia' );?></a></p>
 <? if ( is_array( $this -> order['products'] ) ): foreach ( $this -> order['products'] as $product ):?>
-  <? $summary_tmp += \S::normalize_decimal( $product['price_brutto'] * $product['quantity'] );?>
+  <? $summary_tmp += \Shared\Helpers\Helpers::normalize_decimal( $product['price_brutto'] * $product['quantity'] );?>
   <? $quantity += $product['quantity'];?>
 <? endforeach; endif;?>
 <?
@@ -20,14 +20,14 @@ echo $this -> settings['newsletter_header'];
 <? $summary_tmp += $this -> order['transport_cost'];?>
 <? if ( $this -> order['payment_method_id'] == 1 ):?>
   <div style="border-bottom: 1px solid #eee; margin-bottom: 15px;"></div>
-  <p style="font-family: Arial; font-size: 14px; font-weight: 600; text-transform: uppercase;"><?= \S::lang( 'dane-do-przelewu' );?>:</p>
+  <p style="font-family: Arial; font-size: 14px; font-weight: 600; text-transform: uppercase;"><?= \Shared\Helpers\Helpers::lang( 'dane-do-przelewu' );?>:</p>
   <div style="font-family: Arial; font-size: 14px;">
-    <?= str_replace( [ '[KWOTA]', '[NR-ZAMOWIENIA]' ], [ \S::decimal( $summary_tmp ) . ' zł', $this -> order['number'] ], $this -> settings['shop_bank_account_info'] );?>
+    <?= str_replace( [ '[KWOTA]', '[NR-ZAMOWIENIA]' ], [ \Shared\Helpers\Helpers::decimal( $summary_tmp ) . ' zł', $this -> order['number'] ], $this -> settings['shop_bank_account_info'] );?>
   </div>
 <? endif;?>
 
 <div style="border-bottom: 1px solid #eee; margin-bottom: 15px;"></div>
-<p style="font-family: Arial; font-size: 14px; font-weight: 600; text-transform: uppercase;"><?= \S::lang( 'dane-do-dostawy' );?>:</p>
+<p style="font-family: Arial; font-size: 14px; font-weight: 600; text-transform: uppercase;"><?= \Shared\Helpers\Helpers::lang( 'dane-do-dostawy' );?>:</p>
 <p style="font-family: Arial; font-size: 14px; ">
   <?= $this -> order['client_surname'];?> <?= $this -> order['client_name'];?><br />
   <?= $this -> order['client_street'];?><br />
@@ -43,7 +43,7 @@ echo $this -> settings['newsletter_header'];
 </p>
 <? if ( $this -> order['firm_name'] ):?>
   <div style="border-bottom: 1px solid #eee; margin-bottom: 15px;"></div>
-  <p style="font-family: Arial; font-size: 14px; font-weight: 600; text-transform: uppercase;"><?= \S::lang( 'dane-do-faktury' );?>:</p>
+  <p style="font-family: Arial; font-size: 14px; font-weight: 600; text-transform: uppercase;"><?= \Shared\Helpers\Helpers::lang( 'dane-do-faktury' );?>:</p>
   <p style="font-family: Arial; font-size: 14px; margin-top: 15px;">
     <?= $this -> order['firm_name'];?><br />
     <?= $this -> order['firm_street'];?><br />
@@ -52,14 +52,14 @@ echo $this -> settings['newsletter_header'];
   </p>
 <? endif;?>
 <div style="border-bottom: 1px solid #eee; margin-bottom: 15px;"></div>
-<p style="font-family: Arial; font-size: 14px; font-weight: 600; text-transform: uppercase;"><?= \S::lang( 'zamowione-produkty' );?>:</p>
+<p style="font-family: Arial; font-size: 14px; font-weight: 600; text-transform: uppercase;"><?= \Shared\Helpers\Helpers::lang( 'zamowione-produkty' );?>:</p>
 <table style="font-family: Arial; width: 100%; max-width: 800px; border-collapse: collapse; font-size: 14px; margin-bottom: 25px;">
   <thead>
     <tr>
-      <th style="text-align: left; border-bottom: 1px solid #ccc;"><?= ucfirst( \S::lang( 'produkt' ) );?></th>
-      <th style="text-align: right; border-bottom: 1px solid #ccc; padding: 0 5px;"><?= ucfirst( \S::lang( 'cena' ) );?></th>
-      <th style="text-align: right; border-bottom: 1px solid #ccc; padding: 0 5px;"><?= ucfirst( \S::lang( 'ilosc' ) );?></th>
-      <th style="text-align: right; border-bottom: 1px solid #ccc; padding: 0 5px;"><?= ucfirst( \S::lang( 'razem' ) );?></th>
+      <th style="text-align: left; border-bottom: 1px solid #ccc;"><?= ucfirst( \Shared\Helpers\Helpers::lang( 'produkt' ) );?></th>
+      <th style="text-align: right; border-bottom: 1px solid #ccc; padding: 0 5px;"><?= ucfirst( \Shared\Helpers\Helpers::lang( 'cena' ) );?></th>
+      <th style="text-align: right; border-bottom: 1px solid #ccc; padding: 0 5px;"><?= ucfirst( \Shared\Helpers\Helpers::lang( 'ilosc' ) );?></th>
+      <th style="text-align: right; border-bottom: 1px solid #ccc; padding: 0 5px;"><?= ucfirst( \Shared\Helpers\Helpers::lang( 'razem' ) );?></th>
     </tr>
   </thead>
   <tbody>
@@ -68,10 +68,10 @@ echo $this -> settings['newsletter_header'];
       <tr style="border-bottom: 1px solid #eee;">
         <td style="padding: 10px 10px 10px 0;" colspan="4">
           <?
-            $product['language']['seo_link'] ? $url = '/' . $product['language']['seo_link'] : $url = '/p-' . $product['id'] . '-' . \S::seo( $product['language']['name'] );
+            $product['language']['seo_link'] ? $url = '/' . $product['language']['seo_link'] : $url = '/p-' . $product['id'] . '-' . \Shared\Helpers\Helpers::seo( $product['language']['name'] );
 
-            if ( \S::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' )
-              $url = '/' . \S::get_session( 'current-lang' ) . $url;
+            if ( \Shared\Helpers\Helpers::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' )
+              $url = '/' . \Shared\Helpers\Helpers::get_session( 'current-lang' ) . $url;
 
             $regex  = "-(<a[^>]+href\s*=\s*['\"])(((?!'|\"|http://).)*)(['\"][^>]*>)-i";
             echo preg_replace( $regex, "$1" . $base . "://" . $_SERVER['SERVER_NAME'] . "$2$4", '<a href="' . $url . '" target="_blank" style="text-decoration: none; color: #77cdd1; font-size: 14px; font-weight: bold;">' . $product['language']['name'] . '</a>' );
@@ -106,33 +106,33 @@ echo $this -> settings['newsletter_header'];
         </td>
         <td style="text-align: right; white-space: nowrap; padding: 0 5px;">
           <?
-            echo \S::decimal( $position['price_brutto_promo'] ) . ' zł';
+            echo \Shared\Helpers\Helpers::decimal( $position['price_brutto_promo'] ) . ' zł';
 
             if ( $position['price_brutto_promo'] and $position['price_brutto_promo'] < $position['price_brutto'])
-              echo '<u style="font-size: 15px; font-weight: 400; color: #c3c3c3; margin-left: 5px; text-decoration: line-through;">' . \S::decimal( $position['price_brutto'] ) . ' zł</u>';
+              echo '<u style="font-size: 15px; font-weight: 400; color: #c3c3c3; margin-left: 5px; text-decoration: line-through;">' . \Shared\Helpers\Helpers::decimal( $position['price_brutto'] ) . ' zł</u>';
 
             if ( $position['price_brutto_promo'] and $position['price_brutto_promo'] < $position['price_brutto'] )
-              $discount += \S::normalize_decimal( ( $position['price_brutto'] - $position['price_brutto_promo'] ) * $position['quantity'] );
+              $discount += \Shared\Helpers\Helpers::normalize_decimal( ( $position['price_brutto'] - $position['price_brutto_promo'] ) * $position['quantity'] );
           ?>
         </td>
         <td style="text-align: right; white-space: nowrap; padding: 0 5px;">
           <?= $position['quantity'];?>
         </td>
         <td style="text-align: right; white-space: nowrap; padding: 0 5px;">
-          <?= \S::decimal( \S::normalize_decimal( $position['price_brutto_promo'] * $position['quantity'] ) );?> zł
+          <?= \Shared\Helpers\Helpers::decimal( \Shared\Helpers\Helpers::normalize_decimal( $position['price_brutto_promo'] * $position['quantity'] ) );?> zł
         </td>
       </tr>
-      <? $summary += \S::normalize_decimal( $position['price_brutto'] * $position['quantity'] );?>
+      <? $summary += \Shared\Helpers\Helpers::normalize_decimal( $position['price_brutto'] * $position['quantity'] );?>
       <? $quantity += $position['quantity'];?>
     <? endforeach; endif;?>
     <tr>
       <td style="text-align: right; font-weight: 600; padding-top: 10px;" colspan="3">Wartość koszyka:</td>
-      <td style="text-align: right; font-weight: 600; padding-top: 10px; white-space: nowrap;"><?= \S::decimal( $summary );?> zł</td>
+      <td style="text-align: right; font-weight: 600; padding-top: 10px; white-space: nowrap;"><?= \Shared\Helpers\Helpers::decimal( $summary );?> zł</td>
     </tr>
     <? if ( $discount ):?>
       <tr>
         <td style="text-align: right; font-weight: 600; padding-top: 10px;" colspan="4">
-          Rabat: <span style="color: #cc0000;">-<?= \S::decimal( $discount );?> zł</span>
+          Rabat: <span style="color: #cc0000;">-<?= \Shared\Helpers\Helpers::decimal( $discount );?> zł</span>
         </td>
       </tr>
     <? endif;?>
@@ -148,11 +148,11 @@ echo $this -> settings['newsletter_header'];
     </tr>
     <tr style="border-bottom: 1px solid #eee;">
       <td style="text-align: right; font-weight: 600; padding-top: 10px; padding-bottom: 10px;" colspan="3"><?= $this -> order['transport'];?><div style="font-weight: 500; font-size: 13px; line-height: 16px; font-style: italic; margin-top: 5px;"><?= $this -> order['transport_description'];?></div></td>
-      <td style="text-align: right; font-weight: 600; padding-top: 10px; padding-bottom: 10px; white-space: nowrap;"><?= \S::decimal( $this -> order['transport_cost'] );?> zł</td>
+      <td style="text-align: right; font-weight: 600; padding-top: 10px; padding-bottom: 10px; white-space: nowrap;"><?= \Shared\Helpers\Helpers::decimal( $this -> order['transport_cost'] );?> zł</td>
     </tr>
     <tr>
-      <td style="text-align: right; font-weight: 600; padding-top: 10px; padding-bottom: 10px;" colspan="3"><?= ucfirst( \S::lang( 'razem' ) );?>:</td>
-      <td style="text-align: right; font-weight: 600; padding-top: 10px; padding-bottom: 10px; white-space: nowrap;"><?= \S::decimal( $summary - $discount + $this -> order['transport_cost'] );?> zł</td>
+      <td style="text-align: right; font-weight: 600; padding-top: 10px; padding-bottom: 10px;" colspan="3"><?= ucfirst( \Shared\Helpers\Helpers::lang( 'razem' ) );?>:</td>
+      <td style="text-align: right; font-weight: 600; padding-top: 10px; padding-bottom: 10px; white-space: nowrap;"><?= \Shared\Helpers\Helpers::decimal( $summary - $discount + $this -> order['transport_cost'] );?> zł</td>
     </tr>
     <? if ( $this -> order['message'] ):?>
       <tr style="border-top: 1px solid #eee;">
diff --git a/templates/shop-order/order-details.php b/templates/shop-order/order-details.php
index c5ef684..37f8eee 100644
--- a/templates/shop-order/order-details.php
+++ b/templates/shop-order/order-details.php
@@ -1,7 +1,7 @@
 <? global $config; $this -> settings['ssl'] ? $base = 'https' : $base = 'http';?>
 <div class="order-summary">
   <div class="box-title">
-    <?= ucfirst( \S::lang( 'szczegoly-zamowienia' ) );?>: <?= $this -> order['number'];?>
+    <?= ucfirst( \Shared\Helpers\Helpers::lang( 'szczegoly-zamowienia' ) );?>: <?= $this -> order['number'];?>
   </div>
   <?= \Tpl::view( 'shop-order/order-simple', [
         'order' => $this -> order,
@@ -12,13 +12,13 @@
     <div class="order-bottom">
       <div class="left">
         <div class="content">
-          <div class="box-title"><?= ucfirst( \S::lang( 'dane-do-przelewu' ) );?>:</div>
-          <?= str_replace( [ '[KWOTA]', '[NR-ZAMOWIENIA]' ], [ \S::decimal( $this -> order['summary'] ) . ' zł', $this -> order['number'] ], $this -> settings['shop_bank_account_info'] );?>
+          <div class="box-title"><?= ucfirst( \Shared\Helpers\Helpers::lang( 'dane-do-przelewu' ) );?>:</div>
+          <?= str_replace( [ '[KWOTA]', '[NR-ZAMOWIENIA]' ], [ \Shared\Helpers\Helpers::decimal( $this -> order['summary'] ) . ' zł', $this -> order['number'] ], $this -> settings['shop_bank_account_info'] );?>
         </div>
       </div>
       <div class="right">
         <div class="content">
-          <div class="box-title"><?= $this -> order['payment_method_id'] == 6 ? 'Zapłać za pomocą PAYPO' : ucfirst( \S::lang( 'platnosc-online' ) );?>:</div>
+          <div class="box-title"><?= $this -> order['payment_method_id'] == 6 ? 'Zapłać za pomocą PAYPO' : ucfirst( \Shared\Helpers\Helpers::lang( 'platnosc-online' ) );?>:</div>
           <? if ( $this -> order['payment_method_id'] == 1 or $this -> order['payment_method_id'] == 3 ):?>
             <div class="payment-info">Co prawda nie wybrałeś żadnej z dostępnych form "szybkich płatności", ale w każdej chwili możesz z nich skorzystać.</div>
           <? endif;?>
@@ -33,12 +33,12 @@
               <input name="DANE_OSOBOWE" value="" type="hidden">
               <div class="form-group row agreement">
                 <div class="col-12">
-                  <input type="checkbox" required id="agreement"> <?= \S::lang( 'akceptuje-regulamin-sklepu' );?>
+                  <input type="checkbox" required id="agreement"> <?= \Shared\Helpers\Helpers::lang( 'akceptuje-regulamin-sklepu' );?>
                 </div>
               </div>
               <div class="form-group row agreement">
                 <div class="col-12">
-                  <button type="submit" class="btn btn-success"><?= \S::lang( 'zaplac-online' );?> <b><?= \S::decimal( $this -> order['summary'] );?> zł</b></button>
+                  <button type="submit" class="btn btn-success"><?= \Shared\Helpers\Helpers::lang( 'zaplac-online' );?> <b><?= \Shared\Helpers\Helpers::decimal( $this -> order['summary'] );?> zł</b></button>
                 </div>
               </div>
             </form>
@@ -69,7 +69,7 @@
               <input type="hidden" name="p24_wait_for_result" value="1">
               <input type="hidden" name="p24_method" value="227">
               <input type="hidden" name="p24_sign" value="<?= md5( $przelewy24_hash . '|' . $this -> settings['przelewy24_merchant_id'] . '|' . ( $this -> order['summary'] * 100 ) . '|PLN|' . $this -> settings['przelewy24_crc_key'] );?>" />
-              <button type="submit" name="submit_send" class="btn btn-success">Zapłać za pomocą PAYPO&nbsp;<b><?= \S::decimal( $this -> order['summary'] );?> zł</b></button>
+              <button type="submit" name="submit_send" class="btn btn-success">Zapłać za pomocą PAYPO&nbsp;<b><?= \Shared\Helpers\Helpers::decimal( $this -> order['summary'] );?> zł</b></button>
             </form>
           <? endif;?>
           <? if ( $this -> order['payment_method_id'] == 6 ):?>
@@ -100,7 +100,7 @@
               <input type="hidden" name="p24_api_version" value="3.2" />
               <input type="hidden" name="p24_wait_for_result" value="1">
               <input type="hidden" name="p24_sign" value="<?= md5( $przelewy24_hash . '|' . $this -> settings['przelewy24_merchant_id'] . '|' . ( $this -> order['summary'] * 100 ) . '|PLN|' . $this -> settings['przelewy24_crc_key'] );?>" />
-              <button type="submit" name="submit_send" class="btn btn-success"><?= \S::lang( 'zaplac-online' );?>&nbsp;<b><?= \S::decimal( $this -> order['summary'] );?> zł</b></button>
+              <button type="submit" name="submit_send" class="btn btn-success"><?= \Shared\Helpers\Helpers::lang( 'zaplac-online' );?>&nbsp;<b><?= \Shared\Helpers\Helpers::decimal( $this -> order['summary'] );?> zł</b></button>
             </form>
           <? endif;?>
           <?
@@ -124,14 +124,14 @@
               $url .= '&return_error_url=' . urlencode( $base . "://" . $_SERVER['SERVER_NAME'] . '/zamowienie/' . $this -> order['hash'] );
               $url .= '&md5sum=' . md5( $id . '&' . str_replace( ',', '.', round( $this -> order['summary'], 2 ) ) . '&' . $this -> order['hash'] . '&' . $code );
               ?>
-              <button type="button" onclick="document.location.href='<?= $url;?>'" class="btn btn-success"><?= \S::lang( 'zaplac-online' );?> <?= \S::decimal( $this -> order['summary'] );?> zł</b></button>
+              <button type="button" onclick="document.location.href='<?= $url;?>'" class="btn btn-success"><?= \Shared\Helpers\Helpers::lang( 'zaplac-online' );?> <?= \Shared\Helpers\Helpers::decimal( $this -> order['summary'] );?> zł</b></button>
             <? endif;?>
           </div>
         </div>
       <? endif;?>
   </div>
 </div>
-<? if ( \S::get_session( 'ekomi-purchase' ) and $this -> settings['ekomi_survey'] and ( $this -> order['payment_method_id'] == 1 or $this -> order['payment_method_id'] == 3 ) ):?>
+<? if ( \Shared\Helpers\Helpers::get_session( 'ekomi-purchase' ) and $this -> settings['ekomi_survey'] and ( $this -> order['payment_method_id'] == 1 or $this -> order['payment_method_id'] == 3 ) ):?>
   <? unset( $_SESSION['ekomi-purchase'] );?>
   <?= $this -> settings['ekomi_survey'];?>
 <? endif;?>
@@ -145,7 +145,7 @@
       radioClass: 'iradio_minimal-blue'
     });
 
-    <? if ( \S::get_session( 'piksel_purchase' ) and $this -> settings[ 'piksel' ] ):?>
+    <? if ( \Shared\Helpers\Helpers::get_session( 'piksel_purchase' ) and $this -> settings[ 'piksel' ] ):?>
       <? unset( $_SESSION['piksel_purchase'] );?>
         fbq(
           'track',
@@ -161,7 +161,7 @@
           } );
     <? endif;?>
 
-    <? if ( \S::get_session('google-analytics-purchase') ):?>
+    <? if ( \Shared\Helpers\Helpers::get_session('google-analytics-purchase') ):?>
 
       <? if ( $this -> settings['google_tag_manager_id'] ):?>
         dataLayer.push({ ecommerce: null });
@@ -171,8 +171,8 @@
             transaction_id: "<?= $this -> order['id'];?>",
             value: 25.42,
             currency: "PLN",
-            value: <?= \S::normalize_decimal( round( $this -> order['summary'], 2 ) ) - str_replace( ',', '.', round( $this -> order['transport_cost'], 2 ) );?>,
-            shipping: <?= \S::normalize_decimal( $this -> order['transport_cost'] );?>,
+            value: <?= \Shared\Helpers\Helpers::normalize_decimal( round( $this -> order['summary'], 2 ) ) - str_replace( ',', '.', round( $this -> order['transport_cost'], 2 ) );?>,
+            shipping: <?= \Shared\Helpers\Helpers::normalize_decimal( $this -> order['transport_cost'] );?>,
             items: [
               <? foreach ( $this -> order['products'] as $product ):?>
               {
diff --git a/templates/shop-order/order-simple.php b/templates/shop-order/order-simple.php
index e05ea45..a5e06b9 100644
--- a/templates/shop-order/order-simple.php
+++ b/templates/shop-order/order-simple.php
@@ -1,7 +1,7 @@
 <div class="order-summary-content">
   <div class="top">
     <div class="basket-summary left">
-      Data zamówienia: <span><?= \S::pretty_date( 'j f Y', strtotime( $this -> order['date_order'] ) );?></span>
+      Data zamówienia: <span><?= \Shared\Helpers\Helpers::pretty_date( 'j f Y', strtotime( $this -> order['date_order'] ) );?></span>
     </div>
     <div class="basket-summary left">
       Status zamówienia: <span><?= $this -> statuses[ $this -> order['status'] ];?></span>
@@ -9,7 +9,7 @@
   </div>
   <div class="top-second">
     <div class="column">
-      <h5><?= ucfirst( \S::lang( 'dane-do-dostawy' ) );?></h5>
+      <h5><?= ucfirst( \Shared\Helpers\Helpers::lang( 'dane-do-dostawy' ) );?></h5>
       <p>
         <?= $this -> order['client_surname'];?> <?= $this -> order['client_name'];?><br />
         <?= $this -> order['client_street'];?><br />
@@ -26,7 +26,7 @@
     </div>
     <div class="column">
       <? if ( $this -> order['firm_name'] ):?>
-        <h5><?= \S::lang( 'dane-do-faktury' );?>:</h5>
+        <h5><?= \Shared\Helpers\Helpers::lang( 'dane-do-faktury' );?>:</h5>
         <p>
           <?= $this -> order['firm_name'];?><br />
           <?= $this -> order['firm_street'];?><br />
@@ -65,27 +65,27 @@
           <div class="prices">
             <div class="price">
               <?
-                echo \S::decimal( $product['price_brutto_promo'] ) . ' zł';
+                echo \Shared\Helpers\Helpers::decimal( $product['price_brutto_promo'] ) . ' zł';
 
                 if ( $product['price_brutto_promo'] and $product['price_brutto_promo'] < $product['price_brutto'] )
-                  echo '<u>' . \S::decimal( $product['price_brutto'] ) . ' zł</u>';
+                  echo '<u>' . \Shared\Helpers\Helpers::decimal( $product['price_brutto'] ) . ' zł</u>';
 
                 if ( $product['price_brutto_promo'] and $product['price_brutto_promo'] < $product['price_brutto'] )
-                  $discount += \S::normalize_decimal( ( $product['price_brutto'] - $product['price_brutto_promo'] ) * $product['quantity'] );
+                  $discount += \Shared\Helpers\Helpers::normalize_decimal( ( $product['price_brutto'] - $product['price_brutto_promo'] ) * $product['quantity'] );
               ?>
               <span>x <?= $product['quantity'];?></span>
-              <?= \S::decimal( \S::normalize_decimal( $product['price_brutto'] * $product['quantity'] ) );?> zł
+              <?= \Shared\Helpers\Helpers::decimal( \Shared\Helpers\Helpers::normalize_decimal( $product['price_brutto'] * $product['quantity'] ) );?> zł
             </div>
           </div>
         </div>
-        <? $summary += \S::normalize_decimal( $product['price_brutto'] * $product['quantity'] );?>
+        <? $summary += \Shared\Helpers\Helpers::normalize_decimal( $product['price_brutto'] * $product['quantity'] );?>
       <? endforeach;?>
       <div class="basket-summary">
-        Wartość koszyka <span><?= \S::decimal( $summary );?> zł</span>
+        Wartość koszyka <span><?= \Shared\Helpers\Helpers::decimal( $summary );?> zł</span>
       </div>
       <? if ( $discount ):?>
         <div class="basket-summary">
-          Rabat <span class="text-danger"><?= \S::decimal( $discount );?> zł</span>
+          Rabat <span class="text-danger"><?= \Shared\Helpers\Helpers::decimal( $discount );?> zł</span>
         </div>
       <? endif;?>
       <? if ( $this -> coupon ):?>
@@ -94,10 +94,10 @@
         </div>
       <? endif;?>
       <div class="basket-summary">
-        <?= $this -> order['transport'];?> <span><?= \S::decimal( $this -> order['transport_cost'] );?> zł</span>
+        <?= $this -> order['transport'];?> <span><?= \Shared\Helpers\Helpers::decimal( $this -> order['transport_cost'] );?> zł</span>
       </div>
       <div class="basket-summary big">
-        <?= ucfirst( \S::lang( 'razem-z-dostawa' ) );?>: <span><?= \S::decimal( $summary - $discount + $this -> order['transport_cost'] );?> zł</span>
+        <?= ucfirst( \Shared\Helpers\Helpers::lang( 'razem-z-dostawa' ) );?>: <span><?= \Shared\Helpers\Helpers::decimal( $summary - $discount + $this -> order['transport_cost'] );?> zł</span>
       </div>
     <? endif;?>
     <? if ( $this -> order['message'] ):?>
diff --git a/templates/shop-producer/list.php b/templates/shop-producer/list.php
index 130db67..e65b9b0 100644
--- a/templates/shop-producer/list.php
+++ b/templates/shop-producer/list.php
@@ -1,7 +1,7 @@
 <div class="producer-list">
   <? foreach ( $this -> producers as $producer ):?>
     <div class="producer">
-      <a href="/producent/<?= \S::seo( $producer['name'] );?>">
+      <a href="/producent/<?= \Shared\Helpers\Helpers::seo( $producer['name'] );?>">
         <? if ( file_exists( substr( $producer['img'], 1, strlen( $producer['img'] ) ) ) ):?>
           <img src="<?= $producer['img'];?>" alt="<?= $producer['name'];?>">
         <? endif;?>
diff --git a/templates/shop-product/_partial/product-attribute.php b/templates/shop-product/_partial/product-attribute.php
index f2862d8..ad6391d 100644
--- a/templates/shop-product/_partial/product-attribute.php
+++ b/templates/shop-product/_partial/product-attribute.php
@@ -4,11 +4,11 @@ $attribute_details = \front\factory\ShopAttribute::attribute_details( $this -> a
 if ( $attribute_details['type'] == 0 )
 {
   ?>
-    <div class="attribute-container fradio-group attribute-<?= \S::seo( $attribute_details['language']['name'] );?>" level="<?= $this -> level;?>" order="<?= $this -> order;?>" attribute="<?= \S::seo( $attribute_details['language']['name'] );?>" attribute-name="<?= $attribute_details['language']['name'];?>">
+    <div class="attribute-container fradio-group attribute-<?= \Shared\Helpers\Helpers::seo( $attribute_details['language']['name'] );?>" level="<?= $this -> level;?>" order="<?= $this -> order;?>" attribute="<?= \Shared\Helpers\Helpers::seo( $attribute_details['language']['name'] );?>" attribute-name="<?= $attribute_details['language']['name'];?>">
       <p class="attribute-label"><?= $attribute_details['language']['name'];?>:</p>
       <? foreach ( $this -> attribute['values'] as $value ):?>
         <div class="fradio">
-          <input type="radio" id="<?= $this -> attribute['id'];?>-<?= $value['id'];?>" <? if ( $value['is_default'] ):?>checked="checked"<? endif;?> require="true" value="<?= $this -> attribute['id'];?>-<?= $value['id'];?>" name="<?= \S::seo( $attribute_details['language']['name'] );?>">
+          <input type="radio" id="<?= $this -> attribute['id'];?>-<?= $value['id'];?>" <? if ( $value['is_default'] ):?>checked="checked"<? endif;?> require="true" value="<?= $this -> attribute['id'];?>-<?= $value['id'];?>" name="<?= \Shared\Helpers\Helpers::seo( $attribute_details['language']['name'] );?>">
           <label for="<?= $this -> attribute['id'];?>-<?= $value['id'];?>" order="<?= $this -> order;?>"><?= \shop\ProductAttribute::get_value_name( $value['id'], $lang_id );?></label>
         </div>
         <? if ( $value['is_default'] ):?>
diff --git a/templates/shop-product/product-mini.php b/templates/shop-product/product-mini.php
index 5a87b50..edeb220 100644
--- a/templates/shop-product/product-mini.php
+++ b/templates/shop-product/product-mini.php
@@ -1,13 +1,13 @@
 <? global $lang_id;?>
 <?
-  $this -> product -> language['seo_link'] ? $url = '/' . $this -> product -> language['seo_link'] : $url = '/p-' . $this -> product['id'] . '-' . \S::seo( $this -> product -> language['name'] );
+  $this -> product -> language['seo_link'] ? $url = '/' . $this -> product -> language['seo_link'] : $url = '/p-' . $this -> product['id'] . '-' . \Shared\Helpers\Helpers::seo( $this -> product -> language['name'] );
 
-  if ( \S::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' )
-    $url = '/' . \S::get_session( 'current-lang' ) . $url;
+  if ( \Shared\Helpers\Helpers::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' )
+    $url = '/' . \Shared\Helpers\Helpers::get_session( 'current-lang' ) . $url;
 ?>
 <div class="product-mini <?= $this -> product_mini_class;?>">
   <? if ( $this -> product -> new_to_date and $this -> product -> new_to_date >= date( 'Y-m-d' ) ):?>
-    <div class="new"><?= \S::lang( 'nowosc' );?></div>
+    <div class="new"><?= \Shared\Helpers\Helpers::lang( 'nowosc' );?></div>
   <? endif;?>
   <a href="<?= $url;?>">
     <div class="img">
diff --git a/templates/shop-product/product.php b/templates/shop-product/product.php
index 35cc314..2fd6e11 100644
--- a/templates/shop-product/product.php
+++ b/templates/shop-product/product.php
@@ -20,7 +20,7 @@
     <div class="col-12 col-md-6">
       <div id="image-big">
         <? if ( $this -> product -> new_to_date and $this -> product -> new_to_date >= date( 'Y-m-d' ) ):?>
-          <div class="new"><?= \S::lang( 'nowosc' );?></div>
+          <div class="new"><?= \Shared\Helpers\Helpers::lang( 'nowosc' );?></div>
         <? endif;?>
         <? if ( file_exists( substr( $this -> product -> images[0]['src'], 1 ) ) ):?>
           <a image-id="0">
@@ -75,7 +75,7 @@
         </div>
         <form class="product-options" id="product-<?= $this -> product['id'];?>">
           <input type="hidden" name="product-id" value="<?= $this -> product -> id;?>">
-          <? if ( \S::is_array_fix( $attributes ) ):?>
+          <? if ( \Shared\Helpers\Helpers::is_array_fix( $attributes ) ):?>
             <div id="attributes">
               <div class="title">Opcje produktu</div>
               <? foreach ( $attributes as $key => $val )
@@ -105,7 +105,7 @@
                 <i class="fa fa-plus"></i>
               </a>
             </div>
-            <button id="add-to-basket" class="btn btn-success"><?= \S::lang( 'do-koszyka' );?></span>
+            <button id="add-to-basket" class="btn btn-success"><?= \Shared\Helpers\Helpers::lang( 'do-koszyka' );?></span>
             </button>
             <div class="alert hidden">Produkt chwilowo niedostępny.</div>
             <?
@@ -123,7 +123,7 @@
         </form>
         <? if ( $this -> product['producer'] and $this -> product['producer']['status'] ):?>
           <div class="product-producer">
-            Producent: <a href="/producent/<?= \S::seo( $this -> product['producer']['name'] );?>" title="Produkty marki <?= htmlspecialchars( $this -> product['producer']['name'] );?>"><?= $this -> product['producer']['name'];?></a>
+            Producent: <a href="/producent/<?= \Shared\Helpers\Helpers::seo( $this -> product['producer']['name'] );?>" title="Produkty marki <?= htmlspecialchars( $this -> product['producer']['name'] );?>"><?= $this -> product['producer']['name'];?></a>
           </div>
         <? endif;?>
 
@@ -141,15 +141,15 @@
     <div class="row">
       <div class="col-12 col-lg-8">
         <ul class="tabs" id="tabs-menu">
-          <li class="tab-link current" id="tab-link-0" tab="0"><?= ucfirst( \S::lang( 'opis' ) );?></li>
+          <li class="tab-link current" id="tab-link-0" tab="0"><?= ucfirst( \Shared\Helpers\Helpers::lang( 'opis' ) );?></li>
           <? if ( $this -> product -> language['tab_name_1'] ):?>
             <li class="tab-link" id="tab-link-1" tab="1"><?= $this -> product -> language['tab_name_1'];?></li>
           <? endif;?>
-          <li class="tab-link" id="tab-link-2" tab="2"><?= ucfirst( \S::lang( 'opinie' ) );?></li>
+          <li class="tab-link" id="tab-link-2" tab="2"><?= ucfirst( \Shared\Helpers\Helpers::lang( 'opinie' ) );?></li>
           <li class="tab-link" id="tab-link-3" tab="3">Bezpieczeństwo</li>
         </ul>
         <div id="tab-0" class="tab-content">
-          <div class="tab-title"><?= \S::lang( 'opis-produktu' );?></div>
+          <div class="tab-title"><?= \Shared\Helpers\Helpers::lang( 'opis-produktu' );?></div>
           <?= $this -> product -> language['description'];?>
         </div>
         <? if ( $this -> product -> language['tab_description_1'] ):?>
@@ -159,7 +159,7 @@
           </div>
         <? endif;?>
         <div id="tab-2" class="tab-content reviews">
-          <div class="tab-title"><?= ucfirst( \S::lang( 'opinie' ) );?></div>
+          <div class="tab-title"><?= ucfirst( \Shared\Helpers\Helpers::lang( 'opinie' ) );?></div>
           <div id="widget-container" class="data-ekomi-emp ekomi-widget-container ekomi-widget-sf14835961656364de9f9"  ></div>
           <div id="ekomi-product-widget-identifier" class="prod-data-emp"  style="visibility: hidden"><?= $this -> product['id'];?></div>
           <a href="https://www.ekomi-pl.com/opinie-marianek.html" target="_blank"><img alt="marianek.pl Reviews with ekomi-pl.com" src="https://smart-widget-assets.ekomiapps.de/resources/ekomi_logo.png" style="display: none;"/></a>
@@ -213,11 +213,11 @@
       </div>
     </div>
   </div>
-  <? if ( \S::is_array_fix( $this -> product['products_sets'] ) ):?>
+  <? if ( \Shared\Helpers\Helpers::is_array_fix( $this -> product['products_sets'] ) ):?>
     <div class="products-sets box">
       <div class="row">
         <div class="col-12">
-          <div class="box-title"><?= ucfirst( \S::lang( 'dobierz-do-kompletu' ) );?></div>
+          <div class="box-title"><?= ucfirst( \Shared\Helpers\Helpers::lang( 'dobierz-do-kompletu' ) );?></div>
           <div class="owl-carousel owl-theme">
             <?
               foreach ( $this -> product['products_sets'] as $product_sets_id ):
@@ -235,7 +235,7 @@
       </div>
     </div>
   <? endif;?>
-  <? if ( \S::is_array_fix( $this -> product['products_related'] ) ):?>
+  <? if ( \Shared\Helpers\Helpers::is_array_fix( $this -> product['products_related'] ) ):?>
     <div class="products-related box">
       <div class="row">
         <div class="col-12">
@@ -257,7 +257,7 @@
       </div>
     </div>
   <? endif;?>
-  <a href="javascript:history.go(-1)" class="btn btn-success history-back"><?= \S::lang( 'wstecz' );?></a>
+  <a href="javascript:history.go(-1)" class="btn btn-success history-back"><?= \Shared\Helpers\Helpers::lang( 'wstecz' );?></a>
 </div>
 <link class="footer" rel="stylesheet" type="text/css" href="/libraries/fancybox3/css/core.css">
 <link class="footer" rel="stylesheet" type="text/css" href="/plugins/OwlCarousel/owl.carousel.css">
@@ -277,7 +277,7 @@
             {
               item_id: "<?= $this -> product -> id;?>",
               item_name: "<?= str_replace( '"', '', $this -> product -> language['name'] );?>",
-              price: '<? if ( $this -> product -> price_brutto_promo ): echo \S::normalize_decimal( $this -> product -> price_brutto_promo ); else: echo \S::normalize_decimal( $this -> product -> price_brutto ); endif;?>',
+              price: '<? if ( $this -> product -> price_brutto_promo ): echo \Shared\Helpers\Helpers::normalize_decimal( $this -> product -> price_brutto_promo ); else: echo \Shared\Helpers\Helpers::normalize_decimal( $this -> product -> price_brutto ); endif;?>',
               quantity: 1
             }
           ]
@@ -405,7 +405,7 @@
         quantity = max_value;
         $.alert(
         {
-          title: '<?= ucfirst( \S::lang( 'uwaga' ) );?>',
+          title: '<?= ucfirst( \Shared\Helpers\Helpers::lang( 'uwaga' ) );?>',
           content: 'Maksymalna ilość wybranego produktu wynosi: <b>' + max_value + '<\/b>',
           type: 'blue',
           closeIcon: true,
@@ -418,7 +418,7 @@
           icon: 'fas fa-exclamation',
           buttons: {
             confirm: {
-              text: '<?= \S::lang( 'zamknij' );?>',
+              text: '<?= \Shared\Helpers\Helpers::lang( 'zamknij' );?>',
               btnClass: 'btn-blue',
               keys: ['enter'],
               action: function () {}
@@ -445,7 +445,7 @@
         quantity = max_value;
         $.alert(
         {
-          title: '<?= ucfirst( \S::lang( 'uwaga' ) );?>',
+          title: '<?= ucfirst( \Shared\Helpers\Helpers::lang( 'uwaga' ) );?>',
           content: 'Maksymalna ilość wybranego produktu wynosi: <b>' + max_value + '<\/b>',
           type: 'blue',
           closeIcon: true,
@@ -458,7 +458,7 @@
           icon: 'fas fa-exclamation',
           buttons: {
             confirm: {
-              text: '<?= \S::lang( 'zamknij' );?>',
+              text: '<?= \Shared\Helpers\Helpers::lang( 'zamknij' );?>',
               btnClass: 'btn-blue',
               keys: ['enter'],
               action: function () {}
@@ -496,8 +496,8 @@
         {
           var name = $( element ).attr( 'description' );
           shopAlert(
-              '<?= ucfirst( \S::lang( 'uwaga' ) );?>',
-              '<?= ucfirst( \S::lang( 'prosze-wybrac' ) );?>: <b>' + name + '</b>',
+              '<?= ucfirst( \Shared\Helpers\Helpers::lang( 'uwaga' ) );?>',
+              '<?= ucfirst( \Shared\Helpers\Helpers::lang( 'prosze-wybrac' ) );?>: <b>' + name + '</b>',
               [
                 '<a href="#" onclick="shopAlertClose(); return false;" class="btn btn-success">Zamknij</a>',
                ] );
@@ -515,8 +515,8 @@
         {
           var name = $( element ).attr( 'attribute-name' );
           shopAlert(
-              '<?= ucfirst( \S::lang( 'uwaga' ) );?>',
-              '<?= ucfirst( \S::lang( 'prosze-wybrac' ) );?>: <b>' + name + '</b>',
+              '<?= ucfirst( \Shared\Helpers\Helpers::lang( 'uwaga' ) );?>',
+              '<?= ucfirst( \Shared\Helpers\Helpers::lang( 'prosze-wybrac' ) );?>: <b>' + name + '</b>',
               [
                 '<a href="#" onclick="shopAlertClose(); return false;" class="btn btn-success">Zamknij</a>',
                ] );
@@ -528,7 +528,7 @@
       if ( $( '.product-message textarea' ).prop( 'required' ) && $.trim( $( '.product-message textarea' ).val() ) == '' )
       {
         shopAlert(
-            '<?= ucfirst( \S::lang( 'uwaga' ) );?>',
+            '<?= ucfirst( \Shared\Helpers\Helpers::lang( 'uwaga' ) );?>',
             'Proszę uzupełnić pole na dodatkową wiadomość.',
             [
               '<a href="#" onclick="shopAlertClose(); return false;" class="btn btn-success">Zamknij</a>',
@@ -543,7 +543,7 @@
         if ( $.trim( $( element ).val() ) == '' )
         {
           shopAlert(
-              '<?= ucfirst( \S::lang( 'uwaga' ) );?>',
+              '<?= ucfirst( \Shared\Helpers\Helpers::lang( 'uwaga' ) );?>',
               'Proszę uzupełnić pole: <b>' + $( element ).attr( 'field_name' ) + '</b>',
               [
                 '<a href="#" onclick="shopAlertClose(); return false;" class="btn btn-success">Zamknij</a>',
@@ -592,9 +592,9 @@
                   content_type: 'product',
                   value: '<?
                     if ( $this -> product -> price_brutto_promo ):
-                      echo \S::normalize_decimal( $this -> product -> price_brutto_promo );
+                      echo \Shared\Helpers\Helpers::normalize_decimal( $this -> product -> price_brutto_promo );
                     else:
-                      echo \S::normalize_decimal( $this -> product -> price_brutto );
+                      echo \Shared\Helpers\Helpers::normalize_decimal( $this -> product -> price_brutto );
                     endif;
                   ?>',
                   currency: 'PLN'
@@ -603,7 +603,7 @@
             <? endif;?>
 
             <? if ( $this -> settings['google_tag_manager_id'] ):?>
-              var add_to_cart_value = <? if ( $this -> product -> price_brutto_promo ): echo \S::normalize_decimal( $this -> product -> price_brutto_promo ); else: echo \S::normalize_decimal( $this -> product -> price_brutto ); endif;?> * quantity;
+              var add_to_cart_value = <? if ( $this -> product -> price_brutto_promo ): echo \Shared\Helpers\Helpers::normalize_decimal( $this -> product -> price_brutto_promo ); else: echo \Shared\Helpers\Helpers::normalize_decimal( $this -> product -> price_brutto ); endif;?> * quantity;
               dataLayer.push({ ecommerce: null });
               dataLayer.push({
                 event: "add_to_cart",
@@ -614,7 +614,7 @@
                     {
                       item_id: "<?= $this -> product -> id;?>",
                       item_name: "<?= str_replace( '"', '', $this -> product -> language['name'] );?>",
-                      price: <? if ( $this -> product -> price_brutto_promo ): echo \S::normalize_decimal( $this -> product -> price_brutto_promo ); else: echo \S::normalize_decimal( $this -> product -> price_brutto ); endif;?>,
+                      price: <? if ( $this -> product -> price_brutto_promo ): echo \Shared\Helpers\Helpers::normalize_decimal( $this -> product -> price_brutto_promo ); else: echo \Shared\Helpers\Helpers::normalize_decimal( $this -> product -> price_brutto ); endif;?>,
                       quantity: quantity
                     }
                   ]
diff --git a/templates/shop-product/promoted-products.php b/templates/shop-product/promoted-products.php
index b151fe5..4849f89 100644
--- a/templates/shop-product/promoted-products.php
+++ b/templates/shop-product/promoted-products.php
@@ -1,14 +1,14 @@
 <? global $lang_id;?>
-<div class="box-title"><?= ucfirst( \S::lang( 'polecane-produkty' ) );?></div>
+<div class="box-title"><?= ucfirst( \Shared\Helpers\Helpers::lang( 'polecane-produkty' ) );?></div>
 <div class="content">
   <? if ( is_array( $this -> products ) ): foreach ( $this -> products as $product_id ):?>
     <?
       $product = \shop\Product::getFromCache( $product_id, $lang_id );
 
-      $product -> languages[$lang_id]['seo_link'] ? $url = '/' . $product -> languages[$lang_id]['seo_link'] : $url = '/p-' . $product['id'] . '-' . \S::seo( $product -> languages[$lang_id]['name'] );
+      $product -> languages[$lang_id]['seo_link'] ? $url = '/' . $product -> languages[$lang_id]['seo_link'] : $url = '/p-' . $product['id'] . '-' . \Shared\Helpers\Helpers::seo( $product -> languages[$lang_id]['name'] );
 
-      if ( \S::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' )
-        $url = '/' . \S::get_session( 'current-lang' ) . $url;
+      if ( \Shared\Helpers\Helpers::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' )
+        $url = '/' . \Shared\Helpers\Helpers::get_session( 'current-lang' ) . $url;
     ?>
     <?= \Tpl::view( 'shop-product/product-mini', [
                         'product' => $product,
diff --git a/templates/shop-search/product-search.php b/templates/shop-search/product-search.php
index c65dce7..437b0b7 100644
--- a/templates/shop-search/product-search.php
+++ b/templates/shop-search/product-search.php
@@ -1,13 +1,13 @@
 <? global $lang_id;?>
 <?
-  $this -> product -> language['seo_link'] ? $url = '/' . $this -> product -> language['seo_link'] : $url = '/p-' . $this -> product['id'] . '-' . \S::seo( $this -> product -> language['name'] );
+  $this -> product -> language['seo_link'] ? $url = '/' . $this -> product -> language['seo_link'] : $url = '/p-' . $this -> product['id'] . '-' . \Shared\Helpers\Helpers::seo( $this -> product -> language['name'] );
 
-  if ( \S::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' )
-    $url = '/' . \S::get_session( 'current-lang' ) . $url;
+  if ( \Shared\Helpers\Helpers::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' )
+    $url = '/' . \Shared\Helpers\Helpers::get_session( 'current-lang' ) . $url;
 ?>
 <div class="product-search">
   <? if ( $this -> product -> new_to_date and $this -> product -> new_to_date >= date( 'Y-m-d' ) ):?>
-    <div class="new"><?= \S::lang( 'nowosc' );?></div>
+    <div class="new"><?= \Shared\Helpers\Helpers::lang( 'nowosc' );?></div>
   <? endif;?>
   <a href="<?= $url;?>" class="a-img">
     <div class="img">
diff --git a/templates/shop-search/products.php b/templates/shop-search/products.php
index c9d91fa..cd7a65a 100644
--- a/templates/shop-search/products.php
+++ b/templates/shop-search/products.php
@@ -1,7 +1,7 @@
 <? global $lang_id;?>
 <? if ( $this -> query ):?>
   <div class="box-title">
-    <?= \S::lang( 'wyniki-wyszukiwania-dla-zapytania' ) . ': <strong>' . $this -> query . '</strong>';?>
+    <?= \Shared\Helpers\Helpers::lang( 'wyniki-wyszukiwania-dla-zapytania' ) . ': <strong>' . $this -> query . '</strong>';?>
   </div>
 <? endif;?>
 <div class="search-content">
diff --git a/templates/shop-search/simple-form.php b/templates/shop-search/simple-form.php
index 966cb09..b44b3aa 100644
--- a/templates/shop-search/simple-form.php
+++ b/templates/shop-search/simple-form.php
@@ -8,11 +8,11 @@
     <div class="row">
       <div class="col-12">
         <div class="small-title">
-          <?= \S::lang( 'czego-szukasz' );?>?
+          <?= \Shared\Helpers\Helpers::lang( 'czego-szukasz' );?>?
           <a href="#" class="search-form-big-close"><i class="fa fa-times"></i></a>
         </div>
         <div class="input">
-          <input type="text" name="q" class="form-control" placeholder="<?= \S::lang( 'wpisz-szukany-produkt' );?>">
+          <input type="text" name="q" class="form-control" placeholder="<?= \Shared\Helpers\Helpers::lang( 'wpisz-szukany-produkt' );?>">
         </div>
         <div class="search-big-results"></div>
         <div class="search-more-button"></div>
@@ -68,7 +68,7 @@
             var time = 0;
             if ( data == null )
             {
-              $( '.search-big-results' ).html( '<div class="no-found"><?= \S::lang( 'nie-znaleziono-produktow' );?><\/div>' );
+              $( '.search-big-results' ).html( '<div class="no-found"><?= \Shared\Helpers\Helpers::lang( 'nie-znaleziono-produktow' );?><\/div>' );
               $( '.search-more-button' ).html('');
             }
             else
@@ -87,7 +87,7 @@
                 {
                   setTimeout( function()
                   {
-                    $( '.search-more-button' ).html( '<a href="/wyszukiwarka/' + _this.val() + '" class="btn btn-success"><?= \S::lang( 'zobacz-wiecej' );?><\/a>' );
+                    $( '.search-more-button' ).html( '<a href="/wyszukiwarka/' + _this.val() + '" class="btn btn-success"><?= \Shared\Helpers\Helpers::lang( 'zobacz-wiecej' );?><\/a>' );
                   }, time );
                 }
               });
diff --git a/templates/site/pager.php b/templates/site/pager.php
index 2759d81..e9e57d8 100644
--- a/templates/site/pager.php
+++ b/templates/site/pager.php
@@ -5,7 +5,7 @@
     $link = $this -> link;
   else
   {
-    $this -> page['language']['seo_link'] ? $link = $this -> page['language']['seo_link'] : $link = 's-' . $this -> page['id'] . '-' . \S::seo( $this -> page['language']['title'] );
+    $this -> page['language']['seo_link'] ? $link = $this -> page['language']['seo_link'] : $link = 's-' . $this -> page['id'] . '-' . \Shared\Helpers\Helpers::seo( $this -> page['language']['title'] );
   }
 ?>
 <ul class="pager">
diff --git a/tests/Unit/Domain/Cache/CacheRepositoryTest.php b/tests/Unit/Domain/Cache/CacheRepositoryTest.php
index 12d73d3..449f634 100644
--- a/tests/Unit/Domain/Cache/CacheRepositoryTest.php
+++ b/tests/Unit/Domain/Cache/CacheRepositoryTest.php
@@ -8,7 +8,7 @@ use Domain\Cache\CacheRepository;
  * Testy dla CacheRepository
  *
  * Testujemy logikę Redis (mockowaną) oraz strukturę odpowiedzi.
- * Czyszczenie katalogów delegowane do \S::delete_dir() - nietestowalne unit testami.
+ * Czyszczenie katalogów delegowane do \Shared\Helpers\Helpers::delete_dir() - nietestowalne unit testami.
  */
 class CacheRepositoryTest extends TestCase
 {
diff --git a/tests/Unit/admin/Controllers/SettingsControllerTest.php b/tests/Unit/admin/Controllers/SettingsControllerTest.php
index e8f6e1d..c78ff78 100644
--- a/tests/Unit/admin/Controllers/SettingsControllerTest.php
+++ b/tests/Unit/admin/Controllers/SettingsControllerTest.php
@@ -10,7 +10,7 @@ use Domain\Settings\SettingsRepository;
  * Testy dla SettingsController
  *
  * Kontroler używa SettingsRepository (DI).
- * Cache czyszczony bezpośrednio przez \S::delete_dir() i \Shared\Cache\RedisConnection.
+ * Cache czyszczony bezpośrednio przez \Shared\Helpers\Helpers::delete_dir() i \Shared\Cache\RedisConnection.
  */
 class SettingsControllerTest extends TestCase
 {
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index a1d1008..9b3d592 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -38,25 +38,8 @@ require_once __DIR__ . '/../libraries/medoo/medoo.php';
 date_default_timezone_set('Europe/Warsaw');
 
 // Stuby klas systemowych (nie dostępnych w testach unit)
-if (!class_exists('S')) {
-    class S {
-        public static function seo($str) { return $str; }
-        public static function delete_dir($path) {}
-        public static function alert($msg) {}
-        public static function htacces() {}
-        public static function delete_cache() {}
-        public static function get($key) { return null; }
-        public static function set_message($msg) {}
-        public static function clear_redis_cache() {}
-        public static function clear_product_cache($id) {}
-        public static function email_check($email) { return filter_var($email, FILTER_VALIDATE_EMAIL); }
-        public static function get_session($key) { return $_SESSION[$key] ?? null; }
-        public static function set_session($key, $value) { $_SESSION[$key] = $value; }
-        public static function send_email($to, $subject, $body) { return true; }
-        public static function remove_special_chars($str) { return str_ireplace(['\'', '"', ',', ';', '<', '>'], ' ', $str); }
-        public static function normalize_decimal($val, $precision = 2) { return round((float)$val, $precision); }
-        public static function is_array_fix($value) { return is_array($value) && count($value); }
-    }
+if (!class_exists('Shared\\Helpers\\Helpers')) {
+    require_once __DIR__ . '/stubs/Helpers.php';
 }
 
 if (!class_exists('Shared\\Cache\\RedisConnection')) {
diff --git a/tests/stubs/Helpers.php b/tests/stubs/Helpers.php
new file mode 100644
index 0000000..b2894de
--- /dev/null
+++ b/tests/stubs/Helpers.php
@@ -0,0 +1,21 @@
+<?php
+namespace Shared\Helpers;
+
+class Helpers
+{
+    public static function seo($str) { return $str; }
+    public static function delete_dir($path) {}
+    public static function alert($msg) {}
+    public static function htacces() {}
+    public static function delete_cache() {}
+    public static function get($key) { return null; }
+    public static function set_message($msg) {}
+    public static function clear_product_cache($id) {}
+    public static function email_check($email) { return filter_var($email, FILTER_VALIDATE_EMAIL); }
+    public static function get_session($key) { return $_SESSION[$key] ?? null; }
+    public static function set_session($key, $value) { $_SESSION[$key] = $value; }
+    public static function send_email($to, $subject, $body) { return true; }
+    public static function remove_special_chars($str) { return str_ireplace(['\'', '"', ',', ';', '<', '>'], ' ', $str); }
+    public static function normalize_decimal($val, $precision = 2) { return round((float)$val, $precision); }
+    public static function is_array_fix($value) { return is_array($value) && count($value); }
+}