5 files changed, 48 insertions, 48 deletions
diff --git a/stdlib/source/program/compositor.lux b/stdlib/source/program/compositor.lux
index bca81bd88..90e5534f9 100644
--- a/stdlib/source/program/compositor.lux
+++ b/stdlib/source/program/compositor.lux
@@ -1,27 +1,27 @@
 (.module:
   [library
-   [lux (#- Module)
-    [type (#+ :sharing)]
+   [lux {"-" [Module]}
+    [type {"+" [:sharing]}]
     ["@" target]
     ["." debug]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
-     ["." io (#+ IO io)]
-     ["." try (#+ Try)]
+     ["." io {"+" [IO io]}]
+     ["." try {"+" [Try]}]
      [concurrency
-      ["." async (#+ Async) ("#\." monad)]]]
+      ["." async {"+" [Async]} ("#\." monad)]]]
     [data
-     [binary (#+ Binary)]
+     [binary {"+" [Binary]}]
      ["." product]
      ["." text
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
-      ["." dictionary (#+ Dictionary)]
-      ["." row (#+ Row)]]]
+      ["." dictionary {"+" [Dictionary]}]
+      ["." row {"+" [Row]}]]]
     [time
      ["." instant]]
-    ["." world #_
+    ["." world "_"
      ["." file]
      ["#/." program]
      ... ["." console]
@@ -30,30 +30,30 @@
      [compiler
       ["." phase]
       [default
-       ["." platform (#+ Platform)]]
+       ["." platform {"+" [Platform]}]]
       [language
        ["$" lux
-        ["#/." program (#+ Program)]
+        ["#/." program {"+" [Program]}]
         ["." syntax]
         ["." analysis
-         [macro (#+ Expander)]]
-        ["." generation (#+ Buffer Context)]
+         [macro {"+" [Expander]}]]
+        ["." generation {"+" [Buffer Context]}]
         ["." directive]
         [phase
-         [extension (#+ Extender)]]]]
+         [extension {"+" [Extender]}]]]]
       [meta
-       [packager (#+ Packager)]
-       [archive (#+ Archive)
-        [descriptor (#+ Module)]]
+       [packager {"+" [Packager]}]
+       [archive {"+" [Archive]}
+        [descriptor {"+" [Module]}]]
        [cache
         ["." dependency]]
        [io
         ["ioW" archive]]]]
      ... ["." interpreter]
      ]]]
-  ["." / #_
-   ["#." cli (#+ Service)]
-   ["#." static (#+ Static)]
+  ["." / "_"
+   ["#." cli {"+" [Service]}]
+   ["#." static {"+" [Static]}]
    ["#." export]
    ["#." import]])
 
diff --git a/stdlib/source/program/compositor/cli.lux b/stdlib/source/program/compositor/cli.lux
index a7a02ed0f..58f36d8c8 100644
--- a/stdlib/source/program/compositor/cli.lux
+++ b/stdlib/source/program/compositor/cli.lux
@@ -1,17 +1,17 @@
 (.module:
   [library
-   [lux (#- Module Source)
+   [lux {"-" [Module Source]}
     [control
-     [pipe (#+ case>)]
+     [pipe {"+" [case>]}]
      ["<>" parser
-      ["." cli (#+ Parser)]]]
+      ["." cli {"+" [Parser]}]]]
     [tool
      [compiler
       [meta
        [archive
-        [descriptor (#+ Module)]]]]]
+        [descriptor {"+" [Module]}]]]]]
     [world
-     [file (#+ Path)]]]])
+     [file {"+" [Path]}]]]])
 
 (type: .public Source
   Path)
diff --git a/stdlib/source/program/compositor/export.lux b/stdlib/source/program/compositor/export.lux
index 1da80fc55..49169526d 100644
--- a/stdlib/source/program/compositor/export.lux
+++ b/stdlib/source/program/compositor/export.lux
@@ -1,15 +1,15 @@
 (.module:
   [library
-   [lux (#- Source)
+   [lux {"-" [Source]}
     [abstract
-     ["." monad (#+ do)]]
+     ["." monad {"+" [do]}]]
     [control
-     ["." try (#+ Try)]
+     ["." try {"+" [Try]}]
      [concurrency
-      ["." async (#+ Async)]]]
+      ["." async {"+" [Async]}]]]
     [data
      ["." text
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
       ["." dictionary]
       ["." row]]
@@ -21,12 +21,12 @@
     [tool
      [compiler
       [meta
-       ["." io #_
-        ["#" context (#+ Extension)]]]]]
+       ["." io "_"
+        ["#" context {"+" [Extension]}]]]]]
     [world
      ["." file]]]]
   [//
-   [cli (#+ Source Export)]])
+   [cli {"+" [Source Export]}]])
 
 (def: file
   "library.tar")
diff --git a/stdlib/source/program/compositor/import.lux b/stdlib/source/program/compositor/import.lux
index 230b0325e..72bc61d57 100644
--- a/stdlib/source/program/compositor/import.lux
+++ b/stdlib/source/program/compositor/import.lux
@@ -1,21 +1,21 @@
 (.module:
   [library
-   [lux (#- Module)
+   [lux {"-" [Module]}
     [abstract
-     ["." monad (#+ Monad do)]]
+     ["." monad {"+" [Monad do]}]]
     [control
-     ["." try (#+ Try)]
-     ["." exception (#+ exception:)]
+     ["." try {"+" [Try]}]
+     ["." exception {"+" [exception:]}]
      [concurrency
-      ["." async (#+ Async) ("#\." monad)]]
+      ["." async {"+" [Async]} ("#\." monad)]]
      ["<>" parser
       ["<.>" binary]]]
     [data
-     [binary (#+ Binary)]
+     [binary {"+" [Binary]}]
      ["." text
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
-      ["." dictionary (#+ Dictionary)]
+      ["." dictionary {"+" [Dictionary]}]
       ["." row]]
      [format
       ["." tar]]]
@@ -23,11 +23,11 @@
      [compiler
       [meta
        [archive
-        [descriptor (#+ Module)]]]]]
+        [descriptor {"+" [Module]}]]]]]
     [world
      ["." file]]]]
   [//
-   [cli (#+ Library)]])
+   [cli {"+" [Library]}]])
 
 (def: Action
   (type (All (_ a) (Async (Try a)))))
diff --git a/stdlib/source/program/compositor/static.lux b/stdlib/source/program/compositor/static.lux
index 88f3ce65f..44d5d8a18 100644
--- a/stdlib/source/program/compositor/static.lux
+++ b/stdlib/source/program/compositor/static.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    [target (#+ Target)]
+   [lux "*"
+    [target {"+" [Target]}]
     [world
-     [file (#+ Path)]]]])
+     [file {"+" [Path]}]]]])
 
 (type: .public Static
   (Record