diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php
index f0ff8f12..6ca9f7bd 100644
--- a/application/controllers/Logbook.php
+++ b/application/controllers/Logbook.php
@@ -1287,9 +1287,9 @@ function worked_grid_before($gridsquare, $type, $band, $mode)
 		$ci =& get_instance();
 		switch($name) {
 		case 'Mode':    $ret.= '<td>'; $ret.= $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE . '</td>'; break;
-		case 'RSTS':    $ret.= '<td class="d-none d-sm-table-cell">' . $row->COL_RST_SENT; if ($row->COL_STX) { $ret.= ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; $ret.=sprintf("%03d", $row->COL_STX); $ret.= '</span>';} if ($row->COL_STX_STRING) { $ret.= ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_STX_STRING . '</span>';} $ret.= '</td>'; break;
-		case 'RSTR':    $ret.= '<td class="d-none d-sm-table-cell">' . $row->COL_RST_RCVD; if ($row->COL_SRX) { $ret.= ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; $ret.=sprintf("%03d", $row->COL_SRX); $ret.= '</span>';} if ($row->COL_SRX_STRING) { $ret.= ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';} $ret.= '</td>'; break;
-		case 'Country': $ret.= '<td>' . ucwords(strtolower(($row->COL_COUNTRY))); if ($row->end != NULL) $ret.= ' <span class="badge badge-danger">'.$ci->lang->line('gen_hamradio_deleted_dxcc').'</span>'  . '</td>'; break;
+		case 'RSTS':    $ret.= '<td class="d-none d-sm-table-cell">' . $row->COL_RST_SENT; if ($row->COL_STX) { $ret.= ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; $ret.=sprintf("%03d", $row->COL_STX); $ret.= '</span>';} if ($row->COL_STX_STRING) { $ret.= ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_STX_STRING . '</span>';} $ret.= '</td>'; break;
+		case 'RSTR':    $ret.= '<td class="d-none d-sm-table-cell">' . $row->COL_RST_RCVD; if ($row->COL_SRX) { $ret.= ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; $ret.=sprintf("%03d", $row->COL_SRX); $ret.= '</span>';} if ($row->COL_SRX_STRING) { $ret.= ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';} $ret.= '</td>'; break;
+		case 'Country': $ret.= '<td>' . ucwords(strtolower(($row->COL_COUNTRY))); if ($row->end != NULL) $ret.= ' <span class="badge text-bg-danger">'.$ci->lang->line('gen_hamradio_deleted_dxcc').'</span>'  . '</td>'; break;
 		case 'IOTA':    $ret.= '<td>' . ($row->COL_IOTA) . '</td>'; break;
 		case 'SOTA':    $ret.= '<td>' . ($row->COL_SOTA_REF) . '</td>'; break;
 		case 'WWFF':    $ret.= '<td>' . ($row->COL_WWFF_REF) . '</td>'; break;
diff --git a/application/views/accumulate/index.php b/application/views/accumulate/index.php
index ccb1d5c0..a91c5ae3 100644
--- a/application/views/accumulate/index.php
+++ b/application/views/accumulate/index.php
@@ -4,10 +4,10 @@
         <form class="form">
 
                 <!-- Select Basic -->
-                <div class="form-group row">
+                <div class="mb-3 row">
                     <label class="col-md-1 control-label" for="band">Band</label>
                     <div class="col-md-3">
-                        <select id="band" name="band" class="form-control custom-select">
+                        <select id="band" name="band" class="form-select form-select">
                             <option value="All">All</option>
                             <?php foreach($worked_bands as $band) {
                                 echo '<option value="' . $band . '">' . $band . '</option>'."\n";
@@ -17,7 +17,7 @@
 
                     <label class="col-md-1 control-label" for="mode">Mode</label>
                     <div class="col-md-3">
-                        <select id="mode" name="mode" class="form-control custom-select">
+                        <select id="mode" name="mode" class="form-select form-select">
                             <option value="All">All</option>
                             <?php
                             foreach($modes->result() as $mode){
@@ -32,7 +32,7 @@
                     </div>
                 </div>
 
-                <div class="form-group row">
+                <div class="mb-3 row">
 
                         <label class="col-md-1 control-label" for="radio">Award</label>
                         <div class="col-md-3">
@@ -81,7 +81,7 @@
 
 
                 <!-- Button (Double) -->
-                <div class="form-group row">
+                <div class="mb-3 row">
                     <div class="col-md-10">
                         <button id="button1id" type="button" name="button1id" class="btn btn-primary ld-ext-right" onclick="accumulatePlot(this.form)">Show<div class="ld ld-ring ld-spin"></div></button>
                     </div>
diff --git a/application/views/activated_gridmap/index.php b/application/views/activated_gridmap/index.php
index 7c8e055f..5865dba2 100644
--- a/application/views/activated_gridmap/index.php
+++ b/application/views/activated_gridmap/index.php
@@ -46,9 +46,9 @@
 
 	<h2><?php echo lang('gridsquares_activated_gridsquare_map'); ?></h2>
 
-<form class="form-inline">
-            <label class="my-1 mr-2" for="band"><?php echo lang('gridsquares_band'); ?></label>
-            <select class="custom-select my-1 mr-sm-2"  id="band">
+<form class="d-flex align-items-center">
+            <label class="my-1 me-2" for="band"><?php echo lang('gridsquares_band'); ?></label>
+            <select class="form-select my-1 me-sm-2"  id="band">
                 <option value="All"><?php echo lang('general_word_all')?></option>
                 <?php foreach($bands as $band) {
                     echo '<option value="'.$band.'"';
@@ -59,8 +59,8 @@
                 } ?>
             </select>
             <?php if (count($sats_available) != 0) { ?>
-                <label class="my-1 mr-2" for="distplot_sats"><?php echo lang('gridsquares_sat'); ?></label>
-                <select class="custom-select my-1 mr-sm-2"  id="sats" <?php if ($user_default_band != "SAT") { ?>disabled<?php } ?>>
+                <label class="my-1 me-2" for="distplot_sats"><?php echo lang('gridsquares_sat'); ?></label>
+                <select class="form-select my-1 me-sm-2"  id="sats" <?php if ($user_default_band != "SAT") { ?>disabled<?php } ?>>
                     <option value="All"><?php echo lang('general_word_all')?></option>
                     <?php foreach($sats_available as $sat) {
                         echo '<option value="' . $sat . '"' . '>' . $sat . '</option>'."\n";
@@ -69,8 +69,8 @@
             <?php } else { ?>
                 <input id="sats" type="hidden" value="All"></input>
             <?php } ?>
-			<label class="my-1 mr-2" for="mode"><?php echo lang('gridsquares_mode'); ?></label>
-            <select class="custom-select my-1 mr-sm-2"  id="mode">
+			<label class="my-1 me-2" for="mode"><?php echo lang('gridsquares_mode'); ?></label>
+            <select class="form-select my-1 me-sm-2"  id="mode">
 			<option value="All"><?php echo lang('general_word_all')?></option>
                     <?php
                     foreach($modes as $mode){
@@ -80,7 +80,7 @@
                     }
                     ?>
             </select>
-			<label class="my-1 mr-2"><?php echo lang('gridsquares_confirmation'); ?></label>
+			<label class="my-1 me-2"><?php echo lang('gridsquares_confirmation'); ?></label>
                 <div>
                     <div class="form-check-inline">
                     <?php echo '<input class="form-check-input" type="checkbox" name="qsl" id="qsl"';
@@ -108,8 +108,8 @@
                     </div>
                 </div>
 
-            <button id="plot" type="button" name="plot" class="btn btn-primary mr-1 ld-ext-right ld-ext-right-plot" onclick="gridPlot(this.form)"><?php echo lang('gridsquares_button_plot'); ?><div class="ld ld-ring ld-spin"></div></button>
-			<button id="clear" type="button" name="clear" class="btn btn-primary mr-1 ld-ext-right ld-ext-right-clear" onclick="clearMarkers()"><?php echo lang('gridsquares_button_clear_markers'); ?><div class="ld ld-ring ld-spin"></div></button>
+            <button id="plot" type="button" name="plot" class="btn btn-primary me-1 ld-ext-right ld-ext-right-plot" onclick="gridPlot(this.form)"><?php echo lang('gridsquares_button_plot'); ?><div class="ld ld-ring ld-spin"></div></button>
+			<button id="clear" type="button" name="clear" class="btn btn-primary me-1 ld-ext-right ld-ext-right-clear" onclick="clearMarkers()"><?php echo lang('gridsquares_button_clear_markers'); ?><div class="ld ld-ring ld-spin"></div></button>
 </form>
 
 		<?php if($this->session->flashdata('message')) { ?>
@@ -125,15 +125,15 @@
 </div>
 <div class="coordinates d-flex">
         <div class="cohidden"><?php echo lang('gen_hamradio_latitude')?>: </div>
-        <div class="cohidden col-auto text-success font-weight-bold" id="latDeg"></div>
+        <div class="cohidden col-auto text-success fw-bold" id="latDeg"></div>
         <div class="cohidden"><?php echo lang('gen_hamradio_longitude')?>: </div>
-        <div class="cohidden col-auto text-success font-weight-bold" id="lngDeg"></div>
+        <div class="cohidden col-auto text-success fw-bold" id="lngDeg"></div>
         <div class="cohidden"><?php echo lang('gen_hamradio_gridsquare')?>: </div>
-        <div class="cohidden col-auto text-success font-weight-bold" id="locator"></div>
+        <div class="cohidden col-auto text-success fw-bold" id="locator"></div>
         <div class="cohidden"><?php echo lang('gen_hamradio_distance')?>: </div>
-        <div class="cohidden col-auto text-success font-weight-bold" id="distance"></div>
+        <div class="cohidden col-auto text-success fw-bold" id="distance"></div>
         <div class="cohidden"><?php echo lang('gen_hamradio_bearing')?>: </div>
-        <div class="cohidden col-auto text-success font-weight-bold" id="bearing"></div>
+        <div class="cohidden col-auto text-success fw-bold" id="bearing"></div>
 </div>
 <script>var gridsquaremap = true;
 var type = "activated";
diff --git a/application/views/activated_grids/index.php b/application/views/activated_grids/index.php
index c099c5b9..a9dc52e8 100644
--- a/application/views/activated_grids/index.php
+++ b/application/views/activated_grids/index.php
@@ -5,9 +5,9 @@
 	<h2><?php echo $page_title; ?></h2>
 
 	<?php if ($this->uri->segment(1) == "activated_grids" && $this->uri->segment(2) == "band") { ?>
-<form class="form-inline">
-	<label class="my-1 mr-2" for="gridsquare_bands"><?php echo lang('gen_band_selection'); ?></label>
-	<select class="custom-select my-1 mr-sm-2"  id="gridsquare_bands"></select>
+<form class="d-flex align-items-center">
+	<label class="my-1 me-2" for="gridsquare_bands"><?php echo lang('gen_band_selection'); ?></label>
+	<select class="form-select my-1 me-sm-2"  id="gridsquare_bands"></select>
 </form>
 
 <?php } ?>
@@ -42,8 +42,8 @@
     <div class="modal-content">
       <div class="modal-header">
         <h5 class="modal-title" id="exampleModalLabel"><span id="qso_count"></span> QSO<span id="gt1_qso"></span> from Square: <span id="square_number"></span></h5>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">
+          
         </button>
       </div>
       <div class="modal-body">
@@ -62,7 +62,7 @@
 		</table>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
       </div>
     </div>
   </div>
diff --git a/application/views/activators/index.php b/application/views/activators/index.php
index 9aef4031..255fbed3 100644
--- a/application/views/activators/index.php
+++ b/application/views/activators/index.php
@@ -3,10 +3,10 @@
 
     <form class="form" action="<?php echo site_url('activators'); ?>" method="post" enctype="multipart/form-data">
         <!-- Select Basic -->
-                <div class="form-group row">
+                <div class="mb-3 row">
                     <label class="col-md-1 control-label" for="band"><?php echo lang('gen_hamradio_band'); ?></label>
                     <div class="col-md-3">
-                        <select id="band" name="band" class="form-control custom-select">
+                        <select id="band" name="band" class="form-select form-select">
                             <option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> ><?php echo lang('general_word_all'); ?></option>
                             <?php foreach($worked_bands as $band) {
                                 echo '<option value="' . $band . '"';
@@ -16,20 +16,20 @@
                         </select>
                     </div>
                 </div>
-                <div class="form-group row" id="leogeo">
+                <div class="mb-3 row" id="leogeo">
                     <label class="col-md-1 control-label" for="leogeo">LEO/GEO</label>
                     <div class="col-md-3">
-                        <select id="leogeo" name="leogeo" class="form-control custom-select">
+                        <select id="leogeo" name="leogeo" class="form-select form-select">
                             <option value="both" <?php if ($this->input->post('leogeo') == "both" || $this->input->method() !== 'post') echo ' selected'; ?> >Both</option>
                             <option value="leo" <?php if ($this->input->post('leogeo') == "leo") echo ' selected'; ?>>LEO</option>
                             <option value="geo" <?php if ($this->input->post('leogeo') == "geo") echo ' selected'; ?>>GEO</option>
                         </select>
                     </div>
                 </div>
-                <div class="form-group row">
+                <div class="mb-3 row">
                     <label class="col-md-1 control-label" for="mincount"><?php echo lang('gridsquares_minimum_count'); ?></label>
                     <div class="col-md-3">
-                        <select id="mincount" name="mincount" class="form-control custom-select">
+                        <select id="mincount" name="mincount" class="form-select form-select">
                             <?php
                                 $i = 1;
                                 do {
@@ -44,7 +44,7 @@
 
                 </div>
 
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <label class="col-md-1 control-label" for="button1id"></label>
                 <div class="col-md-10">
                     <button id="button1id" type="submit" name="button1id" class="btn btn-primary"><?php echo lang('filter_options_show'); ?></button>
@@ -76,7 +76,7 @@
             $result = write_activators($activators_array, $vucc_grids, $custom_date_format, $this->input->post('band'), $this->input->post('leogeo'));
         }
         else {
-            echo '<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
+            echo '<div class="alert alert-danger" role="alert"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
         }
     }
     ?>
diff --git a/application/views/adif/import.php b/application/views/adif/import.php
index 8e6d7aa7..ca093ee5 100644
--- a/application/views/adif/import.php
+++ b/application/views/adif/import.php
@@ -13,16 +13,16 @@
     <div class="card-header">
     <ul class="nav nav-tabs card-header-tabs pull-right" role="tablist">
         <li class="nav-item">
-            <a class="nav-link <?php if($showtab == '' || $showtab == 'adif') { echo 'active'; } ?>" id="import-tab" data-toggle="tab" href="#import" role="tab" aria-controls="import" aria-selected="<?php if ($showtab == '' || $showtab == 'adif') { echo 'true'; } else { echo 'false'; } ?>"><?php echo lang('adif_import')?></a>
+            <a class="nav-link <?php if($showtab == '' || $showtab == 'adif') { echo 'active'; } ?>" id="import-tab" data-bs-toggle="tab" href="#import" role="tab" aria-controls="import" aria-selected="<?php if ($showtab == '' || $showtab == 'adif') { echo 'true'; } else { echo 'false'; } ?>"><?php echo lang('adif_import')?></a>
         </li>
         <li class="nav-item">
-            <a class="nav-link" id="export-tab" data-toggle="tab" href="#export" role="tab" aria-controls="export" aria-selected="false"><?php echo lang('adif_export')?></a>
+            <a class="nav-link" id="export-tab" data-bs-toggle="tab" href="#export" role="tab" aria-controls="export" aria-selected="false"><?php echo lang('adif_export')?></a>
         </li>
         <li class="nav-item">
-            <a class="nav-link" id="lotw-tab" data-toggle="tab" href="#lotw" role="tab" aria-controls="lotw" aria-selected="false"><?php echo lang('lotw_title')?></a>
+            <a class="nav-link" id="lotw-tab" data-bs-toggle="tab" href="#lotw" role="tab" aria-controls="lotw" aria-selected="false"><?php echo lang('lotw_title')?></a>
         </li>
         <li class="nav-item">
-            <a class="nav-link <?php if ($showtab == 'dcl') { echo 'active'; } ?>" id="dcl-tab" data-toggle="tab" href="#dcl" role="tab" aria-controls="dcl" aria-selected="<?php if ($showtab == 'dcl') { echo 'true'; } else { echo 'false'; } ?>"><?php echo lang('darc_dcl')?></a>
+            <a class="nav-link <?php if ($showtab == 'dcl') { echo 'active'; } ?>" id="dcl-tab" data-bs-toggle="tab" href="#dcl" role="tab" aria-controls="dcl" aria-selected="<?php if ($showtab == 'dcl') { echo 'true'; } else { echo 'false'; } ?>"><?php echo lang('darc_dcl')?></a>
         </li>
     </ul>
     </div>
@@ -37,20 +37,20 @@
                     </div>
                 <?php } ?>
 
-                <p><span class="badge badge-warning"><?php echo lang('general_word_important')?></span> <?php echo lang('adif_alert_log_files_type')?></p>
-                <p><span class="badge badge-warning"><?php echo lang('general_word_warning')?></span> <?php echo lang('gen_max_file_upload_size')?><?php echo $max_upload; ?>B.</p>
+                <p><span class="badge text-bg-warning"><?php echo lang('general_word_important')?></span> <?php echo lang('adif_alert_log_files_type')?></p>
+                <p><span class="badge text-bg-warning"><?php echo lang('general_word_warning')?></span> <?php echo lang('gen_max_file_upload_size')?><?php echo $max_upload; ?>B.</p>
 
                 <form class="form" action="<?php echo site_url('adif/import'); ?>" method="post" enctype="multipart/form-data">
-                    <select name="station_profile" class="custom-select mb-2 mr-sm-2" style="width: 20%;">
+                    <select name="station_profile" class="form-select mb-2 me-sm-2" style="width: 20%;">
                     <option value="0"><?php echo lang('adif_select_stationlocation')?></option>
                     <?php foreach ($station_profile->result() as $station) { ?>
                     <option value="<?php echo $station->station_id; ?>" <?php if ($station->station_id == $this->stations->find_active()) { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_callsign') . ": "?><?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
                     <?php } ?>
                     </select>
-                  <label class="sr-only" for="inlineFormInputName2"><?php echo lang('adif_file_label')?></label>
-                  <input class="file-input mb-2 mr-sm-2" type="file" name="userfile" size="20" />
+                  <label class="visually-hidden" for="inlineFormInputName2"><?php echo lang('adif_file_label')?></label>
+                  <input class="file-input mb-2 me-sm-2" type="file" name="userfile" size="20" />
 
-                    <div class="form-group row">
+                    <div class="mb-3 row">
                         <div class="col-md-10">
                             <div class="form-check-inline">
                                 <input class="form-check-input" type="checkbox" name="skipDuplicate" value="1" id="skipDuplicate">
@@ -59,7 +59,7 @@
                         </div>
                     </div>
 
-                    <div class="form-group row">
+                    <div class="mb-3 row">
                         <div class="col-md-10">
                             <div class="form-check-inline">
                                 <input class="form-check-input" type="checkbox" name="markLotw" value="1" id="markLotwImport">
@@ -69,7 +69,7 @@
                         </div>
                     </div>
 
-                    <div class="form-group row">
+                    <div class="mb-3 row">
                         <div class="col-md-10">
                             <div class="form-check-inline">
                                 <input class="form-check-input" type="checkbox" name="markHrd" value="1" id="markHrdImport">
@@ -79,7 +79,7 @@
                         </div>
                     </div>
 
-                    <div class="form-group row">
+                    <div class="mb-3 row">
                         <div class="col-md-10">
                             <div class="form-check-inline">
                                 <input class="form-check-input" type="checkbox" name="markQrz" value="1" id="markQrzImport">
@@ -89,7 +89,7 @@
                         </div>
                     </div>
 
-                    <div class="form-group row">
+                    <div class="mb-3 row">
                         <div class="col-md-10">
                             <div class="form-check-inline">
                                 <input class="form-check-input" type="checkbox" name="markClublog" value="1" id="markClublogImport">
@@ -99,7 +99,7 @@
                         </div>
                     </div>
 
-                    <div class="form-group row">
+                    <div class="mb-3 row">
                         <div class="col-md-10">
                             <div class="form-check-inline">
                                 <input class="form-check-input" type="checkbox" name="dxccAdif" value="1" id="dxccAdif">
@@ -109,7 +109,7 @@
                         </div>
                     </div>
 
-					<div class="form-group row">
+					<div class="mb-3 row">
 						<div class="col-md-10">
 							<div class="form-check-inline">
 								<input class="form-check-input" type="checkbox" name="operatorName" value="1" id="operatorName">
@@ -118,11 +118,11 @@
 						</div>
 					</div>
 
-					<div class="form-group row">
+					<div class="mb-3 row">
 						<div class="col-md-10">
 							<div class="form-check-inline">
 								<input class="form-check-input" type="checkbox" name="skipStationCheck" value="1" id="skipStationCheck">
-								<label class="form-check-label" for="skipStationCheck"><span class="badge badge-warning"><?php echo lang('general_word_danger')?></span> <?php echo lang('adif_ignore_station_call')?></label>
+								<label class="form-check-label" for="skipStationCheck"><span class="badge text-bg-warning"><?php echo lang('general_word_danger')?></span> <?php echo lang('adif_ignore_station_call')?></label>
 							</div>
                             				<div class="small form-text text-muted"><?php echo lang('adif_ignore_station_call_hint')?></div>
 						</div>
@@ -137,7 +137,7 @@
 		  <form class="form" action="<?php echo site_url('adif/export_custom'); ?>" method="post" enctype="multipart/form-data">
                 <h5 class="card-title"><?php echo lang('adif_export_take_it_anywhere')?> </h5>
                 <p class="card-text"><?php echo lang('adif_export_take_it_anywhere_hint')?> </p>
-					  <select name="station_profile" class="custom-select mb-2 mr-sm-2" style="width: 20%;">
+					  <select name="station_profile" class="form-select mb-2 me-sm-2" style="width: 20%;">
 						  <option value="0"><?php echo lang('adif_select_stationlocation')?></option>
 						  <?php foreach ($station_profile->result() as $station) { ?>
                        <option value="<?php echo $station->station_id; ?>" <?php if ($station->station_id == $this->stations->find_active()) { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_callsign') . ": "?><?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
@@ -146,8 +146,8 @@
                       <p class="card-text"><?php echo lang('gen_from_date') . ": "?></p>
                       <div class="row">
                           <div class="input-group date col-md-3" id="datetimepicker1" data-target-input="nearest">
-                              <input name="from" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker1"/>
-                              <div class="input-group-append"  data-target="#datetimepicker1" data-toggle="datetimepicker">
+                              <input name="from" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-bs-target="#datetimepicker1"/>
+                              <div class="input-group-append"  data-bs-target="#datetimepicker1" data-bs-toggle="datetimepicker">
                                   <div class="input-group-text"><i class="fa fa-calendar"></i></div>
                               </div>
                           </div>
@@ -156,14 +156,14 @@
                       <p class="card-text"><?php echo lang('gen_to_date') . ": "?></p>
                       <div class="row">
                           <div class="input-group date col-md-3" id="datetimepicker2" data-target-input="nearest">
-                              <input name="to" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker2"/>
-                              <div class="input-group-append" data-target="#datetimepicker2" data-toggle="datetimepicker">
+                              <input name="to" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-bs-target="#datetimepicker2"/>
+                              <div class="input-group-append" data-bs-target="#datetimepicker2" data-bs-toggle="datetimepicker">
                                   <div class="input-group-text"><i class="fa fa-calendar"></i></div>
                               </div>
                           </div>
                       </div>
                         <br>
-                      <div class="form-group row">
+                      <div class="mb-3 row">
                           <div class="col-md-10">
                               <div class="form-check-inline">
                                   <input class="form-check-input" type="checkbox" name="markLotw" value="1" id="markLotwExport">
@@ -171,7 +171,7 @@
                               </div>
                           </div>
                       </div>
-                      <div class="form-group row">
+                      <div class="mb-3 row">
                           <div class="col-md-10">
                               <div class="form-check-inline">
                                   <input class="form-check-input" type="checkbox" name="exportLotw" value="1" id="exportLotw">
@@ -194,18 +194,18 @@
 
         <div class="tab-pane fade" id="lotw" role="tabpanel" aria-labelledby="home-tab">
             <form class="form" action="<?php echo site_url('adif/mark_lotw'); ?>" method="post" enctype="multipart/form-data">
-				<select name="station_profile" class="custom-select mb-2 mr-sm-2" style="width: 20%;">
+				<select name="station_profile" class="form-select mb-2 me-sm-2" style="width: 20%;">
 					<option value="0"><?php echo lang('adif_select_stationlocation')?></option>
 					<?php foreach ($station_profile->result() as $station) { ?>
 						<option value="<?php echo $station->station_id; ?>"><?php echo lang('gen_hamradio_callsign') . ": "?><?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
 					<?php } ?>
 				</select>
-				<p><span class="badge badge-warning"><?php echo lang('general_word_warning')?></span> <?php echo lang('adif_lotw_export_if_selected')?></p>
+				<p><span class="badge text-bg-warning"><?php echo lang('general_word_warning')?></span> <?php echo lang('adif_lotw_export_if_selected')?></p>
                 <p class="card-text"><?php echo lang('gen_from_date') . ": "?></p>
                 <div class="row">
                     <div class="input-group date col-md-3" id="datetimepicker3" data-target-input="nearest">
-                        <input name="from" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker1"/>
-                        <div class="input-group-append"  data-target="#datetimepicker3" data-toggle="datetimepicker">
+                        <input name="from" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-bs-target="#datetimepicker1"/>
+                        <div class="input-group-append"  data-bs-target="#datetimepicker3" data-bs-toggle="datetimepicker">
                             <div class="input-group-text"><i class="fa fa-calendar"></i></div>
                         </div>
                     </div>
@@ -213,8 +213,8 @@
                 <p class="card-text"><?php echo lang('gen_to_date') . ": "?></p>
                 <div class="row">
                     <div class="input-group date col-md-3" id="datetimepicker4" data-target-input="nearest">
-                        <input name="to" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker2"/>
-                        <div class="input-group-append" data-target="#datetimepicker4" data-toggle="datetimepicker">
+                        <input name="to" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-bs-target="#datetimepicker2"/>
+                        <div class="input-group-append" data-bs-target="#datetimepicker4" data-bs-toggle="datetimepicker">
                             <div class="input-group-text"><i class="fa fa-calendar"></i></div>
                         </div>
                     </div>
@@ -233,7 +233,7 @@
                 <p class="card-text"><?php echo lang('adif_dcl_text_pre')?> <a href="http://dcl.darc.de/dml/export_adif_form.php" target="_blank"><?php echo lang('darc_dcl')?></a> <?php echo lang('adif_dcl_text_post')?></p>
                 <form class="form" action="<?php echo site_url('adif/dcl'); ?>" method="post" enctype="multipart/form-data">
 
-                    <div class="form-group row">
+                    <div class="mb-3 row">
                         <div class="col-md-10">
                             <div class="form-check-inline">
                                 <input class="form-check-input" type="checkbox" name="onlyConfirmed" value="1" id="onlyConfirmed" checked>
@@ -242,16 +242,16 @@
                             <div class="small form-text text-muted"><?php echo lang('only_confirmed_qsos_hint')?></div>
                         </div>
                     </div>
-                    <div class="form-group row">
+                    <div class="mb-3 row">
                         <div class="col-md-10">
                             <div class="form-check-inline">
                                 <input class="form-check-input" type="checkbox" name="overwriteDok" value="1" id="overwriteDok">
-                                <label class="form-check-label" for="overwriteDok"><span class="badge badge-warning"><?php echo lang('general_word_warning')?></span> <?php echo lang('overwrite_by_dcl')?></label>
+                                <label class="form-check-label" for="overwriteDok"><span class="badge text-bg-warning"><?php echo lang('general_word_warning')?></span> <?php echo lang('overwrite_by_dcl')?></label>
                             </div>
                             <div class="small form-text text-muted"><?php echo lang('overwrite_by_dcl_hint')?></div>
                         </div>
                     </div>
-                    <div class="form-group row">
+                    <div class="mb-3 row">
                         <div class="col-md-10">
                             <div class="form-check-inline">
                                 <input class="form-check-input" type="checkbox" name="ignoreAmbiguous" value="1" id="ignoreAmbiguous" checked>
@@ -260,7 +260,7 @@
                             <div class="small form-text text-muted"><?php echo lang('ignore_ambiguous_hint')?></div>
                         </div>
                     </div>
-                  <input class="file-input mb-2 mr-sm-2" type="file" name="userfile" size="20" />
+                  <input class="file-input mb-2 me-sm-2" type="file" name="userfile" size="20" />
                   <button type="submit" class="btn-sm btn-primary mb-2" value="Upload"><?php echo lang('adif_upload')?></button>
                 </form>
         </div>
diff --git a/application/views/api/description.php b/application/views/api/description.php
index 23c49d4f..a627417c 100644
--- a/application/views/api/description.php
+++ b/application/views/api/description.php
@@ -22,7 +22,7 @@
 
 
 	<form method="post" action="<?php echo site_url('api/edit'); ?>/<?php echo $api_info['key']; ?>" name="APIDescription">
-	  <div class="form-group">
+	  <div class="mb-3">
 	    <label for="APIDescription">API Description</label>
 	    <input type="text" class="form-control" name="api_desc" id="APIDescription" aria-describedby="APIDescriptionHelp" value="<?php echo $api_info['description']; ?>">
 	    <small id="APIDescriptionHelp" class="form-text text-muted">Simple name to describe what you use this API for.</small>
diff --git a/application/views/api/help.php b/application/views/api/help.php
index e422f0d4..68ff78a3 100644
--- a/application/views/api/help.php
+++ b/application/views/api/help.php
@@ -16,8 +16,8 @@
   <div class="card-body">
 	<p class="card-text">The Cloudlog API (Application Programming Interface) lets third party systems access Cloudlog in a controlled way. Access to the API is managed via API keys.</p>
 	<p class="card-text">You will need to generate an API key for each tool you wish to use (e.g. CloudlogCAT). Generate a read-write key if the application needs to send data to Cloudlog. Generate a read-only key if the application only needs to obtain data from Cloudlog.</p>
-   <p class="card-text"><span class="badge badge-warning">API URL</span> The API URL for this Cloudlog instance is: <span class="api-url" id="apiUrl"><a target="_blank" href="<?php echo base_url(); ?>"><?php echo base_url(); ?></a></span><span data-toggle="tooltip" data-original-title="<?php echo lang('copy_to_clipboard'); ?>" onClick='copyApiUrl()'><i class="copy-icon fas fa-copy"></i></span></p>
-	<p class="card-text"><span class="badge badge-info">Info</span> It's good practice to delete a key if you are no longer using the associated application.</p>
+   <p class="card-text"><span class="badge text-bg-warning">API URL</span> The API URL for this Cloudlog instance is: <span class="api-url" id="apiUrl"><a target="_blank" href="<?php echo base_url(); ?>"><?php echo base_url(); ?></a></span><span data-bs-toggle="tooltip" data-original-title="<?php echo lang('copy_to_clipboard'); ?>" onClick='copyApiUrl()'><i class="copy-icon fas fa-copy"></i></span></p>
+	<p class="card-text"><span class="badge text-bg-info">Info</span> It's good practice to delete a key if you are no longer using the associated application.</p>
 
 		<?php if ($api_keys->num_rows() > 0) { ?>
 
@@ -35,7 +35,7 @@
 		  <tbody>
 			<?php foreach ($api_keys->result() as $row) { ?>
 				<tr>
-					<td><i class="fas fa-key"></i> <span class="api-key" id="<?php echo $row->key; ?>"><?php echo $row->key; ?></span> <span data-toggle="tooltip" data-original-title="<?php echo lang('copy_to_clipboard'); ?>" onclick='copyApiKey("<?php echo $row->key; ?>")'><i class="copy-icon fas fa-copy"></span></td>
+					<td><i class="fas fa-key"></i> <span class="api-key" id="<?php echo $row->key; ?>"><?php echo $row->key; ?></span> <span data-bs-toggle="tooltip" data-original-title="<?php echo lang('copy_to_clipboard'); ?>" onclick='copyApiKey("<?php echo $row->key; ?>")'><i class="copy-icon fas fa-copy"></span></td>
 					<td><?php echo $row->description; ?></td>
 					<td><?php echo $row->last_used; ?></td>
 					<td>
@@ -52,7 +52,7 @@
 						?>
 
 					</td>
-					<td><span class="badge badge-pill badge-success"><?php echo ucfirst($row->status); ?></span></td>
+					<td><span class="badge rounded-pill text-bg-success"><?php echo ucfirst($row->status); ?></span></td>
 					<td>
 						<a href="<?php echo site_url('api/edit'); ?>/<?php echo $row->key; ?>" class="btn btn-outline-primary btn-sm">Edit</a>
 
diff --git a/application/views/awards/counties/details.php b/application/views/awards/counties/details.php
index 94852d23..49f8661a 100644
--- a/application/views/awards/counties/details.php
+++ b/application/views/awards/counties/details.php
@@ -24,6 +24,6 @@
         echo '</tbody></table></div>';
     }
     else {
-        echo '<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
+        echo '<div class="alert alert-danger" role="alert"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
     }
     ?>
diff --git a/application/views/awards/counties/index.php b/application/views/awards/counties/index.php
index a446daf7..4065490a 100644
--- a/application/views/awards/counties/index.php
+++ b/application/views/awards/counties/index.php
@@ -10,7 +10,7 @@
             var lang_award_info_ln4 = "<?php echo lang('awards_counties_description_ln4'); ?>";
             </script>
             <h2><?php echo $page_title; ?></h2>
-            <button type="button" class="btn btn-sm btn-primary mr-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
         </div>
         <!-- End of Award Info Box -->
     <?php if ($counties_array) { ?>
@@ -43,7 +43,7 @@
         </tbody>
     </table>
     <?php } else {
-        echo '<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
+        echo '<div class="alert alert-danger" role="alert"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
     }
     ?>
 </div>
\ No newline at end of file
diff --git a/application/views/awards/cq/index.php b/application/views/awards/cq/index.php
index d4f0051f..a6d5376c 100644
--- a/application/views/awards/cq/index.php
+++ b/application/views/awards/cq/index.php
@@ -44,14 +44,14 @@
       var lang_award_info_ln4 = "<?php echo lang('awards_cq_description_ln4'); ?>";
     </script>
     <h2><?php echo lang('awards_cq_page_title'); ?></h2>
-    <button type="button" class="btn btn-sm btn-primary mr-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+    <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
   </div>
   <!-- End of Award Info Box -->
             <form class="form" action="<?php echo site_url('awards/cq'); ?>" method="post" enctype="multipart/form-data">
             <fieldset>
 
             <!-- Multiple Checkboxes (inline) -->
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <div class="col-md-2" for="checkboxes"><?php echo lang('general_word_worked') . ' / ' . lang('general_word_confirmed')?></div>
                 <div class="col-md-10">
                     <div class="form-check-inline">
@@ -69,7 +69,7 @@
                 </div>
             </div>
 
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <div class="col-md-2"><?php echo lang('gen_hamradio_qsltype'); ?></div>
                 <div class="col-md-10">
                     <div class="form-check-inline">
@@ -87,10 +87,10 @@
                 </div>
             </div>
 
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <label class="col-md-2 control-label" for="band"><?php echo lang('gen_hamradio_band'); ?></label>
                 <div class="col-md-2">
-                    <select id="band2" name="band" class="form-control custom-select-sm">
+                    <select id="band2" name="band" class="form-select form-select-sm">
                         <option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> ><?php echo lang('general_word_all'); ?></option>
                         <?php foreach($worked_bands as $band) {
                             echo '<option value="' . $band . '"';
@@ -101,10 +101,10 @@
                 </div>
             </div>
 
-			<div class="form-group row">
+			<div class="mb-3 row">
 				<label class="col-md-2 control-label" for="mode"><?php echo lang('gen_hamradio_mode'); ?></label>
 				<div class="col-md-2">
-					<select id="mode" name="mode" class="form-control custom-select-sm">
+					<select id="mode" name="mode" class="form-select form-select-sm">
 						<option value="All" <?php if ($this->input->post('mode') == "All" || $this->input->method() !== 'mode') echo ' selected'; ?>><?php echo lang('general_word_all'); ?></option>
 						<?php
 						foreach($modes->result() as $mode){
@@ -123,7 +123,7 @@
 				</div>
 			</div>
 
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <label class="col-md-2 control-label" for="button1id"></label>
                 <div class="col-md-10">
                     <button id="button2id" type="reset" name="button2id" class="btn btn-sm btn-warning"><?php echo lang('filter_reset'); ?></button>
@@ -138,10 +138,10 @@
 
     <ul class="nav nav-tabs" id="myTab" role="tablist">
         <li class="nav-item">
-            <a class="nav-link active" id="table-tab" data-toggle="tab" href="#table" role="tab" aria-controls="table" aria-selected="true"><?php echo lang('general_word_table'); ?></a>
+            <a class="nav-link active" id="table-tab" data-bs-toggle="tab" href="#table" role="tab" aria-controls="table" aria-selected="true"><?php echo lang('general_word_table'); ?></a>
         </li>
         <li class="nav-item">
-            <a class="nav-link" onclick="load_cq_map();" id="map-tab" data-toggle="tab" href="#cqmaptab" role="tab" aria-controls="home" aria-selected="false"><?php echo lang('filter_map'); ?></a>
+            <a class="nav-link" onclick="load_cq_map();" id="map-tab" data-bs-toggle="tab" href="#cqmaptab" role="tab" aria-controls="home" aria-selected="false"><?php echo lang('filter_map'); ?></a>
         </li>
     </ul>
     <br />
@@ -212,7 +212,7 @@
 
     }
     else {
-        echo '<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
+        echo '<div class="alert alert-danger" role="alert"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
     }
     ?>
 
diff --git a/application/views/awards/dok/index.php b/application/views/awards/dok/index.php
index 5c33ff05..b43a41c7 100644
--- a/application/views/awards/dok/index.php
+++ b/application/views/awards/dok/index.php
@@ -10,16 +10,16 @@
             var lang_award_info_ln4 = "<?php echo lang('awards_dok_description_ln4'); ?>";
             </script>
             <h2><?php echo $page_title; ?></h2>
-            <button type="button" class="btn btn-sm btn-primary mr-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
         </div>
         <!-- End of Award Info Box -->
             <form class="form" action="<?php echo site_url('awards/dok'); ?>" method="post" enctype="multipart/form-data">
             <fieldset>
 
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <label class="col-md-2 control-label" for="band">DOK / SDOK</label>
                 <div class="col-md-2">
-                    <select id="doks" name="doks" class="form-control custom-select-sm">
+                    <select id="doks" name="doks" class="form-select form-select-sm">
                         <option value="both" <?php if ($this->input->post('doks') == "both" || $this->input->method() !== 'post') echo ' selected'; ?> >DOK + SDOK</option>
                         <?php echo '<option value="dok"';
                             if ($this->input->post('doks') == 'dok') echo ' selected';
@@ -33,7 +33,7 @@
                 </div>
             </div>
 
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <div class="col-md-2" for="checkboxes">Worked / Confirmed</div>
                 <div class="col-md-10">
                     <div class="form-check-inline">
@@ -47,7 +47,7 @@
                 </div>
             </div>
 
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <div class="col-md-2">QSL Type</div>
                 <div class="col-md-10">
                     <div class="form-check-inline">
@@ -65,10 +65,10 @@
                 </div>
             </div>
 
-           <div class="form-group row">
+           <div class="mb-3 row">
                <label class="col-md-2 control-label" for="band">Band</label>
                <div class="col-md-2">
-                   <select id="band2" name="band" class="form-control custom-select-sm">
+                   <select id="band2" name="band" class="form-select form-select-sm">
                        <option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> >Every band</option>
                        <?php foreach($worked_bands as $band) {
                            echo '<option value="' . $band . '"';
@@ -79,10 +79,10 @@
                </div>
            </div>
 
-           <div class="form-group row">
+           <div class="mb-3 row">
                <label class="col-md-2 control-label" for="mode">Mode</label>
                <div class="col-md-2">
-                  <select id="mode" name="mode" class="form-control custom-select-sm">
+                  <select id="mode" name="mode" class="form-select form-select-sm">
                      <option value="All" <?php if ($this->input->post('mode') == "All" || $this->input->method() !== 'mode') echo ' selected'; ?>>All</option>
                      <?php
                         foreach($modes->result() as $mode){
@@ -112,7 +112,7 @@
    }
 ?>
 
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <label class="col-md-2 control-label" for="button1id"></label>
                 <div class="col-md-10">
                     <button id="button2id" type="reset" name="button2id" class="btn btn-sm btn-warning">Reset</button>
@@ -185,7 +185,7 @@
 
     }
     else {
-        echo '<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
+        echo '<div class="alert alert-danger" role="alert"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
     }
     ?>
 
diff --git a/application/views/awards/dxcc/index.php b/application/views/awards/dxcc/index.php
index 40e78d15..92fb4d55 100644
--- a/application/views/awards/dxcc/index.php
+++ b/application/views/awards/dxcc/index.php
@@ -43,14 +43,14 @@
             var lang_award_info_ln4 = "<?php echo lang('awards_dxcc_description_ln4'); ?>";
             </script>
             <h2><?php echo $page_title; ?></h2>
-            <button type="button" class="btn btn-sm btn-primary mr-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
         </div>
         <!-- End of Award Info Box -->
 
     <form class="form" action="<?php echo site_url('awards/dxcc'); ?>" method="post" enctype="multipart/form-data">
         <fieldset>
 
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <div class="col-md-2 control-label" for="checkboxes">Deleted DXCC</div>
                 <div class="col-md-10">
                     <div class="form-check-inline">
@@ -61,7 +61,7 @@
             </div>
 
             <!-- Multiple Checkboxes (inline) -->
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <div class="col-md-2" for="checkboxes">Worked / Confirmed</div>
                 <div class="col-md-10">
                     <div class="form-check-inline">
@@ -79,7 +79,7 @@
                 </div>
             </div>
 
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <div class="col-md-2">QSL Type</div>
                 <div class="col-md-10">
                     <div class="form-check-inline">
@@ -97,7 +97,7 @@
                 </div>
             </div>
 
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <div class="col-md-2">Continents</div>
                 <div class="col-md-10">
                     <div class="form-check-inline">
@@ -131,10 +131,10 @@
                 </div>
             </div>
 
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <label class="col-md-2 control-label" for="band">Band</label>
                 <div class="col-md-2">
-                    <select id="band2" name="band" class="form-control custom-select-sm">
+                    <select id="band2" name="band" class="form-select form-select-sm">
                         <option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> >Every band</option>
                         <?php foreach($worked_bands as $band) {
                             echo '<option value="' . $band . '"';
@@ -145,10 +145,10 @@
                 </div>
             </div>
 
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <label class="col-md-2 control-label" for="mode">Mode</label>
                 <div class="col-md-2">
-                <select id="mode" name="mode" class="form-control custom-select-sm">
+                <select id="mode" name="mode" class="form-select form-select-sm">
                     <option value="All" <?php if ($this->input->post('mode') == "All" || $this->input->method() !== 'mode') echo ' selected'; ?>>All</option>
                     <?php
                     foreach($modes->result() as $mode){
@@ -167,7 +167,7 @@
                 </div>
             </div>
 
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <label class="col-md-2 control-label" for="button1id"></label>
                 <div class="col-md-10">
                     <button id="button2id" type="reset" name="button2id" class="btn btn-sm btn-warning">Reset</button>
@@ -183,10 +183,10 @@
 
     <ul class="nav nav-tabs" id="myTab" role="tablist">
         <li class="nav-item">
-            <a class="nav-link active" id="table-tab" data-toggle="tab" href="#table" role="tab" aria-controls="table" aria-selected="true">Table</a>
+            <a class="nav-link active" id="table-tab" data-bs-toggle="tab" href="#table" role="tab" aria-controls="table" aria-selected="true">Table</a>
         </li>
         <li class="nav-item">
-            <a class="nav-link" id="map-tab" onclick="load_dxcc_map();" data-toggle="tab" href="#dxccmaptab" role="tab" aria-controls="home" aria-selected="false">Map</a>
+            <a class="nav-link" id="map-tab" onclick="load_dxcc_map();" data-bs-toggle="tab" href="#dxccmaptab" role="tab" aria-controls="home" aria-selected="false">Map</a>
         </li>
     </ul>
     <br />
@@ -222,7 +222,7 @@
                         <td>'. $i++ .'</td>';
             foreach ($value as $name => $key) {
                 if (isset($value['Deleted']) && $value['Deleted'] == 1 && $name == "name") {
-                   echo '<td style="text-align: center">' . $key . ' <span class="badge badge-danger">'.lang('gen_hamradio_deleted_dxcc').'</span></td>';
+                   echo '<td style="text-align: center">' . $key . ' <span class="badge text-bg-danger">'.lang('gen_hamradio_deleted_dxcc').'</span></td>';
                 } else if ($name == "Deleted") {
                    continue;
                 } else {
@@ -264,7 +264,7 @@
 
     }
     else {
-        echo '<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
+        echo '<div class="alert alert-danger" role="alert"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
     }
     ?>
                 </div>
diff --git a/application/views/awards/ffma/index.php b/application/views/awards/ffma/index.php
index a905972a..14e1d206 100644
--- a/application/views/awards/ffma/index.php
+++ b/application/views/awards/ffma/index.php
@@ -52,7 +52,7 @@
             var lang_award_info_ln4 = "<?php echo lang('awards_ffma_description_ln4'); ?>";
             </script>
             <h2><?php echo $page_title; ?></h2>
-            <button type="button" class="btn btn-sm btn-primary mr-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
         </div>
         <!-- End of Award Info Box -->
 
@@ -69,15 +69,15 @@
 </div>
 <div class="coordinates d-flex">
         <div class="cohidden"><?php echo lang('gen_hamradio_latitude')?>: </div>
-        <div class="cohidden col-auto text-success font-weight-bold" id="latDeg"></div>
+        <div class="cohidden col-auto text-success fw-bold" id="latDeg"></div>
         <div class="cohidden"><?php echo lang('gen_hamradio_longitude')?>: </div>
-        <div class="cohidden col-auto text-success font-weight-bold" id="lngDeg"></div>
+        <div class="cohidden col-auto text-success fw-bold" id="lngDeg"></div>
         <div class="cohidden"><?php echo lang('gen_hamradio_gridsquare')?>: </div>
-        <div class="cohidden col-auto text-success font-weight-bold" id="locator"></div>
+        <div class="cohidden col-auto text-success fw-bold" id="locator"></div>
         <div class="cohidden"><?php echo lang('gen_hamradio_distance')?>: </div>
-        <div class="cohidden col-auto text-success font-weight-bold" id="distance"></div>
+        <div class="cohidden col-auto text-success fw-bold" id="distance"></div>
         <div class="cohidden"><?php echo lang('gen_hamradio_bearing')?>: </div>
-        <div class="cohidden col-auto text-success font-weight-bold" id="bearing"></div>
+        <div class="cohidden col-auto text-success fw-bold" id="bearing"></div>
 </div>
 <script>var gridsquaremap = true;
 var type = "worked";
diff --git a/application/views/awards/gridmaster/index.php b/application/views/awards/gridmaster/index.php
index 7dca6d24..948734c0 100644
--- a/application/views/awards/gridmaster/index.php
+++ b/application/views/awards/gridmaster/index.php
@@ -52,7 +52,7 @@
             var lang_award_info_ln4 = "<?php echo lang('awards_us_gridmaster_description_ln4'); ?>";
             </script>
             <h2><?php echo $page_title; ?></h2>
-            <button type="button" class="btn btn-sm btn-primary mr-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
         </div>
         <!-- End of Award Info Box -->
 		<?php if($this->session->flashdata('message')) { ?>
@@ -69,15 +69,15 @@
 </div>
 <div class="coordinates d-flex">
         <div class="cohidden"><?php echo lang('gen_hamradio_latitude')?>: </div>
-        <div class="cohidden col-auto text-success font-weight-bold" id="latDeg"></div>
+        <div class="cohidden col-auto text-success fw-bold" id="latDeg"></div>
         <div class="cohidden"><?php echo lang('gen_hamradio_longitude')?>: </div>
-        <div class="cohidden col-auto text-success font-weight-bold" id="lngDeg"></div>
+        <div class="cohidden col-auto text-success fw-bold" id="lngDeg"></div>
         <div class="cohidden"><?php echo lang('gen_hamradio_gridsquare')?>: </div>
-        <div class="cohidden col-auto text-success font-weight-bold" id="locator"></div>
+        <div class="cohidden col-auto text-success fw-bold" id="locator"></div>
         <div class="cohidden"><?php echo lang('gen_hamradio_distance')?>: </div>
-        <div class="cohidden col-auto text-success font-weight-bold" id="distance"></div>
+        <div class="cohidden col-auto text-success fw-bold" id="distance"></div>
         <div class="cohidden"><?php echo lang('gen_hamradio_bearing')?>: </div>
-        <div class="cohidden col-auto text-success font-weight-bold" id="bearing"></div>
+        <div class="cohidden col-auto text-success fw-bold" id="bearing"></div>
 </div>
 <script>var gridsquaremap = true;
 var type = "worked";
diff --git a/application/views/awards/iota/index.php b/application/views/awards/iota/index.php
index 75749070..64b6c35c 100644
--- a/application/views/awards/iota/index.php
+++ b/application/views/awards/iota/index.php
@@ -45,13 +45,13 @@
             var lang_award_info_ln4 = "<?php echo lang('awards_iota_description_ln4'); ?>";
             </script>
             <h2><?php echo $page_title; ?></h2>
-            <button type="button" class="btn btn-sm btn-primary mr-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
         </div>
         <!-- End of Award Info Box -->
     <form class="form" action="<?php echo site_url('awards/iota'); ?>" method="post" enctype="multipart/form-data">
         <fieldset>
 
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <div class="col-md-2 control-label" for="checkboxes">Deleted IOTA</div>
                 <div class="col-md-10">
                     <div class="form-check-inline">
@@ -61,7 +61,7 @@
                 </div>
             </div>
 
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <div class="col-md-2" for="checkboxes">Worked / Confirmed</div>
                 <div class="col-md-10">
                     <div class="form-check-inline">
@@ -79,7 +79,7 @@
                 </div>
             </div>
 
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <div class="col-md-2">Continents</div>
                 <div class="col-md-10">
                     <div class="form-check-inline">
@@ -113,10 +113,10 @@
                 </div>
             </div>
 
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <label class="col-md-2 control-label" for="band">Band</label>
                 <div class="col-md-2">
-                    <select id="band2" name="band" class="form-control custom-select-sm">
+                    <select id="band2" name="band" class="form-select form-select-sm">
                         <option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> >Every band</option>
                         <?php foreach($worked_bands as $band) {
                             echo '<option value="' . $band . '"';
@@ -127,10 +127,10 @@
                 </div>
             </div>
 
-			<div class="form-group row">
+			<div class="mb-3 row">
 				<label class="col-md-2 control-label" for="mode">Mode</label>
 				<div class="col-md-2">
-					<select id="mode" name="mode" class="form-control custom-select-sm">
+					<select id="mode" name="mode" class="form-select form-select-sm">
 						<option value="All" <?php if ($this->input->post('mode') == "All" || $this->input->method() !== 'mode') echo ' selected'; ?>>All</option>
 						<?php
 						foreach($modes->result() as $mode){
@@ -149,7 +149,7 @@
 				</div>
 			</div>
 
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <label class="col-md-2 control-label" for="button1id"></label>
                 <div class="col-md-10">
                     <button id="button2id" type="reset" name="button2id" class="btn btn-sm btn-warning">Reset</button>
@@ -165,10 +165,10 @@
 
     <ul class="nav nav-tabs" id="myTab" role="tablist">
         <li class="nav-item">
-            <a class="nav-link active" id="table-tab" data-toggle="tab" href="#table" role="tab" aria-controls="table" aria-selected="true">Table</a>
+            <a class="nav-link active" id="table-tab" data-bs-toggle="tab" href="#table" role="tab" aria-controls="table" aria-selected="true">Table</a>
         </li>
         <li class="nav-item">
-            <a class="nav-link" id="map-tab" onclick="load_iota_map();" data-toggle="tab" href="#iotamaptab" role="tab" aria-controls="home" aria-selected="false">Map</a>
+            <a class="nav-link" id="map-tab" onclick="load_iota_map();" data-bs-toggle="tab" href="#iotamaptab" role="tab" aria-controls="home" aria-selected="false">Map</a>
         </li>
     </ul>
     <br />
@@ -247,7 +247,7 @@
 
     }
     else {
-        echo '<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
+        echo '<div class="alert alert-danger" role="alert"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
     }
     ?>
                     </div>
diff --git a/application/views/awards/ja_gridmaster/index.php b/application/views/awards/ja_gridmaster/index.php
index 7b373911..87531031 100644
--- a/application/views/awards/ja_gridmaster/index.php
+++ b/application/views/awards/ja_gridmaster/index.php
@@ -55,7 +55,7 @@
             var lang_award_info_ln4 = "<?php echo lang('awards_ja_gridmaster_description_ln4'); ?>";
             </script>
             <h2><?php echo $page_title; ?></h2>
-            <button type="button" class="btn btn-sm btn-primary mr-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
         </div>
         <!-- End of Award Info Box -->
 
@@ -72,15 +72,15 @@
 </div>
 <div class="coordinates d-flex">
         <div class="cohidden"><?php echo lang('gen_hamradio_latitude')?>: </div>
-        <div class="cohidden col-auto text-success font-weight-bold" id="latDeg"></div>
+        <div class="cohidden col-auto text-success fw-bold" id="latDeg"></div>
         <div class="cohidden"><?php echo lang('gen_hamradio_longitude')?>: </div>
-        <div class="cohidden col-auto text-success font-weight-bold" id="lngDeg"></div>
+        <div class="cohidden col-auto text-success fw-bold" id="lngDeg"></div>
         <div class="cohidden"><?php echo lang('gen_hamradio_gridsquare')?>: </div>
-        <div class="cohidden col-auto text-success font-weight-bold" id="locator"></div>
+        <div class="cohidden col-auto text-success fw-bold" id="locator"></div>
         <div class="cohidden"><?php echo lang('gen_hamradio_distance')?>: </div>
-        <div class="cohidden col-auto text-success font-weight-bold" id="distance"></div>
+        <div class="cohidden col-auto text-success fw-bold" id="distance"></div>
         <div class="cohidden"><?php echo lang('gen_hamradio_bearing')?>: </div>
-        <div class="cohidden col-auto text-success font-weight-bold" id="bearing"></div>
+        <div class="cohidden col-auto text-success fw-bold" id="bearing"></div>
 </div>
 <script>var gridsquaremap = true;
 var type = "worked";
diff --git a/application/views/awards/pota/index.php b/application/views/awards/pota/index.php
index 188f2fbc..bbd7e0c4 100644
--- a/application/views/awards/pota/index.php
+++ b/application/views/awards/pota/index.php
@@ -10,7 +10,7 @@
             var lang_award_info_ln4 = "<?php echo lang('awards_pota_description_ln4'); ?>";
             </script>
             <h2><?php echo $page_title; ?></h2>
-            <button type="button" class="btn btn-sm btn-primary mr-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
         </div>
         <!-- End of Award Info Box -->
 	<?php
@@ -61,6 +61,6 @@
 	</tbody>
 	</table>
 	<?php } else {
-        echo '<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
+        echo '<div class="alert alert-danger" role="alert"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
     }?>
 </div>
diff --git a/application/views/awards/sig/index.php b/application/views/awards/sig/index.php
index 576b62b0..2d19062b 100644
--- a/application/views/awards/sig/index.php
+++ b/application/views/awards/sig/index.php
@@ -10,7 +10,7 @@
             var lang_award_info_ln4 = "<?php echo lang('awards_sig_description_ln4'); ?>";
             </script>
             <h2><?php echo $page_title; ?></h2>
-            <button type="button" class="btn btn-sm btn-primary mr-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
         </div>
         <!-- End of Award Info Box -->
 
@@ -42,7 +42,7 @@
 	</table>
 <?php }
 else {
-    echo '<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
+    echo '<div class="alert alert-danger" role="alert"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
 }
 ?>
 </div>
\ No newline at end of file
diff --git a/application/views/awards/sota/index.php b/application/views/awards/sota/index.php
index 2e45f1ab..693d68bf 100644
--- a/application/views/awards/sota/index.php
+++ b/application/views/awards/sota/index.php
@@ -10,7 +10,7 @@
             var lang_award_info_ln4 = "<?php echo lang('awards_sota_description_ln4'); ?>";
             </script>
             <h2><?php echo $page_title; ?></h2>
-            <button type="button" class="btn btn-sm btn-primary mr-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
         </div>
         <!-- End of Award Info Box -->
 	<?php
@@ -50,6 +50,6 @@
 	
 	</table>
 	<?php } else {
-        echo '<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
+        echo '<div class="alert alert-danger" role="alert"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
     }?>
 </div>
diff --git a/application/views/awards/vucc/band.php b/application/views/awards/vucc/band.php
index eab72d01..90376a34 100644
--- a/application/views/awards/vucc/band.php
+++ b/application/views/awards/vucc/band.php
@@ -38,6 +38,6 @@
 
     }
     else {
-        echo '<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
+        echo '<div class="alert alert-danger" role="alert"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
     }
     ?>
diff --git a/application/views/awards/vucc/index.php b/application/views/awards/vucc/index.php
index cf3b8f3e..0b44a7e6 100644
--- a/application/views/awards/vucc/index.php
+++ b/application/views/awards/vucc/index.php
@@ -10,7 +10,7 @@
       var lang_award_info_ln4 = "<?php echo lang('awards_vucc_description_ln4'); ?>";
     </script>
     <h2><?php echo $page_title; ?></h2>
-    <button type="button" class="btn btn-sm btn-primary mr-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+    <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
   </div>
   <!-- End of Award Info Box -->
 <?php if (!empty($vucc_array)) { ?>
@@ -36,6 +36,6 @@
         </table>
 
         <?php } else {
-            echo '<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
+            echo '<div class="alert alert-danger" role="alert"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
         } ?>
 </div>
\ No newline at end of file
diff --git a/application/views/awards/was/index.php b/application/views/awards/was/index.php
index 14e89e59..dd80aa95 100644
--- a/application/views/awards/was/index.php
+++ b/application/views/awards/was/index.php
@@ -11,13 +11,13 @@
             var lang_award_info_ln4 = "<?php echo lang('awards_was_description_ln4'); ?>";
             </script>
             <h2><?php echo $page_title; ?></h2>
-            <button type="button" class="btn btn-sm btn-primary mr-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
         </div>
         <!-- End of Award Info Box -->
     <form class="form" action="<?php echo site_url('awards/was'); ?>" method="post" enctype="multipart/form-data">
         <fieldset>
 
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <div class="col-md-2" for="checkboxes">Worked / Confirmed</div>
                 <div class="col-md-10">
                     <div class="form-check-inline">
@@ -35,7 +35,7 @@
                 </div>
             </div>
 
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <div class="col-md-2">QSL Type</div>
                 <div class="col-md-10">
                     <div class="form-check-inline">
@@ -53,10 +53,10 @@
                 </div>
             </div>
 
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <label class="col-md-2 control-label" for="band">Band</label>
                 <div class="col-md-2">
-                    <select id="band2" name="band" class="form-control custom-select-sm">
+                    <select id="band2" name="band" class="form-select form-select-sm">
                         <option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> >Every band</option>
                         <?php foreach($worked_bands as $band) {
                             echo '<option value="' . $band . '"';
@@ -67,10 +67,10 @@
                 </div>
             </div>
 
-			<div class="form-group row">
+			<div class="mb-3 row">
 				<label class="col-md-2 control-label" for="mode">Mode</label>
 				<div class="col-md-2">
-					<select id="mode" name="mode" class="form-control custom-select-sm">
+					<select id="mode" name="mode" class="form-select form-select-sm">
 						<option value="All" <?php if ($this->input->post('mode') == "All" || $this->input->method() !== 'mode') echo ' selected'; ?>>All</option>
 						<?php
 						foreach($modes->result() as $mode){
@@ -89,7 +89,7 @@
 				</div>
 			</div>
 
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <label class="col-md-2 control-label" for="button1id"></label>
                 <div class="col-md-10">
                     <button id="button2id" type="reset" name="button2id" class="btn btn-sm btn-warning">Reset</button>
@@ -160,5 +160,5 @@
         </div>';
     }
     else {
-        echo '<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
+        echo '<div class="alert alert-danger" role="alert"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
     }
diff --git a/application/views/awards/wwff/index.php b/application/views/awards/wwff/index.php
index d2af382f..3ce34c81 100644
--- a/application/views/awards/wwff/index.php
+++ b/application/views/awards/wwff/index.php
@@ -10,7 +10,7 @@
             var lang_award_info_ln4 = "<?php echo lang('awards_dok_description_ln4'); ?>";
             </script>
             <h2><?php echo $page_title; ?></h2>
-            <button type="button" class="btn btn-sm btn-primary mr-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
         </div>
         <!-- End of Award Info Box -->
 	<?php
@@ -61,6 +61,6 @@
 	</tbody>
 	</table>
 	<?php } else {
-        echo '<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
+        echo '<div class="alert alert-danger" role="alert"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
     }?>
 </div>
diff --git a/application/views/bandmap/index.php b/application/views/bandmap/index.php
index f5c353b7..34e0e1bc 100644
--- a/application/views/bandmap/index.php
+++ b/application/views/bandmap/index.php
@@ -20,18 +20,18 @@
 		</ul>
 </div>
 <div class="tab-content" id="myTabContent">
-<div class="messages my-1 mr-2"></div>
-<div class="form-inline">
-		<label class="my-1 mr-2" for="radio"><?php echo lang('gen_hamradio_radio'); ?></label>
-		<select class="form-control-sm radios my-1 mr-sm-2" id="radio" name="radio">
+<div class="messages my-1 me-2"></div>
+<div class="d-flex align-items-center">
+		<label class="my-1 me-2" for="radio"><?php echo lang('gen_hamradio_radio'); ?></label>
+		<select class="form-select-sm radios my-1 me-sm-2" id="radio" name="radio">
 			<option value="0" selected="selected"><?php echo lang('general_word_none'); ?></option>
 			<?php foreach ($radios->result() as $row) { ?>
 			<option value="<?php echo $row->id; ?>" <?php if($this->session->userdata('radio') == $row->id) { echo "selected=\"selected\""; } ?>><?php echo $row->radio; ?></option>
 			<?php } ?>
 		</select>
 
-		<label class="my-1 mr-2" for="decontSelect">Spots de</label>
-		<select class="form-control-sm my-1 mr-sm-2" id="decontSelect" name="dxcluster_decont" aria-describedby="dxcluster_decontHelp" required>
+		<label class="my-1 me-2" for="decontSelect">Spots de</label>
+		<select class="form-select-sm my-1 me-sm-2" id="decontSelect" name="dxcluster_decont" aria-describedby="dxcluster_decontHelp" required>
 				<option value="Any">*</option>
 				<option value="AF"<?php if ($this->optionslib->get_option('dxcluster_decont') == 'AF') { echo " selected"; } ?>>Africa</option>
 				<option value="AN"<?php if ($this->optionslib->get_option('dxcluster_decont') == 'AN') { echo " selected"; } ?>>Antarctica</option>
@@ -42,8 +42,8 @@
 				<option value="SA"<?php if ($this->optionslib->get_option('dxcluster_decont') == 'SA') { echo " selected"; } ?>>South America</option>
                 </select>
 
-		<label class="my-1 mr-2" for="band"><?php echo lang('gen_hamradio_band'); ?></label>
-		<select id="band" class="form-control-sm my-1 mr-sm-2" name="band">
+		<label class="my-1 me-2" for="band"><?php echo lang('gen_hamradio_band'); ?></label>
+		<select id="band" class="form-select-sm my-1 me-sm-2" name="band">
 			<?php foreach($bands as $key=>$bandgroup) {
 					echo '<optgroup label="' . strtoupper($key) . '">';
 					foreach($bandgroup as $band) {
diff --git a/application/views/bandmap/list.php b/application/views/bandmap/list.php
index 9b24f2d9..bdb776ce 100644
--- a/application/views/bandmap/list.php
+++ b/application/views/bandmap/list.php
@@ -40,17 +40,17 @@
 </div>
 
 <div class="tab-content" id="myTabContent">
-<div class="messages my-1 mr-2"></div>
-<div class="form-inline">
-		<label class="my-1 mr-2" for="radio"><?php echo lang('gen_hamradio_radio'); ?></label>
-		<select class="form-control-sm radios my-1 mr-sm-2" id="radio" name="radio">
+<div class="messages my-1 me-2"></div>
+<div class="d-flex align-items-center">
+		<label class="my-1 me-2" for="radio"><?php echo lang('gen_hamradio_radio'); ?></label>
+		<select class="form-select-sm radios my-1 me-sm-2" id="radio" name="radio">
 			<option value="0" selected="selected"><?php echo lang('general_word_none'); ?></option>
 			<?php foreach ($radios->result() as $row) { ?>
 			<option value="<?php echo $row->id; ?>" <?php if($this->session->userdata('radio') == $row->id) { echo "selected=\"selected\""; } ?>><?php echo $row->radio; ?></option>
 			<?php } ?>
 		</select>
-		<label class="my-1 mr-2" for="decontSelect">Spots de</label>
-		<select class="form-control-sm my-1 mr-sm-2" id="decontSelect" name="dxcluster_decont" aria-describedby="dxcluster_decontHelp" required>
+		<label class="my-1 me-2" for="decontSelect">Spots de</label>
+		<select class="form-select-sm my-1 me-sm-2" id="decontSelect" name="dxcluster_decont" aria-describedby="dxcluster_decontHelp" required>
 				<option value="Any">*</option>
 				<option value="AF"<?php if ($this->optionslib->get_option('dxcluster_decont') == 'AF') { echo " selected"; } ?>>Africa</option>
 				<option value="AN"<?php if ($this->optionslib->get_option('dxcluster_decont') == 'AN') { echo " selected"; } ?>>Antarctica</option>
@@ -61,8 +61,8 @@
 				<option value="SA"<?php if ($this->optionslib->get_option('dxcluster_decont') == 'SA') { echo " selected"; } ?>>South America</option>
                 </select>
 
-		<label class="my-1 mr-2" for="band"><?php echo lang('gen_hamradio_band'); ?></label>
-		<select id="band" class="form-control-sm my-1 mr-sm-2" name="band">
+		<label class="my-1 me-2" for="band"><?php echo lang('gen_hamradio_band'); ?></label>
+		<select id="band" class="form-select-sm my-1 me-sm-2" name="band">
 			<option value="All">All</option>
 			<?php foreach($bands as $key=>$bandgroup) {
 					echo '<optgroup label="' . strtoupper($key) . '">';
diff --git a/application/views/bands/create.php b/application/views/bands/create.php
index e1f74124..1481f6cf 100644
--- a/application/views/bands/create.php
+++ b/application/views/bands/create.php
@@ -20,27 +20,27 @@
 		<?php echo validation_errors(); ?>
 
 		<form>
-		<div class="form-group">
+		<div class="mb-3">
 		    <label for="bandInput"><?php echo lang('gen_hamradio_band'); ?></label>
 		    <input type="text" class="form-control" name="band" id="bandInput" aria-describedby="bandInputHelp" required>
 		    <small id="bandInputHelp" class="form-text text-muted"><?php echo lang('options_bands_name_band'); ?></small>
 		  </div>
-		  <div class="form-group">
+		  <div class="mb-3">
 			<label for="bandGroup"><?php echo lang('gen_hamradio_bandgroup'); ?></label>
 			<input type="text" class="form-control" name="bandgroup" id="bandGroup" aria-describedby="bandgroupInputHelp" required>
 			<small id="bandgroupInputHelp" class="form-text text-muted"><?php echo lang('options_bands_name_bandgroup'); ?></small>
 		</div>
-		<div class="form-group">
+		<div class="mb-3">
 			<label for="ssbqrg"><?php echo lang('options_bands_ssb_qrg'); ?></label>
 			<input type="text" class="form-control" name="ssbqrg" id="ssbqrg" aria-describedby="ssbqrgInputHelp" required>
 			<small id="ssbqrgInputHelp" class="form-text text-muted"><?php echo lang('options_bands_ssb_qrg_hint'); ?></small>
 		</div>
-		<div class="form-group">
+		<div class="mb-3">
 			<label for="dataqrg"><?php echo lang('options_bands_data_qrg'); ?></label>
 			<input type="text" class="form-control" name="dataqrg" id="dataqrg" aria-describedby="dataqrgInputHelp" required>
 			<small id="dataqrgInputHelp" class="form-text text-muted"><?php echo lang('options_bands_data_qrg_hint'); ?></small>
 		</div>
-		<div class="form-group">
+		<div class="mb-3">
 			<label for="cwqrg"><?php echo lang('options_bands_cw_qrg'); ?></label>
 			<input type="text" class="form-control" name="cwqrg" id="cwqrg" aria-describedby="cwqrgInputHelp" required>
 			<small id="cwqrgInputHelp" class="form-text text-muted"><?php echo lang('options_bands_cw_qrg_hint'); ?></small>
diff --git a/application/views/bands/edit.php b/application/views/bands/edit.php
index f92b1559..60f740ba 100644
--- a/application/views/bands/edit.php
+++ b/application/views/bands/edit.php
@@ -2,27 +2,27 @@
 	<form>
 
 		<input type="hidden" name="id" value="<?php echo $my_band->id; ?>">
-		<div class="form-group">
+		<div class="mb-3">
 			<label for="bandInput"><?php echo lang('gen_hamradio_band'); ?></label>
 			<input type="text" class="form-control" name="band" id="bandInput" aria-describedby="bandInputHelp" value="<?php if(set_value('band') != "") { echo set_value('band'); } else { echo $my_band->band; } ?>" required>
 			<small id="bandInputHelp" class="form-text text-muted"><?php echo lang('options_bands_name_band'); ?></small>
 		</div>
-		<div class="form-group">
+		<div class="mb-3">
 			<label for="bandGroup"><?php echo lang('gen_hamradio_bandgroup'); ?></label>
 			<input type="text" class="form-control" name="bandgroup" id="bandGroup" aria-describedby="bandgroupInputHelp" value="<?php if(set_value('bandgroup') != "") { echo set_value('bandgroup'); } else { echo $my_band->bandgroup; } ?>" required>
 			<small id="bandgroupInputHelp" class="form-text text-muted"><?php echo lang('options_bands_name_bandgroup'); ?></small>
 		</div>
-		<div class="form-group">
+		<div class="mb-3">
 			<label for="ssbqrg"><?php echo lang('options_bands_ssb_qrg'); ?></label>
 			<input type="text" class="form-control" name="ssbqrg" id="ssbqrg" aria-describedby="ssbqrgInputHelp" value="<?php echo $my_band->ssb; ?>" required>
 			<small id="ssbqrgInputHelp" class="form-text text-muted"><?php echo lang('options_bands_ssb_qrg_hint'); ?></small>
 		</div>
-		<div class="form-group">
+		<div class="mb-3">
 			<label for="dataqrg"><?php echo lang('options_bands_data_qrg'); ?></label>
 			<input type="text" class="form-control" name="dataqrg" id="dataqrg" aria-describedby="dataqrgInputHelp" value="<?php echo $my_band->data; ?>" required>
 			<small id="dataqrgInputHelp" class="form-text text-muted"><?php echo lang('options_bands_data_qrg_hint'); ?></small>
 		</div>
-		<div class="form-group">
+		<div class="mb-3">
 			<label for="cwqrg"><?php echo lang('options_bands_cw_qrg'); ?></label>
 			<input type="text" class="form-control" name="cwqrg" id="cwqrg" aria-describedby="cwqrgInputHelp" value="<?php echo $my_band->cw; ?>" required>
 			<small id="cwqrgInputHelp" class="form-text text-muted"><?php echo lang('options_bands_cw_qrg_hint'); ?></small>
diff --git a/application/views/cabrillo/index.php b/application/views/cabrillo/index.php
index c23a4f31..c462d6d8 100644
--- a/application/views/cabrillo/index.php
+++ b/application/views/cabrillo/index.php
@@ -24,9 +24,9 @@
 		  if ($station_profile) { ?>
 
 			<form class="form" action="<?php echo site_url('cabrillo/export'); ?>" method="post" enctype="multipart/form-data">
-				<div class="form-group form-inline row">
+				<div class="mb-3 d-flex align-items-center row">
 					<div class="col-md-3 control-label" for="station_id"><?php echo lang('export_cabrillo_select_station'); ?> </div>
-					<select id="station_id" name="station_id" class="custom-select my-1 mr-sm-2 col-md-4">
+					<select id="station_id" name="station_id" class="form-select my-1 me-sm-2 col-md-4">
 					<?php foreach ($station_profile->result() as $station) { ?>
 						<option value="<?php echo $station->station_id; ?>" <?php if ($station->station_id == $this->stations->find_active()) { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_callsign') ?>: <?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
 					<?php } ?>
@@ -34,34 +34,34 @@
 					<button id="button1id" type="button" onclick="loadYears();" name="button1id" class="btn btn-sm btn-primary"> <?php echo lang('export_cabrillo_proceed') ?></button>
 				</div>
 
-				<div class="form-group form-inline row contestyear">
+				<div class="mb-3 d-flex align-items-center row contestyear">
 				</div>
-				<div class="form-group form-inline row contestname">
+				<div class="mb-3 d-flex align-items-center row contestname">
 				</div>
-				<div class="form-group form-inline row contestdates">
+				<div class="mb-3 d-flex align-items-center row contestdates">
 				</div>
-				<div hidden="true" class="form-group form-inline row additionalinfo">
+				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="soapbox">Club: </div>
-					<input class="form-control my-1 mr-sm-2 col-md-4" id="soapbox" type="soapbox" name="soapbox" aria-label="soapbox">
+					<input class="form-control my-1 me-sm-2 col-md-4" id="soapbox" type="soapbox" name="soapbox" aria-label="soapbox">
 				</div>
-				<div hidden="true" class="form-group form-inline row additionalinfo">
+				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="categoryoperator"><?php echo lang('export_cabrillo_cat_operator') ?>: </div>
-					<select class="custom-select my-1 mr-sm-2 col-md-4" id="categoryoperator" name="categoryoperator">
+					<select class="form-select my-1 me-sm-2 col-md-4" id="categoryoperator" name="categoryoperator">
 						<option value="SINGLE-OP"><?php echo lang('export_cabrillo_cat_operator_single_op') ?></option>
 						<option value="MULTI-OP"><?php echo lang('export_cabrillo_cat_operator_multi_op') ?></option>
 						<option value="CHECKLOG"><?php echo lang('export_cabrillo_cat_operator_checklog') ?></option>
 					</select>
 				</div>
-				<div hidden="true" class="form-group form-inline row additionalinfo">
+				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="categoryassisted"><?php echo lang('export_cabrillo_cat_assisted') ?>: </div>
-					<select class="custom-select my-1 mr-sm-2 col-md-4" id="categoryassisted" name="categoryassisted">
+					<select class="form-select my-1 me-sm-2 col-md-4" id="categoryassisted" name="categoryassisted">
 						<option value="NON-ASSISTED"><?php echo lang('export_cabrillo_cat_assisted_not_ass') ?></option>
 						<option value="ASSISTED"><?php echo lang('export_cabrillo_cat_assisted_ass') ?></option>
 					</select>
 				</div>
-					<div hidden="true" class="form-group form-inline row additionalinfo">
+					<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="categoryband"><?php echo lang('export_cabrillo_cat_band') ?>: </div>
-					<select class="custom-select my-1 mr-sm-2 col-md-4" id="categoryband" name="categoryband">
+					<select class="form-select my-1 me-sm-2 col-md-4" id="categoryband" name="categoryband">
 						<option value="ALL"><?php echo lang('general_word_all') ?></option>
 						<option value="160M">160 M</option>
 						<option value="80M">80 M</option>
@@ -90,9 +90,9 @@
 						<option value="VHF-3-BAND and VHF-FM-ONLY (ARRL VHF Contests only)"><?php echo lang('export_cabrillo_cat_band_arrl_vhf') ?></option>
 					</select>
 				</div>
-				<div hidden="true" class="form-group form-inline row additionalinfo">
+				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="categorymode"><?php echo lang('export_cabrillo_cat_mode') ?>: </div>
-					<select class="custom-select my-1 mr-sm-2 col-md-4" id="categorymode" name="categorymode">
+					<select class="form-select my-1 me-sm-2 col-md-4" id="categorymode" name="categorymode">
 						<option value="MIXED">MIXED</option>
 						<option value="CW">CW</option>
 						<option value="DIGI">DIGI</option>
@@ -101,17 +101,17 @@
 						<option value="SSB">SSB</option>
 					</select>
 				</div>
-				<div hidden="true" class="form-group form-inline row additionalinfo">
+				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="categorypower"><?php echo lang('export_cabrillo_cat_power') ?>: </div>
-					<select class="custom-select my-1 mr-sm-2 col-md-4" id="categorypower" name="categorypower">
+					<select class="form-select my-1 me-sm-2 col-md-4" id="categorypower" name="categorypower">
 						<option value="LOW">LOW</option>
 						<option value="HIGH">HIGH</option>
 						<option value="QRP">QRP</option>
 					</select>
 				</div>
-				<div hidden="true" class="form-group form-inline row additionalinfo">
+				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="categorystation"><?php echo lang('export_cabrillo_cat_station') ?>: </div>
-					<select class="custom-select my-1 mr-sm-2 col-md-4" id="categorystation" name="categorystation">
+					<select class="form-select my-1 me-sm-2 col-md-4" id="categorystation" name="categorystation">
 						<option value="FIXED">FIXED</option>
 						<option value="DISTRIBUTED">DISTRIBUTED</option>
 						<option value="MOBILE">MOBILE</option>
@@ -125,9 +125,9 @@
 						<option value="EXPLORER">EXPLORER</option>
 					</select>
 				</div>
-				<div hidden="true" class="form-group form-inline row additionalinfo">
+				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="categorytransmitter"><?php echo lang('export_cabrillo_cat_transmitter') ?>: </div>
-					<select class="custom-select my-1 mr-sm-2 col-md-4" id="categorytransmitter" name="categorytransmitter">
+					<select class="form-select my-1 me-sm-2 col-md-4" id="categorytransmitter" name="categorytransmitter">
 						<option value="ONE">ONE</option>
 						<option value="TWO">TWO</option>
 						<option value="LIMITED">LIMITED</option>
@@ -135,9 +135,9 @@
 						<option value="SWL">SWL</option>
 					</select>
 				</div>
-				<div hidden="true" class="form-group form-inline row additionalinfo">
+				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="categoryoverlay"><?php echo lang('export_cabrillo_cat_overlay') ?>: </div>
-					<select class="custom-select my-1 mr-sm-2 col-md-4" id="categoryoverlay" name="categoryoverlay">
+					<select class="form-select my-1 me-sm-2 col-md-4" id="categoryoverlay" name="categoryoverlay">
 						<option value="CLASSIC">CLASSIC</option>
 						<option value="ROOKIE">ROOKIE</option>
 						<option value="TB-WIRES">TB-WIRES</option>
@@ -146,36 +146,36 @@
 						<option value="YL">YL</option>
 					</select>
 				</div>
-				<div hidden="true" class="form-group form-inline row additionalinfo">
+				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="operators"><?php echo lang('export_cabrillo_operators') ?>: </div>
-					<input class="form-control my-1 mr-sm-2 col-md-4" id="operators" type="operators" name="operators" aria-label="operators">
+					<input class="form-control my-1 me-sm-2 col-md-4" id="operators" type="operators" name="operators" aria-label="operators">
 					</select>
 				</div>
-				<div hidden="true" class="form-group form-inline row additionalinfo">
+				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="soapbox"><?php echo lang('export_cabrillo_soapbox') ?>: </div>
-					<input class="form-control my-1 mr-sm-2 col-md-4" id="soapbox" type="text" name="soapbox" aria-label="soapbox">
+					<input class="form-control my-1 me-sm-2 col-md-4" id="soapbox" type="text" name="soapbox" aria-label="soapbox">
 				</div>
-				<div hidden="true" class="form-group form-inline row additionalinfo">
+				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="address"><?php echo lang('export_cabrillo_address') ?>: </div>
-					<input class="form-control my-1 mr-sm-2 col-md-4" id="address" type="text" name="address" aria-label="address">
+					<input class="form-control my-1 me-sm-2 col-md-4" id="address" type="text" name="address" aria-label="address">
 				</div>
-				<div hidden="true" class="form-group form-inline row additionalinfo">
+				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="addresscity"><?php echo lang('export_cabrillo_address_city') ?>: </div>
-					<input class="form-control my-1 mr-sm-2 col-md-4" id="addresscity" type="text" name="addresscity" aria-label="addresscity">
+					<input class="form-control my-1 me-sm-2 col-md-4" id="addresscity" type="text" name="addresscity" aria-label="addresscity">
 				</div>
-				<div hidden="true" class="form-group form-inline row additionalinfo">
+				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="addressstateprovince"><?php echo lang('export_cabrillo_address_state_province') ?>: </div>
-					<input class="form-control my-1 mr-sm-2 col-md-4" id="addressstateprovince" type="text" name="addressstateprovince" aria-label="addressstateprovince">
+					<input class="form-control my-1 me-sm-2 col-md-4" id="addressstateprovince" type="text" name="addressstateprovince" aria-label="addressstateprovince">
 				</div>
-				<div hidden="true" class="form-group form-inline row additionalinfo">
+				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="addresspostalcode"><?php echo lang('export_cabrillo_address_postalcode') ?>: </div>
-					<input class="form-control my-1 mr-sm-2 col-md-4" id="addresspostalcode" type="text" name="addresspostalcode" aria-label="addresspostalcode">
+					<input class="form-control my-1 me-sm-2 col-md-4" id="addresspostalcode" type="text" name="addresspostalcode" aria-label="addresspostalcode">
 				</div>
-				<div hidden="true" class="form-group form-inline row additionalinfo">
+				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="addresscountry"><?php echo lang('export_cabrillo_address_country') ?>: </div>
-					<input class="form-control my-1 mr-sm-2 col-md-4" id="addresscountry" type="text" name="addresscountry" aria-label="addresscountry">
+					<input class="form-control my-1 me-sm-2 col-md-4" id="addresscountry" type="text" name="addresscountry" aria-label="addresscountry">
 				</div>
-				<div hidden="true" class="form-group form-inline row additionalinfo">
+				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="button1id"></div>
 					<button id="button1id" type="submit" name="button1id" class="btn btn-sm btn-primary"> <?php echo lang('general_word_export') ?></button>
 				</div>
diff --git a/application/views/components/hamsat/table.php b/application/views/components/hamsat/table.php
index e218916f..d6c5af04 100644
--- a/application/views/components/hamsat/table.php
+++ b/application/views/components/hamsat/table.php
@@ -62,7 +62,7 @@
                         echo xss_clean($rove['comment']);
                         ?>
                     </td>
-                    <td><span data-toggle="tooltip" title="<?php echo $rove['frequency']; ?> - <?php echo $rove['mode']; ?>"><?= $rove['satellite'] ?></span></td>
+                    <td><span data-bs-toggle="tooltip" title="<?php echo $rove['frequency']; ?> - <?php echo $rove['mode']; ?>"><?= $rove['satellite'] ?></span></td>
                     <td>
 
 
@@ -74,17 +74,17 @@
                            foreach ($grids as $grid) {
                            $worked = $CI->logbook_model->check_if_grid_worked_in_logbook($grid, null, "SAT");
                               if ($worked != 0) {
-                                  echo " <span data-toggle=\"tooltip\" title=\"Worked\" class=\"badge badge-success\">" . $grid . "</span>";
+                                  echo " <span data-bs-toggle=\"tooltip\" title=\"Worked\" class=\"badge badge-success\">" . $grid . "</span>";
                               } else {
-                                  echo " <span data-toggle=\"tooltip\" title=\"Not Worked\" class=\"badge badge-danger\">" . $grid . "</span>";
+                                  echo " <span data-bs-toggle=\"tooltip\" title=\"Not Worked\" class=\"badge badge-danger\">" . $grid . "</span>";
                               }
                            }
                         } else {
                            $worked = $CI->logbook_model->check_if_grid_worked_in_logbook($rove['gridsquare'], null, "SAT");
                            if ($worked != 0) {
-                               echo " <span data-toggle=\"tooltip\" title=\"Worked\" class=\"badge badge-success\">" . $rove['gridsquare'] . "</span>";
+                               echo " <span data-bs-toggle=\"tooltip\" title=\"Worked\" class=\"badge badge-success\">" . $rove['gridsquare'] . "</span>";
                            } else {
-                               echo " <span data-toggle=\"tooltip\" title=\"Not Worked\" class=\"badge badge-danger\">" . $rove['gridsquare'] . "</span>";
+                               echo " <span data-bs-toggle=\"tooltip\" title=\"Not Worked\" class=\"badge badge-danger\">" . $rove['gridsquare'] . "</span>";
                            }
                         }
                         ?>
diff --git a/application/views/contesting/create.php b/application/views/contesting/create.php
index 2a89db38..37624405 100644
--- a/application/views/contesting/create.php
+++ b/application/views/contesting/create.php
@@ -20,13 +20,13 @@
 		<?php echo validation_errors(); ?>
 
 		<form>
-		<div class="form-group">
+		<div class="mb-3">
 		    <label for="contestInput"><?php echo lang('admin_contest_menu_name'); ?></label>
 		    <input type="text" class="form-control" name="contestname" id="contestInput" aria-describedby="contestInputHelp" required>
 		    <small id="contestInputHelp" class="form-text text-muted"><?php echo lang('admin_contest_name_of_contest'); ?></small>
 		  </div>
 
-		  <div class="form-group">
+		  <div class="mb-3">
 		    <label for="adifcontestInput"><?php echo lang('admin_contest_menu_adif'); ?></label>
 		    <input type="text" class="form-control" name="adifcontestname" id="adifcontestInput" aria-describedby="adifcontestInputHelp">
 		    <small id="adifcontestInputHelp" class="form-text text-muted"><?php echo lang('admin_contest_name_of_adif'); ?></small>
diff --git a/application/views/contesting/edit.php b/application/views/contesting/edit.php
index d70a920c..7c932705 100644
--- a/application/views/contesting/edit.php
+++ b/application/views/contesting/edit.php
@@ -27,21 +27,21 @@
 			<?php echo validation_errors(); ?>
 
 			<form method="post" action="<?php echo site_url('contesting/edit/'); ?><?php echo $contest->id; ?>" name="edit_contest">
-				<div class="form-group">
+				<div class="mb-3">
 					<label for="contestnameInput"><?php echo lang('contesting_contest_name'); ?></label>
 					<input type="text" class="form-control" name="name" id="nameInput" aria-describedby="contestnameInputHelp" value="<?php if(set_value('name') != "") { echo set_value('name'); } else { echo $contest->name; } ?>" required>
 					<small id="contestnameInputHelp" class="form-text text-muted"><?php echo lang('admin_contest_name_of_contest'); ?></small>
 				</div>
 
-				<div class="form-group">
+				<div class="mb-3">
 					<label for="adifnameInput"><?php echo lang('admin_contest_name_adif'); ?></label>
 					<input type="text" class="form-control" name="adifname" id="adifnameInput" aria-describedby="adifnameInputHelp" value="<?php if(set_value('adifname') != "") { echo set_value('adifname'); } else { echo $contest->adifname; } ?>">
 					<small id="adifnameInputHelp" class="form-text text-muted"><?php echo lang('admin_contest_name_of_adif'); ?></small>
 				</div>
 
-				<div class="form-group">
+				<div class="mb-3">
 					<label for="activeInput"><?php echo lang('admin_contest_menu_active'); ?></label>
-					<select id="activeInput" class="form-control mode form-control-sm" name="active">
+					<select id="activeInput" class="form-select mode form-select-sm" name="active">
         				<option value="1" <?php echo $contest->active == 1 ? "selected=\"selected\"" : ""; ?>>
             				<?php echo lang('admin_contest_menu_active'); ?>
         				</option>
diff --git a/application/views/contesting/index.php b/application/views/contesting/index.php
index d446120f..13582c09 100644
--- a/application/views/contesting/index.php
+++ b/application/views/contesting/index.php
@@ -1,5 +1,5 @@
 <div class="container qso_panel contesting">
-    <button type="button" class="btn btn-sm btn-warning float-right" onclick="reset_contest_session()"><i class="fas fa-sync-alt"></i> <?php echo lang('contesting_button_reset_contest_session'); ?></button>
+    <button type="button" class="btn btn-sm btn-warning float-end" onclick="reset_contest_session()"><i class="fas fa-sync-alt"></i> <?php echo lang('contesting_button_reset_contest_session'); ?></button>
     <h2><?php echo lang('contesting_page_title'); ?></h2>
     <div class="row">
 
@@ -7,11 +7,11 @@
             <div class="card">
                 <div class="card-body">
                     <form id="qso_input" name="qsos">
-                        <div class="form-group row">
+                        <div class="mb-3 row">
 							<label class="col-auto control-label" for="radio"><?php echo lang('contesting_exchange_type'); ?></label>
 
 							<div class="col-auto">
-								<select class="form-control-sm" id="exchangetype" name="exchangetype">
+								<select class="form-select-sm" id="exchangetype" name="exchangetype">
 									<option value='None'><?php echo lang('contesting_exchange_type_none'); ?></option>
 									<option value='Exchange'><?php echo lang('contesting_exchange_type_exchange'); ?></option>
 									<option value='Gridsquare'><?php echo lang('contesting_exchange_type_gridsquare'); ?></option>
@@ -24,7 +24,7 @@
                             <label class="col-auto control-label" for="contestname"><?php echo lang('contesting_contest_name'); ?></label>
 
                             <div class="col-auto">
-                                <select class="form-control-sm" id="contestname" name="contestname">
+                                <select class="form-select-sm" id="contestname" name="contestname">
 									<?php foreach($contestnames as $contest) {
 										echo "<option value='" . $contest['adifname'] . "'>" . $contest['name'] . "</option>";
 									} ?>
@@ -37,13 +37,13 @@
                             </div>
                         </div>
 
-                        <div class="form-row">
-                            <div class="form-group col-md-2">
+                        <div class="row">
+                            <div class="mb-3 col-md-2">
                                 <label for="start_date"><?php echo lang('general_word_date'); ?></label>
                                 <input type="text" class="form-control form-control-sm input_date" name="start_date" id="start_date" value="<?php if (($this->session->userdata('start_date') != NULL && ((time() - $this->session->userdata('time_stamp')) < 24 * 60 * 60))) { echo $this->session->userdata('start_date'); } else { echo date('d-m-Y');}?>" <?php echo ($_GET['manual'] == 0 ? "disabled" : "");  ?> >
                             </div>
 
-                            <div class="form-group col-md-1">
+                            <div class="mb-3 col-md-1">
                                 <label for="start_time"><?php echo lang('general_word_time'); ?></label>
                                 <input type="text" class="form-control form-control-sm input_time" name="start_time" id="start_time" value="<?php if (($this->session->userdata('start_time') != NULL && ((time() - $this->session->userdata('time_stamp')) < 24 * 60 * 60))) { echo substr($this->session->userdata('start_time'),0,5); } else { echo $_GET['manual'] == 0 ? date('H:i:s') : date('H:i'); } ?>" size="7" <?php echo ($_GET['manual'] == 0 ? "disabled" : "");  ?> >
                             </div>
@@ -53,9 +53,9 @@
                               <input class="input_date" type="hidden" id="start_date" name="start_date" value="<?php echo date('d-m-Y'); ?>" />
                             <?php } ?>
 
-                            <div class="form-group col-md-2">
+                            <div class="mb-3 col-md-2">
                                 <label for="mode"><?php echo lang('gen_hamradio_mode'); ?></label>
-                                <select id="mode" class="form-control mode form-control-sm" name="mode">
+                                <select id="mode" class="form-select mode form-select-sm" name="mode">
                                     <?php foreach($modes->result() as $mode) {
                                             if ($mode->submode == null) {
                                                 printf("<option value=\"%s\" %s>%s</option>", $mode->mode, $this->session->userdata('mode')==$mode->mode?"selected=\"selected\"":"",$mode->mode);
@@ -66,10 +66,10 @@
                                 </select>
                             </div>
 
-                            <div class="form-group col-md-2">
+                            <div class="mb-3 col-md-2">
                                 <label for="band"><?php echo lang('gen_hamradio_band'); ?></label>
 
-                                <select id="band" class="form-control form-control-sm" name="band">
+                                <select id="band" class="form-select form-select-sm" name="band">
                                 <?php foreach($bands as $key=>$bandgroup) {
                                     echo '<optgroup label="' . strtoupper($key) . '">';
                                     foreach($bandgroup as $band) {
@@ -83,14 +83,14 @@
                                 </select>
                             </div>
 
-                            <div class="form-group col-md-2">
+                            <div class="mb-3 col-md-2">
                                 <label for="frequency"><?php echo lang('gen_hamradio_frequency'); ?></label>
                                 <input type="text" class="form-control form-control-sm" id="frequency" name="freq_display" value="<?php echo $this->session->userdata('freq'); ?>" />
                             </div>
 
-                            <div class="form-group col-md-2">
+                            <div class="mb-3 col-md-2">
                                 <label for="inputRadio"><?php echo lang('gen_hamradio_radio'); ?></label>
-                                <select class="form-control form-control-sm radios" id="radio" name="radio">
+                                <select class="form-select form-select-sm radios" id="radio" name="radio">
                                     <option value="0" selected="selected"><?php echo lang('general_word_none'); ?></option>
                                         <?php foreach ($radios->result() as $row) { ?>
                                         <option value="<?php echo $row->id; ?>" <?php if($this->session->userdata('radio') == $row->id) { echo "selected=\"selected\""; } ?>><?php echo $row->radio; ?></option>
@@ -99,61 +99,61 @@
                             </div>
                         </div>
 
-                        <div class="form-row">
-                            <div class="form-group col-md-3">
+                        <div class="row">
+                            <div class="mb-3 col-md-3">
                                 <label for="callsign"><?php echo lang('gen_hamradio_callsign'); ?></label>
                                 <input type="text" class="form-control form-control-sm" id="callsign" name="callsign" required>
-                                <small id="callsign_info" class="badge badge-danger"></small>
+                                <small id="callsign_info" class="badge text-bg-danger"></small>
                             </div>
 
-                            <div class="form-group col-md-1">
+                            <div class="mb-3 col-md-1">
                                 <label for="rst_sent"><?php echo lang('gen_hamradio_rsts'); ?></label>
                                 <input type="text" class="form-control form-control-sm" name="rst_sent" id="rst_sent" value="59">
                             </div>
 
-                            <div style="display:none" class="form-group col-md-1 serials">
+                            <div style="display:none" class="mb-3 col-md-1 serials">
 								<label for="exch_serial_s"><?php echo lang('contesting_exchange_serial_s'); ?></label>
 								<input type="number" class="form-control form-control-sm" name="exch_serial_s" id="exch_serial_s" value="">
 							</div>
                             
-                            <div style="display:none" class="form-group col-md-1 exchanges">
+                            <div style="display:none" class="mb-3 col-md-1 exchanges">
                                 <label for="exch_sent"><?php echo lang('gen_hamradio_exchange_sent_short'); ?></label>
                                 <input type="text" class="form-control form-control-sm" name="exch_sent" id="exch_sent" value="">
                             </div>
 
-							<div style="display:none" class="form-group col-md-2 gridsquares">
+							<div style="display:none" class="mb-3 col-md-2 gridsquares">
 								<label for="exch_gridsquare_s"><?php echo lang('contesting_exchange_gridsquare_s'); ?></label>
 								<input disabled type="text" class="form-control form-control-sm" name="exch_gridsquare_s" id="exch_gridsquare_s" value="<?php echo $my_gridsquare;?>">
 							</div>
 
-                            <div class="form-group col-md-1">
+                            <div class="mb-3 col-md-1">
                                 <label for="rst_rcvd"><?php echo lang('gen_hamradio_rstr'); ?></label>
                                 <input type="text" class="form-control form-control-sm" name="rst_rcvd" id="rst_rcvd" value="59">
                             </div>
 
-                            <div style="display:none" class="form-group col-md-1 serialr">
+                            <div style="display:none" class="mb-3 col-md-1 serialr">
 								<label for="exch_serial_r"><?php echo lang('contesting_exchange_serial_r'); ?></label>
 								<input type="number" class="form-control form-control-sm" name="exch_serial_r" id="exch_serial_r" value="">
 							</div>
 							
-							<div style="display:none" class="form-group col-md-1 exchanger">
+							<div style="display:none" class="mb-3 col-md-1 exchanger">
 								<label for="exch_rcvd"><?php echo lang('gen_hamradio_exchange_rcvd_short'); ?></label>
 								<input type="text" class="form-control form-control-sm" name="exch_rcvd" id="exch_rcvd" value="">
 							</div>
 
-							<div style="display:none" class="form-group col-md-2 gridsquarer">
+							<div style="display:none" class="mb-3 col-md-2 gridsquarer">
 								<label for="exch_gridsquare_r"><?php echo lang('contesting_exchange_gridsquare_r'); ?></label>
 								<input type="text" class="form-control form-control-sm" name="locator" id="exch_gridsquare_r" value="">
 							</div>
                         </div>
 
-                        <div class="form-row">
-                            <div class="form-group col-md-5">
+                        <div class="row">
+                            <div class="mb-3 col-md-5">
                                 <label for="name"><?php echo lang('general_word_name'); ?></label>
                                 <input type="text" class="form-control form-control-sm" name="name" id="name" value="">
                             </div>
 
-                            <div class="form-group col-md-5">
+                            <div class="mb-3 col-md-5">
                                 <label for="comment"><?php echo lang('general_word_comment'); ?></label>
                                 <input type="text" class="form-control form-control-sm" name="comment" id="comment" value="">
                             </div>
@@ -161,7 +161,7 @@
 
                         <button type="button" class="btn btn-sm btn-light" onclick="reset_log_fields()"><i class="fas fa-sync-alt"></i> <?php echo lang('contesting_btn_reset_qso'); ?></button>
                         <button type="button" class="btn btn-sm btn-primary" onclick="logQso();"><i class="fas fa-save"></i> <?php echo lang('contesting_btn_save_qso'); ?></button>
-                        <div class="form-group row">
+                        <div class="mb-3 row">
                           <div class="col-md-12">
                               <div class="form-check-inline">
                                   <input class="form-check-input" type="checkbox" name="copyexchangetodok" value="1" id="copyexchangetodok">
diff --git a/application/views/continents/index.php b/application/views/continents/index.php
index a03b8d3f..a2482287 100644
--- a/application/views/continents/index.php
+++ b/application/views/continents/index.php
@@ -13,7 +13,7 @@
     <div hidden class="tabs">
         <ul class="nav nav-tabs" id="myTab" role="tablist">
             <li class="nav-item">
-                <a class="nav-link active" id="continents-tab" data-toggle="tab" href="#continents" role="tab"
+                <a class="nav-link active" id="continents-tab" data-bs-toggle="tab" href="#continents" role="tab"
                     aria-controls="continents" aria-selected="true">No of QSOs</a>
             </li>
         </ul>
@@ -24,27 +24,27 @@
         <div class="tab-pane fade active show" id="continents" role="tabpanel" aria-labelledby="continents-tab">
             <br />
             <form id="searchForm" name="searchForm" action="<?php echo base_url()."index.php/continents/get_continents";?>" method="post">
-                <div class="form-row">
+                <div class="row">
 
-                    <div class="form-group col-lg-2">
+                    <div class="mb-3 col-lg-2">
                         <label class="form-label" for="band">Band</label>
-                        <select id="band" name="band" class="form-control form-control-sm">
+                        <select id="band" name="band" class="form-select form-select-sm">
                             <option value="">All</option>
                             <?php foreach($bands as $band){ ?>
 								<option value="<?php echo htmlentities($band);?>"><?php echo htmlspecialchars($band);?>	</option>
 							<?php } ?>
                         </select>
                     </div>
-                    <div class="form-group col-lg-2">
+                    <div class="mb-3 col-lg-2">
                         <label class="form-label" for="mode">Mode</label>
-                        <select id="mode" name="mode" class="form-control form-control-sm">
+                        <select id="mode" name="mode" class="form-select form-select-sm">
                             <option value="">All</option>
                             <?php foreach($modes as $modeId => $mode){ ?>
 								<option value="<?php echo htmlspecialchars($mode);?>"><?php echo htmlspecialchars($mode);?></option>
 							<?php } ?>
                         </select>
                     </div>
-                    <div class="form-group col-lg-2 col-md-3 col-sm-3 col-xl-21">
+                    <div class="mb-3 col-lg-2 col-md-3 col-sm-3 col-xl-21">
                         <label>&nbsp;</label><br>
                         <button type="submit" class="btn btn-sm btn-primary" id="searchButton">Search</button>
                         <button type="reset" class="btn btn-sm btn-danger" id="resetButton">Reset</button>
diff --git a/application/views/csv/index.php b/application/views/csv/index.php
index cb54e449..a5e8ea53 100644
--- a/application/views/csv/index.php
+++ b/application/views/csv/index.php
@@ -14,10 +14,10 @@
 		<div class="card-body">
 
 			<form class="form" action="<?php echo site_url('csv/export'); ?>" method="post" enctype="multipart/form-data">
-				<div class="form-row">
-					<div class="form-group col-md-3">
+				<div class="row">
+					<div class="mb-3 col-md-3">
 						<label for="station_profile"><?php echo lang('cloudlog_station_profile'); ?></label>
-						<select name="station_profile" class="station_id custom-select">
+						<select name="station_profile" class="station_id form-select">
 							<option value="All"><?php echo lang('general_word_all'); ?></option>
 							<?php foreach ($station_profile->result() as $station) { ?>
 								<option value="<?php echo $station->station_id; ?>"><?php echo lang('gen_hamradio_callsign') . ": "; ?><?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
@@ -26,10 +26,10 @@
 					</div>
 				</div>
 
-				<div class="form-row">
-				<div class="form-group col-md-3">
+				<div class="row">
+				<div class="mb-3 col-md-3">
 					<label for="band"><?php echo lang('gen_hamradio_band'); ?></label>
-					<select id="band" name="band" class="custom-select">
+					<select id="band" name="band" class="form-select">
 						<option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> ><?php echo lang('general_word_all'); ?></option>
 						<?php foreach($worked_bands as $band) {
 							echo '<option value="' . $band . '"';
@@ -38,9 +38,9 @@
 						} ?>
 					</select>
 				</div>
-					<div class="form-group col-md-3">
+					<div class="mb-3 col-md-3">
 						<label for="mode"><?php echo lang('gen_hamradio_mode'); ?></label>
-						<select id="mode" name="mode" class="form-control custom-select">
+						<select id="mode" name="mode" class="form-select form-select">
 							<option value="All"><?php echo lang('general_word_all'); ?></option>
 							<?php
 							foreach($modes->result() as $mode){
@@ -54,9 +54,9 @@
 						</select>
 					</div>
 
-				<div class="form-group col-md-4">
+				<div class="mb-3 col-md-4">
 					<label for="dxcc_id"><?php echo lang('gen_hamradio_dxcc'); ?></label>
-					<select class="custom-select" id="dxcc_id" name="dxcc_id">
+					<select class="form-select" id="dxcc_id" name="dxcc_id">
 						<option value="All"><?php echo lang('general_word_all'); ?></option>
 						<?php
 						foreach($dxcc as $d){
@@ -75,10 +75,10 @@
 
 
 
-				<div class="form-row">
-					<div class="form-group col-md-3">
+				<div class="row">
+					<div class="mb-3 col-md-3">
 					<label for="cqz"><?php echo lang('gen_hamradio_cq_zone'); ?></label>
-					<select class="custom-select" id="cqz" name="cqz">
+					<select class="form-select" id="cqz" name="cqz">
 						<option value="All"><?php echo lang('general_word_all'); ?></option>
 						<?php
 						for ($i = 1; $i<=40; $i++) {
@@ -88,9 +88,9 @@
 					</select>
 				</div>
 
-				<div class="form-group col-md-5">
+				<div class="mb-3 col-md-5">
 					<label for="selectPropagation"><?php echo lang('gen_hamradio_propagation_mode'); ?></label>
-					<select class="custom-select" id="selectPropagation" name="prop_mode">
+					<select class="form-select" id="selectPropagation" name="prop_mode">
 						<option value="All"><?php echo lang('general_word_all'); ?></option>
 						<option value="AS">Aircraft Scatter</option>
 						<option value="AUR">Aurora</option>
@@ -113,22 +113,22 @@
 					</select>
 				</div>
 				</div>
-				<div class="form-row">
-					<div class="form-group col-md-3">
+				<div class="row">
+					<div class="mb-3 col-md-3">
 						<label for="datetimepicker1"><?php echo lang('gen_from_date') . ':'; ?></label>
 						<div class="exportdatepicker input-group date col-md-12" id="datetimepicker1" data-target-input="nearest">
-							<input name="fromdate" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker1"/>
-							<div class="input-group-append"  data-target="#datetimepicker1" data-toggle="datetimepicker">
+							<input name="fromdate" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-bs-target="#datetimepicker1"/>
+							<div class="input-group-append"  data-bs-target="#datetimepicker1" data-bs-toggle="datetimepicker">
 								<div class="input-group-text"><i class="fa fa-calendar"></i></div>
 							</div>
 						</div>
 					</div>
 
-					<div class="form-group col-md-3">
+					<div class="mb-3 col-md-3">
 						<label for="datetimepicker2"><?php echo lang('gen_to_date') . ':'; ?></label>
 						<div class="exportdatepicker input-group date col-md-12" id="datetimepicker2" data-target-input="nearest">
-							<input name="todate" totype="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker2"/>
-							<div class="input-group-append" data-target="#datetimepicker2" data-toggle="datetimepicker">
+							<input name="todate" totype="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-bs-target="#datetimepicker2"/>
+							<div class="input-group-append" data-bs-target="#datetimepicker2" data-bs-toggle="datetimepicker">
 								<div class="input-group-text"><i class="fa fa-calendar"></i></div>
 							</div>
 						</div>
diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php
index 2e66e543..7269c298 100644
--- a/application/views/dashboard/index.php
+++ b/application/views/dashboard/index.php
@@ -22,9 +22,9 @@ function echo_table_col($row, $name) {
 	$ci =& get_instance();
 	switch($name) {
 		case 'Mode':    echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE . '</td>'; break;
-      case 'RSTS':    echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_STX_STRING . '</span>';} echo '</td>'; break;
-      case 'RSTR':    echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';} echo '</td>'; break;
-		case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY))); if ($row->end != NULL) echo ' <span class="badge badge-danger">'.$ci->lang->line('gen_hamradio_deleted_dxcc').'</span>'  . '</td>'; break;
+      case 'RSTS':    echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_STX_STRING . '</span>';} echo '</td>'; break;
+      case 'RSTR':    echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';} echo '</td>'; break;
+		case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY))); if ($row->end != NULL) echo ' <span class="badge text-bg-danger">'.$ci->lang->line('gen_hamradio_deleted_dxcc').'</span>'  . '</td>'; break;
 		case 'IOTA':    echo '<td>' . ($row->COL_IOTA) . '</td>'; break;
 		case 'SOTA':    echo '<td>' . ($row->COL_SOTA_REF) . '</td>'; break;
 		case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF) . '</td>'; break;
@@ -80,7 +80,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
 		</div>
 	<?php } else { ?>
 		<div class="alert alert-warning" role="alert">
-			  <span class="badge badge-info"><?php echo lang('general_word_important'); ?></span> <i class="fas fa-broadcast-tower"></i> <?php echo lang('notice_turn_the_radio_on'); ?>
+			  <span class="badge text-bg-info"><?php echo lang('general_word_important'); ?></span> <i class="fas fa-broadcast-tower"></i> <?php echo lang('notice_turn_the_radio_on'); ?>
 		</div>
 	<?php } ?>
 	<?php } ?>
@@ -96,13 +96,13 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
 			$current_date = date('Y-m-d H:i:s');
 			if($this->LotwCert->lotw_cert_expired($this->session->userdata('user_id'), $current_date) == true) { ?>
 			<div class="alert alert-danger" role="alert">
-				<span class="badge badge-info"><?php echo lang('general_word_important'); ?></span> <i class="fas fa-hourglass-end"></i> <?php echo lang('lotw_cert_expired'); ?>
+				<span class="badge text-bg-info"><?php echo lang('general_word_important'); ?></span> <i class="fas fa-hourglass-end"></i> <?php echo lang('lotw_cert_expired'); ?>
 			</div>
 		<?php } ?>
 
 		<?php if($this->LotwCert->lotw_cert_expiring($this->session->userdata('user_id'), $current_date) == true) { ?>
 			<div class="alert alert-warning" role="alert">
-				<span class="badge badge-info"><?php echo lang('general_word_important'); ?></span> <i class="fas fa-hourglass-half"></i> <?php echo lang('lotw_cert_expiring'); ?>
+				<span class="badge text-bg-info"><?php echo lang('general_word_important'); ?></span> <i class="fas fa-hourglass-half"></i> <?php echo lang('lotw_cert_expiring'); ?>
 			</div>
 		<?php } ?>
 	<?php } ?>
@@ -222,7 +222,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
 				<td width="50%"><?php echo $total_countries; ?></td>
 			</tr>
 			<tr>
-				<td width="50%"><a href="#" onclick="return false" data-original-title="QSL Cards / eQSL / LoTW" data-toggle="tooltip"><?php echo lang('general_word_confirmed'); ?></a></td>
+				<td width="50%"><a href="#" onclick="return false" data-original-title="QSL Cards / eQSL / LoTW" data-bs-toggle="tooltip"><?php echo lang('general_word_confirmed'); ?></a></td>
 				<td width="50%">
 					<?php echo $total_countries_confirmed_paper; ?> /
 					<?php echo $total_countries_confirmed_eqsl; ?> /
diff --git a/application/views/dayswithqso/index.php b/application/views/dayswithqso/index.php
index 43a76bc3..aa559377 100644
--- a/application/views/dayswithqso/index.php
+++ b/application/views/dayswithqso/index.php
@@ -67,7 +67,7 @@
             echo '</table></div>';
     }
     else {
-        echo '<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>No streak found!</div>';
+        echo '<div class="alert alert-danger" role="alert"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>No streak found!</div>';
     }
     ?>
 
@@ -115,7 +115,7 @@
         echo '</table></div>';
     }
     else {
-        echo '<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>No current streak found!</div>';
+        echo '<div class="alert alert-danger" role="alert"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>No current streak found!</div>';
     }
     ?>
 </div>
diff --git a/application/views/debug/main.php b/application/views/debug/main.php
index 0b279ef2..127a337b 100644
--- a/application/views/debug/main.php
+++ b/application/views/debug/main.php
@@ -19,11 +19,11 @@
                     </tr>
                     <tr>
                         <td>Base URL</td>
-                        <td><span id="baseUrl"><a href="<?php echo $this->config->item('base_url')?>" target="_blank"><?php echo $this->config->item('base_url'); ?></a></span> <span data-toggle="tooltip" data-original-title="<?php echo lang('copy_to_clipboard'); ?>" onclick='copyURL("<?php echo $this->config->item('base_url'); ?>")'><i class="copy-icon fas fa-copy"></span></td>
+                        <td><span id="baseUrl"><a href="<?php echo $this->config->item('base_url')?>" target="_blank"><?php echo $this->config->item('base_url'); ?></a></span> <span data-bs-toggle="tooltip" data-original-title="<?php echo lang('copy_to_clipboard'); ?>" onclick='copyURL("<?php echo $this->config->item('base_url'); ?>")'><i class="copy-icon fas fa-copy"></span></td>
                     </tr>
                     <tr>
                         <td>Migration</td>
-                        <td><?php echo (isset($migration_version) ? $migration_version : "<span class='badge badge-danger'>There is something wrong with your Migration in Database!</span>"); ?></td>
+                        <td><?php echo (isset($migration_version) ? $migration_version : "<span class='badge text-bg-danger'>There is something wrong with your Migration in Database!</span>"); ?></td>
                     </tr>
 
                 </table>
@@ -73,9 +73,9 @@
                         <td>/backup</td>
                         <td>
                             <?php if($backup_folder == true) { ?>
-                                <span class="badge badge-success">Success</span>
+                                <span class="badge text-bg-success">Success</span>
                             <?php } else { ?>
-                                <span class="badge badge-danger">Failed</span>
+                                <span class="badge text-bg-danger">Failed</span>
                             <?php } ?>
                         </td>
                     </tr>
@@ -84,9 +84,9 @@
                         <td>/updates</td>
                         <td>
                             <?php if($updates_folder == true) { ?>
-                                <span class="badge badge-success">Success</span>
+                                <span class="badge text-bg-success">Success</span>
                             <?php } else { ?>
-                                <span class="badge badge-danger">Failed</span>
+                                <span class="badge text-bg-danger">Failed</span>
                             <?php } ?>
                         </td>
                     </tr>
@@ -95,9 +95,9 @@
                         <td>/uploads</td>
                         <td>
                             <?php if($uploads_folder == true) { ?>
-                                <span class="badge badge-success">Success</span>
+                                <span class="badge text-bg-success">Success</span>
                             <?php } else { ?>
-                                <span class="badge badge-danger">Failed</span>
+                                <span class="badge text-bg-danger">Failed</span>
                             <?php } ?>
                         </td>
                     </tr>
@@ -115,9 +115,9 @@
                         <td>curl</td>
                         <td>
                             <?php if(in_array  ('curl', get_loaded_extensions())) { ?>
-                                <span class="badge badge-success">Installed</span>
+                                <span class="badge text-bg-success">Installed</span>
                             <?php } else { ?>
-                                <span class="badge badge-danger">Not Installed</span>
+                                <span class="badge text-bg-danger">Not Installed</span>
                             <?php } ?>
                         </td>
                     </tr>
@@ -126,9 +126,9 @@
                         <td>MySQL</td>
                         <td>
                             <?php if(in_array  ('mysqli', get_loaded_extensions())) { ?>
-                                <span class="badge badge-success">Installed</span>
+                                <span class="badge text-bg-success">Installed</span>
                             <?php } else { ?>
-                                <span class="badge badge-danger">Not Installed</span>
+                                <span class="badge text-bg-danger">Not Installed</span>
                             <?php } ?>
                         </td>
                     </tr>
@@ -137,9 +137,9 @@
                         <td>mbstring</td>
                         <td>
                             <?php if(in_array  ('mbstring', get_loaded_extensions())) { ?>
-                                <span class="badge badge-success">Installed</span>
+                                <span class="badge text-bg-success">Installed</span>
                             <?php } else { ?>
-                                <span class="badge badge-danger">Not Installed</span>
+                                <span class="badge text-bg-danger">Not Installed</span>
                             <?php } ?>
                         </td>
                     </tr>
@@ -148,9 +148,9 @@
                         <td>xml</td>
                         <td>
                             <?php if(in_array  ('xml', get_loaded_extensions())) { ?>
-                                <span class="badge badge-success">Installed</span>
+                                <span class="badge text-bg-success">Installed</span>
                             <?php } else { ?>
-                                <span class="badge badge-danger">Not Installed</span>
+                                <span class="badge text-bg-danger">Not Installed</span>
                             <?php } ?>
                         </td>
                     </tr>
@@ -159,9 +159,9 @@
                         <td>openssl</td>
                         <td>
                             <?php if(in_array  ('openssl', get_loaded_extensions())) { ?>
-                                <span class="badge badge-success">Installed</span>
+                                <span class="badge text-bg-success">Installed</span>
                             <?php } else { ?>
-                                <span class="badge badge-danger">Not Installed</span>
+                                <span class="badge text-bg-danger">Not Installed</span>
                             <?php } ?>
                         </td>
                     </tr>
@@ -217,12 +217,12 @@
                                 <?php if($owner != "") { ?>
                                     <a target="_blank" href="https://github.com/<?php echo $owner; ?>/Cloudlog/tree/<?php echo $branch?>">
                                 <?php } ?>
-                                    <span class="badge badge-success"><?php echo $branch; ?></span>
+                                    <span class="badge text-bg-success"><?php echo $branch; ?></span>
                                 <?php if($owner != "") { ?>
                                     </a>
                                 <?php } ?>
                             <?php } else { ?>
-                                <span class="badge badge-danger">n/a</span>
+                                <span class="badge text-bg-danger">n/a</span>
                             <?php } ?>
                         </td>
                     </tr>
@@ -231,9 +231,9 @@
                         <td>Commit</td>
                         <td>
                             <?php if($commitHash != "") { ?>
-                                <a target="_blank" href="https://github.com/magicbug/Cloudlog/commit/<?php echo $commitHash?>"><span class="badge badge-success"><?php echo substr($commitHash,0,8); ?></span></a>
+                                <a target="_blank" href="https://github.com/magicbug/Cloudlog/commit/<?php echo $commitHash?>"><span class="badge text-bg-success"><?php echo substr($commitHash,0,8); ?></span></a>
                             <?php } else { ?>
-                                <span class="badge badge-danger">n/a</span>
+                                <span class="badge text-bg-danger">n/a</span>
                             <?php } ?>
                         </td>
                     </tr>
@@ -241,9 +241,9 @@
                         <td>Tag</td>
                         <td>
                             <?php if($commitHash != "") { ?>
-                                <a target="_blank" href="https://github.com/magicbug/Cloudlog/releases/tag/<?php echo substr($tag,0,strpos($tag, '-')); ?>"><span class="badge badge-success"><?php echo $tag; ?></span></a>
+                                <a target="_blank" href="https://github.com/magicbug/Cloudlog/releases/tag/<?php echo substr($tag,0,strpos($tag, '-')); ?>"><span class="badge text-bg-success"><?php echo $tag; ?></span></a>
                             <?php } else { ?>
-                                <span class="badge badge-danger">n/a</span>
+                                <span class="badge text-bg-danger">n/a</span>
                             <?php } ?>
                         </td>
                     </tr>
diff --git a/application/views/distances/index.php b/application/views/distances/index.php
index 2860cbb0..0ea1eb8f 100644
--- a/application/views/distances/index.php
+++ b/application/views/distances/index.php
@@ -15,9 +15,9 @@
         var lang_statistics_distances_qsos_with = '<?php echo lang('lang_statistics_distances_qsos_with'); ?>';
     </script>
     <div id="distances_div">
-        <form class="form-inline">
-            <label class="my-1 mr-2" for="distplot_bands"><?php echo lang('gen_band_selection'); ?></label>
-            <select class="custom-select my-1 mr-sm-2"  id="distplot_bands">
+        <form class="d-flex align-items-center">
+            <label class="my-1 me-2" for="distplot_bands"><?php echo lang('gen_band_selection'); ?></label>
+            <select class="form-select my-1 me-sm-2"  id="distplot_bands">
                 <?php if (count($sats_available) != 0) { ?>
                     <option value="sat">SAT</option>
                 <?php } ?>
@@ -26,8 +26,8 @@
                 } ?>
             </select>
             <?php if (count($sats_available) != 0) { ?>
-                <label class="my-1 mr-2" for="distplot_sats"><?php echo lang('general_word_satellite')?></label>
-                <select class="custom-select my-1 mr-sm-2"  id="distplot_sats">
+                <label class="my-1 me-2" for="distplot_sats"><?php echo lang('general_word_satellite')?></label>
+                <select class="form-select my-1 me-sm-2"  id="distplot_sats">
                     <option value="All"><?php echo lang('general_word_all')?></option>
                     <?php foreach($sats_available as $sat) {
                         echo '<option value="' . $sat . '"' . '>' . $sat . '</option>'."\n";
diff --git a/application/views/dxatlas/index.php b/application/views/dxatlas/index.php
index 259c72ee..408a87d5 100644
--- a/application/views/dxatlas/index.php
+++ b/application/views/dxatlas/index.php
@@ -14,10 +14,10 @@
 		<div class="card-body">
 
 			<form class="form" action="<?php echo site_url('dxatlas/export'); ?>" method="post" enctype="multipart/form-data">
-				<div class="form-row">
-					<div class="form-group col-md-3">
+				<div class="row">
+					<div class="mb-3 col-md-3">
 						<label for="station_profile"><?php echo lang('cloudlog_station_profile'); ?></label>
-						<select name="station_profile" class="station_id custom-select">
+						<select name="station_profile" class="station_id form-select">
 							<option value="All"><?php echo lang('general_word_all'); ?></option>
 							<?php foreach ($station_profile->result() as $station) { ?>
 								<option value="<?php echo $station->station_id; ?>"><?php echo lang('gen_hamradio_callsign') . ": "; ?><?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
@@ -26,10 +26,10 @@
 					</div>
 				</div>
 
-				<div class="form-row">
-				<div class="form-group col-md-3">
+				<div class="row">
+				<div class="mb-3 col-md-3">
 					<label for="band"><?php echo lang('gen_hamradio_band'); ?></label>
-					<select id="band" name="band" class="custom-select">
+					<select id="band" name="band" class="form-select">
 						<option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> ><?php echo lang('general_word_all'); ?></option>
 						<?php foreach($worked_bands as $band) {
 							echo '<option value="' . $band . '"';
@@ -38,9 +38,9 @@
 						} ?>
 					</select>
 				</div>
-					<div class="form-group col-md-3">
+					<div class="mb-3 col-md-3">
 						<label for="mode"><?php echo lang('gen_hamradio_mode'); ?></label>
-						<select id="mode" name="mode" class="form-control custom-select">
+						<select id="mode" name="mode" class="form-select form-select">
 							<option value="All"><?php echo lang('general_word_all'); ?></option>
 							<?php
 							foreach($modes->result() as $mode){
@@ -54,9 +54,9 @@
 						</select>
 					</div>
 
-				<div class="form-group col-md-4">
+				<div class="mb-3 col-md-4">
 					<label for="dxcc_id"><?php echo lang('gen_hamradio_dxcc'); ?></label>
-					<select class="custom-select" id="dxcc_id" name="dxcc_id">
+					<select class="form-select" id="dxcc_id" name="dxcc_id">
 						<option value="All"><?php echo lang('general_word_all'); ?></option>
 						<?php
 						foreach($dxcc as $d){
@@ -75,10 +75,10 @@
 
 
 
-				<div class="form-row">
-					<div class="form-group col-md-3">
+				<div class="row">
+					<div class="mb-3 col-md-3">
 					<label for="cqz"><?php echo lang('gen_hamradio_cq_zone'); ?></label>
-					<select class="custom-select" id="cqz" name="cqz">
+					<select class="form-select" id="cqz" name="cqz">
 						<option value="All"><?php echo lang('general_word_all'); ?></option>
 						<?php
 						for ($i = 1; $i<=40; $i++) {
@@ -88,9 +88,9 @@
 					</select>
 				</div>
 
-				<div class="form-group col-md-5">
+				<div class="mb-3 col-md-5">
 					<label for="selectPropagation"><?php echo lang('gen_hamradio_propagation_mode'); ?></label>
-					<select class="custom-select" id="selectPropagation" name="prop_mode">
+					<select class="form-select" id="selectPropagation" name="prop_mode">
 						<option value="All"><?php echo lang('general_word_all'); ?></option>
 						<option value="AS">Aircraft Scatter</option>
 						<option value="AUR">Aurora</option>
@@ -113,22 +113,22 @@
 					</select>
 				</div>
 				</div>
-				<div class="form-row">
-					<div class="form-group col-md-3">
+				<div class="row">
+					<div class="mb-3 col-md-3">
 						<label for="datetimepicker1"><?php echo lang('gen_from_date') . ':'; ?></label>
 						<div class="exportdatepicker input-group date col-md-12" id="datetimepicker1" data-target-input="nearest">
-							<input name="fromdate" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker1"/>
-							<div class="input-group-append"  data-target="#datetimepicker1" data-toggle="datetimepicker">
+							<input name="fromdate" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-bs-target="#datetimepicker1"/>
+							<div class="input-group-append"  data-bs-target="#datetimepicker1" data-bs-toggle="datetimepicker">
 								<div class="input-group-text"><i class="fa fa-calendar"></i></div>
 							</div>
 						</div>
 					</div>
 
-					<div class="form-group col-md-3">
+					<div class="mb-3 col-md-3">
 						<label for="datetimepicker2"><?php echo lang('gen_to_date') . ':'; ?></label>
 						<div class="exportdatepicker input-group date col-md-12" id="datetimepicker2" data-target-input="nearest">
-							<input name="todate" totype="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker2"/>
-							<div class="input-group-append" data-target="#datetimepicker2" data-toggle="datetimepicker">
+							<input name="todate" totype="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-bs-target="#datetimepicker2"/>
+							<div class="input-group-append" data-bs-target="#datetimepicker2" data-bs-toggle="datetimepicker">
 								<div class="input-group-text"><i class="fa fa-calendar"></i></div>
 							</div>
 						</div>
diff --git a/application/views/eqsl/export.php b/application/views/eqsl/export.php
index 6be59f85..a516ebb8 100644
--- a/application/views/eqsl/export.php
+++ b/application/views/eqsl/export.php
@@ -29,7 +29,7 @@
 ?>
     	<p>Below is a table of QSOs that have not yet been sent to eQSL.</p>
 
-    	<p><span class="badge badge-info">Info</span> Please make sure the "eQSL QTH Nickname" field is set in your station profile and that the value matches the QTH Nickname you set within eQSL.</p>
+    	<p><span class="badge text-bg-info">Info</span> Please make sure the "eQSL QTH Nickname" field is set in your station profile and that the value matches the QTH Nickname you set within eQSL.</p>
  <?php
 
     	echo $eqsl_table;
diff --git a/application/views/eqsl/import.php b/application/views/eqsl/import.php
index 764f0d0e..366c8d87 100644
--- a/application/views/eqsl/import.php
+++ b/application/views/eqsl/import.php
@@ -35,7 +35,7 @@
 					<input type="file" name="userfile" size="20" />
 			  <br/><br/>
 			<p>Choose Station(location) eQSL File belongs to:</p>
-                    <select name="station_profile" class="custom-select mb-2 mr-sm-2" style="width: 20%;">
+                    <select name="station_profile" class="form-select mb-2 me-sm-2" style="width: 20%;">
                     <option value="0">Select Station Location</option>
                     <?php foreach ($station_profile->result() as $station) { ?>
                     <option value="<?php echo $station->station_id; ?>" <?php if ($station->station_id == $this->stations->find_active()) { echo " selected =\"selected\""; } ?>>Callsign: <?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name.") eQSL: ".$station->eqslqthnickname; ?></option>
@@ -49,19 +49,19 @@
 			  <input class="form-check-input" type="radio" name="eqslimport" id="fetch" value="fetch"  checked="checked"/>
 			  <label class="form-check-label" for="exampleRadios1">Import directly from eQSL</label>
 			  <p>Cloudlog will use the eQSL credentials from your Cloudlog user profile to connect to eQSL and download confirmations.</p>
-				<div class="form-row">
-		        	<div class="form-group col-sm-2">
+				<div class="row">
+		        	<div class="mb-3 col-sm-2">
 			          	<div class="dxatlasdatepicker input-group date" id="eqsl_force_from_date" data-target-input="nearest">
-			            	<input name="eqsl_force_from_date" type="text" placeholder="YYYY/MM/DD" class="form-control datetimepicker-input" data-target="#eqsl_force_from_date" value=""/>
-			              	<div class="input-group-append"  data-target="#eqsl_force_from_date" data-toggle="datetimepicker"><div class="input-group-text"><i class="fa fa-calendar"></i></div></div>
+			            	<input name="eqsl_force_from_date" type="text" placeholder="YYYY/MM/DD" class="form-control datetimepicker-input" data-bs-target="#eqsl_force_from_date" value=""/>
+			              	<div class="input-group-append"  data-bs-target="#eqsl_force_from_date" data-bs-toggle="datetimepicker"><div class="input-group-text"><i class="fa fa-calendar"></i></div></div>
 			          	</div>
 		        	</div>
-		         	<div class="form-group col-sm-5" style="vertical-align:middle;"><label class="form-label"><?php echo "(Select a date, only if you want to force an import with an older date)"; //$this->lang->line(''); ?></label></div>
+		         	<div class="mb-3 col-sm-5" style="vertical-align:middle;"><label class="form-label"><?php echo "(Select a date, only if you want to force an import with an older date)"; //$this->lang->line(''); ?></label></div>
 				</div>
 			</div>
 
 			<br>
-			<div class="form-group"><input class="btn btn-primary" type="submit" value="Import eQSL QSO Matches" /></div>
+			<div class="mb-3"><input class="btn btn-primary" type="submit" value="Import eQSL QSO Matches" /></div>
 		</form>
   </div>
 </div>
diff --git a/application/views/gridmap/index.php b/application/views/gridmap/index.php
index ddcc7a78..68a031d7 100644
--- a/application/views/gridmap/index.php
+++ b/application/views/gridmap/index.php
@@ -46,9 +46,9 @@
 
 	<h2><?php echo $page_title; ?></h2>
 
-<form class="form-inline">
-            <label class="my-1 mr-2" for="band"><?php echo lang('gridsquares_band'); ?></label>
-            <select class="custom-select my-1 mr-sm-2"  id="band">
+<form class="d-flex align-items-center">
+            <label class="my-1 me-2" for="band"><?php echo lang('gridsquares_band'); ?></label>
+            <select class="form-select my-1 me-sm-2"  id="band">
                 <option value="All"><?php echo lang('general_word_all')?></option>
                 <?php foreach($bands as $band) {
                     echo '<option value="'.$band.'"';
@@ -59,8 +59,8 @@
                 } ?>
             </select>
             <?php if (count($sats_available) != 0) { ?>
-                <label class="my-1 mr-2" for="distplot_sats"><?php echo lang('gridsquares_sat'); ?></label>
-                <select class="custom-select my-1 mr-sm-2"  id="sats" <?php if ($user_default_band != "SAT") { ?>disabled<?php } ?>>
+                <label class="my-1 me-2" for="distplot_sats"><?php echo lang('gridsquares_sat'); ?></label>
+                <select class="form-select my-1 me-sm-2"  id="sats" <?php if ($user_default_band != "SAT") { ?>disabled<?php } ?>>
                     <option value="All"><?php echo lang('general_word_all')?></option>
                     <?php foreach($sats_available as $sat) {
                         echo '<option value="' . $sat . '"' . '>' . $sat . '</option>'."\n";
@@ -69,8 +69,8 @@
             <?php } else { ?>
                 <input id="sats" type="hidden" value="All"></input>
             <?php } ?>
-			<label class="my-1 mr-2" for="mode"><?php echo lang('gridsquares_mode'); ?></label>
-            <select class="custom-select my-1 mr-sm-2"  id="mode">
+			<label class="my-1 me-2" for="mode"><?php echo lang('gridsquares_mode'); ?></label>
+            <select class="form-select my-1 me-sm-2"  id="mode">
 			<option value="All"><?php echo lang('general_word_all')?></option>
                     <?php
                     foreach($modes as $mode){
@@ -80,7 +80,7 @@
                     }
                     ?>
             </select>
-			<label class="my-1 mr-2"><?php echo lang('gridsquares_confirmation'); ?></label>
+			<label class="my-1 me-2"><?php echo lang('gridsquares_confirmation'); ?></label>
                 <div>
                     <div class="form-check-inline">
                     <?php echo '<input class="form-check-input" type="checkbox" name="qsl" id="qsl"';
@@ -108,8 +108,8 @@
                     </div>
                 </div>
 
-            <button id="plot" type="button" name="plot" class="btn btn-primary mr-1 ld-ext-right ld-ext-right-plot" onclick="gridPlot(this.form)"><?php echo lang('gridsquares_button_plot'); ?><div class="ld ld-ring ld-spin"></div></button>
-			<button id="clear" type="button" name="clear" class="btn btn-primary mr-1 ld-ext-right ld-ext-right-clear" onclick="clearMarkers()"><?php echo lang('gridsquares_button_clear_markers'); ?><div class="ld ld-ring ld-spin"></div></button>
+            <button id="plot" type="button" name="plot" class="btn btn-primary me-1 ld-ext-right ld-ext-right-plot" onclick="gridPlot(this.form)"><?php echo lang('gridsquares_button_plot'); ?><div class="ld ld-ring ld-spin"></div></button>
+			<button id="clear" type="button" name="clear" class="btn btn-primary me-1 ld-ext-right ld-ext-right-clear" onclick="clearMarkers()"><?php echo lang('gridsquares_button_clear_markers'); ?><div class="ld ld-ring ld-spin"></div></button>
 </form>
 
 		<?php if($this->session->flashdata('message')) { ?>
@@ -125,15 +125,15 @@
 </div>
 <div class="coordinates d-flex">
         <div class="cohidden"><?php echo lang('gen_hamradio_latitude')?>: </div>
-        <div class="cohidden col-auto text-success font-weight-bold" id="latDeg"></div>
+        <div class="cohidden col-auto text-success fw-bold" id="latDeg"></div>
         <div class="cohidden"><?php echo lang('gen_hamradio_longitude')?>: </div>
-        <div class="cohidden col-auto text-success font-weight-bold" id="lngDeg"></div>
+        <div class="cohidden col-auto text-success fw-bold" id="lngDeg"></div>
         <div class="cohidden"><?php echo lang('gen_hamradio_gridsquare')?>: </div>
-        <div class="cohidden col-auto text-success font-weight-bold" id="locator"></div>
+        <div class="cohidden col-auto text-success fw-bold" id="locator"></div>
         <div class="cohidden"><?php echo lang('gen_hamradio_distance')?>: </div>
-        <div class="cohidden col-auto text-success font-weight-bold" id="distance"></div>
+        <div class="cohidden col-auto text-success fw-bold" id="distance"></div>
         <div class="cohidden"><?php echo lang('gen_hamradio_bearing')?>: </div>
-        <div class="cohidden col-auto text-success font-weight-bold" id="bearing"></div>
+        <div class="cohidden col-auto text-success fw-bold" id="bearing"></div>
 </div>
 <script>var gridsquaremap = true;
 var type = "worked";
diff --git a/application/views/gridsquares/index.php b/application/views/gridsquares/index.php
index ef95b27c..241e4838 100644
--- a/application/views/gridsquares/index.php
+++ b/application/views/gridsquares/index.php
@@ -5,9 +5,9 @@
 	<h2><?php echo $page_title; ?></h2>
 
 	<?php if ($this->uri->segment(1) == "gridsquares" && $this->uri->segment(2) == "band") { ?>
-<form class="form-inline">
-	<label class="my-1 mr-2" for="gridsquare_bands"><?php echo lang('gen_band_selection'); ?></label>
-	<select class="custom-select my-1 mr-sm-2"  id="gridsquare_bands"></select>
+<form class="d-flex align-items-center">
+	<label class="my-1 me-2" for="gridsquare_bands"><?php echo lang('gen_band_selection'); ?></label>
+	<select class="form-select my-1 me-sm-2"  id="gridsquare_bands"></select>
 </form>
 
 <?php } ?>
@@ -42,8 +42,8 @@
     <div class="modal-content">
       <div class="modal-header">
         <h5 class="modal-title" id="exampleModalLabel"><span id="qso_count"></span> QSO<span id="gt1_qso"></span> in Square: <span id="square_number"></span></h5>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">
+          
         </button>
       </div>
       <div class="modal-body">
@@ -62,7 +62,7 @@
 		</table>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
       </div>
     </div>
   </div>
diff --git a/application/views/hrdlog/export.php b/application/views/hrdlog/export.php
index 8260ded0..21583a04 100644
--- a/application/views/hrdlog/export.php
+++ b/application/views/hrdlog/export.php
@@ -7,10 +7,10 @@
         <div class="card-header">
 			<ul class="nav nav-tabs card-header-tabs pull-right" role="tablist">
 				<li class="nav-item">
-					<a class="nav-link active" id="export-tab" data-toggle="tab" href="#export" role="tab" aria-controls="import" aria-selected="true">Upload Logbook</a>
+					<a class="nav-link active" id="export-tab" data-bs-toggle="tab" href="#export" role="tab" aria-controls="import" aria-selected="true">Upload Logbook</a>
 				</li>
 				<li class="nav-item">
-					<a class="nav-link" id="mark-tab" data-toggle="tab" href="#mark" role="tab" aria-controls="export" aria-selected="false">Mark QSOs</a>
+					<a class="nav-link" id="mark-tab" data-bs-toggle="tab" href="#mark" role="tab" aria-controls="export" aria-selected="false">Mark QSOs</a>
 				</li>
 			</ul>
 
@@ -22,7 +22,7 @@
             <p>Here you can see and upload all QSOs which have not been previously uploaded to a HRDLog logbook.</p>
             <p>You need to set a HRDLog Logbook API Code in your station profile. Only station profiles with an API Key set are displayed.</p>
             <p>The Code can be demanded at <a href="http://www.hrdlog.net/EditUser.aspx" target="new" class="link">http://www.hrdlog.net/EditUser.aspx</a></p>
-            <p><span class="badge badge-warning">Warning</span> This might take a while as QSO uploads are processed sequentially.</p>
+            <p><span class="badge text-bg-warning">Warning</span> This might take a while as QSO uploads are processed sequentially.</p>
 
 <?php
             if ($station_profile->result()) {
@@ -53,7 +53,7 @@
 
         }
         else {
-        echo '<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
+        echo '<div class="alert alert-danger" role="alert"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
         }
         ?>
 
@@ -61,18 +61,18 @@
 				<div class="tab-pane fade" id="mark" role="tabpanel" aria-labelledby="home-tab">
 
 				<form class="form" action="<?php echo site_url('hrdlog/mark_hrdlog'); ?>" method="post" enctype="multipart/form-data">
-					<select name="station_profile" class="custom-select mb-4 mr-sm-4" style="width: 30%;">
+					<select name="station_profile" class="form-select mb-4 me-sm-4" style="width: 30%;">
 						<option disabled value="0">Select Station Location</option>
 						<?php foreach ($station_profiles->result() as $station) { ?>
 							<option <?php if ($station->station_active) { echo "selected "; } ?>value="<?php echo $station->station_id; ?>">Callsign: <?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
 						<?php } ?>
 					</select>
-					<p><span class="badge badge-warning">Warning</span> If a date range is not selected then all QSOs will be marked!</p>
+					<p><span class="badge text-bg-warning">Warning</span> If a date range is not selected then all QSOs will be marked!</p>
 					<p class="card-text">From date:</p>
 					<div class="row">
 						<div class="input-group date col-md-3" id="datetimepicker5" data-target-input="nearest">
-							<input name="from" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker1"/>
-							<div class="input-group-append"  data-target="#datetimepicker5" data-toggle="datetimepicker">
+							<input name="from" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-bs-target="#datetimepicker1"/>
+							<div class="input-group-append"  data-bs-target="#datetimepicker5" data-bs-toggle="datetimepicker">
 								<div class="input-group-text"><i class="fa fa-calendar"></i></div>
 							</div>
 						</div>
@@ -80,8 +80,8 @@
 					<p class="card-text">To date:</p>
 					<div class="row">
 						<div class="input-group date col-md-3" id="datetimepicker6" data-target-input="nearest">
-							<input name="to" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker2"/>
-							<div class="input-group-append" data-target="#datetimepicker6" data-toggle="datetimepicker">
+							<input name="to" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-bs-target="#datetimepicker2"/>
+							<div class="input-group-append" data-bs-target="#datetimepicker6" data-bs-toggle="datetimepicker">
 								<div class="input-group-text"><i class="fa fa-calendar"></i></div>
 							</div>
 						</div>
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index 18970412..613066a9 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -51,7 +51,7 @@
 <script>
     // Reinitialize tooltips after new content has been loaded
     document.addEventListener('htmx:afterSwap', function(event) {
-        $('[data-toggle="tooltip"]').tooltip();
+        $('[data-bs-toggle="tooltip"]').tooltip();
     });
     </script>
 <?php if ($this->uri->segment(1) == "awards" && ($this->uri->segment(2) == "was") ) { ?>
@@ -170,7 +170,7 @@ function copyURL(url) {
 }
 
 $(function () {
-   $('[data-toggle="tooltip"]').tooltip({'delay': { show: 500, hide: 0 }, 'placement': 'right'});
+   $('[data-bs-toggle="tooltip"]').tooltip({'delay': { show: 500, hide: 0 }, 'placement': 'right'});
 });
 </script>
 <?php } ?>
@@ -198,7 +198,7 @@ function copyApiUrl() {
 }
 
 $(function () {
-   $('[data-toggle="tooltip"]').tooltip({'delay': { show: 500, hide: 0 }, 'placement': 'right'});
+   $('[data-bs-toggle="tooltip"]').tooltip({'delay': { show: 500, hide: 0 }, 'placement': 'right'});
 });
 </script>
 <?php } ?>
@@ -308,13 +308,13 @@ $(function () {
                             })
                             .done(function(data) {
                                 $(".alert").remove();
-                                $(".card-body.main").append('<div class="alert alert-success"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Your query has been saved!</div>');
+                                $(".card-body.main").append('<div class="alert alert-success"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>Your query has been saved!</div>');
                                 if ($("#querydropdown option").length == 0) {
                                     var dropdowninfo = ' <button class="btn btn-sm btn-primary" onclick="edit_stored_query_dialog()" id="btn-edit">Edit queries</button></p>' +
-                                    '<div class="form-group row querydropdownform">' +
+                                    '<div class="mb-3 row querydropdownform">' +
                                         '<label class="col-md-2 control-label" for="querydropdown">  Stored queries:</label>' +
                                         '<div class="col-md-3">' +
-                                            '<select id="querydropdown" name="querydropdown" class="form-control custom-select-sm">' +
+                                            '<select id="querydropdown" name="querydropdown" class="form-select form-select-sm">' +
                                             '</select>' +
                                         '</div>' +
                                         '<button class="btn btn-sm btn-primary ld-ext-right runbutton" onclick="run_query()">Run Query<div class="ld ld-ring ld-spin"></div></button>' +
@@ -377,7 +377,7 @@ $(function () {
                 if (isDarkModeTheme()) {
                     $(".buttons-csv").css("color", "white");
                 }
-                $('[data-toggle="tooltip"]').tooltip();
+                $('[data-bs-toggle="tooltip"]').tooltip();
                 $(".runbutton").removeClass('running');
                 $(".runbutton").prop('disabled', false);
             });
@@ -400,7 +400,7 @@ $(function () {
                             'id': id
                         },
                         success: function(data) {
-                            $(".bootstrap-dialog-message").prepend('<div class="alert alert-danger"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>The stored query has been deleted!</div>');
+                            $(".bootstrap-dialog-message").prepend('<div class="alert alert-danger"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>The stored query has been deleted!</div>');
                             $("#query_" + id).remove(); // removes query from table in dialog
                             $("#querydropdown option[value='" + id + "']").remove(); // removes query from dropdown
                             if ($("#querydropdown option").length == 0) {
@@ -409,7 +409,7 @@ $(function () {
                             };
                         },
                         error: function() {
-                            $(".bootstrap-dialog-message").prepend('<div class="alert alert-danger"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>The stored query could not be deleted. Please try again!</div>');
+                            $(".bootstrap-dialog-message").prepend('<div class="alert alert-danger"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>The stored query could not be deleted. Please try again!</div>');
                         },
                     });
                 }
@@ -435,11 +435,11 @@ $(function () {
             },
             success: function(html) {
                 $('#edit_' + id).html('<a class="btn btn-outline-primary btn-sm" href="javascript:edit_stored_query(' + id + ');">Edit</a>'); // Change to edit button
-                $(".bootstrap-dialog-message").prepend('<div class="alert alert-success"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>The query description has been updated!</div>');
+                $(".bootstrap-dialog-message").prepend('<div class="alert alert-success"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>The query description has been updated!</div>');
                 $("#querydropdown option[value='" + id + "']").text($('#description_' + id).html()); // Change text in dropdown
             },
             error: function() {
-                $(".bootstrap-dialog-message").prepend('<div class="alert alert-danger"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Something went wrong with the save. Please try again!</div>');
+                $(".bootstrap-dialog-message").prepend('<div class="alert alert-danger"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>Something went wrong with the save. Please try again!</div>');
             },
         });
     }
@@ -502,7 +502,7 @@ $(function () {
                     if (isDarkModeTheme()) {
                         $(".buttons-csv").css("color", "white");
                     }
-                    $('[data-toggle="tooltip"]').tooltip();
+                    $('[data-bs-toggle="tooltip"]').tooltip();
                     $(".searchbutton").removeClass('running');
                     $(".searchbutton").prop('disabled', false);
                     $("#btn-save").show();
@@ -694,7 +694,7 @@ function showActivatorsMap(call, count, grids) {
     <script id="leafembed" type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/leafembed.js" tileUrl="<?php echo $this->optionslib->get_option('option_map_tile_server');?>"></script>
     <script type="text/javascript">
       $(function () {
-        $('[data-toggle="tooltip"]').tooltip()
+        $('[data-bs-toggle="tooltip"]').tooltip()
       });
 
         <?php if($qra == "set") { ?>
@@ -725,7 +725,7 @@ function showActivatorsMap(call, count, grids) {
     <script id="leafembed" type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/leafembed.js" tileUrl="<?php echo $this->optionslib->get_option('option_map_tile_server');?>"></script>
     <script type="text/javascript">
       $(function () {
-        $('[data-toggle="tooltip"]').tooltip()
+        $('[data-bs-toggle="tooltip"]').tooltip()
       });
 
         <?php if($qra == "set") { ?>
@@ -757,7 +757,7 @@ function showActivatorsMap(call, count, grids) {
     
     <script type="text/javascript">
       $(function () {
-        $('[data-toggle="tooltip"]').tooltip()
+        $('[data-bs-toggle="tooltip"]').tooltip()
       });
 
         <?php if($qra == "set") { ?>
@@ -804,7 +804,7 @@ function showActivatorsMap(call, count, grids) {
 
 <script type="text/javascript">
   $(function () {
-     $('[data-toggle="tooltip"]').tooltip()
+     $('[data-bs-toggle="tooltip"]').tooltip()
   });
 
   $(function () {
@@ -917,7 +917,7 @@ function searchButtonPress(){
     if ($('#callsign').val()) {
       let fixedcall = $('#callsign').val();
       $('#partial_view').load("logbook/search_result/" + fixedcall.replace('Ø', '0'), function() {
-         $('[data-toggle="tooltip"]').tooltip()
+         $('[data-bs-toggle="tooltip"]').tooltip()
       });
     }
 }
@@ -926,7 +926,7 @@ $(document).ready(function(){
 
   <?php if($this->input->post('callsign') != "") { ?>
         $('#partial_view').load("logbook/search_result/<?php echo str_replace("Ø","0",$this->input->post('callsign')); ?>", function() {
-           $('[data-toggle="tooltip"]').tooltip()
+           $('[data-bs-toggle="tooltip"]').tooltip()
     });
   <?php } ?>
 
@@ -936,7 +936,7 @@ $(document).on('keypress',function(e) {
     if ($('#callsign').val()) {
         let fixedcall = $('#callsign').val();
         $('#partial_view').load("logbook/search_result/" + fixedcall.replace('Ø', '0'), function() {
-           $('[data-toggle="tooltip"]').tooltip()
+           $('[data-bs-toggle="tooltip"]').tooltip()
         });
     }
 
@@ -955,7 +955,7 @@ $(document).on('keypress',function(e) {
     <script id="leafembed" type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/leafembed.js" tileUrl="<?php echo $this->optionslib->get_option('option_map_tile_server');?>"></script>
     <script type="text/javascript">
       $(function () {
-         $('[data-toggle="tooltip"]').tooltip()
+         $('[data-bs-toggle="tooltip"]').tooltip()
       });
     </script>
     <script type="text/javascript">
@@ -1655,7 +1655,7 @@ $(document).ready(function(){
 				  if (count > 0) {
 					  $('#square_number').text(loc_4char);
 					  $('#exampleModal').modal('show');
-					  $('[data-toggle="tooltip"]').tooltip({ boundary: 'window' });
+					  $('[data-bs-toggle="tooltip"]').tooltip({ boundary: 'window' });
 				  }
 			  }
 		  });
@@ -1791,7 +1791,7 @@ $(document).ready(function(){
 				  if (count > 0) {
 					  $('#square_number').text(loc_4char);
 					  $('#exampleModal').modal('show');
-					  $('[data-toggle="tooltip"]').tooltip({ boundary: 'window' });
+					  $('[data-bs-toggle="tooltip"]').tooltip({ boundary: 'window' });
 				  }
 			  }
 		  });
@@ -2178,7 +2178,7 @@ $(document).ready(function(){
                             nl2br: false,
                             message: html,
                             onshown: function(dialog) {
-                               $('[data-toggle="tooltip"]').tooltip();
+                               $('[data-bs-toggle="tooltip"]').tooltip();
                             },
                             buttons: [{
                                 label: lang_admin_close,
@@ -2244,7 +2244,7 @@ $(document).ready(function(){
                             nl2br: false,
                             message: html,
                             onshown: function(dialog) {
-                               $('[data-toggle="tooltip"]').tooltip();
+                               $('[data-bs-toggle="tooltip"]').tooltip();
                             },
                             buttons: [{
                                 label: lang_admin_close,
@@ -2491,7 +2491,7 @@ function viewEqsl(picture, callsign) {
                     nl2br: false,
                     message: html,
                     onshown: function(dialog) {
-                       $('[data-toggle="tooltip"]').tooltip();
+                       $('[data-bs-toggle="tooltip"]').tooltip();
                        $('.contacttable').DataTable({
                             "pageLength": 25,
                             responsive: false,
@@ -2536,7 +2536,7 @@ function viewEqsl(picture, callsign) {
 			    nl2br: false,
 			    message: html,
 			    onshown: function(dialog) {
-				    $('[data-toggle="tooltip"]').tooltip();
+				    $('[data-bs-toggle="tooltip"]').tooltip();
 				    $('.contacttable').DataTable({
 				    "pageLength": 25,
 					    responsive: false,
@@ -2583,7 +2583,7 @@ function viewEqsl(picture, callsign) {
                             '<td style="text-align: center"><button onclick="viewQsl(\'' + data.status.front.filename + '\')" class="btn btn-sm btn-success">View</button></td>'+
                             '</tr>');
                         var quantity = $(".carousel-indicators li").length;
-                        $(".carousel-indicators").append('<li data-target="#carouselExampleIndicators" data-slide-to="'+quantity+'"></li>');
+                        $(".carousel-indicators").append('<li data-bs-target="#carouselExampleIndicators" data-bs-slide-to="'+quantity+'"></li>');
                         $(".carousel-inner").append('<center><div class="carousel-item carouselimageid_'+data.status.front.insertid+'"><img class="img-fluid w-qsl" src="'+baseURL+'/assets/qslcard/'+data.status.front.filename+'" alt="QSL picture #'+(quantity+1)+'"></div></center>');
                         $("#qslcardfront").val(null);
                     }
@@ -2603,14 +2603,14 @@ function viewEqsl(picture, callsign) {
                         '</tbody></table>');
                         $('.qslcardtab').removeAttr('hidden');
                         var quantity = $(".carousel-indicators li").length;
-                        $(".carousel-indicators").append('<li class="active" data-target="#carouselExampleIndicators" data-slide-to="'+quantity+'"></li>');
+                        $(".carousel-indicators").append('<li class="active" data-bs-target="#carouselExampleIndicators" data-bs-slide-to="'+quantity+'"></li>');
                         $(".carousel-inner").append('<center><div class="active carousel-item carouselimageid_'+data.status.front.insertid+'"><img class="img-fluid w-qsl" src="'+baseURL+'/assets/qslcard/'+data.status.front.filename+'" alt="QSL picture #'+(quantity+1)+'"></div></center>');
                         $(".carouselExampleIndicators").carousel();
                         $("#qslcardfront").val(null);
                     }
 
                 } else if (data.status.front.status != '') {
-                    $("#qslupload").append('<div class="alert alert-danger"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Front QSL Card:' +
+                    $("#qslupload").append('<div class="alert alert-danger"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>Front QSL Card:' +
                     data.status.front.error +
                         '</div>');
                 }
@@ -2622,7 +2622,7 @@ function viewEqsl(picture, callsign) {
                             '<td style="text-align: center"><button onclick="viewQsl(\'' + data.status.back.filename + '\')" class="btn btn-sm btn-success">View</button></td>'+
                             '</tr>');
                         var quantity = $(".carousel-indicators li").length;
-                        $(".carousel-indicators").append('<li data-target="#carouselExampleIndicators" data-slide-to="'+quantity+'"></li>');
+                        $(".carousel-indicators").append('<li data-bs-target="#carouselExampleIndicators" data-bs-slide-to="'+quantity+'"></li>');
                         $(".carousel-inner").append('<center><div class="carousel-item carouselimageid_'+data.status.back.insertid+'"><img class="img-fluid w-qsl" src="'+baseURL+'/assets/qslcard/'+data.status.back.filename+'" alt="QSL picture #'+(quantity+1)+'"></div></center>');
                         $("#qslcardback").val(null);
                     }
@@ -2642,13 +2642,13 @@ function viewEqsl(picture, callsign) {
                             '</tbody></table>');
                         $('.qslcardtab').removeAttr('hidden');
                         var quantity = $(".carousel-indicators li").length;
-                        $(".carousel-indicators").append('<li class="active" data-target="#carouselExampleIndicators" data-slide-to="'+quantity+'"></li>');
+                        $(".carousel-indicators").append('<li class="active" data-bs-target="#carouselExampleIndicators" data-bs-slide-to="'+quantity+'"></li>');
                         $(".carousel-inner").append('<center><div class="active carousel-item carouselimageid_'+data.status.back.insertid+'"><img class="img-fluid w-qsl" src="'+baseURL+'/assets/qslcard/'+data.status.back.filename+'" alt="QSL picture #'+(quantity+1)+'"></div></center>');
                         $(".carouselExampleIndicators").carousel();
                         $("#qslcardback").val(null);
                     }
                 } else if (data.status.back.status != '') {
-                    $("#qslupload").append('<div class="alert alert-danger"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>\nBack QSL Card: ' +
+                    $("#qslupload").append('<div class="alert alert-danger"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>\nBack QSL Card: ' +
                     data.status.back.error +
                         '</div>');
                 }
@@ -2697,7 +2697,7 @@ function viewEqsl(picture, callsign) {
 					location.reload();
 				} else {
 					$(".alert").remove();
-					$('#searchresult').prepend('<div class="alert alert-danger"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Something went wrong. Please try again!</div>');
+					$('#searchresult').prepend('<div class="alert alert-danger"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>Something went wrong. Please try again!</div>');
 				}
 			}
 		});
@@ -2816,7 +2816,7 @@ function viewEqsl(picture, callsign) {
                     nl2br: false,
                     message: html,
                     onshown: function(dialog) {
-                       $('[data-toggle="tooltip"]').tooltip();
+                       $('[data-bs-toggle="tooltip"]').tooltip();
                     },
                     buttons: [{
                         label: lang_admin_close,
diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php
index 3bc9bab9..a0b92be7 100644
--- a/application/views/interface_assets/header.php
+++ b/application/views/interface_assets/header.php
@@ -65,16 +65,16 @@
 
 	<nav class="navbar navbar-expand-lg navbar-light bg-light main-nav">
 		<div class="container">
-			<a class="navbar-brand" href="<?php echo site_url(); ?>">Cloudlog</a> <?php if (ENVIRONMENT == "development") { ?><span class="badge badge-danger"><?php echo lang('menu_badge_developer_mode'); ?></span><?php } ?>
+			<a class="navbar-brand" href="<?php echo site_url(); ?>">Cloudlog</a> <?php if (ENVIRONMENT == "development") { ?><span class="badge text-bg-danger"><?php echo lang('menu_badge_developer_mode'); ?></span><?php } ?>
 
-			<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
+			<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
 
 			<div class="collapse navbar-collapse" id="navbarNav">
 
 				<ul class="navbar-nav">
 					<li class="nav-item active">
 					<li class="nav-item dropdown">
-						<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <?php echo lang('menu_logbook'); ?></a>
+						<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <?php echo lang('menu_logbook'); ?></a>
 						<div class="dropdown-menu" aria-labelledby="navbarDropdown">
 							<a class="dropdown-item" href="<?php echo site_url('logbook'); ?>"><i class="fas fa-book"></i> <?php echo lang('menu_overview'); ?></a>
 							<div class="dropdown-divider"></div>
@@ -89,7 +89,7 @@
 					<?php if (($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
 						<!-- QSO Menu Dropdown -->
 						<li class="nav-item dropdown">
-							<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><?php echo lang('menu_qso'); ?></a>
+							<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><?php echo lang('menu_qso'); ?></a>
 							<div class="dropdown-menu" aria-labelledby="navbarDropdown">
 								<a class="dropdown-item" href="<?php echo site_url('qso?manual=0'); ?>" title="Log Live QSOs"><i class="fas fa-list"></i> <?php echo lang('menu_live_qso'); ?></a>
 								<div class="dropdown-divider"></div>
@@ -108,7 +108,7 @@
 							<a class="nav-link" href="<?php echo site_url('notes'); ?>"><?php echo lang('menu_notes'); ?></a>
 						<?php } ?>
 						<li class="nav-item dropdown">
-							<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><?php echo lang('menu_analytics'); ?></a>
+							<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><?php echo lang('menu_analytics'); ?></a>
 							<div class="dropdown-menu" aria-labelledby="navbarDropdown">
 								<a class="dropdown-item" href="<?php echo site_url('statistics'); ?>" title="Statistics"><i class="fas fa-chart-area"></i> <?php echo lang('menu_statistics'); ?></a>
 								<div class="dropdown-divider"></div>
@@ -135,7 +135,7 @@
 						</li>
 
 						<li class="nav-item dropdown">
-							<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><?php echo lang('menu_awards'); ?></a>
+							<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><?php echo lang('menu_awards'); ?></a>
 							<div class="dropdown-menu" aria-labelledby="navbarDropdown">
 								<a class="dropdown-item" href="<?php echo site_url('awards/cq'); ?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_cq'); ?></a>
 								<div class="dropdown-divider"></div>
@@ -168,7 +168,7 @@
 						</li>
 
 						<li class="nav-item dropdown">
-							<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Tools"><i class="fas fa-tools"></i>
+							<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Tools"><i class="fas fa-tools"></i>
 								<div class="d-inline d-lg-none" style="padding-left: 10px">Tools</div>
 							</a>
 							<div class="dropdown-menu" aria-labelledby="navbarDropdown">
@@ -184,7 +184,7 @@
 
 						<?php if (($this->config->item('use_auth')) && ($this->session->userdata('user_type') == 99)) { ?>
 							<li class="nav-item dropdown">
-								<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="<?php echo lang('menu_admin'); ?>"><i class="fas fa-users-cog"></i>
+								<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="<?php echo lang('menu_admin'); ?>"><i class="fas fa-users-cog"></i>
 									<div class="d-inline d-lg-none" style="padding-left: 10px"><?php echo lang('menu_admin'); ?></div>
 								</a>
 
@@ -265,8 +265,8 @@
 							}
 						</script>
 					<?php } ?>
-					<form id="quicklog-form" class="form-inline" onsubmit="return false;">
-						<input class="form-control mr-sm-2" id="nav-bar-search-input" type="text" name="callsign" placeholder="<?php echo lang('menu_search_text_quicklog'); ?>" aria-label="Quicklog" onkeypress="handleKeyPress(event)">
+					<form id="quicklog-form" class="d-flex align-items-center" onsubmit="return false;">
+						<input class="form-control me-sm-2" id="nav-bar-search-input" type="text" name="callsign" placeholder="<?php echo lang('menu_search_text_quicklog'); ?>" aria-label="Quicklog" onkeypress="handleKeyPress(event)">
 
 						<button title="<?php echo lang('menu_search_button_qicksearch_log'); ?>" class="btn btn-outline-success my-2 my-sm-0" type="button" onclick="logQuicklog()"><i class="fas fa-plus"></i>
 							<div class="d-inline d-lg-none" style="padding-left: 10px"><?php echo lang('menu_search_button_qicksearch_log'); ?></div>
@@ -278,7 +278,7 @@
 					</form>
 				<?php } else { ?>
 					<form method="post" action="<?php echo site_url('search'); ?>" class="form-inline">
-						<input class="form-control mr-sm-2" id="nav-bar-search-input" type="search" name="callsign" placeholder="<?php echo lang('menu_search_text'); ?>" aria-label="Search">
+						<input class="form-control me-sm-2" id="nav-bar-search-input" type="search" name="callsign" placeholder="<?php echo lang('menu_search_text'); ?>" aria-label="Search">
 						<button title="<?php echo lang('menu_search_button'); ?>" class="btn btn-outline-success my-2 my-sm-0" type="submit"><i class="fas fa-search"></i>
 							<div class="d-inline d-lg-none" style="padding-left: 10px"><?php echo lang('menu_search_button'); ?></div>
 						</button>
@@ -290,10 +290,10 @@
 				<?php } else { ?>
 					<!-- Not Logged In-->
 					<form method="post" action="<?php echo site_url('user/login'); ?>" style="padding-left: 5px;" class="form-inline">
-						<input class="form-control mr-sm-2" type="text" name="user_name" placeholder="Username" aria-label="Username">
-						<input class="form-control mr-sm-2" type="password" name="user_password" placeholder="Password" aria-label="Password">
+						<input class="form-control me-sm-2" type="text" name="user_name" placeholder="Username" aria-label="Username">
+						<input class="form-control me-sm-2" type="password" name="user_password" placeholder="Password" aria-label="Password">
 						<input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" />
-						<button class="btn btn-outline-success mr-sm-2" type="submit"><?php echo lang('menu_login_button'); ?></button>
+						<button class="btn btn-outline-success me-sm-2" type="submit"><?php echo lang('menu_login_button'); ?></button>
 					</form>
 				<?php } ?>
 
@@ -301,7 +301,7 @@
 					<ul class="navbar-nav">
 						<!-- Logged in As -->
 						<li class="nav-item dropdown">
-							<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-user"></i> <?php echo $this->session->userdata('user_callsign'); ?></a>
+							<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-user"></i> <?php echo $this->session->userdata('user_callsign'); ?></a>
 
 							<div class="dropdown-menu" aria-labelledby="navbarDropdown">
 								<a class="dropdown-item" href="<?php echo site_url('user/edit') . "/" . $this->session->userdata('user_id'); ?>" title="Account"><i class="fas fa-user"></i> <?php echo lang('menu_account'); ?></a>
@@ -399,7 +399,7 @@
 
 						if ($this->optionslib->get_option('menuitems')) { ?>
 							<li class="nav-item dropdown">
-								<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Extras</a>
+								<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Extras</a>
 								<div class="dropdown-menu" aria-labelledby="navbarDropdown">
 									<?php
 									foreach (json_decode($this->optionslib->get_option('menuitems')) as $item) {
diff --git a/application/views/kml/index.php b/application/views/kml/index.php
index 40ff4294..d9348b45 100644
--- a/application/views/kml/index.php
+++ b/application/views/kml/index.php
@@ -14,10 +14,10 @@
         <div class="card-body">
 
             <form class="form" action="<?php echo site_url('kmlexport/export'); ?>" method="post" enctype="multipart/form-data">
-                <div class="form-row">
-                    <div class="form-group col-md-3">
+                <div class="row">
+                    <div class="mb-3 col-md-3">
                         <label for="band"><?php echo lang('gen_hamradio_band'); ?></label>
-                            <select id="band" name="band" class="custom-select">
+                            <select id="band" name="band" class="form-select">
                                 <option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> ><?php echo lang('general_word_all'); ?></option>
                                 <?php foreach($worked_bands as $band) {
                                     echo '<option value="' . $band . '"';
@@ -27,9 +27,9 @@
                             </select>
                     </div>
 
-                    <div class="form-group col-md-3">
+                    <div class="mb-3 col-md-3">
                     <label for="mode"><?php echo lang('gen_hamradio_mode'); ?></label>
-                        <select id="mode" name="mode" class="form-control custom-select">
+                        <select id="mode" name="mode" class="form-select form-select">
                             <option value="All"><?php echo lang('general_word_all'); ?></option>
                             <?php
                             foreach($modes->result() as $mode){
@@ -43,9 +43,9 @@
                         </select>
                     </div>
 
-                    <div class="form-group col-md-4">
+                    <div class="mb-3 col-md-4">
                         <label for="dxcc_id"><?php echo lang('gen_hamradio_dxcc'); ?></label>
-                        <select class="custom-select" id="dxcc_id" name="dxcc_id">
+                        <select class="form-select" id="dxcc_id" name="dxcc_id">
                             <option value="All"><?php echo lang('general_word_all'); ?></option>
                             <?php
                                 foreach($dxcc as $d){
@@ -60,10 +60,10 @@
                         </select>
                     </div>
                 </div>
-                <div class="form-row">                
-                    <div class="form-group col-md-3">
+                <div class="row">                
+                    <div class="mb-3 col-md-3">
                         <label for="cqz"><?php echo lang('gen_hamradio_cq_zone'); ?></label>
-                        <select class="custom-select" id="cqz" name="cqz">
+                        <select class="form-select" id="cqz" name="cqz">
                             <option value="All"><?php echo lang('general_word_all'); ?></option>
                             <?php
                             for ($i = 1; $i<=40; $i++) {
@@ -73,9 +73,9 @@
                         </select>
                     </div>
 
-                    <div class="form-group col-md-5">
+                    <div class="mb-3 col-md-5">
                         <label for="selectPropagation"><?php echo lang('gen_hamradio_propagation_mode'); ?></label>
-                        <select class="custom-select" id="selectPropagation" name="prop_mode">
+                        <select class="form-select" id="selectPropagation" name="prop_mode">
                             <option value="All"><?php echo lang('general_word_all'); ?></option>
                             <option value="AS">Aircraft Scatter</option>
                             <option value="AUR">Aurora</option>
@@ -98,22 +98,22 @@
                         </select>
                     </div>
                 </div>
-                <div class="form-row">
-                    <div class="form-group col-md-3">
+                <div class="row">
+                    <div class="mb-3 col-md-3">
                         <label for="datetimepicker1"><?php echo lang('gen_from_date') . ':'; ?></label>
                         <div class="exportdatepicker input-group date col-md-12" id="datetimepicker1" data-target-input="nearest">
-                            <input name="fromdate" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker1"/>
-                            <div class="input-group-append"  data-target="#datetimepicker1" data-toggle="datetimepicker">
+                            <input name="fromdate" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-bs-target="#datetimepicker1"/>
+                            <div class="input-group-append"  data-bs-target="#datetimepicker1" data-bs-toggle="datetimepicker">
                                 <div class="input-group-text"><i class="fa fa-calendar"></i></div>
                             </div>
                         </div>
                     </div>
 
-                    <div class="form-group col-md-3">
+                    <div class="mb-3 col-md-3">
                         <label for="datetimepicker2"><?php echo lang('gen_to_date') . ':'; ?></label>
                         <div class="exportdatepicker input-group date col-md-12" id="datetimepicker2" data-target-input="nearest">
-                            <input name="todate" totype="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker2"/>
-                            <div class="input-group-append" data-target="#datetimepicker2" data-toggle="datetimepicker">
+                            <input name="todate" totype="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-bs-target="#datetimepicker2"/>
+                            <div class="input-group-append" data-bs-target="#datetimepicker2" data-bs-toggle="datetimepicker">
                                 <div class="input-group-text"><i class="fa fa-calendar"></i></div>
                             </div>
                         </div>
diff --git a/application/views/labels/create.php b/application/views/labels/create.php
index 8b0fc017..bb60cbc6 100644
--- a/application/views/labels/create.php
+++ b/application/views/labels/create.php
@@ -18,16 +18,16 @@
 		<div class="card-body">
 
 			<!-- Label Name Input -->
-	    	<div class="form-group">
+	    	<div class="mb-3">
 			    <label for="LabelName">Label Name</label>
 			    <input name="label_name" type="text" class="form-control" id="LabelName" aria-describedby="label_nameHelp" placeholder="Code 925041 6x3 Generic Label Sheet">
 			    <small id="label_nameHelp" class="form-text text-muted">Label name used for display purposes, so pick something meaningful, perhaps the label style.</small>
 			</div>
 
-			<div class="form-group row">
+			<div class="mb-3 row">
     			<label class="col-sm-2 col-form-label" for="paperType_id">Paper Type</label>
 			    <div class="col-sm-4">
-				    <select name="paper_type_id" class="form-control" id="paperType_id">
+				    <select name="paper_type_id" class="form-select" id="paperType_id">
 						<?php
 							foreach($papertypes as $paper){
 								echo '<option value=' . $paper->paper_id . '>' . ucwords(strtolower(($paper->paper_name))) . '</option>';
@@ -38,14 +38,14 @@
 
     			<label class="col-sm-2 col-form-label" for="measurementType">Measurement used</label>
 			    <div class="col-sm-4">
-				    <select name="measurementType" class="form-control" id="measurementType">
+				    <select name="measurementType" class="form-select" id="measurementType">
 						<option value="mm">Millimeters</option>
 						<option value="in">Inches</option>
 					</select>
 			    </div>
   			</div>
 
-			<div class="form-group row">
+			<div class="mb-3 row">
     			<label class="col-sm-2 col-form-label" for="marginTop">Margin Top</label>
 			    <div class="col-sm-4">
 				    <input name="marginTop" type="text" class="form-control" id="marginTop" aria-describedby="marginTopHelp">
@@ -59,7 +59,7 @@
 			    </div>
   			</div>
 
-  			<div class="form-group row">
+  			<div class="mb-3 row">
     			<label class="col-sm-2 col-form-label" for="NX">Labels horizontally</label>
 			    <div class="col-sm-4">
 				    <input name="NX" type="number" min="1" max="40" step="1" class="form-control" id="NX" aria-describedby="NXHelp">
@@ -73,7 +73,7 @@
 			    </div>
   			</div>
 
-  			<div class="form-group row">
+  			<div class="mb-3 row">
     			<label class="col-sm-2 col-form-label" for="SpaceX">Horizontal space</label>
 			    <div class="col-sm-4">
 				    <input name="SpaceX" type="text" class="form-control" id="SpaceX">
@@ -87,7 +87,7 @@
 			    </div>
   			</div>
 
-			<div class="form-group row">
+			<div class="mb-3 row">
     			<label class="col-sm-2 col-form-label" for="width">Width of label</label>
 			    <div class="col-sm-4">
 				    <input name="width" type="text" class="form-control" id="width" aria-describedby="widthHelp">
@@ -101,7 +101,7 @@
 			    </div>
   			</div>
 
-  			<div class="form-group row">
+  			<div class="mb-3 row">
     			<label class="col-sm-2 col-form-label" for="font_size">Font Size</label>
 			    <div class="col-sm-4">
 				    <input name="font_size" type="number" min="1" max="40" step="1" class="form-control" id="font_size" value="8" aria-describedby="font_sizeHelp">
diff --git a/application/views/labels/createpaper.php b/application/views/labels/createpaper.php
index 63f09691..6ffd7ead 100644
--- a/application/views/labels/createpaper.php
+++ b/application/views/labels/createpaper.php
@@ -32,7 +32,7 @@
 		<div class="card-body">
 
 			<!-- Label Name Input -->
-	    	<div class="form-group row">
+	    	<div class="mb-3 row">
 			    <label class= "col-sm-2 col-form-label" for="PaperName">Paper Type Name</label>
 				<div class="col-sm-4">
 					<input name="paper_name" type="text" class="form-control" id="PaperName" aria-describedby="paper_nameHelp">
@@ -40,14 +40,14 @@
 	</div>
 					<label class="col-sm-2 col-form-label" for="measurementType">Measurement used</label>
 					<div class="col-sm-4">
-						<select name="measurementType" class="form-control" id="measurementType">
+						<select name="measurementType" class="form-select" id="measurementType">
 							<option selected value="mm">Millimeters</option>
 							<option value="in">Inches</option>
 						</select>
 					</div>
   			</div>
 
-			<div class="form-group row">
+			<div class="mb-3 row">
     			<label class="col-sm-2 col-form-label" for="width">Width of paper</label>
 			    <div class="col-sm-4">
 				    <input name="width" type="text" class="form-control" id="width" aria-describedby="widthHelp">
@@ -61,10 +61,10 @@
 			    </div>
 			</div>
 
-			<div class="form-group row">
+			<div class="mb-3 row">
     			<label class="col-sm-2 col-form-label" for="orientation">Orientation of paper</label>
 			    <div class="col-sm-4">
-				    <select name="orientation" class="form-control" id="orientation">
+				    <select name="orientation" class="form-select" id="orientation">
 					<option value="L">Landscape</option>
 					<option value="P">Portrait</option>
 				    </select>
diff --git a/application/views/labels/edit.php b/application/views/labels/edit.php
index 101fb2c2..6afeb8dd 100644
--- a/application/views/labels/edit.php
+++ b/application/views/labels/edit.php
@@ -18,16 +18,16 @@
 		<div class="card-body">
 
 			<!-- Label Name Input -->
-	    	<div class="form-group">
+	    	<div class="mb-3">
 			    <label for="LabelName">Label Name</label>
 			    <input name="label_name" type="text" class="form-control" id="LabelName" aria-describedby="label_nameHelp" placeholder="Code 925041 6x3 Generic Label Sheet" value="<?php if(isset($label->label_name)) { echo $label->label_name; } ?>">
 			    <small id="label_nameHelp" class="form-text text-muted">Label name used for display purposes so pick something meaningful perhaps the label style.</small>
 			</div>
 
-			<div class="form-group row">
+			<div class="mb-3 row">
     			<label class="col-sm-2 col-form-label" for="paperType_id">Paper Type</label>
 			    <div class="col-sm-4">
-				    <select name="paper_type_id" class="form-control" id="paperType_id">
+				    <select name="paper_type_id" class="form-select" id="paperType_id">
 						<?php
 							foreach($papertypes as $paper){
 								echo '<option value="' . ($paper->paper_id ?? '') . '"';
@@ -40,14 +40,14 @@
 
     			<label class="col-sm-2 col-form-label" for="measurementType">Measurement used</label>
 			    <div class="col-sm-4">
-				    <select name="measurementType" class="form-control" id="measurementType">
+				    <select name="measurementType" class="form-select" id="measurementType">
 						<option value="mm" <?php if($label->metric == "mm") { echo "selected=\"selected\""; } ?>>Millimeters</option>
 						<option value="in" <?php if($label->metric == "in") { echo "selected=\"selected\""; } ?>>Inches</option>
 					</select>
 			    </div>
   			</div>
 
-			<div class="form-group row">
+			<div class="mb-3 row">
     			<label class="col-sm-2 col-form-label" for="marginTop">Margin Top</label>
 			    <div class="col-sm-4">
 				    <input name="marginTop" type="text" class="form-control" id="marginTop" aria-describedby="marginTopHelp" value="<?php if(isset($label->margintop)) { echo $label->margintop; } ?>">
@@ -61,7 +61,7 @@
 			    </div>
   			</div>
 
-  			<div class="form-group row">
+  			<div class="mb-3 row">
     			<label class="col-sm-2 col-form-label" for="NX">Labels horizontally</label>
 			    <div class="col-sm-4">
 				    <input name="NX" type="number" min="1" max="40" step="1" class="form-control" id="NX" aria-describedby="NXHelp" value="<?php if(isset($label->nx)) { echo $label->nx; } ?>">
@@ -75,7 +75,7 @@
 			    </div>
   			</div>
 
-  			<div class="form-group row">
+  			<div class="mb-3 row">
     			<label class="col-sm-2 col-form-label" for="SpaceX">Horizontal space</label>
 			    <div class="col-sm-4">
 				    <input name="SpaceX" type="text" class="form-control" id="SpaceX" value="<?php if(isset($label->spacex)) { echo $label->spacex; } ?>">
@@ -89,7 +89,7 @@
 			    </div>
   			</div>
 
-			<div class="form-group row">
+			<div class="mb-3 row">
     			<label class="col-sm-2 col-form-label" for="width">Width of label</label>
 			    <div class="col-sm-4">
 				    <input name="width" type="text" class="form-control" id="width" aria-describedby="widthHelp" value="<?php if(isset($label->width)) { echo $label->width; } ?>">
@@ -103,7 +103,7 @@
 			    </div>
   			</div>
 
-  			<div class="form-group row">
+  			<div class="mb-3 row">
     			<label class="col-sm-2 col-form-label" for="font_size">Font Size</label>
 			    <div class="col-sm-4">
 				    <input name="font_size" type="number" min="1" max="40" step="1" class="form-control" id="font_size" aria-describedby="font_sizeHelp" value="<?php if(isset($label->font_size)) { echo $label->font_size; } ?>">
diff --git a/application/views/labels/editpaper.php b/application/views/labels/editpaper.php
index 4b793ee0..647cb581 100644
--- a/application/views/labels/editpaper.php
+++ b/application/views/labels/editpaper.php
@@ -32,7 +32,7 @@
 		<div class="card-body">
 
 			<!-- Label Name Input -->
-	    	<div class="form-group row">
+	    	<div class="mb-3 row">
 			<label class= "col-sm-2 col-form-label" for="PaperName">Paper Type Name</label>
 				<div class="col-sm-4">
 			    	<input name="paper_name" type="text" class="form-control" id="PaperName" aria-describedby="paper_nameHelp" value="<?php if(isset($paper->paper_name)) { echo $paper->paper_name; } ?>">
@@ -40,14 +40,14 @@
 				</div>
     				<label class="col-sm-2 col-form-label" for="measurementType">Measurement used</label>
 			    	<div class="col-sm-4">
-				    <select name="measurementType" class="form-control" id="measurementType">
+				    <select name="measurementType" class="form-select" id="measurementType">
 						<option value="mm" <?php if($paper->metric == "mm") { echo "selected=\"selected\""; } ?>>Millimeters</option>
 						<option value="in" <?php if($paper->metric == "in") { echo "selected=\"selected\""; } ?>>Inches</option>
 					</select>
 			    </div>
   			</div>
 
-			<div class="form-group row">
+			<div class="mb-3 row">
     			<label class="col-sm-2 col-form-label" for="width">Width of paper</label>
 			    <div class="col-sm-4">
 				    <input name="width" type="text" class="form-control" id="width" aria-describedby="widthHelp" value="<?php if(isset($paper->width)) { echo $paper->width; } ?>">
@@ -61,10 +61,10 @@
 			    </div>
   			</div>
 
-			<div class="form-group row">
+			<div class="mb-3 row">
     			<label class="col-sm-2 col-form-label" for="orientation">Orientation of paper</label>
 			    <div class="col-sm-4">
-				    <select name="orientation" class="form-control" id="orientation">
+				    <select name="orientation" class="form-select" id="orientation">
 					<option value="L"<?php if($paper->orientation == 'L') { echo " selected"; } ?>>Landscape</option>
 					<option value="P"<?php if($paper->orientation == 'P') { echo " selected"; } ?>>Portrait</option>
 				    </select>
diff --git a/application/views/labels/index.php b/application/views/labels/index.php
index 96d2bf3b..9a8ab58b 100644
--- a/application/views/labels/index.php
+++ b/application/views/labels/index.php
@@ -85,7 +85,7 @@
 		foreach($labels as $label) { ?>
 			<tr class='label_<?php echo $label->id ?>'>
 			<td><?php echo $label->label_name; ?></td>
-			<td><?php echo $label->paper_name ?? '<span class="badge badge-danger">No paper assigned</span>' ?></td>
+			<td><?php echo $label->paper_name ?? '<span class="badge text-bg-danger">No paper assigned</span>' ?></td>
 			<td><?php echo $label->metric; ?></td>
 			<td><?php echo $label->width; ?></td>
 			<td><?php echo $label->height; ?></td>
diff --git a/application/views/labels/startatform.php b/application/views/labels/startatform.php
index 8bcf78ce..287105a9 100644
--- a/application/views/labels/startatform.php
+++ b/application/views/labels/startatform.php
@@ -1,23 +1,23 @@
 <form method="post" class="col-md" action="<?php echo site_url('labels/print/'.$stationid) ?>">
-    <div class="form-group row">
-        <label class="my-1 mr-2 col-md-4" for="grid">Include Grid?</label>
+    <div class="mb-3 row">
+        <label class="my-1 me-2 col-md-4" for="grid">Include Grid?</label>
         <div class="form-check-inline">
             <input class="form-check-input" type="checkbox" name="grid" id="grid">
         </div>
     </div>
-    <div class="form-group row">
-        <label class="my-1 mr-2 col-md-4" for="via">Include Via (if filled)?</label>
+    <div class="mb-3 row">
+        <label class="my-1 me-2 col-md-4" for="via">Include Via (if filled)?</label>
         <div class="form-check-inline">
             <input class="form-check-input" type="checkbox" name="via" id="via">
         </div>
     </div>
-    <div class="form-group row">
-        <label class="my-1 mr-2 col-md-4" for="startat">Start printing at?</label>
-        <div class="form-inline">
+    <div class="mb-3 row">
+        <label class="my-1 me-2 col-md-4" for="startat">Start printing at?</label>
+        <div class="d-flex align-items-center">
             <input class="form-control input-group-sm" type="number" id="startat" name="startat" value="1">
         </div>
     </div>
-    <div class="text-left">
+    <div class="text-start">
         <button type="submit" id="button1id" name="button1id" class="btn btn-primary ld-ext-right">Print</button>
     </div>
 </form>
diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php
index 753d5bd3..a544a697 100644
--- a/application/views/logbookadvanced/index.php
+++ b/application/views/logbookadvanced/index.php
@@ -42,7 +42,7 @@ echo "var user_options = $options;";
 <?php
 $options = json_decode($options);
 ?>
-<div class="container-fluid qso_manager pt-3 pl-4 pr-4">
+<div class="container-fluid qso_manager pt-3 ps-4 pe-4">
     <?php if ($this->session->flashdata('message')) { ?>
     <!-- Display Message -->
     <div class="alert-message error">
@@ -55,30 +55,30 @@ $options = json_decode($options);
             method="post">
             <input type="hidden" id="dupes" name="dupes" value="">
             <div class="filterbody collapse">
-                <div class="form-row">
-                    <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+                <div class="row">
+                    <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                         <label class="form-label" for="dateFrom"><?php echo lang('filter_general_from'); ?></label>
                         <div class="input-group input-group-sm date" id="dateFrom" data-target-input="nearest">
                             <input name="dateFrom" type="text" placeholder="<?php echo $datePlaceholder;?>"
-                                class="form-control" data-target="#dateFrom" />
-                            <div class="input-group-append" data-target="#dateFrom" data-toggle="datetimepicker">
+                                class="form-control" data-bs-target="#dateFrom" />
+                            <div class="input-group-append" data-bs-target="#dateFrom" data-bs-toggle="datetimepicker">
                                 <div class="input-group-text"><i class="fa fa-calendar"></i></div>
                             </div>
                         </div>
                     </div>
-                    <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+                    <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                         <label for="dateTo"><?php echo lang('filter_general_to'); ?></label>
                         <div class="input-group input-group-sm date" id="dateTo" data-target-input="nearest">
                             <input name="dateTo" type="text" placeholder="<?php echo $datePlaceholder;?>"
-                                class="form-control" data-target="#dateTo" />
-                            <div class="input-group-append" data-target="#dateTo" data-toggle="datetimepicker">
+                                class="form-control" data-bs-target="#dateTo" />
+                            <div class="input-group-append" data-bs-target="#dateTo" data-bs-toggle="datetimepicker">
                                 <div class="input-group-text"><i class="fa fa-calendar"></i></div>
                             </div>
                         </div>
                     </div>
-                    <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+                    <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                         <label class="form-label" for="de"><?php echo lang('gen_hamradio_de'); ?></label>
-                        <select id="de" name="de" class="form-control form-control-sm">
+                        <select id="de" name="de" class="form-select form-select-sm">
                             <option value=""><?php echo lang('general_word_all'); ?></option>
                             <?php
 					foreach($deOptions as $deOption){
@@ -87,13 +87,13 @@ $options = json_decode($options);
 					?>
                         </select>
                     </div>
-                    <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+                    <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                         <label class="form-label" for="dx"><?php echo lang('gen_hamradio_dx'); ?></label>
                         <input type="text" name="dx" id="dx" class="form-control form-control-sm" value="">
                     </div>
-                    <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+                    <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                         <label class="form-label" for="dxcc"><?php echo lang('gen_hamradio_dxcc'); ?></label>
-                        <select class="form-control form-control-sm" id="dxcc" name="dxcc">
+                        <select class="form-select form-select-sm" id="dxcc" name="dxcc">
                             <option value="">-</option>
                             <option value="0"><?php echo lang('filter_general_none'); ?></option>
                             <?php
@@ -108,9 +108,9 @@ $options = json_decode($options);
 					?>
                         </select>
                     </div>
-                    <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+                    <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                         <label class="form-label" for="iota"><?php echo lang('gen_hamradio_iota'); ?></label>
-                        <select class="form-control form-control-sm" id="iota" name="iota">
+                        <select class="form-select form-select-sm" id="iota" name="iota">
                             <option value="">-</option>
                             <?php
 					foreach($iotaarray as $iota){
@@ -120,18 +120,18 @@ $options = json_decode($options);
 					?>
                         </select>
                     </div>
-                    <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+                    <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                         <label class="form-label" for="state"><?php echo lang('gen_hamradio_state'); ?></label>
                         <input type="text" name="state" id="state" class="form-control form-control-sm" value="">
                     </div>
-                    <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+                    <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                         <label class="form-label" for="gridsquare"><?php echo lang('gen_hamradio_gridsquare'); ?></label>
                         <input type="text" name="gridsquare" id="gridsquare" class="form-control form-control-sm"
                             value="">
                     </div>
-                    <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+                    <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                         <label class="form-label" for="mode"><?php echo lang('gen_hamradio_mode'); ?></label>
-                        <select id="mode" name="mode" class="form-control form-control-sm">
+                        <select id="mode" name="mode" class="form-select form-select-sm">
                             <option value=""><?php echo lang('general_word_all'); ?></option>
                             <?php
 					foreach($modes as $modeId => $mode){
@@ -140,9 +140,9 @@ $options = json_decode($options);
 					?>
                         </select>
                     </div>
-                    <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+                    <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                         <label class="form-label" for="band"><?php echo lang('gen_hamradio_band'); ?></label>
-                        <select id="band" name="band" class="form-control form-control-sm">
+                        <select id="band" name="band" class="form-select form-select-sm">
                             <option value=""><?php echo lang('general_word_all'); ?></option>
                             <?php
 					foreach($bands as $band){
@@ -151,18 +151,18 @@ $options = json_decode($options);
 					?>
                         </select>
                     </div>
-                    <div hidden class="sats_dropdown form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+                    <div hidden class="sats_dropdown mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                         <label class="form-label" for="sats"><?php echo lang('general_word_satellite'); ?></label>
-                        <select class="form-control form-control-sm" id="sats">
+                        <select class="form-select form-select-sm" id="sats">
                             <option value="All"><?php echo lang('general_word_all'); ?></option>
                             <?php foreach($sats as $sat) {
 					echo '<option value="' . htmlentities($sat) . '"' . '>' . htmlentities($sat) . '</option>'."\n";
 				} ?>
                         </select>
                     </div>
-                    <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+                    <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                         <label class="form-label" for="selectPropagation"><?php echo lang('filter_general_propagation'); ?></label>
-                        <select id="selectPropagation" name="selectPropagation" class="form-control form-control-sm">
+                        <select id="selectPropagation" name="selectPropagation" class="form-select form-select-sm">
                             <option value=""><?php echo lang('general_word_all'); ?></option>
                             <option value="AS">Aircraft Scatter</option>
                             <option value="AUR">Aurora</option>
@@ -184,9 +184,9 @@ $options = json_decode($options);
                             <option value="TR">Tropospheric ducting</option>
                         </select>
                     </div>
-                    <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+                    <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                         <label class="form-label" for="cqzone">CQ Zone</label>
-                        <select id="cqzone" name="cqzone" class="form-control form-control-sm">
+                        <select id="cqzone" name="cqzone" class="form-select form-select-sm">
                             <option value=""><?php echo lang('general_word_all'); ?></option>
                             <?php
                       for ($i = 1; $i<=40; $i++) {
@@ -196,15 +196,15 @@ $options = json_decode($options);
                             ?>
                         </select>
                     </div>
-                    <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+                    <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                         <label class="form-label" for="sota"><?php echo lang('gen_hamradio_sota'); ?></label>
                         <input type="text" name="sota" id="sota" class="form-control form-control-sm" value="">
                     </div>
-                    <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+                    <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                         <label class="form-label" for="wwff"><?php echo lang('gen_hamradio_wwff'); ?></label>
                         <input type="text" name="wwff" id="wwff" class="form-control form-control-sm" value="">
                     </div>
-                    <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+                    <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                         <label class="form-label" for="pota"><?php echo lang('gen_hamradio_pota'); ?></label>
                         <input type="text" name="pota" id="pota" class="form-control form-control-sm" value="">
                     </div>
@@ -212,10 +212,10 @@ $options = json_decode($options);
             </div>
     </div>
     <div class="qslfilterbody collapse">
-        <div class="form-row">
-            <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+        <div class="row">
+            <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                 <label for="qslSent"><?php echo lang('filter_qsl_sent'); ?></label>
-                <select id="qslSent" name="qslSent" class="form-control form-control-sm">
+                <select id="qslSent" name="qslSent" class="form-select form-select-sm">
                     <option value=""><?php echo lang('general_word_all'); ?></option>
                     <option value="Y"><?php echo lang('general_word_yes'); ?></option>
                     <option value="N"><?php echo lang('general_word_no'); ?></option>
@@ -224,9 +224,9 @@ $options = json_decode($options);
                     <option value="I"><?php echo lang('general_word_invalid_ignore'); ?></option>
                 </select>
             </div>
-            <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+            <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                 <label for="qslReceived"><?php echo lang('filter_qsl_recv'); ?></label>
-                <select id="qslReceived" name="qslReceived" class="form-control form-control-sm">
+                <select id="qslReceived" name="qslReceived" class="form-select form-select-sm">
                     <option value=""><?php echo lang('general_word_all'); ?></option>
                     <option value="Y"><?php echo lang('general_word_yes'); ?></option>
                     <option value="N"><?php echo lang('general_word_no'); ?></option>
@@ -235,9 +235,9 @@ $options = json_decode($options);
                     <option value="V"><?php echo lang('filter_qsl_verified'); ?></option>
                 </select>
             </div>
-            <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+            <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                 <label for="qslSentMethod"><?php echo lang('filter_qsl_sent_method'); ?></label>
-                <select id="qslSentMethod" name="qslSentMethod" class="form-control form-control-sm">
+                <select id="qslSentMethod" name="qslSentMethod" class="form-select form-select-sm">
                     <option value=""><?php echo lang('general_word_all'); ?></option>
                     <option value="B"><?php echo lang('general_word_qslcard_bureau'); ?></option>
                     <option value="D"><?php echo lang('general_word_qslcard_direct'); ?></option>
@@ -245,9 +245,9 @@ $options = json_decode($options);
                     <option value="M"><?php echo lang('general_word_qslcard_manager'); ?></option>
                 </select>
             </div>
-            <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+            <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                 <label for="qslReceivedMethod"><?php echo lang('filter_qsl_recv_method'); ?></label>
-                <select id="qslReceivedMethod" name="qslReceivedMethod" class="form-control form-control-sm">
+                <select id="qslReceivedMethod" name="qslReceivedMethod" class="form-select form-select-sm">
                     <option value=""><?php echo lang('general_word_all'); ?></option>
                     <option value="B"><?php echo lang('general_word_qslcard_bureau'); ?></option>
                     <option value="D"><?php echo lang('general_word_qslcard_direct'); ?></option>
@@ -255,9 +255,9 @@ $options = json_decode($options);
                     <option value="M"><?php echo lang('general_word_qslcard_manager'); ?></option>
                 </select>
             </div>
-            <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+            <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                 <label for="lotwSent"><?php echo lang('filter_lotw_sent'); ?></label>
-                <select id="lotwSent" name="lotwSent" class="form-control form-control-sm">
+                <select id="lotwSent" name="lotwSent" class="form-select form-select-sm">
                     <option value=""><?php echo lang('general_word_all'); ?></option>
                     <option value="Y"><?php echo lang('general_word_yes'); ?></option>
                     <option value="N"><?php echo lang('general_word_no'); ?></option>
@@ -266,9 +266,9 @@ $options = json_decode($options);
                     <option value="I"><?php echo lang('general_word_invalid_ignore'); ?></option>
                 </select>
             </div>
-            <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+            <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                 <label for="lotwReceived"><?php echo lang('filter_lotw_recv'); ?></label>
-                <select id="lotwReceived" name="lotwReceived" class="form-control form-control-sm">
+                <select id="lotwReceived" name="lotwReceived" class="form-select form-select-sm">
                     <option value=""><?php echo lang('general_word_all'); ?></option>
                     <option value="Y"><?php echo lang('general_word_yes'); ?></option>
                     <option value="N"><?php echo lang('general_word_no'); ?></option>
@@ -277,9 +277,9 @@ $options = json_decode($options);
                     <option value="V"><?php echo lang('filter_qsl_verified'); ?></option>
                 </select>
             </div>
-            <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+            <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                 <label for="eqslSent"><?php echo lang('filter_eqsl_sent'); ?></label>
-                <select id="eqslSent" name="eqslSent" class="form-control form-control-sm">
+                <select id="eqslSent" name="eqslSent" class="form-select form-select-sm">
                     <option value=""><?php echo lang('general_word_all'); ?></option>
                     <option value="Y"><?php echo lang('general_word_yes'); ?></option>
                     <option value="N"><?php echo lang('general_word_no'); ?></option>
@@ -288,9 +288,9 @@ $options = json_decode($options);
                     <option value="I"><?php echo lang('general_word_invalid_ignore'); ?></option>
                 </select>
             </div>
-            <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+            <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                 <label for="eqslReceived"><?php echo lang('filter_eqsl_recv'); ?></label>
-                <select id="eqslReceived" name="eqslReceived" class="form-control form-control-sm">
+                <select id="eqslReceived" name="eqslReceived" class="form-select form-select-sm">
                     <option value=""><?php echo lang('general_word_all'); ?></option>
                     <option value="Y"><?php echo lang('general_word_yes'); ?></option>
                     <option value="N"><?php echo lang('general_word_no'); ?></option>
@@ -299,13 +299,13 @@ $options = json_decode($options);
                     <option value="V"><?php echo lang('filter_qsl_verified'); ?></option>
                 </select>
             </div>
-            <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+            <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                 <label for="qslvia"><?php echo lang('filter_qsl_via'); ?></label>
                 <input type="search" name="qslviainput" class="form-control form-control-sm">
             </div>
-            <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+            <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                 <label for="qslimages"><?php echo lang('filter_qsl_images'); ?></label>
-                <select class="form-control form-control-sm" id="qslimages" name="qslimages">
+                <select class="form-select form-select-sm" id="qslimages" name="qslimages">
                     <option value="">-</option>
                     <option value="Y"><?php echo lang('general_word_yes'); ?></option>
                     <option value="N"><?php echo lang('general_word_no'); ?></option>
@@ -319,85 +319,85 @@ $options = json_decode($options);
             var lang_filter_actions_delete_warning = '<?php echo lang('filter_actions_delete_warning'); ?>';
         </script>
         <div class="mb-2 btn-group">
-            <span class="h6 mr-1"><?php echo lang('filter_actions_w_selected'); ?></span>
-            <button type="button" class="btn btn-sm btn-primary mr-1" id="btnUpdateFromCallbook"><?php echo lang('filter_actions_update_f_callbook'); ?></button>
-            <button type="button" class="btn btn-sm btn-primary mr-1" id="queueBureau"><?php echo lang('filter_actions_queue_bureau'); ?></button>
-            <button type="button" class="btn btn-sm btn-primary mr-1" id="queueDirect"><?php echo lang('filter_actions_queue_direct'); ?></button>
-            <button type="button" class="btn btn-sm btn-primary mr-1" id="queueElectronic"><?php echo lang('filter_actions_queue_electronic'); ?></button>
-            <button type="button" class="btn btn-sm btn-success mr-1" id="sentBureau"><?php echo lang('filter_actions_sent_bureau'); ?></button>
-            <button type="button" class="btn btn-sm btn-success mr-1" id="sentDirect"><?php echo lang('filter_actions_sent_direct'); ?></button>
-            <button type="button" class="btn btn-sm btn-success mr-1" id="sentElectronic"><?php echo lang('filter_actions_sent_electronic'); ?></button>
-            <button type="button" class="btn btn-sm btn-warning mr-1" id="dontSend"><?php echo lang('filter_actions_not_sent'); ?></button>
-            <button type="button" class="btn btn-sm btn-warning mr-1" id="notRequired"><?php echo lang('filter_actions_qsl_n_required'); ?></button>
-            <button type="button" class="btn btn-sm btn-warning mr-1" id="receivedBureau"><?php echo lang('filter_actions_recv_bureau'); ?></button>
-            <button type="button" class="btn btn-sm btn-warning mr-1" id="receivedDirect"><?php echo lang('filter_actions_recv_direct'); ?></button>
-            <button type="button" class="btn btn-sm btn-warning mr-1" id="receivedElectronic"><?php echo lang('filter_actions_recv_electronic'); ?></button>
-            <button type="button" class="btn btn-sm btn-info mr-1" id="exportAdif"><?php echo lang('filter_actions_create_adif'); ?></button>
-            <button type="button" class="btn btn-sm btn-info mr-1" id="printLabel"><?php echo lang('filter_actions_print_label'); ?></button>
-            <button type="button" class="btn btn-sm btn-info mr-1" id="qslSlideshow"><?php echo lang('filter_actions_qsl_slideshow'); ?></button>
-            <button type="button" class="btn btn-sm btn-danger mr-1" id="deleteQsos"><?php echo lang('filter_actions_delete'); ?></button>
+            <span class="h6 me-1"><?php echo lang('filter_actions_w_selected'); ?></span>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="btnUpdateFromCallbook"><?php echo lang('filter_actions_update_f_callbook'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="queueBureau"><?php echo lang('filter_actions_queue_bureau'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="queueDirect"><?php echo lang('filter_actions_queue_direct'); ?></button>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="queueElectronic"><?php echo lang('filter_actions_queue_electronic'); ?></button>
+            <button type="button" class="btn btn-sm btn-success me-1" id="sentBureau"><?php echo lang('filter_actions_sent_bureau'); ?></button>
+            <button type="button" class="btn btn-sm btn-success me-1" id="sentDirect"><?php echo lang('filter_actions_sent_direct'); ?></button>
+            <button type="button" class="btn btn-sm btn-success me-1" id="sentElectronic"><?php echo lang('filter_actions_sent_electronic'); ?></button>
+            <button type="button" class="btn btn-sm btn-warning me-1" id="dontSend"><?php echo lang('filter_actions_not_sent'); ?></button>
+            <button type="button" class="btn btn-sm btn-warning me-1" id="notRequired"><?php echo lang('filter_actions_qsl_n_required'); ?></button>
+            <button type="button" class="btn btn-sm btn-warning me-1" id="receivedBureau"><?php echo lang('filter_actions_recv_bureau'); ?></button>
+            <button type="button" class="btn btn-sm btn-warning me-1" id="receivedDirect"><?php echo lang('filter_actions_recv_direct'); ?></button>
+            <button type="button" class="btn btn-sm btn-warning me-1" id="receivedElectronic"><?php echo lang('filter_actions_recv_electronic'); ?></button>
+            <button type="button" class="btn btn-sm btn-info me-1" id="exportAdif"><?php echo lang('filter_actions_create_adif'); ?></button>
+            <button type="button" class="btn btn-sm btn-info me-1" id="printLabel"><?php echo lang('filter_actions_print_label'); ?></button>
+            <button type="button" class="btn btn-sm btn-info me-1" id="qslSlideshow"><?php echo lang('filter_actions_qsl_slideshow'); ?></button>
+            <button type="button" class="btn btn-sm btn-danger me-1" id="deleteQsos"><?php echo lang('filter_actions_delete'); ?></button>
         </div>
     </div>
     <div class="quickfilterbody collapse">
         <div class="mb-2 btn-group">
-            <span class="h6 mr-1"><?php echo lang('filter_quicksearch_w_sel'); ?></span>
+            <span class="h6 me-1"><?php echo lang('filter_quicksearch_w_sel'); ?></span>
 			<?php if (($options->dx->show ?? "true") == "true") { ?>
-                <button type="button" class="btn btn-sm btn-primary mr-1" id="searchCallsign"><?php echo lang('filter_search_callsign'); ?></button><?php
+                <button type="button" class="btn btn-sm btn-primary me-1" id="searchCallsign"><?php echo lang('filter_search_callsign'); ?></button><?php
             } ?>
 			<?php if (($options->dxcc->show ?? "true") == "true") { ?>
-                <button type="button" class="btn btn-sm btn-primary mr-1" id="searchDxcc"><?php echo lang('filter_search_dxcc'); ?></button><?php
+                <button type="button" class="btn btn-sm btn-primary me-1" id="searchDxcc"><?php echo lang('filter_search_dxcc'); ?></button><?php
             } ?>
 			<?php if (($options->state->show ?? "true") == "true") { ?>
-                <button type="button" class="btn btn-sm btn-primary mr-1" id="searchState"><?php echo lang('filter_search_state'); ?></button><?php
+                <button type="button" class="btn btn-sm btn-primary me-1" id="searchState"><?php echo lang('filter_search_state'); ?></button><?php
             } ?>
 			<?php if (($options->refs->show ?? "true") == "true") { ?>
-                <button type="button" class="btn btn-sm btn-primary mr-1" id="searchGridsquare"><?php echo lang('filter_search_gridsquare'); ?></button><?php
+                <button type="button" class="btn btn-sm btn-primary me-1" id="searchGridsquare"><?php echo lang('filter_search_gridsquare'); ?></button><?php
             } ?>
 			<?php if (($options->cqzone->show ?? "true") == "true") { ?>
-                <button type="button" class="btn btn-sm btn-primary mr-1" id="searchCqZone"><?php echo lang('filter_search_cq_zone'); ?></button><?php
+                <button type="button" class="btn btn-sm btn-primary me-1" id="searchCqZone"><?php echo lang('filter_search_cq_zone'); ?></button><?php
             } ?>
 			<?php if (($options->mode->show ?? "true") == "true") { ?>
-                <button type="button" class="btn btn-sm btn-primary mr-1" id="searchMode"><?php echo lang('filter_search_mode'); ?></button><?php
+                <button type="button" class="btn btn-sm btn-primary me-1" id="searchMode"><?php echo lang('filter_search_mode'); ?></button><?php
             } ?>
 			<?php if (($options->band->show ?? "true") == "true") { ?>
-                <button type="button" class="btn btn-sm btn-primary mr-1" id="searchBand"><?php echo lang('filter_search_band'); ?></button><?php
+                <button type="button" class="btn btn-sm btn-primary me-1" id="searchBand"><?php echo lang('filter_search_band'); ?></button><?php
             } ?>
             <?php if (($options->iota->show ?? "true") == "true") { ?>
-                <button type="button" class="btn btn-sm btn-primary mr-1" id="searchIota"><?php echo lang('filter_search_iota'); ?></button><?php
+                <button type="button" class="btn btn-sm btn-primary me-1" id="searchIota"><?php echo lang('filter_search_iota'); ?></button><?php
             } ?>
 			<?php if (($options->refs->show ?? "true") == "true") { ?>
-                <button type="button" class="btn btn-sm btn-primary mr-1" id="searchSota"><?php echo lang('filter_search_sota'); ?></button><?php
+                <button type="button" class="btn btn-sm btn-primary me-1" id="searchSota"><?php echo lang('filter_search_sota'); ?></button><?php
             } ?>
             <?php if (($options->refs->show ?? "true") == "true") { ?>
-                <button type="button" class="btn btn-sm btn-primary mr-1" id="searchPota"><?php echo lang('filter_search_pota'); ?></button><?php
+                <button type="button" class="btn btn-sm btn-primary me-1" id="searchPota"><?php echo lang('filter_search_pota'); ?></button><?php
             } ?>
             <?php if (($options->refs->show ?? "true") == "true") { ?>
-                <button type="button" class="btn btn-sm btn-primary mr-1" id="searchWwff"><?php echo lang('filter_search_wwff'); ?></button><?php
+                <button type="button" class="btn btn-sm btn-primary me-1" id="searchWwff"><?php echo lang('filter_search_wwff'); ?></button><?php
             } ?>
         </div>
     </div>
-<div class="form-row pt-2">
-    <div class="form-group form-inline col-lg d-flex flex-row justify-content-center align-items-center">
-        <button type="button" class="btn btn-sm btn-primary mr-1" data-toggle="collapse"
-            data-target=".quickfilterbody"><?php echo lang('filter_quickfilters'); ?></button>
-        <button type="button" class="btn btn-sm btn-primary mr-1" data-toggle="collapse"
-            data-target=".qslfilterbody"><?php echo lang('filter_qsl_filters'); ?></button>
-        <button type="button" class="btn btn-sm btn-primary mr-1" data-toggle="collapse"
-            data-target=".filterbody"><?php echo lang('filter_filters'); ?></button>
-        <button type="button" class="btn btn-sm btn-primary mr-1" data-toggle="collapse"
-            data-target=".actionbody"><?php echo lang('filter_actions'); ?></button>
-        <label for="qsoResults" class="mr-2"><?php echo lang('filter_results'); ?></label>
-        <select id="qsoResults" name="qsoResults" class="form-control form-control-sm mr-2">
+<div class="row pt-2">
+    <div class="mb-3 d-flex align-items-center col-lg d-flex flex-row justify-content-center align-items-center">
+        <button type="button" class="btn btn-sm btn-primary me-1" data-bs-toggle="collapse"
+            data-bs-target=".quickfilterbody"><?php echo lang('filter_quickfilters'); ?></button>
+        <button type="button" class="btn btn-sm btn-primary me-1" data-bs-toggle="collapse"
+            data-bs-target=".qslfilterbody"><?php echo lang('filter_qsl_filters'); ?></button>
+        <button type="button" class="btn btn-sm btn-primary me-1" data-bs-toggle="collapse"
+            data-bs-target=".filterbody"><?php echo lang('filter_filters'); ?></button>
+        <button type="button" class="btn btn-sm btn-primary me-1" data-bs-toggle="collapse"
+            data-bs-target=".actionbody"><?php echo lang('filter_actions'); ?></button>
+        <label for="qsoResults" class="me-2"><?php echo lang('filter_results'); ?></label>
+        <select id="qsoResults" name="qsoResults" class="form-select form-select-sm me-2">
             <option value="250">250</option>
             <option value="1000">1000</option>
             <option value="2500">2500</option>
             <option value="5000">5000</option>
         </select>
-        <button type="submit" class="btn btn-sm btn-primary mr-1" id="searchButton"><?php echo lang('filter_search'); ?></button>
-        <button type="button" class="btn btn-sm btn-primary mr-1" id="dupeButton"><?php echo lang('filter_dupes'); ?></button>
-        <button type="button" class="btn btn-sm btn-primary mr-1" id="mapButton" onclick="mapQsos(this.form);"><?php echo lang('filter_map'); ?></button>
-		<button type="options" class="btn btn-sm btn-primary mr-1" id="optionButton"><?php echo lang('filter_options'); ?></button>
-		<button type="reset" class="btn btn-sm btn-danger mr-1" id="resetButton"><?php echo lang('filter_reset'); ?></button>
+        <button type="submit" class="btn btn-sm btn-primary me-1" id="searchButton"><?php echo lang('filter_search'); ?></button>
+        <button type="button" class="btn btn-sm btn-primary me-1" id="dupeButton"><?php echo lang('filter_dupes'); ?></button>
+        <button type="button" class="btn btn-sm btn-primary me-1" id="mapButton" onclick="mapQsos(this.form);"><?php echo lang('filter_map'); ?></button>
+		<button type="options" class="btn btn-sm btn-primary me-1" id="optionButton"><?php echo lang('filter_options'); ?></button>
+		<button type="reset" class="btn btn-sm btn-danger me-1" id="resetButton"><?php echo lang('filter_reset'); ?></button>
 
     </div>
 </div>
diff --git a/application/views/logbookadvanced/qslcarousel.php b/application/views/logbookadvanced/qslcarousel.php
index aafbe247..00270a31 100644
--- a/application/views/logbookadvanced/qslcarousel.php
+++ b/application/views/logbookadvanced/qslcarousel.php
@@ -1,10 +1,10 @@
-<div id="carouselExampleIndicators" class="carousel slide" data-ride="carousel">
+<div id="carouselExampleIndicators" class="carousel slide" data-bs-ride="carousel">
 <?php if (count($qslimages) > 1) { ?>
 <ol class="carousel-indicators">
     <?php
     $i = 0;
     foreach ($qslimages as $image) {
-        echo '<li data-target="#carouselExampleIndicators" data-slide-to="' . $i . '"';
+        echo '<li data-bs-target="#carouselExampleIndicators" data-bs-slide-to="' . $i . '"';
         if ($i == 0) {
             echo 'class="active"';
         }
@@ -62,13 +62,13 @@
     ?>
 </div>
 <?php if (count($qslimages) > 1) { ?>
-	<a class="carousel-control-prev" href="#carouselExampleIndicators" role="button" data-slide="prev">
+	<a class="carousel-control-prev" href="#carouselExampleIndicators" role="button" data-bs-slide="prev">
 		<span class="carousel-control-prev-icon" aria-hidden="true"></span>
-		<span class="sr-only"><?php echo lang('general_word_previous'); ?></span>
+		<span class="visually-hidden"><?php echo lang('general_word_previous'); ?></span>
 	</a>
-	<a class="carousel-control-next" href="#carouselExampleIndicators" role="button" data-slide="next">
+	<a class="carousel-control-next" href="#carouselExampleIndicators" role="button" data-bs-slide="next">
 		<span class="carousel-control-next-icon" aria-hidden="true"></span>
-		<span class="sr-only"><?php echo lang('general_word_next'); ?></span>
+		<span class="visually-hidden"><?php echo lang('general_word_next'); ?></span>
 	</a>
 <?php } ?>
 </div>
diff --git a/application/views/logbookadvanced/startatform.php b/application/views/logbookadvanced/startatform.php
index 463f00cc..f30c316e 100644
--- a/application/views/logbookadvanced/startatform.php
+++ b/application/views/logbookadvanced/startatform.php
@@ -1,23 +1,23 @@
 <form method="post" class="col-md">
-    <div class="form-group row">
-        <label class="my-1 mr-2 col-md-4" for="gridlabel"><?php echo lang('filter_actions_print_include_grid'); ?></label>
+    <div class="mb-3 row">
+        <label class="my-1 me-2 col-md-4" for="gridlabel"><?php echo lang('filter_actions_print_include_grid'); ?></label>
         <div class="form-check-inline">
             <input class="form-check-input" type="checkbox" name="gridlabel" id="gridlabel">
         </div>
     </div>
-    <div class="form-group row">
-        <label class="my-1 mr-2 col-md-4" for="via"><?php echo lang('filter_actions_print_include_via'); ?></label>
+    <div class="mb-3 row">
+        <label class="my-1 me-2 col-md-4" for="via"><?php echo lang('filter_actions_print_include_via'); ?></label>
         <div class="form-check-inline">
             <input class="form-check-input" type="checkbox" name="via" id="via">
         </div>
     </div>
-    <div class="form-group row">
-        <label class="my-1 mr-2 col-md-4" for="startat"><?php echo lang('filter_actions_start_print'); ?></label>
-        <div class="form-inline">
+    <div class="mb-3 row">
+        <label class="my-1 me-2 col-md-4" for="startat"><?php echo lang('filter_actions_start_print'); ?></label>
+        <div class="d-flex align-items-center">
             <input class="form-control input-group-sm" type="number" id="startat" name="startat" value="1">
         </div>
     </div>
-    <div class="text-left">
+    <div class="text-start">
         <button type="button" id="button1id" name="button1id" class="btn btn-primary ld-ext-right" onclick="printlabel();"><?php echo lang('filter_actions_print'); ?></button>
     </div>
 </form>
diff --git a/application/views/logbookadvanced/useroptions.php b/application/views/logbookadvanced/useroptions.php
index cd9b8c59..e6241c35 100644
--- a/application/views/logbookadvanced/useroptions.php
+++ b/application/views/logbookadvanced/useroptions.php
@@ -1,7 +1,7 @@
-<table style="width:100%" class="table-sm table table-hover table-striped table-condensed text-left" id="useroptions">
+<table style="width:100%" class="table-sm table table-hover table-striped table-condensed text-start" id="useroptions">
 	<thead>
 		<tr>
-			<th class="text-left"><?php echo lang('filter_options_column'); ?></th>
+			<th class="text-start"><?php echo lang('filter_options_column'); ?></th>
 			<th><?php echo lang('filter_options_show'); ?></th>
 		</tr>
 	</thead>
diff --git a/application/views/logbooks/create.php b/application/views/logbooks/create.php
index 96e00eca..a9defc00 100644
--- a/application/views/logbooks/create.php
+++ b/application/views/logbooks/create.php
@@ -24,7 +24,7 @@
 		<?php echo validation_errors(); ?>
 
 		<form method="post" action="<?php echo site_url('logbooks/create'); ?>" name="create_profile">
-		  <div class="form-group">
+		  <div class="mb-3">
 		    <label for="stationLogbookNameInput"><?php echo lang('station_logbooks_create_name');?></label>
 		    <input type="text" class="form-control" name="stationLogbook_Name" id="stationLogbookNameInput" aria-describedby="stationLogbookNameHelp" placeholder="Home QTH" required>
 		    <small id="stationLogbookNameHelp" class="form-text text-muted"><?php echo lang('station_logbooks_create_name_hint');?></small>
diff --git a/application/views/logbooks/edit.php b/application/views/logbooks/edit.php
index 7df9b778..c872928b 100644
--- a/application/views/logbooks/edit.php
+++ b/application/views/logbooks/edit.php
@@ -26,7 +26,7 @@
 					<form method="post" action="<?php echo site_url('logbooks/edit/'); ?><?php echo $station_logbook_details->logbook_id; ?>" name="create_profile">
 						<input type="hidden" name="logbook_id" value="<?php echo $station_logbook_details->logbook_id; ?>">
 
-						<div class="form-group">
+						<div class="mb-3">
 							<label for="stationLogbookNameInput"><?php echo lang('station_logbooks_create_name'); ?></label>
 							<input type="text" class="form-control" name="station_logbook_name" id="stationLogbookNameInput" aria-describedby="stationLogbookNameInputHelp" value="<?php if(set_value('station_logbook_name') != "") { echo set_value('station_logbook_name'); } else { echo $station_logbook_details->logbook_name; } ?>" required>
 							<small id="stationLogbookNameInputHelp" class="form-text text-muted"><?php echo lang('station_logbooks_edit_name_hint'); ?></small>
@@ -50,7 +50,7 @@
 					<form hx-post="<?php echo site_url('logbooks/save_publicslug/'); ?>" hx-target="#publicSlugForm" style="display: inline;">
 					<div id="publicSlugForm">
 					</div>
-					<div class="form-group">
+					<div class="mb-3">
 						<input type="hidden" name="logbook_id" value="<?php echo $station_logbook_details->logbook_id; ?>">
 						<label for="publicSlugInput"><?php echo lang('station_logbooks_public_slug_input'); ?></label>
 						<div hx-target="this" hx-swap="outerHTML">
@@ -74,7 +74,7 @@
 					<input type="hidden" name="logbook_id" value="<?php echo $station_logbook_details->logbook_id; ?>">
 					<p style="margin-top: 15px;"><?php echo lang('station_logbooks_public_search_hint'); ?></p>
 					<label for="public_search"><?php echo lang('station_logbooks_public_search_enabled'); ?></label>
-					<select class="custom-select" id="public_search" name="public_search" hx-post="<?php echo site_url('logbooks/save_publicsearch/'); ?>" hx-target="#publicSearchForm" hx-trigger="change">
+					<select class="form-select" id="public_search" name="public_search" hx-post="<?php echo site_url('logbooks/save_publicsearch/'); ?>" hx-target="#publicSearchForm" hx-trigger="change">
 						<option value="1" <?php if ($station_logbook_details->public_search == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
 						<option value="0" <?php if ($station_logbook_details->public_search == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
 					</select>
@@ -104,9 +104,9 @@
 						}
 					?>
 
-					<div class="form-group">
+					<div class="mb-3">
 						<label for="StationLocationsSelect"><?php echo lang('station_logbooks_select_avail_loc'); ?></label>
-						<select name="SelectedStationLocation" class="form-control" id="StationLocationSelect" aria-describedby="StationLocationSelectHelp">
+						<select name="SelectedStationLocation" class="form-select" id="StationLocationSelect" aria-describedby="StationLocationSelectHelp">
 							<?php foreach ($station_locations_list->result() as $row) {
 								if (!in_array($row->station_id, $linked_stations)) { ?>
 								<option value="<?php echo $row->station_id;?>"><?php echo $row->station_profile_name;?> (<?php echo lang('gen_hamradio_callsign'); ?>: <?php echo $row->station_callsign;?> <?php echo lang('gen_hamradio_dxcc'); ?>: <?php echo $row->station_country; if ($row->dxcc_end != NULL) { echo ' ('.lang('gen_hamradio_deleted_dxcc').')'; } ?>)</option>
@@ -143,7 +143,7 @@
 							foreach ($station_locations_linked->result() as $row) {
 					?>
 					<tr>
-						<td><?php echo $row->station_profile_name;?> (<?php echo lang('gen_hamradio_callsign'); ?>: <?php echo $row->station_callsign;?> <?php echo lang('gen_hamradio_dxcc'); ?>: <?php echo $row->station_country; if ($row->end != NULL) { echo ' <span class="badge badge-danger">'.lang('gen_hamradio_deleted_dxcc').'</span>'; } ?>)</td>
+						<td><?php echo $row->station_profile_name;?> (<?php echo lang('gen_hamradio_callsign'); ?>: <?php echo $row->station_callsign;?> <?php echo lang('gen_hamradio_dxcc'); ?>: <?php echo $row->station_country; if ($row->end != NULL) { echo ' <span class="badge text-bg-danger">'.lang('gen_hamradio_deleted_dxcc').'</span>'; } ?>)</td>
 						<td><a href="<?php echo site_url('logbooks/delete_relationship/'); ?><?php echo $station_logbook_details->logbook_id; ?>/<?php echo $row->station_id;?>" class="btn btn-danger"><i class="fas fa-trash-alt"></i></a></td>
 					</tr>
 					<?php
diff --git a/application/views/logbooks/index.php b/application/views/logbooks/index.php
index c2ca7c64..0b2c5137 100644
--- a/application/views/logbooks/index.php
+++ b/application/views/logbooks/index.php
@@ -21,7 +21,7 @@
 
 <div class="card" style="margin-top: 20px;">
   <div class="card-header">
-  <?php echo lang('station_logbooks')?> <a class="btn btn-primary float-right" href="<?php echo site_url('logbooks/create'); ?>"><i class="fas fa-plus"></i> <?php echo lang('station_logbooks_create')?></a>
+  <?php echo lang('station_logbooks')?> <a class="btn btn-primary float-end" href="<?php echo site_url('logbooks/create'); ?>"><i class="fas fa-plus"></i> <?php echo lang('station_logbooks_create')?></a>
   </div>
   <div class="card-body">
   <div id="station_logbooks">
@@ -50,7 +50,7 @@
 						<?php if($this->session->userdata('active_station_logbook') != $row->logbook_id) { ?>
 						<a href="<?php echo site_url('logbooks/set_active')."/".$row->logbook_id; ?>" class="btn btn-outline-primary btn-sm"><?php echo lang('station_logbooks_set_active')?></a>
 						<?php } else {
-							echo "<span class='badge badge-success'>" . lang('station_logbooks_active_logbook') . "</span>";
+							echo "<span class='badge text-bg-success'>" . lang('station_logbooks_active_logbook') . "</span>";
 							}?>
 					</td>
 					<td>
@@ -68,9 +68,9 @@
 					</td>
 					<td>
 							<?php if ($row->public_search == 1) {
-							echo "<span class='badge badge-success'>" . lang('general_word_enabled') . "</span>";
+							echo "<span class='badge text-bg-success'>" . lang('general_word_enabled') . "</span>";
 							} else {
-							echo "<span class='badge badge-dark'>" . lang('general_word_disabled') . "</span>";
+							echo "<span class='badge text-bg-dark'>" . lang('general_word_disabled') . "</span>";
 							} ?>
 					</td>
 				</tr>
diff --git a/application/views/lookup/index.php b/application/views/lookup/index.php
index 20caf6a6..19937838 100644
--- a/application/views/lookup/index.php
+++ b/application/views/lookup/index.php
@@ -1,5 +1,5 @@
-	<form method="post" class="form-inline">
-		<select id="quicklookuptype" name="type" class="form-control custom-select">
+	<form method="post" class="d-flex align-items-center">
+		<select id="quicklookuptype" name="type" class="form-select form-select">
 			<option value="cq">CQ Zone</option>
 			<option value="dxcc">DXCC</option>
 			<option value="vucc">Gridsquare</option>
@@ -10,7 +10,7 @@
 		</select>
 		<div>&nbsp;</div>
 		<input style="display:none" class="form-control input-group-sm" id="quicklookuptext" type="text" name="searchfield" placeholder="" aria-label="Search">
-		<select style="display:none" class="form-control custom-select" id="quicklookupdxcc" name="dxcc" required>
+		<select style="display:none" class="form-select form-select" id="quicklookupdxcc" name="dxcc" required>
 
 			<?php
 			foreach($dxcc as $d){
@@ -24,7 +24,7 @@
 
 		</select>
 
-		<select class="form-control custom-select" id="quicklookupcqz" name="cqz" required>
+		<select class="form-select form-select" id="quicklookupcqz" name="cqz" required>
 			<?php
 			for ($i = 1; $i<=40; $i++) {
 				echo '<option value="'. $i . '">'. $i .'</option>';
@@ -32,7 +32,7 @@
 			?>
 		</select>
 
-		<select style="display:none" class="form-control custom-select" id="quicklookupwas" name="was">
+		<select style="display:none" class="form-select form-select" id="quicklookupwas" name="was">
 			<option value="AL">Alabama (AL)</option>
 			<option value="AK">Alaska (AK)</option>
 			<option value="AZ">Arizona (AZ)</option>
@@ -86,7 +86,7 @@
 			<option value="WY">Wyoming (WY)</option>
 		</select>
 
-		<select style="display:none" class="form-control custom-select" id="quicklookupiota" name="iota_ref">
+		<select style="display:none" class="form-select form-select" id="quicklookupiota" name="iota_ref">
 
 			<?php
 			foreach($iota as $i){
diff --git a/application/views/lotw/import.php b/application/views/lotw/import.php
index d76e9239..bd5206e5 100644
--- a/application/views/lotw/import.php
+++ b/application/views/lotw/import.php
@@ -15,11 +15,11 @@
       <label class="form-check-label" for="lotwimport"><?php echo lang('lotw_input_a_file'); ?></label>
 
       <p><?php echo lang('lotw_upload_exported_adif_file_from_lotw'); ?></p>
-      <p><span class="badge badge-info"><?php echo lang('general_word_important'); ?></span> <?php echo lang('lotw_upload_type_must_be_adi'); ?></p>
+      <p><span class="badge text-bg-info"><?php echo lang('general_word_important'); ?></span> <?php echo lang('lotw_upload_type_must_be_adi'); ?></p>
       
       <div class="custom-file">
-          <input type="file" class="custom-file-input" id="adiffile" name="userfile" size="20" />
-        <label class="custom-file-label" for="adiffile"><?php echo lang('general_word_choose_file'); ?></label>
+          <input type="file" class="form-control" id="adiffile" name="userfile" size="20" />
+        <label class="form-label" for="adiffile"><?php echo lang('general_word_choose_file'); ?></label>
       </div>
 
     </div>
@@ -27,15 +27,15 @@
 
 		<br><br>
 
-		<div class="custom-control custom-radio">
-			<input type="radio" name="lotwimport" id="fetch" class="custom-control-input" value="fetch" checked="checked" />
-			<label class="custom-control-label" for="fetch"><?php echo lang('lotw_pull_lotw_data_for_me'); ?></label>
+		<div class="form-check">
+			<input type="radio" name="lotwimport" id="fetch" class="form-check-input" value="fetch" checked="checked" />
+			<label class="form-check-label" for="fetch"><?php echo lang('lotw_pull_lotw_data_for_me'); ?></label>
 		</div>
       <p class="card-text"><?php echo lang('gen_from_date'); ?>:</p>
       <div class="row">
           <div class="input-group date col-md-3" id="datetimepicker1" data-target-input="nearest">
-              <input name="from" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker1"/>
-              <div class="input-group-append"  data-target="#datetimepicker1" data-toggle="datetimepicker">
+              <input name="from" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-bs-target="#datetimepicker1"/>
+              <div class="input-group-append"  data-bs-target="#datetimepicker1" data-bs-toggle="datetimepicker">
                   <div class="input-group-text"><i class="fa fa-calendar"></i></div>
               </div>
           </div>
diff --git a/application/views/lotw_views/index.php b/application/views/lotw_views/index.php
index 0ce0a3d5..28f0a5b9 100644
--- a/application/views/lotw_views/index.php
+++ b/application/views/lotw_views/index.php
@@ -1,12 +1,12 @@
 <div class="container lotw">
 <br>
-	<a class="btn btn-outline-primary btn-sm float-right" href="<?php echo site_url('/lotw/import'); ?>" role="button"><i class="fas fa-cloud-download-alt"></i> <?php echo lang('lotw_btn_lotw_import'); ?></a>
+	<a class="btn btn-outline-primary btn-sm float-end" href="<?php echo site_url('/lotw/import'); ?>" role="button"><i class="fas fa-cloud-download-alt"></i> <?php echo lang('lotw_btn_lotw_import'); ?></a>
 	<h2><?php echo lang('lotw_title'); ?></h2>
 
 	<!-- Card Starts -->
 	<div class="card">
 		<div class="card-header">
-			<a class="btn btn-outline-success btn-sm float-right" href="<?php echo site_url('/lotw/cert_upload'); ?>" role="button"><i class="fas fa-cloud-upload-alt"></i> <?php echo lang('lotw_btn_upload_certificate'); ?></a><i class="fab fa-expeditedssl"></i> <?php echo lang('lotw_title_available_cert'); ?>
+			<a class="btn btn-outline-success btn-sm float-end" href="<?php echo site_url('/lotw/cert_upload'); ?>" role="button"><i class="fas fa-cloud-upload-alt"></i> <?php echo lang('lotw_btn_upload_certificate'); ?></a><i class="fab fa-expeditedssl"></i> <?php echo lang('lotw_title_available_cert'); ?>
 		</div>
 
 		<div class="lotw-cert-list">
@@ -44,7 +44,7 @@
 						<?php foreach ($lotw_cert_results->result() as $row) { ?>
 							<tr>
 					      		<td><?php echo $row->callsign; ?></td>
-                           <td><?php echo $row->cert_dxcc == '' ? '- NONE -' : ucfirst($row->cert_dxcc); if ($row->cert_dxcc_end != NULL) { echo ' <span class="badge badge-danger">'.lang('gen_hamradio_deleted_dxcc').'</span>'; } ?></td>
+                           <td><?php echo $row->cert_dxcc == '' ? '- NONE -' : ucfirst($row->cert_dxcc); if ($row->cert_dxcc_end != NULL) { echo ' <span class="badge text-bg-danger">'.lang('gen_hamradio_deleted_dxcc').'</span>'; } ?></td>
 								<td><?php
 									if (isset($row->qso_start_date)) {
 										$valid_qso_start = strtotime( $row->qso_start_date );
@@ -79,18 +79,18 @@
 									<?php $warning_date = date('Y-m-d H:i:s', strtotime($row->date_expires.'-30 days')); ?>
 
 									<?php if ($current_date > $row->date_expires) { ?>
-										<span class="badge badge-danger"><?php echo lang('lotw_expired'); ?></span>
+										<span class="badge text-bg-danger"><?php echo lang('lotw_expired'); ?></span>
 									<?php } else if ($current_date <= $row->date_expires && $current_date > $warning_date) { ?>
-										<span class="badge badge-warning"><?php echo lang('lotw_expiring'); ?></span>
+										<span class="badge text-bg-warning"><?php echo lang('lotw_expiring'); ?></span>
 									<?php } else { ?>
-										<span class="badge badge-success"><?php echo lang('lotw_valid'); ?></span>
+										<span class="badge text-bg-success"><?php echo lang('lotw_valid'); ?></span>
 									<?php } ?>
 
 									<?php if ($row->last_upload) {
 										$last_upload = date($this->config->item('qso_date_format').' H:i:s', strtotime( $row->last_upload )); ?>
-										<span class="badge badge-success"><?php echo $last_upload; ?></span>
+										<span class="badge text-bg-success"><?php echo $last_upload; ?></span>
 									<?php } else { ?>
-										<span class="badge badge-warning"><?php echo lang('lotw_not_synced'); ?></span>
+										<span class="badge text-bg-warning"><?php echo lang('lotw_not_synced'); ?></span>
 									<?php } ?>
 								</td>
 								<td>
diff --git a/application/views/lotw_views/upload_cert.php b/application/views/lotw_views/upload_cert.php
index 6a08a2c2..cef2ff4a 100644
--- a/application/views/lotw_views/upload_cert.php
+++ b/application/views/lotw_views/upload_cert.php
@@ -27,9 +27,9 @@
 	    	</div>
 
 			<?php echo form_open_multipart('lotw/do_cert_upload');?>
-				<div class="form-group">
+				<div class="mb-3">
 				    <label for="exampleFormControlFile1"><?php echo lang('lotw_title_upload_p12_cert'); ?></label>
-				    <input type="file" name="userfile" class="form-control-file" id="exampleFormControlFile1">
+				    <input type="file" name="userfile" class="form-control" id="exampleFormControlFile1">
 				 </div>
 
 				<button type="submit" value="upload" class="btn btn-primary"><?php echo lang('lotw_btn_upload_file'); ?></button>
diff --git a/application/views/maintenance/main.php b/application/views/maintenance/main.php
index 8c276ced..7b36560a 100644
--- a/application/views/maintenance/main.php
+++ b/application/views/maintenance/main.php
@@ -15,7 +15,7 @@
 		  </div>
 		<?php if(!empty($qsos_with_no_station_id)) { ?>
 					<div class="alert alert-danger" role="alert" style="margin-bottom: 0px !important;">
-						<span class="badge badge-pill badge-warning">Warning</span> The Database contains <?php echo count($qsos_with_no_station_id); ?> QSO<?php echo count($qsos_with_no_station_id) > 1 ? 's' : '' ?> without a station-profile (location)<br/>
+						<span class="badge rounded-pill text-bg-warning">Warning</span> The Database contains <?php echo count($qsos_with_no_station_id); ?> QSO<?php echo count($qsos_with_no_station_id) > 1 ? 's' : '' ?> without a station-profile (location)<br/>
 					</div>
 		  <div class="card-body">
 		  <div class?"table-responsive">
@@ -80,7 +80,7 @@
 		<?php 
 			} else { ?>
 		<div class="alert alert-secondary" role="alert" style="margin-bottom: 0px !important;">
-			<span class="badge badge-pill badge-success">Everything ok</span> Every QSO in your Database is assigned to a station-profile (location)
+			<span class="badge rounded-pill text-bg-success">Everything ok</span> Every QSO in your Database is assigned to a station-profile (location)
 		</div>
 		<?php } ?>
 	  </div>
@@ -91,7 +91,7 @@
 		  </div>
 		<?php if(!$this->config->item('cl_multilanguage')) { ?>
 					<div class="alert alert-danger" role="alert" style="margin-bottom: 0px !important;">
-						<span class="badge badge-pill badge-warning">Warning</span> You didn't enabled Multilanguage support in your config.php
+						<span class="badge rounded-pill text-bg-warning">Warning</span> You didn't enabled Multilanguage support in your config.php
 					</div>
 		  <div class="card-body">
 		  	<p class="card-text">Please edit your ./application/config/config.php File and add some rows to it:</br></br>
@@ -103,7 +103,7 @@
 		<?php 
 		} else { ?>
 		<div class="alert alert-secondary" role="alert" style="margin-bottom: 0px !important;">
-			<span class="badge badge-pill badge-success">Everything ok</span> You have enabled Multuser-Language support
+			<span class="badge rounded-pill text-bg-success">Everything ok</span> You have enabled Multuser-Language support
 		</div>
 		<?php } ?>
 	  </div>
diff --git a/application/views/map/custom_date.php b/application/views/map/custom_date.php
index c48cd6e7..47ce1b13 100644
--- a/application/views/map/custom_date.php
+++ b/application/views/map/custom_date.php
@@ -12,8 +12,8 @@
     <div class="row">
         <label class="col-md-2 control-label" for="from">Start Date/Time</label>
         <div class="input-group date col-md-3" id="datetimepicker1" data-target-input="nearest">
-            <input name="from" type="text" placeholder="DD/MM/YYYY" class="form-control form-control-sm datetimepicker-input" data-target="#datetimepicker1" <?php if ($this->input->post('from') != "" || $this->input->method() !== 'post') echo 'value="'.$this->input->post('from').'"'; ?>/>
-                <div class="input-group-append"  data-target="#datetimepicker1" data-toggle="datetimepicker">
+            <input name="from" type="text" placeholder="DD/MM/YYYY" class="form-control form-control-sm datetimepicker-input" data-bs-target="#datetimepicker1" <?php if ($this->input->post('from') != "" || $this->input->method() !== 'post') echo 'value="'.$this->input->post('from').'"'; ?>/>
+                <div class="input-group-append"  data-bs-target="#datetimepicker1" data-bs-toggle="datetimepicker">
                     <div class="input-group-text"><i class="fa fa-calendar"></i></div>
                 </div>
             </div>
@@ -24,8 +24,8 @@
         <label class="col-md-2 control-label" for="to">End Date/Time</label>
 
         <div class="input-group date col-md-3" id="datetimepicker2" data-target-input="nearest">
-                <input name="to" type="text" placeholder="DD/MM/YYYY" class="form-control form-control-sm datetimepicker-input" data-target="#datetimepicker2" <?php if ($this->input->post('to') != "" || $this->input->method() !== 'post') echo 'value="'.$this->input->post('to').'"'; ?>/>
-                <div class="input-group-append" data-target="#datetimepicker2" data-toggle="datetimepicker">
+                <input name="to" type="text" placeholder="DD/MM/YYYY" class="form-control form-control-sm datetimepicker-input" data-bs-target="#datetimepicker2" <?php if ($this->input->post('to') != "" || $this->input->method() !== 'post') echo 'value="'.$this->input->post('to').'"'; ?>/>
+                <div class="input-group-append" data-bs-target="#datetimepicker2" data-bs-toggle="datetimepicker">
                     <div class="input-group-text"><i class="fa fa-calendar"></i></div>
                 </div>
         </div>
@@ -35,7 +35,7 @@
         <label class="col-md-2 control-label" for="band">Band</label>
 
         <div class="col-md-3">
-            <select id="band2" name="band" class="form-control custom-select-sm">
+            <select id="band2" name="band" class="form-select form-select-sm">
                 <option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> >Every band</option>
                 <?php foreach($worked_bands as $band) {
                     echo '<option value="' . $band . '"';
@@ -49,7 +49,7 @@
     <div class="row">
         <label class="col-md-2 control-label" for="mode">Mode</label>
         <div class="col-md-3">
-        <select id="mode" name="mode" class="form-control custom-select-sm">
+        <select id="mode" name="mode" class="form-select form-select-sm">
         <option value="All" <?php if ($this->input->post('mode') == "All" || $this->input->method() !== 'post') echo ' selected'; ?>>All</option>
             <?php
             foreach($modes->result() as $mode){
@@ -70,7 +70,7 @@
     <div class="row">
         <label class="col-md-2 control-label"for="selectPropagation">Propagation Mode</label>
         <div class="col-md-3">
-            <select class="form-control custom-select-sm" id="selectPropagation" name="prop_mode">
+            <select class="form-select form-select-sm" id="selectPropagation" name="prop_mode">
                 <option value="All" <?php if ($this->input->post('prop_mode') == "All" || $this->input->method() !== 'post') echo ' selected'; ?>>All</option>
                 <option value="AS" <?php if ($this->input->post('prop_mode') == "AS") echo ' selected';?>>Aircraft Scatter</option>
                 <option value="AUR" <?php if ($this->input->post('prop_mode') == "AUR") echo ' selected';?>>Aurora</option>
diff --git a/application/views/mode/create.php b/application/views/mode/create.php
index 7fcd0631..1d1b43a9 100644
--- a/application/views/mode/create.php
+++ b/application/views/mode/create.php
@@ -20,21 +20,21 @@
 		<?php echo validation_errors(); ?>
 
 		<form>
-		<div class="form-group">
+		<div class="mb-3">
 		    <label for="modeInput">ADIF Mode</label>
 		    <input type="text" class="form-control" name="mode" id="modeInput" aria-describedby="modeInputHelp" required>
 		    <small id="modeInputHelp" class="form-text text-muted">Name of mode in ADIF-specification</small>
 		  </div>
 		  
-		  <div class="form-group">
+		  <div class="mb-3">
 		    <label for="submodeInput">ADIF Sub-Mode</label>
 		    <input type="text" class="form-control" name="submode" id="submodeInput" aria-describedby="submodeInputHelp">
 		    <small id="submodeInputHelp" class="form-text text-muted">Name of sub-mode in ADIF-specification</small>
 		  </div>
 
-			<div class="form-group">
+			<div class="mb-3">
 		    <label for="qrgmodeInput">SSB/CW/DATA</label>
-			<select id="qrgmodeInput" class="form-control mode form-control-sm" name="qrgmode">
+			<select id="qrgmodeInput" class="form-select mode form-select-sm" name="qrgmode">
 				<option value="CW">CW</option>
 				<option value="SSB">SSB</option>
 				<option value="DATA">DATA</option>
@@ -42,9 +42,9 @@
 		    <small id="qrgmodeInputHelp" class="form-text text-muted">Defines the QRG-segment in bandplan.</small>
 		  </div>
 
-		  <div class="form-group">
+		  <div class="mb-3">
 		    <label for="activeInput">Active</label>
-			<select id="activeInput" class="form-control mode form-control-sm" name="active">
+			<select id="activeInput" class="form-select mode form-select-sm" name="active">
 				<option value="1">active</option>
 				<option value="0">not active</option>
 			</select>
diff --git a/application/views/mode/edit.php b/application/views/mode/edit.php
index 25c5936c..16711bd3 100644
--- a/application/views/mode/edit.php
+++ b/application/views/mode/edit.php
@@ -29,21 +29,21 @@
 		<form method="post" action="<?php echo site_url('mode/edit/'); ?><?php echo $my_mode->id; ?>" name="create_mode">
 
 			<input type="hidden" name="id" value="<?php echo $my_mode->id; ?>">
-		  <div class="form-group">
+		  <div class="mb-3">
 		    <label for="modeInput">ADIF Mode</label>
 		    <input type="text" class="form-control" name="mode" id="modeInput" aria-describedby="modeInputHelp" value="<?php if(set_value('mode') != "") { echo set_value('mode'); } else { echo $my_mode->mode; } ?>" required>
 		    <small id="modeInputHelp" class="form-text text-muted">Name of mode in ADIF-specification</small>
 		  </div>
 
-		  <div class="form-group">
+		  <div class="mb-3">
 		    <label for="modeInput">ADIF Sub-Mode</label>
 		    <input type="text" class="form-control" name="submode" id="submodeInput" aria-describedby="submodeInputHelp" value="<?php if(set_value('submode') != "") { echo set_value('submode'); } else { echo $my_mode->submode; } ?>">
 		    <small id="submodeInputHelp" class="form-text text-muted">Name of sub-mode in ADIF-specification</small>
 		  </div>
 
-			<div class="form-group">
+			<div class="mb-3">
 		    <label for="qrgmodeInput">SSB/CW/DATA</label>
-			<select id="qrgmodeInput" class="form-control mode form-control-sm" name="qrgmode">
+			<select id="qrgmodeInput" class="form-select mode form-select-sm" name="qrgmode">
 			<?php
 			printf("<option value=\"CW\" %s>CW</option>", $my_mode->qrgmode=="CW"?"selected=\"selected\"":"");
 			printf("<option value=\"SSB\" %s>SSB</option>", $my_mode->qrgmode=="SSB"?"selected=\"selected\"":"");
@@ -53,9 +53,9 @@
 		    <small id="qrgmodeInputHelp" class="form-text text-muted">Defines the QRG-segment in bandplan.</small>
 		  </div>
 
-		  <div class="form-group">
+		  <div class="mb-3">
 		    <label for="activeInput">Active</label>
-			<select id="activeInput" class="form-control mode form-control-sm" name="active">
+			<select id="activeInput" class="form-select mode form-select-sm" name="active">
 			<?php
 			printf("<option value=\"1\" %s>active</option>", $my_mode->active==1?"selected=\"selected\"":"");
 			printf("<option value=\"0\" %s>not active</option>", $my_mode->active==0?"selected=\"selected\"":"");
diff --git a/application/views/notes/add.php b/application/views/notes/add.php
index 9194bf92..fb329a6e 100644
--- a/application/views/notes/add.php
+++ b/application/views/notes/add.php
@@ -18,28 +18,28 @@
 
   	<?php if (!empty(validation_errors())): ?>
     <div class="alert alert-danger">
-        <a class="close" data-dismiss="alert" title="close">x</a>
+        <a class="btn-close" data-bs-dismiss="alert" title="close">x</a>
         <ul><?php echo (validation_errors('<li>', '</li>')); ?></ul>
     </div>
 	<?php endif; ?>
 
     <form method="post" action="<?php echo site_url('notes/add'); ?>" name="notes_add" id="notes_add">
 
-	<div class="form-group">
+	<div class="mb-3">
 		<label for="inputTitle"><?php echo lang('notes_input_title'); ?></label>
 		<input type="text" name="title" class="form-control" id="inputTitle">
 	</div>
 
-	<div class="form-group">
+	<div class="mb-3">
 	   <label for="catSelect"><?php echo lang('notes_input_category'); ?></label>
-	   <select name="category" class="form-control" id="catSelect">
+	   <select name="category" class="form-select" id="catSelect">
 	   	<option value="General" selected="selected"><?php echo lang('notes_selection_general'); ?></option>
 		<option value="Antennas"><?php echo lang('notes_selection_antennas'); ?></option>
 		<option value="Satellites"><?php echo lang('notes_selection_satellites'); ?></option>
 	   </select>
 	</div>
 
-	<div class="form-group">
+	<div class="mb-3">
 		<label for="inputTitle"><?php echo lang('notes_input_notes_content'); ?></label>
 		<div id="quillArea"></div>
 		<textarea name="content" style="display:none" id="hiddenArea"></textarea>
diff --git a/application/views/notes/edit.php b/application/views/notes/edit.php
index edb355bf..e7235c78 100644
--- a/application/views/notes/edit.php
+++ b/application/views/notes/edit.php
@@ -19,28 +19,28 @@
 
   	<?php if (!empty(validation_errors())): ?>
     <div class="alert alert-danger">
-        <a class="close" data-dismiss="alert" title="close">x</a>
+        <a class="btn-close" data-bs-dismiss="alert" title="close">x</a>
         <ul><?php echo (validation_errors('<li>', '</li>')); ?></ul>
     </div>
 	<?php endif; ?>
 
 	<form method="post" action="<?php echo site_url('notes/edit'); ?>/<?php echo $id; ?>" name="notes_add" id="notes_add">
 
-	<div class="form-group">
+	<div class="mb-3">
 		<label for="inputTitle"><?php echo lang('notes_input_title'); ?></label>
 		<input type="text" name="title" class="form-control" value="<?php echo $row->title; ?>" id="inputTitle">
 	</div>
 
-	<div class="form-group">
+	<div class="mb-3">
 	   <label for="catSelect"><?php echo lang('notes_input_category'); ?></label>
-	   <select name="category" class="form-control" id="catSelect">
+	   <select name="category" class="form-select" id="catSelect">
 	    <option value="General" selected="selected"><?php echo lang('notes_selection_general'); ?></option>
 		<option value="Antennas"><?php echo lang('notes_selection_antennas'); ?></option>
 		<option value="Satellites"><?php echo lang('notes_selection_satellites'); ?></option>
 	   </select>
 	</div>
 
-	<div class="form-group">
+	<div class="mb-3">
 		<label for="inputTitle"><?php echo lang('notes_input_notes_content'); ?></label>
 		<div id="quillArea"><?php echo $row->note; ?></div>
 		<textarea name="content" style="display:none" id="hiddenArea"></textarea>
diff --git a/application/views/options/appearance.php b/application/views/options/appearance.php
index 1f407d00..0708aee0 100644
--- a/application/views/options/appearance.php
+++ b/application/views/options/appearance.php
@@ -27,15 +27,15 @@
 
                     <?php if(validation_errors()) { ?>
                     <div class="alert alert-danger">
-                        <a class="close" data-dismiss="alert">x</a>
+                        <a class="btn-close" data-bs-dismiss="alert">x</a>
                         <?php echo validation_errors(); ?>
                     </div>
                     <?php } ?>
 
                     <?php echo form_open('options/appearance_save'); ?>
-                        <!-- <div class="form-group">
+                        <!-- <div class="mb-3">
                             <label for="themeSelect">Language</label>
-                            <select class="custom-select" id="langSelect" name="language" aria-describedby="langHelp" required>
+                            <select class="form-select" id="langSelect" name="language" aria-describedby="langHelp" required>
                                 <?php foreach ($language_options as &$lang_opt) { ?>
                                     <option value='<?php echo $lang_opt; ?>' <?php if($this->optionslib->get_option('language')== $lang_opt) { echo "selected=\"selected\""; } ?>><?php echo ucfirst($lang_opt); ?></option>
                                 <?php } ?>
@@ -44,9 +44,9 @@
                         </div> -->
 
                         <!-- Form options for selecting global theme choice -->
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label for="themeSelect"><?php echo lang('options_theme'); ?></label>
-                            <select class="custom-select" id="themeSelect" name="theme" aria-describedby="themeHelp" required>
+                            <select class="form-select" id="themeSelect" name="theme" aria-describedby="themeHelp" required>
 								<?php
 								foreach ($themes as $theme) {
 									echo '<option value="' . $theme->foldername . '"';
@@ -61,23 +61,23 @@
                         </div>
                         
                         
-                            <select class="custom-select" id="globalSearch" name="globalSearch" style="display: none;">
+                            <select class="form-select" id="globalSearch" name="globalSearch" style="display: none;">
                                 <option value='true' <?php if($this->optionslib->get_option('global_search') == "true") { echo "selected=\"selected\""; } ?>>Enabled</option>
                                 <option value='false' <?php if($this->optionslib->get_option('global_search') == "false") { echo "selected=\"selected\""; } ?>>Disabled</option>
                             </select>
 
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label for="dashboardBanner"><?php echo lang('options_dashboard_notification_banner'); ?></label>
-                            <select class="custom-select" id="dashboardBanner" name="dashboardBanner" aria-describedby="dashboardBannerHelp" required>
+                            <select class="form-select" id="dashboardBanner" name="dashboardBanner" aria-describedby="dashboardBannerHelp" required>
                                 <option value='true' <?php if($this->optionslib->get_option('dashboard_banner') == "true") { echo "selected=\"selected\""; } ?>>Enabled</option>
                                 <option value='false' <?php if($this->optionslib->get_option('dashboard_banner') == "false") { echo "selected=\"selected\""; } ?>>Disabled</option>
                             </select>
                             <small id="dashboardBannerHelp" class="form-text text-muted"><?php echo lang('options_this_allows_to_disable_the_global_notification_banner_on_the_dashboard'); ?></small>
                         </div>
 
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label for="dashboardMap"><?php echo lang('options_dashboard_map'); ?></label>
-                            <select class="custom-select" id="dashboardMap" name="dashboardMap" aria-describedby="dashboardMapHelp" required>
+                            <select class="form-select" id="dashboardMap" name="dashboardMap" aria-describedby="dashboardMapHelp" required>
                                 <option value='true' <?php if($this->optionslib->get_option('dashboard_map') == "true") { echo "selected=\"selected\""; } ?>>Enabled</option>
                                 <option value='false' <?php if($this->optionslib->get_option('dashboard_map') == "false") { echo "selected=\"selected\""; } ?>>Disabled</option>
                                 <option value='map_at_right' <?php if($this->optionslib->get_option('dashboard_map') == "map_at_right") { echo "selected=\"selected\""; } ?>>Map at right</option>
@@ -85,9 +85,9 @@
                             <small id="dashboardMapHelp" class="form-text text-muted"><?php echo lang('options_this_allows_the_map_on_the_dashboard_to_be_disabled_or_placed_on_the_right'); ?></small>
                         </div>
 
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label for="logbookMap"><?php echo lang('options_logbook_map'); ?></label>
-                            <select class="custom-select" id="logbookMap" name="logbookMap" aria-describedby="logbookMapHelp" required>
+                            <select class="form-select" id="logbookMap" name="logbookMap" aria-describedby="logbookMapHelp" required>
                                 <option value='true' <?php if($this->optionslib->get_option('logbook_map') == "true") { echo "selected=\"selected\""; } ?>>Enabled</option>
                                 <option value='false' <?php if($this->optionslib->get_option('logbook_map') == "false") { echo "selected=\"selected\""; } ?>>Disabled</option>
                             </select>
diff --git a/application/views/options/dxcluster.php b/application/views/options/dxcluster.php
index 4d8d9a58..c248e8a1 100644
--- a/application/views/options/dxcluster.php
+++ b/application/views/options/dxcluster.php
@@ -27,31 +27,31 @@
 
                     <?php if(validation_errors()) { ?>
                     <div class="alert alert-danger">
-                        <a class="close" data-dismiss="alert">x</a>
+                        <a class="btn-close" data-bs-dismiss="alert">x</a>
                         <?php echo validation_errors(); ?>
                     </div>
                     <?php } ?>
 
                     <?php echo form_open('options/dxcluster_save'); ?>
 
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label for="globalSearch"><?php echo lang('options_dxcluster_provider'); ?></label>
                             <p><?php echo lang('options_dxcluster_longtext'); ?></p>
                             <input type="text" name="dxcache_url" class="form-control" id="dxcache_url" aria-describedby="dxcache_urlHelp" value="<?php echo $this->optionslib->get_option('dxcache_url'); ?>">
                             <small id="dxcache_urlHelp" class="form-text text-muted"><?php echo lang('options_dxcluster_hint'); ?></small>
                         </div>
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label for="maxAgeSelect"><?php echo lang('options_dxcluster_maxage'); ?></label>
-                            <select class="custom-select" id="maxAgeSelect" name="dxcluster_maxage" aria-describedby="dxcluster_maxageHelp" required>
+                            <select class="form-select" id="maxAgeSelect" name="dxcluster_maxage" aria-describedby="dxcluster_maxageHelp" required>
 				<option value="120"<?php if ($this->optionslib->get_option('dxcluster_maxage') == '120') { echo " selected"; } ?>>2 Hours</option>
 				<option value="60"<?php if ($this->optionslib->get_option('dxcluster_maxage') == '60') { echo " selected"; } ?>>60 Minutes</option>
 				<option value="30"<?php if ($this->optionslib->get_option('dxcluster_maxage') == '30') { echo " selected"; } ?>>30 Minutes</option>
                                 </select>
                             <small id="dxcluster_maxageHelp" class="form-text text-muted"><?php echo lang('options_dxcluster_maxage_hint'); ?></small>
                         </div>
-			<div class="form-group">
+			<div class="mb-3">
                             <label for="decontSelect"><?php echo lang('options_dxcluster_decont'); ?></label>
-                            <select class="custom-select" id="decontSelect" name="dxcluster_decont" aria-describedby="dxcluster_decontHelp" required>
+                            <select class="form-select" id="decontSelect" name="dxcluster_decont" aria-describedby="dxcluster_decontHelp" required>
 				<option value="AF"<?php if ($this->optionslib->get_option('dxcluster_decont') == 'AF') { echo " selected"; } ?>>Africa</option>
 				<option value="AN"<?php if ($this->optionslib->get_option('dxcluster_decont') == 'AN') { echo " selected"; } ?>>Antarctica</option>
 				<option value="AS"<?php if ($this->optionslib->get_option('dxcluster_decont') == 'AS') { echo " selected"; } ?>>Asia</option>
diff --git a/application/views/options/email.php b/application/views/options/email.php
index 9a11bd6a..9cc83e4e 100644
--- a/application/views/options/email.php
+++ b/application/views/options/email.php
@@ -27,80 +27,80 @@
 
                     <?php if(validation_errors()) { ?>
                     <div class="alert alert-danger">
-                        <a class="close" data-dismiss="alert">x</a>
+                        <a class="btn-close" data-bs-dismiss="alert">x</a>
                         <?php echo validation_errors(); ?>
                     </div>
                     <?php } ?>
 
                     <?php echo form_open('options/email_save'); ?>
 
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label for="emailProtocol"><?php echo lang('options_outgoing_protocol'); ?></label>
-                            <select name="emailProtocol" class="form-control" id="emailProtocol">
+                            <select name="emailProtocol" class="form-select" id="emailProtocol">
                                 <option value="sendmail" <?php if($this->optionslib->get_option('emailProtocol')== "sendmail") { echo "selected=\"selected\""; } ?>>Sendmail</option>
                                 <option value="smtp" <?php if($this->optionslib->get_option('emailProtocol')== "smtp") { echo "selected=\"selected\""; } ?>>SMTP</option>
                             </select>
                         </div>
 
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label for="smtpEncryption"><?php echo lang('options_smtp_encryption'); ?></label>
-                            <select name="smtpEncryption" class="form-control" id="smtpEncryption">
+                            <select name="smtpEncryption" class="form-select" id="smtpEncryption">
                                 <option value="" <?php if($this->optionslib->get_option('smtpEncryption') == "") { echo "selected=\"selected\""; } ?>>None</option>
                                 <option value="tls" <?php if($this->optionslib->get_option('smtpEncryption') == "tls") { echo "selected=\"selected\""; } ?>>TLS</option>
                                 <option value="ssl" <?php if($this->optionslib->get_option('smtpEncryption') == "ssl") { echo "selected=\"selected\""; } ?>>SSL</option>
                             </select>
                         </div>
 
-                        <div class="form-group row">
+                        <div class="mb-3 row">
                         <label for="emailSenderName" class="col-sm-2 col-form-label"><?php echo lang('options_email_sender_name'); ?></label>
                             <div class="col-sm-10">
                                 <input type="text" name="emailSenderName" class="form-control" id="emailSenderName" value="<?php echo ($this->optionslib->get_option('emailSenderName') == "" ? 'Cloudlog' : $this->optionslib->get_option('emailSenderName'));?>">
                             </div>
                         </div>
 
-                        <div class="form-group row">
+                        <div class="mb-3 row">
                         <label for="emailAddress" class="col-sm-2 col-form-label"><?php echo lang('options_email_address'); ?></label>
                             <div class="col-sm-10">
                                 <input type="text" name="emailAddress" class="form-control" id="emailAddress" value="<?php if($this->optionslib->get_option('emailAddress') != "") { echo $this->optionslib->get_option('emailAddress'); } ?>">
                             </div>
                         </div>
 
-                        <div class="form-group row">
+                        <div class="mb-3 row">
                             <label for="smtpHost" class="col-sm-2 col-form-label"><?php echo lang('options_smtp_host'); ?></label>
                             <div class="col-sm-10">
                                 <input type="text" name="smtpHost" class="form-control" id="smtpHost" value="<?php if($this->optionslib->get_option('smtpHost') != "") { echo $this->optionslib->get_option('smtpHost'); } ?>">
                             </div>
                         </div>
 
-                        <div class="form-group row">
+                        <div class="mb-3 row">
                             <label for="smtpPort" class="col-sm-2 col-form-label"><?php echo lang('options_smtp_port'); ?></label>
                             <div class="col-sm-10">
                                 <input type="number" name="smtpPort" class="form-control" id="smtpPort" value="<?php if($this->optionslib->get_option('smtpPort') != "") { echo $this->optionslib->get_option('smtpPort'); } ?>">
                             </div>
                         </div>
 
-                        <div class="form-group row">
+                        <div class="mb-3 row">
                             <label for="smtpUsername" class="col-sm-2 col-form-label"><?php echo lang('options_smtp_username'); ?></label>
                             <div class="col-sm-10">
                                 <input type="text" name="smtpUsername" class="form-control" id="smtpUsername" value="<?php if($this->optionslib->get_option('smtpUsername') != "") { echo $this->optionslib->get_option('smtpUsername'); } ?>">
                             </div>
                         </div>
 
-                        <div class="form-group row">
+                        <div class="mb-3 row">
                             <label for="smtpPassword" class="col-sm-2 col-form-label"><?php echo lang('options_smtp_password'); ?></label>
                             <div class="col-sm-10">
                                 <input type="password" name="smtpPassword" class="form-control" id="smtpPassword"  value="<?php if($this->optionslib->get_option('smtpPassword') != "") { echo $this->optionslib->get_option('smtpPassword'); } ?>">
                             </div>
                         </div>
 
-                        <div class="form-group row">
+                        <div class="mb-3 row">
                             <label for="emailcrlf" class="col-sm-2 col-form-label"><?php echo lang('options_crlf'); ?></label>
                             <div class="col-sm-10">
                                 <input type="text" name="emailcrlf" class="form-control" id="emailcrlf" value="<?php if($this->optionslib->get_option('emailcrlf') != "") { echo $this->optionslib->get_option('emailcrlf'); } ?>">
                             </div>
                         </div>
 
-                        <div class="form-group row">
+                        <div class="mb-3 row">
                             <label for="emailnewline" class="col-sm-2 col-form-label"><?php echo lang('options_newline'); ?></label>
                             <div class="col-sm-10">
                                 <input type="text" name="emailnewline" class="form-control" id="emailnewline" value="<?php if($this->optionslib->get_option('emailnewline') != "") { echo $this->optionslib->get_option('emailnewline'); } ?>">
diff --git a/application/views/options/oqrs.php b/application/views/options/oqrs.php
index 9b2b3f1b..4499c207 100644
--- a/application/views/options/oqrs.php
+++ b/application/views/options/oqrs.php
@@ -27,22 +27,22 @@
 
                     <?php if(validation_errors()) { ?>
                     <div class="alert alert-danger">
-                        <a class="close" data-dismiss="alert">x</a>
+                        <a class="btn-close" data-bs-dismiss="alert">x</a>
                         <?php echo validation_errors(); ?>
                     </div>
                     <?php } ?>
 
                     <?php echo form_open('options/oqrs_save'); ?>
 
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label for="globalSearch"><?php echo lang('options_global_text'); ?></label>
                             <input type="text" name="global_oqrs_text" class="form-control" id="global_oqrs_text" aria-describedby="global_oqrs_text" value="<?php echo $this->optionslib->get_option('global_oqrs_text'); ?>">
                             <small id="global_oqrs_text_help" class="form-text text-muted"><?php echo lang('options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'); ?></small>
                         </div>
 
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label for="groupedSearch"><?php echo lang('options_grouped_search'); ?></label>
-                            <select name="groupedSearch" class="form-control" id="groupedSearch">
+                            <select name="groupedSearch" class="form-select" id="groupedSearch">
                                 <option value="off" <?php if($this->optionslib->get_option('groupedSearch') == "off") { echo "selected=\"selected\""; } ?>>Off</option>
                                 <option value="on" <?php if($this->optionslib->get_option('groupedSearch') == "on") { echo "selected=\"selected\""; } ?>>On</option>
                             </select>
diff --git a/application/views/options/radios.php b/application/views/options/radios.php
index efd4d63e..0f705b4e 100644
--- a/application/views/options/radios.php
+++ b/application/views/options/radios.php
@@ -27,14 +27,14 @@
 
                     <?php if(validation_errors()) { ?>
                     <div class="alert alert-danger">
-                        <a class="close" data-dismiss="alert">x</a>
+                        <a class="btn-close" data-bs-dismiss="alert">x</a>
                         <?php echo validation_errors(); ?>
                     </div>
                     <?php } ?>
 
                     <?php echo form_open('options/radio_save'); ?>
 
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label for="globalSearch"><?php echo lang('options_radio_timeout_warning'); ?></label>
                             <p><?php echo lang('options_the_radio_timeout_warning_is_used_on_the_qso_entry_panel_to_alert_you_to_radio_interface_disconnects'); ?></p>
                             <input type="text" name="radioTimeout" class="form-control" id="radioTimeout" aria-describedby="radioTimeoutHelp" value="<?php echo $this->optionslib->get_option('cat_timeout_interval'); ?>">
diff --git a/application/views/oqrs/index.php b/application/views/oqrs/index.php
index f087f83d..ba76c94d 100644
--- a/application/views/oqrs/index.php
+++ b/application/views/oqrs/index.php
@@ -18,8 +18,8 @@
 			echo '<br /><br />';
 		}
 		if ($groupedSearch == 'on') {
-			echo 'This search will search in all station locations where OQRS is active.<br /><br /><form class="form-inline" onsubmit="return false;"><label class="my-1 mr-2" for="oqrssearch">Enter your callsign: </label>
-			<input class="form-control mr-sm-2" id="oqrssearch" type="search" name="callsign" placeholder="Search Callsign" aria-label="Search" required="required">
+			echo 'This search will search in all station locations where OQRS is active.<br /><br /><form class="d-flex align-items-center" onsubmit="return false;"><label class="my-1 me-2" for="oqrssearch">Enter your callsign: </label>
+			<input class="form-control me-sm-2" id="oqrssearch" type="search" name="callsign" placeholder="Search Callsign" aria-label="Search" required="required">
 			<button onclick="searchOqrsGrouped();" class="btn btn-sm btn-primary" id="stationbuttonsubmit" type="button"><i class="fas fa-search"></i> Search</button>
 			</form>';
 			echo '<div class="searchinfo"></div>';
@@ -44,9 +44,9 @@
 			} else {
 		  if ($stations->result() != NULL) { ?>
 
-                <form class="form-inline" enctype="multipart/form-data">
-                    <label class="my-1 mr-2" for="station">Select station: </label>
-                    <select id="station" class="custom-select my-1 mr-sm-2" name="station">
+                <form class="d-flex align-items-center" enctype="multipart/form-data">
+                    <label class="my-1 me-2" for="station">Select station: </label>
+                    <select id="station" class="form-select my-1 me-sm-2" name="station">
                         <?php foreach($stations->result() as $station) {
 									echo '<option value="' . $station->station_id . '">' . $station->station_profile_name . ' - ' . $station->station_callsign . '</option>'."\n";
 								} ?>
diff --git a/application/views/oqrs/notinlogform.php b/application/views/oqrs/notinlogform.php
index 726a94e2..2de51deb 100644
--- a/application/views/oqrs/notinlogform.php
+++ b/application/views/oqrs/notinlogform.php
@@ -25,13 +25,13 @@ checked.<br />
 <button type="button" onclick="oqrsAddLine(this.form);" class="btn btn-sm btn-primary"><i class="fas fa-plus-square"></i> Add line</button>
 <br />
 <form>
-    <div class="form-group">
+    <div class="mb-3">
         <label for="message">Message</label>
         <textarea name="message" class="form-control" id="messageInput" rows="3" aria-describedby="messageHelp"></textarea>
         <small id="messageHelp" class="form-text text-muted">Any extra information we need to know about?</small>
     </div>
 
-    <div class="form-group">
+    <div class="mb-3">
         <label for="emailInput">E-mail</label>
         <input type="text" class="form-control" name="email" id="emailInput" aria-describedby="emailInputHelp" required>
         <small id="emailInputHelp" class="form-text text-muted">Your e-mail address where we can contact you</small>
diff --git a/application/views/oqrs/qsolist.php b/application/views/oqrs/qsolist.php
index 393a8fd6..0f634847 100644
--- a/application/views/oqrs/qsolist.php
+++ b/application/views/oqrs/qsolist.php
@@ -36,7 +36,7 @@ if ($qsos->result() != NULL) {
 		echo '<td style=\'text-align: center\'>'; $timestamp = strtotime($qsl->COL_TIME_ON); echo date('H:i', $timestamp); echo '</td>';
 		echo '<td style=\'text-align: center\'>'; echo $qsl->COL_SUBMODE==null?$qsl->COL_MODE:$qsl->COL_SUBMODE; echo '</td>';
 		echo '<td style=\'text-align: center\'>'; if($qsl->COL_SAT_NAME != null) { echo $qsl->COL_SAT_NAME; } else { echo strtolower($qsl->COL_BAND); }; echo '</td>';
-		echo '<td style=\'text-align: center\'><span class="badge badge-light">' . $qsl->station_callsign . '</span></td>';
+		echo '<td style=\'text-align: center\'><span class="badge text-bg-light">' . $qsl->station_callsign . '</span></td>';
 		echo '<td style=\'text-align: center\' class="qsl">';
 		echo '<span ';
 		if ($qsl->COL_QSL_SENT != "N") {
@@ -47,16 +47,16 @@ if ($qsos->result() != NULL) {
 			}
 			switch ($qsl->COL_QSL_SENT) {
 			case "Y":
-				echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_sent').$timestamp;
+				echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_sent').$timestamp;
 				break;
 			case "Q":
-				echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued').$timestamp;
+				echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued').$timestamp;
 				break;
 			case "R":
-				echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested').$timestamp;
+				echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested').$timestamp;
 				break;
 			case "I":
-				echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_invalid_ignore').$timestamp;
+				echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_invalid_ignore').$timestamp;
 				break;
 			default:
 				echo "class=\"qsl-red";
@@ -89,16 +89,16 @@ if ($qsos->result() != NULL) {
 			}
 			switch ($qsl->COL_QSL_RCVD) {
 			case "Y":
-				echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_received').$timestamp;
+				echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_received').$timestamp;
 				break;
 			case "Q":
-				echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued').$timestamp;
+				echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued').$timestamp;
 				break;
 			case "R":
-				echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested').$timestamp;
+				echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested').$timestamp;
 				break;
 			case "I":
-				echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_invalid_ignore').$timestamp;
+				echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_invalid_ignore').$timestamp;
 				break;
 			default:
 				echo "class=\"qsl-red";
@@ -132,7 +132,7 @@ if ($qsos->result() != NULL) {
 					$timestamp = strtotime($qsl->COL_EQSL_QSLSDATE);
 					echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
 				}
-				echo "\" data-toggle=\"tooltip\"";
+				echo "\" data-bs-toggle=\"tooltip\"";
 			}
 			echo ' class="eqsl-';
 			echo ($qsl->COL_EQSL_QSL_SENT=='Y')?'green':'red';
@@ -145,7 +145,7 @@ if ($qsos->result() != NULL) {
 					$timestamp = strtotime($qsl->COL_EQSL_QSLRDATE);
 					echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
 				}
-				echo "\" data-toggle=\"tooltip\"";
+				echo "\" data-bs-toggle=\"tooltip\"";
 			}
 			echo ' class="eqsl-';
 			echo ($qsl->COL_EQSL_QSL_RCVD=='Y')?'green':'red';
@@ -161,7 +161,7 @@ if ($qsos->result() != NULL) {
 					$timestamp = strtotime($qsl->COL_LOTW_QSLSDATE);
 					echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
 				}
-				echo "\" data-toggle=\"tooltip\"";
+				echo "\" data-bs-toggle=\"tooltip\"";
 			}
 			echo ' class="lotw-';
 			echo ($qsl->COL_LOTW_QSL_SENT=='Y')?'green':'red';
@@ -174,7 +174,7 @@ if ($qsos->result() != NULL) {
 					$timestamp = strtotime($qsl->COL_LOTW_QSLRDATE);
 					echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
 				}
-				echo "\" data-toggle=\"tooltip\"";
+				echo "\" data-bs-toggle=\"tooltip\"";
 			}
 			echo ' class="lotw-';
 			echo ($qsl->COL_LOTW_QSL_RCVD=='Y')?'green':'red';
@@ -190,6 +190,6 @@ if ($qsos->result() != NULL) {
 
 	<?php
 } else {
-	echo '<div class="alert alert-danger"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>No QSO\'s were found. It seems you were not active at this time.</div>';
+	echo '<div class="alert alert-danger"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>No QSO\'s were found. It seems you were not active at this time.</div>';
 }
 ?>
diff --git a/application/views/oqrs/request.php b/application/views/oqrs/request.php
index 7ed817a6..e331023f 100644
--- a/application/views/oqrs/request.php
+++ b/application/views/oqrs/request.php
@@ -50,13 +50,13 @@ The following QSO(s) were found. Please fill out the date and time and submit yo
         <label class="form-check-label" for="direct">Direct (write address in message below)</label>
     </div>
     <br /><br />
-    <div class="form-group">
+    <div class="mb-3">
         <label for="message">Message</label>
         <textarea name="message" class="form-control" id="messageInput" rows="3" aria-describedby="messageHelp"></textarea>
         <small id="messageHelp" class="form-text text-muted">Any extra information we need to know about?</small>
     </div>
 
-    <div class="form-group">
+    <div class="mb-3">
         <label for="emailInput">E-mail</label>
         <input type="text" class="form-control" name="mode" id="emailInput" aria-describedby="emailInputHelp" required>
         <small id="emailInputHelp" class="form-text text-muted">Your e-mail address where we can contact you</small>
diff --git a/application/views/oqrs/request_grouped.php b/application/views/oqrs/request_grouped.php
index 0cf56afc..a5294f8c 100644
--- a/application/views/oqrs/request_grouped.php
+++ b/application/views/oqrs/request_grouped.php
@@ -47,13 +47,13 @@ The following QSO(s) were found. Please fill out the date and time and submit yo
         <label class="form-check-label" for="direct">Direct (write address in message below)</label>
     </div>
     <br /><br />
-    <div class="form-group">
+    <div class="mb-3">
         <label for="message">Message</label>
         <textarea name="message" class="form-control" id="messageInput" rows="3" aria-describedby="messageHelp"></textarea>
         <small id="messageHelp" class="form-text text-muted">Any extra information we need to know about?</small>
     </div>
 
-    <div class="form-group">
+    <div class="mb-3">
         <label for="emailInput">E-mail</label>
         <input type="text" class="form-control" name="mode" id="emailInput" aria-describedby="emailInputHelp" required>
         <small id="emailInputHelp" class="form-text text-muted">Your e-mail address where we can contact you</small>
diff --git a/application/views/oqrs/showrequests.php b/application/views/oqrs/showrequests.php
index 906b9d2f..f0fe5a01 100644
--- a/application/views/oqrs/showrequests.php
+++ b/application/views/oqrs/showrequests.php
@@ -16,7 +16,7 @@ function echo_qsl_method($method) {
 }
 
 ?>
-<div class="container-fluid oqrs pt-3 pl-4 pr-4">
+<div class="container-fluid oqrs pt-3 ps-4 pe-4">
 	<h2><?php echo $page_title; ?></h2>
 	<?php if ($this->session->flashdata('message')) { ?>
 		<!-- Display Message -->
@@ -26,10 +26,10 @@ function echo_qsl_method($method) {
 	<?php } ?>
 <div class="row">
 	<form id="searchForm" name="searchForm" action="<?php echo base_url()."index.php/oqrs/search";?>" method="post">
-		<div class="form-row">
+		<div class="row">
 			<div class="forn-group col-lg-2 col-md-2 col-sm-3 col-xl">
 				<label class="form-label" for="de">De</label>
-				<select id="de" name="de" class="form-control form-control-sm">
+				<select id="de" name="de" class="form-select form-select-sm">
 					<option value="">All</option>
 					<?php
 					foreach($stations->result() as $station){
@@ -45,7 +45,7 @@ function echo_qsl_method($method) {
 			
 			<div class="forn-group col-lg-2 col-md-2 col-sm-3 col-xl">
 				<label for="status">OQRS Status</label>
-				<select id="status" name="status" class="form-control form-control-sm">
+				<select id="status" name="status" class="form-select form-select-sm">
 					<option value="">All</option>
 					<option value="0">Open request</option>
 					<option value="1">Not in log request</option>
@@ -54,7 +54,7 @@ function echo_qsl_method($method) {
 			</div>
 			<div class="forn-group col-lg-2 col-md-2 col-sm-3 col-xl">
 				<label for="oqrsResults"># Results</label>
-				<select id="oqrsResults" name="oqrsResults" class="form-control form-control-sm">
+				<select id="oqrsResults" name="oqrsResults" class="form-select form-select-sm">
 					<option value="50">50</option>
 					<option value="200">200</option>
 					<option value="500">500</option>
@@ -62,7 +62,7 @@ function echo_qsl_method($method) {
 					<option value="All">All</option>
 				</select>
 			</div>
-			<div class="form-group">
+			<div class="mb-3">
 				<label>&nbsp;</label><br>
 				<button type="submit" class="btn btn-sm btn-primary" id="searchButton">Search</button>
 				<button type="reset" class="btn btn-sm btn-danger" id="resetButton">Reset</button>
diff --git a/application/views/public_search/empty.php b/application/views/public_search/empty.php
index c9fc3fde..656d3d0c 100644
--- a/application/views/public_search/empty.php
+++ b/application/views/public_search/empty.php
@@ -1,4 +1,4 @@
 <div class="container publicsearch">
 <h1>Results <small class="text-muted">Searching for <?php echo str_replace("0","&Oslash;",strtoupper($callsign)); ?></small></h1>
-	<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>
+	<div class="alert alert-danger" role="alert"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>
 </div>
diff --git a/application/views/public_search/result.php b/application/views/public_search/result.php
index 36662dc3..0297f827 100644
--- a/application/views/public_search/result.php
+++ b/application/views/public_search/result.php
@@ -59,7 +59,7 @@ if ($results) { ?>
         $config['last_tag_open'] = '<li class="page-item">';
         $config['last_tag_close'] = '</li>';
         $config['cur_tag_open'] = '<li class="page-item active"><a href="#" class="page-link">';
-        $config['cur_tag_close'] = '<span class="sr-only">(current)</span></a></li>';
+        $config['cur_tag_close'] = '<span class="visually-hidden">(current)</span></a></li>';
         $config['num_tag_open'] = '<li class="page-item">';
         $config['num_tag_close'] = '</li>';
         $this->pagination->initialize($config);
diff --git a/application/views/qrbcalc/index.php b/application/views/qrbcalc/index.php
index 0806b98f..92a0ba62 100644
--- a/application/views/qrbcalc/index.php
+++ b/application/views/qrbcalc/index.php
@@ -1,19 +1,19 @@
 <form class="form col-md-12" enctype="multipart/form-data">
-    <div class="form-group row">
+    <div class="mb-3 row">
         <div class="col-md-2 control-label" for="input">Locator 1</div>
         <div class="col-md-4">
             <input class="form-control input-group-sm" id="qrbcalc_locator1" type="text" name="locator1" placeholder="" value="<?php if ($station_locator != "0") echo $station_locator; ?>" aria-label="locator1">  
         </div>
     </div>
 
-    <div class="form-group row">
+    <div class="mb-3 row">
         <div class="col-md-2 control-label" for="input">Locator 2</div>
         <div class="col-md-4">
         <input class="form-control input-group-sm" id="qrbcalc_locator2" type="text" name="locator2" placeholder="" aria-label="locator2">
         </div>
     </div>
 
-    <div class="form-group row">
+    <div class="mb-3 row">
         <label class="col-md-2 control-label" for="button1id"></label>
         <div class="col-md-4">
             <button id="button2id" type="reset" name="button2id" class="btn-sm btn-warning">Reset</button>
diff --git a/application/views/qrz/export.php b/application/views/qrz/export.php
index 9a7b76b2..4b0c3de5 100644
--- a/application/views/qrz/export.php
+++ b/application/views/qrz/export.php
@@ -7,10 +7,10 @@
         <div class="card-header">
 			<ul class="nav nav-tabs card-header-tabs pull-right" role="tablist">
 				<li class="nav-item">
-					<a class="nav-link active" id="export-tab" data-toggle="tab" href="#export" role="tab" aria-controls="import" aria-selected="true">Upload Logbook</a>
+					<a class="nav-link active" id="export-tab" data-bs-toggle="tab" href="#export" role="tab" aria-controls="import" aria-selected="true">Upload Logbook</a>
 				</li>
 				<li class="nav-item">
-					<a class="nav-link" id="mark-tab" data-toggle="tab" href="#mark" role="tab" aria-controls="export" aria-selected="false">Mark QSOs</a>
+					<a class="nav-link" id="mark-tab" data-bs-toggle="tab" href="#mark" role="tab" aria-controls="export" aria-selected="false">Mark QSOs</a>
 				</li>
 			</ul>
 
@@ -21,7 +21,7 @@
 				<div class="tab-pane active" id="export" role="tabpanel" aria-labelledby="export-tab">
             <p>Here you can see and upload all QSOs which have not been previously uploaded to a QRZ logbook.</p>
             <p>You need to set a QRZ Logbook API key in your station profile. Only station profiles with an API Key set are displayed.</p>
-            <p><span class="badge badge-warning">Warning</span> This might take a while as QSO uploads are processed sequentially.</p>
+            <p><span class="badge text-bg-warning">Warning</span> This might take a while as QSO uploads are processed sequentially.</p>
 
 <?php
             if ($station_profile->result()) {
@@ -52,7 +52,7 @@
 
         }
         else {
-        echo '<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
+        echo '<div class="alert alert-danger" role="alert"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
         }
         ?>
 
@@ -60,18 +60,18 @@
 				<div class="tab-pane fade" id="mark" role="tabpanel" aria-labelledby="home-tab">
 
 				<form class="form" action="<?php echo site_url('qrz/mark_qrz'); ?>" method="post" enctype="multipart/form-data">
-					<select name="station_profile" class="custom-select mb-4 mr-sm-4" style="width: 30%;">
+					<select name="station_profile" class="form-select mb-4 me-sm-4" style="width: 30%;">
 						<option disabled value="0">Select Station Location</option>
 						<?php foreach ($station_profiles->result() as $station) { ?>
 							<option <?php if ($station->station_active) { echo "selected "; } ?>value="<?php echo $station->station_id; ?>">Callsign: <?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
 						<?php } ?>
 					</select>
-					<p><span class="badge badge-warning">Warning</span> If a date range is not selected then all QSOs will be marked!</p>
+					<p><span class="badge text-bg-warning">Warning</span> If a date range is not selected then all QSOs will be marked!</p>
 					<p class="card-text">From date:</p>
 					<div class="row">
 						<div class="input-group date col-md-3" id="datetimepicker5" data-target-input="nearest">
-							<input name="from" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker1"/>
-							<div class="input-group-append"  data-target="#datetimepicker5" data-toggle="datetimepicker">
+							<input name="from" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-bs-target="#datetimepicker1"/>
+							<div class="input-group-append"  data-bs-target="#datetimepicker5" data-bs-toggle="datetimepicker">
 								<div class="input-group-text"><i class="fa fa-calendar"></i></div>
 							</div>
 						</div>
@@ -79,8 +79,8 @@
 					<p class="card-text">To date:</p>
 					<div class="row">
 						<div class="input-group date col-md-3" id="datetimepicker6" data-target-input="nearest">
-							<input name="to" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker2"/>
-							<div class="input-group-append" data-target="#datetimepicker6" data-toggle="datetimepicker">
+							<input name="to" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-bs-target="#datetimepicker2"/>
+							<div class="input-group-append" data-bs-target="#datetimepicker6" data-bs-toggle="datetimepicker">
 								<div class="input-group-text"><i class="fa fa-calendar"></i></div>
 							</div>
 						</div>
diff --git a/application/views/qslcard/qslcarousel.php b/application/views/qslcard/qslcarousel.php
index 3f26ed00..887b2a36 100644
--- a/application/views/qslcard/qslcarousel.php
+++ b/application/views/qslcard/qslcarousel.php
@@ -1,10 +1,10 @@
-<div id="carouselExampleIndicators" class="carousel slide" data-ride="carousel">
+<div id="carouselExampleIndicators" class="carousel slide" data-bs-ride="carousel">
 <?php if (count($qslimages) > 1) { ?>
 <ol class="carousel-indicators">
     <?php
     $i = 0;
     foreach ($qslimages as $image) {
-        echo '<li data-target="#carouselExampleIndicators" data-slide-to="' . $i . '"';
+        echo '<li data-bs-target="#carouselExampleIndicators" data-bs-slide-to="' . $i . '"';
         if ($i == 0) {
             echo 'class="active"';
         }
@@ -30,13 +30,13 @@
     ?>
 </div>
 <?php if (count($qslimages) > 1) { ?>
-	<a class="carousel-control-prev" href="#carouselExampleIndicators" role="button" data-slide="prev">
+	<a class="carousel-control-prev" href="#carouselExampleIndicators" role="button" data-bs-slide="prev">
 		<span class="carousel-control-prev-icon" aria-hidden="true"></span>
-		<span class="sr-only">Previous</span>
+		<span class="visually-hidden">Previous</span>
 	</a>
-	<a class="carousel-control-next" href="#carouselExampleIndicators" role="button" data-slide="next">
+	<a class="carousel-control-next" href="#carouselExampleIndicators" role="button" data-bs-slide="next">
 		<span class="carousel-control-next-icon" aria-hidden="true"></span>
-		<span class="sr-only">Next</span>
+		<span class="visually-hidden">Next</span>
 	</a>
 <?php } ?>
 </div>
diff --git a/application/views/qslcard/searchform.php b/application/views/qslcard/searchform.php
index bfd20d32..ca4d6386 100644
--- a/application/views/qslcard/searchform.php
+++ b/application/views/qslcard/searchform.php
@@ -1,5 +1,5 @@
 		<form method="post" onsubmit="return false;" action="" id="search_box" name="test">
-			<div class="form-group row col-sm-12">
+			<div class="mb-3 row col-sm-12">
 				<label for="callsign" class="col-sm-2 col-form-label">Callsign</label>
 				<div class="col-sm-8">
 					<input type="text" class="form-control" id="callsign" value="">
diff --git a/application/views/qslcard/searchresult.php b/application/views/qslcard/searchresult.php
index 195ed3e0..dadc1e16 100644
--- a/application/views/qslcard/searchresult.php
+++ b/application/views/qslcard/searchresult.php
@@ -111,8 +111,8 @@
 
 			switch($this->session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')) {
 				case 'Mode':    echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break;
-				case 'RSTS':    echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo '<span class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo '<span class="badge badge-light">' . $row->COL_STX_STRING . '</span>';}; break;
-				case 'RSTR':    echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '<span class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo '<span class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';}; break;
+				case 'RSTS':    echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo '<span class="badge text-bg-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo '<span class="badge text-bg-light">' . $row->COL_STX_STRING . '</span>';}; break;
+				case 'RSTR':    echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '<span class="badge text-bg-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo '<span class="badge text-bg-light">' . $row->COL_SRX_STRING . '</span>';}; break;
 				case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
 				case 'IOTA':    echo '<td>' . ($row->COL_IOTA); break;
 				case 'SOTA':    echo '<td>' . ($row->COL_SOTA_REF); break;
@@ -127,8 +127,8 @@
 			echo '</td>';
 			switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) {
 				case 'Mode':    echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break;
-				case 'RSTS':    echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo '<span class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo '<span class="badge badge-light">' . $row->COL_STX_STRING . '</span>';}; break;
-				case 'RSTR':    echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '<span class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo '<span class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';}; break;
+				case 'RSTS':    echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo '<span class="badge text-bg-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo '<span class="badge text-bg-light">' . $row->COL_STX_STRING . '</span>';}; break;
+				case 'RSTR':    echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '<span class="badge text-bg-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo '<span class="badge text-bg-light">' . $row->COL_SRX_STRING . '</span>';}; break;
 				case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
 				case 'IOTA':    echo '<td>' . ($row->COL_IOTA); break;
 				case 'SOTA':    echo '<td>' . ($row->COL_SOTA_REF); break;
@@ -144,8 +144,8 @@
 
 			switch($this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3')) {
 				case 'Mode':    echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break;
-				case 'RSTS':    echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo '<span class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo '<span class="badge badge-light">' . $row->COL_STX_STRING . '</span>';}; break;
-				case 'RSTR':    echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '<span class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo '<span class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';}; break;
+				case 'RSTS':    echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo '<span class="badge text-bg-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo '<span class="badge text-bg-light">' . $row->COL_STX_STRING . '</span>';}; break;
+				case 'RSTR':    echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '<span class="badge text-bg-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo '<span class="badge text-bg-light">' . $row->COL_SRX_STRING . '</span>';}; break;
 				case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
 				case 'IOTA':    echo '<td>' . ($row->COL_IOTA); break;
 				case 'SOTA':    echo '<td>' . ($row->COL_SOTA_REF); break;
@@ -160,8 +160,8 @@
 			echo '</td>';
 			switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) {
 				case 'Mode':    echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break;
-				case 'RSTS':    echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo '<span class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo '<span class="badge badge-light">' . $row->COL_STX_STRING . '</span>';}; break;
-				case 'RSTR':    echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '<span class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo '<span class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';}; break;
+				case 'RSTS':    echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo '<span class="badge text-bg-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo '<span class="badge text-bg-light">' . $row->COL_STX_STRING . '</span>';}; break;
+				case 'RSTR':    echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '<span class="badge text-bg-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo '<span class="badge text-bg-light">' . $row->COL_SRX_STRING . '</span>';}; break;
 				case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
 				case 'IOTA':    echo '<td>' . ($row->COL_IOTA); break;
 				case 'SOTA':    echo '<td>' . ($row->COL_SOTA_REF); break;
@@ -176,8 +176,8 @@
 			echo '</td>';
 			switch($this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5')) {
 				case 'Mode':    echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break;
-				case 'RSTS':    echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo '<span class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo '<span class="badge badge-light">' . $row->COL_STX_STRING . '</span>';}; break;
-				case 'RSTR':    echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '<span class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo '<span class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';}; break;
+				case 'RSTS':    echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo '<span class="badge text-bg-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo '<span class="badge text-bg-light">' . $row->COL_STX_STRING . '</span>';}; break;
+				case 'RSTR':    echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '<span class="badge text-bg-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo '<span class="badge text-bg-light">' . $row->COL_SRX_STRING . '</span>';}; break;
 				case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
 				case 'IOTA':    echo '<td>' . ($row->COL_IOTA); break;
 				case 'SOTA':    echo '<td>' . ($row->COL_SOTA_REF); break;
diff --git a/application/views/qslprint/index.php b/application/views/qslprint/index.php
index e8c435fe..77cc21c0 100644
--- a/application/views/qslprint/index.php
+++ b/application/views/qslprint/index.php
@@ -18,7 +18,7 @@
 		<div class="card-body">
 			<form class="form" action="<?php echo site_url('adif/import'); ?>" method="post" enctype="multipart/form-data">
 				<?php echo lang('cloudlog_station_profile'); ?>:
-				<select name="station_profile" class="station_id custom-select mb-3 mr-sm-3" style="width: 20%;">
+				<select name="station_profile" class="station_id form-select mb-3 me-sm-3" style="width: 20%;">
 					<option value="All">All</option>
 					<?php foreach ($station_profile->result() as $station) { ?>
 						<option <?php if ($station->station_id == $station_id) { echo "selected "; } ?>value="<?php echo $station->station_id; ?>">Callsign: <?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
diff --git a/application/views/qslprint/qslprint.php b/application/views/qslprint/qslprint.php
index bfe0b63e..7a488f29 100644
--- a/application/views/qslprint/qslprint.php
+++ b/application/views/qslprint/qslprint.php
@@ -50,7 +50,7 @@ if ($qsos->result() != NULL) {
 		echo '<td style=\'text-align: center\'>'; echo $qsl->COL_SUBMODE==null?$qsl->COL_MODE:$qsl->COL_SUBMODE; echo '</td>';
 		echo '<td style=\'text-align: center\'>'; if($qsl->COL_SAT_NAME != null) { echo $qsl->COL_SAT_NAME; } else { echo strtolower($qsl->COL_BAND); }; echo '</td>';
 		echo '<td style=\'text-align: center\'>' . $qsl->COL_QSL_VIA . '</td>';
-		echo '<td style=\'text-align: center\'><span class="badge badge-light">' . $qsl->station_callsign . '</span></td>';
+		echo '<td style=\'text-align: center\'><span class="badge text-bg-light">' . $qsl->station_callsign . '</span></td>';
 		echo '<td style=\'text-align: center\'>'; echo_qsl_sent_via($qsl->COL_QSL_SENT_VIA); echo '</td>';
 		echo '<td style=\'text-align: center\'><button onclick="mark_qsl_sent(\''.$qsl->COL_PRIMARY_KEY.'\', \'B\')" class="btn btn-sm btn-success"><i class="fa fa-check"></i></button></td>';
 		echo '<td style=\'text-align: center\'><button onclick="deleteFromQslQueue(\''.$qsl->COL_PRIMARY_KEY.'\')" class="btn btn-sm btn-danger"><i class="fas fa-trash-alt"></i></button></td>';
@@ -72,6 +72,6 @@ if ($qsos->result() != NULL) {
 
 <?php
 } else {
-	echo '<div class="alert alert-danger"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>No QSL\'s to print were found!</div>';
+	echo '<div class="alert alert-danger"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>No QSL\'s to print were found!</div>';
 }
 ?>
diff --git a/application/views/qslprint/qsolist.php b/application/views/qslprint/qsolist.php
index 3cbf6699..5da90864 100644
--- a/application/views/qslprint/qsolist.php
+++ b/application/views/qslprint/qsolist.php
@@ -38,7 +38,7 @@ if ($qsos->result() != NULL) {
 		echo '<td style=\'text-align: center\'>'; $timestamp = strtotime($qsl->COL_TIME_ON); echo date('H:i', $timestamp); echo '</td>';
 		echo '<td style=\'text-align: center\'>'; echo $qsl->COL_SUBMODE==null?$qsl->COL_MODE:$qsl->COL_SUBMODE; echo '</td>';
 		echo '<td style=\'text-align: center\'>'; if($qsl->COL_SAT_NAME != null) { echo $qsl->COL_SAT_NAME; } else { echo strtolower($qsl->COL_BAND); }; echo '</td>';
-		echo '<td style=\'text-align: center\'><span class="badge badge-light">' . $qsl->station_callsign . '</span></td>';
+		echo '<td style=\'text-align: center\'><span class="badge text-bg-light">' . $qsl->station_callsign . '</span></td>';
 		echo '<td style=\'text-align: center\'>' . $qsl->COL_QSL_VIA . '</td>';
 		echo '<td style=\'text-align: center\'>'; echo_qsl_sent_via($qsl->COL_QSL_SENT_VIA); echo '</td>';
 		echo '<td style=\'text-align: center\' class="qsl">';
@@ -51,16 +51,16 @@ if ($qsos->result() != NULL) {
 			}
 			switch ($qsl->COL_QSL_SENT) {
 			case "Y":
-				echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_sent').$timestamp;
+				echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_sent').$timestamp;
 				break;
 			case "Q":
-				echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued').$timestamp;
+				echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued').$timestamp;
 				break;
 			case "R":
-				echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested').$timestamp;
+				echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested').$timestamp;
 				break;
 			case "I":
-				echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_invalid_ignore').$timestamp;
+				echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_invalid_ignore').$timestamp;
 				break;
 			default:
 				echo "class=\"qsl-red";
@@ -93,16 +93,16 @@ if ($qsos->result() != NULL) {
 			}
 			switch ($qsl->COL_QSL_RCVD) {
 			case "Y":
-				echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_received').$timestamp;
+				echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_received').$timestamp;
 				break;
 			case "Q":
-				echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued').$timestamp;
+				echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued').$timestamp;
 				break;
 			case "R":
-				echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested').$timestamp;
+				echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested').$timestamp;
 				break;
 			case "I":
-				echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_invalid_ignore').$timestamp;
+				echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_invalid_ignore').$timestamp;
 				break;
 			default:
 				echo "class=\"qsl-red";
@@ -136,7 +136,7 @@ if ($qsos->result() != NULL) {
 					$timestamp = strtotime($qsl->COL_EQSL_QSLSDATE);
 					echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
 				}
-				echo "\" data-toggle=\"tooltip\"";
+				echo "\" data-bs-toggle=\"tooltip\"";
 			}
 			echo ' class="eqsl-';
 			echo ($qsl->COL_EQSL_QSL_SENT=='Y')?'green':'red';
@@ -149,7 +149,7 @@ if ($qsos->result() != NULL) {
 					$timestamp = strtotime($qsl->COL_EQSL_QSLRDATE);
 					echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
 				}
-				echo "\" data-toggle=\"tooltip\"";
+				echo "\" data-bs-toggle=\"tooltip\"";
 			}
 			echo ' class="eqsl-';
 			echo ($qsl->COL_EQSL_QSL_RCVD=='Y')?'green':'red';
@@ -165,7 +165,7 @@ if ($qsos->result() != NULL) {
 					$timestamp = strtotime($qsl->COL_LOTW_QSLSDATE);
 					echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
 				}
-				echo "\" data-toggle=\"tooltip\"";
+				echo "\" data-bs-toggle=\"tooltip\"";
 			}
 			echo ' class="lotw-';
 			echo ($qsl->COL_LOTW_QSL_SENT=='Y')?'green':'red';
@@ -178,7 +178,7 @@ if ($qsos->result() != NULL) {
 					$timestamp = strtotime($qsl->COL_LOTW_QSLRDATE);
 					echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
 				}
-				echo "\" data-toggle=\"tooltip\"";
+				echo "\" data-bs-toggle=\"tooltip\"";
 			}
 			echo ' class="lotw-';
 			echo ($qsl->COL_LOTW_QSL_RCVD=='Y')?'green':'red';
@@ -194,7 +194,7 @@ if ($qsos->result() != NULL) {
 
 	<?php
 } else {
-	echo '<div class="alert alert-danger"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>No additional QSO\'s were found. That means they are probably already in the queue.</div>';
+	echo '<div class="alert alert-danger"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>No additional QSO\'s were found. That means they are probably already in the queue.</div>';
 }
 
 function echo_qsl_sent_via($method) {
diff --git a/application/views/qso/components/previous_contacts.php b/application/views/qso/components/previous_contacts.php
index f0f8ad8d..4d99d19d 100644
--- a/application/views/qso/components/previous_contacts.php
+++ b/application/views/qso/components/previous_contacts.php
@@ -54,9 +54,9 @@ function echo_table_col($row, $name) {
 	$ci =& get_instance();
 	switch($name) {
 		case 'Mode':    echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE . '</td>'; break;
-      case 'RSTS':    echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_STX_STRING . '</span>';} echo '</td>'; break;
-      case 'RSTR':    echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';} echo '</td>'; break;
-		case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY))); if ($row->end != NULL) echo ' <span class="badge badge-danger">'.$ci->lang->line('gen_hamradio_deleted_dxcc').'</span>'  . '</td>'; break;
+      case 'RSTS':    echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_STX_STRING . '</span>';} echo '</td>'; break;
+      case 'RSTR':    echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';} echo '</td>'; break;
+		case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY))); if ($row->end != NULL) echo ' <span class="badge text-bg-danger">'.$ci->lang->line('gen_hamradio_deleted_dxcc').'</span>'  . '</td>'; break;
 		case 'IOTA':    echo '<td>' . ($row->COL_IOTA) . '</td>'; break;
 		case 'SOTA':    echo '<td>' . ($row->COL_SOTA_REF) . '</td>'; break;
 		case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF) . '</td>'; break;
diff --git a/application/views/qso/components/winkeysettings.php b/application/views/qso/components/winkeysettings.php
index a563bd31..b6915182 100644
--- a/application/views/qso/components/winkeysettings.php
+++ b/application/views/qso/components/winkeysettings.php
@@ -8,14 +8,14 @@
 		</div>
 
 		<div class="modal-body">
-				<div class="form-group row">
+				<div class="mb-3 row">
     				<label for="function1_name" class="col-sm-5 col-form-label">Function 1 - Name</label>
     				<div class="col-sm-7">
 						<input name="function1_name" type="text" class="form-control" id="function1_name" maxlength="6">
 					</div>
   				</div>
 
-				<div class="form-group row">
+				<div class="mb-3 row">
     				<label for="function1_macro" class="col-sm-5 col-form-label">Function 1 - Macro</label>
     				<div class="col-sm-7">
 						<input name="function1_macro" type="text" class="form-control" id="function1_macro">
@@ -24,14 +24,14 @@
 
 				<hr>
 
-				<div class="form-group row">
+				<div class="mb-3 row">
     				<label for="function2_name" class="col-sm-5 col-form-label">Function 2 - Name</label>
     				<div class="col-sm-7">
 						<input name="function2_name" type="text" class="form-control" id="function2_name" maxlength="6">
 					</div>
   				</div>
 
-				<div class="form-group row">
+				<div class="mb-3 row">
     				<label for="function2_macro" class="col-sm-5 col-form-label">Function 2 - Macro</label>
     				<div class="col-sm-7">
 						<input name="function2_macro" type="text" class="form-control" id="function2_macro">
@@ -40,14 +40,14 @@
 
 				<hr>
 
-				<div class="form-group row">
+				<div class="mb-3 row">
     				<label for="function3_name" class="col-sm-5 col-form-label">Function 3 - Name</label>
     				<div class="col-sm-7">
 						<input name="function3_name" type="text" class="form-control" id="function3_name" maxlength="6">
 					</div>
   				</div>
 
-				<div class="form-group row">
+				<div class="mb-3 row">
     				<label for="function3_macro" class="col-sm-5 col-form-label">Function 3 - Macro</label>
     				<div class="col-sm-7">
 						<input name="function3_macro" type="text" class="form-control" id="function3_macro">
@@ -56,14 +56,14 @@
 
 				<hr>
 
-				<div class="form-group row">
+				<div class="mb-3 row">
     				<label for="function4_name" class="col-sm-5 col-form-label">Function 4 - Name</label>
     				<div class="col-sm-7">
 						<input name="function4_name" type="text" class="form-control" id="function4_name" maxlength="6">
 					</div>
   				</div>
 
-				<div class="form-group row">
+				<div class="mb-3 row">
     				<label for="function4_macro" class="col-sm-5 col-form-label">Function 4 - Macro</label>
     				<div class="col-sm-7">
 						<input name="function4_macro" type="text" class="form-control" id="function4_macro">
@@ -72,14 +72,14 @@
 
 				<hr>
 
-				<div class="form-group row">
+				<div class="mb-3 row">
     				<label for="function5_name" class="col-sm-5 col-form-label">Function 5 - Name</label>
     				<div class="col-sm-7">
 						<input name="function5_name" type="text" class="form-control" id="function5_name" maxlength="6">
 					</div>
   				</div>
 
-				<div class="form-group row">
+				<div class="mb-3 row">
     				<label for="function5_macro" class="col-sm-5 col-form-label">Function 5 - Macro</label>
     				<div class="col-sm-7">
 						<input name="function5_macro" type="text" class="form-control" id="function5_macro">
diff --git a/application/views/qso/components/winkeysettings_results.php b/application/views/qso/components/winkeysettings_results.php
index aa7c957c..45fdffdc 100644
--- a/application/views/qso/components/winkeysettings_results.php
+++ b/application/views/qso/components/winkeysettings_results.php
@@ -8,14 +8,14 @@
 		</div>
 
 		<div class="modal-body">
-				<div class="form-group row">
+				<div class="mb-3 row">
     				<label for="function1_name" class="col-sm-5 col-form-label">Function 1 - Name</label>
     				<div class="col-sm-7">
 						<input name="function1_name" type="text" class="form-control" id="function1_name" maxlength="6" value="<?php echo $result->function1_name; ?>">
 					</div>
   				</div>
 
-				<div class="form-group row">
+				<div class="mb-3 row">
     				<label for="function1_macro" class="col-sm-5 col-form-label">Function 1 - Macro</label>
     				<div class="col-sm-7">
 						<input name="function1_macro" type="text" class="form-control" id="function1_macro" value="<?php echo $result->function1_macro; ?>">
@@ -24,14 +24,14 @@
 
 				<hr>
 
-				<div class="form-group row">
+				<div class="mb-3 row">
     				<label for="function2_name" class="col-sm-5 col-form-label">Function 2 - Name</label>
     				<div class="col-sm-7">
 						<input name="function2_name" type="text" class="form-control" id="function2_name" maxlength="6" value="<?php echo $result->function2_name; ?>">
 					</div>
   				</div>
 
-				<div class="form-group row">
+				<div class="mb-3 row">
     				<label for="function2_macro" class="col-sm-5 col-form-label">Function 2 - Macro</label>
     				<div class="col-sm-7">
 						<input name="function2_macro" type="text" class="form-control" id="function2_macro" value="<?php echo $result->function2_macro; ?>">
@@ -40,14 +40,14 @@
 
 				<hr>
 
-				<div class="form-group row">
+				<div class="mb-3 row">
     				<label for="function3_name" class="col-sm-5 col-form-label">Function 3 - Name</label>
     				<div class="col-sm-7">
 						<input name="function3_name" type="text" class="form-control" id="function3_name" maxlength="6" value="<?php echo $result->function3_name; ?>">
 					</div>
   				</div>
 
-				<div class="form-group row">
+				<div class="mb-3 row">
     				<label for="function3_macro" class="col-sm-5 col-form-label">Function 3 - Macro</label>
     				<div class="col-sm-7">
 						<input name="function3_macro" type="text" class="form-control" id="function3_macro" value="<?php echo $result->function3_macro; ?>">
@@ -56,14 +56,14 @@
 
 				<hr>
 
-				<div class="form-group row">
+				<div class="mb-3 row">
     				<label for="function4_name" class="col-sm-5 col-form-label">Function 4 - Name</label>
     				<div class="col-sm-7">
 						<input name="function4_name" type="text" class="form-control" id="function4_name" maxlength="6" value="<?php echo $result->function4_name; ?>">
 					</div>
   				</div>
 
-				<div class="form-group row">
+				<div class="mb-3 row">
     				<label for="function4_macro" class="col-sm-5 col-form-label">Function 4 - Macro</label>
     				<div class="col-sm-7">
 						<input name="function4_macro" type="text" class="form-control" id="function4_macro" value="<?php echo $result->function4_macro; ?>">
@@ -72,14 +72,14 @@
 
 				<hr>
 
-				<div class="form-group row">
+				<div class="mb-3 row">
     				<label for="function5_name" class="col-sm-5 col-form-label">Function 5 - Name</label>
     				<div class="col-sm-7">
 						<input name="function5_name" type="text" class="form-control" id="function5_name" maxlength="6" value="<?php echo $result->function5_name; ?>">
 					</div>
   				</div>
 
-				<div class="form-group row">
+				<div class="mb-3 row">
     				<label for="function5_macro" class="col-sm-5 col-form-label">Function 5 - Macro</label>
     				<div class="col-sm-7">
 						<input name="function5_macro" type="text" class="form-control" id="function5_macro" value="<?php echo $result->function5_macro; ?>">
diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php
index f7e7d097..35bd5529 100644
--- a/application/views/qso/edit_ajax.php
+++ b/application/views/qso/edit_ajax.php
@@ -36,13 +36,13 @@
                     <div class="card-header">
                         <nav class="card-header-tabs">
                             <div class="nav nav-tabs" id="nav-tab" role="tablist">
-                                <a class="nav-item nav-link active" id="nav-qso-tab" data-toggle="tab" href="#nav-qso" role="tab" aria-controls="nav-qso" aria-selected="true">QSO</a>
-                                <a class="nav-item nav-link" id="nav-satellites-tab" data-toggle="tab" href="#nav-satellites" role="tab" aria-controls="nav-awards" aria-selected="true">Sats</a>
-                                <a class="nav-item nav-link" id="nav-awards-tab" data-toggle="tab" href="#nav-awards" role="tab" aria-controls="nav-awards" aria-selected="true">Awards</a>
-                                <a class="nav-item nav-link" id="nav-qso-notes-tab" data-toggle="tab" href="#nav-qso-notes" role="tab" aria-controls="nav-qso-notes" aria-selected="false">Notes</a>
-                                <a class="nav-item nav-link" id="nav-qsl-tab" data-toggle="tab" href="#nav-qsl" role="tab" aria-controls="nav-qsl" aria-selected="false">QSL</a>
-                                <a class="nav-item nav-link" id="nav-station-tab" data-toggle="tab" href="#nav-station" role="tab" aria-controls="nav-station" aria-selected="false">Station</a>
-								<a class="nav-item nav-link" id="nav-contest-tab" data-toggle="tab" href="#nav-contest" role="tab" aria-controls="nav-contest" aria-selected="false">Contest</a>
+                                <a class="nav-item nav-link active" id="nav-qso-tab" data-bs-toggle="tab" href="#nav-qso" role="tab" aria-controls="nav-qso" aria-selected="true">QSO</a>
+                                <a class="nav-item nav-link" id="nav-satellites-tab" data-bs-toggle="tab" href="#nav-satellites" role="tab" aria-controls="nav-awards" aria-selected="true">Sats</a>
+                                <a class="nav-item nav-link" id="nav-awards-tab" data-bs-toggle="tab" href="#nav-awards" role="tab" aria-controls="nav-awards" aria-selected="true">Awards</a>
+                                <a class="nav-item nav-link" id="nav-qso-notes-tab" data-bs-toggle="tab" href="#nav-qso-notes" role="tab" aria-controls="nav-qso-notes" aria-selected="false">Notes</a>
+                                <a class="nav-item nav-link" id="nav-qsl-tab" data-bs-toggle="tab" href="#nav-qsl" role="tab" aria-controls="nav-qsl" aria-selected="false">QSL</a>
+                                <a class="nav-item nav-link" id="nav-station-tab" data-bs-toggle="tab" href="#nav-station" role="tab" aria-controls="nav-station" aria-selected="false">Station</a>
+								<a class="nav-item nav-link" id="nav-contest-tab" data-bs-toggle="tab" href="#nav-contest" role="tab" aria-controls="nav-contest" aria-selected="false">Contest</a>
                             </div>
                         </nav>
 
@@ -52,42 +52,42 @@
 
                         <div class="tab-content" id="nav-tabContent">
                             <div class="tab-pane fade show active" id="nav-qso" role="tabpanel" aria-labelledby="nav-qso-tab">
-                                <div class="form-row">
-                                    <div class="form-group col-sm-6">
+                                <div class="row">
+                                    <div class="mb-3 col-sm-6">
                                         <label for="start_date">Start Date/Time</label>
                                         <input type="text" class="form-control form-control-sm input_date" name="time_on" id="time_on" value="<?php echo $qso->COL_TIME_ON; ?>">
                                     </div>
 
-                                    <div class="form-group col-sm-6">
+                                    <div class="mb-3 col-sm-6">
                                         <label for="start_time">End Date/Time</label>
                                         <input type="text" class="form-control form-control-sm input_time" name="time_off" id="time_off" value="<?php echo $qso->COL_TIME_OFF; ?>">
                                     </div>
                                 </div>
-                                <div class="form-row">
-                                    <div class="form-group col-sm-6">
+                                <div class="row">
+                                    <div class="mb-3 col-sm-6">
                                         <label for="callsign">Callsign</label>
                                         <input type="text" class="form-control" id="callsign" name="callsign" value="<?php echo $qso->COL_CALL; ?>">
                                     </div>
 
-                                    <div class="form-group col-sm-6">
+                                    <div class="mb-3 col-sm-6">
                                     </div>
                                 </div>
-                                <div class="form-row">
-                                    <div class="form-group col-sm-6">
+                                <div class="row">
+                                    <div class="mb-3 col-sm-6">
                                         <label for="freq">Frequency</label>
                                         <input type="text" class="form-control" id="freq" name="freq" value="<?php echo $qso->COL_FREQ; ?>">
                                     </div>
 
-                                    <div class="form-group col-sm-6">
+                                    <div class="mb-3 col-sm-6">
                                     <label for="freq">RX Frequency</label>
                                     <input type="text" class="form-control" id="freqrx" name="freq_display_rx" value="<?php if($qso->COL_FREQ_RX != "0") { echo $qso->COL_FREQ_RX; } ?>">
                                     </div>
                                 </div>
 
-                                <div class="form-row">
-                                    <div class="form-group col-sm-6">
+                                <div class="row">
+                                    <div class="mb-3 col-sm-6">
                                         <label for="freq">Band</label>
-                                        <select id="band" class="form-control form-control-sm" name="band">
+                                        <select id="band" class="form-select form-select-sm" name="band">
                                         <?php foreach($bands as $key=>$bandgroup) {
                                             echo '<optgroup label="' . strtoupper($key) . '">';
                                             foreach($bandgroup as $band) {
@@ -101,9 +101,9 @@
                                         </select>
                                     </div>
 
-                                    <div class="form-group col-sm-6">
+                                    <div class="mb-3 col-sm-6">
                                         <label for="freq">RX Band</label>
-                                        <select id="band_rx" class="form-control form-control-sm" name="band_rx">
+                                        <select id="band_rx" class="form-select form-select-sm" name="band_rx">
                                             <option value="" <?php if(strtolower($qso->COL_BAND_RX == "")) { echo "selected=\"selected\""; } ?>></option>
                                             <?php foreach($bands as $key=>$bandgroup) {
                                             echo '<optgroup label="' . strtoupper($key) . '">';
@@ -120,10 +120,10 @@
                                     </div>
                                 </div>
 
-                                <div class="form-row">
-                                    <div class="form-group col-sm-6">
+                                <div class="row">
+                                    <div class="mb-3 col-sm-6">
                                         <label for="freq">Mode</label>
-                                        <select id="mode" class="form-control mode form-control-sm" name="mode">
+                                        <select id="mode" class="form-select mode form-select-sm" name="mode">
                                             <?php
                                             foreach($modes->result() as $mode){
                                                 var_dump($mode);
@@ -136,20 +136,20 @@
                                             ?>
                                         </select>
                                     </div>
-                                    <div class="form-group col-sm6">
+                                    <div class="mb-3 col-sm6">
               		                    <label for="transmit_power">Transmit Power (W)</label>
               		                    <input type="number" step="0.001" class="form-control" id="transmit_power" name="transmit_power" value="<?php echo $qso->COL_TX_PWR; ?>" />
 					                    <small id="powerHelp" class="form-text text-muted">Give power value in Watts. Include only numbers in the input.</small>
 					                </div>
                                 </div>
 
-                                <div class="form-row">
-                                    <div class="form-group col-sm-6">
+                                <div class="row">
+                                    <div class="mb-3 col-sm-6">
                                         <label for="rst_sent">RST (S)</label>
                                         <input type="text" class="form-control form-control-sm" name="rst_sent" id="rst_sent" value="<?php echo $qso->COL_RST_SENT; ?>">
                                     </div>
 
-                                    <div class="form-group col-sm-6">
+                                    <div class="mb-3 col-sm-6">
                                         <label for="rst_rcvd">RST (R)</label>
                                         <input type="text" class="form-control form-control-sm" name="rst_rcvd" id="rst_rcvd" value="<?php echo $qso->COL_RST_RCVD; ?>">
                                     </div>
@@ -157,8 +157,8 @@
 
 
 
-                                <div class="form-row">
-                                    <div class="form-group col-sm-6">
+                                <div class="row">
+                                    <div class="mb-3 col-sm-6">
                                         <label for="locator">Gridsquare</label>
                                         <input type="text" class="form-control" id="locator" name="locator" value="<?php echo $qso->COL_GRIDSQUARE; ?>">
                                         <small id="locator_info" class="form-text text-muted"><?php if ($qso->COL_DISTANCE != "") echo $qso->COL_DISTANCE." km"; ?></small>
@@ -166,34 +166,34 @@
 
                                     <input type="hidden" name="distance" id="distance" value="<?php print ($qso->COL_DISTANCE != "") ? $qso->COL_DISTANCE : "0"; ?>">
 
-                                    <div class="form-group col-sm-6">
+                                    <div class="mb-3 col-sm-6">
                                         <label for="vucc_grids">VUCC Gridsquare</label>
                                         <input type="text" class="form-control" id="vucc_grids" name="vucc_grids" value="<?php echo $qso->COL_VUCC_GRIDS; ?>">
                                         <p>Used for VUCC MultiGrids</p>
                                     </div>
                                 </div>
 
-                                <div class="form-row">
-                                    <div class="form-group col-sm-6">
+                                <div class="row">
+                                    <div class="mb-3 col-sm-6">
                                         <label for="name">Name</label>
                                         <input type="text" class="form-control" id="name" name="name" value="<?php echo $qso->COL_NAME; ?>">
                                     </div>
 
-                                    <div class="form-group col-sm-6">
+                                    <div class="mb-3 col-sm-6">
                                         <label for="qth">QTH</label>
                                         <input type="text" class="form-control" id="qth" name="qth" value="<?php echo $qso->COL_QTH; ?>">
                                     </div>
                                 </div>
 
-                                <div class="form-group">
+                                <div class="mb-3">
                                     <label for="comment">Comment</label>
                                     <input type="text" class="form-control" id="comment" name="comment" value="<?php echo $qso->COL_COMMENT; ?>">
                                 </div>
 
-                                <div class="form-row">
-                                    <div class="form-group col-sm-6">
+                                <div class="row">
+                                    <div class="mb-3 col-sm-6">
                                         <label for="prop_mode">Propagation Mode</label>
-                                        <select class="custom-select" id="prop_mode" name="prop_mode">
+                                        <select class="form-select" id="prop_mode" name="prop_mode">
                                             <option value="" <?php if($qso->COL_PROP_MODE == "") { echo "selected=\"selected\""; } ?>></option>
                                             <option value="AS" <?php if($qso->COL_PROP_MODE == "AS") { echo "selected=\"selected\""; } ?>>Aircraft Scatter</option>
                                             <option value="AUR" <?php if($qso->COL_PROP_MODE == "AUR") { echo "selected=\"selected\""; } ?>>Aurora</option>
@@ -219,10 +219,10 @@
                                     <input type="hidden" class="form-control" id="country" name="country" value="<?php echo $qso->COL_COUNTRY; ?>">
 
                                 </div>
-                                <div class="form-row">
-                                    <div class="form-group col-sm-6">
+                                <div class="row">
+                                    <div class="mb-3 col-sm-6">
                                         <label for="dxcc_id">DXCC</label>
-                                        <select class="custom-select" id="dxcc_id" name="dxcc_id" required>
+                                        <select class="form-select" id="dxcc_id" name="dxcc_id" required>
                                             <option value="0">- NONE -</option>
                                             <?php
                                             foreach($dxcc as $d){
@@ -240,9 +240,9 @@
 
                                         </select>
                                     </div>
-                                    <div class="form-group col-sm-6">
+                                    <div class="mb-3 col-sm-6">
                                         <label for="continent"><?php echo lang('gen_hamradio_continent'); ?></label>
-                                        <select class="custom-select" id="continent" name="continent">
+                                        <select class="form-select" id="continent" name="continent">
                                             <option value=""></option>
                                             <option value="AF" <?php if($qso->COL_CONT == "AF") { echo "selected=\"selected\""; } ?>><?php echo lang('africa'); ?></option>
                                             <option value="AN" <?php if($qso->COL_CONT == "AN") { echo "selected=\"selected\""; } ?>><?php echo lang('antarctica'); ?></option>
@@ -259,12 +259,12 @@
 
                             <!-- Satellite Panel Contents -->
                             <div class="tab-pane fade" id="nav-satellites" role="tabpanel" aria-labelledby="nav-satellites-tab">
-                                <div class="form-group">
+                                <div class="mb-3">
                                     <label for="sat_name">Sat Name</label>
                                     <input type="text" class="form-control form-control-sm" name="sat_name" id="sat_name" value="<?php echo $qso->COL_SAT_NAME; ?>">
                                 </div>
 
-                                <div class="form-group">
+                                <div class="mb-3">
                                     <label for="sat_mode">Sat Mode</label>
                                     <input type="text" class="form-control form-control-sm" name="sat_mode" id="sat_mode" value="<?php echo $qso->COL_SAT_MODE; ?>">
                                 </div>
@@ -273,9 +273,9 @@
                             <!-- Awards Panel Contents -->
                             <div class="tab-pane fade" id="nav-awards" role="tabpanel" aria-labelledby="nav-awards-tab">
 
-                                <div class="form-group">
+                                <div class="mb-3">
                                     <label for="cqz">CQ Zone</label>
-                                    <select class="custom-select" id="cqz" name="cqz" required>
+                                    <select class="form-select" id="cqz" name="cqz" required>
                                         <?php
                                         for ($i = 1; $i<=40; $i++) {
                                             echo '<option value='. $i;
@@ -289,9 +289,9 @@
                                 </div>
 
 
-                                <div class="form-group">
+                                <div class="mb-3">
                                     <label for="usa_state">USA State</label>
-                                    <select class="custom-select" id="input_usa_state_edit" name="usa_state">
+                                    <select class="form-select" id="input_usa_state_edit" name="usa_state">
                                         <option value=""></option>
                                         <option value="AL" <?php if($qso->COL_STATE == "AL") { echo "selected=\"selected\""; } ?>>Alabama (AL)</option>
                                         <option value="AK" <?php if($qso->COL_STATE == "AK") { echo "selected=\"selected\""; } ?>>Alaska (AK)</option>
@@ -347,14 +347,14 @@
                                     </select>
                                 </div>
 
-                                <div class="form-group">
+                                <div class="mb-3">
                                     <label for="stationCntyInput">USA County</label>
                                     <input disabled="disabled" class="form-control" id="stationCntyInputEdit" type="text" name="usa_county" value="<?php echo $qso->COL_CNTY; ?>" />
                                 </div>
 
-                                <div class="form-group">
+                                <div class="mb-3">
                                     <label for="iota_ref">IOTA</label>
-                                    <select class="custom-select" id="iota_ref" name="iota_ref">
+                                    <select class="form-select" id="iota_ref" name="iota_ref">
                                         <option value =""></option>
 
                                         <?php
@@ -370,32 +370,32 @@
                                     </select>
                                 </div>
 
-                                <div class="form-group">
+                                <div class="mb-3">
                                     <label for="sota_ref">SOTA</label>
                                     <input type="text" class="form-control" id="sota_ref_edit" name="sota_ref" value="<?php echo $qso->COL_SOTA_REF; ?>">
                                 </div>
 
-                                <div class="form-group">
+                                <div class="mb-3">
                                     <label for="wwff_ref">WWFF</label>
                                     <input type="text" class="form-control" id="wwff_ref_edit" name="wwff_ref" value="<?php echo $qso->COL_WWFF_REF; ?>">
                                 </div>
 
-                                <div class="form-group">
+                                <div class="mb-3">
                                     <label for="pota_ref">POTA</label>
                                     <input type="text" class="form-control" id="pota_ref_edit" name="pota_ref" value="<?php echo $qso->COL_POTA_REF; ?>">
                                 </div>
 
-                                <div class="form-group">
+                                <div class="mb-3">
                                     <label for="sig">Sig</label>
                                     <input type="text" class="form-control" id="sig" name="sig" value="<?php echo $qso->COL_SIG; ?>">
                                 </div>
 
-                                <div class="form-group">
+                                <div class="mb-3">
                                     <label for="sig_info">Sig Info</label>
                                     <input type="text" class="form-control" id="sig_info" name="sig_info" value="<?php echo $qso->COL_SIG_INFO; ?>">
                                 </div>
 
-                                <div class="form-group">
+                                <div class="mb-3">
                                     <label for="darc_dok">DOK</label>
                                     <input type="text" class="form-control" id="darc_dok_edit" name="darc_dok" value="<?php echo $qso->COL_DARC_DOK; ?>">
                                 </div>
@@ -403,7 +403,7 @@
 
                             <!-- Notes Panel Contents -->
                             <div class="tab-pane fade" id="nav-qso-notes" role="tabpanel" aria-labelledby="nav-qso-notes-tab">
-                                <div class="form-group">
+                                <div class="mb-3">
                                     <label for="notes">Notes (for internal usage only)</label>
                                     <textarea  type="text" class="form-control" id="notes" name="notes" rows="10"><?php echo $qso->COL_NOTES; ?></textarea>
                                 </div>
@@ -413,21 +413,21 @@
                             <div class="tab-pane fade" id="nav-qsl" role="tabpanel" aria-labelledby="nav-qsl-tab">
                                 <ul class="nav nav-tabs" id="myTab" role="tablist">
                                     <li class="nav-item">
-                                        <a class="nav-link active" id="home-tab" data-toggle="tab" href="#home" role="tab" aria-controls="home" aria-selected="true">QSL Card</a>
+                                        <a class="nav-link active" id="home-tab" data-bs-toggle="tab" href="#home" role="tab" aria-controls="home" aria-selected="true">QSL Card</a>
                                     </li>
                                     <li class="nav-item">
-                                        <a class="nav-link" id="profile-tab" data-toggle="tab" href="#profile" role="tab" aria-controls="profile" aria-selected="false">eQSL</a>
+                                        <a class="nav-link" id="profile-tab" data-bs-toggle="tab" href="#profile" role="tab" aria-controls="profile" aria-selected="false">eQSL</a>
                                     </li>
                                     <li class="nav-item">
-                                        <a class="nav-link" id="contact-tab" data-toggle="tab" href="#contact" role="tab" aria-controls="contact" aria-selected="false">LoTW</a>
+                                        <a class="nav-link" id="contact-tab" data-bs-toggle="tab" href="#contact" role="tab" aria-controls="contact" aria-selected="false">LoTW</a>
                                     </li>
                                 </ul>
                                 <div class="tab-content" id="myTabContent">
                                     <div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="home-tab">
-                                        <div class="form-group row">
+                                        <div class="mb-3 row">
                                             <label for="sent" class="col-sm-3 col-form-label">Sent</label>
                                             <div class="col-sm-9">
-                                                <select class="custom-select" name="qsl_sent">
+                                                <select class="form-select" name="qsl_sent">
                                                     <option value="N" <?php if($qso->COL_QSL_SENT == "N") { echo "selected=\"selected\""; } ?>>No</option>
                                                     <option value="Y" <?php if($qso->COL_QSL_SENT == "Y") { echo "selected=\"selected\""; } ?>>Yes</option>
                                                     <option value="R" <?php if($qso->COL_QSL_SENT == "R") { echo "selected=\"selected\""; } ?>>Requested</option>
@@ -437,10 +437,10 @@
                                             </div>
                                         </div>
 
-                                        <div class="form-group row">
+                                        <div class="mb-3 row">
                                             <label for="sent-method" class="col-sm-3 col-form-label">Sent Method</label>
                                             <div class="col-sm-9">
-                                                <select class="custom-select" name="qsl_sent_method">
+                                                <select class="form-select" name="qsl_sent_method">
                                                     <option value="" <?php if($qso->COL_QSL_SENT_VIA == "") { echo "selected=\"selected\""; } ?>>Method</option>
                                                     <option value="D" <?php if($qso->COL_QSL_SENT_VIA == "D") { echo "selected=\"selected\""; } ?>>Direct</option>
                                                     <option value="B" <?php if($qso->COL_QSL_SENT_VIA == "B") { echo "selected=\"selected\""; } ?>>Bureau</option>
@@ -450,17 +450,17 @@
                                             </div>
                                         </div>
 
-                                        <div class="form-group row">
+                                        <div class="mb-3 row">
                                             <label for="qsl-via" class="col-sm-2 col-form-label">Sent Via</label>
                                             <div class="col-sm-10">
                                                 <input type="text" id="qsl-via" class="form-control" name="qsl_via_callsign" value="<?php echo $qso->COL_QSL_VIA; ?>" />
                                             </div>
                                         </div>
 
-                                        <div class="form-group row">
+                                        <div class="mb-3 row">
                                             <label for="sent-method" class="col-sm-3 col-form-label">Received</label>
                                             <div class="col-sm-9">
-                                                <select class="custom-select" name="qsl_rcvd">
+                                                <select class="form-select" name="qsl_rcvd">
                                                     <option value="N" <?php if($qso->COL_QSL_RCVD == "N") { echo "selected=\"selected\""; } ?>>No</option>
                                                     <option value="Y" <?php if($qso->COL_QSL_RCVD == "Y") { echo "selected=\"selected\""; } ?>>Yes</option>
                                                     <option value="R" <?php if($qso->COL_QSL_RCVD == "R") { echo "selected=\"selected\""; } ?>>Requested</option>
@@ -470,10 +470,10 @@
                                             </div>
                                         </div>
 
-                                        <div class="form-group row">
+                                        <div class="mb-3 row">
                                             <label for="sent-method" class="col-sm-3 col-form-label">Received Method</label>
                                             <div class="col-sm-9">
-                                                <select class="custom-select" name="qsl_rcvd_method">
+                                                <select class="form-select" name="qsl_rcvd_method">
                                                     <option value="" <?php if($qso->COL_QSL_RCVD_VIA == "") { echo "selected=\"selected\""; } ?>>Method</option>
                                                     <option value="D" <?php if($qso->COL_QSL_RCVD_VIA == "D") { echo "selected=\"selected\""; } ?>>Direct</option>
                                                     <option value="B" <?php if($qso->COL_QSL_RCVD_VIA == "B") { echo "selected=\"selected\""; } ?>>Bureau</option>
@@ -485,10 +485,10 @@
                                     </div>
 
                                     <div class="tab-pane fade" id="profile" role="tabpanel" aria-labelledby="profile-tab">
-                                        <div class="form-group row">
+                                        <div class="mb-3 row">
                                             <label for="sent" class="col-sm-3 col-form-label">Sent</label>
                                             <div class="col-sm-9">
-                                                <select class="custom-select" name="eqsl_sent">
+                                                <select class="form-select" name="eqsl_sent">
                                                     <option value="N" <?php if($qso->COL_EQSL_QSL_SENT == "N") { echo "selected=\"selected\""; } ?>>No</option>
                                                     <option value="Y" <?php if($qso->COL_EQSL_QSL_SENT == "Y") { echo "selected=\"selected\""; } ?>>Yes</option>
                                                     <option value="R" <?php if($qso->COL_EQSL_QSL_SENT == "R") { echo "selected=\"selected\""; } ?>>Requested</option>
@@ -498,10 +498,10 @@
                                             </div>
                                         </div>
 
-                                        <div class="form-group row">
+                                        <div class="mb-3 row">
                                             <label for="sent" class="col-sm-3 col-form-label">Received</label>
                                             <div class="col-sm-9">
-                                                <select class="custom-select" name="eqsl_rcvd">
+                                                <select class="form-select" name="eqsl_rcvd">
                                                     <option value="N" <?php if($qso->COL_EQSL_QSL_RCVD == "N") { echo "selected=\"selected\""; } ?>>No</option>
                                                     <option value="Y" <?php if($qso->COL_EQSL_QSL_RCVD == "Y") { echo "selected=\"selected\""; } ?>>Yes</option>
                                                     <option value="R" <?php if($qso->COL_EQSL_QSL_RCVD == "R") { echo "selected=\"selected\""; } ?>>Requested</option>
@@ -509,11 +509,11 @@
                                                     <option value="V" <?php if($qso->COL_EQSL_QSL_RCVD == "V") { echo "selected=\"selected\""; } ?>>Verified (Match)</option>
                                                 </select></div>
                                         </div>
-                                        <div class="form-group row">
+                                        <div class="mb-3 row">
                                              <div class="col-sm-9">
                                                  <label for="qslmsg"><?php echo lang('general_word_notes'); ?></label>
                                                  <div class="alert alert-info" role="alert">
-                                                     <span class="badge badge-info"><?php echo lang('general_word_info'); ?></span> <?php echo lang('qsl_notes_helptext'); ?>
+                                                     <span class="badge text-bg-info"><?php echo lang('general_word_info'); ?></span> <?php echo lang('qsl_notes_helptext'); ?>
                                                  </div>
                                              </div>
                                              <div class="col-sm-9">
@@ -523,10 +523,10 @@
 
                                     </div>
                                     <div class="tab-pane fade" id="contact" role="tabpanel" aria-labelledby="contact-tab">
-                                        <div class="form-group row">
+                                        <div class="mb-3 row">
                                             <label for="sent" class="col-sm-3 col-form-label">Sent</label>
                                             <div class="col-sm-9">
-                                                <select class="custom-select" name="lotw_sent">
+                                                <select class="form-select" name="lotw_sent">
                                                     <option value="N" <?php if($qso->COL_LOTW_QSL_SENT == "N") { echo "selected=\"selected\""; } ?>>No</option>
                                                     <option value="Y" <?php if($qso->COL_LOTW_QSL_SENT == "Y") { echo "selected=\"selected\""; } ?>>Yes</option>
                                                     <option value="R" <?php if($qso->COL_LOTW_QSL_SENT == "R") { echo "selected=\"selected\""; } ?>>Requested</option>
@@ -535,10 +535,10 @@
                                                 </select></div>
                                         </div>
 
-                                        <div class="form-group row">
+                                        <div class="mb-3 row">
                                             <label for="sent" class="col-sm-3 col-form-label">Received</label>
                                             <div class="col-sm-9">
-                                                <select class="custom-select" name="lotw_rcvd">
+                                                <select class="form-select" name="lotw_rcvd">
                                                     <option value="N" <?php if($qso->COL_LOTW_QSL_RCVD == "N") { echo "selected=\"selected\""; } ?>>No</option>
                                                     <option value="Y" <?php if($qso->COL_LOTW_QSL_RCVD == "Y") { echo "selected=\"selected\""; } ?>>Yes</option>
                                                     <option value="R" <?php if($qso->COL_LOTW_QSL_RCVD == "R") { echo "selected=\"selected\""; } ?>>Requested</option>
@@ -560,16 +560,16 @@
                                 $my_stations = $CI->stations->all_of_user();
                                 ?>
 
-                                <div class="form-group">
+                                <div class="mb-3">
                                     <label for="inputStationProfile">Change Station Profile</label>
-                                    <select id="stationProfile" class="custom-select" name="station_profile">
+                                    <select id="stationProfile" class="form-select" name="station_profile">
                                         <?php foreach ($my_stations->result() as $stationrow) { ?>
                                             <option value="<?php echo $stationrow->station_id; ?>" <?php if($qso->station_id == $stationrow->station_id) { echo "selected=\"selected\""; } ?>><?php echo $stationrow->station_profile_name; ?></option>
                                         <?php } ?>
                                     </select>
                                 </div>
 
-                                <div class="form-group">
+                                <div class="mb-3">
                                     <label for="operatorCallsign">Operator Callsign</label>
                                     <input type="text" id="operatorCallsign" class="form-control" name="operator_callsign" value="<?php echo $qso->COL_OPERATOR; ?>" />
                                 </div>
@@ -578,9 +578,9 @@
                             </div>
 							<!-- Contest Panel Contents -->
 							<div class="tab-pane fade" id="nav-contest" role="tabpanel" aria-labelledby="nav-contest-tab">
-								<div class="form-group">
+								<div class="mb-3">
 									<label for="contest_name">Contest Name</label>
-									<select class="custom-select" id="contest_name" name="contest_name">
+									<select class="form-select" id="contest_name" name="contest_name">
 										<option value =""></option>
 
 										<?php
@@ -595,23 +595,23 @@
 
 									</select>
 								</div>
-								<div class="form-row">
-									<div class="form-group col-sm-3">
+								<div class="row">
+									<div class="mb-3 col-sm-3">
 										<label for="srx">Serial (R)</label>
 										<input type="text" id="srx" class="form-control" name="srx" value="<?php echo $qso->COL_SRX; ?>" />
 									</div>
 
-									<div class="form-group col-sm-3">
+									<div class="mb-3 col-sm-3">
 										<label for="stx">Serial (S)</label>
 										<input type="text" id="stx" class="form-control" name="stx" value="<?php echo $qso->COL_STX; ?>" />
 									</div>
 
-									<div class="form-group col-sm-3">
+									<div class="mb-3 col-sm-3">
 										<label for="srx_string">Exchange (R)</label>
 										<input type="text" id="srx_string" class="form-control" name="srx_string" value="<?php echo $qso->COL_SRX_STRING; ?>" />
 									</div>
 
-									<div class="form-group col-sm-3">
+									<div class="mb-3 col-sm-3">
 										<label for="stx_string">Exchange (S)</label>
 										<input type="text" id="stx_string" class="form-control" name="stx_string" value="<?php echo $qso->COL_STX_STRING; ?>" />
 									</div>
@@ -625,7 +625,7 @@
 
                         <div class="actions">
                             <a class="btn btn-danger" href="javascript:qso_delete(<?php echo $qso->COL_PRIMARY_KEY; ?>, '<?php echo $qso->COL_CALL; ?>')"><i class="fas fa-trash-alt"></i> Delete QSO</a>
-                            <button id="show" type="button" name="download" class="btn btn-primary float-right" onclick="qso_save();"><i class="fas fa-save"></i> Save changes</button>
+                            <button id="show" type="button" name="download" class="btn btn-primary float-end" onclick="qso_save();"><i class="fas fa-save"></i> Save changes</button>
                         </div>
                     </div>
                 </div>
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index 3222af4b..c2c3091e 100755
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -10,33 +10,33 @@
       <div class="card-header">
         <ul style="font-size: 15px;" class="nav nav-tabs card-header-tabs pull-right"  id="myTab" role="tablist">
           <li class="nav-item">
-           <a class="nav-link active" id="qsp-tab" data-toggle="tab" href="#qso" role="tab" aria-controls="qso" aria-selected="true"><?php echo lang('gen_hamradio_qso'); ?></a>
+           <a class="nav-link active" id="qsp-tab" data-bs-toggle="tab" href="#qso" role="tab" aria-controls="qso" aria-selected="true"><?php echo lang('gen_hamradio_qso'); ?></a>
           </li>
 
           <li class="nav-item">
-            <a class="nav-link" id="station-tab" data-toggle="tab" href="#station" role="tab" aria-controls="station" aria-selected="false"><?php echo lang('gen_hamradio_station'); ?></a>
+            <a class="nav-link" id="station-tab" data-bs-toggle="tab" href="#station" role="tab" aria-controls="station" aria-selected="false"><?php echo lang('gen_hamradio_station'); ?></a>
           </li>
 
           <li class="nav-item">
-            <a class="nav-link" id="general-tab" data-toggle="tab" href="#general" role="tab" aria-controls="general" aria-selected="false"><?php echo lang('general_word_general'); ?></a>
+            <a class="nav-link" id="general-tab" data-bs-toggle="tab" href="#general" role="tab" aria-controls="general" aria-selected="false"><?php echo lang('general_word_general'); ?></a>
           </li>
 
 <?php if ($sat_active) { ?>
           <li class="nav-item">
-            <a class="nav-link" id="satellite-tab" data-toggle="tab" href="#satellite" role="tab" aria-controls="satellite" aria-selected="false"><?php echo lang('general_word_satellite_short'); ?></a>
+            <a class="nav-link" id="satellite-tab" data-bs-toggle="tab" href="#satellite" role="tab" aria-controls="satellite" aria-selected="false"><?php echo lang('general_word_satellite_short'); ?></a>
           </li>
 <?php } ?>
 
           <li class="nav-item">
-            <a class="nav-link" id="notes-tab" data-toggle="tab" href="#nav-notes" role="tab" aria-controls="notes" aria-selected="false"><?php echo lang('general_word_notes'); ?></a>
+            <a class="nav-link" id="notes-tab" data-bs-toggle="tab" href="#nav-notes" role="tab" aria-controls="notes" aria-selected="false"><?php echo lang('general_word_notes'); ?></a>
           </li>
 
           <li class="nav-item">
-            <a class="nav-link" id="qsl-tab" data-toggle="tab" href="#qsl" role="tab" aria-controls="qsl" aria-selected="false"><?php echo lang('gen_hamradio_qsl'); ?></a>
+            <a class="nav-link" id="qsl-tab" data-bs-toggle="tab" href="#qsl" role="tab" aria-controls="qsl" aria-selected="false"><?php echo lang('gen_hamradio_qsl'); ?></a>
           </li>
 	
   <li class="nav-item dropdown">
-    <a class="nav-link dropdown-toggle" id="fav_item" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-star"></i></a>
+    <a class="nav-link dropdown-toggle" id="fav_item" data-bs-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-star"></i></a>
     <div class="dropdown-menu">
       <a class="dropdown-item" href="#" id="fav_add"><?php echo lang('fav_add'); ?></a>
       <div class="dropdown-divider"></div>
@@ -52,26 +52,26 @@
           <div class="tab-pane fade show active" id="qso" role="tabpanel" aria-labelledby="qso-tab">
                       <!-- HTML for Date/Time -->
               <?php if ($this->session->userdata('user_qso_end_times')  == 1) { ?>
-              <div class="form-row">
-                <div class="form-group col-md-3">
+              <div class="row">
+                <div class="mb-3 col-md-3">
                   <label for="start_date"><?php echo lang('general_word_date'); ?></label>
                   <input type="text" class="form-control form-control-sm input_date" name="start_date" id="start_date" value="<?php if (($this->session->userdata('start_date') != NULL && ((time() - $this->session->userdata('time_stamp')) < 24 * 60 * 60))) { echo $this->session->userdata('start_date'); } else { echo date('d-m-Y');}?>" <?php echo ($_GET['manual'] == 0 ? "disabled" : "");  ?> required pattern="[0-3][0-9]-[0-1][0-9]-[0-9]{4}">
                 </div>
 
-                <div class="form-group col-md-3">
+                <div class="mb-3 col-md-3">
                 <label for="start_time"><?php echo lang('general_word_time_on'); ?></label>
                 <?php if ($_GET['manual'] != 1) { ?>
-                   <i id="reset_time" data-toggle="tooltip" data-original-title="Reset start time" class="fas fa-stopwatch"></i>
+                   <i id="reset_time" data-bs-toggle="tooltip" data-original-title="Reset start time" class="fas fa-stopwatch"></i>
                 <?php } else { ?>
-                   <i id="reset_start_time" data-toggle="tooltip" data-original-title="Reset start time" class="fas fa-stopwatch"></i>
+                   <i id="reset_start_time" data-bs-toggle="tooltip" data-original-title="Reset start time" class="fas fa-stopwatch"></i>
                 <?php } ?>
                   <input type="text" class="form-control form-control-sm input_start_time" name="start_time" id="start_time" value="<?php if (($this->session->userdata('start_time') != NULL && ((time() - $this->session->userdata('time_stamp')) < 24 * 60 * 60))) { echo substr($this->session->userdata('start_time'),0,5); } else { echo $_GET['manual'] == 0 ? date('H:i:s') : date('H:i'); } ?>" size="7" <?php echo ($_GET['manual'] == 0 ? "disabled" : "");  ?> required pattern="[0-2][0-9]:[0-5][0-9]">
                 </div>
 
-                <div class="form-group col-md-3">
+                <div class="mb-3 col-md-3">
                   <label for="end_time"><?php echo lang('general_word_time_off'); ?></label>
                 <?php if ($_GET['manual'] == 1) { ?>
-                   <i id="reset_end_time" data-toggle="tooltip" data-original-title="Reset end time" class="fas fa-stopwatch"></i>
+                   <i id="reset_end_time" data-bs-toggle="tooltip" data-original-title="Reset end time" class="fas fa-stopwatch"></i>
                 <?php } ?>
                   <input type="text" class="form-control form-control-sm input_end_time" name="end_time" id="end_time" value="<?php if (($this->session->userdata('end_time') != NULL && ((time() - $this->session->userdata('time_stamp')) < 24 * 60 * 60))) { echo substr($this->session->userdata('end_time'),0,5); } else { echo $_GET['manual'] == 0 ? date('H:i:s') : date('H:i'); } ?>" size="7" <?php echo ($_GET['manual'] == 0 ? "disabled" : "");  ?> required pattern="[0-2][0-9]:[0-5][0-9]">
                 </div>
@@ -84,16 +84,16 @@
               </div>
 
               <?php } else {?>
-              <div class="form-row">
-                <div class="form-group col-md-6">
+              <div class="row">
+                <div class="mb-3 col-md-6">
                   <label for="start_date"><?php echo lang('general_word_date'); ?></label>
                   <input type="text" class="form-control form-control-sm input_date" name="start_date" id="start_date" value="<?php if (($this->session->userdata('start_date') != NULL && ((time() - $this->session->userdata('time_stamp')) < 24 * 60 * 60))) { echo $this->session->userdata('start_date'); } else { echo date('d-m-Y');}?>" <?php echo ($_GET['manual'] == 0 ? "disabled" : "");  ?> required pattern="[0-3][0-9]-[0-1][0-9]-[0-9]{4}">
                 </div>
 
-                <div class="form-group col-md-6">
+                <div class="mb-3 col-md-6">
                   <label for="start_time"><?php echo lang('general_word_time'); ?></label>
                 <?php if ($_GET['manual'] == 1) { ?>
-                   <i id="reset_start_time" data-toggle="tooltip" data-original-title="Reset start time" class="fas fa-stopwatch"></i>
+                   <i id="reset_start_time" data-bs-toggle="tooltip" data-original-title="Reset start time" class="fas fa-stopwatch"></i>
                 <?php } ?>
                   <input type="text" class="form-control form-control-sm input_start_time" name="start_time" id="start_time" value="<?php if (($this->session->userdata('start_time') != NULL && ((time() - $this->session->userdata('time_stamp')) < 24 * 60 * 60))) { echo substr($this->session->userdata('start_time'),0,5); } else { echo $_GET['manual'] == 0 ? date('H:i:s') : date('H:i'); } ?>" size="7" <?php echo ($_GET['manual'] == 0 ? "disabled" : "");  ?> required pattern="[0-2][0-9]:[0-5][0-9]">
                 </div>
@@ -106,22 +106,22 @@
               <?php } ?>
 
               <!-- Callsign Input -->
-              <div class="form-row">
-                <div class="form-group col-md-9">
-                  <label for="callsign"><?php echo lang('gen_hamradio_callsign'); ?></label><?php if ($this->optionslib->get_option('dxcache_url') != '') { ?>&nbsp;<i id="check_cluster" data-toggle="tooltip" data-original-title="Search DXCluster for latest Spot" class="fas fa-search"></i> <?php } ?>
+              <div class="row">
+                <div class="mb-3 col-md-9">
+                  <label for="callsign"><?php echo lang('gen_hamradio_callsign'); ?></label><?php if ($this->optionslib->get_option('dxcache_url') != '') { ?>&nbsp;<i id="check_cluster" data-bs-toggle="tooltip" data-original-title="Search DXCluster for latest Spot" class="fas fa-search"></i> <?php } ?>
                   <input type="text" class="form-control" id="callsign" name="callsign" required>
-                  <small id="callsign_info" class="badge badge-secondary"></small> <a id="lotw_link"><small id="lotw_info" class="badge badge-success"></small></a>
+                  <small id="callsign_info" class="badge text-bg-secondary"></small> <a id="lotw_link"><small id="lotw_info" class="badge text-bg-success"></small></a>
                 </div>
-                <div class="form-group col-md-3 align-self-center">
-                  <small id="qrz_info" class="badge badge-secondary"></small>
-                  <small id="hamqth_info" class="badge badge-secondary"></small>
+                <div class="mb-3 col-md-3 align-self-center">
+                  <small id="qrz_info" class="badge text-bg-secondary"></small>
+                  <small id="hamqth_info" class="badge text-bg-secondary"></small>
                 </div>
               </div>
 
-              <div class="form-row">
-                <div class="form-group col-md-6">
+              <div class="row">
+                <div class="mb-3 col-md-6">
                   <label for="mode"><?php echo lang('gen_hamradio_mode'); ?></label>
-                  <select id="mode" class="form-control mode form-control-sm" name="mode">
+                  <select id="mode" class="form-select mode form-select-sm" name="mode">
                   <?php
                       foreach($modes->result() as $mode){
                         if ($mode->submode == null) {
@@ -134,10 +134,10 @@
                   </select>
                 </div>
 
-                <div class="form-group col-md-6">
+                <div class="mb-3 col-md-6">
                   <label for="band"><?php echo lang('gen_hamradio_band'); ?></label>
 
-                  <select id="band" class="form-control form-control-sm" name="band">
+                  <select id="band" class="form-select form-select-sm" name="band">
                   <?php foreach($bands as $key=>$bandgroup) {
                           echo '<optgroup label="' . strtoupper($key) . '">';
                           foreach($bandgroup as $band) {
@@ -155,33 +155,33 @@
               </div>
 
               <!-- Signal Report Information -->
-              <div class="form-row">
-                <div class="form-group col-md-6">
+              <div class="row">
+                <div class="mb-3 col-md-6">
                   <label for="rst_sent"><?php echo lang('gen_hamradio_rsts'); ?></label>
                   <input type="text" class="form-control form-control-sm" name="rst_sent" id="rst_sent" value="59">
                 </div>
 
-                <div class="form-group col-md-6">
+                <div class="mb-3 col-md-6">
                   <label for="rst_rcvd"><?php echo lang('gen_hamradio_rstr'); ?></label>
                   <input type="text" class="form-control form-control-sm" name="rst_rcvd" id="rst_rcvd" value="59">
                 </div>
               </div>
 
-              <div class="form-group row">
+              <div class="mb-3 row">
                   <label for="name" class="col-sm-3 col-form-label"><?php echo lang('general_word_name'); ?></label>
                   <div class="col-sm-9">
                     <input type="text" class="form-control form-control-sm" name="name" id="name" value="">
                 </div>
               </div>
 
-              <div class="form-group row">
+              <div class="mb-3 row">
                 <label for="qth" class="col-sm-3 col-form-label"><?php echo lang('general_word_location'); ?></label>
                 <div class="col-sm-9">
                     <input type="text" class="form-control form-control-sm" name="qth" id="qth" value="">
                 </div>
               </div>
 
-              <div class="form-group row">
+              <div class="mb-3 row">
                   <label for="locator" class="col-sm-3 col-form-label"><?php echo lang('gen_hamradio_gridsquare'); ?></label>
                   <div class="col-sm-9">
                     <input type="text" class="form-control form-control-sm" name="locator" id="locator" value="">
@@ -191,7 +191,7 @@
 
               <input type="hidden" name="distance" id="distance" value="0">
 
-              <div class="form-group row">
+              <div class="mb-3 row">
                   <label for="comment" class="col-sm-3 col-form-label"><?php echo lang('general_word_comment'); ?></label>
                   <div class="col-sm-9">
                     <input type="text" class="form-control form-control-sm" name="comment" id="comment" value="">
@@ -202,9 +202,9 @@
 
           <!-- Station Panel Data -->
           <div class="tab-pane fade" id="station" role="tabpanel" aria-labelledby="station-tab">
-            <div class="form-group">
+            <div class="mb-3">
               <label for="stationProfile"><?php echo lang('cloudlog_station_profile'); ?></label>
-              <select id="stationProfile" class="custom-select" name="station_profile">
+              <select id="stationProfile" class="form-select" name="station_profile">
                 <?php
                    $power = '';
                       foreach ($stations->result() as $stationrow) {
@@ -214,9 +214,9 @@
               </select>
             </div>
 
-            <div class="form-group">
+            <div class="mb-3">
               <label for="radio"><?php echo lang('gen_hamradio_radio'); ?></label>
-              <select class="custom-select radios" id="radio" name="radio">
+              <select class="form-select radios" id="radio" name="radio">
                 <option value="0" selected="selected"><?php echo lang('general_word_none'); ?></option>
                 <?php foreach ($radios->result() as $row) { ?>
                 <option value="<?php echo $row->id; ?>" <?php if($this->session->userdata('radio') == $row->id) { echo "selected=\"selected\""; } ?>><?php echo $row->radio; ?></option>
@@ -224,20 +224,20 @@
                 </select>
             </div>
 
-            <div class="form-group">
+            <div class="mb-3">
               <label for="frequency"><?php echo lang('gen_hamradio_frequency'); ?></label>
               <input type="text" class="form-control" id="frequency" name="freq_display" value="<?php echo $this->session->userdata('freq'); ?>" />
             </div>
 
-            <div class="form-group">
+            <div class="mb-3">
               <label for="frequency_rx"><?php echo lang('gen_hamradio_frequency_rx'); ?></label>
               <input type="text" class="form-control" id="frequency_rx" name="freq_display_rx" value="<?php echo $this->session->userdata('freq_rx'); ?>" />
             </div>
 
-            <div class="form-group">
+            <div class="mb-3">
                   <label for="band_rx"><?php echo lang('gen_hamradio_band_rx'); ?></label>
 
-                  <select id="band_rx" class="form-control" name="band_rx">
+                  <select id="band_rx" class="form-select" name="band_rx">
                     <option value="" <?php if($this->session->userdata('band_rx') == "") { echo "selected=\"selected\""; } ?>></option>
 
                   <?php foreach($bands as $key=>$bandgroup) {
@@ -253,13 +253,13 @@
                   </select>
             </div>
 
-            <div class="form-group">
+            <div class="mb-3">
               <label for="transmit_power"><?php echo lang('gen_hamradio_transmit_power'); ?></label>
               <input type="number" step="0.001" class="form-control" id="transmit_power" name="transmit_power" value="<?php if ($this->session->userdata('transmit_power')) { echo $this->session->userdata('transmit_power'); } else { echo $power; } ?>" />
               <small id="powerHelp" class="form-text text-muted"><?php echo lang('qso_transmit_power_helptext'); ?></small>
             </div>
 
-            <div class="form-group">
+            <div class="mb-3">
               <label for="operator_callsign"><?php echo lang('qso_operator_callsign'); ?></label>
               <input type="text" class="form-control" id="operator_callsign" name="operator_callsign" value="<?php if ($this->session->userdata('operator_callsign')) { echo $this->session->userdata('operator_callsign'); } ?>" />
             </div>
@@ -268,9 +268,9 @@
 
           <!-- General Items -->
           <div class="tab-pane fade" id="general" role="tabpanel" aria-labelledby="general-tab">
-              <div class="form-group">
+              <div class="mb-3">
                   <label for="dxcc_id"><?php echo lang('gen_hamradio_dxcc'); ?></label>
-                  <select class="custom-select" id="dxcc_id" name="dxcc_id" required>
+                  <select class="form-select" id="dxcc_id" name="dxcc_id" required>
                       <option value="0">- NONE -</option>
                       <?php
                       foreach($dxcc as $d){
@@ -284,9 +284,9 @@
 
                   </select>
               </div>
-              <div class="form-group">
+              <div class="mb-3">
                   <label for="continent"><?php echo lang('gen_hamradio_continent'); ?></label>
-                  <select class="custom-select" id="continent" name="continent">
+                  <select class="form-select" id="continent" name="continent">
                       <option value=""></option>
                       <option value="AF"><?php echo lang('africa'); ?></option>
                       <option value="AN"><?php echo lang('antarctica'); ?></option>
@@ -297,9 +297,9 @@
                       <option value="SA"><?php echo lang('southamerica'); ?></option>
                   </select>
               </div>
-              <div class="form-group">
+              <div class="mb-3">
                   <label for="cqz"><?php echo lang('gen_hamradio_cq_zone'); ?></label>
-                  <select class="custom-select" id="cqz" name="cqz" required>
+                  <select class="form-select" id="cqz" name="cqz" required>
                       <?php
                       for ($i = 0; $i<=40; $i++) {
                           echo '<option value="'. $i . '">'. $i .'</option>';
@@ -308,9 +308,9 @@
                   </select>
               </div>
 
-            <div class="form-group">
+            <div class="mb-3">
               <label for="selectPropagation"><?php echo lang('gen_hamradio_propagation_mode'); ?></label>
-              <select class="custom-select" id="selectPropagation" name="prop_mode">
+              <select class="form-select" id="selectPropagation" name="prop_mode">
                 <option value="" <?php if(!empty($this->session->userdata('prop_mode'))) { echo "selected=\"selected\""; } ?>></option>
                 <option value="AS" <?php if($this->session->userdata('prop_mode') == "AS") { echo "selected=\"selected\""; } ?>>Aircraft Scatter</option>
                 <option value="AUR" <?php if($this->session->userdata('prop_mode') == "AUR") { echo "selected=\"selected\""; } ?>>Aurora</option>
@@ -333,9 +333,9 @@
               </select>
             </div>
 
-            <div class="form-group">
+            <div class="mb-3">
               <label for="input_usa_state"><?php echo lang('gen_hamradio_usa_state'); ?></label>
-              <select class="custom-select" id="input_usa_state" name="usa_state">
+              <select class="form-select" id="input_usa_state" name="usa_state">
                 <option value=""></option>
                 <option value="AL">Alabama (AL)</option>
                 <option value="AK">Alaska (AK)</option>
@@ -391,14 +391,14 @@
               </select>
             </div>
 
-              <div class="form-group">
+              <div class="mb-3">
                   <label for="stationCntyInput"><?php echo lang('gen_hamradio_county_reference'); ?></label>
                   <input disabled="disabled" class="form-control" id="stationCntyInput" type="text" name="county" value="" />
               </div>
 
-            <div class="form-group">
+            <div class="mb-3">
               <label for="iota_ref"><?php echo lang('gen_hamradio_iota_reference'); ?></label>
-                    <select class="custom-select" id="iota_ref" name="iota_ref">
+                    <select class="form-select" id="iota_ref" name="iota_ref">
                         <option value =""></option>
 
                         <?php
@@ -410,52 +410,52 @@
                     </select>
             </div>
 
-            <div class="form-row">
-              <div class="form-group col-md-9">
+            <div class="row">
+              <div class="mb-3 col-md-9">
                 <label for="sota_ref"><?php echo lang('gen_hamradio_sota_reference'); ?></label>
                 <input class="form-control" id="sota_ref" type="text" name="sota_ref" value="" />
                 <small id="sotaRefHelp" class="form-text text-muted"><?php echo lang('qso_sota_ref_helptext'); ?></small>
               </div>
-              <div class="form-group col-md-3 align-self-center">
-                <small id="sota_info" class="badge badge-secondary"></small>
+              <div class="mb-3 col-md-3 align-self-center">
+                <small id="sota_info" class="badge text-bg-secondary"></small>
               </div>
             </div>
 
-            <div class="form-row">
-              <div class="form-group col-md-9">
+            <div class="row">
+              <div class="mb-3 col-md-9">
                 <label for="wwff_ref"><?php echo lang('gen_hamradio_wwff_reference'); ?></label>
                 <input class="form-control" id="wwff_ref" type="text" name="wwff_ref" value="" />
                 <small id="wwffRefHelp" class="form-text text-muted"><?php echo lang('qso_wwff_ref_helptext'); ?></small>
               </div>
-              <div class="form-group col-md-3 align-self-center">
-                <small id="wwff_info" class="badge badge-secondary"></small>
+              <div class="mb-3 col-md-3 align-self-center">
+                <small id="wwff_info" class="badge text-bg-secondary"></small>
               </div>
             </div>
 
-            <div class="form-row">
-              <div class="form-group col-md-9">
+            <div class="row">
+              <div class="mb-3 col-md-9">
                 <label for="pota_ref"><?php echo lang('gen_hamradio_pota_reference'); ?></label>
                 <input class="form-control" id="pota_ref" type="text" name="pota_ref" value="" />
                 <small id="potaRefHelp" class="form-text text-muted"><?php echo lang('qso_pota_ref_helptext'); ?></small>
               </div>
-              <div class="form-group col-md-3 align-self-center">
-                <small id="pota_info" class="badge badge-secondary"></small>
+              <div class="mb-3 col-md-3 align-self-center">
+                <small id="pota_info" class="badge text-bg-secondary"></small>
               </div>
             </div>
 
-            <div class="form-group">
+            <div class="mb-3">
               <label for="sig"><?php echo lang('gen_hamradio_sig'); ?></label>
               <input class="form-control" id="sig" type="text" name="sig" value="" />
               <small id="sigHelp" class="form-text text-muted"><?php echo lang('qso_sig_helptext'); ?></small>
             </div>
 
-            <div class="form-group">
+            <div class="mb-3">
               <label for="sig_info"><?php echo lang('gen_hamradio_sig_info'); ?></label>
               <input class="form-control" id="sig_info" type="text" name="sig_info" value="" />
               <small id="sigInfoHelp" class="form-text text-muted"><?php echo lang('qso_sig_info_helptext'); ?></small>
             </div>
 
-            <div class="form-group">
+            <div class="mb-3">
               <label for="darc_dok"><?php echo lang('gen_hamradio_dok'); ?></label>
               <input class="form-control" id="darc_dok" type="text" name="darc_dok" value="" />
               <small id="dokHelp" class="form-text text-muted"><?php echo lang('qso_dok_helptext'); ?></small>
@@ -464,7 +464,7 @@
 
           <!-- Satellite Panel -->
           <div class="tab-pane fade" id="satellite" role="tabpanel" aria-labelledby="satellite-tab">
-            <div class="form-group">
+            <div class="mb-3">
               <label for="sat_name"><?php echo lang('gen_hamradio_satellite_name'); ?></label>
 
               <input list="satellite_names" id="sat_name" type="text" name="sat_name" class="form-control" value="<?php echo $this->session->userdata('sat_name'); ?>">
@@ -472,7 +472,7 @@
               <datalist id="satellite_names" class="satellite_names_list"></datalist>
             </div>
 
-            <div class="form-group">
+            <div class="mb-3">
               <label for="sat_mode"><?php echo lang('gen_hamradio_satellite_mode'); ?></label>
 
               <input list="satellite_modes" id="sat_mode" type="text" name="sat_mode" class="form-control" value="<?php echo $this->session->userdata('sat_mode'); ?>">
@@ -484,9 +484,9 @@
           <!-- Notes Panel Contents -->
           <div class="tab-pane fade" id="nav-notes" role="tabpanel" aria-labelledby="notes-tab">
             <div class="alert alert-info" role="alert">
-              <span class="badge badge-info"><?php echo lang('general_word_info'); ?></span> <?php echo lang('qso_notes_helptext'); ?>
+              <span class="badge text-bg-info"><?php echo lang('general_word_info'); ?></span> <?php echo lang('qso_notes_helptext'); ?>
             </div>
-           <div class="form-group">
+           <div class="mb-3">
               <label for="notes"><?php echo lang('general_word_notes'); ?></label>
               <textarea  type="text" class="form-control" id="notes" name="notes" rows="10"></textarea>
             </div>
@@ -495,10 +495,10 @@
           <!-- QSL Tab -->
           <div class="tab-pane fade" id="qsl" role="tabpanel" aria-labelledby="qsl-tab">
 
-            <div class="form-group row">
+            <div class="mb-3 row">
               <label for="sent" class="col-sm-3 col-form-label"><?php echo lang('general_word_sent'); ?></label>
               <div class="col-sm-9">
-                <select class="custom-select" id="sent" name="qsl_sent">
+                <select class="form-select" id="sent" name="qsl_sent">
                   <option value="N" selected="selected"><?php echo lang('general_word_no'); ?></option>
                   <option value="Y"><?php echo lang('general_word_yes'); ?></option>
                   <option value="R"><?php echo lang('general_word_requested'); ?></option>
@@ -508,10 +508,10 @@
               </div>
             </div>
 
-            <div class="form-group row">
+            <div class="mb-3 row">
               <label for="sent-method" class="col-sm-3 col-form-label"><?php echo lang('general_word_method'); ?></label>
               <div class="col-sm-9">
-                <select class="custom-select" id="sent-method" name="qsl_sent_method">
+                <select class="form-select" id="sent-method" name="qsl_sent_method">
                  <option value="" selected="selected"><?php echo lang('general_word_method'); ?></option>
                  <option value="D"><?php echo lang('general_word_qslcard_direct'); ?></option>
                  <option value="B"><?php echo lang('general_word_qslcard_bureau'); ?></option>
@@ -521,7 +521,7 @@
               </div>
             </div>
 
-            <div class="form-group row">
+            <div class="mb-3 row">
               <label for="qsl_via" class="col-sm-2 col-form-label"><?php echo lang('general_word_qslcard_via'); ?></label>
               <div class="col-sm-10">
                 <input type="text" id="qsl_via" class="form-control" name="qsl_via" value="" />
@@ -529,9 +529,9 @@
             </div>
 
             <div class="alert alert-info" role="alert">
-              <span class="badge badge-info"><?php echo lang('general_word_info'); ?></span> <?php echo lang('qsl_notes_helptext'); ?>
+              <span class="badge text-bg-info"><?php echo lang('general_word_info'); ?></span> <?php echo lang('qsl_notes_helptext'); ?>
             </div>
-           <div class="form-group">
+           <div class="mb-3">
               <label for="qslmsg"><?php echo lang('general_word_notes'); ?></label>
               <textarea  type="text" class="form-control" id="qslmsg" name="qslmsg" rows="5"></textarea>
             </div>
diff --git a/application/views/radio/index.php b/application/views/radio/index.php
index bb425754..34be00e2 100644
--- a/application/views/radio/index.php
+++ b/application/views/radio/index.php
@@ -24,7 +24,7 @@
 		</div>
 
 		<p class="card-text">
-	    	<span class="badge badge-info">Info</span> You can find out how to use the <a href="https://github.com/magicbug/Cloudlog/wiki/Radio-Interface" target="_blank">radio functions</a> in the wiki.</a>
+	    	<span class="badge text-bg-info">Info</span> You can find out how to use the <a href="https://github.com/magicbug/Cloudlog/wiki/Radio-Interface" target="_blank">radio functions</a> in the wiki.</a>
 	    </p>
 
 	  </div>
diff --git a/application/views/search/cqzones.php b/application/views/search/cqzones.php
index 9a5867ab..ae28f672 100644
--- a/application/views/search/cqzones.php
+++ b/application/views/search/cqzones.php
@@ -27,9 +27,9 @@
 	  </div>
 	  <div class="card-body">
 	  	<form method="post" action="" id="search_box" name="test">
-		  <div class="form-group row">
+		  <div class="mb-3 row">
 		    <label for="callsign" class="col-sm-2 col-form-label">Station location:</label>
-		    <select id="station_id" name="station_profile" class="custom-select col-sm-3 mb-3 mr-sm-3">
+		    <select id="station_id" name="station_profile" class="form-select col-sm-3 mb-3 me-sm-3">
 					<option value="All">All</option>
                     <?php foreach ($station_profile->result() as $station) { ?>
                     <option value="<?php echo $station->station_id; ?>">Callsign: <?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
diff --git a/application/views/search/cqzones_result.php b/application/views/search/cqzones_result.php
index 8ddad4d3..82ba2249 100644
--- a/application/views/search/cqzones_result.php
+++ b/application/views/search/cqzones_result.php
@@ -39,7 +39,7 @@ if ($qsos->result() != NULL) {
 		echo '<td style=\'text-align: center\'>' . $qso->COL_CQZ . '</td>';
 		echo '<td style=\'text-align: center\'>' . $qso->correctcqzone . '</td>';
 		echo '<td style=\'text-align: center\'>' . ucwords(strtolower($qso->COL_COUNTRY), "- (/") . '</td>';
-		echo '<td style=\'text-align: center\'><span class="badge badge-light">' . $qso->station_callsign . '</span></td>';
+		echo '<td style=\'text-align: center\'><span class="badge text-bg-light">' . $qso->station_callsign . '</span></td>';
 		echo '</tr>';
 	}
 
@@ -48,6 +48,6 @@ if ($qsos->result() != NULL) {
 
 	<?php
 } else {
-	echo '<div class="alert alert-success"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>No incorrect CQ Zones were found.</div>';
+	echo '<div class="alert alert-success"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>No incorrect CQ Zones were found.</div>';
 }
 ?>
diff --git a/application/views/search/duplicates.php b/application/views/search/duplicates.php
index 22bcde5b..996c909f 100644
--- a/application/views/search/duplicates.php
+++ b/application/views/search/duplicates.php
@@ -27,9 +27,9 @@
 	  </div>
 	  <div class="card-body">
 	  	<form method="post" action="" id="search_box" name="test">
-		  <div class="form-group row">
+		  <div class="mb-3 row">
 		    <label for="callsign" class="col-sm-2 col-form-label">Station location:</label>
-		    <select id="station_id" name="station_profile" class="custom-select col-sm-3 mb-3 mr-sm-3">
+		    <select id="station_id" name="station_profile" class="form-select col-sm-3 mb-3 me-sm-3">
 					<option value="All">All</option>
                     <?php foreach ($station_profile->result() as $station) { ?>
                     <option value="<?php echo $station->station_id; ?>">Callsign: <?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
diff --git a/application/views/search/duplicates_result.php b/application/views/search/duplicates_result.php
index 97f6a46e..f00c4f2e 100644
--- a/application/views/search/duplicates_result.php
+++ b/application/views/search/duplicates_result.php
@@ -36,7 +36,7 @@ if ($qsos->result() != NULL) {
 		echo '<td style=\'text-align: center\'>'; $timestamp = strtotime($qso->Maxtime); echo date('H:i', $timestamp); echo '</td>';
 		echo '<td style=\'text-align: center\'>'; echo $qso->COL_SUBMODE==null?$qso->COL_MODE:$qso->COL_SUBMODE; echo '</td>';
 		echo '<td style=\'text-align: center\'>'; if($qso->COL_SAT_NAME != null) { echo $qso->COL_SAT_NAME; } else { echo strtolower($qso->COL_BAND); }; echo '</td>';
-		echo '<td style=\'text-align: center\'><span class="badge badge-light">' . $qso->station_callsign . '</span></td>';
+		echo '<td style=\'text-align: center\'><span class="badge text-bg-light">' . $qso->station_callsign . '</span></td>';
 		echo '</tr>';
 	}
 
@@ -45,6 +45,6 @@ if ($qsos->result() != NULL) {
 
 	<?php
 } else {
-	echo '<div class="alert alert-success"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>No duplicate QSO\'s were found.</div>';
+	echo '<div class="alert alert-success"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>No duplicate QSO\'s were found.</div>';
 }
 ?>
\ No newline at end of file
diff --git a/application/views/search/filter.php b/application/views/search/filter.php
index a3174a2c..af0a03a4 100644
--- a/application/views/search/filter.php
+++ b/application/views/search/filter.php
@@ -49,10 +49,10 @@
 			<button class="btn btn-sm btn-primary" onclick="edit_stored_query_dialog()" id="btn-edit">Edit queries</button></p>
 
 
-		  <div class="form-group row querydropdownform">
+		  <div class="mb-3 row querydropdownform">
 			  <label class="col-md-2 control-label" for="querydropdown">  Stored queries:</label>
 			  <div class="col-md-3">
-				  <select id="querydropdown" name="querydropdown" class="form-control custom-select-sm">
+				  <select id="querydropdown" name="querydropdown" class="form-select form-select-sm">
 					  <?php
 					  foreach($stored_queries as $q){
 						  echo '<option value="' . $q->id . '">'. $q->description . '</option>'."\n";
@@ -69,7 +69,7 @@
 		  }
 		  ?>
 
-	    	<div style="display:none;"><span  class="badge badge-info">Info</span> You can find out how to use the <a href="https://github.com/magicbug/Cloudlog/wiki/Search----Filter" target="_blank">search filter functions</a> in the wiki.</a></div>
+	    	<div style="display:none;"><span  class="badge text-bg-info">Info</span> You can find out how to use the <a href="https://github.com/magicbug/Cloudlog/wiki/Search----Filter" target="_blank">search filter functions</a> in the wiki.</a></div>
 	    
 
 	  </div>
diff --git a/application/views/search/lotw_unconfirmed.php b/application/views/search/lotw_unconfirmed.php
index 2fa3f0e4..ee81dd4b 100644
--- a/application/views/search/lotw_unconfirmed.php
+++ b/application/views/search/lotw_unconfirmed.php
@@ -28,9 +28,9 @@
 	  <div class="card-body">
         The search displays QSOs which are unconfirmed on LoTW, but the callsign worked has uploaded to LoTW after your QSO date.<br/><br />
 	  	<form method="post" action="" id="search_box" name="test">
-		  <div class="form-group row">
+		  <div class="mb-3 row">
 		    <label for="callsign" class="col-sm-2 col-form-label">Station location:</label>
-		    <select id="station_id" name="station_profile" class="custom-select col-sm-3 mb-3 mr-sm-3">
+		    <select id="station_id" name="station_profile" class="form-select col-sm-3 mb-3 me-sm-3">
 					<option value="All">All</option>
                     <?php foreach ($station_profile->result() as $station) { ?>
                     <option value="<?php echo $station->station_id; ?>">Callsign: <?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
diff --git a/application/views/search/lotw_unconfirmed_result.php b/application/views/search/lotw_unconfirmed_result.php
index 4767684c..561dc730 100644
--- a/application/views/search/lotw_unconfirmed_result.php
+++ b/application/views/search/lotw_unconfirmed_result.php
@@ -29,7 +29,7 @@ if ($qsos->result() != NULL) {
 		echo '<td style=\'text-align: center\'>'; echo $qso->COL_SUBMODE==null?$qso->COL_MODE:$qso->COL_SUBMODE; echo '</td>';
 		echo '<td style=\'text-align: center\'>'; if($qso->COL_SAT_NAME != null) { echo $qso->COL_SAT_NAME; } else { echo strtolower($qso->COL_BAND); }; echo '</td>';
 		echo '<td style=\'text-align: center\'>' . $qso->lastupload . '</td>';
-		echo '<td style=\'text-align: center\'><span class="badge badge-light">' . $qso->station_callsign . '</span></td>';
+		echo '<td style=\'text-align: center\'><span class="badge text-bg-light">' . $qso->station_callsign . '</span></td>';
 		echo '</tr>';
 	}
 
@@ -38,6 +38,6 @@ if ($qsos->result() != NULL) {
 
 	<?php
 } else {
-	echo '<div class="alert alert-success"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>No QSOs with outstanding LoTW upload were found.</div>';
+	echo '<div class="alert alert-success"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>No QSOs with outstanding LoTW upload were found.</div>';
 }
 ?>
diff --git a/application/views/search/main.php b/application/views/search/main.php
index 78d36a6c..63e94750 100644
--- a/application/views/search/main.php
+++ b/application/views/search/main.php
@@ -27,7 +27,7 @@
 	  </div>
 	  <div class="card-body">
 	  	<form method="post" action="" id="search_box" name="test">
-		  <div class="form-group row">
+		  <div class="mb-3 row">
 		    <label for="callsign" class="col-sm-2 col-form-label">Callsign / Gridsquare</label>
 		    <div class="col-sm-8">
 		      <input type="text" class="form-control" id="callsign" value="<?php if ($this->input->post('callsign') !== null) { echo htmlspecialchars($this->input->post('callsign')); }; ?>">
diff --git a/application/views/search/result.php b/application/views/search/result.php
index 5e6b3274..4cc2ed8d 100644
--- a/application/views/search/result.php
+++ b/application/views/search/result.php
@@ -27,9 +27,9 @@
 	<td style="padding: 0.3em 0 0.3em 0.5em;" align="left">
 	<?php
 		if ($grid_worked != 0) {
-			echo " <span data-toggle=\"tooltip\" title=\"Worked\" class=\"badge-success\" style=\"padding-left: 0.2em; padding-right: 0.2em;\">".strtoupper($callsign['gridsquare'])."</span>";
+			echo " <span data-bs-toggle=\"tooltip\" title=\"Worked\" class=\"badge-success\" style=\"padding-left: 0.2em; padding-right: 0.2em;\">".strtoupper($callsign['gridsquare'])."</span>";
 		} else {
-			echo " <span data-toggle=\"tooltip\" title=\"Not Worked\" class=\"badge-danger\" style=\"padding-left: 0.2em; padding-right: 0.2em;\">".strtoupper($callsign['gridsquare'])."</span>";
+			echo " <span data-bs-toggle=\"tooltip\" title=\"Not Worked\" class=\"badge-danger\" style=\"padding-left: 0.2em; padding-right: 0.2em;\">".strtoupper($callsign['gridsquare'])."</span>";
 		}
 	?>
 	</td>
diff --git a/application/views/search/search_result_ajax.php b/application/views/search/search_result_ajax.php
index f1ac93b2..083312e3 100644
--- a/application/views/search/search_result_ajax.php
+++ b/application/views/search/search_result_ajax.php
@@ -130,8 +130,8 @@ $ci =& get_instance();
 
 			switch($this->session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')) {
 				case 'Mode':    echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break;
-				case 'RSTS':    echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_STX_STRING . '</span>';} echo '</td>'; break;
-				case 'RSTR': echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';} echo '</td>'; break;
+				case 'RSTS':    echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_STX_STRING . '</span>';} echo '</td>'; break;
+				case 'RSTR': echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';} echo '</td>'; break;
 				case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
 				case 'IOTA':    echo '<td>' . ($row->COL_IOTA); break;
 				case 'SOTA':    echo '<td>' . ($row->COL_SOTA_REF); break;
@@ -142,13 +142,13 @@ $ci =& get_instance();
 				case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
 				case 'State':   echo '<td>' . ($row->COL_STATE); break;
 				case 'Operator':   echo '<td>' . ($row->COL_OPERATOR); break;
-            case 'Frequency':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'; if ($row->COL_FREQ != null) { echo ' <span data-toggle="tooltip" data-original-title="'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'">'.$row->COL_SAT_NAME.'</span>'; } else { echo $row->COL_SAT_NAME; } echo '</a></td>'; } else { if ($row->COL_FREQ != null) { echo ' <span data-toggle="tooltip" data-original-title="'.$row->COL_BAND.'">'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'</span>'; } else { echo strtolower($row->COL_BAND); } } echo '</td>'; break;
+            case 'Frequency':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'; if ($row->COL_FREQ != null) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'">'.$row->COL_SAT_NAME.'</span>'; } else { echo $row->COL_SAT_NAME; } echo '</a></td>'; } else { if ($row->COL_FREQ != null) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.$row->COL_BAND.'">'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'</span>'; } else { echo strtolower($row->COL_BAND); } } echo '</td>'; break;
 			}
 			echo '</td>';
 			switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) {
 				case 'Mode':    echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break;
-				case 'RSTS':    echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_STX_STRING . '</span>';} echo '</td>'; break;
-				case 'RSTR': echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';} echo '</td>'; break;
+				case 'RSTS':    echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_STX_STRING . '</span>';} echo '</td>'; break;
+				case 'RSTR': echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';} echo '</td>'; break;
 				case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
 				case 'IOTA':    echo '<td>' . ($row->COL_IOTA); break;
 				case 'SOTA':    echo '<td>' . ($row->COL_SOTA_REF); break;
@@ -159,14 +159,14 @@ $ci =& get_instance();
 				case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
 				case 'State':   echo '<td>' . ($row->COL_STATE); break;
 				case 'Operator':   echo '<td>' . ($row->COL_OPERATOR); break;
-            case 'Frequency':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'; if ($row->COL_FREQ != null) { echo ' <span data-toggle="tooltip" data-original-title="'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'">'.$row->COL_SAT_NAME.'</span>'; } else { echo $row->COL_SAT_NAME; } echo '</a></td>'; } else { if ($row->COL_FREQ != null) { echo ' <span data-toggle="tooltip" data-original-title="'.$row->COL_BAND.'">'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'</span>'; } else { echo strtolower($row->COL_BAND); } } echo '</td>'; break;
+            case 'Frequency':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'; if ($row->COL_FREQ != null) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'">'.$row->COL_SAT_NAME.'</span>'; } else { echo $row->COL_SAT_NAME; } echo '</a></td>'; } else { if ($row->COL_FREQ != null) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.$row->COL_BAND.'">'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'</span>'; } else { echo strtolower($row->COL_BAND); } } echo '</td>'; break;
 			}
 			echo '</td>';
 
 			switch($this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3')) {
 				case 'Mode':    echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break;
-				case 'RSTS':    echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_STX_STRING . '</span>';} echo '</td>'; break;
-				case 'RSTR': echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';} echo '</td>'; break;
+				case 'RSTS':    echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_STX_STRING . '</span>';} echo '</td>'; break;
+				case 'RSTR': echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';} echo '</td>'; break;
 				case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
 				case 'IOTA':    echo '<td>' . ($row->COL_IOTA); break;
 				case 'SOTA':    echo '<td>' . ($row->COL_SOTA_REF); break;
@@ -177,13 +177,13 @@ $ci =& get_instance();
 				case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
 				case 'State':   echo '<td>' . ($row->COL_STATE); break;
 				case 'Operator':   echo '<td>' . ($row->COL_OPERATOR); break;
-            case 'Frequency':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'; if ($row->COL_FREQ != null) { echo ' <span data-toggle="tooltip" data-original-title="'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'">'.$row->COL_SAT_NAME.'</span>'; } else { echo $row->COL_SAT_NAME; } echo '</a></td>'; } else { if ($row->COL_FREQ != null) { echo ' <span data-toggle="tooltip" data-original-title="'.$row->COL_BAND.'">'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'</span>'; } else { echo strtolower($row->COL_BAND); } } echo '</td>'; break;
+            case 'Frequency':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'; if ($row->COL_FREQ != null) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'">'.$row->COL_SAT_NAME.'</span>'; } else { echo $row->COL_SAT_NAME; } echo '</a></td>'; } else { if ($row->COL_FREQ != null) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.$row->COL_BAND.'">'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'</span>'; } else { echo strtolower($row->COL_BAND); } } echo '</td>'; break;
 			}
 			echo '</td>';
 			switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) {
 				case 'Mode':    echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break;
-				case 'RSTS':    echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_STX_STRING . '</span>';} echo '</td>'; break;
-				case 'RSTR': echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';} echo '</td>'; break;
+				case 'RSTS':    echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_STX_STRING . '</span>';} echo '</td>'; break;
+				case 'RSTR': echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';} echo '</td>'; break;
 				case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
 				case 'IOTA':    echo '<td>' . ($row->COL_IOTA); break;
 				case 'SOTA':    echo '<td>' . ($row->COL_SOTA_REF); break;
@@ -194,13 +194,13 @@ $ci =& get_instance();
 				case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
 				case 'State':   echo '<td>' . ($row->COL_STATE); break;
 				case 'Operator':   echo '<td>' . ($row->COL_OPERATOR); break;
-            case 'Frequency':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'; if ($row->COL_FREQ != null) { echo ' <span data-toggle="tooltip" data-original-title="'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'">'.$row->COL_SAT_NAME.'</span>'; } else { echo $row->COL_SAT_NAME; } echo '</a></td>'; } else { if ($row->COL_FREQ != null) { echo ' <span data-toggle="tooltip" data-original-title="'.$row->COL_BAND.'">'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'</span>'; } else { echo strtolower($row->COL_BAND); } } echo '</td>'; break;
+            case 'Frequency':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'; if ($row->COL_FREQ != null) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'">'.$row->COL_SAT_NAME.'</span>'; } else { echo $row->COL_SAT_NAME; } echo '</a></td>'; } else { if ($row->COL_FREQ != null) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.$row->COL_BAND.'">'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'</span>'; } else { echo strtolower($row->COL_BAND); } } echo '</td>'; break;
 			}
 			echo '</td>';
 			switch($this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5')) {
 				case 'Mode':    echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break;
-				case 'RSTS':    echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_STX_STRING . '</span>';} echo '</td>'; break;
-				case 'RSTR': echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';} echo '</td>'; break;
+				case 'RSTS':    echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_STX_STRING . '</span>';} echo '</td>'; break;
+				case 'RSTR': echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';} echo '</td>'; break;
 				case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
 				case 'IOTA':    echo '<td>' . ($row->COL_IOTA); break;
 				case 'SOTA':    echo '<td>' . ($row->COL_SOTA_REF); break;
@@ -211,7 +211,7 @@ $ci =& get_instance();
 				case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
 				case 'State':   echo '<td>' . ($row->COL_STATE); break;
 				case 'Operator':   echo '<td>' . ($row->COL_OPERATOR); break;
-            case 'Frequency':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'; if ($row->COL_FREQ != null) { echo ' <span data-toggle="tooltip" data-original-title="'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'">'.$row->COL_SAT_NAME.'</span>'; } else { echo $row->COL_SAT_NAME; } echo '</a></td>'; } else { if ($row->COL_FREQ != null) { echo ' <span data-toggle="tooltip" data-original-title="'.$row->COL_BAND.'">'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'</span>'; } else { echo strtolower($row->COL_BAND); } } echo '</td>'; break;
+            case 'Frequency':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'; if ($row->COL_FREQ != null) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'">'.$row->COL_SAT_NAME.'</span>'; } else { echo $row->COL_SAT_NAME; } echo '</a></td>'; } else { if ($row->COL_FREQ != null) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.$row->COL_BAND.'">'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'</span>'; } else { echo strtolower($row->COL_BAND); } } echo '</td>'; break;
 			}
 			echo '</td>';
 				if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
@@ -227,16 +227,16 @@ $ci =& get_instance();
                      }
                      switch ($row->COL_QSL_SENT) {
                      case "Y":
-                        echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_sent').$timestamp;
+                        echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_sent').$timestamp;
                         break;
                      case "Q":
-                        echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued').$timestamp;
+                        echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued').$timestamp;
                         break;
                      case "R":
-                        echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested').$timestamp;
+                        echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested').$timestamp;
                         break;
                      case "I":
-                        echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_invalid_ignore').$timestamp;
+                        echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_invalid_ignore').$timestamp;
                         break;
                      default:
                         echo "class=\"qsl-red";
@@ -269,16 +269,16 @@ $ci =& get_instance();
                      }
                      switch ($row->COL_QSL_RCVD) {
                      case "Y":
-                        echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_received').$timestamp;
+                        echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_received').$timestamp;
                         break;
                      case "Q":
-                        echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued').$timestamp;
+                        echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued').$timestamp;
                         break;
                      case "R":
-                        echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested').$timestamp;
+                        echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested').$timestamp;
                         break;
                      case "I":
-                        echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_invalid_ignore').$timestamp;
+                        echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_invalid_ignore').$timestamp;
                         break;
                      default:
                         echo "class=\"qsl-red";
@@ -312,7 +312,7 @@ $ci =& get_instance();
                         $timestamp = strtotime($row->COL_EQSL_QSLSDATE);
                         echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
                      }
-                     echo "\" data-toggle=\"tooltip\"";
+                     echo "\" data-bs-toggle=\"tooltip\"";
                   }
                   echo ' class="eqsl-';
                   echo ($row->COL_EQSL_QSL_SENT=='Y')?'green':'red';
@@ -325,7 +325,7 @@ $ci =& get_instance();
                         $timestamp = strtotime($row->COL_EQSL_QSLRDATE);
                         echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
                      }
-                     echo "\" data-toggle=\"tooltip\"";
+                     echo "\" data-bs-toggle=\"tooltip\"";
                   }
                   echo ' class="eqsl-';
                   echo ($row->COL_EQSL_QSL_RCVD=='Y')?'green':'red';
@@ -350,7 +350,7 @@ $ci =& get_instance();
                      $timestamp = strtotime($row->COL_LOTW_QSLSDATE);
                      echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
                    }
-                   echo "\" data-toggle=\"tooltip\"";
+                   echo "\" data-bs-toggle=\"tooltip\"";
                 }
                 echo ' class="lotw-';
                 echo ($row->COL_LOTW_QSL_SENT=='Y')?'green':'red';
@@ -363,7 +363,7 @@ $ci =& get_instance();
                       $timestamp = strtotime($row->COL_LOTW_QSLRDATE);
                       echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
                    }
-                   echo "\" data-toggle=\"tooltip\"";
+                   echo "\" data-bs-toggle=\"tooltip\"";
                 }
                 echo ' class="lotw-';
                 echo ($row->COL_LOTW_QSL_RCVD=='Y')?'green':'red';
@@ -375,14 +375,14 @@ $ci =& get_instance();
 
                     <?php if(isset($row->station_callsign)) { ?>
                         <td>
-                            <span class="badge badge-light"><?php echo $row->station_callsign; ?></span>
+                            <span class="badge text-bg-light"><?php echo $row->station_callsign; ?></span>
                         </td>
                     <?php } ?>
 
             <?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
                 <td>
                     <div class="dropdown">
-                        <a class="btn btn-sm btn-secondary dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        <a class="btn btn-sm btn-secondary dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                             <i class="fas fa-cog"></i>
                         </a>
 
diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php
index a86ec04f..35cf9520 100644
--- a/application/views/simplefle/index.php
+++ b/application/views/simplefle/index.php
@@ -34,7 +34,7 @@
 			var lang_qso_simplefle_sample_data = "<?php echo lang('qso_simplefle_sample_data'); ?>";
 		</script>
 		<h2><?php echo $page_title; ?></h2>
-		<button type="button" class="btn btn-sm btn-primary mr-1" id="simpleFleInfoButton"><?php echo lang('qso_simplefle_info'); ?></button>
+		<button type="button" class="btn btn-sm btn-primary me-1" id="simpleFleInfoButton"><?php echo lang('qso_simplefle_info'); ?></button>
 	</div>
 
 	<?php if ($this->session->flashdata('message')) { ?>
@@ -66,7 +66,7 @@
 			<div class="card-body">
 				<div class="row">
 					<div class="col-xs-12 col-lg-12 col-xl-6">
-						<div class="form-group">
+						<div class="mb-3">
 							<label for="qsodate"><?php echo lang('qso_simplefle_qso_date'); ?></label>
 							<input type="date" class="form-control" id="qsodate">
 							<small class="form-text text-muted"><?php echo lang('qso_simplefle_qso_date_hint'); ?></small>
@@ -74,16 +74,16 @@
 					</div>
 					<div class="col-xs-12 col-lg-12 col-xl-6">
 						<p><?php echo lang('qso_simplefle_utc_time'); ?></p>
-						<h4 class="font-weight-bold" id="utc-time"></h4>
+						<h4 class="fw-bold" id="utc-time"></h4>
 					</div>
 				</div>
 				<div class="row">
 					<div class="col-xs-12 col-lg-6">
-						<div class="form-group">
+						<div class="mb-3">
 							<label for="station-call">
 								<?php echo lang('qso_simplefle_station_call_location'); ?>
 							</label>
-							<select name="station_profile" class="station_id custom-select" id="station-call">
+							<select name="station_profile" class="station_id form-select" id="station-call">
 								<option value="-">-</option>
 								<?php foreach ($station_profile->result() as $station) { ?>
 									<option value="<?php echo $station->station_id; ?>" <?php if ($station->station_id == $this->stations->find_active()) {
@@ -98,7 +98,7 @@
 						</div>
 					</div>
 					<div class="col-xs-12 col-lg-6">
-						<div class="form-group">
+						<div class="mb-3">
 							<label for="operator"><?php echo lang('qso_simplefle_operator'); ?> <span class="text-muted input-example"><?php echo lang('qso_simplefle_operator_hint'); ?></span></label>
 							<input type="text" class="form-control text-uppercase" id="operator" value="<?php echo $this->session->userdata('operator_callsign'); ?>">
 							<div class="alert alert-danger" role="alert" id="warningOperatorField" style="display: none"> </div>
@@ -147,7 +147,7 @@
 					<div class="col-6 col-sm-6">
 						<span class="js-qso-count"></span>
 					</div>
-					<div class="col-6 col-sm-6 text-right">
+					<div class="col-6 col-sm-6 text-end">
 						<?php echo lang('qso_simplefle_refs_hint'); ?>
 					</div>
 				</div>
diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php
index 01321249..d08a5ede 100644
--- a/application/views/station_profile/create.php
+++ b/application/views/station_profile/create.php
@@ -28,27 +28,27 @@
 		<?php echo validation_errors(); ?>
 
 		<form method="post" action="<?php echo site_url('station/create'); ?>" name="create_profile">
-		  <div class="form-group">
+		  <div class="mb-3">
 		    <label for="stationNameInput"><?php echo lang("station_location_name"); ?></label>
 		    <input type="text" class="form-control" name="station_profile_name" id="stationNameInput" aria-describedby="stationNameInputHelp" placeholder="Home QTH" required>
 		    <small id="stationNameInputHelp" class="form-text text-muted"><?php echo lang("station_location_name_hint"); ?></small>
 		  </div>
 
-			<div class="form-group">
+			<div class="mb-3">
 		    <label for="stationCallsignInput"><?php echo lang("station_location_callsign"); ?></label>
 		    <input type="text" class="form-control" name="station_callsign" id="stationCallsignInput" aria-describedby="stationCallsignInputHelp" placeholder="2M0SQL" required>
 		    <small id="stationCallsignInputHelp" class="form-text text-muted"><?php echo lang("station_location_callsign_hint"); ?></small>
 		  </div>
 
-			<div class="form-group">
+			<div class="mb-3">
 		    <label for="stationPowerInput"><?php echo lang("station_location_power"); ?></label>
 		    <input type="number" class="form-control" name="station_power" id="stationPowerInput" step="1" aria-describedby="stationPowerInputHelp" placeholder="10">
 		    <small id="stationPowerInputHelp" class="form-text text-muted"><?php echo lang("station_location_power_hint"); ?></small>
 		  </div>
-		  <div class="form-group">
+		  <div class="mb-3">
 		    <label for="stationDXCCInput"><?php echo lang("station_location_dxcc"); ?></label>
 				<?php if ($dxcc_list->num_rows() > 0) { ?>
-				<select class="form-control" id="dxcc_select" name="dxcc" aria-describedby="stationCallsignInputHelp">
+				<select class="form-select" id="dxcc_select" name="dxcc" aria-describedby="stationCallsignInputHelp">
 				<option value="0" selected><?php echo "- " . lang('general_word_none') . " -"; ?></option>
 				<?php foreach ($dxcc_list->result() as $dxcc) { ?>
 				<option value="<?php echo $dxcc->adif; ?>"><?php echo ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix; if ($dxcc->end != NULL) echo ' ('.lang('gen_hamradio_deleted_dxcc').')';?>
@@ -60,16 +60,16 @@
 			<div class="alert alert-danger" role="alert" id="warningMessageDXCC" style="display: none"> </div>
 		  </div>
 
-		  <div class="form-group">
+		  <div class="mb-3">
 		    <label for="stationCityInput"><?php echo lang("station_location_city"); ?></label>
 		    <input type="text" class="form-control" name="city" id="stationCityInput" aria-describedby="stationCityInputHelp">
 		    <small id="stationCityInputHelp" class="form-text text-muted"><?php echo lang("station_location_city_hint"); ?></small>
 		  </div>
 
-        <div class="form-row">
-            <div class="form-group col-sm-6" id="us_state">
+        <div class="row">
+            <div class="mb-3 col-sm-6" id="us_state">
 		    <label for="stateInput"><?php echo lang("station_location_state"); ?></label>
-		    <select class="form-control custom-select" name="station_state" id="StateHelp" aria-describedby="stationCntyInputHelp">
+		    <select class="form-select form-select" name="station_state" id="StateHelp" aria-describedby="stationCntyInputHelp">
 		    	<option value="" selected></option>
 				<option value="AK">Alaska</option>
 				<option value="AL">Alabama</option>
@@ -125,9 +125,9 @@
 		    <small id="StateHelp" class="form-text text-muted"><?php echo lang("station_location_state_hint"); ?></small>
 		  </div>
 
-		  <div class="form-group col-sm-6" id="canada_state">
+		  <div class="mb-3 col-sm-6" id="canada_state">
 		    <label for="stateInput"><?php echo lang("station_location_state"); ?></label>
-		    <select class="form-control custom-select" name="station_ca_state" id="StateHelp" aria-describedby="stationCntyInputHelp">
+		    <select class="form-select form-select" name="station_ca_state" id="StateHelp" aria-describedby="stationCntyInputHelp">
 		    	<option value="" selected></option>
 				<option value="AB">Alberta</option>
 				<option value="BC">British Columbia</option>
@@ -146,17 +146,17 @@
 		    <small id="StateHelp" class="form-text text-muted"><?php echo lang("station_location_state_hint"); ?></small>
 		  </div>
 
-		  <div class="form-group col-sm-6">
+		  <div class="mb-3 col-sm-6">
 		    <label for="stationCntyInput"><?php echo lang("station_location_county"); ?></label>
 		    <input disabled="disabled" type="text" class="form-control" name="station_cnty" id="stationCntyInput" aria-describedby="stationCntyInputHelp">
 		    <small id="stationCntyInputHelp" class="form-text text-muted"><?php echo lang("station_location_county_hint"); ?></small>
 		  </div>
         </div>
 
-            <div class="form-row">
-                <div class="form-group col-sm-6">
+            <div class="row">
+                <div class="mb-3 col-sm-6">
                     <label for="stationCQZoneInput"><?php echo lang("gen_hamradio_cq_zone"); ?></label>
-                    <select class="custom-select" id="stationCQZoneInput" name="station_cq" required>
+                    <select class="form-select" id="stationCQZoneInput" name="station_cq" required>
                         <?php
                         for ($i = 1; $i<=40; $i++) {
                             echo '<option value='. $i;
@@ -168,9 +168,9 @@
                     <small id="stationCQInputHelp" class="form-text text-muted"><?php echo lang("gen_find_zone_cq_part1")." <a href='https://zone-check.eu/?m=cq' target='_blank'>".lang("gen_find_zone_part2")."</a> ".lang("gen_find_zone_part3"); ?></small>
                 </div>
 
-                <div class="form-group col-sm-6">
+                <div class="mb-3 col-sm-6">
                     <label for="stationITUZoneInput"><?php echo lang("gen_hamradio_itu_zone"); ?></label>
-                    <select class="custom-select" id="stationITUZoneInput" name="station_itu" required>
+                    <select class="form-select" id="stationITUZoneInput" name="station_itu" required>
                         <?php
                         for ($i = 1; $i<=90; $i++) {
                             echo '<option value='. $i;
@@ -183,7 +183,7 @@
                 </div>
             </div>
 
-		  <div class="form-group">
+		  <div class="mb-3">
 		    <label for="stationGridsquareInput"><?php echo lang("station_location_gridsquare"); ?></label>
 
 			<div class="input-group mb-3">
@@ -197,9 +197,9 @@
 		    <small id="stationGridInputHelp" class="form-text text-muted"><?php echo lang("station_location_gridsquare_hint_ln2"); ?></small>
 		  </div>
 
-            <div class="form-group">
+            <div class="mb-3">
                 <label for="stationIOTAInput"><?php echo lang("gen_hamradio_iota_reference"); ?></label>
-                <select class="custom-select" name="iota" id="stationIOTAInput" aria-describedby="stationIOTAInputHelp" placeholder="EU-005">
+                <select class="form-select" name="iota" id="stationIOTAInput" aria-describedby="stationIOTAInputHelp" placeholder="EU-005">
                     <option value =""></option>
 
                     <?php
@@ -213,52 +213,52 @@
                 <small id="stationIOTAInputHelp" class="form-text text-muted"><?php echo lang("station_location_iota_hint_ln2"); ?></small>
             </div>
 
-		  <div class="form-group">
+		  <div class="mb-3">
 		    <label for="stationSOTAInput"><?php echo lang("gen_hamradio_sota_reference"); ?></label>
 		    <input type="text" class="form-control" name="sota" id="stationSOTAInput" aria-describedby="stationSOTAInputHelp">
 		    <small id="stationSOTAInputHelp" class="form-text text-muted"><?php echo lang("station_location_sota_hint_ln1"); ?></small>
 		  </div>
 
-		  <div class="form-group">
+		  <div class="mb-3">
 		    <label for="stationWWFFInput"><?php echo lang("gen_hamradio_wwff_reference"); ?></label>
 		    <input type="text" class="form-control" name="wwff" id="stationWWFFInput" aria-describedby="stationWWFFInputHelp">
 		    <small id="stationWWFFInputHelp" class="form-text text-muted"><?php echo lang("station_location_wwff_hint_ln1"); ?></small>
 		  </div>
 
-		  <div class="form-group">
+		  <div class="mb-3">
 		    <label for="stationPOTAInput"><?php echo lang("gen_hamradio_pota_reference"); ?></label>
 		    <input type="text" class="form-control" name="pota" id="stationPOTAInput" aria-describedby="stationPOTAInputHelp">
 		    <small id="stationPOTAInputHelp" class="form-text text-muted"><?php echo lang("station_location_pota_hint_ln1"); ?></small>
 		  </div>
 
-		  <div class="form-group">
+		  <div class="mb-3">
 		    <label for="stationSigInput"><?php echo lang("station_location_signature"); ?></label>
 		    <input type="text" class="form-control" name="sig" id="stationSigInput" aria-describedby="stationSigInputHelp">
 		    <small id="stationSigInputHelp" class="form-text text-muted"><?php echo lang("station_location_signature_name_hint"); ?></small>
 		  </div>
 
-		  <div class="form-group">
+		  <div class="mb-3">
 		    <label for="stationSigInfoInput"><?php echo lang("station_location_signature_info"); ?></label>
 		    <input type="text" class="form-control" name="sig_info" id="stationSigInfoInput" aria-describedby="stationSigInfoInputHelp">
 		    <small id="stationSigInfoInput" class="form-text text-muted"><?php echo lang("station_location_signature_info_hint"); ?></small>
 		  </div>
 
-            <div class="form-group">
+            <div class="mb-3">
                 <label for="eqslNickname">eQSL QTH Nickname</label> <!-- This does not need Multilanguage Support -->
                 <input type="text" class="form-control" name="eqslnickname" id="eqslNickname" aria-describedby="eqslhelp">
                 <small id="eqslhelp" class="form-text text-muted"><?php echo lang("station_location_eqsl_hint"); ?></small>
             </div>
 
 
-            <div class="form-row">
-                <div class="form-group col-sm-6">                                                                                                                                                    
+            <div class="row">
+                <div class="mb-3 col-sm-6">                                                                                                                                                    
 					<label for="hrdlog_code">HRDLog.net API Code</label> <!-- This does not need Multilanguage Support -->
                     <input type="text" class="form-control" name="hrdlog_code" id="hrdlog_code" aria-describedby="hrdlog_codeHelp">
                     <small id="hrdlog_codeHelp" class="form-text text-muted"><?php echo lang("station_location_hrdlog_hint"); ?></a></small>
                 </div>
-                <div class="form-group col-sm-6">
+                <div class="mb-3 col-sm-6">
                     <label for="hrdlogrealtime"><?php echo lang("station_location_hrdlog_realtime_upload"); ?></label>                                                                                                                 
-					<select class="custom-select" id="hrdlogrealtime" name="hrdlogrealtime">
+					<select class="form-select" id="hrdlogrealtime" name="hrdlogrealtime">
                         <option value="1"><?php echo lang("general_word_yes"); ?></option>
                         <option value="0" selected><?php echo lang("general_word_no"); ?></option>
                     </select>
@@ -269,52 +269,52 @@
 				<?php echo "QRZ.com - " . lang("station_location_qrz_subscription"); ?>
 			</div>
 
-            <div class="form-row">
-                <div class="form-group col-sm-6">
+            <div class="row">
+                <div class="mb-3 col-sm-6">
                     <label for="qrzApiKey">QRZ.com Logbook API Key</label>  <!-- This does not need Multilanguage Support -->
                     <input type="text" class="form-control" name="qrzapikey" pattern="^([A-F0-9]{4}-){3}[A-F0-9]{4}$" id="qrzApiKey" aria-describedby="qrzApiKeyHelp">
                     <small id="qrzApiKeyHelp" class="form-text text-muted"><?php echo lang("station_location_qrz_hint"); ?></a></small>
                 </div>
-                <div class="form-group col-sm-6">
+                <div class="mb-3 col-sm-6">
                     <label for="qrzrealtime"><?php echo lang("station_location_qrz_realtime_upload"); ?></label>
-                    <select class="custom-select" id="qrzrealtime" name="qrzrealtime">
+                    <select class="form-select" id="qrzrealtime" name="qrzrealtime">
                         <option value="1"><?php echo lang("general_word_yes"); ?></option>
                         <option value="0" selected><?php echo lang("general_word_no"); ?></option>
                     </select>
                 </div>
             </div>
 
-			<div class="form-row">
-				<div class="form-group col-sm-6">
+			<div class="row">
+				<div class="mb-3 col-sm-6">
 					<label for="webadifApiKey"> QO-100 Dx Club API Key </label> <!-- This does not need Multilanguage Support -->
 					<input type="text" class="form-control" name="webadifapikey" id="webadifApiKey" aria-describedby="webadifApiKeyHelp">
 					<small id="webadifApiKeyHelp" class="form-text text-muted"><?php echo lang("station_location_qo100_hint"); ?></a></small>
 				</div>
-				<div class="form-group col-sm-6">
+				<div class="mb-3 col-sm-6">
 					<label for="webadifrealtime"><?php echo lang("station_location_qo100_realtime_upload"); ?></label>
-					<select class="custom-select" id="webadifrealtime" name="webadifrealtime">
+					<select class="form-select" id="webadifrealtime" name="webadifrealtime">
 						<option value="1"><?php echo lang("general_word_yes"); ?></option>
 						<option value="0" selected><?php echo lang("general_word_no"); ?></option>
 					</select>
 				</div>
 			</div>
 
-			<div class="form-group">
+			<div class="mb-3">
 				<label for="oqrs"><?php echo lang("station_location_oqrs_enabled"); ?></label>
-				<select class="custom-select" id="oqrs" name="oqrs">
+				<select class="form-select" id="oqrs" name="oqrs">
 					<option value="0"><?php echo lang("general_word_no"); ?></option>
 					<option value="1"><?php echo lang("general_word_yes"); ?></option>
 				</select>
 			</div>
-			<div class="form-group">
+			<div class="mb-3">
 						<label for="oqrs"><?php echo lang("station_location_oqrs_email_alert"); ?></label>
-						<select class="custom-select" id="oqrsemail" name="oqrsemail">
+						<select class="form-select" id="oqrsemail" name="oqrsemail">
 						<option value="0"><?php echo lang("general_word_no"); ?></option>
 						<option value="1"><?php echo lang("general_word_yes"); ?></option>
 						</select>
 						<small id="oqrsemailHelp" class="form-text text-muted"><?php echo lang("station_location_oqrs_email_hint"); ?></small>
 					</div>
-			<div class="form-group">
+			<div class="mb-3">
 				<label for="oqrstext"><?php echo lang("station_location_oqrs_text"); ?></label>
 				<input type="text" class="form-control" name="oqrstext" id="oqrstext" aria-describedby="oqrstextHelp">
 				<small id="oqrstextHelp" class="form-text text-muted"><?php echo lang("station_location_oqrs_text_hint"); ?></small>
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php
index cbd441bc..0b1aa361 100644
--- a/application/views/station_profile/edit.php
+++ b/application/views/station_profile/edit.php
@@ -36,19 +36,19 @@
 				<div class="card-header"><?php echo $page_title; ?> <?php echo "(" . lang("gen_hamradio_callsign") . ": "; ?> <?php echo $my_station_profile->station_callsign; ?>)</div>
 				<div class="card-body">
 
-					<div class="form-group">
+					<div class="mb-3">
 						<label for="stationNameInput"><?php echo lang("station_location_name"); ?></label>
 						<input type="text" class="form-control" name="station_profile_name" id="stationNameInput" aria-describedby="stationNameInputHelp" value="<?php if(set_value('station_profile_name') != "") { echo set_value('station_profile_name'); } else { echo $my_station_profile->station_profile_name; } ?>" required>
 						<small id="stationNameInputHelp" class="form-text text-muted"><?php echo lang("station_location_name_hint"); ?></small>
 					</div>
 
-					<div class="form-group">
+					<div class="mb-3">
 						<label for="stationCallsignInput"><?php echo lang("station_location_callsign"); ?></label>
 						<input type="text" class="form-control" name="station_callsign" id="stationCallsignInput" aria-describedby="stationCallsignInputHelp" value="<?php if(set_value('station_callsign') != "") { echo set_value('station_callsign'); } else { echo $my_station_profile->station_callsign; } ?>" required>
 						<small id="stationCallsignInputHelp" class="form-text text-muted"><?php echo lang("station_location_callsign_hint"); ?></small>
 					</div>
 
-					<div class="form-group">
+					<div class="mb-3">
 						<label for="stationPowerInput"><?php echo lang("station_location_power"); ?></label>
 						<input type="number" class="form-control" name="station_power" step="1" id="stationPowerInput" aria-describedby="stationPowerInputHelp" value="<?php if(set_value('station_power') != "") { echo set_value('station_power'); } else { echo $my_station_profile->station_power; } ?>">
 						<small id="stationPowerInputHelp" class="form-text text-muted"><?php echo lang("station_location_power_hint"); ?></small>
@@ -65,10 +65,10 @@
 				<div class="card-header"><?php echo lang("general_word_location"); ?></div>
 				<div class="card-body">
 					<!-- DXCC -->
-					<div class="form-group">
+					<div class="mb-3">
 					    <label for="stationDXCCInput"><?php echo lang("station_location_dxcc"); ?></label>
 					    <?php if ($dxcc_list->num_rows() > 0) { ?>
-					        <select class="form-control" id="dxcc_select" name="dxcc" aria-describedby="stationCallsignInputHelp">
+					        <select class="form-select" id="dxcc_select" name="dxcc" aria-describedby="stationCallsignInputHelp">
 					            <option value="0" <?php if($my_station_profile->station_dxcc == "0") { ?>selected<?php } ?>><?php echo "- " . lang('general_word_none') . " -"; ?></option>
 					            <?php foreach ($dxcc_list->result() as $dxcc) { ?>
 					                <?php $isDeleted = $dxcc->end !== NULL; ?>
@@ -87,16 +87,16 @@
 					</div>
 
 					<!-- City -->
-					<div class="form-group">
+					<div class="mb-3">
 						<label for="stationCityInput"><?php echo lang("station_location_city"); ?></label>
 						<input type="text" class="form-control" name="city" id="stationCityInput" aria-describedby="stationCityInputHelp" value="<?php if(set_value('city') != "") { echo set_value('city'); } else { echo $my_station_profile->station_city; } ?>">
 		    			<small id="stationCityInputHelp" class="form-text text-muted"><?php echo lang("station_location_city_hint"); ?></small>
 		  			</div>
 
 					<!-- US State -->
-					<div class="form-group" id="us_state">
+					<div class="mb-3" id="us_state">
 		    			<label for="stateInput"><?php echo lang("station_location_state"); ?></label>
-		    				<select class="form-control custom-select" name="station_state" id="StateHelp" aria-describedby="stationCntyInputHelp">
+		    				<select class="form-select form-select" name="station_state" id="StateHelp" aria-describedby="stationCntyInputHelp">
 								<option value=""></option>
 								<option value="AK" <?php if($my_station_profile->state == "AK") { echo "selected"; } ?>>Alaska</option>
 								<option value="AL" <?php if($my_station_profile->state == "AL") { echo "selected"; } ?>>Alabama</option>
@@ -154,9 +154,9 @@
 		 				</div>
 
 					<!-- Canada State -->
-					<div class="form-group" id="canada_state">
+					<div class="mb-3" id="canada_state">
 		    			<label for="stateInput"><?php echo lang("station_location_state"); ?></label>
-		    				<select class="form-control custom-select" name="station_ca_state" id="StateHelp" aria-describedby="stationCntyInputHelp">
+		    				<select class="form-select form-select" name="station_ca_state" id="StateHelp" aria-describedby="stationCntyInputHelp">
 								<option value=""></option>
 								<option value="AB" <?php if($my_station_profile->state == "AB") { echo "selected"; } ?>>Alberta</option>
 								<option value="BC" <?php if($my_station_profile->state == "BC") { echo "selected"; } ?>>British Columbia</option>
@@ -176,7 +176,7 @@
 						</div>
 
 						<!-- US County -->
-						<div class="form-group">
+						<div class="mb-3">
 							<label for="stationCntyInput"><?php echo lang("station_location_county"); ?></label>
 							<input disabled="disabled" type="text" class="form-control" name="station_cnty" id="stationCntyInput" aria-describedby="stationCntyInputHelp" value="<?php if(set_value('station_cnty') != "") { echo set_value('station_cnty'); } else { echo $my_station_profile->station_cnty; } ?>">
 							<small id="stationCntyInputHelp" class="form-text text-muted"><?php echo lang("station_location_county_hint"); ?></small>
@@ -192,9 +192,9 @@
 				<div class="card-header"><?php echo lang("gen_hamradio_zones"); ?></div>
 				<div class="card-body">
 					<!-- CQ Zone -->
-					<div class="form-group">
+					<div class="mb-3">
 						<label for="stationCQZoneInput"><?php echo lang("gen_hamradio_cq_zone"); ?></label>
-						<select class="custom-select" id="stationCQZoneInput" name="station_cq" required>
+						<select class="form-select" id="stationCQZoneInput" name="station_cq" required>
 							<?php
 							for ($i = 1; $i<=40; $i++) {
 								echo '<option value='. $i;
@@ -209,9 +209,9 @@
 					</div>
 
 					<!-- ITU Zone -->
-					<div class="form-group">
+					<div class="mb-3">
                     	<label for="stationITUZoneInput"><?php echo lang("gen_hamradio_itu_zone"); ?></label>
-                    	<select class="custom-select" id="stationITUZoneInput" name="station_itu" required>
+                    	<select class="form-select" id="stationITUZoneInput" name="station_itu" required>
 							<?php
 							for ($i = 1; $i<=90; $i++) {
 								echo '<option value='. $i;
@@ -236,7 +236,7 @@
 			<div class="card">
 				<h5 class="card-header"><?php echo lang("station_location_gridsquare"); ?></h5>
 				<div class="card-body">
-					<div class="form-group">
+					<div class="mb-3">
 		    			<label for="stationGridsquareInput"><?php echo lang("station_location_gridsquare"); ?></label>
 
 						<div class="input-group mb-3">
@@ -257,9 +257,9 @@
 			<div class="card">
 				<h5 class="card-header"><?php echo lang("gen_hamradio_iota"); ?></h5>
 				<div class="card-body">
-					<div class="form-group">
+					<div class="mb-3">
                 		<label for="stationIOTAInput"><?php echo lang("gen_hamradio_iota_reference"); ?></label>
-                		<select class="custom-select" name="iota" id="stationIOTAInput" aria-describedby="stationIOTAInputHelp" placeholder="EU-005">
+                		<select class="form-select" name="iota" id="stationIOTAInput" aria-describedby="stationIOTAInputHelp" placeholder="EU-005">
                     		<option value =""></option>
                     		<?php
                     			foreach($iota_list as $i){
@@ -285,7 +285,7 @@
 			<div class="card">
 				<h5 class="card-header"><?php echo lang("gen_hamradio_sota"); ?></h5>
 				<div class="card-body">
-					<div class="form-group">
+					<div class="mb-3">
 		    			<label for="stationSOTAInput"><?php echo lang("gen_hamradio_sota_reference"); ?></label>
 		    			<input type="text" class="form-control" name="sota" id="stationSOTAInput" aria-describedby="stationSOTAInputHelp" value="<?php if(set_value('sota') != "") { echo set_value('sota'); } else { echo $my_station_profile->station_sota; } ?>">
 		    			<small id="stationSOTAInputHelp" class="form-text text-muted"><?php echo lang("station_location_sota_hint_ln1"); ?></small>
@@ -298,7 +298,7 @@
 			<div class="card">
 				<h5 class="card-header"><?php echo lang("gen_hamradio_wwff"); ?></h5>
 				<div class="card-body">
-					<div class="form-group">
+					<div class="mb-3">
 						<label for="stationWWFFInput"><?php echo lang("gen_hamradio_wwff_reference"); ?></label>
 						<input type="text" class="form-control" name="wwff" id="stationWWFFInput" aria-describedby="stationWWFFInputHelp" value="<?php if(set_value('wwff') != "") { echo set_value('wwff'); } else { echo $my_station_profile->station_wwff; } ?>">
 						<small id="stationWWFFInputHelp" class="form-text text-muted"><?php echo lang("station_location_wwff_hint_ln1"); ?></small>
@@ -311,7 +311,7 @@
 			<div class="card">
 				<h5 class="card-header"><?php echo lang("gen_hamradio_pota"); ?></h5>
 				<div class="card-body">
-					<div class="form-group">
+					<div class="mb-3">
 						<label for="stationPOTAInput"><?php echo lang("gen_hamradio_pota_reference"); ?></label>
 						<input type="text" class="form-control" name="pota" id="stationPOTAInput" aria-describedby="stationPOTAInputHelp" value="<?php if(set_value('pota') != "") { echo set_value('pota'); } else { echo $my_station_profile->station_pota; } ?>">
 						<small id="stationPOTAInputHelp" class="form-text text-muted"><?php echo lang("station_location_pota_hint_ln1"); ?></small>
@@ -326,13 +326,13 @@
 			<div class="card">
 				<h5 class="card-header"><?php echo lang("station_location_signature"); ?></h5>
 				<div class="card-body">
-					<div class="form-group">
+					<div class="mb-3">
 		    			<label for="stationSigInput"><?php echo lang("station_location_signature_name"); ?></label>
 		    			<input type="text" class="form-control" name="sig" id="stationSigInput" aria-describedby="stationSigInputHelp" value="<?php if(set_value('sig') != "") { echo set_value('sig'); } else { echo $my_station_profile->station_sig; } ?>">
 		    			<small id="stationSigInputHelp" class="form-text text-muted"><?php echo lang("station_location_signature_name_hint"); ?></small>
 					</div>
 
-					<div class="form-group">
+					<div class="mb-3">
 		    			<label for="stationSigInfoInput"><?php echo lang("station_location_signature_info"); ?></label>
 		    			<input type="text" class="form-control" name="sig_info" id="stationSigInfoInput" aria-describedby="stationSigInfoInputHelp" value="<?php if(set_value('sig_info') != "") { echo set_value('sig_info'); } else { echo $my_station_profile->station_sig_info; } ?>">
 		    			<small id="stationSigInfoInputHelp" class="form-text text-muted"><?php echo lang("station_location_signature_info_hint"); ?></small>
@@ -347,7 +347,7 @@
 			<div class="card">
 				<h5 class="card-header"><?php echo lang("eqsl_short"); ?></h5>
 				<div class="card-body">
-					<div class="form-group">
+					<div class="mb-3">
 		    			<label for="eqslNickname">eQSL QTH Nickname</label> <!-- This does not need Multilanguage Support -->
 		    			<input type="text" class="form-control" name="eqslnickname" id="eqslNickname" aria-describedby="eqslhelp" value="<?php if(set_value('eqslnickname') != "") { echo set_value('eqslnickname'); } else { echo $my_station_profile->eqslqthnickname; } ?>">
 		    			<small id="eqslhelp" class="form-text text-muted"><?php echo lang("station_location_eqsl_hint"); ?></small>
@@ -358,17 +358,17 @@
 
 		<div class="col-md">
 			<div class="card">
-				<h5 class="card-header">QRZ.com <span class="badge badge-warning"> <?php echo lang("station_location_qrz_subscription"); ?></span></h5> <!-- "QRZ.com" does not need Multilanguage Support -->
+				<h5 class="card-header">QRZ.com <span class="badge text-bg-warning"> <?php echo lang("station_location_qrz_subscription"); ?></span></h5> <!-- "QRZ.com" does not need Multilanguage Support -->
 				<div class="card-body">
-					<div class="form-group">
+					<div class="mb-3">
 						<label for="qrzApiKey">QRZ.com Logbook API Key</label> <!-- This does not need Multilanguage Support -->
 						<input type="text" class="form-control" name="qrzapikey" pattern="^([A-F0-9]{4}-){3}[A-F0-9]{4}$" id="qrzApiKey" aria-describedby="qrzApiKeyHelp" value="<?php if(set_value('qrzapikey') != "") { echo set_value('qrzapikey'); } else { echo $my_station_profile->qrzapikey; } ?>">
 						<small id="qrzApiKeyHelp" class="form-text text-muted"><?php echo lang("station_location_qrz_hint"); ?></a></small>
 					</div>
 
-					<div class="form-group">
+					<div class="mb-3">
 						<label for="qrzrealtime"><?php echo lang("station_location_qrz_realtime_upload"); ?></label>
-						<select class="custom-select" id="qrzrealtime" name="qrzrealtime">
+						<select class="form-select" id="qrzrealtime" name="qrzrealtime">
 							<option value="1" <?php if ($my_station_profile->qrzrealtime == 1) { echo " selected =\"selected\""; } ?>><?php echo lang("general_word_yes"); ?></option>
 							<option value="0" <?php if ($my_station_profile->qrzrealtime == 0) { echo " selected =\"selected\""; } ?>><?php echo lang("general_word_no"); ?></option>
 						</select>
@@ -383,14 +383,14 @@
 			<div class="card">
 				<h5 class="card-header">HRDLog.net</h5> <!-- This does not need Multilanguage Support -->
 				<div class="card-body">
-					<div class="form-group">
+					<div class="mb-3">
 						<label for="webadifApiKey">HRDLog.net API Code</label> <!-- This does not need Multilanguage Support -->
 						<input type="text" class="form-control" name="hrdlog_code" id="hrdlog_code" aria-describedby="hrdlog_codeHelp" value="<?php if(set_value('hrdlog_code') != "") { echo set_value('hrdlog_code'); } else { echo $my_station_profile->hrdlog_code; } ?>">
 						<small id="hrdlog_codeHelp" class="form-text text-muted"><?php echo lang("station_location_hrdlog_hint"); ?></a></small>
 					</div>
-					<div class="form-group">
+					<div class="mb-3">
 						<label for="hrdlogrealtime"><?php echo lang("station_location_hrdlog_realtime_upload"); ?></label>
-						<select class="custom-select" id="hrdlogrealtime" name="hrdlogrealtime">
+						<select class="form-select" id="hrdlogrealtime" name="hrdlogrealtime">
 							<option value="1" <?php if ($my_station_profile->hrdlogrealtime == 1) { echo " selected =\"selected\""; } ?>><?php echo lang("general_word_yes"); ?></option>
 							<option value="0" <?php if ($my_station_profile->hrdlogrealtime == 0) { echo " selected =\"selected\""; } ?>><?php echo lang("general_word_no"); ?></option>
 						</select>
@@ -404,14 +404,14 @@
 			<div class="card">
 				<h5 class="card-header">QO-100 Dx Club</h5> <!-- This does not need Multilanguage Support -->
 				<div class="card-body">
-					<div class="form-group">
+					<div class="mb-3">
 						<label for="webadifApiKey">QO-100 Dx Club API Key</label> <!-- This does not need Multilanguage Support -->
 						<input type="text" class="form-control" name="webadifapikey" id="webadifApiKey" aria-describedby="webadifApiKeyHelp" value="<?php if(set_value('webadifapikey') != "") { echo set_value('webadifapikey'); } else { echo $my_station_profile->webadifapikey; } ?>">
 						<small id="webadifApiKeyHelp" class="form-text text-muted"><?php echo lang("station_location_qo100_hint"); ?></a></small>
 					</div>
-					<div class="form-group">
+					<div class="mb-3">
 						<label for="webadifrealtime"><?php echo lang("station_location_qo100_realtime_upload"); ?></label>
-						<select class="custom-select" id="webadifrealtime" name="webadifrealtime">
+						<select class="form-select" id="webadifrealtime" name="webadifrealtime">
 							<option value="1" <?php if ($my_station_profile->webadifrealtime == 1) { echo " selected =\"selected\""; } ?>><?php echo lang("general_word_yes"); ?></option>
 							<option value="0" <?php if ($my_station_profile->webadifrealtime == 0) { echo " selected =\"selected\""; } ?>><?php echo lang("general_word_no"); ?></option>
 						</select>
@@ -425,22 +425,22 @@
 			<div class="card">
 				<h5 class="card-header">OQRS</h5> <!-- This does not need Multilanguage Support -->
 				<div class="card-body">
-					<div class="form-group">
+					<div class="mb-3">
 						<label for="oqrs"><?php echo lang("station_location_oqrs_enabled"); ?></label>
-						<select class="custom-select" id="oqrs" name="oqrs">
+						<select class="form-select" id="oqrs" name="oqrs">
 							<option value="1" <?php if ($my_station_profile->oqrs == 1) { echo " selected =\"selected\""; } ?>><?php echo lang("general_word_yes"); ?></option>
 							<option value="0" <?php if ($my_station_profile->oqrs == 0) { echo " selected =\"selected\""; } ?>><?php echo lang("general_word_no"); ?></option>
 						</select>
 					</div>
-					<div class="form-group">
+					<div class="mb-3">
 						<label for="oqrs"><?php echo lang("station_location_oqrs_email_alert"); ?></label>
-						<select class="custom-select" id="oqrsemail" name="oqrsemail">
+						<select class="form-select" id="oqrsemail" name="oqrsemail">
 							<option value="1" <?php if ($my_station_profile->oqrs_email == 1) { echo " selected =\"selected\""; } ?>><?php echo lang("general_word_yes"); ?></option>
 							<option value="0" <?php if ($my_station_profile->oqrs_email == 0) { echo " selected =\"selected\""; } ?>><?php echo lang("general_word_no"); ?></option>
 						</select>
 						<small id="oqrsemailHelp" class="form-text text-muted"><?php echo lang("station_location_oqrs_email_hint"); ?></small>
 					</div>
-					<div class="form-group">
+					<div class="mb-3">
 						<label for="oqrstext"><?php echo lang("station_location_oqrs_text"); ?></label>
 						<input type="text" class="form-control" name="oqrstext" id="oqrstext" aria-describedby="oqrstextHelp" value="<?php if(set_value('oqrs_text') != "") { echo set_value('oqrs_text'); } else { echo $my_station_profile->oqrs_text; } ?>">
 						<small id="oqrstextHelp" class="form-text text-muted"><?php echo lang("station_location_oqrs_text_hint"); ?></small>
diff --git a/application/views/station_profile/index.php b/application/views/station_profile/index.php
index ba4803e2..65ae9e4a 100644
--- a/application/views/station_profile/index.php
+++ b/application/views/station_profile/index.php
@@ -28,7 +28,7 @@
 
 		<?php if (($is_there_qsos_with_no_station_id >= 1) && ($is_admin)) { ?>
 			<div class="alert alert-danger" role="alert">
-		  		<span class="badge badge-pill badge-warning"><?php echo lang('general_word_warning'); ?></span> <?php echo lang('station_location_warning_reassign'); ?>
+		  		<span class="badge rounded-pill text-bg-warning"><?php echo lang('general_word_warning'); ?></span> <?php echo lang('station_location_warning_reassign'); ?>
 				</br>
 				<?php echo lang('station_location_reassign_at'); ?> <a href="<?php echo site_url('maintenance/'); ?>" class="btn btn-warning"><i class="fas fa-sync"></i><?php echo lang('account_word_admin') . "/" . lang('general_word_maintenance'); ?></a>
 			</div>
@@ -56,18 +56,18 @@
 						<?php echo $row->station_profile_name;?><br>
 					</td>
 					<td><?php echo $row->station_callsign;?></td>
-					<td><?php echo $row->station_country == '' ? '- NONE -' : $row->station_country; if ($row->dxcc_end != NULL) { echo ' <span class="badge badge-danger">'.lang('gen_hamradio_deleted_dxcc').'</span>'; } ?></td>
+					<td><?php echo $row->station_country == '' ? '- NONE -' : $row->station_country; if ($row->dxcc_end != NULL) { echo ' <span class="badge text-bg-danger">'.lang('gen_hamradio_deleted_dxcc').'</span>'; } ?></td>
 					<td><?php echo $row->station_gridsquare;?></td>
 					<td style="text-align: center" data-order="<?php echo $row->station_id;?>">
 						<?php if($row->station_active != 1) { ?>
 							<a href="<?php echo site_url('station/set_active/').$current_active."/".$row->station_id; ?>" class="btn btn-outline-secondary btn-sm" onclick="return confirm('<?php echo lang('station_location_confirm_active'); ?> <?php echo $row->station_profile_name; ?>');"><?php echo lang('station_location_set_active'); ?></a>
 						<?php } else { ?>
-							<span class="badge badge-success"><?php echo lang('station_location_active'); ?></span>
+							<span class="badge text-bg-success"><?php echo lang('station_location_active'); ?></span>
 						<?php } ?>
 
 						<br>
-						<span class="badge badge-info">ID: <?php echo $row->station_id;?></span>
-						<span class="badge badge-light"><?php echo $row->qso_total;?> <?php echo lang('gen_hamradio_qso'); ?></span>
+						<span class="badge text-bg-info">ID: <?php echo $row->station_id;?></span>
+						<span class="badge text-bg-light"><?php echo $row->qso_total;?> <?php echo lang('gen_hamradio_qso'); ?></span>
 					</td>
 					<td>
 						<?php if($row->user_id == "") { ?>
diff --git a/application/views/stations/index.php b/application/views/stations/index.php
index 6cdbdcab..d677c489 100644
--- a/application/views/stations/index.php
+++ b/application/views/stations/index.php
@@ -31,7 +31,7 @@
 
 		<?php if($is_there_qsos_with_no_station_id >= 1) { ?>
 			<div class="alert alert-danger" role="alert">
-		  		<span class="badge badge-pill badge-warning">Warning</span> Due to recent changes within Cloudlog you need to reassign QSOs to your station profiles.
+		  		<span class="badge rounded-pill text-bg-warning">Warning</span> Due to recent changes within Cloudlog you need to reassign QSOs to your station profiles.
 
 		  		Create a station profile, if you haven't already, then <a href="<?php echo site_url('station/assign_all/'); ?>" class="btn btn-danger" onclick="return confirm('Assign All QSOs to Default Station ID"><i class="fas fa-trash-alt"></i> press this button to assign all QSOs to the first Station Profile.</a>
 			</div>
@@ -59,21 +59,21 @@
 						<?php echo $row->station_profile_name;?><br>
 					</td>
 					<td><?php echo $row->station_callsign;?></td>
-					<td><?php echo $row->station_country == '' ? '- NONE -' : $row->station_country; if ($row->dxcc_end != NULL) { echo ' <span class="badge badge-danger">'.lang('gen_hamradio_deleted_dxcc').'</span>'; } ?></td>
+					<td><?php echo $row->station_country == '' ? '- NONE -' : $row->station_country; if ($row->dxcc_end != NULL) { echo ' <span class="badge text-bg-danger">'.lang('gen_hamradio_deleted_dxcc').'</span>'; } ?></td>
 					<td><?php echo $row->station_gridsquare;?></td>
 					<td style="text-align: center" data-order="<?php echo $row->station_id;?>">
 						<?php if($row->station_active != 1) { ?>
 							<a href="<?php echo site_url('station/set_active/').$current_active."/".$row->station_id; ?>" class="btn btn-outline-secondary btn-sm" onclick="return confirm('Are you sure you want to make station <?php echo $row->station_profile_name; ?> the active station?');">Set Active</a>
 						<?php } else { ?>
-							<span class="badge badge-success">Active Station</span>
+							<span class="badge text-bg-success">Active Station</span>
 						<?php } ?>
 
 						<?php if($is_there_qsos_with_no_station_id >= 1) { ?>
 							<a href="<?php echo site_url('station/reassign_profile/').$row->station_id; ?>" class="btn btn-outline-secondary btn-sm" onclick="return confirm('Are you sure you want to reassign QSOs to the <?php echo $row->station_profile_name; ?> profile?');">Reassign</a>
 						<?php } ?>
 						<br>
-						<span class="badge badge-info">ID: <?php echo $row->station_id;?></span>
-						<span class="badge badge-light"><?php echo $row->qso_total;?> QSOs</span>
+						<span class="badge text-bg-info">ID: <?php echo $row->station_id;?></span>
+						<span class="badge text-bg-light"><?php echo $row->qso_total;?> QSOs</span>
 					</td>
 					<td>
 						<?php if($row->user_id == "") { ?>
diff --git a/application/views/statistics/custom.php b/application/views/statistics/custom.php
index b3f9b352..617ec667 100644
--- a/application/views/statistics/custom.php
+++ b/application/views/statistics/custom.php
@@ -14,10 +14,10 @@
 
 <ul class="nav nav-tabs" id="myTab" role="tablist">
   <li class="nav-item">
-    <a class="nav-link active" id="home-tab" data-toggle="tab" href="/index.php/statistics" role="tab" aria-controls="home" aria-selected="true">General</a>
+    <a class="nav-link active" id="home-tab" data-bs-toggle="tab" href="/index.php/statistics" role="tab" aria-controls="home" aria-selected="true">General</a>
   </li>
   <li class="nav-item">
-    <a class="nav-link" id="satellite-tab" data-toggle="tab" href="/index.php/statistics#space" role="tab" aria-controls="satellite" aria-selected="false">Satellites</a>
+    <a class="nav-link" id="satellite-tab" data-bs-toggle="tab" href="/index.php/statistics#space" role="tab" aria-controls="satellite" aria-selected="false">Satellites</a>
   </li>
   <li class="nav-item">
     <a href="/index.php/statistics/custom" class="nav-link" role="tab">Custom</a>
diff --git a/application/views/statistics/custom_result.php b/application/views/statistics/custom_result.php
index 3d380d82..757d3a1f 100644
--- a/application/views/statistics/custom_result.php
+++ b/application/views/statistics/custom_result.php
@@ -15,10 +15,10 @@
 
 <ul class="nav nav-tabs" id="myTab" role="tablist">
   <li class="nav-item">
-    <a class="nav-link active" id="home-tab" data-toggle="tab" href="/index.php/statistics" role="tab" aria-controls="home" aria-selected="true">General</a>
+    <a class="nav-link active" id="home-tab" data-bs-toggle="tab" href="/index.php/statistics" role="tab" aria-controls="home" aria-selected="true">General</a>
   </li>
   <li class="nav-item">
-    <a class="nav-link" id="satellite-tab" data-toggle="tab" href="/index.php/statistics#space" role="tab" aria-controls="satellite" aria-selected="false">Satellites</a>
+    <a class="nav-link" id="satellite-tab" data-bs-toggle="tab" href="/index.php/statistics#space" role="tab" aria-controls="satellite" aria-selected="false">Satellites</a>
   </li>
   <li class="nav-item">
     <a href="/index.php/statistics/custom" class="nav-link" role="tab">Custom</a>
diff --git a/application/views/statistics/index.php b/application/views/statistics/index.php
index 61f26851..e5a7c691 100644
--- a/application/views/statistics/index.php
+++ b/application/views/statistics/index.php
@@ -32,11 +32,11 @@
 	<div hidden class="tabs">
 		<ul class="nav nav-tabs" id="myTab" role="tablist">
 			<li class="nav-item">
-				<a class="nav-link active" id="home-tab" data-toggle="tab" href="#home" role="tab" aria-controls="home" aria-selected="true">General</a>
+				<a class="nav-link active" id="home-tab" data-bs-toggle="tab" href="#home" role="tab" aria-controls="home" aria-selected="true">General</a>
 			</li>
 			<?php if ($sat_active) { ?>
 			<li class="nav-item">
-				<a class="nav-link" id="satellite-tab" data-toggle="tab" href="#satellite" role="tab" aria-controls="satellite" aria-selected="false">Satellites</a>
+				<a class="nav-link" id="satellite-tab" data-bs-toggle="tab" href="#satellite" role="tab" aria-controls="satellite" aria-selected="false">Satellites</a>
 			</li>
 			<?php } ?>
 		</ul>
@@ -47,19 +47,19 @@
 					<br />
 					<ul class="nav nav-pills" id="myTab2" role="tablist">
 						<li class="nav-item">
-							<a class="nav-link active" id="years-tab" data-toggle="tab" href="#yearstab" role="tab" aria-controls="yearstab" aria-selected="true"><?php echo lang('statistics_years'); ?></a>
+							<a class="nav-link active" id="years-tab" data-bs-toggle="tab" href="#yearstab" role="tab" aria-controls="yearstab" aria-selected="true"><?php echo lang('statistics_years'); ?></a>
 						</li>
 						<li class="nav-item">
-							<a class="nav-link" id="mode-tab" data-toggle="tab" href="#modetab" role="tab" aria-controls="modetab" aria-selected="false"><?php echo lang('statistics_modes'); ?></a>
+							<a class="nav-link" id="mode-tab" data-bs-toggle="tab" href="#modetab" role="tab" aria-controls="modetab" aria-selected="false"><?php echo lang('statistics_modes'); ?></a>
 						</li>
 						<li class="nav-item">
-							<a class="nav-link" id="band-tab" data-toggle="tab" href="#bandtab" role="tab" aria-controls="bandtab" aria-selected="false"><?php echo lang('statistics_bands'); ?></a>
+							<a class="nav-link" id="band-tab" data-bs-toggle="tab" href="#bandtab" role="tab" aria-controls="bandtab" aria-selected="false"><?php echo lang('statistics_bands'); ?></a>
 						</li>
 						<li class="nav-item">
-							<a class="nav-link" id="qso-tab" data-toggle="tab" href="#qsotab" role="tab" aria-controls="bandtab" aria-selected="false"><?php echo lang('statistics_qsos'); ?></a>
+							<a class="nav-link" id="qso-tab" data-bs-toggle="tab" href="#qsotab" role="tab" aria-controls="bandtab" aria-selected="false"><?php echo lang('statistics_qsos'); ?></a>
 						</li>
 						<li class="nav-item">
-							<a class="nav-link" id="unique-tab" data-toggle="tab" href="#uniquetab" role="tab" aria-controls="uniquetab" aria-selected="false"><?php echo lang('statistics_unique_callsigns'); ?></a>
+							<a class="nav-link" id="unique-tab" data-bs-toggle="tab" href="#uniquetab" role="tab" aria-controls="uniquetab" aria-selected="false"><?php echo lang('statistics_unique_callsigns'); ?></a>
 						</li>
 					</ul>
 				<div class="tab-content">
diff --git a/application/views/themes/add.php b/application/views/themes/add.php
index 9c770061..5f2ffce1 100644
--- a/application/views/themes/add.php
+++ b/application/views/themes/add.php
@@ -20,13 +20,13 @@
 	<?php echo validation_errors(); ?>
 
 	<form>
-		<div class="form-group">
+		<div class="mb-3">
 			<label for="nameInput">Theme Name</label>
 			<input type="text" class="form-control" name="name" id="nameInput" aria-describedby="nameInputHelp" required>
 			<small id="nameInputHelp" class="form-text text-muted">This is the name that is used to display the theme in the theme list.</small>
 		</div>
 
-		<div class="form-group">
+		<div class="mb-3">
 			<label for="foldernameInput">Folder Name</label>
 			<input type="text" class="form-control" name="foldername" id="foldernameInput" aria-describedby="foldernameInputHelp">
 			<small id="foldernameInputHelp" class="form-text text-muted">This is the name of the folder where your CSS-files are placed under assets/css.</small>
diff --git a/application/views/themes/edit.php b/application/views/themes/edit.php
index 56b6a90a..580f2e3a 100644
--- a/application/views/themes/edit.php
+++ b/application/views/themes/edit.php
@@ -27,13 +27,13 @@
 			<?php echo validation_errors(); ?>
 
 			<form method="post" action="<?php echo site_url('themes/edit/'); ?><?php echo $theme->id; ?>" name="edit_theme">
-				<div class="form-group">
+				<div class="mb-3">
 					<label for="themenameInput">Theme Name</label>
 					<input type="text" class="form-control" name="name" id="nameInput" aria-describedby="themenameInputHelp" value="<?php if(set_value('name') != "") { echo set_value('name'); } else { echo $theme->name; } ?>" required>
 					<small id="themenameInputHelp" class="form-text text-muted">This is the name that is used to display the theme in the theme list.</small>
 				</div>
 
-				<div class="form-group">
+				<div class="mb-3">
 					<label for="foldernameInput">Folder Name</label>
 					<input type="text" class="form-control" name="foldername" id="foldernameInput" aria-describedby="foldernameInputHelp" value="<?php if(set_value('foldername') != "") { echo set_value('foldername'); } else { echo $theme->foldername; } ?>">
 					<small id="foldernameInputHelp" class="form-text text-muted">This is the name of the folder where your CSS-files are placed under assets/css.</small>
diff --git a/application/views/timeline/index.php b/application/views/timeline/index.php
index 0caa46c2..89e341be 100644
--- a/application/views/timeline/index.php
+++ b/application/views/timeline/index.php
@@ -3,10 +3,10 @@
 
     <form class="form" action="<?php echo site_url('timeline'); ?>" method="post" enctype="multipart/form-data">
         <!-- Select Basic -->
-                <div class="form-group row">
+                <div class="mb-3 row">
                     <label class="col-md-1 control-label" for="band"><?php echo lang('gen_hamradio_band') ?></label>
                     <div class="col-md-3">
-                        <select id="band" name="band" class="form-control custom-select">
+                        <select id="band" name="band" class="form-select form-select">
                             <option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> ><?php echo lang('general_word_all') ?></option>
                             <?php foreach($worked_bands as $band) {
                                 echo '<option value="' . $band . '"';
@@ -18,7 +18,7 @@
 
                     <label class="col-md-1 control-label" for="mode"><?php echo lang('gen_hamradio_mode') ?></label>
                     <div class="col-md-3">
-                        <select id="mode" name="mode" class="form-control custom-select">
+                        <select id="mode" name="mode" class="form-select form-select">
                             <option value="All" <?php if ($this->input->post('mode') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> ><?php echo lang('general_word_all') ?></option>
                             <?php
                             foreach($modes->result() as $mode){
@@ -37,10 +37,10 @@
                     </div>
                 </div>
 
-        <div class="form-group row">
+        <div class="mb-3 row">
             <label class="col-md-1 control-label" for="award"><?php echo lang('gen_hamradio_award') ?></label>
                 <div class="col-md-3">
-                    <select id="award" name="award" class="form-control custom-select">
+                    <select id="award" name="award" class="form-select form-select">
                         <option value="dxcc" <?php if ($this->input->post('award') == "dxcc") echo ' selected'; ?> >DX Century Club (DXCC)</option>
                         <option value="was" <?php if ($this->input->post('award') == "was") echo ' selected'; ?> >Worked All States (WAS)</option>
                         <option value="iota" <?php if ($this->input->post('award') == "iota") echo ' selected'; ?> >Islands On The Air (IOTA)</option>
@@ -65,7 +65,7 @@
                 </div>
             </div>
 
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <label class="col-md-1 control-label" for="button1id"></label>
                 <div class="col-md-10">
                     <button id="button1id" type="submit" name="button1id" class="btn btn-primary"><?php echo lang('filter_options_show') ?></button>
@@ -97,7 +97,7 @@
         }
     }
     else {
-        echo '<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
+        echo '<div class="alert alert-danger" role="alert"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
     }
     ?>
 
@@ -130,7 +130,7 @@ function write_dxcc_timeline($timeline_array, $custom_date_format, $bandselect,
                 <td>' . $line->prefix . '</td>
                 <td>' . $line->col_country . '</td>
                 <td>';
-        if (!empty($line->end)) echo '<span class="badge badge-danger">'.$ci->lang->line('gen_hamradio_deleted_dxcc').'</span>';
+        if (!empty($line->end)) echo '<span class="badge text-bg-danger">'.$ci->lang->line('gen_hamradio_deleted_dxcc').'</span>';
         echo '</td>
                 <td>' . $line->end . '</td>
                 <td><a href=javascript:displayTimelineContacts("' . $line->adif . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>'.$ci->lang->line('filter_options_show').'</a></td>
diff --git a/application/views/timeplotter/index.php b/application/views/timeplotter/index.php
index 0a017b6a..1197bad4 100644
--- a/application/views/timeplotter/index.php
+++ b/application/views/timeplotter/index.php
@@ -3,10 +3,10 @@
         <p>The Timeplotter is used to analyze your logbook and find out when you have worked a certain CQ zone or DXCC on a chosen band.</p>
         <form class="form">
 
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <label class="col-md-1 control-label" for="band">Band</label>
                 <div class="col-md-3">
-                    <select id="band" name="band" class="form-control custom-select">
+                    <select id="band" name="band" class="form-select form-select">
                         <option value="All">All</option>
                         <?php foreach($worked_bands as $band) {
                             echo '<option value="' . $band . '">' . $band . '</option>'."\n";
@@ -16,7 +16,7 @@
 
                 <label class="col-md-1 control-label" for="dxcc">DXCC</label>
                 <div class="col-md-3">
-                    <select id="dxcc" name="dxcc" class="form-control custom-select">
+                    <select id="dxcc" name="dxcc" class="form-select form-select">
                         <option value = 'All'>All</option>
                         <?php
                         if ($dxcc_list->num_rows() > 0) {
@@ -33,10 +33,10 @@
                 </div>
             </div>
 
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <label class="col-md-1 control-label" for="cqzone">CQ Zone</label>
                 <div class="col-md-3">
-                    <select id="cqzone" name="cqzone" class="form-control custom-select">
+                    <select id="cqzone" name="cqzone" class="form-select form-select">
                         <option value = 'All'>All</option>
                         <?php
                         for ($i = 1; $i<=40; $i++) {
@@ -47,7 +47,7 @@
                 </div>
             </div>
 
-            <div class="form-group row">
+            <div class="mb-3 row">
                 <div class="col-md-3">
                     <button id="button1id" type="button" name="button1id" class="btn btn-primary ld-ext-right" onclick="timeplot(this.form);">Show<div class="ld ld-ring ld-spin"></div></button>
                 </div>
diff --git a/application/views/update/index.php b/application/views/update/index.php
index 936ad51f..e2e75c82 100644
--- a/application/views/update/index.php
+++ b/application/views/update/index.php
@@ -5,11 +5,11 @@
 		<div class="card-header">
 			<ul style="font-size: 15px;" class="nav nav-tabs card-header-tabs pull-right"  id="myTab" role="tablist">
 				<li class="nav-item">
-					<a class="nav-link active" id="dxcc-tab" data-toggle="tab" href="#dxcc" role="tab" aria-controls="update" aria-selected="true">DXCC Lookup Data</a>
+					<a class="nav-link active" id="dxcc-tab" data-bs-toggle="tab" href="#dxcc" role="tab" aria-controls="update" aria-selected="true">DXCC Lookup Data</a>
 				</li>
 
 				<li class="nav-item">
-					<a class="nav-link" id="distance-tab" data-toggle="tab" href="#distance" role="tab" aria-controls="update" aria-selected="false">Distance Data</a>
+					<a class="nav-link" id="distance-tab" data-bs-toggle="tab" href="#distance" role="tab" aria-controls="update" aria-selected="false">Distance Data</a>
 				</li>
 			</ul>
 		</div>
diff --git a/application/views/user/add.php b/application/views/user/add.php
index a4a4238d..2e1f1f90 100644
--- a/application/views/user/add.php
+++ b/application/views/user/add.php
@@ -20,21 +20,21 @@
                     </div>
                     <div class="card-body">
 
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label><?php echo lang('account_username'); ?></label>
                             <input class="form-control" type="text" name="user_name"
                                 value="<?php if(isset($user_name)) { echo $user_name; } ?>" />
                             <?php if(isset($username_error)) { echo "<div class=\"small error\">".$username_error."</div>"; } ?>
                         </div>
 
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label><?php echo lang('account_email_address'); ?></label>
                             <input class="form-control" type="text" name="user_email"
                                 value="<?php if(isset($user_email)) { echo $user_email; } ?>" />
                             <?php if(isset($email_error)) { echo "<div class=\"small error\">".$email_error."</div>"; } ?>
                         </div>
 
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label><?php echo lang('account_password'); ?></label>
                             <input class="form-control" type="password" name="user_password"
                                 value="<?php if(isset($user_password)) { echo $user_password; } ?>" />
@@ -51,9 +51,9 @@
                         <?php echo lang('account_roles'); ?>
                     </div>
                     <div class="card-body">
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label><?php echo lang('account_user_role'); ?></label>
-                            <select class="custom-select" name="user_type">
+                            <select class="form-select" name="user_type">
                                 <?php
 										$levels = $this->config->item('auth_level');
 										foreach ($levels as $key => $value) {
@@ -81,9 +81,9 @@
                     </div>
                     <div class="card-body">
 
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label for="user_stylesheet"><?php echo lang('account_stylesheet'); ?></label>
-                            <select class="custom-select" id="user_stylesheet" name="user_stylesheet" required>
+                            <select class="form-select" id="user_stylesheet" name="user_stylesheet" required>
                                 <?php
 				foreach ($themes as $theme) {
 					echo '<option value="' . $theme->foldername . '"';
@@ -109,27 +109,27 @@
                     </div>
                     <div class="card-body">
 
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label><?php echo lang('account_first_name'); ?></label>
                             <input class="form-control" type="text" name="user_firstname"
                                 value="<?php if(isset($user_firstname)) { echo $user_firstname; } ?>" />
                             <?php if(isset($firstname_error)) { echo "<div class=\"small error\">".$firstname_error."</div>"; } ?>
                         </div>
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label><?php echo lang('account_last_name'); ?></label>
                             <input class="form-control" type="text" name="user_lastname"
                                 value="<?php if(isset($user_lastname)) { echo $user_lastname; } ?>" />
                             <?php if(isset($lastname_error)) { echo "<div class=\"small error\">".$lastname_error."</div>"; } ?>
                         </div>
 
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label><?php echo lang('account_callsign'); ?></label>
                             <input class="form-control" type="text" name="user_callsign"
                                 value="<?php if(isset($user_callsign)) { echo $user_callsign; } ?>" />
                             <?php if(isset($callsign_error)) { echo "<div class=\"small error\">".$callsign_error."</div>"; } ?>
                         </div>
 
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label><?php echo lang('account_gridsquare'); ?></label>
                             <input class="form-control" type="text" name="user_locator"
                                 value="<?php if(isset($user_locator)) { echo $user_locator; } ?>" />
@@ -148,7 +148,7 @@
                     </div>
                     <div class="card-body">
 
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label><?php echo lang('account_timezone'); ?></label>
                             <?php
 					if(!isset($user_timezone)) { $user_timezone = 0; }
@@ -156,18 +156,18 @@
 					?>
                         </div>
 
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label for="logendtime"><?php echo lang('account_log_end_time'); ?></label>
-                            <select class="custom-select" id="logendtime" name="user_qso_end_times">
+                            <select class="form-select" id="logendtime" name="user_qso_end_times">
                                 <option value="0"><?php echo lang('general_word_no'); ?></option>
                                 <option value="1"><?php echo lang('general_word_yes'); ?></option>
                             </select>
                             <small id="SelectDateFormatHelp" class="form-text text-muted"><?php echo lang('account_log_end_time_hint'); ?></small>
                         </div>
 
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label for="SelectDateFormat"><?php echo lang('account_date_format'); ?></label>
-                            <select name="user_date_format" class="custom-select" id="SelectDateFormat"
+                            <select name="user_date_format" class="form-select" id="SelectDateFormat"
                                 aria-describedby="SelectDateFormatHelp">
                                 <option value="">Select Format</option>
                                 <option value="d/m/y"><?php echo date('d/m/y'); ?></option>
@@ -182,9 +182,9 @@
                         </div>
 
 
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label for="user_measurement_base"><?php echo lang('account_measurement_preferences'); ?></label>
-                            <select class="custom-select" id="user_measurement_base" name="user_measurement_base"
+                            <select class="form-select" id="user_measurement_base" name="user_measurement_base"
                                 required>
                                 <option value=''></option>
                                 <option value='K'
@@ -200,7 +200,7 @@
                             <small id="user_measurement_base_Help" class="form-text text-muted"><?php echo lang('account_choose_which_unit_distances_will_be_shown_in'); ?></small>
                         </div>
 				<?php if ($this->config->item('cl_multilanguage')) { ?>
-		 	    <div class="form-group">
+		 	    <div class="mb-3">
 		                <label for="language">Cloudlog Language</label>
 						<?php
 						foreach($existing_languages as $lang){
@@ -225,25 +225,25 @@
                 	<?php echo lang('account_main_menu'); ?>
                     </div>
                     <div class="card-body">
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label for="shownotes"><?php echo lang('account_show_notes_in_the_main_menu'); ?></label>
-                            <select class="custom-select" id="shownotes" name="user_show_notes">
+                            <select class="form-select" id="shownotes" name="user_show_notes">
                                 <option value="0"><?php echo lang('general_word_no'); ?></option>
                                 <option value="1"><?php echo lang('general_word_yes'); ?></option>
                             </select>
                             <small> </small>
                         </div>
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label for="quicklog"><?php echo lang('account_quicklog_feature'); ?></label>
-                            <select class="custom-select" id="quicklog" name="user_quicklog">
+                            <select class="form-select" id="quicklog" name="user_quicklog">
                                 <option value="0"><?php echo lang('general_word_no'); ?></option>
                                 <option value="1"><?php echo lang('general_word_yes'); ?></option>
                             </select>
                             <small id="SelectDateFormatHelp" class="form-text text-muted"><?php echo lang('account_quicklog_feature_hint'); ?></small>
                         </div>
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label for="quicklog_enter"><?php echo lang('account_quicklog_enter'); ?></label>
-                            <select class="custom-select" id="quicklog_enter" name="user_quicklog_enter">
+                            <select class="form-select" id="quicklog_enter" name="user_quicklog_enter">
                                 <option value="0"><?php echo lang('account_quicklog_enter_log'); ?></option>
                                 <option value="1"><?php echo lang('account_quicklog_enter_search'); ?></option>
                             </select>
@@ -263,10 +263,10 @@
                     </div>
                     <div class="card-body">
 
-                        <div class="form-row">
-                            <div class="form-group col-md-12">
+                        <div class="row">
+                            <div class="mb-3 col-md-12">
                                 <label for="qthlookup"><?php echo lang('account_location_auto_lookup'); ?></label>
-                                <select class="custom-select" id="qthlookup" name="user_qth_lookup">
+                                <select class="form-select" id="qthlookup" name="user_qth_lookup">
                                     <option value="0"><?php echo lang('general_word_no'); ?>
                                     </option>
                                     <option value="1"><?php echo lang('general_word_yes'); ?>
@@ -276,9 +276,9 @@
                                 </td>
                             </div>
 
-                            <div class="form-group col-md-12">
+                            <div class="mb-3 col-md-12">
                                 <label for="sotalookup"><?php echo lang('account_sota_auto_lookup_gridsquare_and_name_for_summit'); ?></label>
-                                <select class="custom-select" id="sotalookup" name="user_sota_lookup">
+                                <select class="form-select" id="sotalookup" name="user_sota_lookup">
                                     <option value="0"><?php echo lang('general_word_no'); ?>
                                     </option>
                                     <option value="1"><?php echo lang('general_word_yes'); ?>
@@ -288,9 +288,9 @@
                                 </td>
                             </div>
 
-                            <div class="form-group col-md-12">
+                            <div class="mb-3 col-md-12">
                                 <label for="wwfflookup"><?php echo lang('account_wwff_auto_lookup_gridsquare_and_name_for_reference'); ?></label>
-                                <select class="custom-select" id="wwfflookup" name="user_wwff_lookup">
+                                <select class="form-select" id="wwfflookup" name="user_wwff_lookup">
                                     <option value="0"><?php echo lang('general_word_no'); ?>
                                     </option>
                                     <option value="1"><?php echo lang('general_word_yes'); ?>
@@ -300,9 +300,9 @@
                                 </td>
                             </div>
 
-                            <div class="form-group col-md-12">
+                            <div class="mb-3 col-md-12">
                                 <label for="potalookup"><?php echo lang('account_pota_auto_lookup_gridsquare_and_name_for_park'); ?></label>
-                                <select class="custom-select" id="potalookup" name="user_pota_lookup">
+                                <select class="form-select" id="potalookup" name="user_pota_lookup">
                                     <option value="0"><?php echo lang('general_word_no'); ?>
                                     </option>
                                     <option value="1"><?php echo lang('general_word_yes'); ?>
@@ -324,13 +324,13 @@
                         <?php echo lang('account_logbook_fields'); ?>
                     </div>
                     <div class="card-body">
-                        <div class="form-row">
+                        <div class="row">
 
-                            <div class="form-row">
-                                <div class="form-group col-md-12">
+                            <div class="row">
+                                <div class="mb-3 col-md-12">
                                     <label
                                         for="column1"><?php echo lang('account_column1_text'); ?></label>
-                                    <select class="custom-select" id="column1" name="user_column1">
+                                    <select class="form-select" id="column1" name="user_column1">
                                         <option value="Band"> <?php echo lang('gen_hamradio_band'); ?>
                                         </option>
                                         <option value="Frequency">
@@ -358,10 +358,10 @@
                                     </select>
                                 </div>
 
-                                <div class="form-group col-md-12">
+                                <div class="mb-3 col-md-12">
                                     <label
                                         for="column2"><?php echo lang('account_column2_text'); ?></label>
-                                    <select class="custom-select" id="column2" name="user_column2">
+                                    <select class="form-select" id="column2" name="user_column2">
                                         <option value="Band"> <?php echo lang('gen_hamradio_band'); ?>
                                         </option>
                                         <option value="Frequency">
@@ -389,10 +389,10 @@
                                     </select>
                                 </div>
 
-                                <div class="form-group col-md-12">
+                                <div class="mb-3 col-md-12">
                                     <label
                                         for="column3"><?php echo lang('account_column3_text'); ?></label>
-                                    <select class="custom-select" id="column3" name="user_column3">
+                                    <select class="form-select" id="column3" name="user_column3">
                                         <option value="Band"> <?php echo lang('gen_hamradio_band'); ?>
                                         </option>
                                         <option value="Frequency">
@@ -420,10 +420,10 @@
                                     </select>
                                 </div>
 
-                                <div class="form-group col-md-12">
+                                <div class="mb-3 col-md-12">
                                     <label
                                         for="column4"><?php echo lang('account_column4_text'); ?></label>
-                                    <select class="custom-select" id="column4" name="user_column4">
+                                    <select class="form-select" id="column4" name="user_column4">
                                         <option value="Band" selected='selected'>
                                             <?php echo lang('gen_hamradio_band'); ?></option>
                                         <option value="Frequency">
@@ -451,10 +451,10 @@
                                     </select>
                                 </div>
 
-                                <div class="form-group col-md-12">
+                                <div class="mb-3 col-md-12">
                                     <label
                                         for="column5"><?php echo lang('account_column5_text'); ?></label>
-                                    <select class="custom-select" id="column5" name="user_column5">
+                                    <select class="form-select" id="column5" name="user_column5">
                                         <option value=""></option>
                                         <option value="Band"> <?php echo lang('gen_hamradio_band'); ?>
                                         </option>
@@ -500,9 +500,9 @@
                     </div>
                     <div class="card-body">
 
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label for="previousqsltype"><?php echo lang('account_select_the_type_of_qsl_to_show_in_the_previous_qsos_section'); ?></label>
-                            <select class="custom-select" id="previousqsltype" name="user_previous_qsl_type">
+                            <select class="form-select" id="previousqsltype" name="user_previous_qsl_type">
                                 <option value="0"><?php echo lang('gen_hamradio_qsl'); ?></option>
                                 <option value="1"><?php echo lang('lotw_short'); ?></option>
                                 <option value="2"><?php echo lang('eqsl_short'); ?></option>
@@ -519,9 +519,9 @@
                     </div>
                     <div class="card-body">
 
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label for="profileimages"><?php echo lang('account_show_profile_picture_of_qso_partner_from_qrzcom_hamqthcom_profile_in_the_log_qso_section'); ?></label>
-                            <select class="custom-select" id="profileimages" name="user_show_profile_image">
+                            <select class="form-select" id="profileimages" name="user_show_profile_image">
                                 <option value="0"><?php echo lang('general_word_no'); ?></option>
                                 <option value="1"><?php echo lang('general_word_yes'); ?></option>
                             </select>
@@ -542,9 +542,9 @@
                     </div>
                     <div class="card-body">
 
-                        <div class="form-group">
+                        <div class="mb-3">
                             <label for="amsatstatusupload"><?php echo lang('account_upload_status_of_sat_qsos_to'); ?> <a href="https://www.amsat.org/status/" target="_blank">https://www.amsat.org/status/</a>.</label>
-                            <select class="custom-select" id="amsatstatusupload" name="user_amsat_status_upload">
+                            <select class="form-select" id="amsatstatusupload" name="user_amsat_status_upload">
                                 <option value="0"><?php echo lang('general_word_no'); ?></option>
                                 <option value="1"><?php echo lang('general_word_yes'); ?></option>
                             </select>
@@ -558,7 +558,7 @@
 				<?php echo lang('account_mastodon'); ?>
 			</div>
 			<div class="card-body">
-				<div class="form-group">
+				<div class="mb-3">
 					<label><?php echo lang('account_user_mastodon'); ?></label>
 					<input class="form-control" type="text" name="user_mastodon_url" value="<?php if(isset($user_mastodon_url)) { echo $user_mastodon_url; } ?>" />
                     <div class="small form-text text-muted"><?php echo lang('account_user_mastodon_hint'); ?></a></div></td>
@@ -575,10 +575,10 @@
                     <?php echo lang('account_default_band_settings'); ?>
                     </div>
                     <div class="card-body">
-                            <div class="form-group">
+                            <div class="mb-3">
                                 <label for="user_default_band"><?php echo lang('account_gridmap_default_band'); ?></label>
 
-                                <select id="user_default_band" class="form-control" name="user_default_band">
+                                <select id="user_default_band" class="form-select" name="user_default_band">
                                     <option value="All">All</option>;
                                     <?php foreach($bands as $band) {
                                         echo '<option value="'.$band.'"';
@@ -589,8 +589,8 @@
                                     } ?>
                                 </select>
                             </div>
-                            <div class="form-group">
-                                <label class="my-1 mr-2"><?php echo lang('account_qsl_settings'); ?></label>
+                            <div class="mb-3">
+                                <label class="my-1 me-2"><?php echo lang('account_qsl_settings'); ?></label>
                                 <div class="form-check-inline">
                                     <?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_qsl" id="user_default_confirmation_qsl"';
                                         if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) {
diff --git a/application/views/user/edit.php b/application/views/user/edit.php
index 20e117ec..9b79ec5b 100644
--- a/application/views/user/edit.php
+++ b/application/views/user/edit.php
@@ -20,7 +20,7 @@
 
 	<?php if(validation_errors()) { ?>
     <div class="alert alert-danger">
-    	<a class="close" data-dismiss="alert">x</a>
+    	<a class="btn-close" data-bs-dismiss="alert">x</a>
  		<?php echo validation_errors(); ?>
     </div>
 	<?php } ?>
@@ -35,19 +35,19 @@
 				   	 <?php echo lang('account_account_information'); ?>
 					</div>
 				<div class="card-body">
-					<div class="form-group">
+					<div class="mb-3">
 						<label><?php echo lang('account_username'); ?></label>
 						<input class="form-control" type="text" name="user_name" value="<?php if(isset($user_name)) { echo $user_name; } ?>" />
 						<?php if(isset($username_error)) { echo "<div class=\"small error\">".$username_error."</div>"; } ?>
 					</div>
 
-					<div class="form-group">
+					<div class="mb-3">
 						<label><?php echo lang('account_email_address'); ?></label>
 						<input class="form-control" type="text" name="user_email" value="<?php if(isset($user_email)) { echo $user_email; } ?>" />
 						<?php if(isset($email_error)) { echo "<div class=\"small error\">".$email_error."</div>"; } ?>
 					</div>
 
-					<div class="form-group">
+					<div class="mb-3">
 						<label><?php echo lang('account_password'); ?></label>
 						<input class="form-control" type="password" name="user_password" />
 						<?php if(isset($password_error)) { echo "<div class=\"small error\">".$password_error."</div>"; } else { ?>
@@ -64,11 +64,11 @@
 				   	 <?php echo lang('account_roles'); ?>
 					</div>
 				<div class="card-body">
-					<div class="form-group">
+					<div class="mb-3">
 						<label><?php echo lang('account_user_role'); ?></label>
 
 						<?php if($this->session->userdata('user_type') == 99) { ?>
-						<select class="custom-select" name="user_type">
+						<select class="form-select" name="user_type">
 						<?php
 							$levels = $this->config->item('auth_level');
 							foreach ($levels as $key => $value) {
@@ -95,9 +95,9 @@
                     <?php echo lang('account_theme'); ?>
                 </div>
                 <div class="card-body">
-                    <div class="form-group">
+                    <div class="mb-3">
                         <label><?php echo lang('account_stylesheet'); ?></label>
-                        <select class="custom-select" id="user_stylesheet" name="user_stylesheet" required>
+                        <select class="form-select" id="user_stylesheet" name="user_stylesheet" required>
 							<?php
 							foreach ($themes as $theme) {
 								echo '<option value="' . $theme->foldername . '"';
@@ -123,28 +123,28 @@
 			   	 <?php echo lang('account_personal_information'); ?>
 				</div>
 				<div class="card-body">
-					<div class="form-group">
+					<div class="mb-3">
 							<label><?php echo lang('account_first_name'); ?></label>
 							<input class="form-control" type="text" name="user_firstname" value="<?php if(isset($user_firstname)) { echo $user_firstname; } ?>" />
 								<?php if(isset($firstname_error)) { echo "<div class=\"small error\">".$firstname_error."</div>"; } else { ?>
 								<?php } ?>
 						</div>
 
-						<div class="form-group">
+						<div class="mb-3">
 							<label><?php echo lang('account_last_name'); ?></label>
 							<input class="form-control" type="text" name="user_lastname" value="<?php if(isset($user_lastname)) { echo $user_lastname; } ?>" />
 								<?php if(isset($lastname_error)) { echo "<div class=\"small error\">".$lastname_error."</div>"; } else { ?>
 								<?php } ?>
 						</div>
 
-						<div class="form-group">
+						<div class="mb-3">
 							<label><?php echo lang('account_callsign'); ?></label>
 							<input class="form-control" type="text" name="user_callsign" value="<?php if(isset($user_callsign)) { echo $user_callsign; } ?>" />
 								<?php if(isset($callsign_error)) { echo "<div class=\"small error\">".$callsign_error."</div>"; } else { ?>
 								<?php } ?>
 						</div>
 
-						<div class="form-group">
+						<div class="mb-3">
 							<label><?php echo lang('account_gridsquare'); ?></label>
 							<input class="form-control" type="text" name="user_locator" value="<?php if(isset($user_locator)) { echo $user_locator; } ?>" />
 								<?php if(isset($locator_error)) { echo "<div class=\"small error\">".$locator_error."</div>"; } else { ?>
@@ -160,23 +160,23 @@
 			   	 <?php echo lang('account_cloudlog_preferences'); ?>
 				</div>
 				<div class="card-body">
-					<div class="form-group">
+					<div class="mb-3">
 						<label><?php echo lang('account_timezone'); ?></label>
 						<?php echo form_dropdown('user_timezone', $timezones, $user_timezone); ?>
 					</div>
 
-					<div class="form-group">
+					<div class="mb-3">
 						<label for="logendtime"><?php echo lang('account_log_end_time'); ?></label>
-						<select class="custom-select" id="logendtimes" name="user_qso_end_times">
+						<select class="form-select" id="logendtimes" name="user_qso_end_times">
 							<option value="1" <?php if ($user_qso_end_times == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
 							<option value="0" <?php if ($user_qso_end_times == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
 						</select>
 					<small id="SelectDateFormatHelp" class="form-text text-muted"><?php echo lang('account_log_end_time_hint'); ?></small>
 					</div>
 
-					<div class="form-group">
+					<div class="mb-3">
 					<label for="SelectDateFormat"><?php echo lang('account_date_format'); ?></label>
-						<select name="user_date_format" class="custom-select" id="SelectDateFormat" aria-describedby="SelectDateFormatHelp">
+						<select name="user_date_format" class="form-select" id="SelectDateFormat" aria-describedby="SelectDateFormatHelp">
 							<option value="d/m/y" <?php if($user_date_format == "d/m/y") { echo "selected=\"selected\""; } ?>><?php echo date('d/m/y'); ?></option>
 							<option value="d/m/Y" <?php if($user_date_format == "d/m/Y") { echo "selected=\"selected\""; } ?>><?php echo date('d/m/Y'); ?></option>
 							<option value="m/d/y" <?php if($user_date_format == "m/d/y") { echo "selected=\"selected\""; } ?>><?php echo date('m/d/y'); ?></option>
@@ -190,9 +190,9 @@
 						<small id="SelectDateFormatHelp" class="form-text text-muted"><?php echo lang('account_select_how_you_would_like_dates_shown_when_logged_into_your_account'); ?></small>
 					</div>
 
-					<div class="form-group">
+					<div class="mb-3">
 		                <label for="user_measurement_base"><?php echo lang('account_measurement_preferences'); ?></label>
-		                <select class="custom-select" id="user_measurement_base" name="user_measurement_base" aria-describedby="user_measurement_base_Help" required>
+		                <select class="form-select" id="user_measurement_base" name="user_measurement_base" aria-describedby="user_measurement_base_Help" required>
 		                    <option value ''></option>
                             <option value='K' <?php if($user_measurement_base == "K") { echo "selected=\"selected\""; } ?>>Kilometers</option>
 		                    <option value='M' <?php if($user_measurement_base == "M") { echo "selected=\"selected\""; } ?>>Miles</option>
@@ -202,7 +202,7 @@
 		            </div>
 
 				<?php if ($this->config->item('cl_multilanguage')) { ?>
-		 	    <div class="form-group">
+		 	    <div class="mb-3">
 		                <label for="language"><?php echo lang('account_cloudlog_language'); ?></label>
 						<?php
 						foreach($existing_languages as $lang){
@@ -227,13 +227,13 @@
 			   	 <?php echo lang('account_logbook_of_the_world'); ?>
 				</div>
 				<div class="card-body">
-					<div class="form-group">
+					<div class="mb-3">
 						<label><?php echo lang('account_logbook_of_the_world_lotw_username'); ?></label>
 						<input class="form-control" type="text" name="user_lotw_name" value="<?php if(isset($user_lotw_name)) { echo $user_lotw_name; } ?>" />
 						<?php if(isset($userlotwname_error)) { echo "<div class=\"small error\">".$userlotwname_error."</div>"; } ?>
 					</div>
 
-					<div class="form-group">
+					<div class="mb-3">
 						<label><?php echo lang('account_logbook_of_the_world_lotw_password'); ?></label>
 						<input class="form-control" type="password" name="user_lotw_password" />
 							<?php if(isset($lotwpassword_error)) { echo "<div class=\"small error\">".$lotwpassword_error."</div>"; } else { ?>
@@ -251,13 +251,13 @@
 			   	 <?php echo lang('account_eqsl'); ?>
 				</div>
 				<div class="card-body">
-					<div class="form-group">
+					<div class="mb-3">
 						<label><?php echo lang('account_eqslcc_username'); ?></label>
 						<input class="form-control" type="text" name="user_eqsl_name" value="<?php if(isset($user_eqsl_name)) { echo $user_eqsl_name; } ?>" />
 							<?php if(isset($eqslusername_error)) { echo "<div class=\"small error\">".$eqslusername_error."</div>"; } ?>
 					</div>
 
-					<div class="form-group">
+					<div class="mb-3">
 						<label><?php echo lang('account_eqslcc_password'); ?></label>
 						<input class="form-control" type="password" name="user_eqsl_password" />
 							<?php if(isset($eqslpassword_error)) { echo "<div class=\"small error\">".$eqslpassword_error."</div>"; } else { ?>
@@ -278,7 +278,7 @@
 			   		<?php echo lang('account_clublog'); ?>
 				</div>
 				<div class="card-body">
-					<div class="form-group">
+					<div class="mb-3">
 						<label><?php echo lang('account_clublog_email_callsign'); ?></label>
 						<input class="form-control" type="text" name="user_clublog_name" value="<?php if(isset($user_clublog_name)) { echo $user_clublog_name; } ?>" />
 							<div class="small form-text text-muted"><?php echo lang('account_the_email_or_callsign_you_use_to_login_to_club_log'); ?></div></td>
@@ -286,7 +286,7 @@
 
 					</div>
 
-					<div class="form-group">
+					<div class="mb-3">
 						<label><?php echo lang('account_clublog_password'); ?></label>
 						<input class="form-control" type="password" name="user_clublog_password" />
 							<?php if(isset($clublogpassword_error)) { echo "<div class=\"small error\">".$clublogpassword_error."</div>"; } else { ?>
@@ -302,24 +302,24 @@
 						<?php echo lang('account_main_menu'); ?>
 					</div>
 					<div class="card-body">
-						<div class="form-group">
+						<div class="mb-3">
 							<label for="shownotes"><?php echo lang('account_show_notes_in_the_main_menu'); ?></label>
-							<select class="custom-select" id="shownotes" name="user_show_notes">
+							<select class="form-select" id="shownotes" name="user_show_notes">
 								<option value="1" <?php if ($user_show_notes == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
 								<option value="0" <?php if ($user_show_notes == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
 							</select>
 						</div>
-						<div class="form-group">
+						<div class="mb-3">
 							<label for="quicklog"><?php echo lang('account_quicklog_feature'); ?></label>
-							<select class="custom-select" id="quicklog" name="user_quicklog">
+							<select class="form-select" id="quicklog" name="user_quicklog">
 								<option value="1" <?php if ($user_quicklog == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
 								<option value="0" <?php if ($user_quicklog == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
 							</select>
 							<small id="SelectDateFormatHelp" class="form-text text-muted"><?php echo lang('account_quicklog_feature_hint'); ?></small>
 						</div>
-						<div class="form-group">
+						<div class="mb-3">
 							<label for="quicklog_enter"><?php echo lang('account_quicklog_enter'); ?></label>
-							<select class="custom-select" id="quicklog_enter" name="user_quicklog_enter">
+							<select class="form-select" id="quicklog_enter" name="user_quicklog_enter">
 								<option value="0" <?php if ($user_quicklog_enter == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('account_quicklog_enter_log'); ?></option>
 								<option value="1" <?php if ($user_quicklog_enter == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('account_quicklog_enter_search'); ?></option>
 							</select>
@@ -337,34 +337,34 @@
 						<?php echo lang('account_gridsquare_and_location_autocomplete'); ?>
 					</div>
 					<div class="card-body">
-						<div class="form-row">
-							<div class="form-group col-md-12">
+						<div class="row">
+							<div class="mb-3 col-md-12">
 								<label for="qthlookup"><?php echo lang('account_location_auto_lookup'); ?></label>
-								<select class="custom-select" id="qthlookup" name="user_qth_lookup">
+								<select class="form-select" id="qthlookup" name="user_qth_lookup">
 									<option value="1" <?php if ($user_qth_lookup == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
 									<option value="0" <?php if ($user_qth_lookup == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
 								</select>
 								<div class="small form-text text-muted"><?php echo lang('account_if_set_gridsquare_is_fetched_based_on_location_name'); ?></div></td>
 							</div>
-							<div class="form-group col-md-12">
+							<div class="mb-3 col-md-12">
 								<label for="sotalookup"><?php echo lang('account_sota_auto_lookup_gridsquare_and_name_for_summit'); ?></label>
-								<select class="custom-select" id="sotalookup" name="user_sota_lookup">
+								<select class="form-select" id="sotalookup" name="user_sota_lookup">
 									<option value="1" <?php if ($user_sota_lookup == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
 									<option value="0" <?php if ($user_sota_lookup == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
 								</select>
 								<div class="small form-text text-muted"><?php echo lang('account_if_set_name_and_gridsquare_is_fetched_from_the_api_and_filled_in_location_and_locator'); ?></div></td>
 							</div>
-							<div class="form-group col-md-12">
+							<div class="mb-3 col-md-12">
 								<label for="wwfflookup"><?php echo lang('account_wwff_auto_lookup_gridsquare_and_name_for_reference'); ?></label>
-								<select class="custom-select" id="wwfflookup" name="user_wwff_lookup">
+								<select class="form-select" id="wwfflookup" name="user_wwff_lookup">
 									<option value="1" <?php if ($user_wwff_lookup == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
 									<option value="0" <?php if ($user_wwff_lookup == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
 								</select>
 								<div class="small form-text text-muted"><?php echo lang('account_if_set_name_and_gridsquare_is_fetched_from_the_api_and_filled_in_location_and_locator'); ?></div></td>
 							</div>
-							<div class="form-group col-md-12">
+							<div class="mb-3 col-md-12">
 								<label for="potalookup"><?php echo lang('account_pota_auto_lookup_gridsquare_and_name_for_park'); ?></label>
-								<select class="custom-select" id="potalookup" name="user_pota_lookup">
+								<select class="form-select" id="potalookup" name="user_pota_lookup">
 									<option value="1" <?php if ($user_pota_lookup == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
 									<option value="0" <?php if ($user_pota_lookup == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
 								</select>
@@ -381,10 +381,10 @@
 						<?php echo lang('account_logbook_fields'); ?>
 					</div>
 					<div class="card-body">
-						<div class="form-row">
-						<div class="form-group col-md-12">
+						<div class="row">
+						<div class="mb-3 col-md-12">
 							<label for="column1"><?php echo lang('account_column1_text'); ?></label>
-							<select class="custom-select" id="column1" name="user_column1">
+							<select class="form-select" id="column1" name="user_column1">
 								<option value="Band" <?php if ($user_column1 == "Band") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_band'); ?></option>
 								<option value="Frequency" <?php if ($user_column1 == "Frequency") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_frequency'); ?></option>
 								<option value="Mode" <?php if ($user_column1 == "Mode") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_mode'); ?></option>
@@ -402,9 +402,9 @@
 							</select>
 						</div>
 
-							<div class="form-group col-md-12">
+							<div class="mb-3 col-md-12">
 							<label for="column2"><?php echo lang('account_column2_text'); ?></label>
-							<select class="custom-select" id="column2" name="user_column2">
+							<select class="form-select" id="column2" name="user_column2">
 								<option value="Band" <?php if ($user_column2 == "Band") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_band'); ?></option>
 								<option value="Frequency" <?php if ($user_column2 == "Frequency") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_frequency'); ?></option>
 								<option value="Mode" <?php if ($user_column2 == "Mode") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_mode'); ?></option>
@@ -422,9 +422,9 @@
 							</select>
 							</div>
 
-							<div class="form-group col-md-12">
+							<div class="mb-3 col-md-12">
 							<label for="column3"><?php echo lang('account_column3_text'); ?></label>
-							<select class="custom-select" id="column3" name="user_column3">
+							<select class="form-select" id="column3" name="user_column3">
 								<option value="Band" <?php if ($user_column3 == "Band") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_band'); ?></option>
 								<option value="Frequency" <?php if ($user_column3 == "Frequency") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_frequency'); ?></option>
 								<option value="Mode" <?php if ($user_column3 == "Mode") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_mode'); ?></option>
@@ -442,9 +442,9 @@
 							</select>
 							</div>
 
-							<div class="form-group col-md-12">
+							<div class="mb-3 col-md-12">
 							<label for="column4"><?php echo lang('account_column4_text'); ?></label>
-							<select class="custom-select" id="column4" name="user_column4">
+							<select class="form-select" id="column4" name="user_column4">
 								<option value="Band" <?php if ($user_column4 == "Band") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_band'); ?></option>
 								<option value="Frequency" <?php if ($user_column4 == "Frequency") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_frequency'); ?></option>
 								<option value="Mode" <?php if ($user_column4 == "Mode") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_mode'); ?></option>
@@ -461,9 +461,9 @@
 								<option value="Operator" <?php if ($user_column4 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_operator'); ?></option>
 							</select>
 						</div>
-							<div class="form-group col-md-12">
+							<div class="mb-3 col-md-12">
 								<label for="column5"><?php echo lang('account_column5_text'); ?></label>
-								<select class="custom-select" id="column5" name="user_column5">
+								<select class="form-select" id="column5" name="user_column5">
 									<option value="" <?php if ($user_column5 == "") { echo " selected =\"selected\""; } ?>></option>
 									<option value="Band" <?php if ($user_column5 == "Band") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_band'); ?></option>
 									<option value="Frequency" <?php if ($user_column5 == "Frequency") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_frequency'); ?></option>
@@ -496,9 +496,9 @@
 						<?php echo lang('account_previous_qsl_type'); ?>
 					</div>
 					<div class="card-body">
-						<div class="form-group">
+						<div class="mb-3">
 							<label for="profileimages"><?php echo lang('account_select_the_type_of_qsl_to_show_in_the_previous_qsos_section'); ?></label>
-							<select class="custom-select" id="previousqsltype" name="user_previous_qsl_type">
+							<select class="form-select" id="previousqsltype" name="user_previous_qsl_type">
 								<option value="0" <?php if ($user_previous_qsl_type == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_qsl'); ?></option>
 								<option value="1" <?php if ($user_previous_qsl_type == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('lotw_short'); ?></option>
 								<option value="2" <?php if ($user_previous_qsl_type == 2) { echo " selected =\"selected\""; } ?>><?php echo lang('eqsl_short'); ?></option>
@@ -516,9 +516,9 @@
 						<?php echo lang('account_qrzcom_hamqthcom_images'); ?>
 					</div>
 					<div class="card-body">
-						<div class="form-group">
+						<div class="mb-3">
 							<label for="profileimages"><?php echo lang('account_show_profile_picture_of_qso_partner_from_qrzcom_hamqthcom_profile_in_the_log_qso_section'); ?></label>
-							<select class="custom-select" id="profileimages" name="user_show_profile_image">
+							<select class="form-select" id="profileimages" name="user_show_profile_image">
 								<option value="1" <?php if ($user_show_profile_image == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
 								<option value="0" <?php if ($user_show_profile_image == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
 							</select>
@@ -538,9 +538,9 @@
 						<?php echo lang('account_amsat_status_upload'); ?>
 					</div>
 					<div class="card-body">
-						<div class="form-group">
+						<div class="mb-3">
 							<label for="amsatsatatusupload"><?php echo lang('account_upload_status_of_sat_qsos_to'); ?> <a href="https://www.amsat.org/status/" target="_blank">https://www.amsat.org/status/</a>.</label>
-							<select class="custom-select" id="amsatstatusupload" name="user_amsat_status_upload">
+							<select class="form-select" id="amsatstatusupload" name="user_amsat_status_upload">
 								<option value="1" <?php if ($user_amsat_status_upload == 1) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_yes'); ?></option>
 								<option value="0" <?php if ($user_amsat_status_upload == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
 							</select>
@@ -555,7 +555,7 @@
 					   	 <?php echo lang('account_mastodon'); ?>
 					</div>
 					<div class="card-body">
-						<div class="form-group">
+						<div class="mb-3">
 						<label><?php echo lang('account_user_mastodon'); ?></label>
 							<input class="form-control" type="text" name="user_mastodon_url" value="<?php if(isset($user_mastodon_url)) { echo $user_mastodon_url; } ?>" />
 							<div class="small form-text text-muted"><?php echo lang('account_user_mastodon_hint'); ?></a></div></td>
@@ -572,10 +572,10 @@
 						<?php echo lang('account_default_band_settings'); ?>
 					</div>
 					<div class="card-body">
-						<div class="form-group">
+						<div class="mb-3">
 							<label for="user_default_band"><?php echo lang('account_gridmap_default_band'); ?></label>
 
-							<select id="user_default_band" class="form-control" name="user_default_band">
+							<select id="user_default_band" class="form-select" name="user_default_band">
 								<option value="All">All</option>;
 							<?php foreach($bands as $band) {
 								echo '<option value="'.$band.'"';
@@ -586,8 +586,8 @@
 							} ?>
 							</select>
 						</div>
-						<div class="form-group">
-							<label class="my-1 mr-2"><?php echo lang('account_qsl_settings'); ?></label>
+						<div class="mb-3">
+							<label class="my-1 me-2"><?php echo lang('account_qsl_settings'); ?></label>
 							<div class="form-check-inline">
 								<?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_qsl" id="user_default_confirmation_qsl"';
 								if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) {
@@ -624,16 +624,16 @@
 				<div class="col-md">
 					<div class="card">
 						<div class="card-header">
-							<?php echo lang('account_winkeyer'); ?> <span class="badge badge-danger"><?php echo lang('admin_experimental'); ?></span>
+							<?php echo lang('account_winkeyer'); ?> <span class="badge text-bg-danger"><?php echo lang('admin_experimental'); ?></span>
 						</div>
 						<div class="card-body">
-							<div class="form-group">
+							<div class="mb-3">
 
 							<p><?php echo lang('account_winkeyer_hint'); ?></p>
 
 							<label><?php echo lang('account_winkeyer_enabled'); ?></label>
 							
-							<select class="custom-select" name="user_winkey" id="user_winkeyer">
+							<select class="form-select" name="user_winkey" id="user_winkeyer">
 								<option value="0" <?php if ($user_winkey == 0) { echo 'selected="selected"'; } ?>><?php echo lang('general_word_no'); ?></option>
 								<option value="1" <?php if ($user_winkey == 1) { echo 'selected="selected"'; } ?>><?php echo lang('general_word_yes'); ?></option>
 							</select>
diff --git a/application/views/user/forgot_password.php b/application/views/user/forgot_password.php
index e33b4e23..910875ac 100644
--- a/application/views/user/forgot_password.php
+++ b/application/views/user/forgot_password.php
@@ -41,13 +41,13 @@ input[type="email"] {
                     <?php endif; ?>
 
                     <form id="register-form" role="form" autocomplete="off" class="form" method="post" action="<?php echo site_url('user/forgot_password'); ?>">
-                        <div class="form-group">
+                        <div class="mb-3">
                             <div class="input-group">
                                 <span class="input-group-addon"><i class="glyphicon glyphicon-envelope color-blue"></i></span>
                                 <input id="email" name="email" placeholder="<?php echo lang('account_email_address'); ?>" class="form-control" type="email" autofocus>
                             </div>
                         </div>
-                        <div class="form-group">
+                        <div class="mb-3">
                             <input name="recover-submit" class="w-100 btn btn-primary btn-block" value="<?php echo lang('account_reset_password'); ?>" type="submit">
                         </div>
                         <input type="hidden" class="hide" name="token" id="token" value="">
diff --git a/application/views/user/reset_password.php b/application/views/user/reset_password.php
index 23184ce7..e83184c2 100644
--- a/application/views/user/reset_password.php
+++ b/application/views/user/reset_password.php
@@ -17,21 +17,21 @@
 
                     <form role="form" autocomplete="off" class="form" method="post" action="<?php echo site_url('user/reset_password'); ?>/<?php echo $reset_code; ?>">
 
-                        <div class="form-group row">
+                        <div class="mb-3 row">
                             <label for="inputPassword" class="col-sm-2 col-form-label"><?php echo lang('account_password'); ?></label>
                             <div class="col-sm-10">
                                 <input type="password" name="password" class="form-control" id="inputPassword" placeholder="<?php echo lang('account_password'); ?>">
                             </div>
                         </div>
 
-                        <div class="form-group row">
+                        <div class="mb-3 row">
                             <label for="inputPassword" class="col-sm-2 col-form-label"><?php echo lang('account_confirm_password'); ?></label>
                             <div class="col-sm-10">
                                 <input type="password" name="password_confirm" class="form-control" id="inputPassword" placeholder="<?php echo lang('account_password'); ?>">
                             </div>
                         </div>
 
-                      <div class="form-group">
+                      <div class="mb-3">
                         <input name="recover-submit" class="btn btn-lg btn-primary btn-block" value="<?php echo lang('account_reset_password'); ?>" type="submit">
                       </div>
                       
diff --git a/application/views/view_log/index.php b/application/views/view_log/index.php
index fceaeff4..d2246acf 100644
--- a/application/views/view_log/index.php
+++ b/application/views/view_log/index.php
@@ -1,7 +1,7 @@
 <div class="alert alert-secondary" role="alert" style="margin-bottom: 0px !important;">
 <div class="container">
 	<?php if ($results) { ?>
-		<p style="margin-bottom: 0px !important;"><?php echo lang('gen_hamradio_logbook'); ?>: <span class="badge badge-info"><?php echo $this->logbooks_model->find_name($this->session->userdata('active_station_logbook')); ?></span> <?php echo lang('general_word_location'); ?>: <span class="badge badge-info"><?php echo $this->stations->find_name(); ?></span></p>
+		<p style="margin-bottom: 0px !important;"><?php echo lang('gen_hamradio_logbook'); ?>: <span class="badge text-bg-info"><?php echo $this->logbooks_model->find_name($this->session->userdata('active_station_logbook')); ?></span> <?php echo lang('general_word_location'); ?>: <span class="badge text-bg-info"><?php echo $this->stations->find_name(); ?></span></p>
 	<?php } ?>
 </div>
 </div>
diff --git a/application/views/view_log/partial/log.php b/application/views/view_log/partial/log.php
index 21da7b51..baf60d9b 100644
--- a/application/views/view_log/partial/log.php
+++ b/application/views/view_log/partial/log.php
@@ -44,8 +44,8 @@
 			<td><a data-fancybox data-type="iframe" data-width="750" data-height="520" data-src="<?php echo site_url('logbook/view')."/".$row->COL_PRIMARY_KEY; ?>" href="javascript:;"><?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?></a>
 			</td>
 			<td><?php echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; ?></td>
-			<td><?php echo $row->COL_RST_SENT; ?> <?php if ($row->COL_STX) { ?><span class="badge badge-light"><?php printf("%03d", $row->COL_STX);?></span><?php } ?><?php if ($row->COL_STX_STRING) { ?><span class="badge badge-light"><?php echo $row->COL_STX_STRING;?></span><?php } ?></td>
-			<td><?php echo $row->COL_RST_RCVD; ?> <?php if ($row->COL_SRX) { ?><span class="badge badge-light"><?php printf("%03d", $row->COL_SRX);?></span><?php } ?><?php if ($row->COL_SRX_STRING) { ?><span class="badge badge-light"><?php echo $row->COL_SRX_STRING;?></span><?php } ?></td>
+			<td><?php echo $row->COL_RST_SENT; ?> <?php if ($row->COL_STX) { ?><span class="badge text-bg-light"><?php printf("%03d", $row->COL_STX);?></span><?php } ?><?php if ($row->COL_STX_STRING) { ?><span class="badge text-bg-light"><?php echo $row->COL_STX_STRING;?></span><?php } ?></td>
+			<td><?php echo $row->COL_RST_RCVD; ?> <?php if ($row->COL_SRX) { ?><span class="badge text-bg-light"><?php printf("%03d", $row->COL_SRX);?></span><?php } ?><?php if ($row->COL_SRX_STRING) { ?><span class="badge text-bg-light"><?php echo $row->COL_SRX_STRING;?></span><?php } ?></td>
 			<?php if($row->COL_SAT_NAME != null) { ?>
 			<td><?php echo $row->COL_SAT_NAME; ?></td>
 			<?php } else { ?>
@@ -114,13 +114,13 @@
 
 				<?php if(isset($row->station_callsign)) { ?>
 				<td>
-					<span class="badge badge-light"><?php echo $row->station_callsign; ?></span>
+					<span class="badge text-bg-light"><?php echo $row->station_callsign; ?></span>
 				</td>
 				<?php } ?>
 
 			<td>
 				<div class="dropdown">
-                    <a class="btn btn-secondary dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    <a class="btn btn-secondary dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                         <i class="fas fa-cog"></i>
                     </a>
 
@@ -173,7 +173,7 @@ $config['next_tag_close'] = '</li>';
 $config['last_tag_open'] = '<li class="page-item">';
 $config['last_tag_close'] = '</li>';
 $config['cur_tag_open'] = '<li class="page-item active"><a href="#" class="page-link">';
-$config['cur_tag_close'] = '<span class="sr-only">(current)</span></a></li>';
+$config['cur_tag_close'] = '<span class="visually-hidden">(current)</span></a></li>';
 $config['num_tag_open'] = '<li class="page-item">';
 $config['num_tag_close'] = '</li>';
     	$this->pagination->initialize($config);
diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php
index cf246c0b..974c9269 100644
--- a/application/views/view_log/partial/log_ajax.php
+++ b/application/views/view_log/partial/log_ajax.php
@@ -23,17 +23,17 @@ function echo_table_col($row, $name) {
 	$ci =& get_instance();
 	switch($name) {
 		case 'Mode':    echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE . '</td>'; break;
-        case 'RSTS':    echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_STX_STRING . '</span>';} echo '</td>'; break;
-        case 'RSTR':    echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';} echo '</td>'; break;
-		case 'Country': echo '<td>' . ucwords(strtolower(($row->name==null?"- NONE -":$row->name))); if ($row->end != null) echo ' <span class="badge badge-danger">'.$ci->lang->line('gen_hamradio_deleted_dxcc').'</span>' . '</td>'; break;
+        case 'RSTS':    echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_STX_STRING . '</span>';} echo '</td>'; break;
+        case 'RSTR':    echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';} echo '</td>'; break;
+		case 'Country': echo '<td>' . ucwords(strtolower(($row->name==null?"- NONE -":$row->name))); if ($row->end != null) echo ' <span class="badge text-bg-danger">'.$ci->lang->line('gen_hamradio_deleted_dxcc').'</span>' . '</td>'; break;
 		case 'IOTA':    echo '<td>' . ($row->COL_IOTA) . '</td>'; break;
 		case 'SOTA':    echo '<td>' . ($row->COL_SOTA_REF) . '</td>'; break;
 		case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF) . '</td>'; break;
 		case 'POTA':    echo '<td>' . ($row->COL_POTA_REF) . '</td>'; break;
 		case 'Grid':    echo '<td>'; echoQrbCalcLink($row->station_gridsquare, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE); echo '</td>'; break;
 		case 'Distance':echo '<td>' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . '&nbsp;km' : '') . '</td>'; break;
-		case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank"><span data-toggle="tooltip" data-original-title="'.$row->COL_BAND.'">'.$row->COL_SAT_NAME.'</span></a></td>'; } else { if ($row->COL_FREQ != null) { echo ' <span data-toggle="tooltip" data-original-title="'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'">'. strtolower($row->COL_BAND).'</span>'; } else { echo strtolower($row->COL_BAND); } } echo '</td>'; break;
-		case 'Frequency':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'; if ($row->COL_FREQ != null) { echo ' <span data-toggle="tooltip" data-original-title="'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'">'.$row->COL_SAT_NAME.'</span>'; } else { echo $row->COL_SAT_NAME; } echo '</a></td>'; } else { if ($row->COL_FREQ != null) { echo ' <span data-toggle="tooltip" data-original-title="'.$row->COL_BAND.'">'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'</span>'; } else { echo strtolower($row->COL_BAND); } } echo '</td>'; break;
+		case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank"><span data-bs-toggle="tooltip" data-original-title="'.$row->COL_BAND.'">'.$row->COL_SAT_NAME.'</span></a></td>'; } else { if ($row->COL_FREQ != null) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'">'. strtolower($row->COL_BAND).'</span>'; } else { echo strtolower($row->COL_BAND); } } echo '</td>'; break;
+		case 'Frequency':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'; if ($row->COL_FREQ != null) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'">'.$row->COL_SAT_NAME.'</span>'; } else { echo $row->COL_SAT_NAME; } echo '</a></td>'; } else { if ($row->COL_FREQ != null) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.$row->COL_BAND.'">'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'</span>'; } else { echo strtolower($row->COL_BAND); } } echo '</td>'; break;
 		case 'State':   echo '<td>' . ($row->COL_STATE) . '</td>'; break;
 		case 'Operator':echo '<td>' . ($row->COL_OPERATOR) . '</td>'; break;
 		case 'Location':echo '<td>' . ($row->station_profile_name) . '</td>'; break;
@@ -112,7 +112,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
                        } elseif ($diff > 7) {
                           $lotw_hint = ' lotw_info_yellow';
                        }
-                       $timestamp = strtotime($row->lastupload); echo ($row->callsign == '' ? '' : ' <a id="lotw_badge" href="https://lotw.arrl.org/lotwuser/act?act='.$row->COL_CALL.'" target="_blank"><small id="lotw_info" class="badge badge-success'.$lotw_hint.'" data-toggle="tooltip" data-original-title="LoTW User. Last upload was '.date($custom_date_format." H:i", $timestamp).'">L</small></a>');
+                       $timestamp = strtotime($row->lastupload); echo ($row->callsign == '' ? '' : ' <a id="lotw_badge" href="https://lotw.arrl.org/lotwuser/act?act='.$row->COL_CALL.'" target="_blank"><small id="lotw_info" class="badge text-bg-success'.$lotw_hint.'" data-bs-toggle="tooltip" data-original-title="LoTW User. Last upload was '.date($custom_date_format." H:i", $timestamp).'">L</small></a>');
                     }
                  ?>
             </td>
@@ -129,16 +129,16 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
                 <span <?php if ($row->COL_QSL_SENT != "N") {
                        switch ($row->COL_QSL_SENT) {
                        case "Y":
-                          echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_sent');
+                          echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_sent');
                           break;
                        case "Q":
-                          echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued');
+                          echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued');
                           break;
                        case "R":
-                          echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested');
+                          echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested');
                           break;
                        case "I":
-                          echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_invalid_ignore');
+                          echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_invalid_ignore');
                           break;
                        default:
                           echo "class=\"qsl-red";
@@ -167,16 +167,16 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
                 <span <?php if ($row->COL_QSL_RCVD != "N") {
                        switch ($row->COL_QSL_RCVD) {
                        case "Y":
-                          echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_received');
+                          echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_received');
                           break;
                        case "Q":
-                          echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued');
+                          echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued');
                           break;
                        case "R":
-                          echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested');
+                          echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested');
                           break;
                        case "I":
-                          echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_invalid_ignore');
+                          echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" data-original-title=\"".lang('general_word_invalid_ignore');
                           break;
                        default:
                           echo "class=\"qsl-red";
@@ -206,8 +206,8 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
 
                 <?php if ($this->session->userdata('user_eqsl_name') != ""){ ?>
                     <td class="eqsl">
-                        <span <?php if ($row->COL_EQSL_QSL_SENT == "Y") { echo "data-original-title=\"".lang('eqsl_short')." ".lang('general_word_sent'); if ($row->COL_EQSL_QSLSDATE != null) { $timestamp = strtotime($row->COL_EQSL_QSLSDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-toggle=\"tooltip\""; } ?> class="eqsl-<?php echo ($row->COL_EQSL_QSL_SENT=='Y')?'green':'red'?>">&#9650;</span>
-                        <span <?php if ($row->COL_EQSL_QSL_RCVD == "Y") { echo "data-original-title=\"".lang('eqsl_short')." ".lang('general_word_received'); if ($row->COL_EQSL_QSLRDATE != null) { $timestamp = strtotime($row->COL_EQSL_QSLRDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-toggle=\"tooltip\""; } ?> class="eqsl-<?php echo ($row->COL_EQSL_QSL_RCVD=='Y')?'green':'red'?>">
+                        <span <?php if ($row->COL_EQSL_QSL_SENT == "Y") { echo "data-original-title=\"".lang('eqsl_short')." ".lang('general_word_sent'); if ($row->COL_EQSL_QSLSDATE != null) { $timestamp = strtotime($row->COL_EQSL_QSLSDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="eqsl-<?php echo ($row->COL_EQSL_QSL_SENT=='Y')?'green':'red'?>">&#9650;</span>
+                        <span <?php if ($row->COL_EQSL_QSL_RCVD == "Y") { echo "data-original-title=\"".lang('eqsl_short')." ".lang('general_word_received'); if ($row->COL_EQSL_QSLRDATE != null) { $timestamp = strtotime($row->COL_EQSL_QSLRDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="eqsl-<?php echo ($row->COL_EQSL_QSL_RCVD=='Y')?'green':'red'?>">
 			    	<?php if($row->COL_EQSL_QSL_RCVD =='Y') { ?>
                         <a class="eqsl-green" href="<?php echo site_url("eqsl/image/".$row->COL_PRIMARY_KEY); ?>" data-fancybox="images" data-width="528" data-height="336">&#9660;</a>
                     <?php } else { ?>
@@ -219,8 +219,8 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
 
                 <?php if($this->session->userdata('user_lotw_name') != "") { ?>
                     <td class="lotw">
-                        <span <?php if ($row->COL_LOTW_QSL_SENT == "Y") { echo "data-original-title=\"".lang('lotw_short')." ".lang('general_word_sent'); if ($row->COL_LOTW_QSLSDATE != null) { $timestamp = strtotime($row->COL_LOTW_QSLSDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-toggle=\"tooltip\""; } ?> class="lotw-<?php echo ($row->COL_LOTW_QSL_SENT=='Y')?'green':'red'?>">&#9650;</span>
-                        <span <?php if ($row->COL_LOTW_QSL_RCVD == "Y") { echo "data-original-title=\"".lang('lotw_short')." ".lang('general_word_received'); if ($row->COL_LOTW_QSLRDATE != null) { $timestamp = strtotime($row->COL_LOTW_QSLRDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-toggle=\"tooltip\""; } ?> class="lotw-<?php echo ($row->COL_LOTW_QSL_RCVD=='Y')?'green':'red'?>">&#9660;</span>
+                        <span <?php if ($row->COL_LOTW_QSL_SENT == "Y") { echo "data-original-title=\"".lang('lotw_short')." ".lang('general_word_sent'); if ($row->COL_LOTW_QSLSDATE != null) { $timestamp = strtotime($row->COL_LOTW_QSLSDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="lotw-<?php echo ($row->COL_LOTW_QSL_SENT=='Y')?'green':'red'?>">&#9650;</span>
+                        <span <?php if ($row->COL_LOTW_QSL_RCVD == "Y") { echo "data-original-title=\"".lang('lotw_short')." ".lang('general_word_received'); if ($row->COL_LOTW_QSLRDATE != null) { $timestamp = strtotime($row->COL_LOTW_QSLRDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="lotw-<?php echo ($row->COL_LOTW_QSL_RCVD=='Y')?'green':'red'?>">&#9660;</span>
                     </td>
                 <?php } ?>
 
@@ -228,14 +228,14 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
 
                     <?php if(isset($row->station_callsign)) { ?>
                         <td>
-                            <span class="badge badge-light"><?php echo $row->station_callsign; ?></span>
+                            <span class="badge text-bg-light"><?php echo $row->station_callsign; ?></span>
                         </td>
                     <?php } ?>
 
             <?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
                 <td>
                     <div class="dropdown">
-                        <a class="btn btn-secondary dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        <a class="btn btn-secondary dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                             <i class="fas fa-cog"></i>
                         </a>
 
@@ -297,7 +297,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
         $config['last_tag_open'] = '<li class="page-item">';
         $config['last_tag_close'] = '</li>';
         $config['cur_tag_open'] = '<li class="page-item active"><a href="#" class="page-link">';
-        $config['cur_tag_close'] = '<span class="sr-only">(current)</span></a></li>';
+        $config['cur_tag_close'] = '<span class="visually-hidden">(current)</span></a></li>';
         $config['num_tag_open'] = '<li class="page-item">';
         $config['num_tag_close'] = '</li>';
         $this->pagination->initialize($config);
diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php
index 11db924f..881589a4 100644
--- a/application/views/view_log/qso.php
+++ b/application/views/view_log/qso.php
@@ -3,15 +3,15 @@
 
     <ul style="margin-bottom: 10px;" class="nav nav-tabs" id="myTab" role="tablist">
         <li class="nav-item">
-            <a class="nav-link active" id="table-tab" data-toggle="tab" href="#qsodetails" role="tab" aria-controls="table" aria-selected="true"><?php echo lang('qso_details'); ?></a>
+            <a class="nav-link active" id="table-tab" data-bs-toggle="tab" href="#qsodetails" role="tab" aria-controls="table" aria-selected="true"><?php echo lang('qso_details'); ?></a>
         </li>
         <li class="nav-item">
-            <a id="station-tab" class="nav-link" data-toggle="tab" href="#stationdetails" role="tab" aria-controls="table" aria-selected="true"><?php echo lang('cloudlog_station_profile'); ?></a>
+            <a id="station-tab" class="nav-link" data-bs-toggle="tab" href="#stationdetails" role="tab" aria-controls="table" aria-selected="true"><?php echo lang('cloudlog_station_profile'); ?></a>
         </li>
         <?php
         if ($row->COL_NOTES != null) {?>
         <li class="nav-item">
-            <a id="notes-tab" class="nav-link" data-toggle="tab" href="#notesdetails" role="tab" aria-controls="table" aria-selected="true"><?php echo "Notes"; ?></a>
+            <a id="notes-tab" class="nav-link" data-bs-toggle="tab" href="#notesdetails" role="tab" aria-controls="table" aria-selected="true"><?php echo "Notes"; ?></a>
         </li>
         <?php }?>
         <?php
@@ -22,11 +22,11 @@
                 echo 'hidden ';
             }
                 echo 'class="qslcardtab nav-item">
-                <a class="nav-link" id="qsltab" data-toggle="tab" href="#qslcard" role="tab" aria-controls="home" aria-selected="false">'. lang('general_word_qslcard') .'</a>
+                <a class="nav-link" id="qsltab" data-bs-toggle="tab" href="#qslcard" role="tab" aria-controls="home" aria-selected="false">'. lang('general_word_qslcard') .'</a>
                 </li>';
 
             echo '<li class="nav-item">
-            <a class="nav-link" id="qslmanagementtab" data-toggle="tab" href="#qslupload" role="tab" aria-controls="home" aria-selected="false">'. lang('general_word_qslcard_management') .'</a>
+            <a class="nav-link" id="qslmanagementtab" data-bs-toggle="tab" href="#qslupload" role="tab" aria-controls="home" aria-selected="false">'. lang('general_word_qslcard_management') .'</a>
             </li>';
         }
 
@@ -39,7 +39,7 @@
                 echo 'hidden ';
             }
                 echo 'class="eqslcardtab nav-item">
-                <a class="nav-link" id="eqsltab" data-toggle="tab" href="#eqslcard" role="tab" aria-controls="home" aria-selected="false">'. $this->lang->line('general_word_eqslcard') .'</a>
+                <a class="nav-link" id="eqsltab" data-bs-toggle="tab" href="#eqslcard" role="tab" aria-controls="home" aria-selected="false">'. $this->lang->line('general_word_eqslcard') .'</a>
                 </li>';
         }
 
@@ -205,7 +205,7 @@
                     <?php if($row->name != null) { ?>
                     <tr>
                         <td><?php echo lang('general_word_country'); ?></td>
-                        <td><?php echo ucwords(strtolower(($row->name)), "- (/"); if ($row->end != null) { echo ' <span class="badge badge-danger">'.lang('gen_hamradio_deleted_dxcc').'</span>'; } ?></td>
+                        <td><?php echo ucwords(strtolower(($row->name)), "- (/"); if ($row->end != null) { echo ' <span class="badge text-bg-danger">'.lang('gen_hamradio_deleted_dxcc').'</span>'; } ?></td>
                     </tr>
                     <?php } ?>
 
@@ -450,7 +450,7 @@
                     <?php if($row->station_country) { ?>
                     <tr>
                         <td><?php echo lang('gen_hamradio_station') . ' ' . lang('general_word_country'); ?></td>
-                        <td><?php echo ucwords(strtolower(($row->station_country)), "- (/"); if ($row->station_end != null) echo ' <span class="badge badge-danger">'.lang('gen_hamradio_deleted_dxcc').'</span>'; ?></td>
+                        <td><?php echo ucwords(strtolower(($row->station_country)), "- (/"); if ($row->station_end != null) echo ' <span class="badge text-bg-danger">'.lang('gen_hamradio_deleted_dxcc').'</span>'; ?></td>
                     </tr>
                     <?php } ?>
 
@@ -516,16 +516,16 @@
             }
             ?>
 
-            <p><div class="alert alert-warning" role="alert"><span class="badge badge-warning"><?php echo lang('general_word_warning'); ?></span> <?php echo lang('gen_max_file_upload_size'); ?> <?php echo $max_upload; ?>B.</div></p>
+            <p><div class="alert alert-warning" role="alert"><span class="badge text-bg-warning"><?php echo lang('general_word_warning'); ?></span> <?php echo lang('gen_max_file_upload_size'); ?> <?php echo $max_upload; ?>B.</div></p>
 
             <form class="form" id="fileinfo" name="fileinfo" enctype="multipart/form-data">
             <div class="row">
                 <div class="col-md">
                         <fieldset>
 
-                            <div class="form-group">
+                            <div class="mb-3">
                                 <label for="qslcardfront"><?php echo lang('qslcard_upload_front'); ?></label>
-                                <input class="form-control-file" type="file" id="qslcardfront" name="qslcardfront" accept="image/*" >
+                                <input class="form-control" type="file" id="qslcardfront" name="qslcardfront" accept="image/*" >
                             </div>
 
                             <input type="hidden" class="form-control" id="qsoinputid" name="qsoid" value="<?php echo $row->COL_PRIMARY_KEY; ?>">
@@ -533,9 +533,9 @@
 
                 </div>
                 <div class="col-md">
-                            <div class="form-group">
+                            <div class="mb-3">
                                 <label for="qslcardback"><?php echo lang('qslcard_upload_back'); ?></label>
-                                <input class="form-control-file" type="file" id="qslcardback" name="qslcardback" accept="image/*">
+                                <input class="form-control" type="file" id="qslcardback" name="qslcardback" accept="image/*">
                             </div>
 
                         </fieldset>
diff --git a/application/views/visitor/index.php b/application/views/visitor/index.php
index d92f508b..d6029d30 100644
--- a/application/views/visitor/index.php
+++ b/application/views/visitor/index.php
@@ -20,8 +20,8 @@ function echo_table_col($row, $name) {
 	$ci =& get_instance();
 	switch($name) {
 		case 'Mode':    echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE . '</td>'; break;
-      case 'RSTS':    echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_STX_STRING . '</span>';} echo '</td>'; break;
-      case 'RSTR':    echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo ' <span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';} echo '</td>'; break;
+      case 'RSTS':    echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_STX_STRING . '</span>';} echo '</td>'; break;
+      case 'RSTR':    echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo ' <span data-bs-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';} echo '</td>'; break;
 		case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY))) . '</td>'; break;
 		case 'IOTA':    echo '<td>' . ($row->COL_IOTA) . '</td>'; break;
 		case 'SOTA':    echo '<td>' . ($row->COL_SOTA_REF) . '</td>'; break;
@@ -154,7 +154,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
 				<td width="50%"><?php echo $total_countries; ?></td>
 			</tr>
 			<tr>
-				<td width="50%"><a href="#" onclick="return false" data-original-title="QSL Cards / eQSL / LoTW" data-toggle="tooltip"><?php echo lang('general_word_confirmed'); ?></a></td>
+				<td width="50%"><a href="#" onclick="return false" data-original-title="QSL Cards / eQSL / LoTW" data-bs-toggle="tooltip"><?php echo lang('general_word_confirmed'); ?></a></td>
 				<td width="50%">
 					<?php echo $total_countries_confirmed_paper; ?> /
 					<?php echo $total_countries_confirmed_eqsl; ?> /
diff --git a/application/views/visitor/layout/footer.php b/application/views/visitor/layout/footer.php
index d51f5bba..18913d88 100644
--- a/application/views/visitor/layout/footer.php
+++ b/application/views/visitor/layout/footer.php
@@ -26,7 +26,7 @@
     <script id="leafembed" type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/leafembed.js" tileUrl="<?php echo $this->optionslib->get_option('map_tile_server');?>"></script>
     <script type="text/javascript">
       $(function () {
-        $('[data-toggle="tooltip"]').tooltip()
+        $('[data-bs-toggle="tooltip"]').tooltip()
       });
 
         <?php if(isset($qra) && $qra == "set") { ?>
@@ -162,7 +162,7 @@
 				  if (count > 0) {
 					  $('#square_number').text(loc_4char);
 					  $('#exampleModal').modal('show');
-					  $('[data-toggle="tooltip"]').tooltip({ boundary: 'window' });
+					  $('[data-bs-toggle="tooltip"]').tooltip({ boundary: 'window' });
 				  }
 			  }
 		  });
diff --git a/application/views/visitor/layout/header.php b/application/views/visitor/layout/header.php
index f83b58aa..ecb09888 100644
--- a/application/views/visitor/layout/header.php
+++ b/application/views/visitor/layout/header.php
@@ -47,7 +47,7 @@
 			echo '<a class="navbar-brand" href="' . site_url() .'">Cloudlog</a>';
 		}
 		?>
-	<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
+	<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
 
 	<div class="collapse navbar-collapse" id="navbarNav">
 
@@ -78,7 +78,7 @@
 			$this->CI =& get_instance();
 			if ($this->CI->public_search_enabled($slug) || $this->session->userdata('user_type') >= 2) { ?>
 				<form method="post" name="searchForm" action="<?php echo site_url('visitor/search'); ?>" onsubmit="return validateForm()" class="form-inline">
-            <input class="form-control mr-sm-2" id="searchcall" type="search" name="callsign" placeholder="<?php echo lang('menu_search_text'); ?>" <?php if (isset($callsign) && $callsign != '') { echo 'value="'.strtoupper($callsign).'"'; } ?> aria-label="Search" data-toogle="tooltip" data-placement="bottom" data-original-title="Please enter a callsign!">
+            <input class="form-control me-sm-2" id="searchcall" type="search" name="callsign" placeholder="<?php echo lang('menu_search_text'); ?>" <?php if (isset($callsign) && $callsign != '') { echo 'value="'.strtoupper($callsign).'"'; } ?> aria-label="Search" data-toogle="tooltip" data-bs-placement="bottom" data-original-title="Please enter a callsign!">
 					<input type="hidden" name="public_slug" value="<?php echo $slug; ?>">
 					<button class="btn btn-outline-success my-2 my-sm-0" type="submit"><i class="fas fa-search"></i> <?php echo lang('menu_search_button'); ?></button>
 				</form>
diff --git a/application/views/webadif/export.php b/application/views/webadif/export.php
index 80cabaa5..a59aaa96 100644
--- a/application/views/webadif/export.php
+++ b/application/views/webadif/export.php
@@ -7,10 +7,10 @@
         <div class="card-header">
 			<ul class="nav nav-tabs card-header-tabs pull-right" role="tablist">
 				<li class="nav-item">
-					<a class="nav-link active" id="export-tab" data-toggle="tab" href="#export" role="tab" aria-controls="import" aria-selected="true">Upload Logbook</a>
+					<a class="nav-link active" id="export-tab" data-bs-toggle="tab" href="#export" role="tab" aria-controls="import" aria-selected="true">Upload Logbook</a>
 				</li>
 				<li class="nav-item">
-					<a class="nav-link" id="mark-tab" data-toggle="tab" href="#mark" role="tab" aria-controls="export" aria-selected="false">Mark QSOs</a>
+					<a class="nav-link" id="mark-tab" data-bs-toggle="tab" href="#mark" role="tab" aria-controls="export" aria-selected="false">Mark QSOs</a>
 				</li>
 			</ul>
 
@@ -31,7 +31,7 @@
                if ($queuedqsos > 0) {
 				?>
 				<p>You need to set a QO-100 Dx Club API key in your station profile. Only station profiles with an API Key are displayed.</p>
-				<p><span class="badge badge-warning">Warning</span> This might take a while as QSO uploads are processed sequentially.</p>
+				<p><span class="badge text-bg-warning">Warning</span> This might take a while as QSO uploads are processed sequentially.</p>
 				<?php
             echo '
 
@@ -85,18 +85,18 @@
 				if ($station_profiles->result()!==[]){
 				?>
 				<form class="form" action="<?php echo site_url('webadif/mark_webadif'); ?>" method="post" enctype="multipart/form-data">
-					<select name="station_profile" class="custom-select mb-4 mr-sm-4" style="width: 30%;">
+					<select name="station_profile" class="form-select mb-4 me-sm-4" style="width: 30%;">
 						<option value="0">Select Station Location</option>
 						<?php foreach ($station_profiles->result() as $station) { ?>
 							<option value="<?php echo $station->station_id; ?>">Callsign: <?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
 						<?php } ?>
 					</select>
-					<p><span class="badge badge-warning">Warning</span> If a date range is not selected then all QSOs will be marked!</p>
+					<p><span class="badge text-bg-warning">Warning</span> If a date range is not selected then all QSOs will be marked!</p>
 					<p class="card-text">From date:</p>
 					<div class="row">
 						<div class="input-group date col-md-3" id="datetimepicker5" data-target-input="nearest">
-							<input name="from" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker1"/>
-							<div class="input-group-append"  data-target="#datetimepicker5" data-toggle="datetimepicker">
+							<input name="from" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-bs-target="#datetimepicker1"/>
+							<div class="input-group-append"  data-bs-target="#datetimepicker5" data-bs-toggle="datetimepicker">
 								<div class="input-group-text"><i class="fa fa-calendar"></i></div>
 							</div>
 						</div>
@@ -104,8 +104,8 @@
 					<p class="card-text">To date:</p>
 					<div class="row">
 						<div class="input-group date col-md-3" id="datetimepicker6" data-target-input="nearest">
-							<input name="to" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker2"/>
-							<div class="input-group-append" data-target="#datetimepicker6" data-toggle="datetimepicker">
+							<input name="to" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-bs-target="#datetimepicker2"/>
+							<div class="input-group-append" data-bs-target="#datetimepicker6" data-bs-toggle="datetimepicker">
 								<div class="input-group-text"><i class="fa fa-calendar"></i></div>
 							</div>
 						</div>
diff --git a/application/views/welcome/index.php b/application/views/welcome/index.php
index cac64152..36f8b2fb 100644
--- a/application/views/welcome/index.php
+++ b/application/views/welcome/index.php
@@ -18,12 +18,12 @@
     <?php if(ENVIRONMENT != "production") { ?>
     <div class="card">
 	  <div class="card-header">
-      <span class="badge badge-danger">File Change</span> /index.php - Turn off debugging messages
+      <span class="badge text-bg-danger">File Change</span> /index.php - Turn off debugging messages
 	  </div>
 	  <div class="card-body">
         <p class="card-text">While some users love seeing errors even the development messages most don't so we recommend turning it off..</p>
         
-        <p class="card-text">Edit <span class="badge badge-dark">/index.php</span> and find <code>define('ENVIRONMENT', 'development');</code> and replace with</p>
+        <p class="card-text">Edit <span class="badge text-bg-dark">/index.php</span> and find <code>define('ENVIRONMENT', 'development');</code> and replace with</p>
         
         <code>
             define('ENVIRONMENT', 'production');
@@ -37,12 +37,12 @@
     <?php if($this->config->item('auth_level')[3] != "Operator") { ?>
 	<div class="card">
 	  <div class="card-header">
-      <span class="badge badge-danger">File Change</span> /application/config/config.php - Changes
+      <span class="badge text-bg-danger">File Change</span> /application/config/config.php - Changes
 	  </div>
 	  <div class="card-body">
         <p class="card-text">As part of fully supporting multi-user, we recommend making some changes to the role names as shown below, "Operators" do not have the admin features.</p>
         
-        <p class="card-text">Edit <span class="badge badge-dark">/application/config/config.php</span> and find $config['auth_level'] and replace the options with only the ones below.</p>
+        <p class="card-text">Edit <span class="badge text-bg-dark">/application/config/config.php</span> and find $config['auth_level'] and replace the options with only the ones below.</p>
         
         <code>
             $config['auth_level'][3] = "Operator";<br>
diff --git a/src/QSLManager/QSO.php b/src/QSLManager/QSO.php
index 831bea73..80ed37e3 100644
--- a/src/QSLManager/QSO.php
+++ b/src/QSLManager/QSO.php
@@ -236,16 +236,16 @@ class QSO
 		if ($data['COL_QSL_SENT'] != "N") {
 			switch ($data['COL_QSL_SENT']) {
 			case "Y":
-				$qslstring .= "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".$CI->lang->line('general_word_sent');
+				$qslstring .= "class=\"qsl-green\" data-bs-toggle=\"tooltip\" data-original-title=\"".$CI->lang->line('general_word_sent');
 				break;
 			case "Q":
-				$qslstring .= "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$CI->lang->line('general_word_queued');
+				$qslstring .= "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".$CI->lang->line('general_word_queued');
 				break;
 			case "R":
-				$qslstring .= "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$CI->lang->line('general_word_requested');
+				$qslstring .= "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".$CI->lang->line('general_word_requested');
 				break;
 			case "I":
-				$qslstring .= "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".$CI->lang->line('general_word_invalid_ignore');
+				$qslstring .= "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" data-original-title=\"".$CI->lang->line('general_word_invalid_ignore');
 				break;
 			default:
 			$qslstring .= "class=\"qsl-red";
@@ -281,16 +281,16 @@ class QSO
 			if ($data['COL_QSL_RCVD'] != "N") {
 				switch ($data['COL_QSL_RCVD']) {
 					case "Y":
-						$qslstring .= "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".$CI->lang->line('general_word_received');
+						$qslstring .= "class=\"qsl-green\" data-bs-toggle=\"tooltip\" data-original-title=\"".$CI->lang->line('general_word_received');
 					break;
 					case "Q":
-						$qslstring .= "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$CI->lang->line('general_word_queued');
+						$qslstring .= "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".$CI->lang->line('general_word_queued');
 					break;
 					case "R":
-						$qslstring .= "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$CI->lang->line('general_word_requested');
+						$qslstring .= "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" data-original-title=\"".$CI->lang->line('general_word_requested');
 					break;
 					case "I":
-						$qslstring .= "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".$CI->lang->line('general_word_invalid_ignore');
+						$qslstring .= "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" data-original-title=\"".$CI->lang->line('general_word_invalid_ignore');
 					break;
 					default:
 					$qslstring .= "class=\"qsl-red";
@@ -340,7 +340,7 @@ class QSO
 				$timestamp = strtotime($data['COL_LOTW_QSLSDATE']);
 				$lotwstring .= " ". ($timestamp != '' ? date($custom_date_format, $timestamp) : '');
 			}
-			$lotwstring .= "\" data-toggle=\"tooltip\"";
+			$lotwstring .= "\" data-bs-toggle=\"tooltip\"";
 		}
 
 		$lotwstring .= ' class="lotw-' . (($data['COL_LOTW_QSL_SENT']=='Y') ? 'green' : 'red') . '">&#9650;</span>';
@@ -354,7 +354,7 @@ class QSO
 				$lotwstring .=  " ". ($timestamp != '' ? date($custom_date_format, $timestamp) : '');
 			}
 
-			$lotwstring .= "\" data-toggle=\"tooltip\"";
+			$lotwstring .= "\" data-bs-toggle=\"tooltip\"";
 		}
 
 		$lotwstring .= ' class="lotw-' . (($data['COL_LOTW_QSL_RCVD']=='Y') ? 'green':'red') . '">&#9660;</span>';
@@ -379,7 +379,7 @@ class QSO
 				$eqslstring .=  " ".($timestamp!=''?date($custom_date_format, $timestamp):'');
 			}
 
-			$eqslstring .= "\" data-toggle=\"tooltip\"";
+			$eqslstring .= "\" data-bs-toggle=\"tooltip\"";
 		}
 
 		$eqslstring .= ' class="eqsl-' . (($data['COL_EQSL_QSL_SENT'] =='Y') ? 'green':'red') . '">&#9650;</span><span ';
@@ -391,7 +391,7 @@ class QSO
 				$timestamp = strtotime($data['COL_EQSL_QSLRDATE']);
 				$eqslstring .= " ".($timestamp!=''?date($custom_date_format, $timestamp):'');
 			}
-			$eqslstring .= "\" data-toggle=\"tooltip\"";
+			$eqslstring .= "\" data-bs-toggle=\"tooltip\"";
 		}
 
 		$eqslstring .= ' class="eqsl-' . (($data['COL_EQSL_QSL_RCVD'] =='Y')?'green':'red') . '">';
diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index d45b0e6b..12ee8ccd 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -406,7 +406,7 @@ if ( ! function_exists('form_dropdown'))
 
 		$multiple = (count($selected) > 1 && stripos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : '';
 
-		$form = '<select class="custom-select" '.rtrim(_parse_form_attributes($data, $defaults)).$extra.$multiple.">\n";
+		$form = '<select class="form-select" '.rtrim(_parse_form_attributes($data, $defaults)).$extra.$multiple.">\n";
 
 		foreach ($options as $key => $val)
 		{