diff --git a/macro_areas.php b/macro_areas.php
index 9b001d8..dd94044 100644
--- a/macro_areas.php
+++ b/macro_areas.php
@@ -82,7 +82,7 @@ $macro_areas = $stmt->fetchAll(PDO::FETCH_ASSOC);
                 <span class="icon text-white-50"><i class="fas fa-print"></i></span>
                 <span class="text">Imprimir Lista</span>
             </button>
-            <button class="btn btn-primary btn-icon-split" data-toggle="modal" data-target="#macroAreaModal">
+            <button class="btn btn-primary btn-icon-split" data-bs-toggle="modal" data-bs-target="#macroAreaModal">
                 <span class="icon text-white-50"><i class="fas fa-plus"></i></span>
                 <span class="text">Nova Macro Área</span>
             </button>
@@ -92,9 +92,7 @@ $macro_areas = $stmt->fetchAll(PDO::FETCH_ASSOC);
     <?php if ($error): ?>
         <div class="alert alert-danger alert-dismissible fade show" role="alert">
             <?php echo $error; ?>
-            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-            </button>
+            <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
         </div>
     <?php endif; ?>
 
@@ -130,8 +128,8 @@ $macro_areas = $stmt->fetchAll(PDO::FETCH_ASSOC);
                                             data-nome="<?php echo htmlspecialchars($area['nome']); ?>"
                                             data-descricao="<?php echo htmlspecialchars($area['descricao']); ?>"
                                             data-ativo="<?php echo $area['ativo']; ?>"
-                                            data-toggle="modal"
-                                            data-target="#macroAreaModal">
+                                            data-bs-toggle="modal"
+                                            data-bs-target="#macroAreaModal">
                                         <i class="fas fa-edit"></i>
                                     </button>
                                     <a href="macro_areas.php?delete=<?php echo $area['id']; ?>" class="btn btn-danger btn-circle btn-sm" onclick="return confirm('Tem certeza que deseja excluir este item?');">
@@ -153,33 +151,31 @@ $macro_areas = $stmt->fetchAll(PDO::FETCH_ASSOC);
 </div>
 
 <!-- Modal -->
-<div class="modal fade" id="macroAreaModal" tabindex="-1" role="dialog" aria-labelledby="macroAreaModalLabel" aria-hidden="true">
-  <div class="modal-dialog" role="document">
+<div class="modal fade" id="macroAreaModal" tabindex="-1" aria-labelledby="macroAreaModalLabel" aria-hidden="true">
+  <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
         <h5 class="modal-title" id="macroAreaModalLabel">Nova Macro Área</h5>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
-        </button>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
       </div>
       <form id="macroAreaForm" method="POST" action="macro_areas.php">
         <div class="modal-body">
             <input type="hidden" name="id" id="macroAreaId">
-            <div class="form-group">
-                <label for="macroAreaNome">Nome *</label>
+            <div class="mb-3">
+                <label for="macroAreaNome" class="form-label">Nome *</label>
                 <input type="text" class="form-control" id="macroAreaNome" name="nome" placeholder="Ex: Moradia, Alimentação, Saúde" required>
             </div>
-            <div class="form-group">
-                <label for="macroAreaDescricao">Descrição</label>
+            <div class="mb-3">
+                <label for="macroAreaDescricao" class="form-label">Descrição</label>
                 <textarea class="form-control" id="macroAreaDescricao" name="descricao" rows="3" placeholder="Descrição opcional da macro área"></textarea>
             </div>
-            <div class="form-group form-check form-switch">
+            <div class="mb-3 form-check form-switch">
                 <input type="checkbox" class="form-check-input" id="macroAreaAtivo" name="ativo" value="1" checked>
                 <label class="form-check-label" for="macroAreaAtivo">Ativo</label>
             </div>
         </div>
         <div class="modal-footer">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancelar</button>
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancelar</button>
           <button type="submit" class="btn btn-primary">Salvar</button>
         </div>
       </form>