diff --git a/public/src/modules/groupSearch.js b/public/src/modules/groupSearch.js
index b77e559757..4f4e746c37 100644
--- a/public/src/modules/groupSearch.js
+++ b/public/src/modules/groupSearch.js
@@ -31,8 +31,11 @@ define('groupSearch', function () {
 				el.find('[component="group-list"] [component="group-no-matches"]').toggleClass('hidden', !noMatch);
 			}
 			if (toggleVisibility) {
-				el.find('.dropdown-toggle').addClass('hidden');
+				el.find('.dropdown-toggle').css({ visibility: 'hidden' });
 				searchEl.removeClass('hidden');
+				searchEl.css({
+					'z-index': el.find('.dropdown-toggle').css('z-index') + 1,
+				});
 			}
 
 			searchEl.on('click', function (ev) {
@@ -49,7 +52,7 @@ define('groupSearch', function () {
 
 		el.on('hide.bs.dropdown', function () {
 			if (toggleVisibility) {
-				el.find('.dropdown-toggle').removeClass('hidden');
+				el.find('.dropdown-toggle').css({ visibility: 'visible' });
 				searchEl.addClass('hidden');
 			}
 			searchEl.off('click').find('input').off('keyup');
diff --git a/public/src/modules/settings/array.js b/public/src/modules/settings/array.js
index 6c1ee1395e..58a5f9b507 100644
--- a/public/src/modules/settings/array.js
+++ b/public/src/modules/settings/array.js
@@ -11,7 +11,7 @@ define('settings/array', function () {
 	 */
 	function createRemoveButton(elements) {
 		const rm = $(helper.createElement('button', {
-			class: 'btn btn-xs btn-primary remove',
+			class: 'btn btn-sm btn-primary remove',
 			title: 'Remove Item',
 		}, '-'));
 		rm.click(function (event) {
diff --git a/src/views/admin/manage/group.tpl b/src/views/admin/manage/group.tpl
index de3e0976b1..395f302bdb 100644
--- a/src/views/admin/manage/group.tpl
+++ b/src/views/admin/manage/group.tpl
@@ -1,46 +1,47 @@
-<div class="row">
-	<form role="form" class="group" data-groupname="{group.displayName}">
+<div>
+	<form role="form" class="group row" data-groupname="{group.displayName}">
 		<div class="col-md-9">
 			<div class="group-settings-form">
-				<fieldset>
-					<label for="change-group-name">[[admin/manage/groups:edit.name]]</label>
+				<fieldset class="mb-3">
+					<label class="form-label" for="change-group-name">[[admin/manage/groups:edit.name]]</label>
 					<input type="text" class="form-control" id="change-group-name" placeholder="Group Name" value="{group.displayName}" maxlength="{maximumGroupNameLength}" data-property <!-- IF group.system -->readonly<!-- ENDIF group.system -->/><br />
 				</fieldset>
 
-				<fieldset>
-					<label for="change-group-desc">[[admin/manage/groups:edit.description]]</label>
+				<fieldset class="mb-3">
+					<label class="form-label" for="change-group-desc">[[admin/manage/groups:edit.description]]</label>
 					<input type="text" class="form-control" id="change-group-desc" placeholder="A short description about your group" value="{group.description}" maxlength="255" data-property /><br />
 				</fieldset>
 
-				<div class="row">
+				<div class="row mb-3">
 					<div class="col-md-4">
 						<fieldset>
-							<label for="change-group-user-title">[[admin/manage/groups:edit.user-title]]</label>
-							<span id="group-label-preview" class="label label-default" style="color:<!-- IF group.textColor -->{group.textColor}<!-- ELSE -->#ffffff<!-- ENDIF group.textColor -->; background:<!-- IF group.labelColor -->{group.labelColor}<!-- ELSE -->#000000<!-- ENDIF group.labelColor -->;"><i id="group-icon-preview" class="fa {group.icon} <!-- IF !group.icon -->hidden<!-- ENDIF -->"></i> <span id="group-label-preview-text">{group.userTitle}</span></span>
+							<label class="form-label" for="change-group-user-title">[[admin/manage/groups:edit.user-title]]</label>
+							<span id="group-label-preview" class="badge" style="color:<!-- IF group.textColor -->{group.textColor}<!-- ELSE -->#ffffff<!-- ENDIF group.textColor -->; background:<!-- IF group.labelColor -->{group.labelColor}<!-- ELSE -->#000000<!-- ENDIF group.labelColor -->;"><i id="group-icon-preview" class="fa {group.icon} <!-- IF !group.icon -->hidden<!-- ENDIF -->"></i> <span id="group-label-preview-text">{group.userTitle}</span></span>
 							<input type="text" class="form-control" id="change-group-user-title" placeholder="The title of users if they are a member of this group" value="{group.userTitleEscaped}" maxlength="{maximumGroupTitleLength}" data-property /><br />
 						</fieldset>
 					</div>
 					<div class="col-md-2">
 						<fieldset>
-							<label id="group-icon-label" for="change-group-icon">[[admin/manage/groups:edit.icon]]</label><br/>
+							<label class="form-label" id="group-icon-label" for="change-group-icon">[[admin/manage/groups:edit.icon]]</label><br/>
 							<i id="group-icon" class="fa fa-2x <!-- IF group.icon -->{group.icon}<!-- ENDIF group.icon -->" value="{group.icon}"></i><br />
 						</fieldset>
 					</div>
 					<div class="col-md-3">
 						<fieldset>
-							<label for="change-group-label-color">[[admin/manage/groups:edit.label-color]]</label>
+							<label class="form-label" for="change-group-label-color">[[admin/manage/groups:edit.label-color]]</label>
 
 							<input type="color" id="change-group-label-color" placeholder="#0059b2" data-name="bgColor" value="{group.labelColor}" class="form-control" data-property/><br />
 						</fieldset>
 					</div>
 					<div class="col-md-3">
 						<fieldset>
-							<label for="change-group-text-color">[[admin/manage/groups:edit.text-color]]</label>
+							<label class="form-label" for="change-group-text-color">[[admin/manage/groups:edit.text-color]]</label>
 							<input type="color" id="change-group-text-color" placeholder="#ffffff" data-name="textColor" value="{group.textColor}" class="form-control" data-property/><br />
 						</fieldset>
 					</div>
 				</div>
-				<fieldset>
+
+				<fieldset class="mb-3">
 					<div class="checkbox">
 						<label>
 							<input id="group-userTitleEnabled" name="userTitleEnabled" data-property type="checkbox"<!-- IF group.userTitleEnabled --> checked<!-- ENDIF group.userTitleEnabled -->> <strong>[[admin/manage/groups:edit.show-badge]]</strong>
@@ -48,16 +49,16 @@
 					</div>
 				</fieldset>
 
-				<fieldset>
+				<fieldset class="mb-3">
 					<div class="checkbox">
 						<label>
 							<input id="group-private" name="private" data-property type="checkbox"<!-- IF group.private --> checked<!-- ENDIF group.private -->>
 							<strong>[[groups:details.private]]</strong>
-							<p class="help-block">
+							<p class="form-text">
 								[[admin/manage/groups:edit.private-details]]
 							</p>
 							<!-- IF !allowPrivateGroups -->
-							<p class="help-block">
+							<p class="form-text">
 								[[admin/manage/groups:edit.private-override]]
 							</p>
 							<!-- ENDIF !allowPrivateGroups -->
@@ -65,7 +66,7 @@
 					</div>
 				</fieldset>
 
-				<fieldset>
+				<fieldset class="mb-3">
 					<div class="checkbox">
 						<label>
 							<input id="group-disableJoinRequests" name="disableJoinRequests" data-property type="checkbox"<!-- IF group.disableJoinRequests --> checked<!-- ENDIF group.disableJoinRequests -->>
@@ -74,7 +75,7 @@
 					</div>
 				</fieldset>
 
-				<fieldset>
+				<fieldset class="mb-3">
 					<div class="checkbox">
 						<label>
 							<input id="group-disableLeave" name="disableLeave" data-property type="checkbox"{{{if group.disableLeave}}} checked{{{end}}}>
@@ -83,12 +84,12 @@
 					</div>
 				</fieldset>
 
-				<fieldset>
+				<fieldset class="mb-3">
 					<div class="checkbox">
 						<label>
 							<input id="group-hidden" name="hidden" data-property type="checkbox"<!-- IF group.hidden --> checked<!-- ENDIF group.hidden -->>
 							<strong>[[admin/manage/groups:edit.hidden]]</strong>
-							<p class="help-block">
+							<p class="form-text">
 								[[admin/manage/groups:edit.hidden-details]]
 							</p>
 						</label>
@@ -97,8 +98,8 @@
 
 				<hr />
 
-				<div class="form-group">
-					<label for="memberPostCids">[[groups:details.member-post-cids]]</label>
+				<div class="mb-3">
+					<label class="form-label" for="memberPostCids">[[groups:details.member-post-cids]]</label>
 					<div class="row">
 						<div class="col-md-9">
 							<input id="memberPostCids" type="text" class="form-control" value="{group.memberPostCids}">
@@ -112,11 +113,11 @@
 				<hr />
 
 				<fieldset>
-					<div class="panel panel-default">
-						<div class="panel-heading">
-							<h3 class="panel-title"><i class="fa fa-users"></i> [[admin/manage/groups:edit.members]]</h3>
+					<div class="card">
+						<div class="card-header">
+							<h5 class="card-title"><i class="fa fa-users"></i> [[admin/manage/groups:edit.members]]</h5>
 						</div>
-						<div class="panel-body">
+						<div class="card-body">
 							<!-- IMPORT admin/partials/groups/memberlist.tpl -->
 						</div>
 					</div>
@@ -125,13 +126,13 @@
 		</div>
 		<div class="col-md-3">
 			<div component="group-selector" class="btn-group">
-				<button type="button" class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown">
+				<button type="button" class="btn btn-default dropdown-toggle w-100" data-bs-toggle="dropdown">
 					<span component="group-selector-selected">{group.displayName}</span> <span class="caret"></span>
 				</button>
-				<div component="group-selector-search" class="hidden">
+				<div component="group-selector-search" class="hidden position-absolute w-100">
 					<input type="text" class="form-control" autocomplete="off">
 				</div>
-				<ul component="group-list" class="dropdown-menu group-dropdown-menu" role="menu">
+				<ul component="group-list" class="dropdown-menu dropdown-menu-end group-dropdown-menu" role="menu">
 					<li component="group-no-matches" role="presentation" class="group hidden">
 						<a class="dropdown-item" role="menuitem">[[search:no-matches]]</a>
 					</li>
@@ -143,8 +144,8 @@
 				</ul>
 			</div>
 			<hr />
-			<div class="well edit-privileges-selector">
-				<strong class="pull-left">[[admin/manage/privileges:edit-privileges]]</strong><br />
+			<div class="edit-privileges-selector">
+				<label class="form-label" class="pull-left">[[admin/manage/privileges:edit-privileges]]</label>
 				<!-- IMPORT partials/category-selector.tpl -->
 			</div>
 		</div>
diff --git a/src/views/admin/partials/categories/create.tpl b/src/views/admin/partials/categories/create.tpl
index a76e195d89..9388831c81 100644
--- a/src/views/admin/partials/categories/create.tpl
+++ b/src/views/admin/partials/categories/create.tpl
@@ -1,15 +1,15 @@
 <form type="form">
-	<div class="form-group">
-		<label for="name">[[admin/manage/categories:name]]</label>
+	<div class="mb-3">
+		<label class="form-label" for="name">[[admin/manage/categories:name]]</label>
 		<input type="text" class="form-control" name="name" id="name" />
 	</div>
-	<div class="form-group" id="parentCidGroup">
-		<label for="parentCid">[[admin/manage/categories:optional-parent-category]]</label>
+	<div class="mb-3" id="parentCidGroup">
+		<label class="form-label" for="parentCid">[[admin/manage/categories:optional-parent-category]]</label>
 		<!-- IMPORT partials/category-selector.tpl -->
 	</div>
 
-	<div class="form-group" id="cloneFromCidGroup">
-		<label for="cloneFromCid">[[admin/manage/categories:optional-clone-settings]]</label>
+	<div class="mb-3" id="cloneFromCidGroup">
+		<label class="form-label" for="cloneFromCid">[[admin/manage/categories:optional-clone-settings]]</label>
 		<!-- IMPORT partials/category-selector.tpl -->
 		<label>
 			<input id="cloneChildren" name="cloneChildren" type="checkbox">
@@ -17,11 +17,10 @@
 		</label>
 	</div>
 
-	<div class="form-group">
+	<div class="mb-3">
 		<label>
 			<input id="disabled" name="disabled" type="checkbox">
 			<strong>[[admin/manage/categories:disable-on-create]]</strong>
 		</label>
 	</div>
-
 </form>
\ No newline at end of file
diff --git a/src/views/admin/partials/categories/groups.tpl b/src/views/admin/partials/categories/groups.tpl
deleted file mode 100644
index 1b85caedc4..0000000000
--- a/src/views/admin/partials/categories/groups.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- BEGIN groups -->
-<li data-name="{groups.displayName}">
-	<div class="btn-group pull-right">
-		<button type="button" class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown">
-			Privileges <span class="caret"></span>
-		</button>
-		<ul class="dropdown-menu" role="menu">
-			<li role="presentation"><a href="#" data-priv="groups:find" class="dropdown-item <!-- IF groups.privileges.groups:find -->active<!-- ENDIF groups.privileges.groups:find -->">Find Category</a></li>
-			<li role="presentation"><a href="#" data-priv="groups:read" class="dropdown-item <!-- IF groups.privileges.groups:read -->active<!-- ENDIF groups.privileges.groups:read -->">Access Category</a></li>
-			<li role="presentation"><a href="#" data-priv="groups:topics:read" class="dropdown-item <!-- IF groups.privileges.groups:topics:read -->active<!-- ENDIF groups.privileges.groups:topics:read -->">Access Topics</a></li>
-			<li role="presentation"><a href="#" data-priv="groups:topics:create" class="dropdown-item <!-- IF groups.privileges.groups:topics:create -->active<!-- ENDIF groups.privileges.groups:topics:create -->">Create Topics</a></li>
-			<li role="presentation"><a href="#" data-priv="groups:topics:reply" class="dropdown-item <!-- IF groups.privileges.groups:topics:reply -->active<!-- ENDIF groups.privileges.groups:topics:reply -->">Reply to Topics</a></li>
-			<li role="presentation"><a href="#" data-priv="groups:posts:edit" class="dropdown-item <!-- IF groups.privileges.groups:posts:edit -->active<!-- ENDIF groups.privileges.groups:posts:edit -->">Edit Posts</a></li>
-			<li role="presentation"><a href="#" data-priv="groups:posts:delete" class="dropdown-item <!-- IF groups.privileges.groups:posts:delete -->active<!-- ENDIF groups.privileges.groups:posts:delete -->">Delete Posts</a></li>
-			<li role="presentation"><a href="#" data-priv="groups:topics:delete" class="dropdown-item <!-- IF groups.privileges.groups:topics:delete -->active<!-- ENDIF groups.privileges.groups:topics:delete -->">Delete Topics</a></li>
-		</ul>
-	</div>
-	{groups.displayName}
-</li>
-<!-- END groups -->
diff --git a/src/views/admin/partials/categories/users.tpl b/src/views/admin/partials/categories/users.tpl
deleted file mode 100644
index 8b8c63fb02..0000000000
--- a/src/views/admin/partials/categories/users.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- BEGIN users -->
-<li data-uid="{users.uid}">
-	<div class="btn-group pull-right">
-		<button type="button" class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown">
-			Privileges <span class="caret"></span>
-		</button>
-		<ul class="dropdown-menu" role="menu">
-			<li role="presentation"><a href="#" data-priv="find" class="dropdown-item <!-- IF users.privileges.find -->active<!-- ENDIF users.privileges.find -->">Find Category</a></li>
-			<li role="presentation"><a href="#" data-priv="read" class="dropdown-item <!-- IF users.privileges.read -->active<!-- ENDIF users.privileges.read -->">Access Category</a></li>
-			<li role="presentation"><a href="#" data-priv="topics:read" class="dropdown-item <!-- IF users.privileges.topics:read -->active<!-- ENDIF users.privileges.topics:read -->">Access Topics</a></li>
-			<li role="presentation"><a href="#" data-priv="topics:create" class="dropdown-item <!-- IF users.privileges.topics:create -->active<!-- ENDIF users.privileges.topics:create -->">Create Topics</a></li>
-			<li role="presentation"><a href="#" data-priv="topics:reply" class="dropdown-item <!-- IF users.privileges.topics:reply -->active<!-- ENDIF users.privileges.topics:reply -->">Reply to Topics</a></li>
-			<li role="presentation"><a href="#" data-priv="posts:edit" class="dropdown-item <!-- IF users.privileges.posts:edit -->active<!-- ENDIF users.privileges.posts:edit -->">Edit Posts</a></li>
-			<li role="presentation"><a href="#" data-priv="posts:delete" class="dropdown-item <!-- IF users.privileges.posts:delete -->active<!-- ENDIF users.privileges.posts:delete -->">Delete Posts</a></li>
-			<li role="presentation"><a href="#" data-priv="topics:delete" class="dropdown-item <!-- IF users.privileges.topics:delete -->active<!-- ENDIF users.privileges.topics:delete -->">Delete Topics</a></li>
-			<li role="presentation" class="divider"></li>
-			<li role="presentation"><a href="#" data-priv="mods" class="dropdown-item <!-- IF users.privileges.mods -->active<!-- ENDIF users.privileges.mods -->">Moderator</a></li>
-		</ul>
-	</div>
-	<img src="{users.picture}" alt="" /> {users.username}
-</li>
-<!-- END users -->
diff --git a/src/views/admin/partials/create_user_modal.tpl b/src/views/admin/partials/create_user_modal.tpl
index 278e133165..9526ac52ed 100644
--- a/src/views/admin/partials/create_user_modal.tpl
+++ b/src/views/admin/partials/create_user_modal.tpl
@@ -1,21 +1,21 @@
 <div class="alert alert-danger hidden" id="create-modal-error"></div>
 <form>
-	<div class="form-group">
-		<label for="create-user-name">[[admin/manage/users:create.username]]</label>
+	<div class="mb-3">
+		<label class="form-label" for="create-user-name">[[admin/manage/users:create.username]]</label>
 		<input type="text" class="form-control" id="create-user-name" placeholder="[[admin/manage/users:create.username]]" />
 	</div>
-	<div class="form-group">
-		<label for="create-user-email">[[admin/manage/users:create.email]]</label>
+	<div class="mb-3">
+		<label class="form-label" for="create-user-email">[[admin/manage/users:create.email]]</label>
 		<input type="text" class="form-control" id="create-user-email" placeholder="[[admin/manage/users:create.email-placeholder]]" />
 	</div>
 
-	<div class="form-group">
-		<label for="create-user-password">[[admin/manage/users:create.password]]</label>
+	<div class="mb-3">
+		<label class="form-label" for="create-user-password">[[admin/manage/users:create.password]]</label>
 		<input type="password" class="form-control" id="create-user-password" placeholder="[[admin/manage/users:create.password]]" />
 	</div>
 
-	<div class="form-group">
-		<label for="create-user-password-again">[[admin/manage/users:create.password-confirm]]</label>
+	<div class="mb-3">
+		<label class="form-label" for="create-user-password-again">[[admin/manage/users:create.password-confirm]]</label>
 		<input type="password" class="form-control" id="create-user-password-again" placeholder="[[admin/manage/users:create.password]]" />
 	</div>
 </form>
diff --git a/src/views/admin/partials/dashboard/graph.tpl b/src/views/admin/partials/dashboard/graph.tpl
index 4e91f77285..03a50a51b3 100644
--- a/src/views/admin/partials/dashboard/graph.tpl
+++ b/src/views/admin/partials/dashboard/graph.tpl
@@ -1,10 +1,10 @@
 <div class="card mb-3" id="analytics-panel">
 	<div class="card-header">
 		[[admin/dashboard:forum-traffic]]
-		<div class="pull-right">
+		<div class="float-end">
 			<a href="#"><i class="fa fa-fw fa-expand"></i></a>
 		</div>
-		<div class="pull-right">
+		<div class="float-end">
 			<a target="_blank" id="view-as-json" href="{config.relative_path}/api/v3/admin/analytics/{set}?type=hourly"><i class="fa fa-fw fa-terminal"></i></a>
 		</div>
 	</div>
diff --git a/src/views/admin/partials/dashboard/stats.tpl b/src/views/admin/partials/dashboard/stats.tpl
index f09f115c0e..9d8cb67ba3 100644
--- a/src/views/admin/partials/dashboard/stats.tpl
+++ b/src/views/admin/partials/dashboard/stats.tpl
@@ -3,16 +3,16 @@
 		<thead>
 			<tr>
 				<th></th>
-				<th class="text-right">[[admin/dashboard:stats.yesterday]]</th>
-				<th class="text-right">[[admin/dashboard:stats.today]]</th>
+				<th class="text-end">[[admin/dashboard:stats.yesterday]]</th>
+				<th class="text-end">[[admin/dashboard:stats.today]]</th>
 				<th></th>
-				<th class="text-right">[[admin/dashboard:stats.last-week]]</th>
-				<th class="text-right">[[admin/dashboard:stats.this-week]]</th>
+				<th class="text-end">[[admin/dashboard:stats.last-week]]</th>
+				<th class="text-end">[[admin/dashboard:stats.this-week]]</th>
 				<th></th>
-				<th class="text-right">[[admin/dashboard:stats.last-month]]</th>
-				<th class="text-right">[[admin/dashboard:stats.this-month]]</th>
+				<th class="text-end">[[admin/dashboard:stats.last-month]]</th>
+				<th class="text-end">[[admin/dashboard:stats.this-month]]</th>
 				<th></th>
-				<th class="text-right">[[admin/dashboard:stats.all]]</th>
+				<th class="text-end">[[admin/dashboard:stats.all]]</th>
 			</tr>
 		</thead>
 		<tbody>
@@ -27,19 +27,19 @@
 						{{{ end }}}
 					</strong>
 				</td>
-				<td class="text-right formatted-number">{stats.yesterday}</td>
-				<td class="text-right formatted-number">{stats.today}</td>
+				<td class="text-end formatted-number">{stats.yesterday}</td>
+				<td class="text-end formatted-number">{stats.today}</td>
 				<td class="{stats.dayTextClass}"><small>{stats.dayIncrease}%</small></td>
 
-				<td class="text-right formatted-number">{stats.lastweek}</td>
-				<td class="text-right formatted-number">{stats.thisweek}</td>
+				<td class="text-end formatted-number">{stats.lastweek}</td>
+				<td class="text-end formatted-number">{stats.thisweek}</td>
 				<td class="{stats.weekTextClass}"><small>{stats.weekIncrease}%</small></td>
 
-				<td class="text-right formatted-number">{stats.lastmonth}</td>
-				<td class="text-right formatted-number">{stats.thismonth}</td>
+				<td class="text-end formatted-number">{stats.lastmonth}</td>
+				<td class="text-end formatted-number">{stats.thismonth}</td>
 				<td class="{stats.monthTextClass}"><small>{stats.monthIncrease}%</small></td>
 
-				<td class="text-right formatted-number">{stats.alltime}</td>
+				<td class="text-end formatted-number">{stats.alltime}</td>
 			</tr>
 			<!-- END stats -->
 		</tbody>
diff --git a/src/views/admin/partials/download_plugin_item.tpl b/src/views/admin/partials/download_plugin_item.tpl
index 23e6baaea3..ab8db31850 100644
--- a/src/views/admin/partials/download_plugin_item.tpl
+++ b/src/views/admin/partials/download_plugin_item.tpl
@@ -1,5 +1,5 @@
 					<li id="{../id}" data-plugin-id="{../id}" class="clearfix">
-						<div class="pull-right">
+						<div class="float-end">
 							<button data-action="toggleActive" class="btn btn-success hidden"><i class="fa fa-power-off"></i> [[admin/extend/plugins:plugin-item.activate]]</button>
 							<button data-action="toggleInstall" data-installed="0" class="btn btn-success"><i class="fa fa-download"></i> [[admin/extend/plugins:plugin-item.install]]</button>
 						</div>
diff --git a/src/views/admin/partials/groups/add-members.tpl b/src/views/admin/partials/groups/add-members.tpl
index 7db00be2bb..2127b072ea 100644
--- a/src/views/admin/partials/groups/add-members.tpl
+++ b/src/views/admin/partials/groups/add-members.tpl
@@ -3,6 +3,6 @@
 
 <div class="list-group" id="search-result">
     {{{each users}}}
-    <a href="#" class="list-group-item" data-username="{users.username}" data-uid="{users.uid}"><i class="fa fa-fw fa-check invisible"></i>{users.username}</a>
+    <a href="#" class="list-group-item" data-username="{users.username}" data-uid="{users.uid}"><i class="fa fa-fw fa-check invisible"></i> {users.username}</a>
     {{{end}}}
 </div>
diff --git a/src/views/admin/partials/groups/memberlist.tpl b/src/views/admin/partials/groups/memberlist.tpl
index 5e8b0c049e..9f016a2fd6 100644
--- a/src/views/admin/partials/groups/memberlist.tpl
+++ b/src/views/admin/partials/groups/memberlist.tpl
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="row mb-2">
 	<!-- IF group.isOwner -->
 	<div class="col-lg-1">
 		<button component="groups/members/add" type="button" class="btn btn-primary" title="[[groups:details.add-member]]"><i class="fa fa-user-plus"></i></button>
@@ -7,7 +7,7 @@
 	<div class="<!-- IF group.isOwner -->col-lg-11<!-- ELSE -->col-lg-12<!-- ENDIF group.isOwner -->">
 		<div class="input-group">
 			<input class="form-control" type="text" component="groups/members/search" placeholder="[[global:search]]"/>
-			<span class="input-group-addon search-button"><i class="fa fa-search"></i></span>
+			<span class="input-group-text search-button px-2"><i class="fa fa-search"></i></span>
 		</div>
 	</div>
 </div>
diff --git a/src/views/admin/partials/installed_plugin_item.tpl b/src/views/admin/partials/installed_plugin_item.tpl
index 9b17243edd..5f0d4ef103 100644
--- a/src/views/admin/partials/installed_plugin_item.tpl
+++ b/src/views/admin/partials/installed_plugin_item.tpl
@@ -1,6 +1,6 @@
 					<!-- IF !../error -->
 					<li id="{../id}" data-plugin-index="{@index}" data-plugin-id="{../id}" data-version="{../version}" class="clearfix <!-- IF ../active -->active<!-- ENDIF ../active -->">
-						<div class="pull-right controls">
+						<div class="float-end controls">
 							{{{ if ../installed }}}
 								<!-- IF ../isTheme -->
 								<a href="{config.relative_path}/admin/appearance/themes" class="btn btn-info">[[admin/extend/plugins:plugin-item.themes]]</a>
@@ -30,7 +30,7 @@
 						<small>[[admin/extend/plugins:plugin-item.installed]] <strong class="currentVersion">{../version}</strong> | [[admin/extend/plugins:plugin-item.latest]] <strong class="latestVersion">{../latest}</strong></small>
 
 						<!-- IF ../outdated -->
-						<button data-action="upgrade" class="btn btn-success btn-xs"><i class="fa fa-download"></i> [[admin/extend/plugins:plugin-item.upgrade]]</button>
+						<button data-action="upgrade" class="btn btn-success btn-sm"><i class="fa fa-download"></i> [[admin/extend/plugins:plugin-item.upgrade]]</button>
 						<p>
 							<!-- IF ../isCompatible -->
 							<i class="fa fa-check text-success"></i> [[admin/extend/plugins:plugin-item.compatible, {version}]]
@@ -47,7 +47,7 @@
 					<!-- ENDIF !../error -->
 					<!-- IF ../error -->
 					<li data-plugin-id="{../id}" class="clearfix">
-						<div class="pull-right">
+						<div class="float-end">
 							<button class="btn btn-default disabled"><i class="fa fa-exclamation-triangle"></i> [[admin/extend/plugins:plugin-item.unknown]]</button>
 							<button data-action="toggleInstall" data-installed="1" class="btn btn-danger"><i class="fa fa-trash-o"></i> [[admin/extend/plugins:plugin-item.uninstall]]</button>
 						</div>
diff --git a/src/views/admin/partials/manage_user_groups.tpl b/src/views/admin/partials/manage_user_groups.tpl
index 997fe29d6d..3a5f4f42e8 100644
--- a/src/views/admin/partials/manage_user_groups.tpl
+++ b/src/views/admin/partials/manage_user_groups.tpl
@@ -3,7 +3,7 @@
     <h5>{users.username}</h5>
     <div class="group-area">
         {{{ each users.groups }}}
-        <div class="group-card pull-left m-1" data-group-name="{users.groups.nameEscaped}">
+        <div class="group-card float-start m-1" data-group-name="{users.groups.nameEscaped}">
             <a href="{config.relative_path}/admin/manage/groups/{users.groups.nameEncoded}"><span class="badge p-2" style="color:{users.groups.textColor}; background-color: {users.groups.labelColor};"><!-- IF users.groups.icon --><i class="fa {users.groups.icon}"></i> <!-- ENDIF users.groups.icon -->{users.groups.displayName} <i class="ms-2 remove-group-icon fa fa-times" role="button"></i></span></a>
         </div>
         {{{ end }}}
diff --git a/src/views/admin/partials/pageviews-range-select.tpl b/src/views/admin/partials/pageviews-range-select.tpl
index e01d5a6965..e5168d664f 100644
--- a/src/views/admin/partials/pageviews-range-select.tpl
+++ b/src/views/admin/partials/pageviews-range-select.tpl
@@ -3,18 +3,18 @@
 		<div class="alert alert-danger hidden">[[admin/dashboard:page-views-custom-error]]</div>
 		<div class="row">
 			<div class="col-6">
-				<div class="form-group">
-					<label for="startRange">[[admin/dashboard:page-views-custom-start]]</label>
+				<div class="mb-3">
+					<label class="form-label" for="startRange">[[admin/dashboard:page-views-custom-start]]</label>
 					<input class="form-control" type="date" id="startRange" name="startRange" />
 				</div>
 			</div>
 			<div class="col-6">
-				<div class="form-group">
-					<label for="endRange">[[admin/dashboard:page-views-custom-end]]</label>
+				<div class="mb-3">
+					<label class="form-label" for="endRange">[[admin/dashboard:page-views-custom-end]]</label>
 					<input class="form-control" type="date" id="endRange" name="endRange" />
 				</div>
 			</div>
 		</div>
-		<p class="help-block">[[admin/dashboard:page-views-custom-help]]</p>
+		<p class="form-text">[[admin/dashboard:page-views-custom-help]]</p>
 	</fieldset>
 </form>
\ No newline at end of file
diff --git a/src/views/admin/partials/privileges/category.tpl b/src/views/admin/partials/privileges/category.tpl
index e47a4a739f..5d8dbcbfa7 100644
--- a/src/views/admin/partials/privileges/category.tpl
+++ b/src/views/admin/partials/privileges/category.tpl
@@ -4,11 +4,11 @@
 							<tr class="privilege-table-header">
 								<th class="privilege-filters btn-toolbar" colspan="100">
 									<!-- IF privileges.columnCountGroupOther -->
-									<button type="button" data-filter="19,99" class="btn btn-outline-secondary pull-right">[[admin/manage/categories:privileges.section-other]]</button>
+									<button type="button" data-filter="19,99" class="btn btn-outline-secondary float-end">[[admin/manage/categories:privileges.section-other]]</button>
 									<!-- END -->
-									<button type="button" data-filter="16,18" class="btn btn-outline-secondary pull-right">[[admin/manage/categories:privileges.section-moderation]]</button>
-									<button type="button" data-filter="6,15" class="btn btn-outline-secondary pull-right">[[admin/manage/categories:privileges.section-posting]]</button>
-									<button type="button" data-filter="3,5" class="btn btn-outline-secondary pull-right">[[admin/manage/categories:privileges.section-viewing]]</button>
+									<button type="button" data-filter="16,18" class="btn btn-outline-secondary float-end">[[admin/manage/categories:privileges.section-moderation]]</button>
+									<button type="button" data-filter="6,15" class="btn btn-outline-secondary float-end">[[admin/manage/categories:privileges.section-posting]]</button>
+									<button type="button" data-filter="3,5" class="btn btn-outline-secondary float-end">[[admin/manage/categories:privileges.section-viewing]]</button>
 								</th>
 							</tr><tr><!-- zebrastripe reset --></tr>
 							<tr>
@@ -56,19 +56,19 @@
 								<td colspan="3"></td>
 								<td colspan="{privileges.keys.groups.length}">
 									<div class="btn-toolbar justify-content-end">
-										<button type="button" class="btn btn-outline-secondary pull-right" data-ajaxify="false" data-action="search.group">
+										<button type="button" class="btn btn-outline-secondary float-end" data-ajaxify="false" data-action="search.group">
 											<i class="fa fa-users"></i>
 											[[admin/manage/categories:privileges.search-group]]
 										</button>
-										<button type="button" class="btn btn-outline-secondary pull-right" data-ajaxify="false" data-action="copyPrivilegesFrom">
+										<button type="button" class="btn btn-outline-secondary float-end" data-ajaxify="false" data-action="copyPrivilegesFrom">
 											<i class="fa fa-copy"></i>
 											[[admin/manage/categories:privileges.copy-from-category]]
 										</button>
-										<button type="button" class="btn btn-outline-secondary pull-right" data-ajaxify="false" data-action="copyToChildren">
+										<button type="button" class="btn btn-outline-secondary float-end" data-ajaxify="false" data-action="copyToChildren">
 											<i class="fa fa-copy"></i>
 											[[admin/manage/categories:privileges.copy-to-children]]
 										</button>
-										<button type="button" class="btn btn-outline-secondary pull-right" data-ajaxify="false" data-action="copyToAll">
+										<button type="button" class="btn btn-outline-secondary float-end" data-ajaxify="false" data-action="copyToAll">
 											<i class="fa fa-copy"></i>
 											[[admin/manage/categories:privileges.copy-privileges-to-all-categories]]
 										</button>
@@ -87,11 +87,11 @@
 							<tr class="privilege-table-header">
 								<th class="privilege-filters btn-toolbar" colspan="100">
 									<!-- IF privileges.columnCountUserOther -->
-									<button type="button" data-filter="19,99" class="btn btn-outline-secondary pull-right">[[admin/manage/categories:privileges.section-other]]</button>
+									<button type="button" data-filter="19,99" class="btn btn-outline-secondary float-end">[[admin/manage/categories:privileges.section-other]]</button>
 									<!-- END -->
-									<button type="button" data-filter="16,18" class="btn btn-outline-secondary pull-right">[[admin/manage/categories:privileges.section-moderation]]</button>
-									<button type="button" data-filter="6,15" class="btn btn-outline-secondary pull-right">[[admin/manage/categories:privileges.section-posting]]</button>
-									<button type="button" data-filter="3,5" class="btn btn-outline-secondary pull-right">[[admin/manage/categories:privileges.section-viewing]]</button>
+									<button type="button" data-filter="16,18" class="btn btn-outline-secondary float-end">[[admin/manage/categories:privileges.section-moderation]]</button>
+									<button type="button" data-filter="6,15" class="btn btn-outline-secondary float-end">[[admin/manage/categories:privileges.section-posting]]</button>
+									<button type="button" data-filter="3,5" class="btn btn-outline-secondary float-end">[[admin/manage/categories:privileges.section-viewing]]</button>
 								</th>
 							</tr><tr><!-- zebrastripe reset --></tr>
 							<tr>
@@ -128,7 +128,7 @@
 								<td colspan="3"></td>
 								<td colspan="{privileges.keys.users.length}">
 									<div class="btn-toolbar justify-content-end"></div>
-										<button type="button" class="btn btn-outline-secondary pull-right" data-ajaxify="false" data-action="search.user">
+										<button type="button" class="btn btn-outline-secondary float-end" data-ajaxify="false" data-action="search.user">
 											<i class="fa fa-user"></i>
 											[[admin/manage/categories:privileges.search-user]]
 										</button>
diff --git a/src/views/admin/partials/privileges/global.tpl b/src/views/admin/partials/privileges/global.tpl
index 2196e2f813..ed60f1f81b 100644
--- a/src/views/admin/partials/privileges/global.tpl
+++ b/src/views/admin/partials/privileges/global.tpl
@@ -5,11 +5,11 @@
 							<tr class="privilege-table-header">
 								<th class="privilege-filters btn-toolbar" colspan="100">
 									<!-- IF privileges.columnCountGroupOther -->
-									<button type="button" data-filter="19,99" class="btn btn-outline-secondary pull-right">[[admin/manage/categories:privileges.section-other]]</button>
+									<button type="button" data-filter="19,99" class="btn btn-outline-secondary float-end">[[admin/manage/categories:privileges.section-other]]</button>
 									<!-- END -->
-									<button type="button" data-filter="16,18" class="btn btn-outline-secondary pull-right">[[admin/manage/categories:privileges.section-moderation]]</button>
-									<button type="button" data-filter="3,8" class="btn btn-outline-secondary pull-right">[[admin/manage/categories:privileges.section-posting]]</button>
-									<button type="button" data-filter="9,15" class="btn btn-outline-secondary pull-right">[[admin/manage/categories:privileges.section-viewing]]</button>
+									<button type="button" data-filter="16,18" class="btn btn-outline-secondary float-end">[[admin/manage/categories:privileges.section-moderation]]</button>
+									<button type="button" data-filter="3,8" class="btn btn-outline-secondary float-end">[[admin/manage/categories:privileges.section-posting]]</button>
+									<button type="button" data-filter="9,15" class="btn btn-outline-secondary float-end">[[admin/manage/categories:privileges.section-viewing]]</button>
 								</th>
 							</tr><tr><!-- zebrastripe reset --></tr>
 							{{{ end }}}
@@ -47,7 +47,7 @@
 								<td colspan="3"></td>
 								<td colspan="{privileges.keys.groups.length}">
 									<div class="btn-toolbar justify-content-end">
-										<button type="button" class="btn btn-outline-secondary pull-right" data-ajaxify="false" data-action="search.group">
+										<button type="button" class="btn btn-outline-secondary float-end" data-ajaxify="false" data-action="search.group">
 											<i class="fa fa-users"></i>
 											[[admin/manage/categories:privileges.search-group]]
 										</button>
@@ -67,11 +67,11 @@
 							<tr class="privilege-table-header">
 								<th class="privilege-filters btn-toolbar" colspan="100">
 									<!-- IF privileges.columnCountUserOther -->
-									<button type="button" data-filter="19,99" class="btn btn-outline-secondary pull-right">[[admin/manage/categories:privileges.section-other]]</button>
+									<button type="button" data-filter="19,99" class="btn btn-outline-secondary float-end">[[admin/manage/categories:privileges.section-other]]</button>
 									<!-- END -->
-									<button type="button" data-filter="16,18" class="btn btn-outline-secondary pull-right">[[admin/manage/categories:privileges.section-moderation]]</button>
-									<button type="button" data-filter="3,8" class="btn btn-outline-secondary pull-right">[[admin/manage/categories:privileges.section-posting]]</button>
-									<button type="button" data-filter="9,15" class="btn btn-outline-secondary pull-right">[[admin/manage/categories:privileges.section-viewing]]</button>
+									<button type="button" data-filter="16,18" class="btn btn-outline-secondary float-end">[[admin/manage/categories:privileges.section-moderation]]</button>
+									<button type="button" data-filter="3,8" class="btn btn-outline-secondary float-end">[[admin/manage/categories:privileges.section-posting]]</button>
+									<button type="button" data-filter="9,15" class="btn btn-outline-secondary float-end">[[admin/manage/categories:privileges.section-viewing]]</button>
 								</th>
 							</tr><tr><!-- zebrastripe reset --></tr>
 							{{{ end }}}
@@ -109,7 +109,7 @@
 								<td colspan="3"></td>
 								<td colspan="{privileges.keys.users.length}">
 									<div class="btn-toolbar justify-content-end">
-										<button type="button" class="btn btn-outline-secondary pull-right" data-ajaxify="false" data-action="search.user">
+										<button type="button" class="btn btn-outline-secondary float-end" data-ajaxify="false" data-action="search.user">
 											<i class="fa fa-user"></i>
 											[[admin/manage/categories:privileges.search-user]]
 										</button>
diff --git a/src/views/admin/partials/quick_actions/buttons.tpl b/src/views/admin/partials/quick_actions/buttons.tpl
index eed00da8f6..0d1b7c26da 100644
--- a/src/views/admin/partials/quick_actions/buttons.tpl
+++ b/src/views/admin/partials/quick_actions/buttons.tpl
@@ -1,24 +1,24 @@
 <li component="logout">
-	<a href="#" title="[[admin/menu:logout]]" data-placement="bottom" data-toggle="tooltip">
+	<a href="#" title="[[admin/menu:logout]]" data-bs-placement="bottom" data-bs-toggle="tooltip">
 		<i class="fa fw-fw fa-sign-out"></i>
 	</a>
 </li>
 
 {{{ if user.privileges.superadmin }}}
 <li>
-	<a href="#" class="restart" data-toggle="tooltip" data-placement="bottom" title="[[admin/menu:restart-forum]]">
+	<a href="#" class="restart" data-bs-toggle="tooltip" data-bs-placement="bottom" title="[[admin/menu:restart-forum]]">
 		<i class="fa fa-fw fa-repeat"></i>
 	</a>
 </li>
 <li>
-	<a href="#" class="rebuild-and-restart" data-toggle="tooltip" data-placement="bottom" title="[[admin/menu:rebuild-and-restart-forum]]">
+	<a href="#" class="rebuild-and-restart" data-bs-toggle="tooltip" data-bs-placement="bottom" title="[[admin/menu:rebuild-and-restart-forum]]">
 		<i class="fa fa-fw fa-refresh"></i>
 	</a>
 </li>
 {{{ end }}}
 
 <li>
-	<a href="{config.relative_path}/" data-toggle="tooltip" data-placement="bottom" title="[[admin/menu:view-forum]]">
+	<a href="{config.relative_path}/" data-bs-toggle="tooltip" data-bs-placement="bottom" title="[[admin/menu:view-forum]]">
 		<i class="fa fa-fw fa-home"></i>
 	</a>
 </li>
\ No newline at end of file
diff --git a/src/views/admin/partials/temporary-ban.tpl b/src/views/admin/partials/temporary-ban.tpl
index c437aa0d5c..a32c89f099 100644
--- a/src/views/admin/partials/temporary-ban.tpl
+++ b/src/views/admin/partials/temporary-ban.tpl
@@ -1,13 +1,13 @@
 <form class="form">
 	<div class="row">
 		<div class="col-4">
-			<div class="form-group">
+			<div class="mb-3">
 				<label for="length">[[admin/manage/users:temp-ban.length]]</label>
 				<input class="form-control" id="length" name="length" type="number" min="0" value="1" />
 			</div>
 		</div>
 		<div class="col-8">
-			<div class="form-group">
+			<div class="mb-3">
 				<label for="reason">[[admin/manage/users:temp-ban.reason]]</label>
 				<input type="text" class="form-control" id="reason" name="reason" />
 			</div>
@@ -15,7 +15,7 @@
 	</div>
 	<div class="row">
 		<div class="col-sm-4 text-center">
-			<div class="form-group units">
+			<div class="mb-3 units">
 				<label>[[admin/manage/users:temp-ban.hours]]</label>
 				<input type="radio" name="unit" value="0" checked />
 				&nbsp;&nbsp;
diff --git a/src/views/admin/partials/temporary-mute.tpl b/src/views/admin/partials/temporary-mute.tpl
index 01864acfc6..d203f1c606 100644
--- a/src/views/admin/partials/temporary-mute.tpl
+++ b/src/views/admin/partials/temporary-mute.tpl
@@ -1,13 +1,13 @@
 <form class="form">
 	<div class="row">
 		<div class="col-4">
-			<div class="form-group">
+			<div class="mb-3">
 				<label for="length">[[admin/manage/users:temp-ban.length]]</label>
 				<input class="form-control" id="length" name="length" type="number" min="0" value="1" />
 			</div>
 		</div>
 		<div class="col-8">
-			<div class="form-group">
+			<div class="mb-3">
 				<label for="reason">[[admin/manage/users:temp-ban.reason]]</label>
 				<input type="text" class="form-control" id="reason" name="reason" />
 			</div>
@@ -15,7 +15,7 @@
 	</div>
 	<div class="row">
 		<div class="col-sm-4 text-center">
-			<div class="form-group units">
+			<div class="mb-3 units">
 				<label>[[admin/manage/users:temp-ban.hours]]</label>
 				<input type="radio" name="unit" value="0" checked />
 				&nbsp;&nbsp;
diff --git a/src/views/admin/partials/widget-settings.tpl b/src/views/admin/partials/widget-settings.tpl
index 2549b27d1b..59dbf4e81b 100644
--- a/src/views/admin/partials/widget-settings.tpl
+++ b/src/views/admin/partials/widget-settings.tpl
@@ -1,8 +1,8 @@
 <br />
-<label>[[admin/extend/widgets:title]]</label>
+<label class="form-label">[[admin/extend/widgets:title]]</label>
 <input type="text" class="form-control" name="title" placeholder="[[admin/extend/widgets:title.placeholder]]" /><br />
 
-<label>[[admin/extend/widgets:container]]</label>
+<label class="form-label">[[admin/extend/widgets:container]]</label>
 <textarea rows="4" class="form-control container-html" name="container" placeholder="[[admin/extend/widgets:container.placeholder]]"></textarea>
 
 <br/>
diff --git a/src/views/admin/partials/widgets/show_hide_groups.tpl b/src/views/admin/partials/widgets/show_hide_groups.tpl
index a640c27716..12c72e1684 100644
--- a/src/views/admin/partials/widgets/show_hide_groups.tpl
+++ b/src/views/admin/partials/widgets/show_hide_groups.tpl
@@ -1,7 +1,7 @@
-<div class="row">
+<div class="row mb-3">
 	<div class="col-lg-6">
 		<label>[[admin/extend/widgets:show-to-groups]]</label>
-		<select name="groups" class="form-control" multiple size="10">
+		<select name="groups" class="form-select" multiple size="10">
 			<!-- BEGIN groups -->
 			<option value="{groups.displayName}">{groups.displayName}</option>
 			<!-- END groups -->
@@ -9,7 +9,7 @@
 	</div>
 	<div class="col-lg-6">
 		<label>[[admin/extend/widgets:hide-from-groups]]</label>
-		<select name="groupsHideFrom" class="form-control" multiple size="10">
+		<select name="groupsHideFrom" class="form-select" multiple size="10">
 			<!-- BEGIN groups -->
 			<option value="{groups.displayName}">{groups.displayName}</option>
 			<!-- END groups -->
diff --git a/src/views/modals/move-post.tpl b/src/views/modals/move-post.tpl
index 7583157798..a82eebd1c5 100644
--- a/src/views/modals/move-post.tpl
+++ b/src/views/modals/move-post.tpl
@@ -16,8 +16,8 @@
 	</div>
 	<div class="panel-footer text-right">
 		<div class="btn-group">
-			<button class="btn btn-link btn-xs" id="move_posts_cancel">[[global:buttons.close]]</button>
-			<button class="btn btn-primary btn-xs" id="move_posts_confirm" disabled>[[topic:move]]</button>
+			<button class="btn btn-link btn-sm" id="move_posts_cancel">[[global:buttons.close]]</button>
+			<button class="btn btn-primary btn-sm" id="move_posts_confirm" disabled>[[topic:move]]</button>
 		</div>
 	</div>
 </div>
\ No newline at end of file