diff --git a/ajax/ajax_account_edit.php b/ajax/ajax_account_edit.php
index d535d638..7380821a 100644
--- a/ajax/ajax_account_edit.php
+++ b/ajax/ajax_account_edit.php
@@ -14,16 +14,16 @@ $account_notes = nullable_htmlentities($row['account_notes']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-piggy-bank mr-2"></i>Editing account: <strong><?php echo $account_name; ?></strong></h5>
-    <button type="button" class="close text-white" data-dismiss="modal">
+    <button type="button" class="close text-light" data-dismiss="modal">
         <span>&times;</span>
     </button>
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="account_id" value="<?php echo $account_id; ?>">
     <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
         <div class="form-group">
             <label>Account Name <strong class="text-danger">*</strong></label>
             <div class="input-group">
@@ -40,7 +40,7 @@ ob_start();
         </div>
     
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_account" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
diff --git a/ajax/ajax_admin_mail_queue_message_view.php b/ajax/ajax_admin_mail_queue_message_view.php
index d3e4a0e5..0de43eab 100644
--- a/ajax/ajax_admin_mail_queue_message_view.php
+++ b/ajax/ajax_admin_mail_queue_message_view.php
@@ -43,13 +43,13 @@ if ($email_status == 0) {
 // Generate the HTML form content using output buffering.
 ob_start();
 ?>
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class='fas fa-fw fa-envelope-open mr-2'></i><strong><?php echo $email_subject; ?></strong></h5>
-    <button type="button" class="close text-white" data-dismiss="modal">
+    <button type="button" class="close text-light" data-dismiss="modal">
         <span>&times;</span>
     </button>
 </div>
-<div class="modal-body bg-white">
+<div class="modal-body">
     <div class="row">
         <div class="col-md-1">
             <span class="text-secondary">From:</span>
diff --git a/ajax/ajax_ai_model_edit.php b/ajax/ajax_ai_model_edit.php
index 5d75d8fe..2a3307d6 100644
--- a/ajax/ajax_ai_model_edit.php
+++ b/ajax/ajax_ai_model_edit.php
@@ -17,9 +17,9 @@ $prompt = nullable_htmlentities($row['ai_model_prompt']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-robot mr-2"></i>Editing: <strong><?php echo $model_name; ?></strong></h5>
-    <button type="button" class="close text-white" data-dismiss="modal">
+    <button type="button" class="close text-light" data-dismiss="modal">
         <span>&times;</span>
     </button>
 </div>
@@ -27,7 +27,7 @@ ob_start();
     <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
     <input type="hidden" name="model_id" value="<?php echo $model_id; ?>">
 
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <label>Provider <strong class="text-danger">*</strong></label>
@@ -79,7 +79,7 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_ai_model" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
diff --git a/ajax/ajax_ai_provider_edit.php b/ajax/ajax_ai_provider_edit.php
index e228c279..c5aaf113 100644
--- a/ajax/ajax_ai_provider_edit.php
+++ b/ajax/ajax_ai_provider_edit.php
@@ -15,9 +15,9 @@ $key = nullable_htmlentities($row['ai_provider_api_key']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-robot mr-2"></i>Editing: <strong><?php echo $provider_name; ?></strong></h5>
-    <button type="button" class="close text-white" data-dismiss="modal">
+    <button type="button" class="close text-light" data-dismiss="modal">
         <span>&times;</span>
     </button>
 </div>
@@ -25,7 +25,7 @@ ob_start();
     <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
     <input type="hidden" name="provider_id" value="<?php echo $provider_id; ?>">
 
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <label>Provider Name <strong class="text-danger">*</strong></label>
@@ -58,7 +58,7 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_ai_provider" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
diff --git a/ajax/ajax_asset_copy.php b/ajax/ajax_asset_copy.php
index 3a47c387..18b5f8e0 100644
--- a/ajax/ajax_asset_copy.php
+++ b/ajax/ajax_asset_copy.php
@@ -44,9 +44,9 @@ $device_icon = getAssetIcon($asset_type);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class='fa fa-fw fa-<?php echo $device_icon; ?> mr-2'></i>Copying asset: <strong><?php echo $asset_name; ?></strong></h5>
-    <button type="button" class="close text-white" data-dismiss="modal">
+    <button type="button" class="close text-light" data-dismiss="modal">
         <span>&times;</span>
     </button>
 </div>
diff --git a/js/ajax_modal.js b/js/ajax_modal.js
index 6bb8974c..357a5e96 100644
--- a/js/ajax_modal.js
+++ b/js/ajax_modal.js
@@ -43,7 +43,7 @@ $(document).on('click', '[data-toggle="ajax-modal"]', function (e) {
             var modalHtml = 
                 '<div class="modal fade" id="' + modalId + '" tabindex="-1">' +
                 '    <div class="modal-dialog modal-'+ modalSize +'">' +
-                '       <div class="modal-content bg-dark">'
+                '       <div class="modal-content border-dark">'
                             + response.content +
                 '        </div>' +
                 '    </div>' +
diff --git a/modals/client_add_modal.php b/modals/client_add_modal.php
index 4aba1450..b7b15ba0 100644
--- a/modals/client_add_modal.php
+++ b/modals/client_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addClientModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content border-dark">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-user-plus mr-2"></i>Creating New <?php if($leads_filter == 0){ echo "Client"; } else { echo "Lead"; } ?></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <ul class="nav nav-pills nav-justified mb-3">
                         <li class="nav-item">
@@ -371,7 +371,7 @@
 
                     </div>
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_client" class="btn btn-primary text-bold" onclick="promptPrimaryContact()"><i class="fa fa-check mr-2"></i>Create</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Close</button>
                 </div>