diff --git a/app/plugins/blog/templates/blog.tpl b/app/plugins/blog/templates/blog.tpl
index eceda38..576402a 100644
--- a/app/plugins/blog/templates/blog.tpl
+++ b/app/plugins/blog/templates/blog.tpl
@@ -39,11 +39,11 @@
         {TEMPLATE_CSS_INCLUDES}
     </head>
     <body>
-        <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+        <nav class="navbar navbar-inverse navbar-fixed-top">
             <!--Brand and toggle should get grouped for better mobile display -->
             <div class="navbar-header">
                 <a href="{ROOT_URL}" class="navbar-brand">{SITENAME}</a>
-                <button type="button" class="navbar-toggler" data-toggle="collapse" data-target=".navbar-ex1-collapse" style="">
+                <button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target=".navbar-ex1-collapse" style="">
                     <span class="sr-only">Toggle navigation</span>
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
diff --git a/app/plugins/blog/views/admin/dashboard.html b/app/plugins/blog/views/admin/dashboard.html
index a13cc4f..0f64a36 100644
--- a/app/plugins/blog/views/admin/dashboard.html
+++ b/app/plugins/blog/views/admin/dashboard.html
@@ -14,9 +14,9 @@
         <tr>
             <td>{title}</td>
             <td>{contentSummary}</td>
-            <td><a href="{ROOT_URL}admin/blog/view/{ID}" class="btn btn-sm btn-primary" role="button"><i class="fa fa-fw fa-upload"></i></a></td>
-            <td><a href="{ROOT_URL}admin/blog/edit/{ID}" class="btn btn-sm btn-warning" role="button"><i class="fa fa-fw fa-pencil-square"></i></a></td>
-            <td width="30px"><a href="{ROOT_URL}admin/blog/delete/{ID}" class="btn btn-sm btn-danger" role="button"><i class="fa fa-fw fa-trash"></i></a></td>
+            <td><a href="{ROOT_URL}admin/blog/view/{ID}" class="btn btn-sm btn-primary"><i class="fa fa-fw fa-upload"></i></a></td>
+            <td><a href="{ROOT_URL}admin/blog/edit/{ID}" class="btn btn-sm btn-warning"><i class="fa fa-fw fa-pencil-square"></i></a></td>
+            <td width="30px"><a href="{ROOT_URL}admin/blog/delete/{ID}" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></a></td>
         </tr>
         {/LOOP}
         {ALT}
diff --git a/app/plugins/blog/views/admin/list.html b/app/plugins/blog/views/admin/list.html
index e7a51d9..702eea4 100644
--- a/app/plugins/blog/views/admin/list.html
+++ b/app/plugins/blog/views/admin/list.html
@@ -24,8 +24,8 @@
                 <td>{commentCount}</td>
                 <td>{DTC}{created}{/DTC}</td>
                 <td>{DTC}{edited}{/DTC}</td>
-                <td><a href="{ROOT_URL}admin/blog/edit/{ID}" class="btn btn-sm btn-warning" role="button"><i class="fa fa-fw fa-pencil-square"></i></a></td>
-                <td><a href="{ROOT_URL}admin/blog/delete/{ID}" class="btn btn-sm btn-danger" role="button"><i class="fa fa-fw fa-trash"></i></a></td>
+                <td><a href="{ROOT_URL}admin/blog/edit/{ID}" class="btn btn-sm btn-warning"><i class="fa fa-fw fa-pencil-square"></i></a></td>
+                <td><a href="{ROOT_URL}admin/blog/delete/{ID}" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></a></td>
                 <td>
                     <input type="checkbox" value="{ID}" name="B_[]">
                 </td>
@@ -40,6 +40,6 @@
             {/ALT}
         </tbody>
     </table>
-    <a href="{ROOT_URL}admin/blog/create" class="btn btn-sm btn-primary" role="button">Create</a>
+    <a href="{ROOT_URL}admin/blog/create" class="btn btn-sm btn-primary">Create</a>
     <button name="submit" value="submit" type="submit" class="btn btn-sm btn-danger">Delete</button>
 </form>
\ No newline at end of file
diff --git a/app/plugins/blog/views/admin/view.html b/app/plugins/blog/views/admin/view.html
index f559660..19ed608 100644
--- a/app/plugins/blog/views/admin/view.html
+++ b/app/plugins/blog/views/admin/view.html
@@ -2,8 +2,8 @@
     <div class="col-sm-8 blog-main">
             <h1>{title} <small>{DTC}{created}{/DTC} by <a href="{ROOT_URL}admin/users/view/{author}">{authorName}</a></small></h1>
         <div class="well">{content}</div>
-        <a href="{ROOT_URL}admin/blog/delete/{ID}" class="btn btn-md btn-danger" role="button">Delete</a>
-        <a href="{ROOT_URL}admin/blog/edit/{ID}" class="btn btn-md btn-warning" role="button">Edit</a>
-        <a href="{ROOT_URL}admin/comments/blog/{ID}" class="btn btn-md btn-primary" role="button">View Comments</a>
+        <a href="{ROOT_URL}admin/blog/delete/{ID}" class="btn btn-md btn-danger">Delete</a>
+        <a href="{ROOT_URL}admin/blog/edit/{ID}" class="btn btn-md btn-warning">Edit</a>
+        <a href="{ROOT_URL}admin/comments/blog/{ID}" class="btn btn-md btn-primary">View Comments</a>
     </div><!-- /.blog-main -->
 </div><!-- /.row -->
\ No newline at end of file
diff --git a/app/plugins/blog/views/post.html b/app/plugins/blog/views/post.html
index 9a55303..bd0a8c9 100644
--- a/app/plugins/blog/views/post.html
+++ b/app/plugins/blog/views/post.html
@@ -7,8 +7,8 @@
             {content}
             {ADMIN}
                 <hr>
-                <a href="{ROOT_URL}admin/blog/delete/{ID}" class="btn btn-md btn-danger" role="button">Delete</a>
-                <a href="{ROOT_URL}admin/blog/edit/{ID}" class="btn btn-md btn-warning" role="button">Edit</a>
+                <a href="{ROOT_URL}admin/blog/delete/{ID}" class="btn btn-md btn-danger">Delete</a>
+                <a href="{ROOT_URL}admin/blog/edit/{ID}" class="btn btn-md btn-warning">Edit</a>
                 <hr>
             {/ADMIN}
         </div><!-- /.blog-post -->
diff --git a/app/plugins/bugreport/views/admin/list.html b/app/plugins/bugreport/views/admin/list.html
index b62e48a..7f4d302 100644
--- a/app/plugins/bugreport/views/admin/list.html
+++ b/app/plugins/bugreport/views/admin/list.html
@@ -20,8 +20,8 @@
 				<td align="center">{ID}</td>
 				<td align="center">{DTC}{time}{/DTC}</td>
 				<td>{description}</td>
-				<td><a href="{ROOT_URL}admin/bugreport/view/{ID}" class="btn btn-sm btn-primary" role="button"><i class="fa fa-fw fa-upload"></i></a></td>
-                <td><a href="{ROOT_URL}admin/bugreport/delete/{ID}" class="btn btn-sm btn-danger" role="button"><i class="fa fa-fw fa-trash"></i></a></td>
+				<td><a href="{ROOT_URL}admin/bugreport/view/{ID}" class="btn btn-sm btn-primary"><i class="fa fa-fw fa-upload"></i></a></td>
+                <td><a href="{ROOT_URL}admin/bugreport/delete/{ID}" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></a></td>
 				<td>
 					<input type="checkbox" value="{ID}" name="BR_[]">
 				</td>
diff --git a/app/plugins/comments/views/admin/dashboard.html b/app/plugins/comments/views/admin/dashboard.html
index 49f63ec..7fc7b6d 100644
--- a/app/plugins/comments/views/admin/dashboard.html
+++ b/app/plugins/comments/views/admin/dashboard.html
@@ -13,8 +13,8 @@
         <tr>
             <td>{authorName}</td>
             <td>{content}</td>
-            <td><a href="{ROOT_URL}admin/comments/edit/{ID}" class="btn btn-sm btn-warning" role="button"><i class="fa fa-fw fa-pencil-square"></i></a></td>
-            <td><a href="{ROOT_URL}admin/comments/delete/{ID}" class="btn btn-sm btn-danger" role="button"><i class="fa fa-fw fa-trash"></i></a></td>
+            <td><a href="{ROOT_URL}admin/comments/edit/{ID}" class="btn btn-sm btn-warning"><i class="fa fa-fw fa-pencil-square"></i></a></td>
+            <td><a href="{ROOT_URL}admin/comments/delete/{ID}" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></a></td>
         </tr>
         {/LOOP}
         {ALT}
diff --git a/app/plugins/comments/views/admin/list.html b/app/plugins/comments/views/admin/list.html
index 1a7d600..37b460d 100644
--- a/app/plugins/comments/views/admin/list.html
+++ b/app/plugins/comments/views/admin/list.html
@@ -22,8 +22,8 @@
                 <td><a href="{ROOT_URL}admin/blog/view/{contentID}">{contentTitle}</a></td>
                 <td>{content}</td>
                 <td>{DTC}{created}{/DTC}</td> 
-                <td><a href="{ROOT_URL}admin/comments/edit/{ID}" class="btn btn-sm btn-warning" role="button"><i class="fa fa-fw fa-pencil-square"></i></a></td>
-                <td><a href="{ROOT_URL}admin/comments/delete/{ID}" class="btn btn-sm btn-danger" role="button"><i class="fa fa-fw fa-trash"></i></a></td>
+                <td><a href="{ROOT_URL}admin/comments/edit/{ID}" class="btn btn-sm btn-warning"><i class="fa fa-fw fa-pencil-square"></i></a></td>
+                <td><a href="{ROOT_URL}admin/comments/delete/{ID}" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></a></td>
                 <td>
                     <input type="checkbox" value="{ID}" name="C_[]">
                 </td>
diff --git a/app/plugins/comments/views/control.html b/app/plugins/comments/views/control.html
index df9007c..26661f4 100644
--- a/app/plugins/comments/views/control.html
+++ b/app/plugins/comments/views/control.html
@@ -1,8 +1,8 @@
 <div class="action">
-    <a href="{ROOT_URL}{COMMENT_TYPE}/comments/edit/{ID}" class="btn btn-warning btn-sm" role="button">
+    <a href="{ROOT_URL}{COMMENT_TYPE}/comments/edit/{ID}" class="btn btn-warning btn-sm">
         <span class="fa fa-fw fa-pencil"></span>
     </a>
-    <a href="{ROOT_URL}{COMMENT_TYPE}/comments/delete/{ID}" class="btn btn-danger btn-sm" role="button">
+    <a href="{ROOT_URL}{COMMENT_TYPE}/comments/delete/{ID}" class="btn btn-danger btn-sm">
         <span class="fa fa-fw fa-trash"></span>
     </a>
 </div>
\ No newline at end of file
diff --git a/app/plugins/feedback/views/admin/list.html b/app/plugins/feedback/views/admin/list.html
index 345dd2b..0a60223 100644
--- a/app/plugins/feedback/views/admin/list.html
+++ b/app/plugins/feedback/views/admin/list.html
@@ -20,8 +20,8 @@
 				<td>{ID}</td>
 				<td>{DTC}{time}{/DTC}</td>
 				<td>{feedback}</td>
-				<td><a href="{ROOT_URL}admin/feedback/view/{ID}" class="btn btn-sm btn-primary" role="button"><i class="fa fa-fw fa-upload"></i></a></td>
-                <td><a href="{ROOT_URL}admin/feedback/delete/{ID}" class="btn btn-sm btn-danger" role="button"><i class="fa fa-fw fa-trash"></i></a></td>
+				<td><a href="{ROOT_URL}admin/feedback/view/{ID}" class="btn btn-sm btn-primary"><i class="fa fa-fw fa-upload"></i></a></td>
+                <td><a href="{ROOT_URL}admin/feedback/delete/{ID}" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></a></td>
 				<td>
 					<input type="checkbox" value="{ID}" name="F_[]">
 				</td>
diff --git a/app/plugins/messages/views/nav/recentMessagesDropdown.html b/app/plugins/messages/views/nav/recentMessagesDropdown.html
index 12254b6..7cd7f31 100644
--- a/app/plugins/messages/views/nav/recentMessagesDropdown.html
+++ b/app/plugins/messages/views/nav/recentMessagesDropdown.html
@@ -1,15 +1,15 @@
-<li class="dropdown nav-link">
+<li class="dropdown nav-item">
     <a
         href="#"
         class="nav-link dropdown-toggle"
         id="messagesDropdown"
-        role="button"
-        data-toggle="dropdown"
+       
+        data-bs-toggle="dropdown"
         aria-haspopup="true"
         aria-expanded="false">
         <i class="fa fa-fw fa-envelope"></i>{MBADGE}
     </a>
-    <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="messagesDropdown">
+    <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="messagesDropdown">
         <li class="message-header">
             <div class="media">
                 <div class="media-body text-center" style="padding-bottom: 10px; padding-top: 10px">
diff --git a/app/plugins/notifications/views/list.html b/app/plugins/notifications/views/list.html
index 98ee22c..cb757c7 100644
--- a/app/plugins/notifications/views/list.html
+++ b/app/plugins/notifications/views/list.html
@@ -13,8 +13,8 @@
                 {LOOP}
 			    <tr {unseenBadge}>
                     <td>{notification}</td>
-                    <td><a href="{ROOT_URL}notifications/markRead/{ID}" class="btn btn-sm btn-primary" role="button"><i class="fa fa-fw fa-upload"></i></a></td>
-                    <td><a href="{ROOT_URL}notifications/delete/{ID}" class="btn btn-sm btn-danger" role="button"><i class="fa fa-fw fa-trash"></i></a></td>
+                    <td><a href="{ROOT_URL}notifications/markRead/{ID}" class="btn btn-sm btn-primary"><i class="fa fa-fw fa-upload"></i></a></td>
+                    <td><a href="{ROOT_URL}notifications/delete/{ID}" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></a></td>
                 </tr>
                 {/LOOP}
                 {ALT}
diff --git a/app/plugins/notifications/views/nav/recentNotificationsDropdown.html b/app/plugins/notifications/views/nav/recentNotificationsDropdown.html
index 5de53e7..507d892 100644
--- a/app/plugins/notifications/views/nav/recentNotificationsDropdown.html
+++ b/app/plugins/notifications/views/nav/recentNotificationsDropdown.html
@@ -1,15 +1,14 @@
-<li class="dropdown nav-link">
+<li class="dropdown nav-item">
     <a
         href="#"
         class="nav-link dropdown-toggle"
         id="notiificationsDropdown"
-        role="button"
-        data-toggle="dropdown"
+        data-bs-toggle="dropdown"
         aria-haspopup="true"
         aria-expanded="false">
         <i class="fa fa-fw fa-bell"></i>{NBADGE}
     </a>
-    <ul class="dropdown-menu dropdown-menu-right message-dropdown" aria-labelledby="notiificationsDropdown">
+    <ul class="dropdown-menu dropdown-menu-end message-dropdown" aria-labelledby="notiificationsDropdown">
         {LOOP}
         <li class="message-preview">
             <a href="{ROOT_URL}notifications">
diff --git a/app/plugins/subscribe/views/admin/list.html b/app/plugins/subscribe/views/admin/list.html
index 5e246c5..9791f6b 100644
--- a/app/plugins/subscribe/views/admin/list.html
+++ b/app/plugins/subscribe/views/admin/list.html
@@ -17,7 +17,7 @@
 			<tr>
 				<td align="center">{ID}</td>
 				<td>{EMAIL}</td>
-				<td><a href="{ROOT_URL}admin/subscriptions/delete/{ID}" class="btn btn-sm btn-danger" role="button"><i class="fa fa-fw fa-trash"></i></a></td>
+				<td><a href="{ROOT_URL}admin/subscriptions/delete/{ID}" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></a></td>
 				<td>
 					<input type="checkbox" value="{ID}" name="S_[]">
 				</td>
@@ -32,6 +32,6 @@
 			{/ALT}
 		</tbody>
 	</table>
-    <a href="{ROOT_URL}admin/subscriptions/add" class="btn btn-sm btn-primary" role="button">Add</a>
+    <a href="{ROOT_URL}admin/subscriptions/add" class="btn btn-sm btn-primary">Add</a>
 	<button name="submit" value="submit" type="submit" class="btn btn-sm btn-danger">Delete</button>
 </form>
\ No newline at end of file
diff --git a/app/resources/templates/example.tpl b/app/resources/templates/example.tpl
index 7c3689f..6cbab20 100644
--- a/app/resources/templates/example.tpl
+++ b/app/resources/templates/example.tpl
@@ -25,12 +25,12 @@
         <script language="JavaScript" type="text/javascript" src="{BASE}JS/default.js"></script>
     </head>
     <body>
-        <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+        <nav class="navbar navbar-inverse navbar-fixed-top">
             <!--Brand and toggle should get grouped for better mobile display
                 but I had to account for additional menus-->
             <div class="navbar-header">
                 <a href="{BASE}" class="navbar-brand">{SITENAME}</a>
-                <button type="button" class="navbar-toggler" data-toggle="collapse" data-target=".navbar-ex1-collapse" style="">
+                <button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target=".navbar-ex1-collapse" style="">
                     <span class="sr-only">Toggle navigation</span>
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
diff --git a/app/templates/admin/admin.tpl b/app/templates/admin/admin.tpl
index c8ca652..ae8a3dc 100644
--- a/app/templates/admin/admin.tpl
+++ b/app/templates/admin/admin.tpl
@@ -24,7 +24,7 @@
         {TEMPLATE_CSS_INCLUDES}
     </head>
     <body>
-        <nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top" role="navigation">
+        <nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
             <!--Brand and toggle should get grouped for better mobile display but I had to account for additional menus-->
             <div class="container-fluid">
                 <a href="{ROOT_URL}" class="navbar-brand">{SITENAME}</a>
@@ -32,8 +32,8 @@
                 <button 
                     class="navbar-toggler" 
                     type="button" 
-                    data-toggle="collapse" 
-                    data-target="#navbarNav" 
+                    data-bs-toggle="collapse" 
+                    data-bs-target="#navbarNav" 
                     aria-controls="navbarNav" 
                     aria-expanded="false" 
                     aria-label="Toggle navigation">
@@ -79,6 +79,7 @@
         </footer>
         <!-- Bootstrap core JavaScript and jquery -->
         <script language="JavaScript" crossorigin="anonymous" type="text/javascript" src="{JQUERY_CDN}jquery.min.js"></script>
+        <script language="JavaScript" crossorigin="anonymous" type="text/javascript" src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js"></script>
         <script language="JavaScript" crossorigin="anonymous" type="text/javascript" src="{BOOTSTRAP_CDN}js/bootstrap.min.js"></script>
         <!-- Custom javascript for this template -->
         {TEMPLATE_JS_INCLUDES}
diff --git a/app/templates/default/default.tpl b/app/templates/default/default.tpl
index 9d68c77..e564b98 100644
--- a/app/templates/default/default.tpl
+++ b/app/templates/default/default.tpl
@@ -35,7 +35,7 @@
         {TEMPLATE_CSS_INCLUDES}
     </head>
     <body>
-        <nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top" role="navigation">
+        <nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
             <!--Brand and toggle should get grouped for better mobile display but I had to account for additional menus-->
             <div class="container-fluid">
                 <a href="{ROOT_URL}" class="navbar-brand">{SITENAME}</a>
@@ -43,8 +43,8 @@
                 <button 
                     class="navbar-toggler" 
                     type="button" 
-                    data-toggle="collapse" 
-                    data-target="#navbarNav" 
+                    data-bs-toggle="collapse" 
+                    data-bs-target="#navbarNav" 
                     aria-controls="navbarNav" 
                     aria-expanded="false" 
                     aria-label="Toggle navigation">
@@ -79,6 +79,7 @@
         </footer>
         <!-- Bootstrap core JavaScript and jquery -->
         <script language="JavaScript" crossorigin="anonymous" type="text/javascript" src="{JQUERY_CDN}jquery.min.js"></script>
+        <script language="JavaScript" crossorigin="anonymous" type="text/javascript" src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js"></script>
         <script language="JavaScript" crossorigin="anonymous" type="text/javascript" src="{BOOTSTRAP_CDN}js/bootstrap.min.js"></script>
         <!-- Custom javascript for this template -->
         {TEMPLATE_JS_INCLUDES}
diff --git a/app/views/admin/dashboard/users.html b/app/views/admin/dashboard/users.html
index f5ea13a..8464bb2 100644
--- a/app/views/admin/dashboard/users.html
+++ b/app/views/admin/dashboard/users.html
@@ -12,9 +12,9 @@
         {LOOP}
         <tr>
             <td align="center">{username}</td>
-            <td><a href="{ROOT_URL}admin/users/view/{ID}" class="btn btn-sm btn-primary" role="button"><i class="fa fa-fw fa-user"></i></a></td>
-            <td><a href="{ROOT_URL}admin/users/edit/{ID}" class="btn btn-sm btn-warning" role="button"><i class="fa fa-fw fa-pencil-square"></i></a></td>
-            <td><a href="{ROOT_URL}admin/users/delete/{ID}" class="btn btn-sm btn-danger" role="button"><i class="fa fa-fw fa-trash"></i></a></td>
+            <td><a href="{ROOT_URL}admin/users/view/{ID}" class="btn btn-sm btn-primary"><i class="fa fa-fw fa-user"></i></a></td>
+            <td><a href="{ROOT_URL}admin/users/edit/{ID}" class="btn btn-sm btn-warning"><i class="fa fa-fw fa-pencil-square"></i></a></td>
+            <td><a href="{ROOT_URL}admin/users/delete/{ID}" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></a></td>
         </tr>
         {/LOOP}
         {ALT}
diff --git a/app/views/admin/groups/list.html b/app/views/admin/groups/list.html
index 8f3a1f2..ba8df0a 100644
--- a/app/views/admin/groups/list.html
+++ b/app/views/admin/groups/list.html
@@ -18,8 +18,8 @@
             <tr>
                 <td><a href="{ROOT_URL}admin/groups/view/{ID}">{name}</a></td>
                 <td><a href="{ROOT_URL}admin/groups/listmembers/{ID}">{userCount}</a></td>
-                <td><a href="{ROOT_URL}admin/groups/edit/{ID}" class="btn btn-sm btn-warning" role="button"><i class="fa fa-fw fa-pencil-square"></i></a></td>
-                <td><a href="{ROOT_URL}admin/groups/delete/{ID}" class="btn btn-sm btn-danger" role="button"><i class="fa fa-fw fa-trash"></i></a></td>
+                <td><a href="{ROOT_URL}admin/groups/edit/{ID}" class="btn btn-sm btn-warning"><i class="fa fa-fw fa-pencil-square"></i></a></td>
+                <td><a href="{ROOT_URL}admin/groups/delete/{ID}" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></a></td>
                 <td>
                     <input type="checkbox" value="{ID}" name="G_[]">
                 </td>
@@ -34,6 +34,6 @@
             {/ALT}
         </tbody>
     </table>
-    <a href="{ROOT_URL}admin/groups/create" class="btn btn-sm btn-primary" role="button">Create</a>
+    <a href="{ROOT_URL}admin/groups/create" class="btn btn-sm btn-primary">Create</a>
     <button name="submit" value="submit" type="submit" class="btn btn-sm btn-danger">Delete</button>
 </form>
\ No newline at end of file
diff --git a/app/views/admin/groups/list_members.html b/app/views/admin/groups/list_members.html
index edc49d2..472ee7f 100644
--- a/app/views/admin/groups/list_members.html
+++ b/app/views/admin/groups/list_members.html
@@ -20,8 +20,8 @@
                 <td>{ID}</td>
                 <td><a href='{ROOT_URL}admin/users/view/{ID}'>{username}</a></td>
                 <td>{DTC date}{registered}{/DTC}</td>
-                <td><a href="{ROOT_URL}admin/users/edit/{ID}" class="btn btn-sm btn-warning" role="button"><i class="fa fa-fw fa-pencil-square"></i></a></td>
-                <td><a href="{ROOT_URL}admin/users/delete/{ID}" class="btn btn-sm btn-danger" role="button"><i class="fa fa-fw fa-trash"></i></a></td>
+                <td><a href="{ROOT_URL}admin/users/edit/{ID}" class="btn btn-sm btn-warning"><i class="fa fa-fw fa-pencil-square"></i></a></td>
+                <td><a href="{ROOT_URL}admin/users/delete/{ID}" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></a></td>
                 <td>
                     <input type="checkbox" value="{ID}" name="U_[]">
                 </td>
diff --git a/app/views/admin/groups/view.html b/app/views/admin/groups/view.html
index 8dab507..572a224 100644
--- a/app/views/admin/groups/view.html
+++ b/app/views/admin/groups/view.html
@@ -17,8 +17,8 @@
                     </div>
                 </div>
                 <div class="card-footer">
-                    <a href="{ROOT_URL}admin/groups/edit/{ID}" class="btn btn-sm btn-warning" role="button">Edit</a>
-                    <a href="{ROOT_URL}admin/groups/delete/{ID}" class="btn btn-sm btn-danger" role="button">Delete</a>
+                    <a href="{ROOT_URL}admin/groups/edit/{ID}" class="btn btn-sm btn-warning">Edit</a>
+                    <a href="{ROOT_URL}admin/groups/delete/{ID}" class="btn btn-sm btn-danger">Delete</a>
                 </div>
             </div>
         </div>
diff --git a/app/views/admin/logs/admin_list.html b/app/views/admin/logs/admin_list.html
index e281cb2..9687967 100644
--- a/app/views/admin/logs/admin_list.html
+++ b/app/views/admin/logs/admin_list.html
@@ -20,8 +20,8 @@
 				<td>{ID}</td>
 				<td>{DTC}{time}{/DTC}</td>
 				<td>{action}</td>
-				<td><a href="{ROOT_URL}admin/admin/view/{ID}" class="btn btn-sm btn-primary" role="button"><i class="fa fa-fw fa-upload"></i></a></td>
-                <td><a href="{ROOT_URL}admin/admin/delete/{ID}" class="btn btn-sm btn-danger" role="button"><i class="fa fa-fw fa-trash"></i></a></td>
+				<td><a href="{ROOT_URL}admin/admin/view/{ID}" class="btn btn-sm btn-primary"><i class="fa fa-fw fa-upload"></i></a></td>
+                <td><a href="{ROOT_URL}admin/admin/delete/{ID}" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></a></td>
 				<td>
 					<input type="checkbox" value="{ID}" name="A_[]">
 				</td>
diff --git a/app/views/admin/logs/error_list.html b/app/views/admin/logs/error_list.html
index 92358d1..af8bafe 100644
--- a/app/views/admin/logs/error_list.html
+++ b/app/views/admin/logs/error_list.html
@@ -18,8 +18,8 @@
                 <td align="center">{ID}</td>
                 <td align="center">{DTC}{time}{/DTC}</td>
                 <td>{error}</td>
-                <td><a href="{ROOT_URL}admin/errors/view/{ID}" class="btn btn-sm btn-primary" role="button"><i class="fa fa-fw fa-upload"></i></a></td>
-                <td><a href="{ROOT_URL}admin/errors/delete/{ID}" class="btn btn-sm btn-danger" role="button"><i class="fa fa-fw fa-trash"></i></a></td>
+                <td><a href="{ROOT_URL}admin/errors/view/{ID}" class="btn btn-sm btn-primary"><i class="fa fa-fw fa-upload"></i></a></td>
+                <td><a href="{ROOT_URL}admin/errors/delete/{ID}" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></a></td>
                 <td>
                     <input type="checkbox" value="{ID}" name="E_[]">
                 </td>
diff --git a/app/views/admin/logs/login_list.html b/app/views/admin/logs/login_list.html
index 082748b..2236e85 100644
--- a/app/views/admin/logs/login_list.html
+++ b/app/views/admin/logs/login_list.html
@@ -20,8 +20,8 @@
 				<td>{ID}</td>
 				<td>{DTC}{time}{/DTC}</td>
 				<td>{action}</td>
-				<td><a href="{ROOT_URL}admin/logins/view/{ID}" class="btn btn-sm btn-primary" role="button"><i class="fa fa-fw fa-upload"></i></a></td>
-                <td><a href="{ROOT_URL}admin/logins/delete/{ID}" class="btn btn-sm btn-danger" role="button"><i class="fa fa-fw fa-trash"></i></a></td>
+				<td><a href="{ROOT_URL}admin/logins/view/{ID}" class="btn btn-sm btn-primary"><i class="fa fa-fw fa-upload"></i></a></td>
+                <td><a href="{ROOT_URL}admin/logins/delete/{ID}" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></a></td>
 				<td>
 					<input type="checkbox" value="{ID}" name="L_[]">
 				</td>
diff --git a/app/views/admin/modules/models/list.html b/app/views/admin/modules/models/list.html
index 9673d65..1465e5e 100644
--- a/app/views/admin/modules/models/list.html
+++ b/app/views/admin/modules/models/list.html
@@ -20,7 +20,7 @@
             <td>{installedVersion}</td>
             <td>{DTC=date}{installDate}{/DTC}</td>
             <td>{DTC=date}{lastUpdate}{/DTC}</td>
-            <td><a href="{ROOT_URL}admin/models/view/{name}" class="btn btn-sm btn-primary" role="button"><i class="fa fa-fw fa-upload"></i></a></td>
+            <td><a href="{ROOT_URL}admin/models/view/{name}" class="btn btn-sm btn-primary"><i class="fa fa-fw fa-upload"></i></a></td>
         </tr>
         {/LOOP}
         {ALT}
diff --git a/app/views/admin/modules/models/view.html b/app/views/admin/modules/models/view.html
index a32a1cb..6ba687b 100644
--- a/app/views/admin/modules/models/view.html
+++ b/app/views/admin/modules/models/view.html
@@ -60,8 +60,8 @@
 					</div>
 				</div>
 				<div class="card-footer">
-                    <a href="{ROOT_URL}admin/models/install/{name}" class="btn btn-sm btn-warning" role="button">Install</a>
-                    <a href="{ROOT_URL}admin/models/uninstall/{name}" class="btn btn-sm btn-danger" role="button">Uninstall</a>
+                    <a href="{ROOT_URL}admin/models/install/{name}" class="btn btn-sm btn-warning">Install</a>
+                    <a href="{ROOT_URL}admin/models/uninstall/{name}" class="btn btn-sm btn-danger">Uninstall</a>
                 </div>
 			</div>
 		</div>
diff --git a/app/views/admin/modules/plugins/view.html b/app/views/admin/modules/plugins/view.html
index f77fad8..109dedb 100644
--- a/app/views/admin/modules/plugins/view.html
+++ b/app/views/admin/modules/plugins/view.html
@@ -64,10 +64,10 @@
 					</div>
 				</div>
 				<div class="card-footer">
-                    <a href="{ROOT_URL}admin/plugins/install/{name}" class="btn btn-sm btn-primary" role="button">Install</a>
-                    <a href="{ROOT_URL}admin/plugins/enable/{name}" class="btn btn-sm btn-success" role="button">Enable</a>
-                    <a href="{ROOT_URL}admin/plugins/disable/{name}" class="btn btn-sm btn-danger" role="button">Disable</a>
-                    <a href="{ROOT_URL}admin/plugins/uninstall/{name}" class="btn btn-sm btn-danger" role="button">Uninstall</a>
+                    <a href="{ROOT_URL}admin/plugins/install/{name}" class="btn btn-sm btn-primary">Install</a>
+                    <a href="{ROOT_URL}admin/plugins/enable/{name}" class="btn btn-sm btn-success">Enable</a>
+                    <a href="{ROOT_URL}admin/plugins/disable/{name}" class="btn btn-sm btn-danger">Disable</a>
+                    <a href="{ROOT_URL}admin/plugins/uninstall/{name}" class="btn btn-sm btn-danger">Uninstall</a>
                 </div>
 			</div>
 		</div>
diff --git a/app/views/admin/routes/list.html b/app/views/admin/routes/list.html
index e8bfef8..cd64e8f 100644
--- a/app/views/admin/routes/list.html
+++ b/app/views/admin/routes/list.html
@@ -24,8 +24,8 @@
 				<td>{redirect_type}</td>
 				<td>{original_url}</td>
 				<td>{forwarded_url}</td>
-				<td><a href="{ROOT_URL}admin/routes/edit/{ID}" class="btn btn-sm btn-warning" role="button"><i class="fa fa-fw fa-pencil-square"></i></a></td>
-                <td><a href="{ROOT_URL}admin/routes/delete/{ID}" class="btn btn-sm btn-danger" role="button"><i class="fa fa-fw fa-trash"></i></a></td>
+				<td><a href="{ROOT_URL}admin/routes/edit/{ID}" class="btn btn-sm btn-warning"><i class="fa fa-fw fa-pencil-square"></i></a></td>
+                <td><a href="{ROOT_URL}admin/routes/delete/{ID}" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></a></td>
 				<td>
 					<input type="checkbox" value="{ID}" name="R_[]">
 				</td>
@@ -40,6 +40,6 @@
 			{/ALT}
 	    </tbody>
 	</table>
-    <a href="{ROOT_URL}admin/routes/create" class="btn btn-sm btn-primary" role="button">Create</a>
+    <a href="{ROOT_URL}admin/routes/create" class="btn btn-sm btn-primary">Create</a>
 	<button name="submit" value="submit" type="submit" class="btn btn-sm btn-danger">Delete</button>
 </form>
\ No newline at end of file
diff --git a/app/views/admin/routes/view.html b/app/views/admin/routes/view.html
index 24dfb1e..3abbc83 100644
--- a/app/views/admin/routes/view.html
+++ b/app/views/admin/routes/view.html
@@ -28,8 +28,8 @@
                     </div>
                 </div>
                 <div class="card-footer">
-                    <a href="{ROOT_URL}admin/routes/edit/{ID}" class="btn btn-sm btn-warning" role="button">Edit</a>
-                    <a href="{ROOT_URL}admin/routes/delete/{ID}" class="btn btn-sm btn-danger" role="button">Delete</a>
+                    <a href="{ROOT_URL}admin/routes/edit/{ID}" class="btn btn-sm btn-warning">Edit</a>
+                    <a href="{ROOT_URL}admin/routes/delete/{ID}" class="btn btn-sm btn-danger">Delete</a>
                 </div>
             </div>
         </div>
diff --git a/app/views/admin/tokens/list.html b/app/views/admin/tokens/list.html
index 8297e76..5768f92 100644
--- a/app/views/admin/tokens/list.html
+++ b/app/views/admin/tokens/list.html
@@ -15,7 +15,7 @@
 				<td align="center">{ID}</td>
 				<td><a href='{ROOT_URL}admin/tokens/view/{ID}'>{name}</a></td>
 				<td>{token_type}</td>
-                <td><a href="{ROOT_URL}admin/tokens/delete/{ID}" class="btn btn-sm btn-danger" role="button"><i class="fa fa-fw fa-trash"></i></a></td>
+                <td><a href="{ROOT_URL}admin/tokens/delete/{ID}" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></a></td>
 			</tr>
 			{/LOOP}
 	        {ALT}
@@ -27,4 +27,4 @@
 			{/ALT}
 	    </tbody>
 	</table>
-    <a href="{ROOT_URL}admin/tokens/create" class="btn btn-sm btn-primary" role="button">Create</a>
\ No newline at end of file
+    <a href="{ROOT_URL}admin/tokens/create" class="btn btn-sm btn-primary">Create</a>
\ No newline at end of file
diff --git a/app/views/admin/tokens/view.html b/app/views/admin/tokens/view.html
index cdfc9f5..1653976 100644
--- a/app/views/admin/tokens/view.html
+++ b/app/views/admin/tokens/view.html
@@ -40,7 +40,7 @@
                     </div>
                 </div>
                 <div class="card-footer">
-                    <a href="{ROOT_URL}admin/tokens/delete/{ID}" class="btn btn-sm btn-danger" role="button">Delete</a>
+                    <a href="{ROOT_URL}admin/tokens/delete/{ID}" class="btn btn-sm btn-danger">Delete</a>
                 </div>
             </div>
         </div>
diff --git a/app/views/admin/users/list.html b/app/views/admin/users/list.html
index 9793eba..4328830 100644
--- a/app/views/admin/users/list.html
+++ b/app/views/admin/users/list.html
@@ -20,8 +20,8 @@
 				<td align="center">{ID}</td>
 				<td><a href='{ROOT_URL}admin/users/view/{ID}'>{username}</a></td>
 				<td>{DTC date}{registered}{/DTC}</td>
-				<td><a href="{ROOT_URL}admin/users/edit/{ID}" class="btn btn-sm btn-warning" role="button"><i class="fa fa-fw fa-pencil-square"></i></a></td>
-                <td><a href="{ROOT_URL}admin/users/delete/{ID}" class="btn btn-sm btn-danger" role="button"><i class="fa fa-fw fa-trash"></i></a></td>
+				<td><a href="{ROOT_URL}admin/users/edit/{ID}" class="btn btn-sm btn-warning"><i class="fa fa-fw fa-pencil-square"></i></a></td>
+                <td><a href="{ROOT_URL}admin/users/delete/{ID}" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></a></td>
 				<td>
 					<input type="checkbox" value="{ID}" name="U_[]">
 				</td>
@@ -36,6 +36,6 @@
 			{/ALT}
 	    </tbody>
 	</table>
-    <a href="{ROOT_URL}admin/users/create" class="btn btn-sm btn-primary" role="button">Create</a>
+    <a href="{ROOT_URL}admin/users/create" class="btn btn-sm btn-primary">Create</a>
 	<button name="submit" value="submit" type="submit" class="btn btn-sm btn-danger">Delete</button>
 </form>
\ No newline at end of file
diff --git a/app/views/admin/users/view.html b/app/views/admin/users/view.html
index 4131050..facedc2 100644
--- a/app/views/admin/users/view.html
+++ b/app/views/admin/users/view.html
@@ -50,7 +50,7 @@
 					</div>
 				</div>
 				<div class="card-footer">
-					<a href="{ROOT_URL}messages/create?prepopuser={USERNAME}" data-original-title="Broadcast Message" data-toggle="tooltip" type="button" class="btn btn-sm btn-primary"><i class="fa fa-fw fa-envelope"></i></a>
+					<a href="{ROOT_URL}messages/create?prepopuser={USERNAME}" data-original-title="Broadcast Message" data-bs-toggle="tooltip" type="button" class="btn btn-sm btn-primary"><i class="fa fa-fw fa-envelope"></i></a>
 					{ADMIN}
 					<span class="float-right">
 							<a href="{ROOT_URL}admin/users/edit/{ID}">
diff --git a/app/views/footer/container.html b/app/views/footer/container.html
index ca013ce..dc1f4f8 100644
--- a/app/views/footer/container.html
+++ b/app/views/footer/container.html
@@ -5,8 +5,8 @@
             <button 
                 class="d-lg-none" 
                 type="button" 
-                data-toggle="collapse" 
-                data-target="#footer" 
+                data-bs-toggle="collapse" 
+                data-bs-target="#footer" 
                 aria-controls="footer" 
                 aria-expanded="false" 
                 aria-label="Toggle navigation">
diff --git a/app/views/forms/iconSelect.html b/app/views/forms/iconSelect.html
index 6830569..39da5a9 100644
--- a/app/views/forms/iconSelect.html
+++ b/app/views/forms/iconSelect.html
@@ -1,5 +1,5 @@
 <div id="selected-icon">No icon selected</div>
-<button class="btn btn-default dropdown-toggler" type="button" id="iconMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+<button class="btn btn-default dropdown-toggler" type="button" id="iconMenu" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
     Select Icon <span class="caret"></span>
 </button>
 <ul class="dropdown-menu" aria-labelledby="iconMenu">
diff --git a/app/views/index.html b/app/views/index.html
index 968e348..33435ef 100644
--- a/app/views/index.html
+++ b/app/views/index.html
@@ -4,9 +4,9 @@
             <div id="carousel-home" class="carousel slide" data-ride="carousel">
                 <!-- Indicators -->
                 <ol class="carousel-indicators">
-                    <li data-target="#carousel-home" data-slide-to="0" class="active"></li>
-                    <li data-target="#carousel-home" data-slide-to="1"></li>
-                    <li data-target="#carousel-home" data-slide-to="2"></li>
+                    <li data-bs-target="#carousel-home" data-slide-to="0" class="active"></li>
+                    <li data-bs-target="#carousel-home" data-slide-to="1"></li>
+                    <li data-bs-target="#carousel-home" data-slide-to="2"></li>
                 </ol>
     
                 <!-- Carousel Items -->
@@ -35,11 +35,11 @@
                 </div>
     
                 <!-- Controls -->
-                <a class="carousel-control-prev" href="#carousel-home" role="button" data-slide="prev">
+                <a class="carousel-control-prev" href="#carousel-home" data-slide="prev">
                     <span class="carousel-control-prev-icon" aria-hidden="true"></span>
                     <span class="sr-only">Previous</span>
                 </a>
-                <a class="carousel-control-next" href="#carousel-home" role="button" data-slide="next">
+                <a class="carousel-control-next" href="#carousel-home" data-slide="next">
                     <span class="carousel-control-next-icon" aria-hidden="true"></span>
                     <span class="sr-only">Next</span>
                 </a>
diff --git a/app/views/nav/statusLoggedIn.html b/app/views/nav/statusLoggedIn.html
index aebed12..5f5be68 100644
--- a/app/views/nav/statusLoggedIn.html
+++ b/app/views/nav/statusLoggedIn.html
@@ -1,15 +1,15 @@
-<li class="dropdown nav-link">
+<li class="dropdown nav-item">
     <a
         href="#"
         class="nav-link dropdown-toggle"
         id="userDropdown"
-        role="button"
-        data-toggle="dropdown"
+       
+        data-bs-toggle="dropdown"
         aria-haspopup="true"
         aria-expanded="false">
         {USERNAME}<i class="fa fa-user pl-2"></i>
     </a>
-    <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="userDropdown">
+    <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="userDropdown">
         <li><a href="{ROOT_URL}usercp"><i class="fa fa-fw fa-user"></i> Profile</a></li>
         {topNavRightDropdown}
         <li><a href="{ROOT_URL}usercp/settings"><i class="fa fa-fw fa-gear"></i> Settings</a></li>
@@ -18,4 +18,4 @@
             <a href="{ROOT_URL}home/logout"><i class="fa fa-fw fa-power-off"></i> Log Out</a>
         </li>
     </ul>
-</li>
\ No newline at end of file
+</li>
diff --git a/app/views/nav/statusLoggedOut.html b/app/views/nav/statusLoggedOut.html
index 869548e..5f0e9de 100644
--- a/app/views/nav/statusLoggedOut.html
+++ b/app/views/nav/statusLoggedOut.html
@@ -3,13 +3,13 @@
         href="#"
         class="nav-link dropdown-toggle"
         id="userDropdown"
-        role="button"
-        data-toggle="dropdown"
+       
+        data-bs-toggle="dropdown"
         aria-haspopup="true"
         aria-expanded="false">
       <i class="fa fa-user"></i>
     </a>
-    <div class="dropdown-menu dropdown-menu-right" aria-labelledby="userDropdown">
+    <div class="dropdown-menu dropdown-menu-end" aria-labelledby="userDropdown">
         <form method="post" action="{ROOT_URL}home/login" id="signin" class="px-4 py-3">
             <input type="hidden" name="rurl" id="rurl" value="{CURRENT_URL}">
             <input type="hidden" name="token" value="{TOKEN}">
diff --git a/app/views/privacy.html b/app/views/privacy.html
index e69de29..38eb7cf 100644
--- a/app/views/privacy.html
+++ b/app/views/privacy.html
@@ -0,0 +1,198 @@
+<h1>Privacy Policy</h1>
+<p>Last updated: December 09, 2024</p>
+<p>This Privacy Policy describes Our policies and procedures on the collection, use and disclosure of Your information when You use the Service and tells You about Your privacy rights and how the law protects You.</p>
+<p>We use Your Personal data to provide and improve the Service. By using the Service, You agree to the collection and use of information in accordance with this Privacy Policy. This Privacy Policy has been created with the help of the <a href="https://www.termsfeed.com/privacy-policy-generator/" target="_blank">Privacy Policy Generator</a>.</p>
+<h2>Interpretation and Definitions</h2>
+<h3>Interpretation</h3>
+<p>The words of which the initial letter is capitalized have meanings defined under the following conditions. The following definitions shall have the same meaning regardless of whether they appear in singular or in plural.</p>
+<h3>Definitions</h3>
+<p>For the purposes of this Privacy Policy:</p>
+<ul>
+<li>
+<p><strong>Account</strong> means a unique account created for You to access our Service or parts of our Service.</p>
+</li>
+<li>
+<p><strong>Affiliate</strong> means an entity that controls, is controlled by or is under common control with a party, where &quot;control&quot; means ownership of 50% or more of the shares, equity interest or other securities entitled to vote for election of directors or other managing authority.</p>
+</li>
+<li>
+<p><strong>Application</strong> refers to All The Bookmarks, the software program provided by the Company.</p>
+</li>
+<li>
+<p><strong>Company</strong> (referred to as either &quot;the Company&quot;, &quot;We&quot;, &quot;Us&quot; or &quot;Our&quot; in this Agreement) refers to All The Bookmarks.</p>
+</li>
+<li>
+<p><strong>Cookies</strong> are small files that are placed on Your computer, mobile device or any other device by a website, containing the details of Your browsing history on that website among its many uses.</p>
+</li>
+<li>
+<p><strong>Country</strong> refers to: Georgia,  United States</p>
+</li>
+<li>
+<p><strong>Device</strong> means any device that can access the Service such as a computer, a cellphone or a digital tablet.</p>
+</li>
+<li>
+<p><strong>Personal Data</strong> is any information that relates to an identified or identifiable individual.</p>
+</li>
+<li>
+<p><strong>Service</strong> refers to the Application or the Website or both.</p>
+</li>
+<li>
+<p><strong>Service Provider</strong> means any natural or legal person who processes the data on behalf of the Company. It refers to third-party companies or individuals employed by the Company to facilitate the Service, to provide the Service on behalf of the Company, to perform services related to the Service or to assist the Company in analyzing how the Service is used.</p>
+</li>
+<li>
+<p><strong>Third-party Social Media Service</strong> refers to any website or any social network website through which a User can log in or create an account to use the Service.</p>
+</li>
+<li>
+<p><strong>Usage Data</strong> refers to data collected automatically, either generated by the use of the Service or from the Service infrastructure itself (for example, the duration of a page visit).</p>
+</li>
+<li>
+<p><strong>Website</strong> refers to All The Bookmarks, accessible from <a href="https://allthebookmarks.com" rel="external nofollow noopener" target="_blank">https://allthebookmarks.com</a></p>
+</li>
+<li>
+<p><strong>You</strong> means the individual accessing or using the Service, or the company, or other legal entity on behalf of which such individual is accessing or using the Service, as applicable.</p>
+</li>
+</ul>
+<h2>Collecting and Using Your Personal Data</h2>
+<h3>Types of Data Collected</h3>
+<h4>Personal Data</h4>
+<p>While using Our Service, We may ask You to provide Us with certain personally identifiable information that can be used to contact or identify You. Personally identifiable information may include, but is not limited to:</p>
+<ul>
+<li>
+<p>Email address</p>
+</li>
+<li>
+<p>First name and last name</p>
+</li>
+<li>
+<p>Usage Data</p>
+</li>
+</ul>
+<h4>Usage Data</h4>
+<p>Usage Data is collected automatically when using the Service.</p>
+<p>Usage Data may include information such as Your Device's Internet Protocol address (e.g. IP address), browser type, browser version, the pages of our Service that You visit, the time and date of Your visit, the time spent on those pages, unique device identifiers and other diagnostic data.</p>
+<p>When You access the Service by or through a mobile device, We may collect certain information automatically, including, but not limited to, the type of mobile device You use, Your mobile device unique ID, the IP address of Your mobile device, Your mobile operating system, the type of mobile Internet browser You use, unique device identifiers and other diagnostic data.</p>
+<p>We may also collect information that Your browser sends whenever You visit our Service or when You access the Service by or through a mobile device.</p>
+<h4>Information from Third-Party Social Media Services</h4>
+<p>The Company allows You to create an account and log in to use the Service through the following Third-party Social Media Services:</p>
+<ul>
+<li>Google</li>
+<li>Facebook</li>
+<li>Instagram</li>
+<li>Twitter</li>
+<li>LinkedIn</li>
+</ul>
+<p>If You decide to register through or otherwise grant us access to a Third-Party Social Media Service, We may collect Personal data that is already associated with Your Third-Party Social Media Service's account, such as Your name, Your email address, Your activities or Your contact list associated with that account.</p>
+<p>You may also have the option of sharing additional information with the Company through Your Third-Party Social Media Service's account. If You choose to provide such information and Personal Data, during registration or otherwise, You are giving the Company permission to use, share, and store it in a manner consistent with this Privacy Policy.</p>
+<h4>Tracking Technologies and Cookies</h4>
+<p>We use Cookies and similar tracking technologies to track the activity on Our Service and store certain information. Tracking technologies used are beacons, tags, and scripts to collect and track information and to improve and analyze Our Service. The technologies We use may include:</p>
+<ul>
+<li><strong>Cookies or Browser Cookies.</strong> A cookie is a small file placed on Your Device. You can instruct Your browser to refuse all Cookies or to indicate when a Cookie is being sent. However, if You do not accept Cookies, You may not be able to use some parts of our Service. Unless you have adjusted Your browser setting so that it will refuse Cookies, our Service may use Cookies.</li>
+<li><strong>Web Beacons.</strong> Certain sections of our Service and our emails may contain small electronic files known as web beacons (also referred to as clear gifs, pixel tags, and single-pixel gifs) that permit the Company, for example, to count users who have visited those pages or opened an email and for other related website statistics (for example, recording the popularity of a certain section and verifying system and server integrity).</li>
+</ul>
+<p>Cookies can be &quot;Persistent&quot; or &quot;Session&quot; Cookies. Persistent Cookies remain on Your personal computer or mobile device when You go offline, while Session Cookies are deleted as soon as You close Your web browser. You can learn more about cookies on <a href="https://www.termsfeed.com/blog/cookies/#What_Are_Cookies" target="_blank">TermsFeed website</a> article.</p>
+<p>We use both Session and Persistent Cookies for the purposes set out below:</p>
+<ul>
+<li>
+<p><strong>Necessary / Essential Cookies</strong></p>
+<p>Type: Session Cookies</p>
+<p>Administered by: Us</p>
+<p>Purpose: These Cookies are essential to provide You with services available through the Website and to enable You to use some of its features. They help to authenticate users and prevent fraudulent use of user accounts. Without these Cookies, the services that You have asked for cannot be provided, and We only use these Cookies to provide You with those services.</p>
+</li>
+<li>
+<p><strong>Cookies Policy / Notice Acceptance Cookies</strong></p>
+<p>Type: Persistent Cookies</p>
+<p>Administered by: Us</p>
+<p>Purpose: These Cookies identify if users have accepted the use of cookies on the Website.</p>
+</li>
+<li>
+<p><strong>Functionality Cookies</strong></p>
+<p>Type: Persistent Cookies</p>
+<p>Administered by: Us</p>
+<p>Purpose: These Cookies allow us to remember choices You make when You use the Website, such as remembering your login details or language preference. The purpose of these Cookies is to provide You with a more personal experience and to avoid You having to re-enter your preferences every time You use the Website.</p>
+</li>
+</ul>
+<p>For more information about the cookies we use and your choices regarding cookies, please visit our Cookies Policy or the Cookies section of our Privacy Policy.</p>
+<h3>Use of Your Personal Data</h3>
+<p>The Company may use Personal Data for the following purposes:</p>
+<ul>
+<li>
+<p><strong>To provide and maintain our Service</strong>, including to monitor the usage of our Service.</p>
+</li>
+<li>
+<p><strong>To manage Your Account:</strong> to manage Your registration as a user of the Service. The Personal Data You provide can give You access to different functionalities of the Service that are available to You as a registered user.</p>
+</li>
+<li>
+<p><strong>For the performance of a contract:</strong> the development, compliance and undertaking of the purchase contract for the products, items or services You have purchased or of any other contract with Us through the Service.</p>
+</li>
+<li>
+<p><strong>To contact You:</strong> To contact You by email, telephone calls, SMS, or other equivalent forms of electronic communication, such as a mobile application's push notifications regarding updates or informative communications related to the functionalities, products or contracted services, including the security updates, when necessary or reasonable for their implementation.</p>
+</li>
+<li>
+<p><strong>To provide You</strong> with news, special offers and general information about other goods, services and events which we offer that are similar to those that you have already purchased or enquired about unless You have opted not to receive such information.</p>
+</li>
+<li>
+<p><strong>To manage Your requests:</strong> To attend and manage Your requests to Us.</p>
+</li>
+<li>
+<p><strong>For business transfers:</strong> We may use Your information to evaluate or conduct a merger, divestiture, restructuring, reorganization, dissolution, or other sale or transfer of some or all of Our assets, whether as a going concern or as part of bankruptcy, liquidation, or similar proceeding, in which Personal Data held by Us about our Service users is among the assets transferred.</p>
+</li>
+<li>
+<p><strong>For other purposes</strong>: We may use Your information for other purposes, such as data analysis, identifying usage trends, determining the effectiveness of our promotional campaigns and to evaluate and improve our Service, products, services, marketing and your experience.</p>
+</li>
+</ul>
+<p>We may share Your personal information in the following situations:</p>
+<ul>
+<li><strong>With Service Providers:</strong> We may share Your personal information with Service Providers to monitor and analyze the use of our Service,  to contact You.</li>
+<li><strong>For business transfers:</strong> We may share or transfer Your personal information in connection with, or during negotiations of, any merger, sale of Company assets, financing, or acquisition of all or a portion of Our business to another company.</li>
+<li><strong>With Affiliates:</strong> We may share Your information with Our affiliates, in which case we will require those affiliates to honor this Privacy Policy. Affiliates include Our parent company and any other subsidiaries, joint venture partners or other companies that We control or that are under common control with Us.</li>
+<li><strong>With business partners:</strong> We may share Your information with Our business partners to offer You certain products, services or promotions.</li>
+<li><strong>With other users:</strong> when You share personal information or otherwise interact in the public areas with other users, such information may be viewed by all users and may be publicly distributed outside. If You interact with other users or register through a Third-Party Social Media Service, Your contacts on the Third-Party Social Media Service may see Your name, profile, pictures and description of Your activity. Similarly, other users will be able to view descriptions of Your activity, communicate with You and view Your profile.</li>
+<li><strong>With Your consent</strong>: We may disclose Your personal information for any other purpose with Your consent.</li>
+</ul>
+<h3>Retention of Your Personal Data</h3>
+<p>The Company will retain Your Personal Data only for as long as is necessary for the purposes set out in this Privacy Policy. We will retain and use Your Personal Data to the extent necessary to comply with our legal obligations (for example, if we are required to retain your data to comply with applicable laws), resolve disputes, and enforce our legal agreements and policies.</p>
+<p>The Company will also retain Usage Data for internal analysis purposes. Usage Data is generally retained for a shorter period of time, except when this data is used to strengthen the security or to improve the functionality of Our Service, or We are legally obligated to retain this data for longer time periods.</p>
+<h3>Transfer of Your Personal Data</h3>
+<p>Your information, including Personal Data, is processed at the Company's operating offices and in any other places where the parties involved in the processing are located. It means that this information may be transferred to — and maintained on — computers located outside of Your state, province, country or other governmental jurisdiction where the data protection laws may differ than those from Your jurisdiction.</p>
+<p>Your consent to this Privacy Policy followed by Your submission of such information represents Your agreement to that transfer.</p>
+<p>The Company will take all steps reasonably necessary to ensure that Your data is treated securely and in accordance with this Privacy Policy and no transfer of Your Personal Data will take place to an organization or a country unless there are adequate controls in place including the security of Your data and other personal information.</p>
+<h3>Delete Your Personal Data</h3>
+<p>You have the right to delete or request that We assist in deleting the Personal Data that We have collected about You.</p>
+<p>Our Service may give You the ability to delete certain information about You from within the Service.</p>
+<p>You may update, amend, or delete Your information at any time by signing in to Your Account, if you have one, and visiting the account settings section that allows you to manage Your personal information. You may also contact Us to request access to, correct, or delete any personal information that You have provided to Us.</p>
+<p>Please note, however, that We may need to retain certain information when we have a legal obligation or lawful basis to do so.</p>
+<h3>Disclosure of Your Personal Data</h3>
+<h4>Business Transactions</h4>
+<p>If the Company is involved in a merger, acquisition or asset sale, Your Personal Data may be transferred. We will provide notice before Your Personal Data is transferred and becomes subject to a different Privacy Policy.</p>
+<h4>Law enforcement</h4>
+<p>Under certain circumstances, the Company may be required to disclose Your Personal Data if required to do so by law or in response to valid requests by public authorities (e.g. a court or a government agency).</p>
+<h4>Other legal requirements</h4>
+<p>The Company may disclose Your Personal Data in the good faith belief that such action is necessary to:</p>
+<ul>
+<li>Comply with a legal obligation</li>
+<li>Protect and defend the rights or property of the Company</li>
+<li>Prevent or investigate possible wrongdoing in connection with the Service</li>
+<li>Protect the personal safety of Users of the Service or the public</li>
+<li>Protect against legal liability</li>
+</ul>
+<h3>Security of Your Personal Data</h3>
+<p>The security of Your Personal Data is important to Us, but remember that no method of transmission over the Internet, or method of electronic storage is 100% secure. While We strive to use commercially acceptable means to protect Your Personal Data, We cannot guarantee its absolute security.</p>
+<h2>Children's Privacy</h2>
+<p>Our Service does not address anyone under the age of 13. We do not knowingly collect personally identifiable information from anyone under the age of 13. If You are a parent or guardian and You are aware that Your child has provided Us with Personal Data, please contact Us. If We become aware that We have collected Personal Data from anyone under the age of 13 without verification of parental consent, We take steps to remove that information from Our servers.</p>
+<p>If We need to rely on consent as a legal basis for processing Your information and Your country requires consent from a parent, We may require Your parent's consent before We collect and use that information.</p>
+<h2>Links to Other Websites</h2>
+<p>Our Service may contain links to other websites that are not operated by Us. If You click on a third party link, You will be directed to that third party's site. We strongly advise You to review the Privacy Policy of every site You visit.</p>
+<p>We have no control over and assume no responsibility for the content, privacy policies or practices of any third party sites or services.</p>
+<h2>Changes to this Privacy Policy</h2>
+<p>We may update Our Privacy Policy from time to time. We will notify You of any changes by posting the new Privacy Policy on this page.</p>
+<p>We will let You know via email and/or a prominent notice on Our Service, prior to the change becoming effective and update the &quot;Last updated&quot; date at the top of this Privacy Policy.</p>
+<p>You are advised to review this Privacy Policy periodically for any changes. Changes to this Privacy Policy are effective when they are posted on this page.</p>
+<h2>Contact Us</h2>
+<p>If you have any questions about this Privacy Policy, You can contact us:</p>
+<ul>
+<li>
+<p>By email: webmaster@allthebookmarks.com</p>
+</li>
+<li>
+<p>By visiting this page on our website: <a href="https://allthebookmarks.com/contact" rel="external nofollow noopener" target="_blank">https://allthebookmarks.com/contact</a></p>
+</li>
+</ul>
\ No newline at end of file
diff --git a/app/views/profile.html b/app/views/profile.html
index a2399f1..77b5b06 100644
--- a/app/views/profile.html
+++ b/app/views/profile.html
@@ -46,11 +46,11 @@
 					</div>
 				</div>
 				<div class="card-footer">
-					<a href="{ROOT_URL}messages/create?prepopuser={USERNAME}" data-original-title="Broadcast Message" data-toggle="tooltip" type="button" class="btn btn-sm btn-primary"><i class="fa fa-fw fa-envelope"></i></a>
+					<a href="{ROOT_URL}messages/create?prepopuser={USERNAME}" data-original-title="Broadcast Message" data-bs-toggle="tooltip" type="button" class="btn btn-sm btn-primary"><i class="fa fa-fw fa-envelope"></i></a>
 					{ADMIN}
 					<span class="float-right">
-						<a href="{ROOT_URL}admin/users/edit/{ID}" data-original-title="Edit this user" data-toggle="tooltip" type="button" class="btn btn-sm btn-warning"><i class="fa fa-fw fa-pencil-square"></i></a>
-						<a href="{ROOT_URL}admin/users/delete/{ID}" data-original-title="Remove this user" data-toggle="tooltip" type="button" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-times"></i></a>
+						<a href="{ROOT_URL}admin/users/edit/{ID}" data-original-title="Edit this user" data-bs-toggle="tooltip" type="button" class="btn btn-sm btn-warning"><i class="fa fa-fw fa-pencil-square"></i></a>
+						<a href="{ROOT_URL}admin/users/delete/{ID}" data-original-title="Remove this user" data-bs-toggle="tooltip" type="button" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-times"></i></a>
 					</span>
 					{/ADMIN}
 				</div>
diff --git a/composer.json b/composer.json
index b8c6728..feb7974 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
         "thetempusproject/bedrock": "1.0.10",
         "thetempusproject/canary": "1.0.5",
         "thetempusproject/houdini": "1.0.8",
-        "twbs/bootstrap": "^4.0"
+        "twbs/bootstrap": "5.2.3"
     },
     "autoload":
     {
diff --git a/composer.lock b/composer.lock
index 7060596..2d938d8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "4d87b4a533236913cbbc0e75664016de",
+    "content-hash": "60848437b2d65e726d854a96b9afcf22",
     "packages": [
         {
             "name": "components/jquery",
@@ -478,58 +478,53 @@
         },
         {
             "name": "twbs/bootstrap",
-            "version": "v3.3.7",
+            "version": "v5.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twbs/bootstrap.git",
-                "reference": "0b9c4a4007c44201dce9a6cc1a38407005c26c86"
+                "reference": "cb021439c683d9805e2864c58095b92d405e9b11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twbs/bootstrap/zipball/0b9c4a4007c44201dce9a6cc1a38407005c26c86",
-                "reference": "0b9c4a4007c44201dce9a6cc1a38407005c26c86",
+                "url": "https://api.github.com/repos/twbs/bootstrap/zipball/cb021439c683d9805e2864c58095b92d405e9b11",
+                "reference": "cb021439c683d9805e2864c58095b92d405e9b11",
                 "shasum": ""
             },
             "replace": {
                 "twitter/bootstrap": "self.version"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.3.x-dev"
-                }
-            },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Jacob Thornton",
-                    "email": "jacobthornton@gmail.com"
-                },
                 {
                     "name": "Mark Otto",
                     "email": "markdotto@gmail.com"
+                },
+                {
+                    "name": "Jacob Thornton",
+                    "email": "jacobthornton@gmail.com"
                 }
             ],
             "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
-            "homepage": "http://getbootstrap.com",
+            "homepage": "https://getbootstrap.com/",
             "keywords": [
                 "JS",
                 "css",
                 "framework",
                 "front-end",
-                "less",
                 "mobile-first",
                 "responsive",
+                "sass",
                 "web"
             ],
             "support": {
                 "issues": "https://github.com/twbs/bootstrap/issues",
-                "source": "https://github.com/twbs/bootstrap/tree/master"
+                "source": "https://github.com/twbs/bootstrap/tree/v5.2.3"
             },
-            "time": "2016-07-25T15:51:55+00:00"
+            "time": "2022-11-21T18:19:01+00:00"
         }
     ],
     "packages-dev": [],
