diff --git a/resources/themes/architect/views/auth/login.blade.php b/resources/themes/architect/views/auth/login.blade.php
index 8337bf11..f537b602 100644
--- a/resources/themes/architect/views/auth/login.blade.php
+++ b/resources/themes/architect/views/auth/login.blade.php
@@ -46,13 +46,13 @@
 											</div>
 										</div>
 
-										@if (count($errors) > 0)
+										@if(count($errors) > 0)
 											<div class="row">
 												<div class="col">
 													<div class="alert alert-danger	 m-3">
 														<strong>Whoops!</strong> Something went wrong?<br><br>
 														<ul>
-															@foreach ($errors->all() as $error)
+															@foreach($errors->all() as $error)
 																<li>{{ $error }}</li>
 															@endforeach
 														</ul>
diff --git a/resources/themes/architect/views/layouts/app.blade.php b/resources/themes/architect/views/layouts/app.blade.php
index 94d3c3fb..e1a646b3 100644
--- a/resources/themes/architect/views/layouts/app.blade.php
+++ b/resources/themes/architect/views/layouts/app.blade.php
@@ -16,7 +16,7 @@
 				<div class="app-main__outer">
 					<div class="app-main__inner">
 						<div class="main-content">
-							@if (trim($__env->yieldContent('page_title')))
+							@if(trim($__env->yieldContent('page_title')))
 								@include('architect::layouts.partials.contentheader')
 							@endif
 
diff --git a/resources/themes/architect/views/layouts/partials/contentheader.blade.php b/resources/themes/architect/views/layouts/partials/contentheader.blade.php
index 4ccde0ff..01f0876d 100644
--- a/resources/themes/architect/views/layouts/partials/contentheader.blade.php
+++ b/resources/themes/architect/views/layouts/partials/contentheader.blade.php
@@ -1,7 +1,7 @@
 <div class="app-page-title">
 	<div class="page-title-wrapper bg-white">
 		<div class="page-title-heading">
-			@if (trim($__env->yieldContent('page_icon')))
+			@if(trim($__env->yieldContent('page_icon')))
 				<div class="page-title-icon f32">
 					<i class="@yield('page_icon','')"></i>
 				</div>
diff --git a/resources/themes/architect/views/layouts/partials/topmenu.blade.php b/resources/themes/architect/views/layouts/partials/topmenu.blade.php
index 04d6dde9..b7499f06 100644
--- a/resources/themes/architect/views/layouts/partials/topmenu.blade.php
+++ b/resources/themes/architect/views/layouts/partials/topmenu.blade.php
@@ -142,7 +142,7 @@
 									<img width="35" height="35" class="rounded-circle p-1 bg-light" src="{{ url('user/image') }}" alt="">
 								</a>
 								<div tabindex="-1" role="menu" aria-hidden="true" class="dropdown-menu dropdown-menu-right">
-									@if ($user->exists)
+									@if($user->exists)
 										<h6 tabindex="-1" class="dropdown-header text-center">User Menu</h6>
 										<div tabindex="-1" class="dropdown-divider"></div>
 										<a href="{{ url('logout') }}" tabindex="0" class="dropdown-item">
diff --git a/resources/views/components/attribute-type.blade.php b/resources/views/components/attribute-type.blade.php
index 9cc7410f..1fc305de 100644
--- a/resources/views/components/attribute-type.blade.php
+++ b/resources/views/components/attribute-type.blade.php
@@ -11,7 +11,7 @@
 							<sup>
 								[
 								@foreach($o->hints as $name => $description)
-									@if ($loop->index),@endif
+									@if($loop->index),@endif
 									<abbr title="{{ $description }}">{{ $name }}</abbr>
 								@endforeach
 								]
diff --git a/resources/views/components/attribute/objectclass.blade.php b/resources/views/components/attribute/objectclass.blade.php
index 3dacc7e4..bd5b1f3d 100644
--- a/resources/views/components/attribute/objectclass.blade.php
+++ b/resources/views/components/attribute/objectclass.blade.php
@@ -6,7 +6,7 @@
 				<x-attribute.widget.objectclass :o="$o" :edit="$edit" :new="$new" :langtag="$langtag" :updated="$updated" :value="$value" :loop="$loop" />
 			@else
 				{{ $o->render_item_old($key) }}
-				@if ($o->isStructural($value))
+				@if($o->isStructural($value))
 					<input type="hidden" name="{{ $o->name_lc }}[{{ $langtag }}][]" value="{{ $value }}">
 					<span class="float-end">@lang('structural')</span>
 				@endif
diff --git a/resources/views/components/attribute/widget/objectclass.blade.php b/resources/views/components/attribute/widget/objectclass.blade.php
index 225f352e..c3b39a72 100644
--- a/resources/views/components/attribute/widget/objectclass.blade.php
+++ b/resources/views/components/attribute/widget/objectclass.blade.php
@@ -2,7 +2,7 @@
 	<div class="input-group has-validation">
 		<!-- @todo Have an "x" to remove the entry, we need an event to process the removal, removing any attribute values along the way -->
 		<input type="text" @class(['form-control','input-group-end','is-invalid'=>($e=$errors->get($o->name_lc.'.'.$langtag.'.'.$loop->index)),'mb-1','border-focus'=>! $o->tagValuesOld($langtag)->contains($value),'bg-success-subtle'=>$updated]) name="{{ $o->name_lc }}[{{ $langtag }}][]" value="{{ $value }}" placeholder="{{ Arr::get($o->values,$loop->index,'['.__('NEW').']') }}" @readonly(true)>
-		@if ($o->isStructural($value))
+		@if($o->isStructural($value))
 			<span class="input-group-end text-black-50">@lang('structural')</span>
 		@else
 			<span class="input-group-end"><i class="fas fa-fw fa-xmark"></i></span>
diff --git a/resources/views/components/success.blade.php b/resources/views/components/success.blade.php
index 6598a290..2cefc7a1 100644
--- a/resources/views/components/success.blade.php
+++ b/resources/views/components/success.blade.php
@@ -3,7 +3,7 @@
 		<h4 class="alert-heading"><i class="fas fa-fw fa-thumbs-up"></i> Success!</h4>
 		<hr>
 		<ul class="square">
-			@foreach (session()->get('success') as $item)
+			@foreach(session()->get('success') as $item)
 				<li>{{ $item }}</li>
 			@endforeach
 		</ul>
diff --git a/resources/views/fragment/schema/attributetypes.blade.php b/resources/views/fragment/schema/attributetypes.blade.php
index 79592e36..0083f80d 100644
--- a/resources/views/fragment/schema/attributetypes.blade.php
+++ b/resources/views/fragment/schema/attributetypes.blade.php
@@ -2,14 +2,14 @@
 	<div class="col-12 col-xl-3">
 		<select id="attributetype" class="form-control">
 			<option value="-all-">-all-</option>
-			@foreach ($attributetypes as $o)
+			@foreach($attributetypes as $o)
 				<option value="{{ $o->name_lc }}">{{ $o->name }}</option>
 			@endforeach
 		</select>
 	</div>
 
 	<div class="col-12 col-xl-9">
-		@foreach ($attributetypes as $o)
+		@foreach($attributetypes as $o)
 			<span id="at-{{ $o->name_lc }}">
 				<table class="schema table table-sm table-bordered table-striped">
 					<thead>
@@ -30,16 +30,16 @@
 					</tr>
 					<tr>
 						<td>@lang('Inherits from')</td>
-						<td><strong>@if ($o->sup_attribute)<a class="attributetype" id="{{ strtolower($o->sup_attribute) }}" href="#{{ strtolower($o->sup_attribute) }}">{{ $o->sup_attribute }}</a>@else @lang('(none)')@endif</strong></td>
+						<td><strong>@if($o->sup_attribute)<a class="attributetype" id="{{ strtolower($o->sup_attribute) }}" href="#{{ strtolower($o->sup_attribute) }}">{{ $o->sup_attribute }}</a>@else @lang('(none)')@endif</strong></td>
 					</tr>
 					<tr>
 						<td>@lang('Parent to')</td>
 						<td>
 							<strong>
-								@if (! $o->children->count())
+								@if(! $o->children->count())
 									@lang('(none)')
 								@else
-									@foreach ($o->children->sort() as $child)
+									@foreach($o->children->sort() as $child)
 										@if($loop->index)</strong> <strong>@endif
 										<a class="attributetype" id="{{ strtolower($child) }}" href="#{{ strtolower($child) }}">{{ $child }}</a>
 									@endforeach
@@ -77,9 +77,9 @@
 					<tr>
 						<td>@lang('Aliases')</td>
 						<td><strong>
-							@if ($o->aliases->count())
-								@foreach ($o->aliases as $alias)
-									@if ($loop->index)</strong> <strong>@endif
+							@if($o->aliases->count())
+								@foreach($o->aliases as $alias)
+									@if($loop->index)</strong> <strong>@endif
 									<a class="attributetype" id="{{ strtolower($alias) }}" href="#{{ strtolower($alias) }}">{{ $alias }}</a>
 								@endforeach
 							@else
@@ -90,8 +90,8 @@
 					<tr>
 						<td>@lang('Used by ObjectClasses')</td>
 						<td>
-							@if ($o->used_in_object_classes->count())
-								@foreach ($o->used_in_object_classes as $class => $structural)
+							@if($o->used_in_object_classes->count())
+								@foreach($o->used_in_object_classes as $class => $structural)
 									@if($structural)
 										<strong>
 									@endif
@@ -108,8 +108,8 @@
 					<tr>
 						<td>@lang('Required by ObjectClasses')</td>
 						<td>
-							@if ($o->required_by_object_classes->count())
-								@foreach ($o->required_by_object_classes as $class => $structural)
+							@if($o->required_by_object_classes->count())
+								@foreach($o->required_by_object_classes as $class => $structural)
 									@if($structural)
 										<strong>
 									@endif
diff --git a/resources/views/fragment/schema/ldapsyntaxes.blade.php b/resources/views/fragment/schema/ldapsyntaxes.blade.php
index 42183c56..3819c348 100644
--- a/resources/views/fragment/schema/ldapsyntaxes.blade.php
+++ b/resources/views/fragment/schema/ldapsyntaxes.blade.php
@@ -9,14 +9,14 @@
 			</thead>
 
 			<tbody>
-			@foreach ($ldapsyntaxes as $o)
+			@foreach($ldapsyntaxes as $o)
 				<tr>
 					<td>
 						<abbr title="{{ $o->line }}">{{ $o->description }}</abbr>
-						@if ($o->binary_transfer_required)
+						@if($o->binary_transfer_required)
 							<span class="float-end"><i class="fas fa-fw fa-file-download"></i></span>
 						@endif
-						@if ($o->is_not_human_readable)
+						@if($o->is_not_human_readable)
 							<span class="float-end"><i class="fas fa-fw fa-tools"></i></span>
 						@endif
 					</td>
diff --git a/resources/views/fragment/schema/matchingrules.blade.php b/resources/views/fragment/schema/matchingrules.blade.php
index 62b2f32a..48f2a4ff 100644
--- a/resources/views/fragment/schema/matchingrules.blade.php
+++ b/resources/views/fragment/schema/matchingrules.blade.php
@@ -2,14 +2,14 @@
 	<div class="col-12 col-xl-3">
 		<select id="matchingrule" class="form-control">
 			<option value="-all-">-all-</option>
-			@foreach ($matchingrules as $o)
+			@foreach($matchingrules as $o)
 				<option value="{{ $o->name_lc }}">{{ $o->name }}</option>
 			@endforeach
 		</select>
 	</div>
 
 	<div class="col-12 col-xl-9">
-		@foreach ($matchingrules as $o)
+		@foreach($matchingrules as $o)
 			<span id="me-{{ $o->name_lc }}">
 				<table class="schema table table-sm table-bordered table-striped">
 					<thead>
@@ -32,10 +32,10 @@
 						<td>@lang('Used by Attributes')</td>
 						<td>
 							<strong>
-								@if ($o->used_by_attrs->count() === 0)
+								@if($o->used_by_attrs->count() === 0)
 									@lang('(none)')
 								@else
-									@foreach ($o->used_by_attrs as $attr)
+									@foreach($o->used_by_attrs as $attr)
 										@if($loop->index)</strong> <strong>@endif
 										<a class="attributetype" id="{{ strtolower($attr) }}" href="#at-{{ strtolower($attr) }}">{{ $attr }}</a>
 									@endforeach
diff --git a/resources/views/frames/create.blade.php b/resources/views/frames/create.blade.php
index f03d485f..380befab 100644
--- a/resources/views/frames/create.blade.php
+++ b/resources/views/frames/create.blade.php
@@ -49,7 +49,7 @@
 							@case(2)
 								<x-attribute-type :o="$o->getObject('rdn')" :edit="TRUE" :new="FALSE" :updated="FALSE"/>
 
-								@foreach ($o->getVisibleAttributes() as $ao)
+								@foreach($o->getVisibleAttributes() as $ao)
 									<x-attribute-type :o="$ao" :edit="TRUE" :new="FALSE" :updated="FALSE"/>
 								@endforeach
 
@@ -79,7 +79,7 @@
 		function editmode() {
 			// Find all input items and turn off readonly
 			$('input.form-control').each(function() {
-				// Except for objectClass - @todo show an "X" instead
+				// Except for objectClass
 				if ($(this)[0].name.match(/^objectclass/))
 					return;
 
diff --git a/resources/views/frames/import_result.blade.php b/resources/views/frames/import_result.blade.php
index f5370673..acd8b04b 100644
--- a/resources/views/frames/import_result.blade.php
+++ b/resources/views/frames/import_result.blade.php
@@ -28,7 +28,7 @@
 										<th class="text-end">@lang('Line')</th>
 									</tr>
 									</thead>
-									@foreach ($result as $item)
+									@foreach($result as $item)
 										<tr>
 											<td>{{ $item->get('dn') }}</td>
 											<td>{{ $item->get('result') }}</td>
diff --git a/resources/views/frames/info.blade.php b/resources/views/frames/info.blade.php
index 0c03ffd8..f53e95ba 100644
--- a/resources/views/frames/info.blade.php
+++ b/resources/views/frames/info.blade.php
@@ -13,7 +13,7 @@
 	<div class="main-card mb-3 card">
 		<div class="card-body">
 			<table class="table">
-				@foreach ($server->rootDSE()->getObjects() as $attribute => $ao)
+				@foreach($server->rootDSE()->getObjects() as $attribute => $ao)
 					<tr>
 						<th class="w-25">
 							{!! ($x=$server->schema('attributetypes',$attribute))
diff --git a/resources/views/layouts/dn.blade.php b/resources/views/layouts/dn.blade.php
index 85ca43ff..5317edf8 100644
--- a/resources/views/layouts/dn.blade.php
+++ b/resources/views/layouts/dn.blade.php
@@ -1,4 +1,4 @@
-@if (trim($__env->yieldContent('page_title')))
+@if(trim($__env->yieldContent('page_title')))
 	@include('architect::layouts.partials.contentheader')
 @endif
 
diff --git a/resources/views/update.blade.php b/resources/views/update.blade.php
index 52b58b11..f2958044 100644
--- a/resources/views/update.blade.php
+++ b/resources/views/update.blade.php
@@ -30,7 +30,7 @@
 							</thead>
 
 							<tbody>
-							@foreach ($o->getObjects()->filter(fn($item)=>$item->isDirty()) as $key => $oo)
+							@foreach($o->getObjects()->filter(fn($item)=>$item->isDirty()) as $key => $oo)
 								<tr>
 									<th rowspan="{{ $x=max($oo->values->dot()->keys()->count(),$oo->values_old->dot()->keys()->count())}}">
 										<abbr title="{{ $oo->description }}">{{ $oo->name }}</abbr>