diff --git a/application/views/widgets/table/table.php b/application/views/widgets/table/table.php
index 35d66988a..6cd49c61c 100644
--- a/application/views/widgets/table/table.php
+++ b/application/views/widgets/table/table.php
@@ -12,7 +12,9 @@
 		<div id="tableDatasetActionsTop"></div>
 
 		<!-- TableWidget table -->
-		<?php TableWidget::loadViewDataset(); ?>
+		<div class="border border-2 mb-4">
+			<?php TableWidget::loadViewDataset(); ?>
+		</div>
 
 		<!-- Table info bottom -->
 		<div id="tableDatasetActionsBottom"></div>
diff --git a/application/views/widgets/table/tableHelpsite.php b/application/views/widgets/table/tableHelpsite.php
index 56523f7da..fa864c634 100644
--- a/application/views/widgets/table/tableHelpsite.php
+++ b/application/views/widgets/table/tableHelpsite.php
@@ -1,10 +1,19 @@
 <!--CollapseHTML 'Help'-->
 <div class="row">
 	<div class="col-lg-12 collapse" id="tabulatorHelp-<?php echo $tableUniqueId; ?>">
-		<div class="well">
+		<div class="mb-4 " 
+			 style="<?php 
+				if(isset($bootstrapVersion) && $bootstrapVersion==5)
+				{ 
+					echo "border: 1px solid #ccc;
+      					  border-radius: 4px;
+      					  padding: 15px;
+      					  background-color: #f5f5f5;";
+				} ?>"
+			>
    
 			<h4><?php echo ucfirst($this->p->t('ui', 'tabelleneinstellungen')); ?></h4>
-			<div class="panel panel-body">
+			<div class=" <?php echo (isset($bootstrapVersion) && $bootstrapVersion==5)?"card card-body":"panel panel-body" ?>">
 				<b><?php echo $this->p->t('table', 'spaltenEinAusblenden'); ?></b>
 				<p>
                     <ul>
@@ -25,11 +34,11 @@
 			<br> <!--end panel-body-->
 			
 			<h4><?php echo $this->p->t('table', 'zeilenAuswaehlen'); ?></h4>
-			<div class="panel panel-body">
-				<ul>
-					<li><?php echo $this->p->t('table', 'zeilenAuswaehlenEinzeln'); ?></li>
-					<li><?php echo $this->p->t('table', 'zeilenAuswaehlenBereich'); ?></li>
-					<li><?php echo $this->p->t('table', 'zeilenAuswaehlenAlle'); ?></li>
+			<div class="<?php echo (isset($bootstrapVersion) && $bootstrapVersion==5)?"card card-body":"panel panel-body" ?>">
+				<ul class="mb-0">
+					<li class="mb-1"><?php echo $this->p->t('table', 'zeilenAuswaehlenEinzeln'); ?></li>
+					<li class="mb-1"><?php echo $this->p->t('table', 'zeilenAuswaehlenBereich'); ?></li>
+					<li class="mb-1"><?php echo $this->p->t('table', 'zeilenAuswaehlenAlle'); ?></li>
 				</ul>
 			</div>
 			<br> <!--end panel-body-->
diff --git a/public/css/Tabulator5.css b/public/css/Tabulator5.css
index b755f0d76..7c7c9ed57 100644
--- a/public/css/Tabulator5.css
+++ b/public/css/Tabulator5.css
@@ -44,3 +44,14 @@
 	max-height: 22px;
 	min-width: 30px;
 }
+
+.btn-select-col-selected
+{
+	background-color: #e6e6e6;
+}
+
+.accordion-item-dark, .accordion-item-dark:focus{
+	background-color:#CED4DA !important;
+	 border-color:#ADB5BD !important;
+	 box-shadow: none !important;
+}