diff --git a/Test/Many/!Run,feb b/Test/Many/!Run,feb
index 0c0c2bd8f2bab3bf7aa8235208cc4095d54ade74..c7b1dfc78ef5d115be0aad228df78eedd39ed201 100644
--- a/Test/Many/!Run,feb
+++ b/Test/Many/!Run,feb
@@ -12,8 +12,3 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-|> !Run
-
-WimpSlot 64k 64k
-
-Run <Obey$Dir>.ManyTest
diff --git a/Test/Many/ManyTest,ffb b/Test/Many/ManyTest,ffb
index c0c5557ee940981b47c17c2db8684fc561d9693c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/Test/Many/ManyTest,ffb and b/Test/Many/ManyTest,ffb differ
diff --git a/Test/Many/Templates,fec b/Test/Many/Templates,fec
index 6d3911733c86cb6177f30e0512845d12dbd84ec4..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/Test/Many/Templates,fec and b/Test/Many/Templates,fec differ
diff --git a/Test/Multi/!Run,feb b/Test/Multi/!Run,feb
index e2b4b3256d5c3ebbef3ab27027e9e93920315e55..c7b1dfc78ef5d115be0aad228df78eedd39ed201 100644
--- a/Test/Multi/!Run,feb
+++ b/Test/Multi/!Run,feb
@@ -12,8 +12,3 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-|> !Run
-
-WimpSlot 64k 64k
-
-Run <Obey$Dir>.MultiTest
diff --git a/Test/Multi/!Sprites,ff9 b/Test/Multi/!Sprites,ff9
index 21b0debb205c45785b5dab1f01b65249a2c19951..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/Test/Multi/!Sprites,ff9 and b/Test/Multi/!Sprites,ff9 differ
diff --git a/Test/Multi/MultiTest,ffb b/Test/Multi/MultiTest,ffb
index 2ae3477914983715caede6b0477ad4acab3c6175..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/Test/Multi/MultiTest,ffb and b/Test/Multi/MultiTest,ffb differ
diff --git a/Test/Multi/Templates,fec b/Test/Multi/Templates,fec
index 923566434664a4b0374d9226350bb753ee5c91e9..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/Test/Multi/Templates,fec and b/Test/Multi/Templates,fec differ
diff --git a/Test/Nest1/!Run,feb b/Test/Nest1/!Run,feb
index c655d61802bcdbdffc7b7297cbf9570d381cd4f3..c7b1dfc78ef5d115be0aad228df78eedd39ed201 100644
--- a/Test/Nest1/!Run,feb
+++ b/Test/Nest1/!Run,feb
@@ -12,8 +12,3 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-|> !Run
-
-WimpSlot 64k 64k
-
-Run <Obey$Dir>.WindowTest
diff --git a/Test/Nest1/Templates,fec b/Test/Nest1/Templates,fec
index f7efc2dd700b76355ee8b36181c8e2c4b7d99936..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/Test/Nest1/Templates,fec and b/Test/Nest1/Templates,fec differ
diff --git a/Test/Nest1/WindowTest,ffb b/Test/Nest1/WindowTest,ffb
index e17f7655cabcc0a4e071442e95ce0778b16a5f3f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/Test/Nest1/WindowTest,ffb and b/Test/Nest1/WindowTest,ffb differ
diff --git a/Test/Nest2/!Run,feb b/Test/Nest2/!Run,feb
index 54e88f2d26c8e6a894d7181597782712364960ec..c7b1dfc78ef5d115be0aad228df78eedd39ed201 100644
--- a/Test/Nest2/!Run,feb
+++ b/Test/Nest2/!Run,feb
@@ -12,10 +12,3 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-|> !Run
-
-Set WimpTest2$Dir <Obey$Dir>
-
-WimpSlot 2200k 2200k
-
-Run <Obey$Dir>.WindowTest
diff --git a/Test/Nest2/Log b/Test/Nest2/Log
index 5a7b59fd00f10bf6c48963a812733cbc586f1d09..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/Test/Nest2/Log
+++ b/Test/Nest2/Log
@@ -1,27 +0,0 @@
-Current  21BB0B9       34      174      15E      280       8A FFFFFE92  21BB419 8001F742  21BC4F9        0
-Current  21BC2B9      37C       56      420      1CC       80 FFFFFE90 FFFFFFFF 8003F742  21BBF59  8150000
-Current  21BC079      35C      21E      3D0      24E      100 FFFFFEB0 FFFFFFFF C5030002  21BAF99  5900000
-Current  21BB1D9      5AC       A6      6A6      138       C4 FFFFFEA4  21B9379 F8010002  21BC3D9   A80000
-Current  21BB9B9      2DE       90      304       A0       CA FFFFFEC2  21B8D09 C0810002  21BC199  5180000
-Current  21B9499      232       18      2BC       3E        8 FFFFFEB0 FFFFFFFF BD030002  21B8D09  AA20000
-Current  21BC4F9      7D2 FFFFFFCE      9C2       6A       B2 FFFFFE94 FFFFFFFF 8003F742  21B9379  4AA0000
-Current  21BB539      1C6      1FC      1FC      346       A4 FFFFFE6C  21B8BE9 D487F742  21BB9B9   840000
-Current  21BB779 FFFFFF28      2FE      122      384       DE FFFFFEEA FFFFFFFF C080F742 FFFFFFFF  2640000
-Current  21BBE39      35C      21E      3D0      274       E4 FFFFFEB2 FFFFFFFF C0870002  21BC079    40000
-Current  21BB659      3DA FFFFFF74      440       80       F4 FFFFFE6A FFFFFFFF E0030002  21BC3D9  5850000
-Current  21BC3D9      2DE       70      358       7A       E6 FFFFFEB2 FFFFFFFF 8D870002  21B8BE9        0
-Current  21BBF59      406 FFFFFFC0      480 FFFFFFEE       B8 FFFFFE86  21BC199 8F03F742 FFFFFFFF  1410000
-Current  21BB2F9      2E6 FFFFFF7A      354 FFFFFF7A       F0 FFFFFE74 FFFFFFFF D4000002 FFFFFFFF  2920000
-Current  21BC199      2DE       24      4D2       7A       CC FFFFFEB4  21BBAD9 84030002 FFFFFFFF  2180000
-Current  21B9379      400        2      682       E6       E6 FFFFFEB2  21BB659 ED010002  21BC3D9        0
-Current  21BBBF9      2E6      1E4      40E      1F0       F6 FFFFFF0A FFFFFFFF D4030002  21BB659  8010000
-Current  21BB419       6A FFFFFFD6      21C      156       96 FFFFFE92 FFFFFFFF FF03F742  21BC4F9    10000
-Current  21BAF99      306      288      4CE      2EA       92 FFFFFE92 FFFFFFFF F803F742  21BB9B9        0
-Current  21BB899      240       4E      25E       58       CE FFFFFE9A FFFFFFFF D0830002  21B9499  9250000
-Current  21BBD19      276       76      312      1EA       E0 FFFFFEB6 FFFFFFFF F7030002  21BBBF9   120000
-Current  21BBAD9        8      2EE      10A      344       E8 FFFFFEAC FFFFFFFF FF030002 FFFFFFFF        0
-Current  21B8BE9      2DE       70      332       7A       B8 FFFFFEB2  21BAF99 9F830002  21BB9B9  8020000
-Current  21B8AC9       EC       94      200      24E       E4 FFFFFEB4 FFFFFFFF B7030002  21BB0B9        0
-Current  21B8D09      248       9C      3F8      24A       88 FFFFFE8A FFFFFFFF D803F742  21BC199  1260000
-Old      21BBF59      406 FFFFFFC0      480 FFFFFFEE       B8 FFFFFE86  21BC199 8F03F742 FFFFFFFF  1410000
-Open     21BBF59      407 FFFFFFC0      47C FFFFFFF4       B7 FFFFFE84 FFFFFFFF 8F03F742  21BC2B9  1410000
diff --git a/Test/Nest2/Log1 b/Test/Nest2/Log1
index 598ebba871eb747494ff7e3a755687af9bbcabca..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/Test/Nest2/Log1
+++ b/Test/Nest2/Log1
@@ -1,5 +0,0 @@
-Current  22AF099      130      35C      162      362      102 FFFFFED0 FFFFFFFF 95030002 FFFFFFFF   160000
-Current  22AEF79     6838      20C     699E      2F8       D0 FFFFFEAE  22B3179 FC030002  22B13A9  42A0000
-Current  22B13A9     68B8      39C     6B14      3EE       80 FFFFFE66 FFFFFFFF F887F752  22B3059  9480000
-Current  22B3179 FFFFFE88      4C6       12      4F2       64 FFFFFE42 FFFFFFFF D083F752  22B13A9  9960000
-Current  22B3059      130      382      188      362       D4 FFFFFEB4 FFFFFFFF CF870002  22AF099  A490000
diff --git a/Test/Nest2/Log2 b/Test/Nest2/Log2
index d5de98cc3d511c153f8c613e12678dcbb0ebe892..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/Test/Nest2/Log2
+++ b/Test/Nest2/Log2
@@ -1,27 +0,0 @@
-Current  2297CB9       34      174      15E      280       8A FFFFFE92  229D269 FF01F742        0        0
-Current  2297C09      37C       56      420      1CC       80 FFFFFE90  229CC19 FF01F742        0        0
-Current  229CC19      35C      1D8      3D2      24E      100 FFFFFEB0  229D3C9 FF010002        0        0
-Current  229CB69      5AC       A6      6A6      138       C4 FFFFFEA4  2297CB9 FF010002        0        0
-Current  229CAB9      2DE       2A      354       A0       CA FFFFFEC2  2297C09 FF010002        0        0
-Current  229D3C9      232 FFFFFFC8      2BC       3E        8 FFFFFEB0  229D319 FF010002        0        0
-Current  229D319      7D2 FFFFFFCE      9C2       6A       B2 FFFFFE94  229D749 FF03F742        0        0
-Current  229D269      1C6      1FC      23C      346       A4 FFFFFE6C  229EDE9 FF01F742        0        0
-Current  229D7F9 FFFFFF28      2FE      122      384       DE FFFFFEEA FFFFFFFF FF00F742        0        0
-Current  229D749      35C      1FE      3D2      274       E4 FFFFFEB2  229ED39 FF010002        0        0
-Current  229D699      3DA FFFFFF74      450       80       F4 FFFFFE6A  229E039 FF010002        0        0
-Current  229E039      2DE        4      358       7A       E6 FFFFFEB2  229EC89 FF010002        0        0
-Current  229DF89      406 FFFFFF78      480 FFFFFFEE       B8 FFFFFE86  229CB69 FF01F742        0        0
-Current  229EE99      2E6       28      35C       9E       F0 FFFFFE74 FFFFFFFF FF000002        0        0
-Current  229EDE9      2DE        4      4D2       7A       CC FFFFFEB4  229CAB9 FF010002        0        0
-Current  229ED39      400        2      682       E6       E6 FFFFFEB2  229D699 FF010002        0        0
-Current  229EC89      2E6      17A      40E      1F0       F6 FFFFFF0A  229EBD9 FF010002        0        0
-Current  229EBD9       6A FFFFFFD6      21C      156       96 FFFFFE92  229E869 FF01F742        0        0
-Current  229EB29      306      274      4CE      2EA       92 FFFFFE92  229EA79 FF01F742        0        0
-Current  229EA79      240 FFFFFFE2      2B6       58       CE FFFFFE9A  229E9C9 FF010002        0        0
-Current  229E9C9      276       76      312      1EA       E0 FFFFFEB6  229E919 FF010002        0        0
-Current  229E919        8      2CE      10A      344       E8 FFFFFEAC  229E7B9 FF030002        0        0
-Current  229E869      2DE        4      354       7A       B8 FFFFFEB2  229EB29 FF010002        0        0
-Current  229E7B9       EC       94      200      24E       E4 FFFFFEB4  229E709 FF030002        0        0
-Current  229E709      248       9C      3F8      24A       88 FFFFFE8A FFFFFFFF FF03F742        0        0
-Old      229DF89      406 FFFFFFC0      480 FFFFFFEE       B8 FFFFFE86  229EDE9 8F03F742 FFFFFFFF  1410000
-Open     229DF89      407 FFFFFFC0      47C FFFFFFF4       B7 FFFFFE84 FFFFFFFF 8F03F742  2297C09  1410000
diff --git a/Test/Nest2/LogO b/Test/Nest2/LogO
index d830468173fb8c37dba3df56489f90363e30cdeb..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/Test/Nest2/LogO
+++ b/Test/Nest2/LogO
@@ -1,29 +0,0 @@
-Current  21BD199      17E     16AC      25C     1700       9A FFFFFE7A  21BCE39 E483F752 FFFFFFFF   A10000
-Current  21BA609      4E8     2B04      720     2D90       96 FFFFFF46 FFFFFFFF B803F752  21BA069   940000
-Current  21BA3C9      13C       A4      360      22E       E6 FFFFFEB2 FFFFFFFF FF030002 FFFFFFFF        0
-Current  21BA4E9      346      134      47E      23A       D2 FFFFFECC  21BA069 95030002  21B8E29  4560000
-Current  21BA189 FFFFFE3A FFFFEAA2 FFFFFE8E FFFFEAFA       D8 FFFFFEAC  21BCF59 B4830002  21BCE39  5220000
-Current  21BCBF9      108      1C4      17C      21A       8A FFFFFE90 FFFFFFFF 9003F752  21BD079  5440000
-Current  21B9A09      18C      22E      232      254       86 FFFFFEAA FFFFFFFF D8830002  21BA3C9  4020000
-Current  21B9D69      49A     28E0      508     29DC       9C FFFFFE90 FFFFFFFF 8000F752 FFFFFFFF  A180000
-Current  21BA069      62A     1620      6EA     17B0       80 FFFFFF42 FFFFFFFF DC83F752  21B8E29  8600000
-Current  21B9B29      18C      2EA      232      310       FE FFFFFE98 FFFFFFFF 97830002  21BA729  9AA0000
-Current  21BA2A9      13E      11E      376      258       92 FFFFFE92 FFFFFFFF F087F752  21BCBF9  9200000
-Current  21B9C49      54E     1660      598     176A       98 FFFFFE00 FFFFFFFF 8603F752  21BA4E9  6A40000
-Current  21B98E9      828     28DE      A42     2AAE       88 FFFFFE28 FFFFFFFF B487F752  21BD3D9  4000000
-Current  21B8E29       8E       D0      2F8      138       BE FFFFFDFA FFFFFFFF 80030002  21B9B29  5080000
-Current  21BCD19       B8       2A      14E      1DE       F2 FFFFFEAE FFFFFFFF F0000002 FFFFFFFF  1280000
-Current  21BD2B9 FFFFFF2E     134A       BA     1516       8A FFFFFEB6  21BA3C9 F083F752 FFFFFFFF  1680000
-Current  21BCE39 FFFFFC80 FFFFE9CE FFFFFE8E FFFFEAFE       B0 FFFFFE74  21B94E9 9503F752 FFFFFFFF  1910000
-Current  21BD079       14 FFFFFF1E      1A8       78       9A FFFFFEB4  21B9069 D003F752  21B9C49   480000
-Current  21B94E9       A4       FC      21E      290       A0 FFFFFE98  21BA729 8E01F752 FFFFFFFF  A920000
-Current  21BCF59      20C      262      3FE      390       90 FFFFFE90 FFFFFFFF 9783F752  21BCE39  4810000
-Current  21B9189      988     3C1A      B96     3C26       8A FFFFFE7E FFFFFFFF 8403F752  21BA609  5910000
-Current  21BD3D9      62A     1620      6D0     1646       E4 FFFFFEC6  21BA609 DC830002  21BA069  4A00000
-Current  21B9609       D4      202      338      312       92 FFFFFE92  21BD199 FF01F752 FFFFFFFF        0
-Current  21B9069 FFFFFD06 FFFFEB7C FFFFFE18 FFFFEC3C       82 FFFFFE7E FFFFFFFF D003F752  21B9C49  9520000
-Current  21BA729      18C      2E8      232      336       7E FFFFFE80  21BD2B9 9803F752 FFFFFFFF  A500000
-Old      21BD3D9      18C      310      232      336       E8 FFFFFEB8  21B9A09 F8850002  21B9B29        0
-Open     21BD3D9      18C      310      232      336       E5 FFFFFEC7  21BA609 DC850002  21BA069  4A00001
-Old      21B9A09      18C      310      232      336       86 FFFFFEAA  21B8E29 D8870002  21B9B29    20000
-Open     21B9A09      18C      310      232      336       86 FFFFFEAA FFFFFFFF D8870002  21BA3C9  4020000
diff --git a/Test/Nest2/Sprite1,ff9 b/Test/Nest2/Sprite1,ff9
index f76f99af5a61393a81748a9f459fd2d6def950f0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/Test/Nest2/Sprite1,ff9 and b/Test/Nest2/Sprite1,ff9 differ
diff --git a/Test/Nest2/Sprite2,ff9 b/Test/Nest2/Sprite2,ff9
index 6156a7cbf5434a010f934da12e85be988afa336e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/Test/Nest2/Sprite2,ff9 and b/Test/Nest2/Sprite2,ff9 differ
diff --git a/Test/Nest2/Templates,fec b/Test/Nest2/Templates,fec
index 4e6622745f5068ecb3c5b4641dc44d2c54c04c42..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/Test/Nest2/Templates,fec and b/Test/Nest2/Templates,fec differ
diff --git a/Test/Nest2/Tree b/Test/Nest2/Tree
index 09e2b42d1079f053bf5b83b1614489919f11521c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/Test/Nest2/Tree
+++ b/Test/Nest2/Tree
@@ -1,24 +0,0 @@
-FFFFFFFF
-  21BBF59
-    21BC2B9
-  21BC199
-    21BB9B9
-      21BB539
-      21B8BE9
-        21BC3D9
-          21BB1D9
-          21B9379
-            21BC4F9
-              21BB0B9
-                21B8AC9
-              21BB419
-          21BB659
-            21BBBF9
-              21BBD19
-      21BAF99
-        21BC079
-          21BBE39
-    21B8D09
-      21B9499
-        21BB899
-  21BBAD9
diff --git a/Test/Nest2/Tree_A b/Test/Nest2/Tree_A
index 8a385e650482c27acb5c1f9500c81bd26cd5be18..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/Test/Nest2/Tree_A
+++ b/Test/Nest2/Tree_A
@@ -1,24 +0,0 @@
-FFFFFFFF
-  228BDE9
-    228ABC9
-  2290E59
-    228B4F9
-      228C389
-      22D2459
-        228BF09
-          228AF29
-          2290D39
-            228B2B9
-              2285539
-                22D33E9
-              2290AF9
-          228C029
-            2290C19
-              22D2699
-      22909D9
-        228AAA9
-          228C149
-    22D4549
-      228B3D9
-        22D27B9
-  22D2579
diff --git a/Test/Nest2/Tree_B b/Test/Nest2/Tree_B
index 8a385e650482c27acb5c1f9500c81bd26cd5be18..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/Test/Nest2/Tree_B
+++ b/Test/Nest2/Tree_B
@@ -1,24 +0,0 @@
-FFFFFFFF
-  228BDE9
-    228ABC9
-  2290E59
-    228B4F9
-      228C389
-      22D2459
-        228BF09
-          228AF29
-          2290D39
-            228B2B9
-              2285539
-                22D33E9
-              2290AF9
-          228C029
-            2290C19
-              22D2699
-      22909D9
-        228AAA9
-          228C149
-    22D4549
-      228B3D9
-        22D27B9
-  22D2579
diff --git a/Test/Nest2/WindowTest,ffb b/Test/Nest2/WindowTest,ffb
index aeb2858487ef13e8ad50133abe1bc2221cd9235e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/Test/Nest2/WindowTest,ffb and b/Test/Nest2/WindowTest,ffb differ
diff --git a/Test/Nest2/boom,ff9 b/Test/Nest2/boom,ff9
index 12b83691ca830e8e4d8d10c8b08785e11dc56b38..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/Test/Nest2/boom,ff9 and b/Test/Nest2/boom,ff9 differ
diff --git a/Test/Spy/!Run,feb b/Test/Spy/!Run,feb
index c862e0fa7135a9b0d8d65f57009a6334fa6ccc93..c7b1dfc78ef5d115be0aad228df78eedd39ed201 100644
--- a/Test/Spy/!Run,feb
+++ b/Test/Spy/!Run,feb
@@ -12,8 +12,3 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-|> !Run
-
-WimpSlot 64k 64k
-
-Run <Obey$Dir>.Spy
diff --git a/Test/Spy/Spy,ffb b/Test/Spy/Spy,ffb
index b6e30e0ab0fea98ffcaa78e05df0ddf6d3f831ba..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/Test/Spy/Spy,ffb and b/Test/Spy/Spy,ffb differ
diff --git a/TestO/!Double/!Run,feb b/TestO/!Double/!Run,feb
index 35443960c7eee7155d3a3570ec3b2e0cce24064e..c7b1dfc78ef5d115be0aad228df78eedd39ed201 100644
--- a/TestO/!Double/!Run,feb
+++ b/TestO/!Double/!Run,feb
@@ -12,8 +12,3 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-| > !Run file for !MenuTree
-
-WimpSlot -min 640k -max 640k
-
-Run <Obey$Dir>.!RunImage
diff --git a/TestO/!Double/!RunImage,ffb b/TestO/!Double/!RunImage,ffb
index c6977f9cd814494ac321300806e39cc17d6f4438..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/!Double/!RunImage,ffb and b/TestO/!Double/!RunImage,ffb differ
diff --git a/TestO/!Double/Templates,fec b/TestO/!Double/Templates,fec
index 8cbb6d9de168733125a57cea59660f4f9a0f626c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/!Double/Templates,fec and b/TestO/!Double/Templates,fec differ
diff --git a/TestO/!ManyWinds/!Run,feb b/TestO/!ManyWinds/!Run,feb
index 35443960c7eee7155d3a3570ec3b2e0cce24064e..c7b1dfc78ef5d115be0aad228df78eedd39ed201 100644
--- a/TestO/!ManyWinds/!Run,feb
+++ b/TestO/!ManyWinds/!Run,feb
@@ -12,8 +12,3 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-| > !Run file for !MenuTree
-
-WimpSlot -min 640k -max 640k
-
-Run <Obey$Dir>.!RunImage
diff --git a/TestO/!ManyWinds/!RunImage,ffb b/TestO/!ManyWinds/!RunImage,ffb
index 6acb75501d8e605d237b61efd3f42684ecb07950..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/!ManyWinds/!RunImage,ffb and b/TestO/!ManyWinds/!RunImage,ffb differ
diff --git a/TestO/!ManyWinds/Templates,fec b/TestO/!ManyWinds/Templates,fec
index ce6826cc27528a49735a38b5778714e36a2b8754..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/!ManyWinds/Templates,fec and b/TestO/!ManyWinds/Templates,fec differ
diff --git a/TestO/!MenuTree/!Run,feb b/TestO/!MenuTree/!Run,feb
index 35443960c7eee7155d3a3570ec3b2e0cce24064e..c7b1dfc78ef5d115be0aad228df78eedd39ed201 100644
--- a/TestO/!MenuTree/!Run,feb
+++ b/TestO/!MenuTree/!Run,feb
@@ -12,8 +12,3 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-| > !Run file for !MenuTree
-
-WimpSlot -min 640k -max 640k
-
-Run <Obey$Dir>.!RunImage
diff --git a/TestO/!MenuTree/!RunImage,ffb b/TestO/!MenuTree/!RunImage,ffb
index 2d67b97980291c79aa00def701025217912e675c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/!MenuTree/!RunImage,ffb and b/TestO/!MenuTree/!RunImage,ffb differ
diff --git a/TestO/!MenuTree/Templates,fec b/TestO/!MenuTree/Templates,fec
index 0bf0d4fd5bde632298531a302fd2c07fc57c68da..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/!MenuTree/Templates,fec and b/TestO/!MenuTree/Templates,fec differ
diff --git a/TestO/!Monitor/!Boot,feb b/TestO/!Monitor/!Boot,feb
index ee15a0cf0c8457a9fb6e827ab15989ab6cea40e8..c7b1dfc78ef5d115be0aad228df78eedd39ed201 100644
--- a/TestO/!Monitor/!Boot,feb
+++ b/TestO/!Monitor/!Boot,feb
@@ -12,4 +12,3 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-Set Monitor$Dir <Obey$Dir>
\ No newline at end of file
diff --git a/TestO/!Monitor/!Run,feb b/TestO/!Monitor/!Run,feb
index 12249df929fb291f9d756b1b13f20eddd0f39cad..c7b1dfc78ef5d115be0aad228df78eedd39ed201 100644
--- a/TestO/!Monitor/!Run,feb
+++ b/TestO/!Monitor/!Run,feb
@@ -12,6 +12,3 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-Set Monitor$Dir <Obey$Dir>
-Wimpslot -min 64K -max 64K
-Run <Obey$Dir>.!RunImage
diff --git a/TestO/!Monitor/!runimage,ff8 b/TestO/!Monitor/!runimage,ff8
index 2abac1bc1e1b845d4f94150a645fe3e4379b5ca9..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/!Monitor/!runimage,ff8 and b/TestO/!Monitor/!runimage,ff8 differ
diff --git a/TestO/!Monitor/Templates,fec b/TestO/!Monitor/Templates,fec
index 6c5d2921983e37eb2c04ff036e1c2d739bba7ca7..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/!Monitor/Templates,fec and b/TestO/!Monitor/Templates,fec differ
diff --git a/TestO/!Monitor/c/Monitor b/TestO/!Monitor/c/Monitor
index b0470fd62c30c53edb5c67dd3c1078e5ca192d2a..0a4a6598f40a4e89adf9c2f16a9c10da51278cd1 100644
--- a/TestO/!Monitor/c/Monitor
+++ b/TestO/!Monitor/c/Monitor
@@ -12,99 +12,3 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-/* Monitor messages comming in */
-
-#include <string.h>
-
-#include "wimp.h"
-#include "wimpt.h"
-#include "event.h"
-#include "win.h"
-#include "template.h"
-#include "dbox.h"
-#include "alarm.h"
-#include "res.h"
-#include "akbd.h"
-#include "kernel.h"
-#include "swis.h"
-
-
-int start_time =0;
-int messages =0;
-int my_task;
-
-BOOL unknown_event(wimp_eventstr *e, void *handle)
-{
- dbox d = (dbox) handle;
- int av=alarm_timedifference(start_time,alarm_timenow());
- static int ov=0;
-
- if (ov==0) ov=av-101;
-
- if ( (e->e==wimp_ENULL) && akbd_pollsh() )  /* Shift pressed on a null event */
- {
-  _kernel_swi_regs r;
-
-  r.r[0]=my_task;
-  wimpt_noerror( (os_error *) _kernel_swi(XOS_Bit | 0x816c1 ,&r,&r); /* Get character at pointer */
- }
-
- if (e->e==wimp_ESEND)
- {
-
-  if (e->data.msg.action == 0x816c0)
-  {
-   werr(0,"Character found %c (%i)",e->data.msg.data.words[0],e->data.msg.data.words[0]);
-   wimp_processkey(e->data.msg.data.words[0]);
-  }
-
-
-  char   strbuf [100];
-  sprintf(strbuf,"%x",e->data.msg.hdr.action);
-  dbox_setfield(d,3,strbuf);
-  dbox_setnumeric(d,5,++messages);
- }
-
- if (av-ov >= 100)
- {
-  ov=av;
-  if (av >= 6000) av = messages / (av / 6000);
-     else av=messages;
-
-  dbox_setnumeric(d,1,av);
- }
-
- return TRUE;
-}
-
-int main()
-{
- dbox d;
-
- /* Start a wimp task */
-
- wimpt_wimpversion(275);
- my_task=wimpt_init("Monitor");
- res_init("Monitor");
- template_init();
- dbox_init();
- alarm_init();
- start_time=alarm_timenow();
-
- d=dbox_new("Monitor");
- dbox_showstatic(d);
-
- win_add_unknown_event_processor(unknown_event,d) ;
-
- event_setmask(0);
-
- while (1)
- {
-  event_process();
-  if (wimpt_last_event()->e==wimp_ECLOSE) exit(0);
- }
-
- return 0;
-
-}
diff --git a/TestO/!Open/!Run,feb b/TestO/!Open/!Run,feb
index 35443960c7eee7155d3a3570ec3b2e0cce24064e..c7b1dfc78ef5d115be0aad228df78eedd39ed201 100644
--- a/TestO/!Open/!Run,feb
+++ b/TestO/!Open/!Run,feb
@@ -12,8 +12,3 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-| > !Run file for !MenuTree
-
-WimpSlot -min 640k -max 640k
-
-Run <Obey$Dir>.!RunImage
diff --git a/TestO/!Open/!RunImage,ffb b/TestO/!Open/!RunImage,ffb
index 3935928cc298e93af07a81b9ee3ba3a239597fb7..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/!Open/!RunImage,ffb and b/TestO/!Open/!RunImage,ffb differ
diff --git a/TestO/!Open/Templates,fec b/TestO/!Open/Templates,fec
index f97394d10241347c8be71a3d450b5eaf8e9d63b8..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/!Open/Templates,fec and b/TestO/!Open/Templates,fec differ
diff --git a/TestO/!Redraw/!Run,feb b/TestO/!Redraw/!Run,feb
index 35443960c7eee7155d3a3570ec3b2e0cce24064e..c7b1dfc78ef5d115be0aad228df78eedd39ed201 100644
--- a/TestO/!Redraw/!Run,feb
+++ b/TestO/!Redraw/!Run,feb
@@ -12,8 +12,3 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-| > !Run file for !MenuTree
-
-WimpSlot -min 640k -max 640k
-
-Run <Obey$Dir>.!RunImage
diff --git a/TestO/!Redraw/!RunImage,ffb b/TestO/!Redraw/!RunImage,ffb
index 7374a3d9cace82497735ad3198da38f596412ce3..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/!Redraw/!RunImage,ffb and b/TestO/!Redraw/!RunImage,ffb differ
diff --git a/TestO/!Redraw/Templates,fec b/TestO/!Redraw/Templates,fec
index f97394d10241347c8be71a3d450b5eaf8e9d63b8..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/!Redraw/Templates,fec and b/TestO/!Redraw/Templates,fec differ
diff --git a/TestO/!Redraw2/!Run,feb b/TestO/!Redraw2/!Run,feb
index bac3ea651ae6ad425e5d310cfd313115d5d6196f..c7b1dfc78ef5d115be0aad228df78eedd39ed201 100644
--- a/TestO/!Redraw2/!Run,feb
+++ b/TestO/!Redraw2/!Run,feb
@@ -12,9 +12,3 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-| > !Run file for !MenuTree
-
-*IconSprites <Obey$Dir>.sprites
-WimpSlot -min 640k -max 640k
-
-Run <Obey$Dir>.!RunImage
diff --git a/TestO/!Redraw2/!RunImage,ffb b/TestO/!Redraw2/!RunImage,ffb
index 7374a3d9cace82497735ad3198da38f596412ce3..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/!Redraw2/!RunImage,ffb and b/TestO/!Redraw2/!RunImage,ffb differ
diff --git a/TestO/!Redraw2/Sprites,ff9 b/TestO/!Redraw2/Sprites,ff9
index 558f3ee23159c03c1e83afd7ade711c0c266dde2..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/!Redraw2/Sprites,ff9 and b/TestO/!Redraw2/Sprites,ff9 differ
diff --git a/TestO/!Redraw2/Templates,fec b/TestO/!Redraw2/Templates,fec
index f218c58d5be606a747d08e6c29645cda2c127eb5..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/!Redraw2/Templates,fec and b/TestO/!Redraw2/Templates,fec differ
diff --git a/TestO/!Test/!Boot,feb b/TestO/!Test/!Boot,feb
index 39299bfdc9f03390e79552d5591550cb86421795..c7b1dfc78ef5d115be0aad228df78eedd39ed201 100644
--- a/TestO/!Test/!Boot,feb
+++ b/TestO/!Test/!Boot,feb
@@ -12,7 +12,3 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-| boot file for wexample application
-
-Iconsprites <Obey$Dir>.!Sprites
-
diff --git a/TestO/!Test/!RUNIMAGE,ff8 b/TestO/!Test/!RUNIMAGE,ff8
index e6903d07a4bd4f143f9ac605e78a63274059088d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/!Test/!RUNIMAGE,ff8 and b/TestO/!Test/!RUNIMAGE,ff8 differ
diff --git a/TestO/!Test/!Run,feb b/TestO/!Test/!Run,feb
index 7c1ef678f9e90dc86ce0b4b29e54eb288fa5604c..c7b1dfc78ef5d115be0aad228df78eedd39ed201 100644
--- a/TestO/!Test/!Run,feb
+++ b/TestO/!Test/!Run,feb
@@ -12,10 +12,3 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-RMEnsure SharedCLibrary 3.50 RMLoad System:Modules.Clib
-RMEnsure SharedCLibrary 3.50 Error You need Clib 3.50 or later
-
-*WimpSlot -min 64k -max 64k
-*IconSprites <Obey$Dir>.!Sprites
-*Set Test$Dir <Obey$Dir>
-*Run <Test$Dir>.!RunImage %*0
diff --git a/TestO/!Test/!Sprites,ff9 b/TestO/!Test/!Sprites,ff9
index c0c2582d6642f644b517eb8bedb0a9b6bdf244c5..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/!Test/!Sprites,ff9 and b/TestO/!Test/!Sprites,ff9 differ
diff --git a/TestO/!Test/Templates,fec b/TestO/!Test/Templates,fec
index 630178bb2f016eb64e95fdfc08112e37c45d7b61..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/!Test/Templates,fec and b/TestO/!Test/Templates,fec differ
diff --git a/TestO/!Test/Templates1,fec b/TestO/!Test/Templates1,fec
index 886731ada329e5df914e85b877beea45a7ca21d5..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/!Test/Templates1,fec and b/TestO/!Test/Templates1,fec differ
diff --git a/TestO/!Test/sprites,ff9 b/TestO/!Test/sprites,ff9
index 6e800a81adc79ac343518d80954febda8c5bb8cc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/!Test/sprites,ff9 and b/TestO/!Test/sprites,ff9 differ
diff --git a/TestO/!Valid/!Boot,feb b/TestO/!Valid/!Boot,feb
index 07355f11548368353fea9a91e1a3d105a972f3f3..c7b1dfc78ef5d115be0aad228df78eedd39ed201 100644
--- a/TestO/!Valid/!Boot,feb
+++ b/TestO/!Valid/!Boot,feb
@@ -12,4 +12,3 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-Set Valid$Dir <Obey$Dir>
\ No newline at end of file
diff --git a/TestO/!Valid/!Run,feb b/TestO/!Valid/!Run,feb
index 219a7d7023bc6c78252ba8b9f5169f7715f6e93c..c7b1dfc78ef5d115be0aad228df78eedd39ed201 100644
--- a/TestO/!Valid/!Run,feb
+++ b/TestO/!Valid/!Run,feb
@@ -12,6 +12,3 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-Set Valid$Dir <Obey$Dir>
-Wimpslot -min 64K -max 64K
-Run <Obey$Dir>.!RunImage
diff --git a/TestO/!Valid/!RunImage,ffb b/TestO/!Valid/!RunImage,ffb
index c899f8a5b147e7b96da4c25d11d32d5613bd1bb3..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/!Valid/!RunImage,ffb and b/TestO/!Valid/!RunImage,ffb differ
diff --git a/TestO/!Valid/Templates,fec b/TestO/!Valid/Templates,fec
index cf47b6e7f82e5109310121662a0166818244b859..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/!Valid/Templates,fec and b/TestO/!Valid/Templates,fec differ
diff --git a/TestO/!WimpBUG/!Run,feb b/TestO/!WimpBUG/!Run,feb
index 47cefd90640585a94c65db195e2ea814b7c670e4..c7b1dfc78ef5d115be0aad228df78eedd39ed201 100644
--- a/TestO/!WimpBUG/!Run,feb
+++ b/TestO/!WimpBUG/!Run,feb
@@ -12,6 +12,3 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-Set WimpBUG$Dir <Obey$Dir>
-WimpSlot -min 32k -max 32k
-Run <WimpBUG$Dir>.!Runimage
diff --git a/TestO/!WimpBUG/!Runimage,ffb b/TestO/!WimpBUG/!Runimage,ffb
index 44e229d111629c4438f34d491de38a4be83b0702..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/!WimpBUG/!Runimage,ffb and b/TestO/!WimpBUG/!Runimage,ffb differ
diff --git a/TestO/!WimpBUG/Templates,fec b/TestO/!WimpBUG/Templates,fec
index 6a06201b248c83f9e729e32e9c1b6d07f930465f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/!WimpBUG/Templates,fec and b/TestO/!WimpBUG/Templates,fec differ
diff --git a/TestO/Arrows,aff b/TestO/Arrows,aff
index f3214823dc1b60e26d2801a76f7630159ecbdaea..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/Arrows,aff and b/TestO/Arrows,aff differ
diff --git a/TestO/FontTest,fec b/TestO/FontTest,fec
index 4195431b309d5b815c1cd6760f105fa21e3155f0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/FontTest,fec and b/TestO/FontTest,fec differ
diff --git a/TestO/GrabMem,ffb b/TestO/GrabMem,ffb
index b3ff301a899e8570617e5b2f20493e1f33498dcc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/GrabMem,ffb and b/TestO/GrabMem,ffb differ
diff --git a/TestO/PlotIcon,ffb b/TestO/PlotIcon,ffb
index 12692b58216e271ce2ea7c77c569376685ef5915..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/PlotIcon,ffb and b/TestO/PlotIcon,ffb differ
diff --git a/TestO/PollWord,ffb b/TestO/PollWord,ffb
index 871c69ec13b318b590dc30b2e3ad4e8d8cfcd8b0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/PollWord,ffb and b/TestO/PollWord,ffb differ
diff --git a/TestO/ShowSpr,ffb b/TestO/ShowSpr,ffb
index 817802854e9422bd1a785424165b62d489e09b98..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/ShowSpr,ffb and b/TestO/ShowSpr,ffb differ
diff --git a/TestO/TestMsg,ffb b/TestO/TestMsg,ffb
index 944c9ed705c4cd0dd2bf5e40210bdacf6ec2d802..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/TestMsg,ffb and b/TestO/TestMsg,ffb differ
diff --git a/TestO/TwoTasks,ffb b/TestO/TwoTasks,ffb
index 6b72b141e376c36b491aa1a4f3fc3000e0ac4872..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/TwoTasks,ffb and b/TestO/TwoTasks,ffb differ
diff --git a/TestO/WimpInit,ffb b/TestO/WimpInit,ffb
index 3de08dfd2bf2828364a077aaa84b791ceba3da0b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/WimpInit,ffb and b/TestO/WimpInit,ffb differ
diff --git a/TestO/swap,ffb b/TestO/swap,ffb
index a338a8a587c28d18f985d8c7f7a56ab47781edab..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/swap,ffb and b/TestO/swap,ffb differ
diff --git a/TestO/test1,feb b/TestO/test1,feb
index ae3f2be833f1a792368c2e8d505b4c82ba836704..c7b1dfc78ef5d115be0aad228df78eedd39ed201 100644
--- a/TestO/test1,feb
+++ b/TestO/test1,feb
@@ -12,4 +12,3 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-announce âââthis is a very long message to appear in an error box, but of course the system ought to be able to cope with something even longer than thisààà
diff --git a/TestO/test2,feb b/TestO/test2,feb
index 5684252a2ef154f575396322b7902c9f7db9b2fd..c7b1dfc78ef5d115be0aad228df78eedd39ed201 100644
--- a/TestO/test2,feb
+++ b/TestO/test2,feb
@@ -12,4 +12,3 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-announce âââthisisaverylongmessagetoappearinanerrorbox,butofcoursethesystemoughttobeabletocopewithsomethingevenlongerthanthisààà
diff --git a/TestO/trans,feb b/TestO/trans,feb
index a5edd666498b868957de0edfc184e56cbb6c1751..c7b1dfc78ef5d115be0aad228df78eedd39ed201 100644
--- a/TestO/trans,feb
+++ b/TestO/trans,feb
@@ -12,5 +12,3 @@
 | See the License for the specific language governing permissions and
 | limitations under the License.
 |
-wimptask taskwindow basic <obey$dir>.trans1
-wimptask taskwindow basic <obey$dir>.trans2
diff --git a/TestO/trans1,ffb b/TestO/trans1,ffb
index 38b4334eeb2a9192d69c7ddd43d9d8e4001ee3c0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/trans1,ffb and b/TestO/trans1,ffb differ
diff --git a/TestO/trans2,ffb b/TestO/trans2,ffb
index dc991597eb88b3af29427736a92463e8aa683c02..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/TestO/trans2,ffb and b/TestO/trans2,ffb differ