diff --git a/functions.php b/functions.php
index 893e4529..f653bdcd 100644
--- a/functions.php
+++ b/functions.php
@@ -137,8 +137,7 @@
     // Restrict to only selected blocks
     // Set the value to 'all' to allow all blocks everywhere
    'allowed_blocks' => [
-      'default' => [
-      ],
+      'default' => [],
       'post' => [
         'core/archives',
         'core/audio',
diff --git a/inc/hooks/gutenberg.php b/inc/hooks/gutenberg.php
index 07c47dc1..23524739 100644
--- a/inc/hooks/gutenberg.php
+++ b/inc/hooks/gutenberg.php
@@ -25,6 +25,10 @@ function allowed_block_types( $allowed_blocks, $editor_context ) {
 
   // If there is post type specific blocks, add them to the allowed blocks list
   if ( isset( $editor_context->post->post_type ) && isset( THEME_SETTINGS['allowed_blocks'][ $editor_context->post->post_type ] ) ) {
+    if ( 'all' === THEME_SETTINGS['allowed_blocks'][ $editor_context->post->post_type ] ) {
+      return $allowed_blocks;
+    }
+
     $allowed_blocks = array_merge( $allowed_blocks, THEME_SETTINGS['allowed_blocks'][ $editor_context->post->post_type ] );
   }
 
diff --git a/inc/includes/nav-walker.php b/inc/includes/nav-walker.php
index 196b8266..9c3ff71d 100755
--- a/inc/includes/nav-walker.php
+++ b/inc/includes/nav-walker.php
@@ -106,7 +106,6 @@ public function start_lvl( &$output, $depth = 0, $args = null ) {
     } else {
       $output .= "\n{$n}{$indent}<ul>{$n}";
     }
-
   }
 
  	/**
@@ -146,7 +145,7 @@ public function start_el( &$output, $item, $depth = 0, $args = null, $id = 0 ) {
 
     // Updating the CSS classes of a menu item in the WordPress Customizer preview results in all classes defined
 		// in that particular input box to come in as one big class string.
-		$split_on_spaces = function ( $class ) {
+		$split_on_spaces = function( $class ) {
 			return preg_split( '/\s+/', $class );
 		};
 		$classes         = $this->flatten( array_map( $split_on_spaces, $classes ) );
@@ -600,5 +599,4 @@ public function flatten( $array ) {
 			}
 			return $result;
 		}
-
 	}
diff --git a/inc/includes/post-type.php b/inc/includes/post-type.php
index 7b46205f..de75df83 100644
--- a/inc/includes/post-type.php
+++ b/inc/includes/post-type.php
@@ -65,5 +65,4 @@ public function register_wp_post_type( $slug, $args ) {
 
     return register_post_type( $slug, $args );
   }
-
 }
diff --git a/inc/includes/taxonomy.php b/inc/includes/taxonomy.php
index 37fa5861..2226b456 100644
--- a/inc/includes/taxonomy.php
+++ b/inc/includes/taxonomy.php
@@ -84,5 +84,4 @@ protected function register_wp_taxonomy( $slug, $object_types, $args ) {
 
 		return $registered_object_types;
 	}
-
 }
diff --git a/inc/taxonomies/your-taxonomy.php b/inc/taxonomies/your-taxonomy.php
index 193dffeb..abefbb68 100644
--- a/inc/taxonomies/your-taxonomy.php
+++ b/inc/taxonomies/your-taxonomy.php
@@ -54,5 +54,4 @@ public function register( array $post_types = [] ) {
 
     $this->register_wp_taxonomy( $this->slug, $post_types, $args );
   }
-
 }
diff --git a/inc/template-tags/edit-link.php b/inc/template-tags/edit-link.php
index ef8daf64..6d30470b 100644
--- a/inc/template-tags/edit-link.php
+++ b/inc/template-tags/edit-link.php
@@ -28,5 +28,4 @@ function air_edit_link() {
       </a>
     </p>
   <?php
-
 }
diff --git a/inc/template-tags/single-comment.php b/inc/template-tags/single-comment.php
index eb946566..1d232545 100644
--- a/inc/template-tags/single-comment.php
+++ b/inc/template-tags/single-comment.php
@@ -15,7 +15,8 @@
 
 namespace Air_Light;
 
-function single_comment( $comment, $args, $depth ) { ?>
+function single_comment( $comment, $args, $depth ) {
+?>
   <li id="li-comment-<?php comment_ID(); ?>" <?php comment_class(); ?>>
     <div id="comment-<?php comment_ID(); ?>">
       <?php echo get_avatar( $comment, '62' ); ?>
diff --git a/phpcs.xml b/phpcs.xml
index 9d45a21d..8fd07f54 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -29,11 +29,10 @@
         <exclude name="Generic.WhiteSpace.ScopeIndent.IncorrectExact" />
         <exclude name="Generic.WhiteSpace.ScopeIndent.Incorrect" />
         <exclude name="Generic.WhiteSpace.DisallowSpaceIndent.SpacesUsed" />
-        <exclude name="WordPress.WhiteSpace.PrecisionAlignment" />
         <exclude name="PEAR.Functions.FunctionCallSignature.Indent" />
         <exclude name="WordPress.Arrays.ArrayIndentation.ItemNotAligned" />
         <exclude name="WordPress.Arrays.ArrayIndentation.MultiLineArrayItemNotAligned" />
-        <exclude name="WordPress.WhiteSpace.DisallowInlineTabs.NonIndentTabsUsed" />
+        <exclude name="Universal.WhiteSpace.DisallowInlineTabs.NonIndentTabsUsed" />
         <exclude name="WordPress.Arrays.ArrayIndentation.CloseBraceNotAligned" />
         <exclude name="PEAR.Functions.FunctionCallSignature.OpeningIndent" />
 
@@ -58,7 +57,6 @@
         <exclude name="WordPress.Arrays.ArrayDeclarationSpacing.AssociativeArrayFound" />
         <exclude name="Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace" />
         <exclude name="PHPCompatibility.PHP.NewFunctionArrayDereferencing.Found" />
-        <exclude name="Generic.Arrays.DisallowShortArraySyntax" />
 
         <!-- General WordPress stuff we like to overrule -->
         <exclude name="WordPress.Files.FileName.InvalidClassFileName" />
@@ -97,8 +95,15 @@
         <exclude name="WordPress.Arrays.MultipleStatementAlignment.DoubleArrowNotAligned" />
         <exclude name="WordPress.PHP.DiscouragedPHPFunctions.obfuscation_base64_encode" />
         <exclude name="WordPress.DB.SlowDBQuery.slow_db_query_tax_query" />
-        <exclude name="WordPress.PHP.DisallowShortTernary.Found" />
+        <exclude name="Universal.Operators.DisallowShortTernary.Found" />
         <exclude name="WordPress.DB.SlowDBQuery.slow_db_query_meta_query" />
+        <exclude name="Squiz.Functions.MultiLineFunctionDeclaration.SpaceAfterFunction" />
+        <exclude name="WordPress.PHP.DisallowShortTernary.Found" />
+        <exclude name="Generic.Arrays.DisallowShortArraySyntax.Found" />
+
+        <!-- Whitespace rules -->
+        <exclude name="WordPress.WhiteSpace.PrecisionAlignment.Found" />
+        <exclude name="WordPress.WhiteSpace.DisallowInlineTabs.NonIndentTabsUsed" />
 
         <!-- Project based -->
         <exclude name="Squiz.PHP.CommentedOutCode.Found" />