diff --git a/compiler/semantic/src/dsl_schema.rs b/compiler/semantic/src/dsl_schema.rs
index b912d27c..d39e3c73 100644
--- a/compiler/semantic/src/dsl_schema.rs
+++ b/compiler/semantic/src/dsl_schema.rs
@@ -298,8 +298,7 @@ fn register_web_schemas(reg: &mut HashMap<String, DSLSchema>) {
     );
 }
 
-fn register_canvas_schemas(reg: &mut HashMap<String, DSLSchema>) {
-    // Canvas module schemas ──────────────────────────────────────────
+fn register_canvas_shape_schemas(reg: &mut HashMap<String, DSLSchema>) {
     reg.insert(
         "logo".to_string(),
         DSLSchema::new(
@@ -318,22 +317,6 @@ fn register_canvas_schemas(reg: &mut HashMap<String, DSLSchema>) {
         ),
     );
 
-    reg.insert(
-        "rings".to_string(),
-        DSLSchema::new(
-            vec![
-                "count".into(),
-                "color".into(),
-                "size".into(),
-                "thickness".into(),
-                "spacing".into(),
-                "rotation".into(),
-            ],
-            vec![],
-            vec![],
-        ),
-    );
-
     reg.insert(
         "emblem".to_string(),
         DSLSchema::new(
@@ -365,7 +348,9 @@ fn register_canvas_schemas(reg: &mut HashMap<String, DSLSchema>) {
             vec![],
         ),
     );
+}
 
+fn register_canvas_text_schemas(reg: &mut HashMap<String, DSLSchema>) {
     reg.insert(
         "letter".to_string(),
         DSLSchema::new(
@@ -383,21 +368,6 @@ fn register_canvas_schemas(reg: &mut HashMap<String, DSLSchema>) {
         ),
     );
 
-    reg.insert(
-        "circuits".to_string(),
-        DSLSchema::new(
-            vec![
-                "color".into(),
-                "density".into(),
-                "width".into(),
-                "animated".into(),
-                "complexity".into(),
-            ],
-            vec![],
-            vec![],
-        ),
-    );
-
     reg.insert(
         "title".to_string(),
         DSLSchema::new(
@@ -437,6 +407,39 @@ fn register_canvas_schemas(reg: &mut HashMap<String, DSLSchema>) {
             vec![],
         ),
     );
+}
+
+fn register_canvas_misc_schemas(reg: &mut HashMap<String, DSLSchema>) {
+    reg.insert(
+        "rings".to_string(),
+        DSLSchema::new(
+            vec![
+                "count".into(),
+                "color".into(),
+                "size".into(),
+                "thickness".into(),
+                "spacing".into(),
+                "rotation".into(),
+            ],
+            vec![],
+            vec![],
+        ),
+    );
+
+    reg.insert(
+        "circuits".to_string(),
+        DSLSchema::new(
+            vec![
+                "color".into(),
+                "density".into(),
+                "width".into(),
+                "animated".into(),
+                "complexity".into(),
+            ],
+            vec![],
+            vec![],
+        ),
+    );
 
     reg.insert(
         "theme".to_string(),
@@ -487,6 +490,13 @@ fn register_canvas_schemas(reg: &mut HashMap<String, DSLSchema>) {
     );
 }
 
+fn register_canvas_schemas(reg: &mut HashMap<String, DSLSchema>) {
+    // Canvas module schemas ──────────────────────────────────────────
+    register_canvas_shape_schemas(reg);
+    register_canvas_text_schemas(reg);
+    register_canvas_misc_schemas(reg);
+}
+
 fn register_generic_schemas(reg: &mut HashMap<String, DSLSchema>) {
     // Generic DSL blocks ────────────────────────────────────────────
     reg.insert(