diff --git a/Components/FeatureAdminComponentScreenshots/functions.php b/Components/FeatureAdminComponentScreenshots/functions.php
index 97f3e5e53..95cadb317 100644
--- a/Components/FeatureAdminComponentScreenshots/functions.php
+++ b/Components/FeatureAdminComponentScreenshots/functions.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Flynt\Components\FeatureAdminComponentScreenshots;
 
 use Flynt\ComponentManager;
diff --git a/inc/acf.php b/inc/acf.php
index 76f3b14b4..324dc1371 100644
--- a/inc/acf.php
+++ b/inc/acf.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Flynt\Acf;
 
 use Flynt\Utils\Options;
diff --git a/inc/componentLogServer.php b/inc/componentLogServer.php
index a562a5b2f..8a4a4b2a7 100644
--- a/inc/componentLogServer.php
+++ b/inc/componentLogServer.php
@@ -4,6 +4,7 @@
  * Usage:
  * Add get param `log` to url e.g. `http://localhost:3000/?log` and all the data will be output to via console.log in the dev tools in the browser.
  */
+
 namespace Flynt\ComponentLogServer;
 
 use Flynt;
@@ -21,7 +22,8 @@
 
 function addDebugInfo($data, $componentName)
 {
-    if (!defined(__NAMESPACE__ . '\COMPONENT_WHITELIST') ||
+    if (
+        !defined(__NAMESPACE__ . '\COMPONENT_WHITELIST') ||
         in_array($componentName, Flynt\ComponentLogServer\COMPONENT_WHITELIST)
     ) {
         consoleDebug([
diff --git a/inc/customPostTypes/example.php b/inc/customPostTypes/example.php
index 3dde8bc28..bf02a2b35 100644
--- a/inc/customPostTypes/example.php
+++ b/inc/customPostTypes/example.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Flynt\CustomPostTypes;
-
 /**
  * This is an example file showcasing how you can add custom post types to your Flynt theme.
  *
  * For a full list of parameters see https://developer.wordpress.org/reference/functions/register_post_type/ or use https://generatewp.com/post-type/ to generate the code for you.
  */
 
+namespace Flynt\CustomPostTypes;
+
 // function registerExamplePostType()
 // {
 //     $labels = [
diff --git a/inc/customTaxonomies/example.php b/inc/customTaxonomies/example.php
index 6d28f3c65..237f9a07f 100644
--- a/inc/customTaxonomies/example.php
+++ b/inc/customTaxonomies/example.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Flynt\CustomTaxonomies;
-
 /**
  * This is an example file showcasing how you can add custom taxonomies to your Flynt theme.
  *
  * For a full list of parameters see https://developer.wordpress.org/reference/functions/register_taxonomy/ or use https://generatewp.com/taxonomy/ to generate the code for you.
  */
 
+namespace Flynt\CustomTaxonomies;
+
 // function registerExampleTaxonomy()
 // {
 //     $labels = [
diff --git a/inc/fieldVariables.php b/inc/fieldVariables.php
index 472f125e6..f7e36df5a 100644
--- a/inc/fieldVariables.php
+++ b/inc/fieldVariables.php
@@ -1,7 +1,9 @@
 <?php
+
 /**
  * Defines field variables to be used across multiple components.
  */
+
 namespace Flynt\FieldVariables;
 
 function getTheme()
diff --git a/inc/hideProtectedPosts.php b/inc/hideProtectedPosts.php
index 0e45eed98..433a08c5e 100644
--- a/inc/hideProtectedPosts.php
+++ b/inc/hideProtectedPosts.php
@@ -3,6 +3,7 @@
 /**
  * Hide password protected posts from listings when using the loop or `get_posts`.
  */
+
 namespace Flynt\HideProtectedPosts;
 
 add_action('pre_get_posts', function ($query) {
diff --git a/inc/jquery.php b/inc/jquery.php
index 608c11091..b9db8fb50 100644
--- a/inc/jquery.php
+++ b/inc/jquery.php
@@ -1,9 +1,11 @@
 <?php
+
 /**
  * Loads jQuery before the closing body tag by default. Can be overwritten if there is a script in the head with jQuery as a dependency.
  *
  * If the Asset utility has `loadFromCdn` set to true, it will load from Google's CDN falling back to the default WordPress script. This setting can be changed in the `lib/Init.php` file inside the `initTheme` function.
  */
+
 namespace Flynt\Jquery;
 
 use Flynt\Utils\Asset;
diff --git a/inc/mimeTypes.php b/inc/mimeTypes.php
index 674c9b891..4ca7be3ea 100644
--- a/inc/mimeTypes.php
+++ b/inc/mimeTypes.php
@@ -1,7 +1,9 @@
 <?php
+
 /**
  * Adds SVG to the mime types supported (useful for gallery uploads in the WP Backend).
  */
+
 namespace Flynt\MimeTypes;
 
 add_filter('upload_mimes', function ($mimes) {
diff --git a/inc/removeEditor.php b/inc/removeEditor.php
index 40eb2d98f..e204477ee 100644
--- a/inc/removeEditor.php
+++ b/inc/removeEditor.php
@@ -1,7 +1,9 @@
 <?php
+
 /**
  * Removes `the_content` area (editor) from the Wordpress backend, since Flynt uses ACF.
  */
+
 namespace Flynt\RemoveEditor;
 
 add_action('init', function () {
diff --git a/inc/theContentFix.php b/inc/theContentFix.php
index 9391425d8..38712da41 100644
--- a/inc/theContentFix.php
+++ b/inc/theContentFix.php
@@ -16,16 +16,18 @@ function isShortcodeAndDoesNotMatchId($postContent, $postId)
 }
 
 add_filter('wp_insert_post_data', function ($data, $postArr) {
-    if (in_array(
-        $postArr['post_type'],
-        [
+    if (
+        in_array(
+            $postArr['post_type'],
+            [
             'revision',
             'nav_menu_item',
             'attachment',
             'customize_changeset',
-            'custom_css'
-        ]
-    )) {
+            'custom_css',
+            ]
+        )
+    ) {
         return $data;
     }
     // check if no content was saved before, or if there is a flyntTheContent shortcode but the id does not match the post id
diff --git a/inc/timberDynamicResize.php b/inc/timberDynamicResize.php
index b0b2ca626..d5438efc2 100644
--- a/inc/timberDynamicResize.php
+++ b/inc/timberDynamicResize.php
@@ -1,5 +1,7 @@
 <?php
 
+/** */
+
 namespace Flynt\TimberDynamicResize;
 
 use Flynt\Utils\TimberDynamicResize;
diff --git a/inc/timberLoader.php b/inc/timberLoader.php
index 593e17c24..57d0b4ca6 100644
--- a/inc/timberLoader.php
+++ b/inc/timberLoader.php
@@ -1,9 +1,11 @@
 <?php
+
 /**
  * - Enables rendering with Timber and Twig.
  * - Converts ACF Images to Timber Images if ACF is enabled.
  * - Convert ACF Field of type post_object to a Timber\Post and add all ACF Fields of that Post
  */
+
 namespace Flynt\TimberLoader;
 
 use Flynt\Utils\TwigExtensionFlynt;
diff --git a/inc/tinyMce.php b/inc/tinyMce.php
index 69768c6e9..d87df2acd 100644
--- a/inc/tinyMce.php
+++ b/inc/tinyMce.php
@@ -6,6 +6,7 @@
  * See the TinyMce documentation for more information: https://www.tiny.cloud/docs/
  *
  */
+
 namespace Flynt\TinyMce;
 
 // First Toolbar
diff --git a/inc/yoastToBottom.php b/inc/yoastToBottom.php
index aef049282..d56a7944b 100644
--- a/inc/yoastToBottom.php
+++ b/inc/yoastToBottom.php
@@ -1,7 +1,9 @@
 <?php
+
 /**
  * Moves the Yoast SEO plugin box to the bottom of the backend interface.
  */
+
 namespace Flynt\YoastToBottom;
 
 function init()
diff --git a/inc/youtubeNoCookieEmbed.php b/inc/youtubeNoCookieEmbed.php
index 0a926d39d..bf19e62f8 100644
--- a/inc/youtubeNoCookieEmbed.php
+++ b/inc/youtubeNoCookieEmbed.php
@@ -1,7 +1,9 @@
 <?php
+
 /**
  * Changes oEmbed YouTube URLs from youtube.com to youtube-nocookie.com in favor of GDPR.
  */
+
 namespace Flynt\YoutubeNoCookieEmbed;
 
 use Flynt\Utils\Oembed;
diff --git a/index.php b/index.php
index 132cf9b70..f7d60d2cf 100644
--- a/index.php
+++ b/index.php
@@ -3,6 +3,7 @@
 use Timber\Timber;
 use Timber\PostQuery;
 use Flynt\Utils\Options;
+
 use const Flynt\Archives\POST_TYPES;
 
 $context = Timber::get_context();
diff --git a/lib/ComponentManager.php b/lib/ComponentManager.php
index 6604e47f5..3aa31342c 100644
--- a/lib/ComponentManager.php
+++ b/lib/ComponentManager.php
@@ -10,7 +10,7 @@ class ComponentManager
     public static function getInstance()
     {
         if (null === self::$instance) {
-            self::$instance = new self;
+            self::$instance = new self();
         }
         return self::$instance;
     }
diff --git a/lib/Utils/AdminNoticeManager.php b/lib/Utils/AdminNoticeManager.php
index 12d7fdb3a..63fd623e5 100644
--- a/lib/Utils/AdminNoticeManager.php
+++ b/lib/Utils/AdminNoticeManager.php
@@ -39,7 +39,7 @@ class AdminNoticeManager
     public static function getInstance()
     {
         if (null === self::$instance) {
-            self::$instance = new self;
+            self::$instance = new self();
         }
         return self::$instance;
     }
diff --git a/lib/Utils/Asset.php b/lib/Utils/Asset.php
index 5ac4aaa1e..658217e80 100644
--- a/lib/Utils/Asset.php
+++ b/lib/Utils/Asset.php
@@ -211,7 +211,8 @@ protected static function add($funcType, $options)
 
         // allow external urls
         $path = $options['path'];
-        if (!(StringHelpers::startsWith('http://', $path))
+        if (
+            !(StringHelpers::startsWith('http://', $path))
             && !(StringHelpers::startsWith('https://', $path))
             && !(StringHelpers::startsWith('//', $path))
         ) {
@@ -221,14 +222,16 @@ protected static function add($funcType, $options)
             $fileExists = true;
         }
 
-        if ('script' === $options['type']
+        if (
+            'script' === $options['type']
             && true === self::$loadFromCdn
             && !empty($options['cdn'])
             && !empty($options['cdn']['check'])
             && !empty($options['cdn']['url'])
         ) {
             // if the script isn't registered or enqueued yet
-            if (!wp_script_is($options['name'], 'registered')
+            if (
+                !wp_script_is($options['name'], 'registered')
                 && !wp_script_is($options['name'], 'enqueued')
             ) {
                 $localPath = $path;
diff --git a/lib/Utils/Log.php b/lib/Utils/Log.php
index f75c4d078..c90c719e0 100644
--- a/lib/Utils/Log.php
+++ b/lib/Utils/Log.php
@@ -66,7 +66,7 @@ public static function pp($data, $postpone = true)
     public static function consoleDebug($data, $postpone = true, $title = 'PHP', $logType = 'log')
     {
         if (in_array($logType, ['log', 'error', 'trace'])) {
-            $title .= '(' . self::getCallerFile(2) .'):';
+            $title .= '(' . self::getCallerFile(2) . '):';
             $type = gettype($data);
             $output = json_encode($data);
             $result =  "<script>console.{$logType}('{$title}', '({$type})', {$output});</script>\n";
diff --git a/lib/Utils/TimberDynamicResize.php b/lib/Utils/TimberDynamicResize.php
index 53595d19d..b9cab975e 100644
--- a/lib/Utils/TimberDynamicResize.php
+++ b/lib/Utils/TimberDynamicResize.php
@@ -224,11 +224,13 @@ protected function generateImage($url, $w, $h, $crop, $force = false)
 
         if ($this->webpEnabled) {
             $fileinfo = pathinfo($resizedUrl);
-            if (in_array($fileinfo['extension'], [
+            if (
+                in_array($fileinfo['extension'], [
                 'jpeg',
                 'jpg',
                 'png',
-            ])) {
+                ])
+            ) {
                 ImageHelper::img_to_webp($resizedUrl);
             }
         }
diff --git a/phpcs.ruleset.xml b/phpcs.ruleset.xml
index 7bfd3ea66..c7064bc41 100644
--- a/phpcs.ruleset.xml
+++ b/phpcs.ruleset.xml
@@ -16,5 +16,5 @@
   <!-- Exclude Warnings -->
   <arg value="n"/>
 
-  <rule ref="PSR2"/>
+  <rule ref="PSR12"/>
 </ruleset>