diff --git a/styles/monsterstyles/animal/animal_1 b/styles/monsterstyles/animal/animal_1
index 684f9cdf9..735a89bf5 100644
--- a/styles/monsterstyles/animal/animal_1
+++ b/styles/monsterstyles/animal/animal_1
@@ -5,8 +5,8 @@ Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sat Dec 19 17:06:24 1998
 endmsg
-x 6
-y 6
+width 6
+height 6
 end
 arch snake
 end
@@ -19,6 +19,12 @@ end
 arch pixie
 y 3
 end
+arch goose
+y 4
+end
+arch goose
+y 5
+end
 arch snake
 x 1
 end
diff --git a/styles/monsterstyles/animal/animal_10 b/styles/monsterstyles/animal/animal_10
index d5f7f4d34..9269554a3 100644
--- a/styles/monsterstyles/animal/animal_10
+++ b/styles/monsterstyles/animal/animal_10
@@ -5,8 +5,8 @@ Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sat Dec 19 17:06:24 1998
 endmsg
-x 6
-y 6
+width 6
+height 6
 end
 arch beehive
 end
@@ -34,6 +34,9 @@ arch bat
 x 1
 y 5
 end
+arch wolf
+x 2
+end
 arch generate_scorpion
 x 2
 y 1
@@ -54,6 +57,9 @@ arch bat
 x 2
 y 5
 end
+arch wolf
+x 3
+end
 arch generate_scorpion
 x 3
 y 1
@@ -96,37 +102,18 @@ arch generate_xan
 x 5
 y 5
 end
-arch unicorn
-x 2
-end
-More
-arch unicorn_2
-x 3
-end
-arch cobra
-x 4
-y 3
-end
-More
-arch cobra_2
-x 4
-y 4
-end
-arch cobra
-x 5
-y 1
-end
-More
-arch cobra_2
-x 5
+arch behemoth
 y 2
 end
 arch cobra
+x 4
+y 3
+end
+arch bear
+x 5
+y 1
+end
+arch bear
 x 5
 y 3
 end
-More
-arch cobra_2
-x 5
-y 4
-end
diff --git a/styles/monsterstyles/animal/animal_11 b/styles/monsterstyles/animal/animal_11
index 4bb6884f0..0b9b5646a 100644
--- a/styles/monsterstyles/animal/animal_11
+++ b/styles/monsterstyles/animal/animal_11
@@ -5,8 +5,8 @@ Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sat Dec 19 17:06:24 1998
 endmsg
-x 6
-y 6
+width 6
+height 6
 end
 arch beehive
 speed -0.200000
@@ -14,45 +14,33 @@ end
 arch spider_gen
 y 1
 end
-arch beehive
+arch wolf
 y 2
-speed -0.200000
 end
 arch beehive
+speed -0.200000
 y 3
-speed -0.200000
-end
-arch generate_bee
-y 4
-end
-arch generate_bee
-y 5
 end
 arch beehive
-x 1
 speed -0.200000
+x 1
 end
 arch spider_gen
 x 1
 y 1
 end
 arch beehive
+speed -0.200000
 x 1
 y 2
-speed -0.200000
 end
 arch beehive
+speed -0.200000
 x 1
 y 3
-speed -0.200000
 end
-arch generate_bat
-x 1
-y 4
-end
-arch bat
-x 1
-y 5
+arch dire_wolf
+x 2
 end
 arch generate_scorpion
 x 2
@@ -74,6 +62,9 @@ arch bat
 x 2
 y 5
 end
+arch wolf
+x 3
+end
 arch generate_scorpion
 x 3
 y 1
@@ -116,37 +107,18 @@ arch generate_xan
 x 5
 y 5
 end
-arch unicorn
-x 2
-end
-More
-arch unicorn_2
-x 3
+arch behemoth
+y 4
 end
 arch cobra
 x 4
 y 3
 end
-More
-arch cobra_2
-x 4
-y 4
-end
-arch cobra
+arch bear
 x 5
 y 1
 end
-More
-arch cobra_2
-x 5
-y 2
-end
 arch cobra
 x 5
 y 3
 end
-More
-arch cobra_2
-x 5
-y 4
-end
diff --git a/styles/monsterstyles/animal/animal_12 b/styles/monsterstyles/animal/animal_12
index 5f82e9707..dbb0b7be7 100644
--- a/styles/monsterstyles/animal/animal_12
+++ b/styles/monsterstyles/animal/animal_12
@@ -5,8 +5,8 @@ Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sat Dec 19 17:06:24 1998
 endmsg
-x 6
-y 6
+width 6
+height 6
 end
 arch beehive
 speed -0.200000
@@ -15,48 +15,47 @@ arch spider_gen
 y 1
 end
 arch beehive
+speed -0.200000
 y 2
-speed -0.200000
 end
 arch beehive
+speed -0.200000
 y 3
-speed -0.200000
 end
 arch beehive
-x 1
 speed -0.200000
+x 1
 end
 arch spider_gen
 x 1
 y 1
 end
 arch beehive
+speed -0.200000
 x 1
 y 2
-speed -0.200000
 end
 arch beehive
+speed -0.200000
 x 1
 y 3
-speed -0.200000
 end
-arch generate_bat
-x 1
-y 4
-end
-arch bat
-x 1
-y 5
+arch wolf
+x 2
 end
 arch generate_scorpion
+speed 0.200000
 x 2
 y 1
-speed 0.200000
 end
 arch generate_stalker
 x 2
 y 2
 end
+arch dire_wolf
+x 2
+y 3
+end
 arch generate_bat
 x 2
 y 4
@@ -65,10 +64,13 @@ arch bat
 x 2
 y 5
 end
+arch wolf
+x 3
+end
 arch generate_scorpion
+speed 0.200000
 x 3
 y 1
-speed 0.200000
 end
 arch generate_stalker
 x 3
@@ -83,9 +85,9 @@ x 3
 y 4
 end
 arch generate_xan
+speed 0.300000
 x 3
 y 5
-speed 0.300000
 end
 arch scorpion
 x 4
@@ -99,49 +101,30 @@ x 4
 y 2
 end
 arch generate_xan
+speed 0.300000
 x 4
 y 5
-speed 0.300000
 end
 arch scorpion
 x 5
 end
 arch generate_xan
+speed 0.300000
 x 5
 y 5
-speed 0.300000
 end
-arch unicorn
-x 2
-end
-More
-arch unicorn_2
-x 3
+arch behemoth
+y 4
 end
 arch cobra
 x 4
 y 3
 end
-More
-arch cobra_2
-x 4
-y 4
-end
-arch cobra
+arch bear
 x 5
 y 1
 end
-More
-arch cobra_2
-x 5
-y 2
-end
 arch cobra
 x 5
 y 3
 end
-More
-arch cobra_2
-x 5
-y 4
-end
diff --git a/styles/monsterstyles/animal/animal_13 b/styles/monsterstyles/animal/animal_13
index 5f82e9707..9c9221982 100644
--- a/styles/monsterstyles/animal/animal_13
+++ b/styles/monsterstyles/animal/animal_13
@@ -5,8 +5,8 @@ Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sat Dec 19 17:06:24 1998
 endmsg
-x 6
-y 6
+width 6
+height 6
 end
 arch beehive
 speed -0.200000
@@ -15,48 +15,39 @@ arch spider_gen
 y 1
 end
 arch beehive
-y 2
 speed -0.200000
-end
-arch beehive
-y 3
-speed -0.200000
-end
-arch beehive
 x 1
-speed -0.200000
 end
 arch spider_gen
 x 1
 y 1
 end
 arch beehive
+speed -0.200000
 x 1
 y 2
-speed -0.200000
 end
 arch beehive
+speed -0.200000
 x 1
 y 3
-speed -0.200000
 end
-arch generate_bat
-x 1
-y 4
-end
-arch bat
-x 1
-y 5
+arch wolf
+x 2
 end
 arch generate_scorpion
+speed 0.200000
 x 2
 y 1
-speed 0.200000
 end
 arch generate_stalker
 x 2
 y 2
 end
+arch dire_wolf
+x 2
+y 3
+end
 arch generate_bat
 x 2
 y 4
@@ -65,10 +56,13 @@ arch bat
 x 2
 y 5
 end
+arch wolf
+x 3
+end
 arch generate_scorpion
+speed 0.200000
 x 3
 y 1
-speed 0.200000
 end
 arch generate_stalker
 x 3
@@ -83,9 +77,9 @@ x 3
 y 4
 end
 arch generate_xan
+speed 0.300000
 x 3
 y 5
-speed 0.300000
 end
 arch scorpion
 x 4
@@ -99,49 +93,29 @@ x 4
 y 2
 end
 arch generate_xan
+speed 0.300000
 x 4
 y 5
-speed 0.300000
 end
 arch scorpion
 x 5
 end
 arch generate_xan
+speed 0.300000
 x 5
 y 5
-speed 0.300000
 end
-arch unicorn
-x 2
+arch bear
+y 2
 end
-More
-arch unicorn_2
-x 3
+arch behemoth
+y 4
 end
-arch cobra
+arch giantrat
 x 4
 y 3
 end
-More
-arch cobra_2
-x 4
-y 4
-end
 arch cobra
 x 5
 y 1
 end
-More
-arch cobra_2
-x 5
-y 2
-end
-arch cobra
-x 5
-y 3
-end
-More
-arch cobra_2
-x 5
-y 4
-end
diff --git a/styles/monsterstyles/animal/animal_14 b/styles/monsterstyles/animal/animal_14
index 5f82e9707..4e2f211f7 100644
--- a/styles/monsterstyles/animal/animal_14
+++ b/styles/monsterstyles/animal/animal_14
@@ -5,8 +5,8 @@ Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sat Dec 19 17:06:24 1998
 endmsg
-x 6
-y 6
+width 6
+height 6
 end
 arch beehive
 speed -0.200000
@@ -15,48 +15,44 @@ arch spider_gen
 y 1
 end
 arch beehive
+speed -0.200000
 y 2
-speed -0.200000
 end
 arch beehive
+speed -0.200000
 y 3
-speed -0.200000
 end
 arch beehive
-x 1
 speed -0.200000
+x 1
 end
 arch spider_gen
 x 1
 y 1
 end
 arch beehive
+speed -0.200000
 x 1
 y 2
-speed -0.200000
 end
 arch beehive
+speed -0.200000
 x 1
 y 3
-speed -0.200000
-end
-arch generate_bat
-x 1
-y 4
-end
-arch bat
-x 1
-y 5
 end
 arch generate_scorpion
+speed 0.200000
 x 2
 y 1
-speed 0.200000
 end
 arch generate_stalker
 x 2
 y 2
 end
+arch dire_wolf
+x 2
+y 3
+end
 arch generate_bat
 x 2
 y 4
@@ -66,9 +62,9 @@ x 2
 y 5
 end
 arch generate_scorpion
+speed 0.200000
 x 3
 y 1
-speed 0.200000
 end
 arch generate_stalker
 x 3
@@ -83,11 +79,11 @@ x 3
 y 4
 end
 arch generate_xan
+speed 0.300000
 x 3
 y 5
-speed 0.300000
 end
-arch scorpion
+arch wolf
 x 4
 end
 arch scorpion
@@ -99,49 +95,29 @@ x 4
 y 2
 end
 arch generate_xan
+speed 0.300000
 x 4
 y 5
-speed 0.300000
 end
-arch scorpion
+arch wolf
 x 5
 end
 arch generate_xan
+speed 0.300000
 x 5
 y 5
-speed 0.300000
+end
+arch giantrat
+y 4
 end
 arch unicorn
 x 2
 end
-More
-arch unicorn_2
-x 3
-end
-arch cobra
+arch behemoth
 x 4
 y 3
 end
-More
-arch cobra_2
-x 4
-y 4
-end
 arch cobra
 x 5
 y 1
 end
-More
-arch cobra_2
-x 5
-y 2
-end
-arch cobra
-x 5
-y 3
-end
-More
-arch cobra_2
-x 5
-y 4
-end
diff --git a/styles/monsterstyles/animal/animal_2 b/styles/monsterstyles/animal/animal_2
index f55c14e1a..9d015414d 100644
--- a/styles/monsterstyles/animal/animal_2
+++ b/styles/monsterstyles/animal/animal_2
@@ -5,8 +5,8 @@ Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sat Dec 19 17:06:24 1998
 endmsg
-x 6
-y 6
+width 6
+height 6
 end
 arch snake
 end
@@ -71,7 +71,7 @@ arch bat
 x 2
 y 5
 end
-arch snake
+arch scorpion
 x 3
 end
 arch generate_ant
@@ -90,6 +90,10 @@ arch generate_bat
 x 3
 y 4
 end
+arch bird
+x 3
+y 5
+end
 arch mouse
 x 4
 end
@@ -101,30 +105,14 @@ arch centipede
 x 4
 y 2
 end
-arch cobra
+arch goose
 x 4
 y 3
 end
-More
-arch cobra_2
+arch goose
 x 4
 y 4
 end
-arch cobra
+arch scorpion
 x 5
-y 1
-end
-More
-arch cobra_2
-x 5
-y 2
-end
-arch cobra
-x 5
-y 3
-end
-More
-arch cobra_2
-x 5
-y 4
 end
diff --git a/styles/monsterstyles/animal/animal_3 b/styles/monsterstyles/animal/animal_3
index f55c14e1a..425ba3381 100644
--- a/styles/monsterstyles/animal/animal_3
+++ b/styles/monsterstyles/animal/animal_3
@@ -5,8 +5,8 @@ Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sat Dec 19 17:06:24 1998
 endmsg
-x 6
-y 6
+width 6
+height 6
 end
 arch snake
 end
@@ -90,6 +90,10 @@ arch generate_bat
 x 3
 y 4
 end
+arch bird
+x 3
+y 5
+end
 arch mouse
 x 4
 end
@@ -101,30 +105,30 @@ arch centipede
 x 4
 y 2
 end
-arch cobra
+arch dog
 x 4
-y 3
+y 5
 end
-More
-arch cobra_2
-x 4
-y 4
+arch dog
+x 5
 end
-arch cobra
+arch goose
 x 5
 y 1
 end
-More
-arch cobra_2
+arch goose
 x 5
 y 2
 end
+arch dog
+x 5
+y 5
+end
+arch cobra
+x 4
+y 3
+end
 arch cobra
 x 5
 y 3
 end
-More
-arch cobra_2
-x 5
-y 4
-end
diff --git a/styles/monsterstyles/animal/animal_4 b/styles/monsterstyles/animal/animal_4
index f55c14e1a..1b37579b3 100644
--- a/styles/monsterstyles/animal/animal_4
+++ b/styles/monsterstyles/animal/animal_4
@@ -5,8 +5,8 @@ Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sat Dec 19 17:06:24 1998
 endmsg
-x 6
-y 6
+width 6
+height 6
 end
 arch snake
 end
@@ -90,6 +90,10 @@ arch generate_bat
 x 3
 y 4
 end
+arch wolf
+x 3
+y 5
+end
 arch mouse
 x 4
 end
@@ -101,30 +105,30 @@ arch centipede
 x 4
 y 2
 end
-arch cobra
+arch wolf
 x 4
-y 3
+y 5
 end
-More
-arch cobra_2
-x 4
-y 4
+arch goose
+x 5
 end
-arch cobra
+arch goose
 x 5
 y 1
 end
-More
-arch cobra_2
+arch bird
 x 5
 y 2
 end
+arch wolf
+x 5
+y 5
+end
+arch cobra
+x 4
+y 3
+end
 arch cobra
 x 5
 y 3
 end
-More
-arch cobra_2
-x 5
-y 4
-end
diff --git a/styles/monsterstyles/animal/animal_5 b/styles/monsterstyles/animal/animal_5
index f55c14e1a..2819a24c2 100644
--- a/styles/monsterstyles/animal/animal_5
+++ b/styles/monsterstyles/animal/animal_5
@@ -5,8 +5,8 @@ Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sat Dec 19 17:06:24 1998
 endmsg
-x 6
-y 6
+width 6
+height 6
 end
 arch snake
 end
@@ -90,6 +90,10 @@ arch generate_bat
 x 3
 y 4
 end
+arch bird
+x 3
+y 5
+end
 arch mouse
 x 4
 end
@@ -101,30 +105,26 @@ arch centipede
 x 4
 y 2
 end
+arch wolf
+x 4
+y 5
+end
+arch bird
+x 5
+end
+arch wolf
+x 5
+y 5
+end
 arch cobra
 x 4
 y 3
 end
-More
-arch cobra_2
-x 4
-y 4
-end
-arch cobra
+arch bear
 x 5
 y 1
 end
-More
-arch cobra_2
-x 5
-y 2
-end
 arch cobra
 x 5
 y 3
 end
-More
-arch cobra_2
-x 5
-y 4
-end
diff --git a/styles/monsterstyles/animal/animal_6 b/styles/monsterstyles/animal/animal_6
index 248871b55..08eff656f 100644
--- a/styles/monsterstyles/animal/animal_6
+++ b/styles/monsterstyles/animal/animal_6
@@ -5,8 +5,8 @@ Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sat Dec 19 17:06:24 1998
 endmsg
-x 6
-y 6
+width 6
+height 6
 end
 arch snake
 end
@@ -71,7 +71,7 @@ arch bat
 x 2
 y 5
 end
-arch snake
+arch wolf
 x 3
 end
 arch scorpion
@@ -90,7 +90,7 @@ arch generate_bat
 x 3
 y 4
 end
-arch generate_xan
+arch wolf
 x 3
 y 5
 end
@@ -101,7 +101,7 @@ arch scorpion
 x 4
 y 1
 end
-arch centipede
+arch wolf
 x 4
 y 2
 end
@@ -120,26 +120,11 @@ arch cobra
 x 4
 y 3
 end
-More
-arch cobra_2
-x 4
-y 4
-end
-arch cobra
+arch bear
 x 5
 y 1
 end
-More
-arch cobra_2
-x 5
-y 2
-end
 arch cobra
 x 5
 y 3
 end
-More
-arch cobra_2
-x 5
-y 4
-end
diff --git a/styles/monsterstyles/animal/animal_7 b/styles/monsterstyles/animal/animal_7
index 8a9449531..1a33453a0 100644
--- a/styles/monsterstyles/animal/animal_7
+++ b/styles/monsterstyles/animal/animal_7
@@ -5,10 +5,10 @@ Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sat Dec 19 17:06:24 1998
 endmsg
-x 6
-y 6
+width 6
+height 6
 end
-arch snake
+arch wolf
 end
 arch spider_gen
 y 1
@@ -32,7 +32,7 @@ arch spider_gen
 x 1
 y 1
 end
-arch centipede
+arch dire_wolf
 x 1
 y 2
 end
@@ -40,7 +40,7 @@ arch pixie
 x 1
 y 3
 end
-arch generate_bat
+arch dire_wolf
 x 1
 y 4
 end
@@ -112,7 +112,7 @@ end
 arch scorpion
 x 5
 end
-arch generate_xan
+arch wolf
 x 5
 y 5
 end
@@ -120,26 +120,11 @@ arch cobra
 x 4
 y 3
 end
-More
-arch cobra_2
-x 4
-y 4
-end
-arch cobra
+arch bear
 x 5
 y 1
 end
-More
-arch cobra_2
-x 5
-y 2
-end
 arch cobra
 x 5
 y 3
 end
-More
-arch cobra_2
-x 5
-y 4
-end
diff --git a/styles/monsterstyles/animal/animal_8 b/styles/monsterstyles/animal/animal_8
index a692897b2..5348edeb4 100644
--- a/styles/monsterstyles/animal/animal_8
+++ b/styles/monsterstyles/animal/animal_8
@@ -5,8 +5,8 @@ Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sat Dec 19 17:06:24 1998
 endmsg
-x 6
-y 6
+width 6
+height 6
 end
 arch snake
 end
@@ -48,11 +48,14 @@ arch bat
 x 1
 y 5
 end
+arch wolf
+x 2
+end
 arch generate_scorpion
 x 2
 y 1
 end
-arch giant_bat
+arch dire_wolf
 x 2
 y 2
 end
@@ -68,11 +71,14 @@ arch bat
 x 2
 y 5
 end
+arch wolf
+x 3
+end
 arch generate_scorpion
 x 3
 y 1
 end
-arch giant_bat
+arch dire_wolf
 x 3
 y 2
 end
@@ -110,37 +116,15 @@ arch generate_xan
 x 5
 y 5
 end
-arch unicorn
-x 2
-end
-More
-arch unicorn_2
-x 3
-end
 arch cobra
 x 4
 y 3
 end
-More
-arch cobra_2
-x 4
-y 4
-end
-arch cobra
+arch bear
 x 5
 y 1
 end
-More
-arch cobra_2
-x 5
-y 2
-end
 arch cobra
 x 5
 y 3
 end
-More
-arch cobra_2
-x 5
-y 4
-end
diff --git a/styles/monsterstyles/animal/animal_9 b/styles/monsterstyles/animal/animal_9
index c965c2201..34c8ca77f 100644
--- a/styles/monsterstyles/animal/animal_9
+++ b/styles/monsterstyles/animal/animal_9
@@ -5,8 +5,8 @@ Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sat Dec 19 17:06:24 1998
 endmsg
-x 6
-y 6
+width 6
+height 6
 end
 arch beehive
 end
@@ -48,11 +48,14 @@ arch bat
 x 1
 y 5
 end
+arch dire_wolf
+x 2
+end
 arch generate_scorpion
 x 2
 y 1
 end
-arch giant_bat
+arch wolf
 x 2
 y 2
 end
@@ -68,11 +71,14 @@ arch bat
 x 2
 y 5
 end
+arch dire_wolf
+x 3
+end
 arch generate_scorpion
 x 3
 y 1
 end
-arch giant_bat
+arch wolf
 x 3
 y 2
 end
@@ -110,37 +116,15 @@ arch generate_xan
 x 5
 y 5
 end
-arch unicorn
-x 2
-end
-More
-arch unicorn_2
-x 3
-end
 arch cobra
 x 4
 y 3
 end
-More
-arch cobra_2
-x 4
-y 4
-end
-arch cobra
+arch bear
 x 5
 y 1
 end
-More
-arch cobra_2
-x 5
-y 2
-end
 arch cobra
 x 5
 y 3
 end
-More
-arch cobra_2
-x 5
-y 4
-end
diff --git a/styles/monsterstyles/chaos/chaos_10 b/styles/monsterstyles/chaos/chaos_10
index 87ab22b95..300c4fbf5 100644
--- a/styles/monsterstyles/chaos/chaos_10
+++ b/styles/monsterstyles/chaos/chaos_10
@@ -1,154 +1,44 @@
 arch map
+name <untitled>
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sat Dec 26 20:52:22 1998
 endmsg
-x 6
-y 6
+width 6
+height 6
+end
+arch chaos_witch
+y 5
+end
+arch chaos_witch
+x 1
+y 5
 end
 arch cyclops
 end
-More
-arch cyclops_2
-end
-More
-arch cyclops_3
-end
-More
-arch cyclops_4
-end
-More
-arch cyclops_5
-end
-More
-arch cyclops_6
-end
 arch byakie
 y 3
 end
-More
-arch byakie_2
-y 3
-end
-More
-arch byakie_3
-y 4
-end
-More
-arch byakie_4
-y 4
-end
-arch lamia
-y 5
-end
-More
-arch lamia_2
-y 5
-end
 arch byakie
 x 2
 end
-More
-arch byakie_2
-x 3
-end
-More
-arch byakie_3
-x 2
-end
-More
-arch byakie_4
-x 3
-end
 arch cyclops
 x 2
 y 2
 end
-More
-arch cyclops_2
-x 3
-y 2
-end
-More
-arch cyclops_3
-x 2
-y 3
-end
-More
-arch cyclops_4
-x 3
-y 3
-end
-More
-arch cyclops_5
-x 2
-y 4
-end
-More
-arch cyclops_6
-x 3
-y 4
-end
 arch lamia
 x 2
 y 5
 end
-More
-arch lamia_2
-x 3
-y 5
-end
 arch byakie
 x 4
 end
-More
-arch byakie_2
-x 5
-end
-More
-arch byakie_3
-x 4
-end
-More
-arch byakie_4
-x 5
-end
 arch cyclops
 x 4
 y 2
 end
-More
-arch cyclops_2
-x 5
-y 2
-end
-More
-arch cyclops_3
-x 4
-y 3
-end
-More
-arch cyclops_4
-x 5
-y 3
-end
-More
-arch cyclops_5
-x 4
-y 4
-end
-More
-arch cyclops_6
-x 5
-y 4
-end
 arch lamia
 x 4
 y 5
 end
-More
-arch lamia_2
-x 5
-y 5
-end
diff --git a/styles/monsterstyles/chaos/chaos_5 b/styles/monsterstyles/chaos/chaos_5
index be56e5ca3..7c4d16698 100644
--- a/styles/monsterstyles/chaos/chaos_5
+++ b/styles/monsterstyles/chaos/chaos_5
@@ -1,11 +1,12 @@
 arch map
+name <untitled>
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sat Dec 26 20:52:22 1998
 endmsg
-x 6
-y 6
+width 6
+height 6
 end
 arch lokanth
 end
@@ -15,7 +16,7 @@ end
 arch lokanth
 y 2
 end
-arch living_chaos
+arch chaos_witch
 y 3
 end
 arch crawling_chaos
@@ -32,7 +33,7 @@ arch lokanth
 x 1
 y 2
 end
-arch living_chaos
+arch chaos_witch
 x 1
 y 3
 end
@@ -119,25 +120,11 @@ end
 arch lamia
 y 5
 end
-More
-arch lamia_2
-y 5
-end
 arch lamia
 x 2
 y 5
 end
-More
-arch lamia_2
-x 3
-y 5
-end
 arch lamia
 x 4
 y 5
 end
-More
-arch lamia_2
-x 5
-y 5
-end
diff --git a/styles/monsterstyles/chaos/chaos_6 b/styles/monsterstyles/chaos/chaos_6
index 4b0babc84..5f494fb67 100644
--- a/styles/monsterstyles/chaos/chaos_6
+++ b/styles/monsterstyles/chaos/chaos_6
@@ -1,11 +1,12 @@
 arch map
+name <untitled>
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sat Dec 26 20:52:22 1998
 endmsg
-x 6
-y 6
+width 6
+height 6
 end
 arch lokanth
 end
@@ -24,6 +25,14 @@ end
 arch lokanth
 x 1
 end
+arch chaos_witch
+x 1
+y 1
+end
+arch chaos_witch
+x 1
+y 2
+end
 arch living_chaos
 x 1
 y 3
@@ -35,6 +44,14 @@ end
 arch lokanth
 x 2
 end
+arch chaos_witch
+x 2
+y 1
+end
+arch chaos_witch
+x 2
+y 2
+end
 arch living_chaos
 x 2
 y 3
@@ -73,77 +90,18 @@ end
 arch lamia
 y 5
 end
-More
-arch lamia_2
-y 5
-end
-arch lamia
-x 1
-y 1
-end
-More
-arch lamia_2
-x 2
-y 1
-end
-arch lamia
-x 1
-y 2
-end
-More
-arch lamia_2
-x 2
-y 2
-end
 arch lamia
 x 2
 y 5
 end
-More
-arch lamia_2
-x 3
-y 5
-end
 arch byakie
 x 3
 end
-More
-arch byakie_2
-x 4
-end
-More
-arch byakie_3
-x 3
-end
-More
-arch byakie_4
-x 4
-end
 arch byakie
 x 3
 y 2
 end
-More
-arch byakie_2
-x 4
-y 2
-end
-More
-arch byakie_3
-x 3
-y 3
-end
-More
-arch byakie_4
-x 4
-y 3
-end
 arch lamia
 x 4
 y 5
 end
-More
-arch lamia_2
-x 5
-y 5
-end
diff --git a/styles/monsterstyles/chaos/chaos_8 b/styles/monsterstyles/chaos/chaos_8
index 0cc0ce01c..4d4d593eb 100644
--- a/styles/monsterstyles/chaos/chaos_8
+++ b/styles/monsterstyles/chaos/chaos_8
@@ -1,11 +1,12 @@
 arch map
+name <untitled>
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sat Dec 26 20:52:22 1998
 endmsg
-x 6
-y 6
+width 6
+height 6
 end
 arch crawling_chaos
 y 4
@@ -14,140 +15,49 @@ arch crawling_chaos
 x 1
 y 4
 end
+arch chaos_witch
+x 2
+y 2
+end
+arch chaos_witch
+x 2
+y 3
+end
+arch chaos_witch
+x 3
+y 2
+end
+arch chaos_witch
+x 3
+y 3
+end
 arch byakie
 end
-More
-arch byakie_2
-end
-More
-arch byakie_3
-end
-More
-arch byakie_4
-end
 arch byakie
 y 2
 end
-More
-arch byakie_2
-y 2
-end
-More
-arch byakie_3
-y 3
-end
-More
-arch byakie_4
-y 3
-end
 arch lamia
 y 5
 end
-More
-arch lamia_2
-y 5
-end
 arch byakie
 x 2
 end
-More
-arch byakie_2
-x 3
-end
-More
-arch byakie_3
-x 2
-end
-More
-arch byakie_4
-x 3
-end
 arch lamia
 x 2
-y 2
-end
-More
-arch lamia_2
-x 3
-y 2
-end
-arch lamia
-x 2
-y 3
-end
-More
-arch lamia_2
-x 3
-y 3
-end
-arch lamia
-x 2
-y 4
-end
-More
-arch lamia_2
-x 3
 y 4
 end
 arch lamia
 x 2
 y 5
 end
-More
-arch lamia_2
-x 3
-y 5
-end
 arch byakie
 x 4
 end
-More
-arch byakie_2
-x 5
-end
-More
-arch byakie_3
-x 4
-end
-More
-arch byakie_4
-x 5
-end
 arch cyclops
 x 4
 y 2
 end
-More
-arch cyclops_2
-x 5
-y 2
-end
-More
-arch cyclops_3
-x 4
-y 3
-end
-More
-arch cyclops_4
-x 5
-y 3
-end
-More
-arch cyclops_5
-x 4
-y 4
-end
-More
-arch cyclops_6
-x 5
-y 4
-end
 arch lamia
 x 4
 y 5
 end
-More
-arch lamia_2
-x 5
-y 5
-end
diff --git a/styles/monsterstyles/chaos/chaos_9 b/styles/monsterstyles/chaos/chaos_9
index ec4c1d05f..5cf490b5e 100644
--- a/styles/monsterstyles/chaos/chaos_9
+++ b/styles/monsterstyles/chaos/chaos_9
@@ -1,155 +1,51 @@
 arch map
+name <untitled>
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sat Dec 26 20:52:22 1998
 endmsg
-x 6
-y 6
+width 6
+height 6
 end
 arch crawling_chaos
 y 4
 end
 arch crawling_chaos
+y 5
+end
+arch chaos_witch
 x 1
 y 4
 end
+arch chaos_witch
+x 1
+y 5
+end
 arch byakie
 end
-More
-arch byakie_2
-end
-More
-arch byakie_3
-end
-More
-arch byakie_4
-end
 arch byakie
 y 2
 end
-More
-arch byakie_2
-y 2
-end
-More
-arch byakie_3
-y 3
-end
-More
-arch byakie_4
-y 3
-end
-arch lamia
-y 5
-end
-More
-arch lamia_2
-y 5
-end
 arch byakie
 x 2
 end
-More
-arch byakie_2
-x 3
-end
-More
-arch byakie_3
-x 2
-end
-More
-arch byakie_4
-x 3
-end
 arch cyclops
 x 2
 y 2
 end
-More
-arch cyclops_2
-x 3
-y 2
-end
-More
-arch cyclops_3
-x 2
-y 3
-end
-More
-arch cyclops_4
-x 3
-y 3
-end
-More
-arch cyclops_5
-x 2
-y 4
-end
-More
-arch cyclops_6
-x 3
-y 4
-end
 arch lamia
 x 2
 y 5
 end
-More
-arch lamia_2
-x 3
-y 5
-end
 arch byakie
 x 4
 end
-More
-arch byakie_2
-x 5
-end
-More
-arch byakie_3
-x 4
-end
-More
-arch byakie_4
-x 5
-end
 arch cyclops
 x 4
 y 2
 end
-More
-arch cyclops_2
-x 5
-y 2
-end
-More
-arch cyclops_3
-x 4
-y 3
-end
-More
-arch cyclops_4
-x 5
-y 3
-end
-More
-arch cyclops_5
-x 4
-y 4
-end
-More
-arch cyclops_6
-x 5
-y 4
-end
 arch lamia
 x 4
 y 5
 end
-More
-arch lamia_2
-x 5
-y 5
-end