diff --git a/template/admin/dictionary-index.phtml b/template/admin/dictionary-index.phtml
index 60dd17f..02fad56 100644
--- a/template/admin/dictionary-index.phtml
+++ b/template/admin/dictionary-index.phtml
@@ -2,7 +2,7 @@
 <div class="clearfix">
     <h3><?php _e('List of top searched terms'); ?></h3>
     <?php if ($config['save_log']) { ?>
-        <table class="table table-striped table-bordered table-condensed">
+        <table class="table table-striped table-bordered table-sm">
             <tr>
                 <th><?php _e('Term'); ?></th>
                 <th><?php _e('Count of search'); ?></th>
diff --git a/template/block/search.phtml b/template/block/search.phtml
index 2bed923..22a72c6 100644
--- a/template/block/search.phtml
+++ b/template/block/search.phtml
@@ -13,9 +13,9 @@
                 var results = jQuery.parseJSON(data);
                 $(results).each(function (key, value) {
                     if (value.image != '') {
-                        $('.search-results').append('<li' + value.class + '><a title="' + value.title + '" href="' + value.url + '"><img src="' + value.image + '" alt="' + value.title + '"> ' + value.title + '</a></li>');
+                        $('.search-results').append('<a class="dropdown-item ' + value.class + '" title="' + value.title + '" href="' + value.url + '"><img src="' + value.image + '" alt="' + value.title + '"> ' + value.title + '</a>');
                     } else {
-                        $('.search-results').append('<li' + value.class + '><a title="' + value.title + '" href="' + value.url + '">' + value.title + '</a></li>');
+                        $('.search-results').append('<a class="dropdown-item ' + value.class + '" title="' + value.title + '" href="' + value.url + '">' + value.title + '</a>');
                     }
                 })
             });
@@ -32,9 +32,9 @@
         var keyword = $("#search-keyword").val();
         $(".search-info-text").remove();
         if (keyword.length == 0) {
-            $(".search-results").show().append('<li class="search-info-text"><a>%s</a></li>');
+            $(".search-results").show().append('<a class="dropdown-item search-info-text">%s</a>');
         } else {
-            $(".search-results").show().append('<li class="search-info-text"><a>%s</a></li>');
+            $(".search-results").show().append('<a class="dropdown-item search-info-text">%s</a>');
         }
     });
 })(jQuery)
@@ -65,14 +65,14 @@ EOT;
                         </div>
                     <?php } else { ?>
                         <div class="input-group-btn">
-                            <button class="btn btn-default">
+                            <button class="btn btn-secondary">
                                 <i class="fa fa-search"></i>
                             </button>
                         </div>
                     <?php } ?>
                 </div>
             </form>
-            <ul class="search-results dropdown-menu"></ul>
+            <div class="search-results dropdown-menu"></div>
         </div>
     <?php } else { ?>
         <form method="get" action="<?php echo $block['action']; ?>"
@@ -83,19 +83,17 @@ EOT;
                 <input type="text" class="form-control" name="q" placeholder="<?php echo _b('Search'); ?>">
                 <div class="input-group-btn">
                     <?php if (!empty($block['list'])) { ?>
-                        <a class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                        <a class="btn btn-secondary dropdown-toggle" data-toggle="dropdown">
                             <i class="fa fa-search"></i>
-                            <span class="caret"></span>
+
                         </a>
-                        <ul class="dropdown-menu pull-right" id="js-search-menu">
+                        <div class="dropdown-menu pull-right" id="js-search-menu">
                             <?php foreach ($block['list'] as $name => $label) { ?>
-                                <li>
-                                    <a href="#" data-value="<?php echo $this->escape($name); ?>">
+                                    <a class="dropdown-item" href="#" data-value="<?php echo $this->escape($name); ?>">
                                         <?php echo $this->escape($label); ?>
                                     </a>
-                                </li>
                             <?php } ?>
-                        </ul>
+                        </div>
                         <input type="hidden" name="m">
                     <?php } else { ?>
                         <?php if ($block['options']['module'] != 'all') { ?>
@@ -106,7 +104,7 @@ EOT;
                                 <i class="fa fa-search"></i>
                             </div>
                         <?php } else { ?>
-                            <button class="btn btn-default">
+                            <button class="btn btn-secondary">
                                 <i class="fa fa-search"></i>
                             </button>
                         <?php } ?>
diff --git a/template/front/search-form.phtml b/template/front/search-form.phtml
index 1b586ba..4fc58c8 100644
--- a/template/front/search-form.phtml
+++ b/template/front/search-form.phtml
@@ -1,6 +1,6 @@
 <?php $this->footScript()->appendFile($this->assetModule('front/search-tabs.js')); ?>
 <div class="row">
-    <div class="col-md-8 col-md-offset-2 col-xs-12">
+    <div class="col-md-8 col-md-offset-2 col-12">
         <form method="get" id="js-search-form"
               data-url="<?php echo $this->url('search'); ?>"
               data-module-url="<?php echo $this->url('search', ['m' => '_NAME']); ?>"
@@ -8,7 +8,7 @@
               data-module="<?php echo $searchModule; ?>">
             <div class="search-tabs">
                 <ul class="list-inline">
-                    <li>
+                    <li class="list-inline-item">
                         <a href="#" class="js-search-global<?php if (!$searchModule) {
                             echo ' active';
                         } ?>">
@@ -17,7 +17,7 @@
                     </li>
                     <?php foreach ($modules as $name => $data) {
                         echo sprintf(
-                            '<li><a data-name="%s" href="#" class="js-search-module%s">%s</a></li>',
+                            '<li class="list-inline-item"><a data-name="%s" href="#" class="js-search-module%s">%s</a></li>',
                             $name,
                             $name == $searchModule ? ' active' : '',
                             $this->escape($data['title'])
@@ -39,7 +39,7 @@
                 <ul class="list-inline">
                     <?php foreach ($service as $name => $data) {
                         echo sprintf(
-                            '<li><a data-name="%s" href="#" class="js-search-service">%s</a></li>',
+                            '<li class="list-inline-item"><a data-name="%s" href="#" class="js-search-service">%s</a></li>',
                             $name,
                             $this->escape($data['title'])
                         );
diff --git a/template/front/search-google.phtml b/template/front/search-google.phtml
index a88ce4a..50958eb 100644
--- a/template/front/search-google.phtml
+++ b/template/front/search-google.phtml
@@ -4,11 +4,11 @@ $this->headMeta('noindex', 'robots');
 $mode = 'resultonly'; // 'resultonly', 'custom'
 ?>
 <?php if ('default' == $mode) { ?>
-    <div class="panel panel-primary">
-        <div class="panel-heading">
-            <h1 class="panel-title"><?php echo sprintf(__('Google search for %s'), $this->escape(Pi::config('sitename'))); ?></h1>
+    <div class="card card-primary">
+        <div class="card-heading">
+            <h1 class="card-title"><?php echo sprintf(__('Google search for %s'), $this->escape(Pi::config('sitename'))); ?></h1>
         </div>
-        <div class="panel-body">
+        <div class="card-text">
             <script>
                 (function () {
                     var cx = '<?php echo $google['code']; ?>';
@@ -24,7 +24,7 @@ $mode = 'resultonly'; // 'resultonly', 'custom'
             <gcse:search>
                 <div class="row" style="margin-top: 20px;">
                     <div class="col-md-offset-2 col-md-8">
-                        <div class="well well-lg">
+                        <div class="card card-body bg-light mb-3">
                             <h4>
                                 <?php _e('Loading ...'); ?>
                             </h4>
@@ -74,7 +74,7 @@ $mode = 'resultonly'; // 'resultonly', 'custom'
         <gcse:searchresults-only>
             <div class="row" style="margin-top: 20px;">
                 <div class="col-md-offset-2 col-md-8">
-                    <div class="well well-lg">
+                    <div class="card card-body bg-light mb-3">
                         <h4>
                             <?php _e('Loading ...'); ?>
                         </h4>
@@ -84,11 +84,11 @@ $mode = 'resultonly'; // 'resultonly', 'custom'
         </gcse:searchresults-only>
     </div>
 <?php } else { ?>
-    <div class="panel panel-primary">
-        <div class="panel-heading">
-            <h3 class="panel-title"><?php echo sprintf(__('Google search for %s'), $this->escape(Pi::config('sitename'))); ?></h3>
+    <div class="card card-primary">
+        <div class="card-heading">
+            <h3 class="card-title"><?php echo sprintf(__('Google search for %s'), $this->escape(Pi::config('sitename'))); ?></h3>
         </div>
-        <div class="panel-body" id="cse" style='width: 100%;'><?php _e('Loading ...'); ?></div>
+        <div class="card-body" id="cse" style='width: 100%;'><?php _e('Loading ...'); ?></div>
 
         <script src="https://<?php echo $google['host']; ?>/jsapi" type="text/javascript"></script>
         <script>
diff --git a/template/front/search-home.phtml b/template/front/search-home.phtml
index 76a5ecf..3d0dd60 100644
--- a/template/front/search-home.phtml
+++ b/template/front/search-home.phtml
@@ -4,10 +4,10 @@ $this->headMeta('noindex', 'robots');
 $this->footScript()->appendFile($this->assetModule('front/search-tabs.js'));
 ?>
 <div class="row">
-    <div class="col-md-8 col-md-offset-2 col-xs-12 text-center">
+    <div class="col-md-8 col-md-offset-2 col-12 text-center">
         <h1><?php _e('Search'); ?></h1>
     </div>
-    <div class="col-md-8 col-md-offset-2 col-xs-12">
+    <div class="col-md-8 col-md-offset-2 col-12">
         <form method="get" id="js-search-form"
               data-url="<?php echo $this->url('search'); ?>"
               data-module-url="<?php echo $this->url('search', ['m' => '_NAME']); ?>"
@@ -15,7 +15,7 @@ $this->footScript()->appendFile($this->assetModule('front/search-tabs.js'));
               data-module="<?php echo $searchModule; ?>">
             <div class="search-tabs">
                 <ul class="list-inline">
-                    <li>
+                    <li class="list-inline-item">
                         <a href="#" class="js-search-global<?php if (!$searchModule) {
                             echo ' active';
                         } ?>">
@@ -25,7 +25,7 @@ $this->footScript()->appendFile($this->assetModule('front/search-tabs.js'));
                     <?php
                     foreach ($modules as $name => $data) {
                         echo sprintf(
-                            '<li><a data-name="%s" href="#" class="js-search-module%s">%s</a></li>',
+                            '<li class="list-inline-item"><a data-name="%s" href="#" class="js-search-module%s">%s</a></li>',
                             $name,
                             $name == $searchModule ? ' active' : '',
                             $this->escape($data['title'])
@@ -48,7 +48,7 @@ $this->footScript()->appendFile($this->assetModule('front/search-tabs.js'));
                 <ul class="list-inline">
                     <?php foreach ($service as $name => $data) {
                         echo sprintf(
-                            '<li><a data-name="%s" href="#" class="js-search-service">%s</a></li>',
+                            '<li class="list-inline-item"><a data-name="%s" href="#" class="js-search-service">%s</a></li>',
                             $name,
                             $this->escape($data['title'])
                         );
diff --git a/template/front/search-module-result.phtml b/template/front/search-module-result.phtml
index bbfd73b..6c26e2e 100644
--- a/template/front/search-module-result.phtml
+++ b/template/front/search-module-result.phtml
@@ -3,7 +3,7 @@ $this->css($this->assetModule('front/front.css'));
 $this->headMeta('noindex', 'robots');
 ?>
 <div class="clearfix">
-    <div class="col-md-8 col-md-offset-2 col-xs-12 text-center">
+    <div class="col-md-8 col-md-offset-2 col-12 text-center">
         <?php if (isset($query) && !empty($query)) { ?>
             <h1><?php echo sprintf(__('Search result of %s on %s'), $this->escape($query), $this->escape($modules[$searchModule]['title'])); ?></h1>
         <?php } else { ?>
@@ -12,7 +12,7 @@ $this->headMeta('noindex', 'robots');
     </div>
     <?php include $this->template('./search-form.phtml'); ?>
 
-    <div class="well well-sm">
+    <div class="card card-body bg-light mb-3">
         <?php if (0 < $total) {
             echo sprintf(__('On <strong>%s</strong> module we found about <strong>%d</strong> result on search of <strong>%s</strong>'), $this->escape($modules[$searchModule]['title']), $total, $this->escape($query));
         } elseif (!empty($flood)) {
@@ -33,7 +33,7 @@ $this->headMeta('noindex', 'robots');
                         <?php if (!empty($item['image'])) { ?>
                             <div class="col-md-2">
                                 <a title="<?php echo $item['title']; ?>" href="<?php echo $item['url']; ?>">
-                                    <img class="img-responsive img-rounded"
+                                    <img class="img-fluid rounded"
                                          src="<?php echo $this->escape($item['image']); ?>"
                                          alt="<?php echo $this->escape($item['title']); ?>">
                                 </a>
diff --git a/template/front/search-result.phtml b/template/front/search-result.phtml
index debe4c5..540f254 100644
--- a/template/front/search-result.phtml
+++ b/template/front/search-result.phtml
@@ -3,11 +3,11 @@ $this->css($this->assetModule('front/front.css'));
 $this->headMeta('noindex', 'robots');
 ?>
 <div class="clearfix">
-    <div class="col-md-8 col-md-offset-2 col-xs-12 text-center">
+    <div class="col-md-8 col-md-offset-2 col-12 text-center">
         <h1><?php echo sprintf(__('Search result of %s'), $this->escape($query)); ?></h1>
     </div>
     <?php include $this->template('./search-form.phtml'); ?>
-    <div class="well well-sm">
+    <div class="card card-body bg-light mb-3">
         <?php if (0 < $total) {
             echo sprintf(__('On all modules we found about <strong>%d</strong> result on search of <strong>%s</strong>'), $total, $this->escape($query));
         } elseif (!empty($flood)) {
@@ -24,12 +24,12 @@ $this->headMeta('noindex', 'robots');
             <div class="clearfix">
                 <div class="clearfix page-header">
                     <?php if (isset($query) && !empty($query)) { ?>
-                        <h2 class="col-md-10 panel-title"><?php echo sprintf(__('Search result of %s on %s'), $this->escape($query), $this->escape($modules[$name]['title'])); ?></h2>
+                        <h2 class="col-md-10 card-title"><?php echo sprintf(__('Search result of %s on %s'), $this->escape($query), $this->escape($modules[$name]['title'])); ?></h2>
                     <?php } else { ?>
-                        <h2 class="col-md-10 panel-title"><?php _e('Search result'); ?></h2>
+                        <h2 class="col-md-10 card-title"><?php _e('Search result'); ?></h2>
                     <?php } ?>
                     <div class="col-md-2 text-right">
-                        <span class="label label-default">
+                        <span class="badge badge-default">
                             <?php echo sprintf(__('%d found.'), $total); ?>
                         </span>
                     </div>
@@ -43,7 +43,7 @@ $this->headMeta('noindex', 'robots');
                             <?php if (!empty($item['image'])) { ?>
                                 <div class="col-md-2">
                                     <a title="<?php echo $item['title']; ?>" href="<?php echo $item['url']; ?>">
-                                        <img class="img-responsive img-rounded"
+                                        <img class="img-fluid rounded"
                                              src="<?php echo $this->escape($item['image']); ?>"
                                              alt="<?php echo $this->escape($item['title']); ?>">
                                     </a>
@@ -68,7 +68,7 @@ $this->headMeta('noindex', 'robots');
                 <?php if ($total > Pi::config('leading_limit', 'search')) { ?>
                     <div class="search-all-result clearfix col-md-12 text-right">
                         <a href="<?php echo $modules[$name]['url']; ?>">
-                            <span class="label label-success"><?php echo __('All result &raquo;'); ?></span>
+                            <span class="badge badge-success"><?php echo __('All result &raquo;'); ?></span>
                         </a>
                     </div>
                 <?php } ?>