diff --git a/application/layouts/clan3columns/index.php b/application/layouts/clan3columns/index.php
index 36822bf74..5d8d7ac71 100644
--- a/application/layouts/clan3columns/index.php
+++ b/application/layouts/clan3columns/index.php
@@ -7,6 +7,7 @@
         <link href="<?=$this->getLayoutUrl('style.css') ?>" rel="stylesheet">
         <?=$this->getCustomCSS() ?>
         <script src="<?=$this->getVendorUrl('twbs/bootstrap/dist/js/bootstrap.min.js') ?>"></script>
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/js/bootstrap.bundle.min.js"></script>
     </head>
     <body>
         <header>
diff --git a/application/layouts/clan3columns/index_full.php b/application/layouts/clan3columns/index_full.php
index 1f5cea317..33567c0b1 100644
--- a/application/layouts/clan3columns/index_full.php
+++ b/application/layouts/clan3columns/index_full.php
@@ -7,6 +7,7 @@
         <link href="<?=$this->getLayoutUrl('style.css') ?>" rel="stylesheet">
         <?=$this->getCustomCSS() ?>
         <script src="<?=$this->getVendorUrl('twbs/bootstrap/dist/js/bootstrap.min.js') ?>"></script>
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/js/bootstrap.bundle.min.js"></script>
     </head>
     <body>
       <header>
diff --git a/application/libraries/Captcha/DefaultCaptcha.php b/application/libraries/Captcha/DefaultCaptcha.php
index c918c0683..84db9984f 100644
--- a/application/libraries/Captcha/DefaultCaptcha.php
+++ b/application/libraries/Captcha/DefaultCaptcha.php
@@ -59,23 +59,23 @@ public function setForm(string $form): DefaultCaptcha
      */
     public function getCaptcha(View $view): string
     {
-        return '<div class="form-group ' . ($view->validation()->hasError('captcha') ? 'has-error' : '') . '">
-            <label class="col-lg-2 control-label">
+        return '<div class="form-group row mb-15 ' . ($view->validation()->hasError('captcha') ? 'has-error' : '') . '">
+            <label class="col-xl-2 control-label">
                 ' . $view->getTrans('captcha') . '
             </label>
-            <div class="col-lg-8">
+            <div class="col-xl-8">
                 ' . $view->getCaptchaField() . '
             </div>
         </div>
-        <div class="form-group ' . ($view->validation()->hasError('captcha') ? 'has-error' : '') . '">
-            <div class="col-lg-offset-2 col-lg-8 input-group captcha">
+        <div class="form-group row mb-15 ' . ($view->validation()->hasError('captcha') ? 'has-error' : '') . '">
+            <div class="offset-xl-2 col-xl-8 input-group captcha">
                 <input type="text"
                        class="form-control"
                        id="captcha-form"
                        name="captcha"
                        autocomplete="off"
                        placeholder="' . $view->getTrans('captcha') . '" />
-                <span class="input-group-addon">
+                <span class="input-group-text">
                     <a href="javascript:void(0)" onclick="
                         document.getElementById(\'captcha\').src=\'' . $view->getUrl() . '/application/libraries/Captcha/Captcha.php?\'+Math.random();
                         document.getElementById(\'captcha-form\').focus();"
diff --git a/application/libraries/Ilch/Layout/Base.php b/application/libraries/Ilch/Layout/Base.php
index 65b0b5015..eb6adea42 100644
--- a/application/libraries/Ilch/Layout/Base.php
+++ b/application/libraries/Ilch/Layout/Base.php
@@ -104,12 +104,12 @@ public function getContent(): string
                     $text .= '<li>' . $messageText . '</li>';
                 }
                 $text .= '</ul>';
-                $html .= '<div class="alert alert-' . $message['type'] . ' alert-dismissable">
-                            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+                $html .= '<div class="alert alert-' . $message['type'] . ' alert-dismissable" role="alert">
+                            <button type="button" class="btn-close" data-bs-dismiss="alert" aria-hidden="true" aria-label="close"></button>
                 ' . $text . '</div>';
             } else {
-                $html .= '<div class="alert alert-' . $message['type'] . ' alert-dismissable">
-                            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+                $html .= '<div class="alert alert-' . $message['type'] . ' alert-dismissable" role="alert">
+                            <button type="button" class="btn-close" data-bs-dismiss="alert" aria-hidden="true" aria-label="close"></button>
                 ' . $this->escape($message['text']) . '</div>';
             }
             unset($_SESSION['messages'][$key]);
diff --git a/application/libraries/Ilch/View.php b/application/libraries/Ilch/View.php
index 866674243..636a29ce4 100644
--- a/application/libraries/Ilch/View.php
+++ b/application/libraries/Ilch/View.php
@@ -55,7 +55,7 @@ public function load($file, $data = [])
     public function getSaveBar($saveKey = 'saveButton', $nameKey = null, $deleteKey = '')
     {
         $html = '<div class="content_savebox">
-                    <button type="submit" class="save_button btn btn-default" name="save'.$nameKey.'" value="save">
+                    <button type="submit" class="save_button btn btn-outline-secondary" name="save'.$nameKey.'" value="save">
                         '.$this->getTrans($saveKey).'
                     </button>';
 
diff --git a/application/modules/admin/views/admin/menu/index.php b/application/modules/admin/views/admin/menu/index.php
index 1238128b9..0e7117e4a 100644
--- a/application/modules/admin/views/admin/menu/index.php
+++ b/application/modules/admin/views/admin/menu/index.php
@@ -374,18 +374,18 @@ function escapeHtml(string) {
             if ($(this).val() == '0') {
                 $('.dyn').html('');
             } else if ($(this).val() == '1') {
-                $('.dyn').html('<div class="form-group"><label for="href" class="col-lg-4 control-label"><?=$this->getTrans('address') ?></label>\n\
+                $('.dyn').html('<div class="form-group row ilch-margin-b"><label for="href" class="col-lg-4 control-label"><?=$this->getTrans('address') ?></label>\n\
                                 <div class="col-lg-8"><input type="text" class="form-control" id="href" value="http://" /></div></div>\n\
-                                <div class="form-group"><label for="target" class="col-lg-4 control-label"><?=$this->getTrans('target') ?></label>\n\
+                                <div class="form-group row ilch-margin-b"><label for="target" class="col-lg-4 control-label"><?=$this->getTrans('target') ?></label>\n\
                                 <div class="col-lg-8"><select class="form-control" id="target"><?php foreach ($targets as $target => $translation) { echo '<option value="'.$target.'">'.$this->getTrans($translation).'</option>';} ?></select></div></div>'+menuHtml);
             } else if ($(this).val() == '2') {
-                 $('.dyn').html('<div class="form-group"><label for="siteid" class="col-lg-4 control-label"><?=$this->getTrans('page') ?></label>\n\
+                 $('.dyn').html('<div class="form-group row ilch-margin-b"><label for="siteid" class="col-lg-4 control-label"><?=$this->getTrans('page') ?></label>\n\
                                 <div class="col-lg-8"><?php if (!empty($pages)) { echo '<select class="form-control" id="siteid">'; foreach ($pages as $page) { echo '<option value="'.$page->getId().'">'.$this->escape($page->getTitle()).'</option>';} echo '</select>'; } else { echo $this->getTrans('missingSite'); } ?></div></div>'+menuHtml);
             } else if ($(this).val() == '3') {
-                $('.dyn').html('<div class="form-group"><label for="modulekey" class="col-lg-4 control-label"><?=$this->getTrans('module') ?></label>\n\
+                $('.dyn').html('<div class="form-group row ilch-margin-b"><label for="modulekey" class="col-lg-4 control-label"><?=$this->getTrans('module') ?></label>\n\
                                 <div class="col-lg-8"><?php if (!empty($modules)) { echo '<select class="form-control" id="modulekey">'; foreach ($modules as $module) { if ($module->getHideMenu() != true) { $content = $module->getContentForLocale($this->getTranslator()->getLocale()); echo '<option value="'.$module->getKey().'">'.$content['name'].'</option>';}} echo '</select>'; } else { echo $this->getTrans('missingModule'); } ?></div></div>'+menuHtml);
             } else if ($(this).val() == '4') {
-                $('.dyn').html('<div class="form-group"><label for="boxkey" class="col-lg-4 control-label"><?=$this->getTrans('box') ?></label>\n\
+                $('.dyn').html('<div class="form-group row ilch-margin-b"><label for="boxkey" class="col-lg-4 control-label"><?=$this->getTrans('box') ?></label>\n\
                                 <div class="col-lg-8"><?='<select class="form-control" id="boxkey">';
                     foreach ($boxes as $box) { echo '<option value="'.$box->getModule().'_'.$box->getKey().'">'.$box->getName().'</option>'; } foreach ($selfBoxes as $box) { echo '<option value="'.$box->getId().'">self_'.$this->escape($box->getTitle()).'</option>';} echo '</select>'; ?></div></div>');
             }
diff --git a/application/modules/comment/static/css/comment.css b/application/modules/comment/static/css/comment.css
index 76de6cbd5..45671d259 100644
--- a/application/modules/comment/static/css/comment.css
+++ b/application/modules/comment/static/css/comment.css
@@ -22,7 +22,8 @@
 
 .comment-list .media-block .media-left {
     display: block;
-    float: left
+    float: left;
+    margin-right: 10px;
 }
 
 .comment-list .media-block .media-body {
diff --git a/application/modules/gallery/boxes/views/pictureofx.php b/application/modules/gallery/boxes/views/pictureofx.php
index 9128fbdfd..1fcd071bd 100644
--- a/application/modules/gallery/boxes/views/pictureofx.php
+++ b/application/modules/gallery/boxes/views/pictureofx.php
@@ -42,8 +42,8 @@
 
 <?php if (!empty($image)) : ?>
     <?php $commentsCount = $commentMapper->getCountComments('gallery/index/showimage/id/' . $image->getId()); ?>
-    <div class="panel panel-default">
-        <div class="panel-image thumbnail">
+    <div class="card panel-default">
+        <div class="card-image img-thumbnail">
         <?php if (file_exists($image->getImageThumb())) : ?>
             <a href="<?=$this->getUrl(['module' => 'gallery', 'controller' => 'index', 'action' => 'showimage', 'id' => $image->getId()]) ?>">
                 <?php $altText = (empty($image->getImageTitle())) ? basename($image->getImageUrl()) : $image->getImageTitle(); ?>
@@ -53,7 +53,7 @@
             <?=$this->getTrans('pictureMissing') ?>
         <?php endif; ?>
         </div>
-        <div class="panel-footer text-center">
+        <div class="card-footer text-center">
             <i class="fa-regular fa-comment"></i> <?=$commentsCount ?>
             <i class="fa-solid fa-eye"> <?=$image->getVisits() ?></i>
         </div>
diff --git a/application/modules/gallery/static/css/gallery.css b/application/modules/gallery/static/css/gallery.css
index 0932b2a81..a29676166 100644
--- a/application/modules/gallery/static/css/gallery.css
+++ b/application/modules/gallery/static/css/gallery.css
@@ -11,6 +11,8 @@
 .lib-panel .col-md-6 {
     padding: 0;
     background-color: #FFFFFF;
+    margin-left: auto;
+    margin-right: auto;
 }
 
 .lib-panel .lib-row {
@@ -58,4 +60,4 @@
 
 .navbar-nav > li > .dropdown-menu {
     background-color: #e7e7e7
-}
\ No newline at end of file
+}
diff --git a/application/modules/gallery/views/index/index.php b/application/modules/gallery/views/index/index.php
index cf27faaf5..033dfbb66 100644
--- a/application/modules/gallery/views/index/index.php
+++ b/application/modules/gallery/views/index/index.php
@@ -92,38 +92,29 @@ function recGallery(\Modules\Gallery\Models\GalleryItem $item, \Modules\Gallery\
 <link href="<?=$this->getModuleUrl('static/css/gallery.css') ?>" rel="stylesheet">
 <h1><?=$this->getTrans('menuGallery') ?> <span class="catinfo"></span></h1>
 
-<nav class="navbar navbar-default">
+<nav class="navbar navbar-expand-lg navbar-light bg-light">
   <div class="container-fluid">
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse">
-        <span class="sr-only"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
+    <a class="navbar-brand"><?=$this->getTrans('navigation') ?></a>
+      <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar-collapse" aria-controls="navbar-collapse" aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
       </button>
-      <a class="navbar-brand"><?=$this->getTrans('navigation') ?></a>
-    </div>
     <div id="navbar-collapse" class="collapse navbar-collapse">
-      <ul class="nav navbar-nav">
-        <li class="dropdown active">
-          <a class="dropdown-toggle" href="#" id="dropdownConfig" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa-solid fa-arrow-down"></i> <?=$this->getTrans('allCat') ?></a>
-          <ul id="filters" class="dropdown-menu" aria-labelledby="dropdownConfig">
-            <li class="active"><a href="#filter" data-filter="*"><i class="fa-solid fa-image"></i> <?=$this->getTrans('allCat') ?></a></li>
-            <?php if (!empty($galleryItems)) :
-                ?>
-                <?php foreach ($galleryItems as $item) :
-                    ?>
-                    <?php recCategory($item, $galleryMapper, $this); ?>
-                    <?php
-                endforeach; ?>
-                <?php
-            endif; ?>
+      <ul class="navbar-nav">
+        <li class="nav-item dropdown active">
+          <a class="nav-link dropdown-toggle" href="#" id="dropdownConfig" data-bs-toggle="dropdown" role="button"><i class="fa-solid fa-arrow-down"></i> <?=$this->getTrans('allCat') ?></a>
+          <ul id="filters" class="dropdown-menu">
+            <li><a class="dropdown-item" href="#filter" data-filter="*"><i class="fa-solid fa-image"></i> <?=$this->getTrans('allCat') ?></a></li>
+            <?php if (!empty($galleryItems)): ?>
+              <?php foreach ($galleryItems as $item): ?>
+                <?php recCategory($item, $galleryMapper, $this, $imageMapper); ?>
+              <?php endforeach; ?>
+            <?php endif; ?>
           </ul>
         </li>
-        <li id="sorts"><a href="#filter" data-sort-direction="asc" data-sort-by="name"><i class="sorticon fa-solid fa-arrow-down-9-1"></i> <?=$this->getTrans('sort') ?></a></li>
+        <li id="sorts" class="nav-item"><a href="#filter" data-sort-direction="asc" data-sort-by="name" class="nav-link"><i class="sorticon fa-solid fa-arrow-down-9-1"></i> <?=$this->getTrans('sort') ?></a></li>
       </ul>
-      <form class="nav navbar-form navbar-right">
-        <input type="text" id="quicksearch" class="form-control" placeholder="<?=$this->getTrans('search') ?>">
+      <form class="d-flex">
+        <input type="text" id="quicksearch" class="form-control" aria-label="search" type="search" placeholder="<?=$this->getTrans('search') ?>">
       </form>
     </div>
   </div>
diff --git a/application/modules/gallery/views/index/show.php b/application/modules/gallery/views/index/show.php
index 9ea91ad2e..297197c33 100644
--- a/application/modules/gallery/views/index/show.php
+++ b/application/modules/gallery/views/index/show.php
@@ -48,30 +48,30 @@
 
 <link href="<?=$this->getModuleUrl('static/venobox/venobox.min.css') ?>" media="screen" rel="stylesheet">
 
-<div id="gallery">
+<div id="gallery" class="row">
     <?php
     /** @var \Modules\Gallery\Models\Image $image */
     foreach ($this->get('image') as $image) : ?>
         <?php $commentsCount = $commentMapper->getCountComments('gallery/index/showimage/id/' . $image->getId()); ?>
- 
-        <div class="col-xs-6 col-md-4 col-lg-3 col-sm-4">
-            <div class="panel panel-default">
+
+        <div class="col-sm-6 col-lg-4 col-xl-3 col-md-4">
+            <div class="card card-default">
             <?php if (file_exists($image->getImageThumb())) : ?>
                 <a class="venobox" data-gall="gallery01" href="<?= $this->getUrl() . '/' . $image->getImageUrl() ?>" title="<?= $image->getImageTitle() ?> ">
-                    <div class="panel-image thumbnail">
+                    <div class="card-image img-thumbnail">
                         <img src="<?= $this->getUrl() . '/' . $image->getImageThumb() ?>" class="panel-image-preview" alt="<?= $this->escape($image->getImageTitle()) ?>" />
                     </div>
                 </a>
             <?php else : ?>
                 <a class="venobox" data-gall="gallery01" href="<?= $this->getUrl() . '/' . $image->getImageUrl() ?>" data-title="<?= $image->getImageTitle() ?> ">
-                    <div class="panel-image thumbnail">
+                    <div class="card-image img-thumbnail">
                         <img src="<?=$this->getBaseUrl('application/modules/media/static/img/nomedia.png') ?>" class="panel-image-preview" alt="<?=$this->getTrans('noMediaAlt') ?>" />
                     </div>
                 </a>
             <?php endif; ?>
 
                 <a href="<?=$this->getUrl(['action' => 'showimage', 'id' => $image->getId()]) ?>" title="<?=$this->getTrans('description')?>">
-                    <div class="panel-footer text-center">
+                    <div class="card-footer text-center">
                         <i class="fa-regular fa-comment"></i> <?=$commentsCount ?>
                         <i class="fa-solid fa-eye"></i> <?=$image->getVisits() ?>
                     </div>
diff --git a/application/modules/guestbook/views/index/index.php b/application/modules/guestbook/views/index/index.php
index 6ed40b2df..02a1a9159 100644
--- a/application/modules/guestbook/views/index/index.php
+++ b/application/modules/guestbook/views/index/index.php
@@ -5,19 +5,19 @@
     </div>
 </h1>
 <?php if (!empty($this->get('welcomeMessage'))) : ?>
-<div class="panel panel-default">
-    <div class="panel-body welcomeMessage"><?=$this->purify($this->get('welcomeMessage')) ?></div>
+<div class="card panel-default">
+    <div class="card-body welcomeMessage"><?=$this->purify($this->get('welcomeMessage')) ?></div>
 </div>
 <?php endif; ?>
 <?php foreach ($this->get('entries') as $entry): ?>
     <?php $date = new \Ilch\Date($entry->getDatetime()); ?>
-    <div class="panel panel-default">
-        <div class="panel-heading">
+    <div class="card panel-default">
+        <div class="card-header">
             <div class="row">
-                <div class="col-sm-6 col-lg-5">
+                <div class="col-md-6 col-xl-5">
                     <?=$this->getTrans('from') ?>: <?=$this->escape($entry->getName()) ?>
                 </div>
-                <div class="col-sm-6 col-lg-3">
+                <div class="col-md-6 col-xl-3">
                     <?php if ($this->getUser() && $this->getUser()->isAdmin()) : ?>
                         <a target="_blank" href="mailto:<?=$this->escape($entry->getEmail()) ?>">
                             <i class="fa-solid fa-envelope"></i>
@@ -29,12 +29,12 @@
                         </a>
                     <?php endif; ?>
                 </div>
-                <div class="col-sm-12 col-lg-4">
+                <div class="col-md-12 col-xl-4">
                     <?=$this->getTrans('date') ?>: <?=$date->format('H:i d.m.Y', true) ?>
                 </div>
             </div>
         </div>
-        <div class="panel-body">
+        <div class="card-body">
             <?=$this->alwaysPurify($entry->getText()) ?>
         </div>
     </div>
diff --git a/application/modules/guestbook/views/index/newentry.php b/application/modules/guestbook/views/index/newentry.php
index ec8fe2083..27e98407c 100644
--- a/application/modules/guestbook/views/index/newentry.php
+++ b/application/modules/guestbook/views/index/newentry.php
@@ -2,11 +2,11 @@
 
 <form id="guestbookForm" name="guestbookForm" class="form-horizontal" method="POST">
     <?=$this->getTokenField() ?>
-    <div class="form-group hidden">
-        <label for="bot" class="col-lg-2 control-label">
+    <div class="row form-group mb-15 hidden">
+        <label for="bot" class="col-xl-2 control-label">
             <?=$this->getTrans('bot') ?>*
         </label>
-        <div class="col-lg-8">
+        <div class="col-xl-8">
             <input type="text"
                    class="form-control"
                    name="bot"
@@ -14,11 +14,11 @@ class="form-control"
                    placeholder="Bot" />
         </div>
     </div>
-    <div class="form-group <?=$this->validation()->hasError('name') ? 'has-error' : '' ?>">
-        <label for="name" class="col-lg-2 control-label">
+    <div class="row form-group mb-15 <?=$this->validation()->hasError('name') ? 'has-error' : '' ?>">
+        <label for="name" class="col-xl-2 control-label">
             <?=$this->getTrans('name') ?>*
         </label>
-        <div class="col-lg-8">
+        <div class="col-xl-8">
             <input type="text"
                    class="form-control"
                    name="name"
@@ -27,11 +27,11 @@ class="form-control"
                    value="<?=$this->escape($this->originalInput('name')) ?>" />
         </div>
     </div>
-    <div class="form-group <?= $this->validation()->hasError('email') ? 'has-error' : '' ?>">
-        <label for="email" class="col-lg-2 control-label">
+    <div class="row form-group mb-15 <?= $this->validation()->hasError('email') ? 'has-error' : '' ?>">
+        <label for="email" class="col-xl-2 control-label">
             <?=$this->getTrans('email') ?>*
         </label>
-        <div class="col-lg-8">
+        <div class="col-xl-8">
             <input type="email"
                    class="form-control"
                    name="email"
@@ -40,11 +40,11 @@ class="form-control"
                    value="<?=$this->escape($this->originalInput('email')) ?>" />
         </div>
     </div>
-    <div class="form-group <?= $this->validation()->hasError('homepage') ? 'has-error' : '' ?>">
-        <label for="homepage" class="col-lg-2 control-label">
+    <div class="row form-group mb-15 <?= $this->validation()->hasError('homepage') ? 'has-error' : '' ?>">
+        <label for="homepage" class="col-xl-2 control-label">
             <?=$this->getTrans('page') ?>
         </label>
-        <div class="col-lg-8">
+        <div class="col-xl-8">
            <input type="text"
                   class="form-control"
                   name="homepage"
@@ -53,11 +53,11 @@ class="form-control"
                   value="<?=$this->escape($this->originalInput('homepage')) ?>" />
         </div>
     </div>
-    <div class="form-group <?= $this->validation()->hasError('text') ? 'has-error' : '' ?>">
-        <label for="text" class="col-lg-2 control-label">
+    <div class="row form-group mb-15 <?= $this->validation()->hasError('text') ? 'has-error' : '' ?>">
+        <label for="text" class="col-xl-2 control-label">
             <?=$this->getTrans('message') ?>*
         </label>
-        <div class="col-lg-8">
+        <div class="col-xl-8">
             <textarea class="form-control ckeditor"
                       id="ck_1"
                       name="text"
@@ -69,8 +69,8 @@ class="form-control"
     <?php if ($this->get('captchaNeeded') && $this->get('defaultcaptcha')) : ?>
         <?=$this->get('defaultcaptcha')->getCaptcha($this) ?>
     <?php endif; ?>
-    <div class="form-group">
-        <div class="col-lg-offset-2 col-lg-8">
+    <div class="row form-group mb-15">
+        <div class="offset-xl-2 col-xl-8">
             <?php
                 if ($this->get('captchaNeeded')) {
                     if ($this->get('googlecaptcha')) {
diff --git a/application/modules/linkus/views/index/index.php b/application/modules/linkus/views/index/index.php
index ffb265a78..f17349e1b 100644
--- a/application/modules/linkus/views/index/index.php
+++ b/application/modules/linkus/views/index/index.php
@@ -6,41 +6,40 @@
 <h1><?=$this->getTrans('menuLinkus') ?></h1>
 <?php if ($linkus != ''): ?>
     <?php foreach ($linkus as $linkus): ?>
-        <div class="row">
-            <div class="col-lg-12">
-                <h4><?=$this->escape($linkus->getTitle()) ?></h4>
-                <div class="col-lg-12 text-center">
-                    <a href="<?=$this->getUrl() ?>" target="_blank" rel="noopener"><img src="<?=$this->getBaseUrl($this->escape($linkus->getBanner())) ?>" alt="<?=$this->escape($linkus->getTitle()) ?>" title="<?=$this->escape($linkus->getTitle()) ?>" border="0"></a>
-                    <br /><br />
-                </div>
+        <div class="row col-xl-12">
+              <h4><?=$this->escape($linkus->getTitle()) ?></h4>
+              <div class="col-xl-12 text-center">
+                  <a href="<?=$this->getUrl() ?>" target="_blank" rel="noopener"><img src="<?=$this->getBaseUrl($this->escape($linkus->getBanner())) ?>" alt="<?=$this->escape($linkus->getTitle()) ?>" title="<?=$this->escape($linkus->getTitle()) ?>" border="0"></a>
+                  <br /><br />
+              </div>
 
-                <?php if ($config->get('linkus_html') == 1): ?>
-                    <div class="col-lg-6 text-center">
-                        <?=$this->getTrans('htmlForWebsite') ?>
-                        <textarea class="form-control"
-                                  style="resize: vertical"
-                                  name="text"
-                                  rows="4"
-                                  readonly><a href="<?=$this->getUrl() ?>" target="_blank" rel="noopener"><img src="<?=$this->getBaseUrl($this->escape($linkus->getBanner())) ?>" border="0"></a></textarea>
-                    </div>
-                <?php endif; ?>
+              <?php if ($config->get('linkus_html') == 1): ?>
+                  <div class="col-xl-6 text-center">
+                      <?=$this->getTrans('htmlForWebsite') ?>
+                      <textarea class="form-control bg-light"
+                                style="resize: vertical"
+                                name="text"
+                                type="text"
+                                rows="4"
+                                readonly><a href="<?=$this->getUrl() ?>" target="_blank" rel="noopener"><img src="<?=$this->getBaseUrl($this->escape($linkus->getBanner())) ?>" border="0"></a></textarea>
+                  </div>
+              <?php endif; ?>
 
-                <?php if ($config->get('linkus_bbcode') == 1): ?>
-                    <div class="col-lg-6 text-center">
-                        <?=$this->getTrans('bbcodeForForum') ?>
-                        <textarea class="form-control"
-                                  style="resize: vertical"
-                                  name="text"
-                                  rows="4"
-                                  readonly>[url=<?=$this->getUrl() ?>][img]<?=$this->getBaseUrl($this->escape($linkus->getBanner())) ?>[/img][/url]</textarea>
-                    </div>
-                <?php endif; ?>
-            </div>
+              <?php if ($config->get('linkus_bbcode') == 1): ?>
+                  <div class="col-xl-6 text-center">
+                      <?=$this->getTrans('bbcodeForForum') ?>
+                      <textarea class="form-control bg-light"
+                                style="resize: vertical"
+                                name="text"
+                                rows="4"
+                                readonly>[url=<?=$this->getUrl() ?>][img]<?=$this->getBaseUrl($this->escape($linkus->getBanner())) ?>[/img][/url]</textarea>
+                  </div>
+              <?php endif; ?>
         </div>
         <hr />
     <?php endforeach; ?>
 <?php else: ?>
-    <div class="col-lg-12">
+    <div class="col-xl-12">
         <?=$this->getTrans('noLinkus') ?>
     </div>
 <?php endif; ?>
diff --git a/application/modules/partner/views/index/index.php b/application/modules/partner/views/index/index.php
index e98347aa7..56b4bca3a 100644
--- a/application/modules/partner/views/index/index.php
+++ b/application/modules/partner/views/index/index.php
@@ -1,22 +1,22 @@
 <h1><?=$this->getTrans('menuPartnerAdd') ?></h1>
 <form id="partnerForm" name="partnerForm" method="POST" class="form-horizontal">
     <?=$this->getTokenField() ?>
-    <div class="form-group hidden">
-        <label class="col-lg-2 control-label">
+    <div class="row form-group mb-15 d-none">
+        <label class="col-xl-2 control-label">
             <?=$this->getTrans('bot') ?>*
         </label>
-        <div class="col-lg-8">
+        <div class="col-xl-8">
             <input type="text"
                    class="form-control"
                    name="bot"
                    placeholder="Bot" />
         </div>
     </div>
-    <div class="form-group <?=$this->validation()->hasError('name') ? 'has-error' : '' ?>">
-        <label for="name" class="col-lg-2 control-label">
+    <div class="row form-group mb-15 <?=$this->validation()->hasError('name') ? 'has-error' : '' ?>">
+        <label for="name" class="col-xl-2 control-label">
             <?=$this->getTrans('name') ?>:
         </label>
-        <div class="col-lg-8">
+        <div class="col-xl-8">
             <input type="text"
                    class="form-control"
                    id="name"
@@ -25,11 +25,11 @@ class="form-control"
                    value="<?=($this->originalInput('name') != '' ? $this->escape($this->originalInput('name')) : '') ?>" />
         </div>
     </div>
-    <div class="form-group <?=$this->validation()->hasError('link') ? 'has-error' : '' ?>">
-        <label for="link" class="col-lg-2 control-label">
+    <div class="row form-group mb-15 <?=$this->validation()->hasError('link') ? 'has-error' : '' ?>">
+        <label for="link" class="col-xl-2 control-label">
             <?=$this->getTrans('link') ?>:
         </label>
-        <div class="col-lg-8">
+        <div class="col-xl-8">
             <input type="text"
                    class="form-control"
                    id="link"
@@ -38,11 +38,11 @@ class="form-control"
                    value="<?=($this->originalInput('link') != '' ? $this->escape($this->originalInput('link')) : '') ?>" />
         </div>
     </div>
-    <div class="form-group <?=$this->validation()->hasError('banner') ? 'has-error' : '' ?>">
-        <label for="banner" class="col-lg-2 control-label">
+    <div class="row form-group mb-15 <?=$this->validation()->hasError('banner') ? 'has-error' : '' ?>">
+        <label for="banner" class="col-xl-2 control-label">
             <?=$this->getTrans('banner') ?>:
         </label>
-        <div class="col-lg-8">
+        <div class="col-xl-8">
             <input type="text"
                    class="form-control"
                    id="banner"
@@ -54,8 +54,8 @@ class="form-control"
     <?php if ($this->get('captchaNeeded') && $this->get('defaultcaptcha')) : ?>
         <?=$this->get('defaultcaptcha')->getCaptcha($this) ?>
     <?php endif; ?>
-    <div class="form-group">
-        <div class="col-lg-offset-2 col-lg-8">
+    <div class="row form-group mb-15">
+        <div class="offset-xl-2 col-xl-8">
             <?php
                 if ($this->get('captchaNeeded')) {
                     if ($this->get('googlecaptcha')) {
diff --git a/application/modules/rule/views/index/index.php b/application/modules/rule/views/index/index.php
index 74481a160..d2589fc0a 100644
--- a/application/modules/rule/views/index/index.php
+++ b/application/modules/rule/views/index/index.php
@@ -1,3 +1,4 @@
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.5/font/bootstrap-icons.css">
 <?php
 
 /** @var \Ilch\View $this */
@@ -23,11 +24,11 @@ function rec(\Modules\Rule\Models\Rule $item, \Ilch\View $obj)
     if ($item->getParentId() === 0 && !$subItemsFalse) {
         echo '<div class="card">
     <div class="card-header" id="paragraph' . $paragraph . '">
-        <h3 class="mb-0" data-toggle="collapse" data-target="#paragraph0_' . $paragraph . '" aria-expanded="false" aria-controls="paragraph0_' . $paragraph . '">
-            <a href="#paragraph' . $paragraph . '"><i class="fa-solid fa-bookmark"></i></a> ' . $obj->getTrans('art') . ' ' . $paragraph . ' : ' . $obj->escape($item->getTitle()) . '<span class="pull-right glyphicon glyphicon-' . ($obj->get('showallonstart') ? 'minus' : 'plus') . '"></span>
+        <h3 class="mb-0" data-bs-toggle="collapse" data-bs-target="#paragraph0_'.$paragraph.'" aria-expanded="false" aria-controls="paragraph0_'.$paragraph.'">
+            <a href="#paragraph'.$paragraph.'"><i class="fa fa-bookmark"></i></a> '.$obj->getTrans('art').' '.$paragraph.' : '.$obj->escape($item->getTitle()).'<span class="pull-right bi bi-'.($obj->get('showallonstart')?'dash':'plus').'"></span>
         </h3>
     </div>
-    <div id="paragraph0_' . $paragraph . '" class="panel-collapse collapse" aria-labelledby="paragraph' . $paragraph . '" data-parent="#accordion">
+    <div id="paragraph0_'.$paragraph.'" class="panel-collapse collapse" aria-labelledby="paragraph'.$paragraph.'" data-bs-parent="#accordion">
         <div class="card-body">
             <table class="table table-striped table-responsive">';
 
@@ -75,10 +76,10 @@ function rec(\Modules\Rule\Models\Rule $item, \Ilch\View $obj)
 
         $('#accordion .collapse')
         .on('shown.bs.collapse', function() {
-            $(this).parent().find(".glyphicon-plus").removeClass("glyphicon-plus").addClass("glyphicon-minus");
+            $(this).parent().find(".bi-plus").removeClass("bi-plus").addClass("bi-dash");
         })
         .on('hidden.bs.collapse', function() {
-            $(this).parent().find(".glyphicon-minus").removeClass("glyphicon-minus").addClass("glyphicon-plus");
+            $(this).parent().find(".bi-dash").removeClass("bi-dash").addClass("bi-plus");
         });
 
         function openAnchorAccordion() {
diff --git a/application/modules/training/views/index/show.php b/application/modules/training/views/index/show.php
index 3562c6f2b..03dc0bb14 100644
--- a/application/modules/training/views/index/show.php
+++ b/application/modules/training/views/index/show.php
@@ -6,32 +6,32 @@
 <?php if ($this->get('hasReadAccess')) : ?>
     <h1><?=$this->getTrans('trainDetails') ?></h1>
     <div class="form-horizontal">
-        <div class="form-group">
-            <div class="col-lg-3">
+        <div class="row form-group mb-15">
+            <div class="col-xl-3">
                 <?=$this->getTrans('title') ?>:
             </div>
             <div class="col-lg-9"><?=$this->escape($training->getTitle()) ?></div>
         </div>
-        <div class="form-group">
-            <div class="col-lg-3">
+        <div class="row form-group mb-15">
+            <div class="col-xl-3">
                 <?=$this->getTrans('dateTime') ?>:
             </div>
             <div class="col-lg-9"><?=date('d.m.Y', strtotime($training->getDate())) ?> <?=$this->getTrans('at') ?> <?=date('H:i', strtotime($training->getDate())) ?> <?=$this->getTrans('clock') ?></div>
         </div>
-        <div class="form-group">
-            <div class="col-lg-3">
+        <div class="row form-group mb-15">
+            <div class="col-xl-3">
                 <?=$this->getTrans('time') ?>:
             </div>
-            <div class="col-lg-9">~ <?=$this->escape($training->getTime()) ?></div>
+            <div class="col-xl-9">~ <?=$this->escape($training->getTime()) ?></div>
         </div>
-        <div class="form-group">
+        <div class="row form-group mb-15">
             <div class="col-lg-3">
                 <?=$this->getTrans('place') ?>:
             </div>
-            <div class="col-lg-9"><?=$this->escape($training->getPlace()) ?></div>
+            <div class="col-xl-9"><?=$this->escape($training->getPlace()) ?></div>
         </div>
-        <div class="form-group">
-            <div class="col-lg-3">
+        <div class="row form-group mb-15">
+            <div class="col-xl-3">
                 <?=$this->getTrans('contactPerson') ?>:
             </div>
             <?php $contactUser = $userMapper->getUserById($training->getContact()); ?>
@@ -39,19 +39,19 @@
         </div>
         <?php if ($training->getVoiceServer() != ''): ?>
             <?php if ($training->getVoiceServerIP() != ''): ?>
-                <div class="form-group">
-                    <div class="col-lg-3">
+                <div class="row form-group mb-15">
+                    <div class="col-xl-3">
                         <?=$this->getTrans('voiceServerIP') ?>:
                     </div>
-                    <div class="col-lg-9"><?=$this->escape($training->getVoiceServerIP()) ?></div>
+                    <div class="col-xl-9"><?=$this->escape($training->getVoiceServerIP()) ?></div>
                 </div>
             <?php endif; ?>
             <?php if ($training->getVoiceServerPW() != ''): ?>
-                <div class="form-group">
-                    <div class="col-lg-3">
+                <div class="row form-group mb-15">
+                    <div class="col-xl-3">
                         <?=$this->getTrans('voiceServerPW') ?>:
                     </div>
-                    <div class="col-lg-9">
+                    <div class="col-xl-9">
                         <?php if ($this->getUser() && $this->get('trainEntrantUser') != ''): ?>
                             <?=$this->escape($training->getVoiceServerPW()) ?>
                         <?php else: ?>
@@ -63,19 +63,19 @@
         <?php endif; ?>
         <?php if ($training->getGameServer() != ''): ?>
             <?php if ($training->getGameServerIP() != ''): ?>
-                <div class="form-group">
-                    <div class="col-lg-3">
+                <div class="row form-group mb-15">
+                    <div class="col-xl-3">
                         <?=$this->getTrans('gameServerIP') ?>:
                     </div>
-                    <div class="col-lg-9"><?=$this->escape($training->getGameServerIP()) ?></div>
+                    <div class="col-xl-9"><?=$this->escape($training->getGameServerIP()) ?></div>
                 </div>
             <?php endif; ?>
             <?php if ($training->getGameServerPW() != ''): ?>
-                <div class="form-group">
-                    <div class="col-lg-3">
+                <div class="row form-group mb-15">
+                    <div class="col-xl-3">
                         <?=$this->getTrans('gameServerPW') ?>:
                     </div>
-                    <div class="col-lg-9">
+                    <div class="col-xl-9">
                         <?php if ($this->getUser() && $this->get('trainEntrantUser') != ''): ?>
                             <?=$this->escape($training->getGameServerPW()) ?>
                         <?php else: ?>
@@ -85,11 +85,11 @@
                 </div>
             <?php endif; ?>
         <?php endif; ?>
-        <div class="form-group">
-            <div class="col-lg-3">
+        <div class="row form-group mb-15">
+            <div class="col-xl-3">
                 <?=$this->getTrans('entrant') ?>:
             </div>
-            <div class="col-lg-9">
+            <div class="col-xl-9">
                 <?=$this->getTrans('entrys') ?> <?=$this->get('trainEntrantsUserCount') ?>
                 <?php if ($this->get('trainEntrantsUserCount') != 0): ?>
                     <br />
@@ -104,11 +104,11 @@
                 <?php endif; ?>
             </div>
         </div>
-        <div class="form-group">
-            <div class="col-lg-12">
+        <div class="row form-group mb-15">
+            <div class="col-xl-12">
                 <?=$this->getTrans('otherInfo') ?>:
             </div>
-            <div class="col-lg-12">
+            <div class="col-xl-12">
                 <?php if ($training->getText()!= ''): ?>
                     <?=$this->purify($training->getText()) ?>
                 <?php else: ?>
@@ -126,11 +126,11 @@
                         <?=$this->getTrans('decline') ?>
                     </button>
                 <?php else: ?>
-                    <div class="form-group">
+                    <div class="row form-group mb-15">
                         <label for="otherInfo" class="col-lg-2" style="top: 7px;">
                             <?=$this->getTrans('note') ?>:
                         </label>
-                        <div class="col-lg-4">
+                        <div class="col-xl-4">
                         <textarea class="form-control"
                                   style="resize: none;"
                                   id="otherInfo"
@@ -138,7 +138,7 @@
                                   cols="10"
                                   rows="1"></textarea>
                         </div>
-                        <div class="col-lg-2" style="top: 2px;">
+                        <div class="col-xl-2" style="top: 2px;">
                             <button type="submit" class="btn btn-sm btn-success" name="save" value="save">
                                 <?=$this->getTrans('join') ?>
                             </button>
diff --git a/static/css/ilch.css b/static/css/ilch.css
index d68aa0e4e..f3ed4d851 100644
--- a/static/css/ilch.css
+++ b/static/css/ilch.css
@@ -91,3 +91,13 @@ img {
 .input-group > :not(.input-group-addon):not(.input-group-btn) + .input-group-addon {
     border-left-width: 0;
 }
+
+/* Margin-bottom Class */
+.mb-15 {
+    margin-bottom: 15px;
+}
+/* input-group BS5 have width 100% */
+
+.input-group {
+  width:auto !important;
+}
