diff --git a/asset/css/front.css b/asset/css/front.css
index 4b8a62e..891c8df 100644
--- a/asset/css/front.css
+++ b/asset/css/front.css
@@ -197,8 +197,8 @@ a.item-ribbon:hover {
 }
 
 
-.table.table-striped .btn-success.btn-xs:focus,
-.table.table-striped .btn-success.btn-xs {
+.table.table-striped .btn-success.btn-sm:focus,
+.table.table-striped .btn-success.btn-sm {
     padding: 1px 5px;
 }
 
@@ -213,7 +213,7 @@ a.item-ribbon:hover {
 }
 
 @media screen and (max-width: 991px) {
-    .col-xs-3.event-single-image{
+    .col-3.event-single-image{
         padding-right:0;
     }
 
diff --git a/asset/ng-template/front/event-list.html b/asset/ng-template/front/event-list.html
index 7cf5962..e4b596c 100644
--- a/asset/ng-template/front/event-list.html
+++ b/asset/ng-template/front/event-list.html
@@ -1,6 +1,6 @@
 <div class="clearfix pi-item-list">
-    <div class="col-xs-12 col-md-3">
-        <div class="pi-item-search-form clearfix well well-sm">
+    <div class="col-12 col-md-3">
+        <div class="pi-item-search-form clearfix card card-body bg-light mb-3">
             <div class="page-header">
                 <h3>{{'SEARCH' | translate}}</h3>
             </div>
@@ -48,12 +48,12 @@ <h3>{{'SEARCH' | translate}}</h3>
             </form>
         </div>
         <!-- <div class="clearfix" data-ng-if="condition.description">
-            <div class="well small">
+            <div class="card card-body bg-light mb-3 small">
                 {{condition.description}}
             </div>
         </div> -->
     </div>
-    <div class="col-xs-12 col-md-9">
+    <div class="col-12 col-md-9">
         <div class="clearfix">
             <div class="page-header">
                 <h1>{{condition.title}}</h1>
@@ -62,11 +62,11 @@ <h1>{{condition.title}}</h1>
                 <div class="row">
                     <div ng-repeat="event in events" class="event-single clearfix h-event" itemscope itemtype="https://schema.org/Event">
                         <div class="row">
-                            <div class="col-xs-12 col-md-3 event-single-image">
+                            <div class="col-12 col-md-3 event-single-image">
                                 <div class="text-center">
                                     <a itemprop="url" title="{{event.title}}"
                                        data-ng-href="{{event.eventUrl}}">
-                                        <img itemprop="image" class="img-responsive img-rounded u-photo center-block"
+                                        <img itemprop="image" class="img-fluid rounded u-photo center-block"
                                              src="#"
                                              data-ng-src="{{event.thumbUrl}}"
                                              alt="{{event.title}}"/>
@@ -74,7 +74,7 @@ <h1>{{condition.title}}</h1>
                                 </div>
                             </div>
                             <div ng-if="condition.importantOrganizer == 1">
-                                <div class="col-xs-12 col-md-7 event-single-body">
+                                <div class="col-12 col-md-7 event-single-body">
                                     <div class="p-name clearfix" itemprop="name">
                                         <h2 class="event-single-title">
                                             <a itemprop="url" title="{{event.title}}"
@@ -85,18 +85,18 @@ <h2 class="event-single-title">
                                     </div>
                                     <div class="event-single-information small">
                                         <ul class="clearfix list-inline event-time">
-                                            <li data-ng-if="event.time_view">
+                                            <li data-ng-if="event.time_view" class="list-inline-item">
                                                 <i class="fa fa-clock-o"></i> {{event.days}} {{event.time_view}}
                                                 <meta data-ng-if="event.time_start_view" itemprop="startDate"
                                                       content="{{event.time_start_view}}"/>
                                                 <meta data-ng-if="event.time_end_view" itemprop="endDate"
                                                       content="{{event.time_end_view}}"/>
                                             </li>
-                                            <li data-ng-if="event.register_price" class="p-price" itemprop="price"
+                                            <li data-ng-if="event.register_price" class="list-inline-item p-price" itemprop="price"
                                                 content="{{event.register_price}}">
                                                 <i class="fa fa-money"></i> {{event.register_price_view}}
                                             </li>
-                                            <li><i class="fa fa-eye"></i> {{event.hits}}</li>
+                                            <li class="list-inline-item"><i class="fa fa-eye"></i> {{event.hits}}</li>
                                         </ul>
                                         <meta data-ng-if="event.register_price" itemprop="priceCurrency" content="{{event.price_currency}}"/>
                                     </div>
@@ -105,14 +105,14 @@ <h2 class="event-single-title">
                                         {{event.text_summary}}
                                     </div>
                                 </div>
-                                <div class="col-xs-12 col-md-2">
+                                <div class="col-12 col-md-2">
                                     <div class="event-single-organizer">
                                         {{event.organizer_name}}
                                     </div>
                                 </div>
                             </div>
                             <div ng-if="condition.importantOrganizer == 0">
-                                <div class="col-xs-12 col-md-9 event-single-body">
+                                <div class="col-12 col-md-9 event-single-body">
                                     <div class="p-name clearfix" itemprop="name">
                                         <h2 class="event-single-title">
                                             <a itemprop="url" title="{{event.title}}"
@@ -123,18 +123,18 @@ <h2 class="event-single-title">
                                     </div>
                                     <div class="event-single-information small">
                                         <ul class="clearfix list-inline event-time">
-                                            <li data-ng-if="event.time_view">
+                                            <li data-ng-if="event.time_view" class="list-inline-item">
                                                 <i class="fa fa-clock-o"></i> {{event.days}} {{event.time_view}}
                                                 <meta data-ng-if="event.time_start_view" itemprop="startDate"
                                                       content="{{event.time_start_view}}"/>
                                                 <meta data-ng-if="event.time_end_view" itemprop="endDate"
                                                       content="{{event.time_end_view}}"/>
                                             </li>
-                                            <li data-ng-if="event.register_price" class="p-price" itemprop="price"
+                                            <li data-ng-if="event.register_price" class="list-inline-item p-price" itemprop="price"
                                                 content="{{event.register_price}}">
                                                 <i class="fa fa-money"></i> {{event.register_price_view}}
                                             </li>
-                                            <li><i class="fa fa-eye"></i> {{event.hits}}</li>
+                                            <li class="list-inline-item"><i class="fa fa-eye"></i> {{event.hits}}</li>
                                         </ul>
                                         <meta data-ng-if="event.register_price" itemprop="priceCurrency" content="{{event.price_currency}}"/>
                                     </div>
diff --git a/config/block.php b/config/block.php
index b0e880e..4f820ad 100644
--- a/config/block.php
+++ b/config/block.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/config/comment.php b/config/comment.php
index e14fff8..b9c789e 100644
--- a/config/comment.php
+++ b/config/comment.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/config/config.php b/config/config.php
index 32792bf..3a6231a 100755
--- a/config/config.php
+++ b/config/config.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/config/database.php b/config/database.php
index 94cdc0a..bd84c42 100644
--- a/config/database.php
+++ b/config/database.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/config/module.php b/config/module.php
index 6d5ef15..48fb56f 100755
--- a/config/module.php
+++ b/config/module.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/config/navigation.php b/config/navigation.php
index fe6d494..f91b856 100755
--- a/config/navigation.php
+++ b/config/navigation.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/config/page.php b/config/page.php
index 6a235c4..75a5d33 100755
--- a/config/page.php
+++ b/config/page.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/config/permission.php b/config/permission.php
index a3ce6bb..450fc22 100755
--- a/config/permission.php
+++ b/config/permission.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/config/route.php b/config/route.php
index 93598ea..3a07444 100644
--- a/config/route.php
+++ b/config/route.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/src/Api/Breadcrumbs.php b/src/Api/Breadcrumbs.php
index dc84ae9..ff61c77 100644
--- a/src/Api/Breadcrumbs.php
+++ b/src/Api/Breadcrumbs.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/src/Api/Comment.php b/src/Api/Comment.php
index 1fcc964..880ce94 100644
--- a/src/Api/Comment.php
+++ b/src/Api/Comment.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/src/Api/Event.php b/src/Api/Event.php
index e553220..9cae75c 100755
--- a/src/Api/Event.php
+++ b/src/Api/Event.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/src/Api/Order.php b/src/Api/Order.php
index b557462..89678be 100644
--- a/src/Api/Order.php
+++ b/src/Api/Order.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/src/Api/Search.php b/src/Api/Search.php
index 05f813e..1bc6c98 100644
--- a/src/Api/Search.php
+++ b/src/Api/Search.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/src/Api/Time.php b/src/Api/Time.php
index 66a2fa3..4169fd0 100644
--- a/src/Api/Time.php
+++ b/src/Api/Time.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/src/Block/Block.php b/src/Block/Block.php
index 1398376..868dd4b 100644
--- a/src/Block/Block.php
+++ b/src/Block/Block.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/src/Controller/Admin/EventController.php b/src/Controller/Admin/EventController.php
index 6db09b2..d30589e 100644
--- a/src/Controller/Admin/EventController.php
+++ b/src/Controller/Admin/EventController.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/src/Controller/Admin/IndexController.php b/src/Controller/Admin/IndexController.php
index 8782aae..6bf2505 100644
--- a/src/Controller/Admin/IndexController.php
+++ b/src/Controller/Admin/IndexController.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/src/Controller/Admin/OrderController.php b/src/Controller/Admin/OrderController.php
index 66a966b..f9e8575 100644
--- a/src/Controller/Admin/OrderController.php
+++ b/src/Controller/Admin/OrderController.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/src/Controller/Admin/ToolsController.php b/src/Controller/Admin/ToolsController.php
index 95eae52..dc7473b 100644
--- a/src/Controller/Admin/ToolsController.php
+++ b/src/Controller/Admin/ToolsController.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/src/Controller/Feed/IndexController.php b/src/Controller/Feed/IndexController.php
index 1f49ad8..809958c 100644
--- a/src/Controller/Feed/IndexController.php
+++ b/src/Controller/Feed/IndexController.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/src/Controller/Front/CategoryController.php b/src/Controller/Front/CategoryController.php
index c3487ac..8f611e6 100644
--- a/src/Controller/Front/CategoryController.php
+++ b/src/Controller/Front/CategoryController.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/src/Controller/Front/DetailController.php b/src/Controller/Front/DetailController.php
index 8225584..ce4d81d 100644
--- a/src/Controller/Front/DetailController.php
+++ b/src/Controller/Front/DetailController.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/src/Controller/Front/IndexController.php b/src/Controller/Front/IndexController.php
index 5d93af6..81466ec 100644
--- a/src/Controller/Front/IndexController.php
+++ b/src/Controller/Front/IndexController.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/src/Controller/Front/JsonController.php b/src/Controller/Front/JsonController.php
index 78e1a25..ec78fd8 100644
--- a/src/Controller/Front/JsonController.php
+++ b/src/Controller/Front/JsonController.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/src/Controller/Front/ManageController.php b/src/Controller/Front/ManageController.php
index 6fa96f3..8478de0 100644
--- a/src/Controller/Front/ManageController.php
+++ b/src/Controller/Front/ManageController.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/src/Controller/Front/RegisterController.php b/src/Controller/Front/RegisterController.php
index bb2a75f..b2a1816 100644
--- a/src/Controller/Front/RegisterController.php
+++ b/src/Controller/Front/RegisterController.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/src/Form/Element/ImageCrop.php b/src/Form/Element/ImageCrop.php
index ec7cf0a..395e930 100644
--- a/src/Form/Element/ImageCrop.php
+++ b/src/Form/Element/ImageCrop.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/src/Form/EventFilter.php b/src/Form/EventFilter.php
index a4b4429..579c8ef 100644
--- a/src/Form/EventFilter.php
+++ b/src/Form/EventFilter.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/src/Form/EventForm.php b/src/Form/EventForm.php
index 61f0f66..b9c103d 100755
--- a/src/Form/EventForm.php
+++ b/src/Form/EventForm.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/src/Form/RegisterFilter.php b/src/Form/RegisterFilter.php
index 98a9210..d7ae44e 100644
--- a/src/Form/RegisterFilter.php
+++ b/src/Form/RegisterFilter.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/src/Form/RegisterForm.php b/src/Form/RegisterForm.php
index a85a3f0..e65901b 100644
--- a/src/Form/RegisterForm.php
+++ b/src/Form/RegisterForm.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/src/Form/SitemapForm.php b/src/Form/SitemapForm.php
index beb8ac4..85b3abb 100644
--- a/src/Form/SitemapForm.php
+++ b/src/Form/SitemapForm.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/src/Installer/Action/Update.php b/src/Installer/Action/Update.php
index 9b44fa8..84fd93b 100644
--- a/src/Installer/Action/Update.php
+++ b/src/Installer/Action/Update.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/src/Model/Extra.php b/src/Model/Extra.php
index ab8dcc7..d0e05da 100644
--- a/src/Model/Extra.php
+++ b/src/Model/Extra.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/src/Model/Extra/RowGateway.php b/src/Model/Extra/RowGateway.php
index e6cd4d9..f43e524 100644
--- a/src/Model/Extra/RowGateway.php
+++ b/src/Model/Extra/RowGateway.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt BSD 3-Clause License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt BSD 3-Clause License
  */
 
 namespace Module\Event\Model\Extra;
diff --git a/src/Model/Order.php b/src/Model/Order.php
index 030cf14..05e6964 100644
--- a/src/Model/Order.php
+++ b/src/Model/Order.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/src/Registry/CategoryRoute.php b/src/Registry/CategoryRoute.php
index f19afce..92aed19 100644
--- a/src/Registry/CategoryRoute.php
+++ b/src/Registry/CategoryRoute.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt BSD 3-Clause License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt BSD 3-Clause License
  * @package         Registry
  */
 
diff --git a/src/Route/Event.php b/src/Route/Event.php
index 8fb0716..8a3b1e9 100644
--- a/src/Route/Event.php
+++ b/src/Route/Event.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Pi Engine (http://pialog.org)
+ * Pi Engine (http://piengine.org)
  *
- * @link            http://code.pialog.org for the Pi Engine source repository
- * @copyright       Copyright (c) Pi Engine http://pialog.org
- * @license         http://pialog.org/license.txt New BSD License
+ * @link            http://code.piengine.org for the Pi Engine source repository
+ * @copyright       Copyright (c) Pi Engine http://piengine.org
+ * @license         http://piengine.org/license.txt New BSD License
  */
 
 /**
diff --git a/template/admin/event-index.phtml b/template/admin/event-index.phtml
index 1463395..f932acb 100644
--- a/template/admin/event-index.phtml
+++ b/template/admin/event-index.phtml
@@ -8,28 +8,28 @@
         
             <div class="btn-group">
                 <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
-                    <i class="fa fa-eye"></i> <?php _e('View'); ?> <span class="caret"></span>
+                    <i class="fa fa-eye"></i> <?php _e('View'); ?>
                 </button>
-                <ul class="dropdown-menu" role="menu">
-                    <li><a title="<?php _e('All events'); ?>"
+                <div class="dropdown-menu" role="menu">
+                    <a class="dropdown-item"  title="<?php _e('All events'); ?>"
                            href="<?php echo $this->url('', array('controller' => 'event', 'action' => 'index')); ?>"><i
-                                class="fa fa-file"></i> <?php _e('All events'); ?></a></li>
-                    <li><a title="<?php _e('Published'); ?>"
+                                class="fa fa-file"></i> <?php _e('All events'); ?></a>
+                    <a class="dropdown-item"  title="<?php _e('Published'); ?>"
                            href="<?php echo $this->url('', array('controller' => 'event', 'action' => 'index', 'status' => '1')); ?>"><i
-                                class="fa fa-file"></i> <?php _e('Published'); ?></a></li>
-                    <li><a title="<?php _e('Pending review'); ?>"
+                                class="fa fa-file"></i> <?php _e('Published'); ?></a>
+                    <a class="dropdown-item"  title="<?php _e('Pending review'); ?>"
                            href="<?php echo $this->url('', array('controller' => 'event', 'action' => 'index', 'status' => '2')); ?>"><i
-                                class="fa fa-file"></i> <?php _e('Pending review'); ?></a></li>
-                    <li><a title="<?php _e('Draft'); ?>"
+                                class="fa fa-file"></i> <?php _e('Pending review'); ?></a>
+                    <a class="dropdown-item"  title="<?php _e('Draft'); ?>"
                            href="<?php echo $this->url('', array('controller' => 'event', 'action' => 'index', 'status' => '3')); ?>"><i
-                                class="fa fa-file"></i> <?php _e('Draft'); ?></a></li>
-                    <li><a title="<?php _e('Private'); ?>"
+                                class="fa fa-file"></i> <?php _e('Draft'); ?></a>
+                    <a class="dropdown-item"  title="<?php _e('Private'); ?>"
                            href="<?php echo $this->url('', array('controller' => 'event', 'action' => 'index', 'status' => '4')); ?>"><i
-                                class="fa fa-file"></i> <?php _e('Private'); ?></a></li>
-                    <li><a title="<?php _e('Trash'); ?>"
+                                class="fa fa-file"></i> <?php _e('Private'); ?></a>
+                    <a class="dropdown-item"  title="<?php _e('Trash'); ?>"
                            href="<?php echo $this->url('', array('controller' => 'event', 'action' => 'index', 'status' => '5')); ?>"><i
-                                    class="fa fa-file"></i> <?php _e('Trash'); ?></a></li>
-                </ul>
+                                    class="fa fa-file"></i> <?php _e('Trash'); ?></a>
+                </div>
             </div>
         </div>        
         <div class="col-md-8">
@@ -38,7 +38,7 @@
     </div>
     <?php if (!empty($list)) { ?>
         <h3><?php _e('List of events'); ?></h3>
-        <table class="table table-striped table-bordered table-condensed">
+        <table class="table table-striped table-bordered table-sm">
             <tr>
                 <th><?php _e('ID'); ?></th>
                 <th><?php _e('Title'); ?></th>
@@ -89,11 +89,11 @@
             <?php echo $this->paginationControl($paginator, 'Sliding', 'paginator.phtml'); ?>
         </div>
         <p>
-            <span class="label label-success"><?php _e('Published'); ?></span>
-            <span class="label label-warning"><?php _e('Pending review'); ?></span>
-            <span class="label label-warning"><?php _e('Draft'); ?></span>
-            <span class="label label-warning"><?php _e('Private'); ?></span>
-            <span class="label label-danger"><?php _e('Trash'); ?></span>
+            <span class="badge badge-success"><?php _e('Published'); ?></span>
+            <span class="badge badge-warning"><?php _e('Pending review'); ?></span>
+            <span class="badge badge-warning"><?php _e('Draft'); ?></span>
+            <span class="badge badge-warning"><?php _e('Private'); ?></span>
+            <span class="badge badge-danger"><?php _e('Trash'); ?></span>
         </p>
     <?php } ?>
 </div>
\ No newline at end of file
diff --git a/template/admin/order-index.phtml b/template/admin/order-index.phtml
index 353f6fd..4e118c3 100644
--- a/template/admin/order-index.phtml
+++ b/template/admin/order-index.phtml
@@ -1,7 +1,7 @@
 <?php $this->css($this->assetModule('css/admin.css')); ?>
 <div class="clearfix">
     <h3><?php _e('List of all orders'); ?></h3>
-    <table class="table table-striped table-bordered table-condensed">
+    <table class="table table-striped table-bordered table-sm">
         <tr>
             <th><?php _e('ID'); ?></th>
             <th><?php _e('Name'); ?></th>
diff --git a/template/block/recent-event.phtml b/template/block/recent-event.phtml
index ab855bf..e91d0cb 100644
--- a/template/block/recent-event.phtml
+++ b/template/block/recent-event.phtml
@@ -12,7 +12,7 @@
                             <?php if ($event['main_image']) { ?>
                                 <a itemprop="url" title="<?php echo $this->escape($event['title']); ?>"
                                    href="<?php echo $this->escape($event['eventUrl']); ?>">
-                                    <img itemprop="image" class="img-responsive img-rounded u-photo"
+                                    <img itemprop="image" class="img-fluid rounded u-photo"
                                          src="<?php echo Pi::api('doc','media')->getSingleLinkUrl($event['main_image'])->setConfigModule('news')->thumb('item'); ?>"
                                          alt="<?php echo $this->escape($event['title']); ?>"/>
                                 </a>
@@ -30,26 +30,26 @@
                             <div class="recent-event-single-information small">
                                 <ul class="clearfix list-inline event-time">
                                     <?php if ($block['show-days']) { ?>
-                                        <li><i class="fa fa-clock-o"></i> <?php echo $this->escape($event['days']); ?></li>
+                                        <li class="list-inline-item"><i class="fa fa-clock-o"></i> <?php echo $this->escape($event['days']); ?></li>
                                     <?php } ?>
                                     <?php if ($block['show-time']) { ?>
                                         <?php if (!empty($event['time_start']) && !empty($event['time_end'])) { ?>
-                                            <li>
+                                            <li class="list-inline-item">
                                                 <?php if (!$block['show-days']) { ?><i class="fa fa-clock-o"></i> <?php } ?>
                                                 <strong><?php echo _b('From') ?></strong>
                                             </li>
-                                            <li class="dt-start"><?php echo $this->escape($event['time_start_view']); ?></li>
-                                            <li><strong><?php echo _b('to') ?></strong></li>
-                                            <li class="dt-end"><?php echo $this->escape($event['time_end_view']); ?></li>
+                                            <li class="list-inline-item dt-start"><?php echo $this->escape($event['time_start_view']); ?></li>
+                                            <li class="list-inline-item"><strong><?php echo _b('to') ?></strong></li>
+                                            <li class="list-inline-item dt-end"><?php echo $this->escape($event['time_end_view']); ?></li>
                                         <?php } elseif (!empty($event['time_start'])) { ?>
-                                            <li class="event-single-time dt-start">
+                                            <li class="list-inline-item event-single-time dt-start">
                                                 <?php if ($block['show-days']) { ?><i class="fa fa-clock-o"></i> <?php } ?>
                                                 <?php echo $this->escape($event['time_start_view']); ?>
                                             </li>
                                         <?php } ?>
                                     <?php } ?>
                                     <?php if (!empty($event['topics']) && $block['show-topic']) { ?>
-                                        <li><i class="fa fa-folder"></i></li>
+                                        <li class="list-inline-item"><i class="fa fa-folder"></i></li>
                                         <?php foreach ($event['topics'] as $eventTopic) { ?>
                                             <li class="p-category">
                                                 <a title="<?php echo $this->escape($eventTopic['title']); ?>"
@@ -58,12 +58,12 @@
                                         <?php } ?>
                                     <?php } ?>
                                     <?php if (!empty($event['register_price']) && $block['show-price']) { ?>
-                                        <li class="p-price" itemprop="price" content="<?php echo $this->escape($event['register_price']); ?>">
+                                        <li class="list-inline-item p-price" itemprop="price" content="<?php echo $this->escape($event['register_price']); ?>">
                                             <i class="fa fa-money"></i> <?php echo _b('Minimum Price') ?> : <?php echo $this->escape($event['register_price_view']); ?>
                                         </li>
                                     <?php } ?>
                                     <?php if ($block['show-hits']) { ?>
-                                        <li><i class="fa fa-eye"></i> <?php echo $this->escape(_number($event['hits'])); ?></li>
+                                        <li class="list-inline-item"><i class="fa fa-eye"></i> <?php echo $this->escape(_number($event['hits'])); ?></li>
                                     <?php } ?>
                                 </ul>
 
@@ -118,7 +118,7 @@
                                 <div class="recent-event-single-image">
                                     <a itemprop="url" title="<?php echo $this->escape($event['title']); ?>"
                                        href="<?php echo $this->escape($event['eventUrl']); ?>">
-                                        <img itemprop="image" class="img-responsive img-rounded u-photo"
+                                        <img itemprop="image" class="img-fluid rounded u-photo"
                                              src="<?php echo Pi::api('doc','media')->getSingleLinkUrl($event['main_image'])->setConfigModule('news')->thumb('item'); ?>"
                                              alt="<?php echo $this->escape($event['title']); ?>"/>
                                     </a>
diff --git a/template/front/event-angular-new.phtml b/template/front/event-angular-new.phtml
index f100728..b279efc 100644
--- a/template/front/event-angular-new.phtml
+++ b/template/front/event-angular-new.phtml
@@ -65,10 +65,10 @@ if(isset($config['image_homepage']) && !empty($config['image_homepage'])) {
                     <h1 class="p-name"><?php echo $this->escape($title); ?></h1>
                 </div>
                 <?php if (!empty($config['text_summary_index'])) { ?>
-                    <div class="clearfix well"><?php echo $config['text_summary_index']; ?></div>
+                    <div class="clearfix card card-body bg-light mb-3"><?php echo $config['text_summary_index']; ?></div>
                 <?php } ?>
                 <?php if (!empty($config['text_description_index'])) { ?>
-                    <div class="clearfix well"><?php echo $config['text_description_index']; ?></div>
+                    <div class="clearfix card card-body bg-light mb-3"><?php echo $config['text_description_index']; ?></div>
                 <?php } ?>
             <?php } ?>
         <?php } elseif (isset($isCategoryPage) && $isCategoryPage == 1) { ?>
@@ -76,7 +76,7 @@ if(isset($config['image_homepage']) && !empty($config['image_homepage'])) {
                 <h1 class="p-name"><?php echo $this->escape($category['title']); ?></h1>
             </div>
             <?php if (!empty($category['text_description'])) { ?>
-                <div class="clearfix well"><?php echo $category['text_description']; ?></div>
+                <div class="clearfix card card-body bg-light mb-3"><?php echo $category['text_description']; ?></div>
             <?php } ?>
         <?php } ?>
     </div>
diff --git a/template/front/event-angular.phtml b/template/front/event-angular.phtml
index d48cf61..29b9281 100644
--- a/template/front/event-angular.phtml
+++ b/template/front/event-angular.phtml
@@ -151,7 +151,7 @@ if(isset($config['image_homepage']) && !empty($config['image_homepage'])) {
                     <h1 class="p-name"><?php echo $this->escape($title); ?></h1>
                 </div>
                 <?php if (!empty($config['text_summary_index'])) { ?>
-                    <div class="clearfix well"><?php echo $config['text_summary_index']; ?></div>
+                    <div class="clearfix card card-body bg-light mb-3"><?php echo $config['text_summary_index']; ?></div>
                 <?php } ?>
             <?php } ?>
         <?php } elseif (isset($isCategoryPage) && $isCategoryPage == 1) { ?>
@@ -159,7 +159,7 @@ if(isset($config['image_homepage']) && !empty($config['image_homepage'])) {
                 <h1 class="p-name"><?php echo $this->escape($category['title']); ?></h1>
             </div>
             <?php if (!empty($category['text_description'])) { ?>
-                <div class="clearfix well"><?php echo $category['text_description']; ?></div>
+                <div class="clearfix card card-body bg-light mb-3"><?php echo $category['text_description']; ?></div>
             <?php } ?>
         <?php } ?>
     </div>
@@ -168,7 +168,7 @@ if(isset($config['image_homepage']) && !empty($config['image_homepage'])) {
             <div class="page-header">
                 <h4><?php _e('Search on this group'); ?></h4>
             </div>
-            <form class="well">
+            <form class="card card-body bg-light mb-3">
                 <div class="form-group">
                     <label><?php _e('Title'); ?></label>
                     <input type="text" data-ng-model="filterTitle" class="form-control">
@@ -227,7 +227,7 @@ if(isset($config['image_homepage']) && !empty($config['image_homepage'])) {
         </div>
 
         <div class="clearfix">
-            <div class="well small">
+            <div class="card card-body bg-light mb-3 small">
                 <?php if (!empty($config['text_description_index'])) { ?>
                     <?php echo $config['text_description_index']; ?>
                 <?php } ?>
@@ -239,18 +239,18 @@ if(isset($config['image_homepage']) && !empty($config['image_homepage'])) {
             <div class="event-list clearfix">
                 <div class="clearfix event-sort ">
                     <ul class="list-inline col-md-8">
-                        <li><?php _e('Sort by'); ?> :</li>
-                        <li class="event-sort-type" data-ng-click="sort('time_publish')"><?php _e('Time'); ?> <i
+                        <li class="list-inline-item"><?php _e('Sort by'); ?> :</li>
+                        <li class="list-inline-item event-sort-type" data-ng-click="sort('time_publish')"><?php _e('Time'); ?> <i
                                 class="fa sort-icon" data-ng-show="sortKey=='time_publish'"
                                 data-ng-class="{'fa-caret-up':reverse,'fa-caret-down':!reverse}"></i></li>
-                        <li class="event-sort-type" data-ng-click="sort('hits')"><?php _e('Hits'); ?> <i class="fa sort-icon"
+                        <li class="list-inline-item event-sort-type" data-ng-click="sort('hits')"><?php _e('Hits'); ?> <i class="fa sort-icon"
                                                                                                          data-ng-show="sortKey=='hits'"
                                                                                                          data-ng-class="{'fa-caret-up':reverse,'fa-caret-down':!reverse}"></i>
                         </li>
-                        <li class="event-sort-type" data-ng-click="sort('title')"><?php _e('Title'); ?> <i
+                        <li class="list-inline-item event-sort-type" data-ng-click="sort('title')"><?php _e('Title'); ?> <i
                                 class="fa sort-icon" data-ng-show="sortKey=='title'"
                                 data-ng-class="{'fa-caret-up':reverse,'fa-caret-down':!reverse}"></i></li>
-                        <li class="event-sort-type" data-ng-click="sortKey=''"><?php _e('Default'); ?></li>
+                        <li class="list-inline-item event-sort-type" data-ng-click="sortKey=''"><?php _e('Default'); ?></li>
                     </ul>
                    
                    <?php 
@@ -274,7 +274,7 @@ if(isset($config['image_homepage']) && !empty($config['image_homepage'])) {
                         <div data-on-finish-render="dirPaginateFinished" data-dir-paginate="event in events|orderBy:sortKey:reverse|filter: {title : filterTitle, location : filterLocation , category : filterCategory, time_level : filterTime, price_filter : filterPrice} |itemsPerPage:<?php echo $config['view_perpage']; ?>"
                              class="event-single clearfix h-event" itemscope itemtype="https://schema.org/Event">
                             <div class="row">
-                                <div class="col-xs-3 event-single-image" data-ng-if="event.image">
+                                <div class="col-3 event-single-image" data-ng-if="event.image">
                                     <div class="text-center">
                                         <a itemprop="url" title="{{event.title}}"
                                            data-ng-href="{{event.eventUrl}}">
@@ -286,7 +286,7 @@ if(isset($config['image_homepage']) && !empty($config['image_homepage'])) {
                                                 <source srcset="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" data-srcset="{{event.thumbUrl}}" media="(max-width: 1366px)">
                                                 <source srcset="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" data-srcset="{{event.thumbUrl}}" media="(max-width: 2800px)">
 
-                                                <img itemprop="image" class="img-responsive img-rounded u-photo center-block lazyload"
+                                                <img itemprop="image" class="img-fluid rounded u-photo center-block lazyload"
                                                      src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAQAAAA3fa6RAAAADklEQVR42mNkAANGCAUAACMAA2w/AMgAAAAASUVORK5CYII="
                                                      data-src="#"
                                                      data-ng-src="{{event.thumbUrl}}"
@@ -295,7 +295,7 @@ if(isset($config['image_homepage']) && !empty($config['image_homepage'])) {
                                         </a>
                                     </div>
                                 </div>
-                                <div class="col-xs-9 event-single-body">
+                                <div class="col-9 event-single-body">
                                     <div class="p-name clearfix" itemprop="name">
                                         <h2 class="event-single-title">
                                             <a itemprop="url" title="{{event.title}}"
@@ -306,18 +306,18 @@ if(isset($config['image_homepage']) && !empty($config['image_homepage'])) {
                                     </div>
                                     <div class="event-single-information small">
                                         <ul class="clearfix list-inline event-time">
-                                            <li data-ng-if="event.time_view">
+                                            <li data-ng-if="event.time_view" class="list-inline-item">
                                                 <i class="fa fa-clock-o"></i> {{event.time_view}}
                                                 <meta data-ng-if="event.time_start_view" itemprop="startDate"
                                                       content="{{event.time_start_view}}"/>
                                                 <meta data-ng-if="event.time_end_view" itemprop="endDate"
                                                       content="{{event.time_end_view}}"/>
                                             </li>
-                                            <li data-ng-if="event.register_price" class="p-price" itemprop="price"
+                                            <li data-ng-if="event.register_price" class="p-price list-inline-item" itemprop="price"
                                                 content="{{event.register_price}}">
                                                 <i class="fa fa-money"></i> {{event.register_price_view}}
                                             </li>
-                                            <li><i class="fa fa-eye"></i> {{event.hits}}</li>
+                                            <li class="list-inline-item"><i class="fa fa-eye"></i> {{event.hits}}</li>
                                         </ul>
                                         <meta data-ng-if="event.register_price" itemprop="priceCurrency" content="{{event.price_currency}}"/>
                                     </div>
@@ -330,13 +330,13 @@ if(isset($config['image_homepage']) && !empty($config['image_homepage'])) {
                         </div>
                     <?php } elseif (isset($config['view_list_type']) && $config['view_list_type'] == 'box') { ?>
                         <div data-on-finish-render="dirPaginateFinished" data-dir-paginate="event in events|orderBy:sortKey:reverse|filter: {title : filterTitle, location : filterLocation , category : filterCategory, time_level : filterTime, price_filter : filterPrice} |itemsPerPage:<?php echo $config['view_perpage']; ?>"
-                             class="col-xs-12 col-md-4 event-single clearfix h-event" itemscope itemtype="https://schema.org/Event">
+                             class="col-12 col-md-4 event-single clearfix h-event" itemscope itemtype="https://schema.org/Event">
                             <div class="thumbnail">
                                 <div class="event-single-image" data-ng-if="event.image">
                                     <div class="text-center">
                                         <a itemprop="url" title="{{event.title}}"
                                            data-ng-href="{{event.eventUrl}}">
-                                            <img itemprop="image" class="img-responsive img-rounded u-photo center-block"
+                                            <img itemprop="image" class="img-fluid rounded u-photo center-block"
                                                  src="#"
                                                  data-ng-src="{{event.thumbUrl}}"
                                                  alt="{{event.title}}"/>
@@ -383,7 +383,7 @@ if(isset($config['image_homepage']) && !empty($config['image_homepage'])) {
         
        
         <?php if(Pi::user()->config('enable_modal')) { ?> 
-            content += '<div class="text-center"><button onclick="$(\'.popover-active\').popover(\'hide\')" type="button" class="btn btn-primary btn-xs" data-toggle="modal" data-target="#loginRegisterModal" data-redirect="<?php echo $urlAddEvent?>">'+loginLinkLabel+'</button></div>'; 
+            content += '<div class="text-center"><button onclick="$(\'.popover-active\').popover(\'hide\')" type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#loginRegisterModal" data-redirect="<?php echo $urlAddEvent?>">'+loginLinkLabel+'</button></div>';
         <?php } else { ?>
             content += '<div class="text-center"><br><?php _e("Please login to add an event") ?></div>';
         <?php } ?>
diff --git a/template/front/event-detail.phtml b/template/front/event-detail.phtml
index 097af23..5c4b91d 100644
--- a/template/front/event-detail.phtml
+++ b/template/front/event-detail.phtml
@@ -79,8 +79,8 @@ $hitsAjaxUrl = Pi::url($this->url('event', array(
     </div>
     <div class="clearfix small itemUnderHead">
         <ul class="text-muted list-inline text-right pull-right">
-            <li><i class="fa fa-calendar"></i> <?php echo $this->escape($event['time_update_view']); ?></li>
-            <li><i class="fa fa-eye"></i> <span class="hitsCounter"></span></li>
+            <li class="list-inline-item"><i class="fa fa-calendar"></i> <?php echo $this->escape($event['time_update_view']); ?></li>
+            <li class="list-inline-item"><i class="fa fa-eye"></i> <span class="hitsCounter"></span></li>
 
             <script>
                 $(document).ready(function(){
@@ -92,11 +92,11 @@ $hitsAjaxUrl = Pi::url($this->url('event', array(
             </script>
 
             <?php if (!empty($event['guideCategoryInfo']) || !empty($event['topics'])) { ?>
-                <li><i class="fa fa-folder"></i></li>
+                <li class="list-inline-item"><i class="fa fa-folder"></i></li>
             <?php } ?>
             <?php if (!empty($event['guideCategoryInfo'])) { ?>
                 <?php foreach ($event['guideCategoryInfo'] as $guideCategoryInfo) { ?>
-                    <li class="p-category">
+                    <li class="list-inline-item p-category">
                         <a class="u-url" title="<?php echo $this->escape($guideCategoryInfo['title']); ?>" href="<?php echo $this->escape($guideCategoryInfo['categoryUrl']); ?>">
                             <?php echo $this->escape($guideCategoryInfo['title']); ?>
                         </a>
@@ -105,7 +105,7 @@ $hitsAjaxUrl = Pi::url($this->url('event', array(
             <?php } ?>
             <?php if (!empty($event['topics'])) { ?>
                 <?php foreach ($event['topics'] as $eventTopic) { ?>
-                    <li class="p-category">
+                    <li class="list-inline-item p-category">
                         <a title="<?php echo $this->escape($eventTopic['title']); ?>" href="<?php echo $this->escape($eventTopic['url']); ?>">
                             <?php echo $this->escape($eventTopic['title']); ?>
                         </a>
@@ -122,7 +122,7 @@ $hitsAjaxUrl = Pi::url($this->url('event', array(
                         <?php $media = Pi::api('doc','media')->getSingleLinkData($event['main_image'], 'large', null, null, 'news') ?>
                         <a href="<?php echo $media['resized_url']; ?>"
                            title="<?php echo $this->escape($event['title']); ?><?php if($media['copyright']) echo ' - ' . $media['copyright'] ?>" itemprop="image">
-                            <img class="img-responsive img-thumbnail lazyload"
+                            <img class="img-fluid img-thumbnail lazyload"
                                  src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="
                                  data-src="<?php echo Pi::api('doc','media')->getSingleLinkUrl($event['main_image'])->setConfigModule('news')->thumb('medium'); ?>"
                                  alt="<?php echo $this->escape($event['title']); ?>" itemprop="image"/>
@@ -174,7 +174,7 @@ $hitsAjaxUrl = Pi::url($this->url('event', array(
                                 <source srcset="data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAUCAQAAAAwokVPAAAAGElEQVR42mNkoAAwjmoe1TyqeVTzwGoGADbOABUMpReEAAAAAElFTkSuQmCC" data-srcset="<?php echo Pi::api('doc','media')->getSingleLinkUrl($event['main_image'])->setConfigModule('news')->thumb(360,360); ?>" media="(max-width: 1366px)">
                                 <source srcset="data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAUCAQAAAAwokVPAAAAGElEQVR42mNkoAAwjmoe1TyqeVTzwGoGADbOABUMpReEAAAAAElFTkSuQmCC" data-srcset="<?php echo Pi::api('doc','media')->getSingleLinkUrl($event['main_image'])->setConfigModule('news')->thumb(360,360); ?>" media="(max-width: 2800px)">
 
-                                <img class="img-responsive img-thumbnail lazyload"
+                                <img class="img-fluid img-thumbnail lazyload"
                                      src="data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAUCAQAAAAwokVPAAAAGElEQVR42mNkoAAwjmoe1TyqeVTzwGoGADbOABUMpReEAAAAAElFTkSuQmCC"
                                      data-src="<?php echo Pi::api('doc','media')->getSingleLinkUrl($event['main_image'])->setConfigModule('news')->thumb(360,360); ?>"
                                      alt="<?php echo $this->escape($event['title']); ?>" itemprop="image"/>
@@ -192,7 +192,7 @@ $hitsAjaxUrl = Pi::url($this->url('event', array(
                         <?php } ?>
                         <?php if (!empty($event['source_url'])) { ?>
                             <p class="u-url" itemprop="url">
-                                <a class="btn btn-success btn-lg btn-group-justified event-source-url" title="<?php _e('Organizer Website and register') ?>" href="<?php echo $this->escape($event['offer_url']); ?>" target="_blank">
+                                <a class="btn btn-success btn-lg btn-group d-flex event-source-url" title="<?php _e('Organizer Website and register') ?>" href="<?php echo $this->escape($event['offer_url']); ?>" target="_blank">
                                     <i class="fa fa-external-link"></i>
                                     <?php _e('Register') ?>
                                 </a>
@@ -212,10 +212,10 @@ $hitsAjaxUrl = Pi::url($this->url('event', array(
                         <?php if ($event['register_price'] > 0) { ?>
                             <div class="clearfix text-center">
                                 <ul class="list-inline">
-                                    <li class="clearfix event-minPrice-title">
+                                    <li class="list-inline-item clearfix event-minPrice-title">
                                         <?php _e('Start From') ?> :
                                     </li>
-                                    <li class="clearfix event-minPrice-title">
+                                    <li class="list-inline-item clearfix event-minPrice-title">
                                         <strong><?php echo $this->escape($event['register_price_view_clean']); ?></strong>
                                     </li>
                                 </ul>
@@ -229,16 +229,16 @@ $hitsAjaxUrl = Pi::url($this->url('event', array(
                         <?php } ?>
                     </div>
                 <?php } elseif (($event['register_can'] || !empty($event['offer_url']) || $config['order_free']) && !$ended) { ?>
-                    <div class="clearfix well" itemprop="offers" itemscope itemtype="https://schema.org/Offer">
+                    <div class="clearfix card card-body bg-light mb-3" itemprop="offers" itemscope itemtype="https://schema.org/Offer">
                         <div class="p-price" itemprop="price" content="<?php echo $this->escape($event['register_price']); ?>">
                             <?php if ($event['register_can']) { ?>
                                 <?php if ($event['register_stock'] == 0 || $event['register_stock'] - $event['register_sales'] > 0) { ?>
                                     <div class="clearfix text-center">
                                         <ul class="list-inline">
-                                            <li class="clearfix event-minPrice-title">
+                                            <li class="list-inline-item clearfix event-minPrice-title">
                                                 <?php _e('Start From') ?> :
                                             </li>
-                                            <li class="clearfix event-minPrice-text">
+                                            <li class="list-inline-item clearfix event-minPrice-text">
                                                 <strong><?php echo $this->escape($event['register_price_view']); ?></strong>
                                             </li>
                                         </ul>
@@ -261,7 +261,7 @@ $hitsAjaxUrl = Pi::url($this->url('event', array(
                                     <?php echo $this->escape($event['register_price_view']); ?>
                                 </div>
                                 <div class="event-offerUrl-btn" itemprop="url">
-                                    <a class="btn btn-success btn-lg btn-group-justified <?php echo $ended ? 'disabled' : '' ?>" title="<?php _e('Register to the event') ?>" href="<?php echo $this->escape($event['offer_url']); ?>" target="_blank">
+                                    <a class="btn btn-success btn-lg btn-group d-flex <?php echo $ended ? 'disabled' : '' ?>" title="<?php _e('Register to the event') ?>" href="<?php echo $this->escape($event['offer_url']); ?>" target="_blank">
                                         <?php _e('Register to the event') ?>
                                     </a>
                                 </div>
@@ -278,13 +278,13 @@ $hitsAjaxUrl = Pi::url($this->url('event', array(
                     </div>
                 <?php } ?>
                 <?php if ($event['register_stock'] != null) { ?> 
-                    <div class="well clearfix eventTime">
+                    <div class="card card-body bg-light mb-3 clearfix eventTime">
                         <h2><?php _e('Stock'); ?></h2>
                         <ul class="list-inline">
                             <?php if ($count) { ?> 
-                                <li class="text-success"><strong><i class="fa fa-check"></i>&nbsp;<?php echo sprintf(__("I'm registrered to this event (%s place(s))"), $count); ?></strong></li>
+                                <li class="list-inline-item text-success"><strong><i class="fa fa-check"></i>&nbsp;<?php echo sprintf(__("I'm registrered to this event (%s place(s))"), $count); ?></strong></li>
                             <?php } ?>     
-                            <li><i class="fa fa-ticket"></i>&nbsp; 
+                            <li class="list-inline-item"><i class="fa fa-ticket"></i>&nbsp;
                                 <?php
                                 if ($event['register_sales'] == $event['register_stock'] && $event['register_stock'] > 0) { 
                                     _e('Full');
@@ -298,26 +298,26 @@ $hitsAjaxUrl = Pi::url($this->url('event', array(
                         </ul>
                     </div>
                 <?php } ?>
-                <div class="well clearfix eventTime">
+                <div class="card card-body bg-light mb-3 clearfix eventTime">
                     <h2><?php _e('Key Event Elements'); ?></h2>
                     <ul class="list-inline">
                         <?php if ($config['view_days']) { ?>
-                            <li><i class="fa fa-clock-o"></i> <?php echo $this->escape($event['days']); ?></li>
+                            <li class="list-inline-item"><i class="fa fa-clock-o"></i> <?php echo $this->escape($event['days']); ?></li>
                         <?php } ?>
                         <?php if (!empty($event['time_start']) && !empty($event['time_end'])) { ?>
-                            <li><?php if (!$config['view_days']) { ?><i class="fa fa-clock-o"></i> <?php } ?><?php _e('From') ?></li>
-                            <li class="dt-start"><?php echo $this->escape($event['time_start_view']); ?></li>
-                            <li><?php _e('to') ?></li>
-                            <li class="dt-end"><?php echo $this->escape($event['time_end_view']); ?></li>
+                            <li class="list-inline-item"><?php if (!$config['view_days']) { ?><i class="fa fa-clock-o"></i> <?php } ?><?php _e('From') ?></li>
+                            <li class="list-inline-item dt-start"><?php echo $this->escape($event['time_start_view']); ?></li>
+                            <li class="list-inline-item"><?php _e('to') ?></li>
+                            <li class="list-inline-item dt-end"><?php echo $this->escape($event['time_end_view']); ?></li>
                         <?php } elseif (!empty($event['time_start'])) { ?>
-                            <li class="event-single-time dt-start">
+                            <li class="list-inline-item event-single-time dt-start">
                                 <?php if (!$config['view_days']) { ?><i class="fa fa-clock-o"></i> <?php } ?><?php _e('On') ?> <?php echo $this->escape($event['time_start_view']); ?>
                             </li>
                         <?php } ?>
                     </ul>
                     <?php if ($ended) { ?>
                         <ul class="list-inline ended">
-                            <li class=""><i class="fa fa-exclamation-triangle"></i><span> <?php _e("Ended event"); ?></span></li>
+                            <li class="list-inline-item"><i class="fa fa-exclamation-triangle"></i><span> <?php _e("Ended event"); ?></span></li>
                         </ul>
                     <?php } ?>
                     <?php if (!empty($event['time_start']) && !empty($event['time_end'])) { ?>
@@ -330,9 +330,9 @@ $hitsAjaxUrl = Pi::url($this->url('event', array(
                 
                     <?php if (!empty($event['guideLocationInfo'])) { ?>
                         <ul class="list-inline">
-                            <li><i class="fa fa-map-marker"></i> <?php _e('Related locations'); ?></li>
+                            <li class="list-inline-item"><i class="fa fa-map-marker"></i> <?php _e('Related locations'); ?></li>
                             <?php foreach ($event['guideLocationInfo'] as $guideLocationInfo) { ?>
-                                <li itemprop="location" itemscope itemtype="https://schema.org/Place">
+                                <li class="list-inline-item" itemprop="location" itemscope itemtype="https://schema.org/Place">
                                     <a itemprop="url" href="<?php echo $this->escape($guideLocationInfo['locationUrl']); ?>">
                                         <span itemprop="name"><?php echo $this->escape($guideLocationInfo['title']); ?></span>
                                     </a>
@@ -345,7 +345,7 @@ $hitsAjaxUrl = Pi::url($this->url('event', array(
                         <div class="event-organizer">
                             <ul class="list-unstyled">
                                 <?php if (!empty($event['organizer_name'])) { ?>
-                                    <li itemscope itemtype="https://schema.org/Organization">
+                                    <li class="list-inline-item" itemscope itemtype="https://schema.org/Organization">
                                         <i class="fa fa-user"></i> <?php _e('Organizer name') ?> <span itemprop="name"><?php echo $this->escape($event['organizer_name']); ?></span>
                                     </li>
                                 <?php } ?>
@@ -377,7 +377,7 @@ $hitsAjaxUrl = Pi::url($this->url('event', array(
                     </div>
                 <?php } ?>
                 <?php if (!empty($vote)) { ?>
-                    <div class="well clearfix eventVote">
+                    <div class="card card-body bg-light mb-3 clearfix eventVote">
                         <h2><?php _e('Vote to this event'); ?></h2>
                         <?php include $this->template('votebar', 'front', 'vote'); ?>
                     </div>
@@ -403,7 +403,7 @@ $hitsAjaxUrl = Pi::url($this->url('event', array(
                                                     <source srcset="data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAUCAQAAAAwokVPAAAAGElEQVR42mNkoAAwjmoe1TyqeVTzwGoGADbOABUMpReEAAAAAElFTkSuQmCC" data-srcset="<?php echo Pi::api('doc','media')->getSingleLinkUrl($guideItemInfo['main_image'])->setConfigModule('news')->thumb(262,262); ?>" media="(max-width: 1366px)">
                                                     <source srcset="data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAUCAQAAAAwokVPAAAAGElEQVR42mNkoAAwjmoe1TyqeVTzwGoGADbOABUMpReEAAAAAElFTkSuQmCC" data-srcset="<?php echo Pi::api('doc','media')->getSingleLinkUrl($guideItemInfo['main_image'])->setConfigModule('news')->thumb(262,262); ?>" media="(max-width: 2800px)">
 
-                                                    <img class="img-responsive u-photo lazyload"
+                                                    <img class="img-fluid u-photo lazyload"
                                                          src="data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAUCAQAAAAwokVPAAAAGElEQVR42mNkoAAwjmoe1TyqeVTzwGoGADbOABUMpReEAAAAAElFTkSuQmCC"
                                                          data-src="<?php echo Pi::api('doc','media')->getSingleLinkUrl($guideItemInfo['main_image'])->setConfigModule('news')->thumb(262,262); ?>"
                                                          alt="<?php echo $this->escape($guideItemInfo['title']); ?>"/>
@@ -438,10 +438,10 @@ $hitsAjaxUrl = Pi::url($this->url('event', array(
                 <?php } ?>
                 <?php if ($config['social_sharing']) { ?>
                     <div class="clearfix">
-                        <div class="col-md-12 col-sm-12 col-xs-12 socialSharingText">
+                        <div class="col-md-12 col-sm-12 col-12 socialSharingText">
                             <strong><?php _e('Share if you like'); ?></strong>
                         </div>
-                        <div class="col-md-12 col-sm-12 col-xs-12 socialSharing">
+                        <div class="col-md-12 col-sm-12 col-12 socialSharing">
                             <?php echo $this->socialSharing(
                                 $config['social_sharing'],
                                 $title,
@@ -527,7 +527,7 @@ $hitsAjaxUrl = Pi::url($this->url('event', array(
                                                 <source srcset="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" data-srcset="<?php echo Pi::api('doc','media')->getSingleLinkUrl($guideItemInfo['main_image'])->setConfigModule('news')->thumb(270,270); ?>" media="(max-width: 1366px)">
                                                 <source srcset="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" data-srcset="<?php echo Pi::api('doc','media')->getSingleLinkUrl($guideItemInfo['main_image'])->setConfigModule('news')->thumb(270,270); ?>" media="(max-width: 2800px)">
 
-                                                <img class="img-responsive u-photo lazyload"
+                                                <img class="img-fluid u-photo lazyload"
                                                      style="max-width:100%"
                                                      src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="
                                                      data-src="<?php echo Pi::api('doc','media')->getSingleLinkUrl($guideItemInfo['main_image'])->setConfigModule('news')->thumb('medium'); ?>"
diff --git a/template/front/manage-index.phtml b/template/front/manage-index.phtml
index d8f5eda..116f89b 100644
--- a/template/front/manage-index.phtml
+++ b/template/front/manage-index.phtml
@@ -18,7 +18,7 @@
             </div>
             <?php if ($allowed) { ?>
                 <?php if (!empty($events)) { ?>
-                    <table id="item-list" class="table table-striped table-bordered table-condensed">
+                    <table id="item-list" class="table table-striped table-bordered table-sm">
                         <tr>
                             <th><?php _e('ID'); ?></th>
                             <th><?php _e('Title'); ?></th>
@@ -54,17 +54,17 @@
                                 <td>
                                     <div class="text-nowrap">
                                         <?php if ($event['status'] == 1) { ?>
-                                            <a class="btn btn-success btn-xs" title="<?php _e('View'); ?>"
+                                            <a class="btn btn-success btn-sm" title="<?php _e('View'); ?>"
                                                href="<?php echo $this->escape( Pi::url(Pi::service('url')->assemble('event', array('module' => 'event','controller' => 'index','slug' => $event['slug'])))); ?>" target="_blank"><i
                                                         class="fa fa-eye"></i> <?php _e('View'); ?></a>
                                         <?php } ?>
                                         <?php if ($event['time_end'] >= strtotime('now midnight')) { ?>
-                                        <a class="btn btn-primary btn-xs" title="<?php _e('Edit'); ?>"
+                                        <a class="btn btn-primary btn-sm" title="<?php _e('Edit'); ?>"
                                            href="<?php echo $this->url('', array('action' => 'update', 'id' => $event['id'])); ?>"><i
                                                     class="fa fa-edit"></i> <?php _e('Edit'); ?></a>
                                         <?php } ?>
                                         <?php if ($config['order_active'] && $event['register_can']) { ?>
-                                            <a class="btn btn-primary btn-xs" title="<?php _e('List of orders'); ?>"
+                                            <a class="btn btn-primary btn-sm" title="<?php _e('List of orders'); ?>"
                                                href="<?php echo $this->url('', array('action' => 'order', 'id' => $event['id'])); ?>"><i
                                                         class="fa fa-shopping-cart"></i> <?php _e('List of orders'); ?></a>
                                         <?php } ?>
@@ -74,8 +74,8 @@
                         <?php } ?>
                     </table>
                     <p>
-                        <span class="label label-success"><?php _e('Published'); ?></span>
-                        <span class="label label-warning"><?php _e('Pending review'); ?></span>
+                        <span class="badge badge-success"><?php _e('Published'); ?></span>
+                        <span class="badge badge-warning"><?php _e('Pending review'); ?></span>
                     </p>
                 <?php } else { ?>
                     <div class="alert alert-success" role="alert">
diff --git a/template/front/manage-order.phtml b/template/front/manage-order.phtml
index 4605ef5..d61a510 100644
--- a/template/front/manage-order.phtml
+++ b/template/front/manage-order.phtml
@@ -17,7 +17,7 @@
         </div>
 
         <?php if (!empty($list)) { ?>
-            <table class="table table-striped table-bordered table-condensed">
+            <table class="table table-striped table-bordered table-sm">
                 <tr>
                     <th><?php _e('ID'); ?></th>
                     <th><?php _e('Name'); ?></th>
diff --git a/template/front/manage-update.phtml b/template/front/manage-update.phtml
index 6e68602..2d630f6 100755
--- a/template/front/manage-update.phtml
+++ b/template/front/manage-update.phtml
@@ -68,8 +68,8 @@ if ($local = 'fa') {
                     <p><?php echo _e("This functionality is unavailable. Please upgrade your package"); ?></p>
                 </div>
                 <div class="modal-footer">
-                    <a href="<?php echo $urlPackage ?>" class="btn btn-default"><?php echo _e("Ok"); ?></a>
-                    <button type="button" class="btn btn-default" data-dismiss="modal"><?php echo _e("Cancel"); ?></button>
+                    <a href="<?php echo $urlPackage ?>" class="btn btn-secondary"><?php echo _e("Ok"); ?></a>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo _e("Cancel"); ?></button>
                 </div>
             </div>
         </div>
@@ -87,7 +87,7 @@ if ($local = 'fa') {
                     <p><?php echo _e("You cannot yet publish any event : to unlock this feature, you have to get your business item being published"); ?></p>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal"><?php echo _e("Ok"); ?></button>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo _e("Ok"); ?></button>
                 </div>
             </div>
         </div>
@@ -176,7 +176,7 @@ if ($local = 'fa') {
                 <?php echo _e("You must add main image before save that event"); ?>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
             </div>
         </div>
     </div>
@@ -193,7 +193,7 @@ if ($local = 'fa') {
                 <?php echo _e("You must add a description before save that event"); ?>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
             </div>
         </div>
     </div>
diff --git a/template/front/order-detail.phtml b/template/front/order-detail.phtml
index 840ba3d..413713a 100644
--- a/template/front/order-detail.phtml
+++ b/template/front/order-detail.phtml
@@ -1,5 +1,5 @@
 <?php Pi::service('i18n')->load(array('module/event', 'default')); ?>
-<table class="table table-striped table-bordered table-condensed">
+<table class="table table-striped table-bordered table-sm">
     <tr>
         <th colspan="5">
             <?php echo sprintf(__("Details of %s"), $this->escape($product['details']['title'])); ?>
diff --git a/template/front/partial/category-wide-header.phtml b/template/front/partial/category-wide-header.phtml
index b196193..99da7a6 100644
--- a/template/front/partial/category-wide-header.phtml
+++ b/template/front/partial/category-wide-header.phtml
@@ -9,13 +9,13 @@
 <div class="category-width-image">
     <picture>
         <!--[if IE 9]><video style="display: none;"><![endif]-->
-        <source class="img-responsive" srcset="<?php echo sprintf(Pi::url('upload/event/image/width/index/mobi-%s'), $config['image_index']); ?>" media="(max-width: 479px)">
-        <source class="img-responsive" srcset="<?php echo sprintf(Pi::url('upload/event/image/width/index/smart-%s'), $config['image_index']); ?>" media="(max-width: 767px)">
-        <source class="img-responsive" srcset="<?php echo sprintf(Pi::url('upload/event/image/width/index/tab-%s'), $config['image_index']); ?>" media="(max-width: 991px)">
-        <source class="img-responsive" srcset="<?php echo sprintf(Pi::url('upload/event/image/width/index/lap-%s'), $config['image_index']); ?>" media="(max-width: 1366px)">
-        <source class="img-responsive" srcset="<?php echo sprintf(Pi::url('upload/event/image/width/index/xlap-%s'), $config['image_index']); ?>" media="(max-width: 1920px)">
-        <source class="img-responsive" srcset="<?php echo sprintf(Pi::url('upload/event/image/width/index/desk-%s'), $config['image_index']); ?>" media="(max-width: 2880px)">
+        <source class="img-fluid" srcset="<?php echo sprintf(Pi::url('upload/event/image/width/index/mobi-%s'), $config['image_index']); ?>" media="(max-width: 479px)">
+        <source class="img-fluid" srcset="<?php echo sprintf(Pi::url('upload/event/image/width/index/smart-%s'), $config['image_index']); ?>" media="(max-width: 767px)">
+        <source class="img-fluid" srcset="<?php echo sprintf(Pi::url('upload/event/image/width/index/tab-%s'), $config['image_index']); ?>" media="(max-width: 991px)">
+        <source class="img-fluid" srcset="<?php echo sprintf(Pi::url('upload/event/image/width/index/lap-%s'), $config['image_index']); ?>" media="(max-width: 1366px)">
+        <source class="img-fluid" srcset="<?php echo sprintf(Pi::url('upload/event/image/width/index/xlap-%s'), $config['image_index']); ?>" media="(max-width: 1920px)">
+        <source class="img-fluid" srcset="<?php echo sprintf(Pi::url('upload/event/image/width/index/desk-%s'), $config['image_index']); ?>" media="(max-width: 2880px)">
         <!--[if IE 9]></video><![endif]-->
-        <img class="img-responsive" src="<?php echo sprintf(Pi::url('upload/event/image/width/index/xlap-%s'), $config['image_index']); ?>" alt="<?php echo $this->escape($title); ?>">
+        <img class="img-fluid" src="<?php echo sprintf(Pi::url('upload/event/image/width/index/xlap-%s'), $config['image_index']); ?>" alt="<?php echo $this->escape($title); ?>">
     </picture>
 </div>
\ No newline at end of file
diff --git a/template/front/partial/favourite-list.phtml b/template/front/partial/favourite-list.phtml
index 705dca9..43800b8 100644
--- a/template/front/partial/favourite-list.phtml
+++ b/template/front/partial/favourite-list.phtml
@@ -1,7 +1,7 @@
 <?php Pi::service('i18n')->load(array('module/event', 'default')); ?>
 <h5><?php _e('Favourite event'); ?></h5>
 
-<table id="item-list" class="table table-striped table-bordered table-condensed">
+<table id="item-list" class="table table-striped table-bordered table-sm">
     <tr>
         <th class="col-md-<?php echo $isProfil ? '2' : '1' ?>"><?php _e('Image'); ?></th>
         <th class="col-md-<?php echo $isProfil ? '4' : '3' ?>"><?php _e('Name'); ?></th>