diff --git a/bin/solid.pill b/bin/solid.pill
index 55b04b5db..e2d263711 100644
--- a/bin/solid.pill
+++ b/bin/solid.pill
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ed0687965fa6df0a31c4c7622cdce3543c99b505b259d355288fbe08a1cd43d
-size 6363294
+oid sha256:82fbb8acc02fbd0c3ffd8604ff5c1f3e96061abba47041decd9d0220f101cc3e
+size 6293061
diff --git a/pkg/arvo/sys/vane/clay.hoon b/pkg/arvo/sys/vane/clay.hoon
index f9eb5cf64..14d23c8d4 100644
--- a/pkg/arvo/sys/vane/clay.hoon
+++ b/pkg/arvo/sys/vane/clay.hoon
@@ -4643,7 +4643,9 @@
     :+  desk  %|
     :~  ankh+&+ank.dom.dojo
         mime+&+mim.dom.dojo
-        ford+&+fod.dom.dojo
+        ford-vases+&+vases.fod.dom.dojo
+        ford-marks+&+marks.fod.dom.dojo
+        ford-casts+&+casts.fod.dom.dojo
     ==
   :~  domestic+|+domestic
       foreign+&+hoy.ruf
diff --git a/pkg/arvo/ted/ph/breach-multiple.hoon b/pkg/arvo/ted/ph/breach-multiple.hoon
index 4c76bc8a6..d486f9d43 100644
--- a/pkg/arvo/ted/ph/breach-multiple.hoon
+++ b/pkg/arvo/ted/ph/breach-multiple.hoon
@@ -11,14 +11,14 @@
 ;<  ~              bind:m  (spawn az ~marbud)
 ;<  ~              bind:m  (real-ship az ~bud)
 ;<  ~              bind:m  (real-ship az ~marbud)
-;<  file=@t        bind:m  (touch-file ~bud %base %foo)
+;<  file=@t        bind:m  (touch-file ~bud %kids %foo)
 ;<  ~              bind:m  (check-file-touched ~marbud %home file)
 ;<  ~              bind:m  (breach-and-hear az ~bud ~marbud)
 ;<  ~              bind:m  (real-ship az ~bud)
 ;<  ~              bind:m  (breach-and-hear az ~marbud ~bud)
 ;<  ~              bind:m  (real-ship az ~marbud)
-;<  file=@t        bind:m  (touch-file ~bud %base %bar)
-;<  file=@t        bind:m  (touch-file ~bud %base %baz)
+;<  file=@t        bind:m  (touch-file ~bud %kids %bar)
+;<  file=@t        bind:m  (touch-file ~bud %kids %baz)
 ;<  ~              bind:m  (check-file-touched ~marbud %home file)
 ;<  ~              bind:m  end-azimuth
 (pure:m *vase)
diff --git a/pkg/arvo/ted/ph/breach-sudden.hoon b/pkg/arvo/ted/ph/breach-sudden.hoon
index ae6af62dd..5491c84c4 100644
--- a/pkg/arvo/ted/ph/breach-sudden.hoon
+++ b/pkg/arvo/ted/ph/breach-sudden.hoon
@@ -13,13 +13,13 @@
 ;<  ~              bind:m  (spawn az ~marbud)
 ;<  ~              bind:m  (real-ship az ~bud)
 ;<  ~              bind:m  (real-ship az ~marbud)
-;<  file=@t        bind:m  (touch-file ~bud %base %foo)
+;<  file=@t        bind:m  (touch-file ~bud %kids %foo)
 ;<  ~              bind:m  (check-file-touched ~marbud %home file)
 ;<  ~              bind:m  (breach az ~bud)
 ;<  ~              bind:m  (real-ship az ~bud)
-;<  ~              bind:m  (dojo ~bud "|merge %base ~marbud %kids, =gem %this")
-;<  file=@t        bind:m  (touch-file ~bud %base %bar)
-;<  file=@t        bind:m  (touch-file ~bud %base %baz)
+;<  ~              bind:m  (dojo ~bud "|merge %home ~marbud %kids, =gem %this")
+;<  file=@t        bind:m  (touch-file ~bud %kids %bar)
+;<  file=@t        bind:m  (touch-file ~bud %kids %baz)
 ;<  ~              bind:m  (check-file-touched ~marbud %home file)
 ;<  ~              bind:m  end-azimuth
 (pure:m *vase)
diff --git a/pkg/arvo/ted/ph/breach-sync.hoon b/pkg/arvo/ted/ph/breach-sync.hoon
index 833ececd1..a603c779f 100644
--- a/pkg/arvo/ted/ph/breach-sync.hoon
+++ b/pkg/arvo/ted/ph/breach-sync.hoon
@@ -13,6 +13,10 @@
 ;<  ~              bind:m  (real-ship az ~marbud)
 ;<  file=@t        bind:m  (touch-file ~bud %kids %foo)
 ;<  ~              bind:m  (check-file-touched ~marbud %home file)
+::  Merge so that when we unify history with the %this merge later, we
+::  don't get a spurious conflict in %home
+::
+;<  ~              bind:m  (dojo ~marbud "|merge %kids our %home")
 ;<  ~              bind:m  (breach-and-hear az ~bud ~marbud)
 ;<  ~              bind:m  (real-ship az ~bud)
 ;<  ~              bind:m  (dojo ~bud "|merge %kids ~marbud %kids, =gem %this")
diff --git a/pkg/arvo/ted/ph/child-sync.hoon b/pkg/arvo/ted/ph/child-sync.hoon
index 291ce598e..381a67064 100644
--- a/pkg/arvo/ted/ph/child-sync.hoon
+++ b/pkg/arvo/ted/ph/child-sync.hoon
@@ -7,7 +7,8 @@
 ;<  ~        bind:m  start-simple
 ;<  ~        bind:m  (raw-ship ~bud ~)
 ;<  ~        bind:m  (raw-ship ~marbud ~)
-;<  file=@t  bind:m  (touch-file ~bud %base %foo)
+;<  file=@t  bind:m  (touch-file ~bud %home %foo)
+;<  ~        bind:m  (dojo ~bud "|merge %kids our %home")
 ;<  ~        bind:m  (check-file-touched ~marbud %home file)
 ;<  ~        bind:m  end-simple
 (pure:m *vase)
diff --git a/pkg/arvo/ted/ph/child-update.hoon b/pkg/arvo/ted/ph/child-update.hoon
index fc0878ad2..d505e74ea 100644
--- a/pkg/arvo/ted/ph/child-update.hoon
+++ b/pkg/arvo/ted/ph/child-update.hoon
@@ -29,15 +29,15 @@
     %^  cat  3  (get-val /mar/js/hoon)
     '  ~&  >  new-val=new-val  .'
   =/  js-contents
-    %^  cat  3  (get-val /app/publish/js/index/js)
+    %^  cat  3  (get-val /app/landscape/js/channel/js)
     'extra'
   =/  files
     :~  [/sys/zuse/hoon zuse-contents]
         [/mar/js/hoon mar-contents]
-        [/app/publish/js/index/js js-contents]
+        [/app/landscape/js/channel/js js-contents]
     ==
   ;<  ~  bind:m  (send-events (insert-files:util her desk files))
-  (pure:m /app/publish/js/index/js js-contents)
+  (pure:m /app/landscape/js/channel/js js-contents)
   ::
   ++  aqua-path
     |=  =path