diff --git a/ape/ask.hoon b/ape/ask.hoon
index 0e47a424b..d6953849c 100644
--- a/ape/ask.hoon
+++ b/ape/ask.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#ask#ape
+::::  /hoon+ask+ape
   ::
 /?    314
 /+    sole
@@ -17,13 +17,13 @@
   ~|  [%not-in-whitelist src.bow]
   ?>  (~(has in (sa (limo ~zod our.bow ~talsur-todres ~))) src.bow)
   :_  +>.$(sos (~(put by sos) ost.bow *sole-share))
-  =-  [(effect %mor pro#[& %$ "<listening>"] -)]~
+  =-  [(effect %mor pro+[& %$ "<listening>"] -)]~
   =+  all=adrs
-  [tan#(turn all message) (turn all put-mail)]
+  [tan+(turn all message) (turn all put-mail)]
 ::
 ++  adrs  (sort (~(tap by adr)) aor)
 ++  effect  |=(fec/sole-effect [ost.bow %diff %sole-effect fec])
-++  message  |=(ask/@t leaf#"ask: {(trip ask)}")
+++  message  |=(ask/@t leaf+"ask: {(trip ask)}")
 ++  put-mail   |=(ask/@t =+(pax=(rash ask unix-path) [%sav pax '']))
 ++  unix-path  ::  split into path of "name" and "extension"
   ;~  (glue dot)
@@ -34,24 +34,24 @@
 ++  poke-ask-mail
   |=  ask/@t
   ^-  (quip {bone card} +>)
-  ~|  have-mail#ask
+  ~|  have-mail+ask
   ?<  (~(has in adr) ask)
   :_  +>.$(adr (~(put in adr) ask))
   =+  [mez=[(message ask)]~ sav=(put-mail ask)]
   %+  turn  (prey /sole bow)
-  |=({ost/bone ^} (effect(ost.bow ost) %mor tan#mez sav ~))
+  |=({ost/bone ^} (effect(ost.bow ost) %mor tan+mez sav ~))
 ::
 ++  poke-sole-action
   |=  act/sole-action
   ^-  (quip {bone card} +>)  
   ?-  -.act
     $clr  `+>.$
-    $ret  [[(effect tan#(turn adrs message))]~ +>.$]    :: re-print list
+    $ret  [[(effect tan+(turn adrs message))]~ +>.$]    :: re-print list
     $det                              :: reject all input
       =+  som=(~(got by sos) ost.bow) ::  XX this code belongs in a library
       =^  inv  som  (~(transceive sole som) +.act)
       =^  det  som  (~(transmit sole som) inv)
       =.  sos  (~(put by sos) ost.bow som)
-      [[(effect det#det)]~ +>.$]
+      [[(effect det+det)]~ +>.$]
   ==
 --
diff --git a/ape/bit.hoon b/ape/bit.hoon
index 11a9ba8d4..dee970827 100644
--- a/ape/bit.hoon
+++ b/ape/bit.hoon
@@ -43,14 +43,14 @@ $:  cred/(unit {app-secret/@t client-id/@t})
 |_  {hid/bowl vat/axle}
 :: ++  prep  ~&(%bit-prep-wipe ,_`.)
 ++  return  [*(list move) .]
-++  redirect-uri  [hostname `/~~/home#pub#bit#fab ~]
+++  redirect-uri  [hostname `/~~/home+pub+bit+fab ~]
 ++  hostname  ^-  hart
   ?+  (clan our.hid)  !!
      $czar  [| ?+(our.hid `8.443 $~fyr `8.444) `/localhost]
-     $duke  [| `8.444 `/org#urbit#(crip +:<our.hid>)]
+     $duke  [| `8.444 `/org+urbit+(crip +:<our.hid>)]
   ==
 ++  auth-url
-  %+  weld  "https://sandbox.coinbase.com#oauth#authorize"
+  %+  weld  "https://sandbox.coinbase.com+oauth+authorize"
   %-  tail:earn  :~
     'response_type'^%code
     'client_id'^client-id:(need cred.vat)
@@ -64,15 +64,15 @@ $:  cred/(unit {app-secret/@t client-id/@t})
   |=  {pour-path/wire end-point/path req/$@($get {$post p/json})}
   ^-  move
   %^  send:http  ost.hid  pour-path 
-  [/com#coinbase#api v1/end-point req ~ ['access_token' access:(need auth.vat)]~]
+  [/com+coinbase+api v1/end-point req ~ ['access_token' access:(need auth.vat)]~]
 ::
 ++  api-call
   |=  {res/mark req/bit-api-call}  ^+  return
   ~|  %missing-access-token
-  [[ost.hid %hiss / res bit-api-call#[access:(need auth.vat) req]]~ +>.$]
+  [[ost.hid %hiss / res bit-api-call+[access:(need auth.vat) req]]~ +>.$]
 ::
 ++  print  |=(msg/tape [[(publish [%lin & (crip msg)]~)]~ +>.$])
-++  callback-uri  [hostname [`%json /~/to#[dap.hid]/json] ~[anon#'' wire#'/']]
+++  callback-uri  [hostname [`%json /~/to+[dap.hid]/json] ~[anon+'' wire+'/']]
 ++  poke-auth
   |=  arg/{secr/cord id/cord}
   =.  cred.vat  `arg
@@ -91,7 +91,7 @@ $:  cred/(unit {app-secret/@t client-id/@t})
   ^-  move
   [ost.hid %send way [his dap.hid] %poke mez]
 ::
-++  poke-bit-send  |=(req/bit-send (api-call %bit-transaction send#req))
+++  poke-bit-send  |=(req/bit-send (api-call %bit-transaction send+req))
 ++  sigh-bit-transaction
   |=({* trid/@t} (print "transaction success {(trip trid)}"))
 ::
@@ -106,17 +106,17 @@ $:  cred/(unit {app-secret/@t client-id/@t})
   |=  $~                              ::  gen new address with callback
   :_  +>.$
   :_  ~
-  %+  old-api  /addr-request#(scot %p src.hid) 
+  %+  old-api  /addr-request+(scot %p src.hid) 
   :+  /addresses  %post
   %+  joba  %address
   %-  jobe  :~
-    label#(jape "address for {<src.hid>}")
+    label+(jape "address for {<src.hid>}")
     'callback_url'^(jape (earn callback-uri))
   ==
   ::
 ++  pour-addr-request             ::  send new address to sender
   |=  {pax/path rez/json}
-  =+  adr=(need ((ot address#so ~):jo rez))
+  =+  adr=(need ((ot address+so ~):jo rez))
   =+  his=(slav %p +<.pax)
   ~!  incoming.vat
   =.  incoming.vat
@@ -128,7 +128,7 @@ $:  cred/(unit {app-secret/@t client-id/@t})
 ++  poke-bit-addr-made             ::  receive address for sending
   |=  addr/@t
   =+  amount=(~(got by outgoing.vat) src.hid)             ::  get amount to send
-  (api-call %bit-transaction txt-send#[addr amount])
+  (api-call %bit-transaction txt-send+[addr amount])
 ::
 ++  poke-oauth2-code
   |=  code/cord
@@ -136,7 +136,7 @@ $:  cred/(unit {app-secret/@t client-id/@t})
     [~ code]
   ?<  ?=($~ cred.vat)  
   =+  req=[code [client-id app-secret]:u.cred.vat redirect-uri]
-  [[ost.hid %hiss / %oauth-tokens bit-get-token#req]~ +>.$]
+  [[ost.hid %hiss / %oauth-tokens bit-get-token+req]~ +>.$]
 ::
 ++  sigh-oauth-tokens
   |=  {wire toke/{access/@t refresh/@t}}
@@ -157,29 +157,29 @@ $:  cred/(unit {app-secret/@t client-id/@t})
       ~&('contact-exists' (~(get by contacts.vat) to.arg))
   =+  ^=  info
       ?~  cur.arg  
-        [to#s#to.arg amount#s#(need amone.arg) ~]
+        [to+s+to.arg amount+s+(need amone.arg) ~]
       ?~  nt.arg
-        :*  to#s#to.arg 
-            'amount_currency_iso'^s#(need cur.arg) 
-            'amount_string'^s#(need amtwo.arg) 
+        :*  to+s+to.arg 
+            'amount_currency_iso'^s+(need cur.arg) 
+            'amount_string'^s+(need amtwo.arg) 
             ~
         ==
-      :*  to#s#to.arg 
-          amount#s#(need amtwo.arg) 
-          'amount_string'^s#(need amtwo.arg)
+      :*  to+s+to.arg 
+          amount+s+(need amtwo.arg) 
+          'amount_string'^s+(need amtwo.arg)
           ~
       ==
   =+  ^=  pst
-      (jobe transaction#(jobe info) ~)
-  [[(old-api /send /transactions#'send_money' %post pst) ~] +>.$]
+      (jobe transaction+(jobe info) ~)
+  [[(old-api /send /transactions+'send_money' %post pst) ~] +>.$]
 ::
 ++  poke-json
   |=  arg/json
   ~&  arg
-  =+  [adr amo]=(need %.(arg (ot address#so amount#no ~):jo))
+  =+  [adr amo]=(need %.(arg (ot address+so amount+no ~):jo))
   =+  frm=(~(get by incoming.vat) adr)
   (print "just received {(trip amo)} BTC from {<frm>}")
-  ::(old-api /get-id /transactions#[transaction-id] %get)
+  ::(old-api /get-id /transactions+[transaction-id] %get)
 ::
 ++  pour-get-id             ::  display transaction info
   |=  {pax/path rez/json}
diff --git a/ape/cloud.hoon b/ape/cloud.hoon
index 73ec0ca1d..b644549a6 100644
--- a/ape/cloud.hoon
+++ b/ape/cloud.hoon
@@ -77,7 +77,7 @@
         'code'^code
         :-  'client_id'
         'd8f46b95af38c1ab3d78ad34c2157a6959c23eb0eb5d8e393f650f08e6a75c6f'
-        'redirect_uri'^'http://localhost:8443/home#pub#cloud#fab'
+        'redirect_uri'^'http://localhost:8443/home+pub+cloud+fab'
     ==
 ::
 ++  parse-iso8601
@@ -109,7 +109,7 @@
     [%create-do some]
     ::[%create-gce some]
     :-  %action 
-    (ot id#so name#so act#parse-droplet-action ~)
+    (ot id+so name+so act+parse-droplet-action ~)
   ==
 ++  parse-droplet-action
   =>  jo
@@ -143,7 +143,7 @@
 ::
 ++  parse-region
   =>  jo
-  (ot name#so ~)
+  (ot name+so ~)
 ::
 ++  parse-id-text
   |=  jon/json
@@ -160,13 +160,13 @@
           user-data/(unit @t)  
   ==
   %-  jobe
-  :~  name#s#name 
-      size#s#size  
-      image#s#image 
-      backups#?~(backups ~ b#u.backups)  
-      ipv6/?~(ipv6 ~ b#u.ipv6)
-      'user_data'^?~(user-data ~ s#u.user-data)  
-      'private_networking'^?~(private-networking ~ b#u.private-networking)
+  :~  name+s+name 
+      size+s+size  
+      image+s+image 
+      backups+?~(backups ~ b+u.backups)  
+      ipv6/?~(ipv6 ~ b+u.ipv6)
+      'user_data'^?~(user-data ~ s+u.user-data)  
+      'private_networking'^?~(private-networking ~ b+u.private-networking)
   ==
 ::
 ++  convert-do
@@ -191,11 +191,11 @@
   |=  instance
   ^-  json
   %-  jobe
-  :~  name#`json`s#name
-      id#s#id
-      status#s#status
-      created#s#(crip (dust (yore created)))
-      snapshot#s#snapshot
+  :~  name+`json`s+name
+      id+s+id
+      status+s+status
+      created+s+(crip (dust (yore created)))
+      snapshot+s+snapshot
   ==
 ++  map-to-list
   |=  a/(map {@t @t} image)
@@ -211,7 +211,7 @@
   |=  image
   ^-  json
   %-  jobe
-  :~  name#s#name  id#s#id  ==
+  :~  name+s+name  id+s+id  ==
 --
 ::::::::::::::::
 ::  main door :: 
@@ -225,7 +225,7 @@
 ++  thou
   |=  {pour-path/path resp/?(httr *)}
   ^-  {(list move) _+>.$}
-  ~&  unhandled-pour-path#resp
+  ~&  unhandled-pour-path+resp
   :_  +>.$  ~
 ::
 ++  httpreq  
@@ -324,7 +324,7 @@
   ^-  {(list move) _+>.$}
   ~|  resp
   =+  body=(rash q:(need r.resp) apex:poja)
-  ~|  receive-auth#resp(r body)
+  ~|  receive-auth+resp(r body)
   =+  [ac re]=(need ((ot 'access_token'^so 'refresh_token'^so ~):jo body))
   =:  access.do.toke.vat   ac
       refresh.do.toke.vat  re
@@ -342,11 +342,11 @@
       %.  act
       =>  jo
       %-  ot
-      :~  name#so  
-          size#so  
-          image#so
-          ssh#(ar so)  
-          backups#(mu bo)
+      :~  name+so  
+          size+so  
+          image+so
+          ssh+(ar so)  
+          backups+(mu bo)
           'ipv6'^(mu bo)  
           'priv_networking'^(mu bo)  
           'user_data'^(mu so)
@@ -366,7 +366,7 @@
     /create-do
     ~[%digitalocean %api]  /v2/droplets
     [%post body]
-    %^  mo  ['Content-Type' 'application#json; charset=utf-8' ~]
+    %^  mo  ['Content-Type' 'application+json; charset=utf-8' ~]
       ['Authorization' (cat 3 'Bearer ' access.do.toke.vat) ~]
     ~
     ~
@@ -378,13 +378,13 @@
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ++  reserve-ip
   |=  name/json
-  =+  nam=(need ((ot name#so ~):jo name))
+  =+  nam=(need ((ot name+so ~):jo name))
   %-  httpreq
   :*  /reserve-ip/[nam]
       ~['googleapis' 'www']
       /compute/v1/projects/urbcloud/regions/us-central1/addresses
-      [%post (joba name#s#nam)]
-      %^  mo  ['Content-Type' 'application#json' ~]
+      [%post (joba name+s+nam)]
+      %^  mo  ['Content-Type' 'application+json' ~]
               ['Authorization' (cat 3 'Bearer ' access.gce.toke.vat) ~]
               ~
       *quay
@@ -396,14 +396,14 @@
   ~|  r.resp
   =+  parsed=(rash q:(need r.resp) apex:poja)
   =+  ur=(need ((ot 'targetLink'^so ~):jo parsed))
-  ~&  initial-response#parsed
+  ~&  initial-response+parsed
   =+  name=-:(flop q.q:(need (epur ur)))
   =+  buf=`@da`(add ~s10 now) 
   :_(+>.$ [ost %wait `path`/check-ip-status/[name] buf]~)
 ::
 ++  wake-check-ip-status
   |=  {name/path $~}
-  ~&  this-is-the-name#name
+  ~&  this-is-the-name+name
   =+  nam=?~(name !! -.name)
   :_  +>.$
   :_  ~
@@ -412,37 +412,37 @@
       ~['googleapis' 'www']
       `path`/compute/v1/projects/urbcloud/regions/us-central1/addresses/[nam]
       %get
-       %^  mo  ['Content-Type' 'application#json' ~]
+       %^  mo  ['Content-Type' 'application+json' ~]
                ['Authorization' (cat 3 'Bearer ' access.gce.toke.vat) ~]
                ~
       *quay
   ==
 ++  thou-check-ip-status
   |=  {name/path resp/httr}
-  ~&  api-resp#resp
+  ~&  api-resp+resp
   =+  parsed=(rash q:(need r.resp) apex:poja)
   !!
-  ::?.  =('RESERVED' (need ((ot status#so ~):jo parsed)))
+  ::?.  =('RESERVED' (need ((ot status+so ~):jo parsed)))
 ::
 ++  create-gce
   |=  jon/json
   =+  ^-  {name/@t image/@t number/@ud}
-      (need ((ot name#so 'instance_img'^so number#ni ~):jo jon))
+      (need ((ot name+so 'instance_img'^so number+ni ~):jo jon))
   |-  ^-  (list move) 
   ?~  number  ~
   :_  $(number (dec number))
   =+  nam=(cat 3 name (scot %ud number))
   =+  ^-  body/json
       %-  jobe
-      :~  name#s#nam  
-          'machineType'^s#'zones#us-central1-a#machineTypes#n1-standard-1'
+      :~  name+s+nam  
+          'machineType'^s+'zones+us-central1-a+machineTypes+n1-standard-1'
       :-  %disks  :-  %a  :_  ~
       %-  jobe   
-      :+  'initializeParams'^`json`(joba 'sourceImage'^s#image)
-           boot#b#%.y
+      :+  'initializeParams'^`json`(joba 'sourceImage'^s+image)
+           boot+b+%.y
            ~
       :-  'networkInterfaces'  :-  %a  :_  ~
-      (joba 'network' `json`[%s 'global#networks#default'])
+      (joba 'network' `json`[%s 'global+networks+default'])
       ==
   ^-  move
   %-  httpreq
@@ -450,7 +450,7 @@
       `(list cord)`~['googleapis' 'www']  
       `path`/compute/v1/projects/urbcloud/zones/us-central1-a/'instances'
       [%post `json`body]
-     %^  mo  ['Content-Type' 'application#json' ~]
+     %^  mo  ['Content-Type' 'application+json' ~]
        ['Authorization' (cat 3 'Bearer ' access.gce.toke.vat) ~]
     ~
       `quay`[%key access.gce.toke.vat]~
@@ -482,8 +482,8 @@
         ?:  ?=($delete -.action)  
           %delt 
         :-  %post
-        %+  jobe   type#s#(convert-do -.action) 
-        ?.(?=($snapshot -.action) ~ [name#s#p.action ~])
+        %+  jobe   type+s+(convert-do -.action) 
+        ?.(?=($snapshot -.action) ~ [name+s+p.action ~])
     ^-  move
     =+  ^=  req
     %-  httpreq  :*
@@ -491,7 +491,7 @@
       ~[%digitalocean %api]  
       ?:(?=($delt meth) /v2/droplets/[id] /v2/droplets/[id]/actions)
       meth
-      %^  mo  ['Content-Type' 'application#json' ~]
+      %^  mo  ['Content-Type' 'application+json' ~]
       ['Authorization' (cat 3 'Bearer ' access.do.toke.vat) ~]  ~
       *quay
      ==
@@ -499,7 +499,7 @@
   ::
       $gce
     =+  ^=  head-query
-    :-  %^  mo  ['Content-Type' 'application#json' ~]
+    :-  %^  mo  ['Content-Type' 'application+json' ~]
     ['Authorization' (cat 3 'Bearer ' access.gce.toke.vat) ~]  ~
     *quay
     ?-    -.action
@@ -524,12 +524,12 @@
   ==
 ++  thou-do-act
   |=  {pax/path resp/httr}
-  ~&  [resp act#pax]
+  ~&  [resp act+pax]
   :_  +>.$  ~
 ::
 ++  thou-gce-act
   |=  {pax/path resp/httr}
-  ~&  [resp act#pax]
+  ~&  [resp act+pax]
   :_  +>.$  ~
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ::  retrieve google instances and images                                     ::
@@ -559,7 +559,7 @@
   ^-  {(list move) _+>.$}
   =+  parsed=(rash q:(need r.resp) apex:poja)           ::  body httr to json
   ~|  'no list received or bad json'
-  =+  items=(need ((ot items#(ar some) ~):jo parsed))
+  =+  items=(need ((ot items+(ar some) ~):jo parsed))
   =+  ^-  ins/(list {@t instance})
   ~|  'bad-json'^items
   %+  turn  items
@@ -570,10 +570,10 @@
   %-  need
   %.  in  =+  jo
   %-  ot
-  :~  name#so  
-      id#so  
-      status#so  
-      'creationTimestamp'^(su parse-iso8601)  ::zone#so
+  :~  name+so  
+      id+so  
+      status+so  
+      'creationTimestamp'^(su parse-iso8601)  ::zone+so
       'machineType'^(cu tail-url so)
 ::    'networkInterfaces'^parse-ip-gce
   ==
@@ -593,7 +593,7 @@
   |=  {pax/path resp/httr}
   ^-  {(list move) _+>.$}
   =+  parsed=(rash q:(need r.resp) apex:poja)
-  =+  imgz=(need ((ot items#(ar some) ~):jo parsed))
+  =+  imgz=(need ((ot items+(ar some) ~):jo parsed))
   =.  images.vat
   %-  mo
   %+  weld  
@@ -607,7 +607,7 @@
   %-  need
   %.  a  =+  jo
   %-  ot
-  [name#so id#so ~]
+  [name+so id+so ~]
   :_  +>.$  [(spam `json`(image-to-json `(list image)`(map-to-list images.vat)))]
 ::
 ++  wake-refresh-gce  |=({path $~} [list-gce +>.$])
@@ -624,7 +624,7 @@
           /v2/[som]
           %get
           %-  mo
-          :~  ['Content-Type' 'application#json' ~] 
+          :~  ['Content-Type' 'application+json' ~] 
               ['Authorization' (cat 3 'Bearer ' access.do.toke.vat) ~]
           ==
       ==
@@ -634,10 +634,10 @@
   |=  {pax/path resp/httr}
   ^-  {(list move) _+>.$}
   =+  parsed=(rash q:(need r.resp) apex:poja)           ::  parse httr to json
-  ~|  receive-list#parsed
-  =+  dar=(need ((ot droplets#(ar some) ~):jo parsed))  ::  reparse ar of insts
+  ~|  receive-list+parsed
+  =+  dar=(need ((ot droplets+(ar some) ~):jo parsed))  ::  reparse ar of insts
   =+  ^-  dropz/(list {@t instance})
-      ~|  bad-json#-.dar
+      ~|  bad-json+-.dar
       %+  turn  dar
       |=  drp/json    ^-  {@t instance}
       =-  ~!  -  -
@@ -648,11 +648,11 @@
       %.  drp
       =+  jo
       %-  ot
-      :~  name#so  
-          id#parse-id-text  
-          status#so  
+      :~  name+so  
+          id+parse-id-text  
+          status+so  
           'created_at'^(su parse-iso8601) 
-          image#(ot name#so ~)
+          image+(ot name+so ~)
       ==
   =.  insts.vat
   %-  mo
@@ -670,10 +670,10 @@
 ++  thou-list-do-images
   |=  {pax/path resp/httr} 
   =+  parsed=(rash q:(need r.resp) apex:poja)
-  ~|  crashed-do-images#parsed
+  ~|  crashed-do-images+parsed
   =+  ^=  imgz
       %-  need
-      ((ot images#(ar (ot [name#so distribution#so id#no ~])) ~):jo parsed)
+      ((ot images+(ar (ot [name+so distribution+so id+no ~])) ~):jo parsed)
   =+  ^-  images/(list {{@t @t} image})
       %+  turn  imgz
       |=  {name/@t dist/@t id/@t}
diff --git a/ape/dojo.hoon b/ape/dojo.hoon
index afcc381be..94fad2c8d 100644
--- a/ape/dojo.hoon
+++ b/ape/dojo.hoon
@@ -1,5 +1,5 @@
 ::                                                      ::  ::
-::::  /hoon#dojo#app                                    ::  ::::
+::::  /hoon+dojo+app                                    ::  ::::
   ::                                                    ::    ::
 /?  314                                                 ::  arvo kelvin
 /-  sole                                                ::  console structures
@@ -18,7 +18,7 @@
       $:  say/sole-share                                ::  command-line state
           dir/beam                                      ::  active path
           poy/(unit dojo-project)                       ::  working
-          {lib/(list hoof) arc/(list hoof)}             ::  lib#sur
+          {lib/(list hoof) arc/(list hoof)}             ::  lib+sur
           var/(map term cage)                           ::  variable state
           old/(set term)                                ::  used TLVs
           buf/tape                                      ::  multiline buffer
@@ -34,7 +34,7 @@
           {$file p/beam}                                ::  save to clay
           {$http p/?($post $put) q/purl}                ::  http outbound
           {$poke p/goal}                                ::  poke app
-          {$show p/?($0 $1 $2 $3)}                      ::  print val#type#twig
+          {$show p/?($0 $1 $2 $3)}                      ::  print val+type+twig
           {$verb p/term}                                ::  store variable
       ==                                                ::
     ++  dojo-source                                     ::  construction node
@@ -425,13 +425,13 @@
           $?($eny $now $our)  !!
           $lib  .(lib ~)
           $arc  .(arc ~)
-          $dir  .(dir [[our.hid %home ud#0] /])
+          $dir  .(dir [[our.hid %home ud+0] /])
         ==
       =+  cay=(~(got by rez) p.q.mad)
       ?-    -.p.mad
           $verb
         =.  var  (~(put by var) p.p.mad cay)
-        ~|  bad-set#[p.p.mad p.q.cay]
+        ~|  bad-set+[p.p.mad p.q.cay]
         =<  dy-amok
         ?+  p.p.mad  .
           $eny  ~|(%entropy-is-eternal !!)
@@ -447,7 +447,7 @@
                     pax
                 =.  dir  (need (tome pax))
                 =-  +>(..dy (he-diff %tan - ~))
-                rose#[" " `~]^~[leaf#"=%" (smyt (tope he-beak s.dir))]
+                rose+[" " `~]^~[leaf+"=%" (smyt (tope he-beak s.dir))]
         ==
       ::
           $poke       
@@ -479,7 +479,7 @@
           $http
         ?>  ?=($mime p.cay)
         =+  mim=;;(mime q.q.cay)
-        =+  maf=(~(add ja *math) content-type#(moon p.mim))
+        =+  maf=(~(add ja *math) content-type+(moon p.mim))
         (dy-eyre /show [q.p.mad p.p.mad maf ~ q.mim])
       ::
           $show
@@ -500,7 +500,7 @@
         $tang  ;;(tang q.q.cay)
         $httr
           =+  hit=;;(httr q.q.cay)
-          =-  (flop (turn `wall`- |=(a/tape leaf#(dash:ut a ''))))
+          =-  (flop (turn `wall`- |=(a/tape leaf+(dash:ut a ''))))
           :-  "HTTP {<p.hit>}"
           %+  weld
             (turn q.hit |=({a/@t b/@t} "{(trip a)}: {(trip b)}"))
@@ -613,7 +613,7 @@
       %+  sloop
         %-  ~(rep by var)
         |=  {{a/term @ b/vase} c/vase}  ^-  vase
-        (sloop b(p face#[a p.b]) c)
+        (sloop b(p face+[a p.b]) c)
       !>([our=our now=now eny=eny]:hid)
     ::
     ++  dy-made-dial                                    ::  dialog product
@@ -656,8 +656,8 @@
       ::
           $|
         =+  hiz=;;(hiss +<.q.vax)
-        =.  ..dy  (he-diff %tan leaf#"< {(earn p.hiz)}" ~)
-        (dy-eyre(pro `(slap (slot 7 vax) cnzy#%q)) /scar hiz)
+        =.  ..dy  (he-diff %tan leaf+"< {(earn p.hiz)}" ~)
+        (dy-eyre(pro `(slap (slot 7 vax) cnzy+%q)) /scar hiz)
       ==
     ::
     ++  dy-sigh-scar                                    ::  scraper result
@@ -744,14 +744,14 @@
   ::
   ++  he-dope                                           ::  sole user of ++dp
     |=  txt/tape                                        ::
-    ^-  (each (unit (each dojo-command tape)) hair)     ::  prefix#result
+    ^-  (each (unit (each dojo-command tape)) hair)     ::  prefix+result
     =+  len=+((lent txt))                               ::  line length
     =.  txt  :(weld buf txt "\0a")                      ::
     =+  vex=((full dp-command-line):dp [1 1] txt)       ::
     ?:  =(q.p.vex len)                                  ::  matched to line end
       [%& ~]                                            ::
     ?:  =(p.p.vex +((lent (skim txt |=(a/@ =(10 a)))))) ::  parsed all lines
-      [%& ~ ?~(q.vex [%| txt] `p.u.q.vex)]              ::  new buffer#complete
+      [%& ~ ?~(q.vex [%| txt] `p.u.q.vex)]              ::  new buffer+complete
     [%| p.p.vex (dec q.p.vex)]                          ::  syntax error
   ::
   ++  he-duke                                           ::  ++he-dope variant
@@ -766,7 +766,7 @@
   ++  he-easter                                         ::  hint messages
     ^+  .
     =.  egg  +(egg)
-    =-  ?~(msg ..he-diff (he-diff %tan leaf#u.msg ~))
+    =-  ?~(msg ..he-diff (he-diff %tan leaf+u.msg ~))
     ^-  msg/(unit tape)
     ?+  (clan our.hid)  ~
       $pawn  ?+  egg  ~
@@ -783,7 +783,7 @@
   ++  he-beak  -:he-beam
   ++  he-beam                                           ::  logical beam
     ^-  beam
-    ?.  =(ud#0 r.dir)  dir
+    ?.  =(ud+0 r.dir)  dir
     dir(r [%da now.hid])
   ::
   ++  he-card                                           ::  emit gift
@@ -923,7 +923,7 @@
         (he-diff [%err (lent txt)])
       =+  old=(weld ?~(buf "> " "  ") (tufa buf.say))
       =^  cal  say  (~(transmit sole say) [%set ~])
-      =.  +>.$   (he-diff %mor txt#old nex#~ det#cal ~)
+      =.  +>.$   (he-diff %mor txt+old nex+~ det+cal ~)
       ?-  -.u.p.doy
         $&  (he-plan(buf ~) p.u.p.doy)
         $|  he-prom(buf p.u.p.doy)
@@ -984,11 +984,11 @@
     ?.  (~(has by hoc) ost.hid)  [~ .]
     ~&  [%dojo-peer-replaced ost.hid]
     ~(he-abut he ~ (~(got by hoc) ost.hid))
-  =+  ses=%*(. *session -.dir [our.hid %home ud#0])
+  =+  ses=%*(. *session -.dir [our.hid %home ud+0])
   (wrap he-peer):(arm-session moz ses)
 ::
 ++  poke-sole-action
-  |=  act/sole-action  ~|  poke#act  %.  act
+  |=  act/sole-action  ~|  poke+act  %.  act
   (wrap he-type):arm
 ++  made       (wrap he-made):arm
 ++  sigh-httr  (wrap he-sigh):arm
diff --git a/ape/hood.hoon b/ape/hood.hoon
index c10aa7a2d..88b3e3b09 100644
--- a/ape/hood.hoon
+++ b/ape/hood.hoon
@@ -1,5 +1,5 @@
 ::                                                      ::  ::
-::::  /hoon#hood#ape                                    ::  ::
+::::  /hoon+hood+ape                                    ::  ::
   ::                                                    ::  ::
 /?  314                                                 ::  zuse version
 /+  sole, talk, helm, kiln, drum                        ::  libraries
@@ -38,7 +38,7 @@
 |_  $:  hid/bowl                                        ::  system state
         hood-0                                          ::  server state
     ==                                                  ::
-++  able                                                ::  find#make part
+++  able                                                ::  find+make part
   |*  hed/hood-head
   =+  rep=(~(get by lac) hed)
   =+  par=?^(rep u.rep `hood-part`(hood-make our.hid hed))
diff --git a/ape/oct1.hoon b/ape/oct1.hoon
index b748bbe14..559c3d8d5 100644
--- a/ape/oct1.hoon
+++ b/ape/oct1.hoon
@@ -1,5 +1,5 @@
 ::                                                      ::  ::
-::::  /hoon#oct1/ape                                    ::::::  dependencies
+::::  /hoon+oct1/ape                                    ::::::  dependencies
   ::                                                    ::  ::
 /?  310                                                 ::  arvo version
 /-  sole, oct1                                          ::  structures
@@ -50,13 +50,13 @@
           ?.(dud fail wild:kind)                        ::
 ++  kind  =+(res:here ?~(- + (word(gam new:here) ->)))  ::  move result
 ++  prom  (fect %pro %& %oct1 voy:here)                 ::  update prompt
-++  rend  (turn `wall`tab:here |=(tape txt#+<))         ::  table print
+++  rend  (turn `wall`tab:here |=(tape txt++<))         ::  table print
 ++  sawn  .(eye (~(del by eye) ost))                    ::  console unsubscribe
 ++  seen  .(eye (~(put by eye) ost *sole-share))        ::  console subscribe
 ++  show  prom:(fect %mor rend)                         ::  update console
 ++  tame  (flap |=(_. prom:+<))                         ::  light update
 ++  wild  (flap |=(_. show:+<))                         ::  full update
-++  word  |=(tape (flap |=(_+> (fect:+< txt#+>+<))))    ::
+++  word  |=(tape (flap |=(_+> (fect:+< txt++>+<))))    ::
 ::                                                      ::  ::
 ::::                                                    ::::::  process UI
   ::                                                    ::  ::
@@ -67,11 +67,11 @@
   ++  abet  ..work(eye (~(put by eye) ost say))         ::  resolve
   ++  delt  |=  cal/sole-change                         ::  edit command line
             =^  cul  say  (~(remit sole say) cal good)  ::
-            ?~(cul abet fail:(fect:abet det#u.cul))     ::
+            ?~(cul abet fail:(fect:abet det+u.cul))     ::
   ++  dive  =+  (rust (tufa buf.say) (punt come))       ::  apply command line
             ?~(- fail ?~(-> show (kick:wipe ->+)))      ::
   ++  good  |=((list @c) -:(rose (tufa +<) come))       ::  validate input
-  ++  wipe  =^  cal  say  (~(transmit sole say) set#~)  ::  clear line
+  ++  wipe  =^  cal  say  (~(transmit sole say) set+~)  ::  clear line
             (fect:abet %det cal)                        ::
   --                                                    ::
 ::                                                      ::  ::
diff --git a/ape/oct2.hoon b/ape/oct2.hoon
index 31d19d4d3..b839c8e8b 100644
--- a/ape/oct2.hoon
+++ b/ape/oct2.hoon
@@ -1,5 +1,5 @@
 ::                                                      ::  ::
-::::  /hoon#oct2/ape                                    ::::::  dependencies
+::::  /hoon+oct2/ape                                    ::::::  dependencies
   ::                                                    ::  ::
 /?  310                                                 ::  arvo version
 /-  sole, oct2                                          ::  structures
@@ -67,13 +67,13 @@
 ++  kind  =+(res:here ?~(- + (word(gam new:here) ->)))  ::  move result
 ++  hail  |=(? tame(gam (hey:here +<)))                 ::  toggle subscriber
 ++  prom  (fect %pro %& %oct2 voy:here)                 ::  update prompt
-++  rend  (turn `wall`tab:here |=(tape txt#+<))         ::  table print
+++  rend  (turn `wall`tab:here |=(tape txt++<))         ::  table print
 ++  sawn  (hail(eye (~(del by eye) ost)) |)             ::  console unsubscribe
 ++  seen  (hail(eye (~(put by eye) ost *sole-share)) &) ::  console subscribe
 ++  show  prom:(fect %mor rend)                         ::  update console
 ++  tame  (flap |=(_. prom:+<))                         ::  light update
 ++  wild  (flap |=(_. show:+<))                         ::  full update
-++  word  |=(tape (flap |=(_+> (fect:+< txt#+>+<))))    ::
+++  word  |=(tape (flap |=(_+> (fect:+< txt++>+<))))    ::
 ::                                                      ::  ::
 ::::                                                    ::::::  console UI
   ::                                                    ::  ::
@@ -85,11 +85,11 @@
   ++  cusp  (cope !ept:here)                            ::  parsing rule
   ++  delt  |=  cal/sole-change                         ::  edit command line
             =^  cul  say  (~(remit sole say) cal good)  ::
-            ?~(cul abet fail:(fect:abet det#u.cul))     ::
+            ?~(cul abet fail:(fect:abet det+u.cul))     ::
   ++  dive  =+  (rust (tufa buf.say) (punt come))       ::  apply command line
             ?~(- fail ?~(-> show (kick:wipe ->+)))      ::
   ++  good  |=((list @c) -:(rose (tufa +<) cusp))       ::  validate input
-  ++  wipe  =^  cal  say  (~(transmit sole say) set#~)  ::  clear line
+  ++  wipe  =^  cal  say  (~(transmit sole say) set+~)  ::  clear line
             (fect:abet %det cal)                        ::
   --                                                    ::
 ::                                                      ::  ::
diff --git a/ape/oct3.hoon b/ape/oct3.hoon
index fd54f7b45..43c2d8275 100644
--- a/ape/oct3.hoon
+++ b/ape/oct3.hoon
@@ -1,5 +1,5 @@
 ::                                                      ::  ::
-::::  /hoon#oct3/ape                                    ::::::  dependencies
+::::  /hoon+oct3/ape                                    ::::::  dependencies
   ::                                                    ::  ::
 /?  310                                                 ::  arvo version
 /-  sole, oct3                                          ::  structures
@@ -74,7 +74,7 @@
           ?.(dud fail wild:kind)                        ::
 ++  kind  =+(res:here ?~(- + (word(gam new:here) ->)))  ::  move result
 ++  prom  (fect %pro %& %oct3 voy:here)                 ::  update prompt
-++  rend  (turn `wall`tab:here |=(tape txt#+<))         ::  table print
+++  rend  (turn `wall`tab:here |=(tape txt++<))         ::  table print
 ++  sawn  (hail(eye (~(del by eye) ost)) |)             ::  console unsubscribe
 ++  seen  (hail(eye (~(put by eye) ost *sole-share)) &) ::  console subscribe
 ++  show  prom:(fect %mor rend)                         ::  update console
@@ -83,7 +83,7 @@
 ++  wild  (flap |=(_. (fact:+< &/gam)) |=(_. show:+<))  ::  full update
 ++  word  |=  txt/tape  %+  flap                        ::  game message
           |=(_+> (fact:+< |/txt))                       ::
-          |=(_+> (fect:+< txt#txt))                     ::
+          |=(_+> (fect:+< txt+txt))                     ::
 ::                                                      ::  ::
 ::::                                                    ::::::  console UI
   ::                                                    ::  ::
@@ -95,11 +95,11 @@
   ++  cusp  (cope !ept:here)                            ::  parsing rule
   ++  delt  |=  cal/sole-change                         ::  edit command line
             =^  cul  say  (~(remit sole say) cal good)  ::
-            ?~(cul abet fail:(fect:abet det#u.cul))     ::
+            ?~(cul abet fail:(fect:abet det+u.cul))     ::
   ++  dive  =+  (rust (tufa buf.say) (punt come))       ::  apply command line
             ?~(- fail ?~(-> show (kick:wipe ->+)))      ::
   ++  good  |=((list @c) -:(rose (tufa +<) cusp))       ::  validate input
-  ++  wipe  =^  cal  say  (~(transmit sole say) set#~)  ::  clear line
+  ++  wipe  =^  cal  say  (~(transmit sole say) set+~)  ::  clear line
             (fect:abet %det cal)                        ::
   --                                                    ::
 ::                                                      ::  ::
diff --git a/ape/oct4.hoon b/ape/oct4.hoon
index dab1b2710..28144dc62 100644
--- a/ape/oct4.hoon
+++ b/ape/oct4.hoon
@@ -1,5 +1,5 @@
 ::                                                      ::  ::
-::::  /hoon#oct4/ape                                    ::::::  dependencies
+::::  /hoon+oct4/ape                                    ::::::  dependencies
   ::                                                    ::  ::
 /?  310                                                 ::  arvo version
 /-  sole, oct4                                          ::  structures
@@ -83,27 +83,27 @@
 ++  kick  |=  point  =^  dud  gam  ~(m at:here +<)      ::
           ?.(dud fail wild:?~(rem kind (send +>-)))     ::
 ++  kind  =+(res:here ?~(- + (word(gam new:here) ->)))  ::  move result
-++  plan  |=  (unit ship)  ?~  +<  stop(gam new:here)   ::  link#unlink
+++  plan  |=  (unit ship)  ?~  +<  stop(gam new:here)   ::  link+unlink
           ?^(rem fail link(rem +<))                     ::
 ++  plot  |=  (each point (unit ship))                  ::  apply command
           ?-(+<- $& (kick +<+), $| (plan +<+))          ::
 ++  like  |*(* [/oct4 [+.rem dap] +<])                  ::  friend message
-++  link  (dish peer#(like /oct4))                      ::  subscribe to friend
+++  link  (dish peer+(like /oct4))                      ::  subscribe to friend
 ++  prom  (fect %pro %& %oct4 stat)                     ::  update prompt
-++  rend  (turn `wall`tab:here |=(tape txt#+<))         ::  table print
+++  rend  (turn `wall`tab:here |=(tape txt++<))         ::  table print
 ++  sawn  (hail(eye (~(del by eye) ost)) |)             ::  console unsubscribe
 ++  seen  (hail(eye (~(put by eye) ost *sole-share)) &) ::  console subscribe
-++  send  |=(point (dish poke#(like %oct4-move +<)))    ::  send move
+++  send  |=(point (dish poke+(like %oct4-move +<)))    ::  send move
 ++  show  prom:(fect %mor rend)                         ::  update console
 ++  soul  =+((~(get by sup) ost) ?=([~ * %sole *] -))   ::  is console
-++  stat  (weld ?~(rem ~ "@{(scow p#u.rem)}") voy:here) ::  prompt line
-++  stop  ?~(rem done wild:(dish pull#(like ~)))        ::  unsubscribe
+++  stat  (weld ?~(rem ~ "@{(scow p+u.rem)}") voy:here) ::  prompt line
+++  stop  ?~(rem done wild:(dish pull+(like ~)))        ::  unsubscribe
 ++  tame  (flap |=(_. (fact:+< &/gam)) |=(_. prom:+<))  ::  light update
 ++  wild  (flap |=(_. (fact:+< &/gam)) |=(_. show:+<))  ::  full update
 ++  with  |=(? (word(rem ?:(+< rem ~)) "{<[+< src]>}")) ::  
 ++  word  |=  txt/tape  %+  flap                        ::  game message
           |=(_+> (fact:+< |/txt))                       ::
-          |=(_+> (fect:+< txt#txt))                     ::
+          |=(_+> (fect:+< txt+txt))                     ::
 ::                                                      ::  ::
 ::::                                                    ::::::  console UI
   ::                                                    ::  ::
@@ -115,11 +115,11 @@
   ++  cusp  (cope !ept:here)                            ::  parsing rule
   ++  delt  |=  cal/sole-change                         ::  edit command line
             =^  cul  say  (~(remit sole say) cal good)  ::
-            ?~(cul abet fail:(fect:abet det#u.cul))     ::
+            ?~(cul abet fail:(fect:abet det+u.cul))     ::
   ++  dive  =+  (rust (tufa buf.say) (punt comb))       ::  apply command line
             ?~(- fail ?~(-> show (plot:wipe ->+)))      ::
   ++  good  |=((list @c) -:(rose (tufa +<) cusp))       ::  validate input
-  ++  wipe  =^  cal  say  (~(transmit sole say) set#~)  ::  clear line
+  ++  wipe  =^  cal  say  (~(transmit sole say) set+~)  ::  clear line
             (fect:abet %det cal)                        ::
   --                                                    ::
 ::                                                      ::  ::
diff --git a/ape/talk.hoon b/ape/talk.hoon
index 0d8a98490..88aa9b460 100644
--- a/ape/talk.hoon
+++ b/ape/talk.hoon
@@ -978,7 +978,7 @@
         =<  (sh-fact %mor (murn (sort (~(tap by q.owners.she)) aor) .))
         |=  {pon/partner alt/atlas}  ^-  (unit sole-effect)
         ?.  |(=(~ pan) (~(has in pan) pon))  ~
-        =-  `[%tan rose#[", " `~]^- leaf#~(ta-full ta man.she pon) ~]
+        =-  `[%tan rose+[", " `~]^- leaf+~(ta-full ta man.she pon) ~]
         =<  (murn (sort (~(tap by alt)) aor) .)
         |=  {a/ship b/presence c/human}  ^-  (unit tank) :: XX names
         ?-  b
@@ -1125,7 +1125,7 @@
         |=  {txt/cord exe/twig}
         =>  |.([(sell (slap (slop sh-twig-head seed) exe))]~)
         =+  tan=p:(mule .)
-        (say [%fat tank#tan exp#txt] ~)
+        (say [%fat tank+tan exp+txt] ~)
       ::
       ++  say                                           ::  publish
         |=  sep/(list speech)
@@ -1383,7 +1383,7 @@
     =.  soy  (pa-notify:soy her %hear who)
     pa-abet:soy
   ::
-  ++  ra-think                                          ::  publish#review
+  ++  ra-think                                          ::  publish+review
     |=  {pub/? her/ship tiz/(list thought)}
     ^+  +>
     ?~  tiz  +>
@@ -1560,7 +1560,7 @@
       |=  tay/partner
       ^-  (list card)
       ?-  -.tay
-        $|  ~&  tweet-abjure#p.p.tay
+        $|  ~&  tweet-abjure+p.p.tay
             !!
       ::
         $&  ~&  [%pa-abjure [our.hid man] [p.p.tay q.p.tay]]
@@ -1956,31 +1956,31 @@
   ::
   ++  tr-meta  ^-  tang
     =.  wen  (sub wen (mod wen (div wen ~s0..0001)))     :: round
-    =+  hed=leaf#"{(scow %uv sen)} at {(scow %da wen)}"
+    =+  hed=leaf+"{(scow %uv sen)} at {(scow %da wen)}"
     =+  =<  paz=(turn (~(tap by aud)) .)
-        |=({a/partner *} leaf#~(ta-full ta man a))
+        |=({a/partner *} leaf+~(ta-full ta man a))
     =+  bok=(turn (sort (~(tap in bou)) aor) smyt)
     [%rose [" " ~ ~] [hed >who< [%rose [", " "to " ~] paz] bok]]~
   ::
   ++  tr-body
     |-  ^-  sole-effect
-    ?+  -.sep  tan#[>sep<]~
-      $exp  tan#~[leaf#"# {(trip p.sep)}"]
-      $lin  tan#~[leaf#"{?:(p.sep "" "@ ")}{(trip q.sep)}"]
-      $non  tan#~
-      $app  tan#~[rose#[": " ~ ~]^~[leaf#"[{(trip p.sep)}]" leaf#(trip q.sep)]]
-      $tax  tan#~[leaf#(rend-work-duty p.sep)]
-      $url  url#(crip (earf p.sep))
-      $mor  mor#(turn p.sep |=(speech ^$(sep +<)))
-      $fat  [%mor tan#(tr-rend-tors p.sep) $(sep q.sep) ~]
+    ?+  -.sep  tan+[>sep<]~
+      $exp  tan+~[leaf+"# {(trip p.sep)}"]
+      $lin  tan+~[leaf+"{?:(p.sep "" "@ ")}{(trip q.sep)}"]
+      $non  tan+~
+      $app  tan+~[rose+[": " ~ ~]^~[leaf+"[{(trip p.sep)}]" leaf+(trip q.sep)]]
+      $tax  tan+~[leaf+(rend-work-duty p.sep)]
+      $url  url+(crip (earf p.sep))
+      $mor  mor+(turn p.sep |=(speech ^$(sep +<)))
+      $fat  [%mor tan+(tr-rend-tors p.sep) $(sep q.sep) ~]
     ==
   ::
   ++  tr-rend-tors
     |=  a/torso  ^-  tang
     ?-  -.a
-      $name  (welp $(a q.a) leaf#"={(trip p.a)}" ~)
+      $name  (welp $(a q.a) leaf+"={(trip p.a)}" ~)
       $tank  +.a
-      $text  (turn (flop +.a) |=(b/cord leaf#(trip b)))
+      $text  (turn (flop +.a) |=(b/cord leaf+(trip b)))
     ==
   ::
   ++  tr-pals
@@ -2002,7 +2002,7 @@
   ++  tr-text
     |=  oug/?
     ^-  tape
-    ?+    -.sep  ~&(tr-lost#sep "")
+    ?+    -.sep  ~&(tr-lost+sep "")
         $fat
       =+  rem=$(sep q.sep)
       ?:  (gth (lent rem) 62)  (chow 64 rem)
@@ -2143,7 +2143,7 @@
   ^-  move
   =+  ^-  paf/path
       =+  day=(year %*(. (yore now.hid) +.t +:*tarp))
-      %+  tope  [our.hid %home da#now.hid]
+      %+  tope  [our.hid %home da+now.hid]
       /talk-telegrams/(scot %da day)/[man]/talk
   =+  grams:(~(got by stories) man)
   [ost.hid %info /jamfile our.hid (foal paf [%talk-telegrams !>(-)])]
diff --git a/ape/twif.hoon b/ape/twif.hoon
index 4a471beee..6bc4e3f59 100644
--- a/ape/twif.hoon
+++ b/ape/twif.hoon
@@ -2,7 +2,7 @@
 !:
 [twitter .]
 |_  [bowl ~]
-++  poke-noun  |=(span (onwards [%peer / [our %twit] /user#[+<]]))
+++  poke-noun  |=(span (onwards [%peer / [our %twit] /user+[+<]]))
 ++  onwards  |*({mark *} [[ost +<]~ +>.$])
 ++  diff-twit-feed  |=({* a/(list twit-stat)} ?~(a `+>.$ ~&(i.a $(a t.a))))
 --
diff --git a/ape/twit.hoon b/ape/twit.hoon
index cbd5c4111..510675e68 100644
--- a/ape/twit.hoon
+++ b/ape/twit.hoon
@@ -1,6 +1,6 @@
 ::  Twitter daemon
 ::
-::::  /hook#core#twit#app
+::::  /hook+core+twit+app
   ::
 /-    twitter
 /+    twitter, talk
@@ -69,7 +69,7 @@
   ^-  {(unit time) _ran}
   =+  cur=(~(get by ran) pax)
   =+  tym=(add now (mul ~s8 (bex ?~(cur 0 p.u.cur))))
-  :: ~&  dely#`@dr`(sub tym now)
+  :: ~&  dely+`@dr`(sub tym now)
   ?:  &(?=(^ cur) (gte tym q.u.cur) (gth q.u.cur now))
     [~ ran]
   [`tym (~(put by ran) pax ?~(cur 0 (min 5 +(p.u.cur))) tym)]
@@ -79,9 +79,9 @@
   =^  tym  ran  (dely pax)
   :_  +>.$
   ?~  tym  
-    :: ~&  no-wait#ran
+    :: ~&  no-wait+ran
     mof
-  :: ~&  will-wait#u.tym
+  :: ~&  will-wait+u.tym
   :-  [ost %wait pax u.tym]
   mof
 ::
@@ -94,24 +94,24 @@
     +>.$(kes (~(put by kes) p.act p.q.act))             ::  XX verify key
       $post
     =:  out  (~(put by out) p.q.act %& p.act q.q.act)
-        ran  (~(del by ran) /peer#home)
+        ran  (~(del by ran) /peer+home)
       ==
-    %+  wait  /peer#home
+    %+  wait  /peer+home
     =+  mez=(stat-upda:(auth p.act) [%status q.q.act]~ ~)
-    [ost %them /post#(scot %uv p.q.act) ~ mez]~
+    [ost %them /post+(scot %uv p.q.act) ~ mez]~
   ==
 ::
 ++  wake-peer
   |=  {pax/path ~}  ^+  done
-  ~&  twit-wake#peer#pax
+  ~&  twit-wake+peer+pax
   :_  +>.$
-  ?.  (~(has by ran) peer#pax)                           ::  ignore if retracted
+  ?.  (~(has by ran) peer+pax)                           ::  ignore if retracted
     ~
   =+  =>  |=({a/bone @ b/path} [b a]) 
       pus=(~(gas ju *(jug path bone)) (turn (~(tap by sup)) .))
   ?~  (~(get ju pus) pax)
     ~
-  ~&  peer-again#[pax ran]
+  ~&  peer-again+[pax ran]
   (pear | our pax)
 ::
 ++  thou
@@ -121,12 +121,12 @@
     =.  ran  (~(put by ran) pax 6 now)
     =+  lim=%.(%x-rate-limit-reset ;~(biff ~(get by (mo q.hit)) poja ni:jo))
     =+  tym=?~(lim (add ~m7.s30 now) (add ~1970.1.1 (mul ~s1 u.lim)))
-    ~&  retrying-in#`@dr`(sub tym now)
+    ~&  retrying-in+`@dr`(sub tym now)
     :_(+>.$ [ost %wait pax tym]~)
   ::
       200                           ::  OK
     =+  jon=(need (poja q:(need r.hit)))
-    :: ~&  twit-resp#%.(jon ?+(-.jon !! %o stat:twir, %a (ar:jo stat:twir)))
+    :: ~&  twit-resp+%.(jon ?+(-.jon !! %o stat:twir, %a (ar:jo stat:twir)))
     ?+    pax  ~|([%http-missed pax] !!)
         {$post @ $~}                                    ::  post acknowledged
       =+  ^=  rep
@@ -134,30 +134,30 @@
           (need %.(jon stat:twir))
       =.  out  (~(put by out) (slav %uv i.t.pax) %| rep)
       :_  +>.$
-      =+  pax=/[who.rep]/status#(rsh 3 2 (scot %ui id.rep))
-      :-  (print (earn [& ~ `/com#twitter] `pax ~))
+      =+  pax=/[who.rep]/status+(rsh 3 2 (scot %ui id.rep))
+      :-  (print (earn [& ~ `/com+twitter] `pax ~))
       (spam pax (tweet-good rep))
     ::
         {$peer *}                                     ::  feed data
       =+  ^=  rep
           ~|  [%bad-feed jon]
           (need %.(jon (ar:jo stat:twir)))
-      :: ~&  got-feed#[(scag 5 (turn rep |=(stat id))) fed]
+      :: ~&  got-feed+[(scag 5 (turn rep |=(stat id))) fed]
       =+  ren=(cull t.pax rep)                       ::  new messages
       ?~  ren
         (wait pax ~)                              ::  pump polling
-      :: ~&  spam-feed#ren
+      :: ~&  spam-feed+ren
       =:  ran  (~(del by ran) pax)                    ::  clear poll delay
           fed  (~(put by fed) t.pax rep)              ::  saw last message
         ==
-      (wait pax (spam t.pax [%diff twit-feed#(flop ren)] ~))
+      (wait pax (spam t.pax [%diff twit-feed+(flop ren)] ~))
     ==
   ::
       ?($400 $401 $403 $404)            ::  Err
     =+  ^-  git/gift
         =+  err=%.(q:(need r.hit) ;~(biff poja mean:twir))
         :^  %diff  %ares  %bad-http
-        [leaf#"HTTP Code {<p.hit>}" (turn (need err) mean:twip)]
+        [leaf+"HTTP Code {<p.hit>}" (turn (need err) mean:twip)]
     ?+    pax  [[ost git]~ +>.$]
       {$post @ ~}
         [(spam pax git ~) +>.$]
@@ -182,7 +182,7 @@
       ?.  ver  ~
       ?~  ole  ~
       [ost %diff %twit-feed (flop ole)]~
-  =-  `move`[ost %them peer#pax ~ `hiss`-]
+  =-  `move`[ost %them peer+pax ~ `hiss`-]
   =+  opt=?~(ole ~ ['since_id' (lutt:twit id.i.ole)]~)
   =+  aut=any-auth
   ?-    -.pax
@@ -190,7 +190,7 @@
 ::     $home  (stat-home:auth ~ opt)
   ==
 ::
-++  to-sd                                               ::  parse user name#numb
+++  to-sd                                               ::  parse user name+numb
   |=  a/span  ^-  sd:twit
   ~|  [%not-user a]
   %+  rash  a
@@ -217,5 +217,5 @@
 ::
 ++  print
   |=  mes/tape 
-  [ost %poke / [our %talk] (said:^talk our %twit now eny leaf#mes ~)]
+  [ost %poke / [our %talk] (said:^talk our %twit now eny leaf+mes ~)]
 --
diff --git a/ape/work.hoon b/ape/work.hoon
index c221ca9c1..9890a914b 100644
--- a/ape/work.hoon
+++ b/ape/work.hoon
@@ -48,7 +48,7 @@
       :_  moves
       ^-  move
       :*  ost  %poke
-          /sending#(scot %uv id.tax)/(scot %ud version.tax)
+          /sending+(scot %uv id.tax)/(scot %ud version.tax)
           [our %talk]
           %talk-command
           =>  [. talk]  ^-  command:talk
@@ -126,7 +126,7 @@
   ?:  connected
     [~ .]
   :_  .(connected %&)  :_  ~
-  [ost %peer /peering [our %talk] /f#(main:talk our)/(scot %ud count)]
+  [ost %peer /peering [our %talk] /f+(main:talk our)/(scot %ud count)]
 ::
 ++  process-duty
   |=  {when/@da her/ship from/(set station:talk) action/duty:work-stuff:talk}
diff --git a/ape/write.hoon b/ape/write.hoon
index da18f13e5..3b3c60032 100644
--- a/ape/write.hoon
+++ b/ape/write.hoon
@@ -1,6 +1,6 @@
 ::  File writer
 ::
-::::  /hoon#write#app
+::::  /hoon+write+app
   ::
 |_  {bowl $~}
 ++  beak-now  byk(r [%da now])
@@ -9,13 +9,13 @@
   =-  (poke--data (need (- jon.+)))
   =>  jo
   %-  ot  :~
-    pax#(cu deft (su fel:stab))
-    dat#(of json#some mime#(pe / (cu taco so)) ~)    ::  XX mite
+    pax+(cu deft (su fel:stab))
+    dat+(of json+some mime+(pe / (cu taco so)) ~)    ::  XX mite
   ==
 ::
 ++  poke-write-paste
   |=  {typ/?($hoon $md $txt) txt/@t}
-  (poke--data [`typ /pub#paste#(scot %da now)] %mime / (taco txt))
+  (poke--data [`typ /pub+paste+(scot %da now)] %mime / (taco txt))
 ::
 ++  poke--data
   |=  {{ext/(unit @t) pax/path} dat/$$({$json json} {$mime mime})}
@@ -27,8 +27,8 @@
 ++  made
   |=  {pax/wire @ res/gage}
   ?.  =(our src)
-    ~|(foreign-write#[our=our src=src] !!)
-  ?+  -.res  ~|(gage#-.res !!)
+    ~|(foreign-write+[our=our src=src] !!)
+  ?+  -.res  ~|(gage+-.res !!)
     $|  (mean p.res)
     $&  =-  [[ost %info / our -]~ +>.$]
         (foal :(welp (tope beak-now ~) pax /[-.p.res]) p.res)
diff --git a/arvo/ames.hoon b/arvo/ames.hoon
index ab7926687..f3de4ec31 100644
--- a/arvo/ames.hoon
+++ b/arvo/ames.hoon
@@ -1899,6 +1899,6 @@
     ^-  mass
     :-  %ames
     :-  %|
-    :~  fox#`fox
+    :~  fox+`fox
     ==
   --
diff --git a/arvo/behn.hoon b/arvo/behn.hoon
index 9813961c6..e2fdb20da 100644
--- a/arvo/behn.hoon
+++ b/arvo/behn.hoon
@@ -5,7 +5,7 @@
 =>  =~
 |%
 ++  sqeu  |*  {a/_* b/_*}                         ::  binary skew queno
-          $:  r/@u                                      ::  rank#depth
+          $:  r/@u                                      ::  rank+depth
               k/a                                       ::  priority
               n/b                                       ::  value
               c/(broq a b)                              ::  children
@@ -147,11 +147,11 @@
 --
 .  ==
 =|  $:  $0                                              ::
-        tym/{p/clok q/clok}                             ::  positive#negative
+        tym/{p/clok q/clok}                             ::  positive+negative
     ==                                                  ::
 |=  {now/@da eny/@ ski/sled}                            ::  current invocation
 ^?
-|%                                                      ::  poke#peek pattern
+|%                                                      ::  poke+peek pattern
 ++  call                                                ::  handle request
   |=  $:  hen/duct
           hic/(hypo (hobo kiss))
@@ -195,7 +195,7 @@
       :^  hen  %give  %mass
       :-  %behn
       :-  %|
-      :~  tym#`tym
+      :~  tym+`tym
       ==
     ==
   [mof ..^$]
diff --git a/arvo/clay.hoon b/arvo/clay.hoon
index 7c4990df6..09b6381b6 100644
--- a/arvo/clay.hoon
+++ b/arvo/clay.hoon
@@ -796,7 +796,7 @@
     ::  ~&  %taking-patch
     ?:  ?=($| -.res)
       =.  dok  ~
-      (print-to-dill '!' %rose [" " "" ""] leaf#"clay patch failed" p.res)
+      (print-to-dill '!' %rose [" " "" ""] leaf+"clay patch failed" p.res)
     ::  ~&  %editing
     =+  ^-  sim/(list (pair path misu))
         ?~  dok
@@ -879,7 +879,7 @@
     |=  res/gage
     ^+  +>
     ?:  ?=($| -.res)
-      (print-to-dill '!' %rose [" " "" ""] leaf#"clay ergo failed" p.res)
+      (print-to-dill '!' %rose [" " "" ""] leaf+"clay ergo failed" p.res)
     ?~  hez  ~|(%no-sync-duct !!)
     =+  ^-  can/(map path (unit mime))
         %-  mo  ^-  mode
@@ -977,7 +977,7 @@
     ^+  +>
     (edit wen lem)
   ::
-  ::  Be careful to call ++wake if#when necessary.  Every case
+  ::  Be careful to call ++wake if+when necessary.  Every case
   ::  must call it individually.
   ::
   ++  take-foreign-update                              ::  external change
@@ -1301,7 +1301,7 @@
       =+  bol=(~(got by lat.ran) lob)
       ?-  -.bol
         $direct     [%volt q.bol]
-        $delta      ~|  delta#q.q.bol
+        $delta      ~|  delta+q.q.bol
                     [%pact $(lob q.q.bol) [%volt r.bol]]
       ==
     ::
@@ -1637,7 +1637,7 @@
       =+  yak=(tako-to-yaki u.tak)
       =+  len=(lent pax)
       :^  ~  ~  %arch
-      ::  ~&  cy#pax
+      ::  ~&  cy+pax
       :-  -:!>(*arch)
       ^-  arch
       =+  ^-  descendants/(list (pair path lobe))
@@ -2095,7 +2095,7 @@
         ^+  +>
         =+  tay=(gage-to-tage res)
         ?:  ?=($| -.tay)
-          (error:he %diff-ali-bad-made leaf#"merge diff ali failed" p.tay)
+          (error:he %diff-ali-bad-made leaf+"merge diff ali failed" p.tay)
         =+  can=(cages-to-map p.tay)
         ?:  ?=($| -.can)
           (error:he %diff-ali p.can)
@@ -2131,14 +2131,14 @@
       ::
       ++  diff-bob
         ^+  .
-        (diff-bas(wat.dat %diff-bob) %bob bob.dat [p.bob q.bob da#now] ali.dat)
+        (diff-bas(wat.dat %diff-bob) %bob bob.dat [p.bob q.bob da+now] ali.dat)
       ::
       ++  diffed-bob
         |=  res/gage
         ^+  +>
         =+  tay=(gage-to-tage res)
         ?:  ?=($| -.tay)
-          (error:he %diff-bob-bad-made leaf#"merge diff bob failed" p.tay)
+          (error:he %diff-bob-bad-made leaf+"merge diff bob failed" p.tay)
         =+  can=(cages-to-map p.tay)
         ?:  ?=($| -.can)
           (error:he %diff-bob p.can)
@@ -2180,7 +2180,7 @@
           %-  emit(wat.dat %merge)
           :*  hen  %pass
               [%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %merge ~]
-              %f  %exec  p.bob  ~  [p.bob q.bob da#now]  %tabl
+              %f  %exec  p.bob  ~  [p.bob q.bob da+now]  %tabl
               ^-  (list (pair silk silk))
               %+  turn  (~(tap by (~(int by can.dal.dat) can.dob.dat)))
               |=  {pax/path *}
@@ -2199,7 +2199,7 @@
         |=  res/gage
         =+  tay=(gage-to-tage res)
         ?:  ?=($| -.tay)
-          (error:he %merge-bad-made leaf#"merging failed" p.tay)
+          (error:he %merge-bad-made leaf+"merging failed" p.tay)
         =+  can=(cages-to-map p.tay)
         ?:  ?=($| -.can)
           (error:he %merge p.can)
@@ -2214,7 +2214,7 @@
         %-  emit(wat.dat %build)
         :*  hen  %pass
             [%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %build ~]
-            %f  %exec  p.bob  ~  [p.bob q.bob da#now]  %tabl
+            %f  %exec  p.bob  ~  [p.bob q.bob da+now]  %tabl
             ^-  (list (pair silk silk))
             %+  murn  (~(tap by bof.dat))
             |=  {pax/path cay/(unit cage)}
@@ -2235,7 +2235,7 @@
         ^+  +>
         =+  tay=(gage-to-tage res)
         ?:  ?=($| -.tay)
-          (error:he %build-bad-made leaf#"delta building failed" p.tay)
+          (error:he %build-bad-made leaf+"delta building failed" p.tay)
         =+  bop=(cages-to-map p.tay)
         ?:  ?=($| -.bop)
           (error:he %built p.bop)
@@ -2250,7 +2250,7 @@
             %-  ~(urn by con)
             |=  {pax/path *}
             (~(got by q.bas.dat) pax)
-        =.  con                                         ::  change#del conflict
+        =.  con                                         ::  change+del conflict
           %-  ~(uni by con)
           %-  mo  ^-  (list {path *})
           %+  skim  (~(tap by old.dal.dat))
@@ -2259,7 +2259,7 @@
             ~|  %strange-add-and-del
             !!
           (~(has by can.dob.dat) pax)
-        =.  con                                         ::  change#del conflict
+        =.  con                                         ::  change+del conflict
           %-  ~(uni by con)
           %-  mo  ^-  (list {path *})
           %+  skim  (~(tap by old.dob.dat))
@@ -2268,7 +2268,7 @@
             ~|  %strange-del-and-add
             !!
           (~(has by can.dal.dat) pax)
-        =.  con                                         ::  add#add conflict
+        =.  con                                         ::  add+add conflict
           %-  ~(uni by con)
           %-  mo  ^-  (list {path *})
           %+  skip  (~(tap by (~(int by new.dal.dat) new.dob.dat)))
@@ -2343,7 +2343,7 @@
         =+  ^-  val/beak
             ?:  ?=($init gem.dat)
               [p.ali q.ali cas.dat]
-            [p.bob q.bob da#now]
+            [p.bob q.bob da+now]
         %-  emit(wat.dat %checkout)
         :*  hen  %pass
             [%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %checkout ~]
@@ -2362,7 +2362,7 @@
         ^+  +>
         =+  tay=(gage-to-tage res)
         ?:  ?=($| -.tay)
-          (error:he %checkout-bad-made leaf#"merge checkout failed" p.tay)
+          (error:he %checkout-bad-made leaf+"merge checkout failed" p.tay)
         =+  can=(cages-to-map p.tay)
         ?:  ?=($| -.can)
           (error:he %checkout p.can)
@@ -2393,7 +2393,7 @@
         =+  ^-  val/beak
             ?:  ?=($init gem.dat)
               [p.ali q.ali cas.dat]
-            [p.bob q.bob da#now]
+            [p.bob q.bob da+now]
         %-  emit(wat.dat %ergo)
         :*  hen  %pass
             [%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %ergo ~]
@@ -2415,7 +2415,7 @@
         ^+  +>
         =+  tay=(gage-to-tage res)
         ?:  ?=($| -.tay)
-          (error:he %ergo-bad-made leaf#"merge ergo failed" p.tay)
+          (error:he %ergo-bad-made leaf+"merge ergo failed" p.tay)
         =+  =|  nac/mode
             |-  ^-  tan/$^(mode {p/term q/tang})
             ?~  p.tay  nac
@@ -2583,7 +2583,7 @@
     =+  [bos=(sein p.q.hic) can=(clan p.q.hic)]
     %-  zing  ^-  (list (list move))
     :~  ?:  =(bos p.q.hic)  ~
-        [hen %pass /init-merge %c %merg p.q.hic %base bos %kids da#now %init]~
+        [hen %pass /init-merge %c %merg p.q.hic %base bos %kids da+now %init]~
     ::
         ~
     ==
@@ -2708,11 +2708,11 @@
     :^  hen  %give  %mass
     :-  %clay
     :-  %|
-    :~  domestic#`fat.ruf
-        foreign#`hoy.ruf
+    :~  domestic+`fat.ruf
+        foreign+`hoy.ruf
         :-  %object-store  :-  %|
-        :~  commits#`hut.ran.ruf
-            blobs#`lat.ran.ruf
+        :~  commits+`hut.ran.ruf
+            blobs+`lat.ran.ruf
         ==
     ==
   ==
@@ -2731,7 +2731,7 @@
 ++  scry                                              ::  inspect
   |=  {fur/(unit (set monk)) ren/@tas his/ship syd/desk lot/coin tyl/path}
   ^-  (unit (unit cage))
-  ::  ~&  scry#[ren `path`[(scot %p his) syd ~(rent co lot) tyl]]
+  ::  ~&  scry+[ren `path`[(scot %p his) syd ~(rent co lot) tyl]]
   ::  =-  ~&  %scry-done  -
   =+  got=(~(has by fat.ruf) his)
   =+  luk=?.(?=($$ -.lot) ~ ((soft case) p.lot))
@@ -2882,8 +2882,8 @@
       [~ ..^$]
     ~>  %slog.
         :^  0  %rose  [" " "[" "]"]
-        :^    leaf#"initial merge failed"
-            leaf#"my most sincere apologies"
+        :^    leaf+"initial merge failed"
+            leaf+"my most sincere apologies"
           >p.p.p.+.q.hin<
         q.p.p.+.q.hin
     [~ ..^$]
diff --git a/arvo/dill.hoon b/arvo/dill.hoon
index 716f1beb9..e8b97c573 100644
--- a/arvo/dill.hoon
+++ b/arvo/dill.hoon
@@ -209,7 +209,7 @@
         =+  myt=(flop (need tem))
         =+  can=(clan our)
         =.  tem  ~
-        =.  moz  :_(moz [hen %pass / %c %merg our %home our %base da#now %init])
+        =.  moz  :_(moz [hen %pass / %c %merg our %home our %base da+now %init])
         =.  moz  :_(moz [hen %pass ~ %g %conf [[our ram] %load our %home]])
         =.  +>  ?:  ?=($czar can)  +>
                 (sync %base (sein our) %kids)
@@ -328,7 +328,7 @@
         ^-  mass
         :-  %dill
         :-  %|
-        :~  all#`[ore hey dug]:all
+        :~  all+`[ore hey dug]:all
         ==
       ::
       ++  wegt
@@ -375,7 +375,7 @@
           (tuba "<awaiting {(trip p.kyz)}, this may take a few minutes>")
       ==
     --
-|%                                                      ::  poke#peek pattern
+|%                                                      ::  poke+peek pattern
 ++  call                                                ::  handle request
   |=  $:  hen/duct
           hic/(hypo (hobo kiss))
diff --git a/arvo/eyre.hoon b/arvo/eyre.hoon
index 5ebe7a7c6..bb43df4e8 100644
--- a/arvo/eyre.hoon
+++ b/arvo/eyre.hoon
@@ -105,7 +105,7 @@
       die/@da                                           ::  collection date
       sus/(set {dock $json wire path})                  ::  subscriptions
       eve/{p/@u q/(map @u even)}                        ::  queued events
-      med/(qeu duct)                                    ::  waiting /~/to#
+      med/(qeu duct)                                    ::  waiting /~/to+
   ==
 ++  even                                                ::  client event
   $%  {$news p/@uvH}
@@ -194,7 +194,7 @@
 ++  add-cookies
   |=  {cug/(list @t) hit/httr}  ^-  httr
   ?~  cug  hit
-  =+  cuh=(turn `(list @t)`cug |=(a/@t set-cookie#a))
+  =+  cuh=(turn `(list @t)`cug |=(a/@t set-cookie+a))
   hit(q (weld cuh q.hit))
 ::
 ++  inject                                            ::  inject dependency
@@ -204,7 +204,7 @@
       tal.max  (welp tal.max ;script(urb_injected ""):"{(trip etag:js)}" ~)
     ==
   ?~  dep  max
-  max(hed :_(hed.max ;script@"/~/on#{<dep>}.js"(urb_injected "");))
+  max(hed :_(hed.max ;script@"/~/on+{<dep>}.js"(urb_injected "");))
 ::
 ++  add-json                                            ::  inject window.urb
   |=  {urb/json jaz/cord}  ^-  cord 
@@ -217,7 +217,7 @@
 ::
 ++  ares-to-json
   |=  err/ares  ^-  json
-  =-  (jobe fail#s#typ mess#(jape mez) ~)
+  =-  (jobe fail+s+typ mess+(jape mez) ~)
   ^-  {typ/term mez/tape}
   ?~  err  [%fail "Unknown Error"]
   [p.u.err (wush 160 q.u.err)]
@@ -225,13 +225,13 @@
 ++  resp                                                ::  mimed response
   |=  {sas/@uG mit/mite rez/@}  ^-  httr
   ::  (weld (turn cug |=(a=@t ['set-cookie' a]))
-  [sas ~[content-type#(moon mit)] [~ (taco rez)]]
+  [sas ~[content-type+(moon mit)] [~ (taco rez)]]
 ::
 ++  render-tang                                         ::  tanks to manx
   |=  tan/tang
   ;html
     ;head
-      ;link(rel "stylesheet", href "/home#lib#base.css"); ::  XX desk
+      ;link(rel "stylesheet", href "/home+lib+base.css"); ::  XX desk
       ;title: server error
     ==
     ;body:div#c.err:pre:code:"{(wush 80 tan)}"
@@ -404,15 +404,15 @@
       })
     }
     
-    urb.foreign = /^\/~\/am#.test(window.location.pathname)
+    urb.foreign = /^\/~\/am/.test(window.location.pathname)
     urb.redir = function(ship){
       if(ship) document.location.pathname =
-        document.location.pathname.replace(/^\/~~|\/~\/as\/any#,'/~/as#~'+ship)
+        document.location.pathname.replace(/^\/~~|\/~\/as\/any/,'/~/as/~'+ship)
       else document.location = 
         document.location.hash.match(/#[^?]+/)[0].slice(1) +
         document.location.pathname.replace(
           /^\/~\/am\/[^/]+/,
-          '/~/as#~' + urb.ship) +
+          '/~/as/~' + urb.ship) +
         document.location.search
     }
     if(urb.foreign && urb.auth.indexOf(urb.ship) !== -1){
@@ -465,7 +465,7 @@
         ;input#pass(type "password");
         ;h2.advice: (Your login code has been printed to your console.)
         ;pre:code#err;
-        ;script@"/~/at#~/auth.js";
+        ;script@"/~/at/~/auth.js";
         ;script:'''
                 $(function() {
                   $ship = $('#ship')
@@ -502,15 +502,15 @@
     ;=  ;h1: Goodbye ~;{span#ship}.
         ;button#act(onclick "urb.away()"): Log out
         ;pre:code#err;
-        ;script@"/~/at#~/auth.js";
+        ;script@"/~/at/~/auth.js";
     ==
   ::
   ++  poke-test
     %+  titl  'Poke'
-    ;=  ;button(onclick "urb.testPoke('/~/to#hood#helm-hi.json')"): Hi anonymous
-        ;button(onclick "urb.testPoke('/~/as#own#~/to#hood#helm-hi.json')"): Hi
+    ;=  ;button(onclick "urb.testPoke('/~/to/hood/helm-hi.json')"): Hi anonymous
+        ;button(onclick "urb.testPoke('/~/as/own/~/to/hood/helm-hi.json')"): Hi
         ;pre:code#err;
-        ;script@"/~/at#~/auth.js";
+        ;script@"/~/at/~/auth.js";
         ;script:'''
                 show = function(t){err.innerText = ":) " + Date.now() + "\n" + t}
                 urb.testPoke = function(url){
@@ -527,9 +527,9 @@
         "height=device-height, initial-scale=1.0, user-scalable=0, ".
         "minimum-scale=1.0, maximum-scale=1.0");
         ;title:"{(trip a)}" 
-        ;script(type "text#javascript", src "//cdnjs.cloudflare.com#ajax#".
-          "libs#jquery#2.1.1/jquery.min.js");
-        ;link(rel "stylesheet", href "/home#lib#base.css");
+        ;script(type "text/javascript", src "//cdnjs.cloudflare.com/ajax/".
+          "libs/jquery/2.1.1/jquery.min.js");
+        ;link(rel "stylesheet", href "/home/lib/base.css");
       ==
       ;body:div#c:"*{b}"
     ==
@@ -597,7 +597,7 @@
           q.ask  (~(del by q.ask) sud)
           kes    (~(del by kes) hen)
         ==
-      ::  ~&  eyre-them#(earn p.u.p.kyz)
+      ::  ~&  eyre-them+(earn p.u.p.kyz)
       %=  +>.$
         mow    :_(mow [ged [%give %thus p.ask p.kyz]])
         p.ask  +(p.ask)
@@ -613,15 +613,15 @@
       ::    q.ask  (~(del by q.ask) sud)
       ::    kes    (~(del by kes) hen)
       ::  ==
-      ::  ~&  eyre-them#(earn p.u.p.kyz)
-      =+  wir=hi#/[p.kyz]
+      ::  ~&  eyre-them+(earn p.u.p.kyz)
+      =+  wir=hi+/[p.kyz]
       ?:  ?=($hiss p.q.kyz)
         (pass-note wir [%e %meta :(slop !>(%them) !>(~) q.q.kyz)])
       (back wir %hiss q.kyz)
     ::
         $they                                           ::  inbound response
       =+  kas=(need (~(get by q.ask) p.kyz))
-      ::  ~&  >  eyre-they#[p.q.kyz (earn p.q.kas)]
+      ::  ~&  >  eyre-they+[p.q.kyz (earn p.q.kas)]
       %=  +>.$
         mow    :_(mow [p.kas [%give %thou q.kyz]])
         q.ask  (~(del by q.ask) p.kas)
@@ -629,10 +629,10 @@
     ::
         $thud                                           ::  cancel request
       ?.  (~(has by lyv) hen)
-        ~&  dead-request#hen
+        ~&  dead-request+hen
         +>.$(ded (~(put in ded) hen))                   ::  uncaught requests
       =+  lid=(~(got by lyv) hen)
-      :: ~&  did-thud#[-.lid hen]
+      :: ~&  did-thud+[-.lid hen]
       ?-  -.lid
           $exec
         (pass-note p.lid %f [%exec our ~])
@@ -657,16 +657,16 @@
       =.  mow  :_(mow [hen %give %mack ~])
       =+  mez=((soft gram) q.kyz)
       ?~  mez
-        ~&  e#[%strange-west p.kyz]
+        ~&  e+[%strange-west p.kyz]
         ~|(%strange-west !!)
       ?-  -<.u.mez
         $aut  abet:(logon:(ses-ya p.u.mez) q.p.kyz)
         $hat  (foreign-hat:(ses-ya p.u.mez) q.p.kyz q.u.mez)
-        $gib  (pass-note ay#(dray p#uv#~ q.p.kyz p.u.mez) [%e %thud ~])
-        $get  (pass-note ay#(dray p#uv#~ q.p.kyz p.u.mez) [%e %this q.u.mez])
+        $gib  (pass-note ay+(dray p+uv+~ q.p.kyz p.u.mez) [%e %thud ~])
+        $get  (pass-note ay+(dray p+uv+~ q.p.kyz p.u.mez) [%e %this q.u.mez])
         $got
           ?.  (~(has by pox) p.u.mez)
-            ~&  lost-gram-thou#p.kyz^p.u.mez
+            ~&  lost-gram-thou+p.kyz^p.u.mez
             +>.$
           =:  hen  (~(got by pox) p.u.mez)
               pox  (~(del by pox) p.u.mez)
@@ -674,11 +674,11 @@
           (give-thou q.u.mez)
       ::
         $lon  
-          ~&  ses-ask#[p.u.mez sop (~(run by wup) $~)]
+          ~&  ses-ask+[p.u.mez sop (~(run by wup) $~)]
           ?:  (ses-authed p.u.mez)  
-            (ames-gram q.p.kyz aut#~ p.u.mez)
+            (ames-gram q.p.kyz aut+~ p.u.mez)
           =.  sop  (~(put by sop) p.u.mez q.p.kyz |)
-          (ames-gram q.p.kyz hat#~ p.u.mez our-host)
+          (ames-gram q.p.kyz hat+~ p.u.mez our-host)
       ==
     ::
       $wegh  !!                                         ::  handled elsewhere
@@ -696,20 +696,20 @@
     ^+  +>
     =.  our  ?~(hov our u.hov)  ::  XX
     ?:  &(?=({?($of $ow) ^} tee) !(~(has by wix) p.tee))
-      ~&(dead-ire#[`whir`tee ({term term $~} +.sih)] +>)
+      ~&(dead-ire+[`whir`tee ({term term $~} +.sih)] +>)
     ?-    &2.sih
         $crud  +>.$(mow [[hen %slip %d %flog +.sih] mow])
     ::  $dumb  
     ::    =.  +>  ?+(tee +> [%of ^] pop-duct:(ire-ix p.tee))
-    ::    (emule |.(~|(gall-dumb#tee !!)))
+    ::    (emule |.(~|(gall-dumb+tee !!)))
     ::
         $woot  +>.$
         $thou
       ?+    -.tee  !!
-        $ay  (ames-gram (slav %p p.tee) got#~ (slav %uv q.tee) |2.sih)
+        $ay  (ames-gram (slav %p p.tee) got+~ (slav %uv q.tee) |2.sih)
         $hi  =+  cay=[%httr !>(`httr`p.sih)]
              ?:  ?=($httr p.tee)  (give-sigh %& cay)
-             (back si#~ p.tee cay)
+             (back si+~ p.tee cay)
       ==
     ::
         $unto                                           ::  app response
@@ -726,7 +726,7 @@
           (back tee %json p.cuf)
         (get-rush:(ire-ix p.tee) q.tee ((hard json) q.q.p.cuf))
       ::
-          $quit  ~&(quit#tee (get-quit:(ire-ix p.tee) q.tee))
+          $quit  ~&(quit+tee (get-quit:(ire-ix p.tee) q.tee))
       ==
     ::
         $wake
@@ -738,7 +738,7 @@
     ::
         $news                                         ::  dependency updated
       ?.  ?=({$on $~} tee)
-        ~&(e#lost#[tee hen] +>.$)
+        ~&(e+lost+[tee hen] +>.$)
       %+  roll  (~(tap in (~(get ju liz) p.sih)))
       =<  .(con ..axon(liz (~(del by liz) p.sih)))
       |=  {sus/(each duct ixor) con/_..axon}
@@ -754,12 +754,12 @@
       |-  ^+  ..axon
       ?-    tee
           $~  
-        ~|(e#ford#lost#tee !!)
+        ~|(e+ford+lost+tee !!)
       ::
           {$?($on $ay $ow) *}
-        ~|(e#ford#lost#tee !!)
+        ~|(e+ford+lost+tee !!)
       ::
-          {$of @ $~}  ~|(e#ford#lost#tee !!)
+          {$of @ $~}  ~|(e+ford+lost+tee !!)
           {$si $~}     (give-sigh q.sih)
           {$hi ^}
         ?:  ?=($| -.q.sih)
@@ -788,7 +788,7 @@
       ::
           {$at ^}
         ?.  ?=({$& $js ^} q.sih)
-          ~&  e#at-lost#p.tee
+          ~&  e+at-lost+p.tee
           $(tee q.tee)
         =*  cay  p.q.sih
         ?>  ?=(@ q.q.cay)
@@ -803,7 +803,7 @@
         =*  cay  p.q.sih
         ?.  ?=($mime p.cay)
           =+  bek=-:(need (tome p.tee))
-          =+  bik=?+(r.bek bek {$ud $0} bek(r da#now))
+          =+  bik=?+(r.bek bek {$ud $0} bek(r da+now))
           =-  (execute tee bik [%flag [p.sih `~] -])
           =-  `silk`[%cast %mime `[p.cay -]]
           ?.  ?=({$ud $0} r.bek)  q.cay
@@ -817,11 +817,11 @@
         ~|  q.q.cay
         =+  ((hard {mit/mite rez/octs}) q.q.cay)
         =+  dep=(crip "W/{(pojo %s (scot %uv p.sih))}")
-        (give-thou 200 ~[etag#dep content-type#(moon mit)] ~ rez)
+        (give-thou 200 ~[etag+dep content-type+(moon mit)] ~ rez)
       ==
     ==
   ::
-  ++  root-beak  `beak`[our %home da#now]               ::  XX
+  ++  root-beak  `beak`[our %home da+now]               ::  XX
   ++  emule
     |=  a/_|?(..emule)  ^+  ..emule
     =+  mul=(mule a)
@@ -853,20 +853,20 @@
     |=  {a/@uvH b/(each duct ixor)}  ^+  +>.$
     ?~  a  +>.$
     =.  liz  (~(del ju liz) a b)
-    :: ~&  del-deps#[a (~(get ju liz) a)]
+    :: ~&  del-deps+[a (~(get ju liz) a)]
     ?:  (~(has by liz) a)  +>.$
     =-  -(hen hen.+)
-    (pass-note(hen `~) on#~ %f [%wasp our a |])
+    (pass-note(hen `~) on+~ %f [%wasp our a |])
   ::
   ++  new-deps
     |=  {a/@uvH b/(each duct ixor)}  ^+  +>.$
-    :: ~&  new-deps#[a b]
+    :: ~&  new-deps+[a b]
     ?~  a  +>.$
     =+  had=(~(has by liz) a)
     =.  liz  (~(put ju liz) a b)
     ?:  had  +>.$
     =-  -(hen hen.+)
-    (pass-note(hen `~) on#~ %f [%wasp our a &])
+    (pass-note(hen `~) on+~ %f [%wasp our a &])
   ::
   ++  ford-req  |=({bek/beak kas/silk} [%f [%exec our `[bek kas]]])
   ++  execute  
@@ -877,20 +877,20 @@
   ++  fail
     |=  {sas/@ud dep/@uvH mez/tang}
     ^+  +>
-    :: (back ha#~ dep %tang !>(mez))  ::tang->urb chain may be source of failure
+    :: (back ha+~ dep %tang !>(mez))  ::tang->urb chain may be source of failure
     (give-html sas ~ (inject dep (render-tang mez)))
   ::
   ++  give-html
     |=  {sas/@ud cug/(list @t) max/manx}
     %-  give-thou
     %+  add-cookies  cug
-    (resp sas text#/html (crip (poxo max)))
+    (resp sas text+/html (crip (poxo max)))
   ::
   ++  give-json
     |=  {sas/@uG cug/(list @t) jon/json}
     %-  give-thou
     %+  add-cookies  cug
-    (resp sas application#/json (crip (pojo jon)))
+    (resp sas application+/json (crip (pojo jon)))
   ::
   ++  give-thou                                       ::  done request
     |=  hit/httr
@@ -929,7 +929,7 @@
   ++  handle
     |=  $:  {hat/hart pok/pork quy/quay}                ::  purl parsed url
             {cip/clip aut/?}                            ::  client ip nonymous?
-            {mef/meth maf/math bod/(unit octs)}         ::  method#headers#body
+            {mef/meth maf/math bod/(unit octs)}         ::  method+headers+body
         ==
     =<  apex
     |%
@@ -949,7 +949,7 @@
       |=  {wir/whir ext/term bem/beam}
       =+  yac=for-client
       =.  him.yac  ?.(aut anon him.yac)
-      =:  r.bem  ?+(r.bem r.bem {$ud $0} da#now)
+      =:  r.bem  ?+(r.bem r.bem {$ud $0} da+now)
           s.bem  [%web ~(rent co (fcgi quy fcgi-cred.yac)) s.bem]
         ==
       (execute wir -.bem [%boil ext bem ~])
@@ -969,18 +969,18 @@
       ?~  pez  done
       ?-  -.pez
           $~     (give-thou (add-cookies cug p.pez))
-          $js    $(pez [~ (resp 200 text#/javascript p.pez)])
+          $js    $(pez [~ (resp 200 text+/javascript p.pez)])
           $json  (give-json 200 cug p.pez)
           $html  (give-html 200 cug p.pez)
           $htme  (give-html 401 cug p.pez)
           $boil  (ford-boil +.pez)
           $red
         =+  url=(earn hat pok(p [~ %html]) quy)
-        ?+    p.pok  ~|(bad-redirect#[p.pok url] !!)
+        ?+    p.pok  ~|(bad-redirect+[p.pok url] !!)
             {$~ $js}
           $(pez [%js auth-redir:js])
             {$~ $json}
-          $(pez [%json (jobe ok#b#| red#(jape url) ~)])
+          $(pez [%json (jobe ok+b+| red+(jape url) ~)])
         ==
       ==
     ::
@@ -993,7 +993,7 @@
       ?~  oxe  |
       ?:  (~(has in vew.cyz:for-client) u.oxe)
         &
-      ~&(bad-oryx#[u.oxe vew.cyz:for-client] &)         ::  XX security
+      ~&(bad-oryx+[u.oxe vew.cyz:for-client] &)         ::  XX security
     ::
     ++  grab-json
       ?.  ?=(?($post $put $delt) mef)
@@ -1003,7 +1003,7 @@
     ++  need-body  |*(a/fist:jo (need (biff grab-json a)))
     ++  grab-oryx
       ^-  (unit oryx)
-      =+  oxe=(biff grab-json (ot oryx#so ~):jo)
+      =+  oxe=(biff grab-json (ot oryx+so ~):jo)
       ?^  oxe  oxe
       (~(get by (mo quy)) %oryx)
     ::
@@ -1018,19 +1018,19 @@
             ~|(%bad-oryx ~|([grab-oryx vew.cyz:for-client] !!))
           =+  hem=as-aux-request
           ?^  hem  [%& u.hem]
-          ~|(strange-path#q.pok !!)
+          ~|(strange-path+q.pok !!)
       ::
       ++  as-magic-filename
         ^-  (unit httr)
         ?+    [(fall p.pok %$) q.pok]  ~
             {?($ico $png) $favicon $~}
           :-  ~
-          %^  resp  200  image#/png
+          %^  resp  200  image+/png
           favi
         ::
             {$txt $robots $~}
           :-  ~
-          %^  resp  200  text#/plain
+          %^  resp  200  text+/plain
           %-  role
           :~  'User-agent: *'
               'Disallow: /'
@@ -1044,14 +1044,14 @@
           $(q.pok /index)
         ?.  ((sane %tas) i.q.pok)
           (tome q.pok)
-        `[[our i.q.pok ud#0] (flop t.q.pok)]
+        `[[our i.q.pok ud+0] (flop t.q.pok)]
       ::
       ++  as-aux-request                                ::  /~/... req parser
         ^-  (unit perk)
         =.  mef
           ?.  ?=($post mef)  mef
           ?+    (skim quy |=({a/@t b/@t} &(=('' b) =(a (cuss (trip a))))))
-              ~|(bad-quy#[req='"?PUT" or "?DELETE"' quy] !!)
+              ~|(bad-quy+[req='"?PUT" or "?DELETE"' quy] !!)
             $~   mef
             {{$'DELETE' $~} $~}  %delt
             {{$'PUT' $~} $~}     %put
@@ -1063,14 +1063,14 @@
         :-  ~  ^-  perk
         =*  pef  i.t.q.pok
         =+  but=t.t.q.pok                 ::  XX  =*
-        ?+    pef  ~|(pfix-lost#`path`/~/[pef] !!)
+        ?+    pef  ~|(pfix-lost+`path`/~/[pef] !!)
             $debug  ;;(perk [%bugs but])
             $away  [%away ~]
             $at  [%auth %at pok(q but)]
             $am  ?~(but !! [%auth %xen i.but pok(q t.but)])
             $as
           :+  %auth  %get
-          ~|  bad-ship#?~(but ~ i.but)
+          ~|  bad-ship+?~(but ~ i.but)
           ?~  but  !!
           :_  pok(q t.but)
           ?+  i.but  (slav %p i.but)
@@ -1092,7 +1092,7 @@
         ::
             $to
           =+  ^-  dir/{p/ship q/term r/mark}
-              ~|  bad-mess#but
+              ~|  bad-mess+but
               ?+  but  !!
                 {@ @ $~}    [our (raid but %tas %tas ~)]
                 {@ @ @ $~}  (raid but %p %tas %tas ~)
@@ -1100,25 +1100,25 @@
           :^  %mess  [p q]:dir  r.dir
           =+  wir=(~(get by (mo quy)) 'wire')
           ?^  wir  [(stab u.wir) (need grab-json)]         ::  XX distinguish
-          (need-body (ot wire#(cu stab so) xyro#some ~):jo)
+          (need-body (ot wire+(cu stab so) xyro+some ~):jo)
         ::
             $in
-          ~|  expect#[%post 'application#json' /'@uv' '?PUT/DELETE']
+          ~|  expect+[%post 'application+json' /'@uv' '?PUT/DELETE']
           ?>  &(?=(?($delt $put) mef) ?=($@($~ {$~ $json}) p.pok))
           [%deps mef (raid but %uv ~)]
         ::
             $is
           ?~  but
-            ~|(no-app#but=but !!)
+            ~|(no-app+but=but !!)
           |-  ^-  perk
           ?~  p.pok  $(p.pok [~ %json])
           ?.  ?=($json u.p.pok)
-            ~|(is#stub#u.p.pok !!)      ::  XX marks
+            ~|(is+stub+u.p.pok !!)      ::  XX marks
           ?:  ((sane %tas) i.but)
             $(but [(scot %p our) but])
           ?>  ?=(?($delt $put) mef)
           =+  :-  hap=[(slav %p i.but) (slav %tas -.t.but)]
-              wir=(need-body (ot wire#(cu stab so) ~):jo)
+              wir=(need-body (ot wire+(cu stab so) ~):jo)
           [%subs mef hap u.p.pok wir +.t.but]
         ::
             $auth
@@ -1128,14 +1128,14 @@
               $~         $(p.pok [~ %json])
               {$~ $js}    [%js ~]
               {$~ $json}
-            ?+    mef  ~|(bad-meth#mef !!)
+            ?+    mef  ~|(bad-meth+mef !!)
                 $get   [%json ~]
                 $put
-              ~|  parsing#bod
-              [%try (need-body (ot ship#(su fed:ag) code#(mu so) ~):jo)]
+              ~|  parsing+bod
+              [%try (need-body (ot ship+(su fed:ag) code+(mu so) ~):jo)]
             ::
                 $delt
-              ~|  parsing#bod
+              ~|  parsing+bod
               =+  jon=(need (poja q:(need bod)))
               ?>  ?=($o -.jon)
               =+  sip=(~(get by p.jon) %ship)
@@ -1161,7 +1161,7 @@
         =+  bem=?-(-.hem $beam p.hem, $spur [root-beak p.hem])
         =+  wir=`whir`[%ha (tope -.bem ~)]
         =.  wir  ?+(mef !! $get wir, $head [%he wir])
-        ~|  bad-beam#q.bem
+        ~|  bad-beam+q.bem
         ?<  =([~ 0] (sky %cw (tope bem(+ ~, r [%da now]))))
         =+  [wir ext bem]
         ?.(aut [%& %boil -] [%| (ford-boil -)])  ::  XX properly
@@ -1204,7 +1204,7 @@
         ==
       ::
           $view
-        ~|  lost-ixor#p.hem
+        ~|  lost-ixor+p.hem
         [%| ((teba poll:(ire-ix p.hem)) u.q.hem)]
       ==
     ::
@@ -1220,9 +1220,9 @@
           $at
         =.  ..ya  abet.yac
         =+  pez=process(pok p.ham, aut |)
-        ?.  ?=($& -.pez)  ~|(no-inject#p.ham !!)
+        ?.  ?=($& -.pez)  ~|(no-inject+p.ham !!)
         ?~  p.pez  pez
-        ?+    -.p.pez  ~&(bad-inject#p.pez !!)
+        ?+    -.p.pez  ~&(bad-inject+p.pez !!)
             $red  pez
             $boil
           =.  ya  abet.yac 
@@ -1240,7 +1240,7 @@
       ::
           $get
         |-
-        ~|  aute#ham
+        ~|  aute+ham
         ?:  |(=(anon him.ham) (~(has in aut.yac) him.ham))
           =.  ..ya  abet.yac(him him.ham)
           =+  pez=process(pok rem.ham, aut &)
@@ -1253,7 +1253,7 @@
           $try
         :-  %|
         ?.  =(our him.ham)
-          ~|(stub-foreign#him.ham !!)
+          ~|(stub-foreign+him.ham !!)
         ?.  ?|  (~(has in aut.yac) him.ham) 
                 ?~(paz.ham | =(u.paz.ham load-secret))
             ==
@@ -1266,7 +1266,7 @@
     ::
     ++  show-login-page
       |=  ses/(unit hole)  ^-  (each pest _done)
-      %-  (slog leaf#"login code for {(scow %p our)}: {(trip load-secret)}" ~)
+      %-  (slog leaf+"login code for {(scow %p our)}: {(trip load-secret)}" ~)
       ?.  ?=($@($~ {$~ $html}) p.pok)
         [%& %red ~]
       ?~  ses
@@ -1310,7 +1310,7 @@
         (new-ya (rsh 3 1 (scot %p (end 6 1 ney))))
       =+  cyz=(~(get by wup) u.lig)
       ?~  cyz
-        ~&  bad-cookie#u.lig
+        ~&  bad-cookie+u.lig
         (new-ya (rsh 3 1 (scot %p (end 6 1 ney))))
       ~(. ya u.lig u.cyz(cug ~)) 
     ::
@@ -1352,8 +1352,8 @@
     ++  foreign-auth
       |=  {him/ship pul/purl}  ^+  ..ya
       =.  way  (~(put by way) him pul hen)
-      ~&  asking-foreign#him
-      (ames-gram:abet him [lon#~ ses])
+      ~&  asking-foreign+him
+      (ames-gram:abet him [lon+~ ses])
     ::
     ++  foreign-hat
       |=  {him/ship hat/hart}  ^+  ..ya
@@ -1365,7 +1365,7 @@
         ==
       =+  url=(welp (earn pul(p hat)) '#' (head:earn p.pul))
       %-  give-thou:abet
-      (add-cookies cug [307 [location#(crip url)]~ ~])
+      (add-cookies cug [307 [location+(crip url)]~ ~])
     ::
     ++  logon
       |=  her/ship
@@ -1373,14 +1373,14 @@
         him   her
         aut   (~(put in aut) her)
         ..ya
-          ~&  logon#[our her ses]
+          ~&  logon+[our her ses]
           ?.  =(our her)
             ..ya
           =+  sap=(~(get by sop) ses)
           ~&  sap
           ?.  ?=({$~ @ $|} sap)
             ..ya
-          (ames-gram -.u.sap aut#~ ses)
+          (ames-gram -.u.sap aut+~ ses)
       ==
     ++  logoff    
       |=  her/(unit ship)  ^+  ..ya
@@ -1395,7 +1395,7 @@
       =.  vew  (~(put in vew) orx)
       =+  ire=(oryx-to-ixor orx)
       =.  ..ix  ~(init ix ire %*(. *stem him him, p.eve 1))
-      ::  ~&  stat-ire#`@t`ire
+      ::  ~&  stat-ire+`@t`ire
       [orx abet]
     ::
     ++  fcgi-cred  %_(ced aut (~(put ju aut.ced) %$ (scot %p him)))
@@ -1404,11 +1404,11 @@
       =^  orx  ..ya  new-view
       :_  ..ya
       %-  jobe  :~
-        oryx#s#orx
-        ixor#s#(oryx-to-ixor orx)
-        ship#(jape +:<our>)
-        user#(jape +:<him>)
-        auth#a#(turn (~(tap in aut)) |=(a/@p (jape +:<a>)))
+        oryx+s+orx
+        ixor+s+(oryx-to-ixor orx)
+        ship+(jape +:<our>)
+        user+(jape +:<him>)
+        auth+a+(turn (~(tap in aut)) |=(a/@p (jape +:<a>)))
       ==
     --
   ::
@@ -1433,17 +1433,17 @@
       =:  med  (~(put to med) hen)
           hen  `~
         ==
-      :: ~&  >  hurl#[&2.b ire a]
+      :: ~&  >  hurl+[&2.b ire a]
       (pass-note:abet [%of ire (gsig a)] b)
     ::
     ++  init
       =.  die  (add ~d1 now) 
-      abet(mow :_(mow [`/ %pass ow#/[ire] [%b %wait die]]))
+      abet(mow :_(mow [`/ %pass ow+/[ire] [%b %wait die]]))
     ::
     ++  refresh
-      =.  mow  :_(mow [`/ %pass ow#/[ire] [%b %rest die]])
+      =.  mow  :_(mow [`/ %pass ow+/[ire] [%b %rest die]])
       =.  die  (add ~d1 now) 
-      done(mow :_(mow [`/ %pass ow#/[ire] [%b %wait die]]))
+      done(mow :_(mow [`/ %pass ow+/[ire] [%b %wait die]]))
     ::
     ++  add-even
       |=  a/even  ^+  eve
@@ -1455,7 +1455,7 @@
     ::
     ++  add-subs
       |=  {a/dock $json b/wire c/path}  ^+  ..ix
-      ?:  (~(has in sus) +<)  ~|(duplicate#c !!)
+      ?:  (~(has in sus) +<)  ~|(duplicate+c !!)
       =.  sus  (~(put in sus) +<)
       (hurl-note [a b] [%g %deal [him -.a] +.a %peel %json c])
     ::
@@ -1479,7 +1479,7 @@
     ::
     ++  get-ack
       |=  {a/whir-of b/(unit {term tang})}  ^+  ..ix
-      ?:  =(~ med)  ~&  resp-lost#ire  ..ix
+      ?:  =(~ med)  ~&  resp-lost+ire  ..ix
       ?~  b  (nice-json:pop-duct)
       (mean-json:pop-duct 500 b)
     ::
@@ -1499,17 +1499,17 @@
         ==
       ?>  pol                         ::  XX eventstream  
       %^  give-json  200  ~
-      %^  jobe  id#(jone num)  type#[%s -.ven]
+      %^  jobe  id+(jone num)  type+[%s -.ven]
       ?-  -.ven
-        $news  ~[from#[%s (scot %uv p.ven)]]
-        $quit  ~[from#(subs-to-json p.ven)]
-        $rush  ~[from#(subs-to-json p.ven) data#q.ven]
+        $news  ~[from+[%s (scot %uv p.ven)]]
+        $quit  ~[from+(subs-to-json p.ven)]
+        $rush  ~[from+(subs-to-json p.ven) data+q.ven]
       ==
     ::
-    ++  pass-wait  (pass-note of#/[ire] [%b %wait era])
+    ++  pass-wait  (pass-note of+/[ire] [%b %wait era])
     ++  pass-rest
       =.  lyv  (~(del by lyv) hen)
-      (pass-note of#/[ire] [%b %rest era])
+      (pass-note of+/[ire] [%b %rest era])
     ::
     ++  pass-took
       |=  a/{p/dock wire}
@@ -1527,8 +1527,8 @@
         =.  era  (add ~s30 now)
         =.  lyv  (~(put by lyv) hen [%poll ire])
         pass-wait(ude [~ hen &])
-      ?:  (gth a p.eve)  ~|(seq-high#cur=p.eve !!)
-      =+  ven=~|(seq-low#cur=p.eve (~(got by q.eve) a))
+      ?:  (gth a p.eve)  ~|(seq-high+cur=p.eve !!)
+      =+  ven=~|(seq-low+cur=p.eve (~(got by q.eve) a))
       (give-even & a ven)
     ::
     ++  poll-rest
@@ -1545,9 +1545,9 @@
     ++  subs-to-json
       |=  {a/dock b/path}
       %-  jobe  :~
-        ship#[%s (rsh 3 1 (scot %p p.a))]
-        appl#[%s q.a] 
-        path#(jape (spud b))
+        ship+[%s (rsh 3 1 (scot %p p.a))]
+        appl+[%s q.a] 
+        path+(jape (spud b))
       ==
     ++  wake  ^+(..ix abet(ude ~))  ::  XX other effects?
     ::  XX unused
@@ -1579,10 +1579,10 @@
     :^  hen  %give  %mass
     :-  %eyre
     :-  %|
-    :~  dependencies#`liz  sessions#`wup  views#`wix
-        ducts#[%| ~[dead#`ded proxy#`pox outgoing#`ask]]
-        hosts#`dop
-        misc#`bol
+    :~  dependencies+`liz  sessions+`wup  views+`wix
+        ducts+[%| ~[dead+`ded proxy+`pox outgoing+`ask]]
+        hosts+`dop
+        misc+`bol
     ==
   =+  our=`@p`0x100  ::  XX  sentinel
   =+  ska=(slod ski)
diff --git a/arvo/ford.hoon b/arvo/ford.hoon
index 1d9e716b9..b699ec06e 100644
--- a/arvo/ford.hoon
+++ b/arvo/ford.hoon
@@ -34,9 +34,9 @@
   |*  a/$+(* *)                                         ::  product clam
   $:  p/cafe                                            ::  cache
     $=  q                                               ::
-      $%  {$0 p/(set beam) q/a}                         ::  depends#product
+      $%  {$0 p/(set beam) q/a}                         ::  depends+product
           {$1 p/(set {p/care q/beam r/tang})}           ::  blocks
-          {$2 p/(set beam) q/tang}                      ::  depends#error
+          {$2 p/(set beam) q/tang}                      ::  depends+error
       ==                                                ::
   ==                                                    ::
 ::                                                      ::
@@ -170,7 +170,7 @@
     r  ?:  ?=($ud -.r.bem)  r.bem
        =+  num=(ska ~ %cw bem(s ~))
        ?.  ?=({$~ $~ * * @u} num)
-         ~&  norm-lost#(tope bem(s ~))
+         ~&  norm-lost+(tope bem(s ~))
          r.bem  ::  XX
        [%ud q.q.u.u.num]
   ==
@@ -228,13 +228,13 @@
     ?-    -.+.sih
         $writ
       ?~  p.sih  +>.$ 
-      :: ~&  writ#tea
+      :: ~&  writ+tea
       =+  dap=(~(got by deh.bay) dep)
       =-  +>.$(mow mow, deh.bay ?~(dop deh.bay (~(put by deh.bay) dep dop)))
       ^-  {dop/$@($~ _dap) mow/_mow}
       ?-    -.dap
           $done  `mow                ::  writ redundant
-          $init  ~|(never-subscribed#dep !!)
+          $init  ~|(never-subscribed+dep !!)
           $sent
         :-  [%done ~]
         ;:  weld
@@ -255,12 +255,12 @@
     ~%  %ford-w  ..is  ~
     |=  {dep/@uvH ask/?}
     ?~  dep
-      ~&(dep-empty#hen +>.$)
+      ~&(dep-empty+hen +>.$)
     ?:  =(dep 0vtest)                 ::  upstream testing
       +>.$(mow ?.(ask mow :_(mow [hen %give %news dep])))
     =+  dap=(~(get by deh.bay) dep)
-    ?~  dap  ~&(dep-missed#dep +>.$)  ::  XX  ~|  !!
-    :: ~&  awap#[dep u.dap]
+    ?~  dap  ~&(dep-missed+dep +>.$)  ::  XX  ~|  !!
+    :: ~&  awap+[dep u.dap]
     ?-  -.u.dap
       $done  +>.$(mow ?.(ask mow :_(mow [hen %give %news dep])))
       $sent
@@ -273,7 +273,7 @@
         +>.$(deh.bay (~(put by deh.bay) dep [%init q.u.dap]))
     ::
       $init
-        ?.  ask  ~&(awap-kill-empty#dep +>.$)  :: crash?
+        ?.  ask  ~&(awap-kill-empty+dep +>.$)  :: crash?
         %_    +>.$
             deh.bay 
           (~(put by deh.bay) dep [%sent [hen ~ ~] p.u.dap])
@@ -441,7 +441,7 @@
             |-  ^-  (each (list (pair care beam)) tang)
             ?~  p.ton  [%& ~]
             =+  nex=$(p.ton t.p.ton)
-            =+  err=|=(a/tape [%| leaf#a ?:(?=($& -.nex) ~ p.nex)])
+            =+  err=|=(a/tape [%| leaf+a ?:(?=($& -.nex) ~ p.nex)])
             =+  pax=(path i.p.ton)
             ?~  pax  (err "blocking empty")
             ?.  ?=($c (end 3 1 i.pax))
@@ -535,25 +535,25 @@
         |=  {cof/cafe cay/cage coy/cage}  ^-  (bolt gage)
         ?.  =(p.cay p.coy)
           %+  flaw  cof  :_  ~
-          leaf#"diff on data of different marks: {(trip p.cay)} {(trip p.coy)}"
+          leaf+"diff on data of different marks: {(trip p.cay)} {(trip p.coy)}"
         ?:  =(q.q.cay q.q.coy)
           (fine cof %& %null [%atom %n] ~)
         ::
         %+  cope  (fang cof p.cay)
         |=  {cof/cafe pro/vase}
         ?.  (slab %grad p.pro)
-          (flaw cof leaf#"no ++grad" ~)
+          (flaw cof leaf+"no ++grad" ~)
         =+  gar=(slap pro [%cnzy %grad])
         ?@  q.gar
           =+  for=((sand %tas) q.gar)
-          ?~  for  (flaw cof leaf#"bad mark ++grad" ~)
+          ?~  for  (flaw cof leaf+"bad mark ++grad" ~)
           %^  make  cof  %diff
           :-  [%cast u.for `cay]
           [%cast u.for `coy]
         ?.  (slab %form p.gar)
-          (flaw cof leaf#"no ++form:grad" ~)
+          (flaw cof leaf+"no ++form:grad" ~)
         ?.  (slab %diff p.gar)
-          (flaw cof leaf#"no ++diff:grad" ~)
+          (flaw cof leaf+"no ++diff:grad" ~)
         %+  cope  (keel cof pro [[%& 6]~ q.cay]~)
         |=  {cof/cafe pox/vase}
         %+  cope
@@ -563,7 +563,7 @@
         |=  {cof/cafe dif/vase}
         =+  for=((soft @tas) q:(slap gar [%cnzy %form]))
         ?~  for
-          (flaw cof leaf#"bad ++form:grad" ~)
+          (flaw cof leaf+"bad ++form:grad" ~)
         (fine cof %& u.for dif)
       ==
     ::
@@ -605,14 +605,14 @@
     ++  fade                                            ::  compile to hood
       |=  {cof/cafe for/mark bem/beam}
       ^-  (bolt hood)
-      %+  cool  |.(leaf#"ford: fade {<[(tope bem)]>}")
+      %+  cool  |.(leaf+"ford: fade {<[(tope bem)]>}")
       %+  cope  (cope (make cof [%bake for bem ~]) furl)
       |=  {cof/cafe cay/cage}
       %+  (clef %hood)  (fine cof bem(r [%ud 0]) cay)
       ^-  (burg (pair beam cage) hood)
       |=  {cof/cafe bum/beam cay/cage}
-      ~|  fade#(tope bum)
-      :: ~&  fade#clef-miss#bem
+      ~|  fade+(tope bum)
+      :: ~&  fade+clef-miss+bem
       =+  rul=(fair bum)
       ?.  ?=(@ q.q.cay)
         (flaw cof ~)
@@ -802,25 +802,25 @@
         %+  cope  (fang cof for)
         |=  {cof/cafe pro/vase}
         ?.  (slab %grad p.pro)
-          (flaw cof leaf#"no ++grad" ~)
+          (flaw cof leaf+"no ++grad" ~)
         =+  gar=(slap pro [%cnzy %grad])
         ?@  q.gar
           =+  too=((sand %tas) q.gar)
-          ?~  too  (flaw cof leaf#"bad mark ++grad" ~)
+          ?~  too  (flaw cof leaf+"bad mark ++grad" ~)
           (make cof %join u.too `cay `coy)
         ?.  (slab %form p.gar)
-          (flaw cof leaf#"no ++form:grad" ~)
+          (flaw cof leaf+"no ++form:grad" ~)
         =+  fom=((soft @tas) q:(slap gar [%cnzy %form]))
         ?~  fom
-          (flaw cof leaf#"bad ++form:grad" ~)
+          (flaw cof leaf+"bad ++form:grad" ~)
         ?.  &(=(u.fom p.cay) =(u.fom p.coy))
           %+  flaw  cof  :_  :_  ~
-            leaf#"join on data of bad marks: {(trip p.cay)} {(trip p.coy)}"
-          leaf#"expected mark {(trip u.fom)}"
+            leaf+"join on data of bad marks: {(trip p.cay)} {(trip p.coy)}"
+          leaf+"expected mark {(trip u.fom)}"
         ?:  =(q.q.cay q.q.coy)
           (fine cof %& cay)
         ?.  (slab %join p.gar)
-          (flaw cof leaf#"no ++join:grad" ~)
+          (flaw cof leaf+"no ++join:grad" ~)
         %+  cope
           %^  maul  cof
             (slap (slap pro [%cnzy %grad]) [%cnzy %join])
@@ -844,22 +844,22 @@
         %+  cope  (fang cof for)
         |=  {cof/cafe pro/vase}
         ?.  (slab %grad p.pro)
-          (flaw cof leaf#"no ++grad" ~)
+          (flaw cof leaf+"no ++grad" ~)
         =+  gar=(slap pro [%cnzy %grad])
         ?@  q.gar
           =+  too=((sand %tas) q.gar)
-          ?~  too  (flaw cof leaf#"bad mark ++grad" ~)
+          ?~  too  (flaw cof leaf+"bad mark ++grad" ~)
           %+  make  cof
           [%mash u.too [p.mas q.mas `cay] [p.mos q.mos `coy]]
         ?.  (slab %form p.gar)
-          (flaw cof leaf#"no ++form:grad" ~)            
+          (flaw cof leaf+"no ++form:grad" ~)            
         =+  fom=((soft @tas) q:(slap gar [%cnzy %form]))
         ?~  fom
-          (flaw cof leaf#"bad ++form:grad" ~)
+          (flaw cof leaf+"bad ++form:grad" ~)
         ?.  &(=(u.fom p.cay) =(u.fom p.coy))
           %+  flaw  cof  :_  :_  ~
-            leaf#"mash on data of bad marks: {(trip p.cay)} {(trip p.coy)}"
-          leaf#"expected mark {(trip u.fom)}"
+            leaf+"mash on data of bad marks: {(trip p.cay)} {(trip p.coy)}"
+          leaf+"expected mark {(trip u.fom)}"
         ?:  =(q.q.cay q.q.coy)
           (fine cof %& cay)
         ?.  (slab %mash p.gar)
@@ -894,9 +894,9 @@
     ++  keel                                            ::  apply mutations
       |=  {cof/cafe suh/vase yom/(list (pair wing vase))}
       ^-  (bolt vase)
-      %+  cool  =<  |.(leaf#"ford: keel {<(murn yom +)>}")
+      %+  cool  =<  |.(leaf+"ford: keel {<(murn yom +)>}")
                 |=  {a/wing b/type *}
-                =+  c=p:(slap suh cnzz#a)
+                =+  c=p:(slap suh cnzz+a)
                 ?:  (~(nest ut c) | b)  ~
                 (some [a c b])
       %^  maim  cof 
@@ -936,7 +936,7 @@
           $(s.bem t.s.bem, arg [i.s.bem arg])
         ?:  =(~ new)  (fine cof res)
         =^  bem  new  ~(get to new)
-        ~|  next-beam#(tope bem)
+        ~|  next-beam+(tope bem)
         ?<  (gth (lent +.bem) 10)
         $(bem bem, arg ~)
       ::
@@ -990,26 +990,26 @@
       ^-  (bolt vase)
       =.  s.bem  [for s.bem]
       ?:  lit
-        %+  cool  |.(leaf#"ford: load {<for>} {<(tope bem)>}")
+        %+  cool  |.(leaf+"ford: load {<for>} {<(tope bem)>}")
         %+  cope  (liar cof bem)
         |=  {cof/cafe cay/cage}
         ?.  =(for p.cay)
-          (flaw cof leaf#"unexpected mark {<p.cay>}" ~)
+          (flaw cof leaf+"unexpected mark {<p.cay>}" ~)
         ((lake for) cof q.cay)
-      %+  cool  |.(leaf#"ford: hook {<for>} {<(tope bem)>}")
+      %+  cool  |.(leaf+"ford: hook {<for>} {<(tope bem)>}")
       %+  cope  (fade cof %hook bem)
       |=  {cof/cafe hyd/hood}
       (cope (abut:(meow bem arg) cof hyd) (lake for))
     ::
-    ++  lake                                            ::  check#coerce
+    ++  lake                                            ::  check+coerce
       |=  for/mark
       |=  {cof/cafe sam/vase}
       ^-  (bolt vase)
-      %+  cool  |.(leaf#"ford: check {<[for bek `@p`(mug q.sam)]>}")
+      %+  cool  |.(leaf+"ford: check {<[for bek `@p`(mug q.sam)]>}")
       ?:  ?=(?($hoon $hook) for)
         =+  mas=((soft @t) q.sam)
         ?~  mas
-          (flaw cof [leaf#"ford: bad hoon or hook: {<[for bek]>}"]~)
+          (flaw cof [leaf+"ford: bad hoon or hook: {<[for bek]>}"]~)
         (fine cof [%atom %t] u.mas)
       %+  cope  (fang cof for)
       |=  {cof/cafe tux/vase}
@@ -1039,7 +1039,7 @@
         (fine cof bem(r [%ud ((hard @) +.+:(need u.von))]))
       |=  {cof/cafe bem/{{ship desk $ud r/@u} s/spur}}
       ?:  =(0 r.bem)
-        (flaw cof [leaf#"ford: no data: {<(tope bem(s ~))>}"]~)
+        (flaw cof [leaf+"ford: no data: {<(tope bem(s ~))>}"]~)
       (fine cof bem)
     ::
     ++  lave                                            ::  validate
@@ -1081,7 +1081,7 @@
       ?~  von
         [p=*cafe q=[%1 [[%x bem ~] ~ ~]]]
       ?~  u.von
-        (flaw cof leaf#"file not found" (smyt (tope bem)) ~)
+        (flaw cof leaf+"file not found" (smyt (tope bem)) ~)
       (fine cof u.u.von)
     ::
     ++  lily                                            ::  translation targets
@@ -1152,7 +1152,7 @@
         ?:  ?~  -  |                      ::  error if level above built
             (~(has by res) (tack i.pax (scag (dec -) t.pax)))
           ~
-        :_(q.q.raf leaf#"! {<`mark`for>} build failed, ignoring.")
+        :_(q.q.raf leaf+"! {<`mark`for>} build failed, ignoring.")
       --
     ::
     ++  lima                                            ::  load at depth
@@ -1183,13 +1183,13 @@
       ?^  vux  (fine cof u.vux)
       ?~  s.mob
         %+  flaw  cof
-        ~[leaf#"build {<for>}" leaf#"no usable ancestors" (smyt (tope bem))]
+        ~[leaf+"build {<for>}" leaf+"no usable ancestors" (smyt (tope bem))]
       ^$(s.mob t.s.mob, mer [i.s.mob mer])
     ::
     ++  link                                            ::  translate
       |=  {cof/cafe too/mark for/mark vax/vase}
       ^-  (bolt vase)
-      :: %+  cool   |.(leaf#"ford: link {<too>} {<for>} {<p.vax>}")
+      :: %+  cool   |.(leaf+"ford: link {<too>} {<for>} {<p.vax>}")
       ?:  =(too for)  (fine cof vax)
       ?:  |(=(%noun for) =(%$ for))
         ((lake too) cof vax)
@@ -1213,7 +1213,7 @@
     ::
     ++  lion                                            ::  translation search
       |=  {cof/cafe too/mark fro/(set mark)}
-      :: ~&  lion#[too=too fro=(sa fro)]
+      :: ~&  lion+[too=too fro=(sa fro)]
       ^-  (bolt (list mark))
       =|  $:  war/(map mark (list mark))
               pax/(list mark)  
@@ -1290,16 +1290,16 @@
           $$  (fine cof %& p.kas)
           $bake
         ::  ~&  >  [p.kas (tope q.kas)]
-        ::  %+  cool  |.(leaf#"ford: bake {<p.kas>} {<(tope q.kas)>}")
+        ::  %+  cool  |.(leaf+"ford: bake {<p.kas>} {<(tope q.kas)>}")
         %+  cope  (lima cof p.kas q.kas r.kas)
         |=  {cof/cafe vux/(unit vase)}
         ?~  vux
-          (flaw cof leaf#"file not found" (smyt (tope q.kas)) ~)
+          (flaw cof leaf+"file not found" (smyt (tope q.kas)) ~)
         (fine cof [%& p.kas u.vux])
       ::
           $boil
         ^-  (bolt gage)
-        %+  cool  |.(leaf#"ford: boil {<p.kas>} {<(tope q.kas)>} {<r.kas>}")
+        %+  cool  |.(leaf+"ford: boil {<p.kas>} {<(tope q.kas)>} {<r.kas>}")
         %+  cope  (lamp cof q.kas)
         |=  {cof/cafe bem/beam}
         %+  cope  (lime cof p.kas bem r.kas)
@@ -1307,7 +1307,7 @@
         (fine cof `gage`[%& p.kas vax])
       ::
           $bunt
-        %+  cool  |.(leaf#"ford: bunt {<p.kas>}")
+        %+  cool  |.(leaf+"ford: bunt {<p.kas>}")
         ?:  ?=(?($hoon $hook) p.kas)
           (fine cof %& p.kas [%atom %t] '')
         %+  cope  (fang cof p.kas)
@@ -1317,7 +1317,7 @@
         (fine cof [%& p.kas [typ val]])
       ::
           $call
-        ::  %+  cool  |.(leaf#"ford: call {<`@p`(mug kas)>}")
+        ::  %+  cool  |.(leaf+"ford: call {<`@p`(mug kas)>}")
         %.  [cof p.kas q.kas]
         ;~  cope
           ;~  coax
@@ -1333,12 +1333,12 @@
         ==
       ::
           $cast
-        %+  cool  |.(leaf#"ford: cast {<p.kas>}")
+        %+  cool  |.(leaf+"ford: cast {<p.kas>}")
         %+  cope  $(kas q.kas)
         %-  tabl-run
         |=  {cof/cafe cay/cage}
         ^-  (bolt gage)
-        %+  cool  |.(leaf#"ford: casting {<p.cay>} to {<p.kas>}")
+        %+  cool  |.(leaf+"ford: casting {<p.cay>} to {<p.kas>}")
         %+  cope  (lion cof p.kas p.cay `~)
         |=  {cof/cafe wuy/(list @tas)}
         %+  cope
@@ -1348,16 +1348,16 @@
         (flux |=(vax/vase [%& p.kas vax]))
       ::
           $core
-        %+  cool  |.(leaf#"ford: core {<(tope p.kas)>}")
+        %+  cool  |.(leaf+"ford: core {<(tope p.kas)>}")
         (cope (lear cof p.kas) (flux |=(a/vase [%& %core a])))
       ::
           $diff
-        %+  cool  |.(leaf#"ford: diff {<`@p`(mug p.kas)>} {<`@p`(mug q.kas)>}")
+        %+  cool  |.(leaf+"ford: diff {<`@p`(mug p.kas)>} {<`@p`(mug q.kas)>}")
         (diff cof p.kas q.kas)
       ::
           $dude  (cool p.kas $(kas q.kas))
           $file
-        %+  cool  |.(leaf#"ford: file {<p.kas>}")
+        %+  cool  |.(leaf+"ford: file {<p.kas>}")
         %+  cope  (liar cof p.kas)
         (flux |=(cay/cage [%& cay]))
       ::
@@ -1372,31 +1372,31 @@
         ?^  n.p.kas
           (~(put in p.q.rez) n.p.kas)
         =+  dap=(~(get by deh.bay) n.p.kas)
-        ?~  dap    ~&(flag-missed#n.p.kas p.q.rez)
+        ?~  dap    ~&(flag-missed+n.p.kas p.q.rez)
         %-  ~(uni in p.q.rez)  ^-  (set beam)
         ?-(-.u.dap $init p.u.dap, $sent q.u.dap, $done [[bek ~] ~ ~])
       ::                              XX revisit ^ during dependency review
           $join
         %+  cool
           |.
-          leaf#"ford: join {<p.kas>} {<`@p`(mug q.kas)>} {<`@p`(mug r.kas)>}"
+          leaf+"ford: join {<p.kas>} {<`@p`(mug q.kas)>} {<`@p`(mug r.kas)>}"
         (join cof p.kas q.kas r.kas)
       ::
           $mash
         %+  cool
           |.
-          leaf#"ford: mash {<p.kas>} {<`@p`(mug q.kas)>} {<`@p`(mug r.kas)>}"
+          leaf+"ford: mash {<p.kas>} {<`@p`(mug q.kas)>} {<`@p`(mug r.kas)>}"
         (mash cof p.kas q.kas r.kas)
       ::
           $mute  (kale cof p.kas q.kas)
           $pact
-        %+  cool  |.(leaf#"ford: pact {<`@p`(mug p.kas)>} {<`@p`(mug q.kas)>}")
+        %+  cool  |.(leaf+"ford: pact {<`@p`(mug p.kas)>} {<`@p`(mug q.kas)>}")
         (pact cof p.kas q.kas)
       ::
           $plan  (cope (abut:(meow p.kas q.kas) cof r.kas) faun)
           $reef  (faun cof pit)
           $ride
-        %+  cool  |.(leaf#"ford: build failed")
+        %+  cool  |.(leaf+"ford: build failed")
         %+  cope  $(kas q.kas)
         %-  tabl-run
         |=  {cof/cafe cay/cage}
@@ -1420,12 +1420,12 @@
         ==
       ::
           $vale  
-        %+  cool  |.(leaf#"ford: vale {<p.kas>} {<`@p`(mug q.kas)>}")
+        %+  cool  |.(leaf+"ford: vale {<p.kas>} {<`@p`(mug q.kas)>}")
         %+  cope  (lave cof p.kas q.kas)
         (flux |=(vax/vase `gage`[%& p.kas vax]))
       ::
           $volt
-        %+  cool  |.(leaf#"ford: volt {<p.p.kas>}")
+        %+  cool  |.(leaf+"ford: volt {<p.p.kas>}")
         %+  cope  $(kas [%bunt p.p.kas])
         %-  tabl-run
         |=  {cof/cafe cay/cage}
@@ -1724,7 +1724,7 @@
             $&  (fine cof ..wilt(boy [p.hop boy]))
             $|
           =.  r.p.hop  ?:(?=({$ud $0} r.p.hop) r.how r.p.hop)
-          %+  cool  |.(leaf#"ford: wilt {<[(tope p.hop)]>}")
+          %+  cool  |.(leaf+"ford: wilt {<[(tope p.hop)]>}")
           %+  cope  (lend cof p.hop)
           |=  {cof/cafe arc/arch}
           ?:  (~(has by dir.arc) %hoon)
@@ -1768,13 +1768,13 @@
         |=  {cof/cafe cay/cage coy/cage}  ^-  (bolt gage)
         ?:  ?=(?($hoon $hook) p.cay)
           ?.  ?=($txt-diff p.coy)
-            (flaw cof leaf#"{<p.cay>} mark with bad diff type: {<p.coy>}" ~)
+            (flaw cof leaf+"{<p.cay>} mark with bad diff type: {<p.coy>}" ~)
           =+  txt=((soft @t) q.q.cay)
           ?~  txt
-            (flaw cof leaf#"{<p.cay>} mark on bad data" ~)
+            (flaw cof leaf+"{<p.cay>} mark on bad data" ~)
           =+  dif=((soft (urge cord)) q.q.coy)
           ?~  dif
-            =-  (flaw cof leaf#"{<p.cay>} data with bad diff" -)
+            =-  (flaw cof leaf+"{<p.cay>} data with bad diff" -)
             [>type=p.q.coy< >want=p:!>(*(urge cord))< ~]
           =+  pac=(role (lurk (lore (cat 3 u.txt '\0a')) u.dif))
           (fine cof %& p.cay [%atom %t] (end 3 (dec (met 3 pac)) pac))
@@ -1782,23 +1782,23 @@
         %+  cope  (fang cof p.cay)
         |=  {cof/cafe pro/vase}
         ?.  (slab %grad p.pro)
-          (flaw cof leaf#"no ++grad" ~)
+          (flaw cof leaf+"no ++grad" ~)
         =+  gar=(slap pro [%cnzy %grad])
         ?@  q.gar
           =+  for=((sand %tas) q.gar)
-          ?~  for  (flaw cof leaf#"bad mark ++grad" ~)
+          ?~  for  (flaw cof leaf+"bad mark ++grad" ~)
           (make cof %cast p.cay %pact [%cast u.for `cay] `coy)
         ?.  (slab %form p.gar)
-          (flaw cof leaf#"no ++form:grad" ~)
+          (flaw cof leaf+"no ++form:grad" ~)
         =+  for=((soft @tas) q:(slap gar [%cnzy %form]))
         ?~  for
-          (flaw cof leaf#"bad ++form:grad" ~)
+          (flaw cof leaf+"bad ++form:grad" ~)
         ?.  =(u.for p.coy)
           %+  flaw  cof  :_  ~
-          =<  leaf#"pact on data with wrong form: {-} {+<} {+>}"
+          =<  leaf+"pact on data with wrong form: {-} {+<} {+>}"
           [(trip p.cay) (trip u.for) (trip p.coy)]
         ?.  (slab %pact p.gar)
-          (flaw cof leaf#"no ++pact:grad" ~)
+          (flaw cof leaf+"no ++pact:grad" ~)
         %+  cope  (keel cof pro [[%& 6]~ q.cay]~)
         |=  {cof/cafe pox/vase}
         %+  cope
@@ -1858,17 +1858,17 @@
         [%| $(a (turn (turn a2 head) |=(b/mass ?~(-.q.b !! p.q.b))))]
     %+  turn  (~(tap by pol))
     |=  {@ baby}
-    :~  =<  cache#[%| (turn `(list term)`/hood/bake/lilt/slit/slim/slap/slam .)]
+    :~  =<  cache+[%| (turn `(list term)`/hood/bake/lilt/slit/slim/slap/slam .)]
         =-  |=(a/term [a `(~(get ja dep) a)])
         =<  `dep/(jar term *)`(~(rep by jav) .)
         |=({{* a/{term *}} b/(jar term *)} (~(add ja b) a))
     ::
-        =<  depends#[%| (turn `(list term)`/init/sent/done .)]
+        =<  depends+[%| (turn `(list term)`/init/sent/done .)]
         =-  |=(a/term [a `(~(get ja dep) a)])
         =<  `dep/(jar term *)`(~(rep by deh) .)
         |=({{@ a/{term *}} b/(jar term *)} (~(add ja b) a))
     ::
-        tasks#`[dym tad]
+        tasks+`[dym tad]
     ==
   =+  our=p.q.hic
   =+  ^=  bay  ^-  baby
@@ -1916,7 +1916,7 @@
   ^-  (unit (unit cage))
   [~ ~]
 ::
-++  stay                                                ::  save w#o cache
+++  stay                                                ::  save w+o cache
   `axle`+>-.$(pol (~(run by pol) |=(a/baby [tad.a dym.a deh.a ~])))
 ::
 ++  take                                                ::  response
diff --git a/arvo/gall.hoon b/arvo/gall.hoon
index 386e1b5b3..0244b5450 100644
--- a/arvo/gall.hoon
+++ b/arvo/gall.hoon
@@ -14,7 +14,7 @@
 ++  rook                                                ::  forward ames msg
   $%  {$m p/mark q/*}                                   ::  message
       {$s p/path}                                       ::  subscribe
-      {$u $~}                                           ::  cancel#unsubscribe
+      {$u $~}                                           ::  cancel+unsubscribe
   ==                                                    ::
 --                                                      ::
 |%  ::::::::::::::::::::::::::::::::::::::::::::::::::::::    local arvo
@@ -125,7 +125,7 @@
   ::
   ++  mo-conf                                           ::  configure
     |=  {dap/dude lum/culm}
-    (mo-boot dap ?:((~(has by bum) dap) %old %new) p.p.lum q.p.lum da#now)
+    (mo-boot dap ?:((~(has by bum) dap) %old %new) p.p.lum q.p.lum da+now)
   ::
   ++  mo-pass                                           ::  standard pass
     |=  {pax/path noh/note-arvo}
@@ -299,7 +299,7 @@
     |=  pax/path
     ^-  beak
     ?>  ?=({@ @ @ $~} pax)
-    [(slav %p i.pax) i.t.pax da#(slav %da i.t.t.pax)]
+    [(slav %p i.pax) i.t.pax da+(slav %da i.t.t.pax)]
   ::
   ++  mo-cyst                                           ::  take in /sys
     |=  {pax/path sih/sign-arvo}
@@ -329,7 +329,7 @@
       ?-  -.q.+.sih
         $tabl  ~|(%made-tabl !!)
         $&    (mo-give %unto %diff p.q.+>.sih)
-        $|     =.  p.q.+>.sih  (turn p.q.+>.sih |=(a/tank rose#[~ "! " ~]^[a]~))
+        $|     =.  p.q.+>.sih  (turn p.q.+>.sih |=(a/tank rose+[~ "! " ~]^[a]~))
               ~>  %slog.`%*(. >[%wh %y]< +> [>%mo-cyst-fail< (flop p.q.+>.sih)])
               (mo-give %unto %quit ~)   ::  XX better errors pls
       ==
@@ -441,8 +441,8 @@
                 $&     ap-abet:(ap-pout:pap t.t.t.pax %diff +.q.+>.q.hin)
                 $|
                     =+  why=p.q.+>.q.hin
-                    =.  why  (turn why |=(a/tank rose#[~ "! " ~]^[a]~))
-                    ~>  %slog.`rose#["  " "[" "]"]^[>%mo-cook-fail< (flop why)]
+                    =.  why  (turn why |=(a/tank rose+[~ "! " ~]^[a]~))
+                    ~>  %slog.`rose+["  " "[" "]"]^[>%mo-cook-fail< (flop why)]
                     ~&  [him=q.q.pry our=our pax=pax]
                     ::
                     ::  here we should crash because the right thing
@@ -956,15 +956,15 @@
       ^+  +>
       =+  cug=(ap-find /lame)
       ?~  cug
-        =.  why  [>%ap-lame dap wut< (turn why |=(a/tank rose#[~ "! " ~]^[a]~))]
-        ~>  %slog.`rose#["  " "[" "]"]^(flop why)
+        =.  why  [>%ap-lame dap wut< (turn why |=(a/tank rose+[~ "! " ~]^[a]~))]
+        ~>  %slog.`rose+["  " "[" "]"]^(flop why)
         +>.$
       =^  cam  +>.$
         %+  ap-call  q.u.cug
         !>([wut why])
       ?^  cam
-        =.  why  [>%ap-lame-lame< (turn u.cam |=(a/tank rose#[~ "! " ~]^[a]~))]
-        ~>  %slog.`rose#["  " "[" "]"]^(welp (flop why) leaf#"." (flop u.cam))
+        =.  why  [>%ap-lame-lame< (turn u.cam |=(a/tank rose+[~ "! " ~]^[a]~))]
+        ~>  %slog.`rose+["  " "[" "]"]^(welp (flop why) leaf+"." (flop u.cam))
         +>.$
       +>.$
     ::
@@ -1230,9 +1230,9 @@
         [%| $(a (turn (turn a2 head) |=(b/mass ?~(-.q.b !! p.q.b))))]
     %+  turn  (~(tap by pol.all))
     |=  {@ mast}
-    :~  foreign#`sap
-        blocked#[%| (sort :_(aor (~(tap by (~(run by wub) |=(sofa `+<))))))]
-        active#[%| (sort :_(aor (~(tap by (~(run by bum) |=(seat `+<))))))]
+    :~  foreign+`sap
+        blocked+[%| (sort :_(aor (~(tap by (~(run by wub) |=(sofa `+<))))))]
+        active+[%| (sort :_(aor (~(tap by (~(run by bum) |=(seat `+<))))))]
     ==
   ==
 ::
@@ -1256,7 +1256,7 @@
   ^-  (unit (unit (pair mark *)))
   [~ ~]
 ::
-++  stay                                                ::  save w#o cache
+++  stay                                                ::  save w+o cache
   `axle`all
 ::
 ++  take                                                ::  response
diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon
index 2484dbc62..8ed847cd0 100644
--- a/arvo/hoon.hoon
+++ b/arvo/hoon.hoon
@@ -94,7 +94,7 @@
 ++  list  |*  a/$+(* *)                                 ::  null-term list
           $@($~ {i/a t/(list a)})                       ::
 ++  lone  |*(a/$+(* *) p/a)                             ::  just one thing
-++  mane  $@(@tas {@tas @tas})                          ::  XML name#space
+++  mane  $@(@tas {@tas @tas})                          ::  XML name+space
 ++  manx  {g/marx c/marl}                               ::  XML node
 ++  marl  (list manx)                                   ::  XML node list
 ++  mars  {t/{n/$$ a/{i/{n/$$ v/tape} t/$~}} c/$~}      ::  XML cdata
@@ -120,7 +120,7 @@
           [i=(-.a -.b) t=$(a +.a, b +.b)]               ::
 ++  pass  @                                             ::  public key
 ++  path  (list span)                                   ::  filesys location
-++  pint  {p/{p/@ q/@} q/{p/@ q/@}}                     ::  line#column range
+++  pint  {p/{p/@ q/@} q/{p/@ q/@}}                     ::  line+column range
 ++  pole  |*  a/$+(* *)                                 ::  nameless list
           $@($~ {a (pole a)})                           ::
 ++  port  $:  p/axis                                    ::
@@ -171,12 +171,12 @@
 ++  tile  $^  {p/tile q/tile}                           ::  ordered pair
           $%  {$axil p/base}                            ::  base type
               {$bark p/term q/tile}                     ::  name
-              {$bush p/tile q/tile}                     ::  pair#tag
+              {$bush p/tile q/tile}                     ::  pair+tag
               {$fern p/{i/tile t/(list tile)}}          ::  plain selection
               {$herb p/twig}                            ::  gate
               {$kelp p/{i/line t/(list line)}}          ::  tag selection
               {$leaf p/term q/@}                        ::  constant atom
-              {$reed p/tile q/tile}                     ::  atom#cell
+              {$reed p/tile q/tile}                     ::  atom+cell
               {$weed p/twig}                            ::  example
           ==                                            ::
 ++  toga                                                ::  face control
@@ -237,14 +237,14 @@
           ::                                            ::::::  invocations
             {$cnbc p/twig}                              ::  ^~($.p)
             {$cncb p/wing q/tram}                       ::  %+, then cast to p
-            {$cncl p/twig q/twig}                       ::  pull $.p w# sample q
+            {$cncl p/twig q/twig}                       ::  pull $.p w+ sample q
             {$cndt p/twig q/twig}                       ::  %-(q p)
-            {$cnhp p/twig q/tusk}                       ::  slam p w# sample q
-            {$cntr p/wing q/twig r/tram}                ::  pull p.q w# changes
-            {$cnkt p/twig q/twig r/twig s/twig}         ::  slam p w# :*(q r s)
-            {$cnls p/twig q/twig r/twig}                ::  slam p w# :*(q r)
+            {$cnhp p/twig q/tusk}                       ::  slam p w+ sample q
+            {$cntr p/wing q/twig r/tram}                ::  pull p.q w+ changes
+            {$cnkt p/twig q/twig r/twig s/twig}         ::  slam p w+ :*(q r s)
+            {$cnls p/twig q/twig r/twig}                ::  slam p w+ :*(q r)
             {$cnsg p/wing q/twig r/twig}                ::  pull p from q with r
-            {$cnts p/wing q/tram}                       ::  eval. p w# q changes
+            {$cnts p/wing q/tram}                       ::  eval. p w+ q changes
             {$cnzy p/term}                              ::  pulls limb p
             {$cnzz p/wing}                              ::  pulls p
           ::                                            ::::::  nock
@@ -252,7 +252,7 @@
             {$dtls p/twig}                              ::  nock 4 increment
             {$dtzy p/term q/@}                          ::  atom constant
             {$dtzz p/term q/*}                          ::  cubical constant
-            {$dttr p/twig q/twig}                       ::  nock p w# formula q
+            {$dttr p/twig q/twig}                       ::  nock p w+ formula q
             {$dtts p/twig q/twig}                       ::  nock 5 equality test
             {$dtwt p/twig}                              ::  nock 3 cell test
           ::                                            ::::::  prettyprinting
@@ -275,8 +275,8 @@
             {$sggl p/$@(term {p/term q/twig}) q/twig}   ::  hint p to product q
             {$sggr p/$@(term {p/term q/twig}) q/twig}   ::  hint p to q
             {$sgbc p/term q/twig}                       ::  label q, profiling
-            {$sgls p/@ q/twig}                          ::  cache#memoize
-            {$sgpm p/@ud q/twig r/twig}                 ::  print q w#priority
+            {$sgls p/@ q/twig}                          ::  cache+memoize
+            {$sgpm p/@ud q/twig r/twig}                 ::  print q w+priority
             {$sgts p/twig q/twig}                       ::  avoid duplication
             {$sgwt p/@ud q/twig r/twig s/twig}          ::  hint iff q is yes
             {$sgzp p/twig q/twig}                       ::  type in stacktrace
@@ -295,7 +295,7 @@
             {$tsgr p/twig q/twig}                       ::  use p as .. of q
             {$tskt p/twig q/twig r/twig s/twig}         ::  state machine wing
             {$tsls p/twig q/twig}                       ::  push p on .. of q
-            {$tstr p/term q/wing r/twig}                ::  make a $bull#alias
+            {$tstr p/term q/wing r/twig}                ::  make a $bull+alias
             {$tssg p/tusk}                              ::  compose twig list
           ::                                            ::::::  conditionals
             {$wtbr p/tusk}                              ::  logical OR
@@ -305,7 +305,7 @@
             {$wtkt p/wing q/twig r/twig}                ::  if p is a cell
             {$wtgl p/twig q/twig}                       ::  assert |, ?:(p !! q)
             {$wtgr p/twig q/twig}                       ::  assert &, ?:(p q !!)
-            {$wtls p/wing q/twig r/tine}                ::  %wthp w# default
+            {$wtls p/wing q/twig r/tine}                ::  %wthp w+ default
             {$wtpm p/tusk}                              ::  logical AND
             {$wtpt p/wing q/twig r/twig}                ::  if p is an atom
             {$wtsg p/wing q/twig r/twig}                ::  if p is null
@@ -315,7 +315,7 @@
             {$zpcb p/spot q/twig}                       ::  debug info in trace
             {$zpcm p/twig q/twig}                       ::  q twig with p type
             {$zpfs p/twig}                              ::  report .. as error
-            {$zpgr p/twig}                              ::  vase w# value p
+            {$zpgr p/twig}                              ::  vase w+ value p
             {$zpsm p/twig q/twig}                       ::  [type noun] pair
             {$zpts p/twig}                              ::  Nock formula of p
             {$zpwt p/$@(p/@ {p/@ q/@}) q/twig}          ::  restrict hoon vers.
@@ -362,7 +362,7 @@
               {$core p/type q/coil}                     ::
               {$cube p/* q/type}                        ::  constant
               {$face p/term q/type}                     ::  name
-              {$fork p/type q/type}                     ::  union#branch
+              {$fork p/type q/type}                     ::  union+branch
               {$hold p/(list {p/type q/twig})}          ::  infinite genrator
           ==                                            ::
 ++  typo  type                                          ::  old type
@@ -1586,7 +1586,7 @@
     ::
     ++  swr  ?+(r r $d %u, $u %d)                       ::  flipped rounding
     ++  prc  ?>((gth p 1) p)                            ::  force >= 2 precision
-    ++  den  d                                          ::  denorm#flush#inf exp
+    ++  den  d                                          ::  denorm+flush+inf exp
     ++  emn  v                                          ::  minimum exponent
     ++  emx  (sum:si emn (sun:si w))                    ::  maximum exponent
     ++  spd  [e=emn a=1]                                ::  smallest denormal
@@ -1814,7 +1814,7 @@
     =+  r=(^add f (bex p))
     [%f s q r]
   ::
-  ++  bit  |=  {a/fn}  (bif (rou:pa a))                 ::  fn to @r w# rounding
+  ++  bit  |=  {a/fn}  (bif (rou:pa a))                 ::  fn to @r w+ rounding
   ::
   ++  bif                                               ::  fn to @r no rounding
     |=  {a/fn}  ^-  @r
@@ -2286,7 +2286,7 @@
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ::                section 2cJ, extra math               ::
 ::
-++  sqt                                                 ::  sqrt w#remainder
+++  sqt                                                 ::  sqrt w+remainder
   ~/  %sqt
   |=  a/@  ^-  {p/@ q/@}
   ?~  a  [0 0]
@@ -2958,7 +2958,7 @@
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ::                section 2eC, parsing (custom rules)   ::
 ::
-++  cold                                                ::  replace w# constant
+++  cold                                                ::  replace w+ constant
   ~/  %cold
   |*  {cus/* sef/rule}
   ~/  %fun
@@ -3118,7 +3118,7 @@
 ::
 ++  stew                                                ::  switch by first char
   ~/  %stew
-  |*  leh/(list {p/?(@ {@ @}) q/rule})                  ::  char#range keys
+  |*  leh/(list {p/?(@ {@ @}) q/rule})                  ::  char+range keys
   =+  ^=  wor                                           ::  range complete lth
       |=  {ort/?(@ {@ @}) wan/?(@ {@ @})}
       ?@  ort
@@ -4673,7 +4673,7 @@
              :+  %rose  [":" ~ ~]
              :~  (smyt p.sot)
                  =>  [ud=|=(a/@u (scow %ud a)) q.sot]
-                 leaf#"<[{(ud p.p)} {(ud q.p)}].[{(ud p.q)} {(ud q.q)}]>"
+                 leaf+"<[{(ud p.p)} {(ud q.p)}].[{(ud p.q)} {(ud q.q)}]>"
   ==         ==
 ::
 ++  mang
@@ -5102,7 +5102,7 @@
           (dif c $(b (rsh 0 1 b), c (dub c)))
         $(b (rsh 0 1 b), c (dub c))
       ::
-      ++  toe                                           ::  exp#log tables
+      ++  toe                                           ::  exp+log tables
         =+  ^=  nu
             |=  {b/@ c/@}
             ^-  (map @ @)
@@ -5630,7 +5630,7 @@
     (rep 5 (al xw ow))
   ::
   ++  rpp
-    |=  {a/bloq b/@ c/@}                                ::  rip w#filler blocks
+    |=  {a/bloq b/@ c/@}                                ::  rip w+filler blocks
     =+  q=(rip a c)
     =+  w=(lent q)
     ?.  =(w b)
@@ -5690,7 +5690,7 @@
     (hml k (met 3 k) t (met 3 t))
   ::
   ++  hml
-    |=  {k/@ kl/@ t/@ tl/@}                             ::  w#length
+    |=  {k/@ kl/@ t/@ tl/@}                             ::  w+length
     =>  .(k (end 3 kl k), t (end 3 tl t))
     =+  b=64
     =.  k  ?.  (gth kl b)  k  (shay kl k)
@@ -5704,7 +5704,7 @@
     |=  {p/@ s/@ c/@ d/@}
     (pbl p (met 3 p) s (met 3 s) c d)
   ::
-  ++  pbl                                               :: w#length
+  ++  pbl                                               :: w+length
     ~/  %pbl
     |=  {p/@ pl/@ s/@ sl/@ c/@ d/@}
     =>  .(p (end 3 pl p), s (end 3 sl s))
@@ -5733,7 +5733,7 @@
     |=  {p/@ s/@ n/@ r/@ z/@ d/@}
     (hsl p (met 3 p) s (met 3 s) n r z d)
   ::
-  ++  hsl                                               ::  w#length
+  ++  hsl                                               ::  w+length
     ~/  %hsl
     |=  {p/@ pl/@ s/@ sl/@ n/@ r/@ z/@ d/@}
     =|  v/(list (list @))
@@ -6565,7 +6565,7 @@
   ?>  (~(nest ut (~(peek ut gat) %free 6)) & sam)
   (~(play ut [%cell gat sam]) [%cncl [~ 2] [~ 3]])
 ::
-++  slym                                                ::  slam w#o sample-type
+++  slym                                                ::  slam w+o sample-type
   |=  {gat/vase sam/*}  ^-  vase
   (slap gat(+<.q sam) [%cnzy %$])
 ::
@@ -7923,7 +7923,7 @@
       [p.yad [%face p.sut q.yad]]
     ::
         {$fork *}
-      ?:  =(p.sut fork#[cube#[%noun atom#%tas]]^[cube#[%void atom#%tas]])
+      ?:  =(p.sut fork+[cube+[%noun atom+%tas]]^[cube+[%void atom+%tas]])
         [dex %type]                    ::  XX  proper print
       =+  hin=$(sut p.sut)
       =+  yon=$(dex p.hin, sut q.sut)
@@ -9145,7 +9145,7 @@
     %+  sear
       |=  {a/wing b/(unit twig)}  ^-  (unit twig)
       ?~(b [~ %cnzz a] ?.(?=({@ $~} a) ~ [~ [%dtzz %tas i.a] u.b]))
-    ;~(plug rope ;~(pose (stag ~ ;~(pfix ;~(pose hax lus) wide)) (easy ~)))
+    ;~(plug rope ;~(pose (stag ~ ;~(pfix lus wide)) (easy ~)))
   ::
   ++  rood
     ;~  pfix  fas
@@ -9356,7 +9356,7 @@
         ==
       ==
     ::
-    ++  puv                                             ::  wide#tall flow
+    ++  puv                                             ::  wide+tall flow
       %+  cook  |=(a/(list beet) a)
       %-  star
       ;~  pose
@@ -10321,11 +10321,11 @@
 ++  mark  @tas                                          ::  content type
 ++  mash  |=(* (mass +<))                               ::  producing mass
 ++  mass  (pair cord (each noun (list mash)))           ::  memory usage
-++  mill  (each vase milt)                              ::  vase#metavase
+++  mill  (each vase milt)                              ::  vase+metavase
 ++  milt  {p/* q/*}                                     ::  metavase
 ++  monk  (each ship {p/@tas q/@ta})                    ::  general identity
 ++  mold                                                ::  new kernel action
-          |*  {a/$+(* *) b/$+(* *)}                     ::  forward#reverse
+          |*  {a/$+(* *) b/$+(* *)}                     ::  forward+reverse
           $%  {$pass p/path q/a}                        ::  advance
               {$slip p/a}                               ::  lateral
               {$sick p/b}                               ::  lame refactoring
@@ -10776,11 +10776,11 @@
                     q.q
                   :-  %userspace
                   :-  %|
-                  :~  hoon#`pit
-                      zuse#`bud
-                      hoon-cache#`p.niz
+                  :~  hoon+`pit
+                      zuse+`bud
+                      hoon-cache+`p.niz
                       q.q.i.ova
-                      dot#`.
+                      dot+`.
                   ==
                 ==
               =+(avo=$(ova t.ova) [[i.ova -.avo] +.avo])
@@ -10835,7 +10835,7 @@
   ^-  {p/(list ovum) q/*}
   =+  pax=(weld hap `path`[%hoon ~])
   ~&  [%vega-start hap]
-  =+  src=((hard @t) (need (peek now cx#pax)))
+  =+  src=((hard @t) (need (peek now cx+pax)))
   =+  saz=(shax src)
   =+  gen=(rain hap src)
   ~&  %vega-parsed
@@ -10850,7 +10850,7 @@
   =+  raw=.*([-.gat [sam +>.gat]] -.gat)
   [[[~ %vega hap] ((list ovum) -.raw)] +.raw]
 ::
-++  veer                                                ::  install vane#tang
+++  veer                                                ::  install vane+tang
   |=  {now/@da fav/curd}
   =>  .(fav ((hard {$veer lal/@ta pax/path txt/@t}) fav))
   ?:  =(%$ lal.fav)
diff --git a/arvo/jael.hoon b/arvo/jael.hoon
index adfd4768d..785cc7f5f 100644
--- a/arvo/jael.hoon
+++ b/arvo/jael.hoon
@@ -1,6 +1,6 @@
 ::    %jael, secret storage
 ::
-::::  /hoon#jael
+::::  /hoon+jael
   ::
 !?  164
 ::::
@@ -18,7 +18,7 @@
 ::      /userid             ::  user identity
 ::
 ::  /urb                    ::  urbit secrets
-::    /tok#hash
+::    /tok+hash
 
 |=  pit=vase   
 =>  =~
@@ -137,7 +137,7 @@
   ::  actually scry
   ~
 ::
-++  stay                                                ::  save w#o cache
+++  stay                                                ::  save w+o cache
   `axle`+>-.$(pol (~(run by pol) |=(a=baby [tad.a dym.a ~])))
 ::
 ++  take                                                ::  response
diff --git a/arvo/kahn.hoon b/arvo/kahn.hoon
index 94cdae4e3..d8d39b791 100644
--- a/arvo/kahn.hoon
+++ b/arvo/kahn.hoon
@@ -1,6 +1,6 @@
 ::    %kahn, social state
 ::
-::::  /hoon#kahn
+::::  /hoon+kahn
   ::
 !?  164
 ::::
@@ -30,7 +30,7 @@
               [%know p=monk q=(map monk link)]          ::  set forward links
               [%nuke ~]                                 ::  erase subscriber
           ==                                            ::
-++  link  (pair rank ,@da)                              ::  trust#expiration
+++  link  (pair rank ,@da)                              ::  trust+expiration
 ++  monk  (each ship khan)                              ::  general identity
 ++  rank                                                ::  privilege ring
           $?  %0                                        ::  complete trust
@@ -93,7 +93,7 @@
       (
       
 ::
-++  stay                                                ::  save w#o cache
+++  stay                                                ::  save w+o cache
   `axle`+>-.$
 ::
 ++  take                                                ::  response
diff --git a/arvo/lunt.hoon b/arvo/lunt.hoon
index b22323c69..d76d1837d 100644
--- a/arvo/lunt.hoon
+++ b/arvo/lunt.hoon
@@ -1,6 +1,6 @@
 ::    %lunt, fleet job control
 ::
-::::  /hoon#lunt
+::::  /hoon+lunt
   ::
 !?  164
 ::::
@@ -94,7 +94,7 @@
   ^-  (unit (unit (pair mark ,*)))
   ~
 ::
-++  stay                                                ::  save w#o cache
+++  stay                                                ::  save w+o cache
   `axle`+>-.$
 ::
 ++  take                                                ::  response
diff --git a/arvo/musk.hoon b/arvo/musk.hoon
index 39e468b1b..a8187eb66 100644
--- a/arvo/musk.hoon
+++ b/arvo/musk.hoon
@@ -1,6 +1,6 @@
 ::    %musk, realm management
 ::
-::::  /hoon#musk
+::::  /hoon+musk
   ::
 !?  164
 ::::
@@ -38,10 +38,10 @@
 ++  rank                                                ::  relative privilege
           $?  %0                                        ::  enemy
               %1                                        ::  neighbor
-              %2                                        ::  guest#customer
-              %3                                        ::  friend#employee
-              %4                                        ::  officer#family
-              %5                                        ::  self#admin
+              %2                                        ::  guest+customer
+              %3                                        ::  friend+employee
+              %4                                        ::  officer+family
+              %5                                        ::  self+admin
           ==                                            ::
 ++  girl                                                ::
           $:  hop=pony                                  ::  status
@@ -84,7 +84,7 @@
   ^-  (unit (unit (pair mark ,*)))
   ~
 ::
-++  stay                                                ::  save w#o cache
+++  stay                                                ::  save w+o cache
   `axle`+>-.$
 ::
 ++  take                                                ::  response
diff --git a/arvo/zuse.hoon b/arvo/zuse.hoon
index ad720be05..dd75fa480 100644
--- a/arvo/zuse.hoon
+++ b/arvo/zuse.hoon
@@ -553,7 +553,7 @@
     ;~  pfix  bas
       ;~  pose
         doq  fas  soq  bas
-        (sear ~(get by `(map @t @)`(mo b#8 t#9 n#10 f#12 r#13 ~)) low)
+        (sear ~(get by `(map @t @)`(mo b+8 t+9 n+10 f+12 r+13 ~)) low)
         ;~(pfix (just 'u') (cook tuft qix:ab))           :: 4-digit hex to UTF-8
       ==
     ==
@@ -1182,7 +1182,7 @@
   tup=|*({a/@tas b/(pole @tas)} =+(c=(odo:raid a) ?~(b c {c (..$ b)})))
 ::
 ::  .=  [p=%ack q=~sarnel r=&]
-::  (raid /ack#~sarnel#.y p=%tas q=%p r=%f ~)
+::  (raid /ack+~sarnel+.y p=%tas q=%p r=%f ~)
 ++  raid                                                ::  demand path odors
   =-  |*  {a/path b/{@tas (pole @tas)}}
       ?~  +.b  `(odo -.b)`(slav -.b -.a)
@@ -1299,7 +1299,7 @@
     ==
   --
 ::
-++  urlp                                                ::  url#header parser
+++  urlp                                                ::  url+header parser
   |%
   ++  apat                                              ::  2396 abs_path
     %+  cook  deft
@@ -1356,7 +1356,7 @@
   ++  tock  (cook crip (plus pcok))                     ::  6265 cookie-value
   ++  tosk  ;~(pose tock (ifix [doq doq] tock))         ::  6265 cookie-value
   ++  toke  (cook crip (plus ptok))                     ::  2616 token
-  ++  thor                                              ::  2396 host#port
+  ++  thor                                              ::  2396 host+port
     %+  cook  |*(a/{* *} [+.a -.a])
     ;~  plug
       thos
@@ -1401,7 +1401,7 @@
       (stag %| ;~(plug apat yque))
     ==
   --
-++  epur                                                ::  url#header parser
+++  epur                                                ::  url+header parser
   =>(urlp |=(a/cord `(unit purl)`(rush a auri)))
 ::
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
@@ -1475,15 +1475,15 @@
 ::   |=  [pax=path src=*]
 ::   ^-  (each twig (list tank))
 ::   ?.  ?=(@ src)
-::     [%| ~[[leaf#"musk: malformed: {<pax>}"]]]
+::     [%| ~[[leaf+"musk: malformed: {<pax>}"]]]
 ::   =+  ^=  mud
 ::       %-  mule  |.
 ::       ((full vest) [1 1] (trip src))
 ::   ?:  ?=(| -.mud)  mud
 ::   ?~  q.p.mud
 ::     :~  %|
-::         leaf#"musk: syntax error: {<pax>}"
-::         leaf#"musk: line {<p.p.p.mud>}, column {<q.p.p.mud>}"
+::         leaf+"musk: syntax error: {<pax>}"
+::         leaf+"musk: line {<p.p.p.mud>}, column {<q.p.p.mud>}"
 ::     ==
 ::   [%& p.u.q.p.mud]
 :: ::
@@ -1723,15 +1723,15 @@
               {$king p/@t}                              ::  16-bit ship
               {$pawn p/(unit @t)}                       ::  128-bit ship
           ==                                            ::
-++  govt  path                                          ::  country#postcode
+++  govt  path                                          ::  country+postcode
 ++  hand  @uvH                                          ::  hash of code
-++  hart  {p/? q/(unit @ud) r/host}                     ::  http sec#port#host
+++  hart  {p/? q/(unit @ud) r/host}                     ::  http sec+port+host
 ++  hate  {p/purl q/@p r/moth}                          ::  semi-cooked request
-++  heir  {p/@ud q/mess r/(unit love)}                  ::  status#headers#data
+++  heir  {p/@ud q/mess r/(unit love)}                  ::  status+headers+data
 ++  hiss  {p/purl q/moth}                               ::  outbound request
 ++  hist  {p/@ud q/(list @t)}                           ::  depth texts
 ++  hole  @t                                            ::  session identity
-++  hort  {p/(unit @ud) q/host}                         ::  http port#host
+++  hort  {p/(unit @ud) q/host}                         ::  http port+host
 ++  host  (each (list @t) @if)                          ::  http host
 ++  hoke  %+  each   {$localhost $~}                    ::  local host
           ?($.0.0.0.0 $.127.0.0.1)                      ::
@@ -1762,7 +1762,7 @@
           ==                                            ::
 ++  lane                                                ::  packet route
           $%  {$if p/@da q/@ud r/@if}                   ::  IP4/public UDP/addr
-              {$is p/@ud q/(unit lane) r/@is}           ::  IPv6 w#alternates
+              {$is p/@ud q/(unit lane) r/@is}           ::  IPv6 w+alternates
               {$ix p/@da q/@ud r/@if}                   ::  IPv4 provisional
           ==                                            ::
 ++  lang  @ta                                           ::  IETF lang as code
@@ -1783,7 +1783,7 @@
               {$mid p/mite q/octs}                      ::  mime-typed data
               {$raw p/httr}                             ::  raw http response
               {$wan p/wain}                             ::  text lines
-              {$zap p/@ud q/(list tank)}                ::  status#error
+              {$zap p/@ud q/(list tank)}                ::  status+error
           ==                                            ::
 ++  maki  {p/@ta q/@ta r/@ta s/path}                    ::
 ++  mace  (list {p/life q/ring})                        ::  private secrets
@@ -1793,7 +1793,7 @@
               {$buck p/coop q/flap r/@dr}               ::  e2e ack
               {$bond p/life q/path r/@ud s/*}           ::  message
               {$bund p/life q/path r/@ud s/*}           ::  e2e message
-              {$carp p/@ q/@ud r/@ud s/flap t/@}        ::  skin#inx#cnt#hash
+              {$carp p/@ q/@ud r/@ud s/flap t/@}        ::  skin+inx+cnt+hash
               {$fore p/ship q/(unit lane) r/@}          ::  forwarded packet
           ==                                            ::
 ++  mess  (list {p/@t q/@t})                            ::  raw http headers
@@ -1829,7 +1829,7 @@
 ++  moat  {p/case q/case r/path}                        ::  change range
 ++  mood  {p/care q/case r/path}                        ::  request in desk
 ++  moth  {p/meth q/math r/(unit octs)}                 ::  http operation
-++  name  {p/@t q/(unit @t) r/(unit @t) s/@t}           ::  first mid#nick last
+++  name  {p/@t q/(unit @t) r/(unit @t) s/@t}           ::  first mid+nick last
 ++  newt  ?($boot $kick $mess $slay $wake)              ::  lifecycle events
 ++  nori                                                ::  repository action
           $%  {$& p/soba}                               ::  delta
@@ -1853,7 +1853,7 @@
 ++  purf  (pair purl (unit @t))                         ::  url with fragment
 ++  purl  {p/hart q/pork r/quay}                        ::  parsed url
 ++  putt                                                ::  outgoing message
-          $:  ski/snow                                  ::  sequence acked#sent
+          $:  ski/snow                                  ::  sequence acked+sent
               wyv/(list rock)                           ::  packet list XX gear
           ==                                            ::
 ++  pyre                                                ::  cascade stash
@@ -1895,7 +1895,7 @@
           $:  sed/@ud                                   ::  sent
               san/(map @ud duct)                        ::  outstanding
           ==                                            ::
-++  riot  (unit rant)                                   ::  response#complete
+++  riot  (unit rant)                                   ::  response+complete
 ++  road                                                ::  secured oneway route
           $:  exp/@da                                   ::  expiration date
               lun/(unit lane)                           ::  route to friend
@@ -1904,7 +1904,7 @@
 ++  rock  @uvO                                          ::  packet
 ++  rout  {p/(list host) q/path r/oryx s/path}          ::  http route (new)
 ++  rump  {p/care q/case r/@tas s/path}                 ::  relative path
-++  saba  {p/ship q/@tas r/moar s/dome}                 ::  patch#merge
+++  saba  {p/ship q/@tas r/moar s/dome}                 ::  patch+merge
 ++  sack  {p/ship q/ship}                               ::  incoming [our his}
 ++  sufi                                                ::  domestic host
           $:  hoy/(list ship)                           ::  hierarchy
@@ -1935,7 +1935,7 @@
                   cag/@ud                               ::  congest thresh
               ==                                        ::
               $:  diq/(map flap @ud)                    ::  packets sent
-                  pyz/(map soup @ud)                    ::  message#unacked
+                  pyz/(map soup @ud)                    ::  message+unacked
                   puq/(qeu {p/@ud q/soul})              ::  packet queue
               ==                                        ::
           ==                                            ::
@@ -1976,12 +1976,12 @@
               {$lord p/whom}                            ::  male person []
               {$punk p/sect q/@t}                       ::  opaque handle ""
           ==                                            ::
-++  whom  {p/@ud q/govt r/sect s/name}                  ::  year#govt#id
+++  whom  {p/@ud q/govt r/sect s/name}                  ::  year+govt+id
 ++  woof  $@  $know                                     ::  udon transform
               {$chan (list {$@(@ud {p/@ud q/@ud})})}    ::
 ++  wund  (list {p/life q/ring r/acru})                 ::  mace in action
 ++  will  (list deed)                                   ::  certificate
-++  zuse  %310                                          ::  hoon#zuse kelvin
+++  zuse  %310                                          ::  hoon+zuse kelvin
 ::          ::
 ::::        ::::  this will become `%york`, vane structures.
   ::          ::
@@ -2032,7 +2032,7 @@
               dir/(unit (map @ta (unit khan)))          ::
           ==                                            ::
 ++  mode  (list {path (unit mime)})                     ::
-++  riff  {p/desk q/(unit rave)}                        ::  request#desist
+++  riff  {p/desk q/(unit rave)}                        ::  request+desist
 ::::                                                    ::
 ++  gift-clay                                           ::  out result <-$
           $%  {$ergo p/@tas q/mode}                     ::  version update
@@ -2098,7 +2098,7 @@
       {$clr $~}                                         ::  clear the screen
       {$hop p/@ud}                                      ::  set cursor position
       {$mor p/(list dill-blit)}                         ::  multiple blits
-      {$pro p/(list @c)}                                ::  show as cursor#line
+      {$pro p/(list @c)}                                ::  show as cursor+line
       {$qit $~}                                         ::  close console
       {$out p/(list @c)}                                ::  send output line
       {$sag p/path q/*}                                 ::  save to jamfile
@@ -2176,7 +2176,7 @@
               {$mack p/(unit tang)}                     ::  message ack
               {$sigh p/cage}                            ::  marked http response
               {$thou p/httr}                            ::  raw http response
-              {$thus p/@ud q/(unit hiss)}               ::  http request#cancel
+              {$thus p/@ud q/(unit hiss)}               ::  http request+cancel
               {$veer p/@ta q/path r/@t}                 ::  drop-through
               {$vega p/path}                            ::  drop-through
           ==                                            ::
@@ -2210,7 +2210,7 @@
       {$saw p/twig q/horn}                              ::  /;  operate on
       {$see p/beam q/horn}                              ::  /:  relative to
       {$sic p/twig q/horn}                              ::  /^  cast
-      {$toy p/mark}                                     ::  /mark#  static
+      {$toy p/mark}                                     ::  /mark+  static
   ==                                                    ::
 ++  milk  (trel ship desk silk)                         ::  sourced silk
 ++  silk                                                ::  construction layer
@@ -2239,7 +2239,7 @@
   ==                                                    ::
 ::::
 ++  bilk  (pair beak silk)                              ::  sourced request
-++  gage                                                ::  recursive cage#tang
+++  gage                                                ::  recursive cage+tang
   $%  {$& p/cage}                                       ::  success
       {$| p/tang}                                       ::  error
       {$tabl p/(list (pair gage gage))}                 ::  table of results
@@ -2264,7 +2264,7 @@
       {$puff p/mark q/noun}                             ::  unchecked poke
       {$pull $~}                                        ::  unsubscribe
       {$punk p/mark q/cage}                             ::  translated poke
-      {$pump $~}                                        ::  pump yes#no
+      {$pump $~}                                        ::  pump yes+no
   ==                                                    ::
 ++  cuft                                                ::  internal gift
   $%  {$coup p/(unit tang)}                             ::  poke result
@@ -2274,7 +2274,7 @@
       {$reap p/(unit tang)}                             ::  peer result
   ==                                                    ::
 ++  culm                                                ::  config action
-  $%  {$load p/scup}                                    ::  load#reload
+  $%  {$load p/scup}                                    ::  load+reload
   ::  {$kick $~}                                        ::  restart everything
   ::  {$stop $~}                                        ::  toggle suspend
   ::  {$wipe $~}                                        ::  destroy all state
diff --git a/gen/cat.hoon b/gen/cat.hoon
index ee2b9ee40..9339d22e1 100644
--- a/gen/cat.hoon
+++ b/gen/cat.hoon
@@ -1,15 +1,15 @@
 ::  ConCATenate file listings
 ::  
-::::  /hoon#gen#cat
+::::  /hoon+gen+cat
   ::
-//  /%%/ls#subdir
+//  /%%/ls+subdir
 //  /%/pretty
 !:
 ::::
   ::
 :-  %say
 |=  {^ {arg/(list path)} $~}
-=-  tang#(flop `tang`(zing -))
+=-  tang+(flop `tang`(zing -))
 %+  turn  arg
 |=  pax/path
 ^-  tang
@@ -17,17 +17,17 @@
 ?^  fil.ark
   ?:  =(%sched -:(flop pax))
     [>;;((map ,@da cord) .^(%cx pax))<]~
-  [leaf#(spud pax) (pretty-file .^(%cx pax))]
+  [leaf+(spud pax) (pretty-file .^(%cx pax))]
 ?-     dir.ark                                          ::  handle ambiguity
     $~
-  [rose#[" " `~]^~[leaf#"~" (smyt pax)]]~
+  [rose+[" " `~]^~[leaf+"~" (smyt pax)]]~
 ::
     {{@t $~} $~ $~}
   $(pax (welp pax /[p.n.dir.ark]))
 ::
     *
-  =-  [palm#[": " ``~]^-]~
-  :~  rose#[" " `~]^~[leaf#"*" (smyt pax)] 
+  =-  [palm+[": " ``~]^-]~
+  :~  rose+[" " `~]^~[leaf+"*" (smyt pax)] 
       `tank`(subdir pax dir.ark)
   ==
 ==
diff --git a/gen/cat/pretty.hoon b/gen/cat/pretty.hoon
index e37caa1f3..ff8973e2b 100644
--- a/gen/cat/pretty.hoon
+++ b/gen/cat/pretty.hoon
@@ -3,10 +3,10 @@
 ++  pretty-noun
   |=  pri=*  ^-  tank
   ?~  pri
-    leaf#"~"
+    leaf+"~"
   ?@  pri
-    leaf#?:(((sane %tas) pri) <`@tas`pri> <pri>)
-  =<  rose#[" " ?:(- "~[" "[") "]"]^+
+    leaf+?:(((sane %tas) pri) <`@tas`pri> <pri>)
+  =<  rose+[" " ?:(- "~[" "[") "]"]^+
   |-  ^-  [? (list tank)]
   ?~  +.pri
     [& ^$(pri -.pri) ~]
@@ -17,7 +17,7 @@
 ++  vale-cord  |=(a=cord `?`(levy (trip a) |=(b=@ |((gte b 32) =(10 b)))))
 ::
 ++  pretty-file
-  =+  wain-to-tang=|=(a=wain (turn a |=(b=cord leaf#(trip b))))
+  =+  wain-to-tang=|=(a=wain (turn a |=(b=cord leaf+(trip b))))
   |=  fyl=*  ^-  tang
   =+  `(unit wain)`?@(fyl `(lore fyl) ((soft wain) fyl))
   ?^  -  (wain-to-tang u)
diff --git a/gen/curl/url.hoon b/gen/curl/url.hoon
index 00bc1984a..db33d0e56 100644
--- a/gen/curl/url.hoon
+++ b/gen/curl/url.hoon
@@ -7,4 +7,4 @@
   !:
 :-  %say
 |=  {^ {arg/tape $~} $~}
-purl#(scan arg auri:epur)
+purl+(scan arg auri:epur)
diff --git a/gen/hello.hoon b/gen/hello.hoon
index 36c82fb04..23cec09c9 100644
--- a/gen/hello.hoon
+++ b/gen/hello.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#hello#gen
+::::  /hoon+hello+gen
   ::
 /?  314
 ::
diff --git a/gen/hood/ask.hoon b/gen/hood/ask.hoon
index 0c4b3d21c..90942a322 100644
--- a/gen/hood/ask.hoon
+++ b/gen/hood/ask.hoon
@@ -2,5 +2,5 @@
 |=  {^ {mel/cord $~} $~}
 =+  adr=(star ;~(less (mask "\"\\()[],:;<>@") prn))
 =+  dom=[;~(plug dlab dot (most dot dlab))]:urlp
-=+  ~|(bad-email#mel (rash mel ;~((glue pat) adr dom)))
-helm-send-ask#mel
+=+  ~|(bad-email+mel (rash mel ;~((glue pat) adr dom)))
+helm-send-ask+mel
diff --git a/gen/hood/autoload.hoon b/gen/hood/autoload.hoon
index 66f31a121..8f5573521 100644
--- a/gen/hood/autoload.hoon
+++ b/gen/hood/autoload.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#autoload#hood#gen
+::::  /hoon+autoload+hood+gen
   ::
 /?  314
 ::
diff --git a/gen/hood/begin.hoon b/gen/hood/begin.hoon
index e5daa86cf..3e1c72bcd 100644
--- a/gen/hood/begin.hoon
+++ b/gen/hood/begin.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#begin#hood#gun
+::::  /hoon+begin+hood+gun
   ::
 /?  314
 /-  sole
diff --git a/gen/hood/breload.hoon b/gen/hood/breload.hoon
index a7ab5afaa..650bf1614 100644
--- a/gen/hood/breload.hoon
+++ b/gen/hood/breload.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#reload#hood#gen
+::::  /hoon+reload+hood+gen
   ::
 /?  314
 ::
diff --git a/gen/hood/cancel.hoon b/gen/hood/cancel.hoon
index 7b05d1087..aa5ac15ca 100644
--- a/gen/hood/cancel.hoon
+++ b/gen/hood/cancel.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#cancel#hood#gen
+::::  /hoon+cancel+hood+gen
   ::
 /?  314
 ::
diff --git a/gen/hood/cp.hoon b/gen/hood/cp.hoon
index c6b3ff187..cbccfbddb 100644
--- a/gen/hood/cp.hoon
+++ b/gen/hood/cp.hoon
@@ -1,2 +1,2 @@
 :-  %say
-|=({^ {input/path output/path $~} $~} kiln-cp#[input output])
+|=({^ {input/path output/path $~} $~} kiln-cp+[input output])
diff --git a/gen/hood/deset.hoon b/gen/hood/deset.hoon
index 28b00b693..0616c983b 100644
--- a/gen/hood/deset.hoon
+++ b/gen/hood/deset.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#deset#hood#gen
+::::  /hoon+deset+hood+gen
   ::
 /?  314
 ::
diff --git a/gen/hood/hi.hoon b/gen/hood/hi.hoon
index c316a0ee8..508f78e60 100644
--- a/gen/hood/hi.hoon
+++ b/gen/hood/hi.hoon
@@ -1,2 +1,2 @@
 :-  %say
-|=({^ {who/ship mez/$@($~ {a/tape $~})} $~} helm-send-hi#[who ?~(mez ~ `a.mez)])
+|=({^ {who/ship mez/$@($~ {a/tape $~})} $~} helm-send-hi+[who ?~(mez ~ `a.mez)])
diff --git a/gen/hood/init.hoon b/gen/hood/init.hoon
index 3fc321240..e19ed47eb 100644
--- a/gen/hood/init.hoon
+++ b/gen/hood/init.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#reload#hood#gen
+::::  /hoon+reload+hood+gen
   ::
 /?  314
 ::
diff --git a/gen/hood/invite.hoon b/gen/hood/invite.hoon
index bad29985a..be5ee36c5 100644
--- a/gen/hood/invite.hoon
+++ b/gen/hood/invite.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#invite#hood#gen
+::::  /hoon+invite+hood+gen
   ::
 /?  314
 ::
diff --git a/gen/hood/label.hoon b/gen/hood/label.hoon
index cadac1f98..1fa5f3282 100644
--- a/gen/hood/label.hoon
+++ b/gen/hood/label.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#label#hood#gen
+::::  /hoon+label+hood+gen
   ::
 /?  314
 ::
diff --git a/gen/hood/link.hoon b/gen/hood/link.hoon
index 44183b22b..811e8a463 100644
--- a/gen/hood/link.hoon
+++ b/gen/hood/link.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#link#hood#gen
+::::  /hoon+link+hood+gen
   ::
 /?  314
 ::
diff --git a/gen/hood/mass.hoon b/gen/hood/mass.hoon
index bd64d7de4..5ff359a54 100644
--- a/gen/hood/mass.hoon
+++ b/gen/hood/mass.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#mass#hood#gen
+::::  /hoon+mass+hood+gen
   ::
 /?  314
 ::
diff --git a/gen/hood/merge.hoon b/gen/hood/merge.hoon
index 81a81749c..4ce5ca8df 100644
--- a/gen/hood/merge.hoon
+++ b/gen/hood/merge.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#merge#hood#gen
+::::  /hoon+merge+hood+gen
   ::
 /?  314
 !:
diff --git a/gen/hood/mount.hoon b/gen/hood/mount.hoon
index ef7d10717..f1735dc59 100644
--- a/gen/hood/mount.hoon
+++ b/gen/hood/mount.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#mount#hood#gen
+::::  /hoon+mount+hood+gen
   ::
 /?  314
 ::
diff --git a/gen/hood/mv.hoon b/gen/hood/mv.hoon
index 16e3c7da2..88f4df57e 100644
--- a/gen/hood/mv.hoon
+++ b/gen/hood/mv.hoon
@@ -1,2 +1,2 @@
 :-  %say
-|=({^ {input/path output/path $~} $~} kiln-mv#[input output])
+|=({^ {input/path output/path $~} $~} kiln-mv+[input output])
diff --git a/gen/hood/overload.hoon b/gen/hood/overload.hoon
index 17fd2ea32..517e2fbee 100644
--- a/gen/hood/overload.hoon
+++ b/gen/hood/overload.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#overload#hood#gen
+::::  /hoon+overload+hood+gen
   ::
 /?  314
 ::
diff --git a/gen/hood/rc.hoon b/gen/hood/rc.hoon
index 2f2c88478..f7711656c 100644
--- a/gen/hood/rc.hoon
+++ b/gen/hood/rc.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#reload#hood#gen
+::::  /hoon+reload+hood+gen
   ::
 /?  314
 ::
diff --git a/gen/hood/reboot.hoon b/gen/hood/reboot.hoon
index d9691018c..57d9f85b6 100644
--- a/gen/hood/reboot.hoon
+++ b/gen/hood/reboot.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#reload#hood#gen
+::::  /hoon+reload+hood+gen
   ::
 /?  314
 ::
diff --git a/gen/hood/reload-desk.hoon b/gen/hood/reload-desk.hoon
index 7e3c06caf..3560a4202 100644
--- a/gen/hood/reload-desk.hoon
+++ b/gen/hood/reload-desk.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#reload#hood#gen
+::::  /hoon+reload+hood+gen
   ::
 /?  314
 ::
diff --git a/gen/hood/reload.hoon b/gen/hood/reload.hoon
index 1a7b25d7f..5e40dc3d0 100644
--- a/gen/hood/reload.hoon
+++ b/gen/hood/reload.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#reload#hood#gen
+::::  /hoon+reload+hood+gen
   ::
 /?  314
 ::
diff --git a/gen/hood/reset.hoon b/gen/hood/reset.hoon
index 94f698620..2cfa7ff49 100644
--- a/gen/hood/reset.hoon
+++ b/gen/hood/reset.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#reset#hood#gen
+::::  /hoon+reset+hood+gen
   ::
 /?  314
 ::
diff --git a/gen/hood/rf.hoon b/gen/hood/rf.hoon
index 74028e264..ce9a62474 100644
--- a/gen/hood/rf.hoon
+++ b/gen/hood/rf.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#reload#hood#gen
+::::  /hoon+reload+hood+gen
   ::
 /?  314
 ::
diff --git a/gen/hood/rm.hoon b/gen/hood/rm.hoon
index 8b07d2639..b350b79d4 100644
--- a/gen/hood/rm.hoon
+++ b/gen/hood/rm.hoon
@@ -1,2 +1,2 @@
 :-  %say
-|=({^ {input/path $~} $~} kiln-rm#input)
+|=({^ {input/path $~} $~} kiln-rm+input)
diff --git a/gen/hood/schedule.hoon b/gen/hood/schedule.hoon
index 5f03a46fa..86ac4c3b1 100644
--- a/gen/hood/schedule.hoon
+++ b/gen/hood/schedule.hoon
@@ -1,2 +1,2 @@
 :-  %say
-|=({^ {where/path tym/@da eve/@t $~} $~} kiln-schedule#[where tym eve])
+|=({^ {where/path tym/@da eve/@t $~} $~} kiln-schedule+[where tym eve])
diff --git a/gen/hood/start.hoon b/gen/hood/start.hoon
index 34623d49e..39d6e4041 100644
--- a/gen/hood/start.hoon
+++ b/gen/hood/start.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#start#hood#gen
+::::  /hoon+start+hood+gen
   ::
 /?  314
 ::
diff --git a/gen/hood/sync.hoon b/gen/hood/sync.hoon
index 667080f1e..d70ff4815 100644
--- a/gen/hood/sync.hoon
+++ b/gen/hood/sync.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#sync#hood#gen
+::::  /hoon+sync+hood+gen
   ::
 /?  314
 ::
diff --git a/gen/hood/unix.hoon b/gen/hood/unix.hoon
index b5dde1d0c..ab9412c94 100644
--- a/gen/hood/unix.hoon
+++ b/gen/hood/unix.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#unix#hood#gen
+::::  /hoon+unix+hood+gen
   ::
 /?  314
 ::
diff --git a/gen/hood/unlink.hoon b/gen/hood/unlink.hoon
index 750b63312..9d6f2d69b 100644
--- a/gen/hood/unlink.hoon
+++ b/gen/hood/unlink.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#link#hood#gen
+::::  /hoon+link+hood+gen
   ::
 /?  314
 ::
diff --git a/gen/hood/unmount.hoon b/gen/hood/unmount.hoon
index ad543d409..38eb415b4 100644
--- a/gen/hood/unmount.hoon
+++ b/gen/hood/unmount.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#mount#hood#gen
+::::  /hoon+mount+hood+gen
   ::
 /?  314
 ::
diff --git a/gen/hood/unsync.hoon b/gen/hood/unsync.hoon
index 5bdc1dd17..c2144f7bd 100644
--- a/gen/hood/unsync.hoon
+++ b/gen/hood/unsync.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#unsync#hood#gen
+::::  /hoon+unsync+hood+gen
   ::
 /?  314
 ::
diff --git a/gen/hood/verb.hoon b/gen/hood/verb.hoon
index d8e6ba7b8..92303afbd 100644
--- a/gen/hood/verb.hoon
+++ b/gen/hood/verb.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#verb#hood#gun
+::::  /hoon+verb+hood+gun
   ::
 /?  314
 /-  sole
diff --git a/gen/ls.hoon b/gen/ls.hoon
index f011c5073..f63a9b276 100644
--- a/gen/ls.hoon
+++ b/gen/ls.hoon
@@ -1,6 +1,6 @@
 ::  LiSt directory subnodes
 ::
-::::  /hoon#ls#gen
+::::  /hoon+ls+gen
   ::
 //  /%/subdir
 !:
@@ -9,4 +9,4 @@
 :-  %say
 |=  {^ {arg/path $~} $~}
 =+  lon=((hard arch) .^(%cy arg))
-tang#[?~(dir.lon leaf#"~" (subdir arg dir.lon))]~
+tang+[?~(dir.lon leaf+"~" (subdir arg dir.lon))]~
diff --git a/gen/ls/subdir.hoon b/gen/ls/subdir.hoon
index ea26cd82e..500922f3a 100644
--- a/gen/ls/subdir.hoon
+++ b/gen/ls/subdir.hoon
@@ -7,7 +7,7 @@
   |=  {kid/@ta $~}
   =+  paf=`path`/[kid]
   =-  :+  %rose  ["/" ~ ?:(dir "/" ~)]
-      (turn paf |=(a/span leaf#(trip a)))
+      (turn paf |=(a/span leaf+(trip a)))
   |-  ^-  {dir/? paf/path}
   =+  arf=;;(arch .^(%cy (weld pax paf)))
   ?^  fil.arf  
diff --git a/gen/make.hoon b/gen/make.hoon
index 824c2c720..9e7527560 100644
--- a/gen/make.hoon
+++ b/gen/make.hoon
@@ -1,2 +1,2 @@
 :-  %say
-|=({^ arg/(list @) foo/_`@`1 bar/_`@`2} noun#[arg foo bar])
+|=({^ arg/(list @) foo/_`@`1 bar/_`@`2} noun+[arg foo bar])
diff --git a/gen/moon.hoon b/gen/moon.hoon
index 9dc095b34..2d797ccac 100644
--- a/gen/moon.hoon
+++ b/gen/moon.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#ticket#gen
+::::  /hoon+ticket+gen
   ::
 /?  314
 ::
@@ -12,5 +12,5 @@
 :-  %noun
 ?>  =(1 (met 5 p.bec))
 =+  mon=(mix (lsh 5 1 (end 5 1 eny)) p.bec)
-=+  tic=((hard @p) .^(/a#(scot %p p.bec)/tick#(scot %da now)/(scot %p mon)))
+=+  tic=((hard @p) .^(/a+(scot %p p.bec)/tick+(scot %da now)/(scot %p mon)))
 "moon: {<`@p`mon>}; ticket: {<tic>}"
diff --git a/gen/pope.hoon b/gen/pope.hoon
index 2c49939be..b16171e0a 100644
--- a/gen/pope.hoon
+++ b/gen/pope.hoon
@@ -8,7 +8,7 @@
         {{who/ship $~} $~}
     ==
 ^-  (sole-result (cask tang))
-%+  sole-yo  leaf#"generating carrier {(scow %p who)} (#{(scow %ud who)})"
+%+  sole-yo  leaf+"generating carrier {(scow %p who)} (#{(scow %ud who)})"
 %+  sole-lo  [%| %pope-pass "passphrase: "]
 %+  sole-go  (boss 256 (star prn))
 |=  fra/@t
@@ -19,6 +19,6 @@
 ~&  %computing-fingerprint
 =+  arc=(cryp 2.048 bur)
 %+  sole-so  %tang
-:~  leaf#"generator: {(scow %uw bur)}"
-    leaf#"fingerprint: {(scow %uw fig:ex:arc)}"
+:~  leaf+"generator: {(scow %uw bur)}"
+    leaf+"fingerprint: {(scow %uw fig:ex:arc)}"
 ==
diff --git a/gen/solid.hoon b/gen/solid.hoon
index dc1046447..95e041f49 100644
--- a/gen/solid.hoon
+++ b/gen/solid.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#solid#gen
+::::  /hoon+solid+gen
   ::
 /?  314
 ::
diff --git a/gen/ticket.hoon b/gen/ticket.hoon
index e3604775d..d482fc62c 100644
--- a/gen/ticket.hoon
+++ b/gen/ticket.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#ticket#gen
+::::  /hoon+ticket+gen
   ::
 /?  314
 ::
@@ -10,4 +10,4 @@
         {{her/@p ~} ~}
     ==
 :-  %noun
-((hard @p) .^(/a#(scot %p p.bec)/tick#(scot %da now)/(scot %p her)))
+((hard @p) .^(/a+(scot %p p.bec)/tick+(scot %da now)/(scot %p her)))
diff --git a/gen/tree.hoon b/gen/tree.hoon
index f332085b0..fe2486910 100644
--- a/gen/tree.hoon
+++ b/gen/tree.hoon
@@ -1,6 +1,6 @@
 ::  Tree view recursive directory contents
 ::  
-::::  /hoon#tree#gen
+::::  /hoon+tree+gen
   ::
 !:
 ::::
@@ -11,7 +11,7 @@
 =+  rend=?^(fla smyt |=(a/path (smyt (slag len a))))
 :-  %tang  %-  flop
 |-  ^-  tang
-=+  ark=;;(arch .^(cy#pax))
+=+  ark=;;(arch .^(cy+pax))
 =-  ?~  fil.ark  -
     [(rend pax) -]
 %-  zing
diff --git a/gen/twit/tweet.hoon b/gen/twit/tweet.hoon
index 5087808cf..f4eb808ab 100644
--- a/gen/twit/tweet.hoon
+++ b/gen/twit/tweet.hoon
@@ -3,11 +3,11 @@
 |_  {hide $~}
 ++  peer  _`.
 ++  poke--args
-  %+  add-subs  [[our /twit] our /post#(scot %uv eny)]
+  %+  add-subs  [[our /twit] our /post+(scot %uv eny)]
   %^  gate-mess  .  
     |=([a=span b=cord ~] [/twit %twit-do !>([a %post eny b])])
   ,_`.
 ++  posh-twit-stat
-  (args-into-gate . |=({@ @ a/@da @} tang#~[leaf#"tweet received {<a>}"]))
+  (args-into-gate . |=({@ @ a/@da @} tang+~[leaf+"tweet received {<a>}"]))
 ++  pour  |*({ost/@ * sih/{@ ^}} :_(+>.$ [ost %give +.sih]~))
 -- 
diff --git a/gen/twit/twitter-feed.hoon b/gen/twit/twitter-feed.hoon
index f754652fa..f92f1f78a 100644
--- a/gen/twit/twitter-feed.hoon
+++ b/gen/twit/twitter-feed.hoon
@@ -1,6 +1,6 @@
 ::  Display twitter feed
 ::
-::::  /hook#core#twitter-feed#app
+::::  /hook+core+twitter-feed+app
   ::
 /+    sh-utils
 !:
@@ -11,12 +11,12 @@
 ++  stat  {id/@u who/@ta now/@da txt/@t}
 ++  rens
 :-  %say
-  |=(stat rose#[": " `~]^~[leaf#"{<now>} @{(trip who)}" leaf#(trip txt)])
+  |=(stat rose+[": " `~]^~[leaf+"{<now>} @{(trip who)}" leaf+(trip txt)])
 ++  peer  _`.
 ++  poke--args  
   |=  {ost/bone his/ship who/span $~}
-  %.(+< (add-subs [[our /twit] our /user#[who]] ,_`+>.$))
+  %.(+< (add-subs [[our /twit] our /user+[who]] ,_`+>.$))
 ::
 ++  posh-twit-feed 
-  (args-into-gate . |+(a=(list stat) tang#(turn a rens)))
+  (args-into-gate . |+(a=(list stat) tang+(turn a rens)))
 --
diff --git a/lib/down-jet.hoon b/lib/down-jet.hoon
index 8e2c79a20..2f5813a11 100644
--- a/lib/down-jet.hoon
+++ b/lib/down-jet.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#down-jet#lib
+::::  /hoon+down-jet+lib
   ::
 /-    markdown
 ::
diff --git a/lib/down-jet/parse.hoon b/lib/down-jet/parse.hoon
index 16081771f..b35e4db92 100644
--- a/lib/down-jet/parse.hoon
+++ b/lib/down-jet/parse.hoon
@@ -16,12 +16,12 @@
   =+  pax=/==5%%/html5-entities/json                    ::  XX  %%/
   =+  maf=%.(pax ;~(biff file (soft json) (om so):jo))
   ?^  maf  u.maf
-  ~&  no-enty#pax
-  (mo amp#'&' quot#'"' apos#'\'' lt#'<' gt#'>' ~)       ::  fallback
+  ~&  no-enty+pax
+  (mo amp+'&' quot+'"' apos+'\'' lt+'<' gt+'>' ~)       ::  fallback
 ::
 ++  skem-symb  (star ;~(pose dot alp))
 ++  skem-set  ~+  ^-  (set cord)                        ::  URI schemes
-  ::     (sa `wain`/http#https#javascript)
+  ::     (sa `wain`/http+https+javascript)
   =-  (sa `wain`(rash - (more gah (cook crip skem-symb))))
   '''
   coap doi javascript aaa aaas about acap cap cid crid data dav dict dns file
@@ -233,12 +233,12 @@
       ++  auto
         %+  ifix  gal^gar
         ;~  pose
-          (cook |=(a/tape [link#["mailto:{a}" ~] ~[`a]]) mail)
+          (cook |=(a/tape [link+["mailto:{a}" ~] ~[`a]]) mail)
         ::
           =+  cha=;~(pose htm-enty ;~(less (mask "<> ") prn))
           %+  cook
             |=  a/_["" ""]
-            [link#[(weld a) ~] ~[`(weld a)]]
+            [link+[(weld a) ~] ~[`(weld a)]]
           ;~(plug uri-skem col (star cha))
         ==
       ::
@@ -365,7 +365,7 @@
     ++  push                                            ::  continue with head
       |=  a/$@(char inline)
       ^-  nuft
-      ~?  ?@(a | bug)  fon#a
+      ~?  ?@(a | bug)  fon+a
       ?~  t  (veld a done)
       =:  noz  &
           i  i ::?+(i i fens p)
@@ -426,7 +426,7 @@
       =^  b  t  (flome tak)
       ?~  b
         (push (empa a))
-      ~?  >  bug  clot#[a i t]
+      ~?  >  bug  clot+[a i t]
       ?:  =(i u.b)
         (push (empa a))
       ?~  ins                                           ::  outermost
@@ -662,7 +662,7 @@
       =^  nol  nod
         [nod [%defn ~]]
       ?:  ?=($defn -.nol)  self
-      ~?  >  bug  clod#[nol tub]
+      ~?  >  bug  clod+[nol tub]
       ?~  cur  self(top [nol top])
       self(q.q.i.cur [nol q.q.i.cur])
     ::
@@ -754,7 +754,7 @@
     |=  a/(list (pair @ tops))  ^+  +>
     ?~  a  +>
     :: ?:  ?=([[@ *] ~] a)  +>
-    ~?  bug  yank#[i.a blos]
+    ~?  bug  yank+[i.a blos]
     ?>  (match q.i.a)
      :: ~&  [%no-match a cur]
      :: !!
@@ -787,7 +787,7 @@
           (. cur)
         [i.cur (. t.cur)]
     |=  a/_cur  ^+  a
-    ~?  >  bug  naro#[debu nil-li a cur]
+    ~?  >  bug  naro+[debu nil-li a cur]
     ?~  a  a
     ?:  ?=({{$item $~} $~} q.i.a)
       a
@@ -800,12 +800,12 @@
   ::
   ++  eat-line                                          ::  high-level line nom
     ^+  .  
-    ~?  >>  bug  line#curlin
+    ~?  >>  bug  line+curlin
      :: =>  [bup=bun sepa:eat]
      :: ?:  bun:+  +                                      ::  blank line nommed
      :: =<  .(bun |)
      :: =.  bun  bup
-    ~?  bug  line-stat#[debu cur]
+    ~?  bug  line-stat+[debu cur]
     ?:  ?=($html -.nod)
       =+  sep=(sepa:eat)
       ?:  bun.sep  sep
@@ -815,7 +815,7 @@
       code:eat
     =+  sep=(sepa:eat ruc)
     ?:  bun.sep
-      ~?  bug  nilli#[debu nil-li nod cur]:sep
+      ~?  bug  nilli+[debu nil-li nod cur]:sep
       =.  bun.sep
         ?^(ruc & ?^(cur | !nil-li:sep))       ::  XX  Chesterton fence
       sep
@@ -825,7 +825,7 @@
       news:eat 
       node:eat
       span:eat
-    ::  ~?  bug  seated#[nod blos]  .
+    ::  ~?  bug  seated+[nod blos]  .
     ==
   ::
   ++  curlin  (scab q.tub (star prn))
@@ -838,7 +838,7 @@
       =^  buf  tub  (snack ;~(sfix (star ace) nal))
       ?~  buf
         self(bun |)
-      ~?  bug  seat#cur
+      ~?  bug  seat+cur
       =.  self
         ?:  bun  
           delist
@@ -864,7 +864,7 @@
       ?:  =(~ q.tub)
         [~ halt]
       ?~  ruc  [ruc self]
-      ~?  bug  heat#[debu q.i.ruc cur]
+      ~?  bug  heat+[debu q.i.ruc cur]
       ?-    -.p.q.i.ruc
           $bloq
         =^  neu  tub  (snack blomar:donp)
@@ -875,7 +875,7 @@
         ?~  t.ruc  !! 
           :: $(t.ruc [p.i.ruc [%item ~] ~]~)               ::  XX  why this
         ?>  ?=($item -.p.q.i.t.ruc)
-        ~?  bug  leat#[p.i.t.ruc debu]
+        ~?  bug  leat+[p.i.t.ruc debu]
         =^  den  tub  (snack (stun [p p]:i.t.ruc ace))
         ?^  den  $(ruc t.t.ruc)
         ?.  =(self horz)  [ruc self]                    ::  XX  efficiency  
@@ -899,7 +899,7 @@
     ++  lazy                                            ::  errant prev bloqs
       |=  ruc/(list (pair @ tops))
       ^+  self
-      ~?  bug  laze#[debu ruc]
+      ~?  bug  laze+[debu ruc]
       ?.  ?=($para -.nod)
         (collapse (flop ruc))
       ?:  |([?=(^ -)]:lead [?=(^ -)]:(snack leaf:donp))     ::  XX  efficiency
@@ -931,7 +931,7 @@
     ::
     ++  node                                            ::  consume leaf node
       ^+  self
-      ~?  bug  neat#curlin  
+      ~?  bug  neat+curlin  
       ::=.  self  ?.(bun self cull)
       ?^  [q]:((leas htm-head):donp tub)                ::  XX  efficiency
         (pump [%html ~])  
@@ -944,7 +944,7 @@
       =+  saf=q.p.+:(snack (star ace))          ::  XX  efficiency
       =^  neu  tub  
         (snack ;~(pose hez ico leaf:donp))
-      ~?  bug  feat#[bun saf blos neu]
+      ~?  bug  feat+[bun saf blos neu]
       =.  cur  
         ?.(bun cur widen)
       ?~  neu
@@ -964,7 +964,7 @@
     ++  code
       ^+  self
       ?>  ?=({$code ^ *} nod)                          ::  XX  do type stuff
-      ~?  bug  ceas#[sap]
+      ~?  bug  ceas+[sap]
       =.  tub  (aces sap)
       =+  [neu tup]=(snack ;~(sfix (leas fcode):donp eol))
       ?:  &(?=(^ neu) (closes-code p.nod p.u.neu))
@@ -982,14 +982,14 @@
         (snack line:donp)
       ?~  lin 
         halt
-      ~?  bug  adva#u.lin
+      ~?  bug  adva+u.lin
       |-
       ?~  u.lin
         ?+  -.nod  cull
           $code  self
           $html  self(p.nod ['' p.nod])
         ==
-      ?+  -.nod  (pump para#~[`u.lin])
+      ?+  -.nod  (pump para+~[`u.lin])
         $para  self(p.nod :_(p.nod `u.lin))
         $head  ?^  q.nod  $(self cull)
                self(q.nod [`(dehax u.lin)]~)
diff --git a/lib/down-jet/rend.hoon b/lib/down-jet/rend.hoon
index 674a61242..628a57180 100644
--- a/lib/down-jet/rend.hoon
+++ b/lib/down-jet/rend.hoon
@@ -125,10 +125,10 @@
       $para  [/p (sung p.a)]
       $head  
         =+  [hed=(add %h0 (lsh 3 1 p.a)) kid=(sung q.a)]
-        [[hed id#(sanitize kid) ~] kid]
+        [[hed id+(sanitize kid) ~] kid]
     ::
       $hrul  ;hr;
-      $meta  =+  jon=`json`o#(~(run by p.a) |=(cord s#+<))
+      $meta  =+  jon=`json`o+(~(run by p.a) |=(cord s++<))
              ;meta(value "{(pojo jon)}", name "frontmatter", urb_front "");
   ::     %html  
              ::=+  tex=(role (turn p.a crip))
@@ -224,7 +224,7 @@
       =+  res=`manx`;img(src (urly p.p.b), alt (flat (turn q.b ..$)));
         :: ;img@"{p.p.b}";
       ?~  q.p.b  res
-      res(a.g (welp a.g.res title#u.q.p.b ~))
+      res(a.g (welp a.g.res title+u.q.p.b ~))
     =+  kid=(sung q.b)
     %+  into-inner  kid
     ?-  p.b
diff --git a/lib/drum.hoon b/lib/drum.hoon
index 381d166ef..61b0e2222 100644
--- a/lib/drum.hoon
+++ b/lib/drum.hoon
@@ -159,7 +159,7 @@
   ?.  ?|  =(our src)                                  ::  ourself
           &(=(%duke (clan our)) =(our (sein src)))    ::  or our own yacht
       ==                                              ::
-    ~|  [%drum-unauthorized our#our src#src]          ::  very simplistic
+    ~|  [%drum-unauthorized our+our src+src]          ::  very simplistic
     !!
   se-view:(se-text "[{<src>}, driving {<our>}]")
 ::
@@ -305,7 +305,7 @@
 ++  se-anon                                           ::  rotate index
   =+  wag=se-amor
   ?~  wag  +
-  ::  ~&  [%se-anon inx#inx wag#wag nex#(mod +(inx) (lent se-amor))]
+  ::  ~&  [%se-anon inx+inx wag+wag nex+(mod +(inx) (lent se-amor))]
   +(inx (mod +(inx) (lent se-amor)))
 ::
 ++  se-agon                                           ::  current gill
@@ -515,7 +515,7 @@
     ^+  ..ta
     ?.  liv  
       ?:   (~(has in (deft-fish our)) gyl)
-        (se-blit qit#~)
+        (se-blit qit+~)
       (se-nuke gyl)
     ..ta(fug (~(put by fug) gyl ``target`+<+))
   ::
diff --git a/lib/frontmatter.hoon b/lib/frontmatter.hoon
index bc59c8eb7..cdb4639b5 100644
--- a/lib/frontmatter.hoon
+++ b/lib/frontmatter.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#frontmatter#lib
+::::  /hoon+frontmatter+lib
   ::
 /?  314
 !:
@@ -28,7 +28,7 @@
   ?^  (rush i.t.wan (star ace))
     $(wan t.wan)
   =-  $(wan t.wan, atr (~(put by atr) (crip key) (crip val)))
-  ~|  malformed-attribute#i.t.wan
+  ~|  malformed-attribute+i.t.wan
   ^-  {key/tape ^ val/tape}
   +>:(atr-key 1^1 (trip i.t.wan))
 --
diff --git a/lib/helm.hoon b/lib/helm.hoon
index 79fdb80c0..ee203cae3 100644
--- a/lib/helm.hoon
+++ b/lib/helm.hoon
@@ -80,7 +80,7 @@
 ::
 ++  poke-init                                         ::  initialize
   |=  him/ship  =<  abet
-  (emit %flog /helm %crud %hax-init leaf#(scow %p him) ~)
+  (emit %flog /helm %crud %hax-init leaf+(scow %p him) ~)
 ::
 ++  poke-mass
   |=  $~  =<  abet
diff --git a/lib/http.hoon b/lib/http.hoon
index ab367014c..d4c582a00 100644
--- a/lib/http.hoon
+++ b/lib/http.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#http#lib
+::::  /hoon+http+lib
   ::
   ::
   ::
diff --git a/lib/kiln.hoon b/lib/kiln.hoon
index 88a295c4f..189917301 100644
--- a/lib/kiln.hoon
+++ b/lib/kiln.hoon
@@ -83,15 +83,15 @@
 ::
 ++  render
   |=  {mez/tape sud/desk who/ship syd/desk}
-  :^  %palm  [" " ~ ~ ~]  leaf#mez
-  ~[leaf#"from {<sud>}" leaf#"on {<who>}" leaf#"to {<syd>}"]
+  :^  %palm  [" " ~ ~ ~]  leaf+mez
+  ~[leaf+"from {<sud>}" leaf+"on {<who>}" leaf+"to {<syd>}"]
 ::
 ++  poke-mount
   |=  kiln-mount
   =+  bem=(tome pax)
   ?~  bem
     =+  "can't mount bad path: {<pax>}"
-    abet:(spam leaf#- ~)
+    abet:(spam leaf+- ~)
   abet:(emit %mont /mount pot p.u.bem q.u.bem (flop s.u.bem))
 ::
 ++  poke-unmount
@@ -100,7 +100,7 @@
     =+  bem=(tome mon)
     ?~  bem
       =+  "can't unmount bad path: {<mon>}"
-      abet:(spam leaf#- ~)
+      abet:(spam leaf+- ~)
     abet:(emit %ogre /unmount-beam [[p q %ud 0] s]:u.bem)
   abet:(emit %ogre /unmount-point mon)
 ::
@@ -128,14 +128,14 @@
 ::
 ++  do-info
   |=  {mez/tape tor/toro}
-  abet:(emit:(spam leaf#mez ~) %info /kiln our tor)
+  abet:(emit:(spam leaf+mez ~) %info /kiln our tor)
 ::
 ++  poke-rm  |=(a/path (do-info "removed" (fray a)))
 ++  poke-cp
   |=  {input/path output/path}
   %+  do-info  "copied"
   ?>  =(-:(flop input) -:(flop output))
-  (foal output -:(flop input) atom#%t .^(%cx input))    ::  XX type
+  (foal output -:(flop input) atom+%t .^(%cx input))    ::  XX type
 ::
 ++  poke-mv
   |=  {input/path output/path} 
@@ -161,7 +161,7 @@
   ?^  lod
     abet(autoload u.lod)
   =<  abet(autoload !autoload)
-  (spam leaf#"turning autoload o{?:(autoload "ff" "n")}" ~)
+  (spam leaf+"turning autoload o{?:(autoload "ff" "n")}" ~)
 ::
 ++  poke-start-autoload
   |=  $~
@@ -172,7 +172,7 @@
   |=  syd/term
   ^-  card
   :*  %warp  /kiln/autoload/[syd]  [our our]  %home  ~
-      %next  %y  da#now  /arvo/[syd]/hoon
+      %next  %y  da+now  /arvo/[syd]/hoon
   ==
 ::
 ++  poke-overload
@@ -226,7 +226,7 @@
   =.  +>.$
     %-  emit  :*
       %warp  /kiln/autoload/[syd]  [our our]  %home  ~
-      %next  %y  da#now  /arvo/[syd]/hoon
+      %next  %y  da+now  /arvo/[syd]/hoon
     ==
   abet
 ::
@@ -280,14 +280,14 @@
     |=  rot/riot
     ?~  rot
       %^    spam
-          leaf#"bad %writ response"
+          leaf+"bad %writ response"
         (render "on sync" sud her syd)
       ~
     =.  let  ?.  ?=($w p.p.u.rot)  let  ((hard @ud) q.q.r.u.rot)
     %-  blab  :_  ~
     :*  ost  %merg
         /kiln/sync/[syd]/(scot %p her)/[sud]
-        our  syd  her  sud  ud#let
+        our  syd  her  sud  ud+let
         ?:  =(0 .^(%cw /(scot %p our)/[syd]/(scot %da now)))
           %init
         %mate
@@ -302,16 +302,16 @@
         [(render "sync succeeded" sud her syd) ~]
       ?+  p.p.mes
         :*  (render "sync failed" sud her syd)
-            leaf#"please manually merge the desks with"
-            leaf#"|merge %{(trip syd)} {(scow %p her)} %{(trip sud)}"
-            leaf#""
-            leaf#"error code: {<p.p.mes>}"
+            leaf+"please manually merge the desks with"
+            leaf+"|merge %{(trip syd)} {(scow %p her)} %{(trip sud)}"
+            leaf+""
+            leaf+"error code: {<p.p.mes>}"
             q.p.mes
         ==
       ::
           $no-ali-desk
         :~  (render "sync activated" sud her syd)  
-            leaf#"note: blank desk {<sud>} on {<her>}"
+            leaf+"note: blank desk {<sud>} on {<her>}"
         ==
       ==
     %-  blab  :_  ~
@@ -403,12 +403,12 @@
   ++  coup-fancy
     |=  saw/(unit tang) 
     ?~  saw
-      =>  (spam leaf#"%melding %{(trip sud)} into scratch space" ~)
+      =>  (spam leaf+"%melding %{(trip sud)} into scratch space" ~)
       %-  blab  :_  ~
       [ost %merg /kiln/[syd] our (cat 3 syd '-scratch') her sud cas gem]
     =+  :-  "failed to set up conflict resolution scratch space"
         "I'm out of ideas"
-    lose:(spam leaf#-< leaf#-> u.saw)
+    lose:(spam leaf+-< leaf+-> u.saw)
   ::
   ++  mere
     |=  are/(each (set path) (pair term tang)) 
@@ -417,16 +417,16 @@
       ?:  ?=($& -.are)
         ?.  auto
           =+  "merged with strategy {<gem>}"
-          win:(spam leaf#- ?~(p.are ~ [>`(set path)`p.are< ~]))
+          win:(spam leaf+- ?~(p.are ~ [>`(set path)`p.are< ~]))
         :: ~?  >  =(~ p.are)  [%mere-no-conflict syd]
         =+  "mashing conflicts"
-        =>  .(+>.$ (spam leaf#- ~))
+        =>  .(+>.$ (spam leaf+- ~))
         =+  tic=(cat 3 syd '-scratch')
         %-  blab  :_  ~
         :*  ost  %exec  /kiln/[syd]
             our  ~  [our tic %da now]  %tabl
             ^-  (list (pair silk silk))
-            :: ~&  >  kiln-mashing#[p.are syd=syd +<.abet]
+            :: ~&  >  kiln-mashing+[p.are syd=syd +<.abet]
             %+  turn  (~(tap in p.are))
             |=  pax/path
             ^-  (pair silk silk)
@@ -442,50 +442,50 @@
             [%mash for [her sud dali] [our syd dbob]]
         ==
       =+  "failed to merge with strategy meld"
-      lose:(spam leaf#- >p.p.are< q.p.are)
+      lose:(spam leaf+- >p.p.are< q.p.are)
     ?:  ?=($& -.are)
       =+  "merged with strategy {<gem>}"
-      win:(spam leaf#- ?~(p.are ~ [>`(set path)`p.are< ~]))
+      win:(spam leaf+- ?~(p.are ~ [>`(set path)`p.are< ~]))
     ?.  auto
       =+  "failed to merge with strategy {<gem>}"
-      lose:(spam leaf#- >p.p.are< q.p.are)
+      lose:(spam leaf+- >p.p.are< q.p.are)
     ?+    gem
-      (spam leaf#"strange auto" >gem< ~)
+      (spam leaf+"strange auto" >gem< ~)
     ::
         $init
       =+  :-  "auto merge failed on strategy %init"
           "I'm out of ideas"
-      lose:(spam leaf#-< leaf#-> [>p.p.are< q.p.are])
+      lose:(spam leaf+-< leaf+-> [>p.p.are< q.p.are])
     ::
         $fine
       ?.  ?=($bad-fine-merge p.p.are)
         =+  "auto merge failed on strategy %fine"
-        lose:(spam leaf#- >p.p.are< q.p.are)
-      =>  (spam leaf#"%fine merge failed, trying %meet" ~)
+        lose:(spam leaf+- >p.p.are< q.p.are)
+      =>  (spam leaf+"%fine merge failed, trying %meet" ~)
       perform(gem %meet)
     ::
         $meet
       ?.  ?=($meet-conflict p.p.are)
         =+  "auto merge failed on strategy %meet"
-        lose:(spam leaf#- >p.p.are< q.p.are)
-      =>  (spam leaf#"%meet merge failed, trying %mate" ~)
+        lose:(spam leaf+- >p.p.are< q.p.are)
+      =>  (spam leaf+"%meet merge failed, trying %mate" ~)
       perform(gem %mate)
     ::
         $mate
       ?.  ?=($mate-conflict p.p.are)
         =+  "auto merge failed on strategy %mate"
-        lose:(spam leaf#- >p.p.are< q.p.are)
+        lose:(spam leaf+- >p.p.are< q.p.are)
       =>  .(gem %meld)
       =+  tic=(cat 3 syd '-scratch')
       =>  =+  :-  "%mate merge failed with conflicts,"
               "setting up scratch space at %{(trip tic)}"
-          [tic=tic (spam leaf#-< leaf#-> q.p.are)]
+          [tic=tic (spam leaf+-< leaf+-> q.p.are)]
       (fancy-merge tic our syd %init)
     ==
   ::
   ++  tape-to-tanks
     |=  a/tape  ^-  (list tank)
-    (scan a (more (just '\0a') (cook |=(a/tape leaf#a) (star prn))))
+    (scan a (more (just '\0a') (cook |=(a/tape leaf+a) (star prn))))
   ::
   ++  tanks-if-any
     |=  {a/tape b/(list path) c/tape}  ^-  (list tank)
@@ -497,7 +497,7 @@
     ^+  +>
     ?:  ?=($| -.reg)
       =+  "failed to mash"
-      lose:(spam leaf#- p.reg)
+      lose:(spam leaf+- p.reg)
     =+  ^-  can/(list (pair path (unit miso)))
         %+  turn  (gage-to-cages reg)
         |=  {pax/cage dif/cage}
@@ -506,7 +506,7 @@
           ~|  "strange path mark: {<p.pax>}"
           !!
         [((hard path) q.q.pax) ?:(?=($null p.dif) ~ `[%dif dif])]
-    :: ~&  >  kiln-made#[(turn can head) syd=syd +<.abet]
+    :: ~&  >  kiln-made+[(turn can head) syd=syd +<.abet]
     =+  notated=(skid can |=({path a/(unit miso)} ?=(^ a)))
     =+  annotated=(turn `(list (pair path *))`-.notated head)
     =+  unnotated=(turn `(list (pair path *))`+.notated head)
diff --git a/lib/oct1.hoon b/lib/oct1.hoon
index 24dff5d51..d52df9d46 100644
--- a/lib/oct1.hoon
+++ b/lib/oct1.hoon
@@ -1,5 +1,5 @@
 ::                                                      ::  ::
-::::  /hoon#oct1/lib                                    ::::::  dependencies  
+::::  /hoon+oct1/lib                                    ::::::  dependencies  
   ::                                                    ::  ::
 /?    310                                               ::  arvo version
 /-    oct1                                              ::  structures
@@ -38,6 +38,6 @@
   ++  row  |=  y/@  :-  (add y '1')  %-  zing           ::  print row
            (turn (gulf 0 3) |=(@ ~[' ' ~(v at y +<)]))  ::
   ++  tab  ~["+ 1 2 3" (row 0) (row 1) (row 2)]         ::  print table
-  ++  voy   ": {<~[(icon who)]>} (row#col): "           ::  print prompt
+  ++  voy   ": {<~[(icon who)]>} (row+col): "           ::  print prompt
   --
 --
diff --git a/lib/oct2.hoon b/lib/oct2.hoon
index b50389650..de39e05ee 100644
--- a/lib/oct2.hoon
+++ b/lib/oct2.hoon
@@ -1,5 +1,5 @@
 ::                                                      ::  ::
-::::  /hoon#oct2/lib                                    ::::::  dependencies
+::::  /hoon+oct2/lib                                    ::::::  dependencies
   ::                                                    ::  ::
 /?    310                                               ::  arvo version
 /-    oct2                                              ::  structures
@@ -32,7 +32,7 @@
           ++  y  .(box (~(set bo box) +<), p.sag `src)  ::  play at x
           --                                            ::
   ++  ept  =+(own |(&(=(~ -) !=(oth `src)) =(`src -)))  ::  we can play
-  ++  hey  |=(? +>+<+(aud ((stat ship) +< src aud)))    ::  enter#leave
+  ++  hey  |=(? +>+<+(aud ((stat ship) +< src aud)))    ::  enter+leave
   ++  muy  |=  (list ship)  ?~  +<  +>+<+               ::  many in audience
            $(+< t.+<, aud ((stat ship) & i.+< aud))     ::
   ++  nam  =+  ?:  =(p.sag `src)  ['=' (icon &) ~]      ::  print name
@@ -54,6 +54,6 @@
            ?~  dow  ~  =+  mor=$(dow t.dow)             ::
            :(weld nam(src p.i.dow) ?~(mor "" ", ") mor) ::
   ++  voy   =+  ~[(icon who)]  %+  weld  vew            ::  print prompt
-            ?.(ept " ({-}'s turn) " ": {-} (row#col): ")::
+            ?.(ept " ({-}'s turn) " ": {-} (row+col): ")::
   --
 --
diff --git a/lib/oct3.hoon b/lib/oct3.hoon
index 6f6b3f448..f3e3c1390 100644
--- a/lib/oct3.hoon
+++ b/lib/oct3.hoon
@@ -1,5 +1,5 @@
 ::                                                      ::  ::
-::::  /hoon#oct3/lib                                    ::::::  dependencies
+::::  /hoon+oct3/lib                                    ::::::  dependencies
   ::                                                    ::  ::
 /?    310                                               ::  arvo version
 /-    oct3                                              ::  structures
@@ -13,7 +13,7 @@
   |_  bud/board                                         ::
   ++  bit  |=(@ =(1 (cut 0 [+< 1] bud)))                ::  moved at address
   ++  get  |=(point (bit (off +<)))                     ::  get point
-  ++  jon  a#(turn (gulf 0 9) |=(@ b#(bit +<)))         ::  to json
+  ++  jon  a+(turn (gulf 0 9) |=(@ b+(bit +<)))         ::  to json
   ++  off  |=(point (add x (mul 3 y)))                  ::  bitfield address
   ++  set  |=(point (con bud (bex (off +<))))           ::  set point
   ++  win  %-  lien  :_  |=(a/@ =(a (dis a bud)))       ::  test for win
@@ -33,7 +33,7 @@
           ++  y  .(box (~(set bo box) +<), p.sag `src)  ::  play at x
           --                                            ::
   ++  ept  =+(own |(&(=(~ -) !=(oth `src)) =(`src -)))  ::  we can play
-  ++  hey  |=(? +>+<+(aud ((stat ship) +< src aud)))    ::  enter#leave
+  ++  hey  |=(? +>+<+(aud ((stat ship) +< src aud)))    ::  enter+leave
   ++  muy  |=  (list ship)  ?~  +<  +>+<+               ::  many in audience
            $(+< t.+<, aud ((stat ship) & i.+< aud))     ::
   ++  nam  =+  ?:  =(p.sag `src)  ['=' (icon &) ~]      ::  print name
@@ -55,6 +55,6 @@
            ?~  dow  ~  =+  mor=$(dow t.dow)             ::
            :(weld nam(src p.i.dow) ?~(mor "" ", ") mor) ::
   ++  voy   =+  ~[(icon who)]  %+  weld  vew            ::  print prompt
-            ?.(ept " ({-}'s turn) " ": {-} (row#col): ")::
+            ?.(ept " ({-}'s turn) " ": {-} (row+col): ")::
   --
 --
diff --git a/lib/oct4.hoon b/lib/oct4.hoon
index bfc789f65..20db78ff5 100644
--- a/lib/oct4.hoon
+++ b/lib/oct4.hoon
@@ -1,5 +1,5 @@
 ::                                                      ::  ::
-::::  /hoon#oct4/lib                               ::  ::  dependencies
+::::  /hoon+oct4/lib                               ::  ::  dependencies
   ::                                                    ::  ::
 /?    310                                               ::  arvo version
 /-    oct4                                             ::  structures
@@ -13,7 +13,7 @@
   |_  bud/board                                         ::
   ++  bit  |=(@ =(1 (cut 0 [+< 1] bud)))                ::  moved at address
   ++  get  |=(point (bit (off +<)))                     ::  get point
-  ++  jon  a#(turn (gulf 0 9) |=(@ b#(bit +<)))         ::  to json
+  ++  jon  a+(turn (gulf 0 9) |=(@ b+(bit +<)))         ::  to json
   ++  off  |=(point (add x (mul 3 y)))                  ::  bitfield address
   ++  set  |=(point (con bud (bex (off +<))))           ::  set point
   ++  win  %-  lien  :_  |=(a/@ =(a (dis a bud)))       ::  test for win
@@ -33,7 +33,7 @@
           ++  y  .(box (~(set bo box) +<), p.sag `src)  ::  play at x
           --                                            ::
   ++  ept  =+(own |(&(=(~ -) !=(oth `src)) =(`src -)))  ::  we can play
-  ++  hey  |=(? +>+<+(aud ((stat ship) +< src aud)))    ::  enter#leave
+  ++  hey  |=(? +>+<+(aud ((stat ship) +< src aud)))    ::  enter+leave
   ++  muy  |=  (list ship)  ?~  +<  +>+<+               ::  many in audience
            $(+< t.+<, aud ((stat ship) & i.+< aud))     ::
   ++  nam  =+  ?:  =(p.sag `src)  ['=' (icon &) ~]      ::  print name
@@ -55,6 +55,6 @@
            ?~  dow  ~  =+  mor=$(dow t.dow)             ::
            :(weld nam(src p.i.dow) ?~(mor "" ", ") mor) ::
   ++  voy   =+  ~[(icon who)]  %+  weld  vew            ::  print prompt
-            ?.(ept " ({-}'s turn) " ": {-} (row#col): ")::
+            ?.(ept " ({-}'s turn) " ": {-} (row+col): ")::
   --
 --
diff --git a/lib/react.hoon b/lib/react.hoon
index c840bc602..472c49bc2 100644
--- a/lib/react.hoon
+++ b/lib/react.hoon
@@ -68,9 +68,9 @@
       ==    ==
     ==
   %-  jobe  :~
-    c#a#(turn c.src ..$)
-    gn#s#(mane-to-cord n.g.src)
-    =<  ga#(jobe (turn a.g.src .))
+    c+a+(turn c.src ..$)
+    gn+s+(mane-to-cord n.g.src)
+    =<  ga+(jobe (turn a.g.src .))
     |=  {a/mane b/tape}  ^-  {cord json}
     :_  (jape b)
     ?^  a  (mane-to-cord a)
@@ -125,8 +125,8 @@
       =<  ~(ram re %rose [", " "[" "]"] (turn c.src .))
       |=  a/manx
       ?:  ?=(_:/(**) a)
-        leaf#(pojo (jape v.i.a.g.a))
-      leaf#^$(src a)
+        leaf+(pojo (jape v.i.a.g.a))
+      leaf+^$(src a)
     ")"
   ==
 --
diff --git a/lib/sole.hoon b/lib/sole.hoon
index 7298a418e..1f952e45b 100644
--- a/lib/sole.hoon
+++ b/lib/sole.hoon
@@ -1,5 +1,5 @@
 ::  
-::::  /hoon#sole#lib
+::::  /hoon+sole+lib
   ::  
 /?    310
 /-    sole
@@ -101,14 +101,14 @@
   |=  sole-change
   ^-  {sole-edit sole-share}
   ?.  &(=(his.ler his.ven) (lte own.ler own.ven))
-    ~&  [%receive-sync his#[his.ler his.ven] own#[own.ler own.ven]]
+    ~&  [%receive-sync his+[his.ler his.ven] own+[own.ler own.ven]]
     !!
   ?>  &(=(his.ler his.ven) (lte own.ler own.ven))
   ?>  |(!=(own.ler own.ven) =(0 haw) =(haw (sham buf)))
   =.  leg  (scag (sub own.ven own.ler) leg)
   ::  ~?  !=(own.ler own.ven)  [%miss-leg leg]
   =+  dat=(transmute [%mor leg] ted)
-  ::  ~?  !=(~ leg)  [%transmute from#ted to#dat ~]
+  ::  ~?  !=(~ leg)  [%transmute from+ted to+dat ~]
   [dat abet:(apply(his.ven +(his.ven)) dat)]
 ::
 ++  remit                                             ::  conditional accept
diff --git a/lib/talk.hoon b/lib/talk.hoon
index ea3cf5e86..39db1ba8e 100644
--- a/lib/talk.hoon
+++ b/lib/talk.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#talk#lib
+::::  /hoon+talk+lib
   ::  
   ::  This file is in the public domain.
   ::
diff --git a/lib/tree.hoon b/lib/tree.hoon
index ea99c81a0..d1f4e26c3 100644
--- a/lib/tree.hoon
+++ b/lib/tree.hoon
@@ -40,7 +40,7 @@
   |=  a/json  ^-  json
   =-  (fall `(unit json)`- ~)
   %.  a
-  %+  find-in-tree  (ot c#(ar some) gn#so ga#(om so) ~):jo
+  %+  find-in-tree  (ot c+(ar some) gn+so ga+(om so) ~):jo
   |=  {nom/span atr/(map span cord)}  ^-  (unit json)
   ?.  (~(has by atr) 'urb:front')  ~
   ?>  ?=($meta nom)
diff --git a/lib/twitter.hoon b/lib/twitter.hoon
index 07f36d3b5..ac1ececd4 100644
--- a/lib/twitter.hoon
+++ b/lib/twitter.hoon
@@ -1,6 +1,6 @@
 ::    A Twitter API library.
 ::
-::::  /hoon#twitter#lib
+::::  /hoon+twitter+lib
   ::
 /?    314
 /-   twitter
@@ -76,7 +76,7 @@
           eny/@
       ==
   ^-  hiss
-  =+  url="https://api.twitter.com#1.1{rus}.json"
+  =+  url="https://api.twitter.com+1.1{rus}.json"
   =+  req=|=(a/tape (scan a auri:epur))
   =+  ^=  help
       |=  quy/(list {tape tape})
@@ -94,7 +94,7 @@
   =+  ^=  head
       %-  ~(gas by *math)
       :~  ['authorization' [(oauth med url hab key est eny) ~]]
-          ['content-type' ['application#x-www-form-urlencoded' ~]]
+          ['content-type' ['application+x-www-form-urlencoded' ~]]
       ==
   ?:  =(%get med)
     ?~  voy
@@ -110,27 +110,27 @@
   |%
   ++  mean
     |=  {msg/@t num/@ud}  ^-  tank
-    rose#[": " `~]^~[leaf#"Error {<num>}" leaf#(trip msg)]
+    rose+[": " `~]^~[leaf+"Error {<num>}" leaf+(trip msg)]
   --
 ++  twir                                                ::  response parsers
   |%
   ++  fasp  |*({a/@tas b/*} [(gsub '-' '_' a) b])
   ++  user  (cook crip (plus ;~(pose aln cab)))
-  ++  mean  (ot errors#(ar (ot message#so code#ni ~)) ~):jo
+  ++  mean  (ot errors+(ar (ot message+so code+ni ~)) ~):jo
   ++  stat
     =+  jo
     ^-  $+(json (unit {id/@u who/@ta now/@da txt/@t}))
     %-  ot
-    :~  id#ni
-        user#(ot (fasp screen-name#(su user)) ~)
-        (fasp created-at#da)
-        text#so
+    :~  id+ni
+        user+(ot (fasp screen-name+(su user)) ~)
+        (fasp created-at+da)
+        text+so
     ==
   ++  usel
     =+  jo
     ^-  $+(json (unit (list who/@ta)))
-    =-  (ot users#(ar -) ~)
-    (ot (fasp screen-name#(su user)) ~)
+    =-  (ot users+(ar -) ~)
+    (ot (fasp screen-name+(su user)) ~)
   --
 ++  twit
   =>  |%                                                ::  request structures
@@ -227,52 +227,52 @@
     ==
   ::
   ++  stat-ment  
-    (mold %get /statuses#mentions-timeline $~)
+    (mold %get /statuses+mentions-timeline $~)
   ::
   ++  stat-user  
-    (mold %get /statuses#user-timeline {sd $~})
+    (mold %get /statuses+user-timeline {sd $~})
   ::
   ++  stat-home  
-    (mold %get /statuses#home-timeline $~)
+    (mold %get /statuses+home-timeline $~)
   ::
   ++  stat-retw  
-    (mold %get /statuses#retweets-of-me $~)
+    (mold %get /statuses+retweets-of-me $~)
   ::
   ++  stat-rets-iddd  
-    (mold %get /statuses#retweets {ii $~})
+    (mold %get /statuses+retweets {ii $~})
   ::
   ++  stat-show  
-    (mold %get /statuses#show {id $~})
+    (mold %get /statuses+show {id $~})
   ::
   ++  stat-dest-iddd  
-    (mold %post /statuses#destroy {ii $~})
+    (mold %post /statuses+destroy {ii $~})
   ::
   ++  stat-upda  
-    (mold %post /statuses#update {st $~})
+    (mold %post /statuses+update {st $~})
   ::
   ++  stat-retw-iddd  
-    (mold %post /statuses#retweet {ii $~})
+    (mold %post /statuses+retweet {ii $~})
   ::
   ++  stat-oemb-iddd  
-    (mold %get /statuses#oembed {id $~})
+    (mold %get /statuses+oembed {id $~})
   ::
   ++  stat-oemb-urll  
-    (mold %get /statuses#oembed {ur $~})
+    (mold %get /statuses+oembed {ur $~})
   ::
   ++  stat-retw-idss  
-    (mold %get /statuses#retweeters#ids {id $~})
+    (mold %get /statuses+retweeters+ids {id $~})
   ::
   ++  sear-twee  
-    (mold %get /search#tweets {qq $~})
+    (mold %get /search+tweets {qq $~})
   ::
   ++  stat-filt-foll  
-    (mold %post /statuses#filter {?(fo tr) $~})
+    (mold %post /statuses+filter {?(fo tr) $~})
   ::
   ++  stat-samp  
-    (mold %get /statuses#sample $~)
+    (mold %get /statuses+sample $~)
   ::
   ++  stat-fire  
-    (mold %get /statuses#firehose $~)
+    (mold %get /statuses+firehose $~)
   ::
   ++  user  
     (mold %get /user $~)
@@ -284,238 +284,238 @@
     (mold %get /direct-messages $~)
   ::
   ++  dire-sent  
-    (mold %get /direct-messages#sent $~)
+    (mold %get /direct-messages+sent $~)
   ::
   ++  dire-show  
-    (mold %get /direct-messages#show {id $~})
+    (mold %get /direct-messages+show {id $~})
   ::
   ++  dire-dest  
-    (mold %post /direct-messages#destroy {id $~})
+    (mold %post /direct-messages+destroy {id $~})
   ::
   ++  dire-neww  
-    (mold %post /direct-messages#new {sd te $~})
+    (mold %post /direct-messages+new {sd te $~})
   ::
   ++  frie-nore-idss  
-    (mold %get /friendships#no-retweets#ids $~)
+    (mold %get /friendships+no-retweets+ids $~)
   ::
   ++  frie-idss  
-    (mold %get /friends#ids {sd $~})
+    (mold %get /friends+ids {sd $~})
   ::
   ++  foll-idss  
-    (mold %get /followers#ids {sd $~})
+    (mold %get /followers+ids {sd $~})
   ::
   ++  frie-inco  
-    (mold %get /friendships#incoming $~)
+    (mold %get /friendships+incoming $~)
   ::
   ++  frie-outg  
-    (mold %get /friendships#outgoing $~)
+    (mold %get /friendships+outgoing $~)
   ::
   ++  frie-crea  
-    (mold %post /friendships#create {sd $~})
+    (mold %post /friendships+create {sd $~})
   ::
   ++  frie-dest  
-    (mold %post /friendships#destroy {sd $~})
+    (mold %post /friendships+destroy {sd $~})
   ::
   ++  frie-upda  
-    (mold %post /friendships#update {sd $~})
+    (mold %post /friendships+update {sd $~})
   ::
   ++  frie-show  
-    (mold %get /friendships#show {?(si os) ?(ti ts) $~})
+    (mold %get /friendships+show {?(si os) ?(ti ts) $~})
   ::
   ++  frie-list  
-    (mold %get /friends#list {sd $~})
+    (mold %get /friends+list {sd $~})
   ::
   ++  foll-list  
-    (mold %get /followers#list {sd $~})
+    (mold %get /followers+list {sd $~})
   ::
   ++  frie-look  
-    (mold %get /friendships#lookup {?(us ss) $~})
+    (mold %get /friendships+lookup {?(us ss) $~})
   ::
   ++  acco-sett-gett  
-    (mold %get /account#settings $~)
+    (mold %get /account+settings $~)
   ::
   ++  acco-veri  
-    (mold %get /account#verify-credentials $~)
+    (mold %get /account+verify-credentials $~)
   ::
   ++  acco-sett-post  
-    (mold %post /account#settings $~)
+    (mold %post /account+settings $~)
   ::
   ++  acco-upda-deli  
-    (mold %post /account#update-delivery-device {de $~})
+    (mold %post /account+update-delivery-device {de $~})
   ::
   ++  acco-upda-prof  
-    (mold %post /account#update-profile $~)
+    (mold %post /account+update-profile $~)
   ::
   ++  acco-upda-prof-back  
-    (mold %post /account#update-profile-background-image $~)
+    (mold %post /account+update-profile-background-image $~)
   ::
   ++  acco-upda-prof-colo  
-    (mold %post /account#update-profile-colors $~)
+    (mold %post /account+update-profile-colors $~)
   ::
   ++  bloc-list  
-    (mold %get /blocks#list $~)
+    (mold %get /blocks+list $~)
   ::
   ++  bloc-idss  
-    (mold %get /blocks#ids $~)
+    (mold %get /blocks+ids $~)
   ::
   ++  bloc-crea  
-    (mold %post /blocks#create {sd $~})
+    (mold %post /blocks+create {sd $~})
   ::
   ++  bloc-dest  
-    (mold %post /blocks#destroy {sd $~})
+    (mold %post /blocks+destroy {sd $~})
   ::
   ++  user-look  
-    (mold %get /users#lookup {?(us ss) $~})
+    (mold %get /users+lookup {?(us ss) $~})
   ::
   ++  user-show  
-    (mold %get /users#show {sd $~})
+    (mold %get /users+show {sd $~})
   ::
   ++  user-sear  
-    (mold %get /users#search {qq $~})
+    (mold %get /users+search {qq $~})
   ::
   ++  user-cont-tees  
-    (mold %get /users#contributees {sd $~})
+    (mold %get /users+contributees {sd $~})
   ::
   ++  user-cont-tors  
-    (mold %get /users#contributors {sd $~})
+    (mold %get /users+contributors {sd $~})
   ::
   ++  acco-remo  
-    (mold %post /account#remove-profile-banner $~)
+    (mold %post /account+remove-profile-banner $~)
   ::
   ++  user-prof  
-    (mold %get /users#profile-banner {sd $~})
+    (mold %get /users+profile-banner {sd $~})
   ::
   ++  mute-user-crea  
-    (mold %post /mutes#users#create {sd $~})
+    (mold %post /mutes+users+create {sd $~})
   ::
   ++  mute-user-dest  
-    (mold %post /mutes#users#destroy {sd $~})
+    (mold %post /mutes+users+destroy {sd $~})
   ::
   ++  mute-user-idss  
-    (mold %get /mutes#users#ids $~)
+    (mold %get /mutes+users+ids $~)
   ::
   ++  mute-user-list  
-    (mold %get /mutes#users#list $~)
+    (mold %get /mutes+users+list $~)
   ::
   ++  user-sugg-slug  
-    (mold %get /users#suggestions {sl $~})
+    (mold %get /users+suggestions {sl $~})
   ::
   ++  user-sugg  
-    (mold %get /users#suggestions $~)
+    (mold %get /users+suggestions $~)
   ::
   ++  favo-list  
-    (mold %get /favorites#list $~)
+    (mold %get /favorites+list $~)
   ::
   ++  favo-dest  
-    (mold %post /favorites#destroy {id $~})
+    (mold %post /favorites+destroy {id $~})
   ::
   ++  favo-crea  
-    (mold %post /favorites#create {id $~})
+    (mold %post /favorites+create {id $~})
   ::
   ++  list-list  
-    (mold %get /lists#list $~)
+    (mold %get /lists+list $~)
   ::
   ++  list-stat  
-    (mold %get /lists#statuses $~)
+    (mold %get /lists+statuses $~)
   ::
   ++  list-memb-dest  
-    (mold %post /lists#members#destroy $~)
+    (mold %post /lists+members+destroy $~)
   ::
   ++  list-memb-hips  
-    (mold %get /lists#memberships {sd $~})
+    (mold %get /lists+memberships {sd $~})
   ::
   ++  list-subs-bers  
-    (mold %get /lists#subscribers $~)
+    (mold %get /lists+subscribers $~)
   ::
   ++  list-subs-crea  
-    (mold %post /lists#subscribers#create $~)
+    (mold %post /lists+subscribers+create $~)
   ::
   ++  list-subs-show  
-    (mold %get /lists#subscribers#show {sd $~})
+    (mold %get /lists+subscribers+show {sd $~})
   ::
   ++  list-subs-dest  
-    (mold %post /lists#subscribers#destroy $~)
+    (mold %post /lists+subscribers+destroy $~)
   ::
   ++  list-memb-crea-alll  
-    (mold %post /lists#members#create-all {?(us ss) $~})
+    (mold %post /lists+members+create-all {?(us ss) $~})
   ::
   ++  list-memb-show  
-    (mold %get /lists#members#show {sd $~})
+    (mold %get /lists+members+show {sd $~})
   ::
   ++  list-memb-bers  
-    (mold %get /lists#members $~)
+    (mold %get /lists+members $~)
   ::
   ++  list-memb-crea  
-    (mold %post /lists#members#create {sd $~})
+    (mold %post /lists+members+create {sd $~})
   ::
   ++  list-dest  
-    (mold %post /lists#destroy $~)
+    (mold %post /lists+destroy $~)
   ::
   ++  list-upda  
-    (mold %post /lists#update $~)
+    (mold %post /lists+update $~)
   ::
   ++  list-crea  
-    (mold %post /lists#create {na $~})
+    (mold %post /lists+create {na $~})
   ::
   ++  list-show  
-    (mold %get /lists#show $~)
+    (mold %get /lists+show $~)
   ::
   ++  list-subs-ions  
-    (mold %get /lists#subscriptions {sd $~})
+    (mold %get /lists+subscriptions {sd $~})
   ::
   ++  list-memb-dest-alll  
-    (mold %post /lists#members#destroy-all {?(us ss) $~})
+    (mold %post /lists+members+destroy-all {?(us ss) $~})
   ::
   ++  list-owne  
-    (mold %get /lists#ownerships {sd $~})
+    (mold %get /lists+ownerships {sd $~})
   ::
   ++  save-list  
-    (mold %get /saved-searches#list $~)
+    (mold %get /saved-searches+list $~)
   ::
   ++  save-show-iddd  
-    (mold %get /saved-searches#show {ii $~})
+    (mold %get /saved-searches+show {ii $~})
   ::
   ++  save-crea  
-    (mold %post /saved-searches#create {qq $~})
+    (mold %post /saved-searches+create {qq $~})
   ::
   ++  save-dest-iddd  
-    (mold %post /saved-searches#destroy {ii $~})
+    (mold %post /saved-searches+destroy {ii $~})
   ::
   ++  geoo-iddd-plac  
-    (mold %get /geo#id {ii $~})
+    (mold %get /geo+id {ii $~})
   ::
   ++  geoo-reve  
-    (mold %get /geo#reverse-geocode {la lo $~})
+    (mold %get /geo+reverse-geocode {la lo $~})
   ::
   ++  geoo-sear  
-    (mold %get /geo#search $~)
+    (mold %get /geo+search $~)
   ::
   ++  geoo-simi  
-    (mold %get /geo#similar-places {la lo na $~})
+    (mold %get /geo+similar-places {la lo na $~})
   ::
   ++  tren-plac  
-    (mold %get /trends#place {id $~})
+    (mold %get /trends+place {id $~})
   ::
   ++  tren-avai  
-    (mold %get /trends#available $~)
+    (mold %get /trends+available $~)
   ::
   ++  tren-clos  
-    (mold %get /trends#closest {la lo $~})
+    (mold %get /trends+closest {la lo $~})
   ::
   ++  user-repo  
-    (mold %post /users#report-spam {sd $~})
+    (mold %post /users+report-spam {sd $~})
   ::
   ++  oaut-auth-cate  
-    (mold %get /oauth#authenticate $~)
+    (mold %get /oauth+authenticate $~)
   ::
   ++  oaut-auth-rize  
-    (mold %get /oauth#authorize $~)
+    (mold %get /oauth+authorize $~)
   ::
   ++  oaut-acce  
-    (mold %post /oauth#access-token $~)
+    (mold %post /oauth+access-token $~)
   ::
   ++  oaut-requ  
-    (mold %post /oauth#request-token {oa $~})
+    (mold %post /oauth+request-token {oa $~})
   ::
   ++  oaut-toke  
     (mold %post /oauth2/token {gr $~})
@@ -524,21 +524,21 @@
     (mold %post /oauth2/invalidate-token {at $~})
   ::
   ++  help-conf  
-    (mold %get /help#configuration $~)
+    (mold %get /help+configuration $~)
   ::
   ++  help-lang  
-    (mold %get /help#languages $~)
+    (mold %get /help+languages $~)
   ::
   ++  help-priv  
-    (mold %get /help#privacy $~)
+    (mold %get /help+privacy $~)
   ::
   ++  help-toss  
-    (mold %get /help#tos $~)
+    (mold %get /help+tos $~)
   ::
   ++  appl-rate  
-    (mold %get /application#rate-limit-status $~)
+    (mold %get /application+rate-limit-status $~)
   ::
   ++  stat-look  
-    (mold %get /statuses#lookup {us $~})
+    (mold %get /statuses+lookup {us $~})
   --
 --
diff --git a/mar/acto-game.hoon b/mar/acto-game.hoon
index 30bc4eb19..15565aabc 100644
--- a/mar/acto-game.hoon
+++ b/mar/acto-game.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#octo-game#mar
+::::  /hoon+octo-game+mar
   ::
 /?    310
 !:
diff --git a/mar/ask-mail.hoon b/mar/ask-mail.hoon
index 6450f754c..2078454b6 100644
--- a/mar/ask-mail.hoon
+++ b/mar/ask-mail.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#ask-mail#mar
+::::  /hoon+ask-mail+mar
   ::
 /?  314
 |_  txt/cord
@@ -12,6 +12,6 @@
 ++  grow
   |%
   ++  psal  ;div: {(trip txt)}
-  ++  mime  [text#/plain (taco txt)]
+  ++  mime  [text+/plain (taco txt)]
   --
 --
diff --git a/mar/bit/accounts.hoon b/mar/bit/accounts.hoon
index 22f746c2a..4e1cc46db 100644
--- a/mar/bit/accounts.hoon
+++ b/mar/bit/accounts.hoon
@@ -1,6 +1,6 @@
 ::    this mark is used to receive a confirmed transaction
 ::
-::::  /hoon#bit-accounts#mar
+::::  /hoon+bit-accounts+mar
   ::
 /?    310
 /-    bit-api
@@ -15,7 +15,7 @@
             ~|  jon
             %-  need  %.  jon
             =>  jo
-            =+  bal=(ot amount#so currency#(cu cass sa) ~)
-            (ot accounts#(ar (ot id#so name#so balance#bal ~)) ~)
+            =+  bal=(ot amount+so currency+(cu cass sa) ~)
+            (ot accounts+(ar (ot id+so name+so balance+bal ~)) ~)
   --
 --
diff --git a/mar/bit/api-call.hoon b/mar/bit/api-call.hoon
index cee2bd76f..626d86c9d 100644
--- a/mar/bit/api-call.hoon
+++ b/mar/bit/api-call.hoon
@@ -8,11 +8,11 @@
 ::
 ++  wrap
   |=  {end-point/path req/$@($get {$post p/json})}
-  [/com/coinbase/sandbox/api v1#end-point req ~ ['access_token' access-token]~]
+  [/com/coinbase/sandbox/api v1+end-point req ~ ['access_token' access-token]~]
 ::
 ++  order
   |=  {amount/@t currency/@t}  ^-  json
-  (jobe qty#s#amount ?~(currency ~ [currency#s#currency ~]))
+  (jobe qty+s+amount ?~(currency ~ [currency+s+currency ~]))
 ++  grow  
   |%  ++  httpreq
     %-  wrap
@@ -24,7 +24,7 @@
       $send  $(req [%txt-send (rsh 3 2 (scot %uc adr.req)) btc.req])
       $txt-send
         :+  /transactions/'send_money'  %post
-        (joba %transaction (jobe to#s#to.req amount#s#btc.req ~))
+        (joba %transaction (jobe to+s+to.req amount+s+btc.req ~))
       
     ==
   --
diff --git a/mar/bit/transaction.hoon b/mar/bit/transaction.hoon
index 98b3ccaf5..a89bcfd49 100644
--- a/mar/bit/transaction.hoon
+++ b/mar/bit/transaction.hoon
@@ -1,6 +1,6 @@
 ::    this mark is used to receive a confirmed transaction
 ::
-::::  /hoon#bit-transaction#mar
+::::  /hoon+bit-transaction+mar
   ::
 /?  310
 !:
@@ -11,7 +11,7 @@
   ++  noun  @t                   ::  clam from noun
   ++  json  |=  jon/^json
             ~|  jon
-            (need ((ot transaction#(ot id#so ~) ~):jo jon))
+            (need ((ot transaction+(ot id+so ~) ~):jo jon))
   --
 --
 
diff --git a/mar/client-secret.hoon b/mar/client-secret.hoon
index b17764aa6..12ecf1c4c 100644
--- a/mar/client-secret.hoon
+++ b/mar/client-secret.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#client-secret#mar
+::::  /hoon+client-secret+mar
   ::
 /?  314 
 |_  txt/cord
diff --git a/mar/cloud/auth.hoon b/mar/cloud/auth.hoon
index 08873ad0b..0225b374e 100644
--- a/mar/cloud/auth.hoon
+++ b/mar/cloud/auth.hoon
@@ -1,6 +1,6 @@
 ::    this mark is used to receive incoming oauth2 tokens that we use to poke our %gall server
 ::
-::::  /hook#door#do-auth#mar
+::::  /hook+door+do-auth+mar
   ::
 /?  310
 !:
@@ -9,7 +9,7 @@
 ++  grab                          ::  converter arm
   |%
   ++  noun  @t                    ::  clam from noun
-  ++  json  (cork (ot authcode#so platform#so ~):jo need)     ::  (need (so:jo jon))
+  ++  json  (cork (ot authcode+so platform+so ~):jo need)     ::  (need (so:jo jon))
   --
 --
 
diff --git a/mar/cloud/secret.hoon b/mar/cloud/secret.hoon
index 847835048..c504d6eac 100644
--- a/mar/cloud/secret.hoon
+++ b/mar/cloud/secret.hoon
@@ -4,6 +4,6 @@
 ++  grab                          ::  converter am
   |%
   ++  noun  @t                    ::  clam from noun
-  ++  json  (cork (ot secret#so platform#so ~):jo need)
+  ++  json  (cork (ot secret+so platform+so ~):jo need)
   --
 --
diff --git a/mar/dill/belt.hoon b/mar/dill/belt.hoon
index 970e6eaea..df2afe8a4 100644
--- a/mar/dill/belt.hoon
+++ b/mar/dill/belt.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#dill-belt#mar
+::::  /hoon+dill-belt+mar
   ::
 /?    314
 /-    kyev, sole
@@ -16,17 +16,17 @@
     |=  jon/^json  ^-  ^kyev
     %-  need
     %.  jon  =>  jo  %-  ot
-    :~  mod#(cu ^sa (ar (su (perk ~[%ctrl %shift %alt %meta]))))
+    :~  mod+(cu ^sa (ar (su (perk ~[%ctrl %shift %alt %meta]))))
         :-  %key
         %+  cu  |*(a/$%({$str @t} {$act @}) ?+(-.a a $str +.a))
-        =-  (of str#so act#(su (perk -)) ~)
+        =-  (of str+so act+(su (perk -)) ~)
         :~  %ctrl  %shift  %alt   %meta   %entr  %esc  %caps  %uncap
             %pgup  %pgdn   %home  %end    %baxp  %del  %ins
             %up    %down   %left  %right
     ==  ==
   ++  kyev
     |=  kev/^kyev  ^-  dill-belt
-    ~|  dill-belt-incomplete#kev
+    ~|  dill-belt-incomplete+kev
     ?:  ?=({$act ?($ctrl $shift $alt $meta)} q.kev)
       [%txt ~]                        ::  ignore
     =+  mod=(~(del in p.kev) %shift)
diff --git a/mar/dill/blit.hoon b/mar/dill/blit.hoon
index 8ee764b54..f8ef3dba6 100644
--- a/mar/dill/blit.hoon
+++ b/mar/dill/blit.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#dill-blit#mar
+::::  /hoon+dill-blit+mar
   ::
 /?    314
 /-    sole
@@ -14,7 +14,7 @@
   |%
   ++  json
     ^-  ^json
-    ?+  -.dib  ~|(unsupported-blit#-.dib !!)
+    ?+  -.dib  ~|(unsupported-blit+-.dib !!)
       $mor  [%a (turn p.dib |=(a/dill-blit json(dib a)))]
       $hop  (joba %hop (jone p.dib))
       ?($pro $out)  (joba -.dib (jape (tufa p.dib)))
diff --git a/mar/down.hoon b/mar/down.hoon
index 8cd41e23b..9f0e21805 100644
--- a/mar/down.hoon
+++ b/mar/down.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#down#mar
+::::  /hoon+down+mar
   ::
 /?    314
 /-    markdown
diff --git a/mar/helm-hi.hoon b/mar/helm-hi.hoon
index 3ccff1450..c3fa247e9 100644
--- a/mar/helm-hi.hoon
+++ b/mar/helm-hi.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#helm-hi#mar
+::::  /hoon+helm-hi+mar
   ::
 /?  314
 |_  txt/cord
@@ -12,6 +12,6 @@
 ++  grow
   |%
   ++  psal  ;div: {(trip txt)}
-  ++  mime  [text#/plain (taco txt)]
+  ++  mime  [text+/plain (taco txt)]
   --
 --
diff --git a/mar/hiss.hoon b/mar/hiss.hoon
index 20045f0e4..ff7c57884 100644
--- a/mar/hiss.hoon
+++ b/mar/hiss.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#hiss#mar
+::::  /hoon+hiss+mar
   ::
 /?    314
 /+    http
diff --git a/mar/httpreq.hoon b/mar/httpreq.hoon
index bab4668fb..3faafde93 100644
--- a/mar/httpreq.hoon
+++ b/mar/httpreq.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#core#httpreq#pro
+::::  /hoon+core+httpreq+pro
   ::
 /?    314
 /+    http
diff --git a/mar/httr.hoon b/mar/httr.hoon
index 89acd0f39..1b6bbb73b 100644
--- a/mar/httr.hoon
+++ b/mar/httr.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#httr#mar
+::::  /hoon+httr+mar
   ::
 /?  314
 !:
diff --git a/mar/index.hoon b/mar/index.hoon
index af1f9986b..cc4067667 100644
--- a/mar/index.hoon
+++ b/mar/index.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#core#elem#mar
+::::  /hoon+core+elem+mar
   ::
 /?    314
 /+    tree,react
diff --git a/mar/load.hoon b/mar/load.hoon
index 85f365141..4afe3f3ca 100644
--- a/mar/load.hoon
+++ b/mar/load.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#core#load#mar
+::::  /hoon+core+load+mar
   ::
 !:
 |_  man/span
diff --git a/mar/log.hoon b/mar/log.hoon
index 1cb35248e..37929f321 100644
--- a/mar/log.hoon
+++ b/mar/log.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#core#log#mar
+::::  /hoon+core+log+mar
   ::
 !:
 |_  man/span
diff --git a/mar/mess.hoon b/mar/mess.hoon
index 4803c2c44..a689259f2 100644
--- a/mar/mess.hoon
+++ b/mar/mess.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#core#mess#mar
+::::  /hoon+core+mess+mar
   ::
 /?  314
 /-  mess
diff --git a/mar/oauth-tokens.hoon b/mar/oauth-tokens.hoon
index efccc9ed4..0bf4c2f8f 100644
--- a/mar/oauth-tokens.hoon
+++ b/mar/oauth-tokens.hoon
@@ -1,6 +1,6 @@
-::    this mark is used to receive incoming oauth2 refresh#access tokens
+::    this mark is used to receive incoming oauth2 refresh+access tokens
 ::
-::::  /hoon#oauth-tokens#mar
+::::  /hoon+oauth-tokens+mar
   ::
 /?  310
 !:
diff --git a/mar/oauth2-code.hoon b/mar/oauth2-code.hoon
index 862caaf49..771352767 100644
--- a/mar/oauth2-code.hoon
+++ b/mar/oauth2-code.hoon
@@ -1,6 +1,6 @@
 ::    this mark is used to receive incoming oauth2 tokens that we use to poke our %gall server
 ::
-::::  /hoon#oauth2-code#mar
+::::  /hoon+oauth2-code+mar
   ::
 /?  310
 !:
diff --git a/mar/oct3/move.hoon b/mar/oct3/move.hoon
index 680e92351..1bef44e24 100644
--- a/mar/oct3/move.hoon
+++ b/mar/oct3/move.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#oct3-move#mar
+::::  /hoon+oct3-move+mar
   ::
 /?    314
 !:
diff --git a/mar/oct3/update.hoon b/mar/oct3/update.hoon
index 70d32a934..9b89f1c1f 100644
--- a/mar/oct3/update.hoon
+++ b/mar/oct3/update.hoon
@@ -1,5 +1,5 @@
 ::                                                      ::  ::
-::::  /hoon#oct3-update#mar                        ::::::  dependencies
+::::  /hoon+oct3-update+mar                        ::::::  dependencies
   ::                                                    ::  ::
 /?    310                                               ::  arvo
 /-    oct3                                             ::  structures
@@ -20,16 +20,16 @@
     ?:  ?=({$|} +>-<)
       ~!  +>-<
       ~!  p
-      s#(crip p)
-    =+  she=|=(ship s#(scot %p +<))
+      s+(crip p)
+    =+  she=|=(ship s+(scot %p +<))
     =+  hes=|=({ship *} (she +<-))
     %-  jobe
-    :~  who#s#?:(who.p %x %o) 
-        plx#?~(p.sag.p ~ (she u.p.sag.p))
-        plo#?~(q.sag.p ~ (she u.q.sag.p))
-        aud#a#(turn (~(tap by aud.p)) hes)
-        box#~(jon bo box.p)
-        boo#~(jon bo boo.p)
+    :~  who+s+?:(who.p %x %o) 
+        plx+?~(p.sag.p ~ (she u.p.sag.p))
+        plo+?~(q.sag.p ~ (she u.q.sag.p))
+        aud+a+(turn (~(tap by aud.p)) hes)
+        box+~(jon bo box.p)
+        boo+~(jon bo boo.p)
     ==
   --
 --
diff --git a/mar/oct4/move.hoon b/mar/oct4/move.hoon
index dfda45452..61f6b8b3a 100644
--- a/mar/oct4/move.hoon
+++ b/mar/oct4/move.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#oct4-move#mar
+::::  /hoon+oct4-move+mar
   ::
 /?    314
 !:
diff --git a/mar/oct4/update.hoon b/mar/oct4/update.hoon
index 9a3d57f59..e593c58f9 100644
--- a/mar/oct4/update.hoon
+++ b/mar/oct4/update.hoon
@@ -1,5 +1,5 @@
 ::                                                      ::  ::
-::::  /hoon#oct4-update#mar                        ::::::  dependencies
+::::  /hoon+oct4-update+mar                        ::::::  dependencies
   ::                                                    ::  ::
 /?    310                                               ::  arvo
 /-    oct4                                             ::  structures
@@ -20,16 +20,16 @@
     ?:  ?=($| +>-<)
       ~!  +>-<
       ~!  p
-      s#(crip p)
-    =+  she=|=(ship s#(scot %p +<))
+      s+(crip p)
+    =+  she=|=(ship s+(scot %p +<))
     =+  hes=|=({ship *} (she +<-))
     %-  jobe
-    :~  who#s#?:(who.p %x %o) 
-        plx#?~(p.sag.p ~ (she u.p.sag.p))
-        plo#?~(q.sag.p ~ (she u.q.sag.p))
-        aud#a#(turn (~(tap by aud.p)) hes)
-        box#~(jon bo box.p)
-        boo#~(jon bo boo.p)
+    :~  who+s+?:(who.p %x %o) 
+        plx+?~(p.sag.p ~ (she u.p.sag.p))
+        plo+?~(q.sag.p ~ (she u.q.sag.p))
+        aud+a+(turn (~(tap by aud.p)) hes)
+        box+~(jon bo box.p)
+        boo+~(jon bo boo.p)
     ==
   --
 --
diff --git a/mar/purl.hoon b/mar/purl.hoon
index 85c4dbc94..dc7bb68a7 100644
--- a/mar/purl.hoon
+++ b/mar/purl.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#purl#mar
+::::  /hoon+purl+mar
   ::
 /?  314
 |_  url/purl
diff --git a/mar/react-snip.hoon b/mar/react-snip.hoon
index d60c5e26e..ebea325f8 100644
--- a/mar/react-snip.hoon
+++ b/mar/react-snip.hoon
@@ -18,8 +18,8 @@
   ++  react-snips-json
     ::?>  ?=([[%div ~] [[%h1 ~] *] [[%div ~] *] ~]] own)  :: xx mystery fish-loop
     %^  jobe
-      head#react-head-json
-      body#react-snip-json
+      head+react-head-json
+      body+react-snip-json
     ~
   ::
   ++  react-head-json  (react-to-json ;h1:"*{hed}")
diff --git a/mar/save.hoon b/mar/save.hoon
index 53221798d..44a6cf0ff 100644
--- a/mar/save.hoon
+++ b/mar/save.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#core#save#mar
+::::  /hoon+core+save+mar
   ::
 !:
 |_  man/span
diff --git a/mar/snip.hoon b/mar/snip.hoon
index fa392d7cf..5a9a21606 100644
--- a/mar/snip.hoon
+++ b/mar/snip.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#core#elem#mar
+::::  /hoon+core+elem+mar
   ::
 /?  314
 !:
diff --git a/mar/sole/action.hoon b/mar/sole/action.hoon
index 96f0f23b9..a74efe8cc 100644
--- a/mar/sole/action.hoon
+++ b/mar/sole/action.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#sole-action#mar
+::::  /hoon+sole-action+mar
   ::
 /?    314
 /-    sole
@@ -15,7 +15,7 @@
     |=  jon/^json  ^-  sole-action
     %-  need  %.  jon
     =>  [jo ..sole-action]
-    |^  (fo %ret (of det#change ~))
+    |^  (fo %ret (of det+change ~))
     ++  fo
       |*  {a/term b/fist}
       |=(c/json ?.(=([%s a] c) (b c) (some [a ~])))
@@ -25,12 +25,12 @@
       |=  c/json  %.  c
       ?.(=(%a -.c) b (pe p.a (ar q.a)))
     ::
-    ++  change  (ot ler#(at ni ni ~) ted#(cu |*(a/* [0v0 a]) edit) ~)
+    ++  change  (ot ler+(at ni ni ~) ted+(cu |*(a/* [0v0 a]) edit) ~)
     ++  char  (cu turf so)
     ++  edit
       %+  fo  %nop
-      %+  ra  mor#|=(json (edit +<))
-      (of del#ni set#(cu tuba sa) ins#(ot at#ni cha#char ~) ~)
+      %+  ra  mor+|=(json (edit +<))
+      (of del+ni set+(cu tuba sa) ins+(ot at+ni cha+char ~) ~)
     --
   ::
   ++  noun  sole-action                                   ::  clam from %noun
diff --git a/mar/sole/effect.hoon b/mar/sole/effect.hoon
index 9c668ae22..113644148 100644
--- a/mar/sole/effect.hoon
+++ b/mar/sole/effect.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#sole-effect#mar
+::::  /hoon+sole-effect+mar
   ::
 /?    314
 /-    sole
@@ -14,14 +14,14 @@
     |%  ++  json
       ^-  ^json
       =+  cha
-      =<  (jobe ted#(. ted) ler#a#~[(jone own.ler) (jone his.ler)] ~)
+      =<  (jobe ted+(. ted) ler+a+~[(jone own.ler) (jone his.ler)] ~)
       |=  det/sole-edit
       ?-  -.det
         $nop  [%s 'nop']
         $mor  [%a (turn p.det ..$)]
         $del  (joba %del (jone p.det))
         $set  (joba %set (jape (tufa p.det)))
-        $ins  (joba %ins (jobe at#(jone p.det) cha#s#(tuft q.det) ~))
+        $ins  (joba %ins (jobe at+(jone p.det) cha+s+(tuft q.det) ~))
       ==
     --  
   --
@@ -44,14 +44,14 @@
   ++  json
     ^-  ^json
     ?+    -.sef  
-              ~|(unsupported-effect#-.sef !!)
+              ~|(unsupported-effect+-.sef !!)
         $mor  [%a (turn p.sef |=(a/sole-effect json(sef a)))]
         $err  (joba %hop (jone p.sef))
         $txt  (joba %txt (jape p.sef))
         $tan  (joba %tan (jape (wush 160 p.sef)))
         $det  (joba %det json:~(grow mar-sole-change +.sef))
         $pro   
-      (joba %pro (jobe vis#b#vis.sef tag#s#tag.sef cad#(jape cad.sef) ~))
+      (joba %pro (jobe vis+b+vis.sef tag+s+tag.sef cad+(jape cad.sef) ~))
     ::
         ?($bel $clr $nex)  
       (joba %act %s -.sef)
diff --git a/mar/talk/command.hoon b/mar/talk/command.hoon
index 3494e78f5..777c79020 100644
--- a/mar/talk/command.hoon
+++ b/mar/talk/command.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#talk-command#mar
+::::  /hoon+talk-command+mar
   ::
 /?    314
 /-    talk
@@ -14,9 +14,9 @@
     =>  [jo ..command]
     |=  a/json  ^-  command
     =-  (need ((of -) a))
-    =<  :~  publish#(ar thot)
-            review#(ar thot)
-            design#(ot party#so config#(mu conf) ~)
+    =<  :~  publish+(ar thot)
+            review+(ar thot)
+            design+(ot party+so config+(mu conf) ~)
         ==
     |%
     ++  op                                              ::  parse keys of map
@@ -59,15 +59,15 @@
     ++  thot
       ^-  $+(json (unit thought))
       %-  ot  :~
-        serial#(ci (slat %uv) so)
-        audience#audi 
-        statement#stam
+        serial+(ci (slat %uv) so)
+        audience+audi 
+        statement+stam
       ==
     ::
     ++  audi  (op parn memb)                            ::  audience
     ++  auri  (op parn (ci (soft presence) so))
-    ++  memb  (ot envelope#lope delivery#(ci (soft delivery) so) ~)
-    ++  lope  (ot visible#bo sender#(mu (su parn)) ~)
+    ++  memb  (ot envelope+lope delivery+(ci (soft delivery) so) ~)
+    ++  lope  (ot visible+bo sender+(mu (su parn)) ~)
     ::
     ++  parn
       ^-  $+(nail (like partner))
@@ -85,7 +85,7 @@
         ?:  ?=($mor -.r.a)
           [%mor (turn p.r.a |=(b/speech-or-eval ^$(r.a b)))]
         ?.  ?=($eval -.r.a)  r.a
-        =-  [%fat tank#- %exp p.r.a]
+        =-  [%fat tank+- %exp p.r.a]
         =+  pax=[&1:% &2:% (scot %da p.a) |3:%]
         p:(mule |.([(sell (slap !>(..zuse) (rain pax p.r.a)))]~))
       ==
@@ -93,26 +93,26 @@
     ++  stam
       ^-  $+(json (unit statement))   
       %+  cu  eval
-      (ot date#di bouquet#(as (ar so)) speech#spec ~)
+      (ot date+di bouquet+(as (ar so)) speech+spec ~)
     ::
     ++  spec
       %+  ke  *speech-or-eval  |.
       %-  of
-      :~  lin#(ot say#bo txt#so ~) 
-          url#(su aurf:urlp)
-          eval#so
-          mor#(ar spec)
-          ::  exp#(cu |=(a=cord [a ~]) so)
-          ::  inv#(ot ship#(su fed:ag) party#(su urs:ab) ~)
+      :~  lin+(ot say+bo txt+so ~) 
+          url+(su aurf:urlp)
+          eval+so
+          mor+(ar spec)
+          ::  exp+(cu |=(a=cord [a ~]) so)
+          ::  inv+(ot ship+(su fed:ag) party+(su urs:ab) ~)
       ==
     ::
     ++  conf
       ^-  $+(json (unit config))
       %-  ot  :~
-        sources#(as (su parn))
-        caption#so
+        sources+(as (su parn))
+        caption+so
         :-  %cordon
-        (ot posture#(ci (soft posture) so) list#(as (su fed:ag)) ~)
+        (ot posture+(ci (soft posture) so) list+(as (su fed:ag)) ~)
       ==
   --
 --  --
diff --git a/mar/talk/report.hoon b/mar/talk/report.hoon
index 24a842b72..d148f31e8 100644
--- a/mar/talk/report.hoon
+++ b/mar/talk/report.hoon
@@ -20,21 +20,21 @@
     |^  %+  joba  -.rep
         ?-  -.rep
           $cabal  (cabl +.rep)
-          $house  a#(turn (~(tap by +.rep)) jose)
+          $house  a+(turn (~(tap by +.rep)) jose)
           $glyph  ((jome |=(a/char a) nack) +.rep)
-          $grams  (jobe num#(jone p.rep) tele#[%a (turn q.rep gram)] ~)
-          $group  (jobe local#(grop p.rep) global#%.(q.rep (jome parn grop)) ~)
+          $grams  (jobe num+(jone p.rep) tele+[%a (turn q.rep gram)] ~)
+          $group  (jobe local+(grop p.rep) global+%.(q.rep (jome parn grop)) ~)
         ==
     ++  joce  |=(a/span [%s a])
     ++  jose
       |=  {a/span b/posture c/cord}
-      (jobe name#[%s a] posture#[%s a] caption#[%s b] ~)
+      (jobe name+[%s a] posture+[%s a] caption+[%s b] ~)
     ::
     ++  jove
       |=  {a/envelope b/delivery}
       %-  jobe  :~
-        envelope#(jobe visible#[%b p.a] sender#?~(q.a ~ s#(parn u.q.a)) ~)
-        delivery#[%s b]
+        envelope+(jobe visible+[%b p.a] sender+?~(q.a ~ s+(parn u.q.a)) ~)
+        delivery+[%s b]
       ==
     ++  jope  |=(a/ship (jape +:<a>)) ::[%s (crip +:(scow %p a))])
     ++  joke  |=(a/tank [%s (role (turn (wash 0^80 a) crip))])
@@ -58,16 +58,16 @@
     ++  nack  |=(a/(set (set partner)) [%a (turn (~(tap in a)) sorc)])
     ++  grop  (jome phon stas)                          ::  (map ship status)
     ++  phon  |=(a/ship (scot %p a))
-    ++  stas  |=(status (jobe presence#(joce p) human#(huma q) ~))
-    ++  gram  |=(telegram (jobe ship#(jope p) thought#(thot q) ~))
+    ++  stas  |=(status (jobe presence+(joce p) human+(huma q) ~))
+    ++  gram  |=(telegram (jobe ship+(jope p) thought+(thot q) ~))
     ++  thot
       |=  thought
-      (jobe serial#(jape <p>) audience#(audi q) statement#(stam r) ~)
+      (jobe serial+(jape <p>) audience+(audi q) statement+(stam r) ~)
     ::
     ++  audi  (jome parn jove)
     ++  bouq
       |=  a/bouquet
-      a#(turn (~(tap in a)) |=(b/path a#(turn b |=(c/span s#c))))
+      a+(turn (~(tap in a)) |=(b/path a+(turn b |=(c/span s+c))))
     ::
     ++  parn
       |=  a/partner  ^-  cord
@@ -85,20 +85,20 @@
     ::
     ++  stam
       |=  statement
-      (jobe date#(jode p) bouquet#(bouq q) speech#(spec r) ~)
+      (jobe date+(jode p) bouquet+(bouq q) speech+(spec r) ~)
     ::
     ++  spec
       |=  a/speech
       %+  joba  -.a
-      ?+  -.a  ~|(stub#-.a !!)
-        $lin  (jobe txt#[%s q.a] say#[%b p.a] ~)
-        $url  (joba txt#[%s (crip (earf p.a))])
-        $exp  (joba txt#[%s p.a])
-        $tax  (joba txt#(jape (rend-work-duty p.a)))
-        $app  (jobe txt#[%s q.a] src#[%s p.a] ~)
-        $fat  (jobe tor#(tors p.a) taf#$(a q.a) ~)
-        $mor  a#(turn p.a spec)
-        ::  %inv  (jobe ship#(jope p.a) party#[%s q.a] ~)
+      ?+  -.a  ~|(stub+-.a !!)
+        $lin  (jobe txt+[%s q.a] say+[%b p.a] ~)
+        $url  (joba txt+[%s (crip (earf p.a))])
+        $exp  (joba txt+[%s p.a])
+        $tax  (joba txt+(jape (rend-work-duty p.a)))
+        $app  (jobe txt+[%s q.a] src+[%s p.a] ~)
+        $fat  (jobe tor+(tors p.a) taf+$(a q.a) ~)
+        $mor  a+(turn p.a spec)
+        ::  %inv  (jobe ship+(jope p.a) party+[%s q.a] ~)
       ==
     ::
     ++  tors
@@ -107,36 +107,36 @@
       ?-  -.a
         $text  [%s (role +.a)]
         $tank  [%a (turn +.a joke)]
-        $name  (jobe nom#s#p.a mon#$(a q.a) ~)
+        $name  (jobe nom+s+p.a mon+$(a q.a) ~)
       ==
     ::
     ++  huma
       |=  human
       %^  jobe
-        hand#?~(hand ~ [%s u.hand])
+        hand+?~(hand ~ [%s u.hand])
         :-  %true
         ?~  true  ~
         =+  u.true
-        (jobe first#[%s p] middle#?~(q ~ [%s u.q]) last#[%s r] ~)
+        (jobe first+[%s p] middle+?~(q ~ [%s u.q]) last+[%s r] ~)
       ~
     ::
     ++  cabl
       |=  cabal
       %-  jobe  :~
-        loc#(conf loc)
-        ham#((jome stat conf) ham)
+        loc+(conf loc)
+        ham+((jome stat conf) ham)
       ==
     ::
     ++  sorc  
       |=  a/(set partner)  ^-  json
-      [%a (turn (~(tap in a)) |=(b/partner s#(parn b)))]
+      [%a (turn (~(tap in a)) |=(b/partner s+(parn b)))]
     ::
     ++  conf
       |=  config
       %-  jobe  :~
-        sources#(sorc sources)
-        caption#[%s caption]
-        =-  cordon#(jobe posture#[%s -.cordon] list#[%a -] ~)
+        sources+(sorc sources)
+        caption+[%s caption]
+        =-  cordon+(jobe posture+[%s -.cordon] list+[%a -] ~)
         (turn (~(tap in q.cordon)) jope)                ::  XX  jase
       ==
   --
diff --git a/mar/talk/telegrams.hoon b/mar/talk/telegrams.hoon
index bf86fec1f..22106fbbf 100644
--- a/mar/talk/telegrams.hoon
+++ b/mar/talk/telegrams.hoon
@@ -49,29 +49,29 @@
   ++  ship  (su fed:ag)
   ++  dute
     %-  of  :~
-      create#task  change#(ot id#id meat#uppd ~)
-      archive#id   update#(ot id#id version#ni her#(su fed:ag) meat#uppd ~)
+      create+task  change+(ot id+id meat+uppd ~)
+      archive+id   update+(ot id+id version+ni her+(su fed:ag) meat+uppd ~)
     ==
   ++  task
     %-  ot  :~
-      id#id           'date_created'^di
-      version#ni      'date_modified'^di
-      creator#ship    doer#(mu ship)
-      tags#(as so)    'date_due'^(mu di)
-      done#(mu di)    title#so
-      description#so  discussion#(ar (ot date#di ship#ship body#so ~))
+      id+id           'date_created'^di
+      version+ni      'date_modified'^di
+      creator+ship    doer+(mu ship)
+      tags+(as so)    'date_due'^(mu di)
+      done+(mu di)    title+so
+      description+so  discussion+(ar (ot date+di ship+ship body+so ~))
     ==
   ++  audi  (as stan)
   ++  stan  (su ;~((glue fas) ;~(pfix sig fed:ag) urs:ab))
   ++  uppd
     %-  of  :~
-      set-doer#(mu (su fed:ag))
-      set-date-due#(mu di)
-      set-tags#(as so)
-      set-title#so
-      set-description#so
-      set-done#bo
-      add-comment#(ot ship#(su fed:ag) com#so ~)
+      set-doer+(mu (su fed:ag))
+      set-date-due+(mu di)
+      set-tags+(as so)
+      set-title+so
+      set-description+so
+      set-done+bo
+      add-comment+(ot ship+(su fed:ag) com+so ~)
     ==
   --
 ++  grow-work-duty
@@ -83,35 +83,35 @@
       ?-  +<-
         $create   (task tax)
         $archive  (jove id)
-        $change   (jobe id#(jove id) meat#(flesh meat) ~)
+        $change   (jobe id+(jove id) meat+(flesh meat) ~)
         $update
           %-  jobe  :~ 
-            id#(jove id)
-            version#(jone version)
-            her#(jope her)
-            meat#(flesh meat)
+            id+(jove id)
+            version+(jone version)
+            her+(jope her)
+            meat+(flesh meat)
           ==
       ==
   |%
   ++  tags
     |=  a/(set @t)
-    [%a (turn (sort (~(tap in a)) aor) |=(b/cord s#b))]
+    [%a (turn (sort (~(tap in a)) aor) |=(b/cord s+b))]
   ::
   ++  task
     |=  ^task
-    %-  jobe  :~  id#[%s (scot %uv id)]
-                tags#(^tags tags)
-                doer#?~(doer ~ (jope u.doer))
-               title#[%s title]
-             creator#(jope creator)
-             version#(jone version)
+    %-  jobe  :~  id+[%s (scot %uv id)]
+                tags+(^tags tags)
+                doer+?~(doer ~ (jope u.doer))
+               title+[%s title]
+             creator+(jope creator)
+             version+(jone version)
       'date_created'^(jode date-created)
      'date_modified'^(jode date-modified)
-         description#[%s description]
-      =<  discussion#[%a (turn discussion .)]
-      |=(comment (jobe date#(jode date) ship#(jope ship) body#[%s body] ~))
+         description+[%s description]
+      =<  discussion+[%a (turn discussion .)]
+      |=(comment (jobe date+(jode date) ship+(jope ship) body+[%s body] ~))
           'date_due'^?~(date-due ~ (jode u.date-due))
-                done#?~(done ~ (jode u.done))
+                done+?~(done ~ (jode u.done))
     ==
   ++  flesh  
     |=  ^flesh
@@ -123,7 +123,7 @@
       $set-title        [%s til]
       $set-description  [%s des]
       $set-done         [%b don]
-      $add-comment      (jobe ship#(jope who) com#[%s com] ~)
+      $add-comment      (jobe ship+(jope who) com+[%s com] ~)
     ==
   --
 ++  grab
@@ -133,7 +133,7 @@
   ++  json
     =>  [jo ..telegram dute=grab-work-duty]
     |=  a/json  ^-  (list telegram)
-    =-  (need ((ar (ot ship#(su fed:ag) thought#thot ~)) a))
+    =-  (need ((ar (ot ship+(su fed:ag) thought+thot ~)) a))
     |%
     ++  of
       |*  a/(pole {@tas fist})
@@ -183,15 +183,15 @@
     ++  thot
       ^-  $+(json (unit thought))
       %-  ot  :~
-        serial#(ci (slat %uv) so)
-        audience#audi 
-        statement#stam
+        serial+(ci (slat %uv) so)
+        audience+audi 
+        statement+stam
       ==
     ::
     ++  audi  (op parn memb)                            ::  audience
     ++  auri  (op parn (ci (soft presence) so))
-    ++  memb  (ot envelope#lope delivery#(ci (soft delivery) so) ~)
-    ++  lope  (ot visible#bo sender#(mu (su parn)) ~)
+    ++  memb  (ot envelope+lope delivery+(ci (soft delivery) so) ~)
+    ++  lope  (ot visible+bo sender+(mu (su parn)) ~)
     ::
     ++  parn
       ^-  $+(nail (like partner))
@@ -200,26 +200,26 @@
       %+  sear  (soft passport)
       ;~((glue fas) sym urs:ab)                         ::  XX  [a-z0-9_]{1,15}
     ::
-    ++  stam  (ot date#di bouquet#(as (ar so)) speech#spec ~)
+    ++  stam  (ot date+di bouquet+(as (ar so)) speech+spec ~)
     ++  spec
       %+  ke  *speech  |.  ~+
       %-  of  :~
-        lin#(ot say#bo txt#so ~) 
-        url#(ot txt#(su aurf:urlp) ~)
-        exp#(ot txt#so ~)
-        tax#(ot xat#dute ~)
-        app#(ot txt#so src#so ~)
-        fat#(ot tor#tors taf#spec ~)
-        ext#(ot nom#so txe#blob ~)
-        non#ul
-        ::  inv#(ot ship#(su fed:ag) party#(su urs:ab) ~)
+        lin+(ot say+bo txt+so ~) 
+        url+(ot txt+(su aurf:urlp) ~)
+        exp+(ot txt+so ~)
+        tax+(ot xat+dute ~)
+        app+(ot txt+so src+so ~)
+        fat+(ot tor+tors taf+spec ~)
+        ext+(ot nom+so txe+blob ~)
+        non+ul
+        ::  inv+(ot ship+(su fed:ag) party+(su urs:ab) ~)
       ==
     ++  tors  
       %+  ke  *torso  |.  ~+
       %-  of  :~
-        name#(ot nom#so mon#tors ~) 
-        text#(cu lore so)
-        tank#(ot dat#(cu (hard (list tank)) blob) ~)
+        name+(ot nom+so mon+tors ~) 
+        text+(cu lore so)
+        tank+(ot dat+(cu (hard (list tank)) blob) ~)
       ==
     ::
     ++  blob  (cu cue (su fel:ofis))
@@ -235,13 +235,13 @@
     :-  %a
     %+  turn  gam
     |=  telegram
-    (jobe ship#(jope p) thought#(thot q) ~)
+    (jobe ship+(jope p) thought+(thot q) ~)
     ::
     ++  jove
       |=  {a/envelope b/delivery}
       %-  jobe  :~
-        envelope#(jobe visible#[%b p.a] sender#?~(q.a ~ s#(parn u.q.a)) ~)
-        delivery#[%s b]
+        envelope+(jobe visible+[%b p.a] sender+?~(q.a ~ s+(parn u.q.a)) ~)
+        delivery+[%s b]
       ==
     ::
     ++  jope  |=(a/ship (jape +:<a>)) ::[%s (crip +:(scow %p a))])
@@ -258,12 +258,12 @@
     ::
     ++  thot
       |=  thought
-      (jobe serial#(jape <p>) audience#(audi q) statement#(stam r) ~)
+      (jobe serial+(jape <p>) audience+(audi q) statement+(stam r) ~)
     ::
     ++  audi  (jome parn jove)
     ++  bouq
       |=  a/bouquet
-      a#(turn (~(tap in a)) |=(b/path a#(turn b |=(c/span s#c))))
+      a+(turn (~(tap in a)) |=(b/path a+(turn b |=(c/span s+c))))
     ::
     ++  parn
       |=  a/partner  ^-  cord
@@ -281,21 +281,21 @@
     ::
     ++  stam
       |=  statement
-      (jobe date#(jode p) bouquet#(bouq q) speech#(spec r) ~)
+      (jobe date+(jode p) bouquet+(bouq q) speech+(spec r) ~)
     ::
     ++  spec
       |=  a/speech
       %+  joba  -.a
-      ?+  -.a  ~|(stub#-.a !!)
-        $lin  (jobe txt#[%s q.a] say#[%b p.a] ~)
-        $url  (joba txt#(jape (earf p.a)))
-        $exp  (joba txt#[%s p.a])
-        $tax  (jobe txt#(jape (rend-work-duty p.a)) xat#(grow-work-duty p.a) ~)
-        $app  (jobe txt#[%s q.a] src#[%s p.a] ~)
-        $fat  (jobe tor#(tors p.a) taf#$(a q.a) ~)
-        $ext  (jobe nom#[%s p.a] txe#(jape (sifo (jam +.a))) ~)
+      ?+  -.a  ~|(stub+-.a !!)
+        $lin  (jobe txt+[%s q.a] say+[%b p.a] ~)
+        $url  (joba txt+(jape (earf p.a)))
+        $exp  (joba txt+[%s p.a])
+        $tax  (jobe txt+(jape (rend-work-duty p.a)) xat+(grow-work-duty p.a) ~)
+        $app  (jobe txt+[%s q.a] src+[%s p.a] ~)
+        $fat  (jobe tor+(tors p.a) taf+$(a q.a) ~)
+        $ext  (jobe nom+[%s p.a] txe+(jape (sifo (jam +.a))) ~)
         $non  ~
-        ::  $inv  (jobe ship#(jope p.a) party#[%s q.a] ~)
+        ::  $inv  (jobe ship+(jope p.a) party+[%s q.a] ~)
       ==
     ::
     ++  tors
@@ -303,8 +303,8 @@
       %+  joba  -.a
       ?-  -.a
         $text  [%s (role +.a)]
-        $tank  (jobe txt#[%a (turn +.a joke)] dat#(jape (sifo (jam +.a))) ~)
-        $name  (jobe nom#s#p.a mon#$(a q.a) ~)
+        $tank  (jobe txt+[%a (turn +.a joke)] dat+(jape (sifo (jam +.a))) ~)
+        $name  (jobe nom+s+p.a mon+$(a q.a) ~)
       ==
     ::
     --
diff --git a/mar/tang.hoon b/mar/tang.hoon
index ad6b42fb4..f43a97e02 100644
--- a/mar/tang.hoon
+++ b/mar/tang.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#core#tang#mar
+::::  /hoon+core+tang+mar
   ::
 /?  314
 !:
diff --git a/mar/txt-diff.hoon b/mar/txt-diff.hoon
index f09854b8d..7ee36e6b7 100644
--- a/mar/txt-diff.hoon
+++ b/mar/txt-diff.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#term-line#mar
+::::  /hoon+term-line+mar
   ::
 /?  314
 |_  txt-diff/(urge cord)
diff --git a/mar/unlog.hoon b/mar/unlog.hoon
index 2aebf107e..324efb7bc 100644
--- a/mar/unlog.hoon
+++ b/mar/unlog.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#core#unlog#mar
+::::  /hoon+core+unlog+mar
   ::
 !:
 |_  man/span
diff --git a/mar/urbit.hoon b/mar/urbit.hoon
index feb5069cd..1549863c7 100644
--- a/mar/urbit.hoon
+++ b/mar/urbit.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#urbit#mar
+::::  /hoon+urbit+mar
   ::
 /?  314
 ::::  A minimal urbit mark
diff --git a/mar/will.hoon b/mar/will.hoon
index 30a6572fe..f5913c04b 100644
--- a/mar/will.hoon
+++ b/mar/will.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#will#mar
+::::  /hoon+will+mar
   ::
 /?  314
 |_  wyl/(unit will)
diff --git a/mar/work/command.hoon b/mar/work/command.hoon
index 4af585d5f..c2e26e457 100644
--- a/mar/work/command.hoon
+++ b/mar/work/command.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#command#work#mar
+::::  /hoon+command+work+mar
   ::
 /-    work
 !:
@@ -52,34 +52,34 @@
     ++  ship  (su fed:ag)
     ++  coma
       %-  of  :~
-        new#task      old#(ot id#id dif#uppd ~)
-        sort#(ar id)
+        new+task      old+(ot id+id dif+uppd ~)
+        sort+(ar id)
       ==
     ++  task
       %-  ot  :~
-        ::index#ni
-        audience#audi
-        id#id           'date_created'^di
-        version#ni      'date_modified'^di
-        creator#ship    doer#(mu ship)
-        tags#(as so)    'date_due'^(mu di)
-        done#(mu di)    title#so
-        description#so  discussion#(ar (ot date#di ship#ship body#so ~))
+        ::index+ni
+        audience+audi
+        id+id           'date_created'^di
+        version+ni      'date_modified'^di
+        creator+ship    doer+(mu ship)
+        tags+(as so)    'date_due'^(mu di)
+        done+(mu di)    title+so
+        description+so  discussion+(ar (ot date+di ship+ship body+so ~))
       ==
     ++  audi  (as stan)
     ++  stan  (su ;~((glue fas) ;~(pfix sig fed:ag) urs:ab))
     ++  uppd
       %-  of  :~
-        doer#(of release#ul claim#ul ~)
-        add#(of comment#so ~)
+        doer+(of release+ul claim+ul ~)
+        add+(of comment+so ~)
         :-  %set
         %-  of  :~
-          audience#audi
-          date-due#(mu di)
-          title#so
-          description#so
-          tags#(as so)
-          done#bo
+          audience+audi
+          date-due+(mu di)
+          title+so
+          description+so
+          tags+(as so)
+          done+bo
         ==
       ==
     --
diff --git a/mar/work/report.hoon b/mar/work/report.hoon
index 6630d82a8..d1dc1a4c9 100644
--- a/mar/work/report.hoon
+++ b/mar/work/report.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#report#work#mar
+::::  /hoon+report+work+mar
   ::
 /-    work
 !:
@@ -11,27 +11,27 @@
 |%  ++  json
   =+  jope=|=(a/ship [%s (rsh 3 1 (scot %p a))])
   %-  jobe  :~
-         sort#[%a (turn sort |=(a/@uv [%s (scot %uv a)]))]
-    =<  tasks#(jobe (turn (~(tap by tasks)) .))
+         sort+[%a (turn sort |=(a/@uv [%s (scot %uv a)]))]
+    =<  tasks+(jobe (turn (~(tap by tasks)) .))
     |=  {@ client-task}
     =+  tax
     :-  (scot %uv id)
-    %-  jobe  :~  id#[%s (scot %uv id)]
-                tags#[%a (turn (^sort (~(tap in tags)) aor) |=(a/cord s#a))]
-                doer#?~(doer ~ (jope u.doer))
-               title#[%s title]
-             creator#(jope creator)
-             version#(jone version)
-            archived#[%b archived]
-        =<  audience#[%a (turn (~(tap in audience)) .)]
+    %-  jobe  :~  id+[%s (scot %uv id)]
+                tags+[%a (turn (^sort (~(tap in tags)) aor) |=(a/cord s+a))]
+                doer+?~(doer ~ (jope u.doer))
+               title+[%s title]
+             creator+(jope creator)
+             version+(jone version)
+            archived+[%b archived]
+        =<  audience+[%a (turn (~(tap in audience)) .)]
         |=(a/station:talk [%s (crip "{<p.a>}/{(trip q.a)}")])
       'date_created'^(jode date-created)
      'date_modified'^(jode date-modified)
-         description#[%s description]
-      =<  discussion#[%a (turn discussion .)]
-      |=(comment (jobe date#(jode date) ship#(jope ship) body#[%s body] ~))
+         description+[%s description]
+      =<  discussion+[%a (turn discussion .)]
+      |=(comment (jobe date+(jode date) ship+(jope ship) body+[%s body] ~))
           'date_due'^?~(date-due ~ (jode u.date-due))
-                done#?~(done ~ (jode u.done))
+                done+?~(done ~ (jode u.done))
     ==
   ==
 --  --
@@ -44,7 +44,7 @@
 ::      creator:"~ship"
 ::      version:12345
 ::      archived:false
-::      audience:["~ship#chan" ...]
+::      audience:["~ship+chan" ...]
 ::      date_created:1262304000000
 ::      date_modified:1262304000000
 ::      description:"str"
diff --git a/mar/work/task.hoon b/mar/work/task.hoon
index 120380e50..b3d89fac2 100644
--- a/mar/work/task.hoon
+++ b/mar/work/task.hoon
@@ -74,17 +74,17 @@
   ++  mime  [/text/x-task (taco (role txt))]
   ++  txt
     =+  taz
-    =+  due=?~(date-due ~ ~[' ' da#u.date-due])
-    :-  (rend uv#id '_' da#date-created ' ' ud#version da#date-modified due)
+    =+  due=?~(date-due ~ ~[' ' da+u.date-due])
+    :-  (rend uv+id '_' da+date-created ' ' ud+version da+date-modified due)
     %+  welp  (indent (sort (~(tap in tags)) aor))
     :-  title
-    =+  do=[=-(?~(doer - ['>' p#u.doer -]) ?~(done ~ ~['X' da#u.done]))]
-    :-  (rend p#creator do)
+    =+  do=[=-(?~(doer - ['>' p+u.doer -]) ?~(done ~ ~['X' da+u.done]))]
+    :-  (rend p+creator do)
     %-  zing  ^-  (list wain)
     :-  (indent (lore description))
     %+  turn  discussion
     |=  comment  ^-  wain
-    [(rend p#ship ' ' da#date ~) (indent (lore body))]
+    [(rend p+ship ' ' da+date ~) (indent (lore body))]
   --
 ++  grad  %txt
 --
diff --git a/mar/write-paste.hoon b/mar/write-paste.hoon
index cba661c3f..acf3702fb 100644
--- a/mar/write-paste.hoon
+++ b/mar/write-paste.hoon
@@ -1,5 +1,5 @@
 ::   
-::::  /hoon#core#save#mar
+::::  /hoon+core+save+mar
   ::
 !:
 |_  {typ/?($hoon $md $txt) txt/@t}
@@ -7,6 +7,6 @@
   |%
   ++  noun  {?($hoon $md $txt) @t}
   ++  json  
-    (corl need =>(jo (ot typ#(ci (soft ?($hoon $md $txt)) so) txt#so ~)))
+    (corl need =>(jo (ot typ+(ci (soft ?($hoon $md $txt)) so) txt+so ~)))
   --
 --
diff --git a/sur/down.hoon b/sur/down.hoon
index 898f7dea6..2e08b5380 100644
--- a/sur/down.hoon
+++ b/sur/down.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#gate#down#sur
+::::  /hoon+gate+down+sur
   ::
 /?  314
 /-  markdown
diff --git a/sur/kyev.hoon b/sur/kyev.hoon
index d4b5d8f6b..da17ebc4a 100644
--- a/sur/kyev.hoon
+++ b/sur/kyev.hoon
@@ -1,6 +1,6 @@
 ::  Modified key event
 ::
-::::  /hoon#kyev#sur
+::::  /hoon+kyev+sur
   ::
 =-  {p/(set ?($ctrl $shift $alt $meta)) q/$@(cord {$act speck})}
 ^=  speck
diff --git a/sur/oct1.hoon b/sur/oct1.hoon
index 1d327d329..69d89c852 100644
--- a/sur/oct1.hoon
+++ b/sur/oct1.hoon
@@ -1,5 +1,5 @@
 ::                                                      ::  ::
-::::  /hoon#oct1/sur                                    ::::::  dependencies
+::::  /hoon+oct1/sur                                    ::::::  dependencies
   ::                                                    ::  ::
 /?    310                                               ::  arvo version
 ::                                                      ::  ::  
diff --git a/sur/oct2.hoon b/sur/oct2.hoon
index 4678ca5b5..e077aa0fc 100644
--- a/sur/oct2.hoon
+++ b/sur/oct2.hoon
@@ -1,5 +1,5 @@
 ::                                                      ::  ::
-::::  /hoon#oct2/sur                                    ::::::  dependencies
+::::  /hoon+oct2/sur                                    ::::::  dependencies
   ::                                                    ::  ::
 /?    310                                               ::  arvo version
 ::                                                      ::  ::
diff --git a/sur/oct3.hoon b/sur/oct3.hoon
index 20ee8d2f7..2b6634ba8 100644
--- a/sur/oct3.hoon
+++ b/sur/oct3.hoon
@@ -1,5 +1,5 @@
 ::                                                      ::  ::
-::::  /hoon#oct3/sur                                    ::::::  dependencies
+::::  /hoon+oct3/sur                                    ::::::  dependencies
   ::                                                    ::  ::
 /?    310                                               ::  arvo version
 ::                                                      ::  ::
diff --git a/sur/oct4.hoon b/sur/oct4.hoon
index c01bfa031..1007cb349 100644
--- a/sur/oct4.hoon
+++ b/sur/oct4.hoon
@@ -1,5 +1,5 @@
 ::                                                      ::  ::
-::::  /hoon#oct4/sur                                    ::::::  dependencies
+::::  /hoon+oct4/sur                                    ::::::  dependencies
   ::                                                    ::  ::
 /?    310                                               ::
 ::                                                      ::  ::
diff --git a/sur/sole.hoon b/sur/sole.hoon
index 085b6d79e..9a3dc1516 100644
--- a/sur/sole.hoon
+++ b/sur/sole.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#sole#sur
+::::  /hoon+sole+sur
   !:
 |%
 ++  sole-action                                         ::  sole to app
@@ -24,7 +24,7 @@
   ==                                                    ::
 ++  sole-effect                                         ::  app to sole
   $%  {$bel $~}                                         ::  beep
-      {$blk p/@ud q/@c}                                 ::  blink#match char at
+      {$blk p/@ud q/@c}                                 ::  blink+match char at
       {$clr $~}                                         ::  clear screen
       {$det sole-change}                                ::  edit command
       {$err p/@ud}                                      ::  error point
diff --git a/sur/talk.hoon b/sur/talk.hoon
index a3ee41a6c..d0ebf4b49 100644
--- a/sur/talk.hoon
+++ b/sur/talk.hoon
@@ -1,12 +1,12 @@
 ::  
-::::  /hoon#talk#sur
+::::  /hoon+talk+sur
   !:
 |%
-++  audience  (map partner (pair envelope delivery))    ::  destination#state
+++  audience  (map partner (pair envelope delivery))    ::  destination+state
 ++  atlas  (map ship status)                            ::  presence map
 ++  bouquet  (set flavor)                               ::  complete aroma
 ++  command                                             ::  effect on party
-  $%  {$design (pair span (unit config))}               ::  configure#destroy
+  $%  {$design (pair span (unit config))}               ::  configure+destroy
       {$publish (list thought)}                         ::  originate
       {$review (list thought)}                          ::  deliver
   ==                                                    ::
diff --git a/sur/wand.hoon b/sur/wand.hoon
index c5ba12cd0..80d8c9594 100644
--- a/sur/wand.hoon
+++ b/sur/wand.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#gate#down#sur
+::::  /hoon+gate+down+sur
   ::
 /?  314
 /-  markdown
diff --git a/sur/work.hoon b/sur/work.hoon
index 5f3dadb55..92b811cc9 100644
--- a/sur/work.hoon
+++ b/sur/work.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon#work#sur
+::::  /hoon+work+sur
   ::
   ::  A block comment might go here!
   ::