diff --git a/BUILD.bazel b/BUILD.bazel
index dff4ee2a0..5b39985d1 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -4,8 +4,6 @@ load("@npm//:defs.bzl", "npm_link_all_packages")
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load(
     "//bazel:core.bzl",
-    "MLN_LAYER_PLUGIN_HEADERS",
-    "MLN_LAYER_PLUGIN_SOURCE",
     "MLN_CORE_HEADERS",
     "MLN_CORE_SOURCE",
     "MLN_DRAWABLES_GL_HEADERS",
@@ -18,6 +16,8 @@ load(
     "MLN_GENERATED_SHADER_HEADERS",
     "MLN_GENERATED_SHADER_SOURCE",
     "MLN_GENERATED_STYLE_SOURCE",
+    "MLN_LAYER_PLUGIN_HEADERS",
+    "MLN_LAYER_PLUGIN_SOURCE",
     "MLN_OPENGL_HEADERS",
     "MLN_OPENGL_SOURCE",
     "MLN_PRIVATE_GENERATED_STYLE_HEADERS",
diff --git a/MODULE.bazel b/MODULE.bazel
index 166e4c50a..0bc9f0e93 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -10,6 +10,7 @@ bazel_dep(name = "rules_nodejs", version = "6.4.0")
 bazel_dep(name = "libuv", version = "1.48.0")
 bazel_dep(name = "apple_support", version = "1.22.1", repo_name = "build_bazel_apple_support")
 bazel_dep(name = "rules_cc", version = "0.1.3")
+bazel_dep(name = "rules_shell", version = "0.6.0")
 
 node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node", dev_dependency = True)
 node.toolchain(node_version = "20.14.0")
@@ -72,12 +73,13 @@ darwin_config(
 
 bazel_dep(name = "rules_rust", version = "0.62.0")
 bazel_dep(name = "cxx.rs", version = "1.0.157")
+
 # The registry is not always up to date
 # See https://registry.bazel.build/modules/cxx.rs
 git_override(
     module_name = "cxx.rs",
-    tag = "1.0.157",
     remote = "https://github.com/dtolnay/cxx.git",
+    tag = "1.0.157",
 )
 
 rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
diff --git a/platform/BUILD.bazel b/platform/BUILD.bazel
index 6cc1f1dbe..1118b89f5 100644
--- a/platform/BUILD.bazel
+++ b/platform/BUILD.bazel
@@ -267,12 +267,12 @@ objc_library(
 objc_library(
     name = "iosapp",
     srcs = [
+        "//platform/darwin:app/CustomStyleLayerExample.h",
+        "//platform/darwin:app/CustomStyleLayerExample.m",
         "//platform/darwin:app/PluginLayerExample.h",
         "//platform/darwin:app/PluginLayerExample.mm",
         "//platform/darwin:app/PluginLayerExampleMetalRendering.h",
         "//platform/darwin:app/PluginLayerExampleMetalRendering.mm",
-        "//platform/darwin:app/CustomStyleLayerExample.h",
-        "//platform/darwin:app/CustomStyleLayerExample.m",
         "//platform/ios:ios_app_srcs",
     ],
     defines = ["GLES_SILENCE_DEPRECATION"],
diff --git a/platform/darwin/BUILD.bazel b/platform/darwin/BUILD.bazel
index dcc0a8bcb..3dc5e8e01 100644
--- a/platform/darwin/BUILD.bazel
+++ b/platform/darwin/BUILD.bazel
@@ -172,9 +172,9 @@ swift_library(
     testonly = True,
     srcs = glob(["test/*.swift"]),
     data = [
+        "app/PluginLayerTestStyle.json",
         "test/amsterdam.geojson",
         "test/one-liner.json",
-        "app/PluginLayerTestStyle.json",
     ],
     visibility = [
         "//platform/ios/test:__pkg__",
diff --git a/platform/darwin/bazel/files.bzl b/platform/darwin/bazel/files.bzl
index 560189cd6..2866f4a25 100644
--- a/platform/darwin/bazel/files.bzl
+++ b/platform/darwin/bazel/files.bzl
@@ -165,8 +165,7 @@ MLN_DARWIN_PRIVATE_HEADERS = [
     "src/MLNVectorTileSource_Private.h",
     "src/NSExpression+MLNPrivateAdditions.h",
     "src/NSPredicate+MLNPrivateAdditions.h",
-     "src/MLNPluginStyleLayer_Private.h"
-
+    "src/MLNPluginStyleLayer_Private.h",
 ]
 
 MLN_DARWIN_PUBLIC_OBJCPP_SOURCE = [
@@ -222,8 +221,7 @@ MLN_DARWIN_PUBLIC_OBJCPP_SOURCE = [
     "src/NSPredicate+MLNAdditions.mm",
     "src/NSValue+MLNStyleAttributeAdditions.mm",
     "src/MLNPluginLayer.mm",
-    "src/MLNPluginStyleLayer.mm"
-
+    "src/MLNPluginStyleLayer.mm",
 ]
 MLN_DARWIN_PUBLIC_OBJCPP_CUSTOM_DRAWABLE_SOURCE = [
     "src/MLNCustomDrawableStyleLayer_Private.h",
diff --git a/platform/ios/BUILD.bazel b/platform/ios/BUILD.bazel
index fa83c9af8..e4726db2f 100644
--- a/platform/ios/BUILD.bazel
+++ b/platform/ios/BUILD.bazel
@@ -4,7 +4,7 @@ load("@rules_apple//apple:apple.bzl", "apple_static_xcframework", "apple_xcframe
 load("@rules_apple//apple:ios.bzl", "ios_application", "ios_framework")
 load("@rules_apple//apple:resources.bzl", "apple_resource_bundle")
 load("@rules_apple//apple:versioning.bzl", "apple_bundle_version")
-
+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
 load(
     "@rules_xcodeproj//xcodeproj:defs.bzl",
     "top_level_target",
diff --git a/platform/ios/bazel/files.bzl b/platform/ios/bazel/files.bzl
index bf9d220cd..4667a1da8 100644
--- a/platform/ios/bazel/files.bzl
+++ b/platform/ios/bazel/files.bzl
@@ -11,7 +11,7 @@ MLN_IOS_SDK_HEADERS = [
     "src/MLNUserLocation.h",
     "src/MLNUserLocationAnnotationView.h",
     "src/MLNUserLocationAnnotationViewStyle.h",
-    "src/MLNScaleBar.h"
+    "src/MLNScaleBar.h",
 ]
 
 MLN_IOS_PUBLIC_HEADERS = [
diff --git a/platform/linux/BUILD.bazel b/platform/linux/BUILD.bazel
index 0205f7f69..dc8a78d9a 100644
--- a/platform/linux/BUILD.bazel
+++ b/platform/linux/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@rules_cc//cc:defs.bzl", "cc_library")
+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
 load("//bazel:flags.bzl", "CPP_FLAGS", "MAPLIBRE_FLAGS")
 
 ICU_FLAGS = [
@@ -48,7 +49,7 @@ genrule(
             $$(pkg-config --variable=libdir icu-uc)/libicuuc.a \
             $$(pkg-config --variable=libdir icu-uc)/libicudata.a \
             $$(pkg-config --variable=libdir icu-i18n)/libicui18n.a
-    )"""
+    )""",
 )
 
 sh_binary(