diff --git a/src/meta/aliases.js b/src/meta/aliases.js
index d393b2e18a..d5eb42aa89 100644
--- a/src/meta/aliases.js
+++ b/src/meta/aliases.js
@@ -10,7 +10,7 @@ const aliases = {
 	'admin js bundle': ['adminjs', 'adminscript', 'adminscripts'],
 	javascript: ['js'],
 	'client side styles': [
-		'clientcss', 'clientless', 'clientstyles', 'clientstyle',
+		'clientcss', 'clientscss', 'clientstyles', 'clientstyle',
 	],
 	'admin control panel styles': [
 		'admincss', 'adminless', 'adminstyles', 'adminstyle', 'acpcss', 'acpless', 'acpstyles', 'acpstyle',
diff --git a/src/views/admin/extend/widgets.tpl b/src/views/admin/extend/widgets.tpl
index a11dfeffeb..210f80caa2 100644
--- a/src/views/admin/extend/widgets.tpl
+++ b/src/views/admin/extend/widgets.tpl
@@ -91,10 +91,10 @@
 						<div class="pointer" style="padding: 20px; border: 1px dotted #dedede; margin-bottom: 20px;" data-container-html=" ">
 							[[admin/extend/widgets:containers.none]]
 						</div>
-						<div class="card card-body bg-light rounded-0 border-0 shadow-none mb-3 pointer" data-container-html='<div class="card card-body bg-light rounded-0 border-0 shadow-none mb-3">\{{body}}</div>'>
+						<div class="card card-header p-3 rounded-0 border-0 shadow-none mb-3 pointer" data-container-html='<div class="card card-header p-3 rounded-0 border-0 shadow-none mb-3">\{{body}}</div>'>
 							[[admin/extend/widgets:container.well]]
 						</div>
-						<div class="card card-body bg-light rounded-0 border-0 shadow-none p-5 mb-3 pointer" data-container-html='<div class="card card-body bg-light rounded-0 border-0 shadow-none p-5 mb-3">\{{body}}</div>'>
+						<div class="card card-header rounded-0 border-0 shadow-none p-5 mb-3 pointer" data-container-html='<div class="card card-header rounded-0 border-0 shadow-none p-5 mb-3">\{{body}}</div>'>
 							[[admin/extend/widgets:container.jumbotron]]
 						</div>
 						<div class="card mb-3" data-container-html='<div class="card"><div class="card-body">\{{body}}</div></div>'>
diff --git a/src/views/admin/partials/widget-settings.tpl b/src/views/admin/partials/widget-settings.tpl
index 59dbf4e81b..b56a5a5062 100644
--- a/src/views/admin/partials/widget-settings.tpl
+++ b/src/views/admin/partials/widget-settings.tpl
@@ -1,13 +1,16 @@
-<br />
-<label class="form-label">[[admin/extend/widgets:title]]</label>
-<input type="text" class="form-control" name="title" placeholder="[[admin/extend/widgets:title.placeholder]]" /><br />
+<div class="mb-3">
+	<label class="form-label">[[admin/extend/widgets:title]]</label>
+	<input type="text" class="form-control" name="title" placeholder="[[admin/extend/widgets:title.placeholder]]" />
+</div>
 
-<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>
+<div class="mb-3">
+	<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>
+</div>
 
-<br/>
 <!-- IMPORT admin/partials/widgets/show_hide_groups.tpl -->
 
-<div class="checkbox">
-<label><input name="hide-mobile" type="checkbox"> [[admin/extend/widgets:hide-on-mobile]]</input></label>
+<div class="form-check">
+	<input class="form-check-input" type="checkbox" name="hide-mobile" id="hide-mobile-check"/>
+	<label class="form-check-label" for="hide-mobile-check">[[admin/extend/widgets:hide-on-mobile]]</label>
 </div>