diff --git a/tests/rsrc/miso/viewer/scene.xml b/tests/rsrc/miso/viewer/scene.xml
deleted file mode 100644
index 0f0ca4c7a..000000000
--- a/tests/rsrc/miso/viewer/scene.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-
-<miso>
-  <width>22</width>
-  <height>22</height>
-  <base>65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65540, 65546, 65546, 65536, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65539, 65549, 65549, 65538, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65539, 65549, 65549, 65538, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65541, 65546, 65546, 65537, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546</base>
-  <fringe>0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 196610, 196612, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 196608, 196614, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0</fringe>
-  <object></object>
-</miso>
diff --git a/tests/rsrc/miso/viewer/towne.xml b/tests/rsrc/miso/viewer/towne.xml
deleted file mode 100644
index 3a1107c18..000000000
--- a/tests/rsrc/miso/viewer/towne.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-
-  <miso>
-  <width>22</width>
-  <height>22</height>
-  <base>65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 131072, 131072, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 131072, 131072, 131072, 131072, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 131072, 131072, 131072, 131072, 131072, 131072, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 131072, 131072, 131072, 131072, 131072, 131072, 131072, 131072, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 131072, 131072, 131072, 131072, 131072, 131072, 131072, 131072, 131072, 131072, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 131072, 131072, 131072, 131072, 131072, 131072, 131075, 131075, 131072, 131072, 131072, 131072, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 131074, 131074, 131074, 131072, 131072, 131072, 131075, 131075, 131075, 131075, 131072, 131072, 131072, 131072, 131072, 65546, 65546, 65546, 65546, 65546, 65546, 131074, 131074, 131074, 131074, 131074, 131072, 131072, 131072, 131075, 131075, 131075, 131075, 131072, 131072, 131072, 131072, 131072, 65546, 65546, 65546, 65546, 131072, 131072, 131072, 131074, 131074, 131074, 131074, 131072, 131072, 131072, 131075, 131075, 131075, 131075, 131072, 131072, 131072, 131072, 65546, 65546, 65546, 131072, 131072, 131072, 131072, 131072, 131072, 131074, 131074, 131074, 131074, 131072, 131072, 131075, 131075, 131075, 131072, 131072, 131072, 131072, 131072, 65546, 65546, 131072, 131072, 131072, 131072, 131072, 131072, 131072, 131074, 131074, 131074, 131074, 131074, 131072, 131075, 131072, 131072, 131072, 131072, 131072, 131072, 131072, 65546, 65546, 131072, 131072, 131072, 131072, 131072, 131072, 131072, 131074, 131074, 131074, 131074, 131074, 131072, 131072, 131072, 131072, 131072, 131072, 131072, 131072, 131072, 65546, 65546, 131072, 131072, 131072, 131072, 131072, 131072, 131072, 131072, 131074, 131074, 131074, 131072, 131072, 131072, 131072, 131072, 131072, 131072, 131072, 131072, 65546, 65546, 65546, 131072, 131072, 131072, 131072, 131072, 131072, 131072, 131074, 131074, 131074, 131072, 131072, 131072, 131072, 131072, 131072, 131072, 131072, 131072, 65546, 65546, 65546, 131072, 131072, 131072, 131072, 131072, 131072, 131072, 131074, 131074, 131074, 131072, 131072, 131072, 131072, 131072, 131072, 131072, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 131072, 131072, 131072, 131072, 131072, 131074, 131074, 131074, 131072, 131072, 131072, 131072, 131072, 131072, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 131072, 131072, 131072, 131072, 131074, 131074, 131074, 131074, 131072, 131072, 131072, 131072, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 131072, 131072, 131072, 131072, 131074, 131074, 131074, 131074, 131072, 131072, 131072, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 131072, 131072, 131074, 131074, 131074, 131074, 131072, 131072, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 131072, 131072, 131074, 131074, 131074, 131074, 131072, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 131072, 131074, 131074, 131074, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 131074, 131074, 131074, 65546, 65546, 65546, 65546, 65546, 65546, 65546, 65546</base>
-  <fringe>0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 196634, 0, 0, 196636, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 196636, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 196632, 0, 0, 0, 0, 196636, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 196624, 0, 0, 0, 0, 0, 0, 196632, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 196624, 0, 0, 0, 0, 196627, 196632, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 196624, 0, 0, 0, 0, 0, 196632, 0, 196638, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 196624, 0, 0, 0, 0, 196609, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 196624, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 196628, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 196624, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0</fringe>
-  <object>10, 8, 262145, 16, 14, 262146, 9, 15, 262144</object>
-</miso>
diff --git a/tests/rsrc/scenes/wooded.xml b/tests/rsrc/scenes/wooded.xml
index 579e7ff27..479f33d3d 100644
--- a/tests/rsrc/scenes/wooded.xml
+++ b/tests/rsrc/scenes/wooded.xml
@@ -1,12 +1,31 @@
 <?xml version="1.0" standalone="yes"?>
 
-  <miso>
-    <width>22</width>
-    <height>22</height>
-    <viewwidth>10</viewwidth>
-    <viewheight>12</viewheight>
-    <base>131072, 131073, 131073, 131073, 131074, 131072, 131072, 131072, 131073, 131074, 131074, 131072, 131074, 131074, 131072, 131072, 131073, 131073, 131072, 131073, 131073, 131072, 131074, 131072, 131074, 131074, 131072, 131073, 131074, 131072, 131074, 131074, 131074, 131072, 131074, 131074, 131072, 131074, 131072, 131072, 131073, 131074, 131074, 131072, 131074, 131072, 131072, 131072, 131072, 131074, 131073, 131073, 131074, 131073, 131074, 131073, 131074, 131073, 131074, 131074, 131072, 131072, 131073, 131074, 131074, 131073, 131073, 131073, 131073, 131073, 131072, 131073, 131072, 131072, 131072, 131072, 131072, 131074, 131074, 131073, 131074, 131072, 131074, 131074, 131073, 131074, 131073, 131073, 131072, 131073, 131073, 131072, 131074, 131073, 131073, 131074, 131072, 131072, 131073, 131072, 131072, 131073, 131072, 131072, 131074, 131072, 131072, 131074, 131073, 131072, 131072, 131072, 131074, 131074, 131073, 131073, 131073, 131073, 131074, 131073, 131074, 131072, 131074, 131073, 131073, 131072, 131074, 131073, 131072, 131074, 131073, 131072, 131074, 131074, 131074, 131072, 131074, 131073, 131074, 131072, 131073, 131072, 131072, 131072, 131073, 131074, 131073, 131073, 131072, 131072, 131073, 131072, 131072, 131074, 131074, 131074, 131072, 131074, 131074, 131074, 131074, 131074, 131074, 131072, 131072, 131073, 131074, 131073, 131073, 131073, 131072, 131073, 131073, 131073, 131073, 131074, 131073, 131074, 131072, 131072, 131073, 131073, 131072, 131073, 131074, 131074, 131074, 131074, 131072, 131073, 131074, 131072, 131072, 131072, 131074, 131072, 131073, 131073, 131074, 131072, 131072, 131073, 131073, 131072, 131074, 131072, 131073, 131073, 131073, 131073, 131074, 131073, 131072, 131073, 131072, 131073, 131072, 131073, 131072, 131072, 131074, 131074, 131072, 131073, 131074, 131074, 131073, 131074, 131074, 131072, 131073, 131072, 131072, 131072, 131073, 131073, 131072, 131073, 131072, 131074, 131074, 131074, 131073, 131073, 131073, 131073, 131073, 131073, 131073, 131073, 131074, 131073, 131072, 131072, 131074, 131072, 131074, 131073, 131073, 131074, 131074, 131074, 131074, 131072, 131073, 131073, 131074, 131072, 131072, 131073, 131072, 131074, 131073, 131074, 131072, 131072, 131073, 131073, 131074, 131072, 131073, 131074, 131072, 131073, 131074, 131073, 131072, 131072, 131074, 131072, 131073, 131073, 131072, 131074, 131073, 131072, 131074, 131072, 131074, 131072, 131072, 131074, 131073, 131074, 131074, 131073, 131072, 131074, 131072, 131074, 131073, 131073, 131073, 131073, 131072, 131074, 131073, 131073, 131074, 131073, 131073, 131074, 131074, 131074, 131072, 131073, 131072, 131074, 131072, 131074, 131072, 131072, 131073, 131074, 131073, 131072, 131074, 131073, 131073, 131073, 131074, 131073, 131073, 131072, 131074, 131072, 131072, 131072, 131073, 131074, 131074, 131073, 131072, 131074, 131073, 131074, 131074, 131073, 131074, 131073, 131073, 131072, 131072, 131074, 131073, 131072, 131073, 131074, 131073, 131074, 131073, 131072, 131073, 131073, 131072, 131074, 131072, 131074, 131074, 131072, 131074, 131074, 131072, 131072, 131072, 131073, 131072, 131073, 131072, 131073, 131073, 131074, 131074, 131073, 131074, 131074, 131073, 131074, 131072, 131073, 131072, 131074, 131073, 131073, 131073, 131073, 131073, 131073, 131072, 131073, 131073, 131074, 131073, 131072, 131072, 131074, 131072, 131073, 131072, 131074, 131073, 131073, 131073, 131073, 131073, 131072, 131072, 131072, 131072, 131074, 131072, 131073, 131073, 131073, 131074, 131074, 131072, 131072, 131074, 131073, 131073, 131073, 131072, 131072, 131074, 131073, 131074, 131073, 131074, 131073, 131073, 131073, 131074, 131073, 131074, 131072, 131073, 131072, 131073, 131073, 131074, 131072, 131073, 131072, 131072, 131072, 131074, 131073, 131072, 131072, 131074, 131073, 131072, 131072, 131073, 131073, 131074, 131072, 131074, 131072, 131072, 131074, 131074, 131074</base>
-    <fringe>0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0</fringe>
-    <object>18, 10, 1048577, 18, 13, 655362, 17, 19, 655363, 17, 11, 851968, 16, 14, 1048577, 14, 11, 1048576, 13, 5, 1048577, 13, 17, 851968, 12, 18, 1048576, 12, 22, 655361, 12, 8, 1179648, 11, 13, 786432, 10, 12, 655360, 10, 11, 655362, 9, 7, 1048576, 7, 12, 851968, 6, 15, 655361, 6, 12, 655361, 5, 9, 1179649, 3, 10, 1048576</object>
-    <actions>, , , , , , , , , , , , , , , , , , , </actions>
-  </miso>
+<miso>
+  <width>22</width>
+  <height>22</height>
+  <viewwidth>10</viewwidth>
+  <viewheight>12</viewheight>
+  <base>131072, 131073, 131073, 131073, 131074, 131072, 131072, 131072, 131073, 131074, 131074, 131072, 131074, 131074, 131072, 131072, 131073, 131073, 131072, 131073, 131073, 131072, 131074, 131072, 131074, 131074, 131072, 131073, 131074, 131072, 131074, 131074, 131074, 131072, 131074, 131074, 131072, 131074, 131072, 131072, 131073, 131074, 131074, 131072, 131074, 131072, 131072, 131072, 131072, 131074, 131073, 131073, 131074, 131073, 131074, 131073, 131074, 131073, 131074, 131074, 131072, 131072, 131073, 131074, 131074, 131073, 131073, 131073, 131073, 131073, 131072, 131073, 131072, 131072, 131072, 131072, 131072, 131074, 131074, 131073, 131074, 131072, 131074, 131074, 131073, 131074, 131073, 131073, 131072, 131073, 131073, 131072, 131074, 131073, 131073, 131074, 131072, 131072, 131073, 131072, 131072, 131073, 131072, 131072, 131074, 131072, 131072, 131074, 131073, 131072, 131072, 131072, 131074, 131074, 131073, 131073, 131073, 131073, 131074, 131073, 131074, 131072, 131074, 131073, 131073, 131072, 131074, 131073, 131072, 131074, 131073, 131072, 131074, 131074, 131074, 131072, 131074, 131073, 131074, 131072, 131073, 131072, 131072, 131072, 131073, 131074, 131073, 131073, 131072, 131072, 131073, 131072, 131072, 131074, 131074, 131074, 131072, 131074, 131074, 131074, 131074, 131074, 131074, 131072, 131072, 131073, 131074, 131073, 131073, 131073, 131072, 131073, 131073, 131073, 131073, 131074, 131073, 131074, 131072, 131072, 131073, 131073, 131072, 131073, 131074, 131074, 131074, 131074, 131072, 131073, 131074, 131072, 131072, 131072, 131074, 131072, 131073, 131073, 131074, 131072, 131072, 131073, 131073, 131072, 131074, 131072, 131073, 131073, 131073, 131073, 131074, 131073, 131072, 131073, 131072, 131073, 131072, 131073, 131072, 131072, 131074, 131074, 131072, 131073, 131074, 131074, 131073, 131074, 131074, 131072, 131073, 131072, 131072, 131072, 131073, 131073, 131072, 131073, 131072, 131074, 131074, 131074, 131073, 131073, 131073, 131073, 131073, 131073, 131073, 131073, 131074, 131073, 131072, 131072, 131074, 131072, 131074, 131073, 131073, 131074, 131074, 131074, 131074, 131072, 131073, 131073, 131074, 131072, 131072, 131073, 131072, 131074, 131073, 131074, 131072, 131072, 131073, 131073, 131074, 131072, 131073, 131074, 131072, 131073, 131074, 131073, 131072, 131072, 131074, 131072, 131073, 131073, 131072, 131074, 131073, 131072, 131074, 131072, 131074, 131072, 131072, 131074, 131073, 131074, 131074, 131073, 131072, 131074, 131072, 131074, 131073, 131073, 131073, 131073, 131072, 131074, 131073, 131073, 131074, 131073, 131073, 131074, 131074, 131074, 131072, 131073, 131072, 131074, 131072, 131074, 131072, 131072, 131073, 131074, 131073, 131072, 131074, 131073, 131073, 131073, 131074, 131073, 131073, 131072, 131074, 131072, 131072, 131072, 131073, 131074, 131074, 131073, 131072, 131074, 131073, 131074, 131074, 131073, 131074, 131073, 131073, 131072, 131072, 131074, 131073, 131072, 131073, 131074, 131073, 131074, 131073, 131072, 131073, 131073, 131072, 131074, 131072, 131074, 131074, 131072, 131074, 131074, 131072, 131072, 131072, 131073, 131072, 131073, 131072, 131073, 131073, 131074, 131074, 131073, 131074, 131074, 131073, 131074, 131072, 131073, 131072, 131074, 131073, 131073, 131073, 131073, 131073, 131073, 131072, 131073, 131073, 131074, 131073, 131072, 131072, 131074, 131072, 131073, 131072, 131074, 131073, 131073, 131073, 131073, 131073, 131072, 131072, 131072, 131072, 131074, 131072, 131073, 131073, 131073, 131074, 131074, 131072, 131072, 131074, 131073, 131073, 131073, 131072, 131072, 131074, 131073, 131074, 131073, 131074, 131073, 131073, 131073, 131074, 131073, 131074, 131072, 131073, 131072, 131073, 131073, 131074, 131072, 131073, 131072, 131072, 131072, 131074, 131073, 131072, 131072, 131074, 131073, 131072, 131072, 131073, 131073, 131074, 131072, 131074, 131072, 131072, 131074, 131074, 131074</base>
+  <objects>
+    <object tileId="1048577" x="18" y="10"/>
+    <object tileId="655362" x="18" y="13"/>
+    <object tileId="655363" x="17" y="19"/>
+    <object tileId="851968" x="17" y="11"/>
+    <object tileId="1048577" x="16" y="14"/>
+    <object tileId="1048576" x="14" y="11"/>
+    <object tileId="1048577" x="13" y="5"/>
+    <object tileId="851968" x="13" y="17"/>
+    <object tileId="1048576" x="12" y="18"/>
+    <object tileId="655361" x="12" y="22"/>
+    <object tileId="1179648" x="12" y="8"/>
+    <object tileId="786432" x="11" y="13"/>
+    <object tileId="655360" x="10" y="12"/>
+    <object tileId="655362" x="10" y="11"/>
+    <object tileId="1048576" x="9" y="7"/>
+    <object tileId="851968" x="7" y="12"/>
+    <object tileId="655361" x="6" y="15"/>
+    <object tileId="655361" x="6" y="12"/>
+    <object tileId="1179649" x="5" y="9"/>
+    <object tileId="1048576" x="3" y="10"/>
+  </objects>
+</miso>
diff --git a/tests/rsrc/whirled/spot/tools/xml/scene.xml b/tests/rsrc/whirled/spot/tools/xml/scene.xml
index eb0c4914a..007d5da7c 100644
--- a/tests/rsrc/whirled/spot/tools/xml/scene.xml
+++ b/tests/rsrc/whirled/spot/tools/xml/scene.xml
@@ -2,11 +2,8 @@
 
 <!-- test spot scene parser -->
 <scene name="Test Scene" version="42" defaultEntranceId="3">
-  <location locationId="0" x="12" y="15" orientation="0" clusterIndex="0"/>
-  <location locationId="1" x="16" y="25" orientation="0" clusterIndex="1"/>
-  <location locationId="2" x="9" y="1" orientation="3" clusterIndex="1"/>
-  <portal locationId="3" x="1" y="25" orientation="3" name="East portal"
+  <portal portalId="1" x="1" y="25" orient="3" name="East portal"
     targetSceneName="East scene" targetPortalName="West portal"/>
-  <portal locationId="4" x="25" y="1" orientation="5" name="North portal"
+  <portal portalId="2" x="25" y="1" orient="5" name="North portal"
     targetSceneName="North scene" targetPortalName="South portal"/>
 </scene>